##// END OF EJS Templates
Go to interactiveTB when ipy_user_conf or ipy_profile_PROF import ...
vivainio -
Show More
@@ -6,7 +6,7 b' 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 1213 2006-03-16 13:45:11Z vivainio $"""
9 $Id: ipmaker.py 1225 2006-03-28 09:11:52Z 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>
@@ -620,12 +620,20 b" object? -> Details about 'object'. ?object also works, ?? prints more."
620 opts_all.profile, ipythondir, profmodname)
620 opts_all.profile, ipythondir, profmodname)
621
621
622 )
622 )
623 except:
624 print "Error importing",profmodname
625 IP.InteractiveTB()
626
623 try:
627 try:
624 import ipy_user_conf
628 import ipy_user_conf
625 except ImportError:
629 except ImportError:
626 if opts_all.debug: IP.InteractiveTB()
630 if opts_all.debug: IP.InteractiveTB()
627 warn("Could not import user config!\n ('%s/ipy_user_conf.py' does not exist? Please run '%%upgrade')\n" %
631 warn("Could not import user config!\n ('%s/ipy_user_conf.py' does not exist? Please run '%%upgrade')\n" %
628 ipythondir)
632 ipythondir)
633 except:
634 print "Error importing ipy_user_conf"
635 IP.InteractiveTB()
636
629
637
630 # release stdout and stderr and save config log into a global summary
638 # release stdout and stderr and save config log into a global summary
631 msg.config.release_all()
639 msg.config.release_all()
General Comments 0
You need to be logged in to leave comments. Login now