From e1a30715d233bc0aa2741502ab122cabf586b4c4 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Tue, 9 Nov 2010 11:46:52 -0500 Subject: [PATCH] - and fix everything from the last checkin that breaks on py 2.4, 2.5 --- lib/sqlalchemy/engine/base.py | 4 ++-- lib/sqlalchemy/test/requires.py | 9 +++++++++ test/engine/test_execute.py | 3 ++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/lib/sqlalchemy/engine/base.py b/lib/sqlalchemy/engine/base.py index 10b2b67827..aa24a6529f 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 5b68a18e17..d29b7abc25 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 diff --git a/test/engine/test_execute.py b/test/engine/test_execute.py index bbec402b20..116b8fc223 100644 --- 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 -- 2.47.2