Merge lp:~pyflakes-dev/pyflakes/0.6-col-offset into lp:pyflakes

[Florent]

Adds the column number

[lp:~pyflakes-dev/pyflakes/0.6-col-offset]

77. By Florent on 2013-03-30

Tests: rename the mock AST node class.

=== modified file 'NEWS.txt'
--- NEWS.txt	2013-03-06 22:39:32 +0000
+++ NEWS.txt	2013-03-30 16:06:22 +0000
@@ -1,4 +1,7 @@
 0.6.x (unreleased):
+  - Add --version and --help options.
+  - Support `python -m pyflakes`.
+  - Add attribute `Message.col` to report column offset.
   - Do not report redefinition of variable for a variable used in a list
     comprehension in a conditional.
   - Do not report redefinition of variable for generator expressions and

=== modified file 'pyflakes/__init__.py'
--- pyflakes/__init__.py	2013-01-29 15:39:57 +0000
+++ pyflakes/__init__.py	2013-03-30 16:06:22 +0000
@@ -1,2 +1,8 @@
 
-__version__ = '0.6.1'
+__version__ = '0.6.2a0'
+
+
+# Python 2.5 support for: python -m pyflakes
+if __name__ == '__main__':
+    from pyflakes.api import main
+    main(prog='pyflakes')

=== added file 'pyflakes/__main__.py'
--- pyflakes/__main__.py	1970-01-01 00:00:00 +0000
+++ pyflakes/__main__.py	2013-03-30 16:06:22 +0000
@@ -0,0 +1,4 @@
+from pyflakes.api import main
+
+if __name__ == '__main__':
+    main(prog='pyflakes')

=== modified file 'pyflakes/api.py'
--- pyflakes/api.py	2013-01-25 12:56:41 +0000
+++ pyflakes/api.py	2013-03-30 16:06:22 +0000
@@ -5,8 +5,9 @@
 import sys
 import os
 import _ast
+from optparse import OptionParser
 
-from pyflakes import checker
+from pyflakes import checker, __version__
 from pyflakes import reporter as modReporter
 
 __all__ = ['check', 'checkPath', 'checkRecursive', 'iterSourceCode', 'main']
@@ -120,8 +121,9 @@
     return warnings
 
 
-def main():
-    args = sys.argv[1:]
+def main(prog=None):
+    parser = OptionParser(prog=prog, version=__version__)
+    __, args = parser.parse_args()
     reporter = modReporter._makeDefaultReporter()
     if args:
         warnings = checkRecursive(args, reporter)

=== modified file 'pyflakes/checker.py'
--- pyflakes/checker.py	2013-03-06 22:54:03 +0000
+++ pyflakes/checker.py	2013-03-30 16:06:22 +0000
@@ -273,7 +273,7 @@
                     undefined = set(all) - set(scope)
                     for name in undefined:
                         self.report(messages.UndefinedExport,
-                                    scope['__all__'].source.lineno, name)
+                                    scope['__all__'].source, name)
             else:
                 all = []
 
@@ -282,7 +282,7 @@
                 if isinstance(importation, Importation):
                     if not importation.used and importation.name not in all:
                         self.report(messages.UnusedImport,
-                                    importation.source.lineno, importation.name)
+                                    importation.source, importation.name)
 
     def pushFunctionScope(self):
         self.scopeStack.append(FunctionScope())
@@ -363,7 +363,7 @@
                         and not self.differentForks(node, existing.source)):
                     redefinedWhileUnused = True
                     self.report(messages.RedefinedWhileUnused,
-                                node.lineno, value.name, existing.source.lineno)
+                                node, value.name, existing.source)
 
         existing = self.scope.get(value.name)
         if not redefinedWhileUnused and self.hasParent(value.source, ast.ListComp):
@@ -371,18 +371,18 @@
                     and not self.hasParent(existing.source, (ast.For, ast.ListComp))
                     and not self.differentForks(node, existing.source)):
                 self.report(messages.RedefinedInListComp,
-                            node.lineno, value.name, existing.source.lineno)
+                            node, value.name, existing.source)
 
         if isinstance(value, UnBinding):
             try:
                 del self.scope[value.name]
             except KeyError:
