summaryrefslogtreecommitdiff
path: root/Lib/typing.py
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2021-06-26 16:52:28 -0700
committerGitHub <noreply@github.com>2021-06-26 16:52:28 -0700
commit3df23b5199a4bb237a595cadca6c49d34ab2a56c (patch)
treec34b770ff1bca34ce420df73bb7fbbae11b56ffb /Lib/typing.py
parent6cd369c48f7dbfe4e2c2035011c575b90ad0e7d5 (diff)
downloadcpython-git-3df23b5199a4bb237a595cadca6c49d34ab2a56c.tar.gz
[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
Diffstat (limited to 'Lib/typing.py')
-rw-r--r--Lib/typing.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/Lib/typing.py b/Lib/typing.py
index 639feeef99..9540021e8c 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__', {})