##// END OF EJS Templates
More informative message in ipy_user_conf import failure (suggest running %upgrade)...
vivainio -
r504:aa8c9348
parent child
Show More
@@ -1,7 +1,7
1 # -*- coding: utf-8 -*-
1 # -*- coding: utf-8 -*-
2 """Release data for the IPython project.
2 """Release data for the IPython project.
3
3
4 $Id: Release.py 2010 2006-12-20 15:29:17Z vivainio $"""
4 $Id: Release.py 2012 2006-12-24 10:28:29Z vivainio $"""
5
5
6 #*****************************************************************************
6 #*****************************************************************************
7 # Copyright (C) 2001-2006 Fernando Perez <fperez@colorado.edu>
7 # Copyright (C) 2001-2006 Fernando Perez <fperez@colorado.edu>
@@ -22,11 +22,11 name = 'ipython'
22 # because bdist_rpm does not accept dashes (an RPM) convention, and
22 # because bdist_rpm does not accept dashes (an RPM) convention, and
23 # bdist_deb does not accept underscores (a Debian convention).
23 # bdist_deb does not accept underscores (a Debian convention).
24
24
25 revision = '2007'
25 revision = '2010M'
26
26
27 version = '0.7.3'
27 #version = '0.7.3'
28
28
29 #version = '0.7.3rc2.r' + revision.rstrip('M')
29 version = '0.7.4.svn.r' + revision.rstrip('M')
30
30
31 description = "An enhanced interactive Python shell."
31 description = "An enhanced interactive Python shell."
32
32
@@ -275,6 +275,21 class IPApi:
275 error('could not get var. %s from %s' %
275 error('could not get var. %s from %s' %
276 (name,cf.f_code.co_name))
276 (name,cf.f_code.co_name))
277
277
278 def expand_alias(self,line):
279 """ Expand an alias in the command line
280
281 Returns the provided command line, possibly with the first word
282 (command) translated according to alias expansion rules.
283
284 [ipython]|16> _ip.expand_aliases("np myfile.txt")
285 <16> 'q:/opt/np/notepad++.exe myfile.txt'
286 """
287
288 pre,fn,rest = self.IP.split_user_input(line)
289 res = pre + self.IP.expand_aliases(fn,rest)
290
291
292
278 def launch_new_instance(user_ns = None):
293 def launch_new_instance(user_ns = None):
279 """ Make and start a new ipython instance.
294 """ Make and start a new ipython instance.
280
295
@@ -6,7 +6,7 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 1979 2006-12-12 18:50:20Z vivainio $"""
9 $Id: ipmaker.py 2012 2006-12-24 10:28:29Z 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>
@@ -627,8 +627,8 object? -> Details about 'object'. ?object also works, ?? prints more.
627 warn("Could not start with profile '%s'!\n"
627 warn("Could not start with profile '%s'!\n"
628 "('%s/%s.py' does not exist? run '%%upgrade')" %
628 "('%s/%s.py' does not exist? run '%%upgrade')" %
629 (opts_all.profile, opts_all.ipythondir, profmodname) )
629 (opts_all.profile, opts_all.ipythondir, profmodname) )
630 except:
630 except:
631 print "Error importing",profmodname
631 print "Error importing",profmodname,"- perhaps you should run %upgrade?"
632 IP.InteractiveTB()
632 IP.InteractiveTB()
633 import_fail_info(profmodname)
633 import_fail_info(profmodname)
634
634
@@ -640,7 +640,7 object? -> Details about 'object'. ?object also works, ?? prints more.
640 "('%s/ipy_user_conf.py' does not exist? Please run '%%upgrade')\n"
640 "('%s/ipy_user_conf.py' does not exist? Please run '%%upgrade')\n"
641 % opts_all.ipythondir)
641 % opts_all.ipythondir)
642 except:
642 except:
643 print "Error importing ipy_user_conf"
643 print "Error importing ipy_user_conf - perhaps you should run %upgrade?"
644 IP.InteractiveTB()
644 IP.InteractiveTB()
645 import_fail_info("ipy_user_conf")
645 import_fail_info("ipy_user_conf")
646
646
@@ -1,7 +1,16
1 2006-12-24 Ville Vainio <vivainio@gmail.com>
2
3 * ipmaker.py: more informative message when ipy_user_conf
4 import fails (suggest running %upgrade).
5
1 2006-12-20 Ville Vainio <vivainio@gmail.com>
6 2006-12-20 Ville Vainio <vivainio@gmail.com>
2
7
3 * 0.7.3 is out - merge all from 0.7.3 branch to trunk
8 * 0.7.3 is out - merge all from 0.7.3 branch to trunk
4
9
10 * ipapi.py: Add new ipapi method, expand_alias.
11
12 * Release.py: Bump up version to 0.7.4.svn
13
5 2006-12-17 Ville Vainio <vivainio@gmail.com>
14 2006-12-17 Ville Vainio <vivainio@gmail.com>
6
15
7 * Extensions/jobctrl.py: Fixed &cmd arg arg...
16 * Extensions/jobctrl.py: Fixed &cmd arg arg...
General Comments 0
You need to be logged in to leave comments. Login now