nemunaire/nemubot
1
0
Fork 0
Code Releases Activity

tools/web: new option decode_error to decode non-200 page content (useful on REST API)

Browse Source
This commit is contained in:
nemunaire 2017-07-22 10:53:08 +02:00
parent 0d52fff64a
commit bc183bcfa0
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nemubot/tools/web.py
View File

@ -68,13 +68,14 @@ def getPassword(url):
# Get real pages # Get real pages
def getURLContent(url, body=None, timeout=7, header=None): def getURLContent(url, body=None, timeout=7, header=None, decode_error=False):
"""Return page content corresponding to URL or None if any error occurs """Return page content corresponding to URL or None if any error occurs
Arguments: Arguments:
url -- the URL to get url -- the URL to get
body -- Data to send as POST content body -- Data to send as POST content
timeout -- maximum number of seconds to wait before returning an exception timeout -- maximum number of seconds to wait before returning an exception
decode_error -- raise exception on non-200 pages or ignore it
""" """
o = urlparse(_getNormalizedURL(url), "http") o = urlparse(_getNormalizedURL(url), "http")
@ -166,7 +167,10 @@ def getURLContent(url, body=None, timeout=7, header=None):
urljoin(url, res.getheader("Location")), urljoin(url, res.getheader("Location")),
body=body, body=body,
timeout=timeout, timeout=timeout,
header=header) header=header,
decode_error=decode_error)
elif decode_error:
return data.decode(charset).strip()
else: else:
raise IMException("A HTTP error occurs: %d - %s" % raise IMException("A HTTP error occurs: %d - %s" %
(res.status, http.client.responses[res.status])) (res.status, http.client.responses[res.status]))