Merged revisions 84172 via svnmerge from

loewis · loewis · commit a5154ad1790c · 2010-08-19T09:03:03.000Z
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84172 | martin.v.loewis | 2010-08-18 18:12:23 +0200 (Mi, 18 Aug 2010) | 2 lines

  Restore GIL in nis_cat in case of error.
........
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -12,6 +12,8 @@ What's New in Python 3.1.3?
 Core and Builtins
 -----------------
 
+- Restore GIL in nis_cat in case of error.
+
 - Issue #5319: Print an error if flushing stdout fails at interpreter
   shutdown.
 
diff --git a/Modules/nismodule.c b/Modules/nismodule.c
@@ -124,6 +124,7 @@ nis_foreach (int instatus, char *inkey, int inkeylen, char *inval,
             PyErr_Clear();
             Py_XDECREF(key);
             Py_XDECREF(val);
+            indata->state = PyEval_SaveThread();
             return 1;
         }
         err = PyDict_SetItem(indata->dict, key, val);

Original file line number	Diff line number	Diff line change
`@@ -124,6 +124,7 @@ nis_foreach (int instatus, char inkey, int inkeylen, char inval,`
`124`	`124`	`PyErr_Clear();`
`125`	`125`	`Py_XDECREF(key);`
`126`	`126`	`Py_XDECREF(val);`
	`127`	`+ indata->state = PyEval_SaveThread();`
`127`	`128`	`return 1;`
`128`	`129`	`}`
`129`	`130`	`err = PyDict_SetItem(indata->dict, key, val);`