Commit cec6bd5a authored by Aymeric Augustin's avatar Aymeric Augustin
Browse files

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

MANIFEST.in

+0 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ include MANIFEST.in 
include django/contrib/gis/gdal/LICENSE

include django/contrib/gis/geos/LICENSE

include django/dispatch/license.txt

include django/utils/simplejson/LICENSE.txt

recursive-include docs *

recursive-include scripts *

recursive-include extras *

django/contrib/formtools/wizard/storage/cookie.py

+2 −1
Original line number Diff line number Diff line 
import json



from django.core.exceptions import SuspiciousOperation

from django.core.signing import BadSignature

from django.utils import simplejson as json



from django.contrib.formtools.wizard import storage

django/contrib/gis/geometry/test_data.py

+2 −2
Original line number Diff line number Diff line
@@ -3,10 +3,10 @@ This module has the mock object definitions used to hold reference geometry 
for the GEOS and GDAL tests.

"""

import gzip

import json

import os



from django.contrib import gis

from django.utils import simplejson





# This global used to store reference geometry data.
@@ -100,6 +100,6 @@ class TestDataMixin(object): 
        if GEOMETRIES is None:

            # Load up the test geometry data from fixture into global.

            gzf = gzip.GzipFile(os.path.join(TEST_DATA, 'geometries.json.gz'))

            geometries = simplejson.loads(gzf.read())

            geometries = json.loads(gzf.read())

            GEOMETRIES = TestGeomSet(**strconvert(geometries))

        return GEOMETRIES

django/contrib/messages/storage/cookie.py

+2 −1
Original line number Diff line number Diff line 
import json



from django.conf import settings

from django.contrib.messages.storage.base import BaseStorage, Message

from django.http import SimpleCookie

from django.utils import simplejson as json

from django.utils.crypto import salted_hmac, constant_time_compare

django/contrib/messages/tests/cookie.py

+2 −1
Original line number Diff line number Diff line 
import json



from django.contrib.messages import constants

from django.contrib.messages.tests.base import BaseTest

from django.contrib.messages.storage.cookie import (CookieStorage,

    MessageEncoder, MessageDecoder)

from django.contrib.messages.storage.base import Message

from django.test.utils import override_settings

from django.utils import simplejson as json





def set_cookie_data(storage, messages, invalid=False, encode_empty=False):