-                self.report(messages.UndefinedName, node.lineno, value.name)
+                self.report(messages.UndefinedName, node, value.name)
         elif (isinstance(existing, Definition)
               and not existing.used
               and not self.differentForks(node, existing.source)):
             self.report(messages.RedefinedWhileUnused,
-                        node.lineno, value.name, existing.source.lineno)
+                        node, value.name, existing.source)
         else:
             self.scope[value.name] = value
 
@@ -393,7 +393,7 @@
         # try local scope
         importStarred = self.scope.importStarred
         try:
-            self.scope[name].used = (self.scope, node.lineno)
+            self.scope[name].used = (self.scope, node)
         except KeyError:
             pass
         else:
@@ -405,7 +405,7 @@
             if not isinstance(scope, FunctionScope):
                 continue
             try:
-                scope[name].used = (self.scope, node.lineno)
+                scope[name].used = (self.scope, node)
             except KeyError:
                 pass
             else:
@@ -414,14 +414,14 @@
         # try global scope
         importStarred = importStarred or self.scopeStack[0].importStarred
         try:
-            self.scopeStack[0][name].used = (self.scope, node.lineno)
+            self.scopeStack[0][name].used = (self.scope, node)
         except KeyError:
             if not importStarred and name not in self.builtIns:
                 if (os.path.basename(self.filename) == '__init__.py' and name == '__path__'):
                     # the special name __path__ is valid only in packages
                     pass
                 else:
-                    self.report(messages.UndefinedName, node.lineno, name)
+                    self.report(messages.UndefinedName, node, name)
 
     def handleNodeStore(self, node):
         name = getNodeName(node)
@@ -440,7 +440,7 @@
                         and name not in self.scope.globals):
                     # then it's probably a mistake
                     self.report(messages.UndefinedLocal,
-                                scope[name].used[1], name, scope[name].source.lineno)
+                                scope[name].used[1], name, scope[name].source)
                     break
 
         parent = getattr(node, 'parent', None)
@@ -579,7 +579,7 @@
                     # unused ones will get an unused import warning
                     and self.scope[varn].used):
                 self.report(messages.ImportShadowedByLoopVar,
-                            node.lineno, varn, self.scope[varn].source.lineno)
+                            node, varn, self.scope[varn].source)
 
         self.handleChildren(node)
 
@@ -619,7 +619,7 @@
                     else:
                         if arg.id in args:
                             self.report(messages.DuplicateArgument,
-                                        node.lineno, arg.id)
+                                        node, arg.id)
                         args.append(arg.id)
             addArgs(node.args.args)
             defaults = node.args.defaults
@@ -627,7 +627,7 @@
             for arg in node.args.args + node.args.kwonlyargs:
                 if arg.arg in args:
                     self.report(messages.DuplicateArgument,
-                                node.lineno, arg.arg)
+                                node, arg.arg)
                 args.append(arg.arg)
                 self.handleNode(arg.annotation, node)
             if hasattr(node, 'returns'):    # Only for FunctionDefs
@@ -641,7 +641,7 @@
             if not wildcard:
                 continue
             if wildcard in args:
-                self.report(messages.DuplicateArgument, node.lineno, wildcard)
+                self.report(messages.DuplicateArgument, node, wildcard)
             args.append(wildcard)
         for default in defaults:
             self.handleNode(default, node)
@@ -668,7 +668,7 @@
                             and not self.scope.usesLocals
                             and isinstance(binding, Assignment)):
                         self.report(messages.UnusedVariable,
-                                    binding.source.lineno, name)
+                                    binding.source, name)
             self.deferAssignment(checkUnusedAssignments)
             self.popScope()
 
@@ -713,19 +713,19 @@
         if node.module == '__future__':
             if not self.futuresAllowed:
                 self.report(messages.LateFutureImport,
-                            node.lineno, [n.name for n in node.names])
+                            node, [n.name for n in node.names])
         else:
             self.futuresAllowed = False
 
         for alias in node.names:
             if alias.name == '*':
                 self.scope.importStarred = True
-                self.report(messages.ImportStarUsed, node.lineno, node.module)
+                self.report(messages.ImportStarUsed, node, node.module)
                 continue
             name = alias.asname or alias.name
             importation = Importation(name, node)
             if node.module == '__future__':
-                importation.used = (self.scope, node.lineno)
+                importation.used = (self.scope, node)
             self.addBinding(node, importation)
 
     def EXCEPTHANDLER(self, node):

