From 94ba691ed34ffa1aff424876d6162b39a297e29e Mon Sep 17 00:00:00 2001
From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Fri, 16 Dec 2011 23:48:31 +0100
Subject: [PATCH] main() now displays an error message before exiting if a
 command line argument cannot be decoded

---
 Modules/python.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Modules/python.c b/Modules/python.c
index 18f9b3dd668..935908af5dc 100644
--- a/Modules/python.c
+++ b/Modules/python.c
@@ -50,8 +50,12 @@ main(int argc, char **argv)
 #else
         argv_copy[i] = _Py_char2wchar(argv[i], NULL);
 #endif
-        if (!argv_copy[i])
+        if (!argv_copy[i]) {
+            fprintf(stderr, "Fatal Python error: "
+                            "unable to decode the command line argument #%i\n",
+                            i + 1);
             return 1;
+        }
         argv_copy2[i] = argv_copy[i];
     }
     setlocale(LC_ALL, oldloc);