From 5ca79f0f49d19cef5b539b32e54f8b32dfeec210 Mon Sep 17 00:00:00 2001 From: Jeremy Fincher Date: Wed, 2 Feb 2005 14:07:20 +0000 Subject: [PATCH] Hah, changed WebError to Error everywhere but the source :) --- src/utils/web.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/utils/web.py b/src/utils/web.py index 650a06d26..86dfba6dc 100644 --- a/src/utils/web.py +++ b/src/utils/web.py @@ -98,18 +98,18 @@ def getUrlFd(url, headers=None): fd = urllib2.urlopen(request) return fd except socket.timeout, e: - raise WebError, TIMED_OUT + raise Error, TIMED_OUT except (socket.error, socket.sslerror), e: - raise WebError, strError(e) + raise Error, strError(e) except httplib.InvalidURL, e: - raise WebError, 'Invalid URL: %s' % e + raise Error, 'Invalid URL: %s' % e except urllib2.HTTPError, e: - raise WebError, strError(e) + raise Error, strError(e) except urllib2.URLError, e: - raise WebError, strError(e.reason) + raise Error, strError(e.reason) # Raised when urllib doesn't recognize the url type except ValueError, e: - raise WebError, strError(e) + raise Error, strError(e) def getUrl(url, size=None, headers=None): """Gets a page. Returns a string that is the page gotten.""" @@ -120,7 +120,7 @@ def getUrl(url, size=None, headers=None): else: text = fd.read(size) except socket.timeout, e: - raise WebError, TIMED_OUT + raise Error, TIMED_OUT fd.close() return text