##// END OF EJS Templates
Always show full traceback when newstyle config fails
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 2684 2007-08-28 20:05:40Z vivainio $"""
9 $Id: ipmaker.py 2704 2007-09-01 14:32:05Z 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>
@@ -632,28 +632,21 b" object? -> Details about 'object'. ?object also works, ?? prints more."
632 profmodname = 'ipy_profile_' + opts_all.profile
632 profmodname = 'ipy_profile_' + opts_all.profile
633 try:
633 try:
634 __import__(profmodname)
634 __import__(profmodname)
635 except ImportError:
636 # only warn if ipythonrc-PROFNAME didn't exist
637 if opts.profile =='':
638 warn("Could not start with profile '%s'!\n"
639 "('%s/%s.py' does not exist? run '%%upgrade')" %
640 (opts_all.profile, opts_all.ipythondir, profmodname) )
641 except:
635 except:
642 print "Error importing",profmodname,"- perhaps you should run %upgrade?"
643 IP.InteractiveTB()
636 IP.InteractiveTB()
637 print "Error importing",profmodname,"- perhaps you should run %upgrade?"
644 import_fail_info(profmodname)
638 import_fail_info(profmodname)
645 else:
639 else:
646 import ipy_profile_none
640 import ipy_profile_none
647 try:
641 try:
648 import ipy_user_conf
642 import ipy_user_conf
649 except ImportError:
643
650 if opts_all.debug: IP.InteractiveTB()
651 warn("Could not import user config!\n "
652 "('%s/ipy_user_conf.py' does not exist? Please run '%%upgrade')\n"
653 % opts_all.ipythondir)
654 except:
644 except:
655 print "Error importing ipy_user_conf - perhaps you should run %upgrade?"
645 conf = opts_all.ipythondir + "/ipy_user_conf.py"
656 IP.InteractiveTB()
646 IP.InteractiveTB()
647 if not os.path.isfile(conf):
648 warn(conf + ' does not exist, please run %upgrade!')
649
657 import_fail_info("ipy_user_conf")
650 import_fail_info("ipy_user_conf")
658
651
659 # finally, push the argv to options again to ensure highest priority
652 # finally, push the argv to options again to ensure highest priority
@@ -1,3 +1,7 b''
1 2007-09-01 Ville Vainio <vivainio@gmail.com>
2
3 * ipmaker.py: Always show full traceback when newstyle config fails
4
1 2007-08-27 Ville Vainio <vivainio@gmail.com>
5 2007-08-27 Ville Vainio <vivainio@gmail.com>
2
6
3 * Magic.py: fix %cd for nonexistent dir when dhist is empty, close #180
7 * Magic.py: fix %cd for nonexistent dir when dhist is empty, close #180
General Comments 0
You need to be logged in to leave comments. Login now