Malcolm Tredinnick e20f09c2d0 Fixed #10006 -- Avoid inadvertently using third-party "json" module. ... 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-02-27 05:14:11 +00:00
..
LICENSE.txt	Fixed #7131 -- Updated included simplejson code to match the simplejson-1.9.2	2008-07-27 23:38:28 +00:00
__init__.py	Fixed #10006 -- Avoid inadvertently using third-party "json" module.	2009-02-27 05:14:11 +00:00
decoder.py	Upgraded included simplejson to 2.0.7.	2009-01-06 05:13:02 +00:00
encoder.py	Upgraded included simplejson to 2.0.7.	2009-01-06 05:13:02 +00:00
scanner.py	Upgraded included simplejson to 2.0.7.	2009-01-06 05:13:02 +00:00
tool.py	Upgraded included simplejson to 2.0.7.	2009-01-06 05:13:02 +00:00