##// END OF EJS Templates
whoops, lasth commit was an accident - but it works....
vivainio -
r150:3f9afd1a
parent child
Show More
@@ -6,7 +6,7 Requires Python 2.3 or newer.
6
6
7 This file contains all the classes and helper functions specific to IPython.
7 This file contains all the classes and helper functions specific to IPython.
8
8
9 $Id: iplib.py 1087 2006-01-27 17:02:42Z vivainio $
9 $Id: iplib.py 1088 2006-01-27 17:16:45Z vivainio $
10 """
10 """
11
11
12 #*****************************************************************************
12 #*****************************************************************************
@@ -410,7 +410,7 class InteractiveShell(object,Magic):
410 for hook_name in hooks.__all__:
410 for hook_name in hooks.__all__:
411 # default hooks have priority 100, i.e. low; user hooks should have 0-100 priority
411 # default hooks have priority 100, i.e. low; user hooks should have 0-100 priority
412 self.set_hook(hook_name,getattr(hooks,hook_name), 100)
412 self.set_hook(hook_name,getattr(hooks,hook_name), 100)
413 print "bound hook",hook_name
413 #print "bound hook",hook_name
414
414
415 # Flag to mark unconditional exit
415 # Flag to mark unconditional exit
416 self.exit_now = False
416 self.exit_now = False
@@ -6,7 +6,7 Requires Python 2.1 or better.
6
6
7 This file contains the main make_IPython() starter function.
7 This file contains the main make_IPython() starter function.
8
8
9 $Id: ipmaker.py 1086 2006-01-27 16:02:38Z vivainio $"""
9 $Id: ipmaker.py 1088 2006-01-27 17:16:45Z vivainio $"""
10
10
11 #*****************************************************************************
11 #*****************************************************************************
12 # Copyright (C) 2001-2006 Fernando Perez. <fperez@colorado.edu>
12 # Copyright (C) 2001-2006 Fernando Perez. <fperez@colorado.edu>
@@ -666,7 +666,8 object? -> Details about 'object'. ?object also works, ?? prints more.
666 old_excepthook,sys.excepthook = sys.excepthook, IP.excepthook
666 old_excepthook,sys.excepthook = sys.excepthook, IP.excepthook
667
667
668 save_argv = sys.argv[:] # save it for later restoring
668 save_argv = sys.argv[:] # save it for later restoring
669 sys.argv.pop(0) # the first arg is 'ipython'
669
670 sys.argv = args
670
671
671 try:
672 try:
672 IP.safe_execfile(args[0], IP.user_ns)
673 IP.safe_execfile(args[0], IP.user_ns)
General Comments 0
You need to be logged in to leave comments. Login now