diff --git a/IPython/config/loader.py b/IPython/config/loader.py index 2a4e4d1..9e2e725 100644 --- a/IPython/config/loader.py +++ b/IPython/config/loader.py @@ -511,7 +511,7 @@ class KeyValueConfigLoader(CommandLineConfigLoader): if raw == '--': # don't parse arguments after '--' # this is useful for relaying arguments to scripts, e.g. - # ipython -i foo.py --pylab=qt -- args after '--' go-to-foo.py + # ipython -i foo.py --matplotlib=qt -- args after '--' go-to-foo.py self.extra_args.extend(uargv[idx+1:]) break diff --git a/IPython/external/qt_for_kernel.py b/IPython/external/qt_for_kernel.py index 1598068..d360054 100644 --- a/IPython/external/qt_for_kernel.py +++ b/IPython/external/qt_for_kernel.py @@ -1,6 +1,6 @@ """ Import Qt in a manner suitable for an IPython kernel. -This is the import used for the `gui=qt` or `pylab=qt` initialization. +This is the import used for the `gui=qt` or `matplotlib=qt` initialization. Import Priority: diff --git a/IPython/terminal/ipapp.py b/IPython/terminal/ipapp.py index 50a6e3d..963115a 100755 --- a/IPython/terminal/ipapp.py +++ b/IPython/terminal/ipapp.py @@ -297,8 +297,8 @@ class TerminalIPythonApp(BaseIPythonApplication, InteractiveShellApp): # warn and transform into current syntax argv = argv[:] # copy, don't clobber idx = argv.index('-pylab') - warn.warn("`-pylab` flag has been deprecated.\n" - " Use `--pylab` instead, or `--pylab=foo` to specify a backend.") + warn.warn("`-pylab` and `--pylab` flags have been deprecated.\n" + " Use `--matplotlib=` and import pylab manually.") sub = '--pylab' if len(argv) > idx+1: # check for gui arg, as in '-pylab qt' diff --git a/examples/lib/gui-wx.py b/examples/lib/gui-wx.py index 2ed4a27..53c4d21 100755 --- a/examples/lib/gui-wx.py +++ b/examples/lib/gui-wx.py @@ -4,7 +4,7 @@ A Simple wx example to test IPython's event loop integration. To run this do: -In [5]: %gui wx # or start IPython with '--gui wx' or '--pylab wx' +In [5]: %gui wx # or start IPython with '--gui wx' In [6]: %run gui-wx.py