diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2015-11-30 11:53:09 -0500 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2015-11-30 11:53:09 -0500 |
| commit | 2b39f09e73f6f2b29ee4a464b5f16fe8a5599275 (patch) | |
| tree | 81db631800faa71eb7d1116de762fc72e06e15df /lib/sqlalchemy | |
| parent | d59e951f465550dfd0584a8ba293ec6a62cb7db4 (diff) | |
| parent | d9178320d6755d893638646503ed538b11b6536a (diff) | |
| download | sqlalchemy-2b39f09e73f6f2b29ee4a464b5f16fe8a5599275.tar.gz | |
Merge remote-tracking branch 'origin/pr/218'
Diffstat (limited to 'lib/sqlalchemy')
| -rw-r--r-- | lib/sqlalchemy/util/__init__.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/util/compat.py | 1 |
2 files changed, 2 insertions, 1 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) |