Merge pull request #9504 from Carreau/cleanup-deprecated-features

takluyver · takluyver · commit 33883d8a403f · 2016-05-30T09:47:12.000+01:00
Cleanup deprecated features
diff --git a/IPython/__init__.py b/IPython/__init__.py
@@ -144,14 +144,3 @@ def start_kernel(argv=None, **kwargs):
     from IPython.kernel.zmq.kernelapp import launch_new_instance
     return launch_new_instance(argv=argv, **kwargs)
     
-# deprecated shim for IPython.Config
-import traitlets.config
-class Config(traitlets.config.Config):
-    def __init__(self, *args, **kwargs):
-        warnings.warn(
-            "IPython.Config is deprecated and will be removed in IPython 5."
-            " Use traitlets.config.Config.",
-            DeprecationWarning, stacklevel=2,
-        )
-        super(Config, self).__init__(*args, **kwargs)
-
diff --git a/IPython/core/builtin_trap.py b/IPython/core/builtin_trap.py
@@ -57,7 +57,7 @@ def __init__(self, shell=None):
             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/core/formatters.py b/IPython/core/formatters.py
@@ -35,21 +35,6 @@
 
 class DisplayFormatter(Configurable):
 
-    # When set to true only the default plain text formatter will be used.
-    plain_text_only = Bool(False).tag(config=True)
-    def _plain_text_only_changed(self, name, old, new):
-        warnings.warn("""DisplayFormatter.plain_text_only is deprecated.
-        
-        It will be removed in IPython 5.0
-
-        Use DisplayFormatter.active_types = ['text/plain']
-        for the same effect.
-        """, DeprecationWarning)
-        if new:
-            self.active_types = ['text/plain']
-        else:
-            self.active_types = self.format_types
-    
     active_types = List(Unicode(),
         help="""List of currently active mime-types to display.
         You can use this to set a white-list for formats to display.
diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
@@ -643,14 +643,6 @@ def init_builtins(self):
         # IPython at a time.
         builtin_mod.__dict__['__IPYTHON__'] = True
 
-        # In 0.11 we introduced '__IPYTHON__active' as an integer we'd try to
-        # manage on enter/exit, but with all our shells it's virtually
-        # impossible to get all the cases right.  We're leaving the name in for
-        # those who adapted their codes to check for this flag, but will
-        # eventually remove it after a few more releases.
-        builtin_mod.__dict__['__IPYTHON__active'] = \
-                                          'Deprecated, check for __IPYTHON__'
-
         self.builtin_trap = BuiltinTrap(shell=self)
 
     def init_inspector(self):
@@ -2019,10 +2011,9 @@ def init_magics(self):
 
         # Expose as public API from the magics manager
         self.register_magics = self.magics_manager.register
-        self.define_magic = self.magics_manager.define_magic
 
         self.register_magics(m.AutoMagics, m.BasicMagics, m.CodeMagics,
-            m.ConfigMagics, m.DeprecatedMagics, m.DisplayMagics, m.ExecutionMagics,
+            m.ConfigMagics, m.DisplayMagics, m.ExecutionMagics,
             m.ExtensionMagics, m.HistoryMagics, m.LoggingMagics,
             m.NamespaceMagics, m.OSMagics, m.PylabMagics, m.ScriptMagics,
         )
diff --git a/IPython/core/magic.py b/IPython/core/magic.py
@@ -426,25 +426,6 @@ def register_function(self, func, magic_kind='line', magic_name=None):
         setattr(self.user_magics, magic_name, func)
         record_magic(self.magics, magic_kind, magic_name, func)
 
-    def define_magic(self, name, func):
-        """[Deprecated] Expose own function as magic function for IPython.
-
-        Will be removed in IPython 5.0
-
-        Example::
-
-            def foo_impl(self, parameter_s=''):
-                'My very own magic!. (Use docstrings, IPython reads them).'
-                print 'Magic function. Passed parameter is between < >:'
-                print '<%s>' % parameter_s
-                print 'The self object is:', self
-
-            ip.define_magic('foo',foo_impl)
-        """
-        meth = types.MethodType(func, self.user_magics)
-        setattr(self.user_magics, name, meth)
-        record_magic(self.magics, 'line', name, meth)
-
     def register_alias(self, alias_name, magic_name, magic_kind='line'):
         """Register an alias to a magic function.
 
diff --git a/IPython/core/magics/__init__.py b/IPython/core/magics/__init__.py
@@ -17,7 +17,6 @@
 from .basic import BasicMagics
 from .code import CodeMagics, MacroToEdit
 from .config import ConfigMagics
-from .deprecated import DeprecatedMagics
 from .display import DisplayMagics
 from .execution import ExecutionMagics
 from .extension import ExtensionMagics
diff --git a/IPython/core/magics/deprecated.py b/IPython/core/magics/deprecated.py
diff --git a/IPython/core/shellapp.py b/IPython/core/shellapp.py
@@ -62,20 +62,6 @@
     colours.""",
     "Disable using colors for info related things."
 )
-addflag('deep-reload', 'InteractiveShell.deep_reload',
-    """ **Deprecated** and will be removed in IPython 5.0.
-    
-    Enable deep (recursive) reloading by default. IPython can use the
-    deep_reload module which reloads changes in modules recursively (it
-    replaces the reload() function, so you don't need to change anything to
-    use it). deep_reload() forces a full reload of modules whose code may
-    have changed, which the default reload() function does not.  When
-    deep_reload is off, IPython will use the normal reload(), but
-    deep_reload will still be available as dreload(). This feature is off
-    by default [which means that you have both normal reload() and
-    dreload()].""",
-    "Disable deep (recursive) reloading by default."
-)
 nosep_config = Config()
 nosep_config.InteractiveShell.separate_in = ''
 nosep_config.InteractiveShell.separate_out = ''
diff --git 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
diff --git a/IPython/terminal/embed.py b/IPython/terminal/embed.py
@@ -89,8 +89,7 @@ def __init__(self, **kw):
         
     
         if kw.get('user_global_ns', None) is not None:
-            warnings.warn("user_global_ns has been replaced by user_module. The\
-                           parameter will be ignored, and removed in IPython 5.0", DeprecationWarning)
+            raise DeprecationWarning("Key word argument `user_global_ns` has been replaced by `user_module` since IPython 4.0.")
 
         self._call_location_id =  kw.pop('_call_location_id', None)
 
@@ -197,12 +196,10 @@ def mainloop(self, local_ns=None, module=None, stack_depth=0,
         """
         
         if (global_ns is not None) and (module is None):
-            warnings.warn("global_ns is deprecated, and will be removed in IPython 5.0 use module instead.", DeprecationWarning)
-            module = DummyMod()
-            module.__dict__ = global_ns
+            raise DeprecationWarning("'global_ns' keyword argument is deprecated, and has been removed in IPython 5.0 use `module` keyword argument instead.")
 
         if (display_banner is not None):
-            warnings.warn("The display_banner parameter is deprecated.", DeprecationWarning)
+            warnings.warn("The display_banner parameter is deprecated since IPython 4.0", DeprecationWarning)
 
         # Get locals and globals from caller
         if ((local_ns is None or module is None or compile_flags is None)
diff --git a/IPython/utils/io.py b/IPython/utils/io.py
@@ -23,7 +23,9 @@
 @undoc
 class IOStream:
 
-    def __init__(self,stream, fallback=None):
+    def __init__(self, stream, fallback=None):
+        warn('IOStream is deprecated since IPython 5.0, use sys.{stdin,stdout,stderr} instead',
+             DeprecationWarning, stacklevel=2)
         if not hasattr(stream,'write') or not hasattr(stream,'flush'):
             if fallback is not None:
                 stream = fallback
@@ -44,7 +46,7 @@ def __repr__(self):
         return tpl.format(mod=cls.__module__, cls=cls.__name__, args=self.stream)
 
     def write(self,data):
-        warn('IOStream is deprecated, use sys.{stdin,stdout,stderr} instead',
+        warn('IOStream is deprecated since IPython 5.0, use sys.{stdin,stdout,stderr} instead',
              DeprecationWarning, stacklevel=2)
         try:
             self._swrite(data)
@@ -60,7 +62,7 @@ def write(self,data):
                       file=sys.stderr)
 
     def writelines(self, lines):
-        warn('IOStream is deprecated, use sys.{stdin,stdout,stderr} instead',
+        warn('IOStream is deprecated since IPython 5.0, use sys.{stdin,stdout,stderr} instead',
              DeprecationWarning, stacklevel=2)
         if isinstance(lines, string_types):
             lines = [lines]
diff --git a/IPython/utils/warn.py b/IPython/utils/warn.py
@@ -11,7 +11,7 @@
 import sys
 import warnings
 
-warnings.warn("The module IPython.utils.warn is deprecated, use the standard warnings module instead", DeprecationWarning)
+warnings.warn("The module IPython.utils.warn is deprecated since IPython 4.0, use the standard warnings module instead", DeprecationWarning)
 
 def warn(msg,level=2,exit_val=1):
     """Standard warning printer. Gives formatting consistency.
@@ -30,7 +30,7 @@ def warn(msg,level=2,exit_val=1):
     -exit_val (1): exit value returned by sys.exit() for a level 4
     warning. Ignored for all other levels."""
     
-    warnings.warn("The module IPython.utils.warn is deprecated, use the standard warnings module instead", DeprecationWarning)
+    warnings.warn("The module IPython.utils.warn is deprecated since IPython 4.0, use the standard warnings module instead", DeprecationWarning)
     if level>0:
         header = ['','','WARNING: ','ERROR: ','FATAL ERROR: ']
         print(header[level], msg, sep='', file=sys.stderr)
