remove unnecessary to_dict() (#834)

We have some objects that have exactly the same to_dict() method, only specifying that `from_user` should be `from` in the `data`-dict. I refractored this logic to `TelegramObject` and removed those to_dicts() from the code.

Author: Eldinnie

telegram/base.py

@@ -70,6 +70,8 @@ def to_dict(self):
                 else:
                     data[key] = value
 
+        if data.get('from_user'):
+            data['from'] = data.pop('from_user', None)
         return data
 
     def __eq__(self, other):

telegram/callbackquery.py

@@ -105,13 +105,6 @@ def de_json(cls, data, bot):
 
         return cls(bot=bot, **data)
 
-    def to_dict(self):
-        data = super(CallbackQuery, self).to_dict()
-
-        # Required
-        data['from'] = data.pop('from_user', None)
-        return data
-
     def answer(self, *args, **kwargs):
         """Shortcut for::
 

telegram/choseninlineresult.py

@@ -79,11 +79,3 @@ def de_json(cls, data, bot):
         data['location'] = Location.de_json(data.get('location'), bot)
 
         return cls(**data)
-
-    def to_dict(self):
-        data = super(ChosenInlineResult, self).to_dict()
-
-        # Required
-        data['from'] = data.pop('from_user', None)
-
-        return data

telegram/inline/inlinequery.py

@@ -75,14 +75,6 @@ def de_json(cls, data, bot):
 
         return cls(bot=bot, **data)
 
-    def to_dict(self):
-        data = super(InlineQuery, self).to_dict()
-
-        # Required
-        data['from'] = data.pop('from_user', None)
-
-        return data
-
     def answer(self, *args, **kwargs):
         """Shortcut for::
 

telegram/message.py

@@ -387,7 +387,6 @@ def to_dict(self):
         data = super(Message, self).to_dict()
 
         # Required
-        data['from'] = data.pop('from_user', None)
         data['date'] = to_timestamp(self.date)
         # Optionals
         if self.forward_date:

telegram/payment/precheckoutquery.py

@@ -89,13 +89,6 @@ def de_json(cls, data, bot):
 
         return cls(bot=bot, **data)
 
-    def to_dict(self):
-        data = super(PreCheckoutQuery, self).to_dict()
-
-        data['from'] = data.pop('from_user', None)
-
-        return data
-
     def answer(self, *args, **kwargs):
         """Shortcut for::
 

telegram/payment/shippingquery.py

@@ -66,13 +66,6 @@ def de_json(cls, data, bot):
 
         return cls(**data)
 
-    def to_dict(self):
-        data = super(ShippingQuery, self).to_dict()
-
-        data['from'] = data.pop('from_user', None)
-
-        return data
-
     def answer(self, *args, **kwargs):
         """Shortcut for::