Skip to content

Bug470 #500

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
tsnoam merged 3 commits into from
Feb 25, 2017
Merged

Bug470 #500

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
bd96771
Fix typo
tsnoam Jan 7, 2017
1bb5dd2
Fix bad formatting of BadRequest exception message
tsnoam Jan 7, 2017
4c7cc3a
Fix test_set_game_score3 - telegram changed something in their responses
tsnoam Jan 7, 2017
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: 1 addition & 1 deletion telegram/bot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@ def sendDocument(self,
chat_id: Unique identifier for the message recipient - Chat id.
document: File to send. You can either pass a file_id as String to resend a file that
is already on the Telegram servers, or upload a new file using multipart/form-data.
filename (Optional[str]): File name that shows in telegram message (it is usefull when
filename (Optional[str]): File name that shows in telegram message (it is useful when
you send file generated by temp module, for example).
caption (Optional[str]): Document caption (may also be used when resending documents by
file_id), 0-200 characters.
Expand Down
2 changes: 1 addition & 1 deletion telegram/utils/request.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ def _request_wrapper(self, *args, **kwargs):
if resp.status in (401, 403):
raise Unauthorized()
elif resp.status == 400:
raise BadRequest(repr(message))
raise BadRequest(message)
elif resp.status == 404:
raise InvalidToken()
elif resp.status == 502:
Expand Down
2 changes: 1 addition & 1 deletion tests/test_bot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ def test_set_game_score3(self):
chat_id=game.chat_id,
message_id=game.message_id)

self.assertTrue('BOT_SCORE_NOT_MODIFIED' in cm.exception.message)
self.assertTrue('BOT_SCORE_NOT_MODIFIED' in str(cm.exception.message).upper())

@flaky(3, 1)
@timeout(10)
Expand Down