From bc75b7a457a11fa5938a3d1e8eb8609ebb23a08d Mon Sep 17 00:00:00 2001 From: Harmon Date: Tue, 12 Jan 2021 07:35:48 -0600 Subject: [PATCH] Improve clarity of API.media_upload --- tweepy/api.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/tweepy/api.py b/tweepy/api.py index 85a5678..1f46c20 100644 --- a/tweepy/api.py +++ b/tweepy/api.py @@ -240,17 +240,16 @@ class API: file_type = imghdr.what(filename, h=h) or mimetypes.guess_type(filename)[0] size_bytes = os.path.getsize(filename) - if file_type in IMAGE_TYPES or file_type in CHUNKED_TYPES: - if size_bytes > MAX_UPLOAD_SIZE_CHUNKED * 1024: - raise TweepError(f'Media files must be smaller than {MAX_UPLOAD_SIZE_CHUNKED} kb') - - if file_type in IMAGE_TYPES and size_bytes < MAX_UPLOAD_SIZE_STANDARD * 1024: - return self.image_upload(filename, MAX_UPLOAD_SIZE_STANDARD * 1024, file_type=file_type, f=f, *args, **kwargs) + if file_type not in IMAGE_TYPES and file_type not in CHUNKED_TYPES: + raise TweepError(f'unsupported media type: {file_type}') + if size_bytes > MAX_UPLOAD_SIZE_CHUNKED * 1024: + raise TweepError(f'Media files must be smaller than {MAX_UPLOAD_SIZE_CHUNKED} kb') + if file_type in IMAGE_TYPES and size_bytes < MAX_UPLOAD_SIZE_STANDARD * 1024: + return self.image_upload(filename, MAX_UPLOAD_SIZE_STANDARD * 1024, file_type=file_type, f=f, *args, **kwargs) + else: return self.upload_chunked(filename, f=f, file_type=file_type, *args, **kwargs) - raise TweepError(f'unsupported media type: {file_type}') - def image_upload(self, filename, max_size, *args, **kwargs): """ :reference: https://developer.twitter.com/en/docs/media/upload-media/api-reference/post-media-upload :allowed_param: -- 2.25.1