summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2010-08-19 09:03:03 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2010-08-19 09:03:03 (GMT)
commita5154ad1790cdc0c5518e1df56733d52b2ba213d (patch)
treeb098bb906d80f74ab6fc20e945c68a759c2b210d /Modules
parent72994f6df3820961aa5b66492ca04ec21c494b7f (diff)
downloadcpython-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. ........
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 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);