From a672328f1e2515f5b103df12d19fa3c2ffba68fc Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Thu, 30 Apr 2020 11:28:09 +0200 Subject: bpo-40443: Remove unused imports in distutils (GH-19802) --- _msvccompiler.py | 4 ---- bcppcompiler.py | 4 ++-- ccompiler.py | 2 +- command/bdist_rpm.py | 1 - command/bdist_wininst.py | 2 +- command/check.py | 1 - command/upload.py | 1 - cygwinccompiler.py | 2 -- msvc9compiler.py | 3 +-- msvccompiler.py | 2 +- sysconfig.py | 1 - 11 files changed, 6 insertions(+), 17 deletions(-) diff --git a/_msvccompiler.py b/_msvccompiler.py index 03a5986d..af8099a4 100644 --- a/_msvccompiler.py +++ b/_msvccompiler.py @@ -14,8 +14,6 @@ for older versions in distutils.msvc9compiler and distutils.msvccompiler. # ported to VS 2015 by Steve Dower import os -import shutil -import stat import subprocess import winreg @@ -65,8 +63,6 @@ def _find_vc2017(): If vswhere.exe is not available, by definition, VS 2017 is not installed. """ - import json - root = os.environ.get("ProgramFiles(x86)") or os.environ.get("ProgramFiles") if not root: return None, None diff --git a/bcppcompiler.py b/bcppcompiler.py index 9f4c432d..071fea5d 100644 --- a/bcppcompiler.py +++ b/bcppcompiler.py @@ -14,10 +14,10 @@ for the Borland C++ compiler. import os from distutils.errors import \ - DistutilsExecError, DistutilsPlatformError, \ + DistutilsExecError, \ CompileError, LibError, LinkError, UnknownFileError from distutils.ccompiler import \ - CCompiler, gen_preprocess_options, gen_lib_options + CCompiler, gen_preprocess_options from distutils.file_util import write_file from distutils.dep_util import newer from distutils import log diff --git a/ccompiler.py b/ccompiler.py index 4cfc6c70..b5ef143e 100644 --- a/ccompiler.py +++ b/ccompiler.py @@ -8,7 +8,7 @@ from distutils.errors import * from distutils.spawn import spawn from distutils.file_util import move_file from distutils.dir_util import mkpath -from distutils.dep_util import newer_pairwise, newer_group +from distutils.dep_util import newer_group from distutils.util import split_quoted, execute from distutils import log diff --git a/command/bdist_rpm.py b/command/bdist_rpm.py index 74381cc6..550cbfa1 100644 --- a/command/bdist_rpm.py +++ b/command/bdist_rpm.py @@ -6,7 +6,6 @@ distributions).""" import subprocess, sys, os from distutils.core import Command from distutils.debug import DEBUG -from distutils.util import get_platform from distutils.file_util import write_file from distutils.errors import * from distutils.sysconfig import get_python_version diff --git a/command/bdist_wininst.py b/command/bdist_wininst.py index b5ed6f04..0e9ddaa2 100644 --- a/command/bdist_wininst.py +++ b/command/bdist_wininst.py @@ -8,7 +8,7 @@ import sys import warnings from distutils.core import Command from distutils.util import get_platform -from distutils.dir_util import create_tree, remove_tree +from distutils.dir_util import remove_tree from distutils.errors import * from distutils.sysconfig import get_python_version from distutils import log diff --git a/command/check.py b/command/check.py index 7ceabd3a..ada25006 100644 --- a/command/check.py +++ b/command/check.py @@ -11,7 +11,6 @@ try: from docutils.parsers.rst import Parser from docutils import frontend from docutils import nodes - from io import StringIO class SilentReporter(Reporter): diff --git a/command/upload.py b/command/upload.py index 11afa24b..d822ba01 100644 --- a/command/upload.py +++ b/command/upload.py @@ -7,7 +7,6 @@ index). import os import io -import platform import hashlib from base64 import standard_b64encode from urllib.request import urlopen, Request, HTTPError diff --git a/cygwinccompiler.py b/cygwinccompiler.py index 6c5d7774..66c12dd3 100644 --- a/cygwinccompiler.py +++ b/cygwinccompiler.py @@ -51,12 +51,10 @@ import copy from subprocess import Popen, PIPE, check_output import re -from distutils.ccompiler import gen_preprocess_options, gen_lib_options from distutils.unixccompiler import UnixCCompiler from distutils.file_util import write_file from distutils.errors import (DistutilsExecError, CCompilerError, CompileError, UnknownFileError) -from distutils import log from distutils.version import LooseVersion from distutils.spawn import find_executable diff --git a/msvc9compiler.py b/msvc9compiler.py index 4c0036a0..6934e964 100644 --- a/msvc9compiler.py +++ b/msvc9compiler.py @@ -19,8 +19,7 @@ import re from distutils.errors import DistutilsExecError, DistutilsPlatformError, \ CompileError, LibError, LinkError -from distutils.ccompiler import CCompiler, gen_preprocess_options, \ - gen_lib_options +from distutils.ccompiler import CCompiler, gen_lib_options from distutils import log from distutils.util import get_platform diff --git a/msvccompiler.py b/msvccompiler.py index d1de2fbf..d5857cb1 100644 --- a/msvccompiler.py +++ b/msvccompiler.py @@ -13,7 +13,7 @@ from distutils.errors import \ DistutilsExecError, DistutilsPlatformError, \ CompileError, LibError, LinkError from distutils.ccompiler import \ - CCompiler, gen_preprocess_options, gen_lib_options + CCompiler, gen_lib_options from distutils import log _can_read_reg = False diff --git a/sysconfig.py b/sysconfig.py index 01ee5197..37feae5d 100644 --- a/sysconfig.py +++ b/sysconfig.py @@ -15,7 +15,6 @@ import re import sys from .errors import DistutilsPlatformError -from .util import get_platform, get_host_platform # These are needed in a couple of spots, so just compute them once. PREFIX = os.path.normpath(sys.prefix) -- cgit v1.2.1