From cec6bd5a59547dc97fe98975c570fc27a1e970be Mon Sep 17 00:00:00 2001 From: Aymeric Augustin Date: Sun, 29 Apr 2012 19:58:00 +0200 Subject: 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. --- tests/regressiontests/test_utils/tests.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/regressiontests/test_utils') diff --git a/tests/regressiontests/test_utils/tests.py b/tests/regressiontests/test_utils/tests.py index 2192404b93..a277bc999b 100644 --- a/tests/regressiontests/test_utils/tests.py +++ b/tests/regressiontests/test_utils/tests.py @@ -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() -- cgit v1.3