From a5154ad1790cdc0c5518e1df56733d52b2ba213d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Thu, 19 Aug 2010 09:03:03 +0000 Subject: 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. ........ --- Misc/NEWS | 2 ++ Modules/nismodule.c | 1 + 2 files changed, 3 insertions(+) diff --git a/Misc/NEWS b/Misc/NEWS index d035ff1..39e2430 100644 --- 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 index 16c7b81..d75af5d 100644 --- 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); -- cgit v0.12