diff options
| -rw-r--r-- | Lib/test/test_gdb.py | 4 | ||||
| -rw-r--r-- | Tools/gdb/libpython.py | 19 |
2 files changed, 14 insertions, 9 deletions
diff --git a/Lib/test/test_gdb.py b/Lib/test/test_gdb.py index bac8d36..d80acfe 100644 --- a/Lib/test/test_gdb.py +++ b/Lib/test/test_gdb.py @@ -234,7 +234,9 @@ class PrettyPrintTests(DebuggerTests): text.encode(encoding) printable = True except UnicodeEncodeError: - self.assertGdbRepr(text, ascii(text)) + # Workaround ascii() bug on UCS-2 builds: issue #9804 + asc = "'" + text.encode('unicode-escape').decode('ascii') + "'" + self.assertGdbRepr(text, asc) else: self.assertGdbRepr(text) diff --git a/Tools/gdb/libpython.py b/Tools/gdb/libpython.py index 361fb03..8a69803 100644 --- a/Tools/gdb/libpython.py +++ b/Tools/gdb/libpython.py @@ -1171,9 +1171,8 @@ class PyUnicodeObjectPtr(PyObjectPtr): # Non-ASCII characters else: ucs = ch - orig_ucs = None ch2 = None - if self.char_width() == 2: + if sys.maxunicode < 0x10000: # If sizeof(Py_UNICODE) is 2 here (in gdb), join # surrogate pairs before calling _unichr_is_printable. if (i < len(proxy) @@ -1183,22 +1182,26 @@ class PyUnicodeObjectPtr(PyObjectPtr): ucs = ch + ch2 i += 1 + # Unfortuately, Python 2's unicode type doesn't seem + # to expose the "isprintable" method printable = _unichr_is_printable(ucs) if printable: try: ucs.encode(ENCODING) except UnicodeEncodeError: printable = False - if orig_ucs is not None: - ucs = orig_ucs - i -= 1 # Map Unicode whitespace and control characters # (categories Z* and C* except ASCII space) if not printable: - # Unfortuately, Python 2's unicode type doesn't seem - # to expose the "isprintable" method - code = ord(ucs) + if ch2 is not None: + # Match Python 3's representation of non-printable + # wide characters. + code = (ord(ch) & 0x03FF) << 10 + code |= ord(ch2) & 0x03FF + code += 0x00010000 + else: + code = ord(ucs) # Map 8-bit characters to '\\xhh' if code <= 0xff: |