From bbbc6225173e2ed836d9a3d95771f2d89bd13b78 Mon Sep 17 00:00:00 2001 From: leandrotoledo Date: Fri, 3 Jun 2016 13:28:29 -0400 Subject: [PATCH 1/2] Adds @message decorator to editMessageText #320 --- telegram/bot.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/telegram/bot.py b/telegram/bot.py index b4e1de77368..2145bee7942 100644 --- a/telegram/bot.py +++ b/telegram/bot.py @@ -1009,6 +1009,7 @@ def answerCallbackQuery(self, callback_query_id, text=None, show_alert=False, ** return result @log + @message def editMessageText(self, text, chat_id=None, @@ -1016,7 +1017,6 @@ def editMessageText(self, inline_message_id=None, parse_mode=None, disable_web_page_preview=None, - reply_markup=None, **kwargs): """Use this method to edit text messages sent by the bot or via the bot (for inline bots). @@ -1043,6 +1043,10 @@ def editMessageText(self, A JSON-serialized object for an inline keyboard. Keyword Args: + reply_markup (Optional[:class:`telegram.ReplyMarkup`]): Additional + interface options. A JSON-serialized object for an inline + keyboard, custom reply keyboard, instructions to hide reply + keyboard or to force a reply from the user. timeout (Optional[float]): If this value is specified, use it as the definitive timeout (in seconds) for urlopen() operations. @@ -1070,15 +1074,8 @@ def editMessageText(self, data['parse_mode'] = parse_mode if disable_web_page_preview: data['disable_web_page_preview'] = disable_web_page_preview - if reply_markup: - if isinstance(reply_markup, ReplyMarkup): - data['reply_markup'] = reply_markup.to_json() - else: - data['reply_markup'] = reply_markup - - result = request.post(url, data, timeout=kwargs.get('timeout')) - return Message.de_json(result) + return url, data @log @message From f0b91ecf467aef757d9f3073bf40cc5fa8f3ac59 Mon Sep 17 00:00:00 2001 From: leandrotoledo Date: Fri, 3 Jun 2016 13:44:24 -0400 Subject: [PATCH 2/2] Fix travis --- tests/test_photo.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/test_photo.py b/tests/test_photo.py index 994d0bd3ef1..15db261e4fd 100644 --- a/tests/test_photo.py +++ b/tests/test_photo.py @@ -35,15 +35,14 @@ class PhotoTest(BaseTest, unittest.TestCase): def setUp(self): self.photo_file = open('tests/data/telegram.jpg', 'rb') - self.photo_file_id = 'AgADAQADvb8xGx8j9QcpZDKxYoFK3bfX1i8ABFX_dgMWoKDuQugAAgI' + self.photo_file_id = 'AgADAQADgEsyGx8j9QfmDMmwkPBrFcKRzy8ABHW8ul9nW7FoNHYBAAEC' self.photo_file_url = 'https://raw.githubusercontent.com/python-telegram-bot/python-telegram-bot/master/tests/data/telegram.jpg' self.width = 300 self.height = 300 self.thumb = { 'width': 90, 'height': 90, - 'file_id': - 'AgADAQADvb8xGx8j9QcpZDKxYoFK3bfX1i8ABBxRLXFhLnhIQ-gAAgI', + 'file_id': 'AgADAQADgEsyGx8j9QfmDMmwkPBrFcKRzy8ABD64nkFkjujeNXYBAAEC', 'file_size': 1478 } self.file_size = 10209