- fix up the invalidate on connect for py3k

- fix the test for separately installed pysqlite

diff --git a/lib/sqlalchemy/engine/strategies.py b/lib/sqlalchemy/engine/strategies.py
index 528bc3175753d97aa396c5c6ebcf0536525ae563..b9a1671ec8a7fc99c4eeb1ad59ba5ec9ceda7cfb 100644 (file)
--- a/lib/sqlalchemy/engine/strategies.py
+++ b/lib/sqlalchemy/engine/strategies.py
@@ -81,12 +81,16 @@ class DefaultEngineStrategy(EngineStrategy):
                 except Exception, e:
                     # Py3K
                     #raise exc.DBAPIError.instance(None, None, 
-                    #                   e, dialect.dbapi.Error) from e
+                    #                   e, dialect.dbapi.Error,
+                    #                   connection_invalidated=
+                    #                       dialect.is_disconnect(e, None, None)
+                    #                       ) from e
                     # Py2K
                     import sys
                     raise exc.DBAPIError.instance(
                                 None, None, e, dialect.dbapi.Error,
-                                connection_invalidated=dialect.is_disconnect(e, None, None)), \
+                                connection_invalidated=
+                                        dialect.is_disconnect(e, None, None)), \
                                 None, sys.exc_info()[2]
                     # end Py2K
 

diff --git a/test/engine/test_parseconnect.py b/test/engine/test_parseconnect.py
index 1c1ab6aad1adab9bee330919fd9a1bb1dcb64751..ef15cde9fef4211899758ed307284f531fa75926 100644 (file)
--- a/test/engine/test_parseconnect.py
+++ b/test/engine/test_parseconnect.py
@@ -232,7 +232,8 @@ pool_timeout=10
         # "Cannot operate on a closed database." error
         # on connect.   IRL we'd be getting Oracle's "shutdown in progress"
 
-        import sqlite3
+        e = create_engine('sqlite://')
+        sqlite3 = e.dialect.dbapi
         class ThrowOnConnect(MockDBAPI):
             dbapi = sqlite3
             Error = sqlite3.Error