wangtao
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[lldb] Make socket_packet_pump.py work in Python3 

Summary:

The `string_escape` encoding used here was removed in Python 3 which makes the
test crash during tearDown:

```
  File "lldb/third_party/Python/module/unittest2/unittest2/case.py", line 386, in run
    self.tearDown()
  File "lldb/packages/Python/lldbsuite/test/tools/lldb-server/gdbremote_testcase.py", line 124, in tearDown
    self._pump_queues.verify_queues_empty()
  File "lldb/packages/Python/lldbsuite/test/tools/lldb-server/socket_packet_pump.py", line 55, in verify_queues_empty
    _dump_queue(self.packet_queue())
  File "lldb/packages/Python/lldbsuite/test/tools/lldb-server/socket_packet_pump.py", line 28, in _dump_queue
    print(codecs.encode(the_queue.get(True), "string_escape"))
LookupError: unknown encoding: string_escape
```

Just replace it with `repr` which should work in both Python versions.

Reviewers: labath, JDevlieghere

Reviewed By: labath, JDevlieghere

Subscribers: JDevlieghere

Differential Revision: https://reviews.llvm.org/D84017
This commit is contained in:
Raphael Isemann 2020-07-23 18:35:40 +02:00
parent 77ae06b8c6
commit 4a3a821c68
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lldb/packages/Python/lldbsuite/test/tools/lldb-server/socket_packet_pump.py
View File

@ -6,7 +6,6 @@ import re
import select import select
import threading import threading
import traceback import traceback
import codecs
from six.moves import queue from six.moves import queue
from lldbsuite.support import seven from lldbsuite.support import seven
@ -25,7 +24,7 @@ def _handle_output_packet_string(packet_contents):
def _dump_queue(the_queue): def _dump_queue(the_queue):
while not the_queue.empty(): while not the_queue.empty():
print(codecs.encode(the_queue.get(True), "string_escape")) print(repr(the_queue.get(True)))
print("\n") print("\n")