home
·
contact
·
privacy
projects
/
plomlombot-irc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
61a573d
)
URL interpreter: Handle HTTPErrors.
author
Christian Heller
<c.heller@plomlompom.de>
Sun, 17 Jan 2016 20:34:25 +0000
(21:34 +0100)
committer
Christian Heller
<c.heller@plomlompom.de>
Sun, 17 Jan 2016 20:34:25 +0000
(21:34 +0100)
plomlombot.py
patch
|
blob
|
history
diff --git
a/plomlombot.py
b/plomlombot.py
index e4a5be35aabd091204209eff379a542f206c7e4e..ffb4192ac8f2925b1d6a34684acfd585eec82c6f 100644
(file)
--- a/
plomlombot.py
+++ b/
plomlombot.py
@@
-75,11
+75,15
@@
def url_check(msg):
matches = re.findall("(https?://[^\s]+)", msg)
for i in range(len(matches)):
url = matches[i]
matches = re.findall("(https?://[^\s]+)", msg)
for i in range(len(matches)):
url = matches[i]
- webpage = urllib.request.urlopen(url, timeout=15)
- content_type = webpage.info().get_content_type()
+ try:
+ webpage = urllib.request.urlopen(url, timeout=15)
+ except urllib.error.HTTPError as error:
+ print("TROUBLE FOLLOWING URL: " + str(error))
+ continue
charset = webpage.info().get_content_charset()
if not charset:
charset="utf-8"
charset = webpage.info().get_content_charset()
if not charset:
charset="utf-8"
+ content_type = webpage.info().get_content_type()
if not content_type in ('text/html', 'text/xml',
'application/xhtml+xml'):
print("TROUBLE INTERPRETING URL: bad content_type " + content_type)
if not content_type in ('text/html', 'text/xml',
'application/xhtml+xml'):
print("TROUBLE INTERPRETING URL: bad content_type " + content_type)