From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Wed, 2 Oct 2024 10:36:54 +0000 (+0200)
Subject: [3.12] gh-122864: Fix a ``test_funcattrs.test___builtins__`` when executing directly... 
X-Git-Tag: v3.12.8~263
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cceb25c5033bce5d19311d63f6943215a1a27283;p=thirdparty%2FPython%2Fcpython.git

[3.12] gh-122864: Fix a ``test_funcattrs.test___builtins__`` when executing directly (GH-124845) (#124885)

gh-122864: Fix a ``test_funcattrs.test___builtins__`` when executing directly (GH-124845)

Previously when executing ``test_functattrs.test___builtins__`` directly, it failed because the fact, that ``__builtins__`` is refers to the built-in module ``builtins`` while it's expects a ``__builtins__.__dict__``. But when this test is being run from another module, then ``__builtins__`` is refers to ``builtins.__dict__``. Now this part of the behaviour is covered.
---------

(cherry picked from commit 8fbf10d6cfd9c69ffcc1f80fa0c5f33785197af7)

Co-authored-by: Mark Byrne <31762852+mbyrnepr2@users.noreply.github.com>
Co-authored-by: Victor Stinner <vstinner@python.org>
---

diff --git a/Lib/test/test_funcattrs.py b/Lib/test/test_funcattrs.py
index 35b473d5e9a0..7ab1b0b5f701 100644
--- a/Lib/test/test_funcattrs.py
+++ b/Lib/test/test_funcattrs.py
@@ -76,7 +76,12 @@ class FunctionPropertiesTest(FuncAttrsTest):
                              (AttributeError, TypeError))
 
     def test___builtins__(self):
-        self.assertIs(self.b.__builtins__, __builtins__)
+        if __name__ == "__main__":
+            builtins_dict = __builtins__.__dict__
+        else:
+            builtins_dict = __builtins__
+
+        self.assertIs(self.b.__builtins__, builtins_dict)
         self.cannot_set_attr(self.b, '__builtins__', 2,
                              (AttributeError, TypeError))
 
@@ -86,7 +91,7 @@ class FunctionPropertiesTest(FuncAttrsTest):
         ns = {}
         func2 = type(func)(func.__code__, ns)
         self.assertIs(func2.__globals__, ns)
-        self.assertIs(func2.__builtins__, __builtins__)
+        self.assertIs(func2.__builtins__, builtins_dict)
 
         # Make sure that the function actually works.
         self.assertEqual(func2("abc"), 3)