Additional Python 3 compatibility fixes

Kagami · Kagami · commit 3f13d375e726 · 2014-05-23T20:40:51.000+04:00
diff --git a/.travis.yml b/.travis.yml
@@ -2,6 +2,10 @@ language: python
 python:
   - "2.6"
   - "2.7"
+  - "3.2"
+  - "3.3"
+  - "3.4"
 install:
-  - pip install -r requirements/dev.txt --use-mirrors
+  - pip install -r requirements/dev.txt
+  - if [[ $TRAVIS_PYTHON_VERSION == 2* ]]; then pip install unittest2; fi
 script: nosetests
diff --git a/pygithub3/core/json/__init__.py b/pygithub3/core/json/__init__.py
@@ -9,6 +9,8 @@
 except ImportError:
     import json
 
+import six
+
 GITHUB_DATE_FORMAT = '%Y-%m-%dT%H:%M:%SZ'
 
 
@@ -21,7 +23,7 @@ def default(self, o):
 
 
 def gh_decoder_hook(dict_):
-    for k, v in dict_.iteritems():
+    for k, v in six.iteritems(dict_):
         try:
             date = datetime.strptime(v, GITHUB_DATE_FORMAT)
             dict_[k] = date
diff --git a/pygithub3/core/result/link.py b/pygithub3/core/result/link.py
@@ -1,12 +1,7 @@
 #!/usr/bin/env python
 # -*- encoding: utf-8 -*-
 
-try:
-    # Python 3
-    from urllib.parse import urlparse, parse_qs
-except ImportError:
-    from urlparse import urlparse, parse_qs
-
+from six.moves.urllib.parse import urlparse, parse_qs
 
 from pygithub3.core.third_libs.link_header import parse_link_value
 
diff --git a/pygithub3/core/result/smart.py b/pygithub3/core/result/smart.py
@@ -1,6 +1,8 @@
 #!/usr/bin/env python
 # -*- encoding: utf-8 -*-
 
+import six
+
 from . import base
 from .link import Link
 
@@ -105,6 +107,6 @@ def get_page(self, page):
 
         :param int page: Page number
         """
-        if page in range(1, self.pages + 1):
+        if page in six.moves.range(1, self.pages + 1):
             return base.Page(self.getter, page)
         return None
diff --git a/pygithub3/requests/users/emails.py b/pygithub3/requests/users/emails.py
@@ -3,6 +3,8 @@
 
 import re
 
+import six
+
 from . import Request, ValidationError
 
 # Src: http://code.djangoproject.com/svn/django/trunk/django/core/validators.py
@@ -30,7 +32,7 @@ def is_email(email):
             raise ValidationError("'%s' request needs emails"
                                   % (self.__class__.__name__))
 
-        return tuple([ele for ele in self.body if is_email(ele)])
+        return tuple(six.moves.filter(is_email, self.body))
 
 
 class Delete(Request):
diff --git a/pygithub3/tests/core/test_json.py b/pygithub3/tests/core/test_json.py
@@ -20,8 +20,8 @@ class TestJson(TestCase):
     json_ = '{"date_fake": "some_fake", "list": [1, 2, 3], "date_ok": "2008-01-14T04:33:35Z", "nested_dict": {"with_date": "2008-01-14T04:33:35Z"}}'
 
     def test_encoder(self):
-        to_json = json.dumps(self.dict_)
-        self.assertEquals(to_json, self.json_)
+        dict_ = json.loads(json.dumps(self.dict_))
+        self.assertEquals(self.dict_, dict_)
 
     def test_decoder(self):
         to_dict = json.loads(self.json_)
diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -2,5 +2,4 @@
 
 nose
 mock
-unittest2
 sphinx
diff --git a/setup.py b/setup.py
@@ -38,6 +38,8 @@
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.2',
+        'Programming Language :: Python :: 3.3',
+        'Programming Language :: Python :: 3.4',
         'License :: OSI Approved :: ISC License (ISCL)',
         'Operating System :: OS Independent',
         'Development Status :: 2 - Pre-Alpha',

-Original file line number
+Diff line change
 nose
 mock
 -unittest2
 sphinx