Mercurial > cpython-lru_cache-weakref

changeset 64166:d0e9febfa00a 3.1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged revisions 84172 via svnmerge from 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. ........
author Martin v. Löwis <martin@v.loewis.de>
date Thu, 19 Aug 2010 09:03:03 +0000
parents f6723d55de4b
children 88e843ce1160
files Misc/NEWS Modules/nismodule.c
diffstat 2 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/Misc/NEWS	Thu Aug 19 07:04:27 2010 +0000
+++ b/Misc/NEWS	Thu Aug 19 09:03:03 2010 +0000
@@ -12,6 +12,8 @@
 Core and Builtins
 -----------------
 
+- Restore GIL in nis_cat in case of error.
+
 - Issue #5319: Print an error if flushing stdout fails at interpreter
   shutdown.
 
--- a/Modules/nismodule.c	Thu Aug 19 07:04:27 2010 +0000
+++ b/Modules/nismodule.c	Thu Aug 19 09:03:03 2010 +0000
@@ -124,6 +124,7 @@
             PyErr_Clear();
             Py_XDECREF(key);
             Py_XDECREF(val);
+            indata->state = PyEval_SaveThread();
             return 1;
         }
         err = PyDict_SetItem(indata->dict, key, val);