Merge branch 'fix-json' of https://github.com/rhansen/python-gitlab into rhansen-fix-json

1 files changed, 4 insertions, 2 deletions

diff --git a/gitlab/objects.py b/gitlab/objects.py
index d0e05ea..9f3a655 100644
--- a/gitlab/objects.py
+++ b/gitlab/objects.py
@@ -31,8 +31,10 @@ from gitlab.exceptions import *  # noqa
 
 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 @@ class GitlabObject(object):
         Returns:
             str: The json string.
         """
-        return json.dumps(self.__dict__, cls=jsonEncoder)
+        return json.dumps(self, cls=jsonEncoder)
 
 
 class UserKey(GitlabObject):