summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2009-02-27 05:14:11 +0000
committerMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2009-02-27 05:14:11 +0000
commite20f09c2d047d782b4b471b2e8cf4a910b338db6 (patch)
treeabf61770d1bf75570c5f9a447a49298b533b245f /docs
parent0dd4ec654f4b22854df841d9ea8f463fdbdf99c3 (diff)
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
Diffstat (limited to 'docs')
0 files changed, 0 insertions, 0 deletions