From: Brett Cannon <brett@python.org>
Date: Sun, 16 Jun 2013 03:24:11 +0000 (-0400)
Subject: Make test_builtin work when executed directly
X-Git-Tag: v3.4.0a1~477
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2f9f056db132a66dcc9de452bf1e90969ae7c74d;p=thirdparty%2FPython%2Fcpython.git

Make test_builtin work when executed directly
---

diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py
index f46f8d561ca8..f8504564db29 100644
--- a/Lib/test/test_builtin.py
+++ b/Lib/test/test_builtin.py
@@ -584,7 +584,10 @@ class BuiltinTest(unittest.TestCase):
                 raise frozendict_error("frozendict is readonly")
 
         # read-only builtins
-        frozen_builtins = frozendict(__builtins__)
+        if isinstance(__builtins__, types.ModuleType):
+            frozen_builtins = frozendict(__builtins__.__dict__)
+        else:
+            frozen_builtins = frozendict(__builtins__)
         code = compile("__builtins__['superglobal']=2; print(superglobal)", "test", "exec")
         self.assertRaises(frozendict_error,
                           exec, code, {'__builtins__': frozen_builtins})