summaryrefslogtreecommitdiff
path: root/sphinx/util/jsonimpl.py
Commit message (Collapse)AuthorAgeFilesLines
* merge with 1.0Georg Brandl2011-01-041-1/+1
|\
| * New year update.Georg Brandl2011-01-041-1/+1
| |
* | Docstring harmonization.Georg Brandl2010-08-221-1/+1
|/
* #488: Fix crash when json-py is installed, which provides a ``json`` module ↵Georg Brandl2010-08-051-1/+3
| | | | but is incompatible to simplejson.
* Dont fail when no json impl is found.Georg Brandl2010-07-271-2/+5
|
* Add a custom json serializer implementation that forces translation proxies. ↵Georg Brandl2010-07-251-0/+43
Fixes building with the JSON builder.