bpo-44761: Change default value of NewType __module__ attr (GH-27406) (GH-27477)
(cherry picked from commit 7b975f81e4dba70a42c6279539a7fcfe4211b4c0)
Co-authored-by: Yurii Karabas <1998uriyyo@gmail.com>
diff --git a/Lib/typing.py b/Lib/typing.py
index 2c2d8ec..bcb22b2 100644
--- a/Lib/typing.py
+++ b/Lib/typing.py
@@ -1379,11 +1379,11 @@ def _no_init(self, *args, **kwargs):
if type(self)._is_protocol:
raise TypeError('Protocols cannot be instantiated')
-def _callee(depth=2, default=None):
+def _caller(depth=1, default='__main__'):
try:
- return sys._getframe(depth).f_globals['__name__']
+ return sys._getframe(depth + 1).f_globals.get('__name__', default)
except (AttributeError, ValueError): # For platforms without _getframe()
- return default
+ return None
def _allow_reckless_class_checks(depth=3):
@@ -2385,8 +2385,10 @@ def __init__(self, name, tp):
if '.' in name:
name = name.rpartition('.')[-1]
self.__name__ = name
- self.__module__ = _callee(default='typing')
self.__supertype__ = tp
+ def_mod = _caller()
+ if def_mod != 'typing':
+ self.__module__ = def_mod
def __repr__(self):
return f'{self.__module__}.{self.__qualname__}'