From: Marc-André Lemburg <mal@egenix.com>
Date: Thu, 21 Sep 2000 21:08:08 +0000 (+0000)
Subject: Special case the "s#" PyArg_Parse() token for Unicode objects:
X-Git-Tag: v2.0b2~154
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3578b77312720061ef3e5a86e3db4f3c968edf56;p=thirdparty%2FPython%2Fcpython.git

Special case the "s#" PyArg_Parse() token for Unicode objects:
"s#" will now return a pointer to the default encoded string data
of the Unicode object instead of a pointer to the raw UTF-16
data.

The latter is still available via PyObject_AsReadBuffer().
---

diff --git a/Doc/ext/ext.tex b/Doc/ext/ext.tex
index d54b78cac92c..38215fad66b4 100644
--- a/Doc/ext/ext.tex
+++ b/Doc/ext/ext.tex
@@ -692,10 +692,10 @@ raised.
 This variant on \samp{s} stores into two C variables, the first one a
 pointer to a character string, the second one its length.  In this
 case the Python string may contain embedded null bytes.  Unicode
-objects and all other read buffer compatible objects pass back a
-reference to the raw internal data representation. In case of Unicode
-objects the pointer points to a null-terminated buffer of 16-bit
-Py_UNICODE (UTF-16) data.
+objects pass back a pointer to the default encoded string version of the
+object if such a conversion is possible. All other read buffer
+compatible objects pass back a reference to the raw internal data
+representation.
 
 \item[\samp{z} (string or \code{None}) {[char *]}]
 Like \samp{s}, but the Python object may also be \code{None}, in which