summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrett Cannon <brett@python.org>2016-08-12 17:57:17 (GMT)
committerBrett Cannon <brett@python.org>2016-08-12 17:57:17 (GMT)
commit3f63483a30e87d8df4a815db18bf227c671f9272 (patch)
tree98f1f73a9face3d5e07d13df17958540e23afeba
parent4a2360d3f786053a8e324c4b9587aa6025072689 (diff)
parent6336fb27342e4f5ec76d73182d2c0af764a51777 (diff)
downloadcpython-3f63483a30e87d8df4a815db18bf227c671f9272.zip
cpython-3f63483a30e87d8df4a815db18bf227c671f9272.tar.gz
cpython-3f63483a30e87d8df4a815db18bf227c671f9272.tar.bz2
Merge for issue #27712
-rw-r--r--Doc/reference/import.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/reference/import.rst b/Doc/reference/import.rst
index 56049ce..fcc707b 100644
--- a/Doc/reference/import.rst
+++ b/Doc/reference/import.rst
@@ -785,7 +785,7 @@ hooks <path entry hook>` in this list is called with a single argument, the
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
:exc:`ImportError`. An :exc:`ImportError` is used by the path based finder to
-signal that the hook cannot find a :term:`path entry finder`.
+signal that the hook cannot find a :term:`path entry finder`
for that :term:`path entry`. The
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
- sake of backward compatibility. Howevever, if ``find_spec()`` is
+ sake of backward compatibility. However, if ``find_spec()`` is
implemented on the path entry finder, the legacy methods are ignored.
:meth:`~importlib.abc.PathEntryFinder.find_loader` takes one argument, the