Merge pull request #9240 from parleur/warn

Fix the deprecation of IPython.utils.warn

IPython/core/alias.py

@@ -29,7 +29,7 b' from IPython.core.error import UsageError'
 
 from IPython.utils.py3compat import string_types
 from traitlets import List, Instance
-from IPython.utils.warn import error
+from logging import error
 
 #-----------------------------------------------------------------------------
 # Utilities

IPython/core/displayhook.py

@@ -18,7 +18,7 b' from traitlets.config.configurable import Configurable'
 from IPython.utils import io
 from IPython.utils.py3compat import builtin_mod, cast_unicode_py2
 from traitlets import Instance, Float
-from IPython.utils.warn import warn
+from warnings import warn
 
 # TODO: Move the various attributes (cache_size, [others now moved]). Some
 # of these are also attributes of InteractiveShell. They should be on ONE object
@@ -293,4 +293,3 b' class DisplayHook(Configurable):'
         # IronPython blocks here forever
         if sys.platform != "cli":
             gc.collect()
-

IPython/core/history.py

@@ -35,7 +35,7 b' from IPython.utils import py3compat'
 from traitlets import (
     Any, Bool, Dict, Instance, Integer, List, Unicode, TraitError,
 )
-from IPython.utils.warn import warn
+from warnings import warn
 
 #-----------------------------------------------------------------------------
 # Classes and functions
@@ -879,5 +879,3 b' def _format_lineno(session, line):'
     if session == 0:
         return str(line)
     return "%s#%s" % (session, line)
-
-

IPython/core/interactiveshell.py

@@ -77,7 +77,8 b' from IPython.utils.text import (format_screen, LSString, SList,'
                                 DollarFormatter)
 from traitlets import (Integer, Bool, CBool, CaselessStrEnum, Enum,
                                      List, Dict, Unicode, Instance, Type)
-from IPython.utils.warn import warn, error
+from warnings import warn
+from logging import error
 import IPython.core.hooks
 
 #-----------------------------------------------------------------------------

IPython/core/magic.py

@@ -33,7 +33,7 b' from IPython.utils.process import arg_split'
 from IPython.utils.py3compat import string_types, iteritems
 from IPython.utils.text import dedent
 from traitlets import Bool, Dict, Instance
-from IPython.utils.warn import error
+from logging import error
 
 #-----------------------------------------------------------------------------
 # Globals

IPython/core/magics/auto.py

@@ -1,6 +1,7 b''
 """Implementation of magic functions that control various automatic behaviors.
 """
 from __future__ import print_function
+from __future__ import absolute_import
 #-----------------------------------------------------------------------------
 #  Copyright (c) 2012 The IPython Development Team.
 #
@@ -16,7 +17,7 b' from __future__ import print_function'
 # Our own packages
 from IPython.core.magic import Bunch, Magics, magics_class, line_magic
 from IPython.testing.skipdoctest import skip_doctest
-from IPython.utils.warn import error
+from logging import error
 
 #-----------------------------------------------------------------------------
 # Magic implementation classes

IPython/core/magics/basic.py

@@ -1,6 +1,7 b''
 """Implementation of basic magic functions."""
 
 from __future__ import print_function
+from __future__ import absolute_import
 
 import io
 import sys
@@ -14,7 +15,8 b' from IPython.testing.skipdoctest import skip_doctest'
 from IPython.utils.ipstruct import Struct
 from IPython.utils.path import unquote_filename
 from IPython.utils.py3compat import unicode_type
-from IPython.utils.warn import warn, error
+from warnings import warn
+from logging import error
 
 
 class MagicsDisplay(object):

IPython/core/magics/code.py

@@ -1,6 +1,7 b''
 """Implementation of code management magic functions.
 """
 from __future__ import print_function
+from __future__ import absolute_import
 #-----------------------------------------------------------------------------
 #  Copyright (c) 2012 The IPython Development Team.
 #
@@ -32,7 +33,8 b' from IPython.utils import py3compat'
 from IPython.utils.py3compat import string_types
 from IPython.utils.contexts import preserve_keys
 from IPython.utils.path import get_py_filename, unquote_filename
-from IPython.utils.warn import warn, error
+from warnings import warn
+from logging import error
 from IPython.utils.text import get_text_list
 
 #-----------------------------------------------------------------------------

IPython/core/magics/config.py

@@ -1,6 +1,7 b''
 """Implementation of configuration-related magic functions.
 """
 from __future__ import print_function
