##// END OF EJS Templates
david cournapeau patch from ticket \#107 (import_some fix). doc changes
vivainio -
Show More
@@ -12,6 +12,8 b' Note that as such this file does nothing, for backwards compatibility.'
12 Consult e.g. file 'ipy_profile_sh.py' for an example of the things
12 Consult e.g. file 'ipy_profile_sh.py' for an example of the things
13 you can do here.
13 you can do here.
14
14
15 See http://ipython.scipy.org/moin/IpythonExtensionApi for detailed
16 description on what you could do here.
15 """
17 """
16
18
17 # Most of your config files and extensions will probably start with this import
19 # Most of your config files and extensions will probably start with this import
@@ -1,10 +1,17 b''
1 # -*- Mode: Shell-Script -*- Not really, but shows comments correctly
1 # -*- Mode: Shell-Script -*- Not really, but shows comments correctly
2 # $Id: ipythonrc 1879 2006-11-04 00:34:34Z fptest $
2 # $Id: ipythonrc 1979 2006-12-12 18:50:20Z vivainio $
3
3
4 #***************************************************************************
4 #***************************************************************************
5 #
5 #
6 # Configuration file for IPython -- ipythonrc format
6 # Configuration file for IPython -- ipythonrc format
7 #
7 #
8 # ===========================================================
9 # Deprecation note: you should look into modifying ipy_user_conf.py (located
10 # in ~/.ipython or ~/_ipython, depending on your platform) instead, it's a
11 # more flexible and robust (and better supported!) configuration
12 # method.
13 # ===========================================================
14 #
8 # The format of this file is simply one of 'key value' lines.
15 # The format of this file is simply one of 'key value' lines.
9 # Lines containing only whitespace at the beginning and then a # are ignored
16 # Lines containing only whitespace at the beginning and then a # are ignored
10 # as comments. But comments can NOT be put on lines with data.
17 # as comments. But comments can NOT be put on lines with data.
@@ -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 1879 2006-11-04 00:34:34Z fptest $"""
9 $Id: ipmaker.py 1979 2006-12-12 18:50:20Z 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>
@@ -576,13 +576,13 b" object? -> Details about 'object'. ?object also works, ?? prints more."
576 import_fail_info(mod)
576 import_fail_info(mod)
577
577
578 for mod_fn in IP_rc.import_some:
578 for mod_fn in IP_rc.import_some:
579 if mod_fn == []: break
579 if not mod_fn == []:
580 mod,fn = mod_fn[0],','.join(mod_fn[1:])
580 mod,fn = mod_fn[0],','.join(mod_fn[1:])
581 try:
581 try:
582 exec 'from '+mod+' import '+fn in IP.user_ns
582 exec 'from '+mod+' import '+fn in IP.user_ns
583 except :
583 except :
584 IP.InteractiveTB()
584 IP.InteractiveTB()
585 import_fail_info(mod,fn)
585 import_fail_info(mod,fn)
586
586
587 for mod in IP_rc.import_all:
587 for mod in IP_rc.import_all:
588 try:
588 try:
@@ -1,3 +1,13 b''
1 2006-12-12 Ville Vainio <vivainio@gmail.com>
2
3 * ipmaker.py: apply david cournapeau's patch to make
4 import_some work properly even when ipythonrc does
5 import_some on empty list (it was an old bug!).
6
7 * UserConfig/ipy_user_conf.py, UserConfig/ipythonrc:
8 Add deprecation note to ipythonrc and a url to wiki
9 in ipy_user_conf.py
10
1 2006-12-08 Ville Vainio <vivainio@gmail.com>
11 2006-12-08 Ville Vainio <vivainio@gmail.com>
2
12
3 * Extensions/ipy_stock_completers.py.py: fix cd completer
13 * Extensions/ipy_stock_completers.py.py: fix cd completer
General Comments 0
You need to be logged in to leave comments. Login now