[Python-checkins] cpython (merge 3.3 -> default): Remove mentions of Python 2.x and being externally maintained from

[gregory.p.smith]

http://hg.python.org/cpython/rev/8f789599b26a
changeset:   87827:8f789599b26a
parent:      87825:7ff101a449b4
parent:      87826:3580c718add3
user:        Gregory P. Smith <greg at krypto.org>
date:        Sun Dec 08 00:39:36 2013 -0800
summary:
  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.

files:
  Lib/json/__init__.py |  7 ++-----
  1 files changed, 2 insertions(+), 5 deletions(-)


diff --git a/Lib/json/__init__.py b/Lib/json/__init__.py
--- a/Lib/json/__init__.py
+++ b/Lib/json/__init__.py
@@ -3,11 +3,8 @@
 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::
 

-- 
Repository URL: http://hg.python.org/cpython