summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordoko@ubuntu.com <doko@ubuntu.com>2016-06-04 23:17:57 (GMT)
committerdoko@ubuntu.com <doko@ubuntu.com>2016-06-04 23:17:57 (GMT)
commit409482251b06fe75c4ee56e85ffbb4b23d934159 (patch)
tree7fa39f0d3ef4c8ca90d5b8953698ac9d5292f45b
parentb11c7442907ff3cbaa594b54d8b59aea773e7b41 (diff)
downloadcpython-409482251b06fe75c4ee56e85ffbb4b23d934159.zip
cpython-409482251b06fe75c4ee56e85ffbb4b23d934159.tar.gz
cpython-409482251b06fe75c4ee56e85ffbb4b23d934159.tar.bz2
- Issue #21272: Use _sysconfigdata.py to initialize distutils.sysconfig.
-rw-r--r--Lib/distutils/sysconfig.py35
-rw-r--r--Misc/NEWS2
2 files changed, 6 insertions, 31 deletions
diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
index d203f8e..f205dca 100644
--- a/Lib/distutils/sysconfig.py
+++ b/Lib/distutils/sysconfig.py
@@ -415,38 +415,11 @@ _config_vars = None
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
index 2cef457..9a02894 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -27,6 +27,8 @@ Core and Builtins
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``.