From 4f25ac7abdf093798edeb7e3d04a3d494821b6da Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Fri, 14 May 2010 14:30:11 +0000 Subject: [PATCH] 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 ........ --- Doc/howto/cporting.rst | 2 +- Doc/library/pkgutil.rst | 4 ++-- Doc/library/runpy.rst | 4 ++-- Doc/library/threading.rst | 2 +- Doc/library/wsgiref.rst | 2 +- Doc/library/zipimport.rst | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Doc/howto/cporting.rst b/Doc/howto/cporting.rst index 9b66650c38..c0b59338ba 100644 --- a/Doc/howto/cporting.rst +++ b/Doc/howto/cporting.rst @@ -118,7 +118,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/pkgutil.rst b/Doc/library/pkgutil.rst index f1692639f7..518937778d 100644 --- a/Doc/library/pkgutil.rst +++ b/Doc/library/pkgutil.rst @@ -45,7 +45,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 @@ -60,5 +60,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 cfaab94f12..a0f3035195 100644 --- a/Doc/library/runpy.rst +++ b/Doc/library/runpy.rst @@ -25,7 +25,7 @@ The :mod:`runpy` module provides a single function: 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 fresh module + mechanism (refer to :pep:`302` for details) and then executed in a fresh module namespace. The optional dictionary argument *init_globals* may be used to pre-populate the @@ -41,7 +41,7 @@ The :mod:`runpy` module provides a single function: ``__name__`` is set to *run_name* if this optional argument is supplied, and the *mod_name* argument otherwise. - ``__loader__`` is set to the PEP 302 module loader used to retrieve the code for + ``__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). ``__file__`` is set to the name provided by the module loader. If the loader diff --git a/Doc/library/threading.rst b/Doc/library/threading.rst index 1440215394..94f75ed4a3 100644 --- a/Doc/library/threading.rst +++ b/Doc/library/threading.rst @@ -14,7 +14,7 @@ The :mod:`dummy_threading` module is provided for situations where .. note:: - Starting with Python 2.6, this module provides PEP 8 compliant aliases and + Starting with Python 2.6, this module provides :pep:`8` compliant aliases and properties to replace the ``camelCase`` names that were inspired by Java's threading API. This updated API is compatible with that of the :mod:`multiprocessing` module. However, no schedule has been set for the diff --git a/Doc/library/wsgiref.rst b/Doc/library/wsgiref.rst index a97eaecbbf..517fc3849b 100644 --- a/Doc/library/wsgiref.rst +++ b/Doc/library/wsgiref.rst @@ -712,7 +712,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 = '200 OK' # HTTP Status headers = [('Content-type', 'text/plain')] # HTTP Headers diff --git a/Doc/library/zipimport.rst b/Doc/library/zipimport.rst index 8e6b132cf4..4ce9a3543c 100644 --- a/Doc/library/zipimport.rst +++ b/Doc/library/zipimport.rst @@ -41,12 +41,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. -- 2.40.0