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-27 08:50:38 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3 from JASON0916/simplify-code

Browse source 
Simplify code
This commit is contained in:
Leandro Toledo 2015-07-11 19:05:09 -03:00
commit 2e7e24d16c
2 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -56,3 +56,5 @@ docs/_build/
# PyBuilder
target/
.idea/
.gitignore

23
telegram/bot.py
View file

@ -533,6 +533,24 @@ class Bot(object):
return True
def _isFileRequest(self,
data=None):
"""Check if the request is a file request
Args:
data:
A dict od (str, unicode) key/value pairs
Returns:
bool
"""
if data:
file_types = ['audio', 'document', 'photo', 'video']
file_type = [i for i in data.keys() if i in file_types]
if file_type:
file_content = data[file_type[0]]
return isinstance(file_content, file) or str(file_content).startswith('http')
return False
def _requestUrl(self,
url,
method,
@ -552,10 +570,7 @@ class Bot(object):
"""
if method == 'POST':
if 'audio' in data and (isinstance(data['audio'], file) or 'http' in data['audio']) or \
'document' in data and (isinstance(data['document'], file) or 'http' in data['document']) or \
'photo' in data and (isinstance(data['photo'], file) or 'http' in data['photo']) or \
'video' in data and (isinstance(data['video'], file) or 'http' in data['video']):
if self._isFileRequest(data):
try:
data = InputFile(data)
request = urllib2.Request(