diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-05-29 18:36:10 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-05-29 18:36:10 -0400 |
| commit | 9c746c44a314d357b855108b6e99b773ce52f760 (patch) | |
| tree | 6b34148dd43233a48e3b2ae54583155c761b2241 /lib/sqlalchemy/util | |
| parent | c62d6203d94839b1ee6d44bff5762d2ee6049aa1 (diff) | |
| download | sqlalchemy-9c746c44a314d357b855108b6e99b773ce52f760.tar.gz | |
add the py2k symbol from the 0.9 branch to support the hstore change
Diffstat (limited to 'lib/sqlalchemy/util')
| -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 3fa06c793..efeca6f1b 100644 --- a/lib/sqlalchemy/util/__init__.py +++ b/lib/sqlalchemy/util/__init__.py @@ -5,7 +5,7 @@ # the MIT License: http://www.opensource.org/licenses/mit-license.php from .compat import callable, cmp, reduce, \ - threading, py3k, py3k_warning, jython, pypy, cpython, win32, set_types, \ + threading, py3k, py2k, py3k_warning, jython, pypy, cpython, win32, set_types, \ pickle, dottedgetter, parse_qsl, namedtuple, next, WeakSet, reraise, \ raise_from_cause diff --git a/lib/sqlalchemy/util/compat.py b/lib/sqlalchemy/util/compat.py index 033a87cc7..6905d6347 100644 --- a/lib/sqlalchemy/util/compat.py +++ b/lib/sqlalchemy/util/compat.py @@ -16,6 +16,7 @@ except ImportError: py32 = sys.version_info >= (3, 2) py3k_warning = getattr(sys, 'py3kwarning', False) or sys.version_info >= (3, 0) py3k = sys.version_info >= (3, 0) +py2k = sys.version_info < (3, 0) jython = sys.platform.startswith('java') pypy = hasattr(sys, 'pypy_version_info') win32 = sys.platform.startswith('win') |