Fix .send_file failing with strings (as they are iterable)

This commit is contained in:
Lonami Exo 2018-01-17 13:28:56 +01:00
parent fde0d60f72
commit bfe9378054

View File

@ -873,7 +873,7 @@ class TelegramClient(TelegramBareClient):
""" """
# First check if the user passed an iterable, in which case # First check if the user passed an iterable, in which case
# we may want to send as an album if all are photo files. # we may want to send as an album if all are photo files.
if hasattr(file, '__iter__'): if hasattr(file, '__iter__') and not isinstance(file, (str, bytes)):
# Convert to tuple so we can iterate several times # Convert to tuple so we can iterate several times
file = tuple(x for x in file) file = tuple(x for x in file)
if all(utils.is_image(x) for x in file): if all(utils.is_image(x) for x in file):
@ -1321,7 +1321,7 @@ class TelegramClient(TelegramBareClient):
``User``, ``Chat`` or ``Channel`` corresponding to the input ``User``, ``Chat`` or ``Channel`` corresponding to the input
entity. entity.
""" """
if not isinstance(entity, str) and hasattr(entity, '__iter__'): if hasattr(entity, '__iter__') and not isinstance(entity, str):
single = False single = False
else: else:
single = True single = True