Ticket #2245: cdefer.4.patch

twisted/test/test_defer.py

@@ -278 +278 @@
         """
         L = []
         d = defer.Deferred()
+        if not hasattr(d, 'setTimeout'):
+            log.msg("setTimeout support not in Deferred, so will not be tested")
+            return
         d.setTimeout(0.01)
         self.assertFailure(d, defer.TimeoutError)
         d.addCallback(L.append)
@@ -300 +303 @@
         """
         l = []
         d = defer.succeed("success")
+        if not hasattr(d, 'setTimeout'):
+            log.msg("setTimeout support not in Deferred, so will not be tested")
+            return
         d.setTimeout(1.0)
         d.addCallback(l.append)
         self.assertEquals(l, ["success"])

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.