remove page parameters from getlabel, use unittests2 as test lib

Itxaka · Itxaka · commit 241c32e3e00a · 2015-03-13T16:08:39.000+01:00
diff --git a/gitlab/__init__.py b/gitlab/__init__.py
@@ -1786,13 +1786,12 @@ def deletegitlabciservice(self, project_id, token, project_url):
         else:
             return False
 
-    def getlabels(self, project_id, page=1, per_page=20):
+    def getlabels(self, project_id):
         """Get all labels for given project.
 
         :param project_id: The ID of a project
         :return: list of the labels
         """
-        data = {'page': page, 'per_page': per_page}
         request = requests.get("{0}/{1}/labels".format(self.projects_url, project_id), params=data,
                                verify=self.verify_ssl, headers=self.headers)
 
diff --git a/gitlab_tests/pyapi-gitlab_test.py b/gitlab_tests/pyapi-gitlab_test.py
@@ -2,12 +2,7 @@
 pyapi-gitlab tests
 """
 
-import sys
-if sys.version_info[:2] == (2, 6):
-    import unittest2 as unittest
-else:
-    import unittest
-
+import unittest2 as unittest
 import gitlab
 import os
 import time
