From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sun, 26 Jun 2011 23:50:31 +0000 (-0400)
Subject: if python 2.4, have DontWrapException be old style
X-Git-Tag: rel_0_7_2~47
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1006f1705169310477db073c2b66af1d20615c38;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

if python 2.4, have DontWrapException be old style
---

diff --git a/lib/sqlalchemy/exc.py b/lib/sqlalchemy/exc.py
index a7ea5b0e22..951e44d61a 100644
--- 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 967fc92426..5f11684ba0 100644
--- 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