Commitdea9435

authored

Merge pull request#2040 from python-gitlab/jlvillal/type_alias

chore: have `EncodedId` creation always return `EncodedId`

2 parents3fa330c +a1a246f commitdea9435Copy full SHA for dea9435

File tree

-9

lines changed

-9

lines changed

Lines changed: 5 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -113,16 +113,14 @@ class EncodedId(str):`
`113`	`113`	`https://docs.gitlab.com/ee/api/index.html#path-parameters`
`114`	`114`	`"""`
`115`	`115`
`116`		`-# mypy complains if return type other than the class type. So we ignore issue.`
`117`		`-def__new__(# type: ignore`
`118`		`-cls,value:Union[str,int,"EncodedId"]`
`119`		`- )->Union[int,"EncodedId"]:`
`120`		`-ifisinstance(value, (int,EncodedId)):`
	`116`	`+def__new__(cls,value:Union[str,int,"EncodedId"])->"EncodedId":`
	`117`	`+ifisinstance(value,EncodedId):`
`121`	`118`	`returnvalue`
`122`	`119`
`123`		`-ifnotisinstance(value,str):`
	`120`	`+ifnotisinstance(value,(int,str)):`
`124`	`121`	`raiseTypeError(f"Unsupported type received:{type(value)}")`
`125`		`-value=urllib.parse.quote(value,safe="")`
	`122`	`+ifisinstance(value,str):`
	`123`	`+value=urllib.parse.quote(value,safe="")`
`126`	`124`	`returnsuper().__new__(cls,value)`
`127`	`125`
`128`	`126`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -48,16 +48,18 @@ def test_init_str(self):`
`48`	`48`	`assert"Hello"==obj`
`49`	`49`	`assert"Hello"==str(obj)`
`50`	`50`	`assert"Hello"==f"{obj}"`
	`51`	`+assertisinstance(obj,utils.EncodedId)`
`51`	`52`
`52`	`53`	`obj=utils.EncodedId("this/is a/path")`
`53`	`54`	`assert"this%2Fis%20a%2Fpath"==str(obj)`
`54`	`55`	`assert"this%2Fis%20a%2Fpath"==f"{obj}"`
	`56`	`+assertisinstance(obj,utils.EncodedId)`
`55`	`57`
`56`	`58`	`deftest_init_int(self):`
`57`	`59`	`obj=utils.EncodedId(23)`
`58`		`-assert23==obj`
`59`		`-assert"23"==str(obj)`
	`60`	`+assert"23"==obj`
`60`	`61`	`assert"23"==f"{obj}"`
	`62`	`+assertisinstance(obj,utils.EncodedId)`
`61`	`63`
`62`	`64`	`deftest_init_invalid_type_raises(self):`
`63`	`65`	`withpytest.raises(TypeError):`

Comments

(0)