OpenSource/python-telegram-bot
OpenSource/python-telegram-bot
1
0
Fork 0
mirror of https://github.com/python-telegram-bot/python-telegram-bot.git synced 2025-03-16 12:25:45 +01:00
Code Issues Projects Releases Packages Wiki Activity

use basename and check if filename has extension

Browse source
This commit is contained in:
Jannes Höke 2016-01-12 12:42:07 +01:00
parent 9f55c15cc7
commit f71c40e0b8
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
telegram/inputfile.py
View file

@ -77,19 +77,19 @@ class InputFile(object):
from_url = False
if isinstance(self.input_file, file) or from_url:
self.filename = None
self.input_file_content = self.input_file.read()
if 'filename' in data:
self.filename = self.data.pop('filename')
elif isinstance(self.input_file, file):
self.filename = os.path.basename(self.input_file.name)
elif from_url:
self.filename = \
self.input_file.url.split('/')[-1]\
.split('?')[0].split('&')[0]
self.filename = os.path.basename(self.input_file.url)\
.split('?')[0].split('&')[0]
try:
self.mimetype = InputFile.is_image(self.input_file_content)
if 'filename' not in dir(self):
if not self.filename or '.' not in self.filename:
self.filename = self.mimetype.replace('/', '.')
except TelegramError:
self.mimetype = mimetypes.guess_type(self.filename)[0] or \