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

Drop claims that Unicode always means UCS-2. Fixes #881861.

Browse source
This commit is contained in:
Martin v. Löwis 2004-06-03 09:55:28 +00:00
parent 4a9b8069e0
commit 9bc4f2def3
2 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Doc/api/concrete.tex
View file

@ -1109,9 +1109,10 @@ These are the UTF-16 codec APIs:
the Unicode BOM mark (U+FEFF). In the other two modes, no BOM mark
is prepended.
Note that \ctype{Py_UNICODE} data is being interpreted as UTF-16
reduced to UCS-2. This trick makes it possible to add full UTF-16
capabilities at a later point without comprimising the APIs.
If \var{Py_UNICODE_WIDE} is defined, a single \ctype{Py_UNICODE}
value may get represented as a surrogate pair. If it is not
defined, each \ctype{Py_UNICODE} values is interpreted as an
UCS-2 character.
Returns \NULL{} if an exception was raised by the codec.
\end{cfuncdesc}

12
Doc/api/utilities.tex
View file

@ -780,14 +780,14 @@ PyArg_ParseTuple(args, "O|O:ref", &object, &callback)
Same as \samp{s\#}.
\item[\samp{u} (Unicode string) {[Py_UNICODE *]}]
Convert a null-terminated buffer of Unicode (UCS-2) data to a
Python Unicode object. If the Unicode buffer pointer is \NULL,
\code{None} is returned.
Convert a null-terminated buffer of Unicode (UCS-2 or UCS-4)
data to a Python Unicode object. If the Unicode buffer pointer
is \NULL, \code{None} is returned.
\item[\samp{u\#} (Unicode string) {[Py_UNICODE *, int]}]
Convert a Unicode (UCS-2) data buffer and its length to a Python
Unicode object. If the Unicode buffer pointer is \NULL, the
length is ignored and \code{None} is returned.
Convert a Unicode (UCS-2 or UCS-4) data buffer and its length
to a Python Unicode object. If the Unicode buffer pointer
is \NULL, the length is ignored and \code{None} is returned.
\item[\samp{i} (integer) {[int]}]
Convert a plain C \ctype{int} to a Python integer object.