@@ -784,12 +784,16 @@ def __getitem__(self, key):
784784 raise ValueError
785785 self .assertRaises (ValueError , eval , "foo" , {}, X ())
786786
787- # Pass frozenset to globals
787+ def test_eval_frozendict ( self ):
788788 ns = frozendict (x = 1 , data = [], __builtins__ = __builtins__ )
789- code = "data.append(x)"
790- eval (code , ns , ns )
789+ eval ("data.append(x)" , ns , ns )
791790 self .assertEqual (ns ['data' ], [1 ])
792791
792+ ns = frozendict ()
793+ errmsg = "cannot set __builtins__ in frozendict globals"
794+ with self .assertRaisesRegex (TypeError , errmsg ):
795+ eval ("" , ns , ns )
796+
793797 def test_eval_kwargs (self ):
794798 data = {"A_GLOBAL_VALUE" : 456 }
795799 self .assertEqual (eval ("globals()['A_GLOBAL_VALUE']" , globals = data ), 456 )
@@ -888,17 +892,20 @@ def test_exec(self):
888892 del l ['__builtins__' ]
889893 self .assertEqual ((g , l ), ({'a' : 1 }, {'b' : 2 }))
890894
891- # Pass frozenset to globals
895+ def test_exec_frozendict ( self ):
892896 ns = frozendict (x = 1 , data = [], __builtins__ = __builtins__ )
893- code = "data.append(x)"
894- exec (code , ns , ns )
897+ exec ("data.append(x)" , ns , ns )
895898 self .assertEqual (ns ['data' ], [1 ])
896899
897900 ns = frozendict (__builtins__ = __builtins__ )
898- code = "x = 1"
899901 errmsg = "'frozendict' object does not support item assignment"
900902 with self .assertRaisesRegex (TypeError , errmsg ):
901- exec (code , ns , ns )
903+ exec ("x = 1" , ns , ns )
904+
905+ ns = frozendict ()
906+ errmsg = "cannot set __builtins__ in frozendict globals"
907+ with self .assertRaisesRegex (TypeError , errmsg ):
908+ exec ("" , ns , ns )
902909
903910 def test_exec_kwargs (self ):
904911 g = {}
0 commit comments