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

Using hasattr instead isinstance for file check #119

Browse source
This commit is contained in:
leandrotoledo 2016-04-22 21:51:00 -03:00
parent 203364d939
commit 252abb138d
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
telegram/inputfile.py
View file

@ -23,7 +23,6 @@
try:
from email.generator import _make_boundary as choose_boundary
from urllib.request import urlopen
from io import BufferedReader as file
except ImportError:
from mimetools import choose_boundary
from urllib2 import urlopen
@ -76,13 +75,12 @@ class InputFile(object):
else:
from_url = False
if isinstance(self.input_file, file) or from_url:
if hasattr(self.input_file, 'read') 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) and \
hasattr(self.input_file, 'name'):
elif hasattr(self.input_file, 'name'):
self.filename = os.path.basename(self.input_file.name)
elif from_url:
self.filename = os.path.basename(self.input_file.url) \
@ -198,7 +196,7 @@ class InputFile(object):
if file_type:
file_content = data[file_type[0]]
return isinstance(file_content, file) or str(
return hasattr(file_content, 'read') or str(
file_content).startswith('http')
return False

10
tests/test_bot.py
View file

@ -152,6 +152,16 @@ class BotTest(BaseTest, unittest.TestCase):
self.assertTrue(self.is_json(message.to_json()))
self.assertEqual(message.photo[0].file_size, 684)
@flaky(3, 1)
@timeout(10)
def testSendBufferedReaderPhoto(self):
photo = open('tests/data/telegram.png', 'rb')
message = self._bot.sendPhoto(photo=photo,
chat_id=self._chat_id)
self.assertTrue(self.is_json(message.to_json()))
self.assertEqual(message.photo[0].file_size, 1451)
@flaky(3, 1)
@timeout(10)
def testSendChatAction(self):