Mailman 3 June 2021 - Python-checkins

Clarify the order of a stacked `abstractmethod` (GH-26892)
by miss-islington June 27, 2021

June 27, 2021

https://github.com/python/cpython/commit/c95cdf2dae185b1241c0b1e07635dc6322… commit: c95cdf2dae185b1241c0b1e07635dc632267e37e branch: 3.10 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: miss-islington <31488909+miss-islington(a)users.noreply.github.com> date: 2021-06-27T11:50:38-07:00 summary: Clarify the order of a stacked `abstractmethod` (GH-26892) Co-authored-by: Tal Einat <532281+taleinat(a)users.noreply.github.com> (cherry picked from commit 74d60eab558bffdf5ca8ea2f5305e19b36bdb9a8) Co-authored-by: Ram Rachum <ram(a)rachum.com> files: M Lib/abc.py diff --git a/Lib/abc.py b/Lib/abc.py index 276ef9a2cd485..3c552cebb4226 100644 --- a/Lib/abc.py +++ b/Lib/abc.py @@ -28,7 +28,14 @@ def my_abstract_method(self, ...): class abstractclassmethod(classmethod): """A decorator indicating abstract classmethods. - Deprecated, use 'classmethod' with 'abstractmethod' instead. + Deprecated, use 'classmethod' with 'abstractmethod' instead: + + class C(ABC): + @classmethod + @abstractmethod + def my_abstract_classmethod(cls, ...): + ... + """ __isabstractmethod__ = True @@ -41,7 +48,14 @@ def __init__(self, callable): class abstractstaticmethod(staticmethod): """A decorator indicating abstract staticmethods. - Deprecated, use 'staticmethod' with 'abstractmethod' instead. + Deprecated, use 'staticmethod' with 'abstractmethod' instead: + + class C(ABC): + @staticmethod + @abstractmethod + def my_abstract_staticmethod(...): + ... + """ __isabstractmethod__ = True @@ -54,7 +68,14 @@ def __init__(self, callable): class abstractproperty(property): """A decorator indicating abstract properties. - Deprecated, use 'property' with 'abstractmethod' instead. + Deprecated, use 'property' with 'abstractmethod' instead: + + class C(ABC): + @property + @abstractmethod + def my_abstract_property(self): + ... + """ __isabstractmethod__ = True

1 0

Clarify the order of a stacked `abstractmethod` (GH-26892)
by taleinat June 27, 2021

June 27, 2021

https://github.com/python/cpython/commit/74d60eab558bffdf5ca8ea2f5305e19b36… commit: 74d60eab558bffdf5ca8ea2f5305e19b36bdb9a8 branch: main author: Ram Rachum <ram(a)rachum.com> committer: taleinat <532281+taleinat(a)users.noreply.github.com> date: 2021-06-27T21:02:23+03:00 summary: Clarify the order of a stacked `abstractmethod` (GH-26892) Co-authored-by: Tal Einat <532281+taleinat(a)users.noreply.github.com> files: M Lib/abc.py diff --git a/Lib/abc.py b/Lib/abc.py index 276ef9a2cd485..3c552cebb4226 100644 --- a/Lib/abc.py +++ b/Lib/abc.py @@ -28,7 +28,14 @@ def my_abstract_method(self, ...): class abstractclassmethod(classmethod): """A decorator indicating abstract classmethods. - Deprecated, use 'classmethod' with 'abstractmethod' instead. + Deprecated, use 'classmethod' with 'abstractmethod' instead: + + class C(ABC): + @classmethod + @abstractmethod + def my_abstract_classmethod(cls, ...): + ... + """ __isabstractmethod__ = True @@ -41,7 +48,14 @@ def __init__(self, callable): class abstractstaticmethod(staticmethod): """A decorator indicating abstract staticmethods. - Deprecated, use 'staticmethod' with 'abstractmethod' instead. + Deprecated, use 'staticmethod' with 'abstractmethod' instead: + + class C(ABC): + @staticmethod + @abstractmethod + def my_abstract_staticmethod(...): + ... + """ __isabstractmethod__ = True @@ -54,7 +68,14 @@ def __init__(self, callable): class abstractproperty(property): """A decorator indicating abstract properties. - Deprecated, use 'property' with 'abstractmethod' instead. + Deprecated, use 'property' with 'abstractmethod' instead: + + class C(ABC): + @property + @abstractmethod + def my_abstract_property(self): + ... + """ __isabstractmethod__ = True

