cpython: 42a461366d6c (original) (raw)
Mercurial > cpython
changeset 102625:42a461366d6c
Merge for issue #27712 [#27712]
| Brett Cannon brett@python.org | |
|---|---|
| date | Fri, 12 Aug 2016 10:57:17 -0700 |
| parents | 863258dcb745(current diff)927c29e1d646(diff) |
| children | 71a7db7ceabc |
| files | Doc/reference/import.rst |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-)[+] [-] Doc/reference/import.rst 4 |
line wrap: on
line diff
--- a/Doc/reference/import.rst
+++ b/Doc/reference/import.rst
@@ -785,7 +785,7 @@ hooks in this list is[](#l1.3) path entry to be searched. This callable may either return a :term:path
entry finder that can handle the path entry, or it may raise[](#l1.5) :exc:ImportError. An :exc:ImportError is used by the path based finder to[](#l1.6) -signal that the hook cannot find a :term:path entry finder.[](#l1.7) +signal that the hook cannot find a :term:path entry finder[](#l1.8) for that :term:path entry. The[](#l1.9) exception is ignored and :term:import path` iteration continues. The hook
should expect either a string or bytes object; the encoding of bytes objects
@@ -839,7 +839,7 @@ portion.
Older path entry finders may implement one of these two deprecated methods
instead of find_spec(). The methods are still respected for the