1 files changed, 36 insertions, 32 deletions
diff --git a/test/ext/declarative/test_mixin.py b/test/ext/declarative/test_mixin.py
index f51a75b3e..7fec77270 100644
--- a/test/ext/declarative/test_mixin.py
+++ b/test/ext/declarative/test_mixin.py
@@ -1,32 +1,36 @@
-from sqlalchemy.testing import (
-    eq_,
-    assert_raises,
-    assert_raises_message,
-    is_,
-    expect_warnings,
-)
-from sqlalchemy.ext import declarative as decl
 import sqlalchemy as sa
+from sqlalchemy import ForeignKey
+from sqlalchemy import func
+from sqlalchemy import Integer
+from sqlalchemy import select
+from sqlalchemy import String
 from sqlalchemy import testing
-from sqlalchemy import Integer, String, ForeignKey, select, func
-from sqlalchemy.testing.schema import Table, Column
-from sqlalchemy.orm import (
-    relationship,
-    create_session,
-    class_mapper,
-    configure_mappers,
-    clear_mappers,
-    deferred,
-    column_property,
-    Session,
-    base as orm_base,
-    synonym,
-)
-from sqlalchemy.util import classproperty
-from sqlalchemy.ext.declarative import declared_attr, declarative_base
+from sqlalchemy.ext import declarative as decl
+from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.ext.declarative import declared_attr
+from sqlalchemy.orm import base as orm_base
+from sqlalchemy.orm import class_mapper
+from sqlalchemy.orm import clear_mappers
+from sqlalchemy.orm import column_property
+from sqlalchemy.orm import configure_mappers
+from sqlalchemy.orm import create_session
+from sqlalchemy.orm import deferred
 from sqlalchemy.orm import events as orm_events
-from sqlalchemy.testing import fixtures, mock
+from sqlalchemy.orm import relationship
+from sqlalchemy.orm import Session
+from sqlalchemy.orm import synonym
+from sqlalchemy.testing import assert_raises
+from sqlalchemy.testing import assert_raises_message
+from sqlalchemy.testing import eq_
+from sqlalchemy.testing import expect_warnings
+from sqlalchemy.testing import fixtures
+from sqlalchemy.testing import is_
+from sqlalchemy.testing import mock
+from sqlalchemy.testing.schema import Column
+from sqlalchemy.testing.schema import Table
 from sqlalchemy.testing.util import gc_collect
+from sqlalchemy.util import classproperty
+
 
 Base = None
 
@@ -1319,7 +1323,6 @@ class DeclarativeMixinPropertyTest(
 
     def test_correct_for_proxies(self):
         from sqlalchemy.ext.hybrid import hybrid_property
-        from sqlalchemy.ext import hybrid
         from sqlalchemy import inspect
 
         class Mixin(object):
@@ -1388,7 +1391,8 @@ class DeclarativeMixinPropertyTest(
         s = Session()
         self.assert_compile(
             s.query(Base.data_syn).filter(Base.data_syn == "foo"),
-            "SELECT test.data AS test_data FROM test WHERE test.data = :data_1",
+            "SELECT test.data AS test_data FROM test "
+            "WHERE test.data = :data_1",
             dialect="default",
         )
         self.assert_compile(
@@ -1770,12 +1774,12 @@ class DeclaredAttrTest(DeclarativeTestBase, testing.AssertsCompiledSQL):
             @declared_attr.cascading
             def my_attr(cls):
                 if decl.has_inherited_table(cls):
-                    id = Column(ForeignKey("a.my_attr"), primary_key=True)
-                    asserted["b"].add(id)
+                    id_ = Column(ForeignKey("a.my_attr"), primary_key=True)
+                    asserted["b"].add(id_)
                 else:
-                    id = Column(Integer, primary_key=True)
-                    asserted["a"].add(id)
-                return id
+                    id_ = Column(Integer, primary_key=True)
+                    asserted["a"].add(id_)
+                return id_
 
         class A(Base, Mixin):
             __tablename__ = "a"