From 16382b9377fc2918b97fef658a163ec40d8f605d Mon Sep 17 00:00:00 2001 From: "Andrew J. Erickson" Date: Mon, 9 Aug 2010 00:06:16 -0700 Subject: [PATCH 1/2] patching per http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=573221 --- Hellanzb/HellaReactor.py | 2 +- Hellanzb/HellaXMLRPC/HtPasswdAuth.py | 2 +- Hellanzb/HellaXMLRPC/xmlrpc.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Hellanzb/HellaReactor.py b/Hellanzb/HellaReactor.py index cf16898..4284c0b 100644 --- a/Hellanzb/HellaReactor.py +++ b/Hellanzb/HellaReactor.py @@ -9,7 +9,7 @@ import Hellanzb, sys, time import twisted.copyright -if twisted.copyright.version >= '2.0.0': +if twisted.copyright.version >= '2.0.0' or twisted.copyright.version >= '10.0.0': from twisted.internet.selectreactor import SelectReactor from twisted.internet.selectreactor import _NO_FILENO from twisted.internet.selectreactor import _NO_FILEDESC diff --git a/Hellanzb/HellaXMLRPC/HtPasswdAuth.py b/Hellanzb/HellaXMLRPC/HtPasswdAuth.py index 0d75a51..f18a387 100644 --- a/Hellanzb/HellaXMLRPC/HtPasswdAuth.py +++ b/Hellanzb/HellaXMLRPC/HtPasswdAuth.py @@ -18,7 +18,7 @@ from twisted.web.resource import Resource import twisted.copyright -if twisted.copyright.version >= '2.0.0': +if twisted.copyright.version >= '2.0.0' or twisted.copyright.version >= '10.0.0': from twisted.web import http else: from twisted.protocols import http diff --git a/Hellanzb/HellaXMLRPC/xmlrpc.py b/Hellanzb/HellaXMLRPC/xmlrpc.py index 853b7cb..0ac968e 100644 --- a/Hellanzb/HellaXMLRPC/xmlrpc.py +++ b/Hellanzb/HellaXMLRPC/xmlrpc.py @@ -31,7 +31,7 @@ from twisted.python import log, reflect import twisted.copyright -if twisted.copyright.version >= '2.0.0': +if twisted.copyright.version >= '2.0.0' or twisted.copyright.version >= '10.0.0': from twisted.web import http else: from twisted.protocols import http From 2a8a873b65d79a6483d4c7afb547ed8ce43b8d6e Mon Sep 17 00:00:00 2001 From: Emil Mikulic Date: Tue, 27 Dec 2011 01:38:09 +1100 Subject: [PATCH 2/2] _NO_FILENO has moved to twisted.internet.posixbase --- Hellanzb/HellaReactor.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Hellanzb/HellaReactor.py b/Hellanzb/HellaReactor.py index 4284c0b..88ee556 100644 --- a/Hellanzb/HellaReactor.py +++ b/Hellanzb/HellaReactor.py @@ -9,7 +9,11 @@ import Hellanzb, sys, time import twisted.copyright -if twisted.copyright.version >= '2.0.0' or twisted.copyright.version >= '10.0.0': +if twisted.copyright.version >= '11.1.0': + from twisted.internet.selectreactor import SelectReactor + from twisted.internet.posixbase import _NO_FILENO + from twisted.internet.posixbase import _NO_FILEDESC +elif twisted.copyright.version >= '2.0.0' or twisted.copyright.version >= '10.0.0': from twisted.internet.selectreactor import SelectReactor from twisted.internet.selectreactor import _NO_FILENO from twisted.internet.selectreactor import _NO_FILEDESC