spla/Mastodonplus.py
1
0
Fork 0
Codi Incidències Sol·licituds Pull repo.project Llançaments Paquets Wiki Activitat

Use magic for guessing mime type if available

Explorar la Font 
Replace uses of mimetypes.guess_type with guess_type wrapper that uses
magic if available, and falls back to mimetypes if not.
This commit is contained in:
Jason McBrayer 2018-11-12 10:04:15 -05:00
pare 7e2259e3ee
commit 4b7bbe72cd
S'han modificat 1 arxius amb 3 adicions i 3 eliminacions
Mostrar estadístiques Descarregar el fitxer de pedaç Descarregar el fitxer de diferències Expand all files Collapse all files

6
mastodon/Mastodon.py
Veure arxiu

@ -1496,7 +1496,7 @@ class Mastodon:
# Load avatar, if specified # Load avatar, if specified
if not avatar is None: if not avatar is None:
if avatar_mime_type is None and os.path.isfile(avatar): 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') avatar = open(avatar, 'rb')
if avatar_mime_type is None: if avatar_mime_type is None:
@ -1505,7 +1505,7 @@ class Mastodon:
# Load header, if specified # Load header, if specified
if not header is None: if not header is None:
if header_mime_type is None and os.path.isfile(header): 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') header = open(header, 'rb')
if header_mime_type is None: if header_mime_type is None:
@ -1725,7 +1725,7 @@ class Mastodon:
status_post to attach the media file to a toot. status_post to attach the media file to a toot.
""" """
if mime_type is None and os.path.isfile(media_file): 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') media_file = open(media_file, 'rb')
if mime_type is None: if mime_type is None: