mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 00:23:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Issue 7128: Removed reference to the non-existent copyreg module.

Browse source 
The reference to copyreg was a unnoticed leftover from the compatibility
support for the grand renaming of the standard library in Python 3. The
compatibility support was reverted in r63493, but not completely as this
patch shows.

Based on a patch by Amaury Forgeot d'Arc.
This commit is contained in:
Alexandre Vassalotti 2009-11-24 17:53:23 +00:00
parent 1d2c16db7e
commit 8b2d713d32
2 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Lib/test/pickletester.py
View file

@ -1091,6 +1091,16 @@ class AbstractPickleModuleTests(unittest.TestCase):
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()

5
Modules/cPickle.c
View file

@ -132,7 +132,7 @@ static PyObject *__class___str, *__getinitargs___str, *__dict___str,
*__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 @@ newPicklerobject(PyObject *file, int proto)
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_stuff(PyObject *module_dict)
INIT_STR(append);
INIT_STR(read);
INIT_STR(readline);
INIT_STR(copyreg);
INIT_STR(dispatch_table);
if (!( copyreg = PyImport_ImportModule("copy_reg")))