merge next() compatibility

diff --git a/lib/sqlalchemy/sql/compiler.py b/lib/sqlalchemy/sql/compiler.py
index bc81da22c5ff8322a0e9f597ee3d83088f9f56e8..2ba581384fb5f08bb15a778c00ec8d473d197c62 100644 (file)
--- a/lib/sqlalchemy/sql/compiler.py
+++ b/lib/sqlalchemy/sql/compiler.py
@@ -286,7 +286,7 @@ class SQLCompiler(engine.Compiled):
         poscount = itertools.count(1)
         self.string = re.sub(
                         r'\[_POSITION\]', 
-                        lambda m:str(next(poscount)), 
+                        lambda m:str(util.next(poscount)), 
                         self.string)
 
     @util.memoized_property

diff --git a/lib/sqlalchemy/util/__init__.py b/lib/sqlalchemy/util/__init__.py
index 13914aa7dc5905a3913b4f7d816ef5eaec9fc453..ac5de443be032213a303e17682f247f631c020c0 100644 (file)
--- 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
+    parse_qsl, any, contextmanager, 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 99b92b1e340a9ed80507bafe7dcf92a488797c34..534adc42b1baa2a95d4b2f1bb358be6b8ee8282f 100644 (file)
--- 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: