- break out engine/base.py into base, interfaces, result, util.

- remove deprecated 0.7 engine methods

2 files changed, 8 insertions, 8 deletions

diff --git a/test/engine/test_execute.py b/test/engine/test_execute.py
index f2537e3fe..9a2fd0a5a 100644
--- a/test/engine/test_execute.py
+++ b/test/engine/test_execute.py
@@ -11,7 +11,7 @@ from test.lib import testing, engines
 from test.lib.engines import testing_engine
 import logging
 from sqlalchemy.dialects.oracle.zxjdbc import ReturningParam
-from sqlalchemy.engine import base, default
+from sqlalchemy.engine import result as _result, default
 from sqlalchemy.engine.base import Connection, Engine
 from test.lib import fixtures
 import StringIO
@@ -1000,16 +1000,16 @@ class AlternateResultProxyTest(fixtures.TestBase):
         eq_(rows, [(i, "t_%d" % i) for i in xrange(1, 6)])
 
     def test_plain(self):
-        self._test_proxy(base.ResultProxy)
+        self._test_proxy(_result.ResultProxy)
 
     def test_buffered_row_result_proxy(self):
-        self._test_proxy(base.BufferedRowResultProxy)
+        self._test_proxy(_result.BufferedRowResultProxy)
 
     def test_fully_buffered_result_proxy(self):
-        self._test_proxy(base.FullyBufferedResultProxy)
+        self._test_proxy(_result.FullyBufferedResultProxy)
 
     def test_buffered_column_result_proxy(self):
-        self._test_proxy(base.BufferedColumnResultProxy)
+        self._test_proxy(_result.BufferedColumnResultProxy)
 
 class EngineEventsTest(fixtures.TestBase):
     __requires__ = 'ad_hoc_engines',
diff --git a/test/engine/test_parseconnect.py b/test/engine/test_parseconnect.py
index 622df3fdf..a87c8d056 100644
--- a/test/engine/test_parseconnect.py
+++ b/test/engine/test_parseconnect.py
@@ -3,7 +3,7 @@ import ConfigParser
 import StringIO
 import sqlalchemy.engine.url as url
 from sqlalchemy import create_engine, engine_from_config, exc, pool
-from sqlalchemy.engine import _coerce_config
+from sqlalchemy.engine.util import _coerce_config
 from sqlalchemy.engine.default import DefaultDialect
 import sqlalchemy as tsa
 from test.lib import fixtures, testing
@@ -118,11 +118,11 @@ pool_timeout=10
             }
 
         prefixed = dict(ini.items('prefixed'))
-        self.assert_(tsa.engine._coerce_config(prefixed, 'sqlalchemy.')
+        self.assert_(_coerce_config(prefixed, 'sqlalchemy.')
                      == expected)
 
         plain = dict(ini.items('plain'))
-        self.assert_(tsa.engine._coerce_config(plain, '') == expected)
+        self.assert_(_coerce_config(plain, '') == expected)
 
     def test_engine_from_config(self):
         dbapi = mock_dbapi