fixup! fixup! [NFC] Remove Python 2 imports from __future__

dduan · dduan · commit ccaeffd0e1ea · 2022-03-29T14:48:32.000-07:00
diff --git a/stdlib/public/core/FloatingPointTypes.swift.gyb b/stdlib/public/core/FloatingPointTypes.swift.gyb
@@ -13,7 +13,6 @@
 import SwiftShims
 
 %{
-from __future__ import division
 from SwiftIntTypes import all_integer_types
 from SwiftFloatingPointTypes import all_floating_point_types
 
diff --git a/stdlib/public/core/IntegerTypes.swift.gyb b/stdlib/public/core/IntegerTypes.swift.gyb
@@ -14,7 +14,6 @@
 # Utility code for later in this template
 #
 
-from __future__ import division
 from SwiftIntTypes import all_integer_types, int_max_bits, should_define_truncating_bit_pattern_init
 from SwiftFloatingPointTypes import getFtoIBounds
 
diff --git a/stdlib/public/core/SIMDConcreteOperations.swift.gyb b/stdlib/public/core/SIMDConcreteOperations.swift.gyb
@@ -11,7 +11,6 @@
 //===----------------------------------------------------------------------===//
 
 %{
-from __future__ import division
 from SwiftIntTypes import all_integer_types
 word_bits = int(CMAKE_SIZEOF_VOID_P) * 8
 storagescalarCounts = [2,4,8,16,32,64]
diff --git a/stdlib/public/core/SIMDVectorTypes.swift.gyb b/stdlib/public/core/SIMDVectorTypes.swift.gyb
@@ -11,7 +11,6 @@
 //===----------------------------------------------------------------------===//
 
 %{
-from __future__ import division
 from SwiftIntTypes import all_integer_types
 word_bits = int(CMAKE_SIZEOF_VOID_P) * 8
 storagescalarCounts = [2,4,8,16,32,64]
diff --git a/test/Driver/Inputs/filelists/check-filelist-abc.py b/test/Driver/Inputs/filelists/check-filelist-abc.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # check-filelist-abc.py - Fake build to test driver-produced -filelists.
 #
 # This source file is part of the Swift.org open source project
diff --git a/test/lit.cfg b/test/lit.cfg
@@ -18,7 +18,6 @@
 #
 # -----------------------------------------------------------------------------
 
-from __future__ import absolute_import
 import os
 import platform
 import re
diff --git a/test/stdlib/Integers.swift.gyb b/test/stdlib/Integers.swift.gyb
@@ -20,7 +20,6 @@
 // REQUIRES: OS=macosx
 
 %{
-from __future__ import division
 word_bits = int(WORD_BITS) // 2
 from SwiftIntTypes import all_integer_types
 }%
diff --git a/test/stdlib/NumericParsing.swift.gyb b/test/stdlib/NumericParsing.swift.gyb
@@ -17,7 +17,6 @@
 // RUN: %line-directive %t/NumericParsing.swift -- %target-run %t/a.out
 // REQUIRES: executable_test
 %{
-from __future__ import division
 from SwiftIntTypes import all_integer_types
 
 word_bits = int(CMAKE_SIZEOF_VOID_P)
diff --git a/test/stdlib/SIMDConcreteIntegers.swift.gyb b/test/stdlib/SIMDConcreteIntegers.swift.gyb
@@ -20,7 +20,6 @@
 import StdlibUnittest
 
 %{
-from __future__ import division
 from SwiftIntTypes import all_integer_types
 word_bits = int(CMAKE_SIZEOF_VOID_P) * 8
 storagescalarCounts = [2,4,8,16,32,64]
diff --git a/test/stdlib/SIMDConcreteMasks.swift.gyb b/test/stdlib/SIMDConcreteMasks.swift.gyb
@@ -20,7 +20,6 @@
 import StdlibUnittest
 
 %{
-from __future__ import division
 from SwiftIntTypes import all_integer_types
 word_bits = int(CMAKE_SIZEOF_VOID_P) * 8
 storagescalarCounts = [2,4,8,16,32,64]
diff --git a/utils/backtrace-check b/utils/backtrace-check
@@ -22,8 +22,6 @@ StaticString, StaticString, UInt, flags : UInt32) -> () + 444
 """
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 import argparse
 import re
 import sys
diff --git a/utils/build-script b/utils/build-script
@@ -14,8 +14,6 @@ The ultimate tool for building Swift.
 """
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 import json
 import os
 import platform
diff --git a/utils/build_swift/build_swift/argparse/__init__.py b/utils/build_swift/build_swift/argparse/__init__.py
@@ -14,8 +14,6 @@
 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,
                       Namespace, RawDescriptionHelpFormatter,
diff --git a/utils/build_swift/build_swift/argparse/actions.py b/utils/build_swift/build_swift/argparse/actions.py
@@ -13,8 +13,6 @@
 """
 
 
-from __future__ import absolute_import, unicode_literals
-
 import argparse
 import copy
 
diff --git a/utils/build_swift/build_swift/argparse/parser.py b/utils/build_swift/build_swift/argparse/parser.py
@@ -13,9 +13,6 @@
 constructing complex parsers.
 """
 
-
-from __future__ import absolute_import, unicode_literals
-
 import argparse
 from contextlib import contextmanager
 
diff --git a/utils/build_swift/build_swift/argparse/types.py b/utils/build_swift/build_swift/argparse/types.py
@@ -13,8 +13,6 @@
 """
 
 
-from __future__ import absolute_import, unicode_literals
-
 import os.path
 import re
 import shlex
diff --git a/utils/build_swift/build_swift/cache_utils.py b/utils/build_swift/build_swift/cache_utils.py
@@ -11,9 +11,6 @@
 Cache related utitlity functions and decorators.
 """
 
-
-from __future__ import absolute_import, unicode_literals
-
 import functools
 
 
diff --git a/utils/build_swift/build_swift/class_utils.py b/utils/build_swift/build_swift/class_utils.py
@@ -12,9 +12,6 @@
 """
 
 
-from __future__ import absolute_import, unicode_literals
-
-
 __all__ = [
     'generate_repr',
 ]
diff --git a/utils/build_swift/build_swift/defaults.py b/utils/build_swift/build_swift/defaults.py
@@ -11,9 +11,6 @@
 Default option value definitions.
 """
 
-
-from __future__ import absolute_import, unicode_literals
-
 import os
 import platform
 
diff --git a/utils/build_swift/build_swift/driver_arguments.py b/utils/build_swift/build_swift/driver_arguments.py
@@ -6,9 +6,6 @@
 # See https://swift.org/LICENSE.txt for license information
 # See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 
-
-from __future__ import absolute_import, unicode_literals
-
 import multiprocessing
 import os
 
diff --git a/utils/build_swift/build_swift/migration.py b/utils/build_swift/build_swift/migration.py
@@ -12,8 +12,6 @@
 """
 
 
-from __future__ import absolute_import, unicode_literals
-
 import itertools
 import subprocess
 
diff --git a/utils/build_swift/build_swift/presets.py b/utils/build_swift/build_swift/presets.py
@@ -12,8 +12,6 @@
 """
 
 
-from __future__ import absolute_import, unicode_literals
-
 import configparser
 import functools
 import io
diff --git a/utils/build_swift/build_swift/shell.py b/utils/build_swift/build_swift/shell.py
@@ -12,8 +12,6 @@
 """
 
 
-from __future__ import absolute_import, unicode_literals
-
 import abc
 import collections
 import functools
diff --git a/utils/build_swift/build_swift/versions.py b/utils/build_swift/build_swift/versions.py
@@ -12,8 +12,6 @@
 """
 
 
-from __future__ import absolute_import, unicode_literals
-
 import functools
 
 
diff --git a/utils/build_swift/build_swift/wrappers/__init__.py b/utils/build_swift/build_swift/wrappers/__init__.py
@@ -6,9 +6,6 @@
 # See https://swift.org/LICENSE.txt for license information
 # See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 
-
-from __future__ import absolute_import, unicode_literals
-
 from . import xcrun as _xcrun
 
 
diff --git a/utils/build_swift/build_swift/wrappers/xcrun.py b/utils/build_swift/build_swift/wrappers/xcrun.py
@@ -11,9 +11,6 @@
 Wrapper module around the 'xcrun' command-line utility.
 """
 
-
-from __future__ import absolute_import, unicode_literals
-
 import functools
 import re
 import shlex
diff --git a/utils/build_swift/run_tests.py b/utils/build_swift/run_tests.py
@@ -14,8 +14,6 @@
 """
 
 
-from __future__ import absolute_import, unicode_literals
-
 import argparse
 import os
 import sys
diff --git a/utils/build_swift/tests/build_swift/argparse/test_actions.py b/utils/build_swift/tests/build_swift/argparse/test_actions.py
@@ -7,8 +7,6 @@
 # See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 
 
-from __future__ import absolute_import, unicode_literals
-
 import unittest
 
 from build_swift.argparse import (
diff --git a/utils/build_swift/tests/build_swift/argparse/test_parser.py b/utils/build_swift/tests/build_swift/argparse/test_parser.py
@@ -7,8 +7,6 @@
 # See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 
 
-from __future__ import absolute_import, unicode_literals
-
 import unittest
 from argparse import _ArgumentGroup, _MutuallyExclusiveGroup
 
diff --git a/utils/build_swift/tests/build_swift/argparse/test_types.py b/utils/build_swift/tests/build_swift/argparse/test_types.py
@@ -7,8 +7,6 @@
 # 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 unittest
diff --git a/utils/build_swift/tests/build_swift/test_cache_utils.py b/utils/build_swift/tests/build_swift/test_cache_utils.py
@@ -7,8 +7,6 @@
 # See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 
 
-from __future__ import absolute_import, unicode_literals
-
 import unittest
 
 from build_swift import cache_utils
diff --git a/utils/build_swift/tests/build_swift/test_constants.py b/utils/build_swift/tests/build_swift/test_constants.py
@@ -7,9 +7,6 @@
 # See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 
 
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 import os.path
 import unittest
 
diff --git a/utils/build_swift/tests/build_swift/test_defaults.py b/utils/build_swift/tests/build_swift/test_defaults.py
@@ -7,8 +7,6 @@
 # See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 
 
-from __future__ import absolute_import, unicode_literals
-
 import unittest
 
 from build_swift import defaults
diff --git a/utils/build_swift/tests/build_swift/test_driver_arguments.py b/utils/build_swift/tests/build_swift/test_driver_arguments.py
@@ -7,8 +7,6 @@
 # See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 
 
-from __future__ import absolute_import, unicode_literals
-
 import os
 import platform
 import sys
diff --git a/utils/build_swift/tests/build_swift/test_migration.py b/utils/build_swift/tests/build_swift/test_migration.py
@@ -7,8 +7,6 @@
 # See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 
 
-from __future__ import absolute_import, unicode_literals
-
 import platform
 import unittest
 
diff --git a/utils/build_swift/tests/build_swift/test_presets.py b/utils/build_swift/tests/build_swift/test_presets.py
@@ -7,8 +7,6 @@
 # See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 
 
-from __future__ import unicode_literals
-
 import configparser
 import os
 import unittest
diff --git a/utils/build_swift/tests/build_swift/test_shell.py b/utils/build_swift/tests/build_swift/test_shell.py
@@ -7,8 +7,6 @@
 # See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 
 
-from __future__ import absolute_import, unicode_literals
-
 import builtins
 import collections
 import sys
diff --git a/utils/build_swift/tests/build_swift/test_versions.py b/utils/build_swift/tests/build_swift/test_versions.py
@@ -7,8 +7,6 @@
 # See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 
 
-from __future__ import absolute_import, unicode_literals
-
 import unittest
 
 from build_swift.versions import Version
diff --git a/utils/build_swift/tests/build_swift/wrappers/test_xcrun.py b/utils/build_swift/tests/build_swift/wrappers/test_xcrun.py
@@ -7,8 +7,6 @@
 # See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 
 
-from __future__ import absolute_import, unicode_literals
-
 import os.path
 import unittest
 
diff --git a/utils/build_swift/tests/expected_options.py b/utils/build_swift/tests/expected_options.py
@@ -7,8 +7,6 @@
 # See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 
 
-from __future__ import absolute_import, unicode_literals
-
 import multiprocessing
 
 from build_swift import argparse
diff --git a/utils/build_swift/tests/utils.py b/utils/build_swift/tests/utils.py
@@ -7,8 +7,6 @@
 # See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 
 
-from __future__ import absolute_import, unicode_literals
-
 import functools
 import os
 import platform
diff --git a/utils/python_lint.py b/utils/python_lint.py
@@ -16,8 +16,6 @@
 """
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 import os
 import subprocess
 import sys
diff --git a/utils/swift_build_support/run_tests.py b/utils/swift_build_support/run_tests.py
@@ -14,8 +14,6 @@
 """
 
 
-from __future__ import absolute_import, unicode_literals
-
 import os
 import sys
 import unittest
diff --git a/utils/swift_build_support/swift_build_support/cmake.py b/utils/swift_build_support/swift_build_support/cmake.py
@@ -15,8 +15,6 @@
 # ----------------------------------------------------------------------------
 
 
-from __future__ import absolute_import, unicode_literals
-
 import os
 import platform
 import re
diff --git a/utils/swift_build_support/swift_build_support/toolchain.py b/utils/swift_build_support/swift_build_support/toolchain.py
diff --git a/utils/swift_build_support/swift_build_support/utils.py b/utils/swift_build_support/swift_build_support/utils.py
diff --git a/utils/swift_build_support/tests/test_build_graph.py b/utils/swift_build_support/tests/test_build_graph.py
diff --git a/utils/swift_build_support/tests/test_cmake.py b/utils/swift_build_support/tests/test_cmake.py
diff --git a/validation-test/stdlib/FixedPoint.swift.gyb b/validation-test/stdlib/FixedPoint.swift.gyb

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,6 @@`
`14`	`14`	`# Utility code for later in this template`
`15`	`15`	`#`
`16`	`16`
`17`		`-from __future__ import division`
`18`	`17`	`from SwiftIntTypes import all_integer_types, int_max_bits, should_define_truncating_bit_pattern_init`
`19`	`18`	`from SwiftFloatingPointTypes import getFtoIBounds`
`20`	`19`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#!/usr/bin/env python`
	`1`	`+#!/usr/bin/env python3`
`2`	`2`	`# check-filelist-abc.py - Fake build to test driver-produced -filelists.`
`3`	`3`	`#`
`4`	`4`	`# This source file is part of the Swift.org open source project`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@`
`18`	`18`	`#`
`19`	`19`	`# -----------------------------------------------------------------------------`
`20`	`20`
`21`		`-from __future__ import absolute_import`
`22`	`21`	`import os`
`23`	`22`	`import platform`
`24`	`23`	`import re`
Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,6 @@`
`12`	`12`	`"""`
`13`	`13`
`14`	`14`
`15`		`-from __future__ import absolute_import, unicode_literals`
`16`		`-`
`17`		`-`
`18`	`15`	`__all__ = [`
`19`	`16`	`'generate_repr',`
`20`	`17`	`]`