merging 0.4 branch to trunk. see CHANGES for details. 0.3 moves to maintenance branch in branches/rel_0_3.

1 files changed, 5 insertions, 7 deletions

diff --git a/test/engine/parseconnect.py b/test/engine/parseconnect.py
index 967a20ed5..3e186275d 100644
--- a/test/engine/parseconnect.py
+++ b/test/engine/parseconnect.py
@@ -1,8 +1,7 @@
-from testbase import PersistTest
 import testbase
-import sqlalchemy.engine.url as url
 from sqlalchemy import *
-import unittest
+import sqlalchemy.engine.url as url
+from testlib import *
 
         
 class ParseConnectTest(PersistTest):
@@ -65,7 +64,7 @@ class CreateEngineTest(PersistTest):
     def testrecycle(self):
         dbapi = MockDBAPI(foober=12, lala=18, hoho={'this':'dict'}, fooz='somevalue')
         e = create_engine('postgres://', pool_recycle=472, module=dbapi)
-        assert e.connection_provider._pool._recycle == 472
+        assert e.pool._recycle == 472
         
     def testbadargs(self):
         # good arg, use MockDBAPI to prevent oracle import errors
@@ -116,7 +115,6 @@ class CreateEngineTest(PersistTest):
         except TypeError:
             assert True
             
-        e = create_engine('sqlite://', echo=True)
         e = create_engine('mysql://', module=MockDBAPI(), connect_args={'use_unicode':True}, convert_unicode=True)
         
         e = create_engine('sqlite://', connect_args={'use_unicode':True}, convert_unicode=True)
@@ -139,8 +137,8 @@ class CreateEngineTest(PersistTest):
     def testpoolargs(self):
         """test that connection pool args make it thru"""
         e = create_engine('postgres://', creator=None, pool_recycle=-1, echo_pool=None, auto_close_cursors=False, disallow_open_cursors=True, module=MockDBAPI())
-        assert e.connection_provider._pool.auto_close_cursors is False
-        assert e.connection_provider._pool.disallow_open_cursors is True
+        assert e.pool.auto_close_cursors is False
+        assert e.pool.disallow_open_cursors is True
 
         # these args work for QueuePool
         e = create_engine('postgres://', max_overflow=8, pool_timeout=60, poolclass=pool.QueuePool, module=MockDBAPI())