Issue #18038: SyntaxError raised during compilation sources with illegal
encoding now always contains an encoding name.
This commit is contained in:
parent
c1f5839412
commit
3af14aaba5
|
@ -55,6 +55,24 @@ class PEP263Test(unittest.TestCase):
|
|||
# two bytes in common with the UTF-8 BOM
|
||||
self.assertRaises(SyntaxError, eval, b'\xef\xbb\x20')
|
||||
|
||||
def test_error_message(self):
|
||||
compile(b'# -*- coding: iso-8859-15 -*-\n', 'dummy', 'exec')
|
||||
compile(b'\xef\xbb\xbf\n', 'dummy', 'exec')
|
||||
compile(b'\xef\xbb\xbf# -*- coding: utf-8 -*-\n', 'dummy', 'exec')
|
||||
with self.assertRaisesRegexp(SyntaxError, 'fake'):
|
||||
compile(b'# -*- coding: fake -*-\n', 'dummy', 'exec')
|
||||
with self.assertRaisesRegexp(SyntaxError, 'iso-8859-15'):
|
||||
compile(b'\xef\xbb\xbf# -*- coding: iso-8859-15 -*-\n',
|
||||
'dummy', 'exec')
|
||||
with self.assertRaisesRegexp(SyntaxError, 'BOM'):
|
||||
compile(b'\xef\xbb\xbf# -*- coding: iso-8859-15 -*-\n',
|
||||
'dummy', 'exec')
|
||||
with self.assertRaisesRegexp(SyntaxError, 'fake'):
|
||||
compile(b'\xef\xbb\xbf# -*- coding: fake -*-\n', 'dummy', 'exec')
|
||||
with self.assertRaisesRegexp(SyntaxError, 'BOM'):
|
||||
compile(b'\xef\xbb\xbf# -*- coding: fake -*-\n', 'dummy', 'exec')
|
||||
|
||||
|
||||
def test_main():
|
||||
support.run_unittest(PEP263Test)
|
||||
|
||||
|
|
|
@ -12,6 +12,9 @@ What's New in Python 3.3.3 release candidate 1?
|
|||
Core and Builtins
|
||||
-----------------
|
||||
|
||||
- Issue #18038: SyntaxError raised during compilation sources with illegal
|
||||
encoding now always contains an encoding name.
|
||||
|
||||
- Issue #17644: Fix a crash in str.format when curly braces are used in square
|
||||
brackets.
|
||||
|
||||
|
|
|
@ -291,20 +291,20 @@ check_coding_spec(const char* line, Py_ssize_t size, struct tok_state *tok,
|
|||
tok->encoding = cs;
|
||||
tok->decoding_state = STATE_NORMAL;
|
||||
}
|
||||
else
|
||||
else {
|
||||
PyErr_Format(PyExc_SyntaxError,
|
||||
"encoding problem: %s", cs);
|
||||
PyMem_FREE(cs);
|
||||
}
|
||||
}
|
||||
} else { /* then, compare cs with BOM */
|
||||
r = (strcmp(tok->encoding, cs) == 0);
|
||||
if (!r)
|
||||
PyErr_Format(PyExc_SyntaxError,
|
||||
"encoding problem: %s with BOM", cs);
|
||||
PyMem_FREE(cs);
|
||||
}
|
||||
}
|
||||
if (!r) {
|
||||
cs = tok->encoding;
|
||||
if (!cs)
|
||||
cs = "with BOM";
|
||||
PyErr_Format(PyExc_SyntaxError, "encoding problem: %s", cs);
|
||||
}
|
||||
return r;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue