From: Forrest Voight <forrest@forre.st>
Date: Mon, 15 Oct 2012 07:23:38 +0000 (-0400)
Subject: fixed incompatibility with older versions of Twisted
X-Git-Tag: 8.0~4
X-Git-Url: https://git.novaco.in/?a=commitdiff_plain;h=442b94f7b69583bc7d5ab7d0f58fbf784d736520;hp=0ca9aa7494df862a242b479d50d48e84fafb0de7;p=p2pool.git

fixed incompatibility with older versions of Twisted
---

diff --git a/p2pool/util/deferral.py b/p2pool/util/deferral.py
index 71fe633..0601d39 100644
--- a/p2pool/util/deferral.py
+++ b/p2pool/util/deferral.py
@@ -103,7 +103,10 @@ class GenericDeferrer(object):
         def cancel(df):
             df, timer = self.map.pop(id)
             timer.cancel()
-        df = defer.Deferred(cancel)
+        try:
+            df = defer.Deferred(cancel)
+        except TypeError:
+            df = defer.Deferred() # handle older versions of Twisted
         def timeout():
             self.map.pop(id)
             df.errback(failure.Failure(defer.TimeoutError('in GenericDeferrer')))