Merge pull request #2631 from practicalswift/pep8-fixes-20160520

[gardening] Fix various PEP-8 violations.

Author: practicalswift

Diff for: .pep8

@@ -1,2 +1,2 @@
 [flake8]
-filename = *.py,80+-check,Benchmark_Driver,Benchmark_DTrace.in,Benchmark_GuardMalloc.in,Benchmark_RuntimeLeaksRunner.in,build-script,gyb,line-directive,mock-distcc,ns-html2rst,recursive-lipo,rth,split-generated-tests,submit-benchmark-results,update-checkout,viewcfg,backtrace-check
+filename = *.py,80+-check,Benchmark_Driver,Benchmark_DTrace.in,Benchmark_GuardMalloc.in,Benchmark_RuntimeLeaksRunner.in,build-script,check-incremental,gyb,line-directive,mock-distcc,ns-html2rst,recursive-lipo,rth,split-generated-tests,submit-benchmark-results,update-checkout,viewcfg,backtrace-check

Diff for: utils/check-incremental

@@ -19,74 +19,73 @@
 #
 # ----------------------------------------------------------------------------
 
-import subprocess
 import os
+import subprocess
 import sys
-import time
 
 
 def main():
-  verbose = False
-  num_iterations = 4
-
-  write_obj_file = False
-  next_arg_is_output = False
-  compare_time = True
-  output_file = None
-
-  for arg in sys.argv:
-    if next_arg_is_output:
-      output_file = arg
-      next_arg_is_output = False
-    elif arg == '-c':
-      write_obj_file = True
-    elif arg == '-disable-incremental-llvm-codegen':
-      compare_time = False
-    elif arg == '-o':
-      next_arg_is_output = True
-
-  if not write_obj_file or output_file is None:
-    return
-
-  new_args = sys.argv[1:]
-  subprocess.check_call(new_args)
+    verbose = False
+    num_iterations = 4
+
+    write_obj_file = False
+    next_arg_is_output = False
+    compare_time = True
+    output_file = None
+
+    for arg in sys.argv:
+        if next_arg_is_output:
+            output_file = arg
+            next_arg_is_output = False
+        elif arg == '-c':
+            write_obj_file = True
+        elif arg == '-disable-incremental-llvm-codegen':
+            compare_time = False
+        elif arg == '-o':
+            next_arg_is_output = True
+
+    if not write_obj_file or output_file is None:
+        return
+
+    new_args = sys.argv[1:]
+    subprocess.check_call(new_args)
 
-  if verbose:
-    print "Reference compilation of " + output_file + ":"
+    if verbose:
+        print "Reference compilation of " + output_file + ":"
 
-  reference_md5 = subprocess.check_output(["md5", "-q", output_file])
-  reference_time = os.path.getmtime(output_file)
+    reference_md5 = subprocess.check_output(["md5", "-q", output_file])
+    reference_time = os.path.getmtime(output_file)
 
-  if verbose:
-    print "  time = {}".format(reference_time)
-    print "  md5 = " + reference_md5
+    if verbose:
+        print "  time = {}".format(reference_time)
+        print "  md5 = " + reference_md5
 
-  subprocess.check_call(["cp", output_file, output_file + ".ref.o"])
+    subprocess.check_call(["cp", output_file, output_file + ".ref.o"])
 
-  for iteration in range(0, num_iterations):
+    for iteration in range(0, num_iterations):
 
-    if verbose:
-      print "Iteration {}:".format(iteration)
+        if verbose:
+            print "Iteration {}:".format(iteration)
 
-    subprocess.check_call(new_args)
+        subprocess.check_call(new_args)
 
-    second_md5 = subprocess.check_output(["md5", "-q", output_file])
-    second_time = os.path.getmtime(output_file)
+        second_md5 = subprocess.check_output(["md5", "-q", output_file])
+        second_time = os.path.getmtime(output_file)
 
-    if verbose:
-      print "  time = {}".format(second_time)
-      print "  md5 = " + second_md5
+        if verbose:
+            print "  time = {}".format(second_time)
+            print "  md5 = " + second_md5
 
-    # This is the most important check: is the output file exactly the same.
-    if reference_md5 != second_md5:
-      sys.exit("non-determinism when generating: " + output_file)
+        # This is the most important check: is the output file exactly the
+        # same.
+        if reference_md5 != second_md5:
+            sys.exit("non-determinism when generating: " + output_file)
 
