Improve error message if the command is not decodable

Victor Stinner · Victor Stinner · commit 398356baaa60 · 2010-08-18T22:23:22.000Z
diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py
@@ -509,7 +509,10 @@ def test_main_invalid_unicode(self):
         p = subprocess.Popen([sys.executable, "-c", code], stderr=subprocess.PIPE)
         stdout, stderr = p.communicate()
         self.assertEqual(p.returncode, 1)
-        self.assertIn(br"UnicodeEncodeError:", stderr)
+        lines = stderr.splitlines()
+        self.assertGreaterEqual(len(lines), 2)
+        self.assertEqual(b"Unable to decode the command from the command line:", lines[0])
+        self.assertIn(br"UnicodeEncodeError:", lines[1])
 
     def test_sys_flags(self):
         self.assertTrue(sys.flags)
diff --git a/Modules/main.c b/Modules/main.c
@@ -275,6 +275,7 @@ run_command(wchar_t *command, PyCompilerFlags *cf)
     return ret != 0;
 
 error:
+    PySys_WriteStderr("Unable to decode the command from the command line:\n");
     PyErr_Print();
     return 1;
 }

Original file line number	Diff line number	Diff line change
`@@ -275,6 +275,7 @@ run_command(wchar_t command, PyCompilerFlags cf)`
`275`	`275`	`return ret != 0;`
`276`	`276`
`277`	`277`	`error:`
	`278`	`+ PySys_WriteStderr("Unable to decode the command from the command line:\n");`
`278`	`279`	`PyErr_Print();`
`279`	`280`	`return 1;`
`280`	`281`	`}`