Show More
@@ -1,7 +1,7 b'' | |||||
1 | # -*- coding: utf-8 -*- |
|
1 | # -*- coding: utf-8 -*- | |
2 | """Magic functions for InteractiveShell. |
|
2 | """Magic functions for InteractiveShell. | |
3 |
|
3 | |||
4 |
$Id: Magic.py 133 |
|
4 | $Id: Magic.py 1338 2006-05-31 14:24:23Z vivainio $""" | |
5 |
|
5 | |||
6 | #***************************************************************************** |
|
6 | #***************************************************************************** | |
7 | # Copyright (C) 2001 Janko Hauser <jhauser@zscout.de> and |
|
7 | # Copyright (C) 2001 Janko Hauser <jhauser@zscout.de> and | |
@@ -2952,10 +2952,10 b' Defaulting color scheme to \'NoColor\'"""' | |||||
2952 | """ |
|
2952 | """ | |
2953 | ip = self.getapi() |
|
2953 | ip = self.getapi() | |
2954 | ipinstallation = path(IPython.__file__).dirname() |
|
2954 | ipinstallation = path(IPython.__file__).dirname() | |
2955 |
upgrade_script = sys.executable |
|
2955 | upgrade_script = '%s "%s"' % (sys.executable,ipinstallation / 'upgrade_dir.py') | |
2956 | src_config = ipinstallation / 'UserConfig' |
|
2956 | src_config = ipinstallation / 'UserConfig' | |
2957 | userdir = path(ip.options.ipythondir) |
|
2957 | userdir = path(ip.options.ipythondir) | |
2958 |
cmd = |
|
2958 | cmd = '%s "%s" "%s"' % (upgrade_script, src_config, userdir) | |
2959 | print ">",cmd |
|
2959 | print ">",cmd | |
2960 | shell(cmd) |
|
2960 | shell(cmd) | |
2961 | if arg == '-nolegacy': |
|
2961 | if arg == '-nolegacy': |
@@ -76,7 +76,7 b' def upgrade_dir(srcdir, tgtdir):' | |||||
76 | #print rpt |
|
76 | #print rpt | |
77 | pickle.dump(rpt, rep.open('w')) |
|
77 | pickle.dump(rpt, rep.open('w')) | |
78 | if modded: |
|
78 | if modded: | |
79 | print "\n\nDelete the following files manually if you need a full upgrade:" |
|
79 | print "\n\nDelete the following files manually (and rerun %upgrade)\nif you need a full upgrade:" | |
80 | for m in modded: |
|
80 | for m in modded: | |
81 | print m |
|
81 | print m | |
82 |
|
82 |
@@ -1,3 +1,8 b'' | |||||
|
1 | 2006-05-31 Ville Vainio <vivainio@gmail.com> | |||
|
2 | ||||
|
3 | * upgrade_dir.py, Magic.py (magic_upgrade): call upgrade_dir | |||
|
4 | with args in parens to work correctly with dirs that have spaces. | |||
|
5 | ||||
1 | 2006-05-30 Fernando Perez <Fernando.Perez@colorado.edu> |
|
6 | 2006-05-30 Fernando Perez <Fernando.Perez@colorado.edu> | |
2 |
|
7 | |||
3 | * IPython/Logger.py (Logger.logstart): add option to log raw input |
|
8 | * IPython/Logger.py (Logger.logstart): add option to log raw input |
General Comments 0
You need to be logged in to leave comments.
Login now