Merge pull request swiftlang#29244 from Rostepher/adopt-six-in-build-swift

[Build System: build-script] Adopt the six compatibility library in the build_swift module.

Author: Rostepher

utils/build_swift/build_swift/argparse/__init__.py

@@ -14,6 +14,7 @@
 super-set of the argparse API and is meant to be used as a drop-in replacement.
 """
 
+from __future__ import absolute_import, unicode_literals
 
 from argparse import (ArgumentDefaultsHelpFormatter, ArgumentError,
                       ArgumentTypeError, FileType, HelpFormatter,

utils/build_swift/build_swift/argparse/actions.py

@@ -13,9 +13,13 @@
 """
 
 
+from __future__ import absolute_import, unicode_literals
+
 import argparse
 import copy
 
+import six
+
 from .types import BoolType, PathType
 
 
@@ -77,7 +81,7 @@ def __init__(self,
         if dests == argparse.SUPPRESS:
             dests = []
             metavar = metavar or ''
-        elif isinstance(dests, str):
+        elif isinstance(dests, six.string_types):
             dests = [dests]
             metavar = metavar or dests[0].upper()
 
@@ -134,7 +138,7 @@ def __init__(self, option_strings, join=None, **kwargs):
             **kwargs)
 
     def __call__(self, parser, namespace, values, option_string=None):
-        if isinstance(values, str):
+        if isinstance(values, six.string_types):
             values = [values]
 
         for dest in self.dests:
@@ -339,5 +343,5 @@ def __call__(self, parser, namespace, values, option_string=None):
         if self.message is not None:
             parser.error(self.message)
 
-        arg = option_string or str(values)
+        arg = option_string or six.text_type(values)
         parser.error('unsupported argument: {}'.format(arg))

utils/build_swift/build_swift/argparse/parser.py

@@ -14,9 +14,13 @@
 """
 
 
+from __future__ import absolute_import, unicode_literals
+
 import argparse
 from contextlib import contextmanager
 
+import six
+
 from . import Namespace, SUPPRESS, actions
 from .actions import Action
 
@@ -129,7 +133,7 @@ def thunk(**kwargs):
             *names, action=action, **kwargs)
 
     def add_positional(self, dests, action=None, **kwargs):
-        if isinstance(dests, str):
+        if isinstance(dests, six.string_types):
             dests = [dests]
 
         if any(dest.startswith('-') for dest in dests):
@@ -141,7 +145,7 @@ def add_positional(self, dests, action=None, **kwargs):
         return self._add_argument(dests, action, **kwargs)
 
     def add_option(self, option_strings, *actions, **kwargs):
-        if isinstance(option_strings, str):
+        if isinstance(option_strings, six.string_types):
             option_strings = [option_strings]
 
         if not all(opt.startswith('-') for opt in option_strings):

utils/build_swift/build_swift/argparse/types.py

@@ -13,10 +13,14 @@
 """
 
 
+from __future__ import absolute_import, unicode_literals
+
 import os.path
 import re
 import shlex
 
+import six
+
 from . import ArgumentTypeError
 
 
@@ -40,7 +44,7 @@ class CompilerVersion(object):
 
     def __init__(self, *components):
         if len(components) == 1:
-            if isinstance(components[0], str):
+            if isinstance(components[0], six.string_types):
                 components = components[0].split('.')
             elif isinstance(components[0], (list, tuple)):
                 components = components[0]
@@ -54,7 +58,7 @@ def __eq__(self, other):
         return self.components == other.components
 
     def __str__(self):
-        return '.'.join([str(part) for part in self.components])
+        return '.'.join([six.text_type(part) for part in self.components])
 
 
 # -----------------------------------------------------------------------------

utils/build_swift/build_swift/defaults.py

