diff --git a/IPython/core/usage.py b/IPython/core/usage.py index c9069e8..ab237f8 100644 --- a/IPython/core/usage.py +++ b/IPython/core/usage.py @@ -446,10 +446,10 @@ Inline matplotlib graphics The IPython console is capable of displaying matplotlib figures inline, in SVG format. If started with the ``--pylab inline`` flag, then all figures are -rendered inline automatically. If started with ``--pylab`` or ``--pylab -``, then a GUI backend will be used, but the ``paste()`` function -is added to the global and ``plt`` namespaces. You can paste any figure that -is currently open in a window with this function; type ``paste?`` for +rendered inline automatically. If started with ``--pylab`` or ``--pylab ``, then a GUI backend will be used, but the ``pastefig()`` function is +added to the global and ``plt`` namespaces. You can paste any figure that is +currently open in a window with this function; type ``pastefig?`` for additional details.""" quick_guide = """\ diff --git a/IPython/lib/pylabtools.py b/IPython/lib/pylabtools.py index 416f04e..3becc23 100644 --- a/IPython/lib/pylabtools.py +++ b/IPython/lib/pylabtools.py @@ -112,10 +112,10 @@ def import_pylab(user_ns, backend, import_all=True, shell=None): from IPython.zmq.pylab.backend_inline import flush_svg shell.register_post_execute(flush_svg) else: - from IPython.zmq.pylab.backend_inline import paste + from IPython.zmq.pylab.backend_inline import pastefig from matplotlib import pyplot # Add 'paste' to pyplot and to the user's namespace - user_ns['paste'] = pyplot.paste = paste + user_ns['pastefig'] = pyplot.pastefig = pastefig if import_all: exec("from matplotlib.pylab import *\n" diff --git a/IPython/zmq/pylab/backend_inline.py b/IPython/zmq/pylab/backend_inline.py index 9504572..9d14e2e 100644 --- a/IPython/zmq/pylab/backend_inline.py +++ b/IPython/zmq/pylab/backend_inline.py @@ -38,8 +38,8 @@ def show(close=True): show._draw_called = False -def paste(*figs): - """Paste figures into the console workspace. +def pastefig(*figs): + """Paste one or more figures into the console workspace. If no arguments are given, all available figures are pasted. If the argument list contains references to invalid figures, a warning is printed