style: minor formatting and import cleanup

Author: zhixiangli

packages/google-cloud-storage/google/cloud/storage/asyncio/async_multi_range_downloader.py

@@ -25,6 +25,11 @@
 
 from google.cloud import _storage_v2
 from google.cloud.storage._helpers import generate_random_56_bit_integer
+from google.cloud.storage.asyncio._stream_multiplexer import (
+    _StreamEnd,
+    _StreamError,
+    _StreamMultiplexer,
+)
 from google.cloud.storage.asyncio.async_grpc_client import (
     AsyncGrpcClient,
 )
@@ -39,12 +44,6 @@
     _DownloadState,
     _ReadResumptionStrategy,
 )
-from google.cloud.storage.asyncio._stream_multiplexer import (
-    _StreamMultiplexer,
-    _StreamError,
-    _StreamEnd,
-)
-
 
 from ._utils import raise_if_no_fast_crc32c
 
@@ -358,9 +357,7 @@ async def factory():
                     )
                 )
 
-            await stream.open(
-                metadata=current_metadata if current_metadata else None
-            )
+            await stream.open(metadata=current_metadata if current_metadata else None)
 
             if stream.generation_number:
                 self.generation = stream.generation_number
@@ -459,17 +456,18 @@ async def generator():
 
                     # Reopen stream if needed
                     should_reopen = (
-                        (attempt_count > 1 and last_broken_generation is not None)
-                        or (attempt_count == 1 and metadata is not None)
-                    )
+                        attempt_count > 1 and last_broken_generation is not None
+                    ) or (attempt_count == 1 and metadata is not None)
                     if should_reopen:
                         broken_gen = (
                             last_broken_generation
                             if attempt_count > 1
                             else self._multiplexer.stream_generation
                         )
                         stream_factory = self._create_stream_factory(state, metadata)
-                        await self._multiplexer.reopen_stream(broken_gen, stream_factory)
+                        await self._multiplexer.reopen_stream(
+                            broken_gen, stream_factory
+                        )
 
                     my_generation = self._multiplexer.stream_generation
 
@@ -478,9 +476,7 @@ async def generator():
                     for i in range(
                         0, len(requests), _MAX_READ_RANGES_PER_BIDI_READ_REQUEST
                     ):
-                        batch = requests[
-                            i : i + _MAX_READ_RANGES_PER_BIDI_READ_REQUEST
-                        ]
+                        batch = requests[i : i + _MAX_READ_RANGES_PER_BIDI_READ_REQUEST]
                         try:
                             await self._multiplexer.send(
                                 _storage_v2.BidiReadObjectRequest(read_ranges=batch)

packages/google-cloud-storage/tests/system/test_zonal.py

@@ -1,8 +1,8 @@
 # py standard imports
-import random
 import asyncio
 import gc
 import os
+import random
 import uuid
 from io import BytesIO
 

packages/google-cloud-storage/tests/unit/asyncio/test_async_multi_range_downloader.py

@@ -213,9 +213,7 @@ async def controlled_recv():
         second_buffer = BytesIO()
 
         task1 = asyncio.create_task(mock_mrd.download_ranges([(0, 18, buffer)]))
-        task2 = asyncio.create_task(
-            mock_mrd.download_ranges([(10, 6, second_buffer)])
-        )
+        task2 = asyncio.create_task(mock_mrd.download_ranges([(10, 6, second_buffer)]))
         await asyncio.gather(task1, task2)
 
         assert buffer.getvalue() == data
@@ -323,10 +321,10 @@ def test_init_raises_if_crc32c_c_extension_is_missing(self, mock_google_crc32c):
     async def test_download_ranges_raises_on_checksum_mismatch(
         self, mock_checksum_class
     ):
+        from google.cloud.storage.asyncio._stream_multiplexer import _StreamMultiplexer
         from google.cloud.storage.asyncio.async_multi_range_downloader import (
             AsyncMultiRangeDownloader,
         )
-        from google.cloud.storage.asyncio._stream_multiplexer import _StreamMultiplexer
 
         mock_client = mock.MagicMock()
         mock_stream = mock.AsyncMock(

packages/google-cloud-storage/tests/unit/asyncio/test_stream_multiplexer.py

@@ -13,15 +13,16 @@
 # limitations under the License.
 
 import asyncio
-import pytest
 from unittest.mock import AsyncMock, MagicMock
 
+import pytest
+
 from google.cloud import _storage_v2
 from google.cloud.storage.asyncio._stream_multiplexer import (
-    _StreamMultiplexer,
-    _StreamError,
-    _StreamEnd,
     _DEFAULT_QUEUE_MAX_SIZE,
+    _StreamEnd,
+    _StreamError,
+    _StreamMultiplexer,
 )
 
 
@@ -291,7 +292,9 @@ async def test_send_forwards_to_stream(self):
         mux = _StreamMultiplexer(mock_stream)
 
         request = _storage_v2.BidiReadObjectRequest(
-            read_ranges=[_storage_v2.ReadRange(read_id=1, read_offset=0, read_length=10)]
+            read_ranges=[
+                _storage_v2.ReadRange(read_id=1, read_offset=0, read_length=10)
+            ]
         )
         gen = await mux.send(request)
         mock_stream.send.assert_called_once_with(request)