Merge branch 'bot-api-2.0' into dispatcher-rework

jh0ker · jh0ker · commit bf5ba9a36905 · 2016-04-17T22:22:52.000+02:00
diff --git a/telegram/bot.py b/telegram/bot.py
@@ -1019,7 +1019,10 @@ def editMessageText(self,
         if reply_markup:
             data['disable_web_page_preview'] = disable_web_page_preview
         if reply_markup:
-            data['reply_markup'] = 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)
 
@@ -1066,7 +1069,10 @@ def editMessageCaption(self,
         if inline_message_id:
             data['inline_message_id'] = inline_message_id
         if reply_markup:
-            data['reply_markup'] = 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)
 
@@ -1101,6 +1107,9 @@ def editMessageReplyMarkup(self,
 
         url = '%s/editMessageReplyMarkup' % self.base_url
 
+        if isinstance(reply_markup, ReplyMarkup):
+            reply_markup = reply_markup.to_json()
+
         data = {'reply_markup': reply_markup}
 
         if chat_id:
