Fixed flakes and readded missing Thread import

Author: lukaszb

extras.py

@@ -0,0 +1,88 @@
+import _ast
+import os
+import sys
+from setuptools import Command
+
+
+def check(filename):
+    from pyflakes import reporter as mod_reporter
+    from pyflakes.checker import Checker
+    codeString = open(filename).read()
+    reporter = mod_reporter._makeDefaultReporter()
+    # First, compile into an AST and handle syntax errors.
+    try:
+        tree = compile(codeString, filename, "exec", _ast.PyCF_ONLY_AST)
+    except SyntaxError:
+        value = sys.exc_info()[1]
+        msg = value.args[0]
+
+        (lineno, offset, text) = value.lineno, value.offset, value.text
+
+        # If there's an encoding problem with the file, the text is None.
+        if text is None:
+            # Avoid using msg, since for the only known case, it contains a
+            # bogus message that claims the encoding the file declared was
+            # unknown.
+            reporter.unexpectedError(filename, 'problem decoding source')
+        else:
+            reporter.syntaxError(filename, msg, lineno, offset, text)
+        return 1
+    except Exception:
+        reporter.unexpectedError(filename, 'problem decoding source')
+        return 1
+    else:
+        # Okay, it's syntactically valid.  Now check it.
+        lines = codeString.splitlines()
+        warnings = Checker(tree, filename)
+        warnings.messages.sort(key=lambda m: m.lineno)
+        real_messages = []
+        for m in warnings.messages:
+            line = lines[m.lineno - 1]
+            if 'pyflakes:ignore' in line.rsplit('#', 1)[-1]:
+                # ignore lines with pyflakes:ignore
+                pass
+            else:
+                real_messages.append(m)
+                reporter.flake(m)
+        return len(real_messages)
+
+
+class RunFlakesCommand(Command):
+    """
+    Runs pyflakes against guardian codebase.
+    """
+    description = "Check sources with pyflakes"
+    user_options = []
+    ignore = ['__init__.py', '__main__.py', 'hgcompat.py']
+
+    def initialize_options(self):
+        pass
+
+    def finalize_options(self):
+        pass
+
+    def run(self):
+        try:
+            import pyflakes # pyflakes:ignore
+        except ImportError:
+            sys.stderr.write("No pyflakes installed!\n")
+            sys.exit(-1)
+        thisdir = os.path.dirname(__file__)
+        vcsdir = os.path.join(thisdir, 'vcs')
+        warns = 0
+        # Define top-level directories
+        for topdir, dirnames, filenames in os.walk(vcsdir):
+            filenames = (f for f in filenames if f not in self.ignore)
+            paths = (os.path.join(topdir, f) for f in filenames if f.endswith('.py'))
+            for path in paths:
+                if path.endswith('tests/__init__.py'):
+                    # ignore that module (it should only gather test cases with *)
+                    continue
+                warns += check(path)
+        if warns > 0:
+            sys.stderr.write("ERROR: Finished with total %d warnings.\n" % warns)
+            sys.exit(1)
+        else:
+            print("No problems found in source codes.")
+
+

setup.py

@@ -1,6 +1,7 @@
 import os
 import sys
-from setuptools import setup, find_packages, Command
+from setuptools import setup, find_packages
+from extras import RunFlakesCommand
 
 vcs = __import__('vcs')
 readme_file = os.path.abspath(os.path.join(os.path.dirname(__file__),
@@ -18,38 +19,6 @@
     install_requires.append('unittest2')
 tests_require = install_requires + ['dulwich', 'mercurial']
 
-class run_flakes(Command):
-    description = 'Runs code against pyflakes'
-    user_options = []
-
-    def initialize_options(self):
-        pass
-
-    def finalize_options(self):
-        pass
-
-    def run(self):
-        try:
-            import pyflakes.scripts.pyflakes as flakes
-        except ImportError:
-            print "Audit requires PyFlakes installed in your system."
-            sys.exit(-1)
-
-        warns = 0
-        # Define top-level directories
-        dirs = ['vcs']
-        ignore = ['__init__.py', 'hgcompat.py']
-        for dir in dirs:
-            for root, _, files in os.walk(dir):
-                for file in files:
-                    if file not in ignore and file.endswith('.py') :
-                        warns += flakes.checkPath(os.path.join(root, file))
-        if warns > 0:
-            sys.stderr.write("ERROR: Finished with total %d warnings.\n" % warns)
-            sys.exit(1)
-        else:
-            print "No problems found in sourcecode."
-
 
 setup(
     name='vcs',
@@ -78,5 +47,5 @@ def run(self):
             'vcs = vcs:main',
         ],
     },
-    cmdclass={'flakes': run_flakes},
+    cmdclass={'flakes': RunFlakesCommand},
 )

vcs/commands/summary.py

@@ -58,7 +58,7 @@ def post_process(self, repo, **options):
         output = ['']
         output.extend([
             '%s: %s' % (label.rjust(max_label_size+3), value)
-            for label, value in stats
+            for label, value in stats # pyflakes:ignore
         ])
         output.append('')
         output.append('')

vcs/tests/__main__.py

@@ -1,4 +1,4 @@
-from __init__ import main
+from __init__ import * # allows to run tests with: python vcs/tests
 
 if __name__ == '__main__':
     main()

vcs/utils/compat.py

@@ -153,10 +153,10 @@ def __deepcopy__(self, memo={}):
 #==============================================================================
 
 if sys.version_info >= (2, 6):
-    from threading import Event
+    from threading import Event, Thread
 else:
-    from threading import _Verbose, Lock, _time, \
-        _allocate_lock, RLock, _sleep
+    from threading import (Thread, _Verbose, Lock, _time, # pyflakes:ignore
+        _allocate_lock, RLock, _sleep)
 
     def Condition(*args, **kwargs):
         return _Condition(*args, **kwargs)