style: fix linting and formatting issues

Author: sinhasubham

google/cloud/spanner_dbapi/cursor.py

@@ -520,13 +520,13 @@ def _fetch(self, cursor_statement_type, size=None):
                             self.transaction_helper.retry_transaction()
         except Exception as e:
             exception = e
-            raise
+
         finally:
             if not self._in_retry_mode:
                 self.transaction_helper.add_fetch_statement_for_retry(
                     self, rows, exception, is_fetch_all
                 )
-            return rows
+        return rows
 
     def _handle_DQL_with_snapshot(self, snapshot, sql, params):
         self._result_set = snapshot.execute_sql(

google/cloud/spanner_v1/_async/client.py

@@ -52,6 +52,8 @@
 
 from google.cloud.spanner_admin_instance_v1 import (
     InstanceAdminAsyncClient as InstanceAdminClient,
+    ListInstanceConfigsRequest,
+    ListInstancesRequest,
 )
 
 if CrossSync.is_async:
@@ -63,18 +65,15 @@
         InstanceAdminGrpcTransport,
     )
 
-from google.cloud.spanner_admin_instance_v1 import (
-    ListInstanceConfigsRequest,
-    ListInstancesRequest,
-)
-
 
 from google.cloud.spanner_v1._async.instance import Instance
 from google.cloud.spanner_v1._helpers import (
+    AtomicCounter,
     _create_experimental_host_transport,
+    _merge_query_options,
+    _metadata_with_prefix,
     _validate_client_context,
 )
-from google.cloud.spanner_v1._helpers import _merge_query_options, _metadata_with_prefix
 from google.cloud.spanner_v1.gapic_version import __version__
 from google.cloud.spanner_v1.metrics.constants import METRIC_EXPORT_INTERVAL_MS
 from google.cloud.spanner_v1.metrics.metrics_exporter import (
@@ -95,9 +94,9 @@
 except ImportError:  # pragma: NO COVER
     HAS_GOOGLE_CLOUD_MONITORING_INSTALLED = False
 
-from google.cloud.spanner_v1._helpers import AtomicCounter
 
 _CLIENT_INFO = client_info.ClientInfo(client_library_version=__version__)
+
 EMULATOR_ENV_VAR = "SPANNER_EMULATOR_HOST"
 SPANNER_DISABLE_BUILTIN_METRICS_ENV_VAR = "SPANNER_DISABLE_BUILTIN_METRICS"
 _EMULATOR_HOST_HTTP_SCHEME = (

google/cloud/spanner_v1/_async/database.py

@@ -32,15 +32,16 @@
 from google.cloud.aio._cross_sync import CrossSync
 from google.cloud.exceptions import NotFound
 from google.cloud.spanner_admin_database_v1 import (
+    CreateDatabaseRequest,
+    Database as DatabasePB,
     EncryptionConfig,
     ListDatabaseRolesRequest,
     RestoreDatabaseEncryptionConfig,
     RestoreDatabaseRequest,
     UpdateDatabaseDdlRequest,
 )
-from google.cloud.spanner_admin_database_v1 import CreateDatabaseRequest
-from google.cloud.spanner_admin_database_v1 import Database as DatabasePB
 from google.cloud.spanner_admin_database_v1.types import DatabaseDialect
+
 from google.cloud.spanner_v1._async.batch import Batch, MutationGroups
 from google.cloud.spanner_v1._async.database_sessions_manager import (
     DatabaseSessionsManager,
@@ -90,6 +91,7 @@
     trace_call,
 )
 
+
 from google.cloud.spanner_v1.metrics.metrics_capture import MetricsCapture
 from google.cloud.spanner_v1.table import Table
 
@@ -490,7 +492,6 @@ def spanner_api(self):
                     client_info=client_info, transport=transport
                 )
 
-
                 return self._spanner_api
             if self._experimental_host is not None:
                 from google.cloud.spanner_v1._async._helpers import (

google/cloud/spanner_v1/client.py

@@ -44,17 +44,19 @@
 )
 from google.cloud.spanner_admin_instance_v1 import (
     InstanceAdminClient as InstanceAdminClient,
+    ListInstanceConfigsRequest,
+    ListInstancesRequest,
 )
 from google.cloud.spanner_admin_instance_v1.services.instance_admin.transports.grpc import (
     InstanceAdminGrpcTransport,
 )
-from google.cloud.spanner_admin_instance_v1 import (
-    ListInstanceConfigsRequest,
-    ListInstancesRequest,
-)
 from google.cloud.spanner_v1.instance import Instance
-from google.cloud.spanner_v1._helpers import _validate_client_context
-from google.cloud.spanner_v1._helpers import _merge_query_options, _metadata_with_prefix
+from google.cloud.spanner_v1._helpers import (
+    AtomicCounter,
+    _merge_query_options,
+    _metadata_with_prefix,
+    _validate_client_context,
+)
 from google.cloud.spanner_v1.gapic_version import __version__
 from google.cloud.spanner_v1.metrics.constants import METRIC_EXPORT_INTERVAL_MS
 from google.cloud.spanner_v1.metrics.metrics_exporter import (
@@ -74,8 +76,6 @@
     HAS_GOOGLE_CLOUD_MONITORING_INSTALLED = True
 except ImportError:
     HAS_GOOGLE_CLOUD_MONITORING_INSTALLED = False
-from google.cloud.spanner_v1._helpers import AtomicCounter
-
 _CLIENT_INFO = client_info.ClientInfo(client_library_version=__version__)
 EMULATOR_ENV_VAR = "SPANNER_EMULATOR_HOST"
 SPANNER_DISABLE_BUILTIN_METRICS_ENV_VAR = "SPANNER_DISABLE_BUILTIN_METRICS"

google/cloud/spanner_v1/database.py

@@ -32,14 +32,14 @@
 from google.cloud.aio._cross_sync import CrossSync
 from google.cloud.exceptions import NotFound
 from google.cloud.spanner_admin_database_v1 import (
+    CreateDatabaseRequest,
+    Database as DatabasePB,
     EncryptionConfig,
     ListDatabaseRolesRequest,
     RestoreDatabaseEncryptionConfig,
     RestoreDatabaseRequest,
     UpdateDatabaseDdlRequest,
 )
-from google.cloud.spanner_admin_database_v1 import CreateDatabaseRequest
-from google.cloud.spanner_admin_database_v1 import Database as DatabasePB
 from google.cloud.spanner_admin_database_v1.types import DatabaseDialect
 from google.cloud.spanner_v1.batch import Batch, MutationGroups
 from google.cloud.spanner_v1.database_sessions_manager import (