summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2010-08-19 09:09:04 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2010-08-19 09:09:04 (GMT)
commit6086b0dd95a2a829e83860f9dd090e6274c17132 (patch)
tree2fa4fba15e01ac378cb59c74ddb8f19ec5b0100a /Modules
parent2ada9064faf2f38404ba7733b263d81c3f687e41 (diff)
downloadcpython-6086b0dd95a2a829e83860f9dd090e6274c17132.zip
cpython-6086b0dd95a2a829e83860f9dd090e6274c17132.tar.gz
cpython-6086b0dd95a2a829e83860f9dd090e6274c17132.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. ........
Diffstat (limited to 'Modules')
-rw-r--r--Modules/nismodule.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/Modules/nismodule.c b/Modules/nismodule.c
index 04d8570..6acab63 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);