@@ -12,6 +12,8 @@
 """
 
 
+from __future__ import absolute_import, unicode_literals
+
 from .argparse import CompilerVersion
 
 

utils/build_swift/build_swift/driver_arguments.py

@@ -7,6 +7,8 @@
 # See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 
 
+from __future__ import absolute_import, unicode_literals
+
 import multiprocessing
 import os
 

utils/build_swift/build_swift/migration.py

@@ -17,24 +17,12 @@
 import itertools
 import subprocess
 
+from six.moves import map
+
 from swift_build_support.swift_build_support.targets import \
     StdlibDeploymentTarget
 
 
-try:
-    # Python 2
-    from itertools import imap
-except ImportError:
-    imap = map
-
-
-try:
-    # Python 2
-    unicode
-except NameError:
-    unicode = str
-
-
 __all__ = [
     'UnknownSDKError',
 
@@ -94,12 +82,12 @@ def _migrate_swift_sdks_arg(arg):
         sdks = arg.split('=')[1]
         sdk_list = [] if sdks == '' else sdks.split(';')
 
-        targets = _flatten(imap(_swift_sdk_to_stdlib_targets, sdk_list))
+        targets = _flatten(map(_swift_sdk_to_stdlib_targets, sdk_list))
         target_names = [target.name for target in targets]
 
         return '--stdlib-deployment-targets={}'.format(' '.join(target_names))
 
-    return list(imap(_migrate_swift_sdks_arg, args))
+    return list(map(_migrate_swift_sdks_arg, args))
 
 
 # -----------------------------------------------------------------------------

utils/build_swift/build_swift/presets.py

@@ -17,13 +17,8 @@
 from collections import namedtuple
 from contextlib import contextmanager
 
-try:
-    # Python 2
-    import ConfigParser as configparser
-    from StringIO import StringIO
-except ImportError:
-    import configparser
-    from io import StringIO
+from six import StringIO
+from six.moves import configparser
 
 
 __all__ = [

utils/build_swift/tests/argparse/test_actions.py

@@ -7,6 +7,10 @@
 # See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 
 
+from __future__ import absolute_import, unicode_literals
+
+import six
+
 from ..utils import TestCase, redirect_stderr
 from ...build_swift.argparse import (
     ArgumentParser, BoolType, Nargs, PathType, SUPPRESS, actions)
@@ -179,7 +183,7 @@ def test_valid_int(self):
         parser.add_argument('--foo', action=actions.StoreIntAction)
 
         for i in [0, 1, 42, -64]:
-            args = parser.parse_args(['--foo', str(i)])
+            args = parser.parse_args(['--foo', six.text_type(i)])
             self.assertEqual(args.foo, i)
 
     def test_invalid_int(self):
@@ -188,7 +192,7 @@ def test_invalid_int(self):
 
         for i in [0.0, True, 'bar']:
             with self.quietOutput(), self.assertRaises(SystemExit):
-                parser.parse_args(['--foo', str(i)])
+                parser.parse_args(['--foo', six.text_type(i)])
 
 
 class TestStoreTrueAction(TestCase):
@@ -294,7 +298,7 @@ def test_with_optional_true_arg(self):
         parser.add_argument('--foo', action=actions.ToggleTrueAction)
 
         for value in BoolType.TRUE_VALUES:
-            args = parser.parse_args(['--foo', str(value)])
+            args = parser.parse_args(['--foo', six.text_type(value)])
             self.assertTrue(args.foo)
 
             args = parser.parse_args(['--foo={}'.format(value)])
@@ -305,7 +309,7 @@ def test_with_optional_false_arg(self):
         parser.add_argument('--foo', action=actions.ToggleTrueAction)
 
         for value in BoolType.FALSE_VALUES:
-            args = parser.parse_args(['--foo', str(value)])
+            args = parser.parse_args(['--foo', six.text_type(value)])
             self.assertFalse(args.foo)
 
             args = parser.parse_args(['--foo={}'.format(value)])
@@ -356,7 +360,7 @@ def test_with_optional_true_arg(self):
         parser.add_argument('--foo', action=actions.ToggleFalseAction)
 
         for value in BoolType.TRUE_VALUES:
-            args = parser.parse_args(['--foo', str(value)])
+            args = parser.parse_args(['--foo', six.text_type(value)])
             self.assertFalse(args.foo)
 
             args = parser.parse_args(['--foo={}'.format(value)])
@@ -367,7 +371,7 @@ def test_with_optional_false_arg(self):
         parser.add_argument('--foo', action=actions.ToggleFalseAction)
 
         for value in BoolType.FALSE_VALUES:
-            args = parser.parse_args(['--foo', str(value)])
+            args = parser.parse_args(['--foo', six.text_type(value)])
             self.assertTrue(args.foo)
 
             args = parser.parse_args(['--foo={}'.format(value)])

utils/build_swift/tests/argparse/test_parser.py

@@ -7,6 +7,8 @@
 # See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 
 
+from __future__ import absolute_import, unicode_literals
+
 from argparse import _ArgumentGroup, _MutuallyExclusiveGroup
 
 from ..utils import TestCase

utils/build_swift/tests/argparse/test_types.py

@@ -7,9 +7,13 @@
 # See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 
 
+from __future__ import absolute_import, unicode_literals
+
 import os.path
 import platform
 
+import six
+
 from ..utils import TestCase
 from ...build_swift.argparse import ArgumentTypeError, types
 
@@ -67,10 +71,10 @@ def test_eq(self):
 
     def test_str(self):
         version = types.CompilerVersion('1.0.0')
-        self.assertEqual(str(version), '1.0.0')
+        self.assertEqual(six.text_type(version), '1.0.0')
 
         version = types.CompilerVersion('1.0.0.1')
-        self.assertEqual(str(version), '1.0.0.1')
+        self.assertEqual(six.text_type(version), '1.0.0.1')
 
 
 class TestBoolType(TestCase):

utils/build_swift/tests/expected_options.py

@@ -7,6 +7,8 @@
 # See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 
 
+from __future__ import absolute_import, unicode_literals
+
 import multiprocessing
 
 from swift_build_support.swift_build_support import host