[Python-checkins] cpython (merge 3.5 -> 3.6): [merge from 3.5] Issue28438 - Fix the link for pkgutil.get_data doc.

senthil.kumaran python-checkins at python.org
Fri Oct 14 02:00:46 EDT 2016


https://hg.python.org/cpython/rev/f2110f41012e
changeset:   104488:f2110f41012e
branch:      3.6
parent:      104485:d4e715e725ef
parent:      104487:7fb90c4ae643
user:        Senthil Kumaran <senthil at uthcode.com>
date:        Thu Oct 13 22:59:36 2016 -0700
summary:
  [merge from 3.5] Issue28438 - Fix the link for pkgutil.get_data doc.

Patch contributed by Xiang Zhang.

files:
  Doc/library/pkgutil.rst |  6 ++++--
  1 files changed, 4 insertions(+), 2 deletions(-)


diff --git a/Doc/library/pkgutil.rst b/Doc/library/pkgutil.rst
--- a/Doc/library/pkgutil.rst
+++ b/Doc/library/pkgutil.rst
@@ -206,7 +206,8 @@
 
    Get a resource from a package.
 
-   This is a wrapper for the :term:`loader` :func:`get_data` API.  The
+   This is a wrapper for the :term:`loader`
+   :meth:`get_data <importlib.abc.ResourceLoader.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
@@ -222,4 +223,5 @@
       data = open(os.path.join(d, resource), 'rb').read()
 
    If the package cannot be located or loaded, or it uses a :term:`loader`
-   which does not support :func:`get_data`, then ``None`` is returned.
+   which does not support :meth:`get_data <importlib.abc.ResourceLoader.get_data>`,
+   then ``None`` is returned.

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


More information about the Python-checkins mailing list