From 4d31e7e755a6c910d590586d98fb1367cdf234b4 Mon Sep 17 00:00:00 2001
From: Rintaro Ishizaki <rishizaki@apple.com>
Date: Mon, 21 Oct 2019 11:39:11 -0700
Subject: [PATCH] [build-script] Fix python-lint issue

rdar://problem/56469555
---
 utils/build_swift/driver_arguments.py                       | 1 -
 utils/build_swift/tests/test_driver_arguments.py            | 2 +-
 utils/swift_build_support/swift_build_support/migration.py  | 5 +++--
 .../swift_build_support/products/skstresstester.py          | 6 +++---
 .../swift_build_support/products/swiftevolve.py             | 1 -
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/utils/build_swift/driver_arguments.py b/utils/build_swift/driver_arguments.py
index 2a0e8182dc9d5..c41b5837fec63 100644
--- a/utils/build_swift/driver_arguments.py
+++ b/utils/build_swift/driver_arguments.py
@@ -1046,7 +1046,6 @@ def create_argument_parser():
     option('--install-swift', toggle_true('impl_install_swift'))
     option('--skip-test-swift', toggle_true('impl_skip_test_swift'))
 
-
     # -------------------------------------------------------------------------
     return builder.build()
 
diff --git a/utils/build_swift/tests/test_driver_arguments.py b/utils/build_swift/tests/test_driver_arguments.py
index c58b8ab3328b4..a93f412631b5d 100644
--- a/utils/build_swift/tests/test_driver_arguments.py
+++ b/utils/build_swift/tests/test_driver_arguments.py
@@ -421,7 +421,7 @@ def parse_args_and_unknown_args(self, args, namespace=None):
 
     def parse_args(self, args, namespace=None):
         namespace, unknown_args = self.parse_args_and_unknown_args(args,
-            namespace)
+                                                                   namespace)
 
         if unknown_args:
             raise ParserError('unknown arguments: ' + str(unknown_args))
diff --git a/utils/swift_build_support/swift_build_support/migration.py b/utils/swift_build_support/swift_build_support/migration.py
index de341143a850f..9c7e746013332 100644
--- a/utils/swift_build_support/swift_build_support/migration.py
+++ b/utils/swift_build_support/swift_build_support/migration.py
@@ -32,9 +32,9 @@ def parse_args(parser, argv):
     """
     args, unknown_args = parser.parse_known_args(
         list(arg for arg in argv if arg != '--'))
-    
+
     args, unknown_args = process_disambiguation_arguments(args, unknown_args)
-    
+
     args.build_script_impl_args = unknown_args
     return args
 
@@ -58,6 +58,7 @@ def process_disambiguation_arguments(args, unknown_args):
 
     return args, unknown_args
 
+
 def check_impl_args(build_script_impl, argv):
     """
     Check whether given argv are all known arguments for `build-script-impl`.
diff --git a/utils/swift_build_support/swift_build_support/products/skstresstester.py b/utils/swift_build_support/swift_build_support/products/skstresstester.py
index e9423c1ffc3f6..ee31271701bb1 100644
--- a/utils/swift_build_support/swift_build_support/products/skstresstester.py
+++ b/utils/swift_build_support/swift_build_support/products/skstresstester.py
@@ -17,6 +17,7 @@
 from .. import shell
 from .. import targets
 
+
 class SKStressTester(product.Product):
     @classmethod
     def product_source_name(cls):
@@ -63,8 +64,8 @@ def should_build(self, host_target):
     def build(self, host_target):
         if platform.system() != 'Darwin':
             raise RuntimeError("Unable to build {product} on a platform other "
-                               "than Darwin".format(product=self.package_name())
-                               )
+                               "than Darwin".format(
+                                   product=self.package_name()))
 
         self.run_build_script_helper('build')
 
@@ -82,4 +83,3 @@ def install(self, host_target):
         self.run_build_script_helper('install', [
             '--prefix', install_prefix
         ])
-
diff --git a/utils/swift_build_support/swift_build_support/products/swiftevolve.py b/utils/swift_build_support/swift_build_support/products/swiftevolve.py
index f985d6da4659b..579e90b6e0b4f 100644
--- a/utils/swift_build_support/swift_build_support/products/swiftevolve.py
+++ b/utils/swift_build_support/swift_build_support/products/swiftevolve.py
@@ -10,7 +10,6 @@
 #
 # ----------------------------------------------------------------------------
 
-from . import product
 from . import skstresstester