From bfccb45ebba52ea291bf1382b29ee783218db5c6 2016-05-30 00:39:49 From: Matthias Bussonnier Date: 2016-05-30 00:39:49 Subject: [PATCH] Fix deprecation warning removal notice to 6.0. The 2 notice say contradicting things, fallback to the later. --- diff --git a/IPython/core/builtin_trap.py b/IPython/core/builtin_trap.py index 95c9ca4..909a555 100644 --- a/IPython/core/builtin_trap.py +++ b/IPython/core/builtin_trap.py @@ -57,7 +57,7 @@ class BuiltinTrap(Configurable): from IPython.lib import deepreload if self.shell.deep_reload: from warnings import warn - warn("Automatically replacing builtin `reload` by `deepreload.reload` is deprecated and will be removed in IPython 6.0, please import `reload` explicitly from `IPython.lib.deeprelaod", DeprecationWarning) + warn("Automatically replacing builtin `reload` by `deepreload.reload` is deprecated since IPython 4.0, please import `reload` explicitly from `IPython.lib.deepreload", DeprecationWarning) self.auto_builtins['reload'] = deepreload._dreload else: self.auto_builtins['dreload']= deepreload._dreload diff --git a/IPython/lib/deepreload.py b/IPython/lib/deepreload.py index af226d9..521acf3 100644 --- a/IPython/lib/deepreload.py +++ b/IPython/lib/deepreload.py @@ -350,12 +350,12 @@ def _dreload(module, **kwargs): import reload explicitly from `IPython.lib.deepreload` to use it """ + # this was marked as deprecated and for 5.0 removal, but + # IPython.core_builtin_trap have a Deprecation warning for 6.0, so cannot + # remove that now. warn(""" -injecting `dreload` in interactive namespace is deprecated, and will be removed in IPython 5.0. +injecting `dreload` in interactive namespace is deprecated since IPython 4.0. Please import `reload` explicitly from `IPython.lib.deepreload`. """, DeprecationWarning, stacklevel=2) reload(module, **kwargs) -# Uncomment the following to automatically activate deep reloading whenever -# this module is imported -#builtin_mod.reload = reload