1 files changed, 48 insertions, 31 deletions

diff --git a/test/ext/test_associationproxy.py b/test/ext/test_associationproxy.py
index 4e063a84b..24b57cd6b 100644
--- a/test/ext/test_associationproxy.py
+++ b/test/ext/test_associationproxy.py
@@ -1,34 +1,42 @@
-from sqlalchemy.testing import eq_, assert_raises, is_
 import copy
 import pickle
 
-from sqlalchemy import Integer, ForeignKey, String, or_, MetaData
-from sqlalchemy.orm import (
-    relationship,
-    configure_mappers,
-    mapper,
-    Session,
-    collections,
-    sessionmaker,
-    aliased,
-    clear_mappers,
-    create_session,
-)
 from sqlalchemy import exc
-from sqlalchemy.orm.collections import collection, attribute_mapped_collection
-from sqlalchemy.ext.associationproxy import association_proxy
-from sqlalchemy.ext.associationproxy import _AssociationList
-from sqlalchemy.testing import assert_raises_message
-from sqlalchemy.testing.util import gc_collect
-from sqlalchemy.testing import fixtures, AssertsCompiledSQL
+from sqlalchemy import ForeignKey
+from sqlalchemy import inspect
+from sqlalchemy import Integer
+from sqlalchemy import MetaData
+from sqlalchemy import or_
+from sqlalchemy import String
 from sqlalchemy import testing
-from sqlalchemy.testing.schema import Table, Column
-from sqlalchemy.testing.mock import Mock, call
-from sqlalchemy.testing.assertions import expect_warnings
+from sqlalchemy.engine import default
+from sqlalchemy.ext.associationproxy import _AssociationList
+from sqlalchemy.ext.associationproxy import association_proxy
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.ext.declarative import declared_attr
-from sqlalchemy.engine import default
-from sqlalchemy import inspect
+from sqlalchemy.orm import aliased
+from sqlalchemy.orm import clear_mappers
+from sqlalchemy.orm import collections
+from sqlalchemy.orm import configure_mappers
+from sqlalchemy.orm import create_session
+from sqlalchemy.orm import mapper
+from sqlalchemy.orm import relationship
+from sqlalchemy.orm import Session
+from sqlalchemy.orm import sessionmaker
+from sqlalchemy.orm.collections import attribute_mapped_collection
+from sqlalchemy.orm.collections import collection
+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.assertions import expect_warnings
+from sqlalchemy.testing.mock import call
+from sqlalchemy.testing.mock import Mock
+from sqlalchemy.testing.schema import Column
+from sqlalchemy.testing.schema import Table
+from sqlalchemy.testing.util import gc_collect
 
 
 class DictCollection(dict):
@@ -254,9 +262,9 @@ class _CollectionOperations(fixtures.TestBase):
         if obj not in self.session:
             self.session.add(obj)
         self.session.flush()
-        id, type_ = obj.id, type(obj)
+        id_, type_ = obj.id, type(obj)
         self.session.expunge_all()
-        return self.session.query(type_).get(id)
+        return self.session.query(type_).get(id_)
 
     def _test_sequence_ops(self):
         Parent, Child = self.Parent, self.Child
@@ -962,9 +970,9 @@ class ScalarTest(fixtures.TestBase):
             if obj not in session:
                 session.add(obj)
             session.flush()
-            id, type_ = obj.id, type(obj)
+            id_, type_ = obj.id, type(obj)
             session.expunge_all()
-            return session.query(type_).get(id)
+            return session.query(type_).get(id_)
 
         p = Parent("p")
 
@@ -1155,9 +1163,9 @@ class LazyLoadTest(fixtures.TestBase):
     def roundtrip(self, obj):
         self.session.add(obj)
         self.session.flush()
-        id, type_ = obj.id, type(obj)
+        id_, type_ = obj.id, type(obj)
         self.session.expunge_all()
-        return self.session.query(type_).get(id)
+        return self.session.query(type_).get(id_)
 
     def test_lazy_list(self):
         Parent, Child = self.Parent, self.Child
@@ -1526,7 +1534,16 @@ class ComparatorTest(fixtures.MappedTest, AssertsCompiledSQL):
 
     @classmethod
     def setup_mappers(cls):
-        users, Keyword, UserKeyword, singular, userkeywords, User, keywords, Singular = (
+        (
+            users,
+            Keyword,
+            UserKeyword,
+            singular,
+            userkeywords,
+            User,
+            keywords,
+            Singular,
+        ) = (
             cls.tables.users,
             cls.classes.Keyword,
             cls.classes.UserKeyword,