From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sat, 27 Jul 2013 22:32:15 +0000 (-0400)
Subject: fix py26 flag
X-Git-Tag: rel_0_8_3~81
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9fcb5348afcd35ca317a009b322b289878b153ec;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

fix py26 flag
---

diff --git a/lib/sqlalchemy/util/__init__.py b/lib/sqlalchemy/util/__init__.py
index 8e36ea611d..5c4034160f 100644
--- a/lib/sqlalchemy/util/__init__.py
+++ b/lib/sqlalchemy/util/__init__.py
@@ -6,7 +6,7 @@
 
 from .compat import callable, cmp, reduce,  \
     threading, py3k, py33, py2k, py3k_warning, jython, pypy, cpython, win32, \
-    set_types, \
+    set_types, py26, \
     pickle, dottedgetter, parse_qsl, namedtuple, next, WeakSet, reraise, \
     raise_from_cause, u, b, ue, string_types, text_type, int_types
 
diff --git a/lib/sqlalchemy/util/compat.py b/lib/sqlalchemy/util/compat.py
index 24d78fa701..0b807c382c 100644
--- a/lib/sqlalchemy/util/compat.py
+++ b/lib/sqlalchemy/util/compat.py
@@ -15,6 +15,7 @@ except ImportError:
 
 py33 = sys.version_info >= (3, 3)
 py32 = sys.version_info >= (3, 2)
+py26 = sys.version_info >= (2, 6)
 py3k_warning = getattr(sys, 'py3kwarning', False) or sys.version_info >= (3, 0)
 py3k = sys.version_info >= (3, 0)
 py2k = sys.version_info < (3, 0)