Remove defaults fro non-function annotates in call_annotate_function()

Author: dr-carlos

Lib/annotationlib.py

@@ -711,9 +711,6 @@ def call_annotate_function(annotate, format, *, owner=None, _is_evaluate=False):
         return annotate(format)
     except NotImplementedError:
         pass
-
-    annotate_defaults = getattr(annotate, "__defaults__", None)
-    annotate_kwdefaults = getattr(annotate, "__kwdefaults__", None)
     if format == Format.STRING:
         # STRING is implemented by calling the annotate function in a special
         # environment where every name lookup results in an instance of _Stringifier.
@@ -737,16 +734,14 @@ def call_annotate_function(annotate, format, *, owner=None, _is_evaluate=False):
         globals = _StringifierDict({}, format=format)
         is_class = isinstance(owner, type)
         closure, _ = _build_closure(
-            annotate, owner, is_class, globals,
-            getattr(annotate, "__globals__", {}), allow_evaluation=False
+            annotate, owner, is_class, globals, allow_evaluation=False
         )
-        annotate_code = annotate.__code__
         func = types.FunctionType(
-            annotate_code,
+            annotate.__code__,
             globals,
             closure=closure,
-            argdefs=annotate_defaults,
-            kwdefaults=annotate_kwdefaults,
+            argdefs=annotate.__defaults__,
+            kwdefaults=annotate.__kwdefaults__,
         )
         annos = func(Format.VALUE_WITH_FAKE_GLOBALS)
         if _is_evaluate:
@@ -773,31 +768,24 @@ def call_annotate_function(annotate, format, *, owner=None, _is_evaluate=False):
         # reconstruct the source. But in the dictionary that we eventually return, we
         # want to return objects with more user-friendly behavior, such as an __eq__
         # that returns a bool and an defined set of attributes.
-        annotate_globals = getattr(annotate, "__globals__", {})
-        if annotate_builtins := getattr(annotate, "__builtins__", None):
-            namespace = {**annotate_builtins, **annotate_globals}
-        elif annotate_builtins := annotate_globals.get("__builtins__"):
-            namespace = {**annotate_builtins, **annotate_globals}
-        else:
-            namespace = {**builtins.__dict__, **annotate_globals}
+        namespace = {**annotate.__builtins__, **annotate.__globals__}
         is_class = isinstance(owner, type)
         globals = _StringifierDict(
             namespace,
-            globals=annotate_globals,
+            globals=annotate.__globals__,
             owner=owner,
             is_class=is_class,
             format=format,
         )
         closure, cell_dict = _build_closure(
-            annotate, owner, is_class, globals, annotate_globals, allow_evaluation=True
+            annotate, owner, is_class, globals, allow_evaluation=True
         )
-        annotate_code = annotate.__code__
         func = types.FunctionType(
-            annotate_code,
+            annotate.__code__,
             globals,
             closure=closure,
-            argdefs=annotate_defaults,
-            kwdefaults=annotate_kwdefaults,
+            argdefs=annotate.__defaults__,
+            kwdefaults=annotate.__kwdefaults__,
         )
         try:
             result = func(Format.VALUE_WITH_FAKE_GLOBALS)
@@ -814,21 +802,20 @@ def call_annotate_function(annotate, format, *, owner=None, _is_evaluate=False):
         # a value in certain cases where an exception gets raised during evaluation.
         globals = _StringifierDict(
             {},
-            globals=annotate_globals,
+            globals=annotate.__globals__,
             owner=owner,
             is_class=is_class,
             format=format,
         )
         closure, cell_dict = _build_closure(
-            annotate, owner, is_class, globals,
-            annotate_globals, allow_evaluation=False
+            annotate, owner, is_class, globals, allow_evaluation=False
         )
         func = types.FunctionType(
-            annotate_code,
+            annotate.__code__,
             globals,
             closure=closure,
-            argdefs=annotate_defaults,
-            kwdefaults=annotate_kwdefaults,
+            argdefs=annotate.__defaults__,
+            kwdefaults=annotate.__kwdefaults__,
         )
         result = func(Format.VALUE_WITH_FAKE_GLOBALS)
         globals.transmogrify(cell_dict)
@@ -854,13 +841,12 @@ def call_annotate_function(annotate, format, *, owner=None, _is_evaluate=False):
         raise ValueError(f"Invalid format: {format!r}")
 
 
-def _build_closure(annotate, owner, is_class, stringifier_dict,
-                   annotate_globals, *, allow_evaluation):
-    if not (annotate_closure := getattr(annotate, "__closure__", None)):
+def _build_closure(annotate, owner, is_class, stringifier_dict, *, allow_evaluation):
+    if not annotate.__closure__:
         return None, None
     new_closure = []
     cell_dict = {}
-    for name, cell in zip(annotate.__code__.co_freevars, annotate_closure, strict=True):
+    for name, cell in zip(annotate.__code__.co_freevars, annotate.__closure__, strict=True):
         cell_dict[name] = cell
         new_cell = None
         if allow_evaluation:
@@ -875,7 +861,7 @@ def _build_closure(annotate, owner, is_class, stringifier_dict,
                 name,
                 cell=cell,
                 owner=owner,
-                globals=annotate_globals,
+                globals=annotate.__globals__,
                 is_class=is_class,
                 stringifier_dict=stringifier_dict,
             )

Lib/test/test_annotationlib.py

@@ -1615,7 +1615,7 @@ def __call__(self, format, /, __Format=Format,
                 Annotate(), Format.FORWARDREF
             )
 
-        self.assertEqual(cm.exception.name, "__code__")
+        self.assertEqual(cm.exception.name, "__builtins__")
         self.assertIsInstance(cm.exception.obj, Annotate)
 
     def test_full_non_function_annotate(self):