Allow http url as a file_id

tsnoam · tsnoam · commit 3c889655c161 · 2016-10-04T00:20:17.000+03:00
N.B. test_send_video_mp4_file_url() is still failing, probably because
of telegram servers bug. Will contact telegram bot support about that.
diff --git a/telegram/inputfile.py b/telegram/inputfile.py
@@ -31,8 +31,6 @@
 import os
 import sys
 
-from future.moves.urllib.request import urlopen
-
 from telegram import TelegramError
 
 DEFAULT_MIME_TYPE = 'application/octet-stream'
@@ -49,32 +47,28 @@ def __init__(self, data):
         if 'audio' in data:
             self.input_name = 'audio'
             self.input_file = data.pop('audio')
-        if 'document' in data:
+        elif 'document' in data:
             self.input_name = 'document'
             self.input_file = data.pop('document')
-        if 'photo' in data:
+        elif 'photo' in data:
             self.input_name = 'photo'
             self.input_file = data.pop('photo')
-        if 'sticker' in data:
+        elif 'sticker' in data:
             self.input_name = 'sticker'
             self.input_file = data.pop('sticker')
-        if 'video' in data:
+        elif 'video' in data:
             self.input_name = 'video'
             self.input_file = data.pop('video')
-        if 'voice' in data:
+        elif 'voice' in data:
             self.input_name = 'voice'
             self.input_file = data.pop('voice')
-        if 'certificate' in data:
+        elif 'certificate' in data:
             self.input_name = 'certificate'
             self.input_file = data.pop('certificate')
-
-        if str(self.input_file).startswith('http'):
-            from_url = True
-            self.input_file = urlopen(self.input_file)
         else:
-            from_url = False
+            raise TelegramError('Unknown inputfile type')
 
-        if hasattr(self.input_file, 'read') or from_url:
+        if hasattr(self.input_file, 'read'):
             self.filename = None
             self.input_file_content = self.input_file.read()
             if 'filename' in data:
@@ -83,8 +77,6 @@ def __init__(self, data):
                 # on py2.7, pylint fails to understand this properly
                 # pylint: disable=E1101
                 self.filename = os.path.basename(self.input_file.name)
-            elif from_url:
-                self.filename = os.path.basename(self.input_file.url).split('?')[0].split('&')[0]
 
             try:
                 self.mimetype = InputFile.is_image(self.input_file_content)
@@ -186,6 +178,6 @@ def is_inputfile(data):
             if file_type:
                 file_content = data[file_type[0]]
 
-                return hasattr(file_content, 'read') or str(file_content).startswith('http')
+                return hasattr(file_content, 'read')
 
         return False
diff --git a/tests/test_audio.py b/tests/test_audio.py
@@ -134,19 +134,13 @@ def test_send_audio_mp3_file_custom_filename(self):
     @timeout(10)
     def test_send_audio_mp3_url_file(self):
         message = self._bot.sendAudio(
-            chat_id=self._chat_id,
-            audio=self.audio_file_url,
-            duration=self.duration,
-            performer=self.performer,
-            title=self.title)
+            chat_id=self._chat_id, audio=self.audio_file_url, duration=self.duration)
 
         audio = message.audio
 
         self.assertTrue(isinstance(audio.file_id, str))
         self.assertNotEqual(audio.file_id, '')
         self.assertEqual(audio.duration, self.duration)
-        self.assertEqual(audio.performer, self.performer)
-        self.assertEqual(audio.title, self.title)
         self.assertEqual(audio.mime_type, self.mime_type)
         self.assertEqual(audio.file_size, self.file_size)
 
