[Python-checkins] bpo-44761: Change default value of NewType __module__ attr (GH-27406) (GH-27477)

[ambv]

https://github.com/python/cpython/commit/56122b0bba7a9e2e3ec672a6c22bfdd7ecf08cbe
commit: 56122b0bba7a9e2e3ec672a6c22bfdd7ecf08cbe
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-07-30T15:48:01+02:00
summary:

bpo-44761: Change default value of NewType __module__ attr (GH-27406) (GH-27477)

(cherry picked from commit 7b975f81e4dba70a42c6279539a7fcfe4211b4c0)

Co-authored-by: Yurii Karabas <1998uriyyo at gmail.com>

files:
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 bbda6aa2f13b5..3bc9b9cb8e6ed 100644
--- a/Lib/test/test_typing.py
+++ b/Lib/test/test_typing.py
@@ -3752,6 +3752,12 @@ def test_pickle(self):
                 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 NamedTupleTests(BaseTestCase):
     class NestedEmployee(NamedTuple):
diff --git a/Lib/typing.py b/Lib/typing.py
index 2c2d8ec1a1e96..bcb22b2d178c3 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__}'