Use BTree_ShouldSuppressKeyError

zopefoundation · Apr 10, 2021 · fb615ef · fb615ef
1 parent 1b02aab
commit fb615ef
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 16 deletions.
diff --git a/src/BTrees/SetTemplate.c b/src/BTrees/SetTemplate.c
@@ -106,10 +106,7 @@ Set_discard(Bucket* self, PyObject* args)
         return NULL;
 
     if (_bucket_set(self, key, NULL, 0, 1, 0) < 0) {
-        /* XXX: After PR#162, this should change to
-           BTree_ShouldSuppressKeyError() */
-        PyObject* exc_type = PyErr_Occurred();
-        if (exc_type == PyExc_KeyError) {
+        if (BTree_ShouldSuppressKeyError()) {
             PyErr_Clear();
         }
         else if (PyErr_ExceptionMatches(PyExc_TypeError)) {
@@ -462,10 +459,7 @@ set_isub(Bucket* self, PyObject* other)
                 }
             }
             if (_bucket_set(self, v, NULL, 0, 1, 0) < 0) {
-                /* XXX: With PR#162 this can be changed to
-                   BTree_ShouldSuppressKeyError() */
-                PyObject* exc_type = PyErr_Occurred();
-                if (exc_type == PyExc_KeyError) {
+                if (BTree_ShouldSuppressKeyError()) {
                     PyErr_Clear();
                 }
                 else {

diff --git a/src/BTrees/TreeSetTemplate.c b/src/BTrees/TreeSetTemplate.c
@@ -110,10 +110,7 @@ TreeSet_discard(BTree *self, PyObject *args)
         return NULL;
 
     if (_BTree_set(self, key, NULL, 0, 1) < 0) {
-        /* XXX: After PR#162, this should change to
-           BTree_ShouldSuppressKeyError() */
-        PyObject* exc_type = PyErr_Occurred();
-        if (exc_type == PyExc_KeyError) {
+        if (BTree_ShouldSuppressKeyError()) {
             PyErr_Clear();
         }
         else if (PyErr_ExceptionMatches(PyExc_TypeError)) {
@@ -382,10 +379,7 @@ TreeSet_isub(BTree* self, PyObject* other)
                 }
             }
             if (_BTree_set(self, v, NULL, 0, 1) < 0) {
-                /* XXX: With PR#162 this can be changed to
-                   BTree_ShouldSuppressKeyError() */
-                PyObject* exc_type = PyErr_Occurred();
-                if (exc_type == PyExc_KeyError) {
+                if (BTree_ShouldSuppressKeyError()) {
                     PyErr_Clear();
                 }
                 else {