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 /Objects | |
| parent | 06d2a2cb0e105019e8bd5e29a3c81c6874e6396a (diff) | |
| download | cpython-dffbf5f5421cbeb20237280c0bd70f989269f844.zip cpython-dffbf5f5421cbeb20237280c0bd70f989269f844.tar.gz cpython-dffbf5f5421cbeb20237280c0bd70f989269f844.tar.bz2 | |
Revert copy_reg -> copyreg rename.
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/typeobject.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Objects/typeobject.c b/Objects/typeobject.c index 1138291..c3aa090 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -3058,7 +3058,7 @@ static PyGetSetDef object_getsets[] = { /* Stuff to implement __reduce_ex__ for pickle protocols >= 2. - We fall back to helpers in copyreg for: + We fall back to helpers in copy_reg for: - pickle protocols < 2 - calculating the list of slot names (done only once per class) - the __newobj__ function (which is used as a token but never called) @@ -3070,7 +3070,7 @@ import_copyreg(void) static PyObject *copyreg_str; if (!copyreg_str) { - copyreg_str = PyString_InternFromString("copyreg"); + copyreg_str = PyString_InternFromString("copy_reg"); if (copyreg_str == NULL) return NULL; } @@ -3108,7 +3108,7 @@ slotnames(PyObject *cls) !PyList_Check(slotnames)) { PyErr_SetString(PyExc_TypeError, - "copyreg._slotnames didn't return a list or None"); + "copy_reg._slotnames didn't return a list or None"); Py_DECREF(slotnames); slotnames = NULL; } |