hoelee/Telethon
1
0
Fork 0
mirror of https://github.com/LonamiWebs/Telethon.git synced 2025-06-19 03:26:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix sending files from disk after 6d1bc22 (#941 and #943)

Browse Source
This commit is contained in:
Lonami Exo 2018-08-06 18:03:42 +02:00
parent 44558cc592
commit 9195bccb41
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
telethon/client/uploads.py
View File

@ -393,7 +393,7 @@ class UploadMethods(ButtonMethods, MessageParseMethods, UserMethods):
file_handle = None file_handle = None
as_image = utils.is_image(file) and not force_document as_image = utils.is_image(file) and not force_document
use_cache = types.InputPhoto if as_image else types.InputDocument use_cache = types.InputPhoto if as_image else types.InputDocument
if not isinstance(file, str): if not isinstance(file, str) or os.path.isfile(file):
file_handle = await self.upload_file( file_handle = await self.upload_file(
file, progress_callback=progress_callback, file, progress_callback=progress_callback,
use_cache=use_cache if allow_cache else None use_cache=use_cache if allow_cache else None
@ -412,6 +412,11 @@ class UploadMethods(ButtonMethods, MessageParseMethods, UserMethods):
if media: if media:
pass # Already have media, don't check the rest pass # Already have media, don't check the rest
elif not file_handle:
raise ValueError(
'Failed to convert {} to media. Not an existing file, '
'an HTTP URL or a valid bot-API-like file ID'.format(file)
)
elif isinstance(file_handle, use_cache): elif isinstance(file_handle, use_cache):
# File was cached, so an instance of use_cache was returned # File was cached, so an instance of use_cache was returned
if as_image: if as_image: