summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFred Drake <fdrake@acm.org>2002-06-29 16:06:47 (GMT)
committerFred Drake <fdrake@acm.org>2002-06-29 16:06:47 (GMT)
commit78e057a32a92c3bfb464b27a02f4931c474769e8 (patch)
tree885dbd0c9c425446ebb11e74a031ed3b4284aa70
parent19698174866b8c03848b6ca3a7ea9ce7f0133b91 (diff)
downloadcpython-78e057a32a92c3bfb464b27a02f4931c474769e8.zip
cpython-78e057a32a92c3bfb464b27a02f4931c474769e8.tar.gz
cpython-78e057a32a92c3bfb464b27a02f4931c474769e8.tar.bz2
Clarify the version information for the unicode() built-in.
Closes SF bug #575272.
-rw-r--r--Doc/lib/libfuncs.tex15
1 files changed, 9 insertions, 6 deletions
diff --git a/Doc/lib/libfuncs.tex b/Doc/lib/libfuncs.tex
index dbd3d55..793e472 100644
--- a/Doc/lib/libfuncs.tex
+++ b/Doc/lib/libfuncs.tex
@@ -873,13 +873,16 @@ def my_import(name):
behaviour of \code{str()} except that it returns Unicode strings
instead of 8-bit strings. More precisely, if \var{object} is an
Unicode string or subclass it will return a Unicode string without
- any additional decoding applied. For objects which provide a
- \code{__unicode__} method, it will call this method without
- arguments to create a Unicode string. For all other objects, the
- 8-bit string version or representation is requested and then
- converted to a Unicode string using the codec for the default
- encoding in \code{'strict'} mode.
+ any additional decoding applied.
+
+ For objects which provide a \method{__unicode__()} method, it will
+ call this method without arguments to create a Unicode string. For
+ all other objects, the 8-bit string version or representation is
+ requested and then converted to a Unicode string using the codec for
+ the default encoding in \code{'strict'} mode.
+
\versionadded{2.0}
+ \versionchanged[Support for \method{__unicode__()} added]{2.2}
\end{funcdesc}
\begin{funcdesc}{vars}{\optional{object}}