diff options
| author | Iuri de Silvio <iurisilvio@gmail.com> | 2015-11-30 12:11:02 -0200 |
|---|---|---|
| committer | Iuri de Silvio <iurisilvio@gmail.com> | 2015-11-30 14:50:25 -0200 |
| commit | d9178320d6755d893638646503ed538b11b6536a (patch) | |
| tree | 85b44902fadcfe4b960f4c8483a202a701f81f95 | |
| parent | 4fcd93afb877ec8929586c2d7b671aef1783d883 (diff) | |
| download | sqlalchemy-pr/218.tar.gz | |
Fix _assert_unorderable_types on py36.pr/218
The error message changed to:
`'<' not supported between instances of 'foo' and 'bar'`
| -rw-r--r-- | lib/sqlalchemy/util/__init__.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/util/compat.py | 1 | ||||
| -rw-r--r-- | test/base/test_utils.py | 5 |
3 files changed, 6 insertions, 2 deletions
diff --git a/lib/sqlalchemy/util/__init__.py b/lib/sqlalchemy/util/__init__.py index 36a81dbce..a15ca8efa 100644 --- 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 5b6f691f1..25c88c662 100644 --- 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 c1027ec8e..4370d612b 100644 --- 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: |