From: Diana Clarke <diana.joan.clarke@gmail.com>
Date: Thu, 15 Nov 2012 04:25:09 +0000 (-0500)
Subject: oops! python 3 doesn't do the rich comparison cmp thing
X-Git-Tag: rel_0_8_0b2~57
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8a4ab8a4db3b9fb773302e4e8c1e80b24f13fec4;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

oops! python 3 doesn't do the rich comparison cmp thing
---

diff --git a/test/base/test_utils.py b/test/base/test_utils.py
index 06a91b62bc..8f5bffd436 100644
--- a/test/base/test_utils.py
+++ b/test/base/test_utils.py
@@ -345,8 +345,7 @@ class IdentitySetTest(fixtures.TestBase):
         def should_raise():
             not_an_identity_set = object()
             return unique1 <= not_an_identity_set
-        assert_raises_message(
-            TypeError, 'cannot compare sets using cmp()', should_raise)
+        self._assert_unorderable_types(should_raise)
 
     def test_dunder_lt(self):
         super_, sub_, twin1, twin2, unique1, unique2 = self._create_sets()
@@ -367,8 +366,7 @@ class IdentitySetTest(fixtures.TestBase):
         def should_raise():
             not_an_identity_set = object()
             return unique1 < not_an_identity_set
-        assert_raises_message(
-            TypeError, 'cannot compare sets using cmp()', should_raise)
+        self._assert_unorderable_types(should_raise)
 
     def test_dunder_ge(self):
         super_, sub_, twin1, twin2, unique1, unique2 = self._create_sets()
@@ -389,8 +387,7 @@ class IdentitySetTest(fixtures.TestBase):
         def should_raise():
             not_an_identity_set = object()
             return unique1 >= not_an_identity_set
-        assert_raises_message(
-            TypeError, 'cannot compare sets using cmp()', should_raise)
+        self._assert_unorderable_types(should_raise)
 
     def test_dunder_gt(self):
         super_, sub_, twin1, twin2, unique1, unique2 = self._create_sets()
@@ -411,8 +408,7 @@ class IdentitySetTest(fixtures.TestBase):
         def should_raise():
             not_an_identity_set = object()
             return unique1 > not_an_identity_set
-        assert_raises_message(
-            TypeError, 'cannot compare sets using cmp()', should_raise)
+        self._assert_unorderable_types(should_raise)
 
     def test_issubset(self):
         super_, sub_, twin1, twin2, unique1, unique2 = self._create_sets()
@@ -712,6 +708,15 @@ class IdentitySetTest(fixtures.TestBase):
         unique2 = util.IdentitySet([o5])
         return super_, sub_, twin1, twin2, unique1, unique2
 
+    def _assert_unorderable_types(self, callable_):
+        # Py3K
+        #assert_raises_message(
+        #    TypeError, 'unorderable types', callable_)
+        # Py2K
+        assert_raises_message(
+            TypeError, 'cannot compare sets using cmp()', callable_)
+        # end Py2K
+
     def test_basic_sanity(self):
         IdentitySet = util.IdentitySet