From: Forrest Voight <forrest@forre.st>
Date: Thu, 7 Feb 2013 18:37:50 +0000 (-0500)
Subject: fixed incompatibility with older versions of twisted introduced with memory leak fix
X-Git-Tag: 11.3~5
X-Git-Url: https://git.novaco.in/?p=p2pool.git;a=commitdiff_plain;h=27de695afc01ad16bb534cc2a6777b8d338c3638

fixed incompatibility with older versions of twisted introduced with memory leak fix
---

diff --git a/p2pool/p2p.py b/p2pool/p2p.py
index f643b0c..dffa3c3 100644
--- a/p2pool/p2p.py
+++ b/p2pool/p2p.py
@@ -80,7 +80,7 @@ class Protocol(p2protocol.Protocol):
     def _connect_timeout(self):
         self.timeout_delayed = None
         print 'Handshake timed out, disconnecting from %s:%i' % self.addr
-        if self.transport.abortConnection is not None:
+        if hasattr(self.transport, 'abortConnection'):
             # Available since Twisted 11.1
             self.transport.abortConnection()
         else:
@@ -106,7 +106,7 @@ class Protocol(p2protocol.Protocol):
     def _timeout(self):
         self.timeout_delayed = None
         print 'Connection timed out, disconnecting from %s:%i' % self.addr
-        if self.transport.abortConnection is not None:
+        if hasattr(self.transport, 'abortConnection'):
             # Available since Twisted 11.1
             self.transport.abortConnection()
         else: