From 8204d794e2a607b53998c802d6a4b09176c2c2a8 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Thu, 16 Mar 2017 15:37:44 +0100 Subject: [PATCH] Dumper: Fix missing import Additonally ensure that code path works with Python 2.7+ and 3+. Change-Id: I6c7895eeb830259dc07bb7f64049ae51cb814c7f Reviewed-by: hjk --- share/qtcreator/debugger/dumper.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/share/qtcreator/debugger/dumper.py b/share/qtcreator/debugger/dumper.py index d24d649f556..b2ca3c00cab 100644 --- a/share/qtcreator/debugger/dumper.py +++ b/share/qtcreator/debugger/dumper.py @@ -24,6 +24,7 @@ ############################################################################ import os +import codecs import copy import collections import struct @@ -436,7 +437,7 @@ class DumperBase: elif self.currentValue.encoding == 'utf8': value = self.hexdecode(value) elif self.currentValue.encoding == 'utf16': - b = bytes.fromhex(value) + b = bytes(bytearray.fromhex(value)) value = codecs.decode(b, 'utf-16') self.put('"%s"' % value) if self.currentValue.elided: