diff options
| author | Walter Dörwald <walter@livinglogic.de> | 2002-09-02 13:14:32 (GMT) |
|---|---|---|
| committer | Walter Dörwald <walter@livinglogic.de> | 2002-09-02 13:14:32 (GMT) |
| commit | 3aeb632c3152fa082132ce55b9a880e0d16b04ae (patch) | |
| tree | 192bc1543ea77a826d0c940d024dbc8ebba82156 /Objects/stringobject.c | |
| parent | 94fab762de532de551987e1f48a125145f85304b (diff) | |
| download | cpython-3aeb632c3152fa082132ce55b9a880e0d16b04ae.zip cpython-3aeb632c3152fa082132ce55b9a880e0d16b04ae.tar.gz cpython-3aeb632c3152fa082132ce55b9a880e0d16b04ae.tar.bz2 | |
PEP 293 implemention (from SF patch http://www.python.org/sf/432401)
Diffstat (limited to 'Objects/stringobject.c')
| -rw-r--r-- | Objects/stringobject.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Objects/stringobject.c b/Objects/stringobject.c index 8ae9407..31f188a 100644 --- a/Objects/stringobject.c +++ b/Objects/stringobject.c @@ -2468,7 +2468,9 @@ PyDoc_STRVAR(encode__doc__, Encodes S using the codec registered for encoding. encoding defaults\n\ to the default encoding. errors may be given to set a different error\n\ handling scheme. Default is 'strict' meaning that encoding errors raise\n\ -a ValueError. Other possible values are 'ignore' and 'replace'."); +a UnicodeEncodeError. Other possible values are 'ignore', 'replace' and\n\ +'xmlcharrefreplace' as well as any other name registered with\n\ +codecs.register_error that is able to handle UnicodeEncodeErrors."); static PyObject * string_encode(PyStringObject *self, PyObject *args) @@ -2487,7 +2489,9 @@ PyDoc_STRVAR(decode__doc__, Decodes S using the codec registered for encoding. encoding defaults\n\ to the default encoding. errors may be given to set a different error\n\ handling scheme. Default is 'strict' meaning that encoding errors raise\n\ -a ValueError. Other possible values are 'ignore' and 'replace'."); +a UnicodeDecodeError. Other possible values are 'ignore' and 'replace'\n\ +as well as any other name registerd with codecs.register_error that is\n\ +able to handle UnicodeDecodeErrors."); static PyObject * string_decode(PyStringObject *self, PyObject *args) |