Skip to content

typing: Accept tuple of exceptions in assertRaises #577

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

Open
stephenfin wants to merge 3 commits into
base: master
Choose a base branch
from
Open

typing: Accept tuple of exceptions in assertRaises #577

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
60a4492
typing: Correct hint for TestCase.assertRaises
stephenfin Mar 4, 2026
1a97856
typing: Return Self from __enter__
stephenfin Mar 4, 2026
58f96e3
typing: Further improvements to TestCase.assertRaises
stephenfin Mar 4, 2026
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
35 changes: 31 additions & 4 deletions testtools/testcase.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import types
import unittest
from collections.abc import Callable, Iterator
from typing import TypeVar, cast
from typing import TYPE_CHECKING, TypeVar, cast, overload
from unittest.case import SkipTest

T = TypeVar("T")
Expand Down Expand Up @@ -56,6 +56,12 @@
TestResult,
)

if TYPE_CHECKING:
if sys.version_info >= (3, 11):
from typing import Self
else:
from typing_extensions import Self

# Circular import: fixtures imports gather_details from here, we import
# fixtures, leading to gather_details not being available and fixtures being
# unable to import it.
Expand Down Expand Up @@ -493,9 +499,27 @@ def assertIsInstance( # type: ignore[override]
matcher = IsInstance(klass)
self.assertThat(obj, matcher, msg or "")

@overload # type: ignore[override]
def assertRaises(
self,
expected_exception: type[BaseException] | tuple[type[BaseException]],
callable: Callable[..., object],
*args: object,
**kwargs: object,
) -> BaseException: ...

@overload # type: ignore[override]
def assertRaises(
self,
expected_exception: type[BaseException] | tuple[type[BaseException]],
callable: None = ...,
*args: object,
**kwargs: object,
) -> "_AssertRaisesContext": ...

def assertRaises( # type: ignore[override]
self,
expected_exception: type[BaseException],
expected_exception: type[BaseException] | tuple[type[BaseException]],
callable: Callable[..., object] | None = None,
*args: object,
**kwargs: object,
Expand Down Expand Up @@ -1206,7 +1230,10 @@ class _AssertRaisesContext:
"""

def __init__(
self, expected: type[BaseException], test_case: TestCase, msg: str | None = None
self,
expected: type[BaseException] | tuple[type[BaseException]],
test_case: TestCase,
msg: str | None = None,
) -> None:
"""Construct an `_AssertRaisesContext`.

Expand All @@ -1219,7 +1246,7 @@ def __init__(
self.msg = msg
self.exception: BaseException | None = None

def __enter__(self) -> "_AssertRaisesContext":
def __enter__(self) -> "Self":
return self

def __exit__(
Expand Down