Commit26d73e2

Gauvain Pocentek

committed

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

2 parents3f38689 +ca6da62 commit26d73e2Copy full SHA for 26d73e2

File tree

-2

lines changed

-2

lines changed

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,10 @@`
`31`	`31`
`32`	`32`	`classjsonEncoder(json.JSONEncoder):`
`33`	`33`	`defdefault(self,obj):`
	`34`	`+fromgitlabimportGitlab`
`34`	`35`	`ifisinstance(obj,GitlabObject):`
`35`		`-returnobj.__dict__`
	`36`	`+return {k:vfork,vinobj.__dict__.iteritems()`
	`37`	`+ifnotisinstance(v,BaseManager)}`
`36`	`38`	`elifisinstance(obj,Gitlab):`
`37`	`39`	`return {'url':obj._url}`
`38`	`40`	`returnjson.JSONEncoder.default(self,obj)`
`@@ -474,7 +476,7 @@ def json(self):`
`474`	`476`	`Returns:`
`475`	`477`	`str: The json string.`
`476`	`478`	`"""`
`477`		`-returnjson.dumps(self.__dict__,cls=jsonEncoder)`
	`479`	`+returnjson.dumps(self,cls=jsonEncoder)`
`478`	`480`
`479`	`481`
`480`	`482`	`classUserKey(GitlabObject):`

Comments

(0)