long_running test now works in Python 2 and 3

Author: Austin Bingham

traad/server.py

@@ -1,8 +1,12 @@
 import itertools
 import logging
-import queue
 import sys
 
+try:
+    from queue import Queue
+except ImportError:
+    from Queue import Queue
+
 from bottle import abort, get, post, request, run
 
 from .rope.project import Project
@@ -20,7 +24,7 @@
 state = State()
 
 task_ids = itertools.count()
-task_queue = queue.Queue()
+task_queue = Queue()
 
 
 def run_server(port, project_path):

traad/test/acceptance/long_running.py

@@ -1,17 +1,22 @@
 import json
 import subprocess
 import time
-import urllib.request
 
+try:
+    from urllib.request import Request, urlopen
+except ImportError:
+    from urllib2 import Request, urlopen
 
-def make_req(loc, data={}, method='POST'):
-        req = urllib.request.Request(
-            url='http://localhost:6543{}'.format(loc),
-            data=json.dumps(data).encode('utf-8'),
-            headers={'Content-Type': 'application/json'},
-            method=method)
-        f = urllib.request.urlopen(req)
-        return f.read()
+
+def make_req(loc, data=None):
+    if data is not None:
+        data = json.dumps(data).encode('utf-8')
+    req = Request(
+        url='http://localhost:6543{}'.format(loc),
+        data=data,
+        headers={'Content-Type': 'application/json'})
+    f = urlopen(req)
+    return f.read()
 
 
 def run_test(proc):
@@ -24,14 +29,17 @@ def run_test(proc):
     start_time = time.time()
     while time.time() - start_time < 10:
         results.add(
-            make_req('/task/{}'.format(task_id), method='GET'))
+            make_req('/task/{}'.format(task_id)))
         time.sleep(0.1)
 
     assert len(results) == 10
 
-with subprocess.Popen(['python', '-m', 'traad.server', '-p', '6543', '.']) as proc:
-    try:
-        time.sleep(1)
-        run_test(proc)
-    finally:
-        proc.terminate()
+
+try:
+    proc = subprocess.Popen(
+            ['python', '-m', 'traad.server', '-p', '6543', '.'])
+    time.sleep(1)
+    run_test(proc)
+finally:
+    proc.terminate()
+    proc.wait()

traad/trace.py

@@ -1,11 +1,16 @@
 import itertools
 import logging
-import reprlib
 import sys
 import traceback
 
 import decorator
 
+try:
+    import reprlib
+    repr = reprlib.repr
+except ImportError:
+    pass
+
 log = logging.getLogger('traad.trace')
 
 @decorator.decorator
@@ -16,7 +21,7 @@ def trace(f, *args, **kw):
     log.info('{}({})'.format(
         f.__name__,
         ', '.join(
-            map(reprlib.repr,
+            map(repr,
                 itertools.chain(
                     args,
                     kw.values())))))