summaryrefslogtreecommitdiff
path: root/sphinx/util/jsonimpl.py
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'stable'Takeshi KOMIYA2017-03-261-1/+1
|\
| * Year++Takeshi KOMIYA2017-03-261-1/+1
* | Upgrade to mypy-0.5Takeshi KOMIYA2017-03-031-1/+1
* | Fix mypy violationsTakeshi KOMIYA2017-02-081-1/+10
|/
* Obligatory copyright update.Georg Brandl2016-01-141-1/+1
* util: pep8 fixesGeorg Brandl2015-03-081-0/+3
* Merge branch 'stable'Georg Brandl2015-01-031-1/+1
|\
| * all: update copyrightGeorg Brandl2015-01-031-1/+1
* | use six privided text_type() to replace with unicode() to support py2/py3 in ...Takayuki Shimizukawa2014-04-291-1/+2
* | use six privided functions/classes to support py2/py3 in one source. refs #1350.Takayuki Shimizukawa2014-04-291-2/+3
* | Update copyright year.Georg Brandl2014-03-011-1/+1
|\ \ | |/
| * Update copyright year.Georg Brandl2014-03-011-1/+1
* | Drop python-2.5 and remove 2.4,2.5 support codesTakayuki Shimizukawa2013-12-151-16/+4
|/
* Copyright update.Georg Brandl2013-01-011-1/+1
* 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 b...Georg Brandl2010-08-051-1/+3
* 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