callable aliases now get _ip as first arg

IPython/Extensions/ipy_fsops.py

@@ -37,7 +37,7 b' def parse_args(args):'
         raise IpyShellCmdException("No files found:" + str(tup2[0:-1]))
     return flist, trg
     
-def icp(arg):
+def icp(ip,arg):
     """ icp files... targetdir
     
     Copy all files to target, creating dirs for target if necessary
@@ -57,7 +57,7 b' def icp(arg):'
     return fs
 ip.defalias("icp",icp)
 
-def imv(arg):
+def imv(ip,arg):
     """ imv src tgt
     
     Move source to target.
@@ -71,7 +71,7 b' def imv(arg):'
     return fs
 ip.defalias("imv",imv)        
 
-def irm(arg):
+def irm(ip,arg):
     """ irm path[s]...
     
     Remove file[s] or dir[s] path. Dirs are deleted recursively.
@@ -87,7 +87,7 b' def irm(arg):'
 
 ip.defalias("irm",irm)
 
-def imkdir(arg):
+def imkdir(ip,arg):
     """ imkdir path
     
     Creates dir path, and all dirs on the road
@@ -98,7 +98,7 b' def imkdir(arg):'
 
 ip.defalias("imkdir",imkdir)    
 
-def igrep(arg):
+def igrep(ip,arg):
     """ igrep PAT files...
     
     Very dumb file scan, case-insensitive.
@@ -124,7 +124,7 b' def igrep(arg):'
 
 ip.defalias("igrep",igrep)    
 
-def collect(arg):
+def collect(ip,arg):
     """ collect foo/a.txt rec:bar=*.py
     
     Copies foo/a.txt to ~/_ipython/collect/foo/a.txt and *.py from bar,
@@ -154,7 +154,7 b' def collect(arg):'
 
 ip.defalias("collect",collect)            
 
-def inote(arg):
+def inote(ip,arg):
     """ inote Hello world
     
     Adds timestamp and Hello world to ~/_ipython/notes.txt
@@ -170,5 +170,4 b' def inote(arg):'
     except IndexError:
         ip.IP.hooks.editor(fname)        
 
-ip.defalias("inote",inote)    
-    
+ip.defalias("inote",inote)

IPython/Extensions/ipy_rehashdir.py

@@ -21,7 +21,7 b' ip = IPython.ipapi.get()'
 
 import os,re,fnmatch,sys
 
-def selflaunch(line):
+def selflaunch(ip,line):
     """ Launch python script with 'this' interpreter
     
     e.g. d:\foo\ipython.exe a.py
@@ -40,7 +40,7 b' class PyLauncher:'
     """
     def __init__(self,script):
         self.script = os.path.abspath(script)
-    def __call__(self, line):
+    def __call__(self, ip, line):
         selflaunch("py " + self.script + ' ' + line)
     def __repr__(self):
         return 'PyLauncher("%s")' % self.script

IPython/Extensions/ipy_workdir.py

@@ -6,11 +6,21 b' ip = IPython.ipapi.get()'
 import os, subprocess
 
 workdir = None
-def workdir_f(line):
+def workdir_f(ip,line):
+    """ Exceute commands residing in cwd elsewhere 
+    
+    Example::
+      
+      workdir /myfiles
+      cd bin
+      workdir myscript.py 
+      
+    executes myscript.py (stored in bin, but not in path) in /myfiles
+    """
     global workdir
     dummy,cmd  = line.split(None,1)
     if os.path.isdir(cmd):
-        workdir = cmd
+        workdir = os.path.abspath(cmd)
         print "Set workdir",workdir
     elif workdir is None:
         print "Please set workdir first by doing e.g. 'workdir q:/'"
@@ -22,12 +32,12 b' def workdir_f(line):'
             head, tail = sp
         if os.path.isfile(head):
             cmd = os.path.abspath(head) + ' ' + tail
-        print "Execute command",cmd,"in",workdir
-        ret = subprocess.call(cmd, shell = True, cwd = workdir)
+        print "Execute command '" + cmd+ "' in",workdir
+        olddir = os.getcwd()
+        os.chdir(workdir)
+        try:
+            os.system(cmd)
+        finally:
+            os.chdir(olddir)
 
 ip.defalias("workdir",workdir_f)
-        
-        
-        
-    
-

IPython/iplib.py

@@ -6,7 +6,7 b' Requires Python 2.3 or newer.'
 
 This file contains all the classes and helper functions specific to IPython.
 
-$Id: iplib.py 2718 2007-09-05 21:54:50Z vivainio $
+$Id: iplib.py 2719 2007-09-06 18:53:34Z vivainio $
 """
 
 #*****************************************************************************
@@ -2174,9 +2174,9 b' want to merge them back into the new files.""" % locals()'
         # print "=>",tgt #dbg
         if callable(tgt):
             if '$' in line_info.line:
-                call_meth = '(_ip.itpl(%s))'
+                call_meth = '(_ip, _ip.itpl(%s))'
             else:
-                call_meth = '(%s)'
+                call_meth = '(_ip,%s)'
             line_out = ("%s_sh.%s" + call_meth) % (line_info.preWhitespace,
                                          line_info.iFun, 
             make_quoted_expr(line_info.line))

doc/ChangeLog

@@ -1,3 +1,10 b''
[phone]  Ville Vainio  <[e-mail]>
+
+	* ipy_rehashdir.py, ipy_workdir.py, ipy_fsops.py, iplib.py:
+	Callable aliases now pass the _ip as first arg. This breaks 
+	compatibility with earlier 0.8.2.svn series! (though they should
+	not have been in use yet outside these few extensions)
+
 2007-09-05  Ville Vainio  <[e-mail]>
 
 	* external/mglob.py: expand('dirname') => ['dirname'], instead
@@ -305,7 +312,7 b''
 
 	* IPython/Extensions/ipipe.py: Added a new table icap, which executes a
 	Python string and captures the output. (Idea and original patch by
-	St�fan van der Walt)
+	Stefan van der Walt)
 
 2007-06-01  Fernando Perez  <[e-mail]>
 
@@ -325,7 +332,7 b''
 	in the input line. Split the statusbar to be able to display the currently
 	active refresh interval. (Patch by Nik Tautenhahn)
 
-2007-05-29  J�rgen Stenarson  <[e-mail]>
[phone]  Jorgen Stenarson  <[e-mail]>
 	
 	* fixing set_term_title to use ctypes as default
 
@@ -515,7 +522,7 b''
 	* UserConfig/ipy_user_conf.py, ipy_profile_sh.py: do not import
 	ipy_stock_completers on default profile, do import on sh profile.
 
-2007-04-22  J�rgen Stenarson  <[e-mail]>
[phone]  Jorgen Stenarson  <[e-mail]>
 
 	* Fix bug in iplib.py/safe_execfile when launching ipython with a script
 	like ipython.py foo.py which raised a IndexError.
@@ -731,7 +738,7 b''
 	* IPython/iplib.py (raw_input): Fix mishandling of unicode at
 	input.  Patch sent by Stefan.
 
-2007-03-20  J�rgen Stenarson  <[e-mail]>
[phone]  Jorgen Stenarson  <[e-mail]>
 	* IPython/Extensions/ipy_stock_completer.py
 	shlex_split, fix bug in shlex_split. len function
 	call was missing an if statement. Caused shlex_split to
@@ -789,7 +796,7 b''
 
 	* Extensions/ipy_stock_completers.py: Fixed exception
         on mismatching quotes in %run completer. Patch by
-        J�rgen Stenarson. Closes #127.
+        Jorgen Stenarson. Closes #127.
 
 2007-03-14  Ville Vainio  <[e-mail]>
 
@@ -819,7 +826,7 b''
 	* IPython/Extensions/igrid.py: Patch by Nik Tautenhahn:
 	Close help window if exiting igrid.
 
-2007-03-02  J�rgen Stenarson  <[e-mail]>
[phone]  Jorgen Stenarson  <[e-mail]>
 
 	* IPython/Extensions/ipy_defaults.py: Check if readline is available
 	before calling functions from readline.

test/test_ipapi.py

@@ -1,3 +1,6 b''
+import sys
+sys.path.append('..')
+
 import IPython.ipapi
 
 IPython.ipapi.make_session()
@@ -17,7 +20,8 b' def test_db():'
 def test_defalias():
     slot = [None]
     # test callable alias
-    def cb(s):
+    def cb(localip,s):
+        assert localip is ip
         slot[0] = s
     
     ip.defalias('testalias', cb)