Small fixes

jsmnbom · jsmnbom · commit 0681197db1a8 · 2018-08-25T19:45:46.000+02:00
diff --git a/telegram/__init__.py b/telegram/__init__.py
@@ -147,5 +147,6 @@
     'PassportElementErrorFiles', 'PassportElementErrorDataField', 'PassportElementErrorFile',
     'Credentials', 'DataCredentials', 'SecureData', 'FileCredentials', 'IdDocumentData',
     'PersonalDetails', 'ResidentialAddress', 'InputMediaVideo', 'InputMediaAnimation',
-    'InputMediaAudio', 'InputMediaDocument', 'TelegramDecryptionError'
+    'InputMediaAudio', 'InputMediaDocument', 'TelegramDecryptionError',
+    'PassportElementErrorSelfie'
 ]
diff --git a/telegram/base.py b/telegram/base.py
@@ -60,7 +60,12 @@ def to_dict(self):
         data = dict()
 
         for key in iter(self.__dict__):
-            if key in ('bot', '_id_attrs', '_credentials'):
+            if key in ('bot',
+                       '_id_attrs',
+                       '_credentials',
+                       '_decrypted_credentials',
+                       '_decrypted_data',
+                       '_decrypted_secret'):
                 continue
 
             value = self.__dict__[key]
diff --git a/telegram/passport/credentials.py b/telegram/passport/credentials.py
@@ -37,7 +37,7 @@ class TelegramDecryptionError(TelegramError):
     """
 
     def __init__(self, message):
-        super().__init__("TelegramDecryptionError: " + message)
+        super().__init__("TelegramDecryptionError: {}".format(message))
 
 
 def decrypt(secret, hash, data, file=False):
diff --git a/telegram/passport/encryptedpassportelement.py b/telegram/passport/encryptedpassportelement.py
@@ -142,7 +142,7 @@ def de_json(cls, data, bot, decrypt=False, credentials=None):
                         data['data'] = ResidentialAddress.de_json(data['data'], bot=bot)
 
         data['files'] = PassportFile.de_list(data.get('files'), bot,
-                                             secure_data if secure_data else None)
+                                             secure_data if secure_data else None) or None
         data['front_side'] = PassportFile.de_json(data.get('front_side'), bot,
                                                   secure_data.front_side
                                                   if secure_data else None)
diff --git a/telegram/passport/passportdata.py b/telegram/passport/passportdata.py
@@ -51,7 +51,7 @@ def __init__(self, data, credentials, bot=None, **kwargs):
 
         self.bot = bot
         self._decrypted_data = None
-        self._id_attrs = (data, credentials)
+        self._id_attrs = tuple([x.type for x in data] + [credentials.hash])
 
     @classmethod
     def de_json(cls, data, bot):
@@ -65,6 +65,13 @@ def de_json(cls, data, bot):
 
         return cls(bot=bot, **data)
 
+    def to_dict(self):
+        data = super(PassportData, self).to_dict()
+
+        data['data'] = [e.to_dict() for e in self.data]
+
+        return data
+
     @property
     def decrypted_data(self):
         """
diff --git a/telegram/passport/passportfile.py b/telegram/passport/passportfile.py
@@ -58,6 +58,8 @@ def de_json(cls, data, bot, credentials):
         if not data:
             return None
 
+        data = super(PassportFile, cls).de_json(data, bot)
+
         data['credentials'] = credentials if credentials else None
 
         return cls(bot=bot, **data)

Original file line number	Diff line number	Diff line change
`@@ -147,5 +147,6 @@`
`147`	`147`	`'PassportElementErrorFiles', 'PassportElementErrorDataField', 'PassportElementErrorFile',`
`148`	`148`	`'Credentials', 'DataCredentials', 'SecureData', 'FileCredentials', 'IdDocumentData',`
`149`	`149`	`'PersonalDetails', 'ResidentialAddress', 'InputMediaVideo', 'InputMediaAnimation',`
`150`		`- 'InputMediaAudio', 'InputMediaDocument', 'TelegramDecryptionError'`
	`150`	`+ 'InputMediaAudio', 'InputMediaDocument', 'TelegramDecryptionError',`
	`151`	`+ 'PassportElementErrorSelfie'`
`151`	`152`	`]`