LonamiWebs/Telethon
1
1
Fork 0
mirror of https://github.com/LonamiWebs/Telethon.git synced 2024-11-26 11:23:46 +03:00
Code Issues Packages Projects Releases Wiki Activity

Handle invalid upload of text fd more gracefully

Browse Source
This commit is contained in:
Lonami Exo 2019-12-27 12:05:27 +01:00
parent bdb74ac235
commit a142b7de5e
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
telethon/client/uploads.py
View File

@ -500,6 +500,11 @@ class UploadMethods:
if pos is not None: if pos is not None:
file.seek(pos) file.seek(pos)
if not isinstance(data, bytes):
raise TypeError(
'file descriptor returned {}, not bytes (you must '
'open the file in bytes mode)'.format(type(data)))
file = data file = data
file_size = len(file) file_size = len(file)

2
telethon/utils.py
View File

@ -741,7 +741,7 @@ def _get_extension(file):
elif isinstance(file, bytes): elif isinstance(file, bytes):
kind = imghdr.what(io.BytesIO(file)) kind = imghdr.what(io.BytesIO(file))
return ('.' + kind) if kind else '' return ('.' + kind) if kind else ''
elif isinstance(file, io.IOBase) and file.seekable(): elif isinstance(file, io.IOBase) and not isinstance(file, io.TextIOBase) and file.seekable():
kind = imghdr.what(file) kind = imghdr.what(file)
return ('.' + kind) if kind is not None else '' return ('.' + kind) if kind is not None else ''
elif getattr(file, 'name', None): elif getattr(file, 'name', None):