1 0

bpo-40528: fix is_simple(sum)s behavior for attributes (GH-26918)
by isidentical June 27, 2021

June 27, 2021

https://github.com/python/cpython/commit/107a2c59c91b3911bdd6dfdb83271c588c… commit: 107a2c59c91b3911bdd6dfdb83271c588c506a5a branch: main author: Batuhan Taskaya <batuhan(a)python.org> committer: isidentical <isidentical(a)gmail.com> date: 2021-06-27T17:58:32+03:00 summary: bpo-40528: fix is_simple(sum)s behavior for attributes (GH-26918) This is something I noticed while (now discontinued) experimenting with the idea of annotating operators with location information. Unfortunately without this addition, adding any `attributes` to stuff like `unaryop` doesn't change anything since the code assumes they are singletons and caches all instances. This patch fixes this assumption with including the attributes as well as constructor fields. files: M Parser/asdl_c.py diff --git a/Parser/asdl_c.py b/Parser/asdl_c.py index 21e50442b8bb7..5f0b89bba4489 100755 --- a/Parser/asdl_c.py +++ b/Parser/asdl_c.py @@ -71,16 +71,20 @@ def reflow_lines(s, depth): def reflow_c_string(s, depth): return '"%s"' % s.replace('\n', '\\n"\n%s"' % (' ' * depth * TABSIZE)) -def is_simple(sum): +def is_simple(sum_type): """Return True if a sum is a simple. - A sum is simple if its types have no fields, e.g. + A sum is simple if it's types have no fields and itself + doesn't have any attributes. Instances of these types are + cached at C level, and they act like singletons when propagating + parser generated nodes into Python level, e.g. unaryop = Invert | Not | UAdd | USub """ - for t in sum.types: - if t.fields: - return False - return True + + return not ( + sum_type.attributes or + any(constructor.fields for constructor in sum_type.types) + ) def asdl_of(name, obj): if isinstance(obj, asdl.Product) or isinstance(obj, asdl.Constructor):

1 0

FIX rst issue in NEWS.d (GH-26923)
by JulienPalard June 27, 2021

June 27, 2021

https://github.com/python/cpython/commit/9eea201b7c39a69afa2a7978dde4026610… commit: 9eea201b7c39a69afa2a7978dde40266104154f5 branch: main author: Julien Palard <julien(a)palard.fr> committer: JulienPalard <julien(a)palard.fr> date: 2021-06-27T15:48:51+02:00 summary: FIX rst issue in NEWS.d (GH-26923) files: M Misc/NEWS.d/next/Library/2021-06-23-01-33-01.bpo-44491.tiOlr5.rst diff --git a/Misc/NEWS.d/next/Library/2021-06-23-01-33-01.bpo-44491.tiOlr5.rst b/Misc/NEWS.d/next/Library/2021-06-23-01-33-01.bpo-44491.tiOlr5.rst index aa25052df8227..ebe54484187ab 100644 --- a/Misc/NEWS.d/next/Library/2021-06-23-01-33-01.bpo-44491.tiOlr5.rst +++ b/Misc/NEWS.d/next/Library/2021-06-23-01-33-01.bpo-44491.tiOlr5.rst @@ -1,3 +1,3 @@ Allow clearing the :mod:`sqlite3` authorizer callback by passing -:const:``None`` to :meth:`~sqlite3.Connection.set_authorizer`. Patch by +:const:`None` to :meth:`~sqlite3.Connection.set_authorizer`. Patch by Erlend E. Aasland.

1 0

Add missing arg to DICT_MERGE opcode (GH-26859)
by markshannon June 27, 2021

June 27, 2021

https://github.com/python/cpython/commit/6dd69f45f57e5a79828981039cfa141e05… commit: 6dd69f45f57e5a79828981039cfa141e0507709f branch: main author: andrei kulakov <andrei.avk(a)gmail.com> committer: markshannon <mark(a)hotpy.org> date: 2021-06-27T13:19:14+01:00 summary: Add missing arg to DICT_MERGE opcode (GH-26859) files: M Doc/library/dis.rst diff --git a/Doc/library/dis.rst b/Doc/library/dis.rst index 645e94a669fd1..21747069b3a19 100644 --- a/Doc/library/dis.rst +++ b/Doc/library/dis.rst @@ -936,7 +936,7 @@ All of the following opcodes use their arguments. .. versionadded:: 3.9 -.. opcode:: DICT_MERGE +.. opcode:: DICT_MERGE (i) Like :opcode:`DICT_UPDATE` but raises an exception for duplicate keys.

