mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Latin-1 source code was not being properly decoded when passed through

Browse source 
compile(). This was due to left-over special-casing before UTF-8 became the
default source encoding.

Closes issue #3574. Thanks to Victor Stinner for help with the patch.
This commit is contained in:
Brett Cannon 2008-10-17 03:38:50 +00:00
parent 9e9dcd6d42
commit da78043237
5 changed files with 24 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Python/ast.c
View file

@ -3160,9 +3160,6 @@ decode_unicode(struct compiling *c, const char *s, size_t len, int rawmode, cons
if (encoding == NULL) {
buf = (char *)s;
u = NULL;
} else if (strcmp(encoding, "iso-8859-1") == 0) {
buf = (char *)s;
u = NULL;
} else {
/* check for integer overflow */
if (len > PY_SIZE_MAX / 4)
@ -3275,8 +3272,7 @@ parsestr(struct compiling *c, const node *n, int *bytesmode)
}
}
need_encoding = (!*bytesmode && c->c_encoding != NULL &&
strcmp(c->c_encoding, "utf-8") != 0 &&
strcmp(c->c_encoding, "iso-8859-1") != 0);
strcmp(c->c_encoding, "utf-8") != 0);
if (rawmode || strchr(s, '\\') == NULL) {
if (need_encoding) {
PyObject *v, *u = PyUnicode_DecodeUTF8(s, len, NULL);