rename the file to lib/editorhooks.py and chance string template to {} formating

IPython/lib/editorhooks.py

@@ -6,11 +6,11 b' Contributions are *very* welcome.'
 """
 
 from IPython.core.error import TryNext
-from string import Template
+from IPython.frontend.qt.console import ipython_widget
 import os
 
 
-def install_editor(run_template, wait=False):
+def install_editor(template, wait=False):
     """Installs the editor that is called by IPython for the %edit magic.
 
     This overrides the default editor, which is generally set by your EDITOR
@@ -20,10 +20,10 b' def install_editor(run_template, wait=False):'
 
     Parameters
     ----------
-    run_template : basestring
+    template : basestring
         run_template acts as a template for how your editor is invoked by
-        the shell. It should contain '$file', which will be replaced on
-        invokation with the file name, and '$line$', $line by line number
+        the shell. It should contain '{file}', which will be replaced on
+        invokation with the file name, and '{line}', $line by line number
         (or 0) to invoke the file with.
     wait : bool
         If `wait` is true, wait until the user presses enter before returning,
@@ -38,12 +38,11 b' def install_editor(run_template, wait=False):'
     #        ' for string substitution. You supplied "%s"' % (substitution,
     #            run_template)))
 
-    template = Template(run_template)
 
     def call_editor(self, file, line=0):
         if line is None:
             line = 0
-        cmd = template.substitute(file=file, line=line)
+        cmd = template.format(file=file, line=line)
         print ">", cmd
         if os.system(cmd) != 0:
             raise TryNext()
@@ -51,7 +50,7 b' def install_editor(run_template, wait=False):'
             raw_input("Press Enter when done editing:")
 
     get_ipython().set_hook('editor', call_editor)
-
+    ipython_widget.IPythonWidget.editor = template
 
 # in these, exe is always the path/name of the executable. Useful
 # if you don't have the editor directory in your path
@@ -59,22 +58,22 b' def install_editor(run_template, wait=False):'
 
 def komodo(exe='komodo'):
     """ Activestate Komodo [Edit] """
-    install_editor(exe + ' -l $line "$file"', wait=True)
+    install_editor(exe + ' -l {line} "{file}"', wait=True)
 
 
 def scite(exe="scite"):
     """ SciTE or Sc1 """
-    install_editor(exe + ' "$file" -goto:$line')
+    install_editor(exe + ' "{file}" -goto:{line}')
 
 
 def notepadplusplus(exe='notepad++'):
     """ Notepad++ http://notepad-plus.sourceforge.net """
-    install_editor(exe + ' -n$line "$file"')
+    install_editor(exe + ' -n{line} "{file}"')
 
 
 def jed(exe='jed'):
     """ JED, the lightweight emacsish editor """
-    install_editor(exe + ' +$line "$file"')
+    install_editor(exe + ' +{line} "{file}"')
 
 
 def idle(exe='idle'):
@@ -91,13 +90,13 b" def idle(exe='idle'):"
         # i'm not sure if this actually works. Is this idle.py script guarenteed
         # to be executable?
         exe = os.path.join(p, 'idle.py')
-    install_editor(exe + ' "$file"')
+    install_editor(exe + ' "{file}"')
 
 
 def mate(exe='mate'):
     """ TextMate, the missing editor"""
     # wait=True is not required since we're using the -w flag to mate
-    install_editor(exe + ' -w -l $line "$file"')
+    install_editor(exe + ' -w -l {line} "{file}"')
 
 
 # ##########################################
@@ -106,16 +105,16 b" def mate(exe='mate'):"
 
 
 def emacs(exe='emacs'):
-    install_editor(exe + ' +$line "$file"')
+    install_editor(exe + ' +{line} "{file}"')
 
 
 def gnuclient(exe='gnuclient'):
-    install_editor(exe + ' -nw +$line "$file"')
+    install_editor(exe + ' -nw +{line} "{file}"')
 
 
 def crimson_editor(exe='cedt.exe'):
-    install_editor(exe + ' /L:$line "$file"')
+    install_editor(exe + ' /L:{line} "{file}"')
 
 
 def kate(exe='kate'):
-    install_editor(exe + ' -u -l $line "$file"')
+    install_editor(exe + ' -u -l {line} "{file}"')