summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorRaymond Hettinger <python@rcn.com>2003-01-13 04:29:19 (GMT)
committerRaymond Hettinger <python@rcn.com>2003-01-13 04:29:19 (GMT)
commit2bd1568d35d4a7466a5bd1d379ae04c2cdec8803 (patch)
treef7f2ff4ef42c63bf0278079b66091f928bf943da /Doc
parentbc6552156770ec98e5f8ab39974836cfcde8d5db (diff)
downloadcpython-2bd1568d35d4a7466a5bd1d379ae04c2cdec8803.zip
cpython-2bd1568d35d4a7466a5bd1d379ae04c2cdec8803.tar.gz
cpython-2bd1568d35d4a7466a5bd1d379ae04c2cdec8803.tar.bz2
SF patch 664183 and SF bug 664044: Note that both u'%s' % 'x' and
'%s' % u'x' return a unicode object.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/lib/libstdtypes.tex5
1 files changed, 4 insertions, 1 deletions
diff --git a/Doc/lib/libstdtypes.tex b/Doc/lib/libstdtypes.tex
index a377426..5f4a154 100644
--- a/Doc/lib/libstdtypes.tex
+++ b/Doc/lib/libstdtypes.tex
@@ -834,7 +834,7 @@ The conversion types are:
\lineiii{r}{String (converts any python object using
\function{repr()}).}{(3)}
\lineiii{s}{String (converts any python object using
- \function{str()}).}{}
+ \function{str()}).}{(4)}
\lineiii{\%}{No argument is converted, results in a \character{\%}
character in the result.}{}
\end{tableiii}
@@ -855,6 +855,9 @@ Notes:
not already a zero.
\item[(3)]
The \code{\%r} conversion was added in Python 2.0.
+ \item[(4)]
+ If the object or format provided is a \class{unicode} string,
+ the resulting string will also be \class{unicode}.
\end{description}
% XXX Examples?