feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Fail gracefully on systems without working base64 module

Browse Source 
Change-Id: I341b0fdb1c9e32fda3ce80f3e7569cffbb0708d2
Reviewed-by: Rafael Roquetto <rafael.roquetto@qt.io>
This commit is contained in:
hjk
2022-06-22 12:12:27 +02:00
parent aaf2318a19
commit 8bb22fa4f3
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
share/qtcreator/debugger/dumper.py
View File

@@ -29,7 +29,6 @@ import collections
import glob import glob
import struct import struct
import sys import sys
import base64
import re import re
import time import time
import inspect import inspect
@@ -45,6 +44,14 @@ except:
"Native combined debugging might not work.") "Native combined debugging might not work.")
pass pass
try:
# That fails on some QNX via Windows installations
import base64
def hexencode_(s):
return base64.b16encode(s).decode('utf8')
except:
def hexencode_(s):
return ''.join(["%x" % c for c in s])
if sys.version_info[0] >= 3: if sys.version_info[0] >= 3:
toInteger = int toInteger = int
@@ -550,7 +557,7 @@ class DumperBase():
return s.encode('hex') return s.encode('hex')
if isinstance(s, str): if isinstance(s, str):
s = s.encode('utf8') s = s.encode('utf8')
return base64.b16encode(s).decode('utf8') return hexencode_(s)
def isQt3Support(self): def isQt3Support(self):
# assume no Qt 3 support by default # assume no Qt 3 support by default