ipykit.py special launcher, 'py' alias within ipy_kitcfg

ipykit.py

@@ -0,0 +1,21 b''
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+""" IPykit launcher
+
+w/o args, this launches a full ipykit session.
+
+If the first arg is a .py script, it will be run WITHOUT ipython,
+to facilitate running python scripts almost normally on machines w/o python
+in their own process (as opposed to %run).
+
+"""
+
+import sys
+if len(sys.argv) > 1 and sys.argv[1].endswith('.py'):
+    # shortcut for running ipykit.exe directly on a .py file - do not bother
+    # starting ipython, just handle as normal python scripts
+    sys.argv = sys.argv[1:]
+    execfile(sys.argv[0])
+else:
+    import IPython  
+    IPython.Shell.start().mainloop()

IPython/Extensions/ipy_kitcfg.py

@@ -1,15 +1,29 b''
-#import IPython.ipapi
-#ip = IPython.ipapi.get()
 
-import os
+import os,sys
 
+def selflaunch(line):
+    """ Launch python script with 'this' interpreter
+    
+    e.g. d:\foo\ipython.exe a.py
+    
+    """
+    cmd = sys.executable + ' ' + line.split(None,1)[1]
+    print ">",cmd
+    os.system(cmd)
+    
 def main():
+    import IPython.ipapi
+    ip = IPython.ipapi.get()
+
     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.defalias('py',selflaunch)
+    
 
 main()
 

IPython/Magic.py

@@ -1,7 +1,7 b''
 # -*- coding: utf-8 -*-
 """Magic functions for InteractiveShell.
 
-$Id: Magic.py 2659 2007-08-22 20:21:07Z vivainio $"""
+$Id: Magic.py 2663 2007-08-22 21:46:52Z vivainio $"""
 
 #*****************************************************************************
 #       Copyright (C) 2001 Janko Hauser <[e-mail]> and
@@ -2295,13 +2295,16 b' Defaulting color scheme to \'NoColor\'"""'
             res = []
             showlast = []
             for alias in aliases:
+                special = False
                 try:
                     tgt = atab[alias][1]
                 except TypeError:
                     # unsubscriptable? probably a callable
                     tgt = atab[alias]
+                    special = True
                 # 'interesting' aliases
-                if (alias in stored or 
+                if (alias in stored or
+                    special or 
                     alias.lower() != os.path.splitext(tgt)[0].lower() or
                     ' ' in tgt):
                     showlast.append((alias, tgt))

doc/ChangeLog

@@ -18,6 +18,10 b''
         * genutils.py, Prompts.py, Magic.py: win32 - prompt (with \yDEPTH) and
         term title now include the drive letter, and always use / instead of
         os.sep (as per recommended approach for win32 ipython in general).
+        
+        * ipykit.py, ipy_kitcfg.py: special launcher for ipykit. Allows running
+        plain python scripts from ipykit command line by running
+        "py myscript.py", even w/o installed python.
 
 2007-08-21  Ville Vainio  <[e-mail]>
 

exesetup.py

@@ -79,7 +79,7 b' setup(name = name,'
     license          = license,
     platforms        = platforms,
     keywords         = keywords,
-    console          = ['ipython.py'],
+    console          = ['ipykit.py'],
     
     # extra params needed for eggs
     **egg_extra_kwds                        

ipython.py

@@ -7,6 +7,9 b" in './scripts' directory. This file is here (ipython source root directory)"
 to facilitate non-root 'zero-installation' (just copy the source tree
 somewhere and run ipython.py) and development. """
 
+import sys
+print "e",sys.executable
+
 import IPython
 
 IPython.Shell.start().mainloop()