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

.encode()/.decode() patch part 2.

Browse source
This commit is contained in:
Marc-André Lemburg 2004-07-08 19:13:55 +00:00
parent d2d4598ec2
commit 1dffb120b7
2 changed files with 20 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Objects/stringobject.c
View file

@ -2678,6 +2678,8 @@ string_encode(PyStringObject *self, PyObject *args)
if (!PyArg_ParseTuple(args, "|ss:encode", &encoding, &errors))
return NULL;
v = PyString_AsEncodedObject((PyObject *)self, encoding, errors);
if (v == NULL)
goto onError;
if (!PyString_Check(v) && !PyUnicode_Check(v)) {
PyErr_Format(PyExc_TypeError,
"encoder did not return a string/unicode object "
@ -2687,6 +2689,9 @@ string_encode(PyStringObject *self, PyObject *args)
return NULL;
}
return v;
onError:
return NULL;
}
@ -2710,6 +2715,8 @@ string_decode(PyStringObject *self, PyObject *args)
if (!PyArg_ParseTuple(args, "|ss:decode", &encoding, &errors))
return NULL;
v = PyString_AsDecodedObject((PyObject *)self, encoding, errors);
if (v == NULL)
goto onError;
if (!PyString_Check(v) && !PyUnicode_Check(v)) {
PyErr_Format(PyExc_TypeError,
"decoder did not return a string/unicode object "
@ -2719,6 +2726,9 @@ string_decode(PyStringObject *self, PyObject *args)
return NULL;
}
return v;
onError:
return NULL;
}