2.4 doesn't have any()

diff --git a/lib/sqlalchemy/util/__init__.py b/lib/sqlalchemy/util/__init__.py
index b03d52a1890fd435427f35beb5305c0604614c9c..5712940258b97961ff858468d84bbaa2aeadde8d 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
+    parse_qsl, any
 
 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 493d14801730ef11d96b273e8a8bdce878556c0f..3a92098263ab6101387a25597482e887c344a84e 100644 (file)
--- a/lib/sqlalchemy/util/compat.py
+++ b/lib/sqlalchemy/util/compat.py
@@ -192,6 +192,16 @@ if win32 or jython:
 else:
     time_func = time.time 
 
+if sys.version_info >= (2, 5):
+    any = __builtin__.any
+else:
+    def any(iterator):
+        for item in iterator:
+            if bool(item):
+                return True
+        else:
+            return False
+
 if sys.version_info >= (2, 5):
     def decode_slice(slc):
         """decode a slice object as sent to __getitem__.

diff --git a/test/orm/test_default_strategies.py b/test/orm/test_default_strategies.py
index 4e0f7c47904a18a2071c62b11ccc9aa71a190705..7dbc9adcb4d8df7f809997cbaddfcfd78b774025 100644 (file)
--- a/test/orm/test_default_strategies.py
+++ b/test/orm/test_default_strategies.py
@@ -2,6 +2,7 @@ from test.orm import _fixtures
 from test.lib import testing
 from sqlalchemy.orm import mapper, relationship, create_session
 from sqlalchemy import util
+from sqlalchemy.util import any
 import sqlalchemy as sa
 from test.lib.testing import eq_, assert_raises_message