+from __future__ import absolute_import
 #-----------------------------------------------------------------------------
 #  Copyright (c) 2012 The IPython Development Team.
 #
@@ -19,7 +20,7 b' import re'
 # Our own packages
 from IPython.core.error import UsageError
 from IPython.core.magic import Magics, magics_class, line_magic
-from IPython.utils.warn import error
+from logging import error
 
 #-----------------------------------------------------------------------------
 # Magic implementation classes

IPython/core/magics/execution.py

@@ -5,6 +5,7 b''
 # Distributed under the terms of the Modified BSD License.
 
 from __future__ import print_function
+from __future__ import absolute_import
 
 import ast
 import bdb
@@ -43,7 +44,8 b' from IPython.utils.ipstruct import Struct'
 from IPython.utils.module_paths import find_mod
 from IPython.utils.path import get_py_filename, unquote_filename, shellglob
 from IPython.utils.timing import clock, clock2
-from IPython.utils.warn import warn, error
+from warnings import warn
+from logging import error
 
 if PY3:
     from io import StringIO

IPython/core/magics/logging.py

@@ -18,7 +18,7 b' import sys'
 
 # Our own packages
 from IPython.core.magic import Magics, magics_class, line_magic
-from IPython.utils.warn import warn
+from warnings import warn
 from IPython.utils.py3compat import str_to_unicode
 
 #-----------------------------------------------------------------------------

IPython/core/magics/pylab.py

@@ -18,7 +18,7 b' from traitlets.config.application import Application'
 from IPython.core import magic_arguments
 from IPython.core.magic import Magics, magics_class, line_magic
 from IPython.testing.skipdoctest import skip_doctest
-from IPython.utils.warn import warn
+from warnings import warn
 from IPython.core.pylabtools import backends
 
 #-----------------------------------------------------------------------------

IPython/core/ultratb.py

@@ -118,7 +118,7 b' from IPython.utils import path as util_path'
 from IPython.utils import py3compat
 from IPython.utils import ulinecache
 from IPython.utils.data import uniq_stable
-from IPython.utils.warn import info, error
+from logging import info, error
 
 # Globals
 # amount of space to put line numbers before verbose tracebacks

IPython/lib/backgroundjobs.py

@@ -36,7 +36,7 b' import threading'
 
 from IPython import get_ipython
 from IPython.core.ultratb import AutoFormattedTB
-from IPython.utils.warn import error
+from logging import error
 from IPython.utils.py3compat import string_types
 
 

IPython/lib/inputhook.py

@@ -17,7 +17,7 b' import platform'
 import sys
 from distutils.version import LooseVersion as V
 
-from IPython.utils.warn import warn
+from warnings import warn
 
 #-----------------------------------------------------------------------------
 # Constants

IPython/terminal/interactiveshell.py

@@ -22,7 +22,8 b' from IPython.utils.encoding import get_stream_enc'
 from IPython.utils import py3compat
 from IPython.utils.terminal import toggle_set_term_title, set_term_title
 from IPython.utils.process import abbrev_cwd
-from IPython.utils.warn import warn, error
+from warnings import warn
+from logging import error
 from IPython.utils.text import num_ini_spaces, SList, strip_email_quotes
 from traitlets import Integer, CBool, Unicode
 

IPython/testing/iptest.py

@@ -212,7 +212,7 b" test_group_names.append('autoreload')"
 
 def check_exclusions_exist():
     from IPython.paths import get_ipython_package_dir
-    from IPython.utils.warn import warn
+    from warnings import warn
     parent = os.path.dirname(get_ipython_package_dir())
     for sec in test_sections:
         for pattern in sec.exclusions:
@@ -439,4 +439,3 b' def run_iptest():'
 
 if __name__ == '__main__':
     run_iptest()
-

IPython/utils/warn.py

@@ -12,6 +12,9 b' import sys'
 
 from IPython.utils import io
 
+import warnings
+
+warnings.warn("The module IPython.utils.warn is deprecated, use the standard warnings module instead", DeprecationWarning)
 
 def warn(msg,level=2,exit_val=1):
     """Standard warning printer. Gives formatting consistency.
@@ -29,7 +32,8 b' 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)
     if level>0:
         header = ['','','WARNING: ','ERROR: ','FATAL ERROR: ']
         print(header[level], msg, sep='', file=io.stderr)
@@ -54,4 +58,3 b' def fatal(msg,exit_val=1):'
     """Equivalent to warn(msg,exit_val=exit_val,level=4)."""
 
     warn(msg,exit_val=exit_val,level=4)
-