Merge pull request #439 from bear/fix/issue433

Fix to upload video/gifs to correct endpoint if filesize < self.chunk_size

Author: jeremylow

tests/test_api_30.py

@@ -2,9 +2,15 @@
 from __future__ import unicode_literals, print_function
 
 import json
+import os
 import re
 import sys
+from tempfile import NamedTemporaryFile
 import unittest
+try:
+    from unittest.mock import patch
+except ImportError:
+    from mock import patch
 import warnings
 
 import twitter
@@ -1713,3 +1719,16 @@ def test_UpdateBackgroundImage_deprecation(self):
         with warnings.catch_warnings(record=True) as w:
             resp = self.api.UpdateBackgroundImage(image='testdata/168NQ.jpg')
             self.assertTrue(issubclass(w[0].category, DeprecationWarning))
+
+    @responses.activate
+    @patch('twitter.api.Api.UploadMediaChunked')
+    def test_UploadSmallVideoUsesChunkedData(self, mocker):
+        responses.add(POST, DEFAULT_URL, body='{}')
+        video = NamedTemporaryFile(suffix='.mp4')
+        video.write(b'10' * 1024)
+        video.seek(0, 0)
+
+        resp = self.api.PostUpdate('test', media=video)
+        assert os.path.getsize(video.name) <= 1024 * 1024
+        assert isinstance(resp, twitter.Status)
+        assert twitter.api.Api.UploadMediaChunked.called

twitter/api.py

@@ -1024,6 +1024,7 @@ def PostUpdate(self,
             parameters['attachment_url'] = attachment_url
 
         if media:
+            chunked_types = ['video/mp4', 'video/quicktime', 'image/gif']
             media_ids = []
             if isinstance(media, int):
                 media_ids.append(media)
@@ -1039,9 +1040,8 @@ def PostUpdate(self,
                     _, _, file_size, media_type = parse_media_file(media_file)
                     if media_type == 'image/gif' or media_type == 'video/mp4':
                         raise TwitterError(
-                            'You cannot post more than 1 GIF or 1 video in a '
-                            'single status.')
-                    if file_size > self.chunk_size:
+                            'You cannot post more than 1 GIF or 1 video in a single status.')
+                    if file_size > self.chunk_size or media_type in chunked_types:
                         media_id = self.UploadMediaChunked(
                             media=media_file,
                             additional_owners=media_additional_owners,
@@ -1053,13 +1053,11 @@ def PostUpdate(self,
                             media_category=media_category)
                     media_ids.append(media_id)
             else:
-                _, _, file_size, _ = parse_media_file(media)
-                if file_size > self.chunk_size:
-                    media_ids.append(
-                        self.UploadMediaChunked(media, media_additional_owners))
+                _, _, file_size, media_type = parse_media_file(media)
+                if file_size > self.chunk_size or media_type in chunked_types:
+                    media_ids.append(self.UploadMediaChunked(media, media_additional_owners))
                 else:
-                    media_ids.append(
-                        self.UploadMediaSimple(media, media_additional_owners))
+                    media_ids.append(self.UploadMediaSimple(media, media_additional_owners))
             parameters['media_ids'] = ','.join([str(mid) for mid in media_ids])
 
         if latitude is not None and longitude is not None:

twitter/twitter_utils.py

@@ -223,8 +223,8 @@ def parse_media_file(passed_media):
     # Otherwise, if a file object was passed in the first place,
     # create the standard reference to media_file (i.e., rename it to fp).
     else:
-        if passed_media.mode != 'rb':
-            raise TwitterError({'message': 'File mode must be "rb".'})
+        if passed_media.mode not in ['rb', 'rb+', 'w+b']:
+            raise TwitterError('File mode must be "rb" or "rb+"')
         filename = os.path.basename(passed_media.name)
         data_file = passed_media