commit 6188d09f1c27f0ba5d4c369677a308fe118e9d5a
author Antoine Pitrou <solipsis@pitrou.net> Sat Nov 23 21:06:21 2013 +0100
committer Antoine Pitrou <solipsis@pitrou.net> Sat Nov 23 21:06:21 2013 +0100
tree faaf1f83aeb28ad29f4cd0d7695b2294cf9187a5
parent 8f2ee6e407fe38375095f488b18d2c8c0cbab631
parent 74d8d63b183f7bb90da68f45e34259af439922de

Merge

Modules/_pickle.c

diff --git a/Modules/_pickle.c b/Modules/_pickle.c
index 3411ce9..a1819b9 100644
--- 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;