cpython-lru_cache-weakref: Python/codecs.c annotate

annotate Python/codecs.c @ 76329:005fd1fe31ab

Issue #14582: Import returns the module returned by a loader instead of sys.modules when possible. This is being done for two reasons. One is to gain a little bit of performance by skipping an unnecessary dict lookup in sys.modules. But the other (and main) reason is to be a little bit more clear in how things should work from the perspective of import's interactions with loaders. Otherwise loaders can easily forget to return the module even though PEP 302 explicitly states they are expected to return the module they loaded.

author	Brett Cannon <brett@python.org>
date	Sun, 15 Apr 2012 15:24:04 -0400
parents	f55529aa023d
children	1439e2d1f490

rev	line source
11972 d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	1 /* ------------------------------------------------------------------------
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	2
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	3 Python Codec Registry and support functions
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	4
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	5 Written by Marc-Andre Lemburg (mal@lemburg.com).
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	6
13828 254f8b7c4a83 Changing the CNRI copyright notice according to CNRI's instructions. Guido van Rossum <guido@python.org> parents: 13658 diff changeset	7 Copyright (c) Corporation for National Research Initiatives.
11972 d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	8
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	9 ------------------------------------------------------------------------ */
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	10
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	11 #include "Python.h"
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	12 #include <ctype.h>
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	13
72918 d76338eacf7c Issue #13088: Add shared Py_hexdigits constant to format a number into base 16 Victor Stinner <victor.stinner@haypocalc.com> parents: 72848 diff changeset	14 const char *Py_hexdigits = "0123456789abcdef";
d76338eacf7c Issue #13088: Add shared Py_hexdigits constant to format a number into base 16 Victor Stinner <victor.stinner@haypocalc.com> parents: 72848 diff changeset	15
11972 d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	16 /* --- Codec Registry ----------------------------------------------------- */
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	17
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	18 /* Import the standard encodings package which will register the first
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43603 diff changeset	19 codec search function.
11972 d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	20
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	21 This is done in a lazy way so that the Unicode implementation does
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	22 not downgrade startup time of scripts not needing it.
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	23
12195 bc861add5d71 Marc-Andre Lemburg: Error reporting in the codec registry and lookup Guido van Rossum <guido@python.org> parents: 12048 diff changeset	24 ImportErrors are silently ignored by this function. Only one try is
bc861add5d71 Marc-Andre Lemburg: Error reporting in the codec registry and lookup Guido van Rossum <guido@python.org> parents: 12048 diff changeset	25 made.
11972 d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	26
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	27 */
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	28
28325 850626d47574 Fixed SF bug #663074. The codec system was using global static Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27898 diff changeset	29 static int _PyCodecRegistry_Init(void); /* Forward */
11972 d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	30
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	31 int PyCodec_Register(PyObject *search_function)
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	32 {
31797 846b3ee7e106 Changed random calls to PyThreadState_Get() to use the macro Nicholas Bastin <nick.bastin@gmail.com> parents: 31273 diff changeset	33 PyInterpreterState *interp = PyThreadState_GET()->interp;
28325 850626d47574 Fixed SF bug #663074. The codec system was using global static Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27898 diff changeset	34 if (interp->codec_search_path == NULL && _PyCodecRegistry_Init())
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	35 goto onError;
11972 d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	36 if (search_function == NULL) {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	37 PyErr_BadArgument();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	38 goto onError;
11972 d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	39 }
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	40 if (!PyCallable_Check(search_function)) {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	41 PyErr_SetString(PyExc_TypeError, "argument must be callable");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	42 goto onError;
11972 d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	43 }
28325 850626d47574 Fixed SF bug #663074. The codec system was using global static Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27898 diff changeset	44 return PyList_Append(interp->codec_search_path, search_function);
12195 bc861add5d71 Marc-Andre Lemburg: Error reporting in the codec registry and lookup Guido van Rossum <guido@python.org> parents: 12048 diff changeset	45
bc861add5d71 Marc-Andre Lemburg: Error reporting in the codec registry and lookup Guido van Rossum <guido@python.org> parents: 12048 diff changeset	46 onError:
bc861add5d71 Marc-Andre Lemburg: Error reporting in the codec registry and lookup Guido van Rossum <guido@python.org> parents: 12048 diff changeset	47 return -1;
11972 d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	48 }
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	49
12248 70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 12195 diff changeset	50 /* Convert a string to a normalized Python string: all characters are
70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 12195 diff changeset	51 converted to lower case, spaces are replaced with underscores. */
70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 12195 diff changeset	52
11972 d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	53 static
12248 70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 12195 diff changeset	54 PyObject normalizestring(const char string)
11972 d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	55 {
13128 cb928d926f27 Change the loop index in normalizestring() to size_t too, to avoid a Guido van Rossum <guido@python.org> parents: 13096 diff changeset	56 register size_t i;
13096 8c8de5b736dc Trent Mick's Win64 changes: size_t vs. int or long; also some overflow Guido van Rossum <guido@python.org> parents: 12648 diff changeset	57 size_t len = strlen(string);
11972 d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	58 char *p;
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	59 PyObject *v;
43603 dd03aa741f56 This is the uncontroversial half of patch 1263 by Thomas Lee: Guido van Rossum <guido@python.org> parents: 42534 diff changeset	60
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37875 diff changeset	61 if (len > PY_SSIZE_T_MAX) {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	62 PyErr_SetString(PyExc_OverflowError, "string is too large");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	63 return NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37875 diff changeset	64 }
43603 dd03aa741f56 This is the uncontroversial half of patch 1263 by Thomas Lee: Guido van Rossum <guido@python.org> parents: 42534 diff changeset	65
dd03aa741f56 This is the uncontroversial half of patch 1263 by Thomas Lee: Guido van Rossum <guido@python.org> parents: 42534 diff changeset	66 p = PyMem_Malloc(len + 1);
dd03aa741f56 This is the uncontroversial half of patch 1263 by Thomas Lee: Guido van Rossum <guido@python.org> parents: 42534 diff changeset	67 if (p == NULL)
dd03aa741f56 This is the uncontroversial half of patch 1263 by Thomas Lee: Guido van Rossum <guido@python.org> parents: 42534 diff changeset	68 return NULL;
12248 70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 12195 diff changeset	69 for (i = 0; i < len; i++) {
70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 12195 diff changeset	70 register char ch = string[i];
70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 12195 diff changeset	71 if (ch == ' ')
70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 12195 diff changeset	72 ch = '-';
70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 12195 diff changeset	73 else
71489 92d02de91cc9 Issue #1813: Fix codec lookup under Turkish locales. Antoine Pitrou <solipsis@pitrou.net> parents: 64590 diff changeset	74 ch = Py_TOLOWER(Py_CHARMASK(ch));
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	75 p[i] = ch;
12248 70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 12195 diff changeset	76 }
43603 dd03aa741f56 This is the uncontroversial half of patch 1263 by Thomas Lee: Guido van Rossum <guido@python.org> parents: 42534 diff changeset	77 p[i] = '\0';
dd03aa741f56 This is the uncontroversial half of patch 1263 by Thomas Lee: Guido van Rossum <guido@python.org> parents: 42534 diff changeset	78 v = PyUnicode_FromString(p);
dd03aa741f56 This is the uncontroversial half of patch 1263 by Thomas Lee: Guido van Rossum <guido@python.org> parents: 42534 diff changeset	79 if (v == NULL)
dd03aa741f56 This is the uncontroversial half of patch 1263 by Thomas Lee: Guido van Rossum <guido@python.org> parents: 42534 diff changeset	80 return NULL;
dd03aa741f56 This is the uncontroversial half of patch 1263 by Thomas Lee: Guido van Rossum <guido@python.org> parents: 42534 diff changeset	81 PyMem_Free(p);
11972 d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	82 return v;
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	83 }
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	84
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	85 /* Lookup the given encoding and return a tuple providing the codec
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	86 facilities.
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	87
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	88 The encoding string is looked up converted to all lower-case
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	89 characters. This makes encodings looked up through this mechanism
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	90 effectively case-insensitive.
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	91
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43603 diff changeset	92 If no codec is found, a LookupError is set and NULL returned.
12195 bc861add5d71 Marc-Andre Lemburg: Error reporting in the codec registry and lookup Guido van Rossum <guido@python.org> parents: 12048 diff changeset	93
bc861add5d71 Marc-Andre Lemburg: Error reporting in the codec registry and lookup Guido van Rossum <guido@python.org> parents: 12048 diff changeset	94 As side effect, this tries to load the encodings package, if not
bc861add5d71 Marc-Andre Lemburg: Error reporting in the codec registry and lookup Guido van Rossum <guido@python.org> parents: 12048 diff changeset	95 yet done. This is part of the lazy load strategy for the encodings
bc861add5d71 Marc-Andre Lemburg: Error reporting in the codec registry and lookup Guido van Rossum <guido@python.org> parents: 12048 diff changeset	96 package.
bc861add5d71 Marc-Andre Lemburg: Error reporting in the codec registry and lookup Guido van Rossum <guido@python.org> parents: 12048 diff changeset	97
bc861add5d71 Marc-Andre Lemburg: Error reporting in the codec registry and lookup Guido van Rossum <guido@python.org> parents: 12048 diff changeset	98 */
11972 d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	99
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	100 PyObject _PyCodec_Lookup(const char encoding)
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	101 {
28325 850626d47574 Fixed SF bug #663074. The codec system was using global static Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27898 diff changeset	102 PyInterpreterState *interp;
12048 f87b56eebacc Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	103 PyObject result, args = NULL, *v;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	104 Py_ssize_t i, len;
11972 d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	105
12648 2a53f5dc0590 M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12248 diff changeset	106 if (encoding == NULL) {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	107 PyErr_BadArgument();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	108 goto onError;
12648 2a53f5dc0590 M.-A. Lemburg <mal@lemburg.com>: Fred Drake <fdrake@acm.org> parents: 12248 diff changeset	109 }
28325 850626d47574 Fixed SF bug #663074. The codec system was using global static Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27898 diff changeset	110
31797 846b3ee7e106 Changed random calls to PyThreadState_Get() to use the macro Nicholas Bastin <nick.bastin@gmail.com> parents: 31273 diff changeset	111 interp = PyThreadState_GET()->interp;
28325 850626d47574 Fixed SF bug #663074. The codec system was using global static Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27898 diff changeset	112 if (interp->codec_search_path == NULL && _PyCodecRegistry_Init())
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	113 goto onError;
11972 d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	114
12248 70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 12195 diff changeset	115 /* Convert the encoding to a normalized Python string: all
13620 5b727ab37092 Spelling fixes supplied by Rob W. W. Hooft. All these are fixes in either Thomas Wouters <thomas@python.org> parents: 13330 diff changeset	116 characters are converted to lower case, spaces and hyphens are
12248 70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 12195 diff changeset	117 replaced with underscores. */
70154e2e9c89 Marc-Andre's third try at this bulk patch seems to work (except that Guido van Rossum <guido@python.org> parents: 12195 diff changeset	118 v = normalizestring(encoding);
11972 d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	119 if (v == NULL)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	120 goto onError;
43603 dd03aa741f56 This is the uncontroversial half of patch 1263 by Thomas Lee: Guido van Rossum <guido@python.org> parents: 42534 diff changeset	121 PyUnicode_InternInPlace(&v);
11972 d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	122
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	123 /* First, try to lookup the name in the registry dictionary */
28325 850626d47574 Fixed SF bug #663074. The codec system was using global static Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27898 diff changeset	124 result = PyDict_GetItem(interp->codec_search_cache, v);
11972 d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	125 if (result != NULL) {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	126 Py_INCREF(result);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	127 Py_DECREF(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	128 return result;
11972 d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	129 }
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43603 diff changeset	130
11972 d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	131 /* Next, scan the search functions in order of registration */
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	132 args = PyTuple_New(1);
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	133 if (args == NULL)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	134 goto onError;
11972 d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	135 PyTuple_SET_ITEM(args,0,v);
12048 f87b56eebacc Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	136
28325 850626d47574 Fixed SF bug #663074. The codec system was using global static Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27898 diff changeset	137 len = PyList_Size(interp->codec_search_path);
12048 f87b56eebacc Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12025 diff changeset	138 if (len < 0)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	139 goto onError;
12195 bc861add5d71 Marc-Andre Lemburg: Error reporting in the codec registry and lookup Guido van Rossum <guido@python.org> parents: 12048 diff changeset	140 if (len == 0) {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	141 PyErr_SetString(PyExc_LookupError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	142 "no codec search functions registered: "
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	143 "can't find encoding");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	144 goto onError;
12195 bc861add5d71 Marc-Andre Lemburg: Error reporting in the codec registry and lookup Guido van Rossum <guido@python.org> parents: 12048 diff changeset	145 }
11972 d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	146
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	147 for (i = 0; i < len; i++) {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	148 PyObject *func;
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43603 diff changeset	149
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	150 func = PyList_GetItem(interp->codec_search_path, i);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	151 if (func == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	152 goto onError;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	153 result = PyEval_CallObject(func, args);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	154 if (result == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	155 goto onError;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	156 if (result == Py_None) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	157 Py_DECREF(result);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	158 continue;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	159 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	160 if (!PyTuple_Check(result) \|\| PyTuple_GET_SIZE(result) != 4) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	161 PyErr_SetString(PyExc_TypeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	162 "codec search functions must return 4-tuples");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	163 Py_DECREF(result);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	164 goto onError;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	165 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	166 break;
11972 d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	167 }
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	168 if (i == len) {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	169 /* XXX Perhaps we should cache misses too ? */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	170 PyErr_Format(PyExc_LookupError,
25441 d32588c88633 Add encoding name in LookupError. Fixes #615013. Will backport to 2.2. Martin v. Löwis <martin@v.loewis.de> parents: 25095 diff changeset	171 "unknown encoding: %s", encoding);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	172 goto onError;
11972 d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	173 }
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	174
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	175 /* Cache and return the result */
42534 5f9e79d1e158 Handle error Neal Norwitz <nnorwitz@gmail.com> parents: 42057 diff changeset	176 if (PyDict_SetItem(interp->codec_search_cache, v, result) < 0) {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	177 Py_DECREF(result);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	178 goto onError;
42534 5f9e79d1e158 Handle error Neal Norwitz <nnorwitz@gmail.com> parents: 42057 diff changeset	179 }
11972 d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	180 Py_DECREF(args);
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	181 return result;
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	182
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	183 onError:
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	184 Py_XDECREF(args);
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	185 return NULL;
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	186 }
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	187
47496 2284fa89ab08 Move the codec decode type checks to bytes/bytearray.decode(). Marc-André Lemburg <mal@egenix.com> parents: 47301 diff changeset	188 /* Codec registry encoding check API. */
2284fa89ab08 Move the codec decode type checks to bytes/bytearray.decode(). Marc-André Lemburg <mal@egenix.com> parents: 47301 diff changeset	189
2284fa89ab08 Move the codec decode type checks to bytes/bytearray.decode(). Marc-André Lemburg <mal@egenix.com> parents: 47301 diff changeset	190 int PyCodec_KnownEncoding(const char *encoding)
2284fa89ab08 Move the codec decode type checks to bytes/bytearray.decode(). Marc-André Lemburg <mal@egenix.com> parents: 47301 diff changeset	191 {
2284fa89ab08 Move the codec decode type checks to bytes/bytearray.decode(). Marc-André Lemburg <mal@egenix.com> parents: 47301 diff changeset	192 PyObject *codecs;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	193
47496 2284fa89ab08 Move the codec decode type checks to bytes/bytearray.decode(). Marc-André Lemburg <mal@egenix.com> parents: 47301 diff changeset	194 codecs = _PyCodec_Lookup(encoding);
2284fa89ab08 Move the codec decode type checks to bytes/bytearray.decode(). Marc-André Lemburg <mal@egenix.com> parents: 47301 diff changeset	195 if (!codecs) {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	196 PyErr_Clear();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	197 return 0;
47496 2284fa89ab08 Move the codec decode type checks to bytes/bytearray.decode(). Marc-André Lemburg <mal@egenix.com> parents: 47301 diff changeset	198 }
2284fa89ab08 Move the codec decode type checks to bytes/bytearray.decode(). Marc-André Lemburg <mal@egenix.com> parents: 47301 diff changeset	199 else {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	200 Py_DECREF(codecs);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	201 return 1;
47496 2284fa89ab08 Move the codec decode type checks to bytes/bytearray.decode(). Marc-André Lemburg <mal@egenix.com> parents: 47301 diff changeset	202 }
2284fa89ab08 Move the codec decode type checks to bytes/bytearray.decode(). Marc-André Lemburg <mal@egenix.com> parents: 47301 diff changeset	203 }
2284fa89ab08 Move the codec decode type checks to bytes/bytearray.decode(). Marc-André Lemburg <mal@egenix.com> parents: 47301 diff changeset	204
11972 d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	205 static
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	206 PyObject args_tuple(PyObject object,
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	207 const char *errors)
11972 d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	208 {
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	209 PyObject *args;
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43603 diff changeset	210
11972 d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	211 args = PyTuple_New(1 + (errors != NULL));
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	212 if (args == NULL)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	213 return NULL;
11972 d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	214 Py_INCREF(object);
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	215 PyTuple_SET_ITEM(args,0,object);
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	216 if (errors) {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	217 PyObject *v;
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43603 diff changeset	218
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	219 v = PyUnicode_FromString(errors);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	220 if (v == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	221 Py_DECREF(args);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	222 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	223 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	224 PyTuple_SET_ITEM(args, 1, v);
11972 d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	225 }
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	226 return args;
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	227 }
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	228
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37875 diff changeset	229 /* Helper function to get a codec item */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37875 diff changeset	230
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37875 diff changeset	231 static
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37875 diff changeset	232 PyObject codec_getitem(const char encoding, int index)
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37875 diff changeset	233 {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37875 diff changeset	234 PyObject *codecs;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37875 diff changeset	235 PyObject *v;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37875 diff changeset	236
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37875 diff changeset	237 codecs = _PyCodec_Lookup(encoding);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37875 diff changeset	238 if (codecs == NULL)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	239 return NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37875 diff changeset	240 v = PyTuple_GET_ITEM(codecs, index);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37875 diff changeset	241 Py_DECREF(codecs);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37875 diff changeset	242 Py_INCREF(v);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37875 diff changeset	243 return v;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37875 diff changeset	244 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37875 diff changeset	245
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37875 diff changeset	246 /* Helper function to create an incremental codec. */
11972 d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	247
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	248 static
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37875 diff changeset	249 PyObject codec_getincrementalcodec(const char encoding,
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	250 const char *errors,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	251 const char *attrname)
11972 d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	252 {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37875 diff changeset	253 PyObject codecs, ret, *inccodec;
11972 d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	254
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37875 diff changeset	255 codecs = _PyCodec_Lookup(encoding);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37875 diff changeset	256 if (codecs == NULL)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	257 return NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37875 diff changeset	258 inccodec = PyObject_GetAttrString(codecs, attrname);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37875 diff changeset	259 Py_DECREF(codecs);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37875 diff changeset	260 if (inccodec == NULL)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	261 return NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37875 diff changeset	262 if (errors)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	263 ret = PyObject_CallFunction(inccodec, "s", errors);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37875 diff changeset	264 else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	265 ret = PyObject_CallFunction(inccodec, NULL);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37875 diff changeset	266 Py_DECREF(inccodec);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37875 diff changeset	267 return ret;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37875 diff changeset	268 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37875 diff changeset	269
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37875 diff changeset	270 /* Helper function to create a stream codec. */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37875 diff changeset	271
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37875 diff changeset	272 static
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37875 diff changeset	273 PyObject codec_getstreamcodec(const char encoding,
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	274 PyObject *stream,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	275 const char *errors,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	276 const int index)
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37875 diff changeset	277 {
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	278 PyObject codecs, streamcodec, *codeccls;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37875 diff changeset	279
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37875 diff changeset	280 codecs = _PyCodec_Lookup(encoding);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37875 diff changeset	281 if (codecs == NULL)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	282 return NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37875 diff changeset	283
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	284 codeccls = PyTuple_GET_ITEM(codecs, index);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	285 if (errors != NULL)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	286 streamcodec = PyObject_CallFunction(codeccls, "Os", stream, errors);
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	287 else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	288 streamcodec = PyObject_CallFunction(codeccls, "O", stream);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37875 diff changeset	289 Py_DECREF(codecs);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37875 diff changeset	290 return streamcodec;
11972 d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	291 }
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	292
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43603 diff changeset	293 /* Convenience APIs to query the Codec registry.
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43603 diff changeset	294
11972 d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	295 All APIs return a codec object with incremented refcount.
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43603 diff changeset	296
11972 d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	297 */
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	298
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	299 PyObject PyCodec_Encoder(const char encoding)
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	300 {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37875 diff changeset	301 return codec_getitem(encoding, 0);
11972 d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	302 }
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	303
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	304 PyObject PyCodec_Decoder(const char encoding)
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	305 {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37875 diff changeset	306 return codec_getitem(encoding, 1);
11972 d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	307 }
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	308
37875 a4c70f3968be Merge part of the trunk changes into the p3yk branch. This merges from 43030 Thomas Wouters <thomas@python.org> parents: 36751 diff changeset	309 PyObject PyCodec_IncrementalEncoder(const char encoding,
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	310 const char *errors)
37875 a4c70f3968be Merge part of the trunk changes into the p3yk branch. This merges from 43030 Thomas Wouters <thomas@python.org> parents: 36751 diff changeset	311 {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37875 diff changeset	312 return codec_getincrementalcodec(encoding, errors, "incrementalencoder");
37875 a4c70f3968be Merge part of the trunk changes into the p3yk branch. This merges from 43030 Thomas Wouters <thomas@python.org> parents: 36751 diff changeset	313 }
a4c70f3968be Merge part of the trunk changes into the p3yk branch. This merges from 43030 Thomas Wouters <thomas@python.org> parents: 36751 diff changeset	314
a4c70f3968be Merge part of the trunk changes into the p3yk branch. This merges from 43030 Thomas Wouters <thomas@python.org> parents: 36751 diff changeset	315 PyObject PyCodec_IncrementalDecoder(const char encoding,
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	316 const char *errors)
37875 a4c70f3968be Merge part of the trunk changes into the p3yk branch. This merges from 43030 Thomas Wouters <thomas@python.org> parents: 36751 diff changeset	317 {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37875 diff changeset	318 return codec_getincrementalcodec(encoding, errors, "incrementaldecoder");
37875 a4c70f3968be Merge part of the trunk changes into the p3yk branch. This merges from 43030 Thomas Wouters <thomas@python.org> parents: 36751 diff changeset	319 }
a4c70f3968be Merge part of the trunk changes into the p3yk branch. This merges from 43030 Thomas Wouters <thomas@python.org> parents: 36751 diff changeset	320
11972 d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	321 PyObject PyCodec_StreamReader(const char encoding,
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	322 PyObject *stream,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	323 const char *errors)
11972 d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	324 {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37875 diff changeset	325 return codec_getstreamcodec(encoding, stream, errors, 2);
11972 d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	326 }
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	327
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	328 PyObject PyCodec_StreamWriter(const char encoding,
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	329 PyObject *stream,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	330 const char *errors)
11972 d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	331 {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37875 diff changeset	332 return codec_getstreamcodec(encoding, stream, errors, 3);
11972 d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	333 }
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	334
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	335 /* Encode an object (e.g. an Unicode object) using the given encoding
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	336 and return the resulting encoded object (usually a Python string).
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	337
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	338 errors is passed to the encoder factory as argument if non-NULL. */
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	339
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	340 PyObject PyCodec_Encode(PyObject object,
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	341 const char *encoding,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	342 const char *errors)
11972 d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	343 {
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	344 PyObject *encoder = NULL;
35939 79374eb6db51 Fix a few more ref leaks. Backport candidate Neal Norwitz <nnorwitz@gmail.com> parents: 32533 diff changeset	345 PyObject args = NULL, result = NULL;
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43603 diff changeset	346 PyObject *v = NULL;
11972 d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	347
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	348 encoder = PyCodec_Encoder(encoding);
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	349 if (encoder == NULL)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	350 goto onError;
11972 d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	351
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	352 args = args_tuple(object, errors);
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	353 if (args == NULL)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	354 goto onError;
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43603 diff changeset	355
0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43603 diff changeset	356 result = PyEval_CallObject(encoder, args);
11972 d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	357 if (result == NULL)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	358 goto onError;
11972 d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	359
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43603 diff changeset	360 if (!PyTuple_Check(result) \|\|
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	361 PyTuple_GET_SIZE(result) != 2) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	362 PyErr_SetString(PyExc_TypeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	363 "encoder must return a tuple (object, integer)");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	364 goto onError;
11972 d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	365 }
47496 2284fa89ab08 Move the codec decode type checks to bytes/bytearray.decode(). Marc-André Lemburg <mal@egenix.com> parents: 47301 diff changeset	366 v = PyTuple_GET_ITEM(result,0);
2284fa89ab08 Move the codec decode type checks to bytes/bytearray.decode(). Marc-André Lemburg <mal@egenix.com> parents: 47301 diff changeset	367 Py_INCREF(v);
11972 d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	368 /* We don't check or use the second (integer) entry. */
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	369
47496 2284fa89ab08 Move the codec decode type checks to bytes/bytearray.decode(). Marc-André Lemburg <mal@egenix.com> parents: 47301 diff changeset	370 Py_DECREF(args);
2284fa89ab08 Move the codec decode type checks to bytes/bytearray.decode(). Marc-André Lemburg <mal@egenix.com> parents: 47301 diff changeset	371 Py_DECREF(encoder);
2284fa89ab08 Move the codec decode type checks to bytes/bytearray.decode(). Marc-André Lemburg <mal@egenix.com> parents: 47301 diff changeset	372 Py_DECREF(result);
2284fa89ab08 Move the codec decode type checks to bytes/bytearray.decode(). Marc-André Lemburg <mal@egenix.com> parents: 47301 diff changeset	373 return v;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	374
11972 d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	375 onError:
35939 79374eb6db51 Fix a few more ref leaks. Backport candidate Neal Norwitz <nnorwitz@gmail.com> parents: 32533 diff changeset	376 Py_XDECREF(result);
11972 d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	377 Py_XDECREF(args);
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	378 Py_XDECREF(encoder);
47496 2284fa89ab08 Move the codec decode type checks to bytes/bytearray.decode(). Marc-André Lemburg <mal@egenix.com> parents: 47301 diff changeset	379 return NULL;
11972 d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	380 }
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	381
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	382 /* Decode an object (usually a Python string) using the given encoding
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	383 and return an equivalent object (e.g. an Unicode object).
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	384
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	385 errors is passed to the decoder factory as argument if non-NULL. */
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	386
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	387 PyObject PyCodec_Decode(PyObject object,
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	388 const char *encoding,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	389 const char *errors)
11972 d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	390 {
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	391 PyObject *decoder = NULL;
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	392 PyObject args = NULL, result = NULL;
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	393 PyObject *v;
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	394
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	395 decoder = PyCodec_Decoder(encoding);
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	396 if (decoder == NULL)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	397 goto onError;
11972 d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	398
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	399 args = args_tuple(object, errors);
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	400 if (args == NULL)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	401 goto onError;
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43603 diff changeset	402
11972 d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	403 result = PyEval_CallObject(decoder,args);
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	404 if (result == NULL)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	405 goto onError;
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43603 diff changeset	406 if (!PyTuple_Check(result) \|\|
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	407 PyTuple_GET_SIZE(result) != 2) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	408 PyErr_SetString(PyExc_TypeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	409 "decoder must return a tuple (object,integer)");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	410 goto onError;
11972 d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	411 }
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	412 v = PyTuple_GET_ITEM(result,0);
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	413 Py_INCREF(v);
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	414 /* We don't check or use the second (integer) entry. */
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	415
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	416 Py_DECREF(args);
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	417 Py_DECREF(decoder);
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	418 Py_DECREF(result);
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	419 return v;
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43603 diff changeset	420
11972 d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	421 onError:
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	422 Py_XDECREF(args);
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	423 Py_XDECREF(decoder);
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	424 Py_XDECREF(result);
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	425 return NULL;
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	426 }
d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	427
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	428 /* Register the error handling callback function error under the name
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	429 name. This function will be called by the codec when it encounters
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	430 an unencodable characters/undecodable bytes and doesn't know the
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	431 callback name, when name is specified as the error parameter
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	432 in the call to the encode/decode function.
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	433 Return 0 on success, -1 on error */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	434 int PyCodec_RegisterError(const char name, PyObject error)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	435 {
31797 846b3ee7e106 Changed random calls to PyThreadState_Get() to use the macro Nicholas Bastin <nick.bastin@gmail.com> parents: 31273 diff changeset	436 PyInterpreterState *interp = PyThreadState_GET()->interp;
28325 850626d47574 Fixed SF bug #663074. The codec system was using global static Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27898 diff changeset	437 if (interp->codec_search_path == NULL && _PyCodecRegistry_Init())
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	438 return -1;
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	439 if (!PyCallable_Check(error)) {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	440 PyErr_SetString(PyExc_TypeError, "handler must be callable");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	441 return -1;
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	442 }
28325 850626d47574 Fixed SF bug #663074. The codec system was using global static Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27898 diff changeset	443 return PyDict_SetItemString(interp->codec_error_registry,
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	444 (char *)name, error);
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	445 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	446
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	447 /* Lookup the error handling callback function registered under the
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	448 name error. As a special case NULL can be passed, in which case
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	449 the error handling callback for strict encoding will be returned. */
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	450 PyObject PyCodec_LookupError(const char name)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	451 {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	452 PyObject *handler = NULL;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	453
31797 846b3ee7e106 Changed random calls to PyThreadState_Get() to use the macro Nicholas Bastin <nick.bastin@gmail.com> parents: 31273 diff changeset	454 PyInterpreterState *interp = PyThreadState_GET()->interp;
28325 850626d47574 Fixed SF bug #663074. The codec system was using global static Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27898 diff changeset	455 if (interp->codec_search_path == NULL && _PyCodecRegistry_Init())
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	456 return NULL;
28325 850626d47574 Fixed SF bug #663074. The codec system was using global static Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27898 diff changeset	457
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	458 if (name==NULL)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	459 name = "strict";
28325 850626d47574 Fixed SF bug #663074. The codec system was using global static Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27898 diff changeset	460 handler = PyDict_GetItemString(interp->codec_error_registry, (char *)name);
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	461 if (!handler)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	462 PyErr_Format(PyExc_LookupError, "unknown error handler name '%.400s'", name);
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	463 else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	464 Py_INCREF(handler);
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	465 return handler;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	466 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	467
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	468 static void wrong_exception_type(PyObject *exc)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	469 {
72925 7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72918 diff changeset	470 _Py_IDENTIFIER(__class__);
7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72918 diff changeset	471 _Py_IDENTIFIER(__name__);
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72591 diff changeset	472 PyObject *type = _PyObject_GetAttrId(exc, &PyId___class__);
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	473 if (type != NULL) {
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72591 diff changeset	474 PyObject *name = _PyObject_GetAttrId(type, &PyId___name__);
41878 089f449a20cd Change PyErr_Format() to generate a unicode string (by using Walter Dörwald <walter@livinglogic.de> parents: 41587 diff changeset	475 Py_DECREF(type);
089f449a20cd Change PyErr_Format() to generate a unicode string (by using Walter Dörwald <walter@livinglogic.de> parents: 41587 diff changeset	476 if (name != NULL) {
089f449a20cd Change PyErr_Format() to generate a unicode string (by using Walter Dörwald <walter@livinglogic.de> parents: 41587 diff changeset	477 PyErr_Format(PyExc_TypeError,
089f449a20cd Change PyErr_Format() to generate a unicode string (by using Walter Dörwald <walter@livinglogic.de> parents: 41587 diff changeset	478 "don't know how to handle %S in error callback", name);
089f449a20cd Change PyErr_Format() to generate a unicode string (by using Walter Dörwald <walter@livinglogic.de> parents: 41587 diff changeset	479 Py_DECREF(name);
089f449a20cd Change PyErr_Format() to generate a unicode string (by using Walter Dörwald <walter@livinglogic.de> parents: 41587 diff changeset	480 }
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	481 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	482 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	483
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	484 PyObject PyCodec_StrictErrors(PyObject exc)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	485 {
36751 8e04de2480e4 PEP 352 implementation. Creates a new base class, BaseException, which has an Brett Cannon <bcannon@gmail.com> parents: 36712 diff changeset	486 if (PyExceptionInstance_Check(exc))
8e04de2480e4 PEP 352 implementation. Creates a new base class, BaseException, which has an Brett Cannon <bcannon@gmail.com> parents: 36712 diff changeset	487 PyErr_SetObject(PyExceptionInstance_Class(exc), exc);
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	488 else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	489 PyErr_SetString(PyExc_TypeError, "codec must pass exception instance");
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	490 return NULL;
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	491 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	492
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	493
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	494 PyObject PyCodec_IgnoreErrors(PyObject exc)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	495 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35939 diff changeset	496 Py_ssize_t end;
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	497 if (PyObject_IsInstance(exc, PyExc_UnicodeEncodeError)) {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	498 if (PyUnicodeEncodeError_GetEnd(exc, &end))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	499 return NULL;
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	500 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	501 else if (PyObject_IsInstance(exc, PyExc_UnicodeDecodeError)) {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	502 if (PyUnicodeDecodeError_GetEnd(exc, &end))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	503 return NULL;
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	504 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	505 else if (PyObject_IsInstance(exc, PyExc_UnicodeTranslateError)) {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	506 if (PyUnicodeTranslateError_GetEnd(exc, &end))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	507 return NULL;
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	508 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	509 else {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	510 wrong_exception_type(exc);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	511 return NULL;
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	512 }
73800 6407294eb3c6 PyCodec_IgnoreErrors() avoids the deprecated "u#" format Victor Stinner <victor.stinner@haypocalc.com> parents: 73359 diff changeset	513 return Py_BuildValue("(Nn)", PyUnicode_New(0, 0), end);
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	514 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	515
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	516
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	517 PyObject PyCodec_ReplaceErrors(PyObject exc)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	518 {
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71489 diff changeset	519 Py_ssize_t start, end, i, len;
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	520
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	521 if (PyObject_IsInstance(exc, PyExc_UnicodeEncodeError)) {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	522 PyObject *res;
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71489 diff changeset	523 int kind;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71489 diff changeset	524 void *data;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	525 if (PyUnicodeEncodeError_GetStart(exc, &start))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	526 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	527 if (PyUnicodeEncodeError_GetEnd(exc, &end))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	528 return NULL;
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71489 diff changeset	529 len = end - start;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71489 diff changeset	530 res = PyUnicode_New(len, '?');
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	531 if (res == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	532 return NULL;
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71489 diff changeset	533 kind = PyUnicode_KIND(res);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71489 diff changeset	534 data = PyUnicode_DATA(res);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71489 diff changeset	535 for (i = 0; i < len; ++i)
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71489 diff changeset	536 PyUnicode_WRITE(kind, data, i, '?');
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71489 diff changeset	537 return Py_BuildValue("(Nn)", res, end);
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	538 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	539 else if (PyObject_IsInstance(exc, PyExc_UnicodeDecodeError)) {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	540 if (PyUnicodeDecodeError_GetEnd(exc, &end))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	541 return NULL;
72591 611c57aa694a PyCodec_ReplaceErrors() uses "C" format instead of "u#" to build result Victor Stinner <victor.stinner@haypocalc.com> parents: 72510 diff changeset	542 return Py_BuildValue("(Cn)",
611c57aa694a PyCodec_ReplaceErrors() uses "C" format instead of "u#" to build result Victor Stinner <victor.stinner@haypocalc.com> parents: 72510 diff changeset	543 (int)Py_UNICODE_REPLACEMENT_CHARACTER,
611c57aa694a PyCodec_ReplaceErrors() uses "C" format instead of "u#" to build result Victor Stinner <victor.stinner@haypocalc.com> parents: 72510 diff changeset	544 end);
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	545 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	546 else if (PyObject_IsInstance(exc, PyExc_UnicodeTranslateError)) {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	547 PyObject *res;
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71489 diff changeset	548 int kind;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71489 diff changeset	549 void *data;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	550 if (PyUnicodeTranslateError_GetStart(exc, &start))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	551 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	552 if (PyUnicodeTranslateError_GetEnd(exc, &end))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	553 return NULL;
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71489 diff changeset	554 len = end - start;
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71489 diff changeset	555 res = PyUnicode_New(len, Py_UNICODE_REPLACEMENT_CHARACTER);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	556 if (res == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	557 return NULL;
72475 8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71489 diff changeset	558 kind = PyUnicode_KIND(res);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71489 diff changeset	559 data = PyUnicode_DATA(res);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71489 diff changeset	560 for (i=0; i < len; i++)
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71489 diff changeset	561 PyUnicode_WRITE(kind, data, i, Py_UNICODE_REPLACEMENT_CHARACTER);
8beaa9a37387 Implement PEP 393. Martin v. Löwis <martin@v.loewis.de> parents: 71489 diff changeset	562 return Py_BuildValue("(Nn)", res, end);
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	563 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	564 else {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	565 wrong_exception_type(exc);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	566 return NULL;
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	567 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	568 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	569
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	570 PyObject PyCodec_XMLCharRefReplaceErrors(PyObject exc)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	571 {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	572 if (PyObject_IsInstance(exc, PyExc_UnicodeEncodeError)) {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	573 PyObject *restuple;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	574 PyObject *object;
73358 2df7d749ee3a PyCodec_XMLCharRefReplaceError(): Remove unused variable Victor Stinner <victor.stinner@haypocalc.com> parents: 73351 diff changeset	575 Py_ssize_t i;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	576 Py_ssize_t start;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	577 Py_ssize_t end;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	578 PyObject *res;
73350 0883d6a103a0 Port error handlers from Py_UNICODE indexing to code point indexing. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	579 unsigned char *outp;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	580 int ressize;
73350 0883d6a103a0 Port error handlers from Py_UNICODE indexing to code point indexing. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	581 Py_UCS4 ch;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	582 if (PyUnicodeEncodeError_GetStart(exc, &start))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	583 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	584 if (PyUnicodeEncodeError_GetEnd(exc, &end))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	585 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	586 if (!(object = PyUnicodeEncodeError_GetObject(exc)))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	587 return NULL;
73350 0883d6a103a0 Port error handlers from Py_UNICODE indexing to code point indexing. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	588 for (i = start, ressize = 0; i < end; ++i) {
0883d6a103a0 Port error handlers from Py_UNICODE indexing to code point indexing. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	589 /* object is guaranteed to be "ready" */
0883d6a103a0 Port error handlers from Py_UNICODE indexing to code point indexing. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	590 ch = PyUnicode_READ_CHAR(object, i);
0883d6a103a0 Port error handlers from Py_UNICODE indexing to code point indexing. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	591 if (ch<10)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	592 ressize += 2+1+1;
73350 0883d6a103a0 Port error handlers from Py_UNICODE indexing to code point indexing. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	593 else if (ch<100)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	594 ressize += 2+2+1;
73350 0883d6a103a0 Port error handlers from Py_UNICODE indexing to code point indexing. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	595 else if (ch<1000)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	596 ressize += 2+3+1;
73350 0883d6a103a0 Port error handlers from Py_UNICODE indexing to code point indexing. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	597 else if (ch<10000)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	598 ressize += 2+4+1;
73350 0883d6a103a0 Port error handlers from Py_UNICODE indexing to code point indexing. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	599 else if (ch<100000)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	600 ressize += 2+5+1;
73350 0883d6a103a0 Port error handlers from Py_UNICODE indexing to code point indexing. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	601 else if (ch<1000000)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	602 ressize += 2+6+1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	603 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	604 ressize += 2+7+1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	605 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	606 /* allocate replacement */
73350 0883d6a103a0 Port error handlers from Py_UNICODE indexing to code point indexing. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	607 res = PyUnicode_New(ressize, 127);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	608 if (res == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	609 Py_DECREF(object);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	610 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	611 }
73350 0883d6a103a0 Port error handlers from Py_UNICODE indexing to code point indexing. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	612 outp = PyUnicode_1BYTE_DATA(res);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	613 /* generate replacement */
73358 2df7d749ee3a PyCodec_XMLCharRefReplaceError(): Remove unused variable Victor Stinner <victor.stinner@haypocalc.com> parents: 73351 diff changeset	614 for (i = start; i < end; ++i) {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	615 int digits;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	616 int base;
73351 2bec7c452b39 Fix C89 incompatibility. Martin v. Löwis <martin@v.loewis.de> parents: 73350 diff changeset	617 ch = PyUnicode_READ_CHAR(object, i);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	618 *outp++ = '&';
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	619 *outp++ = '#';
73350 0883d6a103a0 Port error handlers from Py_UNICODE indexing to code point indexing. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	620 if (ch<10) {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	621 digits = 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	622 base = 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	623 }
73350 0883d6a103a0 Port error handlers from Py_UNICODE indexing to code point indexing. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	624 else if (ch<100) {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	625 digits = 2;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	626 base = 10;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	627 }
73350 0883d6a103a0 Port error handlers from Py_UNICODE indexing to code point indexing. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	628 else if (ch<1000) {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	629 digits = 3;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	630 base = 100;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	631 }
73350 0883d6a103a0 Port error handlers from Py_UNICODE indexing to code point indexing. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	632 else if (ch<10000) {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	633 digits = 4;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	634 base = 1000;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	635 }
73350 0883d6a103a0 Port error handlers from Py_UNICODE indexing to code point indexing. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	636 else if (ch<100000) {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	637 digits = 5;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	638 base = 10000;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	639 }
73350 0883d6a103a0 Port error handlers from Py_UNICODE indexing to code point indexing. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	640 else if (ch<1000000) {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	641 digits = 6;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	642 base = 100000;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	643 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	644 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	645 digits = 7;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	646 base = 1000000;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	647 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	648 while (digits-->0) {
73350 0883d6a103a0 Port error handlers from Py_UNICODE indexing to code point indexing. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	649 *outp++ = '0' + ch/base;
0883d6a103a0 Port error handlers from Py_UNICODE indexing to code point indexing. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	650 ch %= base;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	651 base /= 10;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	652 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	653 *outp++ = ';';
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	654 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	655 restuple = Py_BuildValue("(On)", res, end);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	656 Py_DECREF(res);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	657 Py_DECREF(object);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	658 return restuple;
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	659 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	660 else {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	661 wrong_exception_type(exc);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	662 return NULL;
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	663 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	664 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	665
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	666 PyObject PyCodec_BackslashReplaceErrors(PyObject exc)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	667 {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	668 if (PyObject_IsInstance(exc, PyExc_UnicodeEncodeError)) {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	669 PyObject *restuple;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	670 PyObject *object;
73350 0883d6a103a0 Port error handlers from Py_UNICODE indexing to code point indexing. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	671 Py_ssize_t i;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	672 Py_ssize_t start;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	673 Py_ssize_t end;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	674 PyObject *res;
73350 0883d6a103a0 Port error handlers from Py_UNICODE indexing to code point indexing. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	675 unsigned char *outp;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	676 int ressize;
73350 0883d6a103a0 Port error handlers from Py_UNICODE indexing to code point indexing. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	677 Py_UCS4 c;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	678 if (PyUnicodeEncodeError_GetStart(exc, &start))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	679 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	680 if (PyUnicodeEncodeError_GetEnd(exc, &end))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	681 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	682 if (!(object = PyUnicodeEncodeError_GetObject(exc)))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	683 return NULL;
73350 0883d6a103a0 Port error handlers from Py_UNICODE indexing to code point indexing. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	684 for (i = start, ressize = 0; i < end; ++i) {
0883d6a103a0 Port error handlers from Py_UNICODE indexing to code point indexing. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	685 /* object is guaranteed to be "ready" */
0883d6a103a0 Port error handlers from Py_UNICODE indexing to code point indexing. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	686 c = PyUnicode_READ_CHAR(object, i);
0883d6a103a0 Port error handlers from Py_UNICODE indexing to code point indexing. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	687 if (c >= 0x10000) {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	688 ressize += 1+1+8;
73350 0883d6a103a0 Port error handlers from Py_UNICODE indexing to code point indexing. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	689 }
0883d6a103a0 Port error handlers from Py_UNICODE indexing to code point indexing. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	690 else if (c >= 0x100) {
0883d6a103a0 Port error handlers from Py_UNICODE indexing to code point indexing. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	691 ressize += 1+1+4;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	692 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	693 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	694 ressize += 1+1+2;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	695 }
73350 0883d6a103a0 Port error handlers from Py_UNICODE indexing to code point indexing. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	696 res = PyUnicode_New(ressize, 127);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	697 if (res==NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	698 return NULL;
73350 0883d6a103a0 Port error handlers from Py_UNICODE indexing to code point indexing. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	699 for (i = start, outp = PyUnicode_1BYTE_DATA(res);
0883d6a103a0 Port error handlers from Py_UNICODE indexing to code point indexing. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	700 i < end; ++i) {
0883d6a103a0 Port error handlers from Py_UNICODE indexing to code point indexing. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	701 c = PyUnicode_READ_CHAR(object, i);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	702 *outp++ = '\\';
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	703 if (c >= 0x00010000) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	704 *outp++ = 'U';
72918 d76338eacf7c Issue #13088: Add shared Py_hexdigits constant to format a number into base 16 Victor Stinner <victor.stinner@haypocalc.com> parents: 72848 diff changeset	705 *outp++ = Py_hexdigits[(c>>28)&0xf];
d76338eacf7c Issue #13088: Add shared Py_hexdigits constant to format a number into base 16 Victor Stinner <victor.stinner@haypocalc.com> parents: 72848 diff changeset	706 *outp++ = Py_hexdigits[(c>>24)&0xf];
d76338eacf7c Issue #13088: Add shared Py_hexdigits constant to format a number into base 16 Victor Stinner <victor.stinner@haypocalc.com> parents: 72848 diff changeset	707 *outp++ = Py_hexdigits[(c>>20)&0xf];
d76338eacf7c Issue #13088: Add shared Py_hexdigits constant to format a number into base 16 Victor Stinner <victor.stinner@haypocalc.com> parents: 72848 diff changeset	708 *outp++ = Py_hexdigits[(c>>16)&0xf];
d76338eacf7c Issue #13088: Add shared Py_hexdigits constant to format a number into base 16 Victor Stinner <victor.stinner@haypocalc.com> parents: 72848 diff changeset	709 *outp++ = Py_hexdigits[(c>>12)&0xf];
d76338eacf7c Issue #13088: Add shared Py_hexdigits constant to format a number into base 16 Victor Stinner <victor.stinner@haypocalc.com> parents: 72848 diff changeset	710 *outp++ = Py_hexdigits[(c>>8)&0xf];
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	711 }
64590 fc76e8c617dc Issue #9804: ascii() now always represents unicode surrogate pairs as Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	712 else if (c >= 0x100) {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	713 *outp++ = 'u';
72918 d76338eacf7c Issue #13088: Add shared Py_hexdigits constant to format a number into base 16 Victor Stinner <victor.stinner@haypocalc.com> parents: 72848 diff changeset	714 *outp++ = Py_hexdigits[(c>>12)&0xf];
d76338eacf7c Issue #13088: Add shared Py_hexdigits constant to format a number into base 16 Victor Stinner <victor.stinner@haypocalc.com> parents: 72848 diff changeset	715 *outp++ = Py_hexdigits[(c>>8)&0xf];
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	716 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	717 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	718 *outp++ = 'x';
72918 d76338eacf7c Issue #13088: Add shared Py_hexdigits constant to format a number into base 16 Victor Stinner <victor.stinner@haypocalc.com> parents: 72848 diff changeset	719 *outp++ = Py_hexdigits[(c>>4)&0xf];
d76338eacf7c Issue #13088: Add shared Py_hexdigits constant to format a number into base 16 Victor Stinner <victor.stinner@haypocalc.com> parents: 72848 diff changeset	720 *outp++ = Py_hexdigits[c&0xf];
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	721 }
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	722
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	723 restuple = Py_BuildValue("(On)", res, end);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	724 Py_DECREF(res);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	725 Py_DECREF(object);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	726 return restuple;
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	727 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	728 else {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	729 wrong_exception_type(exc);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	730 return NULL;
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	731 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	732 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	733
53687 52a89d723b6b Make PyCodec_SurrogateErrors static. Martin v. Löwis <martin@v.loewis.de> parents: 53681 diff changeset	734 /* This handler is declared static until someone demonstrates
52a89d723b6b Make PyCodec_SurrogateErrors static. Martin v. Löwis <martin@v.loewis.de> parents: 53681 diff changeset	735 a need to call it directly. */
52a89d723b6b Make PyCodec_SurrogateErrors static. Martin v. Löwis <martin@v.loewis.de> parents: 53681 diff changeset	736 static PyObject *
53965 fbcdae3e0ca1 Rename the surrogates error handler to surrogatepass. Martin v. Löwis <martin@v.loewis.de> parents: 53767 diff changeset	737 PyCodec_SurrogatePassErrors(PyObject *exc)
53681 52a77ef069cd Issue #3672: Reject surrogates in utf-8 codec; add surrogates error Martin v. Löwis <martin@v.loewis.de> parents: 49613 diff changeset	738 {
52a77ef069cd Issue #3672: Reject surrogates in utf-8 codec; add surrogates error Martin v. Löwis <martin@v.loewis.de> parents: 49613 diff changeset	739 PyObject *restuple;
52a77ef069cd Issue #3672: Reject surrogates in utf-8 codec; add surrogates error Martin v. Löwis <martin@v.loewis.de> parents: 49613 diff changeset	740 PyObject *object;
73350 0883d6a103a0 Port error handlers from Py_UNICODE indexing to code point indexing. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	741 Py_ssize_t i;
53681 52a77ef069cd Issue #3672: Reject surrogates in utf-8 codec; add surrogates error Martin v. Löwis <martin@v.loewis.de> parents: 49613 diff changeset	742 Py_ssize_t start;
52a77ef069cd Issue #3672: Reject surrogates in utf-8 codec; add surrogates error Martin v. Löwis <martin@v.loewis.de> parents: 49613 diff changeset	743 Py_ssize_t end;
52a77ef069cd Issue #3672: Reject surrogates in utf-8 codec; add surrogates error Martin v. Löwis <martin@v.loewis.de> parents: 49613 diff changeset	744 PyObject *res;
52a77ef069cd Issue #3672: Reject surrogates in utf-8 codec; add surrogates error Martin v. Löwis <martin@v.loewis.de> parents: 49613 diff changeset	745 if (PyObject_IsInstance(exc, PyExc_UnicodeEncodeError)) {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	746 char *outp;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	747 if (PyUnicodeEncodeError_GetStart(exc, &start))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	748 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	749 if (PyUnicodeEncodeError_GetEnd(exc, &end))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	750 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	751 if (!(object = PyUnicodeEncodeError_GetObject(exc)))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	752 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	753 res = PyBytes_FromStringAndSize(NULL, 3*(end-start));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	754 if (!res) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	755 Py_DECREF(object);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	756 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	757 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	758 outp = PyBytes_AsString(res);
73350 0883d6a103a0 Port error handlers from Py_UNICODE indexing to code point indexing. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	759 for (i = start; i < end; i++) {
0883d6a103a0 Port error handlers from Py_UNICODE indexing to code point indexing. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	760 /* object is guaranteed to be "ready" */
0883d6a103a0 Port error handlers from Py_UNICODE indexing to code point indexing. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	761 Py_UCS4 ch = PyUnicode_READ_CHAR(object, i);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	762 if (ch < 0xd800 \|\| ch > 0xdfff) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	763 /* Not a surrogate, fail with original exception */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	764 PyErr_SetObject(PyExceptionInstance_Class(exc), exc);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	765 Py_DECREF(res);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	766 Py_DECREF(object);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	767 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	768 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	769 *outp++ = (char)(0xe0 \| (ch >> 12));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	770 *outp++ = (char)(0x80 \| ((ch >> 6) & 0x3f));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	771 *outp++ = (char)(0x80 \| (ch & 0x3f));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	772 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	773 restuple = Py_BuildValue("(On)", res, end);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	774 Py_DECREF(res);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	775 Py_DECREF(object);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	776 return restuple;
53681 52a77ef069cd Issue #3672: Reject surrogates in utf-8 codec; add surrogates error Martin v. Löwis <martin@v.loewis.de> parents: 49613 diff changeset	777 }
52a77ef069cd Issue #3672: Reject surrogates in utf-8 codec; add surrogates error Martin v. Löwis <martin@v.loewis.de> parents: 49613 diff changeset	778 else if (PyObject_IsInstance(exc, PyExc_UnicodeDecodeError)) {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	779 unsigned char *p;
73359 e3b6458056c7 Avoid the Py_UNICODE type in codecs.c Victor Stinner <victor.stinner@haypocalc.com> parents: 73358 diff changeset	780 Py_UCS4 ch = 0;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	781 if (PyUnicodeDecodeError_GetStart(exc, &start))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	782 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	783 if (!(object = PyUnicodeDecodeError_GetObject(exc)))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	784 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	785 if (!(p = (unsigned char*)PyBytes_AsString(object))) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	786 Py_DECREF(object);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	787 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	788 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	789 /* Try decoding a single surrogate character. If
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	790 there are more, let the codec call us again. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	791 p += start;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	792 if ((p[0] & 0xf0) == 0xe0 \|\|
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	793 (p[1] & 0xc0) == 0x80 \|\|
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	794 (p[2] & 0xc0) == 0x80) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	795 /* it's a three-byte code */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	796 ch = ((p[0] & 0x0f) << 12) + ((p[1] & 0x3f) << 6) + (p[2] & 0x3f);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	797 if (ch < 0xd800 \|\| ch > 0xdfff)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	798 /* it's not a surrogate - fail */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	799 ch = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	800 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	801 Py_DECREF(object);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	802 if (ch == 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	803 PyErr_SetObject(PyExceptionInstance_Class(exc), exc);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	804 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	805 }
73359 e3b6458056c7 Avoid the Py_UNICODE type in codecs.c Victor Stinner <victor.stinner@haypocalc.com> parents: 73358 diff changeset	806 res = PyUnicode_FromOrdinal(ch);
e3b6458056c7 Avoid the Py_UNICODE type in codecs.c Victor Stinner <victor.stinner@haypocalc.com> parents: 73358 diff changeset	807 if (res == NULL)
e3b6458056c7 Avoid the Py_UNICODE type in codecs.c Victor Stinner <victor.stinner@haypocalc.com> parents: 73358 diff changeset	808 return NULL;
e3b6458056c7 Avoid the Py_UNICODE type in codecs.c Victor Stinner <victor.stinner@haypocalc.com> parents: 73358 diff changeset	809 return Py_BuildValue("(Nn)", res, start+3);
53681 52a77ef069cd Issue #3672: Reject surrogates in utf-8 codec; add surrogates error Martin v. Löwis <martin@v.loewis.de> parents: 49613 diff changeset	810 }
52a77ef069cd Issue #3672: Reject surrogates in utf-8 codec; add surrogates error Martin v. Löwis <martin@v.loewis.de> parents: 49613 diff changeset	811 else {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	812 wrong_exception_type(exc);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	813 return NULL;
53681 52a77ef069cd Issue #3672: Reject surrogates in utf-8 codec; add surrogates error Martin v. Löwis <martin@v.loewis.de> parents: 49613 diff changeset	814 }
52a77ef069cd Issue #3672: Reject surrogates in utf-8 codec; add surrogates error Martin v. Löwis <martin@v.loewis.de> parents: 49613 diff changeset	815 }
52a77ef069cd Issue #3672: Reject surrogates in utf-8 codec; add surrogates error Martin v. Löwis <martin@v.loewis.de> parents: 49613 diff changeset	816
53767 ac209f132b17 Issue #5915: Implement PEP 383, Non-decodable Bytes in Martin v. Löwis <martin@v.loewis.de> parents: 53687 diff changeset	817 static PyObject *
53966 7c29bfbfd352 Rename utf8b error handler to surrogateescape. Martin v. Löwis <martin@v.loewis.de> parents: 53965 diff changeset	818 PyCodec_SurrogateEscapeErrors(PyObject *exc)
53767 ac209f132b17 Issue #5915: Implement PEP 383, Non-decodable Bytes in Martin v. Löwis <martin@v.loewis.de> parents: 53687 diff changeset	819 {
ac209f132b17 Issue #5915: Implement PEP 383, Non-decodable Bytes in Martin v. Löwis <martin@v.loewis.de> parents: 53687 diff changeset	820 PyObject *restuple;
ac209f132b17 Issue #5915: Implement PEP 383, Non-decodable Bytes in Martin v. Löwis <martin@v.loewis.de> parents: 53687 diff changeset	821 PyObject *object;
73350 0883d6a103a0 Port error handlers from Py_UNICODE indexing to code point indexing. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	822 Py_ssize_t i;
53767 ac209f132b17 Issue #5915: Implement PEP 383, Non-decodable Bytes in Martin v. Löwis <martin@v.loewis.de> parents: 53687 diff changeset	823 Py_ssize_t start;
ac209f132b17 Issue #5915: Implement PEP 383, Non-decodable Bytes in Martin v. Löwis <martin@v.loewis.de> parents: 53687 diff changeset	824 Py_ssize_t end;
ac209f132b17 Issue #5915: Implement PEP 383, Non-decodable Bytes in Martin v. Löwis <martin@v.loewis.de> parents: 53687 diff changeset	825 PyObject *res;
ac209f132b17 Issue #5915: Implement PEP 383, Non-decodable Bytes in Martin v. Löwis <martin@v.loewis.de> parents: 53687 diff changeset	826 if (PyObject_IsInstance(exc, PyExc_UnicodeEncodeError)) {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	827 char *outp;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	828 if (PyUnicodeEncodeError_GetStart(exc, &start))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	829 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	830 if (PyUnicodeEncodeError_GetEnd(exc, &end))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	831 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	832 if (!(object = PyUnicodeEncodeError_GetObject(exc)))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	833 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	834 res = PyBytes_FromStringAndSize(NULL, end-start);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	835 if (!res) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	836 Py_DECREF(object);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	837 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	838 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	839 outp = PyBytes_AsString(res);
73350 0883d6a103a0 Port error handlers from Py_UNICODE indexing to code point indexing. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	840 for (i = start; i < end; i++) {
0883d6a103a0 Port error handlers from Py_UNICODE indexing to code point indexing. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	841 /* object is guaranteed to be "ready" */
0883d6a103a0 Port error handlers from Py_UNICODE indexing to code point indexing. Martin v. Löwis <martin@v.loewis.de> parents: 72925 diff changeset	842 Py_UCS4 ch = PyUnicode_READ_CHAR(object, i);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	843 if (ch < 0xdc80 \|\| ch > 0xdcff) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	844 /* Not a UTF-8b surrogate, fail with original exception */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	845 PyErr_SetObject(PyExceptionInstance_Class(exc), exc);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	846 Py_DECREF(res);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	847 Py_DECREF(object);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	848 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	849 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	850 *outp++ = ch - 0xdc00;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	851 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	852 restuple = Py_BuildValue("(On)", res, end);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	853 Py_DECREF(res);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	854 Py_DECREF(object);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	855 return restuple;
53767 ac209f132b17 Issue #5915: Implement PEP 383, Non-decodable Bytes in Martin v. Löwis <martin@v.loewis.de> parents: 53687 diff changeset	856 }
ac209f132b17 Issue #5915: Implement PEP 383, Non-decodable Bytes in Martin v. Löwis <martin@v.loewis.de> parents: 53687 diff changeset	857 else if (PyObject_IsInstance(exc, PyExc_UnicodeDecodeError)) {
73359 e3b6458056c7 Avoid the Py_UNICODE type in codecs.c Victor Stinner <victor.stinner@haypocalc.com> parents: 73358 diff changeset	858 PyObject *str;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	859 unsigned char *p;
73359 e3b6458056c7 Avoid the Py_UNICODE type in codecs.c Victor Stinner <victor.stinner@haypocalc.com> parents: 73358 diff changeset	860 Py_UCS2 ch[4]; /* decode up to 4 bad bytes. */
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	861 int consumed = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	862 if (PyUnicodeDecodeError_GetStart(exc, &start))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	863 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	864 if (PyUnicodeDecodeError_GetEnd(exc, &end))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	865 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	866 if (!(object = PyUnicodeDecodeError_GetObject(exc)))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	867 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	868 if (!(p = (unsigned char*)PyBytes_AsString(object))) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	869 Py_DECREF(object);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	870 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	871 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	872 while (consumed < 4 && consumed < end-start) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	873 /* Refuse to escape ASCII bytes. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	874 if (p[start+consumed] < 128)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	875 break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	876 ch[consumed] = 0xdc00 + p[start+consumed];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	877 consumed++;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	878 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	879 Py_DECREF(object);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	880 if (!consumed) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	881 /* codec complained about ASCII byte. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	882 PyErr_SetObject(PyExceptionInstance_Class(exc), exc);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	883 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	884 }
73359 e3b6458056c7 Avoid the Py_UNICODE type in codecs.c Victor Stinner <victor.stinner@haypocalc.com> parents: 73358 diff changeset	885 str = PyUnicode_FromKindAndData(PyUnicode_2BYTE_KIND, ch, consumed);
e3b6458056c7 Avoid the Py_UNICODE type in codecs.c Victor Stinner <victor.stinner@haypocalc.com> parents: 73358 diff changeset	886 if (str == NULL)
e3b6458056c7 Avoid the Py_UNICODE type in codecs.c Victor Stinner <victor.stinner@haypocalc.com> parents: 73358 diff changeset	887 return NULL;
e3b6458056c7 Avoid the Py_UNICODE type in codecs.c Victor Stinner <victor.stinner@haypocalc.com> parents: 73358 diff changeset	888 return Py_BuildValue("(Nn)", str, start+consumed);
53767 ac209f132b17 Issue #5915: Implement PEP 383, Non-decodable Bytes in Martin v. Löwis <martin@v.loewis.de> parents: 53687 diff changeset	889 }
ac209f132b17 Issue #5915: Implement PEP 383, Non-decodable Bytes in Martin v. Löwis <martin@v.loewis.de> parents: 53687 diff changeset	890 else {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	891 wrong_exception_type(exc);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	892 return NULL;
53767 ac209f132b17 Issue #5915: Implement PEP 383, Non-decodable Bytes in Martin v. Löwis <martin@v.loewis.de> parents: 53687 diff changeset	893 }
ac209f132b17 Issue #5915: Implement PEP 383, Non-decodable Bytes in Martin v. Löwis <martin@v.loewis.de> parents: 53687 diff changeset	894 }
ac209f132b17 Issue #5915: Implement PEP 383, Non-decodable Bytes in Martin v. Löwis <martin@v.loewis.de> parents: 53687 diff changeset	895
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	896
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	897 static PyObject strict_errors(PyObject self, PyObject *exc)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	898 {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	899 return PyCodec_StrictErrors(exc);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	900 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	901
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	902
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	903 static PyObject ignore_errors(PyObject self, PyObject *exc)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	904 {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	905 return PyCodec_IgnoreErrors(exc);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	906 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	907
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	908
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	909 static PyObject replace_errors(PyObject self, PyObject *exc)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	910 {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	911 return PyCodec_ReplaceErrors(exc);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	912 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	913
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	914
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	915 static PyObject xmlcharrefreplace_errors(PyObject self, PyObject *exc)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	916 {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	917 return PyCodec_XMLCharRefReplaceErrors(exc);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	918 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	919
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	920
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	921 static PyObject backslashreplace_errors(PyObject self, PyObject *exc)
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	922 {
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	923 return PyCodec_BackslashReplaceErrors(exc);
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	924 }
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	925
53965 fbcdae3e0ca1 Rename the surrogates error handler to surrogatepass. Martin v. Löwis <martin@v.loewis.de> parents: 53767 diff changeset	926 static PyObject surrogatepass_errors(PyObject self, PyObject *exc)
53681 52a77ef069cd Issue #3672: Reject surrogates in utf-8 codec; add surrogates error Martin v. Löwis <martin@v.loewis.de> parents: 49613 diff changeset	927 {
53965 fbcdae3e0ca1 Rename the surrogates error handler to surrogatepass. Martin v. Löwis <martin@v.loewis.de> parents: 53767 diff changeset	928 return PyCodec_SurrogatePassErrors(exc);
53681 52a77ef069cd Issue #3672: Reject surrogates in utf-8 codec; add surrogates error Martin v. Löwis <martin@v.loewis.de> parents: 49613 diff changeset	929 }
52a77ef069cd Issue #3672: Reject surrogates in utf-8 codec; add surrogates error Martin v. Löwis <martin@v.loewis.de> parents: 49613 diff changeset	930
53966 7c29bfbfd352 Rename utf8b error handler to surrogateescape. Martin v. Löwis <martin@v.loewis.de> parents: 53965 diff changeset	931 static PyObject surrogateescape_errors(PyObject self, PyObject *exc)
53767 ac209f132b17 Issue #5915: Implement PEP 383, Non-decodable Bytes in Martin v. Löwis <martin@v.loewis.de> parents: 53687 diff changeset	932 {
53966 7c29bfbfd352 Rename utf8b error handler to surrogateescape. Martin v. Löwis <martin@v.loewis.de> parents: 53965 diff changeset	933 return PyCodec_SurrogateEscapeErrors(exc);
53767 ac209f132b17 Issue #5915: Implement PEP 383, Non-decodable Bytes in Martin v. Löwis <martin@v.loewis.de> parents: 53687 diff changeset	934 }
ac209f132b17 Issue #5915: Implement PEP 383, Non-decodable Bytes in Martin v. Löwis <martin@v.loewis.de> parents: 53687 diff changeset	935
28325 850626d47574 Fixed SF bug #663074. The codec system was using global static Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27898 diff changeset	936 static int _PyCodecRegistry_Init(void)
11972 d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	937 {
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	938 static struct {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	939 char *name;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	940 PyMethodDef def;
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	941 } methods[] =
0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	942 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	943 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	944 "strict",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	945 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	946 "strict_errors",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	947 strict_errors,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	948 METH_O,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	949 PyDoc_STR("Implements the 'strict' error handling, which "
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	950 "raises a UnicodeError on coding errors.")
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	951 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	952 },
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	953 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	954 "ignore",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	955 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	956 "ignore_errors",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	957 ignore_errors,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	958 METH_O,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	959 PyDoc_STR("Implements the 'ignore' error handling, which "
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	960 "ignores malformed data and continues.")
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	961 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	962 },
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	963 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	964 "replace",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	965 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	966 "replace_errors",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	967 replace_errors,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	968 METH_O,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	969 PyDoc_STR("Implements the 'replace' error handling, which "
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	970 "replaces malformed data with a replacement marker.")
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	971 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	972 },
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	973 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	974 "xmlcharrefreplace",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	975 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	976 "xmlcharrefreplace_errors",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	977 xmlcharrefreplace_errors,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	978 METH_O,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	979 PyDoc_STR("Implements the 'xmlcharrefreplace' error handling, "
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	980 "which replaces an unencodable character with the "
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	981 "appropriate XML character reference.")
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	982 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	983 },
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	984 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	985 "backslashreplace",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	986 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	987 "backslashreplace_errors",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	988 backslashreplace_errors,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	989 METH_O,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	990 PyDoc_STR("Implements the 'backslashreplace' error handling, "
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	991 "which replaces an unencodable character with a "
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	992 "backslashed escape sequence.")
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	993 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	994 },
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	995 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	996 "surrogatepass",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	997 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	998 "surrogatepass",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	999 surrogatepass_errors,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	1000 METH_O
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	1001 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	1002 },
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	1003 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	1004 "surrogateescape",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	1005 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	1006 "surrogateescape",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	1007 surrogateescape_errors,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	1008 METH_O
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	1009 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	1010 }
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	1011 };
28325 850626d47574 Fixed SF bug #663074. The codec system was using global static Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27898 diff changeset	1012
31797 846b3ee7e106 Changed random calls to PyThreadState_Get() to use the macro Nicholas Bastin <nick.bastin@gmail.com> parents: 31273 diff changeset	1013 PyInterpreterState *interp = PyThreadState_GET()->interp;
28325 850626d47574 Fixed SF bug #663074. The codec system was using global static Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27898 diff changeset	1014 PyObject *mod;
32533 201986d6d9d6 Fix a couple of signed/unsigned comparison warnings Neal Norwitz <nnorwitz@gmail.com> parents: 31797 diff changeset	1015 unsigned i;
28325 850626d47574 Fixed SF bug #663074. The codec system was using global static Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27898 diff changeset	1016
850626d47574 Fixed SF bug #663074. The codec system was using global static Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27898 diff changeset	1017 if (interp->codec_search_path != NULL)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	1018 return 0;
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	1019
28325 850626d47574 Fixed SF bug #663074. The codec system was using global static Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27898 diff changeset	1020 interp->codec_search_path = PyList_New(0);
850626d47574 Fixed SF bug #663074. The codec system was using global static Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27898 diff changeset	1021 interp->codec_search_cache = PyDict_New();
850626d47574 Fixed SF bug #663074. The codec system was using global static Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27898 diff changeset	1022 interp->codec_error_registry = PyDict_New();
850626d47574 Fixed SF bug #663074. The codec system was using global static Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27898 diff changeset	1023
850626d47574 Fixed SF bug #663074. The codec system was using global static Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27898 diff changeset	1024 if (interp->codec_error_registry) {
72510 b534b56379cb Use the new Py_ARRAY_LENGTH macro Victor Stinner <victor.stinner@haypocalc.com> parents: 72475 diff changeset	1025 for (i = 0; i < Py_ARRAY_LENGTH(methods); ++i) {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	1026 PyObject *func = PyCFunction_New(&methods[i].def, NULL);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	1027 int res;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	1028 if (!func)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	1029 Py_FatalError("can't initialize codec error registry");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	1030 res = PyCodec_RegisterError(methods[i].name, func);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	1031 Py_DECREF(func);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	1032 if (res)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	1033 Py_FatalError("can't initialize codec error registry");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	1034 }
25091 0337dad8403e PEP 293 implemention (from SF patch http://www.python.org/sf/432401) Walter Dörwald <walter@livinglogic.de> parents: 24307 diff changeset	1035 }
28325 850626d47574 Fixed SF bug #663074. The codec system was using global static Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27898 diff changeset	1036
850626d47574 Fixed SF bug #663074. The codec system was using global static Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27898 diff changeset	1037 if (interp->codec_search_path == NULL \|\|
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	1038 interp->codec_search_cache == NULL \|\|
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	1039 interp->codec_error_registry == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	1040 Py_FatalError("can't initialize codec registry");
11972 d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	1041
44442 fa2f7183b1af More PyImport_ImportModule -> PyImport_ImportModuleNoBlock Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1042 mod = PyImport_ImportModuleNoBlock("encodings");
28325 850626d47574 Fixed SF bug #663074. The codec system was using global static Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27898 diff changeset	1043 if (mod == NULL) {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56894 diff changeset	1044 return -1;
28325 850626d47574 Fixed SF bug #663074. The codec system was using global static Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27898 diff changeset	1045 }
850626d47574 Fixed SF bug #663074. The codec system was using global static Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27898 diff changeset	1046 Py_DECREF(mod);
49613 efef5fc45a9a Issue 3723: Fixed initialization of subinterpreters Christian Heimes <christian@cheimes.de> parents: 47496 diff changeset	1047 interp->codecs_initialized = 1;
28325 850626d47574 Fixed SF bug #663074. The codec system was using global static Gustavo Niemeyer <gustavo@niemeyer.net> parents: 27898 diff changeset	1048 return 0;
11972 d0e06efb3165 Python Codec Registry and support functions, written by Marc-Andre Guido van Rossum <guido@python.org> parents: diff changeset	1049 }

Mercurial > cpython-lru_cache-weakref

annotate Python/codecs.c @ 76329:005fd1fe31ab