nemunaire/nemubot
1
0
Fork 0
Code Releases Activity

[networking] Handle ConnectionError exceptions

Browse source
This commit is contained in:
nemunaire 2015-07-03 02:31:27 +02:00
parent 3b8195b81b
commit 6415e4a697
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/networking/page.py
View file

@ -31,6 +31,8 @@ def headers(url):
try: try:
conn.request("HEAD", o.path, None, {"User-agent": conn.request("HEAD", o.path, None, {"User-agent":
"Nemubot v%s" % __version__}) "Nemubot v%s" % __version__})
except ConnectionError as e:
raise IRCException(e.strerror)
except socket.timeout: except socket.timeout:
raise IRCException("request timeout") raise IRCException("request timeout")
except socket.gaierror: except socket.gaierror:
@ -68,6 +70,8 @@ def fetch(url, onNone=_onNoneDefault):
return onNone() return onNone()
else: else:
return None return None
except ConnectionError as e:
raise IRCException(e.strerror)
except socket.timeout: except socket.timeout:
raise IRCException("The request timeout when trying to access the page") raise IRCException("The request timeout when trying to access the page")
except socket.error as e: except socket.error as e: