diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py index bc9021addbe..06bd49b593a 100644 --- a/Lib/test/test_typing.py +++ b/Lib/test/test_typing.py @@ -3777,6 +3777,12 @@ class NewTypeTests: with self.assertRaises(pickle.PicklingError): pickle.dumps(UserAge, proto) + def test_missing__name__(self): + code = ("import typing\n" + "NT = typing.NewType('NT', int)\n" + ) + exec(code, {}) + class NewTypePythonTests(NewTypeTests, BaseTestCase): module = py_typing diff --git a/Lib/typing.py b/Lib/typing.py index f07b00f32ec..2826525efff 100644 --- a/Lib/typing.py +++ b/Lib/typing.py @@ -1387,11 +1387,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): @@ -2395,8 +2395,10 @@ class NewType: 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__}'