Add stacklevel=2 to warn function

IPython/core/interactiveshell.py

@@ -354,9 +354,10 b' class InteractiveShell(SingletonConfigurable):'
     @observe('prompt_in1', 'prompt_in2', 'prompt_out', 'prompt_pad_left')
     def _prompt_trait_changed(self, change):
         name = change['name']
-        warn("InteractiveShell.{name} is deprecated since IPython 4.0 and ignored since 5.0, set TerminalInteractiveShell.prompts object directly.".format(
-                name=name)
-        )
+        warn("InteractiveShell.{name} is deprecated since IPython 4.0"
+             " and ignored since 5.0, set TerminalInteractiveShell.prompts"
+             " object directly.".format(name=name))
+        
         # protect against weird cases where self.config may not exist:
 
     show_rewritten_input = Bool(True,
@@ -811,7 +812,7 b' class InteractiveShell(SingletonConfigurable):'
 
         if _warn_deprecated and (name in IPython.core.hooks.deprecated):
             alternative = IPython.core.hooks.deprecated[name]
-            warn("Hook {} is deprecated. Use {} instead.".format(name, alternative))
+            warn("Hook {} is deprecated. Use {} instead.".format(name, alternative), stacklevel=2)
 
         if not dp:
             dp = IPython.core.hooks.CommandChainDispatcher()
@@ -839,7 +840,7 b' class InteractiveShell(SingletonConfigurable):'
         Register a function for calling after code execution.
         """
         warn("ip.register_post_execute is deprecated, use "
-             "ip.events.register('post_run_cell', func) instead.")
+             "ip.events.register('post_run_cell', func) instead.", stacklevel=2)
         self.events.register('post_run_cell', func)
     
     def _clear_warning_registry(self):

IPython/utils/PyColorize.py

@@ -54,7 +54,7 b' else:'
     from StringIO import StringIO
 
 #############################################################################
-### Python Source Parser (does Hilighting)
+### Python Source Parser (does Highlighting)
 #############################################################################
 
 _KEYWORD = token.NT_OFFSET + 1

IPython/utils/daemonize.py

@@ -1,4 +1,4 b''
 from warnings import warn
 
-warn("IPython.utils.daemonize has moved to ipyparallel.apps.daemonize")
+warn("IPython.utils.daemonize has moved to ipyparallel.apps.daemonize", stacklevel=2)
 from ipyparallel.apps.daemonize import daemonize

IPython/utils/eventful.py

@@ -1,6 +1,6 b''
 
 from warnings import warn
 
-warn("IPython.utils.eventful has moved to traitlets.eventful")
+warn("IPython.utils.eventful has moved to traitlets.eventful", stacklevel=2)
 
 from traitlets.eventful import *

IPython/utils/io.py

@@ -207,7 +207,7 b" def temp_pyfile(src, ext='.py'):"
 
 def atomic_writing(*args, **kwargs):
     """DEPRECATED: moved to notebook.services.contents.fileio"""
-    warn("IPython.utils.io.atomic_writing has moved to notebook.services.contents.fileio")
+    warn("IPython.utils.io.atomic_writing has moved to notebook.services.contents.fileio", stacklevel=2)
     from notebook.services.contents.fileio import atomic_writing
     return atomic_writing(*args, **kwargs)
 
@@ -234,6 +234,6 b' rprinte = raw_print_err'
 
 def unicode_std_stream(stream='stdout'):
     """DEPRECATED, moved to nbconvert.utils.io"""
-    warn("IPython.utils.io.unicode_std_stream has moved to nbconvert.utils.io")
+    warn("IPython.utils.io.unicode_std_stream has moved to nbconvert.utils.io", stacklevel=2)
     from nbconvert.utils.io import unicode_std_stream
     return unicode_std_stream(stream)

IPython/utils/jsonutil.py

@@ -1,5 +1,5 b''
 from warnings import warn
 
-warn("IPython.utils.jsonutil has moved to jupyter_client.jsonutil")
+warn("IPython.utils.jsonutil has moved to jupyter_client.jsonutil", stacklevel=2)
 
 from jupyter_client.jsonutil import *

IPython/utils/localinterfaces.py

@@ -1,5 +1,5 b''
 from warnings import warn
 
-warn("IPython.utils.localinterfaces has moved to jupyter_client.localinterfaces")
+warn("IPython.utils.localinterfaces has moved to jupyter_client.localinterfaces", stacklevel=2)
 
 from jupyter_client.localinterfaces import *

IPython/utils/log.py

@@ -1,6 +1,6 b''
 
 from warnings import warn
 
-warn("IPython.utils.log has moved to traitlets.log")
+warn("IPython.utils.log has moved to traitlets.log", stacklevel=2)
 
 from traitlets.log import *

IPython/utils/pickleutil.py

@@ -1,5 +1,5 b''
 from warnings import warn
 
-warn("IPython.utils.pickleutil has moved to ipykernel.pickleutil")
+warn("IPython.utils.pickleutil has moved to ipykernel.pickleutil", stacklevel=2)
 
 from ipykernel.pickleutil import *

IPython/utils/traitlets.py

@@ -1,6 +1,6 b''
 
 from warnings import warn
 
-warn("IPython.utils.traitlets has moved to a top-level traitlets package.")
+warn("IPython.utils.traitlets has moved to a top-level traitlets package.", stacklevel=2)
 
 from traitlets import *