a9c2f033cd
Upgraded included simplejson to 2.0.7.
...
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
2009-01-06 05:13:02 +00:00
d57ce3d6a9
Fixed #7131 -- Updated included simplejson code to match the simplejson-1.9.2
...
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
2008-07-27 23:38:28 +00:00
695302ce92
Fixed #3320 : upgraded django.utils.simplejson to simplejson version 1.5. Thanks, Lawrence Oluyede.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4454 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-01-30 22:34:15 +00:00
b05e5501a4
Fixed #2677 -- Removed the need to import sre and hence avoid a
...
DeprecationWarning. Thanks, Tom Tobin.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3814 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-24 11:44:04 +00:00
f44e7acb17
Added Bob Ippolito's simplejson ( http://undefined.org/python/#simplejson ) as {{{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
2006-06-28 20:59:49 +00:00
Malcolm Tredinnick
Jacob Kaplan-Moss