From: 9cel <9based@gmail.com>
Date: Sat, 11 Jan 2025 09:17:35 +0000 (-0400)
Subject: Make the Python CLI error message style more consistent (GH-128129)
X-Git-Tag: v3.14.0a4~39
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3a570c6d58bd5ad7d7c13b24dafccc2701081d9f;p=thirdparty%2FPython%2Fcpython.git

Make the Python CLI error message style more consistent (GH-128129)
---

diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py
index 634efda35440..dfdbb80b94d6 100644
--- a/Lib/test/test_cmd_line.py
+++ b/Lib/test/test_cmd_line.py
@@ -1012,7 +1012,7 @@ class CmdLineTest(unittest.TestCase):
                               stdout=subprocess.PIPE,
                               stderr=subprocess.PIPE,
                               text=True)
-        err_msg = "unknown option --unknown-option\nusage: "
+        err_msg = "Unknown option: --unknown-option\nusage: "
         self.assertTrue(proc.stderr.startswith(err_msg), proc.stderr)
         self.assertNotEqual(proc.returncode, 0)
 
diff --git a/Python/getopt.c b/Python/getopt.c
index f64c89fa2273..39a6938dec76 100644
--- a/Python/getopt.c
+++ b/Python/getopt.c
@@ -102,7 +102,7 @@ int _PyOS_GetOpt(Py_ssize_t argc, wchar_t * const *argv, int *longindex)
         // Parse long option.
         if (*opt_ptr == L'\0') {
             if (_PyOS_opterr) {
-                fprintf(stderr, "expected long option\n");
+                fprintf(stderr, "Expected long option\n");
             }
             return -1;
         }
@@ -114,7 +114,7 @@ int _PyOS_GetOpt(Py_ssize_t argc, wchar_t * const *argv, int *longindex)
         }
         if (!opt->name) {
             if (_PyOS_opterr) {
-                fprintf(stderr, "unknown option %ls\n", argv[_PyOS_optind - 1]);
+                fprintf(stderr, "Unknown option: %ls\n", argv[_PyOS_optind - 1]);
             }
             return '_';
         }