base

diff --git a/lib/sqlalchemy/util/_collections.py b/lib/sqlalchemy/util/_collections.py
index e505bdd5f71dca672ce90f6c7542384b4ab805bf..fddedf4f7f74bde202579d966203747caf11a858 100644 (file)
--- a/lib/sqlalchemy/util/_collections.py
+++ b/lib/sqlalchemy/util/_collections.py
@@ -9,7 +9,7 @@
 import itertools
 import weakref
 import operator
-from .compat import threading
+from .compat import threading, itertools_filterfalse
 
 EMPTY_SET = frozenset()
 
@@ -470,7 +470,7 @@ class IdentitySet(object):
 
         if len(self) > len(other):
             return False
-        for m in itertools.filterfalse(other._members.__contains__,
+        for m in itertools_filterfalse(other._members.__contains__,
                                         iter(self._members.keys())):
             return False
         return True
@@ -491,7 +491,7 @@ class IdentitySet(object):
         if len(self) < len(other):
             return False
 
-        for m in itertools.filterfalse(self._members.__contains__,
+        for m in itertools_filterfalse(self._members.__contains__,
                                         iter(other._members.keys())):
             return False
         return True

diff --git a/test/base/test_utils.py b/test/base/test_utils.py
index 6dcfaf9d1ebaab9913024e19b0e6fccbbd4d2b1d..b9f94c603afa76f601a1d1972ea7115a8989d055 100644 (file)
--- a/test/base/test_utils.py
+++ b/test/base/test_utils.py
@@ -843,14 +843,12 @@ class IdentitySetTest(fixtures.TestBase):
         return super_, sub_, twin1, twin2, unique1, unique2
 
     def _assert_unorderable_types(self, callable_):
-# start Py3K
-        assert_raises_message(
-            TypeError, 'unorderable types', callable_)
-# end Py3K
-# start Py2K
-#        assert_raises_message(
-#            TypeError, 'cannot compare sets using cmp()', callable_)
-# end Py2K
+        if util.py3k:
+            assert_raises_message(
+                TypeError, 'unorderable types', callable_)
+        else:
+            assert_raises_message(
+                TypeError, 'cannot compare sets using cmp()', callable_)
 
     def test_basic_sanity(self):
         IdentitySet = util.IdentitySet