Fix #27 flake8 F821 undefined name

phdru · phdru · commit fe1c76c1e867 · 2015-02-06T00:17:23.000+03:00
Some of these warning are real bugs.
diff --git a/setup.cfg b/setup.cfg
@@ -19,13 +19,12 @@ exclude = .git,docs/europython/*.py,ez_setup.py
 ; F402 import 'name' shadowed by loop variable
 ; F403 'from module import *' used; unable to detect undefined names
 ; F812 list comprehension redefines 'name' from line 1402
-; F821 undefined name
 ; F822 undefined name in __all__
 ; W291 trailing whitespace
 ; W293 blank line contains whitespace
 ; W391 blank line at end of file
 ; W603 '<>' is deprecated, use '!='
-ignore = E123,E124,E226,E401,E502,F402,F403,F812,F821,F822,W291,W293,W391,W603
+ignore = E123,E124,E226,E401,E502,F402,F403,F812,F822,W291,W293,W391,W603
 
 [pudge]
 theme = pythonpaste.org
diff --git a/sqlobject/col.py b/sqlobject/col.py
@@ -375,7 +375,7 @@ def __get__(self, obj, type=None):
             if columns is None:
                 obj.sqlmeta.loadValues()
             try:
-                return columns[name]
+                return columns[name]  # noqa
             except KeyError:
                 return obj.sqlmeta.loadColumn(self)
         else:
diff --git a/sqlobject/dbconnection.py b/sqlobject/dbconnection.py
@@ -1040,12 +1040,13 @@ def registerConnection(self, schemes, builder):
 
     def registerConnectionInstance(self, inst):
         if inst.name:
-            assert not inst.name in self.instanceNames \
-                or self.instanceNames[inst.name] is cls, \
-                "A instance has already been registered " \
-                "with the name %s" % inst.name
+            assert (not inst.name in self.instanceNames
+                or self.instanceNames[inst.name] is cls  # noqa
+                ), ("A instance has already been registered "
+                "with the name %s" % inst.name)
             assert inst.name.find(':') == -1, \
-                "You cannot include ':' in your class names (%r)" % cls.name
+                "You cannot include ':' " \
+                "in your class names (%r)" % cls.name  # noqa
             self.instanceNames[inst.name] = inst
 
     def connectionForURI(self, uri, oldUri=False, **args):
diff --git a/sqlobject/events.py b/sqlobject/events.py
@@ -272,8 +272,8 @@ def sort_name(value):
 
 _real_dispatcher_send = dispatcher.send
 _real_dispatcher_sendExact = dispatcher.sendExact
-_real_dispatcher_disconnect = dispatcher.disconnect
 _real_dispatcher_connect = dispatcher.connect
+_real_dispatcher_disconnect = dispatcher.disconnect
 _debug_enabled = False
 
 
@@ -314,7 +314,7 @@ def _debug_disconnect(receiver, signal=dispatcher.Any, sender=dispatcher.Any,
                       weak=True):
     print("disconnecting %s from %s signal %s" % (
           nice_repr(receiver), nice_repr(signal), nice_repr(sender)))
-    return disconnect(receiver, signal, sender, weak)
+    return _real_dispatcher_disconnect(receiver, signal, sender, weak)
 
 
 def fmt_args(*arguments, **name):
diff --git a/sqlobject/manager/command.py b/sqlobject/manager/command.py
@@ -293,7 +293,7 @@ def run(self):
             os.path.basename(self.invoked_as),
             self.command_name)
         if self.description:
-            self.parser.description = description
+            self.parser.description = self.description
         self.options, self.args = self.parser.parse_args(self.raw_args)
         if (getattr(self.options, 'simulate', False)
             and not self.options.verbose):
@@ -1102,7 +1102,7 @@ def strip_comments(self, sql):
     def base_dir(self):
         base = self.options.output_dir
         if base is None:
-            base = CONFIG.get('sqlobject_history_dir', '.')
+            base = CONFIG.get('sqlobject_history_dir', '.')  # noqa
         if not os.path.exists(base):
             print('Creating history directory %s' %
                   self.shorten_filename(base))
diff --git a/sqlobject/maxdb/maxdbconnection.py b/sqlobject/maxdb/maxdbconnection.py
@@ -13,6 +13,8 @@
         host=hostname, database=dbname,
         user=user_name, password=user_password, autoCommit=1, debug=1)
 """
+
+import os
 from sqlobject.dbconnection import DBAPI
 from sqlobject import col
 
@@ -311,7 +313,7 @@ def guessClass(self, t, flength, fscale=None):
         elif t in self._dateTypes:
             return col.DateTimeCol, {}
         elif t == 'FIXED':
-            return CurrencyCol, {'size': flength,
-                                 'precision': fscale}
+            return col.CurrencyCol, {'size': flength,
+                                     'precision': fscale}
         else:
             return col.Col, {}
diff --git a/sqlobject/mssql/mssqlconnection.py b/sqlobject/mssql/mssqlconnection.py
@@ -216,7 +216,7 @@ def addColumn(self, tableName, column):
                     column.mssqlCreateSQL(self)))
 
     def delColumn(self, sqlmeta, column):
-        self.query('ALTER TABLE %s DROP COLUMN %s' % (tableName.table,
+        self.query('ALTER TABLE %s DROP COLUMN %s' % (sqlmeta.table,
                                                       column.dbName))
 
     # precision and scale is gotten from column table so that we can create 
@@ -288,7 +288,9 @@ def _setAutoCommit(self, conn, auto):
             option = "OFF"
         c = conn.cursor()
         c.execute("SET AUTOCOMMIT " + option)
-        conn.setconnectoption(SQL.AUTOCOMMIT, option)
+        # from mx.ODBC.Windows import SQL
+        # connection.setconnectoption(
+        # SQL.AUTOCOMMIT, SQL.AUTOCOMMIT_ON if auto else SQL.AUTOCOMMIT_OFF)
 
     # precision and scale is needed for decimal columns
     def guessClass(self, t, size, precision, scale):
diff --git a/sqlobject/sqlbuilder.py b/sqlobject/sqlbuilder.py
@@ -360,6 +360,7 @@ def components(self):
         return [self.expr]
 
     def execute(self, executor):
+        prefix = self.prefix
         expr = execute(self.expr, executor)
         if prefix == "+":
             return expr
diff --git a/sqlobject/util/csvimport.py b/sqlobject/util/csvimport.py
@@ -55,9 +55,10 @@
 Lines that begin with ``[comment]`` are ignored.
 """
 
+import csv
 from datetime import datetime, date, timedelta
 import os
-import csv
+import time
 import types
 
 __all__ = ['load_csv_from_directory',
@@ -199,7 +200,8 @@ def load_csv(csvreader, allow_python=True, default_type=DEFAULT_TYPE,
                 "for this file (line: %r)" % row)
 
         if current_headers is None:
-            current_headers = _parse_headers(row, default_type)
+            current_headers = _parse_headers(row, default_type,
+                                             allow_python=allow_python)
             continue
 
         if row[0] == '[comment]':
@@ -225,7 +227,7 @@ def load_csv(csvreader, allow_python=True, default_type=DEFAULT_TYPE,
     return results
 
 
-def _parse_headers(header_row, default_type):
+def _parse_headers(header_row, default_type, allow_python=True):
     headers = []
     for name in header_row:
         original_name = name
@@ -359,7 +361,7 @@ def parse_bool(v):
     elif v in ('n', 'no', 'f', 'false', 'off', '0'):
         return False
     raise ValueError(
-        "Value is not boolean-like: %r" % value)
+        "Value is not boolean-like: %r" % v)
 
 register_coercer('bool', parse_bool)
 register_coercer('boolean', parse_bool)
diff --git a/sqlobject/util/moduleloader.py b/sqlobject/util/moduleloader.py
@@ -1,5 +1,6 @@
-import sys
 import imp
+import os
+import sys
 
 
 def load_module(module_name):
