NotificationsYou must be signed in to change notification settings
Fork673
Star2.4k

Commitc7bcc25

committed

fix: catch invalid type used to initialize RESTObject

Sometimes we have errors where we don't get a dictionary passed toRESTObject.__init__() method. This breaks things but in confusingways.Check in the __init__() method and raise an exception if it occurs.

1 parent161bb0b commitc7bcc25Copy full SHA for c7bcc25

File tree

2 files changed

+12

-0

lines changed

gitlab
- base.py
tests/unit
- test_base.py

2 files changed

+12

-0

lines changed

`‎gitlab/base.py`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`	`fromtypingimportAny,Dict,Iterable,NamedTuple,Optional,Tuple,Type`
`21`	`21`
`22`	`22`	`fromgitlabimporttypesasg_types`
	`23`	`+fromgitlab.exceptionsimportGitlabParsingError`
`23`	`24`
`24`	`25`	`from .clientimportGitlab,GitlabList`
`25`	`26`
`@@ -51,6 +52,12 @@ class RESTObject(object):`
`51`	`52`	`manager:"RESTManager"`
`52`	`53`
`53`	`54`	`def__init__(self,manager:"RESTManager",attrs:Dict[str,Any])->None:`
	`55`	`+ifnotisinstance(attrs,dict):`
	`56`	`+raiseGitlabParsingError(`
	`57`	`+"Attempted to initialize RESTObject with a non-dictionary value: "`
	`58`	`+"{!r}\nThis likely indicates an incorrect or malformed server "`
	`59`	`+"response.".format(attrs)`
	`60`	`+ )`
`54`	`61`	`self.__dict__.update(`
`55`	`62`	`{`
`56`	`63`	`"manager":manager,`

`‎tests/unit/test_base.py`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`
`20`	`20`	`importpytest`
`21`	`21`
	`22`	`+importgitlab`
`22`	`23`	`fromgitlabimportbase`
`23`	`24`
`24`	`25`
`@@ -85,6 +86,10 @@ def test_instantiate(self, fake_gitlab, fake_manager):`
`85`	`86`	`assertfake_manager==obj.manager`
`86`	`87`	`assertfake_gitlab==obj.manager.gitlab`
`87`	`88`
	`89`	`+deftest_instantiate_non_dict(self,fake_gitlab,fake_manager):`
	`90`	`+withpytest.raises(gitlab.exceptions.GitlabParsingError):`
	`91`	`+FakeObject(fake_manager, ["a","list","fails"])`
	`92`	`+`
`88`	`93`	`deftest_picklability(self,fake_manager):`
`89`	`94`	`obj=FakeObject(fake_manager, {"foo":"bar"})`
`90`	`95`	`original_obj_module=obj._module`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitc7bcc25

File tree

2 files changed

2 files changed

`‎gitlab/base.py`

`‎tests/unit/test_base.py`

0 commit comments