- Moved to 2.4+ import syntax (w/ some experimental merge-friendly formatting)

1 files changed, 22 insertions, 8 deletions

diff --git a/lib/sqlalchemy/engine/__init__.py b/lib/sqlalchemy/engine/__init__.py
index d3802f306..b8b1c719f 100644
--- a/lib/sqlalchemy/engine/__init__.py
+++ b/lib/sqlalchemy/engine/__init__.py
@@ -51,27 +51,41 @@ url.py
 """
 
 import sqlalchemy.databases
-from sqlalchemy.engine.base import Dialect, ExecutionContext, Compiled, \
-     Connectable, Connection, Transaction, RootTransaction, \
-     NestedTransaction, TwoPhaseTransaction, Engine, RowProxy, \
-     BufferedColumnRow, ResultProxy, BufferedRowResultProxy, \
-     BufferedColumnResultProxy, SchemaIterator, DefaultRunner
+from sqlalchemy.engine.base import (
+    BufferedColumnResultProxy,
+    BufferedColumnRow,
+    BufferedRowResultProxy,
+    Compiled,
+    Connectable,
+    Connection,
+    DefaultRunner,
+    Dialect,
+    Engine,
+    ExecutionContext,
+    NestedTransaction,
+    ResultProxy,
+    RootTransaction,
+    RowProxy,
+    SchemaIterator,
+    Transaction,
+    TwoPhaseTransaction
+    )
 from sqlalchemy.engine import strategies
 from sqlalchemy import util
 
 
-__all__ = [
+__all__ = (
     'engine_descriptors', 'create_engine', 'engine_from_config',
     'Dialect', 'ExecutionContext', 'Compiled', 'Connectable',
     'Connection', 'Transaction', 'RootTransaction', 'NestedTransaction',
     'TwoPhaseTransaction', 'Engine', 'RowProxy', 'BufferedColumnRow',
     'ResultProxy', 'BufferedRowResultProxy', 'BufferedColumnResultProxy',
     'SchemaIterator', 'DefaultRunner',
-    ]
+    )
 
 def engine_descriptors():
     """Provide a listing of all the database implementations supported.
-    
+
     This method will be removed in 0.5.
 
     """