Candidate fixes for python2/3 compatible string handling in pickling support.
llvm-svn: 254550
diff --git a/lldb/packages/Python/lldbsuite/test/dotest_channels.py b/lldb/packages/Python/lldbsuite/test/dotest_channels.py
index 3797ab7..02605fe 100644
--- a/lldb/packages/Python/lldbsuite/test/dotest_channels.py
+++ b/lldb/packages/Python/lldbsuite/test/dotest_channels.py
@@ -47,7 +47,7 @@
self.header_contents = ''
self.packet_bytes_remaining = 0
self.reading_header = True
- self.ibuffer = ''
+ self.ibuffer = b''
self.forwarding_func = forwarding_func
if forwarding_func is None:
# This whole class is useless if we do nothing with the
@@ -58,7 +58,7 @@
"""Unpickles the collected input buffer bytes and forwards."""
if len(self.ibuffer) > 0:
self.forwarding_func(cPickle.loads(self.ibuffer))
- self.ibuffer = ''
+ self.ibuffer = b''
def consume_header_bytes(self, data):
"""Consumes header bytes from the front of data.
diff --git a/lldb/packages/Python/lldbsuite/test/test_results.py b/lldb/packages/Python/lldbsuite/test/test_results.py
index 12fb2e5..547603e 100644
--- a/lldb/packages/Python/lldbsuite/test/test_results.py
+++ b/lldb/packages/Python/lldbsuite/test/test_results.py
@@ -1029,8 +1029,8 @@
# Send it as {serialized_length_of_serialized_bytes}#{serialized_bytes}
pickled_message = cPickle.dumps(test_event)
- self.out_file.send(
- "{}#{}".format(len(pickled_message), pickled_message))
+ self.out_file.send("{}#".format(len(pickled_message)))
+ self.out_file.send(pickled_message)
class DumpFormatter(ResultsFormatter):