matthew/enhanced-discord.py
1
0
Fork 0
Code Issues 4 Pull Requests 21 Projects Releases Wiki Activity

Fix Webhook.send returning an empty string when wait=False

Browse Source
This commit is contained in:
Rapptz 2020-02-16 21:50:55 -05:00
parent af6a5efa53
commit 4cf5f792d4
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
discord/webhook.py
View File

@ -194,7 +194,8 @@ class AsyncWebhookAdapter(WebhookAdapter):
file.reset(seek=tries) file.reset(seek=tries)
async with self.session.request(verb, url, headers=headers, data=data) as r: async with self.session.request(verb, url, headers=headers, data=data) as r:
response = await r.text(encoding='utf-8') # Coerce empty strings to return None for hygiene purposes
response = (await r.text(encoding='utf-8')) or None
if r.headers['Content-Type'] == 'application/json': if r.headers['Content-Type'] == 'application/json':
response = json.loads(response) response = json.loads(response)
@ -275,7 +276,8 @@ class RequestsWebhookAdapter(WebhookAdapter):
r = self.session.request(verb, url, headers=headers, data=data, files=multipart) r = self.session.request(verb, url, headers=headers, data=data, files=multipart)
r.encoding = 'utf-8' r.encoding = 'utf-8'
response = r.text # Coerce empty responses to return None for hygiene purposes
response = r.text or None
# compatibility with aiohttp # compatibility with aiohttp
r.status = r.status_code r.status = r.status_code