python-telegram-bot · JASON0916 · Jul 11, 2015 · Jul 11, 2015 · leandrotoledo · Jul 11, 2015
diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/python-telegram-bot.iml b/.idea/python-telegram-bot.iml
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/telegram/bot.py b/telegram/bot.py
@@ -561,36 +561,16 @@ def _requestUrl(self,
         """
 
         if method == 'POST':
-            if 'photo' in data and isinstance(data['photo'], file):
+            file_types = ['photo', 'audio', 'document']
+            # In sendVideo(), sendAudio() and sendPhoto(), data.keys()[1] represents the file type
+            if data.keys()[1] in file_types and isinstance(data.items()[1], file):
                 try:
-                    photo = data.pop('photo')
+                    file_pop = data.pop(data.keys()[1])
 
                     return requests.post(
                         url,
                         data=data,
-                        files={'photo': photo}
-                    )
-                except requests.RequestException as e:
-                    raise TelegramError(str(e))
-            if 'audio' in data and isinstance(data['audio'], file):
-                try:
-                    audio = data.pop('audio')
-
-                    return requests.post(
-                        url,
-                        data=data,
-                        files={'audio': audio}
-                    )
-                except requests.RequestException as e:
-                    raise TelegramError(str(e))
-            if 'document' in data and isinstance(data['document'], file):
-                try:
-                    document = data.pop('document')
-
-                    return requests.post(
-                        url,
-                        data=data,
-                        files={'document': document}
+                        files={data.keys()[1]: file_pop}
                     )
                 except requests.RequestException as e:
                     raise TelegramError(str(e))

diff --git a/telegram_test.py b/telegram_test.py
@@ -2,4 +2,4 @@
 
 if __name__ == '__main__':
     testsuite = unittest.TestLoader().discover('.')
-    unittest.TextTestRunner(verbosity=1).run(testsuite)
+    unittest.TextTestRunner(verbosity=15).run(testsuite)