pyflakes mop-up

diff --git a/lib/sqlalchemy/databases/access.py b/lib/sqlalchemy/databases/access.py
index 4aa773239d330d6fa4834ff3b56f929cc73ad70c..f901ebf53549a5871bb7529b0bad61bc52833589 100644 (file)
--- a/lib/sqlalchemy/databases/access.py
+++ b/lib/sqlalchemy/databases/access.py
@@ -7,6 +7,7 @@
 
 import random
 from sqlalchemy import sql, schema, ansisql, types, exceptions, pool
+from sqlalchemy.sql import compiler
 import sqlalchemy.engine.default as default
 
 

diff --git a/lib/sqlalchemy/databases/informix.py b/lib/sqlalchemy/databases/informix.py
index ceb56903a6500a7838f0152483f0917629cc98e4..45dfb0370e467a4052fd48c3eb1ab7959a751df0 100644 (file)
--- a/lib/sqlalchemy/databases/informix.py
+++ b/lib/sqlalchemy/databases/informix.py
@@ -506,10 +506,10 @@ class InfoIdentifierPreparer(compiler.IdentifierPreparer):
     def _requires_quotes(self, value):
         return False
 
-class InfoSchemaDroper(compiler.SchemaDropper):
+class InfoSchemaDropper(compiler.SchemaDropper):
     def drop_foreignkey(self, constraint):
         if constraint.name is not None:
-            super( InfoSchemaDroper , self ).drop_foreignkey( constraint )
+            super( InfoSchemaDropper , self ).drop_foreignkey( constraint )
 
 dialect = InfoDialect
 poolclass = pool.SingletonThreadPool

diff --git a/lib/sqlalchemy/engine/__init__.py b/lib/sqlalchemy/engine/__init__.py
index acac8180ce4e2ce3212d3879730d55a2227e102a..070ff3c3e53e5f4645082545ee2ea257eee2ffd3 100644 (file)
--- a/lib/sqlalchemy/engine/__init__.py
+++ b/lib/sqlalchemy/engine/__init__.py
@@ -164,7 +164,7 @@ def engine_from_config(configuration, prefix='sqlalchemy.', **kwargs):
     string values.  in a future release, this functionality will be expanded to include 
     dialect-specific arguments.
     """
-    
+
     opts = dict([(key[len(prefix):], configuration[key]) for key in configuration if key.startswith(prefix)])
     for opt, type_ in (
         ('convert_unicode', bool),
@@ -177,5 +177,3 @@ def engine_from_config(configuration, prefix='sqlalchemy.', **kwargs):
     opts.update(kwargs)
     url = opts.pop('url')
     return create_engine(url, **opts)
-
-    
\ No newline at end of file

diff --git a/lib/sqlalchemy/engine/default.py b/lib/sqlalchemy/engine/default.py
index 059395921fcbd3b13c269de8dfb74a68beffb75f..17986286d011bfea104e1afbd513556506308972 100644 (file)
--- a/lib/sqlalchemy/engine/default.py
+++ b/lib/sqlalchemy/engine/default.py
@@ -6,7 +6,7 @@
 
 """Provide default implementations of per-dialect sqlalchemy.engine classes"""
 
-from sqlalchemy import schema, exceptions, sql, util
+from sqlalchemy import schema, exceptions, util
 import re, random
 from sqlalchemy.engine import base
 from sqlalchemy.sql import compiler, expression

diff --git a/lib/sqlalchemy/orm/interfaces.py b/lib/sqlalchemy/orm/interfaces.py
index 9000a8df58fdc00436ca2c30d4194edd9420a867..ec180d74a879d4938ed4bc6b6e480b5eff707bab 100644 (file)
--- a/lib/sqlalchemy/orm/interfaces.py
+++ b/lib/sqlalchemy/orm/interfaces.py
@@ -5,7 +5,7 @@
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
 
 
-from sqlalchemy import util, logging, sql
+from sqlalchemy import util, logging
 from sqlalchemy.sql import expression
 
 __all__ = ['EXT_CONTINUE', 'EXT_STOP', 'EXT_PASS', 'MapperExtension',

diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py
index 60d4526ec31ca9b1c44286cf1d00cf93721a2d72..51853ddcab1b1aa09d5a4ad1a3b6149d3effd534 100644 (file)
--- a/lib/sqlalchemy/orm/mapper.py
+++ b/lib/sqlalchemy/orm/mapper.py
@@ -11,7 +11,7 @@ from sqlalchemy.sql import util as sqlutil
 from sqlalchemy.orm import util as mapperutil
 from sqlalchemy.orm.util import ExtensionCarrier
 from sqlalchemy.orm import sync
-from sqlalchemy.orm.interfaces import MapperProperty, EXT_CONTINUE, MapperExtension, SynonymProperty
+from sqlalchemy.orm.interfaces import MapperProperty, EXT_CONTINUE, SynonymProperty
 deferred_load = None
 
 __all__ = ['Mapper', 'class_mapper', 'object_mapper', 'mapper_registry']
@@ -280,7 +280,7 @@ class Mapper(object):
                 extlist.add(ext_obj)
 
         for ext in global_extensions:
-            if isinstance(ext_class, type):
+            if isinstance(ext, type):
                 ext = ext()
             extlist.add(ext)
             ext.instrument_class(self, self.class_)

diff --git a/lib/sqlalchemy/orm/sync.py b/lib/sqlalchemy/orm/sync.py
index 49661a95ef691c9fcff21430f40c0461a8ca4719..795d76b1af363279be546f3363362bfef5ff59e5 100644 (file)
--- a/lib/sqlalchemy/orm/sync.py
+++ b/lib/sqlalchemy/orm/sync.py
@@ -9,7 +9,7 @@ attributes between two objects in a manner corresponding to a SQL
 clause that compares column values.
 """
 
-from sqlalchemy import sql, schema, exceptions
+from sqlalchemy import schema, exceptions
 from sqlalchemy.sql import visitors, operators
 from sqlalchemy import logging
 from sqlalchemy.orm import util as mapperutil