[Lldb-commits] [PATCH] D59590: Python 2/3 compat: queue vs Queue

[serge via Phabricator via lldb-commits]

serge-sans-paille created this revision.
serge-sans-paille added a reviewer: michaelplatings.
Herald added subscribers: lldb-commits, jdoerfert.
Herald added a project: LLDB.

Repository:
  rLLDB LLDB

https://reviews.llvm.org/D59590

Files:
  lldb/utils/lui/lui.py
  lldb/utils/lui/sandbox.py


Index: lldb/utils/lui/sandbox.py
===================================================================
--- lldb/utils/lui/sandbox.py
+++ lldb/utils/lui/sandbox.py
@@ -14,7 +14,10 @@
 import signal
 import sys
 
-import Queue
+try:
+    import queue
+except ImportError:
+    import Queue as queue
 
 import cui
 
@@ -62,7 +65,7 @@
 
 def main(screen):
     global event_queue
-    event_queue = Queue.Queue()
+    event_queue = queue.Queue()
 
     sandbox = SandboxUI(screen, event_queue)
     sandbox.eventLoop()
Index: lldb/utils/lui/lui.py
===================================================================
--- lldb/utils/lui/lui.py
+++ lldb/utils/lui/lui.py
@@ -18,7 +18,10 @@
 import signal
 import sys
 
-import Queue
+try:
+    import queue
+except ImportError:
+    import Queue as queue
 
 import debuggerdriver
 import cui
@@ -126,7 +129,7 @@
     signal.signal(signal.SIGINT, sigint_handler)
 
     global event_queue
-    event_queue = Queue.Queue()
+    event_queue = queue.Queue()
 
     global debugger
     debugger = lldb.SBDebugger.Create()



Index: lldb/utils/lui/sandbox.py
===================================================================
--- lldb/utils/lui/sandbox.py
+++ lldb/utils/lui/sandbox.py
@@ -14,7 +14,10 @@
 import signal
 import sys
 
-import Queue
+try:
+    import queue
+except ImportError:
+    import Queue as queue
 
 import cui
 
@@ -62,7 +65,7 @@
 
 def main(screen):
     global event_queue
-    event_queue = Queue.Queue()
+    event_queue = queue.Queue()
 
     sandbox = SandboxUI(screen, event_queue)
     sandbox.eventLoop()
Index: lldb/utils/lui/lui.py
===================================================================
--- lldb/utils/lui/lui.py
+++ lldb/utils/lui/lui.py
@@ -18,7 +18,10 @@
 import signal
 import sys
 
-import Queue
+try:
+    import queue
+except ImportError:
+    import Queue as queue
 
 import debuggerdriver
 import cui
@@ -126,7 +129,7 @@
     signal.signal(signal.SIGINT, sigint_handler)
 
     global event_queue
-    event_queue = Queue.Queue()
+    event_queue = queue.Queue()
 
     global debugger
     debugger = lldb.SBDebugger.Create()

_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits