Show More
@@ -1,771 +1,771 b'' | |||||
1 | # -*- coding: utf-8 -*- |
|
1 | # -*- coding: utf-8 -*- | |
2 | """ |
|
2 | """ | |
3 | IPython -- An enhanced Interactive Python |
|
3 | IPython -- An enhanced Interactive Python | |
4 |
|
4 | |||
5 | Requires Python 2.1 or better. |
|
5 | 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 |
|
9 | |||
10 | #***************************************************************************** |
|
10 | #***************************************************************************** | |
11 | # Copyright (C) 2008-2009 The IPython Development Team |
|
11 | # Copyright (C) 2008-2009 The IPython Development Team | |
12 | # Copyright (C) 2001-2007 Fernando Perez. <fperez@colorado.edu> |
|
12 | # Copyright (C) 2001-2007 Fernando Perez. <fperez@colorado.edu> | |
13 | # |
|
13 | # | |
14 | # Distributed under the terms of the BSD License. The full license is in |
|
14 | # Distributed under the terms of the BSD License. The full license is in | |
15 | # the file COPYING, distributed as part of this software. |
|
15 | # the file COPYING, distributed as part of this software. | |
16 | #***************************************************************************** |
|
16 | #***************************************************************************** | |
17 |
|
17 | |||
18 | try: |
|
18 | try: | |
19 | credits._Printer__data = """ |
|
19 | credits._Printer__data = """ | |
20 | Python: %s |
|
20 | Python: %s | |
21 |
|
21 | |||
22 | IPython: The IPython Development Team. |
|
22 | IPython: The IPython Development Team. | |
23 | See http://ipython.scipy.org for more information.""" \ |
|
23 | See http://ipython.scipy.org for more information.""" \ | |
24 | % credits._Printer__data |
|
24 | % credits._Printer__data | |
25 |
|
25 | |||
26 | copyright._Printer__data += """ |
|
26 | copyright._Printer__data += """ | |
27 |
|
27 | |||
28 | Copyright (c) 2008-2009 The IPython Development Team. |
|
28 | Copyright (c) 2008-2009 The IPython Development Team. | |
29 | Copyright (c) 2001-2007 Fernando Perez, Janko Hauser, Nathan Gray. |
|
29 | Copyright (c) 2001-2007 Fernando Perez, Janko Hauser, Nathan Gray. | |
30 | All Rights Reserved.""" |
|
30 | All Rights Reserved.""" | |
31 | except NameError: |
|
31 | except NameError: | |
32 | # Can happen if ipython was started with 'python -S', so that site.py is |
|
32 | # Can happen if ipython was started with 'python -S', so that site.py is | |
33 | # not loaded |
|
33 | # not loaded | |
34 | pass |
|
34 | pass | |
35 |
|
35 | |||
36 | #**************************************************************************** |
|
36 | #**************************************************************************** | |
37 | # Required modules |
|
37 | # Required modules | |
38 |
|
38 | |||
39 | # From the standard library |
|
39 | # From the standard library | |
40 | import __main__ |
|
40 | import __main__ | |
41 | import __builtin__ |
|
41 | import __builtin__ | |
42 | import os |
|
42 | import os | |
43 | import sys |
|
43 | import sys | |
44 | from pprint import pprint |
|
44 | from pprint import pprint | |
45 |
|
45 | |||
46 | # Our own |
|
46 | # Our own | |
47 | from IPython.utils import DPyGetOpt |
|
47 | from IPython.utils import DPyGetOpt | |
48 | from IPython import Release |
|
48 | from IPython import Release | |
49 | from IPython.utils.ipstruct import Struct |
|
49 | from IPython.utils.ipstruct import Struct | |
50 |
from IPython. |
|
50 | from IPython.core.outputtrap import OutputTrap | |
51 | from IPython.config.configloader import ConfigLoader |
|
51 | from IPython.config.configloader import ConfigLoader | |
52 | from IPython.core.iplib import InteractiveShell |
|
52 | from IPython.core.iplib import InteractiveShell | |
53 | from IPython.usage import cmd_line_usage,interactive_usage |
|
53 | from IPython.usage import cmd_line_usage,interactive_usage | |
54 | from IPython.utils.genutils import * |
|
54 | from IPython.utils.genutils import * | |
55 |
|
55 | |||
56 | def force_import(modname,force_reload=False): |
|
56 | def force_import(modname,force_reload=False): | |
57 | if modname in sys.modules and force_reload: |
|
57 | if modname in sys.modules and force_reload: | |
58 | info("reloading: %s" % modname) |
|
58 | info("reloading: %s" % modname) | |
59 | reload(sys.modules[modname]) |
|
59 | reload(sys.modules[modname]) | |
60 | else: |
|
60 | else: | |
61 | __import__(modname) |
|
61 | __import__(modname) | |
62 |
|
62 | |||
63 |
|
63 | |||
64 | #----------------------------------------------------------------------------- |
|
64 | #----------------------------------------------------------------------------- | |
65 | def make_IPython(argv=None,user_ns=None,user_global_ns=None,debug=1, |
|
65 | def make_IPython(argv=None,user_ns=None,user_global_ns=None,debug=1, | |
66 | rc_override=None,shell_class=InteractiveShell, |
|
66 | rc_override=None,shell_class=InteractiveShell, | |
67 | embedded=False,**kw): |
|
67 | embedded=False,**kw): | |
68 | """This is a dump of IPython into a single function. |
|
68 | """This is a dump of IPython into a single function. | |
69 |
|
69 | |||
70 | Later it will have to be broken up in a sensible manner. |
|
70 | Later it will have to be broken up in a sensible manner. | |
71 |
|
71 | |||
72 | Arguments: |
|
72 | Arguments: | |
73 |
|
73 | |||
74 | - argv: a list similar to sys.argv[1:]. It should NOT contain the desired |
|
74 | - argv: a list similar to sys.argv[1:]. It should NOT contain the desired | |
75 | script name, b/c DPyGetOpt strips the first argument only for the real |
|
75 | script name, b/c DPyGetOpt strips the first argument only for the real | |
76 | sys.argv. |
|
76 | sys.argv. | |
77 |
|
77 | |||
78 | - user_ns: a dict to be used as the user's namespace.""" |
|
78 | - user_ns: a dict to be used as the user's namespace.""" | |
79 |
|
79 | |||
80 | #---------------------------------------------------------------------- |
|
80 | #---------------------------------------------------------------------- | |
81 | # Defaults and initialization |
|
81 | # Defaults and initialization | |
82 |
|
82 | |||
83 | # For developer debugging, deactivates crash handler and uses pdb. |
|
83 | # For developer debugging, deactivates crash handler and uses pdb. | |
84 | DEVDEBUG = False |
|
84 | DEVDEBUG = False | |
85 |
|
85 | |||
86 | if argv is None: |
|
86 | if argv is None: | |
87 | argv = sys.argv |
|
87 | argv = sys.argv | |
88 |
|
88 | |||
89 | # __IP is the main global that lives throughout and represents the whole |
|
89 | # __IP is the main global that lives throughout and represents the whole | |
90 | # application. If the user redefines it, all bets are off as to what |
|
90 | # application. If the user redefines it, all bets are off as to what | |
91 | # happens. |
|
91 | # happens. | |
92 |
|
92 | |||
93 | # __IP is the name of he global which the caller will have accessible as |
|
93 | # __IP is the name of he global which the caller will have accessible as | |
94 | # __IP.name. We set its name via the first parameter passed to |
|
94 | # __IP.name. We set its name via the first parameter passed to | |
95 | # InteractiveShell: |
|
95 | # InteractiveShell: | |
96 |
|
96 | |||
97 | IP = shell_class('__IP',user_ns=user_ns,user_global_ns=user_global_ns, |
|
97 | IP = shell_class('__IP',user_ns=user_ns,user_global_ns=user_global_ns, | |
98 | embedded=embedded,**kw) |
|
98 | embedded=embedded,**kw) | |
99 |
|
99 | |||
100 | # Put 'help' in the user namespace |
|
100 | # Put 'help' in the user namespace | |
101 | try: |
|
101 | try: | |
102 | from site import _Helper |
|
102 | from site import _Helper | |
103 | IP.user_ns['help'] = _Helper() |
|
103 | IP.user_ns['help'] = _Helper() | |
104 | except ImportError: |
|
104 | except ImportError: | |
105 | warn('help() not available - check site.py') |
|
105 | warn('help() not available - check site.py') | |
106 |
|
106 | |||
107 | if DEVDEBUG: |
|
107 | if DEVDEBUG: | |
108 | # For developer debugging only (global flag) |
|
108 | # For developer debugging only (global flag) | |
109 | from IPython import ultraTB |
|
109 | from IPython import ultraTB | |
110 | sys.excepthook = ultraTB.VerboseTB(call_pdb=1) |
|
110 | sys.excepthook = ultraTB.VerboseTB(call_pdb=1) | |
111 |
|
111 | |||
112 | IP.BANNER_PARTS = ['Python %s\n' |
|
112 | IP.BANNER_PARTS = ['Python %s\n' | |
113 | 'Type "copyright", "credits" or "license" ' |
|
113 | 'Type "copyright", "credits" or "license" ' | |
114 | 'for more information.\n' |
|
114 | 'for more information.\n' | |
115 | % (sys.version.split('\n')[0],), |
|
115 | % (sys.version.split('\n')[0],), | |
116 | "IPython %s -- An enhanced Interactive Python." |
|
116 | "IPython %s -- An enhanced Interactive Python." | |
117 | % (Release.version,), |
|
117 | % (Release.version,), | |
118 | """\ |
|
118 | """\ | |
119 | ? -> Introduction and overview of IPython's features. |
|
119 | ? -> Introduction and overview of IPython's features. | |
120 | %quickref -> Quick reference. |
|
120 | %quickref -> Quick reference. | |
121 | help -> Python's own help system. |
|
121 | help -> Python's own help system. | |
122 | object? -> Details about 'object'. ?object also works, ?? prints more. |
|
122 | object? -> Details about 'object'. ?object also works, ?? prints more. | |
123 | """ ] |
|
123 | """ ] | |
124 |
|
124 | |||
125 | IP.usage = interactive_usage |
|
125 | IP.usage = interactive_usage | |
126 |
|
126 | |||
127 | # Platform-dependent suffix. |
|
127 | # Platform-dependent suffix. | |
128 | if os.name == 'posix': |
|
128 | if os.name == 'posix': | |
129 | rc_suffix = '' |
|
129 | rc_suffix = '' | |
130 | else: |
|
130 | else: | |
131 | rc_suffix = '.ini' |
|
131 | rc_suffix = '.ini' | |
132 |
|
132 | |||
133 | # default directory for configuration |
|
133 | # default directory for configuration | |
134 | ipythondir_def = get_ipython_dir() |
|
134 | ipythondir_def = get_ipython_dir() | |
135 |
|
135 | |||
136 | sys.path.insert(0, '') # add . to sys.path. Fix from Prabhu Ramachandran |
|
136 | sys.path.insert(0, '') # add . to sys.path. Fix from Prabhu Ramachandran | |
137 |
|
137 | |||
138 | # we need the directory where IPython itself is installed |
|
138 | # we need the directory where IPython itself is installed | |
139 | import IPython |
|
139 | import IPython | |
140 | IPython_dir = os.path.dirname(IPython.__file__) |
|
140 | IPython_dir = os.path.dirname(IPython.__file__) | |
141 | del IPython |
|
141 | del IPython | |
142 |
|
142 | |||
143 | #------------------------------------------------------------------------- |
|
143 | #------------------------------------------------------------------------- | |
144 | # Command line handling |
|
144 | # Command line handling | |
145 |
|
145 | |||
146 | # Valid command line options (uses DPyGetOpt syntax, like Perl's |
|
146 | # Valid command line options (uses DPyGetOpt syntax, like Perl's | |
147 | # GetOpt::Long) |
|
147 | # GetOpt::Long) | |
148 |
|
148 | |||
149 | # Any key not listed here gets deleted even if in the file (like session |
|
149 | # Any key not listed here gets deleted even if in the file (like session | |
150 | # or profile). That's deliberate, to maintain the rc namespace clean. |
|
150 | # or profile). That's deliberate, to maintain the rc namespace clean. | |
151 |
|
151 | |||
152 | # Each set of options appears twice: under _conv only the names are |
|
152 | # Each set of options appears twice: under _conv only the names are | |
153 | # listed, indicating which type they must be converted to when reading the |
|
153 | # listed, indicating which type they must be converted to when reading the | |
154 | # ipythonrc file. And under DPyGetOpt they are listed with the regular |
|
154 | # ipythonrc file. And under DPyGetOpt they are listed with the regular | |
155 | # DPyGetOpt syntax (=s,=i,:f,etc). |
|
155 | # DPyGetOpt syntax (=s,=i,:f,etc). | |
156 |
|
156 | |||
157 | # Make sure there's a space before each end of line (they get auto-joined!) |
|
157 | # Make sure there's a space before each end of line (they get auto-joined!) | |
158 | cmdline_opts = ('autocall=i autoindent! automagic! banner! cache_size|cs=i ' |
|
158 | cmdline_opts = ('autocall=i autoindent! automagic! banner! cache_size|cs=i ' | |
159 | 'c=s classic|cl color_info! colors=s confirm_exit! ' |
|
159 | 'c=s classic|cl color_info! colors=s confirm_exit! ' | |
160 | 'debug! deep_reload! editor=s log|l messages! nosep ' |
|
160 | 'debug! deep_reload! editor=s log|l messages! nosep ' | |
161 | 'object_info_string_level=i pdb! ' |
|
161 | 'object_info_string_level=i pdb! ' | |
162 | 'pprint! prompt_in1|pi1=s prompt_in2|pi2=s prompt_out|po=s ' |
|
162 | 'pprint! prompt_in1|pi1=s prompt_in2|pi2=s prompt_out|po=s ' | |
163 | 'pydb! ' |
|
163 | 'pydb! ' | |
164 | 'pylab_import_all! ' |
|
164 | 'pylab_import_all! ' | |
165 | 'quick screen_length|sl=i prompts_pad_left=i ' |
|
165 | 'quick screen_length|sl=i prompts_pad_left=i ' | |
166 | 'logfile|lf=s logplay|lp=s profile|p=s ' |
|
166 | 'logfile|lf=s logplay|lp=s profile|p=s ' | |
167 | 'readline! readline_merge_completions! ' |
|
167 | 'readline! readline_merge_completions! ' | |
168 | 'readline_omit__names! ' |
|
168 | 'readline_omit__names! ' | |
169 | 'rcfile=s separate_in|si=s separate_out|so=s ' |
|
169 | 'rcfile=s separate_in|si=s separate_out|so=s ' | |
170 | 'separate_out2|so2=s xmode=s wildcards_case_sensitive! ' |
|
170 | 'separate_out2|so2=s xmode=s wildcards_case_sensitive! ' | |
171 | 'magic_docstrings system_verbose! ' |
|
171 | 'magic_docstrings system_verbose! ' | |
172 | 'multi_line_specials! ' |
|
172 | 'multi_line_specials! ' | |
173 | 'term_title! wxversion=s ' |
|
173 | 'term_title! wxversion=s ' | |
174 | 'autoedit_syntax!') |
|
174 | 'autoedit_syntax!') | |
175 |
|
175 | |||
176 | # Options that can *only* appear at the cmd line (not in rcfiles). |
|
176 | # Options that can *only* appear at the cmd line (not in rcfiles). | |
177 |
|
177 | |||
178 | cmdline_only = ('help interact|i ipythondir=s Version upgrade ' |
|
178 | cmdline_only = ('help interact|i ipythondir=s Version upgrade ' | |
179 | 'gthread! qthread! q4thread! wthread! tkthread! pylab! tk! ' |
|
179 | 'gthread! qthread! q4thread! wthread! tkthread! pylab! tk! ' | |
180 | # 'twisted!' # disabled for now. |
|
180 | # 'twisted!' # disabled for now. | |
181 | ) |
|
181 | ) | |
182 |
|
182 | |||
183 | # Build the actual name list to be used by DPyGetOpt |
|
183 | # Build the actual name list to be used by DPyGetOpt | |
184 | opts_names = qw(cmdline_opts) + qw(cmdline_only) |
|
184 | opts_names = qw(cmdline_opts) + qw(cmdline_only) | |
185 |
|
185 | |||
186 | # Set sensible command line defaults. |
|
186 | # Set sensible command line defaults. | |
187 | # This should have everything from cmdline_opts and cmdline_only |
|
187 | # This should have everything from cmdline_opts and cmdline_only | |
188 | opts_def = Struct(autocall = 1, |
|
188 | opts_def = Struct(autocall = 1, | |
189 | autoedit_syntax = 0, |
|
189 | autoedit_syntax = 0, | |
190 | autoindent = 0, |
|
190 | autoindent = 0, | |
191 | automagic = 1, |
|
191 | automagic = 1, | |
192 | autoexec = [], |
|
192 | autoexec = [], | |
193 | banner = 1, |
|
193 | banner = 1, | |
194 | c = '', |
|
194 | c = '', | |
195 | cache_size = 1000, |
|
195 | cache_size = 1000, | |
196 | classic = 0, |
|
196 | classic = 0, | |
197 | color_info = 0, |
|
197 | color_info = 0, | |
198 | colors = 'NoColor', |
|
198 | colors = 'NoColor', | |
199 | confirm_exit = 1, |
|
199 | confirm_exit = 1, | |
200 | debug = 0, |
|
200 | debug = 0, | |
201 | deep_reload = 0, |
|
201 | deep_reload = 0, | |
202 | editor = '0', |
|
202 | editor = '0', | |
203 | gthread = 0, |
|
203 | gthread = 0, | |
204 | help = 0, |
|
204 | help = 0, | |
205 | interact = 0, |
|
205 | interact = 0, | |
206 | ipythondir = ipythondir_def, |
|
206 | ipythondir = ipythondir_def, | |
207 | log = 0, |
|
207 | log = 0, | |
208 | logfile = '', |
|
208 | logfile = '', | |
209 | logplay = '', |
|
209 | logplay = '', | |
210 | messages = 1, |
|
210 | messages = 1, | |
211 | multi_line_specials = 1, |
|
211 | multi_line_specials = 1, | |
212 | nosep = 0, |
|
212 | nosep = 0, | |
213 | object_info_string_level = 0, |
|
213 | object_info_string_level = 0, | |
214 | pdb = 0, |
|
214 | pdb = 0, | |
215 | pprint = 0, |
|
215 | pprint = 0, | |
216 | profile = '', |
|
216 | profile = '', | |
217 | prompt_in1 = 'In [\\#]: ', |
|
217 | prompt_in1 = 'In [\\#]: ', | |
218 | prompt_in2 = ' .\\D.: ', |
|
218 | prompt_in2 = ' .\\D.: ', | |
219 | prompt_out = 'Out[\\#]: ', |
|
219 | prompt_out = 'Out[\\#]: ', | |
220 | prompts_pad_left = 1, |
|
220 | prompts_pad_left = 1, | |
221 | pydb = 0, |
|
221 | pydb = 0, | |
222 | pylab = 0, |
|
222 | pylab = 0, | |
223 | pylab_import_all = 1, |
|
223 | pylab_import_all = 1, | |
224 | q4thread = 0, |
|
224 | q4thread = 0, | |
225 | qthread = 0, |
|
225 | qthread = 0, | |
226 | quick = 0, |
|
226 | quick = 0, | |
227 | quiet = 0, |
|
227 | quiet = 0, | |
228 | rcfile = 'ipythonrc' + rc_suffix, |
|
228 | rcfile = 'ipythonrc' + rc_suffix, | |
229 | readline = 1, |
|
229 | readline = 1, | |
230 | readline_merge_completions = 1, |
|
230 | readline_merge_completions = 1, | |
231 | readline_omit__names = 0, |
|
231 | readline_omit__names = 0, | |
232 | screen_length = 0, |
|
232 | screen_length = 0, | |
233 | separate_in = '\n', |
|
233 | separate_in = '\n', | |
234 | separate_out = '\n', |
|
234 | separate_out = '\n', | |
235 | separate_out2 = '', |
|
235 | separate_out2 = '', | |
236 | system_header = 'IPython system call: ', |
|
236 | system_header = 'IPython system call: ', | |
237 | system_verbose = 0, |
|
237 | system_verbose = 0, | |
238 | term_title = 1, |
|
238 | term_title = 1, | |
239 | tk = 0, |
|
239 | tk = 0, | |
240 | #twisted= 0, # disabled for now |
|
240 | #twisted= 0, # disabled for now | |
241 | upgrade = 0, |
|
241 | upgrade = 0, | |
242 | Version = 0, |
|
242 | Version = 0, | |
243 | wildcards_case_sensitive = 1, |
|
243 | wildcards_case_sensitive = 1, | |
244 | wthread = 0, |
|
244 | wthread = 0, | |
245 | wxversion = '0', |
|
245 | wxversion = '0', | |
246 | xmode = 'Context', |
|
246 | xmode = 'Context', | |
247 | magic_docstrings = 0, # undocumented, for doc generation |
|
247 | magic_docstrings = 0, # undocumented, for doc generation | |
248 | ) |
|
248 | ) | |
249 |
|
249 | |||
250 | # Things that will *only* appear in rcfiles (not at the command line). |
|
250 | # Things that will *only* appear in rcfiles (not at the command line). | |
251 | # Make sure there's a space before each end of line (they get auto-joined!) |
|
251 | # Make sure there's a space before each end of line (they get auto-joined!) | |
252 | rcfile_opts = { qwflat: 'include import_mod import_all execfile ', |
|
252 | rcfile_opts = { qwflat: 'include import_mod import_all execfile ', | |
253 | qw_lol: 'import_some ', |
|
253 | qw_lol: 'import_some ', | |
254 | # for things with embedded whitespace: |
|
254 | # for things with embedded whitespace: | |
255 | list_strings:'execute alias readline_parse_and_bind ', |
|
255 | list_strings:'execute alias readline_parse_and_bind ', | |
256 | # Regular strings need no conversion: |
|
256 | # Regular strings need no conversion: | |
257 | None:'readline_remove_delims ', |
|
257 | None:'readline_remove_delims ', | |
258 | } |
|
258 | } | |
259 | # Default values for these |
|
259 | # Default values for these | |
260 | rc_def = Struct(include = [], |
|
260 | rc_def = Struct(include = [], | |
261 | import_mod = [], |
|
261 | import_mod = [], | |
262 | import_all = [], |
|
262 | import_all = [], | |
263 | import_some = [[]], |
|
263 | import_some = [[]], | |
264 | execute = [], |
|
264 | execute = [], | |
265 | execfile = [], |
|
265 | execfile = [], | |
266 | alias = [], |
|
266 | alias = [], | |
267 | readline_parse_and_bind = [], |
|
267 | readline_parse_and_bind = [], | |
268 | readline_remove_delims = '', |
|
268 | readline_remove_delims = '', | |
269 | ) |
|
269 | ) | |
270 |
|
270 | |||
271 | # Build the type conversion dictionary from the above tables: |
|
271 | # Build the type conversion dictionary from the above tables: | |
272 | typeconv = rcfile_opts.copy() |
|
272 | typeconv = rcfile_opts.copy() | |
273 | typeconv.update(optstr2types(cmdline_opts)) |
|
273 | typeconv.update(optstr2types(cmdline_opts)) | |
274 |
|
274 | |||
275 | # FIXME: the None key appears in both, put that back together by hand. Ugly! |
|
275 | # FIXME: the None key appears in both, put that back together by hand. Ugly! | |
276 | typeconv[None] += ' ' + rcfile_opts[None] |
|
276 | typeconv[None] += ' ' + rcfile_opts[None] | |
277 |
|
277 | |||
278 | # Remove quotes at ends of all strings (used to protect spaces) |
|
278 | # Remove quotes at ends of all strings (used to protect spaces) | |
279 | typeconv[unquote_ends] = typeconv[None] |
|
279 | typeconv[unquote_ends] = typeconv[None] | |
280 | del typeconv[None] |
|
280 | del typeconv[None] | |
281 |
|
281 | |||
282 | # Build the list we'll use to make all config decisions with defaults: |
|
282 | # Build the list we'll use to make all config decisions with defaults: | |
283 | opts_all = opts_def.copy() |
|
283 | opts_all = opts_def.copy() | |
284 | opts_all.update(rc_def) |
|
284 | opts_all.update(rc_def) | |
285 |
|
285 | |||
286 | # Build conflict resolver for recursive loading of config files: |
|
286 | # Build conflict resolver for recursive loading of config files: | |
287 | # - preserve means the outermost file maintains the value, it is not |
|
287 | # - preserve means the outermost file maintains the value, it is not | |
288 | # overwritten if an included file has the same key. |
|
288 | # overwritten if an included file has the same key. | |
289 | # - add_flip applies + to the two values, so it better make sense to add |
|
289 | # - add_flip applies + to the two values, so it better make sense to add | |
290 | # those types of keys. But it flips them first so that things loaded |
|
290 | # those types of keys. But it flips them first so that things loaded | |
291 | # deeper in the inclusion chain have lower precedence. |
|
291 | # deeper in the inclusion chain have lower precedence. | |
292 | conflict = {'preserve': ' '.join([ typeconv[int], |
|
292 | conflict = {'preserve': ' '.join([ typeconv[int], | |
293 | typeconv[unquote_ends] ]), |
|
293 | typeconv[unquote_ends] ]), | |
294 | 'add_flip': ' '.join([ typeconv[qwflat], |
|
294 | 'add_flip': ' '.join([ typeconv[qwflat], | |
295 | typeconv[qw_lol], |
|
295 | typeconv[qw_lol], | |
296 | typeconv[list_strings] ]) |
|
296 | typeconv[list_strings] ]) | |
297 | } |
|
297 | } | |
298 |
|
298 | |||
299 | # Now actually process the command line |
|
299 | # Now actually process the command line | |
300 | getopt = DPyGetOpt.DPyGetOpt() |
|
300 | getopt = DPyGetOpt.DPyGetOpt() | |
301 | getopt.setIgnoreCase(0) |
|
301 | getopt.setIgnoreCase(0) | |
302 |
|
302 | |||
303 | getopt.parseConfiguration(opts_names) |
|
303 | getopt.parseConfiguration(opts_names) | |
304 |
|
304 | |||
305 | try: |
|
305 | try: | |
306 | getopt.processArguments(argv) |
|
306 | getopt.processArguments(argv) | |
307 | except DPyGetOpt.ArgumentError, exc: |
|
307 | except DPyGetOpt.ArgumentError, exc: | |
308 | print cmd_line_usage |
|
308 | print cmd_line_usage | |
309 | warn('\nError in Arguments: "%s"' % exc) |
|
309 | warn('\nError in Arguments: "%s"' % exc) | |
310 | sys.exit(1) |
|
310 | sys.exit(1) | |
311 |
|
311 | |||
312 | # convert the options dict to a struct for much lighter syntax later |
|
312 | # convert the options dict to a struct for much lighter syntax later | |
313 | opts = Struct(getopt.optionValues) |
|
313 | opts = Struct(getopt.optionValues) | |
314 | args = getopt.freeValues |
|
314 | args = getopt.freeValues | |
315 |
|
315 | |||
316 | # this is the struct (which has default values at this point) with which |
|
316 | # this is the struct (which has default values at this point) with which | |
317 | # we make all decisions: |
|
317 | # we make all decisions: | |
318 | opts_all.update(opts) |
|
318 | opts_all.update(opts) | |
319 |
|
319 | |||
320 | # Options that force an immediate exit |
|
320 | # Options that force an immediate exit | |
321 | if opts_all.help: |
|
321 | if opts_all.help: | |
322 | page(cmd_line_usage) |
|
322 | page(cmd_line_usage) | |
323 | sys.exit() |
|
323 | sys.exit() | |
324 |
|
324 | |||
325 | if opts_all.Version: |
|
325 | if opts_all.Version: | |
326 | print Release.version |
|
326 | print Release.version | |
327 | sys.exit() |
|
327 | sys.exit() | |
328 |
|
328 | |||
329 | if opts_all.magic_docstrings: |
|
329 | if opts_all.magic_docstrings: | |
330 | IP.magic_magic('-latex') |
|
330 | IP.magic_magic('-latex') | |
331 | sys.exit() |
|
331 | sys.exit() | |
332 |
|
332 | |||
333 | # add personal ipythondir to sys.path so that users can put things in |
|
333 | # add personal ipythondir to sys.path so that users can put things in | |
334 | # there for customization |
|
334 | # there for customization | |
335 | sys.path.append(os.path.abspath(opts_all.ipythondir)) |
|
335 | sys.path.append(os.path.abspath(opts_all.ipythondir)) | |
336 |
|
336 | |||
337 | # Create user config directory if it doesn't exist. This must be done |
|
337 | # Create user config directory if it doesn't exist. This must be done | |
338 | # *after* getting the cmd line options. |
|
338 | # *after* getting the cmd line options. | |
339 | if not os.path.isdir(opts_all.ipythondir): |
|
339 | if not os.path.isdir(opts_all.ipythondir): | |
340 | IP.user_setup(opts_all.ipythondir,rc_suffix,'install') |
|
340 | IP.user_setup(opts_all.ipythondir,rc_suffix,'install') | |
341 |
|
341 | |||
342 | # upgrade user config files while preserving a copy of the originals |
|
342 | # upgrade user config files while preserving a copy of the originals | |
343 | if opts_all.upgrade: |
|
343 | if opts_all.upgrade: | |
344 | IP.user_setup(opts_all.ipythondir,rc_suffix,'upgrade') |
|
344 | IP.user_setup(opts_all.ipythondir,rc_suffix,'upgrade') | |
345 |
|
345 | |||
346 | # check mutually exclusive options in the *original* command line |
|
346 | # check mutually exclusive options in the *original* command line | |
347 | mutex_opts(opts,[qw('log logfile'),qw('rcfile profile'), |
|
347 | mutex_opts(opts,[qw('log logfile'),qw('rcfile profile'), | |
348 | qw('classic profile'),qw('classic rcfile')]) |
|
348 | qw('classic profile'),qw('classic rcfile')]) | |
349 |
|
349 | |||
350 | #--------------------------------------------------------------------------- |
|
350 | #--------------------------------------------------------------------------- | |
351 | # Log replay |
|
351 | # Log replay | |
352 |
|
352 | |||
353 | # if -logplay, we need to 'become' the other session. That basically means |
|
353 | # if -logplay, we need to 'become' the other session. That basically means | |
354 | # replacing the current command line environment with that of the old |
|
354 | # replacing the current command line environment with that of the old | |
355 | # session and moving on. |
|
355 | # session and moving on. | |
356 |
|
356 | |||
357 | # this is needed so that later we know we're in session reload mode, as |
|
357 | # this is needed so that later we know we're in session reload mode, as | |
358 | # opts_all will get overwritten: |
|
358 | # opts_all will get overwritten: | |
359 | load_logplay = 0 |
|
359 | load_logplay = 0 | |
360 |
|
360 | |||
361 | if opts_all.logplay: |
|
361 | if opts_all.logplay: | |
362 | load_logplay = opts_all.logplay |
|
362 | load_logplay = opts_all.logplay | |
363 | opts_debug_save = opts_all.debug |
|
363 | opts_debug_save = opts_all.debug | |
364 | try: |
|
364 | try: | |
365 | logplay = open(opts_all.logplay) |
|
365 | logplay = open(opts_all.logplay) | |
366 | except IOError: |
|
366 | except IOError: | |
367 | if opts_all.debug: IP.InteractiveTB() |
|
367 | if opts_all.debug: IP.InteractiveTB() | |
368 | warn('Could not open logplay file '+`opts_all.logplay`) |
|
368 | warn('Could not open logplay file '+`opts_all.logplay`) | |
369 | # restore state as if nothing had happened and move on, but make |
|
369 | # restore state as if nothing had happened and move on, but make | |
370 | # sure that later we don't try to actually load the session file |
|
370 | # sure that later we don't try to actually load the session file | |
371 | logplay = None |
|
371 | logplay = None | |
372 | load_logplay = 0 |
|
372 | load_logplay = 0 | |
373 | del opts_all.logplay |
|
373 | del opts_all.logplay | |
374 | else: |
|
374 | else: | |
375 | try: |
|
375 | try: | |
376 | logplay.readline() |
|
376 | logplay.readline() | |
377 | logplay.readline(); |
|
377 | logplay.readline(); | |
378 | # this reloads that session's command line |
|
378 | # this reloads that session's command line | |
379 | cmd = logplay.readline()[6:] |
|
379 | cmd = logplay.readline()[6:] | |
380 | exec cmd |
|
380 | exec cmd | |
381 | # restore the true debug flag given so that the process of |
|
381 | # restore the true debug flag given so that the process of | |
382 | # session loading itself can be monitored. |
|
382 | # session loading itself can be monitored. | |
383 | opts.debug = opts_debug_save |
|
383 | opts.debug = opts_debug_save | |
384 | # save the logplay flag so later we don't overwrite the log |
|
384 | # save the logplay flag so later we don't overwrite the log | |
385 | opts.logplay = load_logplay |
|
385 | opts.logplay = load_logplay | |
386 | # now we must update our own structure with defaults |
|
386 | # now we must update our own structure with defaults | |
387 | opts_all.update(opts) |
|
387 | opts_all.update(opts) | |
388 | # now load args |
|
388 | # now load args | |
389 | cmd = logplay.readline()[6:] |
|
389 | cmd = logplay.readline()[6:] | |
390 | exec cmd |
|
390 | exec cmd | |
391 | logplay.close() |
|
391 | logplay.close() | |
392 | except: |
|
392 | except: | |
393 | logplay.close() |
|
393 | logplay.close() | |
394 | if opts_all.debug: IP.InteractiveTB() |
|
394 | if opts_all.debug: IP.InteractiveTB() | |
395 | warn("Logplay file lacking full configuration information.\n" |
|
395 | warn("Logplay file lacking full configuration information.\n" | |
396 | "I'll try to read it, but some things may not work.") |
|
396 | "I'll try to read it, but some things may not work.") | |
397 |
|
397 | |||
398 | #------------------------------------------------------------------------- |
|
398 | #------------------------------------------------------------------------- | |
399 | # set up output traps: catch all output from files, being run, modules |
|
399 | # set up output traps: catch all output from files, being run, modules | |
400 | # loaded, etc. Then give it to the user in a clean form at the end. |
|
400 | # loaded, etc. Then give it to the user in a clean form at the end. | |
401 |
|
401 | |||
402 | msg_out = 'Output messages. ' |
|
402 | msg_out = 'Output messages. ' | |
403 | msg_err = 'Error messages. ' |
|
403 | msg_err = 'Error messages. ' | |
404 | msg_sep = '\n' |
|
404 | msg_sep = '\n' | |
405 | msg = Struct(config = OutputTrap('Configuration Loader',msg_out, |
|
405 | msg = Struct(config = OutputTrap('Configuration Loader',msg_out, | |
406 | msg_err,msg_sep,debug, |
|
406 | msg_err,msg_sep,debug, | |
407 | quiet_out=1), |
|
407 | quiet_out=1), | |
408 | user_exec = OutputTrap('User File Execution',msg_out, |
|
408 | user_exec = OutputTrap('User File Execution',msg_out, | |
409 | msg_err,msg_sep,debug), |
|
409 | msg_err,msg_sep,debug), | |
410 | logplay = OutputTrap('Log Loader',msg_out, |
|
410 | logplay = OutputTrap('Log Loader',msg_out, | |
411 | msg_err,msg_sep,debug), |
|
411 | msg_err,msg_sep,debug), | |
412 | summary = '' |
|
412 | summary = '' | |
413 | ) |
|
413 | ) | |
414 |
|
414 | |||
415 | #------------------------------------------------------------------------- |
|
415 | #------------------------------------------------------------------------- | |
416 | # Process user ipythonrc-type configuration files |
|
416 | # Process user ipythonrc-type configuration files | |
417 |
|
417 | |||
418 | # turn on output trapping and log to msg.config |
|
418 | # turn on output trapping and log to msg.config | |
419 | # remember that with debug on, trapping is actually disabled |
|
419 | # remember that with debug on, trapping is actually disabled | |
420 | msg.config.trap_all() |
|
420 | msg.config.trap_all() | |
421 |
|
421 | |||
422 | # look for rcfile in current or default directory |
|
422 | # look for rcfile in current or default directory | |
423 | try: |
|
423 | try: | |
424 | opts_all.rcfile = filefind(opts_all.rcfile,opts_all.ipythondir) |
|
424 | opts_all.rcfile = filefind(opts_all.rcfile,opts_all.ipythondir) | |
425 | except IOError: |
|
425 | except IOError: | |
426 | if opts_all.debug: IP.InteractiveTB() |
|
426 | if opts_all.debug: IP.InteractiveTB() | |
427 | warn('Configuration file %s not found. Ignoring request.' |
|
427 | warn('Configuration file %s not found. Ignoring request.' | |
428 | % (opts_all.rcfile) ) |
|
428 | % (opts_all.rcfile) ) | |
429 |
|
429 | |||
430 | # 'profiles' are a shorthand notation for config filenames |
|
430 | # 'profiles' are a shorthand notation for config filenames | |
431 | profile_handled_by_legacy = False |
|
431 | profile_handled_by_legacy = False | |
432 | if opts_all.profile: |
|
432 | if opts_all.profile: | |
433 |
|
433 | |||
434 | try: |
|
434 | try: | |
435 | opts_all.rcfile = filefind('ipythonrc-' + opts_all.profile |
|
435 | opts_all.rcfile = filefind('ipythonrc-' + opts_all.profile | |
436 | + rc_suffix, |
|
436 | + rc_suffix, | |
437 | opts_all.ipythondir) |
|
437 | opts_all.ipythondir) | |
438 | profile_handled_by_legacy = True |
|
438 | profile_handled_by_legacy = True | |
439 | except IOError: |
|
439 | except IOError: | |
440 | if opts_all.debug: IP.InteractiveTB() |
|
440 | if opts_all.debug: IP.InteractiveTB() | |
441 | opts.profile = '' # remove profile from options if invalid |
|
441 | opts.profile = '' # remove profile from options if invalid | |
442 | # We won't warn anymore, primary method is ipy_profile_PROFNAME |
|
442 | # We won't warn anymore, primary method is ipy_profile_PROFNAME | |
443 | # which does trigger a warning. |
|
443 | # which does trigger a warning. | |
444 |
|
444 | |||
445 | # load the config file |
|
445 | # load the config file | |
446 | rcfiledata = None |
|
446 | rcfiledata = None | |
447 | if opts_all.quick: |
|
447 | if opts_all.quick: | |
448 | print 'Launching IPython in quick mode. No config file read.' |
|
448 | print 'Launching IPython in quick mode. No config file read.' | |
449 | elif opts_all.rcfile: |
|
449 | elif opts_all.rcfile: | |
450 | try: |
|
450 | try: | |
451 | cfg_loader = ConfigLoader(conflict) |
|
451 | cfg_loader = ConfigLoader(conflict) | |
452 | rcfiledata = cfg_loader.load(opts_all.rcfile,typeconv, |
|
452 | rcfiledata = cfg_loader.load(opts_all.rcfile,typeconv, | |
453 | 'include',opts_all.ipythondir, |
|
453 | 'include',opts_all.ipythondir, | |
454 | purge = 1, |
|
454 | purge = 1, | |
455 | unique = conflict['preserve']) |
|
455 | unique = conflict['preserve']) | |
456 | except: |
|
456 | except: | |
457 | IP.InteractiveTB() |
|
457 | IP.InteractiveTB() | |
458 | warn('Problems loading configuration file '+ |
|
458 | warn('Problems loading configuration file '+ | |
459 | `opts_all.rcfile`+ |
|
459 | `opts_all.rcfile`+ | |
460 | '\nStarting with default -bare bones- configuration.') |
|
460 | '\nStarting with default -bare bones- configuration.') | |
461 | else: |
|
461 | else: | |
462 | warn('No valid configuration file found in either currrent directory\n'+ |
|
462 | warn('No valid configuration file found in either currrent directory\n'+ | |
463 | 'or in the IPython config. directory: '+`opts_all.ipythondir`+ |
|
463 | 'or in the IPython config. directory: '+`opts_all.ipythondir`+ | |
464 | '\nProceeding with internal defaults.') |
|
464 | '\nProceeding with internal defaults.') | |
465 |
|
465 | |||
466 | #------------------------------------------------------------------------ |
|
466 | #------------------------------------------------------------------------ | |
467 | # Set exception handlers in mode requested by user. |
|
467 | # Set exception handlers in mode requested by user. | |
468 | otrap = OutputTrap(trap_out=1) # trap messages from magic_xmode |
|
468 | otrap = OutputTrap(trap_out=1) # trap messages from magic_xmode | |
469 | IP.magic_xmode(opts_all.xmode) |
|
469 | IP.magic_xmode(opts_all.xmode) | |
470 | otrap.release_out() |
|
470 | otrap.release_out() | |
471 |
|
471 | |||
472 | #------------------------------------------------------------------------ |
|
472 | #------------------------------------------------------------------------ | |
473 | # Execute user config |
|
473 | # Execute user config | |
474 |
|
474 | |||
475 | # Create a valid config structure with the right precedence order: |
|
475 | # Create a valid config structure with the right precedence order: | |
476 | # defaults < rcfile < command line. This needs to be in the instance, so |
|
476 | # defaults < rcfile < command line. This needs to be in the instance, so | |
477 | # that method calls below that rely on it find it. |
|
477 | # that method calls below that rely on it find it. | |
478 | IP.rc = rc_def.copy() |
|
478 | IP.rc = rc_def.copy() | |
479 |
|
479 | |||
480 | # Work with a local alias inside this routine to avoid unnecessary |
|
480 | # Work with a local alias inside this routine to avoid unnecessary | |
481 | # attribute lookups. |
|
481 | # attribute lookups. | |
482 | IP_rc = IP.rc |
|
482 | IP_rc = IP.rc | |
483 |
|
483 | |||
484 | IP_rc.update(opts_def) |
|
484 | IP_rc.update(opts_def) | |
485 | if rcfiledata: |
|
485 | if rcfiledata: | |
486 | # now we can update |
|
486 | # now we can update | |
487 | IP_rc.update(rcfiledata) |
|
487 | IP_rc.update(rcfiledata) | |
488 | IP_rc.update(opts) |
|
488 | IP_rc.update(opts) | |
489 | IP_rc.update(rc_override) |
|
489 | IP_rc.update(rc_override) | |
490 |
|
490 | |||
491 | # Store the original cmd line for reference: |
|
491 | # Store the original cmd line for reference: | |
492 | IP_rc.opts = opts |
|
492 | IP_rc.opts = opts | |
493 | IP_rc.args = args |
|
493 | IP_rc.args = args | |
494 |
|
494 | |||
495 | # create a *runtime* Struct like rc for holding parameters which may be |
|
495 | # create a *runtime* Struct like rc for holding parameters which may be | |
496 | # created and/or modified by runtime user extensions. |
|
496 | # created and/or modified by runtime user extensions. | |
497 | IP.runtime_rc = Struct() |
|
497 | IP.runtime_rc = Struct() | |
498 |
|
498 | |||
499 | # from this point on, all config should be handled through IP_rc, |
|
499 | # from this point on, all config should be handled through IP_rc, | |
500 | # opts* shouldn't be used anymore. |
|
500 | # opts* shouldn't be used anymore. | |
501 |
|
501 | |||
502 |
|
502 | |||
503 | # update IP_rc with some special things that need manual |
|
503 | # update IP_rc with some special things that need manual | |
504 | # tweaks. Basically options which affect other options. I guess this |
|
504 | # tweaks. Basically options which affect other options. I guess this | |
505 | # should just be written so that options are fully orthogonal and we |
|
505 | # should just be written so that options are fully orthogonal and we | |
506 | # wouldn't worry about this stuff! |
|
506 | # wouldn't worry about this stuff! | |
507 |
|
507 | |||
508 | if IP_rc.classic: |
|
508 | if IP_rc.classic: | |
509 | IP_rc.quick = 1 |
|
509 | IP_rc.quick = 1 | |
510 | IP_rc.cache_size = 0 |
|
510 | IP_rc.cache_size = 0 | |
511 | IP_rc.pprint = 0 |
|
511 | IP_rc.pprint = 0 | |
512 | IP_rc.prompt_in1 = '>>> ' |
|
512 | IP_rc.prompt_in1 = '>>> ' | |
513 | IP_rc.prompt_in2 = '... ' |
|
513 | IP_rc.prompt_in2 = '... ' | |
514 | IP_rc.prompt_out = '' |
|
514 | IP_rc.prompt_out = '' | |
515 | IP_rc.separate_in = IP_rc.separate_out = IP_rc.separate_out2 = '0' |
|
515 | IP_rc.separate_in = IP_rc.separate_out = IP_rc.separate_out2 = '0' | |
516 | IP_rc.colors = 'NoColor' |
|
516 | IP_rc.colors = 'NoColor' | |
517 | IP_rc.xmode = 'Plain' |
|
517 | IP_rc.xmode = 'Plain' | |
518 |
|
518 | |||
519 | IP.pre_config_initialization() |
|
519 | IP.pre_config_initialization() | |
520 | # configure readline |
|
520 | # configure readline | |
521 |
|
521 | |||
522 | # update exception handlers with rc file status |
|
522 | # update exception handlers with rc file status | |
523 | otrap.trap_out() # I don't want these messages ever. |
|
523 | otrap.trap_out() # I don't want these messages ever. | |
524 | IP.magic_xmode(IP_rc.xmode) |
|
524 | IP.magic_xmode(IP_rc.xmode) | |
525 | otrap.release_out() |
|
525 | otrap.release_out() | |
526 |
|
526 | |||
527 | # activate logging if requested and not reloading a log |
|
527 | # activate logging if requested and not reloading a log | |
528 | if IP_rc.logplay: |
|
528 | if IP_rc.logplay: | |
529 | IP.magic_logstart(IP_rc.logplay + ' append') |
|
529 | IP.magic_logstart(IP_rc.logplay + ' append') | |
530 | elif IP_rc.logfile: |
|
530 | elif IP_rc.logfile: | |
531 | IP.magic_logstart(IP_rc.logfile) |
|
531 | IP.magic_logstart(IP_rc.logfile) | |
532 | elif IP_rc.log: |
|
532 | elif IP_rc.log: | |
533 | IP.magic_logstart() |
|
533 | IP.magic_logstart() | |
534 |
|
534 | |||
535 | # find user editor so that it we don't have to look it up constantly |
|
535 | # find user editor so that it we don't have to look it up constantly | |
536 | if IP_rc.editor.strip()=='0': |
|
536 | if IP_rc.editor.strip()=='0': | |
537 | try: |
|
537 | try: | |
538 | ed = os.environ['EDITOR'] |
|
538 | ed = os.environ['EDITOR'] | |
539 | except KeyError: |
|
539 | except KeyError: | |
540 | if os.name == 'posix': |
|
540 | if os.name == 'posix': | |
541 | ed = 'vi' # the only one guaranteed to be there! |
|
541 | ed = 'vi' # the only one guaranteed to be there! | |
542 | else: |
|
542 | else: | |
543 | ed = 'notepad' # same in Windows! |
|
543 | ed = 'notepad' # same in Windows! | |
544 | IP_rc.editor = ed |
|
544 | IP_rc.editor = ed | |
545 |
|
545 | |||
546 | # Keep track of whether this is an embedded instance or not (useful for |
|
546 | # Keep track of whether this is an embedded instance or not (useful for | |
547 | # post-mortems). |
|
547 | # post-mortems). | |
548 | IP_rc.embedded = IP.embedded |
|
548 | IP_rc.embedded = IP.embedded | |
549 |
|
549 | |||
550 | # Recursive reload |
|
550 | # Recursive reload | |
551 | try: |
|
551 | try: | |
552 | from IPython.lib import deepreload |
|
552 | from IPython.lib import deepreload | |
553 | if IP_rc.deep_reload: |
|
553 | if IP_rc.deep_reload: | |
554 | __builtin__.reload = deepreload.reload |
|
554 | __builtin__.reload = deepreload.reload | |
555 | else: |
|
555 | else: | |
556 | __builtin__.dreload = deepreload.reload |
|
556 | __builtin__.dreload = deepreload.reload | |
557 | del deepreload |
|
557 | del deepreload | |
558 | except ImportError: |
|
558 | except ImportError: | |
559 | pass |
|
559 | pass | |
560 |
|
560 | |||
561 | # Save the current state of our namespace so that the interactive shell |
|
561 | # Save the current state of our namespace so that the interactive shell | |
562 | # can later know which variables have been created by us from config files |
|
562 | # can later know which variables have been created by us from config files | |
563 | # and loading. This way, loading a file (in any way) is treated just like |
|
563 | # and loading. This way, loading a file (in any way) is treated just like | |
564 | # defining things on the command line, and %who works as expected. |
|
564 | # defining things on the command line, and %who works as expected. | |
565 |
|
565 | |||
566 | # DON'T do anything that affects the namespace beyond this point! |
|
566 | # DON'T do anything that affects the namespace beyond this point! | |
567 | IP.internal_ns.update(__main__.__dict__) |
|
567 | IP.internal_ns.update(__main__.__dict__) | |
568 |
|
568 | |||
569 | #IP.internal_ns.update(locals()) # so our stuff doesn't show up in %who |
|
569 | #IP.internal_ns.update(locals()) # so our stuff doesn't show up in %who | |
570 |
|
570 | |||
571 | # Now run through the different sections of the users's config |
|
571 | # Now run through the different sections of the users's config | |
572 | if IP_rc.debug: |
|
572 | if IP_rc.debug: | |
573 | print 'Trying to execute the following configuration structure:' |
|
573 | print 'Trying to execute the following configuration structure:' | |
574 | print '(Things listed first are deeper in the inclusion tree and get' |
|
574 | print '(Things listed first are deeper in the inclusion tree and get' | |
575 | print 'loaded first).\n' |
|
575 | print 'loaded first).\n' | |
576 | pprint(IP_rc.__dict__) |
|
576 | pprint(IP_rc.__dict__) | |
577 |
|
577 | |||
578 | for mod in IP_rc.import_mod: |
|
578 | for mod in IP_rc.import_mod: | |
579 | try: |
|
579 | try: | |
580 | exec 'import '+mod in IP.user_ns |
|
580 | exec 'import '+mod in IP.user_ns | |
581 | except : |
|
581 | except : | |
582 | IP.InteractiveTB() |
|
582 | IP.InteractiveTB() | |
583 | import_fail_info(mod) |
|
583 | import_fail_info(mod) | |
584 |
|
584 | |||
585 | for mod_fn in IP_rc.import_some: |
|
585 | for mod_fn in IP_rc.import_some: | |
586 | if not mod_fn == []: |
|
586 | if not mod_fn == []: | |
587 | mod,fn = mod_fn[0],','.join(mod_fn[1:]) |
|
587 | mod,fn = mod_fn[0],','.join(mod_fn[1:]) | |
588 | try: |
|
588 | try: | |
589 | exec 'from '+mod+' import '+fn in IP.user_ns |
|
589 | exec 'from '+mod+' import '+fn in IP.user_ns | |
590 | except : |
|
590 | except : | |
591 | IP.InteractiveTB() |
|
591 | IP.InteractiveTB() | |
592 | import_fail_info(mod,fn) |
|
592 | import_fail_info(mod,fn) | |
593 |
|
593 | |||
594 | for mod in IP_rc.import_all: |
|
594 | for mod in IP_rc.import_all: | |
595 | try: |
|
595 | try: | |
596 | exec 'from '+mod+' import *' in IP.user_ns |
|
596 | exec 'from '+mod+' import *' in IP.user_ns | |
597 | except : |
|
597 | except : | |
598 | IP.InteractiveTB() |
|
598 | IP.InteractiveTB() | |
599 | import_fail_info(mod) |
|
599 | import_fail_info(mod) | |
600 |
|
600 | |||
601 | for code in IP_rc.execute: |
|
601 | for code in IP_rc.execute: | |
602 | try: |
|
602 | try: | |
603 | exec code in IP.user_ns |
|
603 | exec code in IP.user_ns | |
604 | except: |
|
604 | except: | |
605 | IP.InteractiveTB() |
|
605 | IP.InteractiveTB() | |
606 | warn('Failure executing code: ' + `code`) |
|
606 | warn('Failure executing code: ' + `code`) | |
607 |
|
607 | |||
608 | # Execute the files the user wants in ipythonrc |
|
608 | # Execute the files the user wants in ipythonrc | |
609 | for file in IP_rc.execfile: |
|
609 | for file in IP_rc.execfile: | |
610 | try: |
|
610 | try: | |
611 | file = filefind(file,sys.path+[IPython_dir]) |
|
611 | file = filefind(file,sys.path+[IPython_dir]) | |
612 | except IOError: |
|
612 | except IOError: | |
613 | warn(itpl('File $file not found. Skipping it.')) |
|
613 | warn(itpl('File $file not found. Skipping it.')) | |
614 | else: |
|
614 | else: | |
615 | IP.safe_execfile(os.path.expanduser(file),IP.user_ns) |
|
615 | IP.safe_execfile(os.path.expanduser(file),IP.user_ns) | |
616 |
|
616 | |||
617 | # finally, try importing ipy_*_conf for final configuration |
|
617 | # finally, try importing ipy_*_conf for final configuration | |
618 | try: |
|
618 | try: | |
619 | import ipy_system_conf |
|
619 | import ipy_system_conf | |
620 | except ImportError: |
|
620 | except ImportError: | |
621 | if opts_all.debug: IP.InteractiveTB() |
|
621 | if opts_all.debug: IP.InteractiveTB() | |
622 | warn("Could not import 'ipy_system_conf'") |
|
622 | warn("Could not import 'ipy_system_conf'") | |
623 | except: |
|
623 | except: | |
624 | IP.InteractiveTB() |
|
624 | IP.InteractiveTB() | |
625 | import_fail_info('ipy_system_conf') |
|
625 | import_fail_info('ipy_system_conf') | |
626 |
|
626 | |||
627 | # only import prof module if ipythonrc-PROF was not found |
|
627 | # only import prof module if ipythonrc-PROF was not found | |
628 | if opts_all.profile and not profile_handled_by_legacy: |
|
628 | if opts_all.profile and not profile_handled_by_legacy: | |
629 | profmodname = 'ipy_profile_' + opts_all.profile |
|
629 | profmodname = 'ipy_profile_' + opts_all.profile | |
630 | try: |
|
630 | try: | |
631 | force_import(profmodname) |
|
631 | force_import(profmodname) | |
632 | except: |
|
632 | except: | |
633 | IP.InteractiveTB() |
|
633 | IP.InteractiveTB() | |
634 | print "Error importing",profmodname,\ |
|
634 | print "Error importing",profmodname,\ | |
635 | "- perhaps you should run %upgrade?" |
|
635 | "- perhaps you should run %upgrade?" | |
636 | import_fail_info(profmodname) |
|
636 | import_fail_info(profmodname) | |
637 | else: |
|
637 | else: | |
638 | opts.profile = opts_all.profile |
|
638 | opts.profile = opts_all.profile | |
639 | else: |
|
639 | else: | |
640 | force_import('ipy_profile_none') |
|
640 | force_import('ipy_profile_none') | |
641 | # XXX - this is wrong: ipy_user_conf should not be loaded unconditionally, |
|
641 | # XXX - this is wrong: ipy_user_conf should not be loaded unconditionally, | |
642 | # since the user could have specified a config file path by hand. |
|
642 | # since the user could have specified a config file path by hand. | |
643 | try: |
|
643 | try: | |
644 | force_import('ipy_user_conf') |
|
644 | force_import('ipy_user_conf') | |
645 | except: |
|
645 | except: | |
646 | conf = opts_all.ipythondir + "/ipy_user_conf.py" |
|
646 | conf = opts_all.ipythondir + "/ipy_user_conf.py" | |
647 | IP.InteractiveTB() |
|
647 | IP.InteractiveTB() | |
648 | if not os.path.isfile(conf): |
|
648 | if not os.path.isfile(conf): | |
649 | warn(conf + ' does not exist, please run %upgrade!') |
|
649 | warn(conf + ' does not exist, please run %upgrade!') | |
650 |
|
650 | |||
651 | import_fail_info("ipy_user_conf") |
|
651 | import_fail_info("ipy_user_conf") | |
652 |
|
652 | |||
653 | # Define the history file for saving commands in between sessions |
|
653 | # Define the history file for saving commands in between sessions | |
654 | try: |
|
654 | try: | |
655 | histfname = 'history-%s' % opts.profile |
|
655 | histfname = 'history-%s' % opts.profile | |
656 | except AttributeError: |
|
656 | except AttributeError: | |
657 | histfname = 'history' |
|
657 | histfname = 'history' | |
658 | IP.histfile = os.path.join(opts_all.ipythondir,histfname) |
|
658 | IP.histfile = os.path.join(opts_all.ipythondir,histfname) | |
659 |
|
659 | |||
660 | # finally, push the argv to options again to ensure highest priority |
|
660 | # finally, push the argv to options again to ensure highest priority | |
661 | IP_rc.update(opts) |
|
661 | IP_rc.update(opts) | |
662 |
|
662 | |||
663 | # release stdout and stderr and save config log into a global summary |
|
663 | # release stdout and stderr and save config log into a global summary | |
664 | msg.config.release_all() |
|
664 | msg.config.release_all() | |
665 | if IP_rc.messages: |
|
665 | if IP_rc.messages: | |
666 | msg.summary += msg.config.summary_all() |
|
666 | msg.summary += msg.config.summary_all() | |
667 |
|
667 | |||
668 | #------------------------------------------------------------------------ |
|
668 | #------------------------------------------------------------------------ | |
669 | # Setup interactive session |
|
669 | # Setup interactive session | |
670 |
|
670 | |||
671 | # Now we should be fully configured. We can then execute files or load |
|
671 | # Now we should be fully configured. We can then execute files or load | |
672 | # things only needed for interactive use. Then we'll open the shell. |
|
672 | # things only needed for interactive use. Then we'll open the shell. | |
673 |
|
673 | |||
674 | # Take a snapshot of the user namespace before opening the shell. That way |
|
674 | # Take a snapshot of the user namespace before opening the shell. That way | |
675 | # we'll be able to identify which things were interactively defined and |
|
675 | # we'll be able to identify which things were interactively defined and | |
676 | # which were defined through config files. |
|
676 | # which were defined through config files. | |
677 | IP.user_config_ns.update(IP.user_ns) |
|
677 | IP.user_config_ns.update(IP.user_ns) | |
678 |
|
678 | |||
679 | # Force reading a file as if it were a session log. Slower but safer. |
|
679 | # Force reading a file as if it were a session log. Slower but safer. | |
680 | if load_logplay: |
|
680 | if load_logplay: | |
681 | print 'Replaying log...' |
|
681 | print 'Replaying log...' | |
682 | try: |
|
682 | try: | |
683 | if IP_rc.debug: |
|
683 | if IP_rc.debug: | |
684 | logplay_quiet = 0 |
|
684 | logplay_quiet = 0 | |
685 | else: |
|
685 | else: | |
686 | logplay_quiet = 1 |
|
686 | logplay_quiet = 1 | |
687 |
|
687 | |||
688 | msg.logplay.trap_all() |
|
688 | msg.logplay.trap_all() | |
689 | IP.safe_execfile(load_logplay,IP.user_ns, |
|
689 | IP.safe_execfile(load_logplay,IP.user_ns, | |
690 | islog = 1, quiet = logplay_quiet) |
|
690 | islog = 1, quiet = logplay_quiet) | |
691 | msg.logplay.release_all() |
|
691 | msg.logplay.release_all() | |
692 | if IP_rc.messages: |
|
692 | if IP_rc.messages: | |
693 | msg.summary += msg.logplay.summary_all() |
|
693 | msg.summary += msg.logplay.summary_all() | |
694 | except: |
|
694 | except: | |
695 | warn('Problems replaying logfile %s.' % load_logplay) |
|
695 | warn('Problems replaying logfile %s.' % load_logplay) | |
696 | IP.InteractiveTB() |
|
696 | IP.InteractiveTB() | |
697 |
|
697 | |||
698 | # Load remaining files in command line |
|
698 | # Load remaining files in command line | |
699 | msg.user_exec.trap_all() |
|
699 | msg.user_exec.trap_all() | |
700 |
|
700 | |||
701 | # Do NOT execute files named in the command line as scripts to be loaded |
|
701 | # Do NOT execute files named in the command line as scripts to be loaded | |
702 | # by embedded instances. Doing so has the potential for an infinite |
|
702 | # by embedded instances. Doing so has the potential for an infinite | |
703 | # recursion if there are exceptions thrown in the process. |
|
703 | # recursion if there are exceptions thrown in the process. | |
704 |
|
704 | |||
705 | # XXX FIXME: the execution of user files should be moved out to after |
|
705 | # XXX FIXME: the execution of user files should be moved out to after | |
706 | # ipython is fully initialized, just as if they were run via %run at the |
|
706 | # ipython is fully initialized, just as if they were run via %run at the | |
707 | # ipython prompt. This would also give them the benefit of ipython's |
|
707 | # ipython prompt. This would also give them the benefit of ipython's | |
708 | # nice tracebacks. |
|
708 | # nice tracebacks. | |
709 |
|
709 | |||
710 | if (not embedded and IP_rc.args and |
|
710 | if (not embedded and IP_rc.args and | |
711 | not IP_rc.args[0].lower().endswith('.ipy')): |
|
711 | not IP_rc.args[0].lower().endswith('.ipy')): | |
712 | name_save = IP.user_ns['__name__'] |
|
712 | name_save = IP.user_ns['__name__'] | |
713 | IP.user_ns['__name__'] = '__main__' |
|
713 | IP.user_ns['__name__'] = '__main__' | |
714 | # Set our own excepthook in case the user code tries to call it |
|
714 | # Set our own excepthook in case the user code tries to call it | |
715 | # directly. This prevents triggering the IPython crash handler. |
|
715 | # directly. This prevents triggering the IPython crash handler. | |
716 | old_excepthook,sys.excepthook = sys.excepthook, IP.excepthook |
|
716 | old_excepthook,sys.excepthook = sys.excepthook, IP.excepthook | |
717 |
|
717 | |||
718 | save_argv = sys.argv[1:] # save it for later restoring |
|
718 | save_argv = sys.argv[1:] # save it for later restoring | |
719 |
|
719 | |||
720 | sys.argv = args |
|
720 | sys.argv = args | |
721 |
|
721 | |||
722 | try: |
|
722 | try: | |
723 | IP.safe_execfile(args[0], IP.user_ns) |
|
723 | IP.safe_execfile(args[0], IP.user_ns) | |
724 | finally: |
|
724 | finally: | |
725 | # Reset our crash handler in place |
|
725 | # Reset our crash handler in place | |
726 | sys.excepthook = old_excepthook |
|
726 | sys.excepthook = old_excepthook | |
727 | sys.argv[:] = save_argv |
|
727 | sys.argv[:] = save_argv | |
728 | IP.user_ns['__name__'] = name_save |
|
728 | IP.user_ns['__name__'] = name_save | |
729 |
|
729 | |||
730 | msg.user_exec.release_all() |
|
730 | msg.user_exec.release_all() | |
731 |
|
731 | |||
732 | if IP_rc.messages: |
|
732 | if IP_rc.messages: | |
733 | msg.summary += msg.user_exec.summary_all() |
|
733 | msg.summary += msg.user_exec.summary_all() | |
734 |
|
734 | |||
735 | # since we can't specify a null string on the cmd line, 0 is the equivalent: |
|
735 | # since we can't specify a null string on the cmd line, 0 is the equivalent: | |
736 | if IP_rc.nosep: |
|
736 | if IP_rc.nosep: | |
737 | IP_rc.separate_in = IP_rc.separate_out = IP_rc.separate_out2 = '0' |
|
737 | IP_rc.separate_in = IP_rc.separate_out = IP_rc.separate_out2 = '0' | |
738 | if IP_rc.separate_in == '0': IP_rc.separate_in = '' |
|
738 | if IP_rc.separate_in == '0': IP_rc.separate_in = '' | |
739 | if IP_rc.separate_out == '0': IP_rc.separate_out = '' |
|
739 | if IP_rc.separate_out == '0': IP_rc.separate_out = '' | |
740 | if IP_rc.separate_out2 == '0': IP_rc.separate_out2 = '' |
|
740 | if IP_rc.separate_out2 == '0': IP_rc.separate_out2 = '' | |
741 | IP_rc.separate_in = IP_rc.separate_in.replace('\\n','\n') |
|
741 | IP_rc.separate_in = IP_rc.separate_in.replace('\\n','\n') | |
742 | IP_rc.separate_out = IP_rc.separate_out.replace('\\n','\n') |
|
742 | IP_rc.separate_out = IP_rc.separate_out.replace('\\n','\n') | |
743 | IP_rc.separate_out2 = IP_rc.separate_out2.replace('\\n','\n') |
|
743 | IP_rc.separate_out2 = IP_rc.separate_out2.replace('\\n','\n') | |
744 |
|
744 | |||
745 | # Determine how many lines at the bottom of the screen are needed for |
|
745 | # Determine how many lines at the bottom of the screen are needed for | |
746 | # showing prompts, so we can know wheter long strings are to be printed or |
|
746 | # showing prompts, so we can know wheter long strings are to be printed or | |
747 | # paged: |
|
747 | # paged: | |
748 | num_lines_bot = IP_rc.separate_in.count('\n')+1 |
|
748 | num_lines_bot = IP_rc.separate_in.count('\n')+1 | |
749 | IP_rc.screen_length = IP_rc.screen_length - num_lines_bot |
|
749 | IP_rc.screen_length = IP_rc.screen_length - num_lines_bot | |
750 |
|
750 | |||
751 | # configure startup banner |
|
751 | # configure startup banner | |
752 | if IP_rc.c: # regular python doesn't print the banner with -c |
|
752 | if IP_rc.c: # regular python doesn't print the banner with -c | |
753 | IP_rc.banner = 0 |
|
753 | IP_rc.banner = 0 | |
754 | if IP_rc.banner: |
|
754 | if IP_rc.banner: | |
755 | BANN_P = IP.BANNER_PARTS |
|
755 | BANN_P = IP.BANNER_PARTS | |
756 | else: |
|
756 | else: | |
757 | BANN_P = [] |
|
757 | BANN_P = [] | |
758 |
|
758 | |||
759 | if IP_rc.profile: BANN_P.append('IPython profile: %s\n' % IP_rc.profile) |
|
759 | if IP_rc.profile: BANN_P.append('IPython profile: %s\n' % IP_rc.profile) | |
760 |
|
760 | |||
761 | # add message log (possibly empty) |
|
761 | # add message log (possibly empty) | |
762 | if msg.summary: BANN_P.append(msg.summary) |
|
762 | if msg.summary: BANN_P.append(msg.summary) | |
763 | # Final banner is a string |
|
763 | # Final banner is a string | |
764 | IP.BANNER = '\n'.join(BANN_P) |
|
764 | IP.BANNER = '\n'.join(BANN_P) | |
765 |
|
765 | |||
766 | # Finalize the IPython instance. This assumes the rc structure is fully |
|
766 | # Finalize the IPython instance. This assumes the rc structure is fully | |
767 | # in place. |
|
767 | # in place. | |
768 | IP.post_config_initialization() |
|
768 | IP.post_config_initialization() | |
769 |
|
769 | |||
770 | return IP |
|
770 | return IP | |
771 | #************************ end of file <ipmaker.py> ************************** |
|
771 | #************************ end of file <ipmaker.py> ************************** |
1 | NO CONTENT: file renamed from IPython/OutputTrap.py to IPython/core/outputtrap.py |
|
NO CONTENT: file renamed from IPython/OutputTrap.py to IPython/core/outputtrap.py |
@@ -1,46 +1,48 b'' | |||||
1 | #!/usr/bin/env python |
|
1 | #!/usr/bin/env python | |
2 | # encoding: utf-8 |
|
2 | # encoding: utf-8 | |
3 |
|
3 | |||
4 | def test_import_completer(): |
|
4 | def test_import_completer(): | |
5 | from IPython.core import completer |
|
5 | from IPython.core import completer | |
6 |
|
6 | |||
7 | def test_import_crashhandler(): |
|
7 | def test_import_crashhandler(): | |
8 | from IPython.core import crashhandler |
|
8 | from IPython.core import crashhandler | |
9 |
|
9 | |||
10 | def test_import_debugger(): |
|
10 | def test_import_debugger(): | |
11 | from IPython.core import debugger |
|
11 | from IPython.core import debugger | |
12 |
|
12 | |||
13 | def test_import_fakemodule(): |
|
13 | def test_import_fakemodule(): | |
14 | from IPython.core import fakemodule |
|
14 | from IPython.core import fakemodule | |
15 |
|
15 | |||
16 | def test_import_excolors(): |
|
16 | def test_import_excolors(): | |
17 | from IPython.core import excolors |
|
17 | from IPython.core import excolors | |
18 |
|
18 | |||
19 | def test_import_history(): |
|
19 | def test_import_history(): | |
20 | from IPython.core import history |
|
20 | from IPython.core import history | |
21 |
|
21 | |||
22 | def test_import_hooks(): |
|
22 | def test_import_hooks(): | |
23 | from IPython.core import hooks |
|
23 | from IPython.core import hooks | |
24 |
|
24 | |||
25 | def test_import_ipapi(): |
|
25 | def test_import_ipapi(): | |
26 | from IPython.core import ipapi |
|
26 | from IPython.core import ipapi | |
27 |
|
27 | |||
28 | def test_import_iplib(): |
|
28 | def test_import_iplib(): | |
29 | from IPython.core import iplib |
|
29 | from IPython.core import iplib | |
30 |
|
30 | |||
31 | def test_import_ipmaker(): |
|
31 | def test_import_ipmaker(): | |
32 | from IPython.core import ipmaker |
|
32 | from IPython.core import ipmaker | |
33 |
|
33 | |||
34 | def test_import_logger(): |
|
34 | def test_import_logger(): | |
35 | from IPython.core import logger |
|
35 | from IPython.core import logger | |
36 |
|
36 | |||
37 | def test_import_macro(): |
|
37 | def test_import_macro(): | |
38 | from IPython.core import macro |
|
38 | from IPython.core import macro | |
39 |
|
39 | |||
40 | def test_import_magic(): |
|
40 | def test_import_magic(): | |
41 | from IPython.core import magic |
|
41 | from IPython.core import magic | |
42 |
|
42 | |||
43 | def test_import_oinspect(): |
|
43 | def test_import_oinspect(): | |
44 | from IPython.core import oinspect |
|
44 | from IPython.core import oinspect | |
45 |
|
45 | |||
|
46 | def test_import_outputtrap(): | |||
|
47 | from IPython.core import outputtrap | |||
46 |
|
48 |
@@ -1,300 +1,300 b'' | |||||
1 | # -*- coding: utf-8 -*- |
|
1 | # -*- coding: utf-8 -*- | |
2 | """IPython Test Suite Runner. |
|
2 | """IPython Test Suite Runner. | |
3 |
|
3 | |||
4 | This module provides a main entry point to a user script to test IPython |
|
4 | This module provides a main entry point to a user script to test IPython | |
5 | itself from the command line. There are two ways of running this script: |
|
5 | itself from the command line. There are two ways of running this script: | |
6 |
|
6 | |||
7 | 1. With the syntax `iptest all`. This runs our entire test suite by |
|
7 | 1. With the syntax `iptest all`. This runs our entire test suite by | |
8 | calling this script (with different arguments) or trial recursively. This |
|
8 | calling this script (with different arguments) or trial recursively. This | |
9 | causes modules and package to be tested in different processes, using nose |
|
9 | causes modules and package to be tested in different processes, using nose | |
10 | or trial where appropriate. |
|
10 | or trial where appropriate. | |
11 | 2. With the regular nose syntax, like `iptest -vvs IPython`. In this form |
|
11 | 2. With the regular nose syntax, like `iptest -vvs IPython`. In this form | |
12 | the script simply calls nose, but with special command line flags and |
|
12 | the script simply calls nose, but with special command line flags and | |
13 | plugins loaded. |
|
13 | plugins loaded. | |
14 |
|
14 | |||
15 | For now, this script requires that both nose and twisted are installed. This |
|
15 | For now, this script requires that both nose and twisted are installed. This | |
16 | will change in the future. |
|
16 | will change in the future. | |
17 | """ |
|
17 | """ | |
18 |
|
18 | |||
19 | #----------------------------------------------------------------------------- |
|
19 | #----------------------------------------------------------------------------- | |
20 | # Module imports |
|
20 | # Module imports | |
21 | #----------------------------------------------------------------------------- |
|
21 | #----------------------------------------------------------------------------- | |
22 |
|
22 | |||
23 | import os |
|
23 | import os | |
24 | import os.path as path |
|
24 | import os.path as path | |
25 | import sys |
|
25 | import sys | |
26 | import subprocess |
|
26 | import subprocess | |
27 | import time |
|
27 | import time | |
28 | import warnings |
|
28 | import warnings | |
29 |
|
29 | |||
30 | import nose.plugins.builtin |
|
30 | import nose.plugins.builtin | |
31 | from nose.core import TestProgram |
|
31 | from nose.core import TestProgram | |
32 |
|
32 | |||
33 | from IPython.platutils import find_cmd |
|
33 | from IPython.platutils import find_cmd | |
34 | from IPython.testing.plugin.ipdoctest import IPythonDoctest |
|
34 | from IPython.testing.plugin.ipdoctest import IPythonDoctest | |
35 |
|
35 | |||
36 | pjoin = path.join |
|
36 | pjoin = path.join | |
37 |
|
37 | |||
38 | #----------------------------------------------------------------------------- |
|
38 | #----------------------------------------------------------------------------- | |
39 | # Logic for skipping doctests |
|
39 | # Logic for skipping doctests | |
40 | #----------------------------------------------------------------------------- |
|
40 | #----------------------------------------------------------------------------- | |
41 |
|
41 | |||
42 | def test_for(mod): |
|
42 | def test_for(mod): | |
43 | """Test to see if mod is importable.""" |
|
43 | """Test to see if mod is importable.""" | |
44 | try: |
|
44 | try: | |
45 | __import__(mod) |
|
45 | __import__(mod) | |
46 | except ImportError: |
|
46 | except ImportError: | |
47 | return False |
|
47 | return False | |
48 | else: |
|
48 | else: | |
49 | return True |
|
49 | return True | |
50 |
|
50 | |||
51 | have_curses = test_for('_curses') |
|
51 | have_curses = test_for('_curses') | |
52 | have_wx = test_for('wx') |
|
52 | have_wx = test_for('wx') | |
53 | have_zi = test_for('zope.interface') |
|
53 | have_zi = test_for('zope.interface') | |
54 | have_twisted = test_for('twisted') |
|
54 | have_twisted = test_for('twisted') | |
55 | have_foolscap = test_for('foolscap') |
|
55 | have_foolscap = test_for('foolscap') | |
56 | have_objc = test_for('objc') |
|
56 | have_objc = test_for('objc') | |
57 | have_pexpect = test_for('pexpect') |
|
57 | have_pexpect = test_for('pexpect') | |
58 |
|
58 | |||
59 | # For the IPythonDoctest plugin, we need to exclude certain patterns that cause |
|
59 | # For the IPythonDoctest plugin, we need to exclude certain patterns that cause | |
60 | # testing problems. We should strive to minimize the number of skipped |
|
60 | # testing problems. We should strive to minimize the number of skipped | |
61 | # modules, since this means untested code. As the testing machinery |
|
61 | # modules, since this means untested code. As the testing machinery | |
62 | # solidifies, this list should eventually become empty. |
|
62 | # solidifies, this list should eventually become empty. | |
63 | EXCLUDE = [pjoin('IPython', 'external'), |
|
63 | EXCLUDE = [pjoin('IPython', 'external'), | |
64 | pjoin('IPython', 'frontend', 'process', 'winprocess.py'), |
|
64 | pjoin('IPython', 'frontend', 'process', 'winprocess.py'), | |
65 | pjoin('IPython_doctest_plugin'), |
|
65 | pjoin('IPython_doctest_plugin'), | |
66 | pjoin('IPython', 'Gnuplot'), |
|
66 | pjoin('IPython', 'Gnuplot'), | |
67 | pjoin('IPython', 'Extensions', 'ipy_'), |
|
67 | pjoin('IPython', 'Extensions', 'ipy_'), | |
68 | pjoin('IPython', 'Extensions', 'clearcmd'), |
|
68 | pjoin('IPython', 'Extensions', 'clearcmd'), | |
69 | pjoin('IPython', 'Extensions', 'PhysicalQInteractive'), |
|
69 | pjoin('IPython', 'Extensions', 'PhysicalQInteractive'), | |
70 | pjoin('IPython', 'Extensions', 'scitedirector'), |
|
70 | pjoin('IPython', 'Extensions', 'scitedirector'), | |
71 | pjoin('IPython', 'Extensions', 'numeric_formats'), |
|
71 | pjoin('IPython', 'Extensions', 'numeric_formats'), | |
72 | pjoin('IPython', 'testing', 'attic'), |
|
72 | pjoin('IPython', 'testing', 'attic'), | |
73 | pjoin('IPython', 'testing', 'tutils'), |
|
73 | pjoin('IPython', 'testing', 'tutils'), | |
74 | pjoin('IPython', 'testing', 'tools'), |
|
74 | pjoin('IPython', 'testing', 'tools'), | |
75 | pjoin('IPython', 'testing', 'mkdoctests') |
|
75 | pjoin('IPython', 'testing', 'mkdoctests') | |
76 | ] |
|
76 | ] | |
77 |
|
77 | |||
78 | if not have_wx: |
|
78 | if not have_wx: | |
79 | EXCLUDE.append(pjoin('IPython', 'Extensions', 'igrid')) |
|
79 | EXCLUDE.append(pjoin('IPython', 'Extensions', 'igrid')) | |
80 | EXCLUDE.append(pjoin('IPython', 'gui')) |
|
80 | EXCLUDE.append(pjoin('IPython', 'gui')) | |
81 | EXCLUDE.append(pjoin('IPython', 'frontend', 'wx')) |
|
81 | EXCLUDE.append(pjoin('IPython', 'frontend', 'wx')) | |
82 |
|
82 | |||
83 | if not have_objc: |
|
83 | if not have_objc: | |
84 | EXCLUDE.append(pjoin('IPython', 'frontend', 'cocoa')) |
|
84 | EXCLUDE.append(pjoin('IPython', 'frontend', 'cocoa')) | |
85 |
|
85 | |||
86 | if not have_curses: |
|
86 | if not have_curses: | |
87 | EXCLUDE.append(pjoin('IPython', 'Extensions', 'ibrowse')) |
|
87 | EXCLUDE.append(pjoin('IPython', 'Extensions', 'ibrowse')) | |
88 |
|
88 | |||
89 | if not sys.platform == 'win32': |
|
89 | if not sys.platform == 'win32': | |
90 | EXCLUDE.append(pjoin('IPython', 'platutils_win32')) |
|
90 | EXCLUDE.append(pjoin('IPython', 'platutils_win32')) | |
91 |
|
91 | |||
92 | # These have to be skipped on win32 because the use echo, rm, cd, etc. |
|
92 | # These have to be skipped on win32 because the use echo, rm, cd, etc. | |
93 | # See ticket https://bugs.launchpad.net/bugs/366982 |
|
93 | # See ticket https://bugs.launchpad.net/bugs/366982 | |
94 | if sys.platform == 'win32': |
|
94 | if sys.platform == 'win32': | |
95 | EXCLUDE.append(pjoin('IPython', 'testing', 'plugin', 'test_exampleip')) |
|
95 | EXCLUDE.append(pjoin('IPython', 'testing', 'plugin', 'test_exampleip')) | |
96 | EXCLUDE.append(pjoin('IPython', 'testing', 'plugin', 'dtexample')) |
|
96 | EXCLUDE.append(pjoin('IPython', 'testing', 'plugin', 'dtexample')) | |
97 |
|
97 | |||
98 | if not os.name == 'posix': |
|
98 | if not os.name == 'posix': | |
99 | EXCLUDE.append(pjoin('IPython', 'platutils_posix')) |
|
99 | EXCLUDE.append(pjoin('IPython', 'platutils_posix')) | |
100 |
|
100 | |||
101 | if not have_pexpect: |
|
101 | if not have_pexpect: | |
102 | EXCLUDE.append(pjoin('IPython', 'lib', 'irunner')) |
|
102 | EXCLUDE.append(pjoin('IPython', 'lib', 'irunner')) | |
103 |
|
103 | |||
104 | # This is needed for the reg-exp to match on win32 in the ipdoctest plugin. |
|
104 | # This is needed for the reg-exp to match on win32 in the ipdoctest plugin. | |
105 | if sys.platform == 'win32': |
|
105 | if sys.platform == 'win32': | |
106 | EXCLUDE = [s.replace('\\','\\\\') for s in EXCLUDE] |
|
106 | EXCLUDE = [s.replace('\\','\\\\') for s in EXCLUDE] | |
107 |
|
107 | |||
108 |
|
108 | |||
109 | #----------------------------------------------------------------------------- |
|
109 | #----------------------------------------------------------------------------- | |
110 | # Functions and classes |
|
110 | # Functions and classes | |
111 | #----------------------------------------------------------------------------- |
|
111 | #----------------------------------------------------------------------------- | |
112 |
|
112 | |||
113 | def run_iptest(): |
|
113 | def run_iptest(): | |
114 | """Run the IPython test suite using nose. |
|
114 | """Run the IPython test suite using nose. | |
115 |
|
115 | |||
116 | This function is called when this script is **not** called with the form |
|
116 | This function is called when this script is **not** called with the form | |
117 | `iptest all`. It simply calls nose with appropriate command line flags |
|
117 | `iptest all`. It simply calls nose with appropriate command line flags | |
118 | and accepts all of the standard nose arguments. |
|
118 | and accepts all of the standard nose arguments. | |
119 | """ |
|
119 | """ | |
120 |
|
120 | |||
121 | warnings.filterwarnings('ignore', |
|
121 | warnings.filterwarnings('ignore', | |
122 | 'This will be removed soon. Use IPython.testing.util instead') |
|
122 | 'This will be removed soon. Use IPython.testing.util instead') | |
123 |
|
123 | |||
124 | argv = sys.argv + [ |
|
124 | argv = sys.argv + [ | |
125 | # Loading ipdoctest causes problems with Twisted. |
|
125 | # Loading ipdoctest causes problems with Twisted. | |
126 | # I am removing this as a temporary fix to get the |
|
126 | # I am removing this as a temporary fix to get the | |
127 | # test suite back into working shape. Our nose |
|
127 | # test suite back into working shape. Our nose | |
128 | # plugin needs to be gone through with a fine |
|
128 | # plugin needs to be gone through with a fine | |
129 | # toothed comb to find what is causing the problem. |
|
129 | # toothed comb to find what is causing the problem. | |
130 | '--with-ipdoctest', |
|
130 | '--with-ipdoctest', | |
131 | '--ipdoctest-tests','--ipdoctest-extension=txt', |
|
131 | '--ipdoctest-tests','--ipdoctest-extension=txt', | |
132 | '--detailed-errors', |
|
132 | '--detailed-errors', | |
133 |
|
133 | |||
134 | # We add --exe because of setuptools' imbecility (it |
|
134 | # We add --exe because of setuptools' imbecility (it | |
135 | # blindly does chmod +x on ALL files). Nose does the |
|
135 | # blindly does chmod +x on ALL files). Nose does the | |
136 | # right thing and it tries to avoid executables, |
|
136 | # right thing and it tries to avoid executables, | |
137 | # setuptools unfortunately forces our hand here. This |
|
137 | # setuptools unfortunately forces our hand here. This | |
138 | # has been discussed on the distutils list and the |
|
138 | # has been discussed on the distutils list and the | |
139 | # setuptools devs refuse to fix this problem! |
|
139 | # setuptools devs refuse to fix this problem! | |
140 | '--exe', |
|
140 | '--exe', | |
141 | ] |
|
141 | ] | |
142 |
|
142 | |||
143 | # Detect if any tests were required by explicitly calling an IPython |
|
143 | # Detect if any tests were required by explicitly calling an IPython | |
144 | # submodule or giving a specific path |
|
144 | # submodule or giving a specific path | |
145 | has_tests = False |
|
145 | has_tests = False | |
146 | for arg in sys.argv: |
|
146 | for arg in sys.argv: | |
147 | if 'IPython' in arg or arg.endswith('.py') or \ |
|
147 | if 'IPython' in arg or arg.endswith('.py') or \ | |
148 | (':' in arg and '.py' in arg): |
|
148 | (':' in arg and '.py' in arg): | |
149 | has_tests = True |
|
149 | has_tests = True | |
150 | break |
|
150 | break | |
151 |
|
151 | |||
152 | # If nothing was specifically requested, test full IPython |
|
152 | # If nothing was specifically requested, test full IPython | |
153 | if not has_tests: |
|
153 | if not has_tests: | |
154 | argv.append('IPython') |
|
154 | argv.append('IPython') | |
155 |
|
155 | |||
156 | # Construct list of plugins, omitting the existing doctest plugin, which |
|
156 | # Construct list of plugins, omitting the existing doctest plugin, which | |
157 | # ours replaces (and extends). |
|
157 | # ours replaces (and extends). | |
158 | plugins = [IPythonDoctest(EXCLUDE)] |
|
158 | plugins = [IPythonDoctest(EXCLUDE)] | |
159 | for p in nose.plugins.builtin.plugins: |
|
159 | for p in nose.plugins.builtin.plugins: | |
160 | plug = p() |
|
160 | plug = p() | |
161 | if plug.name == 'doctest': |
|
161 | if plug.name == 'doctest': | |
162 | continue |
|
162 | continue | |
163 |
|
163 | |||
164 | #print '*** adding plugin:',plug.name # dbg |
|
164 | #print '*** adding plugin:',plug.name # dbg | |
165 | plugins.append(plug) |
|
165 | plugins.append(plug) | |
166 |
|
166 | |||
167 | TestProgram(argv=argv,plugins=plugins) |
|
167 | TestProgram(argv=argv,plugins=plugins) | |
168 |
|
168 | |||
169 |
|
169 | |||
170 | class IPTester(object): |
|
170 | class IPTester(object): | |
171 | """Call that calls iptest or trial in a subprocess. |
|
171 | """Call that calls iptest or trial in a subprocess. | |
172 | """ |
|
172 | """ | |
173 | def __init__(self,runner='iptest',params=None): |
|
173 | def __init__(self,runner='iptest',params=None): | |
174 | """ """ |
|
174 | """ """ | |
175 | if runner == 'iptest': |
|
175 | if runner == 'iptest': | |
176 | self.runner = ['iptest','-v'] |
|
176 | self.runner = ['iptest','-v'] | |
177 | else: |
|
177 | else: | |
178 | self.runner = [find_cmd('trial')] |
|
178 | self.runner = [find_cmd('trial')] | |
179 | if params is None: |
|
179 | if params is None: | |
180 | params = [] |
|
180 | params = [] | |
181 | if isinstance(params,str): |
|
181 | if isinstance(params,str): | |
182 | params = [params] |
|
182 | params = [params] | |
183 | self.params = params |
|
183 | self.params = params | |
184 |
|
184 | |||
185 | # Assemble call |
|
185 | # Assemble call | |
186 | self.call_args = self.runner+self.params |
|
186 | self.call_args = self.runner+self.params | |
187 |
|
187 | |||
188 | def run(self): |
|
188 | def run(self): | |
189 | """Run the stored commands""" |
|
189 | """Run the stored commands""" | |
190 | return subprocess.call(self.call_args) |
|
190 | return subprocess.call(self.call_args) | |
191 |
|
191 | |||
192 |
|
192 | |||
193 | def make_runners(): |
|
193 | def make_runners(): | |
194 | """Define the modules and packages that need to be tested. |
|
194 | """Define the modules and packages that need to be tested. | |
195 | """ |
|
195 | """ | |
196 |
|
196 | |||
197 | # This omits additional top-level modules that should not be doctested. |
|
197 | # This omits additional top-level modules that should not be doctested. | |
198 | # XXX: Shell.py is also ommited because of a bug in the skip_doctest |
|
198 | # XXX: Shell.py is also ommited because of a bug in the skip_doctest | |
199 | # decorator. See ticket https://bugs.launchpad.net/bugs/366209 |
|
199 | # decorator. See ticket https://bugs.launchpad.net/bugs/366209 | |
200 | top_mod = \ |
|
200 | top_mod = \ | |
201 | ['backgroundjobs.py', 'coloransi.py', 'completer.py', 'configloader.py', |
|
201 | ['backgroundjobs.py', 'coloransi.py', 'completer.py', 'configloader.py', | |
202 | 'crashhandler.py', 'debugger.py', 'deepreload.py', 'demo.py', |
|
202 | 'crashhandler.py', 'debugger.py', 'deepreload.py', 'demo.py', | |
203 | 'DPyGetOpt.py', 'dtutils.py', 'excolors.py', 'fakemodule.py', |
|
203 | 'DPyGetOpt.py', 'dtutils.py', 'excolors.py', 'fakemodule.py', | |
204 | 'generics.py', 'genutils.py', 'history.py', 'hooks.py', 'ipapi.py', |
|
204 | 'generics.py', 'genutils.py', 'history.py', 'hooks.py', 'ipapi.py', | |
205 | 'iplib.py', 'ipmaker.py', 'ipstruct.py', 'Itpl.py', |
|
205 | 'iplib.py', 'ipmaker.py', 'ipstruct.py', 'Itpl.py', | |
206 | 'logger.py', 'macro.py', 'magic.py', 'oinspect.py', |
|
206 | 'logger.py', 'macro.py', 'magic.py', 'oinspect.py', | |
207 |
' |
|
207 | 'outputtrap.py', 'platutils.py', 'prefilter.py', 'Prompts.py', | |
208 | 'PyColorize.py', 'Release.py', 'rlineimpl.py', 'shadowns.py', |
|
208 | 'PyColorize.py', 'Release.py', 'rlineimpl.py', 'shadowns.py', | |
209 | 'shellglobals.py', 'strdispatch.py', 'twshell.py', |
|
209 | 'shellglobals.py', 'strdispatch.py', 'twshell.py', | |
210 | 'ultraTB.py', 'upgrade_dir.py', 'usage.py', 'wildcard.py', |
|
210 | 'ultraTB.py', 'upgrade_dir.py', 'usage.py', 'wildcard.py', | |
211 | # See note above for why this is skipped |
|
211 | # See note above for why this is skipped | |
212 | # 'Shell.py', |
|
212 | # 'Shell.py', | |
213 | 'winconsole.py'] |
|
213 | 'winconsole.py'] | |
214 |
|
214 | |||
215 | if have_pexpect: |
|
215 | if have_pexpect: | |
216 | top_mod.append('irunner.py') |
|
216 | top_mod.append('irunner.py') | |
217 |
|
217 | |||
218 | if sys.platform == 'win32': |
|
218 | if sys.platform == 'win32': | |
219 | top_mod.append('platutils_win32.py') |
|
219 | top_mod.append('platutils_win32.py') | |
220 | elif os.name == 'posix': |
|
220 | elif os.name == 'posix': | |
221 | top_mod.append('platutils_posix.py') |
|
221 | top_mod.append('platutils_posix.py') | |
222 | else: |
|
222 | else: | |
223 | top_mod.append('platutils_dummy.py') |
|
223 | top_mod.append('platutils_dummy.py') | |
224 |
|
224 | |||
225 | # These are tested by nose, so skip IPython.kernel |
|
225 | # These are tested by nose, so skip IPython.kernel | |
226 | top_pack = ['config','Extensions','frontend', |
|
226 | top_pack = ['config','Extensions','frontend', | |
227 | 'testing','tests','tools','UserConfig'] |
|
227 | 'testing','tests','tools','UserConfig'] | |
228 |
|
228 | |||
229 | if have_wx: |
|
229 | if have_wx: | |
230 | top_pack.append('gui') |
|
230 | top_pack.append('gui') | |
231 |
|
231 | |||
232 | modules = ['IPython.%s' % m[:-3] for m in top_mod ] |
|
232 | modules = ['IPython.%s' % m[:-3] for m in top_mod ] | |
233 | packages = ['IPython.%s' % m for m in top_pack ] |
|
233 | packages = ['IPython.%s' % m for m in top_pack ] | |
234 |
|
234 | |||
235 | # Make runners |
|
235 | # Make runners | |
236 | runners = dict(zip(top_pack, [IPTester(params=v) for v in packages])) |
|
236 | runners = dict(zip(top_pack, [IPTester(params=v) for v in packages])) | |
237 |
|
237 | |||
238 | # Test IPython.kernel using trial if twisted is installed |
|
238 | # Test IPython.kernel using trial if twisted is installed | |
239 | if have_zi and have_twisted and have_foolscap: |
|
239 | if have_zi and have_twisted and have_foolscap: | |
240 | runners['trial'] = IPTester('trial',['IPython']) |
|
240 | runners['trial'] = IPTester('trial',['IPython']) | |
241 |
|
241 | |||
242 | runners['modules'] = IPTester(params=modules) |
|
242 | runners['modules'] = IPTester(params=modules) | |
243 |
|
243 | |||
244 | return runners |
|
244 | return runners | |
245 |
|
245 | |||
246 |
|
246 | |||
247 | def run_iptestall(): |
|
247 | def run_iptestall(): | |
248 | """Run the entire IPython test suite by calling nose and trial. |
|
248 | """Run the entire IPython test suite by calling nose and trial. | |
249 |
|
249 | |||
250 | This function constructs :class:`IPTester` instances for all IPython |
|
250 | This function constructs :class:`IPTester` instances for all IPython | |
251 | modules and package and then runs each of them. This causes the modules |
|
251 | modules and package and then runs each of them. This causes the modules | |
252 | and packages of IPython to be tested each in their own subprocess using |
|
252 | and packages of IPython to be tested each in their own subprocess using | |
253 | nose or twisted.trial appropriately. |
|
253 | nose or twisted.trial appropriately. | |
254 | """ |
|
254 | """ | |
255 | runners = make_runners() |
|
255 | runners = make_runners() | |
256 | # Run all test runners, tracking execution time |
|
256 | # Run all test runners, tracking execution time | |
257 | failed = {} |
|
257 | failed = {} | |
258 | t_start = time.time() |
|
258 | t_start = time.time() | |
259 | for name,runner in runners.iteritems(): |
|
259 | for name,runner in runners.iteritems(): | |
260 | print '*'*77 |
|
260 | print '*'*77 | |
261 | print 'IPython test set:',name |
|
261 | print 'IPython test set:',name | |
262 | res = runner.run() |
|
262 | res = runner.run() | |
263 | if res: |
|
263 | if res: | |
264 | failed[name] = res |
|
264 | failed[name] = res | |
265 | t_end = time.time() |
|
265 | t_end = time.time() | |
266 | t_tests = t_end - t_start |
|
266 | t_tests = t_end - t_start | |
267 | nrunners = len(runners) |
|
267 | nrunners = len(runners) | |
268 | nfail = len(failed) |
|
268 | nfail = len(failed) | |
269 | # summarize results |
|
269 | # summarize results | |
270 |
|
270 | |||
271 | print '*'*77 |
|
271 | print '*'*77 | |
272 | print 'Ran %s test sets in %.3fs' % (nrunners, t_tests) |
|
272 | print 'Ran %s test sets in %.3fs' % (nrunners, t_tests) | |
273 |
|
273 | |||
274 | if not failed: |
|
274 | if not failed: | |
275 | print 'OK' |
|
275 | print 'OK' | |
276 | else: |
|
276 | else: | |
277 | # If anything went wrong, point out what command to rerun manually to |
|
277 | # If anything went wrong, point out what command to rerun manually to | |
278 | # see the actual errors and individual summary |
|
278 | # see the actual errors and individual summary | |
279 | print 'ERROR - %s out of %s test sets failed.' % (nfail, nrunners) |
|
279 | print 'ERROR - %s out of %s test sets failed.' % (nfail, nrunners) | |
280 | for name in failed: |
|
280 | for name in failed: | |
281 | failed_runner = runners[name] |
|
281 | failed_runner = runners[name] | |
282 | print '-'*40 |
|
282 | print '-'*40 | |
283 | print 'Runner failed:',name |
|
283 | print 'Runner failed:',name | |
284 | print 'You may wish to rerun this one individually, with:' |
|
284 | print 'You may wish to rerun this one individually, with:' | |
285 | print ' '.join(failed_runner.call_args) |
|
285 | print ' '.join(failed_runner.call_args) | |
286 |
|
286 | |||
287 |
|
287 | |||
288 |
|
288 | |||
289 | def main(): |
|
289 | def main(): | |
290 | if len(sys.argv) == 1: |
|
290 | if len(sys.argv) == 1: | |
291 | run_iptestall() |
|
291 | run_iptestall() | |
292 | else: |
|
292 | else: | |
293 | if sys.argv[1] == 'all': |
|
293 | if sys.argv[1] == 'all': | |
294 | run_iptestall() |
|
294 | run_iptestall() | |
295 | else: |
|
295 | else: | |
296 | run_iptest() |
|
296 | run_iptest() | |
297 |
|
297 | |||
298 |
|
298 | |||
299 | if __name__ == '__main__': |
|
299 | if __name__ == '__main__': | |
300 | main() No newline at end of file |
|
300 | main() |
General Comments 0
You need to be logged in to leave comments.
Login now