chore: tidy flow control in checksum lookups / usage (#255)

Co-authored-by: cojenco <cathyo@google.com>
googleapis · Aug 25, 2021 · fcc24fc · fcc24fc
1 parent a7ae872
commit fcc24fc
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 15 deletions.
diff --git a/google/_async_resumable_media/_upload.py b/google/_async_resumable_media/_upload.py
@@ -277,7 +277,7 @@ def _prepare_request(self, data, metadata, content_type):
 
         checksum_object = sync_helpers._get_checksum_object(self._checksum_type)
 
-        if checksum_object:
+        if checksum_object is not None:
             checksum_object.update(data)
             actual_checksum = sync_helpers.prepare_checksum_digest(
                 checksum_object.digest()

diff --git a/google/_async_resumable_media/requests/download.py b/google/_async_resumable_media/requests/download.py
@@ -90,10 +90,7 @@ async def _write_to_stream(self, response):
             self._stream.write(chunk)
             local_checksum_object.update(chunk)
 
-        if expected_checksum is None:
-            return
-
-        else:
+        if expected_checksum is not None:
             actual_checksum = sync_helpers.prepare_checksum_digest(
                 checksum_object.digest()
             )
@@ -216,9 +213,7 @@ async def _write_to_stream(self, response):
             self._stream.write(chunk)
             checksum_object.update(chunk)
 
-        if expected_checksum is None:
-            return
-        else:
+        if expected_checksum is not None:
             actual_checksum = sync_helpers.prepare_checksum_digest(
                 checksum_object.digest()
             )

diff --git a/google/resumable_media/_upload.py b/google/resumable_media/_upload.py
@@ -289,7 +289,7 @@ def _prepare_request(self, data, metadata, content_type):
             raise TypeError("`data` must be bytes, received", type(data))
 
         checksum_object = _helpers._get_checksum_object(self._checksum_type)
-        if checksum_object:
+        if checksum_object is not None:
             checksum_object.update(data)
             actual_checksum = _helpers.prepare_checksum_digest(checksum_object.digest())
             metadata_key = _helpers._get_metadata_key(self._checksum_type)

diff --git a/google/resumable_media/requests/download.py b/google/resumable_media/requests/download.py
@@ -106,9 +106,7 @@ def _write_to_stream(self, response):
                 self._stream.write(chunk)
                 local_checksum_object.update(chunk)
 
-        if expected_checksum is None:
-            return
-        else:
+        if expected_checksum is not None:
             actual_checksum = _helpers.prepare_checksum_digest(checksum_object.digest())
             if actual_checksum != expected_checksum:
                 msg = _CHECKSUM_MISMATCH.format(
@@ -242,9 +240,7 @@ def _write_to_stream(self, response):
                 checksum_object.update(chunk)
             response._content_consumed = True
 
-        if expected_checksum is None:
-            return
-        else:
+        if expected_checksum is not None:
             actual_checksum = _helpers.prepare_checksum_digest(checksum_object.digest())
 
             if actual_checksum != expected_checksum: