[Python-checkins] cpython (merge 3.2 -> default): merge 3.2
benjamin.peterson
python-checkins at python.org
Fri Sep 23 19:53:11 CEST 2011
http://hg.python.org/cpython/rev/493886a640b6
changeset: 72458:493886a640b6
parent: 72455:e5dade9bf96f
parent: 72457:db8027df8458
user: Benjamin Peterson <benjamin at python.org>
date: Fri Sep 23 13:53:06 2011 -0400
summary:
merge 3.2
files:
Modules/_pickle.c | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/Modules/_pickle.c b/Modules/_pickle.c
--- a/Modules/_pickle.c
+++ b/Modules/_pickle.c
@@ -5318,13 +5318,12 @@
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;
}
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list