mirrors/discord.py
1
0
Fork 0
mirror of https://github.com/Rapptz/discord.py.git synced 2025-05-15 10:19:59 +00:00
Code Issues Projects Releases Wiki Activity

HTTPException now has a text attribute if JSON is not available.

Browse Source
This commit is contained in:
Rapptz 2016-01-25 01:16:14 -05:00
parent 8caadb5f03
commit 4d816c4ef3
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
discord/errors.py
View File

@ -54,10 +54,15 @@ class HTTPException(DiscordException):
instance of `aiohttp.ClientResponse`__. instance of `aiohttp.ClientResponse`__.
__ http://aiohttp.readthedocs.org/en/stable/client_reference.html#aiohttp.ClientResponse __ http://aiohttp.readthedocs.org/en/stable/client_reference.html#aiohttp.ClientResponse
.. attribute:: text
The text of the response if it wasn't JSON. Could be None.
""" """
def __init__(self, response, message=None): def __init__(self, response, message=None, text=None):
self.response = response self.response = response
self.text = text
fmt = '{0.reason} (status code: {0.status})' fmt = '{0.reason} (status code: {0.status})'
if message: if message:

12
discord/utils.py
View File

@ -172,13 +172,19 @@ def _verify_successful_response(response):
code = response.status code = response.status
success = code >= 200 and code < 300 success = code >= 200 and code < 300
if not success: if not success:
message = None
text = None
if response.headers['content-type'] == 'application/json':
data = yield from response.json() data = yield from response.json()
message = data.get('message') message = data.get('message')
else:
text = yield from response.text()
if code == 403: if code == 403:
raise Forbidden(response, message) raise Forbidden(response, message, text)
elif code == 404: elif code == 404:
raise NotFound(response, message) raise NotFound(response, message, text)
raise HTTPException(response, message) raise HTTPException(response, message, text)
def _get_mime_type_for_image(data): def _get_mime_type_for_image(data):
if data.startswith(b'\x89\x50\x4E\x47\x0D\x0A\x1A\x0A'): if data.startswith(b'\x89\x50\x4E\x47\x0D\x0A\x1A\x0A'):