1 files changed, 60 insertions, 48 deletions
diff --git a/test/orm/test_froms.py b/test/orm/test_froms.py
index 064038750..9b68136bd 100644
--- a/test/orm/test_froms.py
+++ b/test/orm/test_froms.py
@@ -1,55 +1,48 @@
+import sqlalchemy as sa
+from sqlalchemy import and_
+from sqlalchemy import asc
+from sqlalchemy import cast
+from sqlalchemy import desc
+from sqlalchemy import exc as sa_exc
+from sqlalchemy import exists
+from sqlalchemy import ForeignKey
+from sqlalchemy import func
+from sqlalchemy import inspect
+from sqlalchemy import Integer
+from sqlalchemy import literal_column
+from sqlalchemy import select
+from sqlalchemy import String
+from sqlalchemy import Table
 from sqlalchemy import testing
-from sqlalchemy.testing import (
-    fixtures,
-    eq_,
-    is_,
-    assert_raises,
-    assert_raises_message,
-    AssertsCompiledSQL,
-)
-from sqlalchemy import (
-    exc as sa_exc,
-    util,
-    Integer,
-    Table,
-    String,
-    ForeignKey,
-    select,
-    func,
-    and_,
-    asc,
-    desc,
-    inspect,
-    literal_column,
-    cast,
-    exists,
-    text,
-)
-from sqlalchemy.orm import (
-    configure_mappers,
-    Session,
-    mapper,
-    create_session,
-    relationship,
-    column_property,
-    joinedload_all,
-    contains_eager,
-    contains_alias,
-    joinedload,
-    clear_mappers,
-    backref,
-    relation,
-    aliased,
-)
-from sqlalchemy.sql import table, column
+from sqlalchemy import text
+from sqlalchemy import util
 from sqlalchemy.engine import default
-import sqlalchemy as sa
+from sqlalchemy.orm import aliased
+from sqlalchemy.orm import backref
+from sqlalchemy.orm import clear_mappers
+from sqlalchemy.orm import column_property
+from sqlalchemy.orm import configure_mappers
+from sqlalchemy.orm import contains_alias
+from sqlalchemy.orm import contains_eager
+from sqlalchemy.orm import create_session
+from sqlalchemy.orm import joinedload
+from sqlalchemy.orm import joinedload_all
+from sqlalchemy.orm import mapper
+from sqlalchemy.orm import relation
+from sqlalchemy.orm import relationship
+from sqlalchemy.orm import Session
+from sqlalchemy.orm.util import join
+from sqlalchemy.sql import column
+from sqlalchemy.sql import table
+from sqlalchemy.testing import assert_raises
+from sqlalchemy.testing import assert_raises_message
+from sqlalchemy.testing import AssertsCompiledSQL
+from sqlalchemy.testing import eq_
+from sqlalchemy.testing import fixtures
+from sqlalchemy.testing import is_
 from sqlalchemy.testing.schema import Column
-
 from test.orm import _fixtures
 
-from sqlalchemy.orm.util import join
-
 
 class QueryTest(_fixtures.FixtureTest):
     run_setup_mappers = "once"
@@ -58,7 +51,26 @@ class QueryTest(_fixtures.FixtureTest):
 
     @classmethod
     def setup_mappers(cls):
-        Node, composite_pk_table, users, Keyword, items, Dingaling, order_items, item_keywords, Item, User, dingalings, Address, keywords, CompositePk, nodes, Order, orders, addresses = (
+        (
+            Node,
+            composite_pk_table,
+            users,
+            Keyword,
+            items,
+            Dingaling,
+            order_items,
+            item_keywords,
+            Item,
+            User,
+            dingalings,
+            Address,
+            keywords,
+            CompositePk,
+            nodes,
+            Order,
+            orders,
+            addresses,
+        ) = (
             cls.classes.Node,
             cls.tables.composite_pk_table,
             cls.tables.users,