From 63bea16b603fc506e685cb5f1356e1a04833488e Mon Sep 17 00:00:00 2001 From: fitnr Date: Thu, 12 Nov 2015 22:28:23 -0500 Subject: [PATCH] fix file type sanity check in upload --- tweepy/api.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tweepy/api.py b/tweepy/api.py index 7f23822..46a7904 100644 --- a/tweepy/api.py +++ b/tweepy/api.py @@ -1382,10 +1382,11 @@ class API(object): fp = f # image must be gif, jpeg, or png - file_type = mimetypes.guess_type(filename) + file_type, _ = mimetypes.guess_type(filename) + if file_type is None: raise TweepError('Could not determine file type') - file_type = file_type[0] + if file_type not in IMAGE_MIMETYPES: raise TweepError('Invalid file type for image: %s' % file_type) @@ -1442,10 +1443,11 @@ class API(object): raise TweepError('File input for APPEND is mandatory.') # video must be mp4 - file_type = mimetypes.guess_type(filename) + file_type, _ = mimetypes.guess_type(filename) + if file_type is None: raise TweepError('Could not determine file type') - file_type = file_type[0] + if file_type not in ['video/mp4']: raise TweepError('Invalid file type for video: %s' % file_type) -- 2.25.1