From 442b94f7b69583bc7d5ab7d0f58fbf784d736520 Mon Sep 17 00:00:00 2001 From: Forrest Voight Date: Mon, 15 Oct 2012 03:23:38 -0400 Subject: [PATCH] fixed incompatibility with older versions of Twisted --- p2pool/util/deferral.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) 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'))) -- 1.7.1