Clear KeyError if necessary.

enthought · Aug 27, 2015 · 703bb78 · 703bb78
1 parent 7b8e552
commit 703bb78
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/traits/ctraits.c b/traits/ctraits.c
@@ -1152,9 +1152,14 @@ _has_traits_trait ( has_traits_object * obj, PyObject * args ) {
         if (dict != NULL) {
             temp_delegate = (has_traits_object *) PyDict_GetItem(
                 dict, trait->delegate_name );
-            /* PyDict_GetItem returns a borrowed reference,
-               so we need to INCREF. */
-            Py_XINCREF( temp_delegate );
+            if (temp_delegate == NULL) {
+                PyErr_Clear();
+            }
+            else {
+                /* PyDict_GetItem returns a borrowed reference,
+                   so we need to INCREF. */
+                Py_INCREF( temp_delegate );
+            }
         }
         if (temp_delegate == NULL) {
             /* has_traits_getattro returns a new reference,