mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-24 06:06:09 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #18023 -- Removed bundled simplejson.

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

Thanks Alex Ogier, Clueless, and other contributors for their
work on the patch.
This commit is contained in:
Aymeric Augustin
2012-04-29 19:58:00 +02:00
parent ee0a7c741e
commit cec6bd5a59
26 changed files with 105 additions and 1321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/regressiontests/test_utils/tests.py
View File

@@ -491,7 +491,7 @@ class AssertFieldOutputTests(SimpleTestCase):
__test__ = {"API_TEST": r"""
# Some checks of the doctest output normalizer.
# Standard doctests do fairly
>>> from django.utils import simplejson
>>> import json
>>> from django.utils.xmlutils import SimplerXMLGenerator
>>> from StringIO import StringIO
@@ -502,7 +502,7 @@ __test__ = {"API_TEST": r"""
... return 42
>>> def produce_json():
... return simplejson.dumps(['foo', {'bar': ('baz', None, 1.0, 2), 'whiz': 42}])
... return json.dumps(['foo', {'bar': ('baz', None, 1.0, 2), 'whiz': 42}])
>>> def produce_xml():
... stream = StringIO()