summaryrefslogtreecommitdiffstats
path: root/Parser/tokenizer.c
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2009-06-16 00:29:31 (GMT)
committerBenjamin Peterson <benjamin@python.org>2009-06-16 00:29:31 (GMT)
commit08a0bbc8461399ff7dac477c68fc6fc16156ee76 (patch)
tree1c0d76883b1de95822b60f91930971aba9904e51 /Parser/tokenizer.c
parenta1cc040828ff2c46a0c8560bddc7d21d3b9e78ef (diff)
downloadcpython-08a0bbc8461399ff7dac477c68fc6fc16156ee76.zip
cpython-08a0bbc8461399ff7dac477c68fc6fc16156ee76.tar.gz
cpython-08a0bbc8461399ff7dac477c68fc6fc16156ee76.tar.bz2
don't mask encoding errors when decoding a string #6289
Diffstat (limited to 'Parser/tokenizer.c')
-rw-r--r--Parser/tokenizer.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/Parser/tokenizer.c b/Parser/tokenizer.c
index 1d0a4aa..0f6705d 100644
--- a/Parser/tokenizer.c
+++ b/Parser/tokenizer.c
@@ -619,11 +619,8 @@ decode_str(const char *str, struct tok_state *tok)
if (tok->enc != NULL) {
assert(utf8 == NULL);
utf8 = translate_into_utf8(str, tok->enc);
- if (utf8 == NULL) {
- PyErr_Format(PyExc_SyntaxError,
- "unknown encoding: %s", tok->enc);
+ if (utf8 == NULL)
return error_ret(tok);
- }
str = PyString_AsString(utf8);
}
#endif