Skip to content

Use Callable[..., Any] instead of Callable[..., object] in unittest #8399

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AlexWaygood merged 4 commits into from
Sep 21, 2022
Merged

Use Callable[..., Any] instead of Callable[..., object] in unittest #8399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ebedc98
Use Callable[..., Any] instead of Callable[..., object]
ShaneHarvey Jul 25, 2022
9145d12
Revert "Use Callable[..., Any] instead of Callable[..., object]"
ShaneHarvey Jul 25, 2022
d942921
Use Callable[..., Any] instead of Callable[..., object] for unittest
ShaneHarvey Jul 25, 2022
bc13872
remove errant Mapping change
ShaneHarvey Jul 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions stdlib/doctest.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,8 +201,8 @@ class DocTestCase(unittest.TestCase):
self,
test: DocTest,
optionflags: int = ...,
setUp: Callable[[DocTest], object] | None = ...,
tearDown: Callable[[DocTest], object] | None = ...,
setUp: Callable[[DocTest], Any] | None = ...,
tearDown: Callable[[DocTest], Any] | None = ...,
checker: OutputChecker | None = ...,
) -> None: ...
def setUp(self) -> None: ...
Expand Down
20 changes: 10 additions & 10 deletions stdlib/unittest/case.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ else:
) -> bool | None: ...

if sys.version_info >= (3, 8):
def addModuleCleanup(__function: Callable[_P, object], *args: _P.args, **kwargs: _P.kwargs) -> None: ...
def addModuleCleanup(__function: Callable[_P, Any], *args: _P.args, **kwargs: _P.kwargs) -> None: ...
def doModuleCleanups() -> None: ...

if sys.version_info >= (3, 11):
Expand Down Expand Up @@ -156,7 +156,7 @@ class TestCase:
self,
expected_exception: type[BaseException] | tuple[type[BaseException], ...],
expected_regex: str | bytes | Pattern[str] | Pattern[bytes],
callable: Callable[..., object],
callable: Callable[..., Any],
*args: Any,
**kwargs: Any,
) -> None: ...
Expand All @@ -171,7 +171,7 @@ class TestCase:
def assertWarns( # type: ignore[misc]
self,
expected_warning: type[Warning] | tuple[type[Warning], ...],
callable: Callable[_P, object],
callable: Callable[_P, Any],
*args: _P.args,
**kwargs: _P.kwargs,
) -> None: ...
Expand All @@ -182,7 +182,7 @@ class TestCase:
self,
expected_warning: type[Warning] | tuple[type[Warning], ...],
expected_regex: str | bytes | Pattern[str] | Pattern[bytes],
callable: Callable[_P, object],
callable: Callable[_P, Any],
*args: _P.args,
**kwargs: _P.kwargs,
) -> None: ...
Expand Down Expand Up @@ -267,17 +267,17 @@ class TestCase:
def id(self) -> str: ...
def shortDescription(self) -> str | None: ...
if sys.version_info >= (3, 8):
def addCleanup(self, __function: Callable[_P, object], *args: _P.args, **kwargs: _P.kwargs) -> None: ...
def addCleanup(self, __function: Callable[_P, Any], *args: _P.args, **kwargs: _P.kwargs) -> None: ...
else:
def addCleanup(self, function: Callable[_P, object], *args: _P.args, **kwargs: _P.kwargs) -> None: ...
def addCleanup(self, function: Callable[_P, Any], *args: _P.args, **kwargs: _P.kwargs) -> None: ...

if sys.version_info >= (3, 11):
def enterContext(self, cm: AbstractContextManager[_T]) -> _T: ...

def doCleanups(self) -> None: ...
if sys.version_info >= (3, 8):
@classmethod
def addClassCleanup(cls, __function: Callable[_P, object], *args: _P.args, **kwargs: _P.kwargs) -> None: ...
def addClassCleanup(cls, __function: Callable[_P, Any], *args: _P.args, **kwargs: _P.kwargs) -> None: ...
@classmethod
def doClassCleanups(cls) -> None: ...

Expand Down Expand Up @@ -310,9 +310,9 @@ class TestCase:
class FunctionTestCase(TestCase):
def __init__(
self,
testFunc: Callable[[], object],
setUp: Callable[[], object] | None = ...,
tearDown: Callable[[], object] | None = ...,
testFunc: Callable[[], Any],
setUp: Callable[[], Any] | None = ...,
tearDown: Callable[[], Any] | None = ...,
description: str | None = ...,
) -> None: ...
def runTest(self) -> None: ...
Expand Down