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

This patch changes the default behaviour of the builtin charmap

Browse source 
codec to not apply Latin-1 mappings for keys which are not found
in the mapping dictionaries, but instead treat them as undefined
mappings.

The patch was originally written by Martin v. Loewis with some
additional (cosmetic) changes and an updated test script
by Marc-Andre Lemburg.

The standard codecs were recreated from the most current files
available at the Unicode.org site using the Tools/scripts/gencodec.py
tool.

This patch closes the bugs #116285 and #119960.
This commit is contained in:
Marc-André Lemburg 2001-01-03 21:29:14 +00:00
parent b55b7bb3ab
commit a866df806d
56 changed files with 424 additions and 293 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Objects/unicodeobject.c
View file

@ -1970,11 +1970,11 @@ PyObject *PyUnicode_DecodeCharmap(const char *s,
Py_DECREF(w);
if (x == NULL) {
if (PyErr_ExceptionMatches(PyExc_LookupError)) {
/* No mapping found: default to Latin-1 mapping */
/* No mapping found means: mapping is undefined. */
PyErr_Clear();
*p++ = (Py_UNICODE)ch;
continue;
}
x = Py_None;
Py_INCREF(x);
} else
goto onError;
}
@ -2086,16 +2086,11 @@ PyObject *PyUnicode_EncodeCharmap(const Py_UNICODE *p,
Py_DECREF(w);
if (x == NULL) {
if (PyErr_ExceptionMatches(PyExc_LookupError)) {
/* No mapping found: default to Latin-1 mapping if possible */
/* No mapping found means: mapping is undefined. */
PyErr_Clear();
if (ch < 256) {
*s++ = (char)ch;
continue;
}
else if (!charmap_encoding_error(&p, &s, errors,
"missing character mapping"))
continue;
}
x = Py_None;
Py_INCREF(x);
} else
goto onError;
}