[Python-checkins] cpython: - Issue #21272: Use _sysconfigdata.py to initialize distutils.sysconfig.

matthias.klose python-checkins at python.org
Sat Jun 4 19:18:02 EDT 2016


https://hg.python.org/cpython/rev/3fa8aebed636
changeset: 101729:3fa8aebed636
user: doko at ubuntu.com
date: Sun Jun 05 01:17:57 2016 +0200
summary:
 - Issue #21272: Use _sysconfigdata.py to initialize distutils.sysconfig.
files:
 Lib/distutils/sysconfig.py | 35 ++-----------------------
 Misc/NEWS | 2 +
 2 files changed, 6 insertions(+), 31 deletions(-)
diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
--- a/Lib/distutils/sysconfig.py
+++ b/Lib/distutils/sysconfig.py
@@ -415,38 +415,11 @@
 
 def _init_posix():
 """Initialize the module as appropriate for POSIX systems."""
- g = {}
- # load the installed Makefile:
- try:
- filename = get_makefile_filename()
- parse_makefile(filename, g)
- except OSError as msg:
- my_msg = "invalid Python installation: unable to open %s" % filename
- if hasattr(msg, "strerror"):
- my_msg = my_msg + " (%s)" % msg.strerror
-
- raise DistutilsPlatformError(my_msg)
-
- # load the installed pyconfig.h:
- try:
- filename = get_config_h_filename()
- with open(filename) as file:
- parse_config_h(file, g)
- except OSError as msg:
- my_msg = "invalid Python installation: unable to open %s" % filename
- if hasattr(msg, "strerror"):
- my_msg = my_msg + " (%s)" % msg.strerror
-
- raise DistutilsPlatformError(my_msg)
-
- # On AIX, there are wrong paths to the linker scripts in the Makefile
- # -- these paths are relative to the Python source, but when installed
- # the scripts are in another directory.
- if python_build:
- g['LDSHARED'] = g['BLDSHARED']
-
+ # _sysconfigdata is generated at build time, see the sysconfig module
+ from _sysconfigdata import build_time_vars
 global _config_vars
- _config_vars = g
+ _config_vars = {}
+ _config_vars.update(build_time_vars)
 
 
 def _init_nt():
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -27,6 +27,8 @@
 Library
 -------
 
+- Issue #21272: Use _sysconfigdata.py to initialize distutils.sysconfig.
+
 - Issue #19611: :mod:`inspect` now reports the implicit ``.0`` parameters
 generated by the compiler for comprehension and generator expression scopes
 as if they were positional-only parameters called ``implicit0``.
-- 
Repository URL: https://hg.python.org/cpython


More information about the Python-checkins mailing list

AltStyle によって変換されたページ (->オリジナル) /