changeset 1443:9f696c3308d5

cdefer: Disabled error handling.
author Marcel Keller <mkeller@cs.au.dk>
date Fri, 11 Jun 2010 18:51:25 +0200
parents d5de2a925c67
children 0ebed2045ec5
files viff/cdefer.c
diffstat 1 files changed, 7 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/viff/cdefer.c	Fri Jun 11 18:09:33 2010 +0200
+++ b/viff/cdefer.c	Fri Jun 11 18:51:25 2010 +0200
@@ -513,9 +513,11 @@
             }
 
             offset = 0;
+	    /*
             if (PyObject_IsInstance(self->result, failure_class)) {
                 offset = 3;
             }
+	    */
 
             callback = PyTuple_GET_ITEM(item, offset + 0);
             if (!callback) {
@@ -564,6 +566,8 @@
             Py_CLEAR(newArgs2);
 
             if (!self->result) {
+		return NULL;
+		/*
                 PyErr_Fetch(&type, &value, &traceback);
                 PyErr_NormalizeException(&type, &value, &traceback);
                 if (!traceback) {
@@ -580,6 +584,7 @@
                 Py_DECREF(value);
                 Py_DECREF(traceback);
                 continue;
+		*/
             }
             Py_INCREF(self->result);
             if (PyObject_TypeCheck(self->result, &cdefer_DeferredType)) {
@@ -622,6 +627,7 @@
         self->callback_index = 0;
     }
 endLabel:;
+    /*
     if (PyObject_IsInstance(self->result, failure_class)) {
         result = PyObject_CallMethod((PyObject *)self->result,
                                      "cleanFailure", NULL);
@@ -637,6 +643,7 @@
             return NULL;
         }
     }
+    */
     Py_INCREF(Py_None);
     return Py_None;
 }