summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/util
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2012-10-24 14:29:52 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2012-10-24 14:29:52 -0400
commite656bf4f47cf3c06975c6207ea6e54131b292bf7 (patch)
tree2fc4badbd7155898bb43261fa68d281b758ba397 /lib/sqlalchemy/util
parentc859893cb8f22db3904ec1a6aa5c71d0925fb2e6 (diff)
downloadsqlalchemy-e656bf4f47cf3c06975c6207ea6e54131b292bf7.tar.gz
- move most/all operator specific tests into test_operator, convert fully to TOT
Diffstat (limited to 'lib/sqlalchemy/util')
-rw-r--r--lib/sqlalchemy/util/__init__.py2
-rw-r--r--lib/sqlalchemy/util/compat.py1
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/sqlalchemy/util/__init__.py b/lib/sqlalchemy/util/__init__.py
index 7d012ff60..b7187e4e4 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, defaultdict, py25_dict, \
- threading, py3k_warning, jython, pypy, cpython, win32, set_types, buffer, \
+ threading, py3k, py3k_warning, jython, pypy, cpython, win32, set_types, buffer, \
pickle, update_wrapper, partial, md5_hex, decode_slice, dottedgetter,\
parse_qsl, any, contextmanager, namedtuple, next, WeakSet
diff --git a/lib/sqlalchemy/util/compat.py b/lib/sqlalchemy/util/compat.py
index c6b990802..2e10b6f69 100644
--- a/lib/sqlalchemy/util/compat.py
+++ b/lib/sqlalchemy/util/compat.py
@@ -15,6 +15,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)
jython = sys.platform.startswith('java')
pypy = hasattr(sys, 'pypy_version_info')
win32 = sys.platform.startswith('win')