Merge remote-tracking branch 'origin/master' into unittest-bot2.0

This commit is contained in:
Leandro Toledo 2016-04-24 14:33:17 -03:00
commit fc7c161018

View file

@ -421,6 +421,7 @@ class Bot(TelegramObject):
chat_id,
document,
filename=None,
caption=None,
**kwargs):
"""Use this method to send general files.
@ -434,6 +435,9 @@ class Bot(TelegramObject):
filename:
File name that shows in telegram message (it is usefull when you
send file generated by temp module, for example). [Optional]
caption:
Document caption (may also be used when resending documents by
file_id), 0-200 characters. [Optional]
Keyword Args:
disable_notification (Optional[bool]): Sends the message silently.
@ -468,6 +472,8 @@ class Bot(TelegramObject):
if filename:
data['filename'] = filename
if caption:
data['caption'] = caption
return url, data