diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2010-08-19 09:03:03 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2010-08-19 09:03:03 (GMT) |
| commit | a5154ad1790cdc0c5518e1df56733d52b2ba213d (patch) | |
| tree | b098bb906d80f74ab6fc20e945c68a759c2b210d | |
| parent | 72994f6df3820961aa5b66492ca04ec21c494b7f (diff) | |
| download | cpython-a5154ad1790cdc0c5518e1df56733d52b2ba213d.zip cpython-a5154ad1790cdc0c5518e1df56733d52b2ba213d.tar.gz cpython-a5154ad1790cdc0c5518e1df56733d52b2ba213d.tar.bz2 | |
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.
........
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | Modules/nismodule.c | 1 |
2 files changed, 3 insertions, 0 deletions
@@ -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); |