From: Christian Heimes <christian@python.org>
Date: Sat, 24 Apr 2021 07:55:15 +0000 (+0200)
Subject: bpo-41282: Consistent message and filter warning in setup.py (GH-25571)
X-Git-Tag: v3.10.0b1~178
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a460ab3134cd5cf3932c2125aec012851268f0cc;p=thirdparty%2FPython%2Fcpython.git

bpo-41282: Consistent message and filter warning in setup.py (GH-25571)

Signed-off-by: Christian Heimes <christian@python.org>
---

diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
index 439040deb561..aa63093a3f0e 100644
--- a/Lib/distutils/sysconfig.py
+++ b/Lib/distutils/sysconfig.py
@@ -57,7 +57,7 @@ if os.name == "nt":
     from sysconfig import _fix_pcbuild
 
 warnings.warn(
-    'the distutils.sysconfig module is deprecated, use sysconfig instead',
+    'The distutils.sysconfig module is deprecated, use sysconfig instead',
     DeprecationWarning,
     stacklevel=2
 )
diff --git a/setup.py b/setup.py
index df434d48768e..4f4b42d1d9d6 100644
--- a/setup.py
+++ b/setup.py
@@ -33,8 +33,16 @@ except ImportError:
 
 with warnings.catch_warnings():
     # bpo-41282 (PEP 632) deprecated distutils but setup.py still uses it
-    warnings.filterwarnings("ignore", "The distutils package is deprecated",
-                            DeprecationWarning)
+    warnings.filterwarnings(
+        "ignore",
+        "The distutils package is deprecated",
+        DeprecationWarning
+    )
+    warnings.filterwarnings(
+        "ignore",
+        "The distutils.sysconfig module is deprecated, use sysconfig instead",
+        DeprecationWarning
+    )
 
     from distutils import log
     from distutils.command.build_ext import build_ext