diff options
| author | Gregory P. Smith <greg@krypto.org> | 2013-12-08 08:39:36 (GMT) |
|---|---|---|
| committer | Gregory P. Smith <greg@krypto.org> | 2013-12-08 08:39:36 (GMT) |
| commit | f491f92529080f6ebe53e4a54ad1fbf4b6f2a57c (patch) | |
| tree | 284b0104e0cf179687b61c1729f1d739176b6ff9 /Lib/json | |
| parent | 34bc8974cd119814276c6e8bc7a9ad518967d59f (diff) | |
| parent | a82f74dee35cb2d433fdf86e48ea6f5cd45b6ded (diff) | |
| download | cpython-f491f92529080f6ebe53e4a54ad1fbf4b6f2a57c.zip cpython-f491f92529080f6ebe53e4a54ad1fbf4b6f2a57c.tar.gz cpython-f491f92529080f6ebe53e4a54ad1fbf4b6f2a57c.tar.bz2 | |
Remove mentions of Python 2.x and being externally maintained from
the bundled json module. Replace that with a mention of it being
a version of the externally maintained simplejson module.
Diffstat (limited to 'Lib/json')
| -rw-r--r-- | Lib/json/__init__.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Lib/json/__init__.py b/Lib/json/__init__.py index a459f77..94f7d8c 100644 --- a/Lib/json/__init__.py +++ b/Lib/json/__init__.py @@ -3,11 +3,8 @@ JavaScript syntax (ECMA-262 3rd edition) used as a lightweight data interchange format. :mod:`json` exposes an API familiar to users of the standard library -:mod:`marshal` and :mod:`pickle` modules. It is the externally maintained -version of the :mod:`json` library contained in Python 2.6, but maintains -compatibility with Python 2.4 and Python 2.5 and (currently) has -significant performance advantages, even without using the optional C -extension for speedups. +:mod:`marshal` and :mod:`pickle` modules. It is derived from a +version of the externally maintained simplejson library. Encoding basic Python object hierarchies:: |