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

Wed Jun 22 22:47:13 EDT 2016

https://hg.python.org/cpython/rev/f6b8b1e5d24d
changeset: 102139:f6b8b1e5d24d
parent: 102136:33769ce40b47
parent: 102138:e3b4033e0ea7
user: Terry Jan Reedy <tjreedy at udel.edu>
date: Wed Jun 22 22:46:51 2016 -0400
summary:
 Merge with 3.5
files:
 Doc/library/dbm.rst | 10 ++++++++++
 Doc/library/importlib.rst | 14 ++++++++++++++
 Doc/library/json.rst | 8 +++++++-
 3 files changed, 31 insertions(+), 1 deletions(-)

diff --git a/Doc/library/dbm.rst b/Doc/library/dbm.rst
--- a/Doc/library/dbm.rst
+++ b/Doc/library/dbm.rst
@@ -128,6 +128,9 @@
 :platform: Unix
 :synopsis: GNU's reinterpretation of dbm.
 
+**Source code:** :source:`Lib/dbm/gnu.py`
+
+--------------
 
 This module is quite similar to the :mod:`dbm` module, but uses the GNU library
 ``gdbm`` instead to provide some additional functionality. Please note that the
@@ -237,6 +240,9 @@
 :platform: Unix
 :synopsis: The standard "database" interface, based on ndbm.
 
+**Source code:** :source:`Lib/dbm/ndbm.py`
+
+--------------
 
 The :mod:`dbm.ndbm` module provides an interface to the Unix "(n)dbm" library.
 Dbm objects behave like mappings (dictionaries), except that keys and values are
@@ -299,6 +305,8 @@
 .. module:: dbm.dumb
 :synopsis: Portable implementation of the simple DBM interface.
 
+**Source code:** :source:`Lib/dbm/dumb.py`
+
 .. index:: single: databases
 
 .. note::
@@ -308,6 +316,8 @@
 module is not written for speed and is not nearly as heavily used as the other
 database modules.
 
+--------------
+
 The :mod:`dbm.dumb` module provides a persistent dictionary-like interface which
 is written entirely in Python. Unlike other modules such as :mod:`dbm.gnu` no
 external library is required. As with other persistent mappings, the keys and
diff --git a/Doc/library/importlib.rst b/Doc/library/importlib.rst
--- a/Doc/library/importlib.rst
+++ b/Doc/library/importlib.rst
@@ -211,6 +211,11 @@
 .. module:: importlib.abc
 :synopsis: Abstract base classes related to import
 
+**Source code:** :source:`Lib/importlib/abc.py`
+
+--------------
+
+
 The :mod:`importlib.abc` module contains all of the core abstract base classes
 used by :keyword:`import`. Some subclasses of the core abstract base classes
 are also provided to help in implementing the core ABCs.
@@ -700,6 +705,10 @@
 .. module:: importlib.machinery
 :synopsis: Importers and path hooks
 
+**Source code:** :source:`Lib/importlib/machinery.py`
+
+--------------
+
 This module contains the various objects that help :keyword:`import`
 find and load modules.
 
@@ -1090,6 +1099,11 @@
 .. module:: importlib.util
 :synopsis: Utility code for importers
 
+
+**Source code:** :source:`Lib/importlib/util.py`
+
+--------------
+
 This module contains the various objects that help in the construction of
 an :term:`importer`.
 
diff --git a/Doc/library/json.rst b/Doc/library/json.rst
--- a/Doc/library/json.rst
+++ b/Doc/library/json.rst
@@ -641,13 +641,19 @@
 :class:`decimal.Decimal`.
 
 .. highlight:: bash
-.. module:: json.tool
 
 .. _json-commandline:
 
 Command Line Interface
 ----------------------
 
+.. module:: json.tool
+ :synopsis: A command line to validate and pretty-print JSON.
+
+**Source code:** :source:`Lib/json/tool.py`
+
+--------------
+
 The :mod:`json.tool` module provides a simple command line interface to validate
 and pretty-print JSON objects.
 
-- 
Repository URL: https://hg.python.org/cpython
