Handle Non-Binary File Input (#2202)

* Don't fail if stream is not bytes

* move logger

* Refactor InputFile.is_image

* Use f-strings

* some clean up

telegram/files/inputfile.py

@@ -20,14 +20,14 @@
 """This module contains an object that represents a Telegram InputFile."""
 
 import imghdr
+import logging
 import mimetypes
 import os
 from typing import IO, Optional, Tuple
 from uuid import uuid4
 
-from telegram import TelegramError
-
 DEFAULT_MIME_TYPE = 'application/octet-stream'
+logger = logging.getLogger(__name__)
 
 
 class InputFile:
@@ -59,13 +59,14 @@ class InputFile:
         elif hasattr(obj, 'name') and not isinstance(obj.name, int):
             self.filename = os.path.basename(obj.name)
 
-        try:
+        image_mime_type = self.is_image(self.input_file_content)
-            self.mimetype = self.is_image(self.input_file_content)
+        if image_mime_type:
-        except TelegramError:
+            self.mimetype = image_mime_type
-            if self.filename:
+        elif self.filename:
-                self.mimetype = mimetypes.guess_type(self.filename)[0] or DEFAULT_MIME_TYPE
+            self.mimetype = mimetypes.guess_type(self.filename)[0] or DEFAULT_MIME_TYPE
-            else:
+        else:
-                self.mimetype = DEFAULT_MIME_TYPE
+            self.mimetype = DEFAULT_MIME_TYPE
+
         if not self.filename:
             self.filename = self.mimetype.replace('/', '.')
 
@@ -74,21 +75,27 @@ class InputFile:
         return self.filename, self.input_file_content, self.mimetype
 
     @staticmethod
-    def is_image(stream: bytes) -> str:
+    def is_image(stream: bytes) -> Optional[str]:
         """Check if the content file is an image by analyzing its headers.
 
         Args:
             stream (:obj:`bytes`): A byte stream representing the content of a file.
 
         Returns:
-            :obj:`str`: The str mime-type of an image.
+            :obj:`str` | :obj:`None`: The mime-type of an image, if the input is an image, or
+            :obj:`None` else.
 
         """
-        image = imghdr.what(None, stream)
+        try:
-        if image:
+            image = imghdr.what(None, stream)
-            return 'image/%s' % image
+            if image:
-
+                return f'image/{image}'
-        raise TelegramError('Could not parse file content')
+            return None
+        except Exception:
+            logger.debug(
+                "Could not parse file content. Assuming that file is not an image.", exc_info=True
+            )
+            return None
 
     @staticmethod
     def is_file(obj: object) -> bool:

tests/data/text_file.txt

@@ -0,0 +1 @@
+PTB Rocks!

tests/test_inputfile.py

@@ -17,6 +17,7 @@
 #
 # You should have received a copy of the GNU Lesser Public License
 # along with this program.  If not, see [http://www.gnu.org/licenses/].
+import logging
 import os
 import subprocess
 import sys
@@ -48,7 +49,7 @@ class TestInputFile:
             # to kill it.
             pass
 
-    def test_mimetypes(self):
+    def test_mimetypes(self, caplog):
         # Only test a few to make sure logic works okay
         assert InputFile(open('tests/data/telegram.jpg', 'rb')).mimetype == 'image/jpeg'
         assert InputFile(open('tests/data/telegram.webp', 'rb')).mimetype == 'image/webp'
@@ -65,6 +66,13 @@ class TestInputFile:
         )
         assert InputFile(BytesIO(b'blah')).mimetype == 'application/octet-stream'
 
+        # Test string file
+        with caplog.at_level(logging.DEBUG):
+            assert InputFile(open('tests/data/text_file.txt', 'r')).mimetype == 'text/plain'
+
+            assert len(caplog.records) == 1
+            assert caplog.records[0].getMessage().startswith('Could not parse file content')
+
     def test_filenames(self):
         assert InputFile(open('tests/data/telegram.jpg', 'rb')).filename == 'telegram.jpg'
         assert InputFile(open('tests/data/telegram.jpg', 'rb'), filename='blah').filename == 'blah'