diff options
| author | Georg Brandl <georg@python.org> | 2009-04-27 16:51:45 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2009-04-27 16:51:45 (GMT) |
| commit | ff2ad0e1a601f04b23dcd2eaf8ffba066123d1dd (patch) | |
| tree | ea7d1d55e5f36bb87e151d96524596756674d77f /Doc/library/json.rst | |
| parent | 3afd46007c4b1098fac697d78e7b9df3ceaf7680 (diff) | |
| download | cpython-ff2ad0e1a601f04b23dcd2eaf8ffba066123d1dd.zip cpython-ff2ad0e1a601f04b23dcd2eaf8ffba066123d1dd.tar.gz cpython-ff2ad0e1a601f04b23dcd2eaf8ffba066123d1dd.tar.bz2 | |
Merged revisions 71814-71817,71901-71903 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r71814 | georg.brandl | 2009-04-23 10:44:57 +0200 (Do, 23 Apr 2009) | 1 line
#5820: fix bug in usage of getreader().
........
r71815 | georg.brandl | 2009-04-23 10:49:39 +0200 (Do, 23 Apr 2009) | 1 line
Fix rewrapping accident.
........
r71816 | georg.brandl | 2009-04-23 10:49:56 +0200 (Do, 23 Apr 2009) | 1 line
#5813: add a reference to the "future statements" section.
........
r71817 | georg.brandl | 2009-04-23 10:52:03 +0200 (Do, 23 Apr 2009) | 1 line
Add link to PEP 236.
........
r71901 | georg.brandl | 2009-04-25 16:50:25 +0200 (Sa, 25 Apr 2009) | 1 line
#3320: fix spelling.
........
r71902 | georg.brandl | 2009-04-25 16:51:31 +0200 (Sa, 25 Apr 2009) | 1 line
#5834: use "failure" instead of "error" because the two have different meanings in unittest context.
........
r71903 | georg.brandl | 2009-04-25 17:05:04 +0200 (Sa, 25 Apr 2009) | 1 line
#5821: add some capabilities of TarFile's file-like object.
........
Diffstat (limited to 'Doc/library/json.rst')
| -rw-r--r-- | Doc/library/json.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/json.rst b/Doc/library/json.rst index e2d189c..3275b4a 100644 --- a/Doc/library/json.rst +++ b/Doc/library/json.rst @@ -173,7 +173,7 @@ Basic Usage If the contents of *fp* are encoded with an ASCII based encoding other than UTF-8 (e.g. latin-1), then an appropriate *encoding* name must be specified. Encodings that are not ASCII based (such as UCS-2) are not allowed, and - should be wrapped with ``codecs.getreader(fp)(encoding)``, or simply decoded + should be wrapped with ``codecs.getreader(encoding)(fp)``, or simply decoded to a :class:`unicode` object and passed to :func:`loads`. *object_hook* is an optional function that will be called with the result of |