diff options
| author | Éric Araujo <merwok@netwok.org> | 2011-04-24 02:49:10 +0200 |
|---|---|---|
| committer | Éric Araujo <merwok@netwok.org> | 2011-04-24 02:49:10 +0200 |
| commit | 92952cc1814bff0af455d79371ef5554d242a93e (patch) | |
| tree | 9decd1704cd11ae86a6f819ce39d07867f688fe1 | |
| parent | 0c91e1d9416586398f00623f98c7970caa1066a9 (diff) | |
| parent | b547148d163d54612528e0c4f2b133dc9ca7cb49 (diff) | |
| download | cpython-git-92952cc1814bff0af455d79371ef5554d242a93e.tar.gz | |
Merge 3.2
| -rw-r--r-- | Doc/distutils/examples.rst | 2 | ||||
| -rw-r--r-- | Doc/library/json.rst | 2 | ||||
| -rw-r--r-- | Doc/library/runpy.rst | 2 | ||||
| -rw-r--r-- | Lib/json/__init__.py | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/Doc/distutils/examples.rst b/Doc/distutils/examples.rst index e31ff72917..b268486398 100644 --- a/Doc/distutils/examples.rst +++ b/Doc/distutils/examples.rst @@ -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. diff --git a/Doc/library/json.rst b/Doc/library/json.rst index dcd6973e2b..4ee17f2395 100644 --- a/Doc/library/json.rst +++ b/Doc/library/json.rst @@ -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:: diff --git a/Doc/library/runpy.rst b/Doc/library/runpy.rst index f7c77f6b8d..4df622cb1f 100644 --- a/Doc/library/runpy.rst +++ b/Doc/library/runpy.rst @@ -49,7 +49,7 @@ The :mod:`runpy` module provides two functions: loader does not make filename information available, this variable is set to :const:`None`. - ``__cached__`` will be set to ``None``. + ``__cached__`` will be set to ``None``. ``__loader__`` is set to the :pep:`302` module loader used to retrieve the code for the module (This loader may be a wrapper around the standard diff --git a/Lib/json/__init__.py b/Lib/json/__init__.py index a746f9cf9c..6d88931dcb 100644 --- a/Lib/json/__init__.py +++ b/Lib/json/__init__.py @@ -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:: |