coverage and test

Author: andrewsg

google/cloud/storage/_helpers.py

@@ -52,6 +52,7 @@
  "object, or None, instead."
 )
 
+
 def _get_storage_host():
  return os.environ.get(STORAGE_EMULATOR_ENV_VAR, _DEFAULT_STORAGE_HOST)
 
@@ -593,9 +594,13 @@ def _api_core_retry_to_resumable_media_retry(retry, num_retries=None):
  raise ValueError("num_retries and retry arguments are mutually exclusive")
 
  elif retry is not None:
- return resumable_media.RetryStrategy(max_sleep=retry._maximum, max_cumulative_retry=retry._deadline, initial_delay=retry._initial, multiplier=retry._multiplier)
+ return resumable_media.RetryStrategy(
+ max_sleep=retry._maximum,
+ max_cumulative_retry=retry._deadline,
+ initial_delay=retry._initial,
+ multiplier=retry._multiplier,
+ )
  elif num_retries is not None:
  return resumable_media.RetryStrategy(max_retries=num_retries)
  else:
  return resumable_media.RetryStrategy(max_retries=0)
-

google/cloud/storage/blob.py

@@ -1754,7 +1754,9 @@ def _do_multipart_upload(
  upload_url = _add_query_parameters(base_url, name_value_pairs)
  upload = MultipartUpload(upload_url, headers=headers, checksum=checksum)
 
- upload._retry_strategy = _api_core_retry_to_resumable_media_retry(retry, num_retries)
+ upload._retry_strategy = _api_core_retry_to_resumable_media_retry(
+ retry, num_retries
+ )
 
  response = upload.transmit(
  transport, data, object_metadata, content_type, timeout=timeout
@@ -1936,7 +1938,9 @@ def _initiate_resumable_upload(
  upload_url, chunk_size, headers=headers, checksum=checksum
  )
 
- upload._retry_strategy = _api_core_retry_to_resumable_media_retry(retry, num_retries)
+ upload._retry_strategy = _api_core_retry_to_resumable_media_retry(
+ retry, num_retries
+ )
 
  upload.initiate(
  transport,
@@ -2092,7 +2096,7 @@ def _do_upload(
  if_metageneration_not_match,
  timeout=_DEFAULT_TIMEOUT,
  checksum=None,
- retry=None
+ retry=None,
  ):
  """Determine an upload strategy and then perform the upload.
 
@@ -2192,7 +2196,10 @@ def _do_upload(
  # arguments into query_params dictionaries. Media operations work
  # differently, so here we make a "fake" query_params to feed to the
  # ConditionalRetryPolicy.
- query_params = {"ifGenerationMatch": if_generation_match, "ifMetagenerationMatch": if_metageneration_match}
+ query_params = {
+ "ifGenerationMatch": if_generation_match,
+ "ifMetagenerationMatch": if_metageneration_match,
+ }
  retry = retry.get_retry_policy_if_conditions_met(query_params=query_params)
 
  if size is not None and size <= _MAX_MULTIPART_SIZE:
@@ -2395,7 +2402,7 @@ def upload_from_file(
  if_metageneration_not_match,
  timeout=timeout,
  checksum=checksum,
- retry=retry
+ retry=retry,
  )
  self._set_properties(created_json)
  except resumable_media.InvalidResponse as exc:
@@ -3524,7 +3531,7 @@ def open(
  "retry". For uploads only, the following additional arguments are
  supported: "content_type", "num_retries", "predefined_acl",
  "checksum". "num_retries" is supported for backwards-compatibility
- reasons only; please use "retry" with a Retry object or 
+ reasons only; please use "retry" with a Retry object or
  ConditionalRetryPolicy instead.
 
  :returns: A 'BlobReader' or 'BlobWriter' from

google/cloud/storage/client.py

@@ -711,7 +711,10 @@ def download_blob_to_file(
  # arguments into query_params dictionaries. Media operations work
  # differently, so here we make a "fake" query_params to feed to the
  # ConditionalRetryPolicy.
- query_params = {"ifGenerationMatch": if_generation_match, "ifMetagenerationMatch": if_metageneration_match}
+ query_params = {
+ "ifGenerationMatch": if_generation_match,
+ "ifMetagenerationMatch": if_metageneration_match,
+ }
  retry = retry.get_retry_policy_if_conditions_met(query_params=query_params)
 
  if not isinstance(blob_or_uri, Blob):

google/cloud/storage/fileio.py

@@ -66,8 +66,6 @@ class BlobReader(io.BufferedIOBase):
  bytes than the chunk_size are requested, the remainder is buffered.
  The default is the chunk_size of the blob, or 40MiB.
 
- 
-
  :param download_kwargs: Keyword arguments to pass to the underlying API
  calls. The following arguments are supported: "if_generation_match",
  "if_generation_not_match", "if_metageneration_match",
@@ -86,7 +84,7 @@ def __init__(self, blob, chunk_size=None, retry=DEFAULT_RETRY, **download_kwargs
  self._pos = 0
  self._buffer = io.BytesIO()
  self._chunk_size = chunk_size or blob.chunk_size or DEFAULT_CHUNK_SIZE
- self._retry=retry
+ self._retry = retry
  self._download_kwargs = download_kwargs
 
  def read(self, size=-1):
@@ -216,7 +214,14 @@ class BlobWriter(io.BufferedIOBase):
  "num_retries", "predefined_acl", "checksum".
  """
 
- def __init__(self, blob, chunk_size=None, text_mode=False, retry=DEFAULT_RETRY_IF_METAGENERATION_SPECIFIED, **upload_kwargs):
+ def __init__(
+ self,
+ blob,
+ chunk_size=None,
+ text_mode=False,
+ retry=DEFAULT_RETRY_IF_METAGENERATION_SPECIFIED,
+ **upload_kwargs
+ ):
  for kwarg in upload_kwargs:
  if kwarg not in VALID_UPLOAD_KWARGS:
  raise ValueError(
@@ -291,7 +296,12 @@ def _initiate_upload(self):
  # arguments into query_params dictionaries. Media operations work
  # differently, so here we make a "fake" query_params to feed to the
  # ConditionalRetryPolicy.
- query_params = {"ifGenerationMatch": self._upload_kwargs.get("if_generation_match"), "ifMetagenerationMatch": self._upload_kwargs.get("if_metageneration_match")}
+ query_params = {
+ "ifGenerationMatch": self._upload_kwargs.get("if_generation_match"),
+ "ifMetagenerationMatch": self._upload_kwargs.get(
+ "if_metageneration_match"
+ ),
+ }
  retry = retry.get_retry_policy_if_conditions_met(query_params=query_params)
 
  self._upload_and_transport = self._blob._initiate_resumable_upload(

tests/unit/test__helpers.py

@@ -558,13 +558,17 @@ def test_hostname_and_scheme(self):
 
 class Test__api_core_retry_to_resumable_media_retry(unittest.TestCase):
  def test_conflict(self):
- from google.cloud.storage._helpers import _api_core_retry_to_resumable_media_retry
+ from google.cloud.storage._helpers import (
+ _api_core_retry_to_resumable_media_retry,
+ )
 
  with self.assertRaises(ValueError):
  _api_core_retry_to_resumable_media_retry(retry=DEFAULT_RETRY, num_retries=2)
 
  def test_retry(self):
- from google.cloud.storage._helpers import _api_core_retry_to_resumable_media_retry
+ from google.cloud.storage._helpers import (
+ _api_core_retry_to_resumable_media_retry,
+ )
 
  retry_strategy = _api_core_retry_to_resumable_media_retry(retry=DEFAULT_RETRY)
  self.assertEqual(retry_strategy.max_sleep, DEFAULT_RETRY._maximum)
@@ -573,13 +577,19 @@ def test_retry(self):
  self.assertEqual(retry_strategy.multiplier, DEFAULT_RETRY._multiplier)
 
  def test_num_retries(self):
- from google.cloud.storage._helpers import _api_core_retry_to_resumable_media_retry
+ from google.cloud.storage._helpers import (
+ _api_core_retry_to_resumable_media_retry,
+ )
 
- retry_strategy = _api_core_retry_to_resumable_media_retry(retry=None, num_retries=2)
+ retry_strategy = _api_core_retry_to_resumable_media_retry(
+ retry=None, num_retries=2
+ )
  self.assertEqual(retry_strategy.max_retries, 2)
 
  def test_none(self):
- from google.cloud.storage._helpers import _api_core_retry_to_resumable_media_retry
+ from google.cloud.storage._helpers import (
+ _api_core_retry_to_resumable_media_retry,
+ )
 
  retry_strategy = _api_core_retry_to_resumable_media_retry(retry=None)
  self.assertEqual(retry_strategy.max_retries, 0)