summaryrefslogtreecommitdiff
path: root/test/base
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2014-10-12 19:37:14 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2014-10-12 19:37:14 -0400
commit0426d174e4a608cb09878fe18185b2ae853243ad (patch)
tree4ceb884e1e0f73bd8aa96d6860a9747332ae8f4e /test/base
parent6d5c03001cd81d9ad5cee2459f222a6319f5b956 (diff)
downloadsqlalchemy-0426d174e4a608cb09878fe18185b2ae853243ad.tar.gz
- the test_except test was doing an unnecessary workaround of some kind,
take that out, restore the better exception logic in exc
Diffstat (limited to 'test/base')
-rw-r--r--test/base/test_except.py9
1 files changed, 1 insertions, 8 deletions
diff --git a/test/base/test_except.py b/test/base/test_except.py
index a62382725..359473c54 100644
--- a/test/base/test_except.py
+++ b/test/base/test_except.py
@@ -2,19 +2,12 @@
from sqlalchemy import exc as sa_exceptions
-from sqlalchemy import util
from sqlalchemy.testing import fixtures
from sqlalchemy.testing import eq_
-if util.py2k:
- from exceptions import StandardError, KeyboardInterrupt, SystemExit
-else:
- Exception = BaseException
-
class Error(Exception):
- """This class will be old-style on <= 2.4 and new-style on >=
- 2.5."""
+ pass
class DatabaseError(Error):