ipykit pylaunchers do .ipy now

IPython/Extensions/ipy_kitcfg.py

@@ -9,8 +9,10 b' def pylaunchers():'
     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]

IPython/Extensions/ipy_rehashdir.py

@@ -24,10 +24,17 b' 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)
 
@@ -41,9 +48,13 b' class PyLauncher:'
     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