Rollup merge of rust-lang#57453 - cuviper:python3-thread, r=nikomatsakis

lldb_batchmode.py: try `import _thread` for Python 3 None
pietroalbini · Jan 12, 2019 · 519b0f0 · 519b0f0
2 parents bff32fc + d9ddc39
commit 519b0f0
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/etc/lldb_batchmode.py b/src/etc/lldb_batchmode.py
@@ -18,10 +18,15 @@
 import os
 import sys
 import threading
-import thread
 import re
 import time
 
+try:
+    import thread
+except ModuleNotFoundError:
+    # The `thread` module was renamed to `_thread` in Python 3.
+    import _thread as thread
+
 # Set this to True for additional output
 DEBUG_OUTPUT = False