[Python-checkins] cpython (merge default -> default): Merge

[antoine.pitrou]

http://hg.python.org/cpython/rev/3c222d1f81e9
changeset:   87447:3c222d1f81e9
parent:      87446:458340ed0606
parent:      87445:c54becd69805
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Sat Nov 23 21:06:21 2013 +0100
summary:
  Merge

files:
  Modules/_pickle.c |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Modules/_pickle.c b/Modules/_pickle.c
--- a/Modules/_pickle.c
+++ b/Modules/_pickle.c
@@ -2951,7 +2951,7 @@
 
     iter = PyObject_GetIter(obj);
     if (iter == NULL) {
-        return NULL;
+        return -1;
     }
     for (;;) {
         PyObject *item;

-- 
Repository URL: http://hg.python.org/cpython