From a8255e4f51a2a2f83b64f957fdb0fa63b20c4c47 Mon Sep 17 00:00:00 2001
From: Leandro Toledo <leandrotoledodesouza@gmail.com>
Date: Thu, 21 Apr 2016 11:42:02 -0300
Subject: [PATCH] Revert switch_inline_query #232

---
 telegram/inlinekeyboardbutton.py | 4 +++-
 telegram/inlinequery.py          | 2 ++
 tests/test_inlinequery.py        | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/telegram/inlinekeyboardbutton.py b/telegram/inlinekeyboardbutton.py
index 20d24f015..455748dac 100644
--- a/telegram/inlinekeyboardbutton.py
+++ b/telegram/inlinekeyboardbutton.py
@@ -52,10 +52,12 @@ class InlineKeyboardButton(TelegramObject):
         # Optionals
         self.url = kwargs.get('url')
         self.callback_data = kwargs.get('callback_data')
-        self.switch_inline_query = kwargs.get('switch_inline_query', '')
+        self.switch_inline_query = kwargs.get('switch_inline_query')
 
     @staticmethod
     def de_json(data):
+        data = super(InlineKeyboardButton, InlineKeyboardButton).de_json(data)
+
         if not data:
             return None
 
diff --git a/telegram/inlinequery.py b/telegram/inlinequery.py
index 706b48a6c..1bd9c44c8 100644
--- a/telegram/inlinequery.py
+++ b/telegram/inlinequery.py
@@ -62,6 +62,8 @@ class InlineQuery(TelegramObject):
         Returns:
             telegram.InlineQuery:
         """
+        data = super(InlineQuery, InlineQuery).de_json(data)
+
         if not data:
             return None
 
diff --git a/tests/test_inlinequery.py b/tests/test_inlinequery.py
index c86697dad..df08998f0 100644
--- a/tests/test_inlinequery.py
+++ b/tests/test_inlinequery.py
@@ -70,7 +70,7 @@ class InlineQueryTest(BaseTest, unittest.TestCase):
         inlinequery = telegram.InlineQuery.de_json(self.json_dict).to_dict()
 
         self.assertTrue(self.is_dict(inlinequery))
-        # self.assertDictEqual(inlinequery, self.json_dict)
+        self.assertDictEqual(inlinequery, self.json_dict)
 
 
 if __name__ == '__main__':