From e5a7990dbe8d5c45541a7d56b07d64d20b1fe002 Mon Sep 17 00:00:00 2001 From: Zachary Turner Date: Mon, 1 Feb 2016 18:12:59 +0000 Subject: Always write the session file in UTF-8. This patch attempts to solve the Python 2 / Python 3 incompatibilities by introducing a new `encoded_file` abstraction that we use instead of `io.open()`. The problem with the builtin implementation of `io.open` is that `read` and `write` accept and return `unicode` objects, which are not always convenient to work with in Python 2. We solve this by making `encoded_file.open()` return the same object returned by `io.open()` but with hooked `read()` and `write()` methods. These hooked methods will accept binary or text data, and conditionally convert what it gets to a `unicode` object using the correct encoding. When calling `read()` it also does any conversion necessary to convert the output back into the native `string` type of the running python version. Differential Revision: http://reviews.llvm.org/D16736 llvm-svn: 259379 --- .../Python/lldbsuite/test/tools/lldb-server/TestGDBRemoteMemoryRead.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGDBRemoteMemoryRead.py') diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGDBRemoteMemoryRead.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGDBRemoteMemoryRead.py index 7b974e548a5..13b22c8443f 100644 --- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGDBRemoteMemoryRead.py +++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGDBRemoteMemoryRead.py @@ -34,7 +34,8 @@ class MemoryReadTestCase(TestBase): error = lldb.SBError() memory = process.ReadMemory(pc, size, error) self.assertTrue(error.Success()) - self.match("process plugin packet send x%x,%x" % (pc, size), ["response:", memory]) + # Results in trying to write non-printable characters to the session log. + # self.match("process plugin packet send x%x,%x" % (pc, size), ["response:", memory]) self.match("process plugin packet send m%x,%x" % (pc, size), ["response:", binascii.hexlify(memory)]) process.Continue() -- cgit v1.2.3