summaryrefslogtreecommitdiff
path: root/test/orm/test_collection.py
diff options
context:
space:
mode:
Diffstat (limited to 'test/orm/test_collection.py')
-rw-r--r--test/orm/test_collection.py38
1 files changed, 21 insertions, 17 deletions
diff --git a/test/orm/test_collection.py b/test/orm/test_collection.py
index 363104596..3ff0129c0 100644
--- a/test/orm/test_collection.py
+++ b/test/orm/test_collection.py
@@ -1,23 +1,27 @@
-from sqlalchemy.testing import eq_, ne_
from operator import and_
+import sqlalchemy as sa
+from sqlalchemy import exc as sa_exc
+from sqlalchemy import ForeignKey
+from sqlalchemy import Integer
+from sqlalchemy import String
+from sqlalchemy import testing
+from sqlalchemy import text
+from sqlalchemy import util
+from sqlalchemy.orm import attributes
+from sqlalchemy.orm import create_session
+from sqlalchemy.orm import instrumentation
+from sqlalchemy.orm import mapper
+from sqlalchemy.orm import relationship
import sqlalchemy.orm.collections as collections
from sqlalchemy.orm.collections import collection
-
-import sqlalchemy as sa
-from sqlalchemy import Integer, String, ForeignKey, text
-from sqlalchemy.testing.schema import Table, Column
-from sqlalchemy import util, exc as sa_exc
-from sqlalchemy.orm import (
- create_session,
- mapper,
- relationship,
- attributes,
- instrumentation,
-)
+from sqlalchemy.testing import assert_raises
+from sqlalchemy.testing import assert_raises_message
+from sqlalchemy.testing import eq_
from sqlalchemy.testing import fixtures
-from sqlalchemy.testing import assert_raises, assert_raises_message
-from sqlalchemy import testing
+from sqlalchemy.testing import ne_
+from sqlalchemy.testing.schema import Column
+from sqlalchemy.testing.schema import Table
class Canary(sa.orm.interfaces.AttributeExtension):
@@ -75,8 +79,8 @@ class CollectionsTest(fixtures.ORMTest):
@classmethod
def dictable_entity(cls, a=None, b=None, c=None):
- id = cls._entity_id = cls._entity_id + 1
- return cls.Entity(a or str(id), b or "value %s" % id, c)
+ id_ = cls._entity_id = cls._entity_id + 1
+ return cls.Entity(a or str(id_), b or "value %s" % id, c)
def _test_adapter(self, typecallable, creator=None, to_set=None):
if creator is None: