Merge branch 'rhansen-fix-json'

Gauvain Pocentek · Gauvain Pocentek · commit 982f54fb174f · 2016-01-23T16:26:13.000+01:00
diff --git a/gitlab/objects.py b/gitlab/objects.py
@@ -31,8 +31,10 @@
 
 class jsonEncoder(json.JSONEncoder):
     def default(self, obj):
+        from gitlab import Gitlab
         if isinstance(obj, GitlabObject):
-            return obj.__dict__
+            return {k: v for k, v in obj.__dict__.iteritems()
+                    if not isinstance(v, BaseManager)}
         elif isinstance(obj, Gitlab):
             return {'url': obj._url}
         return json.JSONEncoder.default(self, obj)
@@ -474,7 +476,7 @@ def json(self):
         Returns:
             str: The json string.
         """
-        return json.dumps(self.__dict__, cls=jsonEncoder)
+        return json.dumps(self, cls=jsonEncoder)
 
 
 class UserKey(GitlabObject):
