django1

Commit Graph

Author	SHA1	Message	Date
Malcolm Tredinnick	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
Malcolm Tredinnick	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

Author

SHA1

Message

Date

Malcolm Tredinnick

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

Malcolm Tredinnick

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

2 Commits