PEP8: Fix all violations of type "at least two spaces before inline comment" (E261)

Author: practicalswift

test/Driver/Dependencies/Inputs/touch.py

@@ -21,7 +21,8 @@
 assert len(sys.argv) >= 2
 timeVal = int(sys.argv[1])
 
-timeVal += 946684800 # offset between Unix and LLVM epochs
+# offset between Unix and LLVM epochs
+timeVal += 946684800
 
 # Update the output file mtime, or create it if necessary.
 # From http://stackoverflow.com/a/1160227.

tools/SourceKit/bindings/python/sourcekitd/capi.py

@@ -226,15 +226,17 @@ def to_python_object(self):
     def to_python_array(self):
         def applier(index, value, arr):
             arr.append(value.to_python_object())
-            return 1 # continue
+            # continue
+            return 1
         arr = []
         conf.lib.sourcekitd_variant_array_apply_f(self, callbacks['array_applier'](applier), arr)
         return arr
 
     def to_python_dictionary(self):
         def applier(cobj, value, d):
             d[str(UIdent(cobj))] = value.to_python_object()
-            return 1 # continue
+            # continue
+            return 1
         d = {}
         conf.lib.sourcekitd_variant_dictionary_apply_f(self, callbacks['dictionary_applier'](applier), d)
         return d
