summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/util
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2012-06-25 14:21:53 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2012-06-25 14:21:53 -0400
commitcdfef65dd6ce7a9296617171b9125314999b7a9d (patch)
tree41c57b94e357962306626c5346e5dec8f95e946b /lib/sqlalchemy/util
parenta1a58219c29daf82db425fcdca5ce212d23e4ff8 (diff)
downloadsqlalchemy-cdfef65dd6ce7a9296617171b9125314999b7a9d.tar.gz
add 2.5 compat for next()
Diffstat (limited to 'lib/sqlalchemy/util')
-rw-r--r--lib/sqlalchemy/util/__init__.py2
-rw-r--r--lib/sqlalchemy/util/compat.py5
2 files changed, 6 insertions, 1 deletions
diff --git a/lib/sqlalchemy/util/__init__.py b/lib/sqlalchemy/util/__init__.py
index 9fc749519..cf61eb02a 100644
--- a/lib/sqlalchemy/util/__init__.py
+++ b/lib/sqlalchemy/util/__init__.py
@@ -7,7 +7,7 @@
from compat import callable, cmp, reduce, defaultdict, py25_dict, \
threading, py3k_warning, jython, pypy, win32, set_types, buffer, pickle, \
update_wrapper, partial, md5_hex, decode_slice, dottedgetter,\
- parse_qsl, any, contextmanager, namedtuple
+ parse_qsl, any, contextmanager, namedtuple, next
from _collections import NamedTuple, ImmutableContainer, immutabledict, \
Properties, OrderedProperties, ImmutableProperties, OrderedDict, \
diff --git a/lib/sqlalchemy/util/compat.py b/lib/sqlalchemy/util/compat.py
index c5339d013..5dc59b5c5 100644
--- a/lib/sqlalchemy/util/compat.py
+++ b/lib/sqlalchemy/util/compat.py
@@ -40,6 +40,11 @@ else:
set_types = set, sets.Set
+if sys.version_info < (2, 6):
+ def next(iter):
+ return iter.next()
+else:
+ next = next
if py3k_warning:
import pickle
else: