Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2025-01-11 20:52:42 +01:00
Code Issues Projects Releases Wiki Activity

Catch httplib.InvalidURL.

Browse Source
This commit is contained in:
Jeremy Fincher 2004-08-31 16:15:17 +00:00
parent faa340913d
commit 7a3be8a8e5
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/webutils.py
View File

@ -36,6 +36,7 @@ import supybot.fix as fix
import re import re
import socket import socket
import urllib2 import urllib2
import httplib
import urlparse import urlparse
import supybot.conf as conf import supybot.conf as conf
@ -44,6 +45,7 @@ Request = urllib2.Request
class WebError(Exception): class WebError(Exception):
pass pass
# XXX We should tighten this up a bit.
urlRe = re.compile(r"(\w+://[^\])>\s]+)", re.I) urlRe = re.compile(r"(\w+://[^\])>\s]+)", re.I)
REFUSED = 'Connection refused.' REFUSED = 'Connection refused.'
@ -94,6 +96,8 @@ def getUrlFd(url, headers=None):
raise WebError, TIMED_OUT raise WebError, TIMED_OUT
except (socket.error, socket.sslerror), e: except (socket.error, socket.sslerror), e:
raise WebError, strError(e) raise WebError, strError(e)
except httplib.InvalidURL, e:
raise WebError, 'Invalid URL: %s' % e
except urllib2.HTTPError, e: except urllib2.HTTPError, e:
raise WebError, strError(e) raise WebError, strError(e)
except urllib2.URLError, e: except urllib2.URLError, e: