chore: reformat with ruff

Author: chalmerlowe

packages/google-cloud-storage/google/cloud/_storage_v2/__init__.py

@@ -13,10 +13,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-from google.cloud._storage_v2 import gapic_version as package_version
+import sys
 
 import google.api_core as api_core
-import sys
+
+from google.cloud._storage_v2 import gapic_version as package_version
 
 __version__ = package_version.__version__
 
@@ -28,65 +29,65 @@
     import importlib_metadata as metadata
 
 
-from .services.storage import StorageClient
-from .services.storage import StorageAsyncClient
-
-from .types.storage import AppendObjectSpec
-from .types.storage import BidiReadHandle
-from .types.storage import BidiReadObjectError
-from .types.storage import BidiReadObjectRedirectedError
-from .types.storage import BidiReadObjectRequest
-from .types.storage import BidiReadObjectResponse
-from .types.storage import BidiReadObjectSpec
-from .types.storage import BidiWriteHandle
-from .types.storage import BidiWriteObjectRedirectedError
-from .types.storage import BidiWriteObjectRequest
-from .types.storage import BidiWriteObjectResponse
-from .types.storage import Bucket
-from .types.storage import BucketAccessControl
-from .types.storage import CancelResumableWriteRequest
-from .types.storage import CancelResumableWriteResponse
-from .types.storage import ChecksummedData
-from .types.storage import CommonObjectRequestParams
-from .types.storage import ComposeObjectRequest
-from .types.storage import ContentRange
-from .types.storage import CreateBucketRequest
-from .types.storage import CustomerEncryption
-from .types.storage import DeleteBucketRequest
-from .types.storage import DeleteObjectRequest
-from .types.storage import GetBucketRequest
-from .types.storage import GetObjectRequest
-from .types.storage import ListBucketsRequest
-from .types.storage import ListBucketsResponse
-from .types.storage import ListObjectsRequest
-from .types.storage import ListObjectsResponse
-from .types.storage import LockBucketRetentionPolicyRequest
-from .types.storage import MoveObjectRequest
-from .types.storage import Object
-from .types.storage import ObjectAccessControl
-from .types.storage import ObjectChecksums
-from .types.storage import ObjectContexts
-from .types.storage import ObjectCustomContextPayload
-from .types.storage import ObjectRangeData
-from .types.storage import Owner
-from .types.storage import ProjectTeam
-from .types.storage import QueryWriteStatusRequest
-from .types.storage import QueryWriteStatusResponse
-from .types.storage import ReadObjectRequest
-from .types.storage import ReadObjectResponse
-from .types.storage import ReadRange
-from .types.storage import ReadRangeError
-from .types.storage import RestoreObjectRequest
-from .types.storage import RewriteObjectRequest
-from .types.storage import RewriteResponse
-from .types.storage import ServiceConstants
-from .types.storage import StartResumableWriteRequest
-from .types.storage import StartResumableWriteResponse
-from .types.storage import UpdateBucketRequest
-from .types.storage import UpdateObjectRequest
-from .types.storage import WriteObjectRequest
-from .types.storage import WriteObjectResponse
-from .types.storage import WriteObjectSpec
+from .services.storage import StorageAsyncClient, StorageClient
+from .types.storage import (
+    AppendObjectSpec,
+    BidiReadHandle,
+    BidiReadObjectError,
+    BidiReadObjectRedirectedError,
+    BidiReadObjectRequest,
+    BidiReadObjectResponse,
+    BidiReadObjectSpec,
+    BidiWriteHandle,
+    BidiWriteObjectRedirectedError,
+    BidiWriteObjectRequest,
+    BidiWriteObjectResponse,
+    Bucket,
+    BucketAccessControl,
+    CancelResumableWriteRequest,
+    CancelResumableWriteResponse,
+    ChecksummedData,
+    CommonObjectRequestParams,
+    ComposeObjectRequest,
+    ContentRange,
+    CreateBucketRequest,
+    CustomerEncryption,
+    DeleteBucketRequest,
+    DeleteObjectRequest,
+    GetBucketRequest,
+    GetObjectRequest,
+    ListBucketsRequest,
+    ListBucketsResponse,
+    ListObjectsRequest,
+    ListObjectsResponse,
+    LockBucketRetentionPolicyRequest,
+    MoveObjectRequest,
+    Object,
+    ObjectAccessControl,
+    ObjectChecksums,
+    ObjectContexts,
+    ObjectCustomContextPayload,
+    ObjectRangeData,
+    Owner,
+    ProjectTeam,
+    QueryWriteStatusRequest,
+    QueryWriteStatusResponse,
+    ReadObjectRequest,
+    ReadObjectResponse,
+    ReadRange,
+    ReadRangeError,
+    RestoreObjectRequest,
+    RewriteObjectRequest,
+    RewriteResponse,
+    ServiceConstants,
+    StartResumableWriteRequest,
+    StartResumableWriteResponse,
+    UpdateBucketRequest,
+    UpdateObjectRequest,
+    WriteObjectRequest,
+    WriteObjectResponse,
+    WriteObjectSpec,
+)
 
 if hasattr(api_core, "check_python_version") and hasattr(
     api_core, "check_dependency_versions"
@@ -97,8 +98,8 @@
     # An older version of api_core is installed which does not define the
     # functions above. We do equivalent checks manually.
     try:
-        import warnings
         import sys
+        import warnings
 
         _py_version_str = sys.version.split()[0]
         _package_label = "google.cloud._storage_v2"

packages/google-cloud-storage/google/cloud/_storage_v2/services/storage/__init__.py

@@ -13,8 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-from .client import StorageClient
 from .async_client import StorageAsyncClient
+from .client import StorageClient
 
 __all__ = (
     "StorageClient",

packages/google-cloud-storage/google/cloud/_storage_v2/services/storage/async_client.py

@@ -14,50 +14,51 @@
 # limitations under the License.
 #
 import logging as std_logging
-from collections import OrderedDict
 import re
+from collections import OrderedDict
 from typing import (
-    Dict,
+    AsyncIterable,
+    AsyncIterator,
+    Awaitable,
     Callable,
+    Dict,
     Mapping,
     MutableMapping,
     MutableSequence,
     Optional,
-    AsyncIterable,
-    Awaitable,
-    AsyncIterator,
     Sequence,
     Tuple,
     Type,
     Union,
 )
 
-from google.cloud._storage_v2 import gapic_version as package_version
-
-from google.api_core.client_options import ClientOptions
+import google.protobuf
 from google.api_core import exceptions as core_exceptions
 from google.api_core import gapic_v1
 from google.api_core import retry_async as retries
+from google.api_core.client_options import ClientOptions
 from google.auth import credentials as ga_credentials  # type: ignore
 from google.oauth2 import service_account  # type: ignore
-import google.protobuf
 
+from google.cloud._storage_v2 import gapic_version as package_version
 
 try:
     OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None]
 except AttributeError:  # pragma: NO COVER
     OptionalRetry = Union[retries.AsyncRetry, object, None]  # type: ignore
 
-from google.cloud._storage_v2.services.storage import pagers
-from google.cloud._storage_v2.types import storage
-from google.longrunning import operations_pb2  # type: ignore
 import google.iam.v1.iam_policy_pb2 as iam_policy_pb2  # type: ignore
 import google.iam.v1.policy_pb2 as policy_pb2  # type: ignore
 import google.protobuf.field_mask_pb2 as field_mask_pb2  # type: ignore
 import google.protobuf.timestamp_pb2 as timestamp_pb2  # type: ignore
-from .transports.base import StorageTransport, DEFAULT_CLIENT_INFO
-from .transports.grpc_asyncio import StorageGrpcAsyncIOTransport
+from google.longrunning import operations_pb2  # type: ignore
+
+from google.cloud._storage_v2.services.storage import pagers
+from google.cloud._storage_v2.types import storage
+
 from .client import StorageClient
+from .transports.base import DEFAULT_CLIENT_INFO, StorageTransport
+from .transports.grpc_asyncio import StorageGrpcAsyncIOTransport
 
 try:
     from google.api_core import client_logging  # type: ignore

packages/google-cloud-storage/google/cloud/_storage_v2/services/storage/client.py

@@ -13,41 +13,41 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-from collections import OrderedDict
-from http import HTTPStatus
 import json
 import logging as std_logging
 import os
 import re
+import warnings
+from collections import OrderedDict
+from http import HTTPStatus
 from typing import (
-    Dict,
     Callable,
+    Dict,
+    Iterable,
+    Iterator,
     Mapping,
     MutableMapping,
     MutableSequence,
     Optional,
-    Iterable,
-    Iterator,
     Sequence,
     Tuple,
     Type,
     Union,
     cast,
 )
-import warnings
-
-from google.cloud._storage_v2 import gapic_version as package_version
 
+import google.protobuf
 from google.api_core import client_options as client_options_lib
 from google.api_core import exceptions as core_exceptions
 from google.api_core import gapic_v1
 from google.api_core import retry as retries
 from google.auth import credentials as ga_credentials  # type: ignore
+from google.auth.exceptions import MutualTLSChannelError  # type: ignore
 from google.auth.transport import mtls  # type: ignore
 from google.auth.transport.grpc import SslCredentials  # type: ignore
-from google.auth.exceptions import MutualTLSChannelError  # type: ignore
 from google.oauth2 import service_account  # type: ignore
-import google.protobuf
+
+from google.cloud._storage_v2 import gapic_version as package_version
 
 try:
     OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None]
@@ -63,14 +63,20 @@
 
 _LOGGER = std_logging.getLogger(__name__)
 
+from google.iam.v1 import (
+    iam_policy_pb2,  # type: ignore
+    policy_pb2,  # type: ignore
+)
+from google.longrunning import operations_pb2  # type: ignore
+from google.protobuf import (
+    field_mask_pb2,  # type: ignore
+    timestamp_pb2,  # type: ignore
+)
+
 from google.cloud._storage_v2.services.storage import pagers
 from google.cloud._storage_v2.types import storage
-from google.iam.v1 import iam_policy_pb2  # type: ignore
-from google.iam.v1 import policy_pb2  # type: ignore
-from google.longrunning import operations_pb2  # type: ignore
-from google.protobuf import field_mask_pb2  # type: ignore
-from google.protobuf import timestamp_pb2  # type: ignore
-from .transports.base import StorageTransport, DEFAULT_CLIENT_INFO
+
+from .transports.base import DEFAULT_CLIENT_INFO, StorageTransport
 from .transports.grpc import StorageGrpcTransport
 from .transports.grpc_asyncio import StorageGrpcAsyncIOTransport
 
@@ -713,8 +719,7 @@ def __init__(
                 )
             if self._client_options.scopes:
                 raise ValueError(
-                    "When providing a transport instance, provide its scopes "
-                    "directly."
+                    "When providing a transport instance, provide its scopes directly."
                 )
             self._transport = cast(StorageTransport, transport)
             self._api_endpoint = self._transport.host

packages/google-cloud-storage/google/cloud/_storage_v2/services/storage/pagers.py

@@ -13,21 +13,22 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-from google.api_core import gapic_v1
-from google.api_core import retry as retries
-from google.api_core import retry_async as retries_async
 from typing import (
     Any,
     AsyncIterator,
     Awaitable,
     Callable,
+    Iterator,
+    Optional,
     Sequence,
     Tuple,
-    Optional,
-    Iterator,
     Union,
 )
 
+from google.api_core import gapic_v1
+from google.api_core import retry as retries
+from google.api_core import retry_async as retries_async
+
 try:
     OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None]
     OptionalAsyncRetry = Union[
@@ -66,7 +67,7 @@ def __init__(
         *,
         retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: Union[float, object] = gapic_v1.method.DEFAULT,
-        metadata: Sequence[Tuple[str, Union[str, bytes]]] = ()
+        metadata: Sequence[Tuple[str, Union[str, bytes]]] = (),
     ):
         """Instantiate the pager.
 
@@ -142,7 +143,7 @@ def __init__(
         *,
         retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT,
         timeout: Union[float, object] = gapic_v1.method.DEFAULT,
-        metadata: Sequence[Tuple[str, Union[str, bytes]]] = ()
+        metadata: Sequence[Tuple[str, Union[str, bytes]]] = (),
     ):
         """Instantiates the pager.
 
@@ -222,7 +223,7 @@ def __init__(
         *,
         retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: Union[float, object] = gapic_v1.method.DEFAULT,
-        metadata: Sequence[Tuple[str, Union[str, bytes]]] = ()
+        metadata: Sequence[Tuple[str, Union[str, bytes]]] = (),
     ):
         """Instantiate the pager.
 
@@ -298,7 +299,7 @@ def __init__(
         *,
         retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT,
         timeout: Union[float, object] = gapic_v1.method.DEFAULT,
-        metadata: Sequence[Tuple[str, Union[str, bytes]]] = ()
+        metadata: Sequence[Tuple[str, Union[str, bytes]]] = (),
     ):
         """Instantiates the pager.
 

packages/google-cloud-storage/google/cloud/_storage_v2/services/storage/transports/__init__.py

@@ -20,7 +20,6 @@
 from .grpc import StorageGrpcTransport
 from .grpc_asyncio import StorageGrpcAsyncIOTransport
 
-
 # Compile a registry of transports.
 _transport_registry = OrderedDict()  # type: Dict[str, Type[StorageTransport]]
 _transport_registry["grpc"] = StorageGrpcTransport