[Python-checkins] cpython (merge 3.3 -> default): Merge for issue #20488

[brett.cannon]

http://hg.python.org/cpython/rev/5641c0b50072
changeset:   88994:5641c0b50072
parent:      88992:47c31e7d3779
parent:      88993:cc08bf665dea
user:        Brett Cannon <brett at python.org>
date:        Thu Feb 06 09:49:53 2014 -0500
summary:
  Merge for issue #20488

files:
  Doc/library/importlib.rst |  14 ++++++++------
  Misc/NEWS                 |   3 +++
  2 files changed, 11 insertions(+), 6 deletions(-)


diff --git a/Doc/library/importlib.rst b/Doc/library/importlib.rst
--- a/Doc/library/importlib.rst
+++ b/Doc/library/importlib.rst
@@ -1,8 +1,8 @@
-:mod:`importlib` -- An implementation of :keyword:`import`
-==========================================================
+:mod:`importlib` -- The implementation of :keyword:`import`
+===========================================================
 
 .. module:: importlib
-   :synopsis: An implementation of the import machinery.
+   :synopsis: The implementation of the import machinery.
 
 .. moduleauthor:: Brett Cannon <brett at python.org>
 .. sectionauthor:: Brett Cannon <brett at python.org>
@@ -13,17 +13,16 @@
 Introduction
 ------------
 
-The purpose of the :mod:`importlib` package is two-fold. One is to provide an
+The purpose of the :mod:`importlib` package is two-fold. One is to provide the
 implementation of the :keyword:`import` statement (and thus, by extension, the
 :func:`__import__` function) in Python source code. This provides an
 implementation of :keyword:`import` which is portable to any Python
-interpreter. This also provides a reference implementation which is easier to
+interpreter. This also provides an implementation which is easier to
 comprehend than one implemented in a programming language other than Python.
 
 Two, the components to implement :keyword:`import` are exposed in this
 package, making it easier for users to create their own custom objects (known
 generically as an :term:`importer`) to participate in the import process.
-Details on custom importers can be found in :pep:`302`.
 
 .. seealso::
 
@@ -53,6 +52,9 @@
     :pep:`366`
         Main module explicit relative imports
 
+    :pep:`451`
+        A ModuleSpec Type for the Import System
+
     :pep:`3120`
         Using UTF-8 as the Default Source Encoding
 
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -166,6 +166,9 @@
 Documentation
 -------------
 
+- Issue #20488: Change wording to say importlib is *the* implementation of
+  import instead of just *an* implementation.
+
 - Issue #6386: Clarify in the tutorial that specifying a symlink to execute
   means the directory containing the executed script and not the symlink is
   added to sys.path.

-- 
Repository URL: http://hg.python.org/cpython