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
(parent:
81f2ce0
)
Add timeout to urlopen().
author
Christian Heller
<c.heller@plomlompom.de>
Sun, 17 Jan 2016 20:02:37 +0000
(21:02 +0100)
committer
Christian Heller
<c.heller@plomlompom.de>
Sun, 17 Jan 2016 20:02:37 +0000
(21:02 +0100)
plomlombot.py
patch
|
blob
|
history
diff --git
a/plomlombot.py
b/plomlombot.py
index cf6bae90864be27ec6a750876b72070e36287774..36228f31b2ccafe949d381958169077a9e6bf77a 100644
(file)
--- a/
plomlombot.py
+++ b/
plomlombot.py
@@
-75,7
+75,7
@@
def url_check(msg):
matches = re.findall("(https?://[^\s]+)", msg)
for i in range(len(matches)):
url = matches[i]
- webpage = urllib.request.urlopen(url)
+ webpage = urllib.request.urlopen(url
, timeout=15
)
content_type = webpage.info().get_content_type()
charset = webpage.info().get_content_charset()
if not charset or not content_type in ('text/html', 'text/xml',