]> granicus.if.org Git - python/commitdiff
Issue #20440: Applied yet one patch for using Py_SETREF.
authorSerhiy Storchaka <storchaka@gmail.com>
Sun, 27 Dec 2015 10:38:28 +0000 (12:38 +0200)
committerSerhiy Storchaka <storchaka@gmail.com>
Sun, 27 Dec 2015 10:38:28 +0000 (12:38 +0200)
The patch is automatically generated, it replaces the code that uses Py_CLEAR.

1  2 
Modules/_io/bufferedio.c
Modules/_io/textio.c
Modules/_pickle.c
Modules/_struct.c
Modules/itertoolsmodule.c
Python/ceval.c

Simple merge
Simple merge
Simple merge
Simple merge
index 29c62e74736c895b80e2613f0b856f645b894735,ccd69be2fe01848a106bc3da2f0949a6690eb733..2bd0594f00bce47d1be0378ae168862d37494122
@@@ -984,14 -968,11 +980,13 @@@ cycle_setstate(cycleobject *lz, PyObjec
  {
      PyObject *saved=NULL;
      int firstpass;
 -    if (!PyArg_ParseTuple(state, "Oi", &saved, &firstpass))
 +
 +    if (!PyArg_ParseTuple(state, "O!i", &PyList_Type, &saved, &firstpass))
          return NULL;
 -    Py_XINCREF(saved);
 +    Py_INCREF(saved);
-     Py_CLEAR(lz->saved);
-     lz->saved = saved;
+     Py_SETREF(lz->saved, saved);
      lz->firstpass = firstpass != 0;
 +    lz->index = 0;
      Py_RETURN_NONE;
  }
  
diff --cc Python/ceval.c
Simple merge