##// END OF EJS Templates
Put .rc attribute in instance earlier, too many methods expect this to be...
fperez -
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 924 2005-11-15 20:24:31Z fperez $"""
9 $Id: ipmaker.py 925 2005-11-15 20:39:39Z fperez $"""
10
10
11 #*****************************************************************************
11 #*****************************************************************************
12 # Copyright (C) 2001-2004 Fernando Perez. <fperez@colorado.edu>
12 # Copyright (C) 2001-2004 Fernando Perez. <fperez@colorado.edu>
@@ -445,11 +445,15 b" object? -> Details about 'object'. ?object also works, ?? prints more."
445 #------------------------------------------------------------------------
445 #------------------------------------------------------------------------
446 # Execute user config
446 # Execute user config
447
447
448 # first, create a valid config structure with the right precedence order:
448 # Create a valid config structure with the right precedence order:
449 # defaults < rcfile < command line. We make it as a local (IP_rc) to
449 # defaults < rcfile < command line. This needs to be in the instance, so
450 # avoid a zillion attribute accesses. Right before returning, this will
450 # that method calls below that rely on it find it.
451 # be set as IP.rc.
451 IP.rc = rc_def.copy()
452 IP_rc = rc_def.copy()
452
453 # Work with a local alias inside this routine to avoid unnecessary
454 # attribute lookups.
455 IP_rc = IP.rc
456
453 IP_rc.update(opts_def)
457 IP_rc.update(opts_def)
454 if rcfiledata:
458 if rcfiledata:
455 # now we can update
459 # now we can update
@@ -719,9 +723,6 b" object? -> Details about 'object'. ?object also works, ?? prints more."
719 # Final banner is a string
723 # Final banner is a string
720 IP.BANNER = '\n'.join(BANN_P)
724 IP.BANNER = '\n'.join(BANN_P)
721
725
722 # Assign the IP_rc object as an attribute of IP
723 IP.rc = IP_rc
724
725 # Finalize the IPython instance. This assumes the rc structure is fully
726 # Finalize the IPython instance. This assumes the rc structure is fully
726 # in place.
727 # in place.
727 IP.post_config_initialization()
728 IP.post_config_initialization()
General Comments 0
You need to be logged in to leave comments. Login now