Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 2 additions & 3 deletions storage/google/cloud/storage/blob.py
Original file line number Diff line number Diff line change
Expand Up @@ -414,9 +414,8 @@ def _do_download(self, transport, file_obj, download_url, headers):
:param headers: Optional headers to be sent with the request(s).
"""
if self.chunk_size is None:
download = Download(download_url, headers=headers)
response = download.consume(transport)
file_obj.write(response.content)
download = Download(download_url, stream=file_obj, headers=headers)
download.consume(transport)
else:
download = ChunkedDownload(
download_url, self.chunk_size, file_obj, headers=headers)
Expand Down
2 changes: 1 addition & 1 deletion storage/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
REQUIREMENTS = [
'google-cloud-core >= 0.25.0, < 0.26dev',
'google-auth >= 1.0.0',
'google-resumable-media >= 0.2.1',
'google-resumable-media >= 0.2.2',
'requests >= 2.0.0',
]

Expand Down
25 changes: 18 additions & 7 deletions storage/tests/unit/test_blob.py
Original file line number Diff line number Diff line change
Expand Up @@ -375,13 +375,20 @@ def test__get_download_url_on_the_fly_with_generation(self):
self.assertEqual(download_url, expected_url)

@staticmethod
def _mock_requests_response(status_code, headers, content=b''):
def _mock_requests_response(
status_code, headers, content=b'', stream=False):
import requests

response = requests.Response()
response.status_code = status_code
response.headers.update(headers)
response._content = content
if stream:
response.raw = io.BytesIO(content)
response._content = False
else:
response.raw = None
response._content = content

response.request = requests.Request(
'POST', 'http://example.com').prepare()
return response
Expand Down Expand Up @@ -429,7 +436,9 @@ def test__do_download_simple(self):
transport.request.return_value = self._mock_requests_response(
http_client.OK,
{'content-length': '6', 'content-range': 'bytes 0-5/6'},
content=b'abcdef')
content=b'abcdef',
stream=True,
)
file_obj = io.BytesIO()
download_url = 'http://test.invalid'
headers = {}
Expand All @@ -438,7 +447,7 @@ def test__do_download_simple(self):
self.assertEqual(file_obj.getvalue(), b'abcdef')

transport.request.assert_called_once_with(
'GET', download_url, data=None, headers=headers)
'GET', download_url, data=None, headers=headers, stream=True)

def test__do_download_chunked(self):
blob_name = 'blob-name'
Expand Down Expand Up @@ -493,7 +502,7 @@ def test_download_to_file_with_failure(self):
self.assertEqual(file_obj.tell(), 0)
# Check that the transport was called once.
transport.request.assert_called_once_with(
'GET', blob.media_link, data=None, headers={})
'GET', blob.media_link, data=None, headers={}, stream=True)

def test_download_to_file_wo_media_link(self):
blob_name = 'blob-name'
Expand Down Expand Up @@ -535,7 +544,9 @@ def _download_to_file_helper(self, use_chunks=False):
single_chunk_response = self._mock_requests_response(
http_client.OK,
{'content-length': '6', 'content-range': 'bytes 0-5/6'},
content=b'abcdef')
content=b'abcdef',
stream=True,
)
transport.request.side_effect = [single_chunk_response]

file_obj = io.BytesIO()
Expand All @@ -546,7 +557,7 @@ def _download_to_file_helper(self, use_chunks=False):
self._check_session_mocks(client, transport, media_link)
else:
transport.request.assert_called_once_with(
'GET', media_link, data=None, headers={})
'GET', media_link, data=None, headers={}, stream=True)

def test_download_to_file_default(self):
self._download_to_file_helper()
Expand Down