Merge pull request #2357 from practicalswift/flake8-fixes-20160501

[gardening] PEP-8 fixes.

Author: practicalswift

.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,ns-html2rst,recursive-lipo,rth,submit-benchmark-results,update-checkout,viewcfg
+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

utils/build-script

@@ -14,12 +14,12 @@ from __future__ import print_function
 import argparse
 import multiprocessing
 import os
+import pipes
 import platform
 import re
+import shlex
 import shutil
 import sys
-import pipes
-import shlex
 
 # FIXME: Instead of modifying the system path in order to enable imports from
 #        other directories, all Python modules related to the build script

utils/gyb_stdlib_support.py

@@ -10,7 +10,8 @@
 
 TRAVERSALS = ['Forward', 'Bidirectional', 'RandomAccess']
 
-def collectionForTraversal(traversal):
+
+def collectionForTraversal(traversal):  # noqa (N802 function name should be lowercase)
     if traversal == 'Forward':
         return 'Collection'
     if traversal == 'Bidirectional':
@@ -19,28 +20,30 @@ def collectionForTraversal(traversal):
         return 'RandomAccessCollection'
     assert False, 'unknown traversal'
 
-def sliceTypeName(traversal, mutable, rangeReplaceable):
+
+def sliceTypeName(traversal, mutable, rangeReplaceable):  # noqa (N802)
     name = collectionForTraversal(traversal).replace('Collection', 'Slice')
     if rangeReplaceable:
         name = 'RangeReplaceable' + name
     if mutable:
         name = 'Mutable' + name
     return name
 
-def protocolsForCollectionFeatures(traversal, mutable, rangeReplaceable):
+
+def protocolsForCollectionFeatures(traversal, mutable, rangeReplaceable):  # noqa (N802)
     protocols = [collectionForTraversal(traversal)]
     if mutable:
         protocols.append('MutableCollection')
     if rangeReplaceable:
         protocols.append('RangeReplaceableCollection')
     return protocols
 
-def defaultIndicesForTraversal(traversal):
+
+def defaultIndicesForTraversal(traversal):  # noqa (N802)
     if traversal == 'Forward':
         return 'DefaultIndices'
     if traversal == 'Bidirectional':
         return 'DefaultBidirectionalIndices'
     if traversal == 'RandomAccess':
         return 'DefaultRandomAccessIndices'
     assert False, 'unknown traversal'
-

utils/gyb_stdlib_unittest_support.py

@@ -16,4 +16,3 @@
 stackTrace = 'stackTrace.pushIf(showFrame, file: file, line: line)'
 
 trace = 'message(),\n  stackTrace: ' + stackTrace
-

utils/split-generated-tests

@@ -12,35 +12,35 @@ from __future__ import print_function
 
 import sys
 
+
 def main():
     with open(sys.argv[1], 'r') as f:
         content = f.readlines()
 
     while len(content) != 0:
-        startIndex = -1
-        endIndex = -1
-        testFilename = ''
+        start_index = -1
+        end_index = -1
+        test_filename = ''
         for i, line in enumerate(content):
             if line.startswith('// Start of file: '):
-                testFilename = line[18:].strip()
-                startIndex = i
+                test_filename = line[18:].strip()
+                start_index = i
                 break
-        if startIndex == -1:
+        if start_index == -1:
             return 0
         for i, line in enumerate(content):
             if line.startswith('// End of file: '):
-                assert line[16:].strip() == testFilename
-                endIndex = i
+                assert line[16:].strip() == test_filename
+                end_index = i
                 break
-        testContent = content[startIndex+1:endIndex]
+        test_content = content[start_index+1:end_index]
 
-        with open(testFilename, 'w') as testFile:
-            for line in testContent:
-                if not '###sourceLocation' in line:
+        with open(test_filename, 'w') as testFile:
+            for line in test_content:
+                if '###sourceLocation' not in line:
                     testFile.write(line)
 
-        content = content[endIndex+1:]
+        content = content[end_index+1:]
 
 if __name__ == "__main__":
     sys.exit(main())
-

utils/swift_build_support/swift_build_support/cmake.py

@@ -14,10 +14,11 @@
 #
 # ----------------------------------------------------------------------------
 
-from numbers import Number
 import platform
 import subprocess
 
+from numbers import Number
+
 from . import xcrun
 from .which import which
 

utils/swift_build_support/tests/test_cmake.py

@@ -13,9 +13,9 @@
 from argparse import Namespace
 
 from swift_build_support.cmake import (
-    host_cmake,
-    CMakeOptions,
     CMake,
+    CMakeOptions,
+    host_cmake,
 )