1 0

bpo-44110: Improve string's __getitem__ error message (GH-26042)
by serhiy-storchaka June 27, 2021

June 27, 2021

https://github.com/python/cpython/commit/ed1076428cca3c8dc7d075c16a575aa390… commit: ed1076428cca3c8dc7d075c16a575aa390e25fb8 branch: main author: Miguel Brito <5544985+miguendes(a)users.noreply.github.com> committer: serhiy-storchaka <storchaka(a)gmail.com> date: 2021-06-27T15:04:57+03:00 summary: bpo-44110: Improve string's __getitem__ error message (GH-26042) files: A Misc/NEWS.d/next/Core and Builtins/2021-05-11-21-52-44.bpo-44110.VqbAsB.rst M Lib/test/string_tests.py M Lib/test/test_userstring.py M Objects/unicodeobject.c diff --git a/Lib/test/string_tests.py b/Lib/test/string_tests.py index 840d7bb7550f7..089701c983a14 100644 --- a/Lib/test/string_tests.py +++ b/Lib/test/string_tests.py @@ -80,12 +80,14 @@ class subtype(self.__class__.type2test): self.assertIsNot(obj, realresult) # check that obj.method(*args) raises exc - def checkraises(self, exc, obj, methodname, *args): + def checkraises(self, exc, obj, methodname, *args, expected_msg=None): obj = self.fixtype(obj) args = self.fixtype(args) with self.assertRaises(exc) as cm: getattr(obj, methodname)(*args) self.assertNotEqual(str(cm.exception), '') + if expected_msg is not None: + self.assertEqual(str(cm.exception), expected_msg) # call obj.method(*args) without any checks def checkcall(self, obj, methodname, *args): @@ -1195,6 +1197,10 @@ def test_subscript(self): self.checkraises(TypeError, 'abc', '__getitem__', 'def') + for idx_type in ('def', object()): + expected_msg = "string indices must be integers, not '{}'".format(type(idx_type).__name__) + self.checkraises(TypeError, 'abc', '__getitem__', idx_type, expected_msg=expected_msg) + def test_slice(self): self.checkequal('abc', 'abc', '__getitem__', slice(0, 1000)) self.checkequal('abc', 'abc', '__getitem__', slice(0, 3)) diff --git a/Lib/test/test_userstring.py b/Lib/test/test_userstring.py index 4d1d8b6b6fe2d..51b4f6041e49b 100644 --- a/Lib/test/test_userstring.py +++ b/Lib/test/test_userstring.py @@ -27,12 +27,14 @@ def checkequal(self, result, object, methodname, *args, **kwargs): realresult ) - def checkraises(self, exc, obj, methodname, *args): + def checkraises(self, exc, obj, methodname, *args, expected_msg=None): obj = self.fixtype(obj) # we don't fix the arguments, because UserString can't cope with it with self.assertRaises(exc) as cm: getattr(obj, methodname)(*args) self.assertNotEqual(str(cm.exception), '') + if expected_msg is not None: + self.assertEqual(str(cm.exception), expected_msg) def checkcall(self, object, methodname, *args): object = self.fixtype(object) diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-05-11-21-52-44.bpo-44110.VqbAsB.rst b/Misc/NEWS.d/next/Core and Builtins/2021-05-11-21-52-44.bpo-44110.VqbAsB.rst new file mode 100644 index 0000000000000..3b82e425ab4a7 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2021-05-11-21-52-44.bpo-44110.VqbAsB.rst @@ -0,0 +1 @@ +Improve :func:`str.__getitem__` error message diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index c316cafdc7ffc..3e6b70bf4b6f5 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -14279,7 +14279,8 @@ unicode_subscript(PyObject* self, PyObject* item) assert(_PyUnicode_CheckConsistency(result, 1)); return result; } else { - PyErr_SetString(PyExc_TypeError, "string indices must be integers"); + PyErr_Format(PyExc_TypeError, "string indices must be integers, not '%.200s'", + Py_TYPE(item)->tp_name); return NULL; } }

1 0

