- and fix everything from the last checkin that breaks on py 2.4, 2.5

2 files changed, 11 insertions, 2 deletions

diff --git a/lib/sqlalchemy/engine/base.py b/lib/sqlalchemy/engine/base.py
index 10b2b6782..aa24a6529 100644
--- a/lib/sqlalchemy/engine/base.py
+++ b/lib/sqlalchemy/engine/base.py
@@ -2093,8 +2093,8 @@ class RowProxy(BaseRowProxy):
 try:
     # Register RowProxy with Sequence, 
     # so sequence protocol is implemented
-    import collections
-    collections.Sequence.register(RowProxy)
+    from collections import Sequence
+    Sequence.register(RowProxy)
 except ImportError:
     pass
     
diff --git a/lib/sqlalchemy/test/requires.py b/lib/sqlalchemy/test/requires.py
index 5b68a18e1..d29b7abc2 100644
--- a/lib/sqlalchemy/test/requires.py
+++ b/lib/sqlalchemy/test/requires.py
@@ -286,6 +286,15 @@ def python2(fn):
             )
     )
 
+def python26(fn):
+    return _chain_decorators_on(
+        fn,
+        skip_if(
+            lambda: sys.version_info < (2, 6),
+            "Python version 2.6 or greater is required"
+        )
+    )
+    
 def _has_cextensions():
     try:
         from sqlalchemy import cresultproxy, cprocessors