Merged revisions 76499 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r76499 | alexandre.vassalotti | 2009-11-24 12:53:23 -0500 (Tue, 24 Nov 2009) | 9 lines
Issue 7128: Removed reference to the non-existent copyreg module.
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.
........
diff --git a/Modules/cPickle.c b/Modules/cPickle.c
index 8fa4a66..4e53ae6 100644
--- a/Modules/cPickle.c
+++ b/Modules/cPickle.c
@@ -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. */
@@ -2985,7 +2985,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;
@@ -5733,7 +5733,6 @@
INIT_STR(append);
INIT_STR(read);
INIT_STR(readline);
- INIT_STR(copyreg);
INIT_STR(dispatch_table);
if (!( copyreg = PyImport_ImportModule("copy_reg")))