diff options
| author | Georg Brandl <georg@python.org> | 2009-01-03 22:47:39 +0000 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2009-01-03 22:47:39 +0000 |
| commit | 1f01debe6f94d7f178e14ee7417786461b724e96 (patch) | |
| tree | f092e467dbf9846ec29f59e626f4d50eb1b2b8c1 /Doc/library/json.rst | |
| parent | 814a2ca9e4b6360f1de37ed3d8d8d4313ab333bc (diff) | |
| download | cpython-git-1f01debe6f94d7f178e14ee7417786461b724e96.tar.gz | |
Merged revisions 68162,68166,68171,68176,68195-68196,68210,68232 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r68162 | ronald.oussoren | 2009-01-02 16:06:00 +0100 (Fri, 02 Jan 2009) | 3 lines
Fix for issue 4472 is incompatible with Cygwin, this patch
should fix that.
........
r68166 | benjamin.peterson | 2009-01-02 19:26:23 +0100 (Fri, 02 Jan 2009) | 1 line
document PyMemberDef
........
r68171 | georg.brandl | 2009-01-02 21:25:14 +0100 (Fri, 02 Jan 2009) | 3 lines
#4811: fix markup glitches (mostly remains of the conversion),
found by Gabriel Genellina.
........
r68176 | andrew.kuchling | 2009-01-02 22:00:35 +0100 (Fri, 02 Jan 2009) | 1 line
Add various items
........
r68195 | georg.brandl | 2009-01-03 14:45:15 +0100 (Sat, 03 Jan 2009) | 2 lines
Remove useless string literal.
........
r68196 | georg.brandl | 2009-01-03 15:29:53 +0100 (Sat, 03 Jan 2009) | 2 lines
Fix indentation.
........
r68210 | georg.brandl | 2009-01-03 20:10:12 +0100 (Sat, 03 Jan 2009) | 2 lines
Set eol-style correctly for mp_distributing.py.
........
r68232 | georg.brandl | 2009-01-03 22:52:16 +0100 (Sat, 03 Jan 2009) | 2 lines
Grammar fix.
........
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 69d4c10248..22925f53c8 100644 --- a/Doc/library/json.rst +++ b/Doc/library/json.rst @@ -151,7 +151,7 @@ Basic Usage *default(obj)* is a function that should return a serializable version of *obj* or raise :exc:`TypeError`. The default simply raises :exc:`TypeError`. - To use a custom :class:`JSONEncoder`` subclass (e.g. one that overrides the + To use a custom :class:`JSONEncoder` subclass (e.g. one that overrides the :meth:`default` method to serialize additional types), specify it with the *cls* kwarg. |