Merge pull request python-telegram-bot#433 from PH89/october3

jsmnbom · web-flow · commit 67b98e3190bd · 2016-10-07T22:25:52.000+02:00
small fix for game related parts
diff --git a/AUTHORS.rst b/AUTHORS.rst
@@ -27,6 +27,7 @@ The following wonderful people contributed directly or indirectly to this projec
 - `Noam Meltzer <https://github.com/tsnoam>`_
 - `Oleg Shlyazhko <https://github.com/ollmer>`_
 - `overquota <https://github.com/overquota>`_
+- `Patrick Hofmann <https://github.com/PH89>`_
 - `Rahiel Kasim <https://github.com/rahiel>`_
 - `Shelomentsev D <https://github.com/shelomentsevd>`_
 - `sooyhwang <https://github.com/sooyhwang>`_
diff --git a/telegram/bot.py b/telegram/bot.py
@@ -776,7 +776,7 @@ def sendGame(self,
             :class:`telegram.TelegramError`
 
         """
-        url = '{0}/sendMessage'.format(self.base_url)
+        url = '{0}/sendGame'.format(self.base_url)
 
         data = {'chat_id': chat_id, 'game_short_name': game_short_name}
 
diff --git a/telegram/callbackquery.py b/telegram/callbackquery.py
@@ -25,14 +25,14 @@
 class CallbackQuery(TelegramObject):
     """This object represents a Telegram CallbackQuery."""
 
-    def __init__(self, id, from_user, data, chat_instance, bot=None, **kwargs):
+    def __init__(self, id, from_user, chat_instance, bot=None, **kwargs):
         # Required
         self.id = id
         self.from_user = from_user
-        self.data = data
         self.chat_instance = chat_instance
         # Optionals
         self.message = kwargs.get('message')
+        self.data = kwargs.get('data', '')
         self.inline_message_id = kwargs.get('inline_message_id', '')
         self.game_short_name = kwargs.get('game_short_name')
 
diff --git a/telegram/message.py b/telegram/message.py
@@ -123,6 +123,7 @@ def __init__(self, message_id, from_user, date, chat, bot=None, **kwargs):
         self.text = kwargs.get('text', '')
         self.entities = kwargs.get('entities', list())
         self.audio = kwargs.get('audio')
+        self.game = kwargs.get('game')
         self.document = kwargs.get('document')
         self.photo = kwargs.get('photo')
         self.sticker = kwargs.get('sticker')
