From: Georg Brandl <georg@python.org>
Date: Tue, 28 Oct 2014 21:54:28 +0000 (+0100)
Subject: merge with 3.4
X-Git-Tag: v3.5.0a1~596
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cf3e788da457de50d77ee02136a348370420304a;p=thirdparty%2FPython%2Fcpython.git

merge with 3.4
---

cf3e788da457de50d77ee02136a348370420304a
diff --cc Doc/library/json.rst
index 55127c0a1f8b,b495b4968095..cff0c727c95d
--- a/Doc/library/json.rst
+++ b/Doc/library/json.rst
@@@ -101,11 -101,9 +101,11 @@@ Using json.tool from the shell to valid
      {
          "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.
 +
  .. highlight:: python3
  
  .. note::