Fix exceptions, and remove the timeout (Python 2.5 compatability)

This commit is contained in:
2010-11-29 11:57:05 +00:00
parent 2aa689f693
commit 3bcbdf5ee5
2 changed files with 2 additions and 2 deletions

View File

@@ -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):
"""

View File

@@ -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: