[Python-checkins] cpython (merge 3.5 -> default): Merge for issue #27712

[brett.cannon]

https://hg.python.org/cpython/rev/42a461366d6c
changeset:   102625:42a461366d6c
parent:      102623:863258dcb745
parent:      102624:927c29e1d646
user:        Brett Cannon <brett at python.org>
date:        Fri Aug 12 10:57:17 2016 -0700
summary:
  Merge for issue #27712

files:
  Doc/reference/import.rst |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Doc/reference/import.rst b/Doc/reference/import.rst
--- a/Doc/reference/import.rst
+++ b/Doc/reference/import.rst
@@ -785,7 +785,7 @@
 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 @@
 
    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

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