[Python-checkins] bpo-45570: Simplify setup macros for pyexpat (GH-29159)

Fri Oct 22 12:28:27 EDT 2021

https://github.com/python/cpython/commit/ec93721e0066c4cbe40085188a9bf0952aa935ef
commit: ec93721e0066c4cbe40085188a9bf0952aa935ef
branch: main
author: Christian Heimes <christian at python.org>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021年10月22日T09:28:23-07:00
summary:
bpo-45570: Simplify setup macros for pyexpat (GH-29159)
* ``HAVE_EXPAT_CONFIG_H`` is not used by our code and not used by
 system-wide expat header files
* ``USE_PYEXPAT_CAPI`` is no longer used by our code
* ``XML_POOR_ENTROPY`` should be defined in expat_config.h
Signed-off-by: Christian Heimes <christian at python.org>
files:
A Misc/NEWS.d/next/Build/2021-10-22-14-45-40.bpo-45570.61gM2A.rst
M Modules/Setup
M Modules/expat/expat_config.h
M PCbuild/_elementtree.vcxproj
M PCbuild/pyexpat.vcxproj
M setup.py

diff --git a/Misc/NEWS.d/next/Build/2021-10-22-14-45-40.bpo-45570.61gM2A.rst b/Misc/NEWS.d/next/Build/2021-10-22-14-45-40.bpo-45570.61gM2A.rst
new file mode 100644
index 0000000000000..7de50f911bf0d
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2021-10-22-14-45-40.bpo-45570.61gM2A.rst
@@ -0,0 +1 @@
+:mod:`pyexpat` and :mod:`_elementtree` no longer define obsolete macros ``HAVE_EXPAT_CONFIG_H`` and ``USE_PYEXPAT_CAPI``. ``XML_POOR_ENTROPY`` is now defined in ``expat_config.h``.
diff --git a/Modules/Setup b/Modules/Setup
index a5b1a7b9c14af..d06d733fc9cbb 100644
--- a/Modules/Setup
+++ b/Modules/Setup
@@ -149,7 +149,7 @@ time timemodule.c
 #_contextvars _contextvarsmodule.c
 #_csv _csv.c
 #_datetime _datetimemodule.c
-#_elementtree -DHAVE_EXPAT_CONFIG_H -DUSE_PYEXPAT_CAPI -I$(srcdir)/Modules/expat _elementtree.c
+#_elementtree -I$(srcdir)/Modules/expat _elementtree.c
 #_heapq _heapqmodule.c
 #_json _json.c
 #_lsprof _lsprof.c rotatingtree.c
@@ -173,7 +173,7 @@ time timemodule.c
 #binascii binascii.c
 #cmath cmathmodule.c _math.c # -lm
 #math mathmodule.c _math.c # -lm
-#pyexpat -DHAVE_EXPAT_CONFIG_H -DXML_POOR_ENTROPY -DUSE_PYEXPAT_CAPI -I$(srcdir)/Modules/expat expat/xmlparse.c expat/xmlrole.c expat/xmltok.c pyexpat.c
+#pyexpat -I$(srcdir)/Modules/expat expat/xmlparse.c expat/xmlrole.c expat/xmltok.c pyexpat.c
 #unicodedata unicodedata.c
 
 # Modules with some UNIX dependencies -- on by default:
diff --git a/Modules/expat/expat_config.h b/Modules/expat/expat_config.h
index afbedd011f660..6671f7b689ba9 100644
--- a/Modules/expat/expat_config.h
+++ b/Modules/expat/expat_config.h
@@ -18,4 +18,8 @@
 #define XML_DTD 1
 #define XML_CONTEXT_BYTES 1024
 
+// bpo-30947: Python uses best available entropy sources to
+// call XML_SetHashSalt(), expat entropy sources are not needed
+#define XML_POOR_ENTROPY 1
+
 #endif /* EXPAT_CONFIG_H */
diff --git a/PCbuild/_elementtree.vcxproj b/PCbuild/_elementtree.vcxproj
index 4a125b243b780..8da5244bac0cb 100644
--- a/PCbuild/_elementtree.vcxproj
+++ b/PCbuild/_elementtree.vcxproj
@@ -94,7 +94,7 @@
 <ItemDefinitionGroup>
 <ClCompile>
 <AdditionalIncludeDirectories>..\Modules\expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;USE_PYEXPAT_CAPI;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 </ClCompile>
 </ItemDefinitionGroup>
 <ItemGroup>
diff --git a/PCbuild/pyexpat.vcxproj b/PCbuild/pyexpat.vcxproj
index b2d9f5d57d497..001f8afd89b9e 100644
--- a/PCbuild/pyexpat.vcxproj
+++ b/PCbuild/pyexpat.vcxproj
@@ -91,7 +91,7 @@
 <ItemDefinitionGroup>
 <ClCompile>
 <AdditionalIncludeDirectories>$(PySourcePath)Modules\expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;PYEXPAT_EXPORTS;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 </ClCompile>
 </ItemDefinitionGroup>
 <ItemGroup>
diff --git a/setup.py b/setup.py
index 03dce63984ef3..4bef3cb52f2b2 100644
--- a/setup.py
+++ b/setup.py
@@ -1748,19 +1748,12 @@ def detect_expat_elementtree(self):
 #
 if '--with-system-expat' in sysconfig.get_config_var("CONFIG_ARGS"):
 expat_inc = []
- define_macros = []
 extra_compile_args = []
 expat_lib = ['expat']
 expat_sources = []
 expat_depends = []
 else:
 expat_inc = [os.path.join(self.srcdir, 'Modules', 'expat')]
- define_macros = [
- ('HAVE_EXPAT_CONFIG_H', '1'),
- # bpo-30947: Python uses best available entropy sources to
- # call XML_SetHashSalt(), expat entropy sources are not needed
- ('XML_POOR_ENTROPY', '1'),
- ]
 extra_compile_args = []
 # bpo-44394: libexpat uses isnan() of math.h and needs linkage
 # against the libm
@@ -1788,7 +1781,6 @@ def detect_expat_elementtree(self):
 extra_compile_args.append('-Wno-unreachable-code')
 
 self.add(Extension('pyexpat',
- define_macros=define_macros,
 extra_compile_args=extra_compile_args,
 include_dirs=expat_inc,
 libraries=expat_lib,
@@ -1799,9 +1791,7 @@ def detect_expat_elementtree(self):
 # uses expat (via the CAPI hook in pyexpat).
 
 if os.path.isfile(os.path.join(self.srcdir, 'Modules', '_elementtree.c')):
- define_macros.append(('USE_PYEXPAT_CAPI', None))
 self.add(Extension('_elementtree',
- define_macros=define_macros,
 include_dirs=expat_inc,
 libraries=expat_lib,
 sources=['_elementtree.c'],
