From: Mike Bayer Date: Thu, 30 May 2019 15:31:03 +0000 (-0400) Subject: Enable F841 X-Git-Tag: rel_1_3_6~33 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b2ad56981fa5f59822dd41d6960ba399b9b0001;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git Enable F841 This is a very useful assertion which prevents unused variables from being set up allows code to be more readable and sometimes even more efficient. test suites seem to be where the most problems are and there do not seem to be documentation examples that are using this, or at least the linter is not taking effect within rst blocks. Change-Id: I2b3341d8dd14da34879d8425838e66a4b9f8e27d (cherry picked from commit 190e0139e834e4271268652e058c280787ae69eb) --- diff --git a/examples/elementtree/adjacency_list.py b/examples/elementtree/adjacency_list.py index 0f53e0012d..0a5a922d0a 100644 --- a/examples/elementtree/adjacency_list.py +++ b/examples/elementtree/adjacency_list.py @@ -93,6 +93,7 @@ class Document(object): self.filename = name self.element = element + # PART IV - Persistence Mapping # Node class. a non-public class which will represent the DB-persisted @@ -230,8 +231,6 @@ ElementTree.dump(d.element) def find_document(path, compareto): - j = documents - prev_elements = None query = session.query(Document) attribute = "_root" for i, match in enumerate( diff --git a/examples/elementtree/optimized_al.py b/examples/elementtree/optimized_al.py index b089a01708..0ba2d1ea4e 100644 --- a/examples/elementtree/optimized_al.py +++ b/examples/elementtree/optimized_al.py @@ -239,8 +239,6 @@ ElementTree.dump(d.element) def find_document(path, compareto): - j = documents - prev_elements = None query = session.query(Document) first = True for i, match in enumerate( diff --git a/examples/performance/__init__.py b/examples/performance/__init__.py index f1f59026c2..c6244554fa 100644 --- a/examples/performance/__init__.py +++ b/examples/performance/__init__.py @@ -334,7 +334,7 @@ class Profiler(object): if len(sys.argv) > 1: potential_name = sys.argv[1] try: - suite = __import__(__name__ + "." + potential_name) + __import__(__name__ + "." + potential_name) except ImportError: pass @@ -382,7 +382,7 @@ class Profiler(object): args.profile = args.profile or args.dump or args.runsnake if cls.name is None: - suite = __import__(__name__ + "." + args.name) + __import__(__name__ + "." + args.name) Profiler(args).run() diff --git a/examples/performance/large_resultsets.py b/examples/performance/large_resultsets.py index a5f99a283b..b7b96453d9 100644 --- a/examples/performance/large_resultsets.py +++ b/examples/performance/large_resultsets.py @@ -64,7 +64,7 @@ def test_orm_full_objects_list(n): """Load fully tracked ORM objects into one big list().""" sess = Session(engine) - objects = list(sess.query(Customer).limit(n)) + list(sess.query(Customer).limit(n)) @Profiler.profile @@ -108,7 +108,7 @@ def test_core_fetchall(n): with engine.connect() as conn: result = conn.execute(Customer.__table__.select().limit(n)).fetchall() for row in result: - data = row["id"], row["name"], row["description"] + row["id"], row["name"], row["description"] @Profiler.profile @@ -124,7 +124,7 @@ def test_core_fetchmany_w_streaming(n): if not chunk: break for row in chunk: - data = row["id"], row["name"], row["description"] + row["id"], row["name"], row["description"] @Profiler.profile @@ -138,7 +138,7 @@ def test_core_fetchmany(n): if not chunk: break for row in chunk: - data = row["id"], row["name"], row["description"] + row["id"], row["name"], row["description"] @Profiler.profile @@ -183,13 +183,11 @@ def _test_dbapi_raw(n, make_objects): if make_objects: for row in cursor.fetchall(): # ensure that we fully fetch! - customer = SimpleCustomer( - id_=row[0], name=row[1], description=row[2] - ) + SimpleCustomer(id_=row[0], name=row[1], description=row[2]) else: for row in cursor.fetchall(): # ensure that we fully fetch! - data = row[0], row[1], row[2] + row[0], row[1], row[2] conn.close() diff --git a/examples/performance/single_inserts.py b/examples/performance/single_inserts.py index 428eb5c412..2dd87d5b69 100644 --- a/examples/performance/single_inserts.py +++ b/examples/performance/single_inserts.py @@ -164,7 +164,7 @@ def _test_dbapi_raw(n, connect): conn = engine.pool._creator() cursor = conn.cursor() cursor.execute(sql, arg) - lastrowid = cursor.lastrowid + cursor.lastrowid conn.commit() conn.close() else: @@ -172,7 +172,7 @@ def _test_dbapi_raw(n, connect): conn = engine.raw_connection() cursor = conn.cursor() cursor.execute(sql, arg) - lastrowid = cursor.lastrowid + cursor.lastrowid conn.commit() conn.close() diff --git a/lib/sqlalchemy/dialects/mssql/base.py b/lib/sqlalchemy/dialects/mssql/base.py index d2c84f446a..675c743f34 100644 --- a/lib/sqlalchemy/dialects/mssql/base.py +++ b/lib/sqlalchemy/dialects/mssql/base.py @@ -2675,7 +2675,6 @@ class MSDialect(default.DefaultDialect): # group rows by constraint ID, to handle multi-column FKs fkeys = [] - fknm, scols, rcols = (None, [], []) def fkey_rec(): return { diff --git a/lib/sqlalchemy/dialects/mssql/pyodbc.py b/lib/sqlalchemy/dialects/mssql/pyodbc.py index 02d70a3731..2246886a32 100644 --- a/lib/sqlalchemy/dialects/mssql/pyodbc.py +++ b/lib/sqlalchemy/dialects/mssql/pyodbc.py @@ -269,7 +269,7 @@ class MSExecutionContext_pyodbc(MSExecutionContext): # without closing it (FreeTDS particularly) row = self.cursor.fetchall()[0] break - except self.dialect.dbapi.Error as e: + except self.dialect.dbapi.Error: # no way around this - nextset() consumes the previous set # so we need to just keep flipping self.cursor.nextset() diff --git a/lib/sqlalchemy/engine/result.py b/lib/sqlalchemy/engine/result.py index fcb1d41554..5dc371cc93 100644 --- a/lib/sqlalchemy/engine/result.py +++ b/lib/sqlalchemy/engine/result.py @@ -503,7 +503,6 @@ class ResultMetaData(object): def _merge_textual_cols_by_position( self, context, cursor_description, result_columns ): - dialect = context.dialect num_ctx_cols = len(result_columns) if result_columns else None if num_ctx_cols > len(cursor_description): @@ -558,7 +557,6 @@ class ResultMetaData(object): yield idx, colname, mapped_type, coltype, obj, untranslated def _merge_cols_by_none(self, context, cursor_description): - dialect = context.dialect for ( idx, colname, diff --git a/lib/sqlalchemy/orm/events.py b/lib/sqlalchemy/orm/events.py index d73a20e93a..fd57fc039b 100644 --- a/lib/sqlalchemy/orm/events.py +++ b/lib/sqlalchemy/orm/events.py @@ -194,11 +194,7 @@ class InstanceEvents(event.Events): @classmethod def _listen(cls, event_key, raw=False, propagate=False, **kw): - target, identifier, fn = ( - event_key.dispatch_target, - event_key.identifier, - event_key._listen_fn, - ) + target, fn = (event_key.dispatch_target, event_key._listen_fn) if not raw: @@ -444,11 +440,7 @@ class _EventsHold(event.RefCollection): def _listen( cls, event_key, raw=False, propagate=False, retval=False, **kw ): - target, identifier, fn = ( - event_key.dispatch_target, - event_key.identifier, - event_key.fn, - ) + target = event_key.dispatch_target if target.class_ in target.all_holds: collection = target.all_holds[target.class_] @@ -472,11 +464,7 @@ class _EventsHold(event.RefCollection): ) def remove(self, event_key): - target, identifier, fn = ( - event_key.dispatch_target, - event_key.identifier, - event_key.fn, - ) + target = event_key.dispatch_target if isinstance(target, _EventsHold): collection = target.all_holds[target.class_] @@ -1974,11 +1962,7 @@ class AttributeEvents(event.Events): propagate=False, ): - target, identifier, fn = ( - event_key.dispatch_target, - event_key.identifier, - event_key._listen_fn, - ) + target, fn = event_key.dispatch_target, event_key._listen_fn if active_history: target.dispatch._active_history = True diff --git a/lib/sqlalchemy/sql/functions.py b/lib/sqlalchemy/sql/functions.py index 3340451440..5153cc6f1a 100644 --- a/lib/sqlalchemy/sql/functions.py +++ b/lib/sqlalchemy/sql/functions.py @@ -37,13 +37,12 @@ from .. import util _registry = util.defaultdict(dict) -_case_sensitive_registry = util.defaultdict( - lambda: util.defaultdict(dict) -) +_case_sensitive_registry = util.defaultdict(lambda: util.defaultdict(dict)) _CASE_SENSITIVE = util.symbol( name="case_sensitive_function", doc="Symbol to mark the functions that are switched into case-sensitive " - "mode.") + "mode.", +) def register_function(identifier, fn, package="_default"): @@ -65,7 +64,8 @@ def register_function(identifier, fn, package="_default"): if raw_identifier in case_sensitive_reg[identifier]: util.warn( "The GenericFunction '{}' is already registered and " - "is going to be overriden.".format(identifier)) + "is going to be overriden.".format(identifier) + ) reg[identifier] = fn else: # If a function with the same lowercase identifier is registered, @@ -79,27 +79,29 @@ def register_function(identifier, fn, package="_default"): "future release.".format( raw_identifier, list(case_sensitive_reg[identifier].keys())[0], - )) + ) + ) reg[identifier] = _CASE_SENSITIVE # Check if a function with different letter case identifier is registered. elif identifier in case_sensitive_reg: # Note: This case will be removed in a later release. - if ( - raw_identifier not in case_sensitive_reg[identifier] - ): + if raw_identifier not in case_sensitive_reg[identifier]: util.warn_deprecated( "GenericFunction(s) '{}' are already registered with " "different letter cases and might interact with '{}'. " "GenericFunction objects will be fully case-insensitive in a " "future release.".format( sorted(case_sensitive_reg[identifier].keys()), - raw_identifier)) + raw_identifier, + ) + ) else: util.warn( "The GenericFunction '{}' is already registered and " - "is going to be overriden.".format(raw_identifier)) + "is going to be overriden.".format(raw_identifier) + ) # Register by default else: @@ -429,6 +431,7 @@ class FunctionAsBinary(BinaryExpression): def __init__(self, fn, left_index, right_index): left = fn.clauses.clauses[left_index - 1] right = fn.clauses.clauses[right_index - 1] + self.sql_function = fn self.left_index = left_index self.right_index = right_index @@ -637,7 +640,7 @@ class _GenericMeta(VisitableType): cls.type = clsdict["__return_type__"] # Check _register attribute status - cls._register = getattr(cls, '_register', True) + cls._register = getattr(cls, "_register", True) # Register the function if required if cls._register: diff --git a/lib/sqlalchemy/testing/plugin/pytestplugin.py b/lib/sqlalchemy/testing/plugin/pytestplugin.py index 99106d7e5c..e0335c1357 100644 --- a/lib/sqlalchemy/testing/plugin/pytestplugin.py +++ b/lib/sqlalchemy/testing/plugin/pytestplugin.py @@ -147,7 +147,6 @@ def pytest_collection_modifyitems(session, config, items): if sub_cls is not test_class.cls: per_cls_dict = rebuilt_items[test_class.cls] - names = [i.name for i in items] for inst in pytest.Class( sub_cls.__name__, parent=test_class.parent.parent ).collect(): diff --git a/lib/sqlalchemy/testing/suite/test_reflection.py b/lib/sqlalchemy/testing/suite/test_reflection.py index e8d75bafa2..e529a0753c 100644 --- a/lib/sqlalchemy/testing/suite/test_reflection.py +++ b/lib/sqlalchemy/testing/suite/test_reflection.py @@ -300,11 +300,7 @@ class ComponentReflectionTest(fixtures.TablesTest): "remote_table_2", ] meta = self.metadata - users, addresses, dingalings = ( - self.tables.users, - self.tables.email_addresses, - self.tables.dingalings, - ) + insp = inspect(meta.bind) if table_type == "view": @@ -413,11 +409,7 @@ class ComponentReflectionTest(fixtures.TablesTest): def _test_get_columns(self, schema=None, table_type="table"): meta = MetaData(testing.db) - users, addresses, dingalings = ( - self.tables.users, - self.tables.email_addresses, - self.tables.dingalings, - ) + users, addresses = (self.tables.users, self.tables.email_addresses) table_names = ["users", "email_addresses"] if table_type == "view": table_names = ["users_v", "email_addresses_v"] @@ -597,11 +589,7 @@ class ComponentReflectionTest(fixtures.TablesTest): @testing.provide_metadata def _test_get_foreign_keys(self, schema=None): meta = self.metadata - users, addresses, dingalings = ( - self.tables.users, - self.tables.email_addresses, - self.tables.dingalings, - ) + users, addresses = (self.tables.users, self.tables.email_addresses) insp = inspect(meta.bind) expected_schema = schema # users @@ -739,11 +727,7 @@ class ComponentReflectionTest(fixtures.TablesTest): @testing.provide_metadata def _test_get_indexes(self, schema=None): meta = self.metadata - users, addresses, dingalings = ( - self.tables.users, - self.tables.email_addresses, - self.tables.dingalings, - ) + # The database may decide to create indexes for foreign keys, etc. # so there may be more indexes than expected. insp = inspect(meta.bind) @@ -995,11 +979,6 @@ class ComponentReflectionTest(fixtures.TablesTest): @testing.provide_metadata def _test_get_view_definition(self, schema=None): meta = self.metadata - users, addresses, dingalings = ( - self.tables.users, - self.tables.email_addresses, - self.tables.dingalings, - ) view_name1 = "users_v" view_name2 = "email_addresses_v" insp = inspect(meta.bind) @@ -1021,11 +1000,6 @@ class ComponentReflectionTest(fixtures.TablesTest): @testing.provide_metadata def _test_get_table_oid(self, table_name, schema=None): meta = self.metadata - users, addresses, dingalings = ( - self.tables.users, - self.tables.email_addresses, - self.tables.dingalings, - ) insp = inspect(meta.bind) oid = insp.get_table_oid(table_name, schema) self.assert_(isinstance(oid, int)) diff --git a/lib/sqlalchemy/testing/suite/test_results.py b/lib/sqlalchemy/testing/suite/test_results.py index a07e45df2d..67b0fd7039 100644 --- a/lib/sqlalchemy/testing/suite/test_results.py +++ b/lib/sqlalchemy/testing/suite/test_results.py @@ -345,7 +345,7 @@ class ServerSideCursorsTest( def test_roundtrip(self): md = self.metadata - engine = self._fixture(True) + self._fixture(True) test_table = Table( "test_table", md, diff --git a/lib/sqlalchemy/util/compat.py b/lib/sqlalchemy/util/compat.py index 11bfe7a037..b655a55f3c 100644 --- a/lib/sqlalchemy/util/compat.py +++ b/lib/sqlalchemy/util/compat.py @@ -74,7 +74,6 @@ def inspect_getfullargspec(func): nkwargs = co.co_kwonlyargcount if py3k else 0 args = list(names[:nargs]) kwonlyargs = list(names[nargs : nargs + nkwargs]) - step = 0 nargs += nkwargs varargs = None diff --git a/lib/sqlalchemy/util/deprecations.py b/lib/sqlalchemy/util/deprecations.py index 9abf4a6be8..9af8005915 100644 --- a/lib/sqlalchemy/util/deprecations.py +++ b/lib/sqlalchemy/util/deprecations.py @@ -112,8 +112,6 @@ def deprecated_params(**specs): check_defaults = () check_kw = set(messages) - has_kw = spec.varkw is not None - @decorator def warned(fn, *args, **kwargs): for m in check_defaults: diff --git a/lib/sqlalchemy/util/langhelpers.py b/lib/sqlalchemy/util/langhelpers.py index 117a9e2292..41a20c41d1 100644 --- a/lib/sqlalchemy/util/langhelpers.py +++ b/lib/sqlalchemy/util/langhelpers.py @@ -266,7 +266,7 @@ def _inspect_func_args(fn): nargs = co.co_argcount return ( list(co.co_varnames[:nargs]), - bool(co.co_flags & inspect.CO_VARKEYWORDS), + bool(co.co_flags & co_varkeywords), ) diff --git a/setup.cfg b/setup.cfg index 4076d815bc..d711080e1b 100644 --- a/setup.cfg +++ b/setup.cfg @@ -16,15 +16,11 @@ identity = C4DAFEE1 show-source = true enable-extensions = G # E203 is due to https://github.com/PyCQA/pycodestyle/issues/373 -# F841 is "variable assigned but never used". lots of these are in -# code examples, as well as in tests where sometimes they serve to keep -# an object in scope. It would be nice to have less of these but at the -# same time some are needed and some make code more readable ignore = A003, D, E203,E305,E711,E712,E721,E722,E741, - F821,F841 + F821 N801,N802,N806, RST304,RST303,RST299,RST399, W503,W504 diff --git a/test/aaa_profiling/test_memusage.py b/test/aaa_profiling/test_memusage.py index d1e9387ff4..d172c4a87d 100644 --- a/test/aaa_profiling/test_memusage.py +++ b/test/aaa_profiling/test_memusage.py @@ -745,7 +745,7 @@ class MemUsageWBackendTest(EnsureZeroed): Column("a_id", ForeignKey("a.id")), ) m1 = mapper(A, a, properties={"bs": relationship(B)}) - m2 = mapper(B, b) + mapper(B, b) @profile_memory() def go(): diff --git a/test/base/test_inspect.py b/test/base/test_inspect.py index 6c2cd0c08e..15b98c848b 100644 --- a/test/base/test_inspect.py +++ b/test/base/test_inspect.py @@ -71,6 +71,6 @@ class TestInspection(fixtures.TestBase): def insp_somesubfoo(subject): return 2 - somefoo = SomeFoo() + SomeFoo() eq_(inspect(SomeFoo()), 1) eq_(inspect(SomeSubFoo()), 2) diff --git a/test/base/test_utils.py b/test/base/test_utils.py index e96162703b..fea34cf8da 100644 --- a/test/base/test_utils.py +++ b/test/base/test_utils.py @@ -763,7 +763,7 @@ class LRUTest(fixtures.TestBase): for id_ in (25, 24, 23, 14, 12, 19, 18, 17, 16, 15): assert id_ in lru - i1 = lru[25] + lru[25] i2 = item(25) lru[25] = i2 assert 25 in lru @@ -1839,7 +1839,7 @@ class SymbolTest(fixtures.TestBase): # default s = util.pickle.dumps(sym1) - sym3 = util.pickle.loads(s) + util.pickle.loads(s) for protocol in 0, 1, 2: print(protocol) diff --git a/test/dialect/mysql/test_compiler.py b/test/dialect/mysql/test_compiler.py index 60e11ca29f..6355f60c38 100644 --- a/test/dialect/mysql/test_compiler.py +++ b/test/dialect/mysql/test_compiler.py @@ -134,13 +134,12 @@ class CompileTest(fixtures.TestBase, AssertsCompiledSQL): table_name = "testtbl" constraint_name = "constraint" constraint = CheckConstraint("data IS NOT NULL", name=constraint_name) - tbl = Table(table_name, m, Column("data", String(255)), constraint) + Table(table_name, m, Column("data", String(255)), constraint) dialect = mysql.dialect() self.assert_compile( schema.DropConstraint(constraint), - "ALTER TABLE %s DROP CHECK `%s`" - % (table_name, constraint_name), - dialect=dialect + "ALTER TABLE %s DROP CHECK `%s`" % (table_name, constraint_name), + dialect=dialect, ) def test_drop_constraint_mariadb(self): @@ -148,14 +147,14 @@ class CompileTest(fixtures.TestBase, AssertsCompiledSQL): table_name = "testtbl" constraint_name = "constraint" constraint = CheckConstraint("data IS NOT NULL", name=constraint_name) - tbl = Table(table_name, m, Column("data", String(255)), constraint) + Table(table_name, m, Column("data", String(255)), constraint) dialect = mysql.dialect() dialect.server_version_info = (10, 1, 1, "MariaDB") self.assert_compile( schema.DropConstraint(constraint), "ALTER TABLE %s DROP CONSTRAINT `%s`" % (table_name, constraint_name), - dialect=dialect + dialect=dialect, ) def test_create_index_with_length_quoted(self): diff --git a/test/dialect/postgresql/test_reflection.py b/test/dialect/postgresql/test_reflection.py index 9580018be2..7e7a82d469 100644 --- a/test/dialect/postgresql/test_reflection.py +++ b/test/dialect/postgresql/test_reflection.py @@ -49,7 +49,7 @@ class ForeignTableReflectionTest(fixtures.TablesTest, AssertsExecutionResults): "sqla_testing", "postgres_test_db_link" ) - testtable = Table( + Table( "testtable", metadata, Column("id", Integer, primary_key=True), @@ -86,13 +86,13 @@ class ForeignTableReflectionTest(fixtures.TablesTest, AssertsExecutionResults): def test_get_foreign_table_names(self): inspector = inspect(testing.db) - with testing.db.connect() as conn: + with testing.db.connect(): ft_names = inspector.get_foreign_table_names() eq_(ft_names, ["test_foreigntable"]) def test_get_table_names_no_foreign(self): inspector = inspect(testing.db) - with testing.db.connect() as conn: + with testing.db.connect(): names = inspector.get_table_names() eq_(names, ["testtable"]) @@ -450,7 +450,7 @@ class ReflectionTest(fixtures.TestBase): @testing.provide_metadata def test_renamed_sequence_reflection(self): metadata = self.metadata - t = Table("t", metadata, Column("id", Integer, primary_key=True)) + Table("t", metadata, Column("id", Integer, primary_key=True)) metadata.create_all() m2 = MetaData(testing.db) t2 = Table("t", m2, autoload=True, implicit_returning=False) @@ -472,7 +472,7 @@ class ReflectionTest(fixtures.TestBase): @testing.provide_metadata def test_altered_type_autoincrement_pk_reflection(self): metadata = self.metadata - t = Table( + Table( "t", metadata, Column("id", Integer, primary_key=True), @@ -490,7 +490,7 @@ class ReflectionTest(fixtures.TestBase): @testing.provide_metadata def test_renamed_pk_reflection(self): metadata = self.metadata - t = Table("t", metadata, Column("id", Integer, primary_key=True)) + Table("t", metadata, Column("id", Integer, primary_key=True)) metadata.create_all() testing.db.connect().execution_options(autocommit=True).execute( "alter table t rename id to t_id" @@ -705,9 +705,7 @@ class ReflectionTest(fixtures.TestBase): m1 = MetaData(conn) - t1_schema = Table( - "some_table", m1, schema="test_schema", autoload=True - ) + Table("some_table", m1, schema="test_schema", autoload=True) t2_schema = Table( "some_other_table", m1, schema="test_schema_2", autoload=True ) @@ -855,7 +853,7 @@ class ReflectionTest(fixtures.TestBase): metadata = self.metadata - t1 = Table( + Table( "party", metadata, Column("id", String(10), nullable=False), @@ -994,7 +992,7 @@ class ReflectionTest(fixtures.TestBase): metadata = self.metadata - t1 = Table( + Table( "t", metadata, Column("id", Integer, primary_key=True), diff --git a/test/dialect/postgresql/test_types.py b/test/dialect/postgresql/test_types.py index e55754f1b5..72335ebe39 100644 --- a/test/dialect/postgresql/test_types.py +++ b/test/dialect/postgresql/test_types.py @@ -68,7 +68,7 @@ class FloatCoercionTest(fixtures.TablesTest, AssertsExecutionResults): @classmethod def define_tables(cls, metadata): - data_table = Table( + Table( "data_table", metadata, Column("id", Integer, primary_key=True), @@ -328,9 +328,9 @@ class EnumTest(fixtures.TestBase, AssertsExecutionResults): metadata = self.metadata e1 = Enum("one", "two", "three", name="myenum") - t1 = Table("e1", metadata, Column("c1", e1)) + Table("e1", metadata, Column("c1", e1)) - t2 = Table("e2", metadata, Column("c1", e1)) + Table("e2", metadata, Column("c1", e1)) metadata.create_all(checkfirst=False) metadata.drop_all(checkfirst=False) @@ -349,7 +349,7 @@ class EnumTest(fixtures.TestBase, AssertsExecutionResults): """ metadata = self.metadata - e1 = Enum("one", "two", "three", name="myenum", metadata=self.metadata) + Enum("one", "two", "three", name="myenum", metadata=self.metadata) metadata.create_all(checkfirst=False) assert "myenum" in [e["name"] for e in inspect(testing.db).get_enums()] @@ -525,7 +525,7 @@ class EnumTest(fixtures.TestBase, AssertsExecutionResults): etype = Enum( "four", "five", "six", name="fourfivesixtype", metadata=metadata ) - t1 = Table( + Table( "table", metadata, Column("id", Integer, primary_key=True), @@ -773,7 +773,7 @@ class NumericInterpretationTest(fixtures.TestBase): Column("ff", Float(asdecimal=False), default=1), ) metadata.create_all() - r = t.insert().execute() + t.insert().execute() row = t.select().execute().first() assert isinstance(row[1], decimal.Decimal) @@ -1890,7 +1890,7 @@ class UUIDTest(fixtures.TestBase): def setup(self): self.conn = testing.db.connect() - trans = self.conn.begin() + self.conn.begin() def teardown(self): self.conn.close() diff --git a/test/engine/test_ddlevents.py b/test/engine/test_ddlevents.py index c9177e6ad3..2fc0549156 100644 --- a/test/engine/test_ddlevents.py +++ b/test/engine/test_ddlevents.py @@ -10,6 +10,7 @@ from sqlalchemy.schema import AddConstraint from sqlalchemy.schema import CheckConstraint from sqlalchemy.schema import DDL from sqlalchemy.schema import DropConstraint +from sqlalchemy.testing import assert_raises from sqlalchemy.testing import AssertsCompiledSQL from sqlalchemy.testing import engines from sqlalchemy.testing import eq_ @@ -494,7 +495,7 @@ class DDLExecutionTest(fixtures.TestBase): assert "fnord" in strings def test_conditional_constraint(self): - metadata, users, engine = self.metadata, self.users, self.engine + metadata, users = self.metadata, self.users nonpg_mock = engines.mock_engine(dialect_name="sqlite") pg_mock = engines.mock_engine(dialect_name="postgresql") constraint = CheckConstraint( @@ -531,7 +532,7 @@ class DDLExecutionTest(fixtures.TestBase): @testing.uses_deprecated(r".*use the DDLEvents") def test_conditional_constraint_deprecated(self): - metadata, users, engine = self.metadata, self.users, self.engine + metadata, users = self.metadata, self.users nonpg_mock = engines.mock_engine(dialect_name="sqlite") pg_mock = engines.mock_engine(dialect_name="postgresql") constraint = CheckConstraint( @@ -567,31 +568,32 @@ class DDLExecutionTest(fixtures.TestBase): table = self.users ddl = DDL("SELECT 1") - for py in ( - "engine.execute(ddl)", - "engine.execute(ddl, table)", - "cx.execute(ddl)", - "cx.execute(ddl, table)", - "ddl.execute(engine)", - "ddl.execute(engine, table)", - "ddl.execute(cx)", - "ddl.execute(cx, table)", + for spec in ( + (engine.execute, ddl), + (engine.execute, ddl, table), + (cx.execute, ddl), + (cx.execute, ddl, table), + (ddl.execute, engine), + (ddl.execute, engine, table), + (ddl.execute, cx), + (ddl.execute, cx, table), ): - r = eval(py) - assert list(r) == [(1,)], py + fn = spec[0] + arg = spec[1:] + r = fn(*arg) + eq_(list(r), [(1,)]) - for py in ("ddl.execute()", "ddl.execute(target=table)"): - try: - r = eval(py) - assert False - except tsa.exc.UnboundExecutionError: - pass + for fn, kw in ((ddl.execute, {}), (ddl.execute, dict(target=table))): + assert_raises(tsa.exc.UnboundExecutionError, fn, **kw) for bind in engine, cx: ddl.bind = bind - for py in ("ddl.execute()", "ddl.execute(target=table)"): - r = eval(py) - assert list(r) == [(1,)], py + for fn, kw in ( + (ddl.execute, {}), + (ddl.execute, dict(target=table)), + ): + r = fn(**kw) + eq_(list(r), [(1,)]) def test_platform_escape(self): """test the escaping of % characters in the DDL construct.""" diff --git a/test/engine/test_deprecations.py b/test/engine/test_deprecations.py index 29bda0ac20..8bae599a9d 100644 --- a/test/engine/test_deprecations.py +++ b/test/engine/test_deprecations.py @@ -576,8 +576,8 @@ class TLTransactionTest(fixtures.TestBase): r1 = tlengine.execute(select([1])) r2 = tlengine.execute(select([1])) - row1 = r1.fetchone() - row2 = r2.fetchone() + r1.fetchone() + r2.fetchone() r1.close() assert r2.connection is r1.connection assert not r2.connection.closed @@ -600,7 +600,7 @@ class TLTransactionTest(fixtures.TestBase): def test_dispose(self): with _tlengine_deprecated(): eng = testing_engine(options=dict(strategy="threadlocal")) - result = eng.execute(select([1])) + eng.execute(select([1])) eng.dispose() eng.execute(select([1])) diff --git a/test/engine/test_execute.py b/test/engine/test_execute.py index 480da71221..20c8ae659c 100644 --- a/test/engine/test_execute.py +++ b/test/engine/test_execute.py @@ -1306,7 +1306,7 @@ class EngineEventsTest(fixtures.TestBase): Engine._has_events = False def _assert_stmts(self, expected, received): - orig = list(received) + list(received) for stmt, params, posn in expected: if not received: assert False, "Nothing available for stmt: %s" % stmt @@ -2162,7 +2162,7 @@ class HandleErrorTest(fixtures.TestBase): r"is.*(?:i_dont_exist|does not exist)", py2konly=True, ): - with patch.object(conn.dialect, "do_rollback", boom) as patched: + with patch.object(conn.dialect, "do_rollback", boom): assert_raises_message( tsa.exc.OperationalError, "rollback failed", diff --git a/test/engine/test_reconnect.py b/test/engine/test_reconnect.py index dd2ebb1c41..14f3a7fd56 100644 --- a/test/engine/test_reconnect.py +++ b/test/engine/test_reconnect.py @@ -286,8 +286,6 @@ class MockReconnectTest(fixtures.TestBase): connection, and additionally dispose the previous connection pool and recreate.""" - db_pool = self.db.pool - # make a connection conn = self.db.connect() @@ -540,8 +538,6 @@ class MockReconnectTest(fixtures.TestBase): dbapi = self.dbapi - mock_dialect = Mock() - class MyURL(URL): def _get_entrypoint(self): return Dialect @@ -553,9 +549,9 @@ class MockReconnectTest(fixtures.TestBase): initialize = Mock() engine = create_engine(MyURL("foo://"), module=dbapi) - c1 = engine.connect() + engine.connect() engine.dispose() - c2 = engine.connect() + engine.connect() eq_(Dialect.initialize.call_count, 1) def test_invalidate_conn_w_contextmanager_interrupt(self): @@ -752,7 +748,6 @@ class RealReconnectTest(fixtures.TestBase): eq_(c1.execute(select([1])).scalar(), 1) - p1 = self.engine.pool self.engine.test_shutdown() _assert_invalidated(c1.execute, select([1])) @@ -844,7 +839,7 @@ class RealReconnectTest(fixtures.TestBase): @testing.requires.savepoints def test_rollback_on_invalid_savepoint(self): conn = self.engine.connect() - trans = conn.begin() + conn.begin() trans2 = conn.begin_nested() conn.invalidate() trans2.rollback() @@ -879,8 +874,6 @@ class RealReconnectTest(fixtures.TestBase): engine.dialect.initialize = broken_initialize - p1 = engine.pool - def is_disconnect(e, conn, cursor): return True diff --git a/test/engine/test_reflection.py b/test/engine/test_reflection.py index b414e15ad4..8830033b33 100644 --- a/test/engine/test_reflection.py +++ b/test/engine/test_reflection.py @@ -1922,9 +1922,9 @@ class SchemaTest(fixtures.TestBase): @testing.requires.implicit_default_schema @testing.provide_metadata def test_reflect_all_schemas_default_overlap(self): - t1 = Table("t", self.metadata, Column("id", Integer, primary_key=True)) + Table("t", self.metadata, Column("id", Integer, primary_key=True)) - t2 = Table( + Table( "t", self.metadata, Column("id1", sa.ForeignKey("t.id")), diff --git a/test/engine/test_transaction.py b/test/engine/test_transaction.py index 81f86089be..598844991e 100644 --- a/test/engine/test_transaction.py +++ b/test/engine/test_transaction.py @@ -145,7 +145,7 @@ class TransactionTest(fixtures.TestBase): trans2.rollback() raise transaction.rollback() - except Exception as e: + except Exception: transaction.rollback() raise except Exception as e: @@ -300,7 +300,7 @@ class TransactionTest(fixtures.TestBase): connection.execute(users.insert(), user_id=2, user_name="user2") try: connection.execute(users.insert(), user_id=2, user_name="user2.5") - except Exception as e: + except Exception: trans.__exit__(*sys.exc_info()) assert not trans.is_active @@ -404,7 +404,7 @@ class TransactionTest(fixtures.TestBase): connection = testing.db.connect() transaction = connection.begin() connection.execute(users.insert(), user_id=1, user_name="user1") - trans2 = connection.begin_nested() + connection.begin_nested() connection.execute(users.insert(), user_id=2, user_name="user2") trans3 = connection.begin() connection.execute(users.insert(), user_id=3, user_name="user3") @@ -557,7 +557,7 @@ class TransactionTest(fixtures.TestBase): with eng.connect() as conn: rec = conn.connection._connection_record raw_dbapi_con = rec.connection - xa = conn.begin_twophase() + conn.begin_twophase() conn.execute(users.insert(), user_id=1, user_name="user1") assert rec.connection is raw_dbapi_con diff --git a/test/ext/declarative/test_concurrency.py b/test/ext/declarative/test_concurrency.py index 42d0b13a44..ac1ae0aaff 100644 --- a/test/ext/declarative/test_concurrency.py +++ b/test/ext/declarative/test_concurrency.py @@ -43,7 +43,7 @@ class ConcurrentUseDeclMappingTest(fixtures.TestBase): # this is the failure mode, where B is being handled by # declarative and is in the registry but not mapped yet. result[0] = oe - except exc.InvalidRequestError as err: + except exc.InvalidRequestError: # if make_b() starts too slowly, we can reach here, because # B isn't in the registry yet. We can't guard against this # case in the library because a class can refer to a name that diff --git a/test/ext/test_horizontal_shard.py b/test/ext/test_horizontal_shard.py index 99c0a3c1a3..affd7112c6 100644 --- a/test/ext/test_horizontal_shard.py +++ b/test/ext/test_horizontal_shard.py @@ -319,7 +319,7 @@ class ShardTest(object): event.listen(WeatherLocation, "load", load) sess = self._fixture_data() - tokyo = ( + tokyo = ( # noqa sess.query(WeatherLocation) .filter_by(city="Tokyo") .set_shard("asia") diff --git a/test/orm/inheritance/test_assorted_poly.py b/test/orm/inheritance/test_assorted_poly.py index 525824669c..6e4861c347 100644 --- a/test/orm/inheritance/test_assorted_poly.py +++ b/test/orm/inheritance/test_assorted_poly.py @@ -614,21 +614,19 @@ class RelationshipTest4(fixtures.MappedTest): polymorphic_on=employee_join.c.type, polymorphic_identity="person", ) - engineer_mapper = mapper( + mapper( Engineer, engineers, inherits=person_mapper, polymorphic_identity="engineer", ) - manager_mapper = mapper( + mapper( Manager, managers, inherits=person_mapper, polymorphic_identity="manager", ) - car_mapper = mapper( - Car, cars, properties={"employee": relationship(person_mapper)} - ) + mapper(Car, cars, properties={"employee": relationship(person_mapper)}) session = create_session() @@ -781,7 +779,7 @@ class RelationshipTest5(fixtures.MappedTest): polymorphic_on=people.c.type, polymorphic_identity="person", ) - engineer_mapper = mapper( + mapper( Engineer, engineers, inherits=person_mapper, @@ -793,7 +791,7 @@ class RelationshipTest5(fixtures.MappedTest): inherits=person_mapper, polymorphic_identity="manager", ) - car_mapper = mapper( + mapper( Car, cars, properties={ @@ -1015,7 +1013,7 @@ class RelationshipTest7(fixtures.MappedTest): polymorphic_on=car_join.c.type, polymorphic_identity="car", ) - offroad_car_mapper = mapper( + mapper( Offraod_Car, offroad_cars, inherits=car_mapper, @@ -1029,13 +1027,13 @@ class RelationshipTest7(fixtures.MappedTest): polymorphic_identity="person", properties={"car": relationship(car_mapper)}, ) - engineer_mapper = mapper( + mapper( Engineer, engineers, inherits=person_mapper, polymorphic_identity="engineer", ) - manager_mapper = mapper( + mapper( Manager, managers, inherits=person_mapper, @@ -1043,8 +1041,6 @@ class RelationshipTest7(fixtures.MappedTest): ) session = create_session() - basic_car = Car(name="basic") - offroad_car = Offraod_Car(name="offroad") for i in range(1, 4): if i % 2: @@ -1284,13 +1280,13 @@ class GenerativeTest(fixtures.TestBase, AssertsExecutionResults): inherits=person_mapper, polymorphic_identity="engineer", ) - manager_mapper = mapper( + mapper( Manager, managers, inherits=person_mapper, polymorphic_identity="manager", ) - car_mapper = mapper( + mapper( Car, cars, properties={ @@ -1338,7 +1334,6 @@ class GenerativeTest(fixtures.TestBase, AssertsExecutionResults): # this particular adapt used to cause a recursion overflow; # added here for testing - e = exists([Car.owner], Car.owner == employee_join.c.person_id) Query(Person)._adapt_clause(employee_join, False, False) r = ( @@ -1475,7 +1470,7 @@ class MultiLevelTest(fixtures.MappedTest): with_polymorphic=("*", pu_Engineer), ) - mapper_Manager = mapper( + mapper( Manager, table_Manager, inherit_condition=table_Manager.c.id == table_Engineer.c.id, @@ -1792,7 +1787,7 @@ class InheritingEagerTest(fixtures.MappedTest): class MissingPolymorphicOnTest(fixtures.MappedTest): @classmethod def define_tables(cls, metadata): - tablea = Table( + Table( "tablea", metadata, Column( @@ -1800,7 +1795,7 @@ class MissingPolymorphicOnTest(fixtures.MappedTest): ), Column("adata", String(50)), ) - tableb = Table( + Table( "tableb", metadata, Column( @@ -1809,13 +1804,13 @@ class MissingPolymorphicOnTest(fixtures.MappedTest): Column("aid", Integer, ForeignKey("tablea.id")), Column("data", String(50)), ) - tablec = Table( + Table( "tablec", metadata, Column("id", Integer, ForeignKey("tablea.id"), primary_key=True), Column("cdata", String(50)), ) - tabled = Table( + Table( "tabled", metadata, Column("id", Integer, ForeignKey("tablec.id"), primary_key=True), @@ -1913,7 +1908,7 @@ class JoinedInhAdjacencyTest(fixtures.MappedTest): pass def _roundtrip(self): - Person, User = self.classes.Person, self.classes.User + User = self.classes.User sess = Session() u1 = User() u2 = User() @@ -2084,13 +2079,7 @@ class Ticket2419Test(fixtures.DeclarativeMappedTest): "end though", ) def test_join_w_eager_w_any(self): - A, B, C, D, E = ( - self.classes.A, - self.classes.B, - self.classes.C, - self.classes.D, - self.classes.E, - ) + B, C, D = (self.classes.B, self.classes.C, self.classes.D) s = Session(testing.db) b = B(ds=[D()]) diff --git a/test/orm/inheritance/test_basic.py b/test/orm/inheritance/test_basic.py index 59ecc7c986..5a7b549ac8 100644 --- a/test/orm/inheritance/test_basic.py +++ b/test/orm/inheritance/test_basic.py @@ -287,7 +287,7 @@ class PolymorphicResolutionMultiLevel( class PolymorphicOnNotLocalTest(fixtures.MappedTest): @classmethod def define_tables(cls, metadata): - t1 = Table( + Table( "t1", metadata, Column( @@ -296,7 +296,7 @@ class PolymorphicOnNotLocalTest(fixtures.MappedTest): Column("x", String(10)), Column("q", String(10)), ) - t2 = Table( + Table( "t2", metadata, Column( @@ -332,21 +332,18 @@ class PolymorphicOnNotLocalTest(fixtures.MappedTest): ) def test_polymorphic_on_non_expr_prop(self): - t2, t1 = self.tables.t2, self.tables.t1 + t2 = self.tables.t2 Parent = self.classes.Parent - t1t2_join = select([t1.c.x], from_obj=[t1.join(t2)]).alias() - - def go(): - interface_m = mapper( - Parent, t2, polymorphic_on=lambda: "hi", polymorphic_identity=0 - ) - assert_raises_message( sa_exc.ArgumentError, "Only direct column-mapped property or " "SQL expression can be passed for polymorphic_on", - go, + mapper, + Parent, + t2, + polymorphic_on=lambda: "hi", + polymorphic_identity=0, ) def test_polymorphic_on_not_present_col(self): @@ -356,7 +353,7 @@ class PolymorphicOnNotLocalTest(fixtures.MappedTest): def go(): t1t2_join_2 = select([t1.c.q], from_obj=[t1.join(t2)]).alias() - interface_m = mapper( + mapper( Parent, t2, polymorphic_on=t1t2_join.c.x, @@ -393,7 +390,7 @@ class PolymorphicOnNotLocalTest(fixtures.MappedTest): # if with_polymorphic, but its not present, not OK def go(): t1t2_join_2 = select([t1.c.q], from_obj=[t1.join(t2)]).alias() - interface_m = mapper( + mapper( Parent, t2, polymorphic_on=t1t2_join.c.x, @@ -447,7 +444,7 @@ class PolymorphicOnNotLocalTest(fixtures.MappedTest): def test_polymorphic_on_expr_implicit_map_no_label_single(self): """test that single_table_criterion is propagated with a standalone expr""" - t2, t1 = self.tables.t2, self.tables.t1 + t1 = self.tables.t1 Parent, Child = self.classes.Parent, self.classes.Child expr = case([(t1.c.x == "p", "parent"), (t1.c.x == "c", "child")]) mapper(Parent, t1, polymorphic_identity="parent", polymorphic_on=expr) @@ -458,7 +455,7 @@ class PolymorphicOnNotLocalTest(fixtures.MappedTest): def test_polymorphic_on_expr_implicit_map_w_label_single(self): """test that single_table_criterion is propagated with a standalone expr""" - t2, t1 = self.tables.t2, self.tables.t1 + t1 = self.tables.t1 Parent, Child = self.classes.Parent, self.classes.Child expr = case( [(t1.c.x == "p", "parent"), (t1.c.x == "c", "child")] @@ -501,8 +498,8 @@ class PolymorphicOnNotLocalTest(fixtures.MappedTest): self._roundtrip(parent_ident="p", child_ident="c") def test_polymorphic_on_synonym(self): - t2, t1 = self.tables.t2, self.tables.t1 - Parent, Child = self.classes.Parent, self.classes.Child + t1 = self.tables.t1 + Parent = self.classes.Parent cprop = column_property(t1.c.x) assert_raises_message( sa_exc.ArgumentError, @@ -1392,7 +1389,7 @@ class FlushTest(fixtures.MappedTest): class Admin(User): pass - role_mapper = mapper(Role, roles) + mapper(Role, roles) user_mapper = mapper( User, users, @@ -1402,7 +1399,7 @@ class FlushTest(fixtures.MappedTest): ) }, ) - admin_mapper = mapper(Admin, admins, inherits=user_mapper) + mapper(Admin, admins, inherits=user_mapper) sess = create_session() adminrole = Role() sess.add(adminrole) @@ -1440,7 +1437,7 @@ class FlushTest(fixtures.MappedTest): class Admin(User): pass - role_mapper = mapper(Role, roles) + mapper(Role, roles) user_mapper = mapper( User, users, @@ -1451,7 +1448,7 @@ class FlushTest(fixtures.MappedTest): }, ) - admin_mapper = mapper(Admin, admins, inherits=user_mapper) + mapper(Admin, admins, inherits=user_mapper) # create roles adminrole = Role("admin") @@ -2874,9 +2871,7 @@ class InhCondTest(fixtures.TestBase): Column("id", Integer, ForeignKey("base.id"), primary_key=True), Column("order_id", Integer, ForeignKey("order.foo")), ) - order_table = Table( - "order", m, Column("id", Integer, primary_key=True) - ) + Table("order", m, Column("id", Integer, primary_key=True)) class Base(object): pass @@ -2983,7 +2978,7 @@ class InhCondTest(fixtures.TestBase): class PKDiscriminatorTest(fixtures.MappedTest): @classmethod def define_tables(cls, metadata): - parents = Table( + Table( "parents", metadata, Column( @@ -2992,7 +2987,7 @@ class PKDiscriminatorTest(fixtures.MappedTest): Column("name", String(60)), ) - children = Table( + Table( "children", metadata, Column("id", Integer, ForeignKey("parents.id"), primary_key=True), @@ -3266,7 +3261,7 @@ class PolymorphicUnionTest(fixtures.TestBase, testing.AssertsCompiledSQL): class NameConflictTest(fixtures.MappedTest): @classmethod def define_tables(cls, metadata): - content = Table( + Table( "content", metadata, Column( @@ -3274,7 +3269,7 @@ class NameConflictTest(fixtures.MappedTest): ), Column("type", String(30)), ) - foo = Table( + Table( "foo", metadata, Column("id", Integer, ForeignKey("content.id"), primary_key=True), diff --git a/test/orm/inheritance/test_concrete.py b/test/orm/inheritance/test_concrete.py index acbf49a203..cea7eeaac8 100644 --- a/test/orm/inheritance/test_concrete.py +++ b/test/orm/inheritance/test_concrete.py @@ -151,14 +151,14 @@ class ConcreteTest(fixtures.MappedTest): "pjoin", ) employee_mapper = mapper(Employee, pjoin, polymorphic_on=pjoin.c.type) - manager_mapper = mapper( + mapper( Manager, managers_table, inherits=employee_mapper, concrete=True, polymorphic_identity="manager", ) - engineer_mapper = mapper( + mapper( Engineer, engineers_table, inherits=employee_mapper, @@ -202,7 +202,7 @@ class ConcreteTest(fixtures.MappedTest): "pjoin2", ) employee_mapper = mapper(Employee, pjoin, polymorphic_on=pjoin.c.type) - manager_mapper = mapper( + mapper( Manager, managers_table, inherits=employee_mapper, @@ -218,7 +218,7 @@ class ConcreteTest(fixtures.MappedTest): concrete=True, polymorphic_identity="engineer", ) - hacker_mapper = mapper( + mapper( Hacker, hackers_table, inherits=engineer_mapper, @@ -399,7 +399,7 @@ class ConcreteTest(fixtures.MappedTest): with_polymorphic=("*", pjoin), polymorphic_on=pjoin.c.type, ) - manager_mapper = mapper( + mapper( Manager, managers_table, inherits=employee_mapper, @@ -415,7 +415,7 @@ class ConcreteTest(fixtures.MappedTest): concrete=True, polymorphic_identity="engineer", ) - hacker_mapper = mapper( + mapper( Hacker, hackers_table, inherits=engineer_mapper, @@ -488,7 +488,7 @@ class ConcreteTest(fixtures.MappedTest): employee_mapper = mapper( Employee, employees_table, polymorphic_identity="employee" ) - manager_mapper = mapper( + mapper( Manager, managers_table, inherits=employee_mapper, @@ -502,7 +502,7 @@ class ConcreteTest(fixtures.MappedTest): concrete=True, polymorphic_identity="engineer", ) - hacker_mapper = mapper( + mapper( Hacker, hackers_table, inherits=engineer_mapper, @@ -615,14 +615,14 @@ class ConcreteTest(fixtures.MappedTest): properties={"employees": relationship(Employee)}, ) employee_mapper = mapper(Employee, pjoin, polymorphic_on=pjoin.c.type) - manager_mapper = mapper( + mapper( Manager, managers_table, inherits=employee_mapper, concrete=True, polymorphic_identity="manager", ) - engineer_mapper = mapper( + mapper( Engineer, engineers_table, inherits=employee_mapper, @@ -1203,14 +1203,14 @@ class ColKeysTest(fixtures.MappedTest): polymorphic_on=pjoin.c.type, polymorphic_identity="location", ) - office_mapper = mapper( + mapper( Office, offices_table, inherits=location_mapper, concrete=True, polymorphic_identity="office", ) - refugee_mapper = mapper( + mapper( Refugee, refugees_table, inherits=location_mapper, diff --git a/test/orm/inheritance/test_magazine.py b/test/orm/inheritance/test_magazine.py index 27f5e71ce1..7061ac3682 100644 --- a/test/orm/inheritance/test_magazine.py +++ b/test/orm/inheritance/test_magazine.py @@ -201,9 +201,9 @@ class MagazineTest(fixtures.MappedTest): def _generate_round_trip_test(use_unions=False, use_joins=False): def test_roundtrip(self): - publication_mapper = mapper(Publication, self.tables.publication) + mapper(Publication, self.tables.publication) - issue_mapper = mapper( + mapper( Issue, self.tables.issue, properties={ @@ -214,9 +214,9 @@ def _generate_round_trip_test(use_unions=False, use_joins=False): }, ) - location_name_mapper = mapper(LocationName, self.tables.location_name) + mapper(LocationName, self.tables.location_name) - location_mapper = mapper( + mapper( Location, self.tables.location, properties={ @@ -232,9 +232,9 @@ def _generate_round_trip_test(use_unions=False, use_joins=False): }, ) - page_size_mapper = mapper(PageSize, self.tables.page_size) + mapper(PageSize, self.tables.page_size) - magazine_mapper = mapper( + mapper( Magazine, self.tables.magazine, properties={ @@ -346,7 +346,7 @@ def _generate_round_trip_test(use_unions=False, use_joins=False): }, ) - classified_page_mapper = mapper( + mapper( ClassifiedPage, self.tables.classified_page, inherits=magazine_page_mapper, diff --git a/test/orm/inheritance/test_poly_linked_list.py b/test/orm/inheritance/test_poly_linked_list.py index 5c3b639c41..e510268584 100644 --- a/test/orm/inheritance/test_poly_linked_list.py +++ b/test/orm/inheritance/test_poly_linked_list.py @@ -154,18 +154,16 @@ class PolymorphicCircularTest(fixtures.MappedTest): }, ) - table1b_mapper = mapper( - Table1B, inherits=table1_mapper, polymorphic_identity="table1b" - ) + mapper(Table1B, inherits=table1_mapper, polymorphic_identity="table1b") - table2_mapper = mapper( + mapper( Table2, table2, inherits=table1_mapper, polymorphic_identity="table2", ) - table3_mapper = mapper( + mapper( Table3, table3, inherits=table1_mapper, diff --git a/test/orm/inheritance/test_poly_persistence.py b/test/orm/inheritance/test_poly_persistence.py index 635f91b87b..614127f1e0 100644 --- a/test/orm/inheritance/test_poly_persistence.py +++ b/test/orm/inheritance/test_poly_persistence.py @@ -340,8 +340,6 @@ def _generate_round_trip_test( ), ] - pointy = employees[0] - jsmith = employees[-1] dilbert = employees[1] session = create_session() @@ -463,7 +461,7 @@ def _generate_round_trip_test( def go(): # assert that only primary table is queried for # already-present-in-session - d = ( + ( session.query(Person) .filter(getattr(Person, person_attribute_name) == "dilbert") .first() diff --git a/test/orm/inheritance/test_productspec.py b/test/orm/inheritance/test_productspec.py index 4174d01e85..b946b2b9bd 100644 --- a/test/orm/inheritance/test_productspec.py +++ b/test/orm/inheritance/test_productspec.py @@ -143,15 +143,13 @@ class InheritTest(fixtures.MappedTest): polymorphic_identity="product", ) - detail_mapper = mapper( - Detail, inherits=product_mapper, polymorphic_identity="detail" - ) + mapper(Detail, inherits=product_mapper, polymorphic_identity="detail") - assembly_mapper = mapper( + mapper( Assembly, inherits=product_mapper, polymorphic_identity="assembly" ) - specification_mapper = mapper( + mapper( SpecLine, specification_table, properties=dict( @@ -208,11 +206,9 @@ class InheritTest(fixtures.MappedTest): polymorphic_identity="product", ) - detail_mapper = mapper( - Detail, inherits=product_mapper, polymorphic_identity="detail" - ) + mapper(Detail, inherits=product_mapper, polymorphic_identity="detail") - specification_mapper = mapper( + mapper( SpecLine, specification_table, properties=dict( @@ -251,14 +247,12 @@ class InheritTest(fixtures.MappedTest): polymorphic_on=products_table.c.product_type, polymorphic_identity="product", ) - detail_mapper = mapper( - Detail, inherits=product_mapper, polymorphic_identity="detail" - ) - assembly_mapper = mapper( + mapper(Detail, inherits=product_mapper, polymorphic_identity="detail") + mapper( Assembly, inherits=product_mapper, polymorphic_identity="assembly" ) - specification_mapper = mapper( + mapper( SpecLine, specification_table, properties=dict( @@ -300,7 +294,7 @@ class InheritTest(fixtures.MappedTest): ), ), ) - raster_document_mapper = mapper( + mapper( RasterDocument, inherits=document_mapper, polymorphic_identity="raster_document", @@ -339,10 +333,8 @@ class InheritTest(fixtures.MappedTest): polymorphic_on=products_table.c.product_type, polymorphic_identity="product", ) - detail_mapper = mapper( - Detail, inherits=product_mapper, polymorphic_identity="detail" - ) - assembly_mapper = mapper( + mapper(Detail, inherits=product_mapper, polymorphic_identity="detail") + mapper( Assembly, inherits=product_mapper, polymorphic_identity="assembly" ) @@ -361,7 +353,7 @@ class InheritTest(fixtures.MappedTest): ), ), ) - raster_document_mapper = mapper( + mapper( RasterDocument, inherits=document_mapper, polymorphic_identity="raster_document", @@ -395,7 +387,7 @@ class InheritTest(fixtures.MappedTest): def test_five(self): """tests the late compilation of mappers""" - specification_mapper = mapper( + mapper( SpecLine, specification_table, properties=dict( @@ -420,7 +412,7 @@ class InheritTest(fixtures.MappedTest): ), ) - product_mapper = mapper( + mapper( Product, products_table, polymorphic_on=products_table.c.product_type, @@ -435,11 +427,9 @@ class InheritTest(fixtures.MappedTest): }, ) - detail_mapper = mapper( - Detail, inherits=Product, polymorphic_identity="detail" - ) + mapper(Detail, inherits=Product, polymorphic_identity="detail") - document_mapper = mapper( + mapper( Document, documents_table, polymorphic_on=documents_table.c.document_type, @@ -450,15 +440,13 @@ class InheritTest(fixtures.MappedTest): ), ) - raster_document_mapper = mapper( + mapper( RasterDocument, inherits=Document, polymorphic_identity="raster_document", ) - assembly_mapper = mapper( - Assembly, inherits=Product, polymorphic_identity="assembly" - ) + mapper(Assembly, inherits=Product, polymorphic_identity="assembly") session = create_session() diff --git a/test/orm/inheritance/test_relationship.py b/test/orm/inheritance/test_relationship.py index 11f945fcd6..3c121e06be 100644 --- a/test/orm/inheritance/test_relationship.py +++ b/test/orm/inheritance/test_relationship.py @@ -164,7 +164,7 @@ class SelfReferentialJ2JTest(fixtures.MappedTest): @classmethod def define_tables(cls, metadata): - people = Table( + Table( "people", metadata, Column( @@ -177,7 +177,7 @@ class SelfReferentialJ2JTest(fixtures.MappedTest): Column("type", String(30)), ) - engineers = Table( + Table( "engineers", metadata, Column( @@ -190,7 +190,7 @@ class SelfReferentialJ2JTest(fixtures.MappedTest): Column("reports_to_id", Integer, ForeignKey("managers.person_id")), ) - managers = Table( + Table( "managers", metadata, Column( @@ -343,7 +343,7 @@ class SelfReferentialJ2JSelfTest(fixtures.MappedTest): @classmethod def define_tables(cls, metadata): - people = Table( + Table( "people", metadata, Column( @@ -356,7 +356,7 @@ class SelfReferentialJ2JSelfTest(fixtures.MappedTest): Column("type", String(30)), ) - engineers = Table( + Table( "engineers", metadata, Column( @@ -494,7 +494,7 @@ class M2MFilterTest(fixtures.MappedTest): @classmethod def define_tables(cls, metadata): - organizations = Table( + Table( "organizations", metadata, Column( @@ -503,14 +503,14 @@ class M2MFilterTest(fixtures.MappedTest): Column("name", String(50)), ) - engineers_to_org = Table( + Table( "engineers_to_org", metadata, Column("org_id", Integer, ForeignKey("organizations.id")), Column("engineer_id", Integer, ForeignKey("engineers.person_id")), ) - people = Table( + Table( "people", metadata, Column( @@ -523,7 +523,7 @@ class M2MFilterTest(fixtures.MappedTest): Column("type", String(30)), ) - engineers = Table( + Table( "engineers", metadata, Column( @@ -2159,11 +2159,10 @@ class JoinAcrossJoinedInhMultiPath( ) def test_joinedload(self): - Root, Intermediate, Sub1, Target = ( + Root, Intermediate, Sub1 = ( self.classes.Root, self.classes.Intermediate, self.classes.Sub1, - self.classes.Target, ) sess = Session() @@ -2257,12 +2256,7 @@ class MultipleAdaptUsesEntityOverTableTest( mapper(D, d, inherits=A) def _two_join_fixture(self): - A, B, C, D = ( - self.classes.A, - self.classes.B, - self.classes.C, - self.classes.D, - ) + B, C, D = (self.classes.B, self.classes.C, self.classes.D) s = Session() return ( s.query(B.name, C.name, D.name) @@ -2272,7 +2266,7 @@ class MultipleAdaptUsesEntityOverTableTest( ) def test_two_joins_adaption(self): - a, b, c, d = self.tables.a, self.tables.b, self.tables.c, self.tables.d + a, c, d = self.tables.a, self.tables.c, self.tables.d q = self._two_join_fixture() btoc = q._from_obj[0].left diff --git a/test/orm/inheritance/test_single.py b/test/orm/inheritance/test_single.py index 1b28974b7b..100d6d017c 100644 --- a/test/orm/inheritance/test_single.py +++ b/test/orm/inheritance/test_single.py @@ -95,8 +95,7 @@ class SingleInheritanceTest(testing.AssertsCompiledSQL, fixtures.MappedTest): ) def _fixture_one(self): - Employee, JuniorEngineer, Manager, Engineer = ( - self.classes.Employee, + JuniorEngineer, Manager, Engineer = ( self.classes.JuniorEngineer, self.classes.Manager, self.classes.Engineer, @@ -139,11 +138,7 @@ class SingleInheritanceTest(testing.AssertsCompiledSQL, fixtures.MappedTest): assert row.employee_id == e1.employee_id def test_multi_qualification(self): - JuniorEngineer, Manager, Engineer = ( - self.classes.JuniorEngineer, - self.classes.Manager, - self.classes.Engineer, - ) + Manager, Engineer = (self.classes.Manager, self.classes.Engineer) session, m1, e1, e2 = self._fixture_one() @@ -1318,7 +1313,6 @@ class ManyToManyToSingleTest(fixtures.MappedTest, AssertsCompiledSQL): def test_assert_joinedload_sql(self): Parent = self.classes.Parent - Child = self.classes.Child s = Session() diff --git a/test/orm/test_assorted_eager.py b/test/orm/test_assorted_eager.py index 8317b58f1b..21534d6bc9 100644 --- a/test/orm/test_assorted_eager.py +++ b/test/orm/test_assorted_eager.py @@ -438,7 +438,7 @@ class EagerTest2(fixtures.MappedTest): session.add(p) session.flush() session.expunge_all() - obj = session.query(Left).filter_by(data="l1").one() + session.query(Left).filter_by(data="l1").one() class EagerTest3(fixtures.MappedTest): @@ -733,7 +733,7 @@ class EagerTest5(fixtures.MappedTest): self.tables.derivedII, ) - commentMapper = mapper(Comment, comments) + mapper(Comment, comments) baseMapper = mapper( Base, @@ -1135,11 +1135,10 @@ class EagerTest8(fixtures.MappedTest): pass def test_nested_joins(self): - task, Task_Type, Joined, prj, task_type, msg = ( + task, Task_Type, Joined, task_type, msg = ( self.tables.task, self.classes.Task_Type, self.classes.Joined, - self.tables.prj, self.tables.task_type, self.tables.msg, ) @@ -1150,8 +1149,6 @@ class EagerTest8(fixtures.MappedTest): mapper(Task_Type, task_type) - tsk_cnt_join = sa.outerjoin(prj, task, task.c.prj_id == prj.c.id) - j = sa.outerjoin(task, msg, task.c.id == msg.c.task_id) jj = sa.select( [ @@ -1290,12 +1287,12 @@ class EagerTest9(fixtures.MappedTest): tx2 = Transaction(name="tx2") acc1 = Account(name="acc1") - ent11 = Entry(name="ent11", account=acc1, transaction=tx1) - ent12 = Entry(name="ent12", account=acc1, transaction=tx2) + Entry(name="ent11", account=acc1, transaction=tx1) + Entry(name="ent12", account=acc1, transaction=tx2) acc2 = Account(name="acc2") - ent21 = Entry(name="ent21", account=acc2, transaction=tx1) - ent22 = Entry(name="ent22", account=acc2, transaction=tx2) + Entry(name="ent21", account=acc2, transaction=tx1) + Entry(name="ent22", account=acc2, transaction=tx2) session.add(acc1) session.flush() diff --git a/test/orm/test_attributes.py b/test/orm/test_attributes.py index 17488f2365..ca888ba2b8 100644 --- a/test/orm/test_attributes.py +++ b/test/orm/test_attributes.py @@ -938,7 +938,7 @@ class AttributesTest(fixtures.ORMTest): try: Foo().collection assert True - except sa_exc.ArgumentError as e: + except sa_exc.ArgumentError: assert False def test_last_known_tracking(self): @@ -2578,8 +2578,6 @@ class HistoryTest(fixtures.TestBase): ) hi = Bar(name="hi") there = Bar(name="there") - old = Bar(name="old") - new = Bar(name="new") f = Foo() eq_( attributes.get_state_history( @@ -3643,7 +3641,7 @@ class EventPropagateTest(fixtures.TestBase): fn() if useobject: - D = make_d() + make_d() instrument_d() yield classes, canary diff --git a/test/orm/test_cascade.py b/test/orm/test_cascade.py index 1cd9d344ff..5f4519bcf7 100644 --- a/test/orm/test_cascade.py +++ b/test/orm/test_cascade.py @@ -87,8 +87,7 @@ class CascadeArgTest(fixtures.MappedTest): ) def test_delete_orphan_without_delete(self): - User, Address = self.classes.User, self.classes.Address - users, addresses = self.tables.users, self.tables.addresses + Address = self.classes.Address assert_raises_message( sa_exc.SAWarning, @@ -161,8 +160,7 @@ class CascadeArgTest(fixtures.MappedTest): ) def test_cascade_unicode(self): - User, Address = self.classes.User, self.classes.Address - users, addresses = self.tables.users, self.tables.addresses + Address = self.classes.Address rel = relationship(Address) rel.cascade = util.u("save-update, merge, expunge") @@ -630,7 +628,7 @@ class O2MCascadeTest(fixtures.MappedTest): ) def test_none_o2m_collection_assignment(self): - User, Address = self.classes.User, self.classes.Address + User = self.classes.User s = Session() u1 = User(name="u", addresses=[None]) s.add(u1) @@ -643,7 +641,7 @@ class O2MCascadeTest(fixtures.MappedTest): eq_(u1.addresses, [None]) def test_none_o2m_collection_append(self): - User, Address = self.classes.User, self.classes.Address + User = self.classes.User s = Session() u1 = User(name="u") @@ -1834,17 +1832,13 @@ class M2OCascadeDeleteOrphanTestTwo(fixtures.MappedTest): def test_single_parent_raise(self): T2, T1 = self.classes.T2, self.classes.T1 - sess = create_session() - y = T2(data="T2a") - x = T1(data="T1a", t2=y) + T1(data="T1a", t2=y) assert_raises(sa_exc.InvalidRequestError, T1, data="T1b", t2=y) def test_single_parent_backref(self): T2, T3 = self.classes.T2, self.classes.T3 - sess = create_session() - y = T3(data="T3a") x = T2(data="T2a", t3=y) @@ -2266,9 +2260,8 @@ class M2MCascadeTest(fixtures.MappedTest): ) mapper(B, b) - sess = create_session() b1 = B(data="b1") - a1 = A(data="a1", bs=[b1]) + A(data="a1", bs=[b1]) assert_raises(sa_exc.InvalidRequestError, A, data="a2", bs=[b1]) @@ -2299,7 +2292,6 @@ class M2MCascadeTest(fixtures.MappedTest): ) mapper(B, b) - sess = create_session() b1 = B(data="b1") a1 = A(data="a1", bs=[b1]) @@ -3286,13 +3278,13 @@ class OrphanCriterionTest(fixtures.MappedTest): ) c1 = Core() if detach_event: - r1 = RelatedOne(cores=[c1]) - r2 = RelatedTwo(cores=[c1]) + RelatedOne(cores=[c1]) + RelatedTwo(cores=[c1]) else: if r1_present: - r1 = RelatedOne(cores=[c1]) + RelatedOne(cores=[c1]) if r2_present: - r2 = RelatedTwo(cores=[c1]) + RelatedTwo(cores=[c1]) if persistent: s = Session() diff --git a/test/orm/test_compile.py b/test/orm/test_compile.py index de8e19bad6..dcf07eec8a 100644 --- a/test/orm/test_compile.py +++ b/test/orm/test_compile.py @@ -79,7 +79,7 @@ class CompileTest(fixtures.ORMTest): order_join = order.select().alias("pjoin") - order_mapper = mapper( + mapper( Order, order, with_polymorphic=("*", order_join), @@ -161,7 +161,7 @@ class CompileTest(fixtures.ORMTest): order_join = order.select().alias("pjoin") - order_mapper = mapper( + mapper( Order, order, with_polymorphic=("*", order_join), @@ -225,9 +225,9 @@ class CompileTest(fixtures.ORMTest): class Host(object): pass - node_mapper = mapper(Node, node_table) - host_mapper = mapper(Host, host_table) - node_name_mapper = mapper( + mapper(Node, node_table) + mapper(Host, host_table) + mapper( NodeName, node_name_table, properties={ diff --git a/test/orm/test_composites.py b/test/orm/test_composites.py index 3fef87a0ec..7247c859a6 100644 --- a/test/orm/test_composites.py +++ b/test/orm/test_composites.py @@ -142,11 +142,7 @@ class PointTest(fixtures.MappedTest, testing.AssertsCompiledSQL): eq_(e.end, Point(18, 4)) def test_not_none(self): - Graph, Edge, Point = ( - self.classes.Graph, - self.classes.Edge, - self.classes.Point, - ) + Edge = self.classes.Edge # current contract. the composite is None # when hasn't been populated etc. on a diff --git a/test/orm/test_defaults.py b/test/orm/test_defaults.py index e870b30573..5fbe091be0 100644 --- a/test/orm/test_defaults.py +++ b/test/orm/test_defaults.py @@ -148,7 +148,7 @@ class TriggerDefaultsTest(fixtures.MappedTest): class ExcludedDefaultsTest(fixtures.MappedTest): @classmethod def define_tables(cls, metadata): - dt = Table( + Table( "dt", metadata, Column( diff --git a/test/orm/test_deferred.py b/test/orm/test_deferred.py index 6b9c1c9182..89e58061dd 100644 --- a/test/orm/test_deferred.py +++ b/test/orm/test_deferred.py @@ -55,7 +55,7 @@ class DeferredTest(AssertsCompiledSQL, _fixtures.FixtureTest): def go(): result = q.all() o2 = result[2] - x = o2.description + o2.description self.sql_eq_( go, @@ -192,7 +192,7 @@ class DeferredTest(AssertsCompiledSQL, _fixtures.FixtureTest): def test_save(self): Order, orders = self.classes.Order, self.tables.orders - m = mapper( + mapper( Order, orders, properties={"description": deferred(orders.c.description)}, diff --git a/test/orm/test_deprecations.py b/test/orm/test_deprecations.py index 679b3ec5bd..47653cc685 100644 --- a/test/orm/test_deprecations.py +++ b/test/orm/test_deprecations.py @@ -195,7 +195,7 @@ class DeprecationWarningsTest(fixtures.DeclarativeMappedTest): "the Session._enable_transaction_accounting parameter is " "deprecated" ): - s = Session(_enable_transaction_accounting=False) + Session(_enable_transaction_accounting=False) def test_session_is_modified(self): class Foo(self.DeclarativeBasic): @@ -750,9 +750,6 @@ class DeprecatedMapperTest(_fixtures.FixtureTest, AssertsCompiledSQL): ) def test_info(self): - users = self.tables.users - Address = self.classes.Address - class MyComposite(object): pass @@ -833,8 +830,6 @@ class DeprecatedMapperTest(_fixtures.FixtureTest, AssertsCompiledSQL): self.sql_count_(1, go) def test_kwarg_accepted(self): - users, Address = self.tables.users, self.classes.Address - class DummyComposite(object): def __init__(self, x, y): pass @@ -2067,7 +2062,7 @@ class InstrumentationTest(fixtures.ORMTest): pass instrumentation.register_class(Foo) - d = attributes.register_attribute( + attributes.register_attribute( Foo, "attr", uselist=True, typecallable=MyDict, useobject=True ) @@ -2448,7 +2443,7 @@ class NonPrimaryMapperTest(_fixtures.FixtureTest, AssertsCompiledSQL): class AddressUser(User): pass - m1 = mapper(User, users, polymorphic_identity="user") + mapper(User, users, polymorphic_identity="user") m2 = mapper( AddressUser, addresses, diff --git a/test/orm/test_eager_relations.py b/test/orm/test_eager_relations.py index 4adf9a72f2..8f9b662f02 100644 --- a/test/orm/test_eager_relations.py +++ b/test/orm/test_eager_relations.py @@ -3069,7 +3069,6 @@ class InnerJoinSplicingTest(fixtures.MappedTest, testing.AssertsCompiledSQL): def test_splice_onto_ac(self): A = self.classes.A B = self.classes.B - C1 = self.classes.C1 b_table = self.tables.b c1_table = self.tables.c1 diff --git a/test/orm/test_events.py b/test/orm/test_events.py index 029b767e53..037d5bd9dc 100644 --- a/test/orm/test_events.py +++ b/test/orm/test_events.py @@ -254,8 +254,7 @@ class MapperEventsTest(_RemoveListeners, _fixtures.FixtureTest): event.listen(m, "load", canary.listen5, insert=True) event.listen(m, "load", canary.listen6, propagate=True, insert=True) - u1 = User() - state = u1._sa_instance_state + User() m.dispatch.before_insert(arg, arg, arg) m.class_manager.dispatch.load(arg, arg) eq_( @@ -2470,7 +2469,7 @@ class QueryEventsTest( s = Session() with self.sql_execution_asserter() as asserter: - q = s.query(User).filter_by(id=7).update({"name": "ed"}) + s.query(User).filter_by(id=7).update({"name": "ed"}) asserter.assert_( CompiledSQL( "UPDATE users SET name=:name WHERE " @@ -2495,7 +2494,7 @@ class QueryEventsTest( # note this deletes no rows with self.sql_execution_asserter() as asserter: - q = s.query(User).filter_by(id=10).delete() + s.query(User).filter_by(id=10).delete() asserter.assert_( CompiledSQL( "DELETE FROM users WHERE " diff --git a/test/orm/test_expire.py b/test/orm/test_expire.py index e8c05fa791..ed4950a06c 100644 --- a/test/orm/test_expire.py +++ b/test/orm/test_expire.py @@ -104,7 +104,7 @@ class ExpireTest(_fixtures.FixtureTest): s.expire_all() def go(): - u = s.query(User).get(10) # get() refreshes + s.query(User).get(10) # get() refreshes self.assert_sql_count(testing.db, go, 1) @@ -114,7 +114,7 @@ class ExpireTest(_fixtures.FixtureTest): self.assert_sql_count(testing.db, go, 0) def go(): - u = s.query(User).get(10) # expire flag reset, so not expired + s.query(User).get(10) # expire flag reset, so not expired self.assert_sql_count(testing.db, go, 0) @@ -1065,7 +1065,6 @@ class ExpireTest(_fixtures.FixtureTest): eq_(len(list(sess)), 4) # since addresses were gc'ed userlist = sess.query(User).order_by(User.id).all() - u = userlist[1] eq_(self.static.user_address_result, userlist) eq_(len(list(sess)), 9) @@ -1269,7 +1268,7 @@ class PolymorphicExpireTest(fixtures.MappedTest): @classmethod def define_tables(cls, metadata): - people = Table( + Table( "people", metadata, Column( @@ -1282,7 +1281,7 @@ class PolymorphicExpireTest(fixtures.MappedTest): Column("type", String(30)), ) - engineers = Table( + Table( "engineers", metadata, Column( diff --git a/test/orm/test_hasparent.py b/test/orm/test_hasparent.py index d3a2bf2036..ac9319466f 100644 --- a/test/orm/test_hasparent.py +++ b/test/orm/test_hasparent.py @@ -172,7 +172,7 @@ class ParentRemovalTest(fixtures.MappedTest): User = self.classes.User s, u1, a1 = self._fixture() - u2 = User(addresses=[a1]) + u2 = User(addresses=[a1]) # noqa s.expire(a1) u1.addresses.remove(a1) @@ -209,13 +209,11 @@ class ParentRemovalTest(fixtures.MappedTest): self._assert_hasparent(a1) def test_fresh_state_positive(self): - User = self.classes.User s, u1, a1 = self._fixture() self._assert_hasparent(a1) def test_fresh_state_negative(self): - User = self.classes.User s, u1, a1 = self._fixture() u1.addresses.remove(a1) diff --git a/test/orm/test_instrumentation.py b/test/orm/test_instrumentation.py index 6c2c8e5f81..5dea8d9d84 100644 --- a/test/orm/test_instrumentation.py +++ b/test/orm/test_instrumentation.py @@ -48,7 +48,7 @@ class InitTest(fixtures.ORMTest): def __init__(self): inits.append((A, "__init__")) - obj = A() + A() eq_(inits, [(A, "__init__")]) def test_A(self): @@ -59,7 +59,7 @@ class InitTest(fixtures.ORMTest): self.register(A, inits) - obj = A() + A() eq_(inits, [(A, "init", A)]) def test_Ai(self): @@ -71,7 +71,7 @@ class InitTest(fixtures.ORMTest): self.register(A, inits) - obj = A() + A() eq_(inits, [(A, "init", A), (A, "__init__")]) def test_ai_B(self): @@ -86,12 +86,12 @@ class InitTest(fixtures.ORMTest): self.register(B, inits) - obj = A() + A() eq_(inits, [(A, "__init__")]) del inits[:] - obj = B() + B() eq_(inits, [(B, "init", B), (A, "__init__")]) def test_ai_Bi(self): @@ -108,12 +108,12 @@ class InitTest(fixtures.ORMTest): self.register(B, inits) - obj = A() + A() eq_(inits, [(A, "__init__")]) del inits[:] - obj = B() + B() eq_(inits, [(B, "init", B), (B, "__init__"), (A, "__init__")]) def test_Ai_bi(self): @@ -130,12 +130,12 @@ class InitTest(fixtures.ORMTest): inits.append((B, "__init__")) super(B, self).__init__() - obj = A() + A() eq_(inits, [(A, "init", A), (A, "__init__")]) del inits[:] - obj = B() + B() eq_(inits, [(B, "__init__"), (A, "init", B), (A, "__init__")]) def test_Ai_Bi(self): @@ -154,12 +154,12 @@ class InitTest(fixtures.ORMTest): self.register(B, inits) - obj = A() + A() eq_(inits, [(A, "init", A), (A, "__init__")]) del inits[:] - obj = B() + B() eq_(inits, [(B, "init", B), (B, "__init__"), (A, "__init__")]) def test_Ai_B(self): @@ -176,12 +176,12 @@ class InitTest(fixtures.ORMTest): self.register(B, inits) - obj = A() + A() eq_(inits, [(A, "init", A), (A, "__init__")]) del inits[:] - obj = B() + B() eq_(inits, [(B, "init", B), (A, "__init__")]) def test_Ai_Bi_Ci(self): @@ -207,16 +207,16 @@ class InitTest(fixtures.ORMTest): self.register(C, inits) - obj = A() + A() eq_(inits, [(A, "init", A), (A, "__init__")]) del inits[:] - obj = B() + B() eq_(inits, [(B, "init", B), (B, "__init__"), (A, "__init__")]) del inits[:] - obj = C() + C() eq_( inits, [ @@ -248,16 +248,16 @@ class InitTest(fixtures.ORMTest): self.register(C, inits) - obj = A() + A() eq_(inits, [(A, "init", A), (A, "__init__")]) del inits[:] - obj = B() + B() eq_(inits, [(B, "__init__"), (A, "init", B), (A, "__init__")]) del inits[:] - obj = C() + C() eq_( inits, [ @@ -287,16 +287,16 @@ class InitTest(fixtures.ORMTest): self.register(C, inits) - obj = A() + A() eq_(inits, [(A, "init", A), (A, "__init__")]) del inits[:] - obj = B() + B() eq_(inits, [(A, "init", B), (A, "__init__")]) del inits[:] - obj = C() + C() eq_(inits, [(C, "init", C), (C, "__init__"), (A, "__init__")]) def test_Ai_B_Ci(self): @@ -320,16 +320,16 @@ class InitTest(fixtures.ORMTest): self.register(C, inits) - obj = A() + A() eq_(inits, [(A, "init", A), (A, "__init__")]) del inits[:] - obj = B() + B() eq_(inits, [(B, "init", B), (A, "__init__")]) del inits[:] - obj = C() + C() eq_(inits, [(C, "init", C), (C, "__init__"), (A, "__init__")]) def test_Ai_B_C(self): @@ -351,16 +351,16 @@ class InitTest(fixtures.ORMTest): self.register(C, inits) - obj = A() + A() eq_(inits, [(A, "init", A), (A, "__init__")]) del inits[:] - obj = B() + B() eq_(inits, [(B, "init", B), (A, "__init__")]) del inits[:] - obj = C() + C() eq_(inits, [(C, "init", C), (A, "__init__")]) def test_A_Bi_C(self): @@ -382,16 +382,16 @@ class InitTest(fixtures.ORMTest): self.register(C, inits) - obj = A() + A() eq_(inits, [(A, "init", A)]) del inits[:] - obj = B() + B() eq_(inits, [(B, "init", B), (B, "__init__")]) del inits[:] - obj = C() + C() eq_(inits, [(C, "init", C), (B, "__init__")]) def test_A_B_Ci(self): @@ -413,16 +413,16 @@ class InitTest(fixtures.ORMTest): self.register(C, inits) - obj = A() + A() eq_(inits, [(A, "init", A)]) del inits[:] - obj = B() + B() eq_(inits, [(B, "init", B)]) del inits[:] - obj = C() + C() eq_(inits, [(C, "init", C), (C, "__init__")]) def test_A_B_C(self): @@ -443,16 +443,16 @@ class InitTest(fixtures.ORMTest): self.register(C, inits) - obj = A() + A() eq_(inits, [(A, "init", A)]) del inits[:] - obj = B() + B() eq_(inits, [(B, "init", B)]) del inits[:] - obj = C() + C() eq_(inits, [(C, "init", C)]) def test_defaulted_init(self): @@ -512,7 +512,7 @@ class MapperInitTest(fixtures.ORMTest): def __init__(self, x): pass - m = mapper(A, self.fixture()) + mapper(A, self.fixture()) # B is not mapped in the current implementation assert_raises(sa.orm.exc.UnmappedClassError, class_mapper, B) @@ -559,7 +559,7 @@ class OnLoadTest(fixtures.ORMTest): a = A() p_a = pickle.dumps(a) - re_a = pickle.loads(p_a) + pickle.loads(p_a) finally: del A @@ -628,23 +628,23 @@ class Py3KFunctionInstTest(fixtures.ORMTest): def test_kw_only_args(self): cls, canary = self._kw_only_fixture() - a = cls("a", b="b", c="c") + cls("a", b="b", c="c") eq_(canary, [(("a",), {"b": "b", "c": "c"})]) def test_kw_plus_posn_args(self): cls, canary = self._kw_plus_posn_fixture() - a = cls("a", 1, 2, 3, b="b", c="c") + cls("a", 1, 2, 3, b="b", c="c") eq_(canary, [(("a", 1, 2, 3), {"b": "b", "c": "c"})]) def test_kw_only_args_plus_opt(self): cls, canary = self._kw_opt_fixture() - a = cls("a", b="b") + cls("a", b="b") eq_(canary, [(("a",), {"b": "b", "c": "c"})]) canary[:] = [] - a = cls("a", b="b", c="d") + cls("a", b="b", c="d") eq_(canary, [(("a",), {"b": "b", "c": "d"})]) def test_kw_only_sig(self): diff --git a/test/orm/test_joins.py b/test/orm/test_joins.py index 69b6d061ac..ebef64d277 100644 --- a/test/orm/test_joins.py +++ b/test/orm/test_joins.py @@ -662,7 +662,6 @@ class JoinTest(QueryTest, AssertsCompiledSQL): ) def test_left_is_none_and_query_has_no_entities(self): - User = self.classes.User Address = self.classes.Address sess = create_session() @@ -739,12 +738,7 @@ class JoinTest(QueryTest, AssertsCompiledSQL): ) def test_single_prop_1(self): - Item, Order, User, Address = ( - self.classes.Item, - self.classes.Order, - self.classes.User, - self.classes.Address, - ) + User = self.classes.User sess = create_session() self.assert_compile( @@ -754,12 +748,7 @@ class JoinTest(QueryTest, AssertsCompiledSQL): ) def test_single_prop_2(self): - Item, Order, User, Address = ( - self.classes.Item, - self.classes.Order, - self.classes.User, - self.classes.Address, - ) + Order, User = (self.classes.Order, self.classes.User) sess = create_session() self.assert_compile( @@ -769,12 +758,7 @@ class JoinTest(QueryTest, AssertsCompiledSQL): ) def test_single_prop_3(self): - Item, Order, User, Address = ( - self.classes.Item, - self.classes.Order, - self.classes.User, - self.classes.Address, - ) + Order, User = (self.classes.Order, self.classes.User) sess = create_session() oalias1 = aliased(Order) @@ -787,12 +771,7 @@ class JoinTest(QueryTest, AssertsCompiledSQL): ) def test_single_prop_4(self): - Item, Order, User, Address = ( - self.classes.Item, - self.classes.Order, - self.classes.User, - self.classes.Address, - ) + Order, User, = (self.classes.Order, self.classes.User) sess = create_session() oalias1 = aliased(Order) @@ -808,12 +787,7 @@ class JoinTest(QueryTest, AssertsCompiledSQL): ) def test_single_prop_5(self): - Item, Order, User, Address = ( - self.classes.Item, - self.classes.Order, - self.classes.User, - self.classes.Address, - ) + Order, User, = (self.classes.Order, self.classes.User) sess = create_session() self.assert_compile( @@ -826,12 +800,7 @@ class JoinTest(QueryTest, AssertsCompiledSQL): ) def test_single_prop_6(self): - Item, Order, User, Address = ( - self.classes.Item, - self.classes.Order, - self.classes.User, - self.classes.Address, - ) + User = self.classes.User sess = create_session() ualias = aliased(User) @@ -842,12 +811,7 @@ class JoinTest(QueryTest, AssertsCompiledSQL): ) def test_single_prop_7(self): - Item, Order, User, Address = ( - self.classes.Item, - self.classes.Order, - self.classes.User, - self.classes.Address, - ) + Order, User = (self.classes.Order, self.classes.User) sess = create_session() # this query is somewhat nonsensical. the old system didn't render a @@ -865,12 +829,7 @@ class JoinTest(QueryTest, AssertsCompiledSQL): ) def test_single_prop_8(self): - Item, Order, User, Address = ( - self.classes.Item, - self.classes.Order, - self.classes.User, - self.classes.Address, - ) + Order, User, = (self.classes.Order, self.classes.User) sess = create_session() # same as before using an aliased() for User as well @@ -887,12 +846,7 @@ class JoinTest(QueryTest, AssertsCompiledSQL): ) def test_single_prop_9(self): - Item, Order, User, Address = ( - self.classes.Item, - self.classes.Order, - self.classes.User, - self.classes.Address, - ) + User = self.classes.User sess = create_session() self.assert_compile( @@ -909,12 +863,7 @@ class JoinTest(QueryTest, AssertsCompiledSQL): ) def test_single_prop_10(self): - Item, Order, User, Address = ( - self.classes.Item, - self.classes.Order, - self.classes.User, - self.classes.Address, - ) + User, Address = (self.classes.User, self.classes.Address) sess = create_session() self.assert_compile( @@ -928,11 +877,10 @@ class JoinTest(QueryTest, AssertsCompiledSQL): ) def test_single_prop_11(self): - Item, Order, User, Address = ( + Item, Order, User, = ( self.classes.Item, self.classes.Order, self.classes.User, - self.classes.Address, ) sess = create_session() @@ -950,8 +898,7 @@ class JoinTest(QueryTest, AssertsCompiledSQL): ) def test_single_prop_12(self): - Item, Order, User, Address = ( - self.classes.Item, + Order, User, Address = ( self.classes.Order, self.classes.User, self.classes.Address, @@ -972,8 +919,7 @@ class JoinTest(QueryTest, AssertsCompiledSQL): ) def test_single_prop_13(self): - Item, Order, User, Address = ( - self.classes.Item, + Order, User, Address = ( self.classes.Order, self.classes.User, self.classes.Address, @@ -1561,10 +1507,9 @@ class JoinTest(QueryTest, AssertsCompiledSQL): def test_clause_present_in_froms_twice_w_onclause(self): # test [ticket:4584] - Order, Address, Dingaling, User = ( + Order, Address, User = ( self.classes.Order, self.classes.Address, - self.classes.Dingaling, self.classes.User, ) @@ -1605,8 +1550,7 @@ class JoinTest(QueryTest, AssertsCompiledSQL): def test_clause_present_in_froms_twice_wo_onclause(self): # test [ticket:4584] - Order, Address, Dingaling, User = ( - self.classes.Order, + Address, Dingaling, User = ( self.classes.Address, self.classes.Dingaling, self.classes.User, @@ -1737,7 +1681,7 @@ class JoinTest(QueryTest, AssertsCompiledSQL): sess = create_session() # no arg error - result = ( + ( sess.query(User) .join("orders", aliased=True) .order_by(Order.id) @@ -2688,7 +2632,7 @@ class JoinFromSelectableTest(fixtures.MappedTest, AssertsCompiledSQL): class MultiplePathTest(fixtures.MappedTest, AssertsCompiledSQL): @classmethod def define_tables(cls, metadata): - t1 = Table( + Table( "t1", metadata, Column( @@ -2696,7 +2640,7 @@ class MultiplePathTest(fixtures.MappedTest, AssertsCompiledSQL): ), Column("data", String(30)), ) - t2 = Table( + Table( "t2", metadata, Column( @@ -2705,14 +2649,14 @@ class MultiplePathTest(fixtures.MappedTest, AssertsCompiledSQL): Column("data", String(30)), ) - t1t2_1 = Table( + Table( "t1t2_1", metadata, Column("t1id", Integer, ForeignKey("t1.id")), Column("t2id", Integer, ForeignKey("t2.id")), ) - t1t2_2 = Table( + Table( "t1t2_2", metadata, Column("t1id", Integer, ForeignKey("t1.id")), @@ -2769,7 +2713,7 @@ class SelfRefMixedTest(fixtures.MappedTest, AssertsCompiledSQL): @classmethod def define_tables(cls, metadata): - nodes = Table( + Table( "nodes", metadata, Column( @@ -2778,7 +2722,7 @@ class SelfRefMixedTest(fixtures.MappedTest, AssertsCompiledSQL): Column("parent_id", Integer, ForeignKey("nodes.id")), ) - sub_table = Table( + Table( "sub_table", metadata, Column( @@ -2787,7 +2731,7 @@ class SelfRefMixedTest(fixtures.MappedTest, AssertsCompiledSQL): Column("node_id", Integer, ForeignKey("nodes.id")), ) - assoc_table = Table( + Table( "assoc_table", metadata, Column("left_id", Integer, ForeignKey("nodes.id")), @@ -2994,7 +2938,7 @@ class JoinToNonPolyAliasesTest(fixtures.MappedTest, AssertsCompiledSQL): def test_join_parent_child(self): Parent = self.classes.Parent - npc = self.npc + sess = Session() self.assert_compile( sess.query(Parent) @@ -3749,7 +3693,7 @@ class SelfReferentialM2MTest(fixtures.MappedTest): @classmethod def define_tables(cls, metadata): - nodes = Table( + Table( "nodes", metadata, Column( @@ -3758,7 +3702,7 @@ class SelfReferentialM2MTest(fixtures.MappedTest): Column("data", String(30)), ) - node_to_nodes = Table( + Table( "node_to_nodes", metadata, Column( diff --git a/test/orm/test_mapper.py b/test/orm/test_mapper.py index 93cf19faea..6103bfa2fb 100644 --- a/test/orm/test_mapper.py +++ b/test/orm/test_mapper.py @@ -247,7 +247,7 @@ class MapperTest(_fixtures.FixtureTest, AssertsCompiledSQL): assert m.configured is False assert sa.orm.mapperlib.Mapper._new_mappers is True - u = User() + User() assert User.addresses assert sa.orm.mapperlib.Mapper._new_mappers is False @@ -533,7 +533,7 @@ class MapperTest(_fixtures.FixtureTest, AssertsCompiledSQL): assert not m.configured configure_mappers() - m2 = mapper( + mapper( Address, addresses, properties={"user": relationship(User, backref="addresses")}, @@ -662,7 +662,7 @@ class MapperTest(_fixtures.FixtureTest, AssertsCompiledSQL): m1 = mapper(User, users) User() - m2 = mapper( + mapper( Address, addresses, properties={"user": relationship(User, backref="addresses")}, @@ -731,7 +731,7 @@ class MapperTest(_fixtures.FixtureTest, AssertsCompiledSQL): inherits=User, properties={"address_id": addresses.c.id}, ) - m3 = mapper(Address, addresses, properties={"foo": relationship(m2)}) + mapper(Address, addresses, properties={"foo": relationship(m2)}) # add property using annotated User.name, # needs to be deannotated m.add_property("x", column_property(User.name + "name")) @@ -858,7 +858,7 @@ class MapperTest(_fixtures.FixtureTest, AssertsCompiledSQL): class MyUser(User): pass - m1 = mapper( + mapper( User, users, polymorphic_on=users.c.name, @@ -1671,10 +1671,8 @@ class MapperTest(_fixtures.FixtureTest, AssertsCompiledSQL): super(MyFakeProperty, self).post_instrument_class(mapper) configure_mappers() - m1 = mapper( - User, users, properties={"name": MyFakeProperty(users.c.name)} - ) - m2 = mapper(Address, addresses) + mapper(User, users, properties={"name": MyFakeProperty(users.c.name)}) + mapper(Address, addresses) configure_mappers() sa.orm.clear_mappers() @@ -1684,10 +1682,8 @@ class MapperTest(_fixtures.FixtureTest, AssertsCompiledSQL): super(MyFakeProperty, self).post_instrument_class(mapper) configure_mappers() - m1 = mapper( - User, users, properties={"name": MyFakeProperty(users.c.name)} - ) - m2 = mapper(Address, addresses) + mapper(User, users, properties={"name": MyFakeProperty(users.c.name)}) + mapper(Address, addresses) configure_mappers() def test_reconstructor(self): @@ -3047,9 +3043,9 @@ class DeferredPopulationTest(fixtures.MappedTest): Thing, Human = self.classes.Thing, self.classes.Human session = create_session() - human = ( + human = ( # noqa session.query(Human).options(sa.orm.joinedload("thing")).first() - ) # noqa + ) session.expunge_all() thing = session.query(Thing).options(sa.orm.undefer("name")).first() self._test(thing) @@ -3058,9 +3054,9 @@ class DeferredPopulationTest(fixtures.MappedTest): Thing, Human = self.classes.Thing, self.classes.Human session = create_session() - human = ( + human = ( # noqa session.query(Human).options(sa.orm.joinedload("thing")).first() - ) # noqa + ) thing = session.query(Thing).options(sa.orm.undefer("name")).first() self._test(thing) @@ -3068,9 +3064,9 @@ class DeferredPopulationTest(fixtures.MappedTest): Thing, Human = self.classes.Thing, self.classes.Human session = create_session() - result = ( + result = ( # noqa session.query(Human).add_entity(Thing).join("thing").first() - ) # noqa + ) session.expunge_all() thing = session.query(Thing).options(sa.orm.undefer("name")).first() self._test(thing) @@ -3079,9 +3075,9 @@ class DeferredPopulationTest(fixtures.MappedTest): Thing, Human = self.classes.Thing, self.classes.Human session = create_session() - result = ( + result = ( # noqa session.query(Human).add_entity(Thing).join("thing").first() - ) # noqa + ) thing = session.query(Thing).options(sa.orm.undefer("name")).first() self._test(thing) @@ -3354,7 +3350,7 @@ class RaiseLoadTest(_fixtures.FixtureTest): ) mapper(User, users) s = Session() - u1 = s.query(User).first() + u1 = s.query(User).first() # noqa a1 = ( s.query(Address) .filter_by(id=1) diff --git a/test/orm/test_merge.py b/test/orm/test_merge.py index 48a519dd7c..89fb4d6e17 100644 --- a/test/orm/test_merge.py +++ b/test/orm/test_merge.py @@ -98,7 +98,7 @@ class MergeTest(_fixtures.FixtureTest): "Instance is already pending in this Session yet is " "being merged again; this is probably not what you want to do" ): - u2 = sess.merge(u) + sess.merge(u) def test_warn_transient_already_pending_pk(self): User, users = self.classes.User, self.tables.users @@ -113,7 +113,7 @@ class MergeTest(_fixtures.FixtureTest): "Instance is already pending in this Session yet is " "being merged again; this is probably not what you want to do" ): - u2 = sess.merge(u) + sess.merge(u) def test_transient_to_pending_collection(self): User, Address, addresses, users = ( @@ -510,7 +510,7 @@ class MergeTest(_fixtures.FixtureTest): # attribute maintains modified state. # (usually autoflush would have happened # here anyway). - u4 = sess.merge(User(id=2)) + u4 = sess.merge(User(id=2)) # noqa eq_(u3.__dict__["data"], "bar") sess.flush() @@ -538,7 +538,7 @@ class MergeTest(_fixtures.FixtureTest): # set it to None. this is actually # a change so gets preserved. u6.data = None - u7 = sess.merge(User(id=3)) + u7 = sess.merge(User(id=3)) # noqa assert u6.__dict__["data"] is None def test_merge_irregular_collection(self): @@ -1132,7 +1132,7 @@ class MergeTest(_fixtures.FixtureTest): u2 = sess2.query(User).options(sa.orm.joinedload("addresses")).get(7) sess3 = create_session() - u3 = sess3.merge(u2, load=False) + u3 = sess3.merge(u2, load=False) # noqa def go(): sess3.flush() @@ -1171,7 +1171,7 @@ class MergeTest(_fixtures.FixtureTest): u2 = sess2.query(User).get(7) sess3 = create_session() - u3 = sess3.merge(u2, load=False) + u3 = sess3.merge(u2, load=False) # noqa assert not sess3.dirty def go(): @@ -1374,7 +1374,7 @@ class MergeTest(_fixtures.FixtureTest): ) sess = create_session(autoflush=True, autocommit=False) - m = mapper( + mapper( User, users, properties={ @@ -1689,7 +1689,7 @@ class M2ONoUseGetLoadingTest(fixtures.MappedTest): def go(): u1 = User(id=1, addresses=[Address(id=1), Address(id=2)]) - u2 = s.merge(u1) + s.merge(u1) self.assert_sql_count(testing.db, go, 2) @@ -1954,13 +1954,13 @@ class LoadOnPendingTest(fixtures.MappedTest): @classmethod def define_tables(cls, metadata): - rocks_table = Table( + Table( "rocks", metadata, Column("id", Integer, primary_key=True), Column("description", String(10)), ) - bugs_table = Table( + Table( "bugs", metadata, Column("id", Integer, primary_key=True), diff --git a/test/orm/test_of_type.py b/test/orm/test_of_type.py index 61fc80cb08..c170026fa0 100644 --- a/test/orm/test_of_type.py +++ b/test/orm/test_of_type.py @@ -462,8 +462,7 @@ class SubclassRelationshipTest( return [p.container for p in cls._fixture()] def test_contains_eager_wpoly(self): - ParentThing, DataContainer, Job, SubJob = ( - self.classes.ParentThing, + DataContainer, Job, SubJob = ( self.classes.DataContainer, self.classes.Job, self.classes.SubJob, @@ -484,8 +483,7 @@ class SubclassRelationshipTest( self.assert_sql_count(testing.db, go, 5) def test_joinedload_wpoly(self): - ParentThing, DataContainer, Job, SubJob = ( - self.classes.ParentThing, + DataContainer, Job, SubJob = ( self.classes.DataContainer, self.classes.Job, self.classes.SubJob, @@ -504,10 +502,8 @@ class SubclassRelationshipTest( self.assert_sql_count(testing.db, go, 5) def test_joinedload_wsubclass(self): - ParentThing, DataContainer, Job, SubJob = ( - self.classes.ParentThing, + DataContainer, SubJob = ( self.classes.DataContainer, - self.classes.Job, self.classes.SubJob, ) s = Session(testing.db) @@ -535,10 +531,8 @@ class SubclassRelationshipTest( self.assert_sql_count(testing.db, go, 11) def test_subquery_wsubclass(self): - ParentThing, DataContainer, Job, SubJob = ( - self.classes.ParentThing, + DataContainer, SubJob = ( self.classes.DataContainer, - self.classes.Job, self.classes.SubJob, ) s = Session(testing.db) @@ -552,10 +546,9 @@ class SubclassRelationshipTest( self.assert_sql_count(testing.db, go, 6) def test_twolevel_subqueryload_wsubclass(self): - ParentThing, DataContainer, Job, SubJob = ( + ParentThing, DataContainer, SubJob = ( self.classes.ParentThing, self.classes.DataContainer, - self.classes.Job, self.classes.SubJob, ) s = Session(testing.db) @@ -586,10 +579,9 @@ class SubclassRelationshipTest( self.assert_sql_count(testing.db, go, 3) def test_twolevel_joinedload_wsubclass(self): - ParentThing, DataContainer, Job, SubJob = ( + ParentThing, DataContainer, SubJob = ( self.classes.ParentThing, self.classes.DataContainer, - self.classes.Job, self.classes.SubJob, ) s = Session(testing.db) @@ -605,8 +597,7 @@ class SubclassRelationshipTest( self.assert_sql_count(testing.db, go, 5) def test_any_wpoly(self): - ParentThing, DataContainer, Job, SubJob = ( - self.classes.ParentThing, + DataContainer, Job, SubJob = ( self.classes.DataContainer, self.classes.Job, self.classes.SubJob, @@ -637,12 +628,7 @@ class SubclassRelationshipTest( ) def test_any_walias(self): - ParentThing, DataContainer, Job, SubJob = ( - self.classes.ParentThing, - self.classes.DataContainer, - self.classes.Job, - self.classes.SubJob, - ) + DataContainer, Job, = (self.classes.DataContainer, self.classes.Job) Job_A = aliased(Job) @@ -670,8 +656,7 @@ class SubclassRelationshipTest( ) def test_join_wpoly(self): - ParentThing, DataContainer, Job, SubJob = ( - self.classes.ParentThing, + DataContainer, Job, SubJob = ( self.classes.DataContainer, self.classes.Job, self.classes.SubJob, @@ -692,10 +677,8 @@ class SubclassRelationshipTest( ) def test_join_wsubclass(self): - ParentThing, DataContainer, Job, SubJob = ( - self.classes.ParentThing, + DataContainer, SubJob = ( self.classes.DataContainer, - self.classes.Job, self.classes.SubJob, ) @@ -715,8 +698,7 @@ class SubclassRelationshipTest( ) def test_join_wpoly_innerjoin(self): - ParentThing, DataContainer, Job, SubJob = ( - self.classes.ParentThing, + DataContainer, Job, SubJob = ( self.classes.DataContainer, self.classes.Job, self.classes.SubJob, @@ -736,12 +718,7 @@ class SubclassRelationshipTest( ) def test_join_walias(self): - ParentThing, DataContainer, Job, SubJob = ( - self.classes.ParentThing, - self.classes.DataContainer, - self.classes.Job, - self.classes.SubJob, - ) + DataContainer, Job, = (self.classes.DataContainer, self.classes.Job) Job_A = aliased(Job) @@ -756,8 +733,7 @@ class SubclassRelationshipTest( ) def test_join_explicit_wpoly_noalias(self): - ParentThing, DataContainer, Job, SubJob = ( - self.classes.ParentThing, + DataContainer, Job, SubJob = ( self.classes.DataContainer, self.classes.Job, self.classes.SubJob, @@ -778,8 +754,7 @@ class SubclassRelationshipTest( ) def test_join_explicit_wpoly_flat(self): - ParentThing, DataContainer, Job, SubJob = ( - self.classes.ParentThing, + DataContainer, Job, SubJob = ( self.classes.DataContainer, self.classes.Job, self.classes.SubJob, @@ -800,8 +775,7 @@ class SubclassRelationshipTest( ) def test_join_explicit_wpoly_full_alias(self): - ParentThing, DataContainer, Job, SubJob = ( - self.classes.ParentThing, + DataContainer, Job, SubJob = ( self.classes.DataContainer, self.classes.Job, self.classes.SubJob, diff --git a/test/orm/test_options.py b/test/orm/test_options.py index 8597305dde..b75cbf2052 100644 --- a/test/orm/test_options.py +++ b/test/orm/test_options.py @@ -807,7 +807,6 @@ class OptionsTest(PathTest, QueryTest): def test_chained(self): User = self.classes.User Order = self.classes.Order - Item = self.classes.Item sess = Session() q = sess.query(User) opt = self._option_fixture(User.orders).joinedload("items") @@ -1291,8 +1290,6 @@ class OptionsNoPropTestInh(_Polymorphic): def test_missing_str_attr_of_type_subclass(self): s = Session() - wp = with_polymorphic(Person, [Manager], flat=True) - assert_raises_message( sa.exc.ArgumentError, r'Can\'t find property named "manager_name" on ' @@ -1352,9 +1349,6 @@ class PickleTest(PathTest, QueryTest): def test_modern_opt_getstate(self): User = self.classes.User - sess = Session() - q = sess.query(User) - opt = self._option_fixture(User.addresses) eq_( opt.__getstate__(), diff --git a/test/orm/test_pickled.py b/test/orm/test_pickled.py index 6a368f31ca..f2ef8e2e9a 100644 --- a/test/orm/test_pickled.py +++ b/test/orm/test_pickled.py @@ -121,7 +121,7 @@ class PickleTest(fixtures.MappedTest): def test_no_mappers(self): users = self.tables.users - umapper = mapper(User, users) + mapper(User, users) u1 = User(name="ed") u1_pickled = pickle.dumps(u1, -1) @@ -138,13 +138,13 @@ class PickleTest(fixtures.MappedTest): def test_no_instrumentation(self): users = self.tables.users - umapper = mapper(User, users) + mapper(User, users) u1 = User(name="ed") u1_pickled = pickle.dumps(u1, -1) clear_mappers() - umapper = mapper(User, users) + mapper(User, users) u1 = pickle.loads(u1_pickled) # this fails unless the InstanceState @@ -454,7 +454,7 @@ class PickleTest(fixtures.MappedTest): eq_(opt.path, opt2.path) u1 = sess.query(User).options(opt).first() - u2 = pickle.loads(pickle.dumps(u1)) + pickle.loads(pickle.dumps(u1)) def test_collection_setstate(self): """test a particular cycle that requires CollectionAdapter @@ -614,7 +614,7 @@ class OptionsTest(_Polymorphic): .first() ) - e2 = pickle.loads(pickle.dumps(emp)) + pickle.loads(pickle.dumps(emp)) class PolymorphicDeferredTest(fixtures.MappedTest): @@ -697,7 +697,6 @@ class TupleLabelTest(_fixtures.FixtureTest): ) # m2o def test_tuple_labeling(self): - users = self.tables.users sess = create_session() # test pickle + all the protocols ! diff --git a/test/orm/test_query.py b/test/orm/test_query.py index 86b304be9d..879af1197b 100644 --- a/test/orm/test_query.py +++ b/test/orm/test_query.py @@ -2555,11 +2555,6 @@ class FilterTest(QueryTest, AssertsCompiledSQL): def test_select_with_bindparam_offset_limit_w_cast(self): User = self.classes.User sess = create_session() - q1 = ( - sess.query(self.classes.User) - .order_by(self.classes.User.id) - .limit(bindparam("n")) - ) eq_( list( sess.query(User) @@ -4274,7 +4269,6 @@ class TextTest(QueryTest, AssertsCompiledSQL): User = self.classes.User Address = self.classes.Address - Order = self.classes.Order sess = create_session() diff --git a/test/orm/test_relationships.py b/test/orm/test_relationships.py index 652b8bacd6..1e7ebf48cd 100644 --- a/test/orm/test_relationships.py +++ b/test/orm/test_relationships.py @@ -1216,7 +1216,7 @@ class CompositeSelfRefFKTest(fixtures.MappedTest, AssertsCompiledSQL): ) def _test_join_aliasing(self, sess): - Employee, Company = self.classes.Employee, self.classes.Company + Employee = self.classes.Employee eq_( [ n @@ -1282,7 +1282,7 @@ class CompositeJoinPartialFK(fixtures.MappedTest, AssertsCompiledSQL): mapper(Child, child) def test_joins_fully(self): - Parent, Child = self.classes.Parent, self.classes.Child + Parent = self.classes.Parent self.assert_compile( Parent.children.property.strategy._lazywhere, @@ -3558,7 +3558,7 @@ class RemoteForeignBetweenColsTest(fixtures.DeclarativeMappedTest): ) def test_lazyload(self): - Network, Address = self.classes.Network, self.classes.Address + Network = self.classes.Network session = Session(testing.db) @@ -4180,7 +4180,7 @@ class SecondaryNestedJoinTest( sess.commit() def test_render_join(self): - A, D = self.classes.A, self.classes.D + A = self.classes.A sess = Session() self.assert_compile( sess.query(A).join(A.d), @@ -4192,7 +4192,7 @@ class SecondaryNestedJoinTest( ) def test_render_joinedload(self): - A, D = self.classes.A, self.classes.D + A = self.classes.A sess = Session() self.assert_compile( sess.query(A).options(joinedload(A.d)), @@ -4207,7 +4207,7 @@ class SecondaryNestedJoinTest( def test_render_lazyload(self): from sqlalchemy.testing.assertsql import CompiledSQL - A, D = self.classes.A, self.classes.D + A = self.classes.A sess = Session() a1 = sess.query(A).filter(A.name == "a1").first() @@ -4240,7 +4240,7 @@ class SecondaryNestedJoinTest( eq_(self.mapping[a.name], d.name if d is not None else None) def test_joinedload(self): - A, D = self.classes.A, self.classes.D + A = self.classes.A sess = Session() for a in sess.query(A).options(joinedload(A.d)): @@ -4248,7 +4248,7 @@ class SecondaryNestedJoinTest( eq_(self.mapping[a.name], d.name if d is not None else None) def test_lazyload(self): - A, D = self.classes.A, self.classes.D + A = self.classes.A sess = Session() for a in sess.query(A): diff --git a/test/orm/test_scoping.py b/test/orm/test_scoping.py index 41e5124d41..6b7feaea7f 100644 --- a/test/orm/test_scoping.py +++ b/test/orm/test_scoping.py @@ -90,7 +90,7 @@ class ScopedSessionTest(fixtures.MappedTest): def test_config_errors(self): Session = scoped_session(sa.orm.sessionmaker()) - s = Session() + s = Session() # noqa assert_raises_message( sa.exc.InvalidRequestError, "Scoped session is already present", diff --git a/test/orm/test_subquery_relations.py b/test/orm/test_subquery_relations.py index 117ab5be41..505debd76f 100644 --- a/test/orm/test_subquery_relations.py +++ b/test/orm/test_subquery_relations.py @@ -1505,7 +1505,7 @@ class OrderBySecondaryTest(fixtures.MappedTest): class BaseRelationFromJoinedSubclassTest(_Polymorphic): @classmethod def define_tables(cls, metadata): - people = Table( + Table( "people", metadata, Column( @@ -1520,7 +1520,7 @@ class BaseRelationFromJoinedSubclassTest(_Polymorphic): # to test fully, PK of engineers table must be # named differently from that of people - engineers = Table( + Table( "engineers", metadata, Column( @@ -1532,7 +1532,7 @@ class BaseRelationFromJoinedSubclassTest(_Polymorphic): Column("primary_language", String(50)), ) - paperwork = Table( + Table( "paperwork", metadata, Column( @@ -1545,7 +1545,7 @@ class BaseRelationFromJoinedSubclassTest(_Polymorphic): Column("person_id", Integer, ForeignKey("people.person_id")), ) - pages = Table( + Table( "pages", metadata, Column( @@ -2691,7 +2691,7 @@ class CyclicalInheritingEagerTestTwo( session.commit() close_all_sessions() - d = session.query(Director).options(subqueryload("*")).first() + d = session.query(Director).options(subqueryload("*")).first() # noqa assert len(list(session)) == 3 @@ -2852,7 +2852,7 @@ class SubqueryloadDistinctTest( ), ) - movies = q.all() + movies = q.all() # noqa # check number of persistent objects in session eq_(len(list(s)), 5) diff --git a/test/orm/test_unitofwork.py b/test/orm/test_unitofwork.py index 60452ea7fc..f23a934e1e 100644 --- a/test/orm/test_unitofwork.py +++ b/test/orm/test_unitofwork.py @@ -445,7 +445,7 @@ class ForeignPKTest(fixtures.MappedTest): self.tables.people, ) - m1 = mapper(PersonSite, peoplesites) + mapper(PersonSite, peoplesites) m2 = mapper( Person, people, properties={"sites": relationship(PersonSite)} ) @@ -1481,7 +1481,7 @@ class OneToManyTest(_fixtures.FixtureTest): self.classes.User, ) - m = mapper( + mapper( User, users, properties=dict( @@ -1541,7 +1541,7 @@ class OneToManyTest(_fixtures.FixtureTest): self.classes.User, ) - m = mapper( + mapper( User, users, properties=dict( @@ -1610,7 +1610,7 @@ class OneToManyTest(_fixtures.FixtureTest): self.classes.User, ) - m = mapper( + mapper( User, users, properties=dict( @@ -1647,7 +1647,7 @@ class OneToManyTest(_fixtures.FixtureTest): self.classes.User, ) - m = mapper( + mapper( User, users, properties=dict( @@ -1683,7 +1683,7 @@ class OneToManyTest(_fixtures.FixtureTest): self.classes.User, ) - m = mapper( + mapper( User, users, properties=dict( @@ -1719,7 +1719,7 @@ class OneToManyTest(_fixtures.FixtureTest): self.classes.User, ) - m = mapper( + mapper( User, users, properties=dict( @@ -1751,7 +1751,7 @@ class OneToManyTest(_fixtures.FixtureTest): ) m1 = mapper(User, users) - m2 = mapper( + mapper( Address, addresses, properties=dict( @@ -1760,7 +1760,7 @@ class OneToManyTest(_fixtures.FixtureTest): ) u = User(name="test") - a = Address(email_address="testaddress", user=u) + Address(email_address="testaddress", user=u) session = create_session() session.add(u) @@ -1777,7 +1777,7 @@ class OneToManyTest(_fixtures.FixtureTest): ) m2 = mapper(Address, addresses) - m = mapper( + mapper( User, users, properties={ @@ -2162,7 +2162,7 @@ class SaveTest(_fixtures.FixtureTest): sa.orm.clear_mappers() - m = mapper(User, users) + mapper(User, users) evt = Events() event.listen(User, "before_insert", evt.before_insert) event.listen(User, "after_insert", evt.after_insert) @@ -2184,8 +2184,7 @@ class ManyToOneTest(_fixtures.FixtureTest): self.classes.User, ) - # TODO: put assertion in here !!! - m = mapper( + mapper( Address, addresses, properties=dict( @@ -2263,7 +2262,7 @@ class ManyToOneTest(_fixtures.FixtureTest): self.classes.User, ) - m = mapper( + mapper( Address, addresses, properties=dict( @@ -2299,7 +2298,7 @@ class ManyToOneTest(_fixtures.FixtureTest): self.classes.User, ) - m = mapper( + mapper( Address, addresses, properties=dict( @@ -2341,7 +2340,7 @@ class ManyToOneTest(_fixtures.FixtureTest): self.classes.User, ) - m = mapper( + mapper( Address, addresses, properties=dict( @@ -2424,7 +2423,7 @@ class ManyToManyTest(_fixtures.FixtureTest): mapper(Keyword, keywords) - m = mapper( + mapper( Item, items, properties=dict( @@ -3227,9 +3226,9 @@ class TransactionTest(fixtures.MappedTest): @classmethod def define_tables(cls, metadata): - t1 = Table("t1", metadata, Column("id", Integer, primary_key=True)) + Table("t1", metadata, Column("id", Integer, primary_key=True)) - t2 = Table( + Table( "t2", metadata, Column("id", Integer, primary_key=True), diff --git a/test/orm/test_update_delete.py b/test/orm/test_update_delete.py index 9e3f8074fc..b90202f33f 100644 --- a/test/orm/test_update_delete.py +++ b/test/orm/test_update_delete.py @@ -1055,7 +1055,7 @@ class UpdateDeleteFromTest(fixtures.MappedTest): class ExpressionUpdateTest(fixtures.MappedTest): @classmethod def define_tables(cls, metadata): - data = Table( + Table( "data", metadata, Column( diff --git a/test/orm/test_utils.py b/test/orm/test_utils.py index ebff409da4..45dd2e38bd 100644 --- a/test/orm/test_utils.py +++ b/test/orm/test_utils.py @@ -57,7 +57,7 @@ class AliasedClassTest(fixtures.TestBase, AssertsCompiledSQL): class Point(object): pass - table = self._fixture(Point) + self._fixture(Point) alias = aliased(Point) assert_raises(TypeError, alias) @@ -67,7 +67,7 @@ class AliasedClassTest(fixtures.TestBase, AssertsCompiledSQL): def zero(self): self.x, self.y = 0, 0 - table = self._fixture(Point) + self._fixture(Point) alias = aliased(Point) assert Point.zero @@ -80,7 +80,7 @@ class AliasedClassTest(fixtures.TestBase, AssertsCompiledSQL): def max_x(cls): return 100 - table = self._fixture(Point) + self._fixture(Point) alias = aliased(Point) assert Point.max_x @@ -93,7 +93,7 @@ class AliasedClassTest(fixtures.TestBase, AssertsCompiledSQL): def max_x(self): return 100 - table = self._fixture(Point) + self._fixture(Point) alias = aliased(Point) assert Point.max_x @@ -122,7 +122,7 @@ class AliasedClassTest(fixtures.TestBase, AssertsCompiledSQL): def thing(self, arg): return arg.center - table = self._fixture(Point) + self._fixture(Point) alias = aliased(Point) assert Point.thing != (0, 0) diff --git a/test/perf/invalidate_stresstest.py b/test/perf/invalidate_stresstest.py index e0f3949dea..59d78237eb 100644 --- a/test/perf/invalidate_stresstest.py +++ b/test/perf/invalidate_stresstest.py @@ -29,7 +29,7 @@ def worker(): while True: conn = engine.connect() try: - trans = conn.begin() + conn.begin() for i in range(5): conn.execute("SELECT 1+1") gevent.sleep(random.random() * 1.01) diff --git a/test/sql/test_constraints.py b/test/sql/test_constraints.py index fdc9731563..d22388f44c 100644 --- a/test/sql/test_constraints.py +++ b/test/sql/test_constraints.py @@ -850,7 +850,7 @@ class ConstraintCompilationTest(fixtures.TestBase, AssertsCompiledSQL): def test_index_against_text_inline(self): metadata = MetaData() idx = Index("y", text("some_function(q)")) - x = Table("x", metadata, Column("q", String(50)), idx) + Table("x", metadata, Column("q", String(50)), idx) self.assert_compile( schema.CreateIndex(idx), "CREATE INDEX y ON x (some_function(q))" diff --git a/test/sql/test_deprecations.py b/test/sql/test_deprecations.py index 08a862e437..4559806495 100644 --- a/test/sql/test_deprecations.py +++ b/test/sql/test_deprecations.py @@ -109,14 +109,14 @@ class DeprecationWarningsTest(fixtures.TestBase): "The select.autocommit parameter is deprecated and " "will be removed in a future release." ): - stmt = select([column("x")], autocommit=True) + select([column("x")], autocommit=True) def test_select_for_update(self): with testing.expect_deprecated( "The select.for_update parameter is deprecated and " "will be removed in a future release." ): - stmt = select([column("x")], for_update=True) + select([column("x")], for_update=True) @testing.provide_metadata def test_table_useexisting(self): @@ -148,11 +148,11 @@ class DeprecationWarningsTest(fixtures.TestBase): class CaseSensitiveFunctionDeprecationsTest(fixtures.TestBase): - def setup(self): self._registry = deepcopy(functions._registry) self._case_sensitive_registry = deepcopy( - functions._case_sensitive_registry) + functions._case_sensitive_registry + ) functions._registry.clear() functions._case_sensitive_registry.clear() @@ -161,8 +161,8 @@ class CaseSensitiveFunctionDeprecationsTest(fixtures.TestBase): functions._case_sensitive_registry = self._case_sensitive_registry def test_case_sensitive(self): - reg = functions._registry['_default'] - cs_reg = functions._case_sensitive_registry['_default'] + reg = functions._registry["_default"] + cs_reg = functions._case_sensitive_registry["_default"] class MYFUNC(GenericFunction): type = DateTime @@ -176,7 +176,7 @@ class CaseSensitiveFunctionDeprecationsTest(fixtures.TestBase): not_in_("MYFUNC", reg) not_in_("MyFunc", reg) in_("myfunc", cs_reg) - eq_(set(cs_reg['myfunc'].keys()), set(['MYFUNC'])) + eq_(set(cs_reg["myfunc"].keys()), set(["MYFUNC"])) with testing.expect_deprecated( "GenericFunction 'MyFunc' is already registered with" @@ -184,8 +184,9 @@ class CaseSensitiveFunctionDeprecationsTest(fixtures.TestBase): "'MYFUNC' is switched into case-sensitive mode. " "GenericFunction objects will be fully case-insensitive in a " "future release.", - regex=False + regex=False, ): + class MyFunc(GenericFunction): type = Integer @@ -200,15 +201,15 @@ class CaseSensitiveFunctionDeprecationsTest(fixtures.TestBase): not_in_("MYFUNC", reg) not_in_("MyFunc", reg) in_("myfunc", cs_reg) - eq_(set(cs_reg['myfunc'].keys()), set(['MYFUNC', 'MyFunc'])) + eq_(set(cs_reg["myfunc"].keys()), set(["MYFUNC", "MyFunc"])) def test_replace_function_case_sensitive(self): - reg = functions._registry['_default'] - cs_reg = functions._case_sensitive_registry['_default'] + reg = functions._registry["_default"] + cs_reg = functions._case_sensitive_registry["_default"] class replaceable_func(GenericFunction): type = Integer - identifier = 'REPLACEABLE_FUNC' + identifier = "REPLACEABLE_FUNC" assert isinstance(func.REPLACEABLE_FUNC().type, Integer) assert isinstance(func.Replaceable_Func().type, Integer) @@ -219,7 +220,7 @@ class CaseSensitiveFunctionDeprecationsTest(fixtures.TestBase): not_in_("REPLACEABLE_FUNC", reg) not_in_("Replaceable_Func", reg) in_("replaceable_func", cs_reg) - eq_(set(cs_reg['replaceable_func'].keys()), set(['REPLACEABLE_FUNC'])) + eq_(set(cs_reg["replaceable_func"].keys()), set(["REPLACEABLE_FUNC"])) with testing.expect_deprecated( "GenericFunction 'Replaceable_Func' is already registered with" @@ -227,11 +228,12 @@ class CaseSensitiveFunctionDeprecationsTest(fixtures.TestBase): "'REPLACEABLE_FUNC' is switched into case-sensitive mode. " "GenericFunction objects will be fully case-insensitive in a " "future release.", - regex=False + regex=False, ): + class Replaceable_Func(GenericFunction): type = DateTime - identifier = 'Replaceable_Func' + identifier = "Replaceable_Func" assert isinstance(func.REPLACEABLE_FUNC().type, Integer) assert isinstance(func.Replaceable_Func().type, DateTime) @@ -242,37 +244,42 @@ class CaseSensitiveFunctionDeprecationsTest(fixtures.TestBase): not_in_("REPLACEABLE_FUNC", reg) not_in_("Replaceable_Func", reg) in_("replaceable_func", cs_reg) - eq_(set(cs_reg['replaceable_func'].keys()), - set(['REPLACEABLE_FUNC', 'Replaceable_Func'])) + eq_( + set(cs_reg["replaceable_func"].keys()), + set(["REPLACEABLE_FUNC", "Replaceable_Func"]), + ) with testing.expect_warnings( "The GenericFunction 'REPLACEABLE_FUNC' is already registered and " "is going to be overriden.", - regex=False + regex=False, ): + class replaceable_func_override(GenericFunction): type = DateTime - identifier = 'REPLACEABLE_FUNC' + identifier = "REPLACEABLE_FUNC" with testing.expect_deprecated( "GenericFunction(s) '['REPLACEABLE_FUNC', 'Replaceable_Func']' " "are already registered with different letter cases and might " "interact with 'replaceable_func'. GenericFunction objects will " "be fully case-insensitive in a future release.", - regex=False + regex=False, ): + class replaceable_func_lowercase(GenericFunction): type = String - identifier = 'replaceable_func' + identifier = "replaceable_func" with testing.expect_warnings( "The GenericFunction 'Replaceable_Func' is already registered and " "is going to be overriden.", - regex=False + regex=False, ): + class Replaceable_Func_override(GenericFunction): type = Integer - identifier = 'Replaceable_Func' + identifier = "Replaceable_Func" assert isinstance(func.REPLACEABLE_FUNC().type, DateTime) assert isinstance(func.Replaceable_Func().type, Integer) @@ -283,8 +290,10 @@ class CaseSensitiveFunctionDeprecationsTest(fixtures.TestBase): not_in_("REPLACEABLE_FUNC", reg) not_in_("Replaceable_Func", reg) in_("replaceable_func", cs_reg) - eq_(set(cs_reg['replaceable_func'].keys()), - set(['REPLACEABLE_FUNC', 'Replaceable_Func', 'replaceable_func'])) + eq_( + set(cs_reg["replaceable_func"].keys()), + set(["REPLACEABLE_FUNC", "Replaceable_Func", "replaceable_func"]), + ) class DDLListenerDeprecationsTest(fixtures.TestBase): @@ -300,7 +309,7 @@ class DDLListenerDeprecationsTest(fixtures.TestBase): ) def test_append_listener(self): - metadata, table, bind = self.metadata, self.table, self.bind + metadata, table = self.metadata, self.table def fn(*a): return None @@ -356,7 +365,7 @@ class DDLListenerDeprecationsTest(fixtures.TestBase): assert "fnord" in canary def test_deprecated_append_ddl_listener_metadata(self): - metadata, users, engine = self.metadata, self.users, self.engine + metadata, engine = self.metadata, self.engine canary = [] with testing.expect_deprecated(".* is deprecated .*"): metadata.append_ddl_listener( @@ -575,4 +584,4 @@ class TextTest(fixtures.TestBase, AssertsCompiledSQL): with testing.expect_deprecated( "The text.autocommit parameter is deprecated" ): - t = text("select id, name from user", autocommit=True) + text("select id, name from user", autocommit=True) diff --git a/test/sql/test_generative.py b/test/sql/test_generative.py index 9b902e8ffd..a311c1d342 100644 --- a/test/sql/test_generative.py +++ b/test/sql/test_generative.py @@ -366,7 +366,7 @@ class ClauseTest(fixtures.TestBase, AssertsCompiledSQL): assert str(clause2) == str(t1.join(t2, t1.c.col2 == t2.c.col3)) def test_aliased_column_adapt(self): - clause = t1.select() + t1.select() aliased = t1.select().alias() aliased2 = t1.alias() @@ -1213,14 +1213,6 @@ class ClauseAdapterTest(fixtures.TestBase, AssertsCompiledSQL): ) def test_table_to_alias_3(self): - t1alias = t1.alias("t1alias") - vis = sql_util.ClauseAdapter(t1alias) - self.assert_compile( - select([literal_column("*")], t1.c.col1 == t2.c.col2), - "SELECT * FROM table1, table2 WHERE table1.col1 = table2.col2", - ) - - def test_table_to_alias_4(self): t1alias = t1.alias("t1alias") vis = sql_util.ClauseAdapter(t1alias) self.assert_compile( @@ -1231,7 +1223,7 @@ class ClauseAdapterTest(fixtures.TestBase, AssertsCompiledSQL): "WHERE t1alias.col1 = table2.col2", ) - def test_table_to_alias_5(self): + def test_table_to_alias_4(self): t1alias = t1.alias("t1alias") vis = sql_util.ClauseAdapter(t1alias) self.assert_compile( @@ -1246,7 +1238,7 @@ class ClauseAdapterTest(fixtures.TestBase, AssertsCompiledSQL): "WHERE t1alias.col1 = table2.col2", ) - def test_table_to_alias_6(self): + def test_table_to_alias_5(self): t1alias = t1.alias("t1alias") vis = sql_util.ClauseAdapter(t1alias) self.assert_compile( @@ -1266,7 +1258,7 @@ class ClauseAdapterTest(fixtures.TestBase, AssertsCompiledSQL): "(SELECT * FROM table2 WHERE t1alias.col1 = table2.col2)", ) - def test_table_to_alias_7(self): + def test_table_to_alias_6(self): t1alias = t1.alias("t1alias") vis = sql_util.ClauseAdapter(t1alias) self.assert_compile( @@ -1288,7 +1280,7 @@ class ClauseAdapterTest(fixtures.TestBase, AssertsCompiledSQL): "WHERE t1alias.col1 = table2.col2)", ) - def test_table_to_alias_8(self): + def test_table_to_alias_7(self): t1alias = t1.alias("t1alias") vis = sql_util.ClauseAdapter(t1alias) self.assert_compile( @@ -1297,7 +1289,7 @@ class ClauseAdapterTest(fixtures.TestBase, AssertsCompiledSQL): "t1alias.col2 ELSE t1alias.col1 END", ) - def test_table_to_alias_9(self): + def test_table_to_alias_8(self): t1alias = t1.alias("t1alias") vis = sql_util.ClauseAdapter(t1alias) self.assert_compile( @@ -1308,13 +1300,13 @@ class ClauseAdapterTest(fixtures.TestBase, AssertsCompiledSQL): "t1alias.col2 ELSE t1alias.col1 END", ) - def test_table_to_alias_10(self): + def test_table_to_alias_9(self): s = select([literal_column("*")], from_obj=[t1]).alias("foo") self.assert_compile( s.select(), "SELECT foo.* FROM (SELECT * FROM table1) " "AS foo" ) - def test_table_to_alias_11(self): + def test_table_to_alias_10(self): s = select([literal_column("*")], from_obj=[t1]).alias("foo") t1alias = t1.alias("t1alias") vis = sql_util.ClauseAdapter(t1alias) @@ -1323,13 +1315,13 @@ class ClauseAdapterTest(fixtures.TestBase, AssertsCompiledSQL): "SELECT foo.* FROM (SELECT * FROM table1 " "AS t1alias) AS foo", ) - def test_table_to_alias_12(self): + def test_table_to_alias_11(self): s = select([literal_column("*")], from_obj=[t1]).alias("foo") self.assert_compile( s.select(), "SELECT foo.* FROM (SELECT * FROM table1) " "AS foo" ) - def test_table_to_alias_13(self): + def test_table_to_alias_12(self): t1alias = t1.alias("t1alias") vis = sql_util.ClauseAdapter(t1alias) ff = vis.traverse(func.count(t1.c.col1).label("foo")) @@ -1344,7 +1336,7 @@ class ClauseAdapterTest(fixtures.TestBase, AssertsCompiledSQL): # .col1).l abel('foo')]), clone=True), "SELECT # count(t1alias.col1) AS foo FROM table1 AS t1alias") - def test_table_to_alias_14(self): + def test_table_to_alias_13(self): t1alias = t1.alias("t1alias") vis = sql_util.ClauseAdapter(t1alias) t2alias = t2.alias("t2alias") @@ -1358,7 +1350,7 @@ class ClauseAdapterTest(fixtures.TestBase, AssertsCompiledSQL): "t2alias.col2", ) - def test_table_to_alias_15(self): + def test_table_to_alias_14(self): t1alias = t1.alias("t1alias") vis = sql_util.ClauseAdapter(t1alias) t2alias = t2.alias("t2alias") @@ -1372,7 +1364,7 @@ class ClauseAdapterTest(fixtures.TestBase, AssertsCompiledSQL): "t2alias.col2", ) - def test_table_to_alias_16(self): + def test_table_to_alias_15(self): t1alias = t1.alias("t1alias") vis = sql_util.ClauseAdapter(t1alias) t2alias = t2.alias("t2alias") @@ -1394,7 +1386,7 @@ class ClauseAdapterTest(fixtures.TestBase, AssertsCompiledSQL): "WHERE t1alias.col1 = t2alias.col2)", ) - def test_table_to_alias_17(self): + def test_table_to_alias_16(self): t1alias = t1.alias("t1alias") vis = sql_util.ClauseAdapter(t1alias) t2alias = t2.alias("t2alias") @@ -1643,9 +1635,6 @@ class ClauseAdapterTest(fixtures.TestBase, AssertsCompiledSQL): "WHERE c.bid = anon_1.b_aid", ) - t1 = table("table1", column("col1"), column("col2"), column("col3")) - t2 = table("table2", column("col1"), column("col2"), column("col3")) - def test_label_anonymize_one(self): t1a = t1.alias() adapter = sql_util.ClauseAdapter(t1a, anonymize_labels=True) diff --git a/test/sql/test_metadata.py b/test/sql/test_metadata.py index 3d60fb60ed..47eab7318d 100644 --- a/test/sql/test_metadata.py +++ b/test/sql/test_metadata.py @@ -399,7 +399,7 @@ class MetaDataTest(fixtures.TestBase, ComparesTables): a = Table("a", meta, Column("a", Integer)) a.append_constraint(ForeignKeyConstraint(["a"], ["b.x"])) - b = Table("b", meta, Column("b", Integer)) + Table("b", meta, Column("b", Integer)) assert_raises_message( exc.NoReferencedColumnError, @@ -478,7 +478,7 @@ class MetaDataTest(fixtures.TestBase, ComparesTables): def test_sequence_attach_to_table(self): m1 = MetaData() s1 = Sequence("s") - t = Table("a", m1, Column("x", Integer, s1)) + Table("a", m1, Column("x", Integer, s1)) assert s1.metadata is m1 def test_sequence_attach_to_existing_table(self): @@ -2045,7 +2045,7 @@ class SchemaTypeTest(fixtures.TestBase): type_ = self.WrapBoolean() y = Column("y", type_) y_copy = y.copy() - t1 = Table("x", m, y_copy) + Table("x", m, y_copy) is_true(y_copy.type._create_events) @@ -3750,7 +3750,7 @@ class ColumnOptionsTest(fixtures.TestBase): def _no_error(self, col): m = MetaData() - b = Table("bar", m, Column("id", Integer)) + Table("bar", m, Column("id", Integer)) t = Table("t", m, col) schema.CreateTable(t).compile() diff --git a/test/sql/test_selectable.py b/test/sql/test_selectable.py index a4d3e1b406..024d2fb645 100644 --- a/test/sql/test_selectable.py +++ b/test/sql/test_selectable.py @@ -236,7 +236,6 @@ class SelectableTest( s1c1 = s1._clone() s1c2 = s1._clone() s2c1 = s2._clone() - s2c2 = s2._clone() s3c1 = s3._clone() eq_( @@ -653,7 +652,7 @@ class SelectableTest( def test_scalar_cloned_comparator(self): sel = select([table1.c.col1]).as_scalar() - expr = sel == table1.c.col1 + sel == table1.c.col1 sel2 = visitors.ReplacingCloningVisitor().traverse(sel) @@ -768,7 +767,7 @@ class SelectableTest( c1 = Column("c1", Integer) c2 = Column("c2", Integer) - s = select([c1]) + select([c1]) t = Table("t", MetaData(), c1, c2) @@ -782,7 +781,7 @@ class SelectableTest( c1 = Column("c1", Integer) c2 = Column("c2", Integer) - s = select([c1]).where(c1 == 5) + select([c1]).where(c1 == 5) t = Table("t", MetaData(), c1, c2) @@ -797,7 +796,7 @@ class SelectableTest( t1 = Table("t1", m, Column("x", Integer)) c1 = Column("c1", Integer) - s = select([c1]).where(c1 == 5).select_from(t1) + select([c1]).where(c1 == 5).select_from(t1) t2 = Table("t2", MetaData(), c1) @@ -1073,7 +1072,7 @@ class AnonLabelTest(fixtures.TestBase): assert c1.label(None) is not c1 eq_(str(select([c1])), "SELECT count(:count_2) AS count_1") - c2 = select([c1]).compile() + select([c1]).compile() eq_(str(select([c1.label(None)])), "SELECT count(:count_2) AS count_1") @@ -1987,7 +1986,7 @@ class AnnotationsTest(fixtures.TestBase): pass col = MyColumn("x", Integer) - binary_1 = col == 5 + col == 5 col_anno = MyColumn("x", Integer)._annotate({"foo": "bar"}) binary_2 = col_anno == 5 eq_(binary_2.left._annotations, {"foo": "bar"}) @@ -2254,10 +2253,10 @@ class AnnotationsTest(fixtures.TestBase): c = column("a") c1 = c._annotate({"foo": "bar"}) - comp1 = c1.comparator + c1.comparator c2 = c1._annotate({"bat": "hoho"}) - comp2 = c2.comparator + c2.comparator assert (c2 == 5).left._annotations == {"foo": "bar", "bat": "hoho"} @@ -2470,7 +2469,7 @@ class ResultMapTest(fixtures.TestBase): def test_select_table_alias_column(self): t = self._fixture() - x, y = t.c.x, t.c.y + x = t.c.x ta = t.alias() s = select([ta.c.x, ta.c.y]) @@ -2479,7 +2478,7 @@ class ResultMapTest(fixtures.TestBase): def test_select_label_alt_name_table_alias_column(self): t = self._fixture() - x, y = t.c.x, t.c.y + x = t.c.x ta = t.alias() l1, l2 = ta.c.x.label("a"), ta.c.y.label("b") diff --git a/test/sql/test_text.py b/test/sql/test_text.py index 60d7518cb8..6463e25fea 100644 --- a/test/sql/test_text.py +++ b/test/sql/test_text.py @@ -514,7 +514,7 @@ class AsFromTest(fixtures.TestBase, AssertsCompiledSQL): def test_select_table_alias_column(self): t = self._xy_table_fixture() - x, y = t.c.x, t.c.y + x = t.c.x ta = t.alias() s = text("select ta.x, ta.y FROM t AS ta").columns(ta.c.x, ta.c.y) @@ -523,7 +523,7 @@ class AsFromTest(fixtures.TestBase, AssertsCompiledSQL): def test_select_label_alt_name_table_alias_column(self): t = self._xy_table_fixture() - x, y = t.c.x, t.c.y + x = t.c.x ta = t.alias() l1, l2 = ta.c.x.label("a"), ta.c.y.label("b")