Python 3.x compatibility fixes

fuzeman · Mar 11, 2015 · af17325 · af17325
1 parent 1b338a4
commit af17325
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/tests/test_summary.py b/tests/test_summary.py
@@ -1,4 +1,4 @@
-from core.helpers import read
+from tests.core.helpers import read
 
 from trakt import Trakt
 import responses

diff --git a/tests/test_sync_movies.py b/tests/test_sync_movies.py
@@ -1,6 +1,6 @@
-from datetime import datetime
-from core.helpers import read
+from tests.core.helpers import read
 
+from datetime import datetime
 from trakt import Trakt
 import responses
 

diff --git a/tests/test_sync_shows.py b/tests/test_sync_shows.py
@@ -1,6 +1,6 @@
-from datetime import datetime
-from core.helpers import read
+from tests.core.helpers import read
 
+from datetime import datetime
 from trakt import Trakt
 import responses
 

diff --git a/trakt/__init__.py b/trakt/__init__.py
@@ -3,6 +3,8 @@
 from trakt.client import TraktClient, __version__
 from trakt.helpers import has_attribute
 
+from six import add_metaclass
+
 
 __all__ = [
     'Trakt',
@@ -39,9 +41,8 @@ def __getitem__(self, key):
         return self.client[key]
 
 
+@add_metaclass(TraktMeta)
 class Trakt(object):
-    __metaclass__ = TraktMeta
-
     client = None
 
     @classmethod

diff --git a/trakt/core/request.py b/trakt/core/request.py
@@ -1,5 +1,6 @@
 from requests import Request
 import json
+import six
 
 
 class TraktRequest(object):
@@ -46,7 +47,7 @@ def transform_parameters(self):
         # Transform `params` into list
         self.params = self.kwargs.get('params') or []
 
-        if isinstance(self.params, basestring):
+        if isinstance(self.params, six.string_types):
             self.params = [self.params]
 
     def transform_method(self):