Fix _assert_unorderable_types on py36.

The error message changed to:

`'<' not supported between instances of 'foo' and 'bar'`

diff --git a/lib/sqlalchemy/util/__init__.py b/lib/sqlalchemy/util/__init__.py
index 36a81dbce882ade27b3382d00f6656fbfddffa9f..a15ca8efac703924eaf9716e10bd8a8013b5cb45 100644 (file)
--- a/lib/sqlalchemy/util/__init__.py
+++ b/lib/sqlalchemy/util/__init__.py
@@ -6,7 +6,7 @@
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
 
 from .compat import callable, cmp, reduce,  \
-    threading, py3k, py33, py2k, jython, pypy, cpython, win32, \
+    threading, py3k, py33, py36, py2k, jython, pypy, cpython, win32, \
     pickle, dottedgetter, parse_qsl, namedtuple, next, reraise, \
     raise_from_cause, text_type, safe_kwarg, string_types, int_types, \
     binary_type, nested, \

diff --git a/lib/sqlalchemy/util/compat.py b/lib/sqlalchemy/util/compat.py
index 5b6f691f1c183fdbf82bd7ba4bb7fcef8e72d283..25c88c662fa538ab1ebd08210164c9a706d75f62 100644 (file)
--- a/lib/sqlalchemy/util/compat.py
+++ b/lib/sqlalchemy/util/compat.py
@@ -14,6 +14,7 @@ try:
 except ImportError:
     import dummy_threading as threading
 
+py36 = sys.version_info >= (3, 6)
 py33 = sys.version_info >= (3, 3)
 py32 = sys.version_info >= (3, 2)
 py3k = sys.version_info >= (3, 0)

diff --git a/test/base/test_utils.py b/test/base/test_utils.py
index c1027ec8ea230bc68c0e0a6f551b4c50728b0d01..4370d612b648295daf5674047576095f68088a1e 100644 (file)
--- a/test/base/test_utils.py
+++ b/test/base/test_utils.py
@@ -1200,7 +1200,10 @@ class IdentitySetTest(fixtures.TestBase):
         return super_, sub_, twin1, twin2, unique1, unique2
 
     def _assert_unorderable_types(self, callable_):
-        if util.py3k:
+        if util.py36:
+            assert_raises_message(
+                TypeError, 'not supported between instances of', callable_)
+        elif util.py3k:
             assert_raises_message(
                 TypeError, 'unorderable types', callable_)
         else: