ipykit pylaunchers do .ipy now

IPython/Extensions/ipy_kitcfg.py

@@ -1,54 +1,56 b''
 import os,sys
 
 import ipy_rehashdir,glob
 from ipy_rehashdir import selflaunch, PyLauncher
 
 def pylaunchers():
     """Create launchers for python scripts in cwd and store them in alias table
     
     This is useful if you want to invoke .py scripts from ipykit session,
     just adding .py files in PATH does not work without file association.
     
+    .ipy files will be run like macros.
+    
     """
-    fs = glob.glob('*.py*')
+    fs = glob.glob('*.?py*')
     for f in fs:
         l = PyLauncher(f)
         n = os.path.splitext(f)[0]
         ip.defalias(n, l)
         ip.magic('store '+n)
 
 
 def exta_imports():
     # add some modules that you'd want to be bundled in the ipykit
     # library zip file here. Do this if you get ImportErrors from scripts you
     # try to launch with 'py' or pylaunchers. In theory you could include
     # the whole stdlib here for full script coverage
     
     # note that this is never run, it's just here for py2exe
     import distutils.dir_util
   
 def main():
     root = os.environ.get('IPYKITROOT', None)
     if not root:
         print "Can't configure ipykit, IPYKITROOT should be set."
         return
     
     os.environ["PATH"] = os.environ["PATH"] + ";" + root + "\\bin;"
     ip.to_user_ns("pylaunchers")
     
     
 def ipython_firstrun(ip):
     print "First run of ipykit - configuring"
     ip.defalias('py',selflaunch)
     ip.defalias('d','ls -F')
     ip.defalias('ls','ls')
     ip.magic('store py')
     ip.magic('store d')
     ip.magic('store ls')
 
 def init_ipython(ipy):
     global ip
     ip = ipy
     main()
 
 

IPython/Extensions/ipy_rehashdir.py

@@ -1,122 +1,133 b''
 # -*- coding: utf-8 -*-
 """ IPython extension: add %rehashdir magic
 
 Usage:
 
 %rehashdir c:/bin c:/tools
   - Add all executables under c:/bin and c:/tools to alias table, in 
   order to make them directly executable from any directory.
   
 This also serves as an example on how to extend ipython
 with new magic functions.
 
 Unlike rest of ipython, this requires Python 2.4 (optional
 extensions are allowed to do that).
 
 """
 
 import IPython.ipapi
 ip = IPython.ipapi.get()
 
 
 import os,re,fnmatch,sys
 
 def selflaunch(ip,line):
     """ Launch python script with 'this' interpreter
     
-    e.g. d:\foo\ipython.exe a.py
+    e.g. d:\foo\ipykit.exe a.py
     
     """
-    cmd = sys.executable + ' ' + line.split(None,1)[1]
+    
+    tup = line.split(None,1)
+    if len(tup) == 1:
+        print "Launching nested ipython session"
+        os.system(sys.executable)
+        return
+        
+    cmd = sys.executable + ' ' + tup[1]
     print ">",cmd
     os.system(cmd)
 
 class PyLauncher:
     """ Invoke selflanucher on the specified script
     
     This is mostly useful for associating with scripts using::
         _ip.defalias('foo',PyLauncher('foo_script.py'))
     
     """
     def __init__(self,script):
         self.script = os.path.abspath(script)
     def __call__(self, ip, line):
-        selflaunch("py " + self.script + ' ' + line)
+        if self.script.endswith('.ipy'):
+            ip.runlines(open(self.script).read())
+        else:
+            selflaunch("py " + self.script + ' ' + line)
     def __repr__(self):
         return 'PyLauncher("%s")' % self.script
+
 def rehashdir_f(self,arg):
     """ Add executables in all specified dirs to alias table
      
     Usage:
 
     %rehashdir c:/bin;c:/tools
       - Add all executables under c:/bin and c:/tools to alias table, in 
       order to make them directly executable from any directory.
         
       Without arguments, add all executables in current directory.
       
     """
 
     # most of the code copied from Magic.magic_rehashx
 
     def isjunk(fname):
         junk = ['*~']
         for j in junk:
             if fnmatch.fnmatch(fname, j):
                 return True
         return False
     
     created = []
     if not arg:
         arg = '.'
     path = map(os.path.abspath,arg.split(';'))
     alias_table = self.shell.alias_table
         
     if os.name == 'posix':
         isexec = lambda fname:os.path.isfile(fname) and \
                  os.access(fname,os.X_OK)
     else:
 
         try:
             winext = os.environ['pathext'].replace(';','|').replace('.','')
         except KeyError:
             winext = 'exe|com|bat|py'
         if 'py' not in winext:
             winext += '|py'
             
         execre = re.compile(r'(.*)\.(%s)$' % winext,re.IGNORECASE)
         isexec = lambda fname:os.path.isfile(fname) and execre.match(fname)
     savedir = os.getcwd()
     try:
         # write the whole loop for posix/Windows so we don't have an if in
         # the innermost part
         if os.name == 'posix':
             for pdir in path:
                 os.chdir(pdir)
                 for ff in os.listdir(pdir):
                     if isexec(ff) and not isjunk(ff):
                         # each entry in the alias table must be (N,name),
                         # where N is the number of positional arguments of the
                         # alias.
                         src,tgt = os.path.splitext(ff)[0], os.path.abspath(ff)
                         created.append(src)                        
                         alias_table[src] = (0,tgt)
         else:
             for pdir in path:
                 os.chdir(pdir)
                 for ff in os.listdir(pdir):
                     if isexec(ff) and not isjunk(ff):
                         src, tgt = execre.sub(r'\1',ff), os.path.abspath(ff)
                         src = src.lower()
                         created.append(src)                                                
                         alias_table[src] = (0,tgt)
         # Make sure the alias table doesn't contain keywords or builtins
         self.shell.alias_table_validate()
         # Call again init_auto_alias() so we get 'rm -i' and other
         # modified aliases since %rehashx will probably clobber them
         # self.shell.init_auto_alias()
     finally:
         os.chdir(savedir)
     return created
 
 ip.expose_magic("rehashdir",rehashdir_f)