Prevented modifications to the request object's original data (python-telegram-bot#454)

pulsastrix · tsnoam · commit a8fecc527dcc · 2016-12-20T00:07:35.000+02:00
fixes python-telegram-bot#357
diff --git a/AUTHORS.rst b/AUTHORS.rst
@@ -15,6 +15,7 @@ The following wonderful people contributed directly or indirectly to this projec
 - `ErgoZ Riftbit Vaper <https://github.com/ergoz>`_
 - `Eugene Lisitsky <https://github.com/lisitsky>`_
 - `franciscod <https://github.com/franciscod>`_
+- `Hugo Damer <https://github.com/HakimusGIT>`_
 - `Jacob Bom <https://github.com/bomjacob>`_
 - `JASON0916 <https://github.com/JASON0916>`_
 - `jh0ker <https://github.com/jh0ker>`_
diff --git a/telegram/animation.py b/telegram/animation.py
@@ -55,6 +55,8 @@ def de_json(data, bot):
         if not data:
             return None
 
+        data = super(Animation, Animation).de_json(data, bot)
+
         data['thumb'] = PhotoSize.de_json(data.get('thumb'), bot)
 
         return Animation(**data)
diff --git a/telegram/callbackquery.py b/telegram/callbackquery.py
@@ -60,6 +60,8 @@ def de_json(data, bot):
         if not data:
             return None
 
+        data = super(CallbackQuery, CallbackQuery).de_json(data, bot)
+
         data['from_user'] = User.de_json(data.get('from'), bot)
         data['message'] = Message.de_json(data.get('message'), bot)
 
diff --git a/telegram/chatmember.py b/telegram/chatmember.py
@@ -59,6 +59,8 @@ def de_json(data, bot):
         if not data:
             return None
 
+        data = super(ChatMember, ChatMember).de_json(data, bot)
+
         data['user'] = User.de_json(data.get('user'), bot)
 
         return ChatMember(**data)
diff --git a/telegram/choseninlineresult.py b/telegram/choseninlineresult.py
@@ -74,7 +74,8 @@ def de_json(data, bot):
         if not data:
             return None
 
-# Required
+        data = super(ChosenInlineResult, ChosenInlineResult).de_json(data, bot)
+        # Required
         data['from_user'] = User.de_json(data.pop('from'), bot)
         # Optionals
         data['location'] = Location.de_json(data.get('location'), bot)
diff --git a/telegram/document.py b/telegram/document.py
@@ -63,6 +63,8 @@ def de_json(data, bot):
         if not data:
             return None
 
+        data = super(Document, Document).de_json(data, bot)
+
         data['thumb'] = PhotoSize.de_json(data.get('thumb'), bot)
 
         return Document(**data)
diff --git a/telegram/game.py b/telegram/game.py
@@ -73,6 +73,8 @@ def de_json(data, bot):
         if not data:
             return None
 
+        data = super(Game, Game).de_json(data, bot)
+
         data['photo'] = PhotoSize.de_list(data.get('photo'), bot)
         data['text_entities'] = MessageEntity.de_list(data.get('text_entities'), bot)
         data['animation'] = Animation.de_json(data.get('animation'), bot)
diff --git a/telegram/gamehighscore.py b/telegram/gamehighscore.py
@@ -49,6 +49,8 @@ def de_json(data, bot):
         if not data:
             return None
 
+        data = super(GameHighScore, GameHighScore).de_json(data, bot)
+
         data['user'] = User.de_json(data.get('user'), bot)
 
         return GameHighScore(**data)
diff --git a/telegram/message.py b/telegram/message.py
@@ -200,6 +200,8 @@ def de_json(data, bot):
         if not data:
             return None
 
+        data = super(Message, Message).de_json(data, bot)
+
         data['from_user'] = User.de_json(data.get('from'), bot)
         data['date'] = datetime.fromtimestamp(data['date'])
         data['chat'] = Chat.de_json(data.get('chat'), bot)
diff --git a/telegram/replykeyboardmarkup.py b/telegram/replykeyboardmarkup.py
@@ -67,6 +67,8 @@ def de_json(data, bot):
         if not data:
             return None
 
+        data = super(ReplyKeyboardMarkup, ReplyKeyboardMarkup).de_json(data, bot)
+
         data['keyboard'] = [KeyboardButton.de_list(keyboard, bot) for keyboard in data['keyboard']]
 
         return ReplyKeyboardMarkup(**data)
diff --git a/telegram/sticker.py b/telegram/sticker.py
@@ -67,6 +67,8 @@ def de_json(data, bot):
         if not data:
             return None
 
+        data = super(Sticker, Sticker).de_json(data, bot)
+
         data['thumb'] = PhotoSize.de_json(data.get('thumb'), bot)
 
         return Sticker(**data)
diff --git a/telegram/update.py b/telegram/update.py
@@ -86,6 +86,8 @@ def de_json(data, bot):
         if not data:
             return None
 
+        data = super(Update, Update).de_json(data, bot)
+
         data['message'] = Message.de_json(data.get('message'), bot)
         data['edited_message'] = Message.de_json(data.get('edited_message'), bot)
         data['inline_query'] = InlineQuery.de_json(data.get('inline_query'), bot)
diff --git a/telegram/user.py b/telegram/user.py
@@ -77,6 +77,8 @@ def de_json(data, bot):
         if not data:
             return None
 
+        data = super(User, User).de_json(data, bot)
+
         return User(bot=bot, **data)
 
     def get_profile_photos(self, *args, **kwargs):
diff --git a/telegram/userprofilephotos.py b/telegram/userprofilephotos.py
@@ -52,6 +52,8 @@ def de_json(data, bot):
         if not data:
             return None
 
+        data = super(UserProfilePhotos, UserProfilePhotos).de_json(data, bot)
+
         data['photos'] = [PhotoSize.de_list(photo, bot) for photo in data['photos']]
 
         return UserProfilePhotos(**data)
diff --git a/telegram/utils/request.py b/telegram/utils/request.py
@@ -31,8 +31,8 @@
 from urllib3.connection import HTTPConnection
 
 from telegram import (InputFile, TelegramError)
-from telegram.error import Unauthorized, InvalidToken, NetworkError, TimedOut, BadRequest, \
-    ChatMigrated, RetryAfter
+from telegram.error import (Unauthorized, NetworkError, TimedOut, BadRequest, ChatMigrated,
+                            RetryAfter, InvalidToken)
 
 logging.getLogger('urllib3').setLevel(logging.WARNING)
 
diff --git a/telegram/video.py b/telegram/video.py
@@ -78,6 +78,8 @@ def de_json(data, bot):
         if not data:
             return None
 
+        data = super(Video, Video).de_json(data, bot)
+
         data['thumb'] = PhotoSize.de_json(data.get('thumb'), bot)
 
         return Video(**data)
diff --git a/telegram/voice.py b/telegram/voice.py
@@ -61,4 +61,6 @@ def de_json(data, bot):
         if not data:
             return None
 
+        data = super(Voice, Voice).de_json(data, bot)
+
         return Voice(**data)
