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 13 |
|
9 | $Id: ipmaker.py 1346 2006-06-03 23:55:15Z fperez $""" | |
10 |
|
10 | |||
11 | #***************************************************************************** |
|
11 | #***************************************************************************** | |
12 | # Copyright (C) 2001-2006 Fernando Perez. <fperez@colorado.edu> |
|
12 | # Copyright (C) 2001-2006 Fernando Perez. <fperez@colorado.edu> | |
@@ -124,13 +124,9 b" object? -> Details about 'object'. ?object also works, ?? prints more." | |||||
124 | ipdir_def = '_ipython' |
|
124 | ipdir_def = '_ipython' | |
125 |
|
125 | |||
126 | # default directory for configuration |
|
126 | # default directory for configuration | |
127 | ipythondir = os.path.abspath(os.environ.get('IPYTHONDIR', |
|
127 | ipythondir_def = os.path.abspath(os.environ.get('IPYTHONDIR', | |
128 | os.path.join(IP.home_dir,ipdir_def))) |
|
128 | os.path.join(IP.home_dir,ipdir_def))) | |
129 |
|
129 | |||
130 | # add personal .ipython dir to sys.path so that users can put things in |
|
|||
131 | # there for customization |
|
|||
132 | sys.path.append(ipythondir) |
|
|||
133 |
|
||||
134 | sys.path.insert(0, '') # add . to sys.path. Fix from Prabhu Ramachandran |
|
130 | sys.path.insert(0, '') # add . to sys.path. Fix from Prabhu Ramachandran | |
135 |
|
131 | |||
136 | # we need the directory where IPython itself is installed |
|
132 | # we need the directory where IPython itself is installed | |
@@ -197,7 +193,7 b" object? -> Details about 'object'. ?object also works, ?? prints more." | |||||
197 | editor = '0', |
|
193 | editor = '0', | |
198 | help = 0, |
|
194 | help = 0, | |
199 | ignore = 0, |
|
195 | ignore = 0, | |
200 | ipythondir = ipythondir, |
|
196 | ipythondir = ipythondir_def, | |
201 | log = 0, |
|
197 | log = 0, | |
202 | logfile = '', |
|
198 | logfile = '', | |
203 | logplay = '', |
|
199 | logplay = '', | |
@@ -318,6 +314,10 b" object? -> Details about 'object'. ?object also works, ?? prints more." | |||||
318 | IP.magic_magic('-latex') |
|
314 | IP.magic_magic('-latex') | |
319 | sys.exit() |
|
315 | sys.exit() | |
320 |
|
316 | |||
|
317 | # add personal ipythondir to sys.path so that users can put things in | |||
|
318 | # there for customization | |||
|
319 | sys.path.append(os.path.abspath(opts_all.ipythondir)) | |||
|
320 | ||||
321 | # Create user config directory if it doesn't exist. This must be done |
|
321 | # Create user config directory if it doesn't exist. This must be done | |
322 | # *after* getting the cmd line options. |
|
322 | # *after* getting the cmd line options. | |
323 | if not os.path.isdir(opts_all.ipythondir): |
|
323 | if not os.path.isdir(opts_all.ipythondir): | |
@@ -634,14 +634,14 b" object? -> Details about 'object'. ?object also works, ?? prints more." | |||||
634 | import ipy_user_conf |
|
634 | import ipy_user_conf | |
635 | except ImportError: |
|
635 | except ImportError: | |
636 | if opts_all.debug: IP.InteractiveTB() |
|
636 | if opts_all.debug: IP.InteractiveTB() | |
637 | warn("Could not import user config!\n ('%s/ipy_user_conf.py' does not exist? Please run '%%upgrade')\n" % |
|
637 | warn("Could not import user config!\n " | |
638 | ipythondir) |
|
638 | "('%s/ipy_user_conf.py' does not exist? Please run '%%upgrade')\n" | |
|
639 | % opts_all.ipythondir) | |||
639 | except: |
|
640 | except: | |
640 | print "Error importing ipy_user_conf" |
|
641 | print "Error importing ipy_user_conf" | |
641 | IP.InteractiveTB() |
|
642 | IP.InteractiveTB() | |
642 | import_fail_info("ipy_user_conf") |
|
643 | import_fail_info("ipy_user_conf") | |
643 |
|
|
644 | ||
644 |
|
||||
645 | # release stdout and stderr and save config log into a global summary |
|
645 | # release stdout and stderr and save config log into a global summary | |
646 | msg.config.release_all() |
|
646 | msg.config.release_all() | |
647 | if IP_rc.messages: |
|
647 | if IP_rc.messages: |
@@ -1,5 +1,9 b'' | |||||
1 | 2006-06-03 Fernando Perez <Fernando.Perez@colorado.edu> |
|
1 | 2006-06-03 Fernando Perez <Fernando.Perez@colorado.edu> | |
2 |
|
2 | |||
|
3 | * IPython/ipmaker.py (make_IPython): honor -ipythondir flag | |||
|
4 | correctly at initialization time. Bug reported by Krishna Mohan | |||
|
5 | Gundu <gkmohan-AT-gmail.com> on the user list. | |||
|
6 | ||||
3 | * IPython/Release.py (version): Mark 0.7.2 version to start |
|
7 | * IPython/Release.py (version): Mark 0.7.2 version to start | |
4 | testing for release on 06/06. |
|
8 | testing for release on 06/06. | |
5 |
|
9 |
General Comments 0
You need to be logged in to leave comments.
Login now