prelude-correlator/master: HTTPConnection does not support timeout keyword with Python < 2.6

[email protected] Thu, 9 Jul 2009 17:57:28 +0200 (CEST)
Newsgroups gmane.comp.security.ids.prelude.cvs
Message-ID <[email protected]>
commit aca0ffd929fedec7f0d37bb6f29d270877e6b108
Author: Yoann Vandoorselaere <[email protected]>
Date:   Wed Jul 8 09:22:48 2009 +0200

    HTTPConnection does not support timeout keyword with Python < 2.6


========================================

 PreludeCorrelator/plugins/dshield.py |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

========================================

diff --git a/PreludeCorrelator/plugins/dshield.py b/PreludeCorrelator/plugins/dshield.py
index 630cd47..f42454b 100644
--- a/PreludeCorrelator/plugins/dshield.py
+++ b/PreludeCorrelator/plugins/dshield.py
@@ -51,7 +51,10 @@ class DshieldPlugin(Plugin):
     def __downloadData(self):
         self.info("Downloading host list, this might take some time...")
 
-        con = httplib.HTTPConnection(self.__server, timeout=self.__timeout)
+        try:
+            con = httplib.HTTPConnection(self.__server, timeout=self.__timeout)
+        except TypeError:
+            con = httplib.HTTPConnection(self.__server)
 
         con.request("GET", self.__uri)
         r = con.getresponse()
_______________________________________________
Prelude-cvslog site list
[email protected]
http://lists.prelude-ids.org/mailman/listinfo/prelude-cvslog