diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2009-05-04 18:56:13 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2009-05-04 18:56:13 (GMT) |
| commit | 244651aa2f21db5006bbdc013d2586cbc10b313d (patch) | |
| tree | d3676bec7e1efd55db9bfc10e02a9e9f5939de25 /Include/unicodeobject.h | |
| parent | 375c01973881076b13d7d08afcd0b06b2a7690ce (diff) | |
| download | cpython-244651aa2f21db5006bbdc013d2586cbc10b313d.zip cpython-244651aa2f21db5006bbdc013d2586cbc10b313d.tar.gz cpython-244651aa2f21db5006bbdc013d2586cbc10b313d.tar.bz2 | |
Merged revisions 72283-72284 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r72283 | antoine.pitrou | 2009-05-04 20:32:32 +0200 (lun., 04 mai 2009) | 4 lines
Issue #4426: The UTF-7 decoder was too strict and didn't accept some legal sequences.
Patch by Nick Barnes and Victor Stinner.
........
r72284 | antoine.pitrou | 2009-05-04 20:32:50 +0200 (lun., 04 mai 2009) | 3 lines
Add Nick Barnes to ACKS.
........
Diffstat (limited to 'Include/unicodeobject.h')
| -rw-r--r-- | Include/unicodeobject.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Include/unicodeobject.h b/Include/unicodeobject.h index 696c1c7..9c11873 100644 --- a/Include/unicodeobject.h +++ b/Include/unicodeobject.h @@ -858,10 +858,8 @@ PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF7Stateful( PyAPI_FUNC(PyObject*) PyUnicode_EncodeUTF7( const Py_UNICODE *data, /* Unicode char buffer */ Py_ssize_t length, /* number of Py_UNICODE chars to encode */ - int encodeSetO, /* force the encoder to encode characters in - Set O, as described in RFC2152 */ - int encodeWhiteSpace, /* force the encoder to encode space, tab, - carriage return and linefeed characters */ + int base64SetO, /* Encode RFC2152 Set O characters in base64 */ + int base64WhiteSpace, /* Encode whitespace (sp, ht, nl, cr) in base64 */ const char *errors /* error handling */ ); |