[Python-checkins] r84197 - in python/branches/release31-maint: Misc/NEWS Modules/nismodule.c
martin.v.loewis
python-checkins at python.org
Thu Aug 19 11:03:03 CEST 2010
Author: martin.v.loewis
Date: Thu Aug 19 11:03:03 2010
New Revision: 84197
Log:
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.
........
Modified:
python/branches/release31-maint/ (props changed)
python/branches/release31-maint/Misc/NEWS
python/branches/release31-maint/Modules/nismodule.c
Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS (original)
+++ python/branches/release31-maint/Misc/NEWS Thu Aug 19 11:03:03 2010
@@ -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.
Modified: python/branches/release31-maint/Modules/nismodule.c
==============================================================================
--- python/branches/release31-maint/Modules/nismodule.c (original)
+++ python/branches/release31-maint/Modules/nismodule.c Thu Aug 19 11:03:03 2010
@@ -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);
More information about the Python-checkins
mailing list