merge with 3.4

birkenfeld · birkenfeld · commit cf3e788da457 · 2014-10-28T22:54:28.000+01:00
diff --git a/Doc/library/json.rst b/Doc/library/json.rst
@@ -97,11 +97,11 @@ Extending :class:`JSONEncoder`::
 
 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.

Original file line number	Diff line number	Diff line change
@@ -97,11 +97,11 @@ Extending :class:`JSONEncoder`::
`97`	`97`
`98`	`98`	`Using json.tool from the shell to validate and pretty-print::`
`99`	`99`
`100`		`- $ echo '{"json":"obj"}' \| python -mjson.tool`
	`100`	`+ $ echo '{"json":"obj"}' \| python -m json.tool`
`101`	`101`	`{`
`102`	`102`	`"json": "obj"`
`103`	`103`	`}`
`104`		`- $ echo '{1.2:3.4}' \| python -mjson.tool`
	`104`	`+ $ echo '{1.2:3.4}' \| python -m json.tool`
`105`	`105`	`Expecting property name enclosed in double quotes: line 1 column 2 (char 1)`
`106`	`106`
`107`	`107`	See :ref:`json-commandline` for detailed documentation.