Revert "build-swift: Explicitly use python3"

Author: shahmishal

utils/build-script

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 
 # This source file is part of the Swift.org open source project
 #
@@ -8,10 +8,14 @@
 # See https://swift.org/LICENSE.txt for license information
 # See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 
+
 """
 The ultimate tool for building Swift.
 """
 
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import json
 import os
 import platform
@@ -28,6 +32,8 @@ from build_swift.build_swift.constants import SWIFT_BUILD_ROOT
 from build_swift.build_swift.constants import SWIFT_REPO_NAME
 from build_swift.build_swift.constants import SWIFT_SOURCE_ROOT
 
+import six
+
 from swift_build_support.swift_build_support import build_script_invocation
 from swift_build_support.swift_build_support import shell
 from swift_build_support.swift_build_support import targets
@@ -113,7 +119,7 @@ class JSONDumper(json.JSONEncoder):
     def default(self, o):
         if hasattr(o, '__dict__'):
             return vars(o)
-        return str(o)
+        return six.text_type(o)
 
 
 def print_xcodebuild_versions(file=sys.stdout):
@@ -500,7 +506,7 @@ def main_preset():
     try:
         preset_parser.read_files(args.preset_file_names)
     except presets.PresetError as e:
-        fatal_error(str(e))
+        fatal_error(six.text_type(e))
 
     if args.show_presets:
         for name in sorted(preset_parser.preset_names,
@@ -521,7 +527,7 @@ def main_preset():
             args.preset,
             vars=args.preset_substitutions)
     except presets.PresetError as e:
-        fatal_error(str(e))
+        fatal_error(six.text_type(e))
 
     preset_args = migration.migrate_swift_sdks(preset.args)
 

utils/swift_build_support/swift_build_support/productpipeline_list_builder.py

@@ -141,7 +141,7 @@ def infer(self):
 
             # Filter out any of the pipelines that before inference were not
             # selected.
-            enabled_pipeline = [p for p in pipeline if p is not None]
+            enabled_pipeline = filter(lambda x: x is not None, pipeline)
 
             if self.args.verbose_build:
                 print("-- Build Graph Inference --")