forked from qt-creator/qt-creator
Debugger: Fail gracefully on systems without working base64 module
Change-Id: I341b0fdb1c9e32fda3ce80f3e7569cffbb0708d2 Reviewed-by: Rafael Roquetto <rafael.roquetto@qt.io>
This commit is contained in:
@@ -29,7 +29,6 @@ import collections
|
||||
import glob
|
||||
import struct
|
||||
import sys
|
||||
import base64
|
||||
import re
|
||||
import time
|
||||
import inspect
|
||||
@@ -45,6 +44,14 @@ except:
|
||||
"Native combined debugging might not work.")
|
||||
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:
|
||||
toInteger = int
|
||||
@@ -550,7 +557,7 @@ class DumperBase():
|
||||
return s.encode('hex')
|
||||
if isinstance(s, str):
|
||||
s = s.encode('utf8')
|
||||
return base64.b16encode(s).decode('utf8')
|
||||
return hexencode_(s)
|
||||
|
||||
def isQt3Support(self):
|
||||
# assume no Qt 3 support by default
|
||||
|
Reference in New Issue
Block a user