From: Daniel Stutzbach Date: Fri, 3 Sep 2010 18:37:34 +0000 (+0000) Subject: Merged revisions 84459 via svnmerge from X-Git-Tag: v3.1.3rc1~282 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=23ef20f46140603e372c9bcd78110aa6bb9c361d;p=python Merged revisions 84459 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r84459 | daniel.stutzbach | 2010-09-03 13:31:07 -0500 (Fri, 03 Sep 2010) | 1 line Doc fix: unicode() is now str() ........ --- diff --git a/Doc/c-api/unicode.rst b/Doc/c-api/unicode.rst index 8973207213..e8e0db8c6f 100644 --- a/Doc/c-api/unicode.rst +++ b/Doc/c-api/unicode.rst @@ -420,7 +420,7 @@ these codecs are directly usable via the following functions. Many of the following APIs take two arguments encoding and errors. These parameters encoding and errors have the same semantics as the ones of the -built-in :func:`unicode` Unicode object constructor. +built-in :func:`str` string object constructor. Setting encoding to *NULL* causes the default encoding to be used which is ASCII. The file system calls should use