From 2e17210ca303b2a8282de81b0e92de8ba21355a9 Mon Sep 17 00:00:00 2001 From: Andrew Williams Date: Wed, 15 Jun 2011 09:41:27 +0100 Subject: [PATCH] Added timeout options for Python 2.6 and above --- app/eve_proxy/models.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/eve_proxy/models.py b/app/eve_proxy/models.py index b3e60c8..61db6ec 100755 --- a/app/eve_proxy/models.py +++ b/app/eve_proxy/models.py @@ -1,3 +1,4 @@ +import sys import urllib, urllib2 from hashlib import sha1 from datetime import datetime, timedelta @@ -65,7 +66,10 @@ class CachedDocumentManager(models.Manager): req = urllib2.Request(url) req.add_header('CCP-Contact', 'matalok@pleaseignore.com') try: - conn = urllib2.urlopen(req) + if sys.version_info < (2, 6): + conn = urllib2.urlopen(req) + else: + conn = urllib2.urlopen(req, timeout=5) except urllib2.HTTPError, e: print "HTTP Error Code: %s" % e.code raise DocumentRetrievalError(e.code)