merge 3.2

2026-01-03 22:12:27 +00:00 · 2011-09-23 13:53:06 -04:00 · 2011-09-23 13:53:06 -04:00 · 3454d52434
commit 3454d52434
parent 7ddbf10589 adde86d0e3
1 changed files with 5 additions and 6 deletions
--- a/Modules/_pickle.c
+++ b/Modules/_pickle.c
@ -5318,13 +5318,12 @@ load(UnpicklerObject *self)
        case STOP:
            break;

-        case '\0':
-            PyErr_SetNone(PyExc_EOFError);
-            return NULL;
-
        default:
-            PyErr_Format(UnpicklingError,
-                         "invalid load key, '%c'.", s[0]);
+            if (s[0] == '\0')
+                PyErr_SetNone(PyExc_EOFError);
+            else
+                PyErr_Format(UnpicklingError,
+                             "invalid load key, '%c'.", s[0]);
            return NULL;
        }