Support py2 + py3 queue (versus Queue)

Author: pglombardo

instana/recorder.py

@@ -4,17 +4,22 @@
 import opentracing.ext.tags as ext
 import socket
 import instana.span as sd
-import Queue
 import time
 import os
 
+import sys
+if sys.version_info.major is 2:
+    import Queue as queue
+else:
+    import queue
+
 
 class InstanaRecorder(SpanRecorder):
     sensor = None
     registered_spans = ("django", "memcache", "rpc-client", "rpc-server")
     entry_kind = ["entry", "server", "consumer"]
     exit_kind = ["exit", "client", "producer"]
-    queue = Queue.Queue()
+    queue = queue.Queue()
 
     def __init__(self, sensor):
         super(InstanaRecorder, self).__init__()
@@ -46,7 +51,7 @@ def queued_spans(self):
         while True:
             try:
                 s = self.queue.get(False)
-            except Queue.Empty:
+            except queue.Empty:
                 break
             else:
                 spans.append(s)