fix merge conflict snakes

rahiel · rahiel · commit 6e9f30ca6ef2 · 2016-05-02T16:37:45.000+02:00
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,3 +1,9 @@
+**2016-05-01**
+
+*Released 4.0.3*
+
+- Add missing attribute ``location`` to ``InlineQuery``
+
 **2016-04-29**
 
 *Released 4.0.2*
diff --git a/README.rst b/README.rst
@@ -110,7 +110,6 @@ answerCallbackQuery       Yes
 editMessageText           Yes
 editMessageCaption        Yes
 editMessageReplyMarkup    Yes
-answerCallbackQuery       Yes
 ========================= ============
 
 =============
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -60,7 +60,7 @@
 # The short X.Y version.
 version = '4.0'
 # The full version, including alpha/beta/rc tags.
-release = '4.0.2'
+release = '4.0.3'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/setup.py b/setup.py
@@ -26,7 +26,7 @@ def requirements():
 
 setup(
     name='python-telegram-bot',
-    version='4.0.2',
+    version='4.0.3',
     author='Leandro Toledo',
     author_email='devs@python-telegram-bot.org',
     license='LGPLv3',
diff --git a/telegram/__init__.py b/telegram/__init__.py
@@ -83,7 +83,7 @@
 
 
 __author__ = 'devs@python-telegram-bot.org'
-__version__ = '4.0.2'
+__version__ = '4.0.3'
 __all__ = ['Audio',
            'Bot',
            'Chat',
diff --git a/telegram/bot.py b/telegram/bot.py
@@ -1293,7 +1293,7 @@ def getUpdates(self,
             long for data to be transmitted from and to the Telegram servers.
 
         Returns:
-            list[:class:`telegram.Message`]: A list of :class:`telegram.Update`
+            list[:class:`telegram.Update`]: A list of :class:`telegram.Update`
             objects are returned.
 
         Raises:
diff --git a/telegram/inlinekeyboardmarkup.py b/telegram/inlinekeyboardmarkup.py
@@ -27,10 +27,10 @@ class InlineKeyboardMarkup(ReplyMarkup):
     """This object represents a Telegram InlineKeyboardMarkup.
 
     Attributes:
-        inline_keyboard (List[List[:class:`telegram.InlineKeyboardMarkup`]]):
+        inline_keyboard (List[List[:class:`telegram.InlineKeyboardButton`]]):
 
     Args:
-        inline_keyboard (List[List[:class:`telegram.InlineKeyboardMarkup`]]):
+        inline_keyboard (List[List[:class:`telegram.InlineKeyboardButton`]]):
 
     """
 
diff --git a/telegram/inlinequery.py b/telegram/inlinequery.py
@@ -19,7 +19,7 @@
 
 """This module contains a object that represents a Telegram InlineQuery"""
 
-from telegram import TelegramObject, User
+from telegram import TelegramObject, User, Location
 
 
 class InlineQuery(TelegramObject):
@@ -39,6 +39,10 @@ class InlineQuery(TelegramObject):
         from_user (:class:`telegram.User`):
         query (str):
         offset (str):
+        **kwargs: Arbitrary keyword arguments.
+
+    Keyword Args:
+        location (optional[:class:`telegram.Location`]):
     """
 
     def __init__(self,
@@ -53,6 +57,9 @@ def __init__(self,
         self.query = query
         self.offset = offset
 
+        # Optional
+        self.location = kwargs.get('location')
+
     @staticmethod
     def de_json(data):
         """
@@ -68,6 +75,7 @@ def de_json(data):
             return None
 
         data['from_user'] = User.de_json(data.get('from'))
+        data['location'] = Location.de_json(data.get('location'))
 
         return InlineQuery(**data)
 
diff --git a/tests/test_inlinequery.py b/tests/test_inlinequery.py
@@ -37,17 +37,20 @@ class InlineQueryTest(BaseTest, unittest.TestCase):
 
     def setUp(self):
         user = telegram.User(1, 'First name')
+        location = telegram.Location(8.8, 53.1)
 
         self.id = 'id'
         self.from_user = user
         self.query = 'query text'
         self.offset = 'offset'
+        self.location = location
 
         self.json_dict = {
             'id': self.id,
             'from': self.from_user.to_dict(),
             'query': self.query,
-            'offset': self.offset
+            'offset': self.offset,
+            'location': self.location.to_dict()
         }
 
     def test_inlinequery_de_json(self):
@@ -56,6 +59,8 @@ def test_inlinequery_de_json(self):
         self.assertEqual(inlinequery.id, self.id)
         self.assertDictEqual(inlinequery.from_user.to_dict(),
                              self.from_user.to_dict())
+        self.assertDictEqual(inlinequery.location.to_dict(),
+                             self.location.to_dict())
         self.assertEqual(inlinequery.query, self.query)
         self.assertEqual(inlinequery.offset, self.offset)
 
