Skip to content

Commit de2a73d

Browse files
authored
bpo-45101: Add consistency in usage message IO between 2 versions of python-config (GH-28162)
On --help output to stdout. On error output to stderr.
1 parent da382aa commit de2a73d

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Add consistency in usage message IO between 2 versions of python-config.

Misc/python-config.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ valid_opts = ['prefix', 'exec-prefix', 'includes', 'libs', 'cflags',
1313

1414
def exit_with_usage(code=1):
1515
print("Usage: {0} [{1}]".format(
16-
sys.argv[0], '|'.join('--'+opt for opt in valid_opts)), file=sys.stderr)
16+
sys.argv[0], '|'.join('--'+opt for opt in valid_opts)),
17+
file=sys.stdout if code == 0 else sys.stderr)
1718
sys.exit(code)
1819

1920
try:

Misc/python-config.sh.in

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,12 @@
44

55
exit_with_usage ()
66
{
7-
echo "Usage: $0 --prefix|--exec-prefix|--includes|--libs|--cflags|--ldflags|--extension-suffix|--help|--abiflags|--configdir|--embed"
7+
local USAGE="Usage: $0 --prefix|--exec-prefix|--includes|--libs|--cflags|--ldflags|--extension-suffix|--help|--abiflags|--configdir|--embed"
8+
if [[ "$1" -eq 0 ]]; then
9+
echo "$USAGE"
10+
else
11+
echo "$USAGE" >&2
12+
fi
813
exit $1
914
}
1015

0 commit comments

Comments
 (0)