Merge pull request #157 from postmasters/fix-None-mimetype

Default to octet-stream if mimetype detection fails.

Author: nathanielmanistaatgoogle

googleapiclient/http.py

@@ -425,7 +425,11 @@ def __init__(self, filename, mimetype=None, chunksize=DEFAULT_CHUNK_SIZE,
     self._filename = filename
     fd = open(self._filename, 'rb')
     if mimetype is None:
-      (mimetype, encoding) = mimetypes.guess_type(filename)
+      # No mimetype provided, make a guess.
+      mimetype, _ = mimetypes.guess_type(filename)
+      if mimetype is None:
+        # Guess failed, use octet-stream.
+        mimetype = 'application/octet-stream'
     super(MediaFileUpload, self).__init__(fd, mimetype, chunksize=chunksize,
                                           resumable=resumable)
 

tests/data/empty

@@ -131,6 +131,13 @@ def test_set_user_agent_nested(self):
 
 class TestMediaUpload(unittest.TestCase):
 
+  def test_media_file_upload_mimetype_detection(self):
+    upload = MediaFileUpload(datafile('small.png'))
+    self.assertEqual('image/png', upload.mimetype())
+
+    upload = MediaFileUpload(datafile('empty'))
+    self.assertEqual('application/octet-stream', upload.mimetype())
+
   def test_media_file_upload_to_from_json(self):
     upload = MediaFileUpload(
         datafile('small.png'), chunksize=500, resumable=True)