=== modified file 'pyflakes/messages.py'
--- pyflakes/messages.py	2013-01-25 11:50:40 +0000
+++ pyflakes/messages.py	2013-03-30 16:06:22 +0000
@@ -5,9 +5,10 @@
     message = ''
     message_args = ()
 
-    def __init__(self, filename, lineno):
+    def __init__(self, filename, loc):
         self.filename = filename
-        self.lineno = lineno
+        self.lineno = loc.lineno
+        self.col = getattr(loc, 'col_offset', 0)
 
     def __str__(self):
         return '%s:%s: %s' % (self.filename, self.lineno, self.message % self.message_args)
@@ -16,88 +17,88 @@
 class UnusedImport(Message):
     message = '%r imported but unused'
 
-    def __init__(self, filename, lineno, name):
-        Message.__init__(self, filename, lineno)
+    def __init__(self, filename, loc, name):
+        Message.__init__(self, filename, loc)
         self.message_args = (name,)
 
 
 class RedefinedWhileUnused(Message):
     message = 'redefinition of unused %r from line %r'
 
-    def __init__(self, filename, lineno, name, orig_lineno):
-        Message.__init__(self, filename, lineno)
-        self.message_args = (name, orig_lineno)
+    def __init__(self, filename, loc, name, orig_loc):
+        Message.__init__(self, filename, loc)
+        self.message_args = (name, orig_loc.lineno)
 
 
 class RedefinedInListComp(Message):
     message = 'list comprehension redefines %r from line %r'
 
-    def __init__(self, filename, lineno, name, orig_lineno):
-        Message.__init__(self, filename, lineno)
-        self.message_args = (name, orig_lineno)
+    def __init__(self, filename, loc, name, orig_loc):
+        Message.__init__(self, filename, loc)
+        self.message_args = (name, orig_loc.lineno)
 
 
 class ImportShadowedByLoopVar(Message):
     message = 'import %r from line %r shadowed by loop variable'
 
-    def __init__(self, filename, lineno, name, orig_lineno):
-        Message.__init__(self, filename, lineno)
-        self.message_args = (name, orig_lineno)
+    def __init__(self, filename, loc, name, orig_loc):
+        Message.__init__(self, filename, loc)
+        self.message_args = (name, orig_loc.lineno)
 
 
 class ImportStarUsed(Message):
     message = "'from %s import *' used; unable to detect undefined names"
 
-    def __init__(self, filename, lineno, modname):
-        Message.__init__(self, filename, lineno)
+    def __init__(self, filename, loc, modname):
+        Message.__init__(self, filename, loc)
         self.message_args = (modname,)
 
 
 class UndefinedName(Message):
     message = 'undefined name %r'
 
-    def __init__(self, filename, lineno, name):
-        Message.__init__(self, filename, lineno)
+    def __init__(self, filename, loc, name):
+        Message.__init__(self, filename, loc)
         self.message_args = (name,)
 
 
 class UndefinedExport(Message):
     message = 'undefined name %r in __all__'
 
-    def __init__(self, filename, lineno, name):
-        Message.__init__(self, filename, lineno)
+    def __init__(self, filename, loc, name):
+        Message.__init__(self, filename, loc)
         self.message_args = (name,)
 
 
 class UndefinedLocal(Message):
     message = "local variable %r (defined in enclosing scope on line %r) referenced before assignment"
 
-    def __init__(self, filename, lineno, name, orig_lineno):
-        Message.__init__(self, filename, lineno)
-        self.message_args = (name, orig_lineno)
+    def __init__(self, filename, loc, name, orig_loc):
+        Message.__init__(self, filename, loc)
+        self.message_args = (name, orig_loc.lineno)
 
 
 class DuplicateArgument(Message):
     message = 'duplicate argument %r in function definition'
 
-    def __init__(self, filename, lineno, name):
-        Message.__init__(self, filename, lineno)
+    def __init__(self, filename, loc, name):
+        Message.__init__(self, filename, loc)
         self.message_args = (name,)
 
 
 class Redefined(Message):
     message = 'redefinition of %r from line %r'
 
-    def __init__(self, filename, lineno, name, orig_lineno):
-        Message.__init__(self, filename, lineno)
-        self.message_args = (name, orig_lineno)
+    def __init__(self, filename, loc, name, orig_loc):
+        Message.__init__(self, filename, loc)
+        self.message_args = (name, orig_loc.lineno)
 
 
 class LateFutureImport(Message):
     message = 'future import(s) %r after other statements'
 
