"ipython mybatch.ipy" now runs mybatch.ipy w/ _ip.runlines(),

instead of plain old exec.

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 1232 2006-04-01 10:59:41Z vivainio $
+$Id: iplib.py 1260 2006-04-11 10:19:34Z vivainio $
 """
 
 #*****************************************************************************
@@ -665,6 +665,12 b' class InteractiveShell(object,Magic):'
             self.magic_alias(alias)
         self.hooks.late_startup_hook()
         
+        for batchfile in [path(arg) for arg in self.rc.args 
+            if arg.lower().endswith('.ipy')]:
+            if not batchfile.isfile():
+                print "No such batch file:", batchfile
+                continue
+            self.api.runlines(batchfile.text())
 
     def add_builtins(self):
         """Store ipython references into the builtin namespace.

IPython/ipmaker.py

@@ -6,7 +6,7 b' Requires Python 2.1 or better.'
 
 This file contains the main make_IPython() starter function.
 
-$Id: ipmaker.py 1225 2006-03-28 09:11:52Z vivainio $"""
+$Id: ipmaker.py 1260 2006-04-11 10:19:34Z vivainio $"""
 
 #*****************************************************************************
 #       Copyright (C) 2001-2006 Fernando Perez. <[e-mail]>
@@ -608,7 +608,10 b" object? -> Details about 'object'. ?object also works, ?? prints more."
     except ImportError:
         if opts_all.debug:  IP.InteractiveTB()
         warn("Could not import 'ipy_system_conf'")        
-
+    except:
+        IP.InteractiveTB()
+        import_fail_info('ipy_system_conf')
+        
     if opts_all.profile:
         profmodname = 'ipy_profile_' + opts_all.profile
         try:
@@ -623,6 +626,7 b" object? -> Details about 'object'. ?object also works, ?? prints more."
         except:
             print "Error importing",profmodname
             IP.InteractiveTB()
+            import_fail_info(profmodname)
                       
     try:    
         import ipy_user_conf
@@ -633,6 +637,7 b" object? -> Details about 'object'. ?object also works, ?? prints more."
     except:
         print "Error importing ipy_user_conf"
         IP.InteractiveTB()
+        import_fail_info("ipy_user_conf")
         
 
     # release stdout and stderr and save config log into a global summary
@@ -682,7 +687,8 b" object? -> Details about 'object'. ?object also works, ?? prints more."
     # ipython prompt.  This would also give them the benefit of ipython's
     # nice tracebacks.
 
-    if not embedded and IP_rc.args:
+    if (not embedded and IP_rc.args and 
+        not IP_rc.args[0].lower().endswith('.ipy')):
         name_save = IP.user_ns['__name__']
         IP.user_ns['__name__'] = '__main__'
         # Set our own excepthook in case the user code tries to call it

doc/ChangeLog

@@ -1,3 +1,9 b''
[phone]  Ville Vainio  <[e-mail]>
+
+	* iplib.py, ipmaker.py: .ipy extension now means "ipython batch file"
+	in command line. E.g. "ipython test.ipy" runs test.ipy with ipython
+	prefilters, allowing stuff like magics and aliases in the file.
+
 2006-03-28  Ville Vainio  <[e-mail]>
 
 	* iplib.py: Fix quoting of aliases so that only argless ones