nemunaire/nemubot
1
0
Fork 0
Code Releases Activity

Tools.Web: fix charset detection on webpages

Browse source
This commit is contained in:
nemunaire 2015-05-27 02:16:48 +02:00
parent 4be9f78104
commit fc500bc853
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
nemubot/tools/web.py
View file

@ -118,7 +118,7 @@ def getURLContent(url, timeout=15):
if cntype is not None: if cntype is not None:
lcharset = res.getheader("Content-Type").split(";") lcharset = res.getheader("Content-Type").split(";")
if len(lcharset) > 1: if len(lcharset) > 1:
for c in charset: for c in lcharset:
ch = c.split("=") ch = c.split("=")
if ch[0].strip().lower() == "charset" and len(ch) > 1: if ch[0].strip().lower() == "charset" and len(ch) > 1:
cha = ch[1].split(".") cha = ch[1].split(".")
@ -132,7 +132,7 @@ def getURLContent(url, timeout=15):
conn.close() conn.close()
if res.status == http.client.OK or res.status == http.client.SEE_OTHER: if res.status == http.client.OK or res.status == http.client.SEE_OTHER:
return data.decode(charset) return data.decode(charset).strip()
elif ((res.status == http.client.FOUND or elif ((res.status == http.client.FOUND or
res.status == http.client.MOVED_PERMANENTLY) and res.status == http.client.MOVED_PERMANENTLY) and
res.getheader("Location") != url): res.getheader("Location") != url):