mirrors/discord.py
1
0
Fork 0
mirror of https://github.com/Rapptz/discord.py.git synced 2025-06-07 12:18:59 +00:00
Code Issues Projects Releases Wiki Activity

Fix bug with uploading file-like objects.

Browse Source 
I would require bytes-like objects instead due to its usage inside
the HTTPClient. Release this restriction so old `send_file` code works.
This commit is contained in:
Rapptz 2016-06-12 22:41:30 -04:00
parent 64c1e7d199
commit f3b257b342
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
discord/client.py
View File

@ -49,7 +49,7 @@ import aiohttp
import websockets import websockets
import logging, traceback import logging, traceback
import sys, re import sys, re, io
import tempfile, os, hashlib import tempfile, os, hashlib
import itertools import itertools
import datetime import datetime
@ -873,7 +873,7 @@ class Client:
try: try:
with open(fp, 'rb') as f: with open(fp, 'rb') as f:
buffer = f.read() buffer = io.BytesIO(f.read())
if filename is None: if filename is None:
filename = fp filename = fp
except TypeError: except TypeError:

3
discord/http.py
View File

@ -29,7 +29,6 @@ import asyncio
import json import json
import sys import sys
import logging import logging
import io
import inspect import inspect
import weakref import weakref
from random import randint as random_integer from random import randint as random_integer
@ -239,7 +238,7 @@ class HTTPClient:
form.add_field('content', str(content)) form.add_field('content', str(content))
form.add_field('tts', 'true' if tts else 'false') form.add_field('tts', 'true' if tts else 'false')
form.add_field('file', io.BytesIO(buffer), filename=filename, content_type='application/octet-stream') form.add_field('file', buffer, filename=filename, content_type='application/octet-stream')
return self.post(url, data=form, bucket='messages:' + str(guild_id)) return self.post(url, data=form, bucket='messages:' + str(guild_id))