Skip to content

Commit

Permalink
Upgraded included simplejson to 2.0.7.
Browse files Browse the repository at this point in the history 
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
  • Loading branch information
@malcolmt
malcolmt committed Jan 6, 2009
1 parent 3b489b7 commit a9c2f03
Show file tree
Hide file tree
Showing 6 changed files with 710 additions and 700 deletions.

0 comments on commit a9c2f03

Please sign in to comment.