[3.9] bpo-44482: Fix very unlikely resource leak in glob in non-CPython implementations (GH-26843). (GH-26916)
by serhiy-storchaka June 27, 2021

June 27, 2021

https://github.com/python/cpython/commit/4861fdaf25f246eb9ee4e8161c15dad26e… commit: 4861fdaf25f246eb9ee4e8161c15dad26efe895d branch: 3.9 author: Serhiy Storchaka <storchaka(a)gmail.com> committer: serhiy-storchaka <storchaka(a)gmail.com> date: 2021-06-27T14:28:24+03:00 summary: [3.9] bpo-44482: Fix very unlikely resource leak in glob in non-CPython implementations (GH-26843). (GH-26916) (cherry picked from commit 5c7940257e1f611e7284fd504887bd29a63d0a94) files: A Misc/NEWS.d/next/Library/2021-06-22-08-43-04.bpo-44482.U9GznK.rst M Lib/glob.py diff --git a/Lib/glob.py b/Lib/glob.py index 0dd2f8be66109..1237061130951 100644 --- a/Lib/glob.py +++ b/Lib/glob.py @@ -1,5 +1,6 @@ """Filename globbing utility.""" +import contextlib import os import re import fnmatch @@ -79,7 +80,7 @@ def _iglob(pathname, recursive, dironly): # takes a literal basename (so it only has to check for its existence). def _glob1(dirname, pattern, dironly): - names = list(_iterdir(dirname, dironly)) + names = _listdir(dirname, dironly) if not _ishidden(pattern): names = (x for x in names if not _ishidden(x)) return fnmatch.filter(names, pattern) @@ -130,9 +131,13 @@ def _iterdir(dirname, dironly): except OSError: return +def _listdir(dirname, dironly): + with contextlib.closing(_iterdir(dirname, dironly)) as it: + return list(it) + # Recursively yields relative pathnames inside a literal directory. def _rlistdir(dirname, dironly): - names = list(_iterdir(dirname, dironly)) + names = _listdir(dirname, dironly) for x in names: if not _ishidden(x): yield x diff --git a/Misc/NEWS.d/next/Library/2021-06-22-08-43-04.bpo-44482.U9GznK.rst b/Misc/NEWS.d/next/Library/2021-06-22-08-43-04.bpo-44482.U9GznK.rst new file mode 100644 index 0000000000000..d05fe908e3eba --- /dev/null +++ b/Misc/NEWS.d/next/Library/2021-06-22-08-43-04.bpo-44482.U9GznK.rst @@ -0,0 +1,2 @@ +Fix very unlikely resource leak in :mod:`glob` in alternate Python +implementations.

1 0

bpo-44404: tkinter `after` support callable classes (GH-26812)
by miss-islington June 27, 2021

June 27, 2021

https://github.com/python/cpython/commit/e1f3bd2bb50a76ba15a2f8d561e2c9968a… commit: e1f3bd2bb50a76ba15a2f8d561e2c9968ae3a1b2 branch: 3.10 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: miss-islington <31488909+miss-islington(a)users.noreply.github.com> date: 2021-06-27T01:02:02-07:00 summary: bpo-44404: tkinter `after` support callable classes (GH-26812) (cherry picked from commit e9c8f784fa13ea3a51df3b72a498a3896ec9e768) Co-authored-by: E-Paine <63801254+E-Paine(a)users.noreply.github.com> files: A Misc/NEWS.d/next/Library/2021-06-20-19-01-11.bpo-44404.McfrYB.rst M Lib/tkinter/__init__.py M Lib/tkinter/test/test_tkinter/test_misc.py diff --git a/Lib/tkinter/__init__.py b/Lib/tkinter/__init__.py index 369004c9d1b3d..2513c972bc77f 100644 --- a/Lib/tkinter/__init__.py +++ b/Lib/tkinter/__init__.py @@ -841,7 +841,11 @@ def callit(): self.deletecommand(name) except TclError: pass - callit.__name__ = func.__name__ + try: + callit.__name__ = func.__name__ + except AttributeError: + # Required for callable classes (bpo-44404) + callit.__name__ = type(func).__name__ name = self._register(callit) return self.tk.call('after', ms, name) diff --git a/Lib/tkinter/test/test_tkinter/test_misc.py b/Lib/tkinter/test/test_tkinter/test_misc.py index d4b7cbd867bc0..ab8f64790dfc0 100644 --- a/Lib/tkinter/test/test_tkinter/test_misc.py +++ b/Lib/tkinter/test/test_tkinter/test_misc.py @@ -1,3 +1,4 @@ +import functools import unittest import tkinter import enum @@ -98,6 +99,12 @@ def callback(start=0, step=1): with self.assertRaises(tkinter.TclError): root.tk.call(script) + # Call with a callable class + count = 0 + timer1 = root.after(0, functools.partial(callback, 42, 11)) + root.update() # Process all pending events. + self.assertEqual(count, 53) + def test_after_idle(self): root = self.root diff --git a/Misc/NEWS.d/next/Library/2021-06-20-19-01-11.bpo-44404.McfrYB.rst b/Misc/NEWS.d/next/Library/2021-06-20-19-01-11.bpo-44404.McfrYB.rst new file mode 100644 index 0000000000000..ff6ca1bfa7242 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2021-06-20-19-01-11.bpo-44404.McfrYB.rst @@ -0,0 +1 @@ +:mod:`tkinter`'s ``after()`` method now supports callables without the ``__name__`` attribute.

