From: Jesus Cea <jcea@jcea.es>
Date: Mon, 25 Apr 2011 02:03:58 +0000 (+0200)
Subject: Revert bb62908896fe, but keep the test
X-Git-Tag: v3.3.0a1~2514
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c1935d2abf4ce18031ecbdba0475574260d8256c;p=python

Revert bb62908896fe, but keep the test
---

diff --git a/Parser/tokenizer.c b/Parser/tokenizer.c
index f7ca598232..f4d7e3fc68 100644
--- a/Parser/tokenizer.c
+++ b/Parser/tokenizer.c
@@ -585,19 +585,12 @@ decoding_fgets(char *s, int size, struct tok_state *tok)
     if (badchar) {
         /* Need to add 1 to the line number, since this line
            has not been counted, yet.  */
-        if (tok->filename != NULL)
-            filename = PyUnicode_DecodeFSDefault(tok->filename);
-        else
-            filename = PyUnicode_FromString("<file>");
-        if (filename != NULL) {
-            PyErr_Format(PyExc_SyntaxError,
-                    "Non-UTF-8 code starting with '\\x%.2x' "
-                    "in file %U on line %i, "
-                    "but no encoding declared; "
-                    "see http://python.org/dev/peps/pep-0263/ for details",
-                    badchar, filename, tok->lineno + 1);
-            Py_DECREF(filename);
-        }
+        PyErr_Format(PyExc_SyntaxError,
+                "Non-UTF-8 code starting with '\\x%.2x' "
+                "in file %U on line %i, "
+                "but no encoding declared; "
+                "see http://python.org/dev/peps/pep-0263/ for details",
+                badchar, tok->filename, tok->lineno + 1);
         return error_ret(tok);
     }
 #endif