bpo-45101: Add consistency in usage message IO between 2 versions of python-config...

On --help output to stdout.
On error output to stderr.

diff --git a/Misc/NEWS.d/next/Tools-Demos/2021-09-05-02-47-48.bpo-45101.60Zqmt.rst b/Misc/NEWS.d/next/Tools-Demos/2021-09-05-02-47-48.bpo-45101.60Zqmt.rst
new file mode 100644 (file)
index 0000000..48a09da
--- /dev/null
+++ b/Misc/NEWS.d/next/Tools-Demos/2021-09-05-02-47-48.bpo-45101.60Zqmt.rst
@@ -0,0 +1 @@
+Add consistency in usage message IO between 2 versions of python-config.

diff --git a/Misc/python-config.in b/Misc/python-config.in
index 81c3316e334a48559d5177abac9f6b133ad0f062..dd5d161ab2286f1f99a2361455aeb249147cefd1 100644 (file)
--- a/Misc/python-config.in
+++ b/Misc/python-config.in
@@ -13,7 +13,8 @@ valid_opts = ['prefix', 'exec-prefix', 'includes', 'libs', 'cflags',
 
 def exit_with_usage(code=1):
     print("Usage: {0} [{1}]".format(
-        sys.argv[0], '|'.join('--'+opt for opt in valid_opts)), file=sys.stderr)
+        sys.argv[0], '|'.join('--'+opt for opt in valid_opts)),
+        file=sys.stdout if code == 0 else sys.stderr)
     sys.exit(code)
 
 try:

diff --git a/Misc/python-config.sh.in b/Misc/python-config.sh.in
index 2602fe24c0402e14e438f3a139c198020dd1280f..eb02223ddcd2c3073e8e32442706d655a9439c95 100644 (file)
--- a/Misc/python-config.sh.in
+++ b/Misc/python-config.sh.in
@@ -4,7 +4,12 @@
 
 exit_with_usage ()
 {
-    echo "Usage: $0 --prefix|--exec-prefix|--includes|--libs|--cflags|--ldflags|--extension-suffix|--help|--abiflags|--configdir|--embed"
+    local USAGE="Usage: $0 --prefix|--exec-prefix|--includes|--libs|--cflags|--ldflags|--extension-suffix|--help|--abiflags|--configdir|--embed"
+    if [[ "$1" -eq 0 ]]; then
+        echo "$USAGE"
+    else
+        echo "$USAGE" >&2
+    fi
     exit $1
 }