diff options
| -rw-r--r-- | gitlab/utils.py | 12 | ||||
| -rw-r--r-- | tests/unit/test_utils.py | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/gitlab/utils.py b/gitlab/utils.py index e8eb941..7c94569 100644 --- a/gitlab/utils.py +++ b/gitlab/utils.py @@ -113,16 +113,14 @@ class EncodedId(str): https://docs.gitlab.com/ee/api/index.html#path-parameters """ - # mypy complains if return type other than the class type. So we ignore issue. - def __new__( # type: ignore - cls, value: Union[str, int, "EncodedId"] - ) -> Union[int, "EncodedId"]: - if isinstance(value, (int, EncodedId)): + def __new__(cls, value: Union[str, int, "EncodedId"]) -> "EncodedId": + if isinstance(value, EncodedId): return value - if not isinstance(value, str): + if not isinstance(value, (int, str)): raise TypeError(f"Unsupported type received: {type(value)}") - value = urllib.parse.quote(value, safe="") + if isinstance(value, str): + value = urllib.parse.quote(value, safe="") return super().__new__(cls, value) diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py index bd425f8..c5f9f93 100644 --- a/tests/unit/test_utils.py +++ b/tests/unit/test_utils.py @@ -48,16 +48,18 @@ class TestEncodedId: assert "Hello" == obj assert "Hello" == str(obj) assert "Hello" == f"{obj}" + assert isinstance(obj, utils.EncodedId) obj = utils.EncodedId("this/is a/path") assert "this%2Fis%20a%2Fpath" == str(obj) assert "this%2Fis%20a%2Fpath" == f"{obj}" + assert isinstance(obj, utils.EncodedId) def test_init_int(self): obj = utils.EncodedId(23) - assert 23 == obj - assert "23" == str(obj) + assert "23" == obj assert "23" == f"{obj}" + assert isinstance(obj, utils.EncodedId) def test_init_invalid_type_raises(self): with pytest.raises(TypeError): |