Browse Source

Fix bug with uploading file-like objects.

I would require bytes-like objects instead due to its usage inside
the HTTPClient. Release this restriction so old `send_file` code works.
pull/244/head
Rapptz 9 years ago
parent
commit
f3b257b342
  1. 4
      discord/client.py
  2. 3
      discord/http.py

4
discord/client.py

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

3
discord/http.py

@ -29,7 +29,6 @@ import asyncio
import json
import sys
import logging
import io
import inspect
import weakref
from random import randint as random_integer
@ -239,7 +238,7 @@ class HTTPClient:
form.add_field('content', str(content))
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))

Loading…
Cancel
Save