diff options
| author | Gregory P. Smith <greg@krypto.org> | 2013-12-08 00:39:36 -0800 |
|---|---|---|
| committer | Gregory P. Smith <greg@krypto.org> | 2013-12-08 00:39:36 -0800 |
| commit | b912042a98b755ccff8310a50ab26ec21336d72b (patch) | |
| tree | a2aab9ce447853a36d219cd6f6269a8b78711faa /Lib/json | |
| parent | 1f512c19aa629ffe4e3af940a0bc47edd572e389 (diff) | |
| parent | 9c699d30fb02545c73cf39cc2b162092e6b7b663 (diff) | |
| download | cpython-b912042a98b755ccff8310a50ab26ec21336d72b.tar.gz | |
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 a459f77a7b..94f7d8c0fa 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:: |