- fix typos in test

- restore __len__ to identity map

diff --git a/lib/sqlalchemy/orm/identity.py b/lib/sqlalchemy/orm/identity.py
index f9cd99289252d196b1e25a90e01c7fc4e9d0ecbb..f75aeba55cfe15440a513db014d54e5a20c052ef 100644 (file)
--- a/lib/sqlalchemy/orm/identity.py
+++ b/lib/sqlalchemy/orm/identity.py
@@ -63,6 +63,9 @@ class IdentityMap(object):
     def setdefault(self, key, default=None):
         raise NotImplementedError("IdentityMap uses add() to insert data")
 
+    def __len__(self):
+        return len(self._dict)
+
     def copy(self):
         raise NotImplementedError()
 

diff --git a/test/orm/test_query.py b/test/orm/test_query.py
index cc1f50023e599a82421ba4cb2d725d3c75310574..b76d1023fdd310662ab604273d6ed23b363e5c05 100644 (file)
--- a/test/orm/test_query.py
+++ b/test/orm/test_query.py
@@ -1290,14 +1290,14 @@ class FilterTest(QueryTest, AssertsCompiledSQL):
             sess.query(User).order_by(User.id).
                     limit(bindparam('limit')).
                     offset(bindparam('offset')).
-                    params(limit=2, offset=1).all()
+                    params(limit=2, offset=1).all(),
             [User(id=8), User(id=9)]
         )
         eq_(
             list(
                 sess.query(User).params(a=1, b=3).
                     order_by(User.id)[bindparam('a'):bindparam('b')]
-                )
+                ),
             [User(id=8), User(id=9)]
         )