summaryrefslogtreecommitdiffstats
path: root/Parser
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2013-06-09 13:53:55 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2013-06-09 13:53:55 (GMT)
commit9670543a00beb429799986b4f8b09632d624f859 (patch)
tree16f79b521f1f402be315ead5e5e8d214198feb1a /Parser
parent7dc4c03344e7d356f5f6080258f03b7d6db6aa96 (diff)
parent3af14aaba5e5df6e1bbe67f037bef1b1789209ca (diff)
downloadcpython-9670543a00beb429799986b4f8b09632d624f859.zip
cpython-9670543a00beb429799986b4f8b09632d624f859.tar.gz
cpython-9670543a00beb429799986b4f8b09632d624f859.tar.bz2
Issue #18038: SyntaxError raised during compilation sources with illegal
encoding now always contains an encoding name.
Diffstat (limited to 'Parser')
-rw-r--r--Parser/tokenizer.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/Parser/tokenizer.c b/Parser/tokenizer.c
index 5480278..62b1a91 100644
--- a/Parser/tokenizer.c
+++ b/Parser/tokenizer.c
@@ -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;
}