From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sat, 4 May 2013 20:00:05 +0000 (-0400)
Subject: base
X-Git-Tag: rel_0_9_0b1~304^2~13^2~43
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8be6831f8be70d7946fd8e3e41b18781a1743ea7;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

base
---

diff --git a/lib/sqlalchemy/util/_collections.py b/lib/sqlalchemy/util/_collections.py
index e505bdd5f7..fddedf4f7f 100644
--- 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 6dcfaf9d1e..b9f94c603a 100644
--- 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