summaryrefslogtreecommitdiff
path: root/django/utils/simplejson
AgeCommit message (Collapse)Author
2012-04-29Fixed #18023 -- Removed bundled simplejson.Aymeric Augustin
And started the deprecation path for django.utils.simplejson. Thanks Alex Ogier, Clueless, and other contributors for their work on the patch.
2012-04-01Fixed #18022 -- Fixed import of standalone Python 'json' module.Ramiro Morales
Thanks Clueless for the report and initial patch. Refs #17071, r17018. git-svn-id: http://code.djangoproject.com/svn/django/trunk@17865 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-10-20Fixed #17071 -- Made sure we report the right version of system-level ↵Ramiro Morales
{simple,}json module. git-svn-id: http://code.djangoproject.com/svn/django/trunk@17018 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-27Fixed #10006 -- Avoid inadvertently using third-party "json" module.Malcolm Tredinnick
In r9707 we added a preference to use Python's standard json module (Python 2.6 and beyond). However, there is also a third-party module called json that was being picked up by accident if it was installed. It isn't API compatible, so bad things happened. This change avoids that problem. Patch from markmuetz. git-svn-id: http://code.djangoproject.com/svn/django/trunk@9910 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-01-06Upgraded included simplejson to 2.0.7.Malcolm Tredinnick
Also changed importing logic to prefer a system-installed version of simplejson (unless it's an earlier version that does not contian the C speedups), then the json module from Python 2.6, then the version shipped with Django. Fixed #9266. git-svn-id: http://code.djangoproject.com/svn/django/trunk@9707 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-27Fixed #7131 -- Updated included simplejson code to match the simplejson-1.9.2Malcolm Tredinnick
release. This should be fully backwards-compatible for people using the public interfaces. git-svn-id: http://code.djangoproject.com/svn/django/trunk@8124 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-01-30Fixed #3320: upgraded django.utils.simplejson to simplejson version 1.5. ↵Jacob Kaplan-Moss
Thanks, Lawrence Oluyede. git-svn-id: http://code.djangoproject.com/svn/django/trunk@4454 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-24Fixed #2677 -- Removed the need to import sre and hence avoid aMalcolm Tredinnick
DeprecationWarning. Thanks, Tom Tobin. git-svn-id: http://code.djangoproject.com/svn/django/trunk@3814 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-28Added Bob Ippolito's simplejson (http://undefined.org/python/#simplejson) as ↵Jacob Kaplan-Moss
{{{django.auth.simplejson}}}. This is version 1.3 of simplejson. Thanks to Bob for his code and his permission to include it. git-svn-id: http://code.djangoproject.com/svn/django/trunk@3232 bcc190cf-cafb-0310-a4f2-bffc1f526a37