Fixed #18023 -- Removed bundled simplejson.

And started the deprecation path for django.utils.simplejson.

Thanks Alex Ogier, Clueless, and other contributors for their
work on the patch.

1 files changed, 11 insertions, 2 deletions

diff --git a/docs/releases/1.5.txt b/docs/releases/1.5.txt
index dcf050f2ae..4f6b05f8f4 100644
--- a/docs/releases/1.5.txt
+++ b/docs/releases/1.5.txt
@@ -58,8 +58,17 @@ Backwards incompatible changes in 1.5
 Features deprecated in 1.5
 ==========================
 
-itercompat.product
-~~~~~~~~~~~~~~~~~~
+``django.utils.simplejson``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Since Django 1.5 drops support for Python 2.5, all supported versions of
+Python provide the :mod:`json` module in their standard library. This module
+is actually a version of ``simplejson`` distributed by Python, so Django no
+longer needs to provide a copy. Any use of :mod:`django.utils.simplejson` can
+be safely changed to :mod:`json`.
+
+``itercompat.product``
+~~~~~~~~~~~~~~~~~~~~~~
 
 The :func:`~django.utils.itercompat.product` function has been deprecated. Use
 the builtin `itertools.product` instead.