[Zope-Checkins] CVS: Zope2 - BTreeTemplate.c:1.9.6.6 BucketTemplate.c:1.6.6.7
Jim Fulton
jim@digicool.com
Fri, 30 Mar 2001 15:37:23 -0500 (EST)
Update of /cvs-repository/Zope2/lib/python/BTrees
In directory korak:/tmp/cvs-serv7927
Modified Files:
Tag: zope-2_3-branch
BTreeTemplate.c BucketTemplate.c
Log Message:
Fixed exception handling in get methods to only swallow key errors.
--- Updated File BTreeTemplate.c in package Zope2 --
--- BTreeTemplate.c 2001/03/21 14:13:27 1.9.6.5
+++ BTreeTemplate.c 2001/03/30 20:37:21 1.9.6.6
@@ -1191,6 +1191,7 @@
UNLESS (PyArg_ParseTuple(args, "O|O", &key, &d)) return NULL;
if ((r=_BTree_get(self, key, 0))) return r;
+ UNLESS (PyErr_ExceptionMatches(PyExc_KeyError)) return NULL;
PyErr_Clear();
Py_INCREF(d);
return d;
--- Updated File BucketTemplate.c in package Zope2 --
--- BucketTemplate.c 2001/03/30 15:35:30 1.6.6.6
+++ BucketTemplate.c 2001/03/30 20:37:21 1.6.6.7
@@ -1057,6 +1057,7 @@
UNLESS (PyArg_ParseTuple(args, "O|O", &key, &d)) return NULL;
if ((r=_bucket_get(self, key, 0))) return r;
+ UNLESS (PyErr_ExceptionMatches(PyExc_KeyError)) return NULL;
PyErr_Clear();
Py_INCREF(d);
return d;