@@ -297,7 +299,7 @@ def __repr__(self):
 functionList = [
   # FIXME: Fix PEP8 violation "continuation line under-indented for hanging
   #        indent" (E121) and remove "noqa" marker.
-  ("sourcekitd_cancel_request", # noqa
+  ("sourcekitd_cancel_request",  # noqa
   	[c_void_p]),
 
   ("sourcekitd_initialize",

utils/SwiftBuildSupport.py

@@ -11,9 +11,11 @@
 from __future__ import print_function
 
 try:
-    import ConfigParser # Python 2
+    # Python 2
+    import ConfigParser
 except ImportError:
-    import configparser as ConfigParser # Python 3
+    # Python 3
+    import configparser as ConfigParser
 
 import os
 import pipes

utils/SwiftIntTypes.py

@@ -78,7 +78,8 @@ def all_integer_type_names():
     return [self_ty.stdlib_name for self_ty in all_integer_types(0)]
 
 def all_real_number_type_names():
-    return ['Float', 'Double'] # FIXME , 'Float80' Revert until I figure out a test failure  # Float80 for i386 & x86_64
+    # FIXME , 'Float80' Revert until I figure out a test failure  # Float80 for i386 & x86_64
+    return ['Float', 'Double']
 
 def all_numeric_type_names():
     return all_integer_type_names() + all_real_number_type_names()

utils/gyb.py

@@ -231,7 +231,8 @@ def tokenizeTemplate(templateText):
         if kind in ('literal', 'symbol'):
             if len(savedLiteral) == 0:
                 literalFirstMatch = m
-            savedLiteral.append(text) # literals and symbols get batched together
+            # literals and symbols get batched together
+            savedLiteral.append(text)
             pos = None
         else:
             # found a non-literal.  First yield any literal we've accumulated
@@ -248,7 +249,8 @@ def tokenizeTemplate(templateText):
         if pos is None:
             pos = m.end(0)
         else:
-            yield # Client is not yet ready to process next token
+            # Client is not yet ready to process next token
+            yield
 
     if savedLiteral != []:
         yield 'literal', ''.join(savedLiteral), literalFirstMatch
@@ -328,7 +330,8 @@ def splitGybLines(sourceLines):
             lastTokenText, lastTokenKind = tokenText, tokenKind
 
     except tokenize.TokenError:
-        return [] # Let the later compile() call report the error
+        # Let the later compile() call report the error
+        return []
 
     if lastTokenText == ':':
         unmatchedIndents.append(len(sourceLines))
@@ -459,7 +462,8 @@ def tokenGenerator(self, baseTokens):
             # Do we need to close the current lines?
             self.closeLines = kind == 'gybLinesClose'
 
-            if kind.endswith('Open'): # %{...}% and ${...} constructs
+            # %{...}% and ${...} constructs
+            if kind.endswith('Open'):
 
                 # Tokenize text that follows as Python up to an unmatched '}'
                 codeStart = self.tokenMatch.end(kind)
@@ -478,7 +482,8 @@ def tokenGenerator(self, baseTokens):
                     nextPos = m2.end(0)
                 else:
                     assert kind == 'substitutionOpen'
-                    nextPos = closePos + 1 # skip past the closing '}'
+                    # skip past the closing '}'
+                    nextPos = closePos + 1
 
                 # Resume tokenizing after the end of the code.
                 baseTokens.send(nextPos)

utils/name-compression/CBCGen.py

@@ -104,7 +104,8 @@ def addLine(line):
 
 # notice that Y and J are missing because they are escape chars:
 charset = r"0123456789_abcdefghijklmnopqrstuvwxyzABCDEFGHIKLMNOPQRSTUVWXZ$"
-encoders = [c for c in charset] # alphabet without the escape chars.
+# alphabet without the escape chars.
+encoders = [c for c in charset]
 enc_len = len(encoders)
 
 # Take the most frequent entries from the table that fit into the range of

utils/name-compression/HuffGen.py

@@ -31,10 +31,14 @@ def addLine(line):
 class Node:
   """ This is a node in the Huffman tree """
   def __init__(self, hits, value=None, l=None, r=None):
-    self.hit = hits  # Number of occurrences for this node.
-    self.left = l    # Left subtree.
-    self.right = r   # Right subtree.
-    self.val = value # Character value for leaf nodes.
+    # Number of occurrences for this node.
+    self.hit = hits
+    # Left subtree.
+    self.left = l
+    # Right subtree.
+    self.right = r
+    # Character value for leaf nodes.
+    self.val = value
 
   def merge(Left, Right):
     """ This is the merge phase of the huffman encoding algorithm

utils/pass-pipeline/src/pass_pipeline_library.py

@@ -78,7 +78,8 @@ def ssapass_passlist(optlevel):
         p.SILCombine,
         simplifycfg_silcombine_passlist(),
         p.GlobalLoadStoreOpts,
-        p.CodeMotion, # Need to add proper argument here
+        # Need to add proper argument here
+        p.CodeMotion,
         p.GlobalARCOpts,
         p.SpeculativeDevirtualizer,
         p.SILLinker,

utils/protocol_graph.py

@@ -134,7 +134,8 @@ def parseProtocol(m):
 
 # Find clusters of protocols that have the same name when underscores
 # are stripped
-clusterBuilder = {} # map from potential cluster name to nodes in the cluster
+# map from potential cluster name to nodes in the cluster
+clusterBuilder = {}
 for n in graph:
     clusterBuilder.setdefault(n.translate(None, '_'), set()).add(n)
 
@@ -148,7 +149,8 @@ def parseProtocol(m):
     for t in graph[s] if t in elements)
 
 print('digraph ProtocolHierarchies {')
-print('  mclimit = 100; ranksep=1.5; ') # ; packmode="array1"
+# ; packmode="array1"
+print('  mclimit = 100; ranksep=1.5; ')
 print('  edge [dir="back"];')
 print('  node [shape = box, fontname = Helvetica, fontsize = 10];')
 

utils/swift-bench.py

@@ -259,7 +259,8 @@ def computeItersNumber(self, name):
         r = self.runCommand([self.tests[name].binary, str(scale),
                              self.tests[name].name])
         (testName, itersComputed, execTime) = self.parseBenchmarkOutput(r)
-        spent = int(execTime) / 1000000 # Convert ns to ms
+        # Convert ns to ms
+        spent = int(execTime) / 1000000
         if spent <= self.minIterTime:
           scale *= 2
         if scale > sys.maxint: