Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Correctly merging #9319 into 3.3?

This commit is contained in:
Jesus Cea 2011-04-25 03:46:43 +02:00
parent 762f8d1bf2 5db3e0167d
commit 88f7841be7
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Lib/test/test_imp.py
View File

@ -176,6 +176,10 @@ class ImportTests(unittest.TestCase):
support.unlink(init_file_name + ext) support.unlink(init_file_name + ext)
support.rmtree(test_package_name) support.rmtree(test_package_name)
def test_issue9319(self):
self.assertRaises(SyntaxError,
imp.find_module, "test/badsyntax_pep3120")
class ReloadTests(unittest.TestCase): class ReloadTests(unittest.TestCase):

19
Parser/tokenizer.c
View File

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