Issue #25390: typing: Don't crash on Union[str, Pattern]. (Merge 3.5->3.6)

Guido van Rossum · Guido van Rossum · commit 59136ccad2e9 · 2015-10-19T14:56:25.000-07:00
diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py
@@ -317,6 +317,10 @@ def test_union_instance_type_error(self):
         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
@@ -487,6 +487,9 @@ def __new__(cls, name, bases, namespace, parameters=None, _root=False):
                 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)
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -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
