Ridding the world of a few wasteful imports.

diff --git a/lib/sqlalchemy/connectors/mxodbc.py b/lib/sqlalchemy/connectors/mxodbc.py
index 1f1688a51ebd340cb0d385514e4bc9d31b2d99c2..2e8d7cf3eed1dc323682efb79ad04b01248e7ac8 100644 (file)
--- a/lib/sqlalchemy/connectors/mxodbc.py
+++ b/lib/sqlalchemy/connectors/mxodbc.py
@@ -15,11 +15,8 @@ For more info on mxODBC, see http://www.egenix.com/
 import sys
 import re
 import warnings
-from sqlalchemy.util.compat import decimal
 
 from sqlalchemy.connectors import Connector
-from sqlalchemy import types as sqltypes
-import sqlalchemy.processors as processors
 
 class MxODBCConnector(Connector):
     driver='mxodbc'

diff --git a/lib/sqlalchemy/connectors/pyodbc.py b/lib/sqlalchemy/connectors/pyodbc.py
index 9f56955b3ed5447d1906812319b4023b49a314b0..b64d5204b6556dee9bd1ab9c910196328641a40a 100644 (file)
--- a/lib/sqlalchemy/connectors/pyodbc.py
+++ b/lib/sqlalchemy/connectors/pyodbc.py
@@ -4,7 +4,6 @@ from sqlalchemy.util import asbool
 import sys
 import re
 import urllib
-import decimal
 
 class PyODBCConnector(Connector):
     driver='pyodbc'

diff --git a/lib/sqlalchemy/dialects/mssql/adodbapi.py b/lib/sqlalchemy/dialects/mssql/adodbapi.py
index 24fa22449cc0f343d322776774fd76650a9e7dcf..bba6e734349805642f117498bef0331d3475ba99 100644 (file)
--- a/lib/sqlalchemy/dialects/mssql/adodbapi.py
+++ b/lib/sqlalchemy/dialects/mssql/adodbapi.py
@@ -2,6 +2,7 @@
 The adodbapi dialect is not implemented for 0.6 at this time.
 
 """
+import datetime
 from sqlalchemy import types as sqltypes, util
 from sqlalchemy.dialects.mssql.base import MSDateTime, MSDialect
 import sys

diff --git a/lib/sqlalchemy/dialects/mssql/base.py b/lib/sqlalchemy/dialects/mssql/base.py
index 0283226777775e0b2482d9c5c7dae3fafae7789a..df8bfd4bdea9248f05fd27af1b747ffef325fd56 100644 (file)
--- a/lib/sqlalchemy/dialects/mssql/base.py
+++ b/lib/sqlalchemy/dialects/mssql/base.py
@@ -118,20 +118,19 @@ Known Issues
   SQL Server 2005
 
 """
-import datetime, decimal, inspect, operator, sys, re
-import itertools
+import datetime, operator, re
 
 from sqlalchemy import sql, schema as sa_schema, exc, util
 from sqlalchemy.sql import select, compiler, expression, \
                             operators as sql_operators, \
-                            functions as sql_functions, util as sql_util
+                            util as sql_util
 from sqlalchemy.engine import default, base, reflection
 from sqlalchemy import types as sqltypes
-from sqlalchemy import processors
 from sqlalchemy.types import INTEGER, BIGINT, SMALLINT, DECIMAL, NUMERIC, \
                                 FLOAT, TIMESTAMP, DATETIME, DATE, BINARY,\
                                 VARBINARY, BLOB
 
+
 from sqlalchemy.dialects.mssql import information_schema as ischema
 
 MS_2008_VERSION = (10,)

diff --git a/lib/sqlalchemy/dialects/mssql/information_schema.py b/lib/sqlalchemy/dialects/mssql/information_schema.py
index 4dd6436cda673937b1e43b6de8229ee165000cd2..7e67f96bb73ef88f714a421a62e0ebfd35b640c2 100644 (file)
--- a/lib/sqlalchemy/dialects/mssql/information_schema.py
+++ b/lib/sqlalchemy/dialects/mssql/information_schema.py
@@ -1,6 +1,6 @@
 # TODO: should be using the sys. catalog with SQL Server, not information schema
 
