diff options
| author | Georg Brandl <georg@python.org> | 2008-05-20 07:49:57 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2008-05-20 07:49:57 (GMT) |
| commit | dffbf5f5421cbeb20237280c0bd70f989269f844 (patch) | |
| tree | 51a520dcf10d589bd145d9117b010dab6bc28e3b /Modules | |
| parent | 06d2a2cb0e105019e8bd5e29a3c81c6874e6396a (diff) | |
| download | cpython-dffbf5f5421cbeb20237280c0bd70f989269f844.zip cpython-dffbf5f5421cbeb20237280c0bd70f989269f844.tar.gz cpython-dffbf5f5421cbeb20237280c0bd70f989269f844.tar.bz2 | |
Revert copy_reg -> copyreg rename.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/cPickle.c | 14 | ||||
| -rw-r--r-- | Modules/parsermodule.c | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/Modules/cPickle.c b/Modules/cPickle.c index 06726ee..f130087 100644 --- a/Modules/cPickle.c +++ b/Modules/cPickle.c @@ -105,18 +105,18 @@ static PyObject *BadPickleGet; /* As the name says, an empty tuple. */ static PyObject *empty_tuple; -/* copyreg.dispatch_table, {type_object: pickling_function} */ +/* copy_reg.dispatch_table, {type_object: pickling_function} */ static PyObject *dispatch_table; /* For EXT[124] opcodes. */ -/* copyreg._extension_registry, {(module_name, function_name): code} */ +/* copy_reg._extension_registry, {(module_name, function_name): code} */ static PyObject *extension_registry; -/* copyreg._inverted_registry, {code: (module_name, function_name)} */ +/* copy_reg._inverted_registry, {code: (module_name, function_name)} */ static PyObject *inverted_registry; -/* copyreg._extension_cache, {code: object} */ +/* copy_reg._extension_cache, {code: object} */ static PyObject *extension_cache; -/* For looking up name pairs in copyreg._extension_registry. */ +/* For looking up name pairs in copy_reg._extension_registry. */ static PyObject *two_tuple; static PyObject *__class___str, *__getinitargs___str, *__dict___str, @@ -2477,7 +2477,7 @@ save(Picklerobject *self, PyObject *args, int pers_save) } /* Get a reduction callable, and call it. This may come from - * copyreg.dispatch_table, the object's __reduce_ex__ method, + * copy_reg.dispatch_table, the object's __reduce_ex__ method, * or the object's __reduce__ method. */ __reduce__ = PyDict_GetItem(dispatch_table, (PyObject *)type); @@ -5591,7 +5591,7 @@ init_stuff(PyObject *module_dict) INIT_STR(copyreg); INIT_STR(dispatch_table); - if (!( copyreg = PyImport_ImportModule("copyreg"))) + if (!( copyreg = PyImport_ImportModule("copy_reg"))) return -1; /* This is special because we want to use a different diff --git a/Modules/parsermodule.c b/Modules/parsermodule.c index 02a1e48..6e52343 100644 --- a/Modules/parsermodule.c +++ b/Modules/parsermodule.c @@ -3284,7 +3284,7 @@ initparser(void) * If this fails, the import of this module will fail because an * exception will be raised here; should we clear the exception? */ - copyreg = PyImport_ImportModuleNoBlock("copyreg"); + copyreg = PyImport_ImportModuleNoBlock("copy_reg"); if (copyreg != NULL) { PyObject *func, *pickler; |