[Zope-Checkins] CVS: Zope2 - BTreeTemplate.c:1.14 BucketTemplate.c:1.12

Jim Fulton jim@digicool.com
Fri, 30 Mar 2001 15:42:23 -0500 (EST)


Update of /cvs-repository/Zope2/lib/python/BTrees
In directory korak:/tmp/cvs-serv8752

Modified Files:
	BTreeTemplate.c BucketTemplate.c 
Log Message:
Fixed exception handling in get methods to only catch key errors.



--- Updated File BTreeTemplate.c in package Zope2 --
--- BTreeTemplate.c	2001/03/21 14:16:58	1.13
+++ BTreeTemplate.c	2001/03/30 20:42:22	1.14
@@ -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:50:18	1.11
+++ BucketTemplate.c	2001/03/30 20:42:22	1.12
@@ -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;