[tor-commits] [stem/master] Drop queue fallback

atagar at torproject.org atagar at torproject.org
Sun Jan 5 21:39:28 UTC 2020


commit bfafe1062511a62ddf612846e8d9ee1c05d19668
Author: Damian Johnson <atagar at torproject.org>
Date:   Fri Jan 3 16:28:05 2020 -0800

    Drop queue fallback
---
 stem/control.py           | 7 +------
 stem/descriptor/reader.py | 6 +-----
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/stem/control.py b/stem/control.py
index c046755c..4adec330 100644
--- a/stem/control.py
+++ b/stem/control.py
@@ -253,15 +253,10 @@ import functools
 import inspect
 import io
 import os
+import queue
 import threading
 import time
 
-try:
-  # Added in 3.x
-  import queue
-except ImportError:
-  import Queue as queue
-
 import stem.descriptor.microdescriptor
 import stem.descriptor.reader
 import stem.descriptor.router_status_entry
diff --git a/stem/descriptor/reader.py b/stem/descriptor/reader.py
index ebd41c73..8ef6f22c 100644
--- a/stem/descriptor/reader.py
+++ b/stem/descriptor/reader.py
@@ -84,14 +84,10 @@ and picks up where it left off if run again...
 
 import mimetypes
 import os
+import queue
 import tarfile
 import threading
 
-try:
-  import queue
-except ImportError:
-  import Queue as queue
-
 import stem.descriptor
 import stem.prereq
 import stem.util





More information about the tor-commits mailing list