Ticket #2245: cdefer.5.patch

twisted/test/test_defer.py

@@ -284 +284 @@
         self.failIf(L, "Deferred failed too soon.")
         return d
     testTimeOut.suppress = [_setTimeoutSuppression]
+    if not hasattr(defer.Deferred, 'setTimeout'):
+        testTimeOut.skip = "setTimeout not supported, skipping"
 
 
     def testImmediateSuccess(self):
@@ -304 +306 @@
         d.addCallback(l.append)
         self.assertEquals(l, ["success"])
     test_immediateSuccessBeforeTimeout.suppress = [_setTimeoutSuppression]
+    if not hasattr(defer.Deferred, 'setTimeout'):
+        test_immediateSuccessBeforeTimeout.skip = "setTimeout not supported, skipping"
 
 
     def testImmediateFailure(self):

twisted/internet/defer.py

@@ -439 +439 @@
         return False
 
 try:
-    from twisted.internet.cdefer import Deferred
+    from twisted.internet.cdefer import Deferred as CDeferred
 except ImportError:
     pass
 else:
-    # Stubs for setDebugging/getDebugging for backwards compatibility
-    # when using cdefer.
-    is_debug = False
+    PyDeferred = Deferred
+    PyDeferred.debug = True
+    # Debugging enabled via use of PyDeferred
     def setDebugging(new_value):
-        global is_debug
+        global is_debug, Deferred
         is_debug = new_value
+        if is_debug:
+            Deferred = PyDeferred
+        else:
+            Deferred = CDeferred
     def getDebugging():
         global is_debug
         return is_debug
 
+    setDebugging(False)
+
 class DeferredList(Deferred):
     """I combine a group of deferreds into one callback.