Merge branch 'master' of git://github.com/tgbot-collection/python-twi…

…tter into tgbot-collection-master
bear · Dec 19, 2021 · c6c87fe · c6c87fe
2 parents 0b325af + 913644a
commit c6c87fe
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -1,2 +1,3 @@
 requests
 requests-oauthlib
+filetype
diff --git a/setup.py b/setup.py
@@ -70,7 +70,7 @@ def extract_metaitem(meta):
     download_url=extract_metaitem('download_url'),
     packages=find_packages(exclude=('tests', 'docs')),
     platforms=['Any'],
-    install_requires=['requests', 'requests-oauthlib'],
+    install_requires=['requests', 'requests-oauthlib', 'filetype'],
     tests_require=['pytest'],
     keywords='twitter api',
     classifiers=[

diff --git a/twitter/twitter_utils.py b/twitter/twitter_utils.py
@@ -2,7 +2,7 @@
 """Collection of utilities for use in API calls, functions."""
 from __future__ import unicode_literals
 
-import mimetypes
+import filetype
 import os
 import re
 import sys
@@ -274,10 +274,7 @@ def parse_media_file(passed_media, async_upload=False):
     except Exception as e:
         pass
 
-    media_type = mimetypes.guess_type(os.path.basename(filename))[0]
-    # The .srt extension is not recognised by the mimetypes module.
-    if os.path.basename(filename).endswith('.srt'):
-        media_type = 'text/srt'
+    media_type = filetype.guess_mime(data_file.name)
     if media_type is not None:
         if media_type in img_formats and file_size > 5 * 1048576:
             raise TwitterError({'message': 'Images must be less than 5MB.'})