diff options
author | Gregory P. Smith <greg@krypto.org> | 2013-12-08 00:39:07 -0800 |
---|---|---|
committer | Gregory P. Smith <greg@krypto.org> | 2013-12-08 00:39:07 -0800 |
commit | 9c699d30fb02545c73cf39cc2b162092e6b7b663 (patch) | |
tree | 472078a8843605d1409544fbdc255e86f554d211 /Lib/json | |
parent | 02e1c39b59abceabd88624d3018379ed2e3609e0 (diff) | |
download | cpython-9c699d30fb02545c73cf39cc2b162092e6b7b663.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 48a4f8f863..6d9b30d92e 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:: |