1 0

[3.10] bpo-44468: Never skip base classes in `typing.get_type_hints()`, even with invalid `.__module__`. (GH-26862) (GH-26920)
by miss-islington June 26, 2021

June 26, 2021

https://github.com/python/cpython/commit/3df23b5199a4bb237a595cadca6c49d34a… commit: 3df23b5199a4bb237a595cadca6c49d34ab2a56c branch: 3.10 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: miss-islington <31488909+miss-islington(a)users.noreply.github.com> date: 2021-06-26T16:52:28-07:00 summary: [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(a)gmail.com> Automerge-Triggered-By: GH:gvanrossum files: A Misc/NEWS.d/next/Library/2021-06-23-19-02-00.bpo-44468.-klV5-.rst M Lib/test/test_typing.py M Lib/typing.py diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py index 79c5c3a910407..07f809ca301e8 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 639feeef99e75..9540021e8c0a6 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__', {}) diff --git a/Misc/NEWS.d/next/Library/2021-06-23-19-02-00.bpo-44468.-klV5-.rst b/Misc/NEWS.d/next/Library/2021-06-23-19-02-00.bpo-44468.-klV5-.rst new file mode 100644 index 0000000000000..78251c7d55068 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2021-06-23-19-02-00.bpo-44468.-klV5-.rst @@ -0,0 +1,2 @@ +:func:`typing.get_type_hints` now finds annotations in classes and base classes +with unexpected ``__module__``. Previously, it skipped those MRO elements.

1 0

bpo-44468: Never skip base classes in `typing.get_type_hints()`, even with invalid `.__module__`. (GH-26862)
by gvanrossum June 26, 2021

June 26, 2021

https://github.com/python/cpython/commit/7569c0fe91dfcf562dee8c29798ecda74d… commit: 7569c0fe91dfcf562dee8c29798ecda74d738aa8 branch: main author: will-ca <willchencontact(a)gmail.com> committer: gvanrossum <gvanrossum(a)gmail.com> date: 2021-06-26T16:31:32-07:00 summary: bpo-44468: Never skip base classes in `typing.get_type_hints()`, even with invalid `.__module__`. (GH-26862) files: A Misc/NEWS.d/next/Library/2021-06-23-19-02-00.bpo-44468.-klV5-.rst M Lib/test/test_typing.py M Lib/typing.py diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py index cb198d6b75fd6..e693883094d5c 100644 --- a/Lib/test/test_typing.py +++ b/Lib/test/test_typing.py @@ -2277,13 +2277,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): @@ -3033,6 +3026,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 00a0df591cbfc..2287f0521a364 100644 --- a/Lib/typing.py +++ b/Lib/typing.py @@ -1701,10 +1701,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__', {}) diff --git a/Misc/NEWS.d/next/Library/2021-06-23-19-02-00.bpo-44468.-klV5-.rst b/Misc/NEWS.d/next/Library/2021-06-23-19-02-00.bpo-44468.-klV5-.rst new file mode 100644 index 0000000000000..78251c7d55068 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2021-06-23-19-02-00.bpo-44468.-klV5-.rst @@ -0,0 +1,2 @@ +:func:`typing.get_type_hints` now finds annotations in classes and base classes +with unexpected ``__module__``. Previously, it skipped those MRO elements.

1 0