1 files changed, 23 insertions, 8 deletions

diff --git a/mastodon/Mastodon.py b/mastodon/Mastodon.py
index e890b6d..fc585ba 100644
--- a/mastodon/Mastodon.py
+++ b/mastodon/Mastodon.py
@@ -31,6 +31,11 @@ try:
 except ImportError:
     from urlparse import urlparse
 
+try:
+    import magic
+except ImportError:
+    magic = None
+
 ###
 # Version check functions, including decorator and parser
 ###
@@ -895,8 +900,8 @@ class Mastodon:
             if "status" in filter_object:
                 filter_status = filter_object["status"]
             filter_text = filter_status["content"]
-            filter_text = re.sub("<.*?>", " ", filter_text)
-            filter_text = re.sub('\s+', ' ', filter_text).strip()
+            filter_text = re.sub(r"<.*?>", " ", filter_text)
+            filter_text = re.sub(r"\s+", " ", filter_text).strip()
             if not filter_re.search(filter_text):
                 filter_results.append(filter_object)
         return filter_results
@@ -1500,8 +1505,8 @@ 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]
+            if avatar_mime_type is None and (isinstance(avatar, str) and os.path.isfile(avatar)):
+                avatar_mime_type = guess_type(avatar)
                 avatar = open(avatar, 'rb')
 
             if avatar_mime_type is None:
@@ -1509,8 +1514,8 @@ 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]
+            if header_mime_type is None and (isinstance(avatar, str) and os.path.isfile(header)):
+                header_mime_type = guess_type(header)
                 header = open(header, 'rb')
 
             if header_mime_type is None:
@@ -1729,8 +1734,10 @@ class Mastodon:
         Returns a `media dict`_. This contains the id that can be used in
         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]
+        if mime_type is None and (isinstance(media_file, str) and os.path.isfile(media_file)):
+            mime_type = guess_type(media_file)
+            media_file = open(media_file, 'rb')
+        elif isinstance(media_file, str) and os.path.isfile(media_file):
             media_file = open(media_file, 'rb')
 
         if mime_type is None:
@@ -2539,3 +2546,11 @@ class MastodonRatelimitError(MastodonError):
 class MastodonMalformedEventError(MastodonError):
     """Raised when the server-sent event stream is malformed"""
     pass
+
+def guess_type(media_file):
+    mime_type = None
+    if magic:
+        mime_type = magic.from_file(media_file, mime=True)
+    else:
+        mime_type = mimetypes.guess_type(media_file)[0]
+    return mime_type