From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Thu, 10 Feb 2011 00:18:33 +0000 (-0500)
Subject: - py3k fix regarding new exception system
X-Git-Tag: rel_0_7b1~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=311fa4f8766c7cdecc7ec08aba57692611060c95;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- py3k fix regarding new exception system
- this test keeps throwing a TNS error on Oracle on the buildbot only, runs locally,
seems to be related to some scaling/memory type of issue on the bot
---

diff --git a/lib/sqlalchemy/engine/strategies.py b/lib/sqlalchemy/engine/strategies.py
index 06bf1126fd..c2c21812be 100644
--- a/lib/sqlalchemy/engine/strategies.py
+++ b/lib/sqlalchemy/engine/strategies.py
@@ -81,7 +81,7 @@ class DefaultEngineStrategy(EngineStrategy):
                 except Exception, e:
                     # Py3K
                     #raise exc.DBAPIError.instance(None, None, 
-                    #                   dialect.dbapi.Error, e) from e
+                    #                   e, dialect.dbapi.Error) from e
                     # Py2K
                     import sys
                     raise exc.DBAPIError.instance(
diff --git a/test/engine/test_transaction.py b/test/engine/test_transaction.py
index 1c94d1f5f7..c4aec7e37a 100644
--- a/test/engine/test_transaction.py
+++ b/test/engine/test_transaction.py
@@ -542,6 +542,7 @@ class TLTransactionTest(TestBase):
 
         tlengine.close()
 
+    @testing.crashes('oracle', 'TNS error of unknown origin occurs on the buildbot.')
     def test_rollback_no_trans(self):
         tlengine = create_engine(testing.db.url, strategy="threadlocal")