From d6447c1d5e653e24c9f363ffa328e41e62f1e22d 2011-12-13 04:35:25
From: Min RK <benjaminrk@gmail.com>
Date: 2011-12-13 04:35:25
Subject: [PATCH] Merge pull request #1128 from minrk/pylab

* pylab profile removed
* pylab StartMenu item uses default profile and `--pylab`


---

diff --git a/IPython/config/profile/pylab/ipython_config.py b/IPython/config/profile/pylab/ipython_config.py
deleted file mode 100644
index 33e72ea..0000000
--- a/IPython/config/profile/pylab/ipython_config.py
+++ /dev/null
@@ -1,23 +0,0 @@
-c = get_config()
-app = c.InteractiveShellApp
-
-# This can be used at any point in a config file to load a sub config
-# and merge it into the current one.
-load_subconfig('ipython_config.py', profile='default')
-
-lines = """
-import matplotlib
-%gui qt
-matplotlib.use('qt4agg')
-matplotlib.interactive(True)
-from matplotlib import pyplot as plt
-from matplotlib.pyplot import *
-"""
-
-# You have to make sure that attributes that are containers already
-# exist before using them.  Simple assigning a new list will override
-# all previous values.
-if hasattr(app, 'exec_lines'):
-    app.exec_lines.append(lines)
-else:
-    app.exec_lines = [lines]
diff --git a/scripts/ipython_win_post_install.py b/scripts/ipython_win_post_install.py
index 09dda68..6e5d962 100755
--- a/scripts/ipython_win_post_install.py
+++ b/scripts/ipython_win_post_install.py
@@ -95,8 +95,8 @@ def install():
     # mkshortcut(python, 'IPython (command prompt mode)', link, cmd, workdir)
     
     link = pjoin(ip_start_menu, 'pylab.lnk')
-    cmd = '"%s" profile=pylab --init' % ipybase
-    mkshortcut(python, 'IPython (pylab profile)', link, cmd, workdir)
+    cmd = '"%s" --pylab' % ipybase
+    mkshortcut(python, 'IPython (pylab mode)', link, cmd, workdir)
         
     link = pjoin(ip_start_menu, 'ipcontroller.lnk')
     cmdbase = suffix(pjoin(scripts, 'ipcontroller'))