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

- remove deprecated 0.7 engine methods

4 files changed, 23 insertions, 21 deletions

diff --git a/lib/sqlalchemy/dialects/maxdb/base.py b/lib/sqlalchemy/dialects/maxdb/base.py
index f52fc4fa6..c2bcfa913 100644
--- a/lib/sqlalchemy/dialects/maxdb/base.py
+++ b/lib/sqlalchemy/dialects/maxdb/base.py
@@ -114,13 +114,15 @@ sapdb.dbapi
 
 
 """
-import datetime, itertools, re
+import datetime
+import itertools
+import re
 
-from sqlalchemy import exc, schema, sql, util, processors
-from sqlalchemy.sql import operators as sql_operators, expression as sql_expr
-from sqlalchemy.sql import compiler, visitors
-from sqlalchemy.engine import base as engine_base, default, reflection
-from sqlalchemy import types as sqltypes
+from ... import exc, schema, sql, util, processors
+from ...sql import expression as sql_expr
+from ...sql import compiler, visitors
+from ...engine import result as _result, default, reflection
+from ... import types as sqltypes
 
 
 class _StringType(sqltypes.String):
@@ -460,7 +462,7 @@ class MaxDBExecutionContext(default.DefaultExecutionContext):
             for column in self.cursor.description:
                 if column[1] in ('Long Binary', 'Long', 'Long Unicode'):
                     return MaxDBResultProxy(self)
-        return engine_base.ResultProxy(self)
+        return _result.ResultProxy(self)
 
     @property
     def rowcount(self):
@@ -475,7 +477,7 @@ class MaxDBExecutionContext(default.DefaultExecutionContext):
         return self._execute_scalar("SELECT %s.NEXTVAL FROM DUAL" % (
             self.dialect.identifier_preparer.format_sequence(seq)))
 
-class MaxDBCachedColumnRow(engine_base.RowProxy):
+class MaxDBCachedColumnRow(_result.RowProxy):
     """A RowProxy that only runs result_processors once per column."""
 
     def __init__(self, parent, row):
@@ -514,7 +516,7 @@ class MaxDBCachedColumnRow(engine_base.RowProxy):
             raise AttributeError(name)
 
 
-class MaxDBResultProxy(engine_base.ResultProxy):
+class MaxDBResultProxy(_result.ResultProxy):
     _process_row = MaxDBCachedColumnRow
 
 class MaxDBCompiler(compiler.SQLCompiler):
diff --git a/lib/sqlalchemy/dialects/oracle/cx_oracle.py b/lib/sqlalchemy/dialects/oracle/cx_oracle.py
index 6f0569c30..e2d98fb78 100644
--- a/lib/sqlalchemy/dialects/oracle/cx_oracle.py
+++ b/lib/sqlalchemy/dialects/oracle/cx_oracle.py
@@ -141,10 +141,10 @@ a period "." as the decimal character.
 
 """
 
-from sqlalchemy.dialects.oracle.base import OracleCompiler, OracleDialect, \
+from .base import OracleCompiler, OracleDialect, \
                                         RESERVED_WORDS, OracleExecutionContext
-from sqlalchemy.dialects.oracle import base as oracle
-from sqlalchemy.engine import base
+from . import base as oracle
+from ...engine import result as _result
 from sqlalchemy import types as sqltypes, util, exc, processors
 from datetime import datetime
 import random
@@ -380,10 +380,10 @@ class OracleExecutionContext_cx_oracle(OracleExecutionContext):
             for column in self.cursor.description:
                 type_code = column[1]
                 if type_code in self.dialect._cx_oracle_binary_types:
-                    result = base.BufferedColumnResultProxy(self)
+                    result = _result.BufferedColumnResultProxy(self)
 
         if result is None:
-            result = base.ResultProxy(self)
+            result = _result.ResultProxy(self)
 
         if hasattr(self, 'out_parameters'):
             if self.compiled_parameters is not None and \
@@ -432,7 +432,7 @@ class OracleExecutionContext_cx_oracle_with_unicode(OracleExecutionContext_cx_or
         return super(OracleExecutionContext_cx_oracle_with_unicode, self).\
                             _execute_scalar(unicode(stmt))
 
-class ReturningResultProxy(base.FullyBufferedResultProxy):
+class ReturningResultProxy(_result.FullyBufferedResultProxy):
     """Result proxy which stuffs the _returning clause + outparams into the fetch."""
 
     def __init__(self, context, returning_params):
diff --git a/lib/sqlalchemy/dialects/oracle/zxjdbc.py b/lib/sqlalchemy/dialects/oracle/zxjdbc.py
index fa86294bd..3a0f45665 100644
--- a/lib/sqlalchemy/dialects/oracle/zxjdbc.py
+++ b/lib/sqlalchemy/dialects/oracle/zxjdbc.py
@@ -19,7 +19,7 @@ import re
 from sqlalchemy import sql, types as sqltypes, util
 from sqlalchemy.connectors.zxJDBC import ZxJDBCConnector
 from sqlalchemy.dialects.oracle.base import OracleCompiler, OracleDialect, OracleExecutionContext
-from sqlalchemy.engine import base, default
+from sqlalchemy.engine import result as _result
 from sqlalchemy.sql import expression
 import collections
 
@@ -113,7 +113,7 @@ class OracleExecutionContext_zxjdbc(OracleExecutionContext):
                         pass
                 self.statement.close()
 
-        return base.ResultProxy(self)
+        return _result.ResultProxy(self)
 
     def create_cursor(self):
         cursor = self._dbapi_connection.cursor()
@@ -121,7 +121,7 @@ class OracleExecutionContext_zxjdbc(OracleExecutionContext):
         return cursor
 
 
-class ReturningResultProxy(base.FullyBufferedResultProxy):
+class ReturningResultProxy(_result.FullyBufferedResultProxy):
 
     """ResultProxy backed by the RETURNING ResultSet results."""
 
diff --git a/lib/sqlalchemy/dialects/postgresql/psycopg2.py b/lib/sqlalchemy/dialects/postgresql/psycopg2.py
index 491bd5c60..e572b49b0 100644
--- a/lib/sqlalchemy/dialects/postgresql/psycopg2.py
+++ b/lib/sqlalchemy/dialects/postgresql/psycopg2.py
@@ -147,7 +147,7 @@ import logging
 from ... import util, exc
 from ...util.compat import decimal
 from ... import processors
-from ...engine import base
+from ...engine import result as _result
 from ...sql import expression
 from ... import types as sqltypes
 from .base import PGDialect, PGCompiler, \
@@ -243,9 +243,9 @@ class PGExecutionContext_psycopg2(PGExecutionContext):
             self._log_notices(self.cursor)
 
         if self.__is_server_side:
-            return base.BufferedRowResultProxy(self)
+            return _result.BufferedRowResultProxy(self)
         else:
-            return base.ResultProxy(self)
+            return _result.ResultProxy(self)
 
     def _log_notices(self, cursor):
         for notice in cursor.connection.notices: