From: Martin v. Löwis <martin@v.loewis.de>
Date: Wed, 24 Aug 2005 08:39:46 +0000 (+0000)
Subject: Forward UnicodeDecodeError into SyntaxError for source encoding errors.
X-Git-Tag: v2.4.2c1~78
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ea3c6f032bb48d54c04a4605cc3897eaabd6f644;p=thirdparty%2FPython%2Fcpython.git

Forward UnicodeDecodeError into SyntaxError for source encoding errors.
---

diff --git a/Misc/NEWS b/Misc/NEWS
index 1626d6a7cb6b..6d4df5dfed84 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,8 @@ What's New in Python 2.4.2a
 Core and builtins
 -----------------
 
+- Forward UnicodeDecodeError into SyntaxError for source encoding errors.
+
 - SF bug #900092: When tracing (e.g. for hotshot), restore 'return' events for
   exceptions that cause a function to exit.
 
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index 50bb20d15c43..a35bb3f3ddd2 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -1471,18 +1471,20 @@ err_input(perrdetail *err)
 		errtype = PyExc_IndentationError;
 		msg = "too many levels of indentation";
 		break;
-	case E_DECODE: {	/* XXX */
-		PyThreadState* tstate = PyThreadState_GET();
-		PyObject* value = tstate->curexc_value;
+	case E_DECODE: {
+		PyObject *type, *value, *tb;
+		PyErr_Fetch(&type, &value, &tb);
 		if (value != NULL) {
-			u = PyObject_Repr(value);
+			u = PyObject_Str(value);
 			if (u != NULL) {
 				msg = PyString_AsString(u);
-				break;
 			}
 		}
 		if (msg == NULL)
 			msg = "unknown decode error";
+		Py_DECREF(type);
+		Py_DECREF(value);
+		Py_DECREF(tb);
 		break;
 	}
 	default: