From 3bcbdf5ee5d1d3239c9b5f13041f1772ec32f905 Mon Sep 17 00:00:00 2001 From: Andrew Williams Date: Mon, 29 Nov 2010 11:57:05 +0000 Subject: [PATCH] Fix exceptions, and remove the timeout (Python 2.5 compatability) --- eve_proxy/exceptions.py | 2 +- eve_proxy/models.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eve_proxy/exceptions.py b/eve_proxy/exceptions.py index 2ed7fa6..c9fcf17 100644 --- a/eve_proxy/exceptions.py +++ b/eve_proxy/exceptions.py @@ -6,7 +6,7 @@ class DocumentRetrievalError(Exception): self.value = value def __str__(self): - return self.__doc__ % value + return self.__doc__ % self.value class InvalidDocument(Exception): """ diff --git a/eve_proxy/models.py b/eve_proxy/models.py index 258914f..01e26bf 100755 --- a/eve_proxy/models.py +++ b/eve_proxy/models.py @@ -76,7 +76,7 @@ class CachedDocumentManager(models.Manager): req = urllib2.Request(url) req.add_header('CCP-Contact', 'matalok@pleaseignore.com') try: - conn = urllib2.urlopen(req, timeout=60) + conn = urllib2.urlopen(req) except urllib2.HTTPError, e: raise DocumentRetrievalError(e.code) except urllib2.URLError, e: