Skip to content

Simplify code #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
leandrotoledo merged 3 commits into from
Jul 11, 2015
Merged

Simplify code #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8ca257c
simplify _requestUrl
NoneGG Jul 11, 2015
4c306de
delete .idea/
NoneGG Jul 11, 2015
f0a5b75
create _isFileRequest to simplify _requestUrl
NoneGG Jul 11, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,3 +56,5 @@ docs/_build/

# PyBuilder
target/
.idea/
.gitignore
23 changes: 19 additions & 4 deletions telegram/bot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -583,6 +583,24 @@ def setWebhook(self, webhook_url=""):

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,
Expand All @@ -602,10 +620,7 @@ def _requestUrl(self,
"""

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(
Expand Down