summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Svetlov <andrew.svetlov@gmail.com>2012-11-15 14:30:30 (GMT)
committerAndrew Svetlov <andrew.svetlov@gmail.com>2012-11-15 14:30:30 (GMT)
commit9bd7f22c0505be784bcaad9a3b335dc273b79564 (patch)
tree6129278100f237b071c1a5aed2e784c7f8830c63
parent8d27023a7e4129609ab005d6e1a437214bca1188 (diff)
parent993fd9f03a43618679b9df81425c558575d68129 (diff)
downloadcpython-9bd7f22c0505be784bcaad9a3b335dc273b79564.zip
cpython-9bd7f22c0505be784bcaad9a3b335dc273b79564.tar.gz
cpython-9bd7f22c0505be784bcaad9a3b335dc273b79564.tar.bz2
Merge heads
-rw-r--r--Doc/reference/import.rst10
1 files changed, 5 insertions, 5 deletions
diff --git a/Doc/reference/import.rst b/Doc/reference/import.rst
index 4688e78..fdecc76 100644
--- a/Doc/reference/import.rst
+++ b/Doc/reference/import.rst
@@ -44,9 +44,9 @@ described in the sections below.
.. versionchanged:: 3.3
The import system has been updated to fully implement the second phase
- of PEP 302. There is no longer any implicit import machinery - the full
+ of :pep:`302`. There is no longer any implicit import machinery - the full
import system is exposed through :data:`sys.meta_path`. In addition,
- native namespace package support has been implemented (see PEP 420).
+ native namespace package support has been implemented (see :pep:`420`).
:mod:`importlib`
@@ -219,9 +219,9 @@ whatever strategy it knows about. Objects that implement both of these
interfaces are referred to as :term:`importers <importer>` - they return
themselves when they find that they can load the requested module.
-Python includes a number of default finders and importers. One
-knows how to locate frozen modules, and another knows how to locate
-built-in modules. A third default finder searches an :term:`import path`
+Python includes a number of default finders and importers. The first one
+knows how to locate built-in modules, and the second knows how to locate
+frozen modules. A third default finder searches an :term:`import path`
for modules. The :term:`import path` is a list of locations that may
name file system paths or zip files. It can also be extended to search
for any locatable resource, such as those identified by URLs.