From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Wed, 18 Aug 2010 22:23:22 +0000 (+0000)
Subject: Improve error message if the command is not decodable
X-Git-Tag: v3.2a2~220
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=398356baaa60b1e46ce45ec7b8ae8ac28ca53091;p=python

Improve error message if the command is not decodable
---

diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py
index d2f5b85d2d..f146d71b7b 100644
--- a/Lib/test/test_sys.py
+++ b/Lib/test/test_sys.py
@@ -509,7 +509,10 @@ class SysModuleTest(unittest.TestCase):
         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
index d129aba074..a5c89059d3 100644
--- 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;
 }