[clang-include-fixer] fix PEP8 warnings

[omtcyf0]

Summary

This fixes PEP8 E231, E225, E226, E302 warnings

[bkramer]

Thanks. Do you have commit access?

[omtcyf0]

@bkramer I don't. Can you please land it?

clang-tools-extra/trunk/include-fixer/tool/clang-include-fixer.py

 
 # set g:clang_include_fixer_path to the path to clang-include-fixer if it is not
 # on the path.
 # Change this to the full path if clang-include-fixer is not on the path.
 binary = 'clang-include-fixer'
 if vim.eval('exists("g:clang_include_fixer_path")') == "1":
   binary = vim.eval('g:clang_include_fixer_path')
 
-maximum_suggested_headers=3
+maximum_suggested_headers = 3
 if vim.eval('exists("g:clang_include_fixer_maximum_suggested_headers")') == "1":
   maximum_suggested_headers = max(
       1,
       vim.eval('g:clang_include_fixer_maximum_suggested_headers'))
 
-increment_num=5
+increment_num = 5
 if vim.eval('exists("g:clang_include_fixer_increment_num")') == "1":
   increment_num = max(
       1,
       vim.eval('g:clang_include_fixer_increment_num'))
 
+
 def GetUserSelection(message, headers, maximum_suggested_headers):
   eval_message = message + '\n'
   for idx, header in enumerate(headers[0:maximum_suggested_headers]):
-    eval_message += "({0}). {1}\n".format(idx+1, header)
+    eval_message += "({0}). {1}\n".format(idx + 1, header)
   eval_message += "Enter (q) to quit;"
   if maximum_suggested_headers < len(headers):
     eval_message += " (m) to show {0} more candidates.".format(
         min(increment_num, len(headers) - maximum_suggested_headers))
 
   eval_message += "\nSelect (default 1): "
   res = vim.eval("input('{0}')".format(eval_message))
   if res == '':
try:
       idx = int(res)
       if idx <= 0 or idx > len(headers):
         raise Exception()
     except Exception:
       # Show a new prompt on invalid option instead of aborting so that users
       # don't need to wait for another include-fixer run.
       print >> sys.stderr, "Invalid option:", res
       return GetUserSelection(message, headers, maximum_suggested_headers)
-  return headers[idx-1]
+  return headers[idx - 1]
 
+
 def execute(command, text):
   p = subprocess.Popen(command,
                        stdout=subprocess.PIPE, stderr=subprocess.PIPE,
                        stdin=subprocess.PIPE)
   return p.communicate(input=text)
 
 
 def InsertHeaderToVimBuffer(header, text):
-  command = [binary, "-stdin", "-insert-header="+json.dumps(header),
+  command = [binary, "-stdin", "-insert-header=" + json.dumps(header),
              vim.current.buffer.name]
   stdout, stderr = execute(command, text)
   if stdout:
     lines = stdout.splitlines()
     sequence = difflib.SequenceMatcher(None, vim.current.buffer, lines)
     for op in reversed(sequence.get_opcodes()):
       if op[0] is not 'equal':
         vim.current.buffer[op[1]:op[2]] = lines[op[3]:op[4]]
 
 
 def main():
   parser = argparse.ArgumentParser(
       description='Vim integration for clang-include-fixer')
   parser.add_argument('-db', default='yaml',
                       help='clang-include-fixer input format.')
   parser.add_argument('-input', default='',
                       help='String to initialize the database.')
   args = parser.parse_args()
 
   # Get the current text.
   buf = vim.current.buffer
   text = '\n'.join(buf)
 
   # Run command to get all headers.
-  command = [binary, "-stdin", "-output-headers", "-db="+args.db,
-             "-input="+args.input, vim.current.buffer.name]
+  command = [binary, "-stdin", "-output-headers", "-db=" + args.db,
+             "-input=" + args.input, vim.current.buffer.name]
   stdout, stderr = execute(command, text)
   if stderr:
     print >> sys.stderr, "Error while running clang-include-fixer: " + stderr
     return
 
   include_fixer_context = json.loads(stdout)
   symbol = include_fixer_context["SymbolIdentifier"]
   headers = include_fixer_context["Headers"]
 
   if not symbol:
     print "The file is fine, no need to add a header.\n"
     return
 
   if not headers:
     print "Couldn't find a header for {0}.\n".format(symbol)
     return
 
   # The first line is the symbol name.
   # If there is only one suggested header, insert it directly.
   if len(headers) == 1 or maximum_suggested_headers == 1:
     InsertHeaderToVimBuffer({"SymbolIdentifier": symbol,
-                             "Headers":[headers[0]]}, text)
+                             "Headers": [headers[0]]}, text)
     print "Added #include {0} for {1}.\n".format(headers[0], symbol)
     return
 
   try:
     selected = GetUserSelection("choose a header file for {0}.".format(symbol),
                                 headers, maximum_suggested_headers)
     # Insert a selected header.
     InsertHeaderToVimBuffer({"SymbolIdentifier": symbol,
-                             "Headers":[selected]}, text)
+                             "Headers": [selected]}, text)
     print "Added #include {0} for {1}.\n".format(selected, symbol)
   except Exception as error:
     print >> sys.stderr, error.message
   return
 
 
 if __name__ == '__main__':
   main()