Merge pull request python-telegram-bot#269 from python-telegram-bot/buttons

jh0ker · jh0ker · commit 41e457f5ed96 · 2016-04-29T19:29:12.000+02:00
support str and KeyboardButton for reply_markup
diff --git a/telegram/replykeyboardmarkup.py b/telegram/replykeyboardmarkup.py
@@ -73,7 +73,12 @@ def to_dict(self):
         data = super(ReplyKeyboardMarkup, self).to_dict()
 
         data['keyboard'] = []
-        for keyboard in self.keyboard:
-            data['keyboard'].append([x.to_dict() for x in keyboard])
-
+        for row in self.keyboard:
+            r = []
+            for button in row:
+                if hasattr(button, 'to_dict'):
+                    r.append(button.to_dict())  # telegram.KeyboardButton
+                else:
+                    r.append(button)            # str
+            data['keyboard'].append(r)
         return data
