[test] Py3 porting

hubstorage/batchuploader.py

@@ -8,7 +8,7 @@
 import requests
 from requests.compat import StringIO
 from collections import deque
-from Queue import Queue
+from six.moves.queue import Queue
 from threading import Thread, Event
 from .utils import xauth, iterqueue
 from .serialization import jsonencode
@@ -130,7 +130,7 @@ def _checkpoint(self, w):
             if w.callback is not None:
                 try:
                     w.callback(response)
-                except Exception, e:
+                except Exception as e:
                     logger.exception("Callback for %s failed", w.url)
 
     def _content_encode(self, qiter, w):

hubstorage/utils.py

@@ -1,5 +1,7 @@
 import time
-from Queue import Empty
+import six
+from six.moves.queue import Empty
+from scrapy.utils.python import to_native_str
 
 
 def urlpathjoin(*parts):
@@ -35,10 +37,10 @@ def urlpathjoin(*parts):
             continue
         elif isinstance(p, tuple):
             p = urlpathjoin(*p)
-        elif isinstance(p, unicode):
-            p = p.encode('utf8')
-        elif not isinstance(p, str):
-            p = str(p)
+        elif isinstance(p, six.string_types):
+            p = to_native_str(p)
+        else:
+            p = to_native_str(str(p))
 
         url = p if url is None else '{0}/{1}'.format(url.rstrip('/'), p)
 
@@ -81,7 +83,7 @@ class iterqueue(object):
 
     it exposes an attribute "count" with the number of messages read
 
-    >>> from Queue import Queue
+    >>> from six.moves.queue import Queue
     >>> q = Queue()
     >>> for x in xrange(10):
     ...     q.put(x)

requirements.txt

@@ -1,2 +1,4 @@
 requests>=1.0
-retrying>=1.3.3
+retrying>=1.3.3
+six
+scrapy

tests/test_activity.py

@@ -1,7 +1,7 @@
 """
 Test Activty
 """
-from hstestcase import HSTestCase
+from .hstestcase import HSTestCase
 
 
 class ActivityTest(HSTestCase):

tests/test_batchuploader.py

@@ -3,8 +3,8 @@
 """
 import time
 from collections import defaultdict
-from hstestcase import HSTestCase
 from hubstorage import ValueTooLarge
+from .hstestcase import HSTestCase
 
 
 class BatchUploaderTest(HSTestCase):

tests/test_client.py

@@ -1,7 +1,7 @@
 """
 Test Client
 """
-from hstestcase import HSTestCase
+from .hstestcase import HSTestCase
 from hubstorage.utils import millitime, apipoll
 
 class ClientTest(HSTestCase):

tests/test_frontier.py

@@ -1,7 +1,7 @@
 """
 Test Frontier
 """
-from hstestcase import HSTestCase
+from .hstestcase import HSTestCase
 
 
 class FrontierTest(HSTestCase):

tests/test_jobq.py

@@ -2,9 +2,9 @@
 Test JobQ
 """
 import os, unittest
-from hstestcase import HSTestCase
 from hubstorage.jobq import DuplicateJobError
 from hubstorage.utils import apipoll
+from .hstestcase import HSTestCase
 
 
 EXCLUSIVE = os.environ.get('EXCLUSIVE_STORAGE')

tests/test_jobsmeta.py

@@ -3,7 +3,7 @@
 
 System tests for operations on stored job metadata
 """
-from hstestcase import HSTestCase
+from .hstestcase import HSTestCase
 
 
 class JobsMetadataTest(HSTestCase):

tests/test_project.py

@@ -6,8 +6,8 @@
 from requests.exceptions import HTTPError
 from hubstorage import HubstorageClient
 from hubstorage.utils import millitime
-from hstestcase import HSTestCase
-from testutil import failing_downloader
+from .hstestcase import HSTestCase
+from .testutil import failing_downloader
 
 
 class ProjectTest(HSTestCase):

tests/test_retry.py

@@ -1,10 +1,10 @@
 """
 Test Retry Policy
 """
-from httplib import BadStatusLine
+from six.moves.http_client import BadStatusLine
 from requests import HTTPError, ConnectionError
-from hstestcase import HSTestCase
 from hubstorage import HubstorageClient
+from .hstestcase import HSTestCase
 import responses
 import json
 import re

tests/test_system.py

@@ -1,8 +1,8 @@
 import random
 from contextlib import closing
-from hstestcase import HSTestCase
 from hubstorage import HubstorageClient
 from hubstorage.utils import millitime
+from .hstestcase import HSTestCase
 
 
 class SystemTest(HSTestCase):