diff options
| author | Daniel Stutzbach <daniel@stutzbachenterprises.com> | 2010-09-03 18:37:34 (GMT) |
|---|---|---|
| committer | Daniel Stutzbach <daniel@stutzbachenterprises.com> | 2010-09-03 18:37:34 (GMT) |
| commit | 23ef20f46140603e372c9bcd78110aa6bb9c361d (patch) | |
| tree | 1939fd3d5f3e6e222771cc4dcdcbc1947e86f425 /Doc | |
| parent | f6efac6df28f1f6a7d699c9fcf4c867c8fce19fb (diff) | |
| download | cpython-23ef20f46140603e372c9bcd78110aa6bb9c361d.zip cpython-23ef20f46140603e372c9bcd78110aa6bb9c361d.tar.gz cpython-23ef20f46140603e372c9bcd78110aa6bb9c361d.tar.bz2 | |
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()
........
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/c-api/unicode.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/c-api/unicode.rst b/Doc/c-api/unicode.rst index 8973207..e8e0db8 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 |