-from sqlalchemy import Table, MetaData, Column, ForeignKey
+from sqlalchemy import Table, MetaData, Column
 from sqlalchemy.types import String, Unicode, Integer, TypeDecorator
 
 ischema = MetaData()

diff --git a/lib/sqlalchemy/dialects/mssql/mxodbc.py b/lib/sqlalchemy/dialects/mssql/mxodbc.py
index 64e4ab9dbad66e9c0b5f4506b79a0a64adee5863..2f220032355f6c53d5e1e50aa266d8a47db5e977 100644 (file)
--- a/lib/sqlalchemy/dialects/mssql/mxodbc.py
+++ b/lib/sqlalchemy/dialects/mssql/mxodbc.py
@@ -45,15 +45,11 @@ of ``False`` will uncondtionally use string-escaped parameters.
 
 """
 
-import re
-import sys
 
 from sqlalchemy import types as sqltypes
-from sqlalchemy import util
 from sqlalchemy.connectors.mxodbc import MxODBCConnector
 from sqlalchemy.dialects.mssql.pyodbc import MSExecutionContext_pyodbc
-from sqlalchemy.dialects.mssql.base import (MSExecutionContext, MSDialect, 
-                                            MSSQLCompiler,
+from sqlalchemy.dialects.mssql.base import (MSDialect, 
                                             MSSQLStrictCompiler,
                                             _MSDateTime, _MSDate, TIME)
 

diff --git a/lib/sqlalchemy/dialects/postgresql/base.py b/lib/sqlalchemy/dialects/postgresql/base.py
index 72b58a71c16ec25894caefc061b8d95bab2f2fda..ee0277b6775398df1587f1598c3ab294518476a5 100644 (file)
--- a/lib/sqlalchemy/dialects/postgresql/base.py
+++ b/lib/sqlalchemy/dialects/postgresql/base.py
@@ -87,11 +87,9 @@ option to the Index constructor::
 
 import re
 
-from sqlalchemy import schema as sa_schema
 from sqlalchemy import sql, schema, exc, util
-from sqlalchemy.engine import base, default, reflection
+from sqlalchemy.engine import default, reflection
 from sqlalchemy.sql import compiler, expression, util as sql_util
-from sqlalchemy.sql import operators as sql_operators
 from sqlalchemy import types as sqltypes
 
 try:

diff --git a/lib/sqlalchemy/dialects/postgresql/pg8000.py b/lib/sqlalchemy/dialects/postgresql/pg8000.py
index 3afa06eaba33baab1fde73690f7cd75ed706b4e1..0896c63b82b7b38f5f866e93f9a992d998dcd2ec 100644 (file)
--- a/lib/sqlalchemy/dialects/postgresql/pg8000.py
+++ b/lib/sqlalchemy/dialects/postgresql/pg8000.py
@@ -21,7 +21,6 @@ Passing data from/to the Interval type is not supported as of
 yet.
 
 """
-from sqlalchemy.engine import default
 from sqlalchemy import util, exc
 from sqlalchemy.util.compat import decimal
 from sqlalchemy import processors

diff --git a/lib/sqlalchemy/dialects/postgresql/psycopg2.py b/lib/sqlalchemy/dialects/postgresql/psycopg2.py
index b3f42c330607188992737a1c774ed1e39534f1e2..7edf1e16a6d11b84e354a5360da37f17719c10a7 100644 (file)
--- a/lib/sqlalchemy/dialects/postgresql/psycopg2.py
+++ b/lib/sqlalchemy/dialects/postgresql/psycopg2.py
@@ -91,9 +91,8 @@ import logging
 from sqlalchemy import util, exc
 from sqlalchemy.util.compat import decimal
 from sqlalchemy import processors
-from sqlalchemy.engine import base, default
+from sqlalchemy.engine import base
 from sqlalchemy.sql import expression
