From 4b7bbe72cd58487612543543fec6dba6c6fe0566 Mon Sep 17 00:00:00 2001 From: Jason McBrayer Date: Mon, 12 Nov 2018 10:04:15 -0500 Subject: [PATCH] Use magic for guessing mime type if available Replace uses of mimetypes.guess_type with guess_type wrapper that uses magic if available, and falls back to mimetypes if not. --- mastodon/Mastodon.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mastodon/Mastodon.py b/mastodon/Mastodon.py index a2035c9..c8dc6e4 100644 --- a/mastodon/Mastodon.py +++ b/mastodon/Mastodon.py @@ -1496,7 +1496,7 @@ class Mastodon: # Load avatar, if specified if not avatar is None: if avatar_mime_type is None and os.path.isfile(avatar): - avatar_mime_type = mimetypes.guess_type(avatar)[0] + avatar_mime_type = guess_type(avatar) avatar = open(avatar, 'rb') if avatar_mime_type is None: @@ -1505,7 +1505,7 @@ class Mastodon: # Load header, if specified if not header is None: if header_mime_type is None and os.path.isfile(header): - header_mime_type = mimetypes.guess_type(header)[0] + header_mime_type = guess_type(header) header = open(header, 'rb') if header_mime_type is None: @@ -1725,7 +1725,7 @@ class Mastodon: status_post to attach the media file to a toot. """ if mime_type is None and os.path.isfile(media_file): - mime_type = mimetypes.guess_type(media_file)[0] + mime_type = guess_type(media_file) media_file = open(media_file, 'rb') if mime_type is None: