From c371166904bec4a86d47ccdf59fd58d54e91e46c Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 23 Mar 2016 08:53:30 +0100 Subject: [PATCH] Debugger: Fix import of system GDB pretty printer Task-number: QTCREATORBUG-15923 Change-Id: I9b8d343f39dd34c33eff05c369bbceb7a581c995 Reviewed-by: Christian Stenger --- share/qtcreator/debugger/gdbbridge.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/share/qtcreator/debugger/gdbbridge.py b/share/qtcreator/debugger/gdbbridge.py index 07a1e815f6a..46086a0c2b9 100644 --- a/share/qtcreator/debugger/gdbbridge.py +++ b/share/qtcreator/debugger/gdbbridge.py @@ -168,13 +168,15 @@ class PlainDumper: self.typeCache = {} def __call__(self, d, value): - printer = self.printer.invoke(value) + printer = self.printer.gen_printer(value) lister = getattr(printer, "children", None) children = [] if lister is None else list(lister()) d.putType(self.printer.name) val = printer.to_string() if isinstance(val, str): d.putValue(val) + elif sys.version_info[0] <= 2 and isinstance(val, unicode): + d.putValue(val) else: # Assuming LazyString d.putCharArrayHelper(val.address, val.length, val.type.sizeof)