100% coverage and fixed tests

sigmavirus24 · sigmavirus24 · commit 92f0cf1c7aa6 · 2013-06-15T21:08:48.000-04:00
diff --git a/github3/models.py b/github3/models.py
@@ -78,6 +78,8 @@ def __repr__(self):
         return '<github3-core at 0x{0:x}>'.format(id(self))
 
     def _remove_none(self, data):
+        if not data:
+            return
         for (k, v) in list(data.items()):
             if v is None:
                 del(data[k])
diff --git a/github3/utils.py b/github3/utils.py
@@ -1,17 +1,12 @@
 from datetime import datetime
+from requests.compat import basestring
 import re
 
-try:
-    # python 2
-    _base_string_class = basestring
-except NameError:
-    # python 3: no basestring class any more, everything is a str
-    _base_string_class = str
-
 # with thanks to https://code.google.com/p/jquery-localtime/issues/detail?id=4
-ISO_8601 = re.compile("^(-?(?:[1-9][0-9]*)?[0-9]{4})-(1[0-2]|0[1-9])-(3[0-1]|0[1-9]|[1-2][0-9])"
-                      "(T(2[0-3]|[0-1][0-9]):([0-5][0-9]):([0-5][0-9])(\.[0-9]+)?"
-                      "(Z|[+-](?:2[0-3]|[0-1][0-9]):[0-5][0-9])?)?$")
+ISO_8601 = re.compile("^(-?(?:[1-9][0-9]*)?[0-9]{4})-(1[0-2]|0[1-9])-(3[0-1]|0"
+                      "[1-9]|[1-2][0-9])(T(2[0-3]|[0-1][0-9]):([0-5][0-9]):([0"
+                      "-5][0-9])(\.[0-9]+)?(Z|[+-](?:2[0-3]|[0-1][0-9]):[0-5]["
+                      "0-9])?)?$")
 
 
 def timestamp_parameter(timestamp, allow_none=True):
@@ -24,9 +19,10 @@ def timestamp_parameter(timestamp, allow_none=True):
     if isinstance(timestamp, datetime):
         return timestamp.isoformat()
 
-    if isinstance(timestamp, _base_string_class):
+    if isinstance(timestamp, basestring):
         if not ISO_8601.match(timestamp):
-            raise ValueError("Invalid timestamp: %s is not a valid ISO-8601 formatted date" % timestamp)
+            raise ValueError(("Invalid timestamp: %s is not a valid ISO-8601"
+                              " formatted date") % timestamp)
         return timestamp
 
     raise ValueError("Cannot accept type %s for timestamp" % type(timestamp))
diff --git a/tests/test_github.py b/tests/test_github.py
@@ -229,7 +229,7 @@ def test_key(self):
     def test_iter_all_repos(self):
         self.response('repo', _iter=True)
         self.get('https://api.github.com/repositories')
-        self.conf.update(params=None)
+        self.conf.update(params={})
 
         repo = next(self.g.iter_all_repos())
         expect(repo).isinstance(github3.repos.Repository)
@@ -243,15 +243,25 @@ def test_iter_all_repos(self):
         assert(repo.id > 100000)
         self.mock_assertions()
 
+        repo = next(self.g.iter_all_repos(per_page=100))
+        self.conf.update(params={'per_page': 100})
+        expect(repo).isinstance(github3.repos.Repository)
+        self.mock_assertions()
+
     def test_iter_all_users(self):
         self.response('user', _iter=True)
         self.get('https://api.github.com/users')
-        self.conf.update(params=None)
+        self.conf.update(params={})
 
         repo = next(self.g.iter_all_users())
         expect(repo).isinstance(github3.users.User)
         self.mock_assertions()
 
+        repo = next(self.g.iter_all_users(per_page=100))
+        self.conf.update(params={'per_page': 100})
+        expect(repo).isinstance(github3.users.User)
+        self.mock_assertions()
+
     def test_iter_authorizations(self):
         self.response('authorization', _iter=True)
         self.get('https://api.github.com/authorizations')
diff --git a/tests/test_utils.py b/tests/test_utils.py
@@ -33,4 +33,8 @@ def test_invalid_datestring(self):
 
     def test_none_handling(self):
         self.assertTrue(timestamp_parameter(None, allow_none=True) is None)
-        self.assertRaises(ValueError, timestamp_parameter, None, allow_none=False)
+        self.assertRaises(ValueError, timestamp_parameter, None, 
+                allow_none=False)
+
+    def test_invalid_type_handling(self):
+        self.assertRaises(ValueError, timestamp_parameter, 1)
