Commit0a1bb94

Gauvain Pocentek

committed

Rework the Gitlab.delete method

1 parentc3f5b3a commit0a1bb94Copy full SHA for 0a1bb94

File tree

+11

-5

lines changed

+11

-5

lines changed

Lines changed: 11 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -471,16 +471,18 @@ def delete(self, obj, id=None, **kwargs):`
`471`	`471`	`ifinspect.isclass(obj):`
`472`	`472`	`ifnotissubclass(obj,GitlabObject):`
`473`	`473`	`raiseGitlabError("Invalid class: %s"%obj)`
`474`		`-params= {}`
`475`		`-params[obj.idAttr]=id`
`476`		`-else:`
`477`		`-params=obj.__dict__.copy()`
	`474`	`+`
	`475`	`+params= {obj.idAttr:idifidelsegetattr(obj,obj.idAttr)}`
`478`	`476`	`params.update(kwargs)`
	`477`	`+`
`479`	`478`	`missing= []`
`480`	`479`	`forkinitertools.chain(obj.requiredUrlAttrs,`
`481`	`480`	`obj.requiredDeleteAttrs):`
`482`	`481`	`ifknotinparams:`
`483`		`-missing.append(k)`
	`482`	`+try:`
	`483`	`+params[k]=getattr(obj,k)`
	`484`	`+exceptKeyError:`
	`485`	`+missing.append(k)`
`484`	`486`	`ifmissing:`
`485`	`487`	`raiseGitlabDeleteError('Missing attribute(s): %s'%`
`486`	`488`	`", ".join(missing))`
`@@ -493,6 +495,10 @@ def delete(self, obj, id=None, **kwargs):`
`493`	`495`	`# url-parameters left`
`494`	`496`	`forattributeinobj.requiredUrlAttrs:`
`495`	`497`	`delparams[attribute]`
	`498`	`+ifobj._id_in_delete_url:`
	`499`	`+# The ID is already built, no need to add it as extra key in query`
	`500`	`+# string`
	`501`	`+params.pop(obj.idAttr)`
`496`	`502`
`497`	`503`	`try:`
`498`	`504`	`r=self.session.delete(url,`

Comments

(0)