Author: guido.van.rossum
Date: Mon May  7 19:15:57 2007
New Revision: 55170

Modified:
   python/branches/py3k-struni/Modules/cPickle.c
Log:
Fix some trivial things in cPickle due to the renaming of the string types.


Modified: python/branches/py3k-struni/Modules/cPickle.c
==============================================================================
--- python/branches/py3k-struni/Modules/cPickle.c       (original)
+++ python/branches/py3k-struni/Modules/cPickle.c       Mon May  7 19:15:57 2007
@@ -2217,13 +2217,11 @@
                }
                break;
 
-        case 's':
+        case 's': /* str8, str */
                if ((type == &PyString_Type) && (PyString_GET_SIZE(args) < 2)) {
                        res = save_string(self, args, 0);
                        goto finally;
                }
-
-        case 'u':
                if ((type == &PyUnicode_Type) && (PyString_GET_SIZE(args) < 2)) 
{
                        res = save_unicode(self, args, 0);
                        goto finally;
@@ -2244,14 +2242,11 @@
        }
 
        switch (type->tp_name[0]) {
-        case 's':
+        case 's': /* str8, str */
                if (type == &PyString_Type) {
                        res = save_string(self, args, 1);
                        goto finally;
                }
-               break;
-
-        case 'u':
                if (type == &PyUnicode_Type) {
                        res = save_unicode(self, args, 1);
                        goto finally;
_______________________________________________
Python-3000-checkins mailing list
[email protected]
http://mail.python.org/mailman/listinfo/python-3000-checkins

Reply via email to