##// END OF EJS Templates
Fix %upgrade, and suggest using it.
vivainio -
Show More
@@ -7,7 +7,8 b' should reside there.'
7
7
8 """
8 """
9
9
10 import IPython.ipapi as ip
10 import IPython.ipapi
11 ip = IPython.ipapi.get()
11
12
12 # add system wide configuration information, import extensions etc. here.
13 # add system wide configuration information, import extensions etc. here.
13 # nothing here is essential
14 # nothing here is essential
@@ -17,3 +18,7 b' import sys'
17 import ext_rehashdir # %rehashdir magic
18 import ext_rehashdir # %rehashdir magic
18 import ext_rescapture # var = !ls and var = %magic
19 import ext_rescapture # var = !ls and var = %magic
19 import pspersistence # %store magic
20 import pspersistence # %store magic
21
22 # Basic readline config
23
24 o = ip.options() No newline at end of file
@@ -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 1140 2006-02-10 17:07:11Z vivainio $"""
9 $Id: ipmaker.py 1213 2006-03-16 13:45:11Z 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>
@@ -616,7 +616,7 b" object? -> Details about 'object'. ?object also works, ?? prints more."
616 except ImportError:
616 except ImportError:
617 # only warn if ipythonrc-PROFNAME didn't exist
617 # only warn if ipythonrc-PROFNAME didn't exist
618 if opts.profile =='':
618 if opts.profile =='':
619 warn("Could not start with profile '%s'!\n ('%s/%s.py' does not exist?)" % (
619 warn("Could not start with profile '%s'!\n ('%s/%s.py' does not exist? run '%%upgrade')" % (
620 opts_all.profile, ipythondir, profmodname)
620 opts_all.profile, ipythondir, profmodname)
621
621
622 )
622 )
@@ -624,7 +624,7 b" object? -> Details about 'object'. ?object also works, ?? prints more."
624 import ipy_user_conf
624 import ipy_user_conf
625 except ImportError:
625 except ImportError:
626 if opts_all.debug: IP.InteractiveTB()
626 if opts_all.debug: IP.InteractiveTB()
627 warn("Could not import user config!\n ('%s/ipy_user_conf.py' does not exist?)" %
627 warn("Could not import user config!\n ('%s/ipy_user_conf.py' does not exist? Please run '%%upgrade')\n" %
628 ipythondir)
628 ipythondir)
629
629
630 # release stdout and stderr and save config log into a global summary
630 # release stdout and stderr and save config log into a global summary
@@ -6,7 +6,7 b' new and unedited files.'
6
6
7 To be used by "upgrade" feature.
7 To be used by "upgrade" feature.
8 """
8 """
9 from path import path
9 from IPython.Extensions.path import path
10 import md5,pickle
10 import md5,pickle
11
11
12 def showdiff(old,new):
12 def showdiff(old,new):
@@ -1,3 +1,10 b''
1 2006-03-16 Ville Vainio <vivainio@gmail.com>
2
3 * upgrade_dir.py: Take path.py from Extensions, correcting
4 %upgrade magic
5
6 * Suggest using %upgrade if ipy_user_conf.py isn't found.
7
1 2006-03-13 Fernando Perez <Fernando.Perez@colorado.edu>
8 2006-03-13 Fernando Perez <Fernando.Perez@colorado.edu>
2
9
3 * Manual: thanks to a tip on proper color handling for Emacs, by
10 * Manual: thanks to a tip on proper color handling for Emacs, by
General Comments 0
You need to be logged in to leave comments. Login now