Skip to content

fix: MediaFileUpload error if file does not exist #1127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gcf-merge-on-green merged 4 commits into from
Dec 9, 2020
Merged

fix: MediaFileUpload error if file does not exist #1127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a6e651d
fix: MediaFileUpload error if file does not exist
parthea Dec 7, 2020
7acba97
Add MediaFileUpload test where file does not exist
parthea Dec 8, 2020
a39e8d1
Merge branch 'master' into fix-mediafileupload-invalid-file-exception
parthea Dec 9, 2020
d1614ea
Merge branch 'master' into fix-mediafileupload-invalid-file-exception
parthea Dec 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions googleapiclient/http.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,20 +573,22 @@ def __init__(
resumable: bool, True if this is a resumable upload. False means upload
in a single request.
"""
self._fd = None
self._filename = filename
fd = open(self._filename, "rb")
self._fd = open(self._filename, "rb")
if mimetype is None:
# 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
self._fd, mimetype, chunksize=chunksize, resumable=resumable
)

def __del__(self):
self._fd.close()
if self._fd:
self._fd.close()

def to_json(self):
"""Creating a JSON representation of an instance of MediaFileUpload.
Expand Down
4 changes: 4 additions & 0 deletions tests/test_http.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,10 @@ def test_media_file_upload_to_from_json(self):
self.assertEqual(500, new_upload.chunksize())
self.assertEqual(b"PNG", new_upload.getbytes(1, 3))

def test_media_file_upload_raises_on_file_not_found(self):
with self.assertRaises(FileNotFoundError):
MediaFileUpload(datafile("missing.png"))

def test_media_file_upload_raises_on_invalid_chunksize(self):
self.assertRaises(
InvalidChunkSizeError,
Expand Down