Index: Modules/cPickle.c =================================================================== --- Modules/cPickle.c (revision 76438) +++ Modules/cPickle.c (working copy) @@ -132,7 +132,7 @@ *__reduce_ex___str, *write_str, *append_str, *read_str, *readline_str, *__main___str, - *copyreg_str, *dispatch_table_str; + *dispatch_table_str; /************************************************************************* Internal Data type for pickle data. */ @@ -3069,7 +3069,7 @@ if (PyEval_GetRestricted()) { /* Restricted execution, get private tables */ - PyObject *m = PyImport_Import(copyreg_str); + PyObject *m = PyImport_ImportModule("copy_reg"); if (m == NULL) goto err; @@ -5852,7 +5852,6 @@ INIT_STR(append); INIT_STR(read); INIT_STR(readline); - INIT_STR(copyreg); INIT_STR(dispatch_table); if (!( copyreg = PyImport_ImportModule("copy_reg"))) Index: Lib/test/pickletester.py =================================================================== --- Lib/test/pickletester.py (revision 76438) +++ Lib/test/pickletester.py (working copy) @@ -1091,6 +1091,16 @@ s = StringIO.StringIO("X''.") self.assertRaises(EOFError, self.module.load, s) + def test_restricted(self): + # issue7128: cPickle failed in restricted mode + builtins = {self.module.__name__: self.module, + '__import__': __import__} + d = {} + teststr = "def f(): {0}.dumps(0)".format(self.module.__name__) + exec teststr in {'__builtins__': builtins}, d + d['f']() + + class AbstractPersistentPicklerTests(unittest.TestCase): # This class defines persistent_id() and persistent_load()