if python 2.4, have DontWrapException be old style

diff --git a/lib/sqlalchemy/exc.py b/lib/sqlalchemy/exc.py
index a7ea5b0e2251de04f7f09596f77f0364034a65ff..951e44d61a5d9bda251d7b13fe6c30c578fd1bc9 100644 (file)
--- a/lib/sqlalchemy/exc.py
+++ b/lib/sqlalchemy/exc.py
@@ -118,6 +118,10 @@ class DontWrapMixin(object):
                     raise MyCustomException("invalid!")
             
     """
+import sys
+if sys.version_info < (2, 5):
+    class DontWrapMixin:
+        pass
 
 # Moved to orm.exc; compatibility definition installed by orm import until 0.6
 UnmappedColumnError = None

diff --git a/test/engine/test_execute.py b/test/engine/test_execute.py
index 967fc92426d37701f97adf90eb351d7e022dfb61..5f11684ba05bf9e01e70bc6005544a298770eab2 100644 (file)
--- a/test/engine/test_execute.py
+++ b/test/engine/test_execute.py
@@ -188,7 +188,6 @@ class ExecuteTest(fixtures.TestBase):
         finally:
             conn.close()
 
-    @testing.requires.python25
     def test_dont_wrap_mixin(self):
         class MyException(Exception, tsa.exc.DontWrapMixin):
             pass