Extracting PrinterThread to separate module.

routersploit/interpreter.py

@@ -5,7 +5,7 @@ import itertools
 import traceback
 import atexit
 
-from routersploit.threads import PrinterThread, printer_queue
+from routersploit.printer import PrinterThread, printer_queue
 from routersploit.exceptions import RoutersploitException
 from routersploit.exploits import GLOBAL_OPTS
 from routersploit import utils

routersploit/printer.py

+from __future__ import print_function
+from __future__ import absolute_import
+
+import threading
+from weakref import WeakKeyDictionary
+
+try:
+    import queue
+except ImportError:
+    import Queue as queue
+
+
+printer_queue = queue.Queue()
+thread_output_stream = WeakKeyDictionary()
+
+
+class PrinterThread(threading.Thread):
+    def __init__(self):
+        super(PrinterThread, self).__init__()
+        self.daemon = True
+
+    def run(self):
+        while True:
+            content, sep, end, file_, thread = printer_queue.get()
+            print(*content, sep=sep, end=end, file=file_)
+            printer_queue.task_done()

routersploit/threads.py

 from __future__ import print_function
+from __future__ import absolute_import
 
 import threading
-from weakref import WeakKeyDictionary
+import time
 
 try:
     import queue
 except ImportError:
     import Queue as queue
 
+from . import utils
 
-data_queue = queue.Queue()
-printer_queue = queue.Queue()
 
-thread_output_stream = WeakKeyDictionary()
+data_queue = queue.Queue()
 
 
 class DataProducerThread(threading.Thread):
@@ -44,15 +44,3 @@ class WorkerThread(threading.Thread):
                 self.target(record)
             finally:
                 data_queue.task_done()
-
-
-class PrinterThread(threading.Thread):
-    def __init__(self):
-        super(PrinterThread, self).__init__()
-        self.daemon = True
-
-    def run(self):
-        while True:
-            content, sep, end, file_, thread = printer_queue.get()
-            print(*content, sep=sep, end=end, file=file_)
-            printer_queue.task_done()

routersploit/utils.py

@@ -18,7 +18,7 @@ from abc import ABCMeta, abstractmethod
 
 import requests
 
-from .threads import printer_queue, thread_output_stream
+from .printer import printer_queue, thread_output_stream
 from .exceptions import RoutersploitException
 from . import modules as rsf_modules