mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-24 11:44:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Rename the surrogates error handler to surrogatepass.

Browse source
This commit is contained in:
Martin v. Löwis 2009-05-10 08:08:56 +00:00
parent cf7925dfc6
commit e0a2b72e61
6 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Python/codecs.c
View file

@ -751,7 +751,7 @@ PyObject *PyCodec_BackslashReplaceErrors(PyObject *exc)
/* This handler is declared static until someone demonstrates
a need to call it directly. */
static PyObject *
PyCodec_SurrogateErrors(PyObject *exc)
PyCodec_SurrogatePassErrors(PyObject *exc)
{
PyObject *restuple;
PyObject *object;
@ -935,9 +935,9 @@ static PyObject *backslashreplace_errors(PyObject *self, PyObject *exc)
return PyCodec_BackslashReplaceErrors(exc);
}
static PyObject *surrogates_errors(PyObject *self, PyObject *exc)
static PyObject *surrogatepass_errors(PyObject *self, PyObject *exc)
{
return PyCodec_SurrogateErrors(exc);
return PyCodec_SurrogatePassErrors(exc);
}
static PyObject *utf8b_errors(PyObject *self, PyObject *exc)
@ -993,10 +993,10 @@ static int _PyCodecRegistry_Init(void)
}
},
{
"surrogates",
"surrogatepass",
{
"surrogates",
surrogates_errors,
"surrogatepass",
surrogatepass_errors,
METH_O
}
},

4
Python/marshal.c
View file

@ -314,7 +314,7 @@ w_object(PyObject *v, WFILE *p)
PyObject *utf8;
utf8 = PyUnicode_EncodeUTF8(PyUnicode_AS_UNICODE(v),
PyUnicode_GET_SIZE(v),
"surrogates");
"surrogatepass");
if (utf8 == NULL) {
p->depth--;
p->error = WFERR_UNMARSHALLABLE;
@ -809,7 +809,7 @@ r_object(RFILE *p)
retval = NULL;
break;
}
v = PyUnicode_DecodeUTF8(buffer, n, "surrogates");
v = PyUnicode_DecodeUTF8(buffer, n, "surrogatepass");
PyMem_DEL(buffer);
retval = v;
break;