-    def __init__(self, filename, lineno, names):
-        Message.__init__(self, filename, lineno)
+    def __init__(self, filename, loc, names):
+        Message.__init__(self, filename, loc)
         self.message_args = (names,)
 
 
@@ -108,6 +109,6 @@
     """
     message = 'local variable %r is assigned to but never used'
 
-    def __init__(self, filename, lineno, names):
-        Message.__init__(self, filename, lineno)
+    def __init__(self, filename, loc, names):
+        Message.__init__(self, filename, loc)
         self.message_args = (names,)

=== modified file 'pyflakes/test/test_api.py'
--- pyflakes/test/test_api.py	2013-01-25 12:56:41 +0000
+++ pyflakes/test/test_api.py	2013-03-30 16:06:22 +0000
@@ -36,6 +36,15 @@
         sys.stderr = outer
 
 
+class Node(object):
+    """
+    Mock an AST node.
+    """
+    def __init__(self, lineno, col_offset=0):
+        self.lineno = lineno
+        self.col_offset = col_offset
+
+
 class LoggingReporter(object):
     """
     Implementation of Reporter that just appends any errors to a list.
@@ -223,7 +232,7 @@
         """
         out = StringIO()
         reporter = Reporter(out, None)
-        message = UnusedImport('foo.py', 42, 'bar')
+        message = UnusedImport('foo.py', Node(42), 'bar')
         reporter.flake(message)
         self.assertEquals(out.getvalue(), "%s\n" % (message,))
 
@@ -434,7 +443,7 @@
         count, errors = self.getErrors(sourcePath)
         self.assertEquals(count, 1)
         self.assertEquals(
-            errors, [('flake', str(UnusedImport(sourcePath, 1, 'foo')))])
+            errors, [('flake', str(UnusedImport(sourcePath, Node(1), 'foo')))])
 
 
     @skipIf(sys.version_info >= (3,), "not relevant")
@@ -489,9 +498,9 @@
         self.assertEqual(warnings, 2)
         self.assertEqual(
             sorted(log),
-            sorted([('flake', str(UnusedImport(file1, 1, 'baz'))),
+            sorted([('flake', str(UnusedImport(file1, Node(1), 'baz'))),
                     ('flake',
-                     str(UnusedImport(file2, 1, 'contraband')))]))
+                     str(UnusedImport(file2, Node(1), 'contraband')))]))
 
 
 class IntegrationTests(TestCase):
@@ -563,7 +572,7 @@
         fd.write("import contraband\n".encode('ascii'))
         fd.close()
         d = self.runPyflakes([self.tempfilepath])
-        self.assertEqual(d, ("%s\n" % UnusedImport(self.tempfilepath, 1, 'contraband'), '', 1))
+        self.assertEqual(d, ("%s\n" % UnusedImport(self.tempfilepath, Node(1), 'contraband'), '', 1))
 
 
     def test_errors(self):
@@ -581,4 +590,4 @@
         If no arguments are passed to C{pyflakes} then it reads from stdin.
         """
         d = self.runPyflakes([], stdin='import contraband'.encode('ascii'))
-        self.assertEqual(d, ("%s\n" % UnusedImport('<stdin>', 1, 'contraband'), '', 1))
+        self.assertEqual(d, ("%s\n" % UnusedImport('<stdin>', Node(1), 'contraband'), '', 1))

=== modified file 'setup.py'
--- setup.py	2013-01-29 15:39:57 +0000
+++ setup.py	2013-03-30 16:06:22 +0000
@@ -1,6 +1,9 @@
 #!/usr/bin/env python
 # Copyright 2005-2011 Divmod, Inc.
 # Copyright 2013 Florent Xicluna.  See LICENSE file for details
+from __future__ import with_statement
+
+import os.path
 import sys
 
 try:
@@ -19,10 +22,18 @@
         'console_scripts': ['pyflakes = pyflakes.api:main'],
     }
 
+
+def get_version(fname=os.path.join('pyflakes', '__init__.py')):
+    with open(fname) as f:
+        for line in f:
+            if line.startswith('__version__'):
+                return eval(line.split('=')[-1])
+
+
 setup(
     name="pyflakes",
     license="MIT",
-    version="0.6.1",
+    version=get_version(),
     description="passive checker of Python programs",
     author="Phil Frost",
     author_email="[e-mail]",