Merged revisions 81163 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81163 | victor.stinner | 2010-05-14 16:20:07 +0200 (ven., 14 mai 2010) | 2 lines

  Doc: replace PEP xxx by :pep:`xxx` to create a link on the PEP
........

diff --git a/Doc/howto/cporting.rst b/Doc/howto/cporting.rst
index 7c7ea04a4708820fe0dd82400f3b2b03014f59d7..9f22bd1e501c2f831bebcfa2ff79ce4c631ca3b2 100644 (file)
--- a/Doc/howto/cporting.rst
+++ b/Doc/howto/cporting.rst
@@ -120,7 +120,7 @@ can also be used in some cases. ::
 Module initialization and state
 ===============================
 
-Python 3.0 has a revamped extension module initialization system.  (See PEP
+Python 3.0 has a revamped extension module initialization system.  (See
 :pep:`3121`.)  Instead of storing module state in globals, they should be stored
 in an interpreter specific structure.  Creating modules that act correctly in
 both 2.x and 3.0 is tricky.  The following simple example demonstrates how. ::

diff --git a/Doc/library/imp.rst b/Doc/library/imp.rst
index 6e70d084fbac76ce00b84e0273481cb08d7b6351..f080934daafdd109df118cfac236c683b6aad72b 100644 (file)
--- a/Doc/library/imp.rst
+++ b/Doc/library/imp.rst
@@ -211,7 +211,7 @@ byte-compiled file paths.
 
 .. function:: cache_from_source(path, debug_override=None)
 
-   Return the PEP 3147 path to the byte-compiled file associated with the
+   Return the :pep:`3147` path to the byte-compiled file associated with the
    source *path*.  For example, if *path* is ``/foo/bar/baz.py`` the return
    value would be ``/foo/bar/__pycache__/baz.cpython-32.pyc`` for Python 3.2.
    The ``cpython-32`` string comes from the current magic tag (see
@@ -225,15 +225,15 @@ byte-compiled file paths.
 
 .. function:: source_from_cache(path)
 
-   Given the *path* to a PEP 3147 file name, return the associated source code
+   Given the *path* to a :pep:`3147` file name, return the associated source code
    file path.  For example, if *path* is
    ``/foo/bar/__pycache__/baz.cpython-32.pyc`` the returned path would be
    ``/foo/bar/baz.py``.  *path* need not exist, however if it does not conform
-   to PEP 3147 format, a ``ValueError`` is raised.
+   to :pep:`3147` format, a ``ValueError`` is raised.
 
 .. function:: get_tag()
 
-   Return the PEP 3147 magic tag string matching this version of Python's
+   Return the :pep:`3147` magic tag string matching this version of Python's
    magic number, as returned by :func:`get_magic`.
 
 

diff --git a/Doc/library/pkgutil.rst b/Doc/library/pkgutil.rst
index c09774924c16a4b3639ddf223c1f73b00285502f..0287c634e1dafb90379bd086a5136042ea55cd9b 100644 (file)
--- a/Doc/library/pkgutil.rst
+++ b/Doc/library/pkgutil.rst
@@ -41,7 +41,7 @@ This module provides functions to manipulate packages:
 
    Get a resource from a package.
 
-   This is a wrapper for the PEP 302 loader :func:`get_data` API. The package
+   This is a wrapper for the :pep:`302` loader :func:`get_data` API. The package
    argument should be the name of a package, in standard module format
    (foo.bar). The resource argument should be in the form of a relative
    filename, using ``/`` as the path separator. The parent directory name
@@ -56,5 +56,5 @@ This module provides functions to manipulate packages:
        d = os.path.dirname(sys.modules[package].__file__)
        data = open(os.path.join(d, resource), 'rb').read()
 
-   If the package cannot be located or loaded, or it uses a PEP 302 loader
+   If the package cannot be located or loaded, or it uses a :pep:`302` loader
    which does not support :func:`get_data`, then None is returned.

diff --git a/Doc/library/runpy.rst b/Doc/library/runpy.rst
index a96285cf7d6f1e49aa2e57e6e00d15361b7c400b..907ce2af13fd97bf5c7f0fe8330a844c02c2f0e4 100644 (file)
--- a/Doc/library/runpy.rst
+++ b/Doc/library/runpy.rst
@@ -18,7 +18,7 @@ The :mod:`runpy` module provides two functions:
 
    Execute the code of the specified module and return the resulting module
    globals dictionary. The module's code is first located using the standard
-   import mechanism (refer to PEP 302 for details) and then executed in a
+   import mechanism (refer to :pep:`302` for details) and then executed in a
    fresh module namespace.
 
    If the supplied module name refers to a package rather than a normal
@@ -48,7 +48,7 @@ The :mod:`runpy` module provides two functions:
 
     ``__cached__`` will be set to ``None``.
 
-   ``__loader__`` is set to the PEP 302 module loader used to retrieve the
+   ``__loader__`` is set to the :pep:`302` module loader used to retrieve the
    code for the module (This loader may be a wrapper around the standard
    import mechanism).
 
@@ -106,7 +106,7 @@ The :mod:`runpy` module provides two functions:
    loader does not make filename information available, this variable is set
    to :const:`None`. For a simple script, this will be set to ``file_path``.
 
-   ``__loader__`` is set to the PEP 302 module loader used to retrieve the
+   ``__loader__`` is set to the :pep:`302` module loader used to retrieve the
    code for the module (This loader may be a wrapper around the standard
    import mechanism). For a simple script, this will be set to :const:`None`.
 

diff --git a/Doc/library/wsgiref.rst b/Doc/library/wsgiref.rst
index 803db26e1688410d571d8d5caf9231c5b57fa7f6..06672ae0cbebbdcc4adf09a312735857d26fbce4 100644 (file)
--- a/Doc/library/wsgiref.rst
+++ b/Doc/library/wsgiref.rst
@@ -710,7 +710,7 @@ This is a working "Hello World" WSGI application::
    # use a function (note that you're not limited to a function, you can
    # use a class for example). The first argument passed to the function
    # is a dictionary containing CGI-style envrironment variables and the
-   # second variable is the callable object (see PEP333)
+   # second variable is the callable object (see :pep:`333`)
    def hello_world_app(environ, start_response):
        status = b'200 OK' # HTTP Status
        headers = [(b'Content-type', b'text/plain; charset=utf-8')] # HTTP Headers

diff --git a/Doc/library/zipimport.rst b/Doc/library/zipimport.rst
index a0dbc764daab97dcc4d69826222bf9801af465ad..fc9d8346c603740963a69b8baf794f2ec0279ed3 100644 (file)
--- a/Doc/library/zipimport.rst
+++ b/Doc/library/zipimport.rst
@@ -34,12 +34,12 @@ ZIP archives with an archive comment are currently not supported.
       Documentation on the ZIP file format by Phil Katz, the creator of the format and
       algorithms used.
 
-   :pep:`0273` - Import Modules from Zip Archives
+   :pep:`273` - Import Modules from Zip Archives
       Written by James C. Ahlstrom, who also provided an implementation. Python 2.3
       follows the specification in PEP 273, but uses an implementation written by Just
       van Rossum that uses the import hooks described in PEP 302.
 
-   :pep:`0302` - New Import Hooks
+   :pep:`302` - New Import Hooks
       The PEP to add the import hooks that help this module work.