##// END OF EJS Templates
Merge pull request #10410 from Carreau/deprecated-profile=II...
Thomas Kluyver -
r23520:c382dbdc merge
parent child Browse files
Show More
@@ -294,13 +294,9 b' Currently the magic system has the following functions:""",'
294 294 prun : run code using the Python profiler
295 295 (:meth:`~IPython.core.magics.execution.ExecutionMagics.prun`)
296 296 """
297 warn("The `%profile` magic has been deprecated since IPython 2.0. Please use "
298 "the value of `get_ipython().profile` instead to see current profile in use.")
299 from IPython.core.application import BaseIPythonApplication
300 if BaseIPythonApplication.initialized():
301 print(BaseIPythonApplication.instance().profile)
302 else:
303 error("profile is an application-level value, but you don't appear to be in an IPython application")
297 raise UsageError("The `%profile` magic has been deprecated since IPython 2.0. "
298 "and removed in IPython 6.0. Please use the value of `get_ipython().profile` instead "
299 "to see current profile in use. Perhaps you meant to use `%prun` to profile code?")
304 300
305 301 @line_magic
306 302 def pprint(self, parameter_s=''):
@@ -173,4 +173,9 b' development cycle marked for Milestone 6.0.'
173 173 `reload` into the interactive namespace have been removed. You have to
174 174 explicitly import `reload` from `IPython.lib.deepreload` to use it.
175 175
176 - the :magic:`profile` used to print current IPython profile in use, and which
177 was deprecated in IPython 2.0 does now raise a `DeprecationWarning` error when
178 used. It is often confused with the :magic:`prun` and the deprecation remove
179 should free up the ``profile`` name in future versions.
180
176 181 .. DO NOT EDIT THIS LINE BEFORE RELEASE. INCOMPAT INSERTION POINT.
General Comments 0
You need to be logged in to leave comments. Login now