diff options
| -rw-r--r-- | Lib/test/test_typing.py | 4 | ||||
| -rw-r--r-- | Lib/typing.py | 3 | ||||
| -rw-r--r-- | Misc/NEWS | 2 |
3 files changed, 9 insertions, 0 deletions
diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py index 1461cfb..a74ec07 100644 --- a/Lib/test/test_typing.py +++ b/Lib/test/test_typing.py @@ -317,6 +317,10 @@ class UnionTests(TestCase): with self.assertRaises(TypeError): isinstance(42, Union[int, str]) + def test_union_str_pattern(self): + # Shouldn't crash; see http://bugs.python.org/issue25390 + A = Union[str, Pattern] + class TypeVarUnionTests(TestCase): diff --git a/Lib/typing.py b/Lib/typing.py index 1a4982e..d900036 100644 --- a/Lib/typing.py +++ b/Lib/typing.py @@ -487,6 +487,9 @@ class UnionMeta(TypingMeta): return Any if isinstance(t1, TypeVar): continue + if isinstance(t1, _TypeAlias): + # _TypeAlias is not a real class. + continue if any(issubclass(t1, t2) for t2 in all_params - {t1} if not isinstance(t2, TypeVar)): all_params.remove(t1) @@ -63,6 +63,8 @@ Core and Builtins Library ------- +- Issue #25390: typing: Don't crash on Union[str, Pattern]. + - Issue #25441: asyncio: Raise error from drain() when socket is closed. - Issue #25410: Cleaned up and fixed minor bugs in C implementation of |