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 26 |
|
9 | $Id: ipmaker.py 2672 2007-08-26 09:15:26Z 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> | |
@@ -654,6 +654,9 b" object? -> Details about 'object'. ?object also works, ?? prints more." | |||||
654 | print "Error importing ipy_user_conf - perhaps you should run %upgrade?" |
|
654 | print "Error importing ipy_user_conf - perhaps you should run %upgrade?" | |
655 | IP.InteractiveTB() |
|
655 | IP.InteractiveTB() | |
656 | import_fail_info("ipy_user_conf") |
|
656 | import_fail_info("ipy_user_conf") | |
|
657 | ||||
|
658 | # finally, push the argv to options again to ensure highest priority | |||
|
659 | IP_rc.update(opts) | |||
657 |
|
660 | |||
658 | # release stdout and stderr and save config log into a global summary |
|
661 | # release stdout and stderr and save config log into a global summary | |
659 | msg.config.release_all() |
|
662 | msg.config.release_all() |
@@ -1,3 +1,7 b'' | |||||
|
1 | 2007-08-26 Ville Vainio <vivainio@gmail.com> | |||
|
2 | ||||
|
3 | * ipmaker.py: Command line args have the highest priority again | |||
|
4 | ||||
1 | 2007-08-22 Ville Vainio <vivainio@gmail.com> |
|
5 | 2007-08-22 Ville Vainio <vivainio@gmail.com> | |
2 |
|
6 | |||
3 | * iplib.py: no extra empty (last) line in raw hist w/ multiline |
|
7 | * iplib.py: no extra empty (last) line in raw hist w/ multiline |
General Comments 0
You need to be logged in to leave comments.
Login now