From c2c4f1947fdc4b818ad94c95de95e5f84752df2b 2014-02-07 23:40:19
From: MinRK <benjaminrk@gmail.com>
Date: 2014-02-07 23:40:19
Subject: [PATCH] remove pylab from desktop entrypoint and completion
---

diff --git a/examples/core/ipython-completion.bash b/examples/core/ipython-completion.bash
index 57dcde0..5d5c011 100644
--- a/examples/core/ipython-completion.bash
+++ b/examples/core/ipython-completion.bash
@@ -13,9 +13,9 @@ _ipython_get_flags()
         opts=$__ipython_complete_last_res
         return
     fi
-    # pylab and profile don't need the = and the
+    # matplotlib and profile don't need the = and the
     # version without simplifies the special cased completion
-    opts=$(ipython ${url} --help-all | grep -E "^-{1,2}[^-]" | sed -e "s/<.*//" -e "s/[^=]$/& /" -e "s/^--pylab=$//" -e "s/^--profile=$/--profile /")
+    opts=$(ipython ${url} --help-all | grep -E "^-{1,2}[^-]" | sed -e "s/<.*//" -e "s/[^=]$/& /" -e "s/^--matplotlib=$//" -e "s/^--profile=$/--profile /")
     __ipython_complete_last="$url $var"
     __ipython_complete_last_res="$opts"
 }
@@ -86,12 +86,12 @@ _ipython()
     elif [[ $mode == "locate" ]]; then
         opts="profile"
         COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
-    elif [[ ${prev} == "--pylab"* ]] || [[ ${prev} == "--gui"* ]]; then
-        if [ -z "$__ipython_complete_pylab" ]; then
-            __ipython_complete_pylab=`cat <<EOF | python -
+    elif [[ ${prev} == "--matplotlib"* ]] || [[ ${prev} == "--gui"* ]]; then
+        if [ -z "$__ipython_complete_matplotlib" ]; then
+            __ipython_complete_matplotlib=`cat <<EOF | python -
 try:
     import IPython.core.shellapp as mod;
-    for k in mod.InteractiveShellApp.pylab.values:
+    for k in mod.InteractiveShellApp.matplotlib.values:
         print "%s " % k
 except:
     pass
@@ -99,7 +99,7 @@ EOF
         `
         fi
         local IFS=$'\t\n'
-        COMPREPLY=( $(compgen -W "${__ipython_complete_pylab}" -- ${cur}) )
+        COMPREPLY=( $(compgen -W "${__ipython_complete_matplotlib}" -- ${cur}) )
     elif [[ ${prev} == "--profile"* ]]; then
         if [ -z  "$__ipython_complete_profiles" ]; then
         __ipython_complete_profiles=`cat <<EOF | python -
diff --git a/examples/core/ipython-qtconsole.desktop b/examples/core/ipython-qtconsole.desktop
index ea63616..35fd19b 100644
--- a/examples/core/ipython-qtconsole.desktop
+++ b/examples/core/ipython-qtconsole.desktop
@@ -13,12 +13,12 @@ Categories=Development;Utility;
 StartupNotify=false
 Terminal=false
 Type=Application
-Actions=Pylab;Pylabinline;
+Actions=Matplotlib;Matplotlibinline;
 
-[Desktop Action Pylab]
-Name=Pylab
-Exec=ipython qtconsole --pylab
+[Desktop Action Matplotlib]
+Name=Matplotlib
+Exec=ipython qtconsole --matplotlib
 
-[Desktop Action Pylabinline]
-Name=Pylab (inline plots)
-Exec=ipython qtconsole --pylab=inline
+[Desktop Action Matplotlibinline]
+Name=Matplotlib (inline plots)
+Exec=ipython qtconsole --matplotlib=inline