[Python-checkins] cpython (merge 3.2 -> default): Merge 3.2
eric.araujo
python-checkins at python.org
Wed Apr 27 16:38:43 CEST 2011
http://hg.python.org/cpython/rev/73ac0477288e
changeset: 69617:73ac0477288e
parent: 69616:52d0aeb96864
parent: 69615:8d4f27590a3e
user: Éric Araujo <merwok at netwok.org>
date: Sun Apr 24 02:49:10 2011 +0200
summary:
Merge 3.2
files:
Doc/distutils/examples.rst | 2 +-
Doc/library/json.rst | 2 +-
Doc/library/runpy.rst | 2 +-
Lib/json/__init__.py | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Doc/distutils/examples.rst b/Doc/distutils/examples.rst
--- a/Doc/distutils/examples.rst
+++ b/Doc/distutils/examples.rst
@@ -279,7 +279,7 @@
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
--- a/Doc/library/json.rst
+++ b/Doc/library/json.rst
@@ -34,7 +34,7 @@
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
--- a/Doc/library/runpy.rst
+++ b/Doc/library/runpy.rst
@@ -49,7 +49,7 @@
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
--- a/Lib/json/__init__.py
+++ b/Lib/json/__init__.py
@@ -31,7 +31,7 @@
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::
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list