chore: remove fossils of pylint (#561)

tseaver · gcf-owl-bot[bot] · web-flow · commit cfe4a5c21c6d · 2021-09-01T07:59:12.000+12:00
* chore: remove fossils of pylint Closes #548. * 🦉 Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
diff --git a/packages/google-cloud-spanner/google/cloud/spanner_v1/_helpers.py b/packages/google-cloud-spanner/google/cloud/spanner_v1/_helpers.py
@@ -123,7 +123,6 @@ def _assert_numeric_precision_and_scale(value):
         raise ValueError(NUMERIC_MAX_PRECISION_ERR_MSG.format(precision + scale))
 
 
-# pylint: disable=too-many-return-statements,too-many-branches
 def _make_value_pb(value):
     """Helper for :func:`_make_list_value_pbs`.
 
@@ -170,9 +169,6 @@ def _make_value_pb(value):
     raise ValueError("Unknown type: %s" % (value,))
 
 
-# pylint: enable=too-many-return-statements,too-many-branches
-
-
 def _make_list_value_pb(values):
     """Construct of ListValue protobufs.
 
@@ -197,7 +193,6 @@ def _make_list_value_pbs(values):
     return [_make_list_value_pb(row) for row in values]
 
 
-# pylint: disable=too-many-branches
 def _parse_value_pb(value_pb, field_type):
     """Convert a Value protobuf to cell data.
 
@@ -250,9 +245,6 @@ def _parse_value_pb(value_pb, field_type):
         raise ValueError("Unknown type: %s" % (field_type,))
 
 
-# pylint: enable=too-many-branches
-
-
 def _parse_list_value_pbs(rows, row_type):
     """Convert a list of ListValue protobufs into a list of list of cell data.
 
diff --git a/packages/google-cloud-spanner/google/cloud/spanner_v1/batch.py b/packages/google-cloud-spanner/google/cloud/spanner_v1/batch.py
@@ -18,15 +18,12 @@
 from google.cloud.spanner_v1 import Mutation
 from google.cloud.spanner_v1 import TransactionOptions
 
-# pylint: disable=ungrouped-imports
 from google.cloud.spanner_v1._helpers import _SessionWrapper
 from google.cloud.spanner_v1._helpers import _make_list_value_pbs
 from google.cloud.spanner_v1._helpers import _metadata_with_prefix
 from google.cloud.spanner_v1._opentelemetry_tracing import trace_call
 from google.cloud.spanner_v1 import RequestOptions
 
-# pylint: enable=ungrouped-imports
-
 
 class _BatchBase(_SessionWrapper):
     """Accumulate mutations for transmission during :meth:`commit`.
diff --git a/packages/google-cloud-spanner/google/cloud/spanner_v1/client.py b/packages/google-cloud-spanner/google/cloud/spanner_v1/client.py
@@ -30,29 +30,24 @@
 from google.api_core.gapic_v1 import client_info
 from google.auth.credentials import AnonymousCredentials
 import google.api_core.client_options
+from google.cloud.client import ClientWithProject
 
-# pylint: disable=line-too-long
-
-from google.cloud.spanner_admin_instance_v1.services.instance_admin.transports.grpc import (
-    InstanceAdminGrpcTransport,
-)
 
+from google.cloud.spanner_admin_database_v1 import DatabaseAdminClient
 from google.cloud.spanner_admin_database_v1.services.database_admin.transports.grpc import (
     DatabaseAdminGrpcTransport,
 )
-
-from google.cloud.spanner_admin_database_v1 import DatabaseAdminClient
 from google.cloud.spanner_admin_instance_v1 import InstanceAdminClient
-
-# pylint: enable=line-too-long
-
-from google.cloud.client import ClientWithProject
-from google.cloud.spanner_v1 import __version__
-from google.cloud.spanner_v1._helpers import _merge_query_options, _metadata_with_prefix
-from google.cloud.spanner_v1.instance import Instance
-from google.cloud.spanner_v1 import ExecuteSqlRequest
+from google.cloud.spanner_admin_instance_v1.services.instance_admin.transports.grpc import (
+    InstanceAdminGrpcTransport,
+)
 from google.cloud.spanner_admin_instance_v1 import ListInstanceConfigsRequest
 from google.cloud.spanner_admin_instance_v1 import ListInstancesRequest
+from google.cloud.spanner_v1 import __version__
+from google.cloud.spanner_v1 import ExecuteSqlRequest
+from google.cloud.spanner_v1._helpers import _merge_query_options
+from google.cloud.spanner_v1._helpers import _metadata_with_prefix
+from google.cloud.spanner_v1.instance import Instance
 
 _CLIENT_INFO = client_info.ClientInfo(client_library_version=__version__)
 EMULATOR_ENV_VAR = "SPANNER_EMULATOR_HOST"
diff --git a/packages/google-cloud-spanner/google/cloud/spanner_v1/database.py b/packages/google-cloud-spanner/google/cloud/spanner_v1/database.py
@@ -29,12 +29,19 @@
 from google.api_core import gapic_v1
 import six
 
-# pylint: disable=ungrouped-imports
+from google.cloud.spanner_admin_database_v1 import CreateDatabaseRequest
 from google.cloud.spanner_admin_database_v1 import Database as DatabasePB
-from google.cloud.spanner_v1._helpers import (
-    _merge_query_options,
-    _metadata_with_prefix,
-)
+from google.cloud.spanner_admin_database_v1 import EncryptionConfig
+from google.cloud.spanner_admin_database_v1 import RestoreDatabaseEncryptionConfig
+from google.cloud.spanner_admin_database_v1 import RestoreDatabaseRequest
+from google.cloud.spanner_admin_database_v1 import UpdateDatabaseDdlRequest
+from google.cloud.spanner_v1 import ExecuteSqlRequest
+from google.cloud.spanner_v1 import TransactionSelector
+from google.cloud.spanner_v1 import TransactionOptions
+from google.cloud.spanner_v1 import RequestOptions
+from google.cloud.spanner_v1 import SpannerClient
+from google.cloud.spanner_v1._helpers import _merge_query_options
+from google.cloud.spanner_v1._helpers import _metadata_with_prefix
 from google.cloud.spanner_v1.batch import Batch
 from google.cloud.spanner_v1.keyset import KeySet
 from google.cloud.spanner_v1.pool import BurstyPool
@@ -43,24 +50,11 @@
 from google.cloud.spanner_v1.snapshot import _restart_on_unavailable
 from google.cloud.spanner_v1.snapshot import Snapshot
 from google.cloud.spanner_v1.streamed import StreamedResultSet
-from google.cloud.spanner_v1 import SpannerClient
 from google.cloud.spanner_v1.services.spanner.transports.grpc import (
     SpannerGrpcTransport,
 )
-from google.cloud.spanner_admin_database_v1 import CreateDatabaseRequest
-from google.cloud.spanner_admin_database_v1 import EncryptionConfig
-from google.cloud.spanner_admin_database_v1 import RestoreDatabaseEncryptionConfig
-from google.cloud.spanner_admin_database_v1 import RestoreDatabaseRequest
-from google.cloud.spanner_admin_database_v1 import UpdateDatabaseDdlRequest
-from google.cloud.spanner_v1 import (
-    ExecuteSqlRequest,
-    TransactionSelector,
-    TransactionOptions,
-)
 from google.cloud.spanner_v1.table import Table
-from google.cloud.spanner_v1 import RequestOptions
 
-# pylint: enable=ungrouped-imports
 
 SPANNER_DATA_SCOPE = "https://www.googleapis.com/auth/spanner.data"
 
diff --git a/packages/google-cloud-spanner/google/cloud/spanner_v1/instance.py b/packages/google-cloud-spanner/google/cloud/spanner_v1/instance.py
@@ -18,24 +18,21 @@
 from google.api_core.exceptions import InvalidArgument
 import re
 
+from google.protobuf.empty_pb2 import Empty
+from google.protobuf.field_mask_pb2 import FieldMask
+from google.cloud.exceptions import NotFound
+
 from google.cloud.spanner_admin_instance_v1 import Instance as InstancePB
 from google.cloud.spanner_admin_database_v1.types import backup
 from google.cloud.spanner_admin_database_v1.types import spanner_database_admin
 from google.cloud.spanner_admin_database_v1 import ListBackupsRequest
 from google.cloud.spanner_admin_database_v1 import ListBackupOperationsRequest
 from google.cloud.spanner_admin_database_v1 import ListDatabasesRequest
 from google.cloud.spanner_admin_database_v1 import ListDatabaseOperationsRequest
-from google.protobuf.empty_pb2 import Empty
-from google.protobuf.field_mask_pb2 import FieldMask
-
-# pylint: disable=ungrouped-imports
-from google.cloud.exceptions import NotFound
 from google.cloud.spanner_v1._helpers import _metadata_with_prefix
 from google.cloud.spanner_v1.backup import Backup
 from google.cloud.spanner_v1.database import Database
 
-# pylint: enable=ungrouped-imports
-
 
 _INSTANCE_NAME_RE = re.compile(
     r"^projects/(?P<project>[^/]+)/" r"instances/(?P<instance_id>[a-z][-a-z0-9]*)$"
diff --git a/packages/google-cloud-spanner/google/cloud/spanner_v1/param_types.py b/packages/google-cloud-spanner/google/cloud/spanner_v1/param_types.py
@@ -31,7 +31,7 @@
 JSON = Type(code=TypeCode.JSON)
 
 
-def Array(element_type):  # pylint: disable=invalid-name
+def Array(element_type):
     """Construct an array parameter type description protobuf.
 
     :type element_type: :class:`~google.cloud.spanner_v1.types.Type`
@@ -43,7 +43,7 @@ def Array(element_type):  # pylint: disable=invalid-name
     return Type(code=TypeCode.ARRAY, array_element_type=element_type)
 
 
-def StructField(name, field_type):  # pylint: disable=invalid-name
+def StructField(name, field_type):
     """Construct a field description protobuf.
 
     :type name: str
@@ -58,7 +58,7 @@ def StructField(name, field_type):  # pylint: disable=invalid-name
     return StructType.Field(name=name, type_=field_type)
 
 
-def Struct(fields):  # pylint: disable=invalid-name
+def Struct(fields):
     """Construct a struct parameter type description protobuf.
 
     :type fields: list of :class:`google.cloud.spanner_v1.types.StructType.Field`
diff --git a/packages/google-cloud-spanner/google/cloud/spanner_v1/pool.py b/packages/google-cloud-spanner/google/cloud/spanner_v1/pool.py
@@ -180,7 +180,7 @@ def bind(self, database):
                 session._session_id = session_pb.name.split("/")[-1]
                 self._sessions.put(session)
 
-    def get(self, timeout=None):  # pylint: disable=arguments-differ
+    def get(self, timeout=None):
         """Check a session out from the pool.
 
         :type timeout: int
@@ -374,7 +374,7 @@ def bind(self, database):
                 self.put(session)
             created_session_count += len(resp.session)
 
-    def get(self, timeout=None):  # pylint: disable=arguments-differ
+    def get(self, timeout=None):
         """Check a session out from the pool.
 
         :type timeout: int
diff --git a/packages/google-cloud-spanner/google/cloud/spanner_v1/session.py b/packages/google-cloud-spanner/google/cloud/spanner_v1/session.py
@@ -18,22 +18,19 @@
 import random
 import time
 
-from google.rpc.error_details_pb2 import RetryInfo
-
-# pylint: disable=ungrouped-imports
 from google.api_core.exceptions import Aborted
 from google.api_core.exceptions import GoogleAPICallError
 from google.api_core.exceptions import NotFound
-import google.api_core.gapic_v1.method
+from google.api_core.gapic_v1 import method
+from google.rpc.error_details_pb2 import RetryInfo
+
+from google.cloud.spanner_v1 import ExecuteSqlRequest
+from google.cloud.spanner_v1 import CreateSessionRequest
 from google.cloud.spanner_v1._helpers import _metadata_with_prefix
 from google.cloud.spanner_v1._opentelemetry_tracing import trace_call
 from google.cloud.spanner_v1.batch import Batch
 from google.cloud.spanner_v1.snapshot import Snapshot
 from google.cloud.spanner_v1.transaction import Transaction
-from google.cloud.spanner_v1 import ExecuteSqlRequest
-from google.cloud.spanner_v1 import CreateSessionRequest
-
-# pylint: enable=ungrouped-imports
 
 
 DEFAULT_RETRY_TIMEOUT_SECS = 30
@@ -231,8 +228,8 @@ def execute_sql(
         query_mode=None,
         query_options=None,
         request_options=None,
-        retry=google.api_core.gapic_v1.method.DEFAULT,
-        timeout=google.api_core.gapic_v1.method.DEFAULT,
+        retry=method.DEFAULT,
+        timeout=method.DEFAULT,
     ):
         """Perform an ``ExecuteStreamingSql`` API request.
 
@@ -387,8 +384,6 @@ def run_in_transaction(self, func, *args, **kw):
                 return return_value
 
 
-# pylint: disable=misplaced-bare-raise
-#
 # Rational:  this function factors out complex shared deadline / retry
 #            handling from two `except:` clauses.
 def _delay_until_retry(exc, deadline, attempts):
@@ -421,9 +416,6 @@ def _delay_until_retry(exc, deadline, attempts):
         time.sleep(delay)
 
 
-# pylint: enable=misplaced-bare-raise
-
-
 def _get_retry_delay(cause, attempts):
     """Helper for :func:`_delay_until_retry`.
 
diff --git a/packages/google-cloud-spanner/google/cloud/spanner_v1/snapshot.py b/packages/google-cloud-spanner/google/cloud/spanner_v1/snapshot.py
@@ -106,7 +106,7 @@ class _SnapshotBase(_SessionWrapper):
     _read_request_count = 0
     _execute_sql_count = 0
 
-    def _make_txn_selector(self):  # pylint: disable=redundant-returns-doc
+    def _make_txn_selector(self):
         """Helper for :meth:`read` / :meth:`execute_sql`.
 
         Subclasses must override, returning an instance of
diff --git a/packages/google-cloud-spanner/google/cloud/spanner_v1/streamed.py b/packages/google-cloud-spanner/google/cloud/spanner_v1/streamed.py
@@ -14,19 +14,15 @@
 
 """Wrapper for streaming results."""
 
+from google.cloud import exceptions
 from google.protobuf.struct_pb2 import ListValue
 from google.protobuf.struct_pb2 import Value
-from google.cloud import exceptions
+
 from google.cloud.spanner_v1 import PartialResultSet
 from google.cloud.spanner_v1 import ResultSetMetadata
 from google.cloud.spanner_v1 import TypeCode
-import six
-
-# pylint: disable=ungrouped-imports
 from google.cloud.spanner_v1._helpers import _parse_value_pb
 
-# pylint: enable=ungrouped-imports
-
 
 class StreamedResultSet(object):
     """Process a sequence of partial result sets into a single set of row data.
@@ -118,7 +114,7 @@ def _consume_next(self):
 
         Parse the result set into new/existing rows in :attr:`_rows`
         """
-        response = six.next(self._response_iterator)
+        response = next(self._response_iterator)
         response_pb = PartialResultSet.pb(response)
 
         if self._metadata is None:  # first response
@@ -218,7 +214,7 @@ def _unmergeable(lhs, rhs, type_):
     raise Unmergeable(lhs, rhs, type_)
 
 
-def _merge_float64(lhs, rhs, type_):  # pylint: disable=unused-argument
+def _merge_float64(lhs, rhs, type_):
     """Helper for '_merge_by_type'."""
     lhs_kind = lhs.WhichOneof("kind")
     if lhs_kind == "string_value":
@@ -234,7 +230,7 @@ def _merge_float64(lhs, rhs, type_):  # pylint: disable=unused-argument
     raise Unmergeable(lhs, rhs, type_)
 
 
-def _merge_string(lhs, rhs, type_):  # pylint: disable=unused-argument
+def _merge_string(lhs, rhs, type_):
     """Helper for '_merge_by_type'."""
     return Value(string_value=lhs.string_value + rhs.string_value)
 
diff --git a/packages/google-cloud-spanner/pylint.config.py b/packages/google-cloud-spanner/pylint.config.py
