[3.10] bpo-44468: Never skip base classes in `typing.get_type_hints()`, even with invalid `.__module__`. (GH-26862) (GH-26920)
(cherry picked from commit 7569c0fe91dfcf562dee8c29798ecda74d738aa8)
Co-authored-by: will-ca <willchencontact@gmail.com>
Automerge-Triggered-By: GH:gvanrossum
diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py
index 79c5c3a..07f809c 100644
--- a/Lib/test/test_typing.py
+++ b/Lib/test/test_typing.py
@@ -2276,13 +2276,6 @@ def test_no_isinstance(self):
with self.assertRaises(TypeError):
issubclass(int, ClassVar)
- def test_bad_module(self):
- # bpo-41515
- class BadModule:
- pass
- BadModule.__module__ = 'bad' # Something not in sys.modules
- self.assertEqual(get_type_hints(BadModule), {})
-
class FinalTests(BaseTestCase):
def test_basics(self):
@@ -3032,6 +3025,24 @@ class Foo:
# This previously raised an error under PEP 563.
self.assertEqual(get_type_hints(Foo), {'x': str})
+ def test_get_type_hints_bad_module(self):
+ # bpo-41515
+ class BadModule:
+ pass
+ BadModule.__module__ = 'bad' # Something not in sys.modules
+ self.assertNotIn('bad', sys.modules)
+ self.assertEqual(get_type_hints(BadModule), {})
+
+ def test_get_type_hints_annotated_bad_module(self):
+ # See https://bugs.python.org/issue44468
+ class BadBase:
+ foo: tuple
+ class BadType(BadBase):
+ bar: list
+ BadType.__module__ = BadBase.__module__ = 'bad'
+ self.assertNotIn('bad', sys.modules)
+ self.assertEqual(get_type_hints(BadType), {'foo': tuple, 'bar': list})
+
class GetUtilitiesTestCase(TestCase):
def test_get_origin(self):
diff --git a/Lib/typing.py b/Lib/typing.py
index 639feee..9540021 100644
--- a/Lib/typing.py
+++ b/Lib/typing.py
@@ -1700,10 +1700,7 @@ def get_type_hints(obj, globalns=None, localns=None, include_extras=False):
hints = {}
for base in reversed(obj.__mro__):
if globalns is None:
- try:
- base_globals = sys.modules[base.__module__].__dict__
- except KeyError:
- continue
+ base_globals = getattr(sys.modules.get(base.__module__, None), '__dict__', {})
else:
base_globals = globalns
ann = base.__dict__.get('__annotations__', {})