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

diff --git a/lib/sqlalchemy/engine/base.py b/lib/sqlalchemy/engine/base.py
index 10b2b67827e6f6653d0f328d1b68a8222692da69..aa24a6529f4e011a37b078d0ec326a626f6084ed 100644 (file)
--- 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 5b68a18e17df62aa7fecad0ac9c1a7f8218bec3f..d29b7abc2516505ebc7bcfca0761e4a136fbcf77 100644 (file)
--- 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

diff --git a/test/engine/test_execute.py b/test/engine/test_execute.py
index bbec402b20f95537ebca1248dd1706097aafc318..116b8fc22365ea39b44823f3cf4d7be4f4682173 100644 (file)
--- a/test/engine/test_execute.py
+++ b/test/engine/test_execute.py
@@ -289,7 +289,8 @@ class ResultProxyTest(TestBase):
             assert_raises(AssertionError, t.delete().execute)
         finally:
             engine.dialect.execution_ctx_cls = execution_ctx_cls
-
+    
+    @testing.requires.python26
     def test_rowproxy_is_sequence(self):
         import collections
         from sqlalchemy.engine import RowProxy