[Python-checkins] cpython (merge 3.4 -> default): merge with 3.4

Tue Oct 28 22:54:50 CET 2014

https://hg.python.org/cpython/rev/d30324e2777a
changeset: 93207:d30324e2777a
parent: 93204:ba84dbc18038
parent: 93206:05e8b25379a3
user: Georg Brandl <georg at python.org>
date: Tue Oct 28 22:54:28 2014 +0100
summary:
 merge with 3.4
files:
 Doc/library/json.rst | 4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Doc/library/json.rst b/Doc/library/json.rst
--- a/Doc/library/json.rst
+++ b/Doc/library/json.rst
@@ -97,11 +97,11 @@
 
 Using json.tool from the shell to validate and pretty-print::
 
- $ echo '{"json":"obj"}' | python -mjson.tool
+ $ echo '{"json":"obj"}' | python -m json.tool
 {
 "json": "obj"
 }
- $ echo '{1.2:3.4}' | python -mjson.tool
+ $ echo '{1.2:3.4}' | python -m json.tool
 Expecting property name enclosed in double quotes: line 1 column 2 (char 1)
 
 See :ref:`json-commandline` for detailed documentation.
-- 
Repository URL: https://hg.python.org/cpython
