diff --git a/telegram/__init__.py b/telegram/__init__.py index dd573add2..84367862e 100644 --- a/telegram/__init__.py +++ b/telegram/__init__.py @@ -45,6 +45,7 @@ from .emoji import Emoji from .parsemode import ParseMode from .message import Message from .messageentity import MessageEntity +from .inputmessagecontent import InputMessageContent from .callbackquery import CallbackQuery from .choseninlineresult import ChosenInlineResult from .inlinekeyboardbutton import InlineKeyboardButton @@ -70,7 +71,6 @@ from .inlinequeryresultphoto import InlineQueryResultPhoto from .inlinequeryresultvenue import InlineQueryResultVenue from .inlinequeryresultvideo import InlineQueryResultVideo from .inlinequeryresultvoice import InlineQueryResultVoice -from .inputmessagecontent import InputMessageContent from .inputtextmessagecontent import InputTextMessageContent from .inputlocationmessagecontent import InputLocationMessageContent from .inputvenuemessagecontent import InputVenueMessageContent diff --git a/telegram/inlinequeryresultarticle.py b/telegram/inlinequeryresultarticle.py index fbba73da3..019ac4b36 100644 --- a/telegram/inlinequeryresultarticle.py +++ b/telegram/inlinequeryresultarticle.py @@ -63,7 +63,8 @@ class InlineQueryResultArticle(InlineQueryResult): description=None, thumb_url=None, thumb_width=None, - thumb_height=None): + thumb_height=None, + **kwargs): # Required super(InlineQueryResultArticle, self).__init__('article', id) diff --git a/telegram/inlinequeryresultaudio.py b/telegram/inlinequeryresultaudio.py index 1e868f394..bfbf04481 100644 --- a/telegram/inlinequeryresultaudio.py +++ b/telegram/inlinequeryresultaudio.py @@ -32,7 +32,8 @@ class InlineQueryResultAudio(InlineQueryResult): performer=None, audio_duration=None, reply_markup=None, - input_message_content=None): + input_message_content=None, + **kwargs): # Required super(InlineQueryResultAudio, self).__init__('audio', id) diff --git a/telegram/inlinequeryresultcachedaudio.py b/telegram/inlinequeryresultcachedaudio.py index 833f7f618..ffca243f5 100644 --- a/telegram/inlinequeryresultcachedaudio.py +++ b/telegram/inlinequeryresultcachedaudio.py @@ -29,7 +29,8 @@ class InlineQueryResultCachedAudio(InlineQueryResult): id, audio_file_id, reply_markup=None, - input_message_content=None): + input_message_content=None, + **kwargs): # Required super(InlineQueryResultCachedAudio, self).__init__('audio', id) self.audio_file_id = audio_file_id diff --git a/telegram/inlinequeryresultcacheddocument.py b/telegram/inlinequeryresultcacheddocument.py index 441c7ea6b..d78dc2bd1 100644 --- a/telegram/inlinequeryresultcacheddocument.py +++ b/telegram/inlinequeryresultcacheddocument.py @@ -32,7 +32,8 @@ class InlineQueryResultCachedDocument(InlineQueryResult): description=None, caption=None, reply_markup=None, - input_message_content=None): + input_message_content=None, + **kwargs): # Required super(InlineQueryResultCachedDocument, self).__init__('document', id) self.title = title diff --git a/telegram/inlinequeryresultcachedgif.py b/telegram/inlinequeryresultcachedgif.py index c5edac3fc..6ad4268ac 100644 --- a/telegram/inlinequeryresultcachedgif.py +++ b/telegram/inlinequeryresultcachedgif.py @@ -31,7 +31,8 @@ class InlineQueryResultCachedGif(InlineQueryResult): title=None, caption=None, reply_markup=None, - input_message_content=None): + input_message_content=None, + **kwargs): # Required super(InlineQueryResultCachedGif, self).__init__('gif', id) self.gif_file_id = gif_file_id diff --git a/telegram/inlinequeryresultcachedmpeg4gif.py b/telegram/inlinequeryresultcachedmpeg4gif.py index a9b4ab70f..7c5d675ae 100644 --- a/telegram/inlinequeryresultcachedmpeg4gif.py +++ b/telegram/inlinequeryresultcachedmpeg4gif.py @@ -31,7 +31,8 @@ class InlineQueryResultCachedMpeg4Gif(InlineQueryResult): title=None, caption=None, reply_markup=None, - input_message_content=None): + input_message_content=None, + **kwargs): # Required super(InlineQueryResultCachedMpeg4Gif, self).__init__('mpeg4_gif', id) self.mpeg4_file_id = mpeg4_file_id diff --git a/telegram/inlinequeryresultcachedphoto.py b/telegram/inlinequeryresultcachedphoto.py index a648a0b58..abb76a941 100644 --- a/telegram/inlinequeryresultcachedphoto.py +++ b/telegram/inlinequeryresultcachedphoto.py @@ -32,7 +32,8 @@ class InlineQueryResultCachedPhoto(InlineQueryResult): description=None, caption=None, reply_markup=None, - input_message_content=None): + input_message_content=None, + **kwargs): # Required super(InlineQueryResultCachedPhoto, self).__init__('photo', id) self.photo_file_id = photo_file_id diff --git a/telegram/inlinequeryresultcachedsticker.py b/telegram/inlinequeryresultcachedsticker.py index c9eeae0d1..1d01ff57f 100644 --- a/telegram/inlinequeryresultcachedsticker.py +++ b/telegram/inlinequeryresultcachedsticker.py @@ -29,7 +29,8 @@ class InlineQueryResultCachedSticker(InlineQueryResult): id, sticker_file_id, reply_markup=None, - input_message_content=None): + input_message_content=None, + **kwargs): # Required super(InlineQueryResultCachedSticker, self).__init__('sticker', id) self.sticker_file_id = sticker_file_id diff --git a/telegram/inlinequeryresultcachedvideo.py b/telegram/inlinequeryresultcachedvideo.py index b013b36ab..807ab4060 100644 --- a/telegram/inlinequeryresultcachedvideo.py +++ b/telegram/inlinequeryresultcachedvideo.py @@ -32,7 +32,8 @@ class InlineQueryResultCachedVideo(InlineQueryResult): description=None, caption=None, reply_markup=None, - input_message_content=None): + input_message_content=None, + **kwargs): # Required super(InlineQueryResultCachedVideo, self).__init__('video', id) self.video_file_id = video_file_id diff --git a/telegram/inlinequeryresultcachedvoice.py b/telegram/inlinequeryresultcachedvoice.py index 7afeda867..61ba9cb4e 100644 --- a/telegram/inlinequeryresultcachedvoice.py +++ b/telegram/inlinequeryresultcachedvoice.py @@ -31,7 +31,8 @@ class InlineQueryResultCachedVoice(InlineQueryResult): title, description=None, reply_markup=None, - input_message_content=None): + input_message_content=None, + **kwargs): # Required super(InlineQueryResultCachedVoice, self).__init__('voice', id) self.voice_file_id = voice_file_id diff --git a/telegram/inlinequeryresultcontact.py b/telegram/inlinequeryresultcontact.py index acccbaff8..ada569e30 100644 --- a/telegram/inlinequeryresultcontact.py +++ b/telegram/inlinequeryresultcontact.py @@ -34,7 +34,8 @@ class InlineQueryResultContact(InlineQueryResult): input_message_content=None, thumb_url=None, thumb_width=None, - thumb_height=None): + thumb_height=None, + **kwargs): # Required super(InlineQueryResultContact, self).__init__('contact', id) self.phone_number = phone_number diff --git a/telegram/inlinequeryresultdocument.py b/telegram/inlinequeryresultdocument.py index e2e3f1999..0c0735cf9 100644 --- a/telegram/inlinequeryresultdocument.py +++ b/telegram/inlinequeryresultdocument.py @@ -36,7 +36,8 @@ class InlineQueryResultDocument(InlineQueryResult): input_message_content=None, thumb_url=None, thumb_width=None, - thumb_height=None): + thumb_height=None, + **kwargs): # Required super(InlineQueryResultDocument, self).__init__('document', id) self.document_url = document_url diff --git a/telegram/inlinequeryresultgif.py b/telegram/inlinequeryresultgif.py index 8ea2ee2f0..ae3589f6b 100644 --- a/telegram/inlinequeryresultgif.py +++ b/telegram/inlinequeryresultgif.py @@ -34,7 +34,8 @@ class InlineQueryResultGif(InlineQueryResult): title=None, caption=None, reply_markup=None, - input_message_content=None): + input_message_content=None, + **kwargs): # Required super(InlineQueryResultGif, self).__init__('gif', id) diff --git a/telegram/inlinequeryresultlocation.py b/telegram/inlinequeryresultlocation.py index bb40f7a94..a5d77179f 100644 --- a/telegram/inlinequeryresultlocation.py +++ b/telegram/inlinequeryresultlocation.py @@ -34,7 +34,8 @@ class InlineQueryResultLocation(InlineQueryResult): input_message_content=None, thumb_url=None, thumb_width=None, - thumb_height=None): + thumb_height=None, + **kwargs): # Required super(InlineQueryResultLocation, self).__init__('location', id) self.latitude = latitude diff --git a/telegram/inlinequeryresultmpeg4gif.py b/telegram/inlinequeryresultmpeg4gif.py index c9cb5045f..9f2232eea 100644 --- a/telegram/inlinequeryresultmpeg4gif.py +++ b/telegram/inlinequeryresultmpeg4gif.py @@ -34,7 +34,8 @@ class InlineQueryResultMpeg4Gif(InlineQueryResult): title=None, caption=None, reply_markup=None, - input_message_content=None): + input_message_content=None, + **kwargs): # Required super(InlineQueryResultMpeg4Gif, self).__init__('mpeg4_gif', id) diff --git a/telegram/inlinequeryresultphoto.py b/telegram/inlinequeryresultphoto.py index bb8d147c1..76afaf695 100644 --- a/telegram/inlinequeryresultphoto.py +++ b/telegram/inlinequeryresultphoto.py @@ -35,7 +35,8 @@ class InlineQueryResultPhoto(InlineQueryResult): description=None, caption=None, reply_markup=None, - input_message_content=None): + input_message_content=None, + **kwargs): # Required super(InlineQueryResultPhoto, self).__init__('photo', id) self.photo_url = photo_url diff --git a/telegram/inlinequeryresultvenue.py b/telegram/inlinequeryresultvenue.py index c47102006..bd1189c2d 100644 --- a/telegram/inlinequeryresultvenue.py +++ b/telegram/inlinequeryresultvenue.py @@ -36,7 +36,8 @@ class InlineQueryResultVenue(InlineQueryResult): input_message_content=None, thumb_url=None, thumb_width=None, - thumb_height=None): + thumb_height=None, + **kwargs): # Required super(InlineQueryResultVenue, self).__init__('venue', id) diff --git a/telegram/inlinequeryresultvideo.py b/telegram/inlinequeryresultvideo.py index 6a0846701..6f1e49188 100644 --- a/telegram/inlinequeryresultvideo.py +++ b/telegram/inlinequeryresultvideo.py @@ -37,7 +37,8 @@ class InlineQueryResultVideo(InlineQueryResult): video_duration=None, description=None, reply_markup=None, - input_message_content=None): + input_message_content=None, + **kwargs): # Required super(InlineQueryResultVideo, self).__init__('video', id) diff --git a/telegram/inlinequeryresultvoice.py b/telegram/inlinequeryresultvoice.py index 4bcae4bcd..a63156dc0 100644 --- a/telegram/inlinequeryresultvoice.py +++ b/telegram/inlinequeryresultvoice.py @@ -31,7 +31,8 @@ class InlineQueryResultVoice(InlineQueryResult): title, voice_duration=None, reply_markup=None, - input_message_content=None): + input_message_content=None, + **kwargs): # Required super(InlineQueryResultVoice, self).__init__('voice', id) diff --git a/tests/test_inlineresult.py b/tests/test_inlineresult.py index 5e73189f4..4ce0181b3 100644 --- a/tests/test_inlineresult.py +++ b/tests/test_inlineresult.py @@ -40,9 +40,9 @@ class InlineQueryResultArticleTest(BaseTest, unittest.TestCase): self.id = 'id' self.type = 'article' self.title = 'title' - self.message_text = 'message text' - self.parse_mode = 'HTML' - self.disable_web_page_preview = True + #self.message_text = 'message text' + #self.parse_mode = 'HTML' + #self.disable_web_page_preview = True self.url = 'url' self.hide_url = True self.description = 'description' @@ -54,9 +54,9 @@ class InlineQueryResultArticleTest(BaseTest, unittest.TestCase): 'type': self.type, 'id': self.id, 'title': self.title, - 'message_text': self.message_text, - 'parse_mode': self.parse_mode, - 'disable_web_page_preview': self.disable_web_page_preview, + #'message_text': self.message_text, + #'parse_mode': self.parse_mode, + ##'disable_web_page_preview': self.disable_web_page_preview, 'url': self.url, 'hide_url': self.hide_url, 'description': self.description, @@ -71,10 +71,10 @@ class InlineQueryResultArticleTest(BaseTest, unittest.TestCase): self.assertEqual(article.type, self.type) self.assertEqual(article.id, self.id) self.assertEqual(article.title, self.title) - self.assertEqual(article.message_text, self.message_text) - self.assertEqual(article.parse_mode, self.parse_mode) - self.assertEqual(article.disable_web_page_preview, - self.disable_web_page_preview) + #self.assertEqual(article.message_text, self.message_text) + #self.assertEqual(article.parse_mode, self.parse_mode) + #self.assertEqual(article.disable_web_page_preview, + # self.disable_web_page_preview) self.assertEqual(article.url, self.url) self.assertEqual(article.hide_url, self.hide_url) self.assertEqual(article.description, self.description) @@ -102,29 +102,29 @@ class InlineQueryResultPhotoTest(BaseTest, unittest.TestCase): self.id = 'id' self.type = 'photo' self.photo_url = 'photo url' - self.mime_type = 'mime type' + #self.mime_type = 'mime type' self.photo_width = 10 self.photo_height = 15 self.thumb_url = 'thumb url' self.title = 'title' self.caption = 'caption' - self.message_text = 'message text' - self.parse_mode = 'parse mode' - self.disable_web_page_preview = True + #self.message_text = 'message text' + #self.parse_mode = 'parse mode' + #self.disable_web_page_preview = True self.json_dict = { 'type': self.type, 'id': self.id, 'photo_url': self.photo_url, - 'mime_type': self.mime_type, + #'mime_type': self.mime_type, 'photo_width': self.photo_width, 'photo_height': self.photo_height, 'thumb_url': self.thumb_url, 'title': self.title, 'caption': self.caption, - 'message_text': self.message_text, - 'parse_mode': self.parse_mode, - 'disable_web_page_preview': self.disable_web_page_preview + #'message_text': self.message_text, + #'parse_mode': self.parse_mode, + #'disable_web_page_preview': self.disable_web_page_preview } def test_photo_de_json(self): @@ -133,16 +133,16 @@ class InlineQueryResultPhotoTest(BaseTest, unittest.TestCase): self.assertEqual(photo.type, self.type) self.assertEqual(photo.id, self.id) self.assertEqual(photo.photo_url, self.photo_url) - self.assertEqual(photo.mime_type, self.mime_type) + #self.assertEqual(photo.mime_type, self.mime_type) self.assertEqual(photo.photo_width, self.photo_width) self.assertEqual(photo.photo_height, self.photo_height) self.assertEqual(photo.thumb_url, self.thumb_url) self.assertEqual(photo.title, self.title) self.assertEqual(photo.caption, self.caption) - self.assertEqual(photo.message_text, self.message_text) - self.assertEqual(photo.parse_mode, self.parse_mode) - self.assertEqual(photo.disable_web_page_preview, - self.disable_web_page_preview) + #self.assertEqual(photo.message_text, self.message_text) + #self.assertEqual(photo.parse_mode, self.parse_mode) + #self.assertEqual(photo.disable_web_page_preview, + # self.disable_web_page_preview) def test_photo_to_json(self): photo = telegram.InlineQueryResultPhoto.de_json(self.json_dict) @@ -169,9 +169,9 @@ class InlineQueryResultGifTest(BaseTest, unittest.TestCase): self.thumb_url = 'thumb url' self.title = 'title' self.caption = 'caption' - self.message_text = 'message text' - self.parse_mode = 'parse mode' - self.disable_web_page_preview = True + #self.message_text = 'message text' + #self.parse_mode = 'parse mode' + #self.disable_web_page_preview = True self.json_dict = { 'type': self.type, @@ -182,9 +182,9 @@ class InlineQueryResultGifTest(BaseTest, unittest.TestCase): 'thumb_url': self.thumb_url, 'title': self.title, 'caption': self.caption, - 'message_text': self.message_text, - 'parse_mode': self.parse_mode, - 'disable_web_page_preview': self.disable_web_page_preview + #'message_text': self.message_text, + #'parse_mode': self.parse_mode, + #'disable_web_page_preview': self.disable_web_page_preview } def test_gif_de_json(self): @@ -198,10 +198,10 @@ class InlineQueryResultGifTest(BaseTest, unittest.TestCase): self.assertEqual(gif.thumb_url, self.thumb_url) self.assertEqual(gif.title, self.title) self.assertEqual(gif.caption, self.caption) - self.assertEqual(gif.message_text, self.message_text) - self.assertEqual(gif.parse_mode, self.parse_mode) - self.assertEqual(gif.disable_web_page_preview, - self.disable_web_page_preview) + #self.assertEqual(gif.message_text, self.message_text) + #self.assertEqual(gif.parse_mode, self.parse_mode) + #self.assertEqual(gif.disable_web_page_preview, + # self.disable_web_page_preview) def test_gif_to_json(self): gif = telegram.InlineQueryResultGif.de_json(self.json_dict) @@ -227,9 +227,9 @@ class InlineQueryResultMpeg4GifTest(BaseTest, unittest.TestCase): self.thumb_url = 'thumb url' self.title = 'title' self.caption = 'caption' - self.message_text = 'message text' - self.parse_mode = 'parse mode' - self.disable_web_page_preview = True + #self.message_text = 'message text' + #self.parse_mode = 'parse mode' + #self.disable_web_page_preview = True self.json_dict = { 'type': self.type, @@ -240,9 +240,9 @@ class InlineQueryResultMpeg4GifTest(BaseTest, unittest.TestCase): 'thumb_url': self.thumb_url, 'title': self.title, 'caption': self.caption, - 'message_text': self.message_text, - 'parse_mode': self.parse_mode, - 'disable_web_page_preview': self.disable_web_page_preview + #'message_text': self.message_text, + #'parse_mode': self.parse_mode, + #'disable_web_page_preview': self.disable_web_page_preview } def test_mpeg4_de_json(self): @@ -256,10 +256,10 @@ class InlineQueryResultMpeg4GifTest(BaseTest, unittest.TestCase): self.assertEqual(mpeg4.thumb_url, self.thumb_url) self.assertEqual(mpeg4.title, self.title) self.assertEqual(mpeg4.caption, self.caption) - self.assertEqual(mpeg4.message_text, self.message_text) - self.assertEqual(mpeg4.parse_mode, self.parse_mode) - self.assertEqual(mpeg4.disable_web_page_preview, - self.disable_web_page_preview) + #self.assertEqual(mpeg4.message_text, self.message_text) + #self.assertEqual(mpeg4.parse_mode, self.parse_mode) + #self.assertEqual(mpeg4.disable_web_page_preview, + # self.disable_web_page_preview) def test_mpeg4_to_json(self): mpeg4 = telegram.InlineQueryResultMpeg4Gif.de_json(self.json_dict) @@ -289,9 +289,9 @@ class InlineQueryResultVideoTest(BaseTest, unittest.TestCase): self.title = 'title' self.caption = 'caption' self.description = 'description' - self.message_text = 'message text' - self.parse_mode = 'parse mode' - self.disable_web_page_preview = True + #self.message_text = 'message text' + #self.parse_mode = 'parse mode' + #self.disable_web_page_preview = True self.json_dict = { 'type': self.type, @@ -305,9 +305,9 @@ class InlineQueryResultVideoTest(BaseTest, unittest.TestCase): 'title': self.title, 'caption': self.caption, 'description': self.description, - 'message_text': self.message_text, - 'parse_mode': self.parse_mode, - 'disable_web_page_preview': self.disable_web_page_preview + #'message_text': self.message_text, + #'parse_mode': self.parse_mode, + #'disable_web_page_preview': self.disable_web_page_preview } def test_video_de_json(self): @@ -324,10 +324,10 @@ class InlineQueryResultVideoTest(BaseTest, unittest.TestCase): self.assertEqual(video.title, self.title) self.assertEqual(video.description, self.description) self.assertEqual(video.caption, self.caption) - self.assertEqual(video.message_text, self.message_text) - self.assertEqual(video.parse_mode, self.parse_mode) - self.assertEqual(video.disable_web_page_preview, - self.disable_web_page_preview) + #self.assertEqual(video.message_text, self.message_text) + #self.assertEqual(video.parse_mode, self.parse_mode) + #self.assertEqual(video.disable_web_page_preview, + # self.disable_web_page_preview) def test_video_to_json(self): video = telegram.InlineQueryResultVideo.de_json(self.json_dict)