Skip to content

Commit

Permalink
Typeshed cherry-pick: Fix @patch when new is missing (#10459) (#15673)
Browse files Browse the repository at this point in the history
For release-1.5
  • Loading branch information
svalentin authored Jul 14, 2023
1 parent 7a94183 commit 45e1bf7
Showing 1 changed file with 21 additions and 6 deletions.
27 changes: 21 additions & 6 deletions mypy/typeshed/stdlib/unittest/mock.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,8 @@ class _patch(Generic[_T]):
def copy(self) -> _patch[_T]: ...
@overload
def __call__(self, func: _TT) -> _TT: ...
# If new==DEFAULT, this should add a MagicMock parameter to the function
# arguments. See the _patch_default_new class below for this functionality.
@overload
def __call__(self, func: Callable[_P, _R]) -> Callable[_P, _R]: ...
if sys.version_info >= (3, 8):
Expand All @@ -257,6 +259,22 @@ class _patch(Generic[_T]):
def start(self) -> _T: ...
def stop(self) -> None: ...

if sys.version_info >= (3, 8):
_Mock: TypeAlias = MagicMock | AsyncMock
else:
_Mock: TypeAlias = MagicMock

# This class does not exist at runtime, it's a hack to make this work:
# @patch("foo")
# def bar(..., mock: MagicMock) -> None: ...
class _patch_default_new(_patch[_Mock]):
@overload
def __call__(self, func: _TT) -> _TT: ...
# Can't use the following as ParamSpec is only allowed as last parameter:
# def __call__(self, func: Callable[_P, _R]) -> Callable[Concatenate[_P, MagicMock], _R]: ...
@overload
def __call__(self, func: Callable[..., _R]) -> Callable[..., _R]: ...

class _patch_dict:
in_dict: Any
values: Any
Expand All @@ -273,11 +291,8 @@ class _patch_dict:
start: Any
stop: Any

if sys.version_info >= (3, 8):
_Mock: TypeAlias = MagicMock | AsyncMock
else:
_Mock: TypeAlias = MagicMock

# This class does not exist at runtime, it's a hack to add methods to the
# patch() function.
class _patcher:
TEST_PREFIX: str
dict: type[_patch_dict]
Expand Down Expand Up @@ -307,7 +322,7 @@ class _patcher:
autospec: Any | None = ...,
new_callable: Any | None = ...,
**kwargs: Any,
) -> _patch[_Mock]: ...
) -> _patch_default_new: ...
@overload
@staticmethod
def object( # type: ignore[misc]
Expand Down

0 comments on commit 45e1bf7

Please sign in to comment.