From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sat, 24 May 2014 18:54:07 +0000 (-0400)
Subject: - fix typos in test
X-Git-Tag: rel_1_0_0b1~428
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6126caec447f98801f3ea7cf045ca807a4537a4d;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- fix typos in test
- restore __len__ to identity map
---

diff --git a/lib/sqlalchemy/orm/identity.py b/lib/sqlalchemy/orm/identity.py
index f9cd992892..f75aeba55c 100644
--- 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 cc1f50023e..b76d1023fd 100644
--- 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)]
         )