diff options
| -rw-r--r-- | lib/sqlalchemy/exc.py | 4 | ||||
| -rw-r--r-- | test/engine/test_execute.py | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lib/sqlalchemy/exc.py b/lib/sqlalchemy/exc.py index a7ea5b0e2..951e44d61 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 967fc9242..5f11684ba 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 |