[Python-checkins] cpython (merge 3.5 -> default): merge from 3.5

[senthil.kumaran]

https://hg.python.org/cpython/rev/6636d688bbd3
changeset:   99945:6636d688bbd3
parent:      99943:db74f3a4cbeb
parent:      99944:31e6d4d25b8e
user:        Senthil Kumaran <senthil at uthcode.com>
date:        Sat Jan 16 18:43:57 2016 -0800
summary:
  merge from 3.5

Issue26135 - In the tutorial section on modules, reference importlib.reload instead of imp.reload.

files:
  Doc/tutorial/modules.rst |  3 ++-
  1 files changed, 2 insertions(+), 1 deletions(-)


diff --git a/Doc/tutorial/modules.rst b/Doc/tutorial/modules.rst
--- a/Doc/tutorial/modules.rst
+++ b/Doc/tutorial/modules.rst
@@ -117,7 +117,8 @@
    For efficiency reasons, each module is only imported once per interpreter
    session.  Therefore, if you change your modules, you must restart the
    interpreter -- or, if it's just one module you want to test interactively,
-   use :func:`imp.reload`, e.g. ``import imp; imp.reload(modulename)``.
+   use :func:`importlib.reload`, e.g. ``import importlib;
+   importlib.reload(modulename)``.
 
 
 .. _tut-modulesasscripts:

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