Merge lp:~icic/pyflakes/devel into lp:~vcs-imports/pyflakes/main

[Brian Olson]

Make warning suppressable by tagging suspicious lines of code with # FLAKE_OK

[Gavin Panella (allenap)]

I think lp:pyflakes is long dead. I found the same thing out this
morning. All development is now going into lp:divmod.org.

review: Abstain

Unmerged revisions

42. By Brian Olson on 2011-11-21

Hide warnings by tagging source lines with "# FLAKE_OK"

=== modified file 'pyflakes/scripts/pyflakes.py'
--- pyflakes/scripts/pyflakes.py	2010-04-13 15:53:04 +0000
+++ pyflakes/scripts/pyflakes.py	2011-11-21 15:47:58 +0000
@@ -54,8 +54,15 @@
         # Okay, it's syntactically valid.  Now check it.
         w = checker.Checker(tree, filename)
         w.messages.sort(lambda a, b: cmp(a.lineno, b.lineno))
+        lines = None
         for warning in w.messages:
-            print warning
+            if not lines:
+                lines = codeString.splitlines()
+            if '# FLAKE_OK' in lines[warning.lineno - 1]:
+                # skip flagged things
+                pass
+            else:
+                print warning
         return len(w.messages)