From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Wed, 29 May 2013 22:36:10 +0000 (-0400)
Subject: add the py2k symbol from the 0.9 branch to support the hstore change
X-Git-Tag: rel_0_8_2~67^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c746c44a314d357b855108b6e99b773ce52f760;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

add the py2k symbol from the 0.9 branch to support the hstore change
---

diff --git a/lib/sqlalchemy/dialects/postgresql/hstore.py b/lib/sqlalchemy/dialects/postgresql/hstore.py
index b2150bc449..4daf54bab6 100644
--- a/lib/sqlalchemy/dialects/postgresql/hstore.py
+++ b/lib/sqlalchemy/dialects/postgresql/hstore.py
@@ -10,6 +10,7 @@ from .base import ARRAY, ischema_names
 from ... import types as sqltypes
 from ...sql import functions as sqlfunc
 from ...sql.operators import custom_op
+from ... import util
 
 __all__ = ('HSTORE', 'hstore')
 
diff --git a/lib/sqlalchemy/util/__init__.py b/lib/sqlalchemy/util/__init__.py
index 3fa06c7932..efeca6f1bc 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 033a87cc7b..6905d6347c 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')