-    # This is the bonus check: does the compiler not re-write the output file.
-    # (For compilations < 1sec this check may succeed even if the file was
-    # overwritten).
-    if compare_time and reference_time != second_time:
-      sys.exit("file re-written: " + output_file)
+        # This is the bonus check: does the compiler not re-write the output
+        # file. (For compilations < 1sec this check may succeed even if the
+        # file was overwritten).
+        if compare_time and reference_time != second_time:
+            sys.exit("file re-written: " + output_file)
 
 
 main()
-

Diff for: utils/gyb_stdlib_support.py

@@ -49,11 +49,11 @@ def defaultIndicesForTraversal(traversal):  # noqa (N802)
     assert False, 'unknown traversal'
 
 
-def documentationNameForTraversal(traversal):
-  if traversal == 'Forward':
-    return 'collection'
+def documentationNameForTraversal(traversal):  # noqa (N802)
+    if traversal == 'Forward':
+        return 'collection'
     if traversal == 'Bidirectional':
-      return 'bidirectional collection'
+        return 'bidirectional collection'
     if traversal == 'RandomAccess':
-      return 'random-access collection'
+        return 'random-access collection'
     assert False, 'unknown traversal'

Diff for: utils/swift_build_support/swift_build_support/cache_util.py

@@ -47,12 +47,12 @@ def reify(func):
 
     Note: Support method that takes no arguments.
     """
-    class wrapper(object):
+    class Wrapper(object):
         def __get__(self, obj, objtype=None):
             if obj is None:
                 return self
             result = func(obj)
             setattr(obj, func.__name__, result)
             return result
 
-    return update_wrapper(wrapper(), func)
+    return update_wrapper(Wrapper(), func)

Diff for: utils/swift_build_support/tests/test_cmake.py

@@ -12,7 +12,7 @@
 import unittest
 from argparse import Namespace
 
-from swift_build_support.cmake import CMakeOptions, CMake
+from swift_build_support.cmake import CMake, CMakeOptions
 from swift_build_support.toolchain import host_toolchain
 
 

Diff for: utils/swift_build_support/tests/test_workspace.py

@@ -63,29 +63,29 @@ def create_basic_args(self, generator, variant, assertions):
             swift_assertions=assertions,
             swift_stdlib_assertions=assertions)
 
-    def test_Ninja_ReleaseAssert(self):
+    def test_Ninja_ReleaseAssert(self):  # noqa (N802 function name should be lowercase)
         # build-script -R
         args = self.create_basic_args(
             "Ninja", variant="Release", assertions=True)
         self.assertEqual(compute_build_subdir(args),
                          "Ninja-ReleaseAssert")
 
-    def test_Ninja_Release(self):
+    def test_Ninja_Release(self):  # noqa (N802 function name should be lowercase)
         # build-script -R --no-assertions
         args = self.create_basic_args(
             "Ninja", variant="Release", assertions=False)
         self.assertEqual(compute_build_subdir(args),
                          "Ninja-Release")
 
-    def test_Ninja_Release_stdlib_ReleaseAssert(self):
+    def test_Ninja_Release_stdlib_ReleaseAssert(self):  # noqa (N802 function name should be lowercase)
         # build-script -R --no-assertions --swift-stdlib-assertions
         args = self.create_basic_args(
             "Ninja", variant="Release", assertions=False)
         args.swift_stdlib_assertions = True
         self.assertEqual(compute_build_subdir(args),
                          "Ninja-Release+stdlib-ReleaseAssert")
 
-    def test_Ninja_mixed(self):
+    def test_Ninja_mixed(self):  # noqa (N802 function name should be lowercase)
         # build-script -R --no-assertions
         #     --llvm-build-variant=RelWithDebInfo
         #     --swift-analyze-code-coverage="merged"
@@ -99,7 +99,7 @@ def test_Ninja_mixed(self):
                          "Ninja+cmark-Release+llvm-RelWithDebInfo"
                          "+swift-ReleaseCoverage+stdlib-ReleaseAssert")
 
-    def test_Unix_Makefiles_ReleaseAssert(self):
+    def test_Unix_Makefiles_ReleaseAssert(self):  # noqa (N802 function name should be lowercase)
         # build-script -R -m
         args = self.create_basic_args(
             "Unix Makefiles", variant="Release", assertions=True)