From: Gregory P. Smith <greg@krypto.org>
Date: Sun, 8 Dec 2013 08:39:07 +0000 (-0800)
Subject: Remove mentions of Python 2.x and being externally maintained from
X-Git-Tag: v3.4.0b2~299^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a82f74dee35cb2d433fdf86e48ea6f5cd45b6ded;p=thirdparty%2FPython%2Fcpython.git

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.
---

diff --git a/Lib/json/__init__.py b/Lib/json/__init__.py
index 48a4f8f863e4..6d9b30d92e60 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::