Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Fix some trivial things in cPickle due to the renaming of the string types.

This commit is contained in:
Guido van Rossum 2007-05-07 17:15:57 +00:00
parent 6cb726a9f2
commit 32c38e7420
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Modules/cPickle.c
View File

@ -2217,13 +2217,11 @@ save(Picklerobject *self, PyObject *args, int pers_save)
} }
break; break;
case 's': case 's': /* str8, str */
if ((type == &PyString_Type) && (PyString_GET_SIZE(args) < 2)) { if ((type == &PyString_Type) && (PyString_GET_SIZE(args) < 2)) {
res = save_string(self, args, 0); res = save_string(self, args, 0);
goto finally; goto finally;
} }
case 'u':
if ((type == &PyUnicode_Type) && (PyString_GET_SIZE(args) < 2)) { if ((type == &PyUnicode_Type) && (PyString_GET_SIZE(args) < 2)) {
res = save_unicode(self, args, 0); res = save_unicode(self, args, 0);
goto finally; goto finally;
@ -2244,14 +2242,11 @@ save(Picklerobject *self, PyObject *args, int pers_save)
} }
switch (type->tp_name[0]) { switch (type->tp_name[0]) {
case 's': case 's': /* str8, str */
if (type == &PyString_Type) { if (type == &PyString_Type) {
res = save_string(self, args, 1); res = save_string(self, args, 1);
goto finally; goto finally;
} }
break;
case 'u':
if (type == &PyUnicode_Type) { if (type == &PyUnicode_Type) {
res = save_unicode(self, args, 1); res = save_unicode(self, args, 1);
goto finally; goto finally;