aboutsummaryrefslogtreecommitdiff
path: root/googleapiclient
diff options
context:
space:
mode:
Diffstat (limited to 'googleapiclient')
-rw-r--r--googleapiclient/http.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/googleapiclient/http.py b/googleapiclient/http.py
index 41daedcdf..10559c5e5 100644
--- a/googleapiclient/http.py
+++ b/googleapiclient/http.py
@@ -425,7 +425,11 @@ class MediaFileUpload(MediaIoBaseUpload):
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)