json calls: for different request versions

Adrien "ze" Urban · Adrien "ze" Urban · commit 611fc1d072d2 · 2014-06-11T16:42:05.000+02:00
diff --git a/gitlab.py b/gitlab.py
@@ -114,9 +114,9 @@ def credentials_auth(self):
         r = self.rawPost('/session',
                          {'email': self.email, 'password': self.password})
         if r.status_code == 201:
-            self.user = CurrentUser(self, r.json())
+            self.user = CurrentUser(self, r.json)
         else:
-            raise GitlabAuthenticationError(r.json()['message'])
+            raise GitlabAuthenticationError(r.json['message'])
 
         self.setToken(self.user.private_token)
 
@@ -208,7 +208,7 @@ def list(self, obj_class, **kwargs):
             cls = obj_class
             if obj_class._returnClass:
                 cls = obj_class._returnClass
-            l = [cls(self, item) for item in r.json() if item is not None]
+            l = [cls(self, item) for item in r.json if item is not None]
             if kwargs:
                 for k, v in kwargs.items():
                     if k in ('page', 'per_page'):
@@ -217,7 +217,7 @@ def list(self, obj_class, **kwargs):
                         obj.__dict__[k] = str(v)
             return l
         elif r.status_code == 401:
-            raise GitlabAuthenticationError(r.json()['message'])
+            raise GitlabAuthenticationError(r.json['message'])
         else:
             raise GitlabGetError('%d: %s' % (r.status_code, r.text))
 
@@ -243,9 +243,9 @@ def get(self, obj_class, id=None, **kwargs):
                 "Can't connect to GitLab server (%s)" % self._url)
 
         if r.status_code == 200:
-            return r.json()
+            return r.json
         elif r.status_code == 401:
-            raise GitlabAuthenticationError(r.json()['message'])
+            raise GitlabAuthenticationError(r.json['message'])
         elif r.status_code == 404:
             raise GitlabGetError("Object doesn't exist")
         else:
@@ -266,9 +266,9 @@ def delete(self, obj):
         if r.status_code == 200:
             return True
         elif r.status_code == 401:
-            raise GitlabAuthenticationError(r.json()['message'])
+            raise GitlabAuthenticationError(r.json['message'])
         else:
-            raise GitlabDeleteError(r.json()['message'])
+            raise GitlabDeleteError(r.json['message'])
         return False
 
     def create(self, obj):
@@ -292,9 +292,9 @@ def create(self, obj):
                 "Can't connect to GitLab server (%s)" % self._url)
 
         if r.status_code == 201:
-            return r.json()
+            return r.json
         elif r.status_code == 401:
-            raise GitlabAuthenticationError(r.json()['message'])
+            raise GitlabAuthenticationError(r.json['message'])
         else:
             raise GitlabCreateError('%d: %s' % (r.status_code, r.text))
 
@@ -319,9 +319,9 @@ def update(self, obj):
                 "Can't connect to GitLab server (%s)" % self._url)
 
         if r.status_code == 200:
-            return r.json()
+            return r.json
         elif r.status_code == 401:
-            raise GitlabAuthenticationError(r.json()['message'])
+            raise GitlabAuthenticationError(r.json['message'])
         else:
             raise GitlabUpdateError('%d: %s' % (r.status_code, r.text))
 
@@ -371,7 +371,7 @@ def _list_projects(self, url, **kwargs):
             raise GitlabListError
 
         l = []
-        for o in r.json():
+        for o in r.json:
             l.append(Project(self, o))
 
         return l
@@ -745,7 +745,7 @@ def diff(self):
               {'project_id': self.project_id, 'commit_id': self.id}
         r = self.gitlab.rawGet(url)
         if r.status_code == 200:
-            return r.json()
+            return r.json
 
         raise GitlabGetError
 
@@ -1013,7 +1013,7 @@ def tree(self, path='', ref_name=''):
         url += '?path=%s&ref_name=%s' % (path, ref_name)
         r = self.gitlab.rawGet(url)
         if r.status_code == 200:
-            return r.json()
+            return r.json
 
         raise GitlabGetError
 
