[Python] Use explicit imports (again) - split up to avoid pygments issue in #757

tools/SourceKit/bindings/python/sourcekitd/capi.py

@@ -10,7 +10,22 @@
 #
 #===------------------------------------------------------------------------===#
 
-from ctypes import *
+from ctypes import (
+    CFUNCTYPE,
+    POINTER,
+    Structure,
+    addressof,
+    c_bool,
+    c_char_p,
+    c_int,
+    c_int64,
+    c_size_t,
+    c_uint64,
+    c_void_p,
+    cdll,
+    py_object,
+    string_at,
+)
 
 # ctypes doesn't implicitly convert c_void_p to the appropriate wrapper
 # object. This is a problem, because it means that from_parameter will see an

utils/build-script

@@ -21,8 +21,16 @@ import textwrap
 
 sys.path.append(os.path.dirname(__file__))
 
-from SwiftBuildSupport import *
-
+from SwiftBuildSupport import (
+    HOME,
+    SWIFT_BUILD_ROOT,
+    SWIFT_SOURCE_ROOT,
+    check_call,
+    get_all_preset_names,
+    get_preset_options,
+    print_with_argv0,
+    quote_shell_command,
+)
 
 # Main entry point for the preset mode.
 def main_preset():

utils/cmpcodesize/cmpcodesize.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-import cmpcodesize
+from cmpcodesize.main import main
 
 if __name__ == '__main__':
-    cmpcodesize.main()
+    main()

utils/cmpcodesize/cmpcodesize/__init__.py

@@ -1,6 +1,3 @@
-from __future__ import absolute_import
-from .main import main
-
 __author__ = 'Brian Gesiak'
 __email__ = '[email protected]'
 __versioninfo__ = (0, 1, 0)

utils/recursive-lipo

@@ -8,7 +8,7 @@ import filecmp
 import os
 import shutil
 
-from SwiftBuildSupport import *
+from SwiftBuildSupport import check_call
 
 def merge_file_lists(src_root_dirs, skip_files, skip_subpaths):
     """Merges the file lists recursively from all src_root_dirs supplied,

utils/update-checkout

@@ -19,8 +19,12 @@ import sys
 
 sys.path.append(os.path.dirname(__file__))
 
-from SwiftBuildSupport import *
-
+from SwiftBuildSupport import (
+    SWIFT_SOURCE_ROOT,
+    WorkingDirectory,
+    check_call,
+    check_output,
+)
 
 def update_git_svn(repo_path):
     with WorkingDirectory(repo_path):