From 4cf5f792d402fe8f6fea054c87da7f460a594aa0 Mon Sep 17 00:00:00 2001 From: Rapptz Date: Sun, 16 Feb 2020 21:50:55 -0500 Subject: [PATCH] Fix Webhook.send returning an empty string when wait=False --- discord/webhook.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/discord/webhook.py b/discord/webhook.py index efc33beda..ebc8abd99 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