nemunaire/nemubot
1
0
Fork 0
Code Releases Activity

Replace IRCException by IMException, as nemubot is not only built for IRC

Browse source
This commit is contained in:
nemunaire 2015-10-30 21:57:45 +01:00
commit 8b4f08c5bd
40 changed files with 183 additions and 188 deletions
Download patch file Download diff file Expand all files Collapse all files

4
nemubot/tools/feed.py
View file

@ -110,8 +110,8 @@ class Feed:
elif self.feed.tagName == "feed":
self._parse_atom_feed()
else:
from nemubot.exception import IRCException
raise IRCException("This is not a valid Atom or RSS feed")
from nemubot.exception import IMException
raise IMException("This is not a valid Atom or RSS feed")
def _parse_atom_feed(self):

12
nemubot/tools/web.py
View file

@ -16,7 +16,7 @@
from urllib.parse import urlparse, urlsplit, urlunsplit
from nemubot.exception import IRCException
from nemubot.exception import IMException
def isURL(url):
@ -100,7 +100,7 @@ def getURLContent(url, body=None, timeout=7, header=None):
elif o.scheme is None or o.scheme == "":
conn = http.client.HTTPConnection(**kwargs)
else:
raise IRCException("Invalid URL")
raise IMException("Invalid URL")
from nemubot import __version__
if header is None:
@ -121,7 +121,7 @@ def getURLContent(url, body=None, timeout=7, header=None):
body,
header)
except OSError as e:
raise IRCException(e.strerror)
raise IMException(e.strerror)
try:
res = conn.getresponse()
@ -129,7 +129,7 @@ def getURLContent(url, body=None, timeout=7, header=None):
cntype = res.getheader("Content-Type")
if size > 524288 or (cntype is not None and cntype[:4] != "text" and cntype[:4] != "appl"):
raise IRCException("Content too large to be retrieved")
raise IMException("Content too large to be retrieved")
data = res.read(size)
@ -147,7 +147,7 @@ def getURLContent(url, body=None, timeout=7, header=None):
else:
charset = cha[0]
except http.client.BadStatusLine:
raise IRCException("Invalid HTTP response")
raise IMException("Invalid HTTP response")
finally:
conn.close()
@ -158,7 +158,7 @@ def getURLContent(url, body=None, timeout=7, header=None):
res.getheader("Location") != url):
return getURLContent(res.getheader("Location"), timeout=timeout)
else:
raise IRCException("A HTTP error occurs: %d - %s" %
raise IMException("A HTTP error occurs: %d - %s" %
(res.status, http.client.responses[res.status]))