From e4a7ffed54677d5aba9ab0251026a8a2a0e71278 Mon Sep 17 00:00:00 2001 From: pavelserchenia Date: Fri, 26 May 2023 14:34:03 +0200 Subject: [PATCH] linter #8240 --- alembic/autogenerate/render.py | 19 ++++--------------- tests/test_autogen_render.py | 11 ++++++----- 2 files changed, 10 insertions(+), 20 deletions(-) diff --git a/alembic/autogenerate/render.py b/alembic/autogenerate/render.py index d7087e9d..e8504e98 100644 --- a/alembic/autogenerate/render.py +++ b/alembic/autogenerate/render.py @@ -94,7 +94,6 @@ def _render_cmd_body( op_container: ops.OpContainer, autogen_context: AutogenContext, ) -> str: - buf = StringIO() printer = PythonPrinter(buf) @@ -165,7 +164,6 @@ def _render_modify_table( def _render_create_table_comment( autogen_context: AutogenContext, op: ops.CreateTableCommentOp ) -> str: - templ = ( "{prefix}create_table_comment(\n" "{indent}'{tname}',\n" @@ -190,7 +188,6 @@ def _render_create_table_comment( def _render_drop_table_comment( autogen_context: AutogenContext, op: ops.DropTableCommentOp ) -> str: - templ = ( "{prefix}drop_table_comment(\n" "{indent}'{tname}',\n" @@ -362,7 +359,6 @@ def _add_unique_constraint( def _add_fk_constraint( autogen_context: AutogenContext, op: ops.CreateForeignKeyOp ) -> str: - args = [repr(_render_gen_name(autogen_context, op.constraint_name))] if not autogen_context._has_batch: args.append(repr(_ident(op.source_table))) @@ -411,7 +407,6 @@ def _add_check_constraint(constraint, autogen_context): def _drop_constraint( autogen_context: AutogenContext, op: ops.DropConstraintOp ) -> str: - if autogen_context._has_batch: template = "%(prefix)sdrop_constraint" "(%(name)r, type_=%(type)r)" else: @@ -432,7 +427,6 @@ def _drop_constraint( @renderers.dispatch_for(ops.AddColumnOp) def _add_column(autogen_context: AutogenContext, op: ops.AddColumnOp) -> str: - schema, tname, column = op.schema, op.table_name, op.column if autogen_context._has_batch: template = "%(prefix)sadd_column(%(column)s)" @@ -452,7 +446,6 @@ def _add_column(autogen_context: AutogenContext, op: ops.AddColumnOp) -> str: @renderers.dispatch_for(ops.DropColumnOp) def _drop_column(autogen_context: AutogenContext, op: ops.DropColumnOp) -> str: - schema, tname, column_name = op.schema, op.table_name, op.column_name if autogen_context._has_batch: @@ -476,7 +469,6 @@ def _drop_column(autogen_context: AutogenContext, op: ops.DropColumnOp) -> str: def _alter_column( autogen_context: AutogenContext, op: ops.AlterColumnOp ) -> str: - tname = op.table_name cname = op.column_name server_default = op.modify_server_default @@ -566,7 +558,6 @@ def _render_potential_expr( is_server_default: bool = False, ) -> str: if isinstance(value, sql.ClauseElement): - if wrap_in_text: template = "%(prefix)stext(%(sql)r)" else: @@ -613,11 +604,11 @@ def _uq_constraint( opts.append( ("name", _render_gen_name(autogen_context, constraint.name)) ) - pg_nulls_not_distinct = constraint.dialect_options["postgresql"]["nulls_not_distinct"] + pg_nulls_not_distinct = constraint.dialect_options["postgresql"][ + "nulls_not_distinct" + ] if pg_nulls_not_distinct is not None: - opts.append( - ("postgresql_nulls_not_distinct", pg_nulls_not_distinct) - ) + opts.append(("postgresql_nulls_not_distinct", pg_nulls_not_distinct)) if alter: args = [repr(_render_gen_name(autogen_context, constraint.name))] @@ -680,7 +671,6 @@ def _render_column( opts: List[Tuple[str, Any]] = [] if column.server_default: - rendered = _render_server_default( # type:ignore[assignment] column.server_default, autogen_context ) @@ -989,7 +979,6 @@ def _fk_colspec( def _populate_render_fk_opts( constraint: ForeignKeyConstraint, opts: List[Tuple[str, str]] ) -> None: - if constraint.onupdate: opts.append(("onupdate", repr(constraint.onupdate))) if constraint.ondelete: diff --git a/tests/test_autogen_render.py b/tests/test_autogen_render.py index f1e413c0..55e7fb73 100644 --- a/tests/test_autogen_render.py +++ b/tests/test_autogen_render.py @@ -1621,7 +1621,6 @@ class AutogenRenderTest(TestBase): ) def test_generic_array_type(self): - eq_ignore_whitespace( autogenerate.render._repr_type( types.ARRAY(Integer), self.autogen_context @@ -1757,7 +1756,6 @@ class AutogenRenderTest(TestBase): ) def test_render_variant(self): - self.autogen_context.opts["user_module_prefix"] = None type_ = ( @@ -2213,7 +2211,6 @@ class AutogenRenderTest(TestBase): class RenderNamingConventionTest(TestBase): def setUp(self): - convention = { "ix": "ix_%(custom)s_%(column_0_label)s", "uq": "uq_%(custom)s_%(table_name)s_%(column_0_name)s", @@ -2322,8 +2319,12 @@ class RenderNamingConventionTest(TestBase): t = Table("t", m, Column("c", Integer)) eq_ignore_whitespace( autogenerate.render._render_unique_constraint( - UniqueConstraint(t.c.c, name="uq_1", deferrable="XYZ", - postgresql_nulls_not_distinct=True), + UniqueConstraint( + t.c.c, + name="uq_1", + deferrable="XYZ", + postgresql_nulls_not_distinct=True, + ), self.autogen_context, None, ), -- 2.47.2