Merge 3.1

This commit is contained in:
Éric Araujo 2011-04-24 02:42:52 +02:00
commit fbeb1a9468
3 changed files with 3 additions and 3 deletions

View File

@ -279,7 +279,7 @@ For example, if the :file:`setup.py` script is changed like this::
Where the long description is broken, ``check`` will be able to detect it
by using the :mod:`docutils` parser::
$ pythontrunk setup.py check --restructuredtext
$ python setup.py check --restructuredtext
running check
warning: check: Title underline too short. (line 2)
warning: check: Could not finish the parsing.

View File

@ -34,7 +34,7 @@ Encoding basic Python object hierarchies::
Compact encoding::
>>> import json
>>> json.dumps([1,2,3,{'4': 5, '6': 7}], separators=(',',':'))
>>> json.dumps([1,2,3,{'4': 5, '6': 7}], separators=(',', ':'))
'[1,2,3,{"4":5,"6":7}]'
Pretty printing::

View File

@ -31,7 +31,7 @@ Encoding basic Python object hierarchies::
Compact encoding::
>>> import json
>>> json.dumps([1,2,3,{'4': 5, '6': 7}], separators=(',',':'))
>>> json.dumps([1,2,3,{'4': 5, '6': 7}], separators=(',', ':'))
'[1,2,3,{"4":5,"6":7}]'
Pretty printing::