mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 00:23:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

bpo-43425: Update setup.py not to use distutils.log (GH-26969)

Browse source
This commit is contained in:
Dong-hee Na 2021-07-02 10:41:54 +09:00 • committed by GitHub
parent 0d7f61ddb0
commit a7e251b07a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

39
setup.py
View file

@ -4,6 +4,7 @@ import argparse
import importlib._bootstrap import importlib._bootstrap
import importlib.machinery import importlib.machinery
import importlib.util import importlib.util
import logging
import os import os
import re import re
import sys import sys
@ -44,7 +45,6 @@ with warnings.catch_warnings():
DeprecationWarning DeprecationWarning
) )
from distutils import log
from distutils.command.build_ext import build_ext from distutils.command.build_ext import build_ext
from distutils.command.build_scripts import build_scripts from distutils.command.build_scripts import build_scripts
from distutils.command.install import install from distutils.command.install import install
@ -64,6 +64,10 @@ DISABLED_MODULE_LIST = []
LIST_MODULE_NAMES = False LIST_MODULE_NAMES = False
logging.basicConfig(format='%(message)s', level=logging.INFO)
log = logging.getLogger('setup')
def get_platform(): def get_platform():
# Cross compiling # Cross compiling
if "_PYTHON_HOST_PLATFORM" in os.environ: if "_PYTHON_HOST_PLATFORM" in os.environ:
@ -241,6 +245,7 @@ def grep_headers_for(function, headers):
return True return True
return False return False
def find_file(filename, std_dirs, paths): def find_file(filename, std_dirs, paths):
"""Searches for the directory where a given file is located, """Searches for the directory where a given file is located,
and returns a possibly-empty list of additional directories, or None and returns a possibly-empty list of additional directories, or None
@ -259,23 +264,23 @@ def find_file(filename, std_dirs, paths):
sysroot = macosx_sdk_root() sysroot = macosx_sdk_root()
# Check the standard locations # Check the standard locations
for dir in std_dirs: for dir_ in std_dirs:
f = os.path.join(dir, filename) f = os.path.join(dir_, filename)
if MACOS and is_macosx_sdk_path(dir): if MACOS and is_macosx_sdk_path(dir_):
f = os.path.join(sysroot, dir[1:], filename) f = os.path.join(sysroot, dir_[1:], filename)
if os.path.exists(f): return [] if os.path.exists(f): return []
# Check the additional directories # Check the additional directories
for dir in paths: for dir_ in paths:
f = os.path.join(dir, filename) f = os.path.join(dir_, filename)
if MACOS and is_macosx_sdk_path(dir): if MACOS and is_macosx_sdk_path(dir_):
f = os.path.join(sysroot, dir[1:], filename) f = os.path.join(sysroot, dir_[1:], filename)
if os.path.exists(f): if os.path.exists(f):
return [dir] return [dir_]
# Not found anywhere # Not found anywhere
return None return None
@ -333,6 +338,7 @@ def find_library_file(compiler, libname, std_dirs, paths):
else: else:
assert False, "Internal error: Path not found in std_dirs or paths" assert False, "Internal error: Path not found in std_dirs or paths"
def validate_tzpath(): def validate_tzpath():
base_tzpath = sysconfig.get_config_var('TZPATH') base_tzpath = sysconfig.get_config_var('TZPATH')
if not base_tzpath: if not base_tzpath:
@ -345,15 +351,16 @@ def validate_tzpath():
+ f'found:\n{tzpaths!r}\nwith invalid paths:\n' + f'found:\n{tzpaths!r}\nwith invalid paths:\n'
+ f'{bad_paths!r}') + f'{bad_paths!r}')
def find_module_file(module, dirlist): def find_module_file(module, dirlist):
"""Find a module in a set of possible folders. If it is not found """Find a module in a set of possible folders. If it is not found
return the unadorned filename""" return the unadorned filename"""
list = find_file(module, [], dirlist) dirs = find_file(module, [], dirlist)
if not list: if not dirs:
return module return module
if len(list) > 1: if len(dirs) > 1:
log.info("WARNING: multiple copies of %s found", module) log.info(f"WARNING: multiple copies of {module} found")
return os.path.join(list[0], module) return os.path.join(dirs[0], module)
class PyBuildExt(build_ext): class PyBuildExt(build_ext):
@ -2667,7 +2674,7 @@ class PyBuildScripts(build_scripts):
newfilename = filename + fullversion newfilename = filename + fullversion
else: else:
newfilename = filename + minoronly newfilename = filename + minoronly
log.info('renaming %s to %s', filename, newfilename) log.info(f'renaming {filename} to {newfilename}')
os.rename(filename, newfilename) os.rename(filename, newfilename)
newoutfiles.append(newfilename) newoutfiles.append(newfilename)
if filename in updated_files: if filename in updated_files: