[gardening] Fix some flake8 failures.

Author: gottesmm

utils/profdata_merge/process.py

@@ -68,7 +68,8 @@ def merge_file_buffer(self):
         try:
             shell.call(llvm_cmd, echo=False)
         except SystemExit as e:
-            self.report("llvm profdata command failed: %s" % e, level=logging.ERROR)
+            self.report("llvm profdata command failed: %s" % e,
+                        level=logging.ERROR)
         if self.config.remove_files:
             for f in self.filename_buffer:
                 if os.path.exists(f):

utils/run-test

@@ -125,9 +125,9 @@ def main():
                         type=arguments.type.shell_split,
                         action=arguments.action.concat,
                         default=[],
-                        help="key=value parameters they are directly passed to "
-                             "lit command in addition to `mode` and `subset`. "
-                             "Accept multiple.")
+                        help="key=value parameters they are directly passed "
+                             "to lit command in addition to `mode` and "
+                             "`subset`. Accept multiple.")
     parser.add_argument("--result-dir", type=os.path.realpath, metavar="PATH",
                         help="directory to store test results (default: none)")
     parser.add_argument("--merge-coverage",

utils/update-checkout

@@ -123,9 +123,10 @@ def obtain_additional_swift_sources(
                             os.path.join(SWIFT_SOURCE_ROOT, repo_name),
                             'checkout', repo_branch], echo=False)
     with shell.pushd(os.path.join(SWIFT_SOURCE_ROOT, repo_name),
-                         dry_run=False, echo=False):
+                     dry_run=False, echo=False):
         shell.call(["git", "submodule", "update", "--recursive"],
-                             echo=False)
+                   echo=False)
+
 
 def validate_config(config):
     # Make sure that our branch-names are unique.