From 6701ff2307d5a62295a7463c461afaf13c827dc1 Mon Sep 17 00:00:00 2001 From: Giorgio Salluzzo Date: Wed, 26 Mar 2025 11:54:50 +0100 Subject: [PATCH 1/8] Missing dependency. --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index 5418304..41089fe 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -31,6 +31,7 @@ dependencies = [ "decorator>=4.0.0", "urllib3>=1.25.3", "h11", + "typing-extensions", ] dynamic = ["version"] From 78c0d7b732b77f6f56738f697a6adcb8436dc000 Mon Sep 17 00:00:00 2001 From: Giorgio Salluzzo Date: Wed, 26 Mar 2025 11:55:49 +0100 Subject: [PATCH 2/8] Bump version. --- mocket/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mocket/__init__.py b/mocket/__init__.py index c785bba..fc941ca 100644 --- a/mocket/__init__.py +++ b/mocket/__init__.py @@ -31,4 +31,4 @@ "FakeSSLContext", ) -__version__ = "3.13.3" +__version__ = "3.13.4" From 4be630a9417e1ab5d98ae096b418ce87529948af Mon Sep 17 00:00:00 2001 From: Giorgio Salluzzo Date: Wed, 26 Mar 2025 12:05:06 +0100 Subject: [PATCH 3/8] Fix. --- mocket/utils.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/mocket/utils.py b/mocket/utils.py index ab29377..c3c7ecb 100644 --- a/mocket/utils.py +++ b/mocket/utils.py @@ -30,12 +30,8 @@ def hexload(string: str) -> bytes: def get_mocketize(wrapper_: Callable) -> Callable: import decorator - if decorator.__version__ < "5": # type: ignore[attr-defined] # pragma: no cover - return decorator.decorator(wrapper_) - return decorator.decorator( # type: ignore[call-arg] # kwsyntax - wrapper_, - kwsyntax=True, - ) + kwargs = {} if decorator.__version__ < "5" else {"kwsyntax": True} + return decorator.decorator(wrapper_, **kwargs) __all__ = ( From a42c0732def8f2ffb92666094391bb20a6880e97 Mon Sep 17 00:00:00 2001 From: Giorgio Salluzzo Date: Wed, 26 Mar 2025 12:37:19 +0100 Subject: [PATCH 4/8] Fix. --- mocket/decorators/async_mocket.py | 2 +- mocket/decorators/mocketizer.py | 2 +- mocket/utils.py | 10 ++++++---- pyproject.toml | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/mocket/decorators/async_mocket.py b/mocket/decorators/async_mocket.py index 40b763a..3839d5f 100644 --- a/mocket/decorators/async_mocket.py +++ b/mocket/decorators/async_mocket.py @@ -16,7 +16,7 @@ async def wrapper( return await test(*args, **kwargs) -async_mocketize = get_mocketize(wrapper_=wrapper) +async_mocketize = get_mocketize(wrapper) __all__ = ("async_mocketize",) diff --git a/mocket/decorators/mocketizer.py b/mocket/decorators/mocketizer.py index 2bf2b9c..4020d52 100644 --- a/mocket/decorators/mocketizer.py +++ b/mocket/decorators/mocketizer.py @@ -92,4 +92,4 @@ def wrapper( return test(*args, **kwargs) -mocketize = get_mocketize(wrapper_=wrapper) +mocketize = get_mocketize(wrapper) diff --git a/mocket/utils.py b/mocket/utils.py index c3c7ecb..0ca141f 100644 --- a/mocket/utils.py +++ b/mocket/utils.py @@ -1,8 +1,11 @@ from __future__ import annotations import binascii +import contextlib from typing import Callable +import decorator + from mocket.compat import decode_from_bytes, encode_to_bytes @@ -28,10 +31,9 @@ def hexload(string: str) -> bytes: def get_mocketize(wrapper_: Callable) -> Callable: - import decorator - - kwargs = {} if decorator.__version__ < "5" else {"kwsyntax": True} - return decorator.decorator(wrapper_, **kwargs) + with contextlib.suppress(TypeError): + return decorator.decorator(wrapper_, kwsyntax=True) # type: ignore[call-arg] + return decorator.decorator(wrapper_) __all__ = ( diff --git a/pyproject.toml b/pyproject.toml index 41089fe..731bf73 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -28,7 +28,7 @@ classifiers = [ ] dependencies = [ "puremagic", - "decorator>=4.0.0", + "decorator>=5.0.0", "urllib3>=1.25.3", "h11", "typing-extensions", From a3893d676a91045edae85497d97db7884c701673 Mon Sep 17 00:00:00 2001 From: Giorgio Salluzzo Date: Wed, 26 Mar 2025 12:37:39 +0100 Subject: [PATCH 5/8] Revert. --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 731bf73..41089fe 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -28,7 +28,7 @@ classifiers = [ ] dependencies = [ "puremagic", - "decorator>=5.0.0", + "decorator>=4.0.0", "urllib3>=1.25.3", "h11", "typing-extensions", From 2c1c989c3e0775543cde9a4306658f2103aadd36 Mon Sep 17 00:00:00 2001 From: Giorgio Salluzzo Date: Wed, 26 Mar 2025 12:39:14 +0100 Subject: [PATCH 6/8] Revert. --- mocket/utils.py | 1 + 1 file changed, 1 insertion(+) diff --git a/mocket/utils.py b/mocket/utils.py index 0ca141f..2b9c6f3 100644 --- a/mocket/utils.py +++ b/mocket/utils.py @@ -31,6 +31,7 @@ def hexload(string: str) -> bytes: def get_mocketize(wrapper_: Callable) -> Callable: + # trying to support different versions of `decorator` with contextlib.suppress(TypeError): return decorator.decorator(wrapper_, kwsyntax=True) # type: ignore[call-arg] return decorator.decorator(wrapper_) From 10ef373bd711f0872c4dcddff24070a7b51116cd Mon Sep 17 00:00:00 2001 From: Giorgio Salluzzo Date: Wed, 26 Mar 2025 12:42:43 +0100 Subject: [PATCH 7/8] Revert. --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index 41089fe..fbe4746 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -125,6 +125,7 @@ files = [ ] strict = true warn_unused_configs = true +suppress_unused_ignore = true ignore_missing_imports = true warn_redundant_casts = true warn_unused_ignores = true From 80e5eba052fc8a861ff64db0cbbd8e6e23e27ab0 Mon Sep 17 00:00:00 2001 From: Giorgio Salluzzo Date: Wed, 26 Mar 2025 12:46:34 +0100 Subject: [PATCH 8/8] Revert. --- mocket/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mocket/utils.py b/mocket/utils.py index 2b9c6f3..60ddd9f 100644 --- a/mocket/utils.py +++ b/mocket/utils.py @@ -33,7 +33,7 @@ def hexload(string: str) -> bytes: def get_mocketize(wrapper_: Callable) -> Callable: # trying to support different versions of `decorator` with contextlib.suppress(TypeError): - return decorator.decorator(wrapper_, kwsyntax=True) # type: ignore[call-arg] + return decorator.decorator(wrapper_, kwsyntax=True) # type: ignore[call-arg,unused-ignore] return decorator.decorator(wrapper_)