feat: fix linting

Author: ansh0l

google/cloud/spanner_v1/database.py

@@ -142,7 +142,7 @@ def __init__(
  pool=None,
  logger=None,
  encryption_config=None,
- database_dialect=DatabaseDialect.DATABASE_DIALECT_UNSPECIFIED
+ database_dialect=DatabaseDialect.DATABASE_DIALECT_UNSPECIFIED,
  ):
  self.database_id = database_id
  self._instance = instance
@@ -395,7 +395,7 @@ def create(self):
  db_name = self.database_id
  if "-" in db_name:
  if self._database_dialect == DatabaseDialect.POSTGRESQL:
- db_name = f"\"{db_name}\""
+ db_name = f'"{db_name}"'
  else:
  db_name = f"`{db_name}`"
  if type(self._encryption_config) == dict:

google/cloud/spanner_v1/instance.py

@@ -429,7 +429,7 @@ def database(
  pool=None,
  logger=None,
  encryption_config=None,
- database_dialect=DatabaseDialect.DATABASE_DIALECT_UNSPECIFIED
+ database_dialect=DatabaseDialect.DATABASE_DIALECT_UNSPECIFIED,
  ):
  """Factory to create a database within this instance.
 
@@ -475,7 +475,7 @@ def database(
  pool=pool,
  logger=logger,
  encryption_config=encryption_config,
- database_dialect=database_dialect
+ database_dialect=database_dialect,
  )
 
  def list_databases(self, page_size=None):

tests/_fixtures.py

@@ -152,6 +152,4 @@
 EMULATOR_DDL_STATEMENTS = [
  stmt.strip() for stmt in EMULATOR_DDL.split(";") if stmt.strip()
 ]
-PG_DDL_STATEMENTS = [
- stmt.strip() for stmt in PG_DDL.split(";") if stmt.strip()
-]
+PG_DDL_STATEMENTS = [stmt.strip() for stmt in PG_DDL.split(";") if stmt.strip()]

tests/system/_helpers.py

@@ -55,8 +55,11 @@
 
 
 DDL_STATEMENTS = (
- _fixtures.PG_DDL_STATEMENTS if DATABASE_DIALECT == "POSTGRESQL" else
- (_fixtures.EMULATOR_DDL_STATEMENTS if USE_EMULATOR else _fixtures.DDL_STATEMENTS)
+ _fixtures.PG_DDL_STATEMENTS
+ if DATABASE_DIALECT == "POSTGRESQL"
+ else (
+ _fixtures.EMULATOR_DDL_STATEMENTS if USE_EMULATOR else _fixtures.DDL_STATEMENTS
+ )
 )
 
 retry_true = retry.RetryResult(operator.truth)

tests/system/conftest.py

@@ -52,13 +52,18 @@ def not_emulator():
 @pytest.fixture(scope="session")
 def not_postgres(database_dialect):
  if database_dialect == DatabaseDialect.POSTGRESQL:
- pytest.skip(f"{_helpers.DATABASE_DIALECT_ENVVAR} set to POSTGRES in environment.")
+ pytest.skip(
+ f"{_helpers.DATABASE_DIALECT_ENVVAR} set to POSTGRES in environment."
+ )
 
 
 @pytest.fixture(scope="session")
 def database_dialect():
- return DatabaseDialect[_helpers.DATABASE_DIALECT] if _helpers.DATABASE_DIALECT else \
- DatabaseDialect.GOOGLE_STANDARD_SQL
+ return (
+ DatabaseDialect[_helpers.DATABASE_DIALECT]
+ if _helpers.DATABASE_DIALECT
+ else DatabaseDialect.GOOGLE_STANDARD_SQL
+ )
 
 
 @pytest.fixture(scope="session")
@@ -165,7 +170,10 @@ def shared_database(shared_instance, database_operation_timeout, database_dialec
  database_name = _helpers.unique_id("test_database")
  pool = spanner_v1.BurstyPool(labels={"testcase": "database_api"})
  database = shared_instance.database(
- database_name, ddl_statements=_helpers.DDL_STATEMENTS, pool=pool, database_dialect=database_dialect
+ database_name,
+ ddl_statements=_helpers.DDL_STATEMENTS,
+ pool=pool,
+ database_dialect=database_dialect,
  )
  operation = database.create()
  operation.result(database_operation_timeout) # raises on failure / timeout.

tests/system/test_backup_api.py

@@ -97,7 +97,10 @@ def second_database(shared_instance, database_operation_timeout, database_dialec
  database_name = _helpers.unique_id("test_database2")
  pool = spanner_v1.BurstyPool(labels={"testcase": "database_api"})
  database = shared_instance.database(
- database_name, ddl_statements=_helpers.DDL_STATEMENTS, pool=pool, database_dialect=database_dialect
+ database_name,
+ ddl_statements=_helpers.DDL_STATEMENTS,
+ pool=pool,
+ database_dialect=database_dialect,
  )
  operation = database.create()
  operation.result(database_operation_timeout) # raises on failure / timeout.

tests/system/test_database_api.py

@@ -58,7 +58,9 @@ def test_list_databases(shared_instance, shared_database):
 def test_create_database(shared_instance, databases_to_delete, database_dialect):
  pool = spanner_v1.BurstyPool(labels={"testcase": "create_database"})
  temp_db_id = _helpers.unique_id("temp_db")
- temp_db = shared_instance.database(temp_db_id, pool=pool, database_dialect=database_dialect)
+ temp_db = shared_instance.database(
+ temp_db_id, pool=pool, database_dialect=database_dialect
+ )
  operation = temp_db.create()
  databases_to_delete.append(temp_db)
 
@@ -182,15 +184,19 @@ def test_table_not_found(shared_instance):
  temp_db.create()
 
 
-def test_update_ddl_w_operation_id(shared_instance, databases_to_delete, database_dialect):
+def test_update_ddl_w_operation_id(
+ shared_instance, databases_to_delete, database_dialect
+):
  # We used to have:
  # @pytest.mark.skip(
  # reason="'Database.update_ddl' has a flaky timeout. See: "
  # https://github.com/GoogleCloudPlatform/google-cloud-python/issues/5629
  # )
  pool = spanner_v1.BurstyPool(labels={"testcase": "update_database_ddl"})
  temp_db_id = _helpers.unique_id("update_ddl", separator="_")
- temp_db = shared_instance.database(temp_db_id, pool=pool, database_dialect=database_dialect)
+ temp_db = shared_instance.database(
+ temp_db_id, pool=pool, database_dialect=database_dialect
+ )
  create_op = temp_db.create()
  databases_to_delete.append(temp_db)
  create_op.result(DBAPI_OPERATION_TIMEOUT) # raises on failure / timeout.