-from sqlalchemy.sql import operators as sql_operators
 from sqlalchemy import types as sqltypes
 from sqlalchemy.dialects.postgresql.base import PGDialect, PGCompiler, \
                                 PGIdentifierPreparer, PGExecutionContext, \

diff --git a/lib/sqlalchemy/dialects/postgresql/pypostgresql.py b/lib/sqlalchemy/dialects/postgresql/pypostgresql.py
index 9abdffb6ebc9a64d1d33ff5e9e38ff550b6b2231..5dcf884f7f07b67c6c80c495cc256a2c654207d2 100644 (file)
--- a/lib/sqlalchemy/dialects/postgresql/pypostgresql.py
+++ b/lib/sqlalchemy/dialects/postgresql/pypostgresql.py
@@ -7,7 +7,6 @@ URLs are of the form ``postgresql+pypostgresql://user@password@host:port/dbname[
 
 
 """
-from sqlalchemy.engine import default
 from sqlalchemy import util
 from sqlalchemy import types as sqltypes
 from sqlalchemy.dialects.postgresql.base import PGDialect, PGExecutionContext

diff --git a/lib/sqlalchemy/dialects/sqlite/base.py b/lib/sqlalchemy/dialects/sqlite/base.py
index 1ab5173fe92b884474aa5f2b492173ca72ac9c5d..44115e7d28e77cd0f68dc8cc64609d0648189a55 100644 (file)
--- a/lib/sqlalchemy/dialects/sqlite/base.py
+++ b/lib/sqlalchemy/dialects/sqlite/base.py
@@ -52,15 +52,13 @@ connection.   Valid values for this parameter are ``SERIALIZABLE`` and
 
 """
 
-import datetime, re, time
+import datetime, re
 
-from sqlalchemy import schema as sa_schema
-from sqlalchemy import sql, exc, pool, DefaultClause
+from sqlalchemy import sql, exc
 from sqlalchemy.engine import default, base, reflection
 from sqlalchemy import types as sqltypes
 from sqlalchemy import util
-from sqlalchemy.sql import compiler, functions as sql_functions
-from sqlalchemy.util import NoneType
+from sqlalchemy.sql import compiler
 from sqlalchemy import processors
 
 from sqlalchemy.types import BLOB, BOOLEAN, CHAR, DATE, DATETIME, DECIMAL,\

diff --git a/lib/sqlalchemy/dialects/sqlite/pysqlite.py b/lib/sqlalchemy/dialects/sqlite/pysqlite.py
index fa43262e2b18291844bc093af47944a15ecdc5e1..fe4b5aec0876840aea42fc6698869f47f099073f 100644 (file)
--- a/lib/sqlalchemy/dialects/sqlite/pysqlite.py
+++ b/lib/sqlalchemy/dialects/sqlite/pysqlite.py
@@ -133,8 +133,7 @@ always represented by an actual database result string.
 """
 
 from sqlalchemy.dialects.sqlite.base import SQLiteDialect, DATETIME, DATE
-from sqlalchemy import schema, exc, pool
-from sqlalchemy.engine import default
+from sqlalchemy import exc, pool
 from sqlalchemy import types as sqltypes
 from sqlalchemy import util
 

diff --git a/test/sql/test_query.py b/test/sql/test_query.py
index 276653e56148a2b8e4d8d1b6d9ff0921df2959c9..085845bc65fd1138db179f10229b0284d04982da 100644 (file)
--- a/test/sql/test_query.py
+++ b/test/sql/test_query.py
@@ -1,10 +1,9 @@
-from test.lib.testing import eq_
+from test.lib.testing import eq_, assert_raises_message, assert_raises
 import datetime
 from sqlalchemy import *
 from sqlalchemy import exc, sql, util
 from sqlalchemy.engine import default, base
 from test.lib import *
-from test.lib.testing import eq_, assert_raises_message, assert_raises
 from test.lib.schema import Table, Column
 
 class QueryTest(TestBase):