aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRapptz <[email protected]>2020-02-16 21:50:55 -0500
committerRapptz <[email protected]>2020-02-16 21:52:20 -0500
commit4cf5f792d402fe8f6fea054c87da7f460a594aa0 (patch)
tree5844b30b4b112b575d0ae2f56b9ea633c6f26877
parentFix crashes when Message.guild is Object (diff)
downloaddiscord.py-4cf5f792d402fe8f6fea054c87da7f460a594aa0.tar.xz
discord.py-4cf5f792d402fe8f6fea054c87da7f460a594aa0.zip
Fix Webhook.send returning an empty string when wait=False
-rw-r--r--discord/webhook.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/discord/webhook.py b/discord/webhook.py
index efc33bed..ebc8abd9 100644
--- a/discord/webhook.py
+++ b/discord/webhook.py
@@ -194,7 +194,8 @@ class AsyncWebhookAdapter(WebhookAdapter):
file.reset(seek=tries)
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':
response = json.loads(response)
@@ -275,7 +276,8 @@ class RequestsWebhookAdapter(WebhookAdapter):
r = self.session.request(verb, url, headers=headers, data=data, files=multipart)
r.encoding = 'utf-8'
- response = r.text
+ # Coerce empty responses to return None for hygiene purposes
+ response = r.text or None
# compatibility with aiohttp
r.status = r.status_code