Show More
@@ -1,297 +1,291 b'' | |||||
1 | # -*- coding: utf-8 -*- |
|
1 | # -*- coding: utf-8 -*- | |
2 | """Displayhook for IPython. |
|
2 | """Displayhook for IPython. | |
3 |
|
3 | |||
4 | Authors: |
|
4 | Authors: | |
5 |
|
5 | |||
6 | * Fernando Perez |
|
6 | * Fernando Perez | |
7 | * Brian Granger |
|
7 | * Brian Granger | |
8 | """ |
|
8 | """ | |
9 |
|
9 | |||
10 | #----------------------------------------------------------------------------- |
|
10 | #----------------------------------------------------------------------------- | |
11 | # Copyright (C) 2008-2010 The IPython Development Team |
|
11 | # Copyright (C) 2008-2010 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 | #----------------------------------------------------------------------------- |
|
18 | #----------------------------------------------------------------------------- | |
19 | # Imports |
|
19 | # Imports | |
20 | #----------------------------------------------------------------------------- |
|
20 | #----------------------------------------------------------------------------- | |
21 |
|
21 | |||
22 | import __builtin__ |
|
22 | import __builtin__ | |
23 | from pprint import PrettyPrinter |
|
|||
24 | pformat = PrettyPrinter().pformat |
|
|||
25 |
|
23 | |||
26 | from IPython.config.configurable import Configurable |
|
24 | from IPython.config.configurable import Configurable | |
27 | from IPython.core import prompts |
|
25 | from IPython.core import prompts | |
28 | import IPython.utils.generics |
|
26 | import IPython.utils.generics | |
29 | import IPython.utils.io |
|
27 | import IPython.utils.io | |
30 |
from IPython.utils.traitlets import Instance, |
|
28 | from IPython.utils.traitlets import Instance, List | |
31 | from IPython.utils.warn import warn |
|
29 | from IPython.utils.warn import warn | |
|
30 | from IPython.core.formatters import DefaultFormatter | |||
32 |
|
31 | |||
33 | #----------------------------------------------------------------------------- |
|
32 | #----------------------------------------------------------------------------- | |
34 | # Main displayhook class |
|
33 | # Main displayhook class | |
35 | #----------------------------------------------------------------------------- |
|
34 | #----------------------------------------------------------------------------- | |
36 |
|
35 | |||
37 | # TODO: The DisplayHook class should be split into two classes, one that |
|
36 | # TODO: The DisplayHook class should be split into two classes, one that | |
38 | # manages the prompts and their synchronization and another that just does the |
|
37 | # manages the prompts and their synchronization and another that just does the | |
39 | # displayhook logic and calls into the prompt manager. |
|
38 | # displayhook logic and calls into the prompt manager. | |
40 |
|
39 | |||
41 | # TODO: Move the various attributes (cache_size, colors, input_sep, |
|
40 | # TODO: Move the various attributes (cache_size, colors, input_sep, | |
42 | # output_sep, output_sep2, ps1, ps2, ps_out, pad_left). Some of these are also |
|
41 | # output_sep, output_sep2, ps1, ps2, ps_out, pad_left). Some of these are also | |
43 | # attributes of InteractiveShell. They should be on ONE object only and the |
|
42 | # attributes of InteractiveShell. They should be on ONE object only and the | |
44 | # other objects should ask that one object for their values. |
|
43 | # other objects should ask that one object for their values. | |
45 |
|
44 | |||
46 | class DisplayHook(Configurable): |
|
45 | class DisplayHook(Configurable): | |
47 | """The custom IPython displayhook to replace sys.displayhook. |
|
46 | """The custom IPython displayhook to replace sys.displayhook. | |
48 |
|
47 | |||
49 | This class does many things, but the basic idea is that it is a callable |
|
48 | This class does many things, but the basic idea is that it is a callable | |
50 | that gets called anytime user code returns a value. |
|
49 | that gets called anytime user code returns a value. | |
51 |
|
50 | |||
52 | Currently this class does more than just the displayhook logic and that |
|
51 | Currently this class does more than just the displayhook logic and that | |
53 | extra logic should eventually be moved out of here. |
|
52 | extra logic should eventually be moved out of here. | |
54 | """ |
|
53 | """ | |
55 |
|
54 | |||
56 | shell = Instance('IPython.core.interactiveshell.InteractiveShellABC') |
|
55 | shell = Instance('IPython.core.interactiveshell.InteractiveShellABC') | |
57 |
|
56 | |||
|
57 | # The default formatter. | |||
|
58 | default_formatter = Instance('IPython.core.formatters.FormatterABC') | |||
|
59 | def _default_formatter_default(self): | |||
|
60 | # FIXME: backwards compatibility for the InteractiveShell.pprint option? | |||
|
61 | return DefaultFormatter(config=self.config) | |||
|
62 | ||||
|
63 | # Any additional FormatterABC instances we use. | |||
|
64 | # FIXME: currently unused. | |||
|
65 | extra_formatters = List(config=True) | |||
|
66 | ||||
58 | # Each call to the In[] prompt raises it by 1, even the first. |
|
67 | # Each call to the In[] prompt raises it by 1, even the first. | |
59 | #prompt_count = Int(0) |
|
68 | #prompt_count = Int(0) | |
60 |
|
69 | |||
61 | def __init__(self, shell=None, cache_size=1000, |
|
70 | def __init__(self, shell=None, cache_size=1000, | |
62 | colors='NoColor', input_sep='\n', |
|
71 | colors='NoColor', input_sep='\n', | |
63 | output_sep='\n', output_sep2='', |
|
72 | output_sep='\n', output_sep2='', | |
64 | ps1 = None, ps2 = None, ps_out = None, pad_left=True, |
|
73 | ps1 = None, ps2 = None, ps_out = None, pad_left=True, | |
65 | config=None): |
|
74 | config=None): | |
66 | super(DisplayHook, self).__init__(shell=shell, config=config) |
|
75 | super(DisplayHook, self).__init__(shell=shell, config=config) | |
67 |
|
76 | |||
68 | cache_size_min = 3 |
|
77 | cache_size_min = 3 | |
69 | if cache_size <= 0: |
|
78 | if cache_size <= 0: | |
70 | self.do_full_cache = 0 |
|
79 | self.do_full_cache = 0 | |
71 | cache_size = 0 |
|
80 | cache_size = 0 | |
72 | elif cache_size < cache_size_min: |
|
81 | elif cache_size < cache_size_min: | |
73 | self.do_full_cache = 0 |
|
82 | self.do_full_cache = 0 | |
74 | cache_size = 0 |
|
83 | cache_size = 0 | |
75 | warn('caching was disabled (min value for cache size is %s).' % |
|
84 | warn('caching was disabled (min value for cache size is %s).' % | |
76 | cache_size_min,level=3) |
|
85 | cache_size_min,level=3) | |
77 | else: |
|
86 | else: | |
78 | self.do_full_cache = 1 |
|
87 | self.do_full_cache = 1 | |
79 |
|
88 | |||
80 | self.cache_size = cache_size |
|
89 | self.cache_size = cache_size | |
81 | self.input_sep = input_sep |
|
90 | self.input_sep = input_sep | |
82 |
|
91 | |||
83 | # we need a reference to the user-level namespace |
|
92 | # we need a reference to the user-level namespace | |
84 | self.shell = shell |
|
93 | self.shell = shell | |
85 |
|
94 | |||
86 | # Set input prompt strings and colors |
|
95 | # Set input prompt strings and colors | |
87 | if cache_size == 0: |
|
96 | if cache_size == 0: | |
88 | if ps1.find('%n') > -1 or ps1.find(r'\#') > -1 \ |
|
97 | if ps1.find('%n') > -1 or ps1.find(r'\#') > -1 \ | |
89 | or ps1.find(r'\N') > -1: |
|
98 | or ps1.find(r'\N') > -1: | |
90 | ps1 = '>>> ' |
|
99 | ps1 = '>>> ' | |
91 | if ps2.find('%n') > -1 or ps2.find(r'\#') > -1 \ |
|
100 | if ps2.find('%n') > -1 or ps2.find(r'\#') > -1 \ | |
92 | or ps2.find(r'\N') > -1: |
|
101 | or ps2.find(r'\N') > -1: | |
93 | ps2 = '... ' |
|
102 | ps2 = '... ' | |
94 | self.ps1_str = self._set_prompt_str(ps1,'In [\\#]: ','>>> ') |
|
103 | self.ps1_str = self._set_prompt_str(ps1,'In [\\#]: ','>>> ') | |
95 | self.ps2_str = self._set_prompt_str(ps2,' .\\D.: ','... ') |
|
104 | self.ps2_str = self._set_prompt_str(ps2,' .\\D.: ','... ') | |
96 | self.ps_out_str = self._set_prompt_str(ps_out,'Out[\\#]: ','') |
|
105 | self.ps_out_str = self._set_prompt_str(ps_out,'Out[\\#]: ','') | |
97 |
|
106 | |||
98 | self.color_table = prompts.PromptColors |
|
107 | self.color_table = prompts.PromptColors | |
99 | self.prompt1 = prompts.Prompt1(self,sep=input_sep,prompt=self.ps1_str, |
|
108 | self.prompt1 = prompts.Prompt1(self,sep=input_sep,prompt=self.ps1_str, | |
100 | pad_left=pad_left) |
|
109 | pad_left=pad_left) | |
101 | self.prompt2 = prompts.Prompt2(self,prompt=self.ps2_str,pad_left=pad_left) |
|
110 | self.prompt2 = prompts.Prompt2(self,prompt=self.ps2_str,pad_left=pad_left) | |
102 | self.prompt_out = prompts.PromptOut(self,sep='',prompt=self.ps_out_str, |
|
111 | self.prompt_out = prompts.PromptOut(self,sep='',prompt=self.ps_out_str, | |
103 | pad_left=pad_left) |
|
112 | pad_left=pad_left) | |
104 | self.set_colors(colors) |
|
113 | self.set_colors(colors) | |
105 |
|
114 | |||
106 | # Store the last prompt string each time, we need it for aligning |
|
115 | # Store the last prompt string each time, we need it for aligning | |
107 | # continuation and auto-rewrite prompts |
|
116 | # continuation and auto-rewrite prompts | |
108 | self.last_prompt = '' |
|
117 | self.last_prompt = '' | |
109 | self.output_sep = output_sep |
|
118 | self.output_sep = output_sep | |
110 | self.output_sep2 = output_sep2 |
|
119 | self.output_sep2 = output_sep2 | |
111 | self._,self.__,self.___ = '','','' |
|
120 | self._,self.__,self.___ = '','','' | |
112 | self.pprint_types = map(type,[(),[],{}]) |
|
|||
113 |
|
121 | |||
114 | # these are deliberately global: |
|
122 | # these are deliberately global: | |
115 | to_user_ns = {'_':self._,'__':self.__,'___':self.___} |
|
123 | to_user_ns = {'_':self._,'__':self.__,'___':self.___} | |
116 | self.shell.user_ns.update(to_user_ns) |
|
124 | self.shell.user_ns.update(to_user_ns) | |
117 |
|
125 | |||
118 | @property |
|
126 | @property | |
119 | def prompt_count(self): |
|
127 | def prompt_count(self): | |
120 | return self.shell.execution_count |
|
128 | return self.shell.execution_count | |
121 |
|
129 | |||
122 | def _set_prompt_str(self,p_str,cache_def,no_cache_def): |
|
130 | def _set_prompt_str(self,p_str,cache_def,no_cache_def): | |
123 | if p_str is None: |
|
131 | if p_str is None: | |
124 | if self.do_full_cache: |
|
132 | if self.do_full_cache: | |
125 | return cache_def |
|
133 | return cache_def | |
126 | else: |
|
134 | else: | |
127 | return no_cache_def |
|
135 | return no_cache_def | |
128 | else: |
|
136 | else: | |
129 | return p_str |
|
137 | return p_str | |
130 |
|
138 | |||
131 | def set_colors(self, colors): |
|
139 | def set_colors(self, colors): | |
132 | """Set the active color scheme and configure colors for the three |
|
140 | """Set the active color scheme and configure colors for the three | |
133 | prompt subsystems.""" |
|
141 | prompt subsystems.""" | |
134 |
|
142 | |||
135 | # FIXME: This modifying of the global prompts.prompt_specials needs |
|
143 | # FIXME: This modifying of the global prompts.prompt_specials needs | |
136 | # to be fixed. We need to refactor all of the prompts stuff to use |
|
144 | # to be fixed. We need to refactor all of the prompts stuff to use | |
137 | # proper configuration and traits notifications. |
|
145 | # proper configuration and traits notifications. | |
138 | if colors.lower()=='nocolor': |
|
146 | if colors.lower()=='nocolor': | |
139 | prompts.prompt_specials = prompts.prompt_specials_nocolor |
|
147 | prompts.prompt_specials = prompts.prompt_specials_nocolor | |
140 | else: |
|
148 | else: | |
141 | prompts.prompt_specials = prompts.prompt_specials_color |
|
149 | prompts.prompt_specials = prompts.prompt_specials_color | |
142 |
|
150 | |||
143 | self.color_table.set_active_scheme(colors) |
|
151 | self.color_table.set_active_scheme(colors) | |
144 | self.prompt1.set_colors() |
|
152 | self.prompt1.set_colors() | |
145 | self.prompt2.set_colors() |
|
153 | self.prompt2.set_colors() | |
146 | self.prompt_out.set_colors() |
|
154 | self.prompt_out.set_colors() | |
147 |
|
155 | |||
148 | #------------------------------------------------------------------------- |
|
156 | #------------------------------------------------------------------------- | |
149 | # Methods used in __call__. Override these methods to modify the behavior |
|
157 | # Methods used in __call__. Override these methods to modify the behavior | |
150 | # of the displayhook. |
|
158 | # of the displayhook. | |
151 | #------------------------------------------------------------------------- |
|
159 | #------------------------------------------------------------------------- | |
152 |
|
160 | |||
153 | def check_for_underscore(self): |
|
161 | def check_for_underscore(self): | |
154 | """Check if the user has set the '_' variable by hand.""" |
|
162 | """Check if the user has set the '_' variable by hand.""" | |
155 | # If something injected a '_' variable in __builtin__, delete |
|
163 | # If something injected a '_' variable in __builtin__, delete | |
156 | # ipython's automatic one so we don't clobber that. gettext() in |
|
164 | # ipython's automatic one so we don't clobber that. gettext() in | |
157 | # particular uses _, so we need to stay away from it. |
|
165 | # particular uses _, so we need to stay away from it. | |
158 | if '_' in __builtin__.__dict__: |
|
166 | if '_' in __builtin__.__dict__: | |
159 | try: |
|
167 | try: | |
160 | del self.shell.user_ns['_'] |
|
168 | del self.shell.user_ns['_'] | |
161 | except KeyError: |
|
169 | except KeyError: | |
162 | pass |
|
170 | pass | |
163 |
|
171 | |||
164 | def quiet(self): |
|
172 | def quiet(self): | |
165 | """Should we silence the display hook because of ';'?""" |
|
173 | """Should we silence the display hook because of ';'?""" | |
166 | # do not print output if input ends in ';' |
|
174 | # do not print output if input ends in ';' | |
167 | try: |
|
175 | try: | |
168 | if self.shell.input_hist[self.prompt_count].endswith(';\n'): |
|
176 | if self.shell.input_hist[self.prompt_count].endswith(';\n'): | |
169 | return True |
|
177 | return True | |
170 | except IndexError: |
|
178 | except IndexError: | |
171 | # some uses of ipshellembed may fail here |
|
179 | # some uses of ipshellembed may fail here | |
172 | pass |
|
180 | pass | |
173 | return False |
|
181 | return False | |
174 |
|
182 | |||
175 | def start_displayhook(self): |
|
183 | def start_displayhook(self): | |
176 | """Start the displayhook, initializing resources.""" |
|
184 | """Start the displayhook, initializing resources.""" | |
177 | pass |
|
185 | pass | |
178 |
|
186 | |||
179 | def write_output_prompt(self): |
|
187 | def write_output_prompt(self): | |
180 | """Write the output prompt.""" |
|
188 | """Write the output prompt.""" | |
181 | # Use write, not print which adds an extra space. |
|
189 | # Use write, not print which adds an extra space. | |
182 | IPython.utils.io.Term.cout.write(self.output_sep) |
|
190 | IPython.utils.io.Term.cout.write(self.output_sep) | |
183 | outprompt = str(self.prompt_out) |
|
191 | outprompt = str(self.prompt_out) | |
184 | if self.do_full_cache: |
|
192 | if self.do_full_cache: | |
185 | IPython.utils.io.Term.cout.write(outprompt) |
|
193 | IPython.utils.io.Term.cout.write(outprompt) | |
186 |
|
194 | |||
187 | # TODO: Make this method an extension point. The previous implementation |
|
|||
188 | # has both a result_display hook as well as a result_display generic |
|
|||
189 | # function to customize the repr on a per class basis. We need to rethink |
|
|||
190 | # the hooks mechanism before doing this though. |
|
|||
191 | def compute_result_repr(self, result): |
|
195 | def compute_result_repr(self, result): | |
192 | """Compute and return the repr of the object to be displayed. |
|
196 | """Compute and return the repr of the object to be displayed. | |
193 |
|
197 | |||
194 | This method only compute the string form of the repr and should NOT |
|
198 | This method only compute the string form of the repr and should NOT | |
195 |
actual print or write that to a stream. |
|
199 | actual print or write that to a stream. | |
196 | the result itself, but the default implementation passes the original |
|
|||
197 | through. |
|
|||
198 | """ |
|
200 | """ | |
199 | try: |
|
201 | result_repr = self.default_formatter(result) | |
200 | if self.shell.pprint: |
|
202 | if '\n' in result_repr: | |
201 | try: |
|
203 | # So that multi-line strings line up with the left column of | |
202 | result_repr = pformat(result) |
|
204 | # the screen, instead of having the output prompt mess up | |
203 | except: |
|
205 | # their first line. | |
204 | # Work around possible bugs in pformat |
|
206 | outprompt = str(self.prompt_out) | |
205 | result_repr = repr(result) |
|
207 | if outprompt and not outprompt.endswith('\n'): | |
206 | if '\n' in result_repr: |
|
208 | # But avoid extraneous empty lines. | |
207 | # So that multi-line strings line up with the left column of |
|
209 | result_repr = '\n' + result_repr | |
208 | # the screen, instead of having the output prompt mess up |
|
210 | ||
209 | # their first line. |
|
211 | return result_repr | |
210 | result_repr = '\n' + result_repr |
|
|||
211 | else: |
|
|||
212 | result_repr = repr(result) |
|
|||
213 | except TypeError: |
|
|||
214 | # This happens when result.__repr__ doesn't return a string, |
|
|||
215 | # such as when it returns None. |
|
|||
216 | result_repr = '\n' |
|
|||
217 | return result, result_repr |
|
|||
218 |
|
212 | |||
219 | def write_result_repr(self, result_repr): |
|
213 | def write_result_repr(self, result_repr): | |
220 | # We want to print because we want to always make sure we have a |
|
214 | # We want to print because we want to always make sure we have a | |
221 | # newline, even if all the prompt separators are ''. This is the |
|
215 | # newline, even if all the prompt separators are ''. This is the | |
222 | # standard IPython behavior. |
|
216 | # standard IPython behavior. | |
223 | print >>IPython.utils.io.Term.cout, result_repr |
|
217 | print >>IPython.utils.io.Term.cout, result_repr | |
224 |
|
218 | |||
225 | def update_user_ns(self, result): |
|
219 | def update_user_ns(self, result): | |
226 | """Update user_ns with various things like _, __, _1, etc.""" |
|
220 | """Update user_ns with various things like _, __, _1, etc.""" | |
227 |
|
221 | |||
228 | # Avoid recursive reference when displaying _oh/Out |
|
222 | # Avoid recursive reference when displaying _oh/Out | |
229 | if result is not self.shell.user_ns['_oh']: |
|
223 | if result is not self.shell.user_ns['_oh']: | |
230 | if len(self.shell.user_ns['_oh']) >= self.cache_size and self.do_full_cache: |
|
224 | if len(self.shell.user_ns['_oh']) >= self.cache_size and self.do_full_cache: | |
231 | warn('Output cache limit (currently '+ |
|
225 | warn('Output cache limit (currently '+ | |
232 | `self.cache_size`+' entries) hit.\n' |
|
226 | `self.cache_size`+' entries) hit.\n' | |
233 | 'Flushing cache and resetting history counter...\n' |
|
227 | 'Flushing cache and resetting history counter...\n' | |
234 | 'The only history variables available will be _,__,___ and _1\n' |
|
228 | 'The only history variables available will be _,__,___ and _1\n' | |
235 | 'with the current result.') |
|
229 | 'with the current result.') | |
236 |
|
230 | |||
237 | self.flush() |
|
231 | self.flush() | |
238 | # Don't overwrite '_' and friends if '_' is in __builtin__ (otherwise |
|
232 | # Don't overwrite '_' and friends if '_' is in __builtin__ (otherwise | |
239 | # we cause buggy behavior for things like gettext). |
|
233 | # we cause buggy behavior for things like gettext). | |
240 | if '_' not in __builtin__.__dict__: |
|
234 | if '_' not in __builtin__.__dict__: | |
241 | self.___ = self.__ |
|
235 | self.___ = self.__ | |
242 | self.__ = self._ |
|
236 | self.__ = self._ | |
243 | self._ = result |
|
237 | self._ = result | |
244 | self.shell.user_ns.update({'_':self._,'__':self.__,'___':self.___}) |
|
238 | self.shell.user_ns.update({'_':self._,'__':self.__,'___':self.___}) | |
245 |
|
239 | |||
246 | # hackish access to top-level namespace to create _1,_2... dynamically |
|
240 | # hackish access to top-level namespace to create _1,_2... dynamically | |
247 | to_main = {} |
|
241 | to_main = {} | |
248 | if self.do_full_cache: |
|
242 | if self.do_full_cache: | |
249 | new_result = '_'+`self.prompt_count` |
|
243 | new_result = '_'+`self.prompt_count` | |
250 | to_main[new_result] = result |
|
244 | to_main[new_result] = result | |
251 | self.shell.user_ns.update(to_main) |
|
245 | self.shell.user_ns.update(to_main) | |
252 | self.shell.user_ns['_oh'][self.prompt_count] = result |
|
246 | self.shell.user_ns['_oh'][self.prompt_count] = result | |
253 |
|
247 | |||
254 | def log_output(self, result): |
|
248 | def log_output(self, result): | |
255 | """Log the output.""" |
|
249 | """Log the output.""" | |
256 | if self.shell.logger.log_output: |
|
250 | if self.shell.logger.log_output: | |
257 | self.shell.logger.log_write(repr(result), 'output') |
|
251 | self.shell.logger.log_write(repr(result), 'output') | |
258 |
|
252 | |||
259 | def finish_displayhook(self): |
|
253 | def finish_displayhook(self): | |
260 | """Finish up all displayhook activities.""" |
|
254 | """Finish up all displayhook activities.""" | |
261 | IPython.utils.io.Term.cout.write(self.output_sep2) |
|
255 | IPython.utils.io.Term.cout.write(self.output_sep2) | |
262 | IPython.utils.io.Term.cout.flush() |
|
256 | IPython.utils.io.Term.cout.flush() | |
263 |
|
257 | |||
264 | def __call__(self, result=None): |
|
258 | def __call__(self, result=None): | |
265 | """Printing with history cache management. |
|
259 | """Printing with history cache management. | |
266 |
|
260 | |||
267 | This is invoked everytime the interpreter needs to print, and is |
|
261 | This is invoked everytime the interpreter needs to print, and is | |
268 | activated by setting the variable sys.displayhook to it. |
|
262 | activated by setting the variable sys.displayhook to it. | |
269 | """ |
|
263 | """ | |
270 | self.check_for_underscore() |
|
264 | self.check_for_underscore() | |
271 | if result is not None and not self.quiet(): |
|
265 | if result is not None and not self.quiet(): | |
272 | self.start_displayhook() |
|
266 | self.start_displayhook() | |
273 | self.write_output_prompt() |
|
267 | self.write_output_prompt() | |
274 |
|
|
268 | result_repr = self.compute_result_repr(result) | |
275 | self.write_result_repr(result_repr) |
|
269 | self.write_result_repr(result_repr) | |
276 | self.update_user_ns(result) |
|
270 | self.update_user_ns(result) | |
277 | self.log_output(result) |
|
271 | self.log_output(result) | |
278 | self.finish_displayhook() |
|
272 | self.finish_displayhook() | |
279 |
|
273 | |||
280 | def flush(self): |
|
274 | def flush(self): | |
281 | if not self.do_full_cache: |
|
275 | if not self.do_full_cache: | |
282 | raise ValueError,"You shouldn't have reached the cache flush "\ |
|
276 | raise ValueError,"You shouldn't have reached the cache flush "\ | |
283 | "if full caching is not enabled!" |
|
277 | "if full caching is not enabled!" | |
284 | # delete auto-generated vars from global namespace |
|
278 | # delete auto-generated vars from global namespace | |
285 |
|
279 | |||
286 | for n in range(1,self.prompt_count + 1): |
|
280 | for n in range(1,self.prompt_count + 1): | |
287 | key = '_'+`n` |
|
281 | key = '_'+`n` | |
288 | try: |
|
282 | try: | |
289 | del self.shell.user_ns[key] |
|
283 | del self.shell.user_ns[key] | |
290 | except: pass |
|
284 | except: pass | |
291 | self.shell.user_ns['_oh'].clear() |
|
285 | self.shell.user_ns['_oh'].clear() | |
292 |
|
286 | |||
293 | if '_' not in __builtin__.__dict__: |
|
287 | if '_' not in __builtin__.__dict__: | |
294 | self.shell.user_ns.update({'_':None,'__':None, '___':None}) |
|
288 | self.shell.user_ns.update({'_':None,'__':None, '___':None}) | |
295 | import gc |
|
289 | import gc | |
296 | gc.collect() # xxx needed? |
|
290 | gc.collect() # xxx needed? | |
297 |
|
291 |
@@ -1,124 +1,123 b'' | |||||
1 | # -*- coding: utf-8 -*- |
|
1 | # -*- coding: utf-8 -*- | |
2 | """Displayhook formatters. |
|
2 | """Displayhook formatters. | |
3 |
|
3 | |||
4 | Authors: |
|
4 | Authors: | |
5 |
|
5 | |||
6 | * Robert Kern |
|
6 | * Robert Kern | |
7 | """ |
|
7 | """ | |
8 |
|
8 | |||
9 | import abc |
|
9 | import abc | |
10 | from cStringIO import StringIO |
|
10 | from cStringIO import StringIO | |
11 |
|
11 | |||
12 | from IPython.config.configurable import Configurable |
|
12 | from IPython.config.configurable import Configurable | |
13 | from IPython.external import pretty |
|
13 | from IPython.external import pretty | |
14 | from IPython.utils.traitlets import Bool, Dict, Int, Str |
|
14 | from IPython.utils.traitlets import Bool, Dict, Int, Str | |
15 |
|
15 | |||
16 |
|
16 | |||
17 | class DefaultFormatter(Configurable): |
|
17 | class DefaultFormatter(Configurable): | |
18 | """ The default pretty-printer. |
|
18 | """ The default pretty-printer. | |
19 | """ |
|
19 | """ | |
20 |
|
20 | |||
21 | # The ID of the formatter. |
|
21 | # The ID of the formatter. | |
22 | id = Str('default') |
|
22 | id = Str('default') | |
23 |
|
23 | |||
24 | # The kind of data returned. |
|
24 | # The kind of data returned. | |
25 | format = Str('text') |
|
25 | format = Str('text') | |
26 |
|
26 | |||
27 | # Whether to pretty-print or not. |
|
27 | # Whether to pretty-print or not. | |
28 | pprint = Bool(True) |
|
28 | pprint = Bool(True, config=True) | |
29 |
|
29 | |||
30 | # Whether to be verbose or not. |
|
30 | # Whether to be verbose or not. | |
31 | verbose = Bool(False) |
|
31 | verbose = Bool(False, config=True) | |
32 |
|
32 | |||
33 | # The maximum width. |
|
33 | # The maximum width. | |
34 | max_width = Int(79) |
|
34 | max_width = Int(79, config=True) | |
35 |
|
35 | |||
36 | # The newline character. |
|
36 | # The newline character. | |
37 | newline = Str('\n') |
|
37 | newline = Str('\n', config=True) | |
38 |
|
38 | |||
39 | # The singleton prettyprinters. |
|
39 | # The singleton prettyprinters. | |
40 | # Maps the IDs of the builtin singleton objects to the format functions. |
|
40 | # Maps the IDs of the builtin singleton objects to the format functions. | |
41 | singleton_pprinters = Dict() |
|
41 | singleton_pprinters = Dict(config=True) | |
42 | def _singleton_pprinters_default(self): |
|
42 | def _singleton_pprinters_default(self): | |
43 | return pretty._singleton_pprinters.copy() |
|
43 | return pretty._singleton_pprinters.copy() | |
44 |
|
44 | |||
45 | # The type-specific prettyprinters. |
|
45 | # The type-specific prettyprinters. | |
46 | # Map type objects to the format functions. |
|
46 | # Map type objects to the format functions. | |
47 | type_pprinters = Dict() |
|
47 | type_pprinters = Dict(config=True) | |
48 | def _type_pprinters_default(self): |
|
48 | def _type_pprinters_default(self): | |
49 | return pretty._type_pprinters.copy() |
|
49 | return pretty._type_pprinters.copy() | |
50 |
|
50 | |||
51 | # The deferred-import type-specific prettyprinters. |
|
51 | # The deferred-import type-specific prettyprinters. | |
52 | # Map (modulename, classname) pairs to the format functions. |
|
52 | # Map (modulename, classname) pairs to the format functions. | |
53 | deferred_pprinters = Dict() |
|
53 | deferred_pprinters = Dict(config=True) | |
54 | def _deferred_pprinters_default(self): |
|
54 | def _deferred_pprinters_default(self): | |
55 | return pretty._deferred_type_pprinters.copy() |
|
55 | return pretty._deferred_type_pprinters.copy() | |
56 |
|
56 | |||
57 | #### FormatterABC interface #### |
|
57 | #### FormatterABC interface #### | |
58 |
|
58 | |||
59 | def __call__(self, obj): |
|
59 | def __call__(self, obj): | |
60 | """ Format the object. |
|
60 | """ Format the object. | |
61 | """ |
|
61 | """ | |
62 | if not self.pprint: |
|
62 | if not self.pprint: | |
63 |
|
|
63 | try: | |
64 | if r is None: |
|
64 | return repr(obj) | |
65 | # It can happen. |
|
65 | except TypeError: | |
66 |
r |
|
66 | return '' | |
67 | return r |
|
|||
68 | else: |
|
67 | else: | |
69 | stream = StringIO() |
|
68 | stream = StringIO() | |
70 | printer = pretty.RepresentationPrinter(stream, self.verbose, |
|
69 | printer = pretty.RepresentationPrinter(stream, self.verbose, | |
71 | self.max_width, self.newline, |
|
70 | self.max_width, self.newline, | |
72 | singleton_pprinters=self.singleton_pprinters, |
|
71 | singleton_pprinters=self.singleton_pprinters, | |
73 | type_pprinters=self.type_pprinters, |
|
72 | type_pprinters=self.type_pprinters, | |
74 | deferred_pprinters=self.deferred_pprinters) |
|
73 | deferred_pprinters=self.deferred_pprinters) | |
75 | printer.pretty(obj) |
|
74 | printer.pretty(obj) | |
76 | printer.flush() |
|
75 | printer.flush() | |
77 | return stream.getvalue() |
|
76 | return stream.getvalue() | |
78 |
|
77 | |||
79 |
|
78 | |||
80 | #### DefaultFormatter interface #### |
|
79 | #### DefaultFormatter interface #### | |
81 |
|
80 | |||
82 | def for_type(self, typ, func): |
|
81 | def for_type(self, typ, func): | |
83 | """ |
|
82 | """ | |
84 | Add a pretty printer for a given type. |
|
83 | Add a pretty printer for a given type. | |
85 | """ |
|
84 | """ | |
86 | oldfunc = self.type_pprinters.get(typ, None) |
|
85 | oldfunc = self.type_pprinters.get(typ, None) | |
87 | if func is not None: |
|
86 | if func is not None: | |
88 | # To support easy restoration of old pprinters, we need to ignore |
|
87 | # To support easy restoration of old pprinters, we need to ignore | |
89 | # Nones. |
|
88 | # Nones. | |
90 | self.type_pprinters[typ] = func |
|
89 | self.type_pprinters[typ] = func | |
91 | return oldfunc |
|
90 | return oldfunc | |
92 |
|
91 | |||
93 | def for_type_by_name(self, type_module, type_name, func): |
|
92 | def for_type_by_name(self, type_module, type_name, func): | |
94 | """ |
|
93 | """ | |
95 | Add a pretty printer for a type specified by the module and name of |
|
94 | Add a pretty printer for a type specified by the module and name of | |
96 | a type rather than the type object itself. |
|
95 | a type rather than the type object itself. | |
97 | """ |
|
96 | """ | |
98 | key = (type_module, type_name) |
|
97 | key = (type_module, type_name) | |
99 | oldfunc = self.deferred_pprinters.get(key, None) |
|
98 | oldfunc = self.deferred_pprinters.get(key, None) | |
100 | if func is not None: |
|
99 | if func is not None: | |
101 | # To support easy restoration of old pprinters, we need to ignore |
|
100 | # To support easy restoration of old pprinters, we need to ignore | |
102 | # Nones. |
|
101 | # Nones. | |
103 | self.deferred_pprinters[key] = func |
|
102 | self.deferred_pprinters[key] = func | |
104 | return oldfunc |
|
103 | return oldfunc | |
105 |
|
104 | |||
106 |
|
105 | |||
107 | class FormatterABC(object): |
|
106 | class FormatterABC(object): | |
108 | """ Abstract base class for Formatters. |
|
107 | """ Abstract base class for Formatters. | |
109 | """ |
|
108 | """ | |
110 | __metaclass__ = abc.ABCMeta |
|
109 | __metaclass__ = abc.ABCMeta | |
111 |
|
110 | |||
112 | # The ID of the formatter. |
|
111 | # The ID of the formatter. | |
113 | id = 'abstract' |
|
112 | id = 'abstract' | |
114 |
|
113 | |||
115 | # The kind of data returned. |
|
114 | # The kind of data returned. | |
116 | format = 'text' |
|
115 | format = 'text' | |
117 |
|
116 | |||
118 | @abc.abstractmethod |
|
117 | @abc.abstractmethod | |
119 | def __call__(self, obj): |
|
118 | def __call__(self, obj): | |
120 | """ Return a JSONable representation of the object. |
|
119 | """ Return a JSONable representation of the object. | |
121 | """ |
|
120 | """ | |
122 | return repr(obj) |
|
121 | return repr(obj) | |
123 |
|
122 | |||
124 | FormatterABC.register(DefaultFormatter) |
|
123 | FormatterABC.register(DefaultFormatter) |
@@ -1,2537 +1,2538 b'' | |||||
1 | # -*- coding: utf-8 -*- |
|
1 | # -*- coding: utf-8 -*- | |
2 | """Main IPython class.""" |
|
2 | """Main IPython class.""" | |
3 |
|
3 | |||
4 | #----------------------------------------------------------------------------- |
|
4 | #----------------------------------------------------------------------------- | |
5 | # Copyright (C) 2001 Janko Hauser <jhauser@zscout.de> |
|
5 | # Copyright (C) 2001 Janko Hauser <jhauser@zscout.de> | |
6 | # Copyright (C) 2001-2007 Fernando Perez. <fperez@colorado.edu> |
|
6 | # Copyright (C) 2001-2007 Fernando Perez. <fperez@colorado.edu> | |
7 | # Copyright (C) 2008-2010 The IPython Development Team |
|
7 | # Copyright (C) 2008-2010 The IPython Development Team | |
8 | # |
|
8 | # | |
9 | # Distributed under the terms of the BSD License. The full license is in |
|
9 | # Distributed under the terms of the BSD License. The full license is in | |
10 | # the file COPYING, distributed as part of this software. |
|
10 | # the file COPYING, distributed as part of this software. | |
11 | #----------------------------------------------------------------------------- |
|
11 | #----------------------------------------------------------------------------- | |
12 |
|
12 | |||
13 | #----------------------------------------------------------------------------- |
|
13 | #----------------------------------------------------------------------------- | |
14 | # Imports |
|
14 | # Imports | |
15 | #----------------------------------------------------------------------------- |
|
15 | #----------------------------------------------------------------------------- | |
16 |
|
16 | |||
17 | from __future__ import with_statement |
|
17 | from __future__ import with_statement | |
18 | from __future__ import absolute_import |
|
18 | from __future__ import absolute_import | |
19 |
|
19 | |||
20 | import __builtin__ |
|
20 | import __builtin__ | |
21 | import __future__ |
|
21 | import __future__ | |
22 | import abc |
|
22 | import abc | |
23 | import atexit |
|
23 | import atexit | |
24 | import codeop |
|
24 | import codeop | |
25 | import os |
|
25 | import os | |
26 | import re |
|
26 | import re | |
27 | import sys |
|
27 | import sys | |
28 | import tempfile |
|
28 | import tempfile | |
29 | import types |
|
29 | import types | |
30 | from contextlib import nested |
|
30 | from contextlib import nested | |
31 |
|
31 | |||
32 | from IPython.config.configurable import Configurable |
|
32 | from IPython.config.configurable import Configurable | |
33 | from IPython.core import debugger, oinspect |
|
33 | from IPython.core import debugger, oinspect | |
34 | from IPython.core import history as ipcorehist |
|
34 | from IPython.core import history as ipcorehist | |
35 | from IPython.core import page |
|
35 | from IPython.core import page | |
36 | from IPython.core import prefilter |
|
36 | from IPython.core import prefilter | |
37 | from IPython.core import shadowns |
|
37 | from IPython.core import shadowns | |
38 | from IPython.core import ultratb |
|
38 | from IPython.core import ultratb | |
39 | from IPython.core.alias import AliasManager |
|
39 | from IPython.core.alias import AliasManager | |
40 | from IPython.core.builtin_trap import BuiltinTrap |
|
40 | from IPython.core.builtin_trap import BuiltinTrap | |
41 | from IPython.core.compilerop import CachingCompiler |
|
41 | from IPython.core.compilerop import CachingCompiler | |
42 | from IPython.core.display_trap import DisplayTrap |
|
42 | from IPython.core.display_trap import DisplayTrap | |
43 | from IPython.core.displayhook import DisplayHook |
|
43 | from IPython.core.displayhook import DisplayHook | |
44 | from IPython.core.error import TryNext, UsageError |
|
44 | from IPython.core.error import TryNext, UsageError | |
45 | from IPython.core.extensions import ExtensionManager |
|
45 | from IPython.core.extensions import ExtensionManager | |
46 | from IPython.core.fakemodule import FakeModule, init_fakemod_dict |
|
46 | from IPython.core.fakemodule import FakeModule, init_fakemod_dict | |
47 | from IPython.core.history import HistoryManager |
|
47 | from IPython.core.history import HistoryManager | |
48 | from IPython.core.inputlist import InputList |
|
48 | from IPython.core.inputlist import InputList | |
49 | from IPython.core.inputsplitter import IPythonInputSplitter |
|
49 | from IPython.core.inputsplitter import IPythonInputSplitter | |
50 | from IPython.core.logger import Logger |
|
50 | from IPython.core.logger import Logger | |
51 | from IPython.core.magic import Magic |
|
51 | from IPython.core.magic import Magic | |
52 | from IPython.core.payload import PayloadManager |
|
52 | from IPython.core.payload import PayloadManager | |
53 | from IPython.core.plugin import PluginManager |
|
53 | from IPython.core.plugin import PluginManager | |
54 | from IPython.core.prefilter import PrefilterManager, ESC_MAGIC |
|
54 | from IPython.core.prefilter import PrefilterManager, ESC_MAGIC | |
55 | from IPython.external.Itpl import ItplNS |
|
55 | from IPython.external.Itpl import ItplNS | |
56 | from IPython.utils import PyColorize |
|
56 | from IPython.utils import PyColorize | |
57 | from IPython.utils import io |
|
57 | from IPython.utils import io | |
58 | from IPython.utils import pickleshare |
|
58 | from IPython.utils import pickleshare | |
59 | from IPython.utils.doctestreload import doctest_reload |
|
59 | from IPython.utils.doctestreload import doctest_reload | |
60 | from IPython.utils.io import ask_yes_no, rprint |
|
60 | from IPython.utils.io import ask_yes_no, rprint | |
61 | from IPython.utils.ipstruct import Struct |
|
61 | from IPython.utils.ipstruct import Struct | |
62 | from IPython.utils.path import get_home_dir, get_ipython_dir, HomeDirError |
|
62 | from IPython.utils.path import get_home_dir, get_ipython_dir, HomeDirError | |
63 | from IPython.utils.process import system, getoutput |
|
63 | from IPython.utils.process import system, getoutput | |
64 | from IPython.utils.strdispatch import StrDispatch |
|
64 | from IPython.utils.strdispatch import StrDispatch | |
65 | from IPython.utils.syspathcontext import prepended_to_syspath |
|
65 | from IPython.utils.syspathcontext import prepended_to_syspath | |
66 | from IPython.utils.text import num_ini_spaces, format_screen, LSString, SList |
|
66 | from IPython.utils.text import num_ini_spaces, format_screen, LSString, SList | |
67 | from IPython.utils.traitlets import (Int, Str, CBool, CaselessStrEnum, Enum, |
|
67 | from IPython.utils.traitlets import (Int, Str, CBool, CaselessStrEnum, Enum, | |
68 | List, Unicode, Instance, Type) |
|
68 | List, Unicode, Instance, Type) | |
69 | from IPython.utils.warn import warn, error, fatal |
|
69 | from IPython.utils.warn import warn, error, fatal | |
70 | import IPython.core.hooks |
|
70 | import IPython.core.hooks | |
71 |
|
71 | |||
72 | #----------------------------------------------------------------------------- |
|
72 | #----------------------------------------------------------------------------- | |
73 | # Globals |
|
73 | # Globals | |
74 | #----------------------------------------------------------------------------- |
|
74 | #----------------------------------------------------------------------------- | |
75 |
|
75 | |||
76 | # compiled regexps for autoindent management |
|
76 | # compiled regexps for autoindent management | |
77 | dedent_re = re.compile(r'^\s+raise|^\s+return|^\s+pass') |
|
77 | dedent_re = re.compile(r'^\s+raise|^\s+return|^\s+pass') | |
78 |
|
78 | |||
79 | #----------------------------------------------------------------------------- |
|
79 | #----------------------------------------------------------------------------- | |
80 | # Utilities |
|
80 | # Utilities | |
81 | #----------------------------------------------------------------------------- |
|
81 | #----------------------------------------------------------------------------- | |
82 |
|
82 | |||
83 | # store the builtin raw_input globally, and use this always, in case user code |
|
83 | # store the builtin raw_input globally, and use this always, in case user code | |
84 | # overwrites it (like wx.py.PyShell does) |
|
84 | # overwrites it (like wx.py.PyShell does) | |
85 | raw_input_original = raw_input |
|
85 | raw_input_original = raw_input | |
86 |
|
86 | |||
87 | def softspace(file, newvalue): |
|
87 | def softspace(file, newvalue): | |
88 | """Copied from code.py, to remove the dependency""" |
|
88 | """Copied from code.py, to remove the dependency""" | |
89 |
|
89 | |||
90 | oldvalue = 0 |
|
90 | oldvalue = 0 | |
91 | try: |
|
91 | try: | |
92 | oldvalue = file.softspace |
|
92 | oldvalue = file.softspace | |
93 | except AttributeError: |
|
93 | except AttributeError: | |
94 | pass |
|
94 | pass | |
95 | try: |
|
95 | try: | |
96 | file.softspace = newvalue |
|
96 | file.softspace = newvalue | |
97 | except (AttributeError, TypeError): |
|
97 | except (AttributeError, TypeError): | |
98 | # "attribute-less object" or "read-only attributes" |
|
98 | # "attribute-less object" or "read-only attributes" | |
99 | pass |
|
99 | pass | |
100 | return oldvalue |
|
100 | return oldvalue | |
101 |
|
101 | |||
102 |
|
102 | |||
103 | def no_op(*a, **kw): pass |
|
103 | def no_op(*a, **kw): pass | |
104 |
|
104 | |||
105 | class SpaceInInput(Exception): pass |
|
105 | class SpaceInInput(Exception): pass | |
106 |
|
106 | |||
107 | class Bunch: pass |
|
107 | class Bunch: pass | |
108 |
|
108 | |||
109 |
|
109 | |||
110 | def get_default_colors(): |
|
110 | def get_default_colors(): | |
111 | if sys.platform=='darwin': |
|
111 | if sys.platform=='darwin': | |
112 | return "LightBG" |
|
112 | return "LightBG" | |
113 | elif os.name=='nt': |
|
113 | elif os.name=='nt': | |
114 | return 'Linux' |
|
114 | return 'Linux' | |
115 | else: |
|
115 | else: | |
116 | return 'Linux' |
|
116 | return 'Linux' | |
117 |
|
117 | |||
118 |
|
118 | |||
119 | class SeparateStr(Str): |
|
119 | class SeparateStr(Str): | |
120 | """A Str subclass to validate separate_in, separate_out, etc. |
|
120 | """A Str subclass to validate separate_in, separate_out, etc. | |
121 |
|
121 | |||
122 | This is a Str based trait that converts '0'->'' and '\\n'->'\n'. |
|
122 | This is a Str based trait that converts '0'->'' and '\\n'->'\n'. | |
123 | """ |
|
123 | """ | |
124 |
|
124 | |||
125 | def validate(self, obj, value): |
|
125 | def validate(self, obj, value): | |
126 | if value == '0': value = '' |
|
126 | if value == '0': value = '' | |
127 | value = value.replace('\\n','\n') |
|
127 | value = value.replace('\\n','\n') | |
128 | return super(SeparateStr, self).validate(obj, value) |
|
128 | return super(SeparateStr, self).validate(obj, value) | |
129 |
|
129 | |||
130 | class MultipleInstanceError(Exception): |
|
130 | class MultipleInstanceError(Exception): | |
131 | pass |
|
131 | pass | |
132 |
|
132 | |||
133 |
|
133 | |||
134 | #----------------------------------------------------------------------------- |
|
134 | #----------------------------------------------------------------------------- | |
135 | # Main IPython class |
|
135 | # Main IPython class | |
136 | #----------------------------------------------------------------------------- |
|
136 | #----------------------------------------------------------------------------- | |
137 |
|
137 | |||
138 | class InteractiveShell(Configurable, Magic): |
|
138 | class InteractiveShell(Configurable, Magic): | |
139 | """An enhanced, interactive shell for Python.""" |
|
139 | """An enhanced, interactive shell for Python.""" | |
140 |
|
140 | |||
141 | _instance = None |
|
141 | _instance = None | |
142 | autocall = Enum((0,1,2), default_value=1, config=True) |
|
142 | autocall = Enum((0,1,2), default_value=1, config=True) | |
143 | # TODO: remove all autoindent logic and put into frontends. |
|
143 | # TODO: remove all autoindent logic and put into frontends. | |
144 | # We can't do this yet because even runlines uses the autoindent. |
|
144 | # We can't do this yet because even runlines uses the autoindent. | |
145 | autoindent = CBool(True, config=True) |
|
145 | autoindent = CBool(True, config=True) | |
146 | automagic = CBool(True, config=True) |
|
146 | automagic = CBool(True, config=True) | |
147 | cache_size = Int(1000, config=True) |
|
147 | cache_size = Int(1000, config=True) | |
148 | color_info = CBool(True, config=True) |
|
148 | color_info = CBool(True, config=True) | |
149 | colors = CaselessStrEnum(('NoColor','LightBG','Linux'), |
|
149 | colors = CaselessStrEnum(('NoColor','LightBG','Linux'), | |
150 | default_value=get_default_colors(), config=True) |
|
150 | default_value=get_default_colors(), config=True) | |
151 | debug = CBool(False, config=True) |
|
151 | debug = CBool(False, config=True) | |
152 | deep_reload = CBool(False, config=True) |
|
152 | deep_reload = CBool(False, config=True) | |
153 | displayhook_class = Type(DisplayHook) |
|
153 | displayhook_class = Type(DisplayHook) | |
154 | exit_now = CBool(False) |
|
154 | exit_now = CBool(False) | |
155 | # Monotonically increasing execution counter |
|
155 | # Monotonically increasing execution counter | |
156 | execution_count = Int(1) |
|
156 | execution_count = Int(1) | |
157 | filename = Str("<ipython console>") |
|
157 | filename = Str("<ipython console>") | |
158 | ipython_dir= Unicode('', config=True) # Set to get_ipython_dir() in __init__ |
|
158 | ipython_dir= Unicode('', config=True) # Set to get_ipython_dir() in __init__ | |
159 |
|
159 | |||
160 | # Input splitter, to split entire cells of input into either individual |
|
160 | # Input splitter, to split entire cells of input into either individual | |
161 | # interactive statements or whole blocks. |
|
161 | # interactive statements or whole blocks. | |
162 | input_splitter = Instance('IPython.core.inputsplitter.IPythonInputSplitter', |
|
162 | input_splitter = Instance('IPython.core.inputsplitter.IPythonInputSplitter', | |
163 | (), {}) |
|
163 | (), {}) | |
164 | logstart = CBool(False, config=True) |
|
164 | logstart = CBool(False, config=True) | |
165 | logfile = Str('', config=True) |
|
165 | logfile = Str('', config=True) | |
166 | logappend = Str('', config=True) |
|
166 | logappend = Str('', config=True) | |
167 | object_info_string_level = Enum((0,1,2), default_value=0, |
|
167 | object_info_string_level = Enum((0,1,2), default_value=0, | |
168 | config=True) |
|
168 | config=True) | |
169 | pdb = CBool(False, config=True) |
|
169 | pdb = CBool(False, config=True) | |
170 |
|
170 | |||
171 | pprint = CBool(True, config=True) |
|
171 | pprint = CBool(True, config=True) | |
172 | profile = Str('', config=True) |
|
172 | profile = Str('', config=True) | |
173 | prompt_in1 = Str('In [\\#]: ', config=True) |
|
173 | prompt_in1 = Str('In [\\#]: ', config=True) | |
174 | prompt_in2 = Str(' .\\D.: ', config=True) |
|
174 | prompt_in2 = Str(' .\\D.: ', config=True) | |
175 | prompt_out = Str('Out[\\#]: ', config=True) |
|
175 | prompt_out = Str('Out[\\#]: ', config=True) | |
176 | prompts_pad_left = CBool(True, config=True) |
|
176 | prompts_pad_left = CBool(True, config=True) | |
177 | quiet = CBool(False, config=True) |
|
177 | quiet = CBool(False, config=True) | |
178 |
|
178 | |||
179 | # The readline stuff will eventually be moved to the terminal subclass |
|
179 | # The readline stuff will eventually be moved to the terminal subclass | |
180 | # but for now, we can't do that as readline is welded in everywhere. |
|
180 | # but for now, we can't do that as readline is welded in everywhere. | |
181 | readline_use = CBool(True, config=True) |
|
181 | readline_use = CBool(True, config=True) | |
182 | readline_merge_completions = CBool(True, config=True) |
|
182 | readline_merge_completions = CBool(True, config=True) | |
183 | readline_omit__names = Enum((0,1,2), default_value=0, config=True) |
|
183 | readline_omit__names = Enum((0,1,2), default_value=0, config=True) | |
184 | readline_remove_delims = Str('-/~', config=True) |
|
184 | readline_remove_delims = Str('-/~', config=True) | |
185 | readline_parse_and_bind = List([ |
|
185 | readline_parse_and_bind = List([ | |
186 | 'tab: complete', |
|
186 | 'tab: complete', | |
187 | '"\C-l": clear-screen', |
|
187 | '"\C-l": clear-screen', | |
188 | 'set show-all-if-ambiguous on', |
|
188 | 'set show-all-if-ambiguous on', | |
189 | '"\C-o": tab-insert', |
|
189 | '"\C-o": tab-insert', | |
190 | '"\M-i": " "', |
|
190 | '"\M-i": " "', | |
191 | '"\M-o": "\d\d\d\d"', |
|
191 | '"\M-o": "\d\d\d\d"', | |
192 | '"\M-I": "\d\d\d\d"', |
|
192 | '"\M-I": "\d\d\d\d"', | |
193 | '"\C-r": reverse-search-history', |
|
193 | '"\C-r": reverse-search-history', | |
194 | '"\C-s": forward-search-history', |
|
194 | '"\C-s": forward-search-history', | |
195 | '"\C-p": history-search-backward', |
|
195 | '"\C-p": history-search-backward', | |
196 | '"\C-n": history-search-forward', |
|
196 | '"\C-n": history-search-forward', | |
197 | '"\e[A": history-search-backward', |
|
197 | '"\e[A": history-search-backward', | |
198 | '"\e[B": history-search-forward', |
|
198 | '"\e[B": history-search-forward', | |
199 | '"\C-k": kill-line', |
|
199 | '"\C-k": kill-line', | |
200 | '"\C-u": unix-line-discard', |
|
200 | '"\C-u": unix-line-discard', | |
201 | ], allow_none=False, config=True) |
|
201 | ], allow_none=False, config=True) | |
202 |
|
202 | |||
203 | # TODO: this part of prompt management should be moved to the frontends. |
|
203 | # TODO: this part of prompt management should be moved to the frontends. | |
204 | # Use custom TraitTypes that convert '0'->'' and '\\n'->'\n' |
|
204 | # Use custom TraitTypes that convert '0'->'' and '\\n'->'\n' | |
205 | separate_in = SeparateStr('\n', config=True) |
|
205 | separate_in = SeparateStr('\n', config=True) | |
206 | separate_out = SeparateStr('', config=True) |
|
206 | separate_out = SeparateStr('', config=True) | |
207 | separate_out2 = SeparateStr('', config=True) |
|
207 | separate_out2 = SeparateStr('', config=True) | |
208 | wildcards_case_sensitive = CBool(True, config=True) |
|
208 | wildcards_case_sensitive = CBool(True, config=True) | |
209 | xmode = CaselessStrEnum(('Context','Plain', 'Verbose'), |
|
209 | xmode = CaselessStrEnum(('Context','Plain', 'Verbose'), | |
210 | default_value='Context', config=True) |
|
210 | default_value='Context', config=True) | |
211 |
|
211 | |||
212 | # Subcomponents of InteractiveShell |
|
212 | # Subcomponents of InteractiveShell | |
213 | alias_manager = Instance('IPython.core.alias.AliasManager') |
|
213 | alias_manager = Instance('IPython.core.alias.AliasManager') | |
214 | prefilter_manager = Instance('IPython.core.prefilter.PrefilterManager') |
|
214 | prefilter_manager = Instance('IPython.core.prefilter.PrefilterManager') | |
215 | builtin_trap = Instance('IPython.core.builtin_trap.BuiltinTrap') |
|
215 | builtin_trap = Instance('IPython.core.builtin_trap.BuiltinTrap') | |
216 | display_trap = Instance('IPython.core.display_trap.DisplayTrap') |
|
216 | display_trap = Instance('IPython.core.display_trap.DisplayTrap') | |
217 | extension_manager = Instance('IPython.core.extensions.ExtensionManager') |
|
217 | extension_manager = Instance('IPython.core.extensions.ExtensionManager') | |
218 | plugin_manager = Instance('IPython.core.plugin.PluginManager') |
|
218 | plugin_manager = Instance('IPython.core.plugin.PluginManager') | |
219 | payload_manager = Instance('IPython.core.payload.PayloadManager') |
|
219 | payload_manager = Instance('IPython.core.payload.PayloadManager') | |
220 | history_manager = Instance('IPython.core.history.HistoryManager') |
|
220 | history_manager = Instance('IPython.core.history.HistoryManager') | |
221 |
|
221 | |||
222 | # Private interface |
|
222 | # Private interface | |
223 | _post_execute = set() |
|
223 | _post_execute = set() | |
224 |
|
224 | |||
225 | def __init__(self, config=None, ipython_dir=None, |
|
225 | def __init__(self, config=None, ipython_dir=None, | |
226 | user_ns=None, user_global_ns=None, |
|
226 | user_ns=None, user_global_ns=None, | |
227 | custom_exceptions=((), None)): |
|
227 | custom_exceptions=((), None)): | |
228 |
|
228 | |||
229 | # This is where traits with a config_key argument are updated |
|
229 | # This is where traits with a config_key argument are updated | |
230 | # from the values on config. |
|
230 | # from the values on config. | |
231 | super(InteractiveShell, self).__init__(config=config) |
|
231 | super(InteractiveShell, self).__init__(config=config) | |
232 |
|
232 | |||
233 | # These are relatively independent and stateless |
|
233 | # These are relatively independent and stateless | |
234 | self.init_ipython_dir(ipython_dir) |
|
234 | self.init_ipython_dir(ipython_dir) | |
235 | self.init_instance_attrs() |
|
235 | self.init_instance_attrs() | |
236 | self.init_environment() |
|
236 | self.init_environment() | |
237 |
|
237 | |||
238 | # Create namespaces (user_ns, user_global_ns, etc.) |
|
238 | # Create namespaces (user_ns, user_global_ns, etc.) | |
239 | self.init_create_namespaces(user_ns, user_global_ns) |
|
239 | self.init_create_namespaces(user_ns, user_global_ns) | |
240 | # This has to be done after init_create_namespaces because it uses |
|
240 | # This has to be done after init_create_namespaces because it uses | |
241 | # something in self.user_ns, but before init_sys_modules, which |
|
241 | # something in self.user_ns, but before init_sys_modules, which | |
242 | # is the first thing to modify sys. |
|
242 | # is the first thing to modify sys. | |
243 | # TODO: When we override sys.stdout and sys.stderr before this class |
|
243 | # TODO: When we override sys.stdout and sys.stderr before this class | |
244 | # is created, we are saving the overridden ones here. Not sure if this |
|
244 | # is created, we are saving the overridden ones here. Not sure if this | |
245 | # is what we want to do. |
|
245 | # is what we want to do. | |
246 | self.save_sys_module_state() |
|
246 | self.save_sys_module_state() | |
247 | self.init_sys_modules() |
|
247 | self.init_sys_modules() | |
248 |
|
248 | |||
249 | self.init_history() |
|
249 | self.init_history() | |
250 | self.init_encoding() |
|
250 | self.init_encoding() | |
251 | self.init_prefilter() |
|
251 | self.init_prefilter() | |
252 |
|
252 | |||
253 | Magic.__init__(self, self) |
|
253 | Magic.__init__(self, self) | |
254 |
|
254 | |||
255 | self.init_syntax_highlighting() |
|
255 | self.init_syntax_highlighting() | |
256 | self.init_hooks() |
|
256 | self.init_hooks() | |
257 | self.init_pushd_popd_magic() |
|
257 | self.init_pushd_popd_magic() | |
258 | # self.init_traceback_handlers use to be here, but we moved it below |
|
258 | # self.init_traceback_handlers use to be here, but we moved it below | |
259 | # because it and init_io have to come after init_readline. |
|
259 | # because it and init_io have to come after init_readline. | |
260 | self.init_user_ns() |
|
260 | self.init_user_ns() | |
261 | self.init_logger() |
|
261 | self.init_logger() | |
262 | self.init_alias() |
|
262 | self.init_alias() | |
263 | self.init_builtins() |
|
263 | self.init_builtins() | |
264 |
|
264 | |||
265 | # pre_config_initialization |
|
265 | # pre_config_initialization | |
266 |
|
266 | |||
267 | # The next section should contain everything that was in ipmaker. |
|
267 | # The next section should contain everything that was in ipmaker. | |
268 | self.init_logstart() |
|
268 | self.init_logstart() | |
269 |
|
269 | |||
270 | # The following was in post_config_initialization |
|
270 | # The following was in post_config_initialization | |
271 | self.init_inspector() |
|
271 | self.init_inspector() | |
272 | # init_readline() must come before init_io(), because init_io uses |
|
272 | # init_readline() must come before init_io(), because init_io uses | |
273 | # readline related things. |
|
273 | # readline related things. | |
274 | self.init_readline() |
|
274 | self.init_readline() | |
275 | # init_completer must come after init_readline, because it needs to |
|
275 | # init_completer must come after init_readline, because it needs to | |
276 | # know whether readline is present or not system-wide to configure the |
|
276 | # know whether readline is present or not system-wide to configure the | |
277 | # completers, since the completion machinery can now operate |
|
277 | # completers, since the completion machinery can now operate | |
278 | # independently of readline (e.g. over the network) |
|
278 | # independently of readline (e.g. over the network) | |
279 | self.init_completer() |
|
279 | self.init_completer() | |
280 | # TODO: init_io() needs to happen before init_traceback handlers |
|
280 | # TODO: init_io() needs to happen before init_traceback handlers | |
281 | # because the traceback handlers hardcode the stdout/stderr streams. |
|
281 | # because the traceback handlers hardcode the stdout/stderr streams. | |
282 | # This logic in in debugger.Pdb and should eventually be changed. |
|
282 | # This logic in in debugger.Pdb and should eventually be changed. | |
283 | self.init_io() |
|
283 | self.init_io() | |
284 | self.init_traceback_handlers(custom_exceptions) |
|
284 | self.init_traceback_handlers(custom_exceptions) | |
285 | self.init_prompts() |
|
285 | self.init_prompts() | |
286 | self.init_displayhook() |
|
286 | self.init_displayhook() | |
287 | self.init_reload_doctest() |
|
287 | self.init_reload_doctest() | |
288 | self.init_magics() |
|
288 | self.init_magics() | |
289 | self.init_pdb() |
|
289 | self.init_pdb() | |
290 | self.init_extension_manager() |
|
290 | self.init_extension_manager() | |
291 | self.init_plugin_manager() |
|
291 | self.init_plugin_manager() | |
292 | self.init_payload() |
|
292 | self.init_payload() | |
293 | self.hooks.late_startup_hook() |
|
293 | self.hooks.late_startup_hook() | |
294 | atexit.register(self.atexit_operations) |
|
294 | atexit.register(self.atexit_operations) | |
295 |
|
295 | |||
296 | @classmethod |
|
296 | @classmethod | |
297 | def instance(cls, *args, **kwargs): |
|
297 | def instance(cls, *args, **kwargs): | |
298 | """Returns a global InteractiveShell instance.""" |
|
298 | """Returns a global InteractiveShell instance.""" | |
299 | if cls._instance is None: |
|
299 | if cls._instance is None: | |
300 | inst = cls(*args, **kwargs) |
|
300 | inst = cls(*args, **kwargs) | |
301 | # Now make sure that the instance will also be returned by |
|
301 | # Now make sure that the instance will also be returned by | |
302 | # the subclasses instance attribute. |
|
302 | # the subclasses instance attribute. | |
303 | for subclass in cls.mro(): |
|
303 | for subclass in cls.mro(): | |
304 | if issubclass(cls, subclass) and \ |
|
304 | if issubclass(cls, subclass) and \ | |
305 | issubclass(subclass, InteractiveShell): |
|
305 | issubclass(subclass, InteractiveShell): | |
306 | subclass._instance = inst |
|
306 | subclass._instance = inst | |
307 | else: |
|
307 | else: | |
308 | break |
|
308 | break | |
309 | if isinstance(cls._instance, cls): |
|
309 | if isinstance(cls._instance, cls): | |
310 | return cls._instance |
|
310 | return cls._instance | |
311 | else: |
|
311 | else: | |
312 | raise MultipleInstanceError( |
|
312 | raise MultipleInstanceError( | |
313 | 'Multiple incompatible subclass instances of ' |
|
313 | 'Multiple incompatible subclass instances of ' | |
314 | 'InteractiveShell are being created.' |
|
314 | 'InteractiveShell are being created.' | |
315 | ) |
|
315 | ) | |
316 |
|
316 | |||
317 | @classmethod |
|
317 | @classmethod | |
318 | def initialized(cls): |
|
318 | def initialized(cls): | |
319 | return hasattr(cls, "_instance") |
|
319 | return hasattr(cls, "_instance") | |
320 |
|
320 | |||
321 | def get_ipython(self): |
|
321 | def get_ipython(self): | |
322 | """Return the currently running IPython instance.""" |
|
322 | """Return the currently running IPython instance.""" | |
323 | return self |
|
323 | return self | |
324 |
|
324 | |||
325 | #------------------------------------------------------------------------- |
|
325 | #------------------------------------------------------------------------- | |
326 | # Trait changed handlers |
|
326 | # Trait changed handlers | |
327 | #------------------------------------------------------------------------- |
|
327 | #------------------------------------------------------------------------- | |
328 |
|
328 | |||
329 | def _ipython_dir_changed(self, name, new): |
|
329 | def _ipython_dir_changed(self, name, new): | |
330 | if not os.path.isdir(new): |
|
330 | if not os.path.isdir(new): | |
331 | os.makedirs(new, mode = 0777) |
|
331 | os.makedirs(new, mode = 0777) | |
332 |
|
332 | |||
333 | def set_autoindent(self,value=None): |
|
333 | def set_autoindent(self,value=None): | |
334 | """Set the autoindent flag, checking for readline support. |
|
334 | """Set the autoindent flag, checking for readline support. | |
335 |
|
335 | |||
336 | If called with no arguments, it acts as a toggle.""" |
|
336 | If called with no arguments, it acts as a toggle.""" | |
337 |
|
337 | |||
338 | if not self.has_readline: |
|
338 | if not self.has_readline: | |
339 | if os.name == 'posix': |
|
339 | if os.name == 'posix': | |
340 | warn("The auto-indent feature requires the readline library") |
|
340 | warn("The auto-indent feature requires the readline library") | |
341 | self.autoindent = 0 |
|
341 | self.autoindent = 0 | |
342 | return |
|
342 | return | |
343 | if value is None: |
|
343 | if value is None: | |
344 | self.autoindent = not self.autoindent |
|
344 | self.autoindent = not self.autoindent | |
345 | else: |
|
345 | else: | |
346 | self.autoindent = value |
|
346 | self.autoindent = value | |
347 |
|
347 | |||
348 | #------------------------------------------------------------------------- |
|
348 | #------------------------------------------------------------------------- | |
349 | # init_* methods called by __init__ |
|
349 | # init_* methods called by __init__ | |
350 | #------------------------------------------------------------------------- |
|
350 | #------------------------------------------------------------------------- | |
351 |
|
351 | |||
352 | def init_ipython_dir(self, ipython_dir): |
|
352 | def init_ipython_dir(self, ipython_dir): | |
353 | if ipython_dir is not None: |
|
353 | if ipython_dir is not None: | |
354 | self.ipython_dir = ipython_dir |
|
354 | self.ipython_dir = ipython_dir | |
355 | self.config.Global.ipython_dir = self.ipython_dir |
|
355 | self.config.Global.ipython_dir = self.ipython_dir | |
356 | return |
|
356 | return | |
357 |
|
357 | |||
358 | if hasattr(self.config.Global, 'ipython_dir'): |
|
358 | if hasattr(self.config.Global, 'ipython_dir'): | |
359 | self.ipython_dir = self.config.Global.ipython_dir |
|
359 | self.ipython_dir = self.config.Global.ipython_dir | |
360 | else: |
|
360 | else: | |
361 | self.ipython_dir = get_ipython_dir() |
|
361 | self.ipython_dir = get_ipython_dir() | |
362 |
|
362 | |||
363 | # All children can just read this |
|
363 | # All children can just read this | |
364 | self.config.Global.ipython_dir = self.ipython_dir |
|
364 | self.config.Global.ipython_dir = self.ipython_dir | |
365 |
|
365 | |||
366 | def init_instance_attrs(self): |
|
366 | def init_instance_attrs(self): | |
367 | self.more = False |
|
367 | self.more = False | |
368 |
|
368 | |||
369 | # command compiler |
|
369 | # command compiler | |
370 | self.compile = CachingCompiler() |
|
370 | self.compile = CachingCompiler() | |
371 |
|
371 | |||
372 | # User input buffers |
|
372 | # User input buffers | |
373 | # NOTE: these variables are slated for full removal, once we are 100% |
|
373 | # NOTE: these variables are slated for full removal, once we are 100% | |
374 | # sure that the new execution logic is solid. We will delte runlines, |
|
374 | # sure that the new execution logic is solid. We will delte runlines, | |
375 | # push_line and these buffers, as all input will be managed by the |
|
375 | # push_line and these buffers, as all input will be managed by the | |
376 | # frontends via an inputsplitter instance. |
|
376 | # frontends via an inputsplitter instance. | |
377 | self.buffer = [] |
|
377 | self.buffer = [] | |
378 | self.buffer_raw = [] |
|
378 | self.buffer_raw = [] | |
379 |
|
379 | |||
380 | # Make an empty namespace, which extension writers can rely on both |
|
380 | # Make an empty namespace, which extension writers can rely on both | |
381 | # existing and NEVER being used by ipython itself. This gives them a |
|
381 | # existing and NEVER being used by ipython itself. This gives them a | |
382 | # convenient location for storing additional information and state |
|
382 | # convenient location for storing additional information and state | |
383 | # their extensions may require, without fear of collisions with other |
|
383 | # their extensions may require, without fear of collisions with other | |
384 | # ipython names that may develop later. |
|
384 | # ipython names that may develop later. | |
385 | self.meta = Struct() |
|
385 | self.meta = Struct() | |
386 |
|
386 | |||
387 | # Object variable to store code object waiting execution. This is |
|
387 | # Object variable to store code object waiting execution. This is | |
388 | # used mainly by the multithreaded shells, but it can come in handy in |
|
388 | # used mainly by the multithreaded shells, but it can come in handy in | |
389 | # other situations. No need to use a Queue here, since it's a single |
|
389 | # other situations. No need to use a Queue here, since it's a single | |
390 | # item which gets cleared once run. |
|
390 | # item which gets cleared once run. | |
391 | self.code_to_run = None |
|
391 | self.code_to_run = None | |
392 |
|
392 | |||
393 | # Temporary files used for various purposes. Deleted at exit. |
|
393 | # Temporary files used for various purposes. Deleted at exit. | |
394 | self.tempfiles = [] |
|
394 | self.tempfiles = [] | |
395 |
|
395 | |||
396 | # Keep track of readline usage (later set by init_readline) |
|
396 | # Keep track of readline usage (later set by init_readline) | |
397 | self.has_readline = False |
|
397 | self.has_readline = False | |
398 |
|
398 | |||
399 | # keep track of where we started running (mainly for crash post-mortem) |
|
399 | # keep track of where we started running (mainly for crash post-mortem) | |
400 | # This is not being used anywhere currently. |
|
400 | # This is not being used anywhere currently. | |
401 | self.starting_dir = os.getcwd() |
|
401 | self.starting_dir = os.getcwd() | |
402 |
|
402 | |||
403 | # Indentation management |
|
403 | # Indentation management | |
404 | self.indent_current_nsp = 0 |
|
404 | self.indent_current_nsp = 0 | |
405 |
|
405 | |||
406 | def init_environment(self): |
|
406 | def init_environment(self): | |
407 | """Any changes we need to make to the user's environment.""" |
|
407 | """Any changes we need to make to the user's environment.""" | |
408 | pass |
|
408 | pass | |
409 |
|
409 | |||
410 | def init_encoding(self): |
|
410 | def init_encoding(self): | |
411 | # Get system encoding at startup time. Certain terminals (like Emacs |
|
411 | # Get system encoding at startup time. Certain terminals (like Emacs | |
412 | # under Win32 have it set to None, and we need to have a known valid |
|
412 | # under Win32 have it set to None, and we need to have a known valid | |
413 | # encoding to use in the raw_input() method |
|
413 | # encoding to use in the raw_input() method | |
414 | try: |
|
414 | try: | |
415 | self.stdin_encoding = sys.stdin.encoding or 'ascii' |
|
415 | self.stdin_encoding = sys.stdin.encoding or 'ascii' | |
416 | except AttributeError: |
|
416 | except AttributeError: | |
417 | self.stdin_encoding = 'ascii' |
|
417 | self.stdin_encoding = 'ascii' | |
418 |
|
418 | |||
419 | def init_syntax_highlighting(self): |
|
419 | def init_syntax_highlighting(self): | |
420 | # Python source parser/formatter for syntax highlighting |
|
420 | # Python source parser/formatter for syntax highlighting | |
421 | pyformat = PyColorize.Parser().format |
|
421 | pyformat = PyColorize.Parser().format | |
422 | self.pycolorize = lambda src: pyformat(src,'str',self.colors) |
|
422 | self.pycolorize = lambda src: pyformat(src,'str',self.colors) | |
423 |
|
423 | |||
424 | def init_pushd_popd_magic(self): |
|
424 | def init_pushd_popd_magic(self): | |
425 | # for pushd/popd management |
|
425 | # for pushd/popd management | |
426 | try: |
|
426 | try: | |
427 | self.home_dir = get_home_dir() |
|
427 | self.home_dir = get_home_dir() | |
428 | except HomeDirError, msg: |
|
428 | except HomeDirError, msg: | |
429 | fatal(msg) |
|
429 | fatal(msg) | |
430 |
|
430 | |||
431 | self.dir_stack = [] |
|
431 | self.dir_stack = [] | |
432 |
|
432 | |||
433 | def init_logger(self): |
|
433 | def init_logger(self): | |
434 | self.logger = Logger(self.home_dir, logfname='ipython_log.py', |
|
434 | self.logger = Logger(self.home_dir, logfname='ipython_log.py', | |
435 | logmode='rotate') |
|
435 | logmode='rotate') | |
436 |
|
436 | |||
437 | def init_logstart(self): |
|
437 | def init_logstart(self): | |
438 | """Initialize logging in case it was requested at the command line. |
|
438 | """Initialize logging in case it was requested at the command line. | |
439 | """ |
|
439 | """ | |
440 | if self.logappend: |
|
440 | if self.logappend: | |
441 | self.magic_logstart(self.logappend + ' append') |
|
441 | self.magic_logstart(self.logappend + ' append') | |
442 | elif self.logfile: |
|
442 | elif self.logfile: | |
443 | self.magic_logstart(self.logfile) |
|
443 | self.magic_logstart(self.logfile) | |
444 | elif self.logstart: |
|
444 | elif self.logstart: | |
445 | self.magic_logstart() |
|
445 | self.magic_logstart() | |
446 |
|
446 | |||
447 | def init_builtins(self): |
|
447 | def init_builtins(self): | |
448 | self.builtin_trap = BuiltinTrap(shell=self) |
|
448 | self.builtin_trap = BuiltinTrap(shell=self) | |
449 |
|
449 | |||
450 | def init_inspector(self): |
|
450 | def init_inspector(self): | |
451 | # Object inspector |
|
451 | # Object inspector | |
452 | self.inspector = oinspect.Inspector(oinspect.InspectColors, |
|
452 | self.inspector = oinspect.Inspector(oinspect.InspectColors, | |
453 | PyColorize.ANSICodeColors, |
|
453 | PyColorize.ANSICodeColors, | |
454 | 'NoColor', |
|
454 | 'NoColor', | |
455 | self.object_info_string_level) |
|
455 | self.object_info_string_level) | |
456 |
|
456 | |||
457 | def init_io(self): |
|
457 | def init_io(self): | |
458 | # This will just use sys.stdout and sys.stderr. If you want to |
|
458 | # This will just use sys.stdout and sys.stderr. If you want to | |
459 | # override sys.stdout and sys.stderr themselves, you need to do that |
|
459 | # override sys.stdout and sys.stderr themselves, you need to do that | |
460 | # *before* instantiating this class, because Term holds onto |
|
460 | # *before* instantiating this class, because Term holds onto | |
461 | # references to the underlying streams. |
|
461 | # references to the underlying streams. | |
462 | if sys.platform == 'win32' and self.has_readline: |
|
462 | if sys.platform == 'win32' and self.has_readline: | |
463 | Term = io.IOTerm(cout=self.readline._outputfile, |
|
463 | Term = io.IOTerm(cout=self.readline._outputfile, | |
464 | cerr=self.readline._outputfile) |
|
464 | cerr=self.readline._outputfile) | |
465 | else: |
|
465 | else: | |
466 | Term = io.IOTerm() |
|
466 | Term = io.IOTerm() | |
467 | io.Term = Term |
|
467 | io.Term = Term | |
468 |
|
468 | |||
469 | def init_prompts(self): |
|
469 | def init_prompts(self): | |
470 | # TODO: This is a pass for now because the prompts are managed inside |
|
470 | # TODO: This is a pass for now because the prompts are managed inside | |
471 | # the DisplayHook. Once there is a separate prompt manager, this |
|
471 | # the DisplayHook. Once there is a separate prompt manager, this | |
472 | # will initialize that object and all prompt related information. |
|
472 | # will initialize that object and all prompt related information. | |
473 | pass |
|
473 | pass | |
474 |
|
474 | |||
475 | def init_displayhook(self): |
|
475 | def init_displayhook(self): | |
476 | # Initialize displayhook, set in/out prompts and printing system |
|
476 | # Initialize displayhook, set in/out prompts and printing system | |
477 | self.displayhook = self.displayhook_class( |
|
477 | self.displayhook = self.displayhook_class( | |
|
478 | config=self.config, | |||
478 | shell=self, |
|
479 | shell=self, | |
479 | cache_size=self.cache_size, |
|
480 | cache_size=self.cache_size, | |
480 | input_sep = self.separate_in, |
|
481 | input_sep = self.separate_in, | |
481 | output_sep = self.separate_out, |
|
482 | output_sep = self.separate_out, | |
482 | output_sep2 = self.separate_out2, |
|
483 | output_sep2 = self.separate_out2, | |
483 | ps1 = self.prompt_in1, |
|
484 | ps1 = self.prompt_in1, | |
484 | ps2 = self.prompt_in2, |
|
485 | ps2 = self.prompt_in2, | |
485 | ps_out = self.prompt_out, |
|
486 | ps_out = self.prompt_out, | |
486 | pad_left = self.prompts_pad_left |
|
487 | pad_left = self.prompts_pad_left | |
487 | ) |
|
488 | ) | |
488 | # This is a context manager that installs/revmoes the displayhook at |
|
489 | # This is a context manager that installs/revmoes the displayhook at | |
489 | # the appropriate time. |
|
490 | # the appropriate time. | |
490 | self.display_trap = DisplayTrap(hook=self.displayhook) |
|
491 | self.display_trap = DisplayTrap(hook=self.displayhook) | |
491 |
|
492 | |||
492 | def init_reload_doctest(self): |
|
493 | def init_reload_doctest(self): | |
493 | # Do a proper resetting of doctest, including the necessary displayhook |
|
494 | # Do a proper resetting of doctest, including the necessary displayhook | |
494 | # monkeypatching |
|
495 | # monkeypatching | |
495 | try: |
|
496 | try: | |
496 | doctest_reload() |
|
497 | doctest_reload() | |
497 | except ImportError: |
|
498 | except ImportError: | |
498 | warn("doctest module does not exist.") |
|
499 | warn("doctest module does not exist.") | |
499 |
|
500 | |||
500 | #------------------------------------------------------------------------- |
|
501 | #------------------------------------------------------------------------- | |
501 | # Things related to injections into the sys module |
|
502 | # Things related to injections into the sys module | |
502 | #------------------------------------------------------------------------- |
|
503 | #------------------------------------------------------------------------- | |
503 |
|
504 | |||
504 | def save_sys_module_state(self): |
|
505 | def save_sys_module_state(self): | |
505 | """Save the state of hooks in the sys module. |
|
506 | """Save the state of hooks in the sys module. | |
506 |
|
507 | |||
507 | This has to be called after self.user_ns is created. |
|
508 | This has to be called after self.user_ns is created. | |
508 | """ |
|
509 | """ | |
509 | self._orig_sys_module_state = {} |
|
510 | self._orig_sys_module_state = {} | |
510 | self._orig_sys_module_state['stdin'] = sys.stdin |
|
511 | self._orig_sys_module_state['stdin'] = sys.stdin | |
511 | self._orig_sys_module_state['stdout'] = sys.stdout |
|
512 | self._orig_sys_module_state['stdout'] = sys.stdout | |
512 | self._orig_sys_module_state['stderr'] = sys.stderr |
|
513 | self._orig_sys_module_state['stderr'] = sys.stderr | |
513 | self._orig_sys_module_state['excepthook'] = sys.excepthook |
|
514 | self._orig_sys_module_state['excepthook'] = sys.excepthook | |
514 | try: |
|
515 | try: | |
515 | self._orig_sys_modules_main_name = self.user_ns['__name__'] |
|
516 | self._orig_sys_modules_main_name = self.user_ns['__name__'] | |
516 | except KeyError: |
|
517 | except KeyError: | |
517 | pass |
|
518 | pass | |
518 |
|
519 | |||
519 | def restore_sys_module_state(self): |
|
520 | def restore_sys_module_state(self): | |
520 | """Restore the state of the sys module.""" |
|
521 | """Restore the state of the sys module.""" | |
521 | try: |
|
522 | try: | |
522 | for k, v in self._orig_sys_module_state.iteritems(): |
|
523 | for k, v in self._orig_sys_module_state.iteritems(): | |
523 | setattr(sys, k, v) |
|
524 | setattr(sys, k, v) | |
524 | except AttributeError: |
|
525 | except AttributeError: | |
525 | pass |
|
526 | pass | |
526 | # Reset what what done in self.init_sys_modules |
|
527 | # Reset what what done in self.init_sys_modules | |
527 | try: |
|
528 | try: | |
528 | sys.modules[self.user_ns['__name__']] = self._orig_sys_modules_main_name |
|
529 | sys.modules[self.user_ns['__name__']] = self._orig_sys_modules_main_name | |
529 | except (AttributeError, KeyError): |
|
530 | except (AttributeError, KeyError): | |
530 | pass |
|
531 | pass | |
531 |
|
532 | |||
532 | #------------------------------------------------------------------------- |
|
533 | #------------------------------------------------------------------------- | |
533 | # Things related to hooks |
|
534 | # Things related to hooks | |
534 | #------------------------------------------------------------------------- |
|
535 | #------------------------------------------------------------------------- | |
535 |
|
536 | |||
536 | def init_hooks(self): |
|
537 | def init_hooks(self): | |
537 | # hooks holds pointers used for user-side customizations |
|
538 | # hooks holds pointers used for user-side customizations | |
538 | self.hooks = Struct() |
|
539 | self.hooks = Struct() | |
539 |
|
540 | |||
540 | self.strdispatchers = {} |
|
541 | self.strdispatchers = {} | |
541 |
|
542 | |||
542 | # Set all default hooks, defined in the IPython.hooks module. |
|
543 | # Set all default hooks, defined in the IPython.hooks module. | |
543 | hooks = IPython.core.hooks |
|
544 | hooks = IPython.core.hooks | |
544 | for hook_name in hooks.__all__: |
|
545 | for hook_name in hooks.__all__: | |
545 | # default hooks have priority 100, i.e. low; user hooks should have |
|
546 | # default hooks have priority 100, i.e. low; user hooks should have | |
546 | # 0-100 priority |
|
547 | # 0-100 priority | |
547 | self.set_hook(hook_name,getattr(hooks,hook_name), 100) |
|
548 | self.set_hook(hook_name,getattr(hooks,hook_name), 100) | |
548 |
|
549 | |||
549 | def set_hook(self,name,hook, priority = 50, str_key = None, re_key = None): |
|
550 | def set_hook(self,name,hook, priority = 50, str_key = None, re_key = None): | |
550 | """set_hook(name,hook) -> sets an internal IPython hook. |
|
551 | """set_hook(name,hook) -> sets an internal IPython hook. | |
551 |
|
552 | |||
552 | IPython exposes some of its internal API as user-modifiable hooks. By |
|
553 | IPython exposes some of its internal API as user-modifiable hooks. By | |
553 | adding your function to one of these hooks, you can modify IPython's |
|
554 | adding your function to one of these hooks, you can modify IPython's | |
554 | behavior to call at runtime your own routines.""" |
|
555 | behavior to call at runtime your own routines.""" | |
555 |
|
556 | |||
556 | # At some point in the future, this should validate the hook before it |
|
557 | # At some point in the future, this should validate the hook before it | |
557 | # accepts it. Probably at least check that the hook takes the number |
|
558 | # accepts it. Probably at least check that the hook takes the number | |
558 | # of args it's supposed to. |
|
559 | # of args it's supposed to. | |
559 |
|
560 | |||
560 | f = types.MethodType(hook,self) |
|
561 | f = types.MethodType(hook,self) | |
561 |
|
562 | |||
562 | # check if the hook is for strdispatcher first |
|
563 | # check if the hook is for strdispatcher first | |
563 | if str_key is not None: |
|
564 | if str_key is not None: | |
564 | sdp = self.strdispatchers.get(name, StrDispatch()) |
|
565 | sdp = self.strdispatchers.get(name, StrDispatch()) | |
565 | sdp.add_s(str_key, f, priority ) |
|
566 | sdp.add_s(str_key, f, priority ) | |
566 | self.strdispatchers[name] = sdp |
|
567 | self.strdispatchers[name] = sdp | |
567 | return |
|
568 | return | |
568 | if re_key is not None: |
|
569 | if re_key is not None: | |
569 | sdp = self.strdispatchers.get(name, StrDispatch()) |
|
570 | sdp = self.strdispatchers.get(name, StrDispatch()) | |
570 | sdp.add_re(re.compile(re_key), f, priority ) |
|
571 | sdp.add_re(re.compile(re_key), f, priority ) | |
571 | self.strdispatchers[name] = sdp |
|
572 | self.strdispatchers[name] = sdp | |
572 | return |
|
573 | return | |
573 |
|
574 | |||
574 | dp = getattr(self.hooks, name, None) |
|
575 | dp = getattr(self.hooks, name, None) | |
575 | if name not in IPython.core.hooks.__all__: |
|
576 | if name not in IPython.core.hooks.__all__: | |
576 | print "Warning! Hook '%s' is not one of %s" % \ |
|
577 | print "Warning! Hook '%s' is not one of %s" % \ | |
577 | (name, IPython.core.hooks.__all__ ) |
|
578 | (name, IPython.core.hooks.__all__ ) | |
578 | if not dp: |
|
579 | if not dp: | |
579 | dp = IPython.core.hooks.CommandChainDispatcher() |
|
580 | dp = IPython.core.hooks.CommandChainDispatcher() | |
580 |
|
581 | |||
581 | try: |
|
582 | try: | |
582 | dp.add(f,priority) |
|
583 | dp.add(f,priority) | |
583 | except AttributeError: |
|
584 | except AttributeError: | |
584 | # it was not commandchain, plain old func - replace |
|
585 | # it was not commandchain, plain old func - replace | |
585 | dp = f |
|
586 | dp = f | |
586 |
|
587 | |||
587 | setattr(self.hooks,name, dp) |
|
588 | setattr(self.hooks,name, dp) | |
588 |
|
589 | |||
589 | def register_post_execute(self, func): |
|
590 | def register_post_execute(self, func): | |
590 | """Register a function for calling after code execution. |
|
591 | """Register a function for calling after code execution. | |
591 | """ |
|
592 | """ | |
592 | if not callable(func): |
|
593 | if not callable(func): | |
593 | raise ValueError('argument %s must be callable' % func) |
|
594 | raise ValueError('argument %s must be callable' % func) | |
594 | self._post_execute.add(func) |
|
595 | self._post_execute.add(func) | |
595 |
|
596 | |||
596 | #------------------------------------------------------------------------- |
|
597 | #------------------------------------------------------------------------- | |
597 | # Things related to the "main" module |
|
598 | # Things related to the "main" module | |
598 | #------------------------------------------------------------------------- |
|
599 | #------------------------------------------------------------------------- | |
599 |
|
600 | |||
600 | def new_main_mod(self,ns=None): |
|
601 | def new_main_mod(self,ns=None): | |
601 | """Return a new 'main' module object for user code execution. |
|
602 | """Return a new 'main' module object for user code execution. | |
602 | """ |
|
603 | """ | |
603 | main_mod = self._user_main_module |
|
604 | main_mod = self._user_main_module | |
604 | init_fakemod_dict(main_mod,ns) |
|
605 | init_fakemod_dict(main_mod,ns) | |
605 | return main_mod |
|
606 | return main_mod | |
606 |
|
607 | |||
607 | def cache_main_mod(self,ns,fname): |
|
608 | def cache_main_mod(self,ns,fname): | |
608 | """Cache a main module's namespace. |
|
609 | """Cache a main module's namespace. | |
609 |
|
610 | |||
610 | When scripts are executed via %run, we must keep a reference to the |
|
611 | When scripts are executed via %run, we must keep a reference to the | |
611 | namespace of their __main__ module (a FakeModule instance) around so |
|
612 | namespace of their __main__ module (a FakeModule instance) around so | |
612 | that Python doesn't clear it, rendering objects defined therein |
|
613 | that Python doesn't clear it, rendering objects defined therein | |
613 | useless. |
|
614 | useless. | |
614 |
|
615 | |||
615 | This method keeps said reference in a private dict, keyed by the |
|
616 | This method keeps said reference in a private dict, keyed by the | |
616 | absolute path of the module object (which corresponds to the script |
|
617 | absolute path of the module object (which corresponds to the script | |
617 | path). This way, for multiple executions of the same script we only |
|
618 | path). This way, for multiple executions of the same script we only | |
618 | keep one copy of the namespace (the last one), thus preventing memory |
|
619 | keep one copy of the namespace (the last one), thus preventing memory | |
619 | leaks from old references while allowing the objects from the last |
|
620 | leaks from old references while allowing the objects from the last | |
620 | execution to be accessible. |
|
621 | execution to be accessible. | |
621 |
|
622 | |||
622 | Note: we can not allow the actual FakeModule instances to be deleted, |
|
623 | Note: we can not allow the actual FakeModule instances to be deleted, | |
623 | because of how Python tears down modules (it hard-sets all their |
|
624 | because of how Python tears down modules (it hard-sets all their | |
624 | references to None without regard for reference counts). This method |
|
625 | references to None without regard for reference counts). This method | |
625 | must therefore make a *copy* of the given namespace, to allow the |
|
626 | must therefore make a *copy* of the given namespace, to allow the | |
626 | original module's __dict__ to be cleared and reused. |
|
627 | original module's __dict__ to be cleared and reused. | |
627 |
|
628 | |||
628 |
|
629 | |||
629 | Parameters |
|
630 | Parameters | |
630 | ---------- |
|
631 | ---------- | |
631 | ns : a namespace (a dict, typically) |
|
632 | ns : a namespace (a dict, typically) | |
632 |
|
633 | |||
633 | fname : str |
|
634 | fname : str | |
634 | Filename associated with the namespace. |
|
635 | Filename associated with the namespace. | |
635 |
|
636 | |||
636 | Examples |
|
637 | Examples | |
637 | -------- |
|
638 | -------- | |
638 |
|
639 | |||
639 | In [10]: import IPython |
|
640 | In [10]: import IPython | |
640 |
|
641 | |||
641 | In [11]: _ip.cache_main_mod(IPython.__dict__,IPython.__file__) |
|
642 | In [11]: _ip.cache_main_mod(IPython.__dict__,IPython.__file__) | |
642 |
|
643 | |||
643 | In [12]: IPython.__file__ in _ip._main_ns_cache |
|
644 | In [12]: IPython.__file__ in _ip._main_ns_cache | |
644 | Out[12]: True |
|
645 | Out[12]: True | |
645 | """ |
|
646 | """ | |
646 | self._main_ns_cache[os.path.abspath(fname)] = ns.copy() |
|
647 | self._main_ns_cache[os.path.abspath(fname)] = ns.copy() | |
647 |
|
648 | |||
648 | def clear_main_mod_cache(self): |
|
649 | def clear_main_mod_cache(self): | |
649 | """Clear the cache of main modules. |
|
650 | """Clear the cache of main modules. | |
650 |
|
651 | |||
651 | Mainly for use by utilities like %reset. |
|
652 | Mainly for use by utilities like %reset. | |
652 |
|
653 | |||
653 | Examples |
|
654 | Examples | |
654 | -------- |
|
655 | -------- | |
655 |
|
656 | |||
656 | In [15]: import IPython |
|
657 | In [15]: import IPython | |
657 |
|
658 | |||
658 | In [16]: _ip.cache_main_mod(IPython.__dict__,IPython.__file__) |
|
659 | In [16]: _ip.cache_main_mod(IPython.__dict__,IPython.__file__) | |
659 |
|
660 | |||
660 | In [17]: len(_ip._main_ns_cache) > 0 |
|
661 | In [17]: len(_ip._main_ns_cache) > 0 | |
661 | Out[17]: True |
|
662 | Out[17]: True | |
662 |
|
663 | |||
663 | In [18]: _ip.clear_main_mod_cache() |
|
664 | In [18]: _ip.clear_main_mod_cache() | |
664 |
|
665 | |||
665 | In [19]: len(_ip._main_ns_cache) == 0 |
|
666 | In [19]: len(_ip._main_ns_cache) == 0 | |
666 | Out[19]: True |
|
667 | Out[19]: True | |
667 | """ |
|
668 | """ | |
668 | self._main_ns_cache.clear() |
|
669 | self._main_ns_cache.clear() | |
669 |
|
670 | |||
670 | #------------------------------------------------------------------------- |
|
671 | #------------------------------------------------------------------------- | |
671 | # Things related to debugging |
|
672 | # Things related to debugging | |
672 | #------------------------------------------------------------------------- |
|
673 | #------------------------------------------------------------------------- | |
673 |
|
674 | |||
674 | def init_pdb(self): |
|
675 | def init_pdb(self): | |
675 | # Set calling of pdb on exceptions |
|
676 | # Set calling of pdb on exceptions | |
676 | # self.call_pdb is a property |
|
677 | # self.call_pdb is a property | |
677 | self.call_pdb = self.pdb |
|
678 | self.call_pdb = self.pdb | |
678 |
|
679 | |||
679 | def _get_call_pdb(self): |
|
680 | def _get_call_pdb(self): | |
680 | return self._call_pdb |
|
681 | return self._call_pdb | |
681 |
|
682 | |||
682 | def _set_call_pdb(self,val): |
|
683 | def _set_call_pdb(self,val): | |
683 |
|
684 | |||
684 | if val not in (0,1,False,True): |
|
685 | if val not in (0,1,False,True): | |
685 | raise ValueError,'new call_pdb value must be boolean' |
|
686 | raise ValueError,'new call_pdb value must be boolean' | |
686 |
|
687 | |||
687 | # store value in instance |
|
688 | # store value in instance | |
688 | self._call_pdb = val |
|
689 | self._call_pdb = val | |
689 |
|
690 | |||
690 | # notify the actual exception handlers |
|
691 | # notify the actual exception handlers | |
691 | self.InteractiveTB.call_pdb = val |
|
692 | self.InteractiveTB.call_pdb = val | |
692 |
|
693 | |||
693 | call_pdb = property(_get_call_pdb,_set_call_pdb,None, |
|
694 | call_pdb = property(_get_call_pdb,_set_call_pdb,None, | |
694 | 'Control auto-activation of pdb at exceptions') |
|
695 | 'Control auto-activation of pdb at exceptions') | |
695 |
|
696 | |||
696 | def debugger(self,force=False): |
|
697 | def debugger(self,force=False): | |
697 | """Call the pydb/pdb debugger. |
|
698 | """Call the pydb/pdb debugger. | |
698 |
|
699 | |||
699 | Keywords: |
|
700 | Keywords: | |
700 |
|
701 | |||
701 | - force(False): by default, this routine checks the instance call_pdb |
|
702 | - force(False): by default, this routine checks the instance call_pdb | |
702 | flag and does not actually invoke the debugger if the flag is false. |
|
703 | flag and does not actually invoke the debugger if the flag is false. | |
703 | The 'force' option forces the debugger to activate even if the flag |
|
704 | The 'force' option forces the debugger to activate even if the flag | |
704 | is false. |
|
705 | is false. | |
705 | """ |
|
706 | """ | |
706 |
|
707 | |||
707 | if not (force or self.call_pdb): |
|
708 | if not (force or self.call_pdb): | |
708 | return |
|
709 | return | |
709 |
|
710 | |||
710 | if not hasattr(sys,'last_traceback'): |
|
711 | if not hasattr(sys,'last_traceback'): | |
711 | error('No traceback has been produced, nothing to debug.') |
|
712 | error('No traceback has been produced, nothing to debug.') | |
712 | return |
|
713 | return | |
713 |
|
714 | |||
714 | # use pydb if available |
|
715 | # use pydb if available | |
715 | if debugger.has_pydb: |
|
716 | if debugger.has_pydb: | |
716 | from pydb import pm |
|
717 | from pydb import pm | |
717 | else: |
|
718 | else: | |
718 | # fallback to our internal debugger |
|
719 | # fallback to our internal debugger | |
719 | pm = lambda : self.InteractiveTB.debugger(force=True) |
|
720 | pm = lambda : self.InteractiveTB.debugger(force=True) | |
720 | self.history_saving_wrapper(pm)() |
|
721 | self.history_saving_wrapper(pm)() | |
721 |
|
722 | |||
722 | #------------------------------------------------------------------------- |
|
723 | #------------------------------------------------------------------------- | |
723 | # Things related to IPython's various namespaces |
|
724 | # Things related to IPython's various namespaces | |
724 | #------------------------------------------------------------------------- |
|
725 | #------------------------------------------------------------------------- | |
725 |
|
726 | |||
726 | def init_create_namespaces(self, user_ns=None, user_global_ns=None): |
|
727 | def init_create_namespaces(self, user_ns=None, user_global_ns=None): | |
727 | # Create the namespace where the user will operate. user_ns is |
|
728 | # Create the namespace where the user will operate. user_ns is | |
728 | # normally the only one used, and it is passed to the exec calls as |
|
729 | # normally the only one used, and it is passed to the exec calls as | |
729 | # the locals argument. But we do carry a user_global_ns namespace |
|
730 | # the locals argument. But we do carry a user_global_ns namespace | |
730 | # given as the exec 'globals' argument, This is useful in embedding |
|
731 | # given as the exec 'globals' argument, This is useful in embedding | |
731 | # situations where the ipython shell opens in a context where the |
|
732 | # situations where the ipython shell opens in a context where the | |
732 | # distinction between locals and globals is meaningful. For |
|
733 | # distinction between locals and globals is meaningful. For | |
733 | # non-embedded contexts, it is just the same object as the user_ns dict. |
|
734 | # non-embedded contexts, it is just the same object as the user_ns dict. | |
734 |
|
735 | |||
735 | # FIXME. For some strange reason, __builtins__ is showing up at user |
|
736 | # FIXME. For some strange reason, __builtins__ is showing up at user | |
736 | # level as a dict instead of a module. This is a manual fix, but I |
|
737 | # level as a dict instead of a module. This is a manual fix, but I | |
737 | # should really track down where the problem is coming from. Alex |
|
738 | # should really track down where the problem is coming from. Alex | |
738 | # Schmolck reported this problem first. |
|
739 | # Schmolck reported this problem first. | |
739 |
|
740 | |||
740 | # A useful post by Alex Martelli on this topic: |
|
741 | # A useful post by Alex Martelli on this topic: | |
741 | # Re: inconsistent value from __builtins__ |
|
742 | # Re: inconsistent value from __builtins__ | |
742 | # Von: Alex Martelli <aleaxit@yahoo.com> |
|
743 | # Von: Alex Martelli <aleaxit@yahoo.com> | |
743 | # Datum: Freitag 01 Oktober 2004 04:45:34 nachmittags/abends |
|
744 | # Datum: Freitag 01 Oktober 2004 04:45:34 nachmittags/abends | |
744 | # Gruppen: comp.lang.python |
|
745 | # Gruppen: comp.lang.python | |
745 |
|
746 | |||
746 | # Michael Hohn <hohn@hooknose.lbl.gov> wrote: |
|
747 | # Michael Hohn <hohn@hooknose.lbl.gov> wrote: | |
747 | # > >>> print type(builtin_check.get_global_binding('__builtins__')) |
|
748 | # > >>> print type(builtin_check.get_global_binding('__builtins__')) | |
748 | # > <type 'dict'> |
|
749 | # > <type 'dict'> | |
749 | # > >>> print type(__builtins__) |
|
750 | # > >>> print type(__builtins__) | |
750 | # > <type 'module'> |
|
751 | # > <type 'module'> | |
751 | # > Is this difference in return value intentional? |
|
752 | # > Is this difference in return value intentional? | |
752 |
|
753 | |||
753 | # Well, it's documented that '__builtins__' can be either a dictionary |
|
754 | # Well, it's documented that '__builtins__' can be either a dictionary | |
754 | # or a module, and it's been that way for a long time. Whether it's |
|
755 | # or a module, and it's been that way for a long time. Whether it's | |
755 | # intentional (or sensible), I don't know. In any case, the idea is |
|
756 | # intentional (or sensible), I don't know. In any case, the idea is | |
756 | # that if you need to access the built-in namespace directly, you |
|
757 | # that if you need to access the built-in namespace directly, you | |
757 | # should start with "import __builtin__" (note, no 's') which will |
|
758 | # should start with "import __builtin__" (note, no 's') which will | |
758 | # definitely give you a module. Yeah, it's somewhat confusing:-(. |
|
759 | # definitely give you a module. Yeah, it's somewhat confusing:-(. | |
759 |
|
760 | |||
760 | # These routines return properly built dicts as needed by the rest of |
|
761 | # These routines return properly built dicts as needed by the rest of | |
761 | # the code, and can also be used by extension writers to generate |
|
762 | # the code, and can also be used by extension writers to generate | |
762 | # properly initialized namespaces. |
|
763 | # properly initialized namespaces. | |
763 | user_ns, user_global_ns = self.make_user_namespaces(user_ns, |
|
764 | user_ns, user_global_ns = self.make_user_namespaces(user_ns, | |
764 | user_global_ns) |
|
765 | user_global_ns) | |
765 |
|
766 | |||
766 | # Assign namespaces |
|
767 | # Assign namespaces | |
767 | # This is the namespace where all normal user variables live |
|
768 | # This is the namespace where all normal user variables live | |
768 | self.user_ns = user_ns |
|
769 | self.user_ns = user_ns | |
769 | self.user_global_ns = user_global_ns |
|
770 | self.user_global_ns = user_global_ns | |
770 |
|
771 | |||
771 | # An auxiliary namespace that checks what parts of the user_ns were |
|
772 | # An auxiliary namespace that checks what parts of the user_ns were | |
772 | # loaded at startup, so we can list later only variables defined in |
|
773 | # loaded at startup, so we can list later only variables defined in | |
773 | # actual interactive use. Since it is always a subset of user_ns, it |
|
774 | # actual interactive use. Since it is always a subset of user_ns, it | |
774 | # doesn't need to be separately tracked in the ns_table. |
|
775 | # doesn't need to be separately tracked in the ns_table. | |
775 | self.user_ns_hidden = {} |
|
776 | self.user_ns_hidden = {} | |
776 |
|
777 | |||
777 | # A namespace to keep track of internal data structures to prevent |
|
778 | # A namespace to keep track of internal data structures to prevent | |
778 | # them from cluttering user-visible stuff. Will be updated later |
|
779 | # them from cluttering user-visible stuff. Will be updated later | |
779 | self.internal_ns = {} |
|
780 | self.internal_ns = {} | |
780 |
|
781 | |||
781 | # Now that FakeModule produces a real module, we've run into a nasty |
|
782 | # Now that FakeModule produces a real module, we've run into a nasty | |
782 | # problem: after script execution (via %run), the module where the user |
|
783 | # problem: after script execution (via %run), the module where the user | |
783 | # code ran is deleted. Now that this object is a true module (needed |
|
784 | # code ran is deleted. Now that this object is a true module (needed | |
784 | # so docetst and other tools work correctly), the Python module |
|
785 | # so docetst and other tools work correctly), the Python module | |
785 | # teardown mechanism runs over it, and sets to None every variable |
|
786 | # teardown mechanism runs over it, and sets to None every variable | |
786 | # present in that module. Top-level references to objects from the |
|
787 | # present in that module. Top-level references to objects from the | |
787 | # script survive, because the user_ns is updated with them. However, |
|
788 | # script survive, because the user_ns is updated with them. However, | |
788 | # calling functions defined in the script that use other things from |
|
789 | # calling functions defined in the script that use other things from | |
789 | # the script will fail, because the function's closure had references |
|
790 | # the script will fail, because the function's closure had references | |
790 | # to the original objects, which are now all None. So we must protect |
|
791 | # to the original objects, which are now all None. So we must protect | |
791 | # these modules from deletion by keeping a cache. |
|
792 | # these modules from deletion by keeping a cache. | |
792 | # |
|
793 | # | |
793 | # To avoid keeping stale modules around (we only need the one from the |
|
794 | # To avoid keeping stale modules around (we only need the one from the | |
794 | # last run), we use a dict keyed with the full path to the script, so |
|
795 | # last run), we use a dict keyed with the full path to the script, so | |
795 | # only the last version of the module is held in the cache. Note, |
|
796 | # only the last version of the module is held in the cache. Note, | |
796 | # however, that we must cache the module *namespace contents* (their |
|
797 | # however, that we must cache the module *namespace contents* (their | |
797 | # __dict__). Because if we try to cache the actual modules, old ones |
|
798 | # __dict__). Because if we try to cache the actual modules, old ones | |
798 | # (uncached) could be destroyed while still holding references (such as |
|
799 | # (uncached) could be destroyed while still holding references (such as | |
799 | # those held by GUI objects that tend to be long-lived)> |
|
800 | # those held by GUI objects that tend to be long-lived)> | |
800 | # |
|
801 | # | |
801 | # The %reset command will flush this cache. See the cache_main_mod() |
|
802 | # The %reset command will flush this cache. See the cache_main_mod() | |
802 | # and clear_main_mod_cache() methods for details on use. |
|
803 | # and clear_main_mod_cache() methods for details on use. | |
803 |
|
804 | |||
804 | # This is the cache used for 'main' namespaces |
|
805 | # This is the cache used for 'main' namespaces | |
805 | self._main_ns_cache = {} |
|
806 | self._main_ns_cache = {} | |
806 | # And this is the single instance of FakeModule whose __dict__ we keep |
|
807 | # And this is the single instance of FakeModule whose __dict__ we keep | |
807 | # copying and clearing for reuse on each %run |
|
808 | # copying and clearing for reuse on each %run | |
808 | self._user_main_module = FakeModule() |
|
809 | self._user_main_module = FakeModule() | |
809 |
|
810 | |||
810 | # A table holding all the namespaces IPython deals with, so that |
|
811 | # A table holding all the namespaces IPython deals with, so that | |
811 | # introspection facilities can search easily. |
|
812 | # introspection facilities can search easily. | |
812 | self.ns_table = {'user':user_ns, |
|
813 | self.ns_table = {'user':user_ns, | |
813 | 'user_global':user_global_ns, |
|
814 | 'user_global':user_global_ns, | |
814 | 'internal':self.internal_ns, |
|
815 | 'internal':self.internal_ns, | |
815 | 'builtin':__builtin__.__dict__ |
|
816 | 'builtin':__builtin__.__dict__ | |
816 | } |
|
817 | } | |
817 |
|
818 | |||
818 | # Similarly, track all namespaces where references can be held and that |
|
819 | # Similarly, track all namespaces where references can be held and that | |
819 | # we can safely clear (so it can NOT include builtin). This one can be |
|
820 | # we can safely clear (so it can NOT include builtin). This one can be | |
820 | # a simple list. Note that the main execution namespaces, user_ns and |
|
821 | # a simple list. Note that the main execution namespaces, user_ns and | |
821 | # user_global_ns, can NOT be listed here, as clearing them blindly |
|
822 | # user_global_ns, can NOT be listed here, as clearing them blindly | |
822 | # causes errors in object __del__ methods. Instead, the reset() method |
|
823 | # causes errors in object __del__ methods. Instead, the reset() method | |
823 | # clears them manually and carefully. |
|
824 | # clears them manually and carefully. | |
824 | self.ns_refs_table = [ self.user_ns_hidden, |
|
825 | self.ns_refs_table = [ self.user_ns_hidden, | |
825 | self.internal_ns, self._main_ns_cache ] |
|
826 | self.internal_ns, self._main_ns_cache ] | |
826 |
|
827 | |||
827 | def make_user_namespaces(self, user_ns=None, user_global_ns=None): |
|
828 | def make_user_namespaces(self, user_ns=None, user_global_ns=None): | |
828 | """Return a valid local and global user interactive namespaces. |
|
829 | """Return a valid local and global user interactive namespaces. | |
829 |
|
830 | |||
830 | This builds a dict with the minimal information needed to operate as a |
|
831 | This builds a dict with the minimal information needed to operate as a | |
831 | valid IPython user namespace, which you can pass to the various |
|
832 | valid IPython user namespace, which you can pass to the various | |
832 | embedding classes in ipython. The default implementation returns the |
|
833 | embedding classes in ipython. The default implementation returns the | |
833 | same dict for both the locals and the globals to allow functions to |
|
834 | same dict for both the locals and the globals to allow functions to | |
834 | refer to variables in the namespace. Customized implementations can |
|
835 | refer to variables in the namespace. Customized implementations can | |
835 | return different dicts. The locals dictionary can actually be anything |
|
836 | return different dicts. The locals dictionary can actually be anything | |
836 | following the basic mapping protocol of a dict, but the globals dict |
|
837 | following the basic mapping protocol of a dict, but the globals dict | |
837 | must be a true dict, not even a subclass. It is recommended that any |
|
838 | must be a true dict, not even a subclass. It is recommended that any | |
838 | custom object for the locals namespace synchronize with the globals |
|
839 | custom object for the locals namespace synchronize with the globals | |
839 | dict somehow. |
|
840 | dict somehow. | |
840 |
|
841 | |||
841 | Raises TypeError if the provided globals namespace is not a true dict. |
|
842 | Raises TypeError if the provided globals namespace is not a true dict. | |
842 |
|
843 | |||
843 | Parameters |
|
844 | Parameters | |
844 | ---------- |
|
845 | ---------- | |
845 | user_ns : dict-like, optional |
|
846 | user_ns : dict-like, optional | |
846 | The current user namespace. The items in this namespace should |
|
847 | The current user namespace. The items in this namespace should | |
847 | be included in the output. If None, an appropriate blank |
|
848 | be included in the output. If None, an appropriate blank | |
848 | namespace should be created. |
|
849 | namespace should be created. | |
849 | user_global_ns : dict, optional |
|
850 | user_global_ns : dict, optional | |
850 | The current user global namespace. The items in this namespace |
|
851 | The current user global namespace. The items in this namespace | |
851 | should be included in the output. If None, an appropriate |
|
852 | should be included in the output. If None, an appropriate | |
852 | blank namespace should be created. |
|
853 | blank namespace should be created. | |
853 |
|
854 | |||
854 | Returns |
|
855 | Returns | |
855 | ------- |
|
856 | ------- | |
856 | A pair of dictionary-like object to be used as the local namespace |
|
857 | A pair of dictionary-like object to be used as the local namespace | |
857 | of the interpreter and a dict to be used as the global namespace. |
|
858 | of the interpreter and a dict to be used as the global namespace. | |
858 | """ |
|
859 | """ | |
859 |
|
860 | |||
860 |
|
861 | |||
861 | # We must ensure that __builtin__ (without the final 's') is always |
|
862 | # We must ensure that __builtin__ (without the final 's') is always | |
862 | # available and pointing to the __builtin__ *module*. For more details: |
|
863 | # available and pointing to the __builtin__ *module*. For more details: | |
863 | # http://mail.python.org/pipermail/python-dev/2001-April/014068.html |
|
864 | # http://mail.python.org/pipermail/python-dev/2001-April/014068.html | |
864 |
|
865 | |||
865 | if user_ns is None: |
|
866 | if user_ns is None: | |
866 | # Set __name__ to __main__ to better match the behavior of the |
|
867 | # Set __name__ to __main__ to better match the behavior of the | |
867 | # normal interpreter. |
|
868 | # normal interpreter. | |
868 | user_ns = {'__name__' :'__main__', |
|
869 | user_ns = {'__name__' :'__main__', | |
869 | '__builtin__' : __builtin__, |
|
870 | '__builtin__' : __builtin__, | |
870 | '__builtins__' : __builtin__, |
|
871 | '__builtins__' : __builtin__, | |
871 | } |
|
872 | } | |
872 | else: |
|
873 | else: | |
873 | user_ns.setdefault('__name__','__main__') |
|
874 | user_ns.setdefault('__name__','__main__') | |
874 | user_ns.setdefault('__builtin__',__builtin__) |
|
875 | user_ns.setdefault('__builtin__',__builtin__) | |
875 | user_ns.setdefault('__builtins__',__builtin__) |
|
876 | user_ns.setdefault('__builtins__',__builtin__) | |
876 |
|
877 | |||
877 | if user_global_ns is None: |
|
878 | if user_global_ns is None: | |
878 | user_global_ns = user_ns |
|
879 | user_global_ns = user_ns | |
879 | if type(user_global_ns) is not dict: |
|
880 | if type(user_global_ns) is not dict: | |
880 | raise TypeError("user_global_ns must be a true dict; got %r" |
|
881 | raise TypeError("user_global_ns must be a true dict; got %r" | |
881 | % type(user_global_ns)) |
|
882 | % type(user_global_ns)) | |
882 |
|
883 | |||
883 | return user_ns, user_global_ns |
|
884 | return user_ns, user_global_ns | |
884 |
|
885 | |||
885 | def init_sys_modules(self): |
|
886 | def init_sys_modules(self): | |
886 | # We need to insert into sys.modules something that looks like a |
|
887 | # We need to insert into sys.modules something that looks like a | |
887 | # module but which accesses the IPython namespace, for shelve and |
|
888 | # module but which accesses the IPython namespace, for shelve and | |
888 | # pickle to work interactively. Normally they rely on getting |
|
889 | # pickle to work interactively. Normally they rely on getting | |
889 | # everything out of __main__, but for embedding purposes each IPython |
|
890 | # everything out of __main__, but for embedding purposes each IPython | |
890 | # instance has its own private namespace, so we can't go shoving |
|
891 | # instance has its own private namespace, so we can't go shoving | |
891 | # everything into __main__. |
|
892 | # everything into __main__. | |
892 |
|
893 | |||
893 | # note, however, that we should only do this for non-embedded |
|
894 | # note, however, that we should only do this for non-embedded | |
894 | # ipythons, which really mimic the __main__.__dict__ with their own |
|
895 | # ipythons, which really mimic the __main__.__dict__ with their own | |
895 | # namespace. Embedded instances, on the other hand, should not do |
|
896 | # namespace. Embedded instances, on the other hand, should not do | |
896 | # this because they need to manage the user local/global namespaces |
|
897 | # this because they need to manage the user local/global namespaces | |
897 | # only, but they live within a 'normal' __main__ (meaning, they |
|
898 | # only, but they live within a 'normal' __main__ (meaning, they | |
898 | # shouldn't overtake the execution environment of the script they're |
|
899 | # shouldn't overtake the execution environment of the script they're | |
899 | # embedded in). |
|
900 | # embedded in). | |
900 |
|
901 | |||
901 | # This is overridden in the InteractiveShellEmbed subclass to a no-op. |
|
902 | # This is overridden in the InteractiveShellEmbed subclass to a no-op. | |
902 |
|
903 | |||
903 | try: |
|
904 | try: | |
904 | main_name = self.user_ns['__name__'] |
|
905 | main_name = self.user_ns['__name__'] | |
905 | except KeyError: |
|
906 | except KeyError: | |
906 | raise KeyError('user_ns dictionary MUST have a "__name__" key') |
|
907 | raise KeyError('user_ns dictionary MUST have a "__name__" key') | |
907 | else: |
|
908 | else: | |
908 | sys.modules[main_name] = FakeModule(self.user_ns) |
|
909 | sys.modules[main_name] = FakeModule(self.user_ns) | |
909 |
|
910 | |||
910 | def init_user_ns(self): |
|
911 | def init_user_ns(self): | |
911 | """Initialize all user-visible namespaces to their minimum defaults. |
|
912 | """Initialize all user-visible namespaces to their minimum defaults. | |
912 |
|
913 | |||
913 | Certain history lists are also initialized here, as they effectively |
|
914 | Certain history lists are also initialized here, as they effectively | |
914 | act as user namespaces. |
|
915 | act as user namespaces. | |
915 |
|
916 | |||
916 | Notes |
|
917 | Notes | |
917 | ----- |
|
918 | ----- | |
918 | All data structures here are only filled in, they are NOT reset by this |
|
919 | All data structures here are only filled in, they are NOT reset by this | |
919 | method. If they were not empty before, data will simply be added to |
|
920 | method. If they were not empty before, data will simply be added to | |
920 | therm. |
|
921 | therm. | |
921 | """ |
|
922 | """ | |
922 | # This function works in two parts: first we put a few things in |
|
923 | # This function works in two parts: first we put a few things in | |
923 | # user_ns, and we sync that contents into user_ns_hidden so that these |
|
924 | # user_ns, and we sync that contents into user_ns_hidden so that these | |
924 | # initial variables aren't shown by %who. After the sync, we add the |
|
925 | # initial variables aren't shown by %who. After the sync, we add the | |
925 | # rest of what we *do* want the user to see with %who even on a new |
|
926 | # rest of what we *do* want the user to see with %who even on a new | |
926 | # session (probably nothing, so theye really only see their own stuff) |
|
927 | # session (probably nothing, so theye really only see their own stuff) | |
927 |
|
928 | |||
928 | # The user dict must *always* have a __builtin__ reference to the |
|
929 | # The user dict must *always* have a __builtin__ reference to the | |
929 | # Python standard __builtin__ namespace, which must be imported. |
|
930 | # Python standard __builtin__ namespace, which must be imported. | |
930 | # This is so that certain operations in prompt evaluation can be |
|
931 | # This is so that certain operations in prompt evaluation can be | |
931 | # reliably executed with builtins. Note that we can NOT use |
|
932 | # reliably executed with builtins. Note that we can NOT use | |
932 | # __builtins__ (note the 's'), because that can either be a dict or a |
|
933 | # __builtins__ (note the 's'), because that can either be a dict or a | |
933 | # module, and can even mutate at runtime, depending on the context |
|
934 | # module, and can even mutate at runtime, depending on the context | |
934 | # (Python makes no guarantees on it). In contrast, __builtin__ is |
|
935 | # (Python makes no guarantees on it). In contrast, __builtin__ is | |
935 | # always a module object, though it must be explicitly imported. |
|
936 | # always a module object, though it must be explicitly imported. | |
936 |
|
937 | |||
937 | # For more details: |
|
938 | # For more details: | |
938 | # http://mail.python.org/pipermail/python-dev/2001-April/014068.html |
|
939 | # http://mail.python.org/pipermail/python-dev/2001-April/014068.html | |
939 | ns = dict(__builtin__ = __builtin__) |
|
940 | ns = dict(__builtin__ = __builtin__) | |
940 |
|
941 | |||
941 | # Put 'help' in the user namespace |
|
942 | # Put 'help' in the user namespace | |
942 | try: |
|
943 | try: | |
943 | from site import _Helper |
|
944 | from site import _Helper | |
944 | ns['help'] = _Helper() |
|
945 | ns['help'] = _Helper() | |
945 | except ImportError: |
|
946 | except ImportError: | |
946 | warn('help() not available - check site.py') |
|
947 | warn('help() not available - check site.py') | |
947 |
|
948 | |||
948 | # make global variables for user access to the histories |
|
949 | # make global variables for user access to the histories | |
949 | ns['_ih'] = self.input_hist |
|
950 | ns['_ih'] = self.input_hist | |
950 | ns['_oh'] = self.output_hist |
|
951 | ns['_oh'] = self.output_hist | |
951 | ns['_dh'] = self.dir_hist |
|
952 | ns['_dh'] = self.dir_hist | |
952 |
|
953 | |||
953 | ns['_sh'] = shadowns |
|
954 | ns['_sh'] = shadowns | |
954 |
|
955 | |||
955 | # user aliases to input and output histories. These shouldn't show up |
|
956 | # user aliases to input and output histories. These shouldn't show up | |
956 | # in %who, as they can have very large reprs. |
|
957 | # in %who, as they can have very large reprs. | |
957 | ns['In'] = self.input_hist |
|
958 | ns['In'] = self.input_hist | |
958 | ns['Out'] = self.output_hist |
|
959 | ns['Out'] = self.output_hist | |
959 |
|
960 | |||
960 | # Store myself as the public api!!! |
|
961 | # Store myself as the public api!!! | |
961 | ns['get_ipython'] = self.get_ipython |
|
962 | ns['get_ipython'] = self.get_ipython | |
962 |
|
963 | |||
963 | # Sync what we've added so far to user_ns_hidden so these aren't seen |
|
964 | # Sync what we've added so far to user_ns_hidden so these aren't seen | |
964 | # by %who |
|
965 | # by %who | |
965 | self.user_ns_hidden.update(ns) |
|
966 | self.user_ns_hidden.update(ns) | |
966 |
|
967 | |||
967 | # Anything put into ns now would show up in %who. Think twice before |
|
968 | # Anything put into ns now would show up in %who. Think twice before | |
968 | # putting anything here, as we really want %who to show the user their |
|
969 | # putting anything here, as we really want %who to show the user their | |
969 | # stuff, not our variables. |
|
970 | # stuff, not our variables. | |
970 |
|
971 | |||
971 | # Finally, update the real user's namespace |
|
972 | # Finally, update the real user's namespace | |
972 | self.user_ns.update(ns) |
|
973 | self.user_ns.update(ns) | |
973 |
|
974 | |||
974 | def reset(self): |
|
975 | def reset(self): | |
975 | """Clear all internal namespaces. |
|
976 | """Clear all internal namespaces. | |
976 |
|
977 | |||
977 | Note that this is much more aggressive than %reset, since it clears |
|
978 | Note that this is much more aggressive than %reset, since it clears | |
978 | fully all namespaces, as well as all input/output lists. |
|
979 | fully all namespaces, as well as all input/output lists. | |
979 | """ |
|
980 | """ | |
980 | # Clear histories |
|
981 | # Clear histories | |
981 | self.history_manager.reset() |
|
982 | self.history_manager.reset() | |
982 |
|
983 | |||
983 | # Reset counter used to index all histories |
|
984 | # Reset counter used to index all histories | |
984 | self.execution_count = 0 |
|
985 | self.execution_count = 0 | |
985 |
|
986 | |||
986 | # Restore the user namespaces to minimal usability |
|
987 | # Restore the user namespaces to minimal usability | |
987 | for ns in self.ns_refs_table: |
|
988 | for ns in self.ns_refs_table: | |
988 | ns.clear() |
|
989 | ns.clear() | |
989 |
|
990 | |||
990 | # The main execution namespaces must be cleared very carefully, |
|
991 | # The main execution namespaces must be cleared very carefully, | |
991 | # skipping the deletion of the builtin-related keys, because doing so |
|
992 | # skipping the deletion of the builtin-related keys, because doing so | |
992 | # would cause errors in many object's __del__ methods. |
|
993 | # would cause errors in many object's __del__ methods. | |
993 | for ns in [self.user_ns, self.user_global_ns]: |
|
994 | for ns in [self.user_ns, self.user_global_ns]: | |
994 | drop_keys = set(ns.keys()) |
|
995 | drop_keys = set(ns.keys()) | |
995 | drop_keys.discard('__builtin__') |
|
996 | drop_keys.discard('__builtin__') | |
996 | drop_keys.discard('__builtins__') |
|
997 | drop_keys.discard('__builtins__') | |
997 | for k in drop_keys: |
|
998 | for k in drop_keys: | |
998 | del ns[k] |
|
999 | del ns[k] | |
999 |
|
1000 | |||
1000 | # Restore the user namespaces to minimal usability |
|
1001 | # Restore the user namespaces to minimal usability | |
1001 | self.init_user_ns() |
|
1002 | self.init_user_ns() | |
1002 |
|
1003 | |||
1003 | # Restore the default and user aliases |
|
1004 | # Restore the default and user aliases | |
1004 | self.alias_manager.clear_aliases() |
|
1005 | self.alias_manager.clear_aliases() | |
1005 | self.alias_manager.init_aliases() |
|
1006 | self.alias_manager.init_aliases() | |
1006 |
|
1007 | |||
1007 | def reset_selective(self, regex=None): |
|
1008 | def reset_selective(self, regex=None): | |
1008 | """Clear selective variables from internal namespaces based on a |
|
1009 | """Clear selective variables from internal namespaces based on a | |
1009 | specified regular expression. |
|
1010 | specified regular expression. | |
1010 |
|
1011 | |||
1011 | Parameters |
|
1012 | Parameters | |
1012 | ---------- |
|
1013 | ---------- | |
1013 | regex : string or compiled pattern, optional |
|
1014 | regex : string or compiled pattern, optional | |
1014 | A regular expression pattern that will be used in searching |
|
1015 | A regular expression pattern that will be used in searching | |
1015 | variable names in the users namespaces. |
|
1016 | variable names in the users namespaces. | |
1016 | """ |
|
1017 | """ | |
1017 | if regex is not None: |
|
1018 | if regex is not None: | |
1018 | try: |
|
1019 | try: | |
1019 | m = re.compile(regex) |
|
1020 | m = re.compile(regex) | |
1020 | except TypeError: |
|
1021 | except TypeError: | |
1021 | raise TypeError('regex must be a string or compiled pattern') |
|
1022 | raise TypeError('regex must be a string or compiled pattern') | |
1022 | # Search for keys in each namespace that match the given regex |
|
1023 | # Search for keys in each namespace that match the given regex | |
1023 | # If a match is found, delete the key/value pair. |
|
1024 | # If a match is found, delete the key/value pair. | |
1024 | for ns in self.ns_refs_table: |
|
1025 | for ns in self.ns_refs_table: | |
1025 | for var in ns: |
|
1026 | for var in ns: | |
1026 | if m.search(var): |
|
1027 | if m.search(var): | |
1027 | del ns[var] |
|
1028 | del ns[var] | |
1028 |
|
1029 | |||
1029 | def push(self, variables, interactive=True): |
|
1030 | def push(self, variables, interactive=True): | |
1030 | """Inject a group of variables into the IPython user namespace. |
|
1031 | """Inject a group of variables into the IPython user namespace. | |
1031 |
|
1032 | |||
1032 | Parameters |
|
1033 | Parameters | |
1033 | ---------- |
|
1034 | ---------- | |
1034 | variables : dict, str or list/tuple of str |
|
1035 | variables : dict, str or list/tuple of str | |
1035 | The variables to inject into the user's namespace. If a dict, a |
|
1036 | The variables to inject into the user's namespace. If a dict, a | |
1036 | simple update is done. If a str, the string is assumed to have |
|
1037 | simple update is done. If a str, the string is assumed to have | |
1037 | variable names separated by spaces. A list/tuple of str can also |
|
1038 | variable names separated by spaces. A list/tuple of str can also | |
1038 | be used to give the variable names. If just the variable names are |
|
1039 | be used to give the variable names. If just the variable names are | |
1039 | give (list/tuple/str) then the variable values looked up in the |
|
1040 | give (list/tuple/str) then the variable values looked up in the | |
1040 | callers frame. |
|
1041 | callers frame. | |
1041 | interactive : bool |
|
1042 | interactive : bool | |
1042 | If True (default), the variables will be listed with the ``who`` |
|
1043 | If True (default), the variables will be listed with the ``who`` | |
1043 | magic. |
|
1044 | magic. | |
1044 | """ |
|
1045 | """ | |
1045 | vdict = None |
|
1046 | vdict = None | |
1046 |
|
1047 | |||
1047 | # We need a dict of name/value pairs to do namespace updates. |
|
1048 | # We need a dict of name/value pairs to do namespace updates. | |
1048 | if isinstance(variables, dict): |
|
1049 | if isinstance(variables, dict): | |
1049 | vdict = variables |
|
1050 | vdict = variables | |
1050 | elif isinstance(variables, (basestring, list, tuple)): |
|
1051 | elif isinstance(variables, (basestring, list, tuple)): | |
1051 | if isinstance(variables, basestring): |
|
1052 | if isinstance(variables, basestring): | |
1052 | vlist = variables.split() |
|
1053 | vlist = variables.split() | |
1053 | else: |
|
1054 | else: | |
1054 | vlist = variables |
|
1055 | vlist = variables | |
1055 | vdict = {} |
|
1056 | vdict = {} | |
1056 | cf = sys._getframe(1) |
|
1057 | cf = sys._getframe(1) | |
1057 | for name in vlist: |
|
1058 | for name in vlist: | |
1058 | try: |
|
1059 | try: | |
1059 | vdict[name] = eval(name, cf.f_globals, cf.f_locals) |
|
1060 | vdict[name] = eval(name, cf.f_globals, cf.f_locals) | |
1060 | except: |
|
1061 | except: | |
1061 | print ('Could not get variable %s from %s' % |
|
1062 | print ('Could not get variable %s from %s' % | |
1062 | (name,cf.f_code.co_name)) |
|
1063 | (name,cf.f_code.co_name)) | |
1063 | else: |
|
1064 | else: | |
1064 | raise ValueError('variables must be a dict/str/list/tuple') |
|
1065 | raise ValueError('variables must be a dict/str/list/tuple') | |
1065 |
|
1066 | |||
1066 | # Propagate variables to user namespace |
|
1067 | # Propagate variables to user namespace | |
1067 | self.user_ns.update(vdict) |
|
1068 | self.user_ns.update(vdict) | |
1068 |
|
1069 | |||
1069 | # And configure interactive visibility |
|
1070 | # And configure interactive visibility | |
1070 | config_ns = self.user_ns_hidden |
|
1071 | config_ns = self.user_ns_hidden | |
1071 | if interactive: |
|
1072 | if interactive: | |
1072 | for name, val in vdict.iteritems(): |
|
1073 | for name, val in vdict.iteritems(): | |
1073 | config_ns.pop(name, None) |
|
1074 | config_ns.pop(name, None) | |
1074 | else: |
|
1075 | else: | |
1075 | for name,val in vdict.iteritems(): |
|
1076 | for name,val in vdict.iteritems(): | |
1076 | config_ns[name] = val |
|
1077 | config_ns[name] = val | |
1077 |
|
1078 | |||
1078 | #------------------------------------------------------------------------- |
|
1079 | #------------------------------------------------------------------------- | |
1079 | # Things related to object introspection |
|
1080 | # Things related to object introspection | |
1080 | #------------------------------------------------------------------------- |
|
1081 | #------------------------------------------------------------------------- | |
1081 |
|
1082 | |||
1082 | def _ofind(self, oname, namespaces=None): |
|
1083 | def _ofind(self, oname, namespaces=None): | |
1083 | """Find an object in the available namespaces. |
|
1084 | """Find an object in the available namespaces. | |
1084 |
|
1085 | |||
1085 | self._ofind(oname) -> dict with keys: found,obj,ospace,ismagic |
|
1086 | self._ofind(oname) -> dict with keys: found,obj,ospace,ismagic | |
1086 |
|
1087 | |||
1087 | Has special code to detect magic functions. |
|
1088 | Has special code to detect magic functions. | |
1088 | """ |
|
1089 | """ | |
1089 | #oname = oname.strip() |
|
1090 | #oname = oname.strip() | |
1090 | #print '1- oname: <%r>' % oname # dbg |
|
1091 | #print '1- oname: <%r>' % oname # dbg | |
1091 | try: |
|
1092 | try: | |
1092 | oname = oname.strip().encode('ascii') |
|
1093 | oname = oname.strip().encode('ascii') | |
1093 | #print '2- oname: <%r>' % oname # dbg |
|
1094 | #print '2- oname: <%r>' % oname # dbg | |
1094 | except UnicodeEncodeError: |
|
1095 | except UnicodeEncodeError: | |
1095 | print 'Python identifiers can only contain ascii characters.' |
|
1096 | print 'Python identifiers can only contain ascii characters.' | |
1096 | return dict(found=False) |
|
1097 | return dict(found=False) | |
1097 |
|
1098 | |||
1098 | alias_ns = None |
|
1099 | alias_ns = None | |
1099 | if namespaces is None: |
|
1100 | if namespaces is None: | |
1100 | # Namespaces to search in: |
|
1101 | # Namespaces to search in: | |
1101 | # Put them in a list. The order is important so that we |
|
1102 | # Put them in a list. The order is important so that we | |
1102 | # find things in the same order that Python finds them. |
|
1103 | # find things in the same order that Python finds them. | |
1103 | namespaces = [ ('Interactive', self.user_ns), |
|
1104 | namespaces = [ ('Interactive', self.user_ns), | |
1104 | ('IPython internal', self.internal_ns), |
|
1105 | ('IPython internal', self.internal_ns), | |
1105 | ('Python builtin', __builtin__.__dict__), |
|
1106 | ('Python builtin', __builtin__.__dict__), | |
1106 | ('Alias', self.alias_manager.alias_table), |
|
1107 | ('Alias', self.alias_manager.alias_table), | |
1107 | ] |
|
1108 | ] | |
1108 | alias_ns = self.alias_manager.alias_table |
|
1109 | alias_ns = self.alias_manager.alias_table | |
1109 |
|
1110 | |||
1110 | # initialize results to 'null' |
|
1111 | # initialize results to 'null' | |
1111 | found = False; obj = None; ospace = None; ds = None; |
|
1112 | found = False; obj = None; ospace = None; ds = None; | |
1112 | ismagic = False; isalias = False; parent = None |
|
1113 | ismagic = False; isalias = False; parent = None | |
1113 |
|
1114 | |||
1114 | # We need to special-case 'print', which as of python2.6 registers as a |
|
1115 | # We need to special-case 'print', which as of python2.6 registers as a | |
1115 | # function but should only be treated as one if print_function was |
|
1116 | # function but should only be treated as one if print_function was | |
1116 | # loaded with a future import. In this case, just bail. |
|
1117 | # loaded with a future import. In this case, just bail. | |
1117 | if (oname == 'print' and not (self.compile.compiler_flags & |
|
1118 | if (oname == 'print' and not (self.compile.compiler_flags & | |
1118 | __future__.CO_FUTURE_PRINT_FUNCTION)): |
|
1119 | __future__.CO_FUTURE_PRINT_FUNCTION)): | |
1119 | return {'found':found, 'obj':obj, 'namespace':ospace, |
|
1120 | return {'found':found, 'obj':obj, 'namespace':ospace, | |
1120 | 'ismagic':ismagic, 'isalias':isalias, 'parent':parent} |
|
1121 | 'ismagic':ismagic, 'isalias':isalias, 'parent':parent} | |
1121 |
|
1122 | |||
1122 | # Look for the given name by splitting it in parts. If the head is |
|
1123 | # Look for the given name by splitting it in parts. If the head is | |
1123 | # found, then we look for all the remaining parts as members, and only |
|
1124 | # found, then we look for all the remaining parts as members, and only | |
1124 | # declare success if we can find them all. |
|
1125 | # declare success if we can find them all. | |
1125 | oname_parts = oname.split('.') |
|
1126 | oname_parts = oname.split('.') | |
1126 | oname_head, oname_rest = oname_parts[0],oname_parts[1:] |
|
1127 | oname_head, oname_rest = oname_parts[0],oname_parts[1:] | |
1127 | for nsname,ns in namespaces: |
|
1128 | for nsname,ns in namespaces: | |
1128 | try: |
|
1129 | try: | |
1129 | obj = ns[oname_head] |
|
1130 | obj = ns[oname_head] | |
1130 | except KeyError: |
|
1131 | except KeyError: | |
1131 | continue |
|
1132 | continue | |
1132 | else: |
|
1133 | else: | |
1133 | #print 'oname_rest:', oname_rest # dbg |
|
1134 | #print 'oname_rest:', oname_rest # dbg | |
1134 | for part in oname_rest: |
|
1135 | for part in oname_rest: | |
1135 | try: |
|
1136 | try: | |
1136 | parent = obj |
|
1137 | parent = obj | |
1137 | obj = getattr(obj,part) |
|
1138 | obj = getattr(obj,part) | |
1138 | except: |
|
1139 | except: | |
1139 | # Blanket except b/c some badly implemented objects |
|
1140 | # Blanket except b/c some badly implemented objects | |
1140 | # allow __getattr__ to raise exceptions other than |
|
1141 | # allow __getattr__ to raise exceptions other than | |
1141 | # AttributeError, which then crashes IPython. |
|
1142 | # AttributeError, which then crashes IPython. | |
1142 | break |
|
1143 | break | |
1143 | else: |
|
1144 | else: | |
1144 | # If we finish the for loop (no break), we got all members |
|
1145 | # If we finish the for loop (no break), we got all members | |
1145 | found = True |
|
1146 | found = True | |
1146 | ospace = nsname |
|
1147 | ospace = nsname | |
1147 | if ns == alias_ns: |
|
1148 | if ns == alias_ns: | |
1148 | isalias = True |
|
1149 | isalias = True | |
1149 | break # namespace loop |
|
1150 | break # namespace loop | |
1150 |
|
1151 | |||
1151 | # Try to see if it's magic |
|
1152 | # Try to see if it's magic | |
1152 | if not found: |
|
1153 | if not found: | |
1153 | if oname.startswith(ESC_MAGIC): |
|
1154 | if oname.startswith(ESC_MAGIC): | |
1154 | oname = oname[1:] |
|
1155 | oname = oname[1:] | |
1155 | obj = getattr(self,'magic_'+oname,None) |
|
1156 | obj = getattr(self,'magic_'+oname,None) | |
1156 | if obj is not None: |
|
1157 | if obj is not None: | |
1157 | found = True |
|
1158 | found = True | |
1158 | ospace = 'IPython internal' |
|
1159 | ospace = 'IPython internal' | |
1159 | ismagic = True |
|
1160 | ismagic = True | |
1160 |
|
1161 | |||
1161 | # Last try: special-case some literals like '', [], {}, etc: |
|
1162 | # Last try: special-case some literals like '', [], {}, etc: | |
1162 | if not found and oname_head in ["''",'""','[]','{}','()']: |
|
1163 | if not found and oname_head in ["''",'""','[]','{}','()']: | |
1163 | obj = eval(oname_head) |
|
1164 | obj = eval(oname_head) | |
1164 | found = True |
|
1165 | found = True | |
1165 | ospace = 'Interactive' |
|
1166 | ospace = 'Interactive' | |
1166 |
|
1167 | |||
1167 | return {'found':found, 'obj':obj, 'namespace':ospace, |
|
1168 | return {'found':found, 'obj':obj, 'namespace':ospace, | |
1168 | 'ismagic':ismagic, 'isalias':isalias, 'parent':parent} |
|
1169 | 'ismagic':ismagic, 'isalias':isalias, 'parent':parent} | |
1169 |
|
1170 | |||
1170 | def _ofind_property(self, oname, info): |
|
1171 | def _ofind_property(self, oname, info): | |
1171 | """Second part of object finding, to look for property details.""" |
|
1172 | """Second part of object finding, to look for property details.""" | |
1172 | if info.found: |
|
1173 | if info.found: | |
1173 | # Get the docstring of the class property if it exists. |
|
1174 | # Get the docstring of the class property if it exists. | |
1174 | path = oname.split('.') |
|
1175 | path = oname.split('.') | |
1175 | root = '.'.join(path[:-1]) |
|
1176 | root = '.'.join(path[:-1]) | |
1176 | if info.parent is not None: |
|
1177 | if info.parent is not None: | |
1177 | try: |
|
1178 | try: | |
1178 | target = getattr(info.parent, '__class__') |
|
1179 | target = getattr(info.parent, '__class__') | |
1179 | # The object belongs to a class instance. |
|
1180 | # The object belongs to a class instance. | |
1180 | try: |
|
1181 | try: | |
1181 | target = getattr(target, path[-1]) |
|
1182 | target = getattr(target, path[-1]) | |
1182 | # The class defines the object. |
|
1183 | # The class defines the object. | |
1183 | if isinstance(target, property): |
|
1184 | if isinstance(target, property): | |
1184 | oname = root + '.__class__.' + path[-1] |
|
1185 | oname = root + '.__class__.' + path[-1] | |
1185 | info = Struct(self._ofind(oname)) |
|
1186 | info = Struct(self._ofind(oname)) | |
1186 | except AttributeError: pass |
|
1187 | except AttributeError: pass | |
1187 | except AttributeError: pass |
|
1188 | except AttributeError: pass | |
1188 |
|
1189 | |||
1189 | # We return either the new info or the unmodified input if the object |
|
1190 | # We return either the new info or the unmodified input if the object | |
1190 | # hadn't been found |
|
1191 | # hadn't been found | |
1191 | return info |
|
1192 | return info | |
1192 |
|
1193 | |||
1193 | def _object_find(self, oname, namespaces=None): |
|
1194 | def _object_find(self, oname, namespaces=None): | |
1194 | """Find an object and return a struct with info about it.""" |
|
1195 | """Find an object and return a struct with info about it.""" | |
1195 | inf = Struct(self._ofind(oname, namespaces)) |
|
1196 | inf = Struct(self._ofind(oname, namespaces)) | |
1196 | return Struct(self._ofind_property(oname, inf)) |
|
1197 | return Struct(self._ofind_property(oname, inf)) | |
1197 |
|
1198 | |||
1198 | def _inspect(self, meth, oname, namespaces=None, **kw): |
|
1199 | def _inspect(self, meth, oname, namespaces=None, **kw): | |
1199 | """Generic interface to the inspector system. |
|
1200 | """Generic interface to the inspector system. | |
1200 |
|
1201 | |||
1201 | This function is meant to be called by pdef, pdoc & friends.""" |
|
1202 | This function is meant to be called by pdef, pdoc & friends.""" | |
1202 | info = self._object_find(oname) |
|
1203 | info = self._object_find(oname) | |
1203 | if info.found: |
|
1204 | if info.found: | |
1204 | pmethod = getattr(self.inspector, meth) |
|
1205 | pmethod = getattr(self.inspector, meth) | |
1205 | formatter = format_screen if info.ismagic else None |
|
1206 | formatter = format_screen if info.ismagic else None | |
1206 | if meth == 'pdoc': |
|
1207 | if meth == 'pdoc': | |
1207 | pmethod(info.obj, oname, formatter) |
|
1208 | pmethod(info.obj, oname, formatter) | |
1208 | elif meth == 'pinfo': |
|
1209 | elif meth == 'pinfo': | |
1209 | pmethod(info.obj, oname, formatter, info, **kw) |
|
1210 | pmethod(info.obj, oname, formatter, info, **kw) | |
1210 | else: |
|
1211 | else: | |
1211 | pmethod(info.obj, oname) |
|
1212 | pmethod(info.obj, oname) | |
1212 | else: |
|
1213 | else: | |
1213 | print 'Object `%s` not found.' % oname |
|
1214 | print 'Object `%s` not found.' % oname | |
1214 | return 'not found' # so callers can take other action |
|
1215 | return 'not found' # so callers can take other action | |
1215 |
|
1216 | |||
1216 | def object_inspect(self, oname): |
|
1217 | def object_inspect(self, oname): | |
1217 | info = self._object_find(oname) |
|
1218 | info = self._object_find(oname) | |
1218 | if info.found: |
|
1219 | if info.found: | |
1219 | return self.inspector.info(info.obj, oname, info=info) |
|
1220 | return self.inspector.info(info.obj, oname, info=info) | |
1220 | else: |
|
1221 | else: | |
1221 | return oinspect.object_info(name=oname, found=False) |
|
1222 | return oinspect.object_info(name=oname, found=False) | |
1222 |
|
1223 | |||
1223 | #------------------------------------------------------------------------- |
|
1224 | #------------------------------------------------------------------------- | |
1224 | # Things related to history management |
|
1225 | # Things related to history management | |
1225 | #------------------------------------------------------------------------- |
|
1226 | #------------------------------------------------------------------------- | |
1226 |
|
1227 | |||
1227 | def init_history(self): |
|
1228 | def init_history(self): | |
1228 | self.history_manager = HistoryManager(shell=self) |
|
1229 | self.history_manager = HistoryManager(shell=self) | |
1229 |
|
1230 | |||
1230 | def save_hist(self): |
|
1231 | def save_hist(self): | |
1231 | """Save input history to a file (via readline library).""" |
|
1232 | """Save input history to a file (via readline library).""" | |
1232 | self.history_manager.save_hist() |
|
1233 | self.history_manager.save_hist() | |
1233 |
|
1234 | |||
1234 | # For backwards compatibility |
|
1235 | # For backwards compatibility | |
1235 | savehist = save_hist |
|
1236 | savehist = save_hist | |
1236 |
|
1237 | |||
1237 | def reload_hist(self): |
|
1238 | def reload_hist(self): | |
1238 | """Reload the input history from disk file.""" |
|
1239 | """Reload the input history from disk file.""" | |
1239 | self.history_manager.reload_hist() |
|
1240 | self.history_manager.reload_hist() | |
1240 |
|
1241 | |||
1241 | # For backwards compatibility |
|
1242 | # For backwards compatibility | |
1242 | reloadhist = reload_hist |
|
1243 | reloadhist = reload_hist | |
1243 |
|
1244 | |||
1244 | def history_saving_wrapper(self, func): |
|
1245 | def history_saving_wrapper(self, func): | |
1245 | """ Wrap func for readline history saving |
|
1246 | """ Wrap func for readline history saving | |
1246 |
|
1247 | |||
1247 | Convert func into callable that saves & restores |
|
1248 | Convert func into callable that saves & restores | |
1248 | history around the call """ |
|
1249 | history around the call """ | |
1249 |
|
1250 | |||
1250 | if self.has_readline: |
|
1251 | if self.has_readline: | |
1251 | from IPython.utils import rlineimpl as readline |
|
1252 | from IPython.utils import rlineimpl as readline | |
1252 | else: |
|
1253 | else: | |
1253 | return func |
|
1254 | return func | |
1254 |
|
1255 | |||
1255 | def wrapper(): |
|
1256 | def wrapper(): | |
1256 | self.save_hist() |
|
1257 | self.save_hist() | |
1257 | try: |
|
1258 | try: | |
1258 | func() |
|
1259 | func() | |
1259 | finally: |
|
1260 | finally: | |
1260 | readline.read_history_file(self.histfile) |
|
1261 | readline.read_history_file(self.histfile) | |
1261 | return wrapper |
|
1262 | return wrapper | |
1262 |
|
1263 | |||
1263 | #------------------------------------------------------------------------- |
|
1264 | #------------------------------------------------------------------------- | |
1264 | # Things related to exception handling and tracebacks (not debugging) |
|
1265 | # Things related to exception handling and tracebacks (not debugging) | |
1265 | #------------------------------------------------------------------------- |
|
1266 | #------------------------------------------------------------------------- | |
1266 |
|
1267 | |||
1267 | def init_traceback_handlers(self, custom_exceptions): |
|
1268 | def init_traceback_handlers(self, custom_exceptions): | |
1268 | # Syntax error handler. |
|
1269 | # Syntax error handler. | |
1269 | self.SyntaxTB = ultratb.SyntaxTB(color_scheme='NoColor') |
|
1270 | self.SyntaxTB = ultratb.SyntaxTB(color_scheme='NoColor') | |
1270 |
|
1271 | |||
1271 | # The interactive one is initialized with an offset, meaning we always |
|
1272 | # The interactive one is initialized with an offset, meaning we always | |
1272 | # want to remove the topmost item in the traceback, which is our own |
|
1273 | # want to remove the topmost item in the traceback, which is our own | |
1273 | # internal code. Valid modes: ['Plain','Context','Verbose'] |
|
1274 | # internal code. Valid modes: ['Plain','Context','Verbose'] | |
1274 | self.InteractiveTB = ultratb.AutoFormattedTB(mode = 'Plain', |
|
1275 | self.InteractiveTB = ultratb.AutoFormattedTB(mode = 'Plain', | |
1275 | color_scheme='NoColor', |
|
1276 | color_scheme='NoColor', | |
1276 | tb_offset = 1, |
|
1277 | tb_offset = 1, | |
1277 | check_cache=self.compile.check_cache) |
|
1278 | check_cache=self.compile.check_cache) | |
1278 |
|
1279 | |||
1279 | # The instance will store a pointer to the system-wide exception hook, |
|
1280 | # The instance will store a pointer to the system-wide exception hook, | |
1280 | # so that runtime code (such as magics) can access it. This is because |
|
1281 | # so that runtime code (such as magics) can access it. This is because | |
1281 | # during the read-eval loop, it may get temporarily overwritten. |
|
1282 | # during the read-eval loop, it may get temporarily overwritten. | |
1282 | self.sys_excepthook = sys.excepthook |
|
1283 | self.sys_excepthook = sys.excepthook | |
1283 |
|
1284 | |||
1284 | # and add any custom exception handlers the user may have specified |
|
1285 | # and add any custom exception handlers the user may have specified | |
1285 | self.set_custom_exc(*custom_exceptions) |
|
1286 | self.set_custom_exc(*custom_exceptions) | |
1286 |
|
1287 | |||
1287 | # Set the exception mode |
|
1288 | # Set the exception mode | |
1288 | self.InteractiveTB.set_mode(mode=self.xmode) |
|
1289 | self.InteractiveTB.set_mode(mode=self.xmode) | |
1289 |
|
1290 | |||
1290 | def set_custom_exc(self, exc_tuple, handler): |
|
1291 | def set_custom_exc(self, exc_tuple, handler): | |
1291 | """set_custom_exc(exc_tuple,handler) |
|
1292 | """set_custom_exc(exc_tuple,handler) | |
1292 |
|
1293 | |||
1293 | Set a custom exception handler, which will be called if any of the |
|
1294 | Set a custom exception handler, which will be called if any of the | |
1294 | exceptions in exc_tuple occur in the mainloop (specifically, in the |
|
1295 | exceptions in exc_tuple occur in the mainloop (specifically, in the | |
1295 | run_code() method. |
|
1296 | run_code() method. | |
1296 |
|
1297 | |||
1297 | Inputs: |
|
1298 | Inputs: | |
1298 |
|
1299 | |||
1299 | - exc_tuple: a *tuple* of valid exceptions to call the defined |
|
1300 | - exc_tuple: a *tuple* of valid exceptions to call the defined | |
1300 | handler for. It is very important that you use a tuple, and NOT A |
|
1301 | handler for. It is very important that you use a tuple, and NOT A | |
1301 | LIST here, because of the way Python's except statement works. If |
|
1302 | LIST here, because of the way Python's except statement works. If | |
1302 | you only want to trap a single exception, use a singleton tuple: |
|
1303 | you only want to trap a single exception, use a singleton tuple: | |
1303 |
|
1304 | |||
1304 | exc_tuple == (MyCustomException,) |
|
1305 | exc_tuple == (MyCustomException,) | |
1305 |
|
1306 | |||
1306 | - handler: this must be defined as a function with the following |
|
1307 | - handler: this must be defined as a function with the following | |
1307 | basic interface:: |
|
1308 | basic interface:: | |
1308 |
|
1309 | |||
1309 | def my_handler(self, etype, value, tb, tb_offset=None) |
|
1310 | def my_handler(self, etype, value, tb, tb_offset=None) | |
1310 | ... |
|
1311 | ... | |
1311 | # The return value must be |
|
1312 | # The return value must be | |
1312 | return structured_traceback |
|
1313 | return structured_traceback | |
1313 |
|
1314 | |||
1314 | This will be made into an instance method (via types.MethodType) |
|
1315 | This will be made into an instance method (via types.MethodType) | |
1315 | of IPython itself, and it will be called if any of the exceptions |
|
1316 | of IPython itself, and it will be called if any of the exceptions | |
1316 | listed in the exc_tuple are caught. If the handler is None, an |
|
1317 | listed in the exc_tuple are caught. If the handler is None, an | |
1317 | internal basic one is used, which just prints basic info. |
|
1318 | internal basic one is used, which just prints basic info. | |
1318 |
|
1319 | |||
1319 | WARNING: by putting in your own exception handler into IPython's main |
|
1320 | WARNING: by putting in your own exception handler into IPython's main | |
1320 | execution loop, you run a very good chance of nasty crashes. This |
|
1321 | execution loop, you run a very good chance of nasty crashes. This | |
1321 | facility should only be used if you really know what you are doing.""" |
|
1322 | facility should only be used if you really know what you are doing.""" | |
1322 |
|
1323 | |||
1323 | assert type(exc_tuple)==type(()) , \ |
|
1324 | assert type(exc_tuple)==type(()) , \ | |
1324 | "The custom exceptions must be given AS A TUPLE." |
|
1325 | "The custom exceptions must be given AS A TUPLE." | |
1325 |
|
1326 | |||
1326 | def dummy_handler(self,etype,value,tb): |
|
1327 | def dummy_handler(self,etype,value,tb): | |
1327 | print '*** Simple custom exception handler ***' |
|
1328 | print '*** Simple custom exception handler ***' | |
1328 | print 'Exception type :',etype |
|
1329 | print 'Exception type :',etype | |
1329 | print 'Exception value:',value |
|
1330 | print 'Exception value:',value | |
1330 | print 'Traceback :',tb |
|
1331 | print 'Traceback :',tb | |
1331 | print 'Source code :','\n'.join(self.buffer) |
|
1332 | print 'Source code :','\n'.join(self.buffer) | |
1332 |
|
1333 | |||
1333 | if handler is None: handler = dummy_handler |
|
1334 | if handler is None: handler = dummy_handler | |
1334 |
|
1335 | |||
1335 | self.CustomTB = types.MethodType(handler,self) |
|
1336 | self.CustomTB = types.MethodType(handler,self) | |
1336 | self.custom_exceptions = exc_tuple |
|
1337 | self.custom_exceptions = exc_tuple | |
1337 |
|
1338 | |||
1338 | def excepthook(self, etype, value, tb): |
|
1339 | def excepthook(self, etype, value, tb): | |
1339 | """One more defense for GUI apps that call sys.excepthook. |
|
1340 | """One more defense for GUI apps that call sys.excepthook. | |
1340 |
|
1341 | |||
1341 | GUI frameworks like wxPython trap exceptions and call |
|
1342 | GUI frameworks like wxPython trap exceptions and call | |
1342 | sys.excepthook themselves. I guess this is a feature that |
|
1343 | sys.excepthook themselves. I guess this is a feature that | |
1343 | enables them to keep running after exceptions that would |
|
1344 | enables them to keep running after exceptions that would | |
1344 | otherwise kill their mainloop. This is a bother for IPython |
|
1345 | otherwise kill their mainloop. This is a bother for IPython | |
1345 | which excepts to catch all of the program exceptions with a try: |
|
1346 | which excepts to catch all of the program exceptions with a try: | |
1346 | except: statement. |
|
1347 | except: statement. | |
1347 |
|
1348 | |||
1348 | Normally, IPython sets sys.excepthook to a CrashHandler instance, so if |
|
1349 | Normally, IPython sets sys.excepthook to a CrashHandler instance, so if | |
1349 | any app directly invokes sys.excepthook, it will look to the user like |
|
1350 | any app directly invokes sys.excepthook, it will look to the user like | |
1350 | IPython crashed. In order to work around this, we can disable the |
|
1351 | IPython crashed. In order to work around this, we can disable the | |
1351 | CrashHandler and replace it with this excepthook instead, which prints a |
|
1352 | CrashHandler and replace it with this excepthook instead, which prints a | |
1352 | regular traceback using our InteractiveTB. In this fashion, apps which |
|
1353 | regular traceback using our InteractiveTB. In this fashion, apps which | |
1353 | call sys.excepthook will generate a regular-looking exception from |
|
1354 | call sys.excepthook will generate a regular-looking exception from | |
1354 | IPython, and the CrashHandler will only be triggered by real IPython |
|
1355 | IPython, and the CrashHandler will only be triggered by real IPython | |
1355 | crashes. |
|
1356 | crashes. | |
1356 |
|
1357 | |||
1357 | This hook should be used sparingly, only in places which are not likely |
|
1358 | This hook should be used sparingly, only in places which are not likely | |
1358 | to be true IPython errors. |
|
1359 | to be true IPython errors. | |
1359 | """ |
|
1360 | """ | |
1360 | self.showtraceback((etype,value,tb),tb_offset=0) |
|
1361 | self.showtraceback((etype,value,tb),tb_offset=0) | |
1361 |
|
1362 | |||
1362 | def showtraceback(self,exc_tuple = None,filename=None,tb_offset=None, |
|
1363 | def showtraceback(self,exc_tuple = None,filename=None,tb_offset=None, | |
1363 | exception_only=False): |
|
1364 | exception_only=False): | |
1364 | """Display the exception that just occurred. |
|
1365 | """Display the exception that just occurred. | |
1365 |
|
1366 | |||
1366 | If nothing is known about the exception, this is the method which |
|
1367 | If nothing is known about the exception, this is the method which | |
1367 | should be used throughout the code for presenting user tracebacks, |
|
1368 | should be used throughout the code for presenting user tracebacks, | |
1368 | rather than directly invoking the InteractiveTB object. |
|
1369 | rather than directly invoking the InteractiveTB object. | |
1369 |
|
1370 | |||
1370 | A specific showsyntaxerror() also exists, but this method can take |
|
1371 | A specific showsyntaxerror() also exists, but this method can take | |
1371 | care of calling it if needed, so unless you are explicitly catching a |
|
1372 | care of calling it if needed, so unless you are explicitly catching a | |
1372 | SyntaxError exception, don't try to analyze the stack manually and |
|
1373 | SyntaxError exception, don't try to analyze the stack manually and | |
1373 | simply call this method.""" |
|
1374 | simply call this method.""" | |
1374 |
|
1375 | |||
1375 | try: |
|
1376 | try: | |
1376 | if exc_tuple is None: |
|
1377 | if exc_tuple is None: | |
1377 | etype, value, tb = sys.exc_info() |
|
1378 | etype, value, tb = sys.exc_info() | |
1378 | else: |
|
1379 | else: | |
1379 | etype, value, tb = exc_tuple |
|
1380 | etype, value, tb = exc_tuple | |
1380 |
|
1381 | |||
1381 | if etype is None: |
|
1382 | if etype is None: | |
1382 | if hasattr(sys, 'last_type'): |
|
1383 | if hasattr(sys, 'last_type'): | |
1383 | etype, value, tb = sys.last_type, sys.last_value, \ |
|
1384 | etype, value, tb = sys.last_type, sys.last_value, \ | |
1384 | sys.last_traceback |
|
1385 | sys.last_traceback | |
1385 | else: |
|
1386 | else: | |
1386 | self.write_err('No traceback available to show.\n') |
|
1387 | self.write_err('No traceback available to show.\n') | |
1387 | return |
|
1388 | return | |
1388 |
|
1389 | |||
1389 | if etype is SyntaxError: |
|
1390 | if etype is SyntaxError: | |
1390 | # Though this won't be called by syntax errors in the input |
|
1391 | # Though this won't be called by syntax errors in the input | |
1391 | # line, there may be SyntaxError cases whith imported code. |
|
1392 | # line, there may be SyntaxError cases whith imported code. | |
1392 | self.showsyntaxerror(filename) |
|
1393 | self.showsyntaxerror(filename) | |
1393 | elif etype is UsageError: |
|
1394 | elif etype is UsageError: | |
1394 | print "UsageError:", value |
|
1395 | print "UsageError:", value | |
1395 | else: |
|
1396 | else: | |
1396 | # WARNING: these variables are somewhat deprecated and not |
|
1397 | # WARNING: these variables are somewhat deprecated and not | |
1397 | # necessarily safe to use in a threaded environment, but tools |
|
1398 | # necessarily safe to use in a threaded environment, but tools | |
1398 | # like pdb depend on their existence, so let's set them. If we |
|
1399 | # like pdb depend on their existence, so let's set them. If we | |
1399 | # find problems in the field, we'll need to revisit their use. |
|
1400 | # find problems in the field, we'll need to revisit their use. | |
1400 | sys.last_type = etype |
|
1401 | sys.last_type = etype | |
1401 | sys.last_value = value |
|
1402 | sys.last_value = value | |
1402 | sys.last_traceback = tb |
|
1403 | sys.last_traceback = tb | |
1403 |
|
1404 | |||
1404 | if etype in self.custom_exceptions: |
|
1405 | if etype in self.custom_exceptions: | |
1405 | # FIXME: Old custom traceback objects may just return a |
|
1406 | # FIXME: Old custom traceback objects may just return a | |
1406 | # string, in that case we just put it into a list |
|
1407 | # string, in that case we just put it into a list | |
1407 | stb = self.CustomTB(etype, value, tb, tb_offset) |
|
1408 | stb = self.CustomTB(etype, value, tb, tb_offset) | |
1408 | if isinstance(ctb, basestring): |
|
1409 | if isinstance(ctb, basestring): | |
1409 | stb = [stb] |
|
1410 | stb = [stb] | |
1410 | else: |
|
1411 | else: | |
1411 | if exception_only: |
|
1412 | if exception_only: | |
1412 | stb = ['An exception has occurred, use %tb to see ' |
|
1413 | stb = ['An exception has occurred, use %tb to see ' | |
1413 | 'the full traceback.\n'] |
|
1414 | 'the full traceback.\n'] | |
1414 | stb.extend(self.InteractiveTB.get_exception_only(etype, |
|
1415 | stb.extend(self.InteractiveTB.get_exception_only(etype, | |
1415 | value)) |
|
1416 | value)) | |
1416 | else: |
|
1417 | else: | |
1417 | stb = self.InteractiveTB.structured_traceback(etype, |
|
1418 | stb = self.InteractiveTB.structured_traceback(etype, | |
1418 | value, tb, tb_offset=tb_offset) |
|
1419 | value, tb, tb_offset=tb_offset) | |
1419 | # FIXME: the pdb calling should be done by us, not by |
|
1420 | # FIXME: the pdb calling should be done by us, not by | |
1420 | # the code computing the traceback. |
|
1421 | # the code computing the traceback. | |
1421 | if self.InteractiveTB.call_pdb: |
|
1422 | if self.InteractiveTB.call_pdb: | |
1422 | # pdb mucks up readline, fix it back |
|
1423 | # pdb mucks up readline, fix it back | |
1423 | self.set_readline_completer() |
|
1424 | self.set_readline_completer() | |
1424 |
|
1425 | |||
1425 | # Actually show the traceback |
|
1426 | # Actually show the traceback | |
1426 | self._showtraceback(etype, value, stb) |
|
1427 | self._showtraceback(etype, value, stb) | |
1427 |
|
1428 | |||
1428 | except KeyboardInterrupt: |
|
1429 | except KeyboardInterrupt: | |
1429 | self.write_err("\nKeyboardInterrupt\n") |
|
1430 | self.write_err("\nKeyboardInterrupt\n") | |
1430 |
|
1431 | |||
1431 | def _showtraceback(self, etype, evalue, stb): |
|
1432 | def _showtraceback(self, etype, evalue, stb): | |
1432 | """Actually show a traceback. |
|
1433 | """Actually show a traceback. | |
1433 |
|
1434 | |||
1434 | Subclasses may override this method to put the traceback on a different |
|
1435 | Subclasses may override this method to put the traceback on a different | |
1435 | place, like a side channel. |
|
1436 | place, like a side channel. | |
1436 | """ |
|
1437 | """ | |
1437 | print >> io.Term.cout, self.InteractiveTB.stb2text(stb) |
|
1438 | print >> io.Term.cout, self.InteractiveTB.stb2text(stb) | |
1438 |
|
1439 | |||
1439 | def showsyntaxerror(self, filename=None): |
|
1440 | def showsyntaxerror(self, filename=None): | |
1440 | """Display the syntax error that just occurred. |
|
1441 | """Display the syntax error that just occurred. | |
1441 |
|
1442 | |||
1442 | This doesn't display a stack trace because there isn't one. |
|
1443 | This doesn't display a stack trace because there isn't one. | |
1443 |
|
1444 | |||
1444 | If a filename is given, it is stuffed in the exception instead |
|
1445 | If a filename is given, it is stuffed in the exception instead | |
1445 | of what was there before (because Python's parser always uses |
|
1446 | of what was there before (because Python's parser always uses | |
1446 | "<string>" when reading from a string). |
|
1447 | "<string>" when reading from a string). | |
1447 | """ |
|
1448 | """ | |
1448 | etype, value, last_traceback = sys.exc_info() |
|
1449 | etype, value, last_traceback = sys.exc_info() | |
1449 |
|
1450 | |||
1450 | # See note about these variables in showtraceback() above |
|
1451 | # See note about these variables in showtraceback() above | |
1451 | sys.last_type = etype |
|
1452 | sys.last_type = etype | |
1452 | sys.last_value = value |
|
1453 | sys.last_value = value | |
1453 | sys.last_traceback = last_traceback |
|
1454 | sys.last_traceback = last_traceback | |
1454 |
|
1455 | |||
1455 | if filename and etype is SyntaxError: |
|
1456 | if filename and etype is SyntaxError: | |
1456 | # Work hard to stuff the correct filename in the exception |
|
1457 | # Work hard to stuff the correct filename in the exception | |
1457 | try: |
|
1458 | try: | |
1458 | msg, (dummy_filename, lineno, offset, line) = value |
|
1459 | msg, (dummy_filename, lineno, offset, line) = value | |
1459 | except: |
|
1460 | except: | |
1460 | # Not the format we expect; leave it alone |
|
1461 | # Not the format we expect; leave it alone | |
1461 | pass |
|
1462 | pass | |
1462 | else: |
|
1463 | else: | |
1463 | # Stuff in the right filename |
|
1464 | # Stuff in the right filename | |
1464 | try: |
|
1465 | try: | |
1465 | # Assume SyntaxError is a class exception |
|
1466 | # Assume SyntaxError is a class exception | |
1466 | value = SyntaxError(msg, (filename, lineno, offset, line)) |
|
1467 | value = SyntaxError(msg, (filename, lineno, offset, line)) | |
1467 | except: |
|
1468 | except: | |
1468 | # If that failed, assume SyntaxError is a string |
|
1469 | # If that failed, assume SyntaxError is a string | |
1469 | value = msg, (filename, lineno, offset, line) |
|
1470 | value = msg, (filename, lineno, offset, line) | |
1470 | stb = self.SyntaxTB.structured_traceback(etype, value, []) |
|
1471 | stb = self.SyntaxTB.structured_traceback(etype, value, []) | |
1471 | self._showtraceback(etype, value, stb) |
|
1472 | self._showtraceback(etype, value, stb) | |
1472 |
|
1473 | |||
1473 | #------------------------------------------------------------------------- |
|
1474 | #------------------------------------------------------------------------- | |
1474 | # Things related to readline |
|
1475 | # Things related to readline | |
1475 | #------------------------------------------------------------------------- |
|
1476 | #------------------------------------------------------------------------- | |
1476 |
|
1477 | |||
1477 | def init_readline(self): |
|
1478 | def init_readline(self): | |
1478 | """Command history completion/saving/reloading.""" |
|
1479 | """Command history completion/saving/reloading.""" | |
1479 |
|
1480 | |||
1480 | if self.readline_use: |
|
1481 | if self.readline_use: | |
1481 | import IPython.utils.rlineimpl as readline |
|
1482 | import IPython.utils.rlineimpl as readline | |
1482 |
|
1483 | |||
1483 | self.rl_next_input = None |
|
1484 | self.rl_next_input = None | |
1484 | self.rl_do_indent = False |
|
1485 | self.rl_do_indent = False | |
1485 |
|
1486 | |||
1486 | if not self.readline_use or not readline.have_readline: |
|
1487 | if not self.readline_use or not readline.have_readline: | |
1487 | self.has_readline = False |
|
1488 | self.has_readline = False | |
1488 | self.readline = None |
|
1489 | self.readline = None | |
1489 | # Set a number of methods that depend on readline to be no-op |
|
1490 | # Set a number of methods that depend on readline to be no-op | |
1490 | self.save_hist = no_op |
|
1491 | self.save_hist = no_op | |
1491 | self.reload_hist = no_op |
|
1492 | self.reload_hist = no_op | |
1492 | self.set_readline_completer = no_op |
|
1493 | self.set_readline_completer = no_op | |
1493 | self.set_custom_completer = no_op |
|
1494 | self.set_custom_completer = no_op | |
1494 | self.set_completer_frame = no_op |
|
1495 | self.set_completer_frame = no_op | |
1495 | warn('Readline services not available or not loaded.') |
|
1496 | warn('Readline services not available or not loaded.') | |
1496 | else: |
|
1497 | else: | |
1497 | self.has_readline = True |
|
1498 | self.has_readline = True | |
1498 | self.readline = readline |
|
1499 | self.readline = readline | |
1499 | sys.modules['readline'] = readline |
|
1500 | sys.modules['readline'] = readline | |
1500 |
|
1501 | |||
1501 | # Platform-specific configuration |
|
1502 | # Platform-specific configuration | |
1502 | if os.name == 'nt': |
|
1503 | if os.name == 'nt': | |
1503 | # FIXME - check with Frederick to see if we can harmonize |
|
1504 | # FIXME - check with Frederick to see if we can harmonize | |
1504 | # naming conventions with pyreadline to avoid this |
|
1505 | # naming conventions with pyreadline to avoid this | |
1505 | # platform-dependent check |
|
1506 | # platform-dependent check | |
1506 | self.readline_startup_hook = readline.set_pre_input_hook |
|
1507 | self.readline_startup_hook = readline.set_pre_input_hook | |
1507 | else: |
|
1508 | else: | |
1508 | self.readline_startup_hook = readline.set_startup_hook |
|
1509 | self.readline_startup_hook = readline.set_startup_hook | |
1509 |
|
1510 | |||
1510 | # Load user's initrc file (readline config) |
|
1511 | # Load user's initrc file (readline config) | |
1511 | # Or if libedit is used, load editrc. |
|
1512 | # Or if libedit is used, load editrc. | |
1512 | inputrc_name = os.environ.get('INPUTRC') |
|
1513 | inputrc_name = os.environ.get('INPUTRC') | |
1513 | if inputrc_name is None: |
|
1514 | if inputrc_name is None: | |
1514 | home_dir = get_home_dir() |
|
1515 | home_dir = get_home_dir() | |
1515 | if home_dir is not None: |
|
1516 | if home_dir is not None: | |
1516 | inputrc_name = '.inputrc' |
|
1517 | inputrc_name = '.inputrc' | |
1517 | if readline.uses_libedit: |
|
1518 | if readline.uses_libedit: | |
1518 | inputrc_name = '.editrc' |
|
1519 | inputrc_name = '.editrc' | |
1519 | inputrc_name = os.path.join(home_dir, inputrc_name) |
|
1520 | inputrc_name = os.path.join(home_dir, inputrc_name) | |
1520 | if os.path.isfile(inputrc_name): |
|
1521 | if os.path.isfile(inputrc_name): | |
1521 | try: |
|
1522 | try: | |
1522 | readline.read_init_file(inputrc_name) |
|
1523 | readline.read_init_file(inputrc_name) | |
1523 | except: |
|
1524 | except: | |
1524 | warn('Problems reading readline initialization file <%s>' |
|
1525 | warn('Problems reading readline initialization file <%s>' | |
1525 | % inputrc_name) |
|
1526 | % inputrc_name) | |
1526 |
|
1527 | |||
1527 | # Configure readline according to user's prefs |
|
1528 | # Configure readline according to user's prefs | |
1528 | # This is only done if GNU readline is being used. If libedit |
|
1529 | # This is only done if GNU readline is being used. If libedit | |
1529 | # is being used (as on Leopard) the readline config is |
|
1530 | # is being used (as on Leopard) the readline config is | |
1530 | # not run as the syntax for libedit is different. |
|
1531 | # not run as the syntax for libedit is different. | |
1531 | if not readline.uses_libedit: |
|
1532 | if not readline.uses_libedit: | |
1532 | for rlcommand in self.readline_parse_and_bind: |
|
1533 | for rlcommand in self.readline_parse_and_bind: | |
1533 | #print "loading rl:",rlcommand # dbg |
|
1534 | #print "loading rl:",rlcommand # dbg | |
1534 | readline.parse_and_bind(rlcommand) |
|
1535 | readline.parse_and_bind(rlcommand) | |
1535 |
|
1536 | |||
1536 | # Remove some chars from the delimiters list. If we encounter |
|
1537 | # Remove some chars from the delimiters list. If we encounter | |
1537 | # unicode chars, discard them. |
|
1538 | # unicode chars, discard them. | |
1538 | delims = readline.get_completer_delims().encode("ascii", "ignore") |
|
1539 | delims = readline.get_completer_delims().encode("ascii", "ignore") | |
1539 | delims = delims.translate(None, self.readline_remove_delims) |
|
1540 | delims = delims.translate(None, self.readline_remove_delims) | |
1540 | delims = delims.replace(ESC_MAGIC, '') |
|
1541 | delims = delims.replace(ESC_MAGIC, '') | |
1541 | readline.set_completer_delims(delims) |
|
1542 | readline.set_completer_delims(delims) | |
1542 | # otherwise we end up with a monster history after a while: |
|
1543 | # otherwise we end up with a monster history after a while: | |
1543 | readline.set_history_length(1000) |
|
1544 | readline.set_history_length(1000) | |
1544 | try: |
|
1545 | try: | |
1545 | #print '*** Reading readline history' # dbg |
|
1546 | #print '*** Reading readline history' # dbg | |
1546 | readline.read_history_file(self.histfile) |
|
1547 | readline.read_history_file(self.histfile) | |
1547 | except IOError: |
|
1548 | except IOError: | |
1548 | pass # It doesn't exist yet. |
|
1549 | pass # It doesn't exist yet. | |
1549 |
|
1550 | |||
1550 | # If we have readline, we want our history saved upon ipython |
|
1551 | # If we have readline, we want our history saved upon ipython | |
1551 | # exiting. |
|
1552 | # exiting. | |
1552 | atexit.register(self.save_hist) |
|
1553 | atexit.register(self.save_hist) | |
1553 |
|
1554 | |||
1554 | # Configure auto-indent for all platforms |
|
1555 | # Configure auto-indent for all platforms | |
1555 | self.set_autoindent(self.autoindent) |
|
1556 | self.set_autoindent(self.autoindent) | |
1556 |
|
1557 | |||
1557 | def set_next_input(self, s): |
|
1558 | def set_next_input(self, s): | |
1558 | """ Sets the 'default' input string for the next command line. |
|
1559 | """ Sets the 'default' input string for the next command line. | |
1559 |
|
1560 | |||
1560 | Requires readline. |
|
1561 | Requires readline. | |
1561 |
|
1562 | |||
1562 | Example: |
|
1563 | Example: | |
1563 |
|
1564 | |||
1564 | [D:\ipython]|1> _ip.set_next_input("Hello Word") |
|
1565 | [D:\ipython]|1> _ip.set_next_input("Hello Word") | |
1565 | [D:\ipython]|2> Hello Word_ # cursor is here |
|
1566 | [D:\ipython]|2> Hello Word_ # cursor is here | |
1566 | """ |
|
1567 | """ | |
1567 |
|
1568 | |||
1568 | self.rl_next_input = s |
|
1569 | self.rl_next_input = s | |
1569 |
|
1570 | |||
1570 | # Maybe move this to the terminal subclass? |
|
1571 | # Maybe move this to the terminal subclass? | |
1571 | def pre_readline(self): |
|
1572 | def pre_readline(self): | |
1572 | """readline hook to be used at the start of each line. |
|
1573 | """readline hook to be used at the start of each line. | |
1573 |
|
1574 | |||
1574 | Currently it handles auto-indent only.""" |
|
1575 | Currently it handles auto-indent only.""" | |
1575 |
|
1576 | |||
1576 | if self.rl_do_indent: |
|
1577 | if self.rl_do_indent: | |
1577 | self.readline.insert_text(self._indent_current_str()) |
|
1578 | self.readline.insert_text(self._indent_current_str()) | |
1578 | if self.rl_next_input is not None: |
|
1579 | if self.rl_next_input is not None: | |
1579 | self.readline.insert_text(self.rl_next_input) |
|
1580 | self.readline.insert_text(self.rl_next_input) | |
1580 | self.rl_next_input = None |
|
1581 | self.rl_next_input = None | |
1581 |
|
1582 | |||
1582 | def _indent_current_str(self): |
|
1583 | def _indent_current_str(self): | |
1583 | """return the current level of indentation as a string""" |
|
1584 | """return the current level of indentation as a string""" | |
1584 | return self.input_splitter.indent_spaces * ' ' |
|
1585 | return self.input_splitter.indent_spaces * ' ' | |
1585 |
|
1586 | |||
1586 | #------------------------------------------------------------------------- |
|
1587 | #------------------------------------------------------------------------- | |
1587 | # Things related to text completion |
|
1588 | # Things related to text completion | |
1588 | #------------------------------------------------------------------------- |
|
1589 | #------------------------------------------------------------------------- | |
1589 |
|
1590 | |||
1590 | def init_completer(self): |
|
1591 | def init_completer(self): | |
1591 | """Initialize the completion machinery. |
|
1592 | """Initialize the completion machinery. | |
1592 |
|
1593 | |||
1593 | This creates completion machinery that can be used by client code, |
|
1594 | This creates completion machinery that can be used by client code, | |
1594 | either interactively in-process (typically triggered by the readline |
|
1595 | either interactively in-process (typically triggered by the readline | |
1595 | library), programatically (such as in test suites) or out-of-prcess |
|
1596 | library), programatically (such as in test suites) or out-of-prcess | |
1596 | (typically over the network by remote frontends). |
|
1597 | (typically over the network by remote frontends). | |
1597 | """ |
|
1598 | """ | |
1598 | from IPython.core.completer import IPCompleter |
|
1599 | from IPython.core.completer import IPCompleter | |
1599 | from IPython.core.completerlib import (module_completer, |
|
1600 | from IPython.core.completerlib import (module_completer, | |
1600 | magic_run_completer, cd_completer) |
|
1601 | magic_run_completer, cd_completer) | |
1601 |
|
1602 | |||
1602 | self.Completer = IPCompleter(self, |
|
1603 | self.Completer = IPCompleter(self, | |
1603 | self.user_ns, |
|
1604 | self.user_ns, | |
1604 | self.user_global_ns, |
|
1605 | self.user_global_ns, | |
1605 | self.readline_omit__names, |
|
1606 | self.readline_omit__names, | |
1606 | self.alias_manager.alias_table, |
|
1607 | self.alias_manager.alias_table, | |
1607 | self.has_readline) |
|
1608 | self.has_readline) | |
1608 |
|
1609 | |||
1609 | # Add custom completers to the basic ones built into IPCompleter |
|
1610 | # Add custom completers to the basic ones built into IPCompleter | |
1610 | sdisp = self.strdispatchers.get('complete_command', StrDispatch()) |
|
1611 | sdisp = self.strdispatchers.get('complete_command', StrDispatch()) | |
1611 | self.strdispatchers['complete_command'] = sdisp |
|
1612 | self.strdispatchers['complete_command'] = sdisp | |
1612 | self.Completer.custom_completers = sdisp |
|
1613 | self.Completer.custom_completers = sdisp | |
1613 |
|
1614 | |||
1614 | self.set_hook('complete_command', module_completer, str_key = 'import') |
|
1615 | self.set_hook('complete_command', module_completer, str_key = 'import') | |
1615 | self.set_hook('complete_command', module_completer, str_key = 'from') |
|
1616 | self.set_hook('complete_command', module_completer, str_key = 'from') | |
1616 | self.set_hook('complete_command', magic_run_completer, str_key = '%run') |
|
1617 | self.set_hook('complete_command', magic_run_completer, str_key = '%run') | |
1617 | self.set_hook('complete_command', cd_completer, str_key = '%cd') |
|
1618 | self.set_hook('complete_command', cd_completer, str_key = '%cd') | |
1618 |
|
1619 | |||
1619 | # Only configure readline if we truly are using readline. IPython can |
|
1620 | # Only configure readline if we truly are using readline. IPython can | |
1620 | # do tab-completion over the network, in GUIs, etc, where readline |
|
1621 | # do tab-completion over the network, in GUIs, etc, where readline | |
1621 | # itself may be absent |
|
1622 | # itself may be absent | |
1622 | if self.has_readline: |
|
1623 | if self.has_readline: | |
1623 | self.set_readline_completer() |
|
1624 | self.set_readline_completer() | |
1624 |
|
1625 | |||
1625 | def complete(self, text, line=None, cursor_pos=None): |
|
1626 | def complete(self, text, line=None, cursor_pos=None): | |
1626 | """Return the completed text and a list of completions. |
|
1627 | """Return the completed text and a list of completions. | |
1627 |
|
1628 | |||
1628 | Parameters |
|
1629 | Parameters | |
1629 | ---------- |
|
1630 | ---------- | |
1630 |
|
1631 | |||
1631 | text : string |
|
1632 | text : string | |
1632 | A string of text to be completed on. It can be given as empty and |
|
1633 | A string of text to be completed on. It can be given as empty and | |
1633 | instead a line/position pair are given. In this case, the |
|
1634 | instead a line/position pair are given. In this case, the | |
1634 | completer itself will split the line like readline does. |
|
1635 | completer itself will split the line like readline does. | |
1635 |
|
1636 | |||
1636 | line : string, optional |
|
1637 | line : string, optional | |
1637 | The complete line that text is part of. |
|
1638 | The complete line that text is part of. | |
1638 |
|
1639 | |||
1639 | cursor_pos : int, optional |
|
1640 | cursor_pos : int, optional | |
1640 | The position of the cursor on the input line. |
|
1641 | The position of the cursor on the input line. | |
1641 |
|
1642 | |||
1642 | Returns |
|
1643 | Returns | |
1643 | ------- |
|
1644 | ------- | |
1644 | text : string |
|
1645 | text : string | |
1645 | The actual text that was completed. |
|
1646 | The actual text that was completed. | |
1646 |
|
1647 | |||
1647 | matches : list |
|
1648 | matches : list | |
1648 | A sorted list with all possible completions. |
|
1649 | A sorted list with all possible completions. | |
1649 |
|
1650 | |||
1650 | The optional arguments allow the completion to take more context into |
|
1651 | The optional arguments allow the completion to take more context into | |
1651 | account, and are part of the low-level completion API. |
|
1652 | account, and are part of the low-level completion API. | |
1652 |
|
1653 | |||
1653 | This is a wrapper around the completion mechanism, similar to what |
|
1654 | This is a wrapper around the completion mechanism, similar to what | |
1654 | readline does at the command line when the TAB key is hit. By |
|
1655 | readline does at the command line when the TAB key is hit. By | |
1655 | exposing it as a method, it can be used by other non-readline |
|
1656 | exposing it as a method, it can be used by other non-readline | |
1656 | environments (such as GUIs) for text completion. |
|
1657 | environments (such as GUIs) for text completion. | |
1657 |
|
1658 | |||
1658 | Simple usage example: |
|
1659 | Simple usage example: | |
1659 |
|
1660 | |||
1660 | In [1]: x = 'hello' |
|
1661 | In [1]: x = 'hello' | |
1661 |
|
1662 | |||
1662 | In [2]: _ip.complete('x.l') |
|
1663 | In [2]: _ip.complete('x.l') | |
1663 | Out[2]: ('x.l', ['x.ljust', 'x.lower', 'x.lstrip']) |
|
1664 | Out[2]: ('x.l', ['x.ljust', 'x.lower', 'x.lstrip']) | |
1664 | """ |
|
1665 | """ | |
1665 |
|
1666 | |||
1666 | # Inject names into __builtin__ so we can complete on the added names. |
|
1667 | # Inject names into __builtin__ so we can complete on the added names. | |
1667 | with self.builtin_trap: |
|
1668 | with self.builtin_trap: | |
1668 | return self.Completer.complete(text, line, cursor_pos) |
|
1669 | return self.Completer.complete(text, line, cursor_pos) | |
1669 |
|
1670 | |||
1670 | def set_custom_completer(self, completer, pos=0): |
|
1671 | def set_custom_completer(self, completer, pos=0): | |
1671 | """Adds a new custom completer function. |
|
1672 | """Adds a new custom completer function. | |
1672 |
|
1673 | |||
1673 | The position argument (defaults to 0) is the index in the completers |
|
1674 | The position argument (defaults to 0) is the index in the completers | |
1674 | list where you want the completer to be inserted.""" |
|
1675 | list where you want the completer to be inserted.""" | |
1675 |
|
1676 | |||
1676 | newcomp = types.MethodType(completer,self.Completer) |
|
1677 | newcomp = types.MethodType(completer,self.Completer) | |
1677 | self.Completer.matchers.insert(pos,newcomp) |
|
1678 | self.Completer.matchers.insert(pos,newcomp) | |
1678 |
|
1679 | |||
1679 | def set_readline_completer(self): |
|
1680 | def set_readline_completer(self): | |
1680 | """Reset readline's completer to be our own.""" |
|
1681 | """Reset readline's completer to be our own.""" | |
1681 | self.readline.set_completer(self.Completer.rlcomplete) |
|
1682 | self.readline.set_completer(self.Completer.rlcomplete) | |
1682 |
|
1683 | |||
1683 | def set_completer_frame(self, frame=None): |
|
1684 | def set_completer_frame(self, frame=None): | |
1684 | """Set the frame of the completer.""" |
|
1685 | """Set the frame of the completer.""" | |
1685 | if frame: |
|
1686 | if frame: | |
1686 | self.Completer.namespace = frame.f_locals |
|
1687 | self.Completer.namespace = frame.f_locals | |
1687 | self.Completer.global_namespace = frame.f_globals |
|
1688 | self.Completer.global_namespace = frame.f_globals | |
1688 | else: |
|
1689 | else: | |
1689 | self.Completer.namespace = self.user_ns |
|
1690 | self.Completer.namespace = self.user_ns | |
1690 | self.Completer.global_namespace = self.user_global_ns |
|
1691 | self.Completer.global_namespace = self.user_global_ns | |
1691 |
|
1692 | |||
1692 | #------------------------------------------------------------------------- |
|
1693 | #------------------------------------------------------------------------- | |
1693 | # Things related to magics |
|
1694 | # Things related to magics | |
1694 | #------------------------------------------------------------------------- |
|
1695 | #------------------------------------------------------------------------- | |
1695 |
|
1696 | |||
1696 | def init_magics(self): |
|
1697 | def init_magics(self): | |
1697 | # FIXME: Move the color initialization to the DisplayHook, which |
|
1698 | # FIXME: Move the color initialization to the DisplayHook, which | |
1698 | # should be split into a prompt manager and displayhook. We probably |
|
1699 | # should be split into a prompt manager and displayhook. We probably | |
1699 | # even need a centralize colors management object. |
|
1700 | # even need a centralize colors management object. | |
1700 | self.magic_colors(self.colors) |
|
1701 | self.magic_colors(self.colors) | |
1701 | # History was moved to a separate module |
|
1702 | # History was moved to a separate module | |
1702 | from . import history |
|
1703 | from . import history | |
1703 | history.init_ipython(self) |
|
1704 | history.init_ipython(self) | |
1704 |
|
1705 | |||
1705 | def magic(self,arg_s): |
|
1706 | def magic(self,arg_s): | |
1706 | """Call a magic function by name. |
|
1707 | """Call a magic function by name. | |
1707 |
|
1708 | |||
1708 | Input: a string containing the name of the magic function to call and |
|
1709 | Input: a string containing the name of the magic function to call and | |
1709 | any additional arguments to be passed to the magic. |
|
1710 | any additional arguments to be passed to the magic. | |
1710 |
|
1711 | |||
1711 | magic('name -opt foo bar') is equivalent to typing at the ipython |
|
1712 | magic('name -opt foo bar') is equivalent to typing at the ipython | |
1712 | prompt: |
|
1713 | prompt: | |
1713 |
|
1714 | |||
1714 | In[1]: %name -opt foo bar |
|
1715 | In[1]: %name -opt foo bar | |
1715 |
|
1716 | |||
1716 | To call a magic without arguments, simply use magic('name'). |
|
1717 | To call a magic without arguments, simply use magic('name'). | |
1717 |
|
1718 | |||
1718 | This provides a proper Python function to call IPython's magics in any |
|
1719 | This provides a proper Python function to call IPython's magics in any | |
1719 | valid Python code you can type at the interpreter, including loops and |
|
1720 | valid Python code you can type at the interpreter, including loops and | |
1720 | compound statements. |
|
1721 | compound statements. | |
1721 | """ |
|
1722 | """ | |
1722 | args = arg_s.split(' ',1) |
|
1723 | args = arg_s.split(' ',1) | |
1723 | magic_name = args[0] |
|
1724 | magic_name = args[0] | |
1724 | magic_name = magic_name.lstrip(prefilter.ESC_MAGIC) |
|
1725 | magic_name = magic_name.lstrip(prefilter.ESC_MAGIC) | |
1725 |
|
1726 | |||
1726 | try: |
|
1727 | try: | |
1727 | magic_args = args[1] |
|
1728 | magic_args = args[1] | |
1728 | except IndexError: |
|
1729 | except IndexError: | |
1729 | magic_args = '' |
|
1730 | magic_args = '' | |
1730 | fn = getattr(self,'magic_'+magic_name,None) |
|
1731 | fn = getattr(self,'magic_'+magic_name,None) | |
1731 | if fn is None: |
|
1732 | if fn is None: | |
1732 | error("Magic function `%s` not found." % magic_name) |
|
1733 | error("Magic function `%s` not found." % magic_name) | |
1733 | else: |
|
1734 | else: | |
1734 | magic_args = self.var_expand(magic_args,1) |
|
1735 | magic_args = self.var_expand(magic_args,1) | |
1735 | with nested(self.builtin_trap,): |
|
1736 | with nested(self.builtin_trap,): | |
1736 | result = fn(magic_args) |
|
1737 | result = fn(magic_args) | |
1737 | return result |
|
1738 | return result | |
1738 |
|
1739 | |||
1739 | def define_magic(self, magicname, func): |
|
1740 | def define_magic(self, magicname, func): | |
1740 | """Expose own function as magic function for ipython |
|
1741 | """Expose own function as magic function for ipython | |
1741 |
|
1742 | |||
1742 | def foo_impl(self,parameter_s=''): |
|
1743 | def foo_impl(self,parameter_s=''): | |
1743 | 'My very own magic!. (Use docstrings, IPython reads them).' |
|
1744 | 'My very own magic!. (Use docstrings, IPython reads them).' | |
1744 | print 'Magic function. Passed parameter is between < >:' |
|
1745 | print 'Magic function. Passed parameter is between < >:' | |
1745 | print '<%s>' % parameter_s |
|
1746 | print '<%s>' % parameter_s | |
1746 | print 'The self object is:',self |
|
1747 | print 'The self object is:',self | |
1747 |
|
1748 | |||
1748 | self.define_magic('foo',foo_impl) |
|
1749 | self.define_magic('foo',foo_impl) | |
1749 | """ |
|
1750 | """ | |
1750 |
|
1751 | |||
1751 | import new |
|
1752 | import new | |
1752 | im = types.MethodType(func,self) |
|
1753 | im = types.MethodType(func,self) | |
1753 | old = getattr(self, "magic_" + magicname, None) |
|
1754 | old = getattr(self, "magic_" + magicname, None) | |
1754 | setattr(self, "magic_" + magicname, im) |
|
1755 | setattr(self, "magic_" + magicname, im) | |
1755 | return old |
|
1756 | return old | |
1756 |
|
1757 | |||
1757 | #------------------------------------------------------------------------- |
|
1758 | #------------------------------------------------------------------------- | |
1758 | # Things related to macros |
|
1759 | # Things related to macros | |
1759 | #------------------------------------------------------------------------- |
|
1760 | #------------------------------------------------------------------------- | |
1760 |
|
1761 | |||
1761 | def define_macro(self, name, themacro): |
|
1762 | def define_macro(self, name, themacro): | |
1762 | """Define a new macro |
|
1763 | """Define a new macro | |
1763 |
|
1764 | |||
1764 | Parameters |
|
1765 | Parameters | |
1765 | ---------- |
|
1766 | ---------- | |
1766 | name : str |
|
1767 | name : str | |
1767 | The name of the macro. |
|
1768 | The name of the macro. | |
1768 | themacro : str or Macro |
|
1769 | themacro : str or Macro | |
1769 | The action to do upon invoking the macro. If a string, a new |
|
1770 | The action to do upon invoking the macro. If a string, a new | |
1770 | Macro object is created by passing the string to it. |
|
1771 | Macro object is created by passing the string to it. | |
1771 | """ |
|
1772 | """ | |
1772 |
|
1773 | |||
1773 | from IPython.core import macro |
|
1774 | from IPython.core import macro | |
1774 |
|
1775 | |||
1775 | if isinstance(themacro, basestring): |
|
1776 | if isinstance(themacro, basestring): | |
1776 | themacro = macro.Macro(themacro) |
|
1777 | themacro = macro.Macro(themacro) | |
1777 | if not isinstance(themacro, macro.Macro): |
|
1778 | if not isinstance(themacro, macro.Macro): | |
1778 | raise ValueError('A macro must be a string or a Macro instance.') |
|
1779 | raise ValueError('A macro must be a string or a Macro instance.') | |
1779 | self.user_ns[name] = themacro |
|
1780 | self.user_ns[name] = themacro | |
1780 |
|
1781 | |||
1781 | #------------------------------------------------------------------------- |
|
1782 | #------------------------------------------------------------------------- | |
1782 | # Things related to the running of system commands |
|
1783 | # Things related to the running of system commands | |
1783 | #------------------------------------------------------------------------- |
|
1784 | #------------------------------------------------------------------------- | |
1784 |
|
1785 | |||
1785 | def system(self, cmd): |
|
1786 | def system(self, cmd): | |
1786 | """Call the given cmd in a subprocess. |
|
1787 | """Call the given cmd in a subprocess. | |
1787 |
|
1788 | |||
1788 | Parameters |
|
1789 | Parameters | |
1789 | ---------- |
|
1790 | ---------- | |
1790 | cmd : str |
|
1791 | cmd : str | |
1791 | Command to execute (can not end in '&', as bacground processes are |
|
1792 | Command to execute (can not end in '&', as bacground processes are | |
1792 | not supported. |
|
1793 | not supported. | |
1793 | """ |
|
1794 | """ | |
1794 | # We do not support backgrounding processes because we either use |
|
1795 | # We do not support backgrounding processes because we either use | |
1795 | # pexpect or pipes to read from. Users can always just call |
|
1796 | # pexpect or pipes to read from. Users can always just call | |
1796 | # os.system() if they really want a background process. |
|
1797 | # os.system() if they really want a background process. | |
1797 | if cmd.endswith('&'): |
|
1798 | if cmd.endswith('&'): | |
1798 | raise OSError("Background processes not supported.") |
|
1799 | raise OSError("Background processes not supported.") | |
1799 |
|
1800 | |||
1800 | return system(self.var_expand(cmd, depth=2)) |
|
1801 | return system(self.var_expand(cmd, depth=2)) | |
1801 |
|
1802 | |||
1802 | def getoutput(self, cmd, split=True): |
|
1803 | def getoutput(self, cmd, split=True): | |
1803 | """Get output (possibly including stderr) from a subprocess. |
|
1804 | """Get output (possibly including stderr) from a subprocess. | |
1804 |
|
1805 | |||
1805 | Parameters |
|
1806 | Parameters | |
1806 | ---------- |
|
1807 | ---------- | |
1807 | cmd : str |
|
1808 | cmd : str | |
1808 | Command to execute (can not end in '&', as background processes are |
|
1809 | Command to execute (can not end in '&', as background processes are | |
1809 | not supported. |
|
1810 | not supported. | |
1810 | split : bool, optional |
|
1811 | split : bool, optional | |
1811 |
|
1812 | |||
1812 | If True, split the output into an IPython SList. Otherwise, an |
|
1813 | If True, split the output into an IPython SList. Otherwise, an | |
1813 | IPython LSString is returned. These are objects similar to normal |
|
1814 | IPython LSString is returned. These are objects similar to normal | |
1814 | lists and strings, with a few convenience attributes for easier |
|
1815 | lists and strings, with a few convenience attributes for easier | |
1815 | manipulation of line-based output. You can use '?' on them for |
|
1816 | manipulation of line-based output. You can use '?' on them for | |
1816 | details. |
|
1817 | details. | |
1817 | """ |
|
1818 | """ | |
1818 | if cmd.endswith('&'): |
|
1819 | if cmd.endswith('&'): | |
1819 | raise OSError("Background processes not supported.") |
|
1820 | raise OSError("Background processes not supported.") | |
1820 | out = getoutput(self.var_expand(cmd, depth=2)) |
|
1821 | out = getoutput(self.var_expand(cmd, depth=2)) | |
1821 | if split: |
|
1822 | if split: | |
1822 | out = SList(out.splitlines()) |
|
1823 | out = SList(out.splitlines()) | |
1823 | else: |
|
1824 | else: | |
1824 | out = LSString(out) |
|
1825 | out = LSString(out) | |
1825 | return out |
|
1826 | return out | |
1826 |
|
1827 | |||
1827 | #------------------------------------------------------------------------- |
|
1828 | #------------------------------------------------------------------------- | |
1828 | # Things related to aliases |
|
1829 | # Things related to aliases | |
1829 | #------------------------------------------------------------------------- |
|
1830 | #------------------------------------------------------------------------- | |
1830 |
|
1831 | |||
1831 | def init_alias(self): |
|
1832 | def init_alias(self): | |
1832 | self.alias_manager = AliasManager(shell=self, config=self.config) |
|
1833 | self.alias_manager = AliasManager(shell=self, config=self.config) | |
1833 | self.ns_table['alias'] = self.alias_manager.alias_table, |
|
1834 | self.ns_table['alias'] = self.alias_manager.alias_table, | |
1834 |
|
1835 | |||
1835 | #------------------------------------------------------------------------- |
|
1836 | #------------------------------------------------------------------------- | |
1836 | # Things related to extensions and plugins |
|
1837 | # Things related to extensions and plugins | |
1837 | #------------------------------------------------------------------------- |
|
1838 | #------------------------------------------------------------------------- | |
1838 |
|
1839 | |||
1839 | def init_extension_manager(self): |
|
1840 | def init_extension_manager(self): | |
1840 | self.extension_manager = ExtensionManager(shell=self, config=self.config) |
|
1841 | self.extension_manager = ExtensionManager(shell=self, config=self.config) | |
1841 |
|
1842 | |||
1842 | def init_plugin_manager(self): |
|
1843 | def init_plugin_manager(self): | |
1843 | self.plugin_manager = PluginManager(config=self.config) |
|
1844 | self.plugin_manager = PluginManager(config=self.config) | |
1844 |
|
1845 | |||
1845 | #------------------------------------------------------------------------- |
|
1846 | #------------------------------------------------------------------------- | |
1846 | # Things related to payloads |
|
1847 | # Things related to payloads | |
1847 | #------------------------------------------------------------------------- |
|
1848 | #------------------------------------------------------------------------- | |
1848 |
|
1849 | |||
1849 | def init_payload(self): |
|
1850 | def init_payload(self): | |
1850 | self.payload_manager = PayloadManager(config=self.config) |
|
1851 | self.payload_manager = PayloadManager(config=self.config) | |
1851 |
|
1852 | |||
1852 | #------------------------------------------------------------------------- |
|
1853 | #------------------------------------------------------------------------- | |
1853 | # Things related to the prefilter |
|
1854 | # Things related to the prefilter | |
1854 | #------------------------------------------------------------------------- |
|
1855 | #------------------------------------------------------------------------- | |
1855 |
|
1856 | |||
1856 | def init_prefilter(self): |
|
1857 | def init_prefilter(self): | |
1857 | self.prefilter_manager = PrefilterManager(shell=self, config=self.config) |
|
1858 | self.prefilter_manager = PrefilterManager(shell=self, config=self.config) | |
1858 | # Ultimately this will be refactored in the new interpreter code, but |
|
1859 | # Ultimately this will be refactored in the new interpreter code, but | |
1859 | # for now, we should expose the main prefilter method (there's legacy |
|
1860 | # for now, we should expose the main prefilter method (there's legacy | |
1860 | # code out there that may rely on this). |
|
1861 | # code out there that may rely on this). | |
1861 | self.prefilter = self.prefilter_manager.prefilter_lines |
|
1862 | self.prefilter = self.prefilter_manager.prefilter_lines | |
1862 |
|
1863 | |||
1863 | def auto_rewrite_input(self, cmd): |
|
1864 | def auto_rewrite_input(self, cmd): | |
1864 | """Print to the screen the rewritten form of the user's command. |
|
1865 | """Print to the screen the rewritten form of the user's command. | |
1865 |
|
1866 | |||
1866 | This shows visual feedback by rewriting input lines that cause |
|
1867 | This shows visual feedback by rewriting input lines that cause | |
1867 | automatic calling to kick in, like:: |
|
1868 | automatic calling to kick in, like:: | |
1868 |
|
1869 | |||
1869 | /f x |
|
1870 | /f x | |
1870 |
|
1871 | |||
1871 | into:: |
|
1872 | into:: | |
1872 |
|
1873 | |||
1873 | ------> f(x) |
|
1874 | ------> f(x) | |
1874 |
|
1875 | |||
1875 | after the user's input prompt. This helps the user understand that the |
|
1876 | after the user's input prompt. This helps the user understand that the | |
1876 | input line was transformed automatically by IPython. |
|
1877 | input line was transformed automatically by IPython. | |
1877 | """ |
|
1878 | """ | |
1878 | rw = self.displayhook.prompt1.auto_rewrite() + cmd |
|
1879 | rw = self.displayhook.prompt1.auto_rewrite() + cmd | |
1879 |
|
1880 | |||
1880 | try: |
|
1881 | try: | |
1881 | # plain ascii works better w/ pyreadline, on some machines, so |
|
1882 | # plain ascii works better w/ pyreadline, on some machines, so | |
1882 | # we use it and only print uncolored rewrite if we have unicode |
|
1883 | # we use it and only print uncolored rewrite if we have unicode | |
1883 | rw = str(rw) |
|
1884 | rw = str(rw) | |
1884 | print >> IPython.utils.io.Term.cout, rw |
|
1885 | print >> IPython.utils.io.Term.cout, rw | |
1885 | except UnicodeEncodeError: |
|
1886 | except UnicodeEncodeError: | |
1886 | print "------> " + cmd |
|
1887 | print "------> " + cmd | |
1887 |
|
1888 | |||
1888 | #------------------------------------------------------------------------- |
|
1889 | #------------------------------------------------------------------------- | |
1889 | # Things related to extracting values/expressions from kernel and user_ns |
|
1890 | # Things related to extracting values/expressions from kernel and user_ns | |
1890 | #------------------------------------------------------------------------- |
|
1891 | #------------------------------------------------------------------------- | |
1891 |
|
1892 | |||
1892 | def _simple_error(self): |
|
1893 | def _simple_error(self): | |
1893 | etype, value = sys.exc_info()[:2] |
|
1894 | etype, value = sys.exc_info()[:2] | |
1894 | return u'[ERROR] {e.__name__}: {v}'.format(e=etype, v=value) |
|
1895 | return u'[ERROR] {e.__name__}: {v}'.format(e=etype, v=value) | |
1895 |
|
1896 | |||
1896 | def user_variables(self, names): |
|
1897 | def user_variables(self, names): | |
1897 | """Get a list of variable names from the user's namespace. |
|
1898 | """Get a list of variable names from the user's namespace. | |
1898 |
|
1899 | |||
1899 | Parameters |
|
1900 | Parameters | |
1900 | ---------- |
|
1901 | ---------- | |
1901 | names : list of strings |
|
1902 | names : list of strings | |
1902 | A list of names of variables to be read from the user namespace. |
|
1903 | A list of names of variables to be read from the user namespace. | |
1903 |
|
1904 | |||
1904 | Returns |
|
1905 | Returns | |
1905 | ------- |
|
1906 | ------- | |
1906 | A dict, keyed by the input names and with the repr() of each value. |
|
1907 | A dict, keyed by the input names and with the repr() of each value. | |
1907 | """ |
|
1908 | """ | |
1908 | out = {} |
|
1909 | out = {} | |
1909 | user_ns = self.user_ns |
|
1910 | user_ns = self.user_ns | |
1910 | for varname in names: |
|
1911 | for varname in names: | |
1911 | try: |
|
1912 | try: | |
1912 | value = repr(user_ns[varname]) |
|
1913 | value = repr(user_ns[varname]) | |
1913 | except: |
|
1914 | except: | |
1914 | value = self._simple_error() |
|
1915 | value = self._simple_error() | |
1915 | out[varname] = value |
|
1916 | out[varname] = value | |
1916 | return out |
|
1917 | return out | |
1917 |
|
1918 | |||
1918 | def user_expressions(self, expressions): |
|
1919 | def user_expressions(self, expressions): | |
1919 | """Evaluate a dict of expressions in the user's namespace. |
|
1920 | """Evaluate a dict of expressions in the user's namespace. | |
1920 |
|
1921 | |||
1921 | Parameters |
|
1922 | Parameters | |
1922 | ---------- |
|
1923 | ---------- | |
1923 | expressions : dict |
|
1924 | expressions : dict | |
1924 | A dict with string keys and string values. The expression values |
|
1925 | A dict with string keys and string values. The expression values | |
1925 | should be valid Python expressions, each of which will be evaluated |
|
1926 | should be valid Python expressions, each of which will be evaluated | |
1926 | in the user namespace. |
|
1927 | in the user namespace. | |
1927 |
|
1928 | |||
1928 | Returns |
|
1929 | Returns | |
1929 | ------- |
|
1930 | ------- | |
1930 | A dict, keyed like the input expressions dict, with the repr() of each |
|
1931 | A dict, keyed like the input expressions dict, with the repr() of each | |
1931 | value. |
|
1932 | value. | |
1932 | """ |
|
1933 | """ | |
1933 | out = {} |
|
1934 | out = {} | |
1934 | user_ns = self.user_ns |
|
1935 | user_ns = self.user_ns | |
1935 | global_ns = self.user_global_ns |
|
1936 | global_ns = self.user_global_ns | |
1936 | for key, expr in expressions.iteritems(): |
|
1937 | for key, expr in expressions.iteritems(): | |
1937 | try: |
|
1938 | try: | |
1938 | value = repr(eval(expr, global_ns, user_ns)) |
|
1939 | value = repr(eval(expr, global_ns, user_ns)) | |
1939 | except: |
|
1940 | except: | |
1940 | value = self._simple_error() |
|
1941 | value = self._simple_error() | |
1941 | out[key] = value |
|
1942 | out[key] = value | |
1942 | return out |
|
1943 | return out | |
1943 |
|
1944 | |||
1944 | #------------------------------------------------------------------------- |
|
1945 | #------------------------------------------------------------------------- | |
1945 | # Things related to the running of code |
|
1946 | # Things related to the running of code | |
1946 | #------------------------------------------------------------------------- |
|
1947 | #------------------------------------------------------------------------- | |
1947 |
|
1948 | |||
1948 | def ex(self, cmd): |
|
1949 | def ex(self, cmd): | |
1949 | """Execute a normal python statement in user namespace.""" |
|
1950 | """Execute a normal python statement in user namespace.""" | |
1950 | with nested(self.builtin_trap,): |
|
1951 | with nested(self.builtin_trap,): | |
1951 | exec cmd in self.user_global_ns, self.user_ns |
|
1952 | exec cmd in self.user_global_ns, self.user_ns | |
1952 |
|
1953 | |||
1953 | def ev(self, expr): |
|
1954 | def ev(self, expr): | |
1954 | """Evaluate python expression expr in user namespace. |
|
1955 | """Evaluate python expression expr in user namespace. | |
1955 |
|
1956 | |||
1956 | Returns the result of evaluation |
|
1957 | Returns the result of evaluation | |
1957 | """ |
|
1958 | """ | |
1958 | with nested(self.builtin_trap,): |
|
1959 | with nested(self.builtin_trap,): | |
1959 | return eval(expr, self.user_global_ns, self.user_ns) |
|
1960 | return eval(expr, self.user_global_ns, self.user_ns) | |
1960 |
|
1961 | |||
1961 | def safe_execfile(self, fname, *where, **kw): |
|
1962 | def safe_execfile(self, fname, *where, **kw): | |
1962 | """A safe version of the builtin execfile(). |
|
1963 | """A safe version of the builtin execfile(). | |
1963 |
|
1964 | |||
1964 | This version will never throw an exception, but instead print |
|
1965 | This version will never throw an exception, but instead print | |
1965 | helpful error messages to the screen. This only works on pure |
|
1966 | helpful error messages to the screen. This only works on pure | |
1966 | Python files with the .py extension. |
|
1967 | Python files with the .py extension. | |
1967 |
|
1968 | |||
1968 | Parameters |
|
1969 | Parameters | |
1969 | ---------- |
|
1970 | ---------- | |
1970 | fname : string |
|
1971 | fname : string | |
1971 | The name of the file to be executed. |
|
1972 | The name of the file to be executed. | |
1972 | where : tuple |
|
1973 | where : tuple | |
1973 | One or two namespaces, passed to execfile() as (globals,locals). |
|
1974 | One or two namespaces, passed to execfile() as (globals,locals). | |
1974 | If only one is given, it is passed as both. |
|
1975 | If only one is given, it is passed as both. | |
1975 | exit_ignore : bool (False) |
|
1976 | exit_ignore : bool (False) | |
1976 | If True, then silence SystemExit for non-zero status (it is always |
|
1977 | If True, then silence SystemExit for non-zero status (it is always | |
1977 | silenced for zero status, as it is so common). |
|
1978 | silenced for zero status, as it is so common). | |
1978 | """ |
|
1979 | """ | |
1979 | kw.setdefault('exit_ignore', False) |
|
1980 | kw.setdefault('exit_ignore', False) | |
1980 |
|
1981 | |||
1981 | fname = os.path.abspath(os.path.expanduser(fname)) |
|
1982 | fname = os.path.abspath(os.path.expanduser(fname)) | |
1982 |
|
1983 | |||
1983 | # Make sure we have a .py file |
|
1984 | # Make sure we have a .py file | |
1984 | if not fname.endswith('.py'): |
|
1985 | if not fname.endswith('.py'): | |
1985 | warn('File must end with .py to be run using execfile: <%s>' % fname) |
|
1986 | warn('File must end with .py to be run using execfile: <%s>' % fname) | |
1986 |
|
1987 | |||
1987 | # Make sure we can open the file |
|
1988 | # Make sure we can open the file | |
1988 | try: |
|
1989 | try: | |
1989 | with open(fname) as thefile: |
|
1990 | with open(fname) as thefile: | |
1990 | pass |
|
1991 | pass | |
1991 | except: |
|
1992 | except: | |
1992 | warn('Could not open file <%s> for safe execution.' % fname) |
|
1993 | warn('Could not open file <%s> for safe execution.' % fname) | |
1993 | return |
|
1994 | return | |
1994 |
|
1995 | |||
1995 | # Find things also in current directory. This is needed to mimic the |
|
1996 | # Find things also in current directory. This is needed to mimic the | |
1996 | # behavior of running a script from the system command line, where |
|
1997 | # behavior of running a script from the system command line, where | |
1997 | # Python inserts the script's directory into sys.path |
|
1998 | # Python inserts the script's directory into sys.path | |
1998 | dname = os.path.dirname(fname) |
|
1999 | dname = os.path.dirname(fname) | |
1999 |
|
2000 | |||
2000 | with prepended_to_syspath(dname): |
|
2001 | with prepended_to_syspath(dname): | |
2001 | try: |
|
2002 | try: | |
2002 | execfile(fname,*where) |
|
2003 | execfile(fname,*where) | |
2003 | except SystemExit, status: |
|
2004 | except SystemExit, status: | |
2004 | # If the call was made with 0 or None exit status (sys.exit(0) |
|
2005 | # If the call was made with 0 or None exit status (sys.exit(0) | |
2005 | # or sys.exit() ), don't bother showing a traceback, as both of |
|
2006 | # or sys.exit() ), don't bother showing a traceback, as both of | |
2006 | # these are considered normal by the OS: |
|
2007 | # these are considered normal by the OS: | |
2007 | # > python -c'import sys;sys.exit(0)'; echo $? |
|
2008 | # > python -c'import sys;sys.exit(0)'; echo $? | |
2008 | # 0 |
|
2009 | # 0 | |
2009 | # > python -c'import sys;sys.exit()'; echo $? |
|
2010 | # > python -c'import sys;sys.exit()'; echo $? | |
2010 | # 0 |
|
2011 | # 0 | |
2011 | # For other exit status, we show the exception unless |
|
2012 | # For other exit status, we show the exception unless | |
2012 | # explicitly silenced, but only in short form. |
|
2013 | # explicitly silenced, but only in short form. | |
2013 | if status.code not in (0, None) and not kw['exit_ignore']: |
|
2014 | if status.code not in (0, None) and not kw['exit_ignore']: | |
2014 | self.showtraceback(exception_only=True) |
|
2015 | self.showtraceback(exception_only=True) | |
2015 | except: |
|
2016 | except: | |
2016 | self.showtraceback() |
|
2017 | self.showtraceback() | |
2017 |
|
2018 | |||
2018 | def safe_execfile_ipy(self, fname): |
|
2019 | def safe_execfile_ipy(self, fname): | |
2019 | """Like safe_execfile, but for .ipy files with IPython syntax. |
|
2020 | """Like safe_execfile, but for .ipy files with IPython syntax. | |
2020 |
|
2021 | |||
2021 | Parameters |
|
2022 | Parameters | |
2022 | ---------- |
|
2023 | ---------- | |
2023 | fname : str |
|
2024 | fname : str | |
2024 | The name of the file to execute. The filename must have a |
|
2025 | The name of the file to execute. The filename must have a | |
2025 | .ipy extension. |
|
2026 | .ipy extension. | |
2026 | """ |
|
2027 | """ | |
2027 | fname = os.path.abspath(os.path.expanduser(fname)) |
|
2028 | fname = os.path.abspath(os.path.expanduser(fname)) | |
2028 |
|
2029 | |||
2029 | # Make sure we have a .py file |
|
2030 | # Make sure we have a .py file | |
2030 | if not fname.endswith('.ipy'): |
|
2031 | if not fname.endswith('.ipy'): | |
2031 | warn('File must end with .py to be run using execfile: <%s>' % fname) |
|
2032 | warn('File must end with .py to be run using execfile: <%s>' % fname) | |
2032 |
|
2033 | |||
2033 | # Make sure we can open the file |
|
2034 | # Make sure we can open the file | |
2034 | try: |
|
2035 | try: | |
2035 | with open(fname) as thefile: |
|
2036 | with open(fname) as thefile: | |
2036 | pass |
|
2037 | pass | |
2037 | except: |
|
2038 | except: | |
2038 | warn('Could not open file <%s> for safe execution.' % fname) |
|
2039 | warn('Could not open file <%s> for safe execution.' % fname) | |
2039 | return |
|
2040 | return | |
2040 |
|
2041 | |||
2041 | # Find things also in current directory. This is needed to mimic the |
|
2042 | # Find things also in current directory. This is needed to mimic the | |
2042 | # behavior of running a script from the system command line, where |
|
2043 | # behavior of running a script from the system command line, where | |
2043 | # Python inserts the script's directory into sys.path |
|
2044 | # Python inserts the script's directory into sys.path | |
2044 | dname = os.path.dirname(fname) |
|
2045 | dname = os.path.dirname(fname) | |
2045 |
|
2046 | |||
2046 | with prepended_to_syspath(dname): |
|
2047 | with prepended_to_syspath(dname): | |
2047 | try: |
|
2048 | try: | |
2048 | with open(fname) as thefile: |
|
2049 | with open(fname) as thefile: | |
2049 | # self.run_cell currently captures all exceptions |
|
2050 | # self.run_cell currently captures all exceptions | |
2050 | # raised in user code. It would be nice if there were |
|
2051 | # raised in user code. It would be nice if there were | |
2051 | # versions of runlines, execfile that did raise, so |
|
2052 | # versions of runlines, execfile that did raise, so | |
2052 | # we could catch the errors. |
|
2053 | # we could catch the errors. | |
2053 | self.run_cell(thefile.read()) |
|
2054 | self.run_cell(thefile.read()) | |
2054 | except: |
|
2055 | except: | |
2055 | self.showtraceback() |
|
2056 | self.showtraceback() | |
2056 | warn('Unknown failure executing file: <%s>' % fname) |
|
2057 | warn('Unknown failure executing file: <%s>' % fname) | |
2057 |
|
2058 | |||
2058 | def run_cell(self, cell): |
|
2059 | def run_cell(self, cell): | |
2059 | """Run the contents of an entire multiline 'cell' of code. |
|
2060 | """Run the contents of an entire multiline 'cell' of code. | |
2060 |
|
2061 | |||
2061 | The cell is split into separate blocks which can be executed |
|
2062 | The cell is split into separate blocks which can be executed | |
2062 | individually. Then, based on how many blocks there are, they are |
|
2063 | individually. Then, based on how many blocks there are, they are | |
2063 | executed as follows: |
|
2064 | executed as follows: | |
2064 |
|
2065 | |||
2065 | - A single block: 'single' mode. |
|
2066 | - A single block: 'single' mode. | |
2066 |
|
2067 | |||
2067 | If there's more than one block, it depends: |
|
2068 | If there's more than one block, it depends: | |
2068 |
|
2069 | |||
2069 | - if the last one is no more than two lines long, run all but the last |
|
2070 | - if the last one is no more than two lines long, run all but the last | |
2070 | in 'exec' mode and the very last one in 'single' mode. This makes it |
|
2071 | in 'exec' mode and the very last one in 'single' mode. This makes it | |
2071 | easy to type simple expressions at the end to see computed values. - |
|
2072 | easy to type simple expressions at the end to see computed values. - | |
2072 | otherwise (last one is also multiline), run all in 'exec' mode |
|
2073 | otherwise (last one is also multiline), run all in 'exec' mode | |
2073 |
|
2074 | |||
2074 | When code is executed in 'single' mode, :func:`sys.displayhook` fires, |
|
2075 | When code is executed in 'single' mode, :func:`sys.displayhook` fires, | |
2075 | results are displayed and output prompts are computed. In 'exec' mode, |
|
2076 | results are displayed and output prompts are computed. In 'exec' mode, | |
2076 | no results are displayed unless :func:`print` is called explicitly; |
|
2077 | no results are displayed unless :func:`print` is called explicitly; | |
2077 | this mode is more akin to running a script. |
|
2078 | this mode is more akin to running a script. | |
2078 |
|
2079 | |||
2079 | Parameters |
|
2080 | Parameters | |
2080 | ---------- |
|
2081 | ---------- | |
2081 | cell : str |
|
2082 | cell : str | |
2082 | A single or multiline string. |
|
2083 | A single or multiline string. | |
2083 | """ |
|
2084 | """ | |
2084 |
|
2085 | |||
2085 | # We need to break up the input into executable blocks that can be run |
|
2086 | # We need to break up the input into executable blocks that can be run | |
2086 | # in 'single' mode, to provide comfortable user behavior. |
|
2087 | # in 'single' mode, to provide comfortable user behavior. | |
2087 | blocks = self.input_splitter.split_blocks(cell) |
|
2088 | blocks = self.input_splitter.split_blocks(cell) | |
2088 |
|
2089 | |||
2089 | if not blocks: |
|
2090 | if not blocks: | |
2090 | return |
|
2091 | return | |
2091 |
|
2092 | |||
2092 | # Store the 'ipython' version of the cell as well, since that's what |
|
2093 | # Store the 'ipython' version of the cell as well, since that's what | |
2093 | # needs to go into the translated history and get executed (the |
|
2094 | # needs to go into the translated history and get executed (the | |
2094 | # original cell may contain non-python syntax). |
|
2095 | # original cell may contain non-python syntax). | |
2095 | ipy_cell = ''.join(blocks) |
|
2096 | ipy_cell = ''.join(blocks) | |
2096 |
|
2097 | |||
2097 | # Store raw and processed history |
|
2098 | # Store raw and processed history | |
2098 | self.history_manager.store_inputs(ipy_cell, cell) |
|
2099 | self.history_manager.store_inputs(ipy_cell, cell) | |
2099 |
|
2100 | |||
2100 | self.logger.log(ipy_cell, cell) |
|
2101 | self.logger.log(ipy_cell, cell) | |
2101 | # dbg code!!! |
|
2102 | # dbg code!!! | |
2102 | if 0: |
|
2103 | if 0: | |
2103 | def myapp(self, val): # dbg |
|
2104 | def myapp(self, val): # dbg | |
2104 | import traceback as tb |
|
2105 | import traceback as tb | |
2105 | stack = ''.join(tb.format_stack()) |
|
2106 | stack = ''.join(tb.format_stack()) | |
2106 | print 'Value:', val |
|
2107 | print 'Value:', val | |
2107 | print 'Stack:\n', stack |
|
2108 | print 'Stack:\n', stack | |
2108 | list.append(self, val) |
|
2109 | list.append(self, val) | |
2109 |
|
2110 | |||
2110 | import new |
|
2111 | import new | |
2111 | self.input_hist.append = types.MethodType(myapp, self.input_hist) |
|
2112 | self.input_hist.append = types.MethodType(myapp, self.input_hist) | |
2112 | # End dbg |
|
2113 | # End dbg | |
2113 |
|
2114 | |||
2114 | # All user code execution must happen with our context managers active |
|
2115 | # All user code execution must happen with our context managers active | |
2115 | with nested(self.builtin_trap, self.display_trap): |
|
2116 | with nested(self.builtin_trap, self.display_trap): | |
2116 |
|
2117 | |||
2117 | # Single-block input should behave like an interactive prompt |
|
2118 | # Single-block input should behave like an interactive prompt | |
2118 | if len(blocks) == 1: |
|
2119 | if len(blocks) == 1: | |
2119 | # since we return here, we need to update the execution count |
|
2120 | # since we return here, we need to update the execution count | |
2120 | out = self.run_one_block(blocks[0]) |
|
2121 | out = self.run_one_block(blocks[0]) | |
2121 | self.execution_count += 1 |
|
2122 | self.execution_count += 1 | |
2122 | return out |
|
2123 | return out | |
2123 |
|
2124 | |||
2124 | # In multi-block input, if the last block is a simple (one-two |
|
2125 | # In multi-block input, if the last block is a simple (one-two | |
2125 | # lines) expression, run it in single mode so it produces output. |
|
2126 | # lines) expression, run it in single mode so it produces output. | |
2126 | # Otherwise just feed the whole thing to run_code. This seems like |
|
2127 | # Otherwise just feed the whole thing to run_code. This seems like | |
2127 | # a reasonable usability design. |
|
2128 | # a reasonable usability design. | |
2128 | last = blocks[-1] |
|
2129 | last = blocks[-1] | |
2129 | last_nlines = len(last.splitlines()) |
|
2130 | last_nlines = len(last.splitlines()) | |
2130 |
|
2131 | |||
2131 | # Note: below, whenever we call run_code, we must sync history |
|
2132 | # Note: below, whenever we call run_code, we must sync history | |
2132 | # ourselves, because run_code is NOT meant to manage history at all. |
|
2133 | # ourselves, because run_code is NOT meant to manage history at all. | |
2133 | if last_nlines < 2: |
|
2134 | if last_nlines < 2: | |
2134 | # Here we consider the cell split between 'body' and 'last', |
|
2135 | # Here we consider the cell split between 'body' and 'last', | |
2135 | # store all history and execute 'body', and if successful, then |
|
2136 | # store all history and execute 'body', and if successful, then | |
2136 | # proceed to execute 'last'. |
|
2137 | # proceed to execute 'last'. | |
2137 |
|
2138 | |||
2138 | # Get the main body to run as a cell |
|
2139 | # Get the main body to run as a cell | |
2139 | ipy_body = ''.join(blocks[:-1]) |
|
2140 | ipy_body = ''.join(blocks[:-1]) | |
2140 | retcode = self.run_source(ipy_body, symbol='exec', |
|
2141 | retcode = self.run_source(ipy_body, symbol='exec', | |
2141 | post_execute=False) |
|
2142 | post_execute=False) | |
2142 | if retcode==0: |
|
2143 | if retcode==0: | |
2143 | # And the last expression via runlines so it produces output |
|
2144 | # And the last expression via runlines so it produces output | |
2144 | self.run_one_block(last) |
|
2145 | self.run_one_block(last) | |
2145 | else: |
|
2146 | else: | |
2146 | # Run the whole cell as one entity, storing both raw and |
|
2147 | # Run the whole cell as one entity, storing both raw and | |
2147 | # processed input in history |
|
2148 | # processed input in history | |
2148 | self.run_source(ipy_cell, symbol='exec') |
|
2149 | self.run_source(ipy_cell, symbol='exec') | |
2149 |
|
2150 | |||
2150 | # Each cell is a *single* input, regardless of how many lines it has |
|
2151 | # Each cell is a *single* input, regardless of how many lines it has | |
2151 | self.execution_count += 1 |
|
2152 | self.execution_count += 1 | |
2152 |
|
2153 | |||
2153 | def run_one_block(self, block): |
|
2154 | def run_one_block(self, block): | |
2154 | """Run a single interactive block. |
|
2155 | """Run a single interactive block. | |
2155 |
|
2156 | |||
2156 | If the block is single-line, dynamic transformations are applied to it |
|
2157 | If the block is single-line, dynamic transformations are applied to it | |
2157 | (like automagics, autocall and alias recognition). |
|
2158 | (like automagics, autocall and alias recognition). | |
2158 | """ |
|
2159 | """ | |
2159 | if len(block.splitlines()) <= 1: |
|
2160 | if len(block.splitlines()) <= 1: | |
2160 | out = self.run_single_line(block) |
|
2161 | out = self.run_single_line(block) | |
2161 | else: |
|
2162 | else: | |
2162 | out = self.run_code(block) |
|
2163 | out = self.run_code(block) | |
2163 | return out |
|
2164 | return out | |
2164 |
|
2165 | |||
2165 | def run_single_line(self, line): |
|
2166 | def run_single_line(self, line): | |
2166 | """Run a single-line interactive statement. |
|
2167 | """Run a single-line interactive statement. | |
2167 |
|
2168 | |||
2168 | This assumes the input has been transformed to IPython syntax by |
|
2169 | This assumes the input has been transformed to IPython syntax by | |
2169 | applying all static transformations (those with an explicit prefix like |
|
2170 | applying all static transformations (those with an explicit prefix like | |
2170 | % or !), but it will further try to apply the dynamic ones. |
|
2171 | % or !), but it will further try to apply the dynamic ones. | |
2171 |
|
2172 | |||
2172 | It does not update history. |
|
2173 | It does not update history. | |
2173 | """ |
|
2174 | """ | |
2174 | tline = self.prefilter_manager.prefilter_line(line) |
|
2175 | tline = self.prefilter_manager.prefilter_line(line) | |
2175 | return self.run_source(tline) |
|
2176 | return self.run_source(tline) | |
2176 |
|
2177 | |||
2177 | # PENDING REMOVAL: this method is slated for deletion, once our new |
|
2178 | # PENDING REMOVAL: this method is slated for deletion, once our new | |
2178 | # input logic has been 100% moved to frontends and is stable. |
|
2179 | # input logic has been 100% moved to frontends and is stable. | |
2179 | def runlines(self, lines, clean=False): |
|
2180 | def runlines(self, lines, clean=False): | |
2180 | """Run a string of one or more lines of source. |
|
2181 | """Run a string of one or more lines of source. | |
2181 |
|
2182 | |||
2182 | This method is capable of running a string containing multiple source |
|
2183 | This method is capable of running a string containing multiple source | |
2183 | lines, as if they had been entered at the IPython prompt. Since it |
|
2184 | lines, as if they had been entered at the IPython prompt. Since it | |
2184 | exposes IPython's processing machinery, the given strings can contain |
|
2185 | exposes IPython's processing machinery, the given strings can contain | |
2185 | magic calls (%magic), special shell access (!cmd), etc. |
|
2186 | magic calls (%magic), special shell access (!cmd), etc. | |
2186 | """ |
|
2187 | """ | |
2187 |
|
2188 | |||
2188 | if isinstance(lines, (list, tuple)): |
|
2189 | if isinstance(lines, (list, tuple)): | |
2189 | lines = '\n'.join(lines) |
|
2190 | lines = '\n'.join(lines) | |
2190 |
|
2191 | |||
2191 | if clean: |
|
2192 | if clean: | |
2192 | lines = self._cleanup_ipy_script(lines) |
|
2193 | lines = self._cleanup_ipy_script(lines) | |
2193 |
|
2194 | |||
2194 | # We must start with a clean buffer, in case this is run from an |
|
2195 | # We must start with a clean buffer, in case this is run from an | |
2195 | # interactive IPython session (via a magic, for example). |
|
2196 | # interactive IPython session (via a magic, for example). | |
2196 | self.reset_buffer() |
|
2197 | self.reset_buffer() | |
2197 | lines = lines.splitlines() |
|
2198 | lines = lines.splitlines() | |
2198 |
|
2199 | |||
2199 | # Since we will prefilter all lines, store the user's raw input too |
|
2200 | # Since we will prefilter all lines, store the user's raw input too | |
2200 | # before we apply any transformations |
|
2201 | # before we apply any transformations | |
2201 | self.buffer_raw[:] = [ l+'\n' for l in lines] |
|
2202 | self.buffer_raw[:] = [ l+'\n' for l in lines] | |
2202 |
|
2203 | |||
2203 | more = False |
|
2204 | more = False | |
2204 | prefilter_lines = self.prefilter_manager.prefilter_lines |
|
2205 | prefilter_lines = self.prefilter_manager.prefilter_lines | |
2205 | with nested(self.builtin_trap, self.display_trap): |
|
2206 | with nested(self.builtin_trap, self.display_trap): | |
2206 | for line in lines: |
|
2207 | for line in lines: | |
2207 | # skip blank lines so we don't mess up the prompt counter, but |
|
2208 | # skip blank lines so we don't mess up the prompt counter, but | |
2208 | # do NOT skip even a blank line if we are in a code block (more |
|
2209 | # do NOT skip even a blank line if we are in a code block (more | |
2209 | # is true) |
|
2210 | # is true) | |
2210 |
|
2211 | |||
2211 | if line or more: |
|
2212 | if line or more: | |
2212 | more = self.push_line(prefilter_lines(line, more)) |
|
2213 | more = self.push_line(prefilter_lines(line, more)) | |
2213 | # IPython's run_source returns None if there was an error |
|
2214 | # IPython's run_source returns None if there was an error | |
2214 | # compiling the code. This allows us to stop processing |
|
2215 | # compiling the code. This allows us to stop processing | |
2215 | # right away, so the user gets the error message at the |
|
2216 | # right away, so the user gets the error message at the | |
2216 | # right place. |
|
2217 | # right place. | |
2217 | if more is None: |
|
2218 | if more is None: | |
2218 | break |
|
2219 | break | |
2219 | # final newline in case the input didn't have it, so that the code |
|
2220 | # final newline in case the input didn't have it, so that the code | |
2220 | # actually does get executed |
|
2221 | # actually does get executed | |
2221 | if more: |
|
2222 | if more: | |
2222 | self.push_line('\n') |
|
2223 | self.push_line('\n') | |
2223 |
|
2224 | |||
2224 | def run_source(self, source, filename=None, |
|
2225 | def run_source(self, source, filename=None, | |
2225 | symbol='single', post_execute=True): |
|
2226 | symbol='single', post_execute=True): | |
2226 | """Compile and run some source in the interpreter. |
|
2227 | """Compile and run some source in the interpreter. | |
2227 |
|
2228 | |||
2228 | Arguments are as for compile_command(). |
|
2229 | Arguments are as for compile_command(). | |
2229 |
|
2230 | |||
2230 | One several things can happen: |
|
2231 | One several things can happen: | |
2231 |
|
2232 | |||
2232 | 1) The input is incorrect; compile_command() raised an |
|
2233 | 1) The input is incorrect; compile_command() raised an | |
2233 | exception (SyntaxError or OverflowError). A syntax traceback |
|
2234 | exception (SyntaxError or OverflowError). A syntax traceback | |
2234 | will be printed by calling the showsyntaxerror() method. |
|
2235 | will be printed by calling the showsyntaxerror() method. | |
2235 |
|
2236 | |||
2236 | 2) The input is incomplete, and more input is required; |
|
2237 | 2) The input is incomplete, and more input is required; | |
2237 | compile_command() returned None. Nothing happens. |
|
2238 | compile_command() returned None. Nothing happens. | |
2238 |
|
2239 | |||
2239 | 3) The input is complete; compile_command() returned a code |
|
2240 | 3) The input is complete; compile_command() returned a code | |
2240 | object. The code is executed by calling self.run_code() (which |
|
2241 | object. The code is executed by calling self.run_code() (which | |
2241 | also handles run-time exceptions, except for SystemExit). |
|
2242 | also handles run-time exceptions, except for SystemExit). | |
2242 |
|
2243 | |||
2243 | The return value is: |
|
2244 | The return value is: | |
2244 |
|
2245 | |||
2245 | - True in case 2 |
|
2246 | - True in case 2 | |
2246 |
|
2247 | |||
2247 | - False in the other cases, unless an exception is raised, where |
|
2248 | - False in the other cases, unless an exception is raised, where | |
2248 | None is returned instead. This can be used by external callers to |
|
2249 | None is returned instead. This can be used by external callers to | |
2249 | know whether to continue feeding input or not. |
|
2250 | know whether to continue feeding input or not. | |
2250 |
|
2251 | |||
2251 | The return value can be used to decide whether to use sys.ps1 or |
|
2252 | The return value can be used to decide whether to use sys.ps1 or | |
2252 | sys.ps2 to prompt the next line.""" |
|
2253 | sys.ps2 to prompt the next line.""" | |
2253 |
|
2254 | |||
2254 | # We need to ensure that the source is unicode from here on. |
|
2255 | # We need to ensure that the source is unicode from here on. | |
2255 | if type(source)==str: |
|
2256 | if type(source)==str: | |
2256 | usource = source.decode(self.stdin_encoding) |
|
2257 | usource = source.decode(self.stdin_encoding) | |
2257 | else: |
|
2258 | else: | |
2258 | usource = source |
|
2259 | usource = source | |
2259 |
|
2260 | |||
2260 | if 0: # dbg |
|
2261 | if 0: # dbg | |
2261 | print 'Source:', repr(source) # dbg |
|
2262 | print 'Source:', repr(source) # dbg | |
2262 | print 'USource:', repr(usource) # dbg |
|
2263 | print 'USource:', repr(usource) # dbg | |
2263 | print 'type:', type(source) # dbg |
|
2264 | print 'type:', type(source) # dbg | |
2264 | print 'encoding', self.stdin_encoding # dbg |
|
2265 | print 'encoding', self.stdin_encoding # dbg | |
2265 |
|
2266 | |||
2266 | try: |
|
2267 | try: | |
2267 | code = self.compile(usource, symbol, self.execution_count) |
|
2268 | code = self.compile(usource, symbol, self.execution_count) | |
2268 | except (OverflowError, SyntaxError, ValueError, TypeError, MemoryError): |
|
2269 | except (OverflowError, SyntaxError, ValueError, TypeError, MemoryError): | |
2269 | # Case 1 |
|
2270 | # Case 1 | |
2270 | self.showsyntaxerror(filename) |
|
2271 | self.showsyntaxerror(filename) | |
2271 | return None |
|
2272 | return None | |
2272 |
|
2273 | |||
2273 | if code is None: |
|
2274 | if code is None: | |
2274 | # Case 2 |
|
2275 | # Case 2 | |
2275 | return True |
|
2276 | return True | |
2276 |
|
2277 | |||
2277 | # Case 3 |
|
2278 | # Case 3 | |
2278 | # We store the code object so that threaded shells and |
|
2279 | # We store the code object so that threaded shells and | |
2279 | # custom exception handlers can access all this info if needed. |
|
2280 | # custom exception handlers can access all this info if needed. | |
2280 | # The source corresponding to this can be obtained from the |
|
2281 | # The source corresponding to this can be obtained from the | |
2281 | # buffer attribute as '\n'.join(self.buffer). |
|
2282 | # buffer attribute as '\n'.join(self.buffer). | |
2282 | self.code_to_run = code |
|
2283 | self.code_to_run = code | |
2283 | # now actually execute the code object |
|
2284 | # now actually execute the code object | |
2284 | if self.run_code(code, post_execute) == 0: |
|
2285 | if self.run_code(code, post_execute) == 0: | |
2285 | return False |
|
2286 | return False | |
2286 | else: |
|
2287 | else: | |
2287 | return None |
|
2288 | return None | |
2288 |
|
2289 | |||
2289 | # For backwards compatibility |
|
2290 | # For backwards compatibility | |
2290 | runsource = run_source |
|
2291 | runsource = run_source | |
2291 |
|
2292 | |||
2292 | def run_code(self, code_obj, post_execute=True): |
|
2293 | def run_code(self, code_obj, post_execute=True): | |
2293 | """Execute a code object. |
|
2294 | """Execute a code object. | |
2294 |
|
2295 | |||
2295 | When an exception occurs, self.showtraceback() is called to display a |
|
2296 | When an exception occurs, self.showtraceback() is called to display a | |
2296 | traceback. |
|
2297 | traceback. | |
2297 |
|
2298 | |||
2298 | Return value: a flag indicating whether the code to be run completed |
|
2299 | Return value: a flag indicating whether the code to be run completed | |
2299 | successfully: |
|
2300 | successfully: | |
2300 |
|
2301 | |||
2301 | - 0: successful execution. |
|
2302 | - 0: successful execution. | |
2302 | - 1: an error occurred. |
|
2303 | - 1: an error occurred. | |
2303 | """ |
|
2304 | """ | |
2304 |
|
2305 | |||
2305 | # Set our own excepthook in case the user code tries to call it |
|
2306 | # Set our own excepthook in case the user code tries to call it | |
2306 | # directly, so that the IPython crash handler doesn't get triggered |
|
2307 | # directly, so that the IPython crash handler doesn't get triggered | |
2307 | old_excepthook,sys.excepthook = sys.excepthook, self.excepthook |
|
2308 | old_excepthook,sys.excepthook = sys.excepthook, self.excepthook | |
2308 |
|
2309 | |||
2309 | # we save the original sys.excepthook in the instance, in case config |
|
2310 | # we save the original sys.excepthook in the instance, in case config | |
2310 | # code (such as magics) needs access to it. |
|
2311 | # code (such as magics) needs access to it. | |
2311 | self.sys_excepthook = old_excepthook |
|
2312 | self.sys_excepthook = old_excepthook | |
2312 | outflag = 1 # happens in more places, so it's easier as default |
|
2313 | outflag = 1 # happens in more places, so it's easier as default | |
2313 | try: |
|
2314 | try: | |
2314 | try: |
|
2315 | try: | |
2315 | self.hooks.pre_run_code_hook() |
|
2316 | self.hooks.pre_run_code_hook() | |
2316 | #rprint('Running code') # dbg |
|
2317 | #rprint('Running code') # dbg | |
2317 | exec code_obj in self.user_global_ns, self.user_ns |
|
2318 | exec code_obj in self.user_global_ns, self.user_ns | |
2318 | finally: |
|
2319 | finally: | |
2319 | # Reset our crash handler in place |
|
2320 | # Reset our crash handler in place | |
2320 | sys.excepthook = old_excepthook |
|
2321 | sys.excepthook = old_excepthook | |
2321 | except SystemExit: |
|
2322 | except SystemExit: | |
2322 | self.reset_buffer() |
|
2323 | self.reset_buffer() | |
2323 | self.showtraceback(exception_only=True) |
|
2324 | self.showtraceback(exception_only=True) | |
2324 | warn("To exit: use any of 'exit', 'quit', %Exit or Ctrl-D.", level=1) |
|
2325 | warn("To exit: use any of 'exit', 'quit', %Exit or Ctrl-D.", level=1) | |
2325 | except self.custom_exceptions: |
|
2326 | except self.custom_exceptions: | |
2326 | etype,value,tb = sys.exc_info() |
|
2327 | etype,value,tb = sys.exc_info() | |
2327 | self.CustomTB(etype,value,tb) |
|
2328 | self.CustomTB(etype,value,tb) | |
2328 | except: |
|
2329 | except: | |
2329 | self.showtraceback() |
|
2330 | self.showtraceback() | |
2330 | else: |
|
2331 | else: | |
2331 | outflag = 0 |
|
2332 | outflag = 0 | |
2332 | if softspace(sys.stdout, 0): |
|
2333 | if softspace(sys.stdout, 0): | |
2333 |
|
2334 | |||
2334 |
|
2335 | |||
2335 | # Execute any registered post-execution functions. Here, any errors |
|
2336 | # Execute any registered post-execution functions. Here, any errors | |
2336 | # are reported only minimally and just on the terminal, because the |
|
2337 | # are reported only minimally and just on the terminal, because the | |
2337 | # main exception channel may be occupied with a user traceback. |
|
2338 | # main exception channel may be occupied with a user traceback. | |
2338 | # FIXME: we need to think this mechanism a little more carefully. |
|
2339 | # FIXME: we need to think this mechanism a little more carefully. | |
2339 | if post_execute: |
|
2340 | if post_execute: | |
2340 | for func in self._post_execute: |
|
2341 | for func in self._post_execute: | |
2341 | try: |
|
2342 | try: | |
2342 | func() |
|
2343 | func() | |
2343 | except: |
|
2344 | except: | |
2344 | head = '[ ERROR ] Evaluating post_execute function: %s' % \ |
|
2345 | head = '[ ERROR ] Evaluating post_execute function: %s' % \ | |
2345 | func |
|
2346 | func | |
2346 | print >> io.Term.cout, head |
|
2347 | print >> io.Term.cout, head | |
2347 | print >> io.Term.cout, self._simple_error() |
|
2348 | print >> io.Term.cout, self._simple_error() | |
2348 | print >> io.Term.cout, 'Removing from post_execute' |
|
2349 | print >> io.Term.cout, 'Removing from post_execute' | |
2349 | self._post_execute.remove(func) |
|
2350 | self._post_execute.remove(func) | |
2350 |
|
2351 | |||
2351 | # Flush out code object which has been run (and source) |
|
2352 | # Flush out code object which has been run (and source) | |
2352 | self.code_to_run = None |
|
2353 | self.code_to_run = None | |
2353 | return outflag |
|
2354 | return outflag | |
2354 |
|
2355 | |||
2355 | # For backwards compatibility |
|
2356 | # For backwards compatibility | |
2356 | runcode = run_code |
|
2357 | runcode = run_code | |
2357 |
|
2358 | |||
2358 | # PENDING REMOVAL: this method is slated for deletion, once our new |
|
2359 | # PENDING REMOVAL: this method is slated for deletion, once our new | |
2359 | # input logic has been 100% moved to frontends and is stable. |
|
2360 | # input logic has been 100% moved to frontends and is stable. | |
2360 | def push_line(self, line): |
|
2361 | def push_line(self, line): | |
2361 | """Push a line to the interpreter. |
|
2362 | """Push a line to the interpreter. | |
2362 |
|
2363 | |||
2363 | The line should not have a trailing newline; it may have |
|
2364 | The line should not have a trailing newline; it may have | |
2364 | internal newlines. The line is appended to a buffer and the |
|
2365 | internal newlines. The line is appended to a buffer and the | |
2365 | interpreter's run_source() method is called with the |
|
2366 | interpreter's run_source() method is called with the | |
2366 | concatenated contents of the buffer as source. If this |
|
2367 | concatenated contents of the buffer as source. If this | |
2367 | indicates that the command was executed or invalid, the buffer |
|
2368 | indicates that the command was executed or invalid, the buffer | |
2368 | is reset; otherwise, the command is incomplete, and the buffer |
|
2369 | is reset; otherwise, the command is incomplete, and the buffer | |
2369 | is left as it was after the line was appended. The return |
|
2370 | is left as it was after the line was appended. The return | |
2370 | value is 1 if more input is required, 0 if the line was dealt |
|
2371 | value is 1 if more input is required, 0 if the line was dealt | |
2371 | with in some way (this is the same as run_source()). |
|
2372 | with in some way (this is the same as run_source()). | |
2372 | """ |
|
2373 | """ | |
2373 |
|
2374 | |||
2374 | # autoindent management should be done here, and not in the |
|
2375 | # autoindent management should be done here, and not in the | |
2375 | # interactive loop, since that one is only seen by keyboard input. We |
|
2376 | # interactive loop, since that one is only seen by keyboard input. We | |
2376 | # need this done correctly even for code run via runlines (which uses |
|
2377 | # need this done correctly even for code run via runlines (which uses | |
2377 | # push). |
|
2378 | # push). | |
2378 |
|
2379 | |||
2379 | #print 'push line: <%s>' % line # dbg |
|
2380 | #print 'push line: <%s>' % line # dbg | |
2380 | self.buffer.append(line) |
|
2381 | self.buffer.append(line) | |
2381 | full_source = '\n'.join(self.buffer) |
|
2382 | full_source = '\n'.join(self.buffer) | |
2382 | more = self.run_source(full_source, self.filename) |
|
2383 | more = self.run_source(full_source, self.filename) | |
2383 | if not more: |
|
2384 | if not more: | |
2384 | self.history_manager.store_inputs('\n'.join(self.buffer_raw), |
|
2385 | self.history_manager.store_inputs('\n'.join(self.buffer_raw), | |
2385 | full_source) |
|
2386 | full_source) | |
2386 | self.reset_buffer() |
|
2387 | self.reset_buffer() | |
2387 | self.execution_count += 1 |
|
2388 | self.execution_count += 1 | |
2388 | return more |
|
2389 | return more | |
2389 |
|
2390 | |||
2390 | def reset_buffer(self): |
|
2391 | def reset_buffer(self): | |
2391 | """Reset the input buffer.""" |
|
2392 | """Reset the input buffer.""" | |
2392 | self.buffer[:] = [] |
|
2393 | self.buffer[:] = [] | |
2393 | self.buffer_raw[:] = [] |
|
2394 | self.buffer_raw[:] = [] | |
2394 | self.input_splitter.reset() |
|
2395 | self.input_splitter.reset() | |
2395 |
|
2396 | |||
2396 | # For backwards compatibility |
|
2397 | # For backwards compatibility | |
2397 | resetbuffer = reset_buffer |
|
2398 | resetbuffer = reset_buffer | |
2398 |
|
2399 | |||
2399 | def _is_secondary_block_start(self, s): |
|
2400 | def _is_secondary_block_start(self, s): | |
2400 | if not s.endswith(':'): |
|
2401 | if not s.endswith(':'): | |
2401 | return False |
|
2402 | return False | |
2402 | if (s.startswith('elif') or |
|
2403 | if (s.startswith('elif') or | |
2403 | s.startswith('else') or |
|
2404 | s.startswith('else') or | |
2404 | s.startswith('except') or |
|
2405 | s.startswith('except') or | |
2405 | s.startswith('finally')): |
|
2406 | s.startswith('finally')): | |
2406 | return True |
|
2407 | return True | |
2407 |
|
2408 | |||
2408 | def _cleanup_ipy_script(self, script): |
|
2409 | def _cleanup_ipy_script(self, script): | |
2409 | """Make a script safe for self.runlines() |
|
2410 | """Make a script safe for self.runlines() | |
2410 |
|
2411 | |||
2411 | Currently, IPython is lines based, with blocks being detected by |
|
2412 | Currently, IPython is lines based, with blocks being detected by | |
2412 | empty lines. This is a problem for block based scripts that may |
|
2413 | empty lines. This is a problem for block based scripts that may | |
2413 | not have empty lines after blocks. This script adds those empty |
|
2414 | not have empty lines after blocks. This script adds those empty | |
2414 | lines to make scripts safe for running in the current line based |
|
2415 | lines to make scripts safe for running in the current line based | |
2415 | IPython. |
|
2416 | IPython. | |
2416 | """ |
|
2417 | """ | |
2417 | res = [] |
|
2418 | res = [] | |
2418 | lines = script.splitlines() |
|
2419 | lines = script.splitlines() | |
2419 | level = 0 |
|
2420 | level = 0 | |
2420 |
|
2421 | |||
2421 | for l in lines: |
|
2422 | for l in lines: | |
2422 | lstripped = l.lstrip() |
|
2423 | lstripped = l.lstrip() | |
2423 | stripped = l.strip() |
|
2424 | stripped = l.strip() | |
2424 | if not stripped: |
|
2425 | if not stripped: | |
2425 | continue |
|
2426 | continue | |
2426 | newlevel = len(l) - len(lstripped) |
|
2427 | newlevel = len(l) - len(lstripped) | |
2427 | if level > 0 and newlevel == 0 and \ |
|
2428 | if level > 0 and newlevel == 0 and \ | |
2428 | not self._is_secondary_block_start(stripped): |
|
2429 | not self._is_secondary_block_start(stripped): | |
2429 | # add empty line |
|
2430 | # add empty line | |
2430 | res.append('') |
|
2431 | res.append('') | |
2431 | res.append(l) |
|
2432 | res.append(l) | |
2432 | level = newlevel |
|
2433 | level = newlevel | |
2433 |
|
2434 | |||
2434 | return '\n'.join(res) + '\n' |
|
2435 | return '\n'.join(res) + '\n' | |
2435 |
|
2436 | |||
2436 | #------------------------------------------------------------------------- |
|
2437 | #------------------------------------------------------------------------- | |
2437 | # Things related to GUI support and pylab |
|
2438 | # Things related to GUI support and pylab | |
2438 | #------------------------------------------------------------------------- |
|
2439 | #------------------------------------------------------------------------- | |
2439 |
|
2440 | |||
2440 | def enable_pylab(self, gui=None): |
|
2441 | def enable_pylab(self, gui=None): | |
2441 | raise NotImplementedError('Implement enable_pylab in a subclass') |
|
2442 | raise NotImplementedError('Implement enable_pylab in a subclass') | |
2442 |
|
2443 | |||
2443 | #------------------------------------------------------------------------- |
|
2444 | #------------------------------------------------------------------------- | |
2444 | # Utilities |
|
2445 | # Utilities | |
2445 | #------------------------------------------------------------------------- |
|
2446 | #------------------------------------------------------------------------- | |
2446 |
|
2447 | |||
2447 | def var_expand(self,cmd,depth=0): |
|
2448 | def var_expand(self,cmd,depth=0): | |
2448 | """Expand python variables in a string. |
|
2449 | """Expand python variables in a string. | |
2449 |
|
2450 | |||
2450 | The depth argument indicates how many frames above the caller should |
|
2451 | The depth argument indicates how many frames above the caller should | |
2451 | be walked to look for the local namespace where to expand variables. |
|
2452 | be walked to look for the local namespace where to expand variables. | |
2452 |
|
2453 | |||
2453 | The global namespace for expansion is always the user's interactive |
|
2454 | The global namespace for expansion is always the user's interactive | |
2454 | namespace. |
|
2455 | namespace. | |
2455 | """ |
|
2456 | """ | |
2456 |
|
2457 | |||
2457 | return str(ItplNS(cmd, |
|
2458 | return str(ItplNS(cmd, | |
2458 | self.user_ns, # globals |
|
2459 | self.user_ns, # globals | |
2459 | # Skip our own frame in searching for locals: |
|
2460 | # Skip our own frame in searching for locals: | |
2460 | sys._getframe(depth+1).f_locals # locals |
|
2461 | sys._getframe(depth+1).f_locals # locals | |
2461 | )) |
|
2462 | )) | |
2462 |
|
2463 | |||
2463 | def mktempfile(self, data=None, prefix='ipython_edit_'): |
|
2464 | def mktempfile(self, data=None, prefix='ipython_edit_'): | |
2464 | """Make a new tempfile and return its filename. |
|
2465 | """Make a new tempfile and return its filename. | |
2465 |
|
2466 | |||
2466 | This makes a call to tempfile.mktemp, but it registers the created |
|
2467 | This makes a call to tempfile.mktemp, but it registers the created | |
2467 | filename internally so ipython cleans it up at exit time. |
|
2468 | filename internally so ipython cleans it up at exit time. | |
2468 |
|
2469 | |||
2469 | Optional inputs: |
|
2470 | Optional inputs: | |
2470 |
|
2471 | |||
2471 | - data(None): if data is given, it gets written out to the temp file |
|
2472 | - data(None): if data is given, it gets written out to the temp file | |
2472 | immediately, and the file is closed again.""" |
|
2473 | immediately, and the file is closed again.""" | |
2473 |
|
2474 | |||
2474 | filename = tempfile.mktemp('.py', prefix) |
|
2475 | filename = tempfile.mktemp('.py', prefix) | |
2475 | self.tempfiles.append(filename) |
|
2476 | self.tempfiles.append(filename) | |
2476 |
|
2477 | |||
2477 | if data: |
|
2478 | if data: | |
2478 | tmp_file = open(filename,'w') |
|
2479 | tmp_file = open(filename,'w') | |
2479 | tmp_file.write(data) |
|
2480 | tmp_file.write(data) | |
2480 | tmp_file.close() |
|
2481 | tmp_file.close() | |
2481 | return filename |
|
2482 | return filename | |
2482 |
|
2483 | |||
2483 | # TODO: This should be removed when Term is refactored. |
|
2484 | # TODO: This should be removed when Term is refactored. | |
2484 | def write(self,data): |
|
2485 | def write(self,data): | |
2485 | """Write a string to the default output""" |
|
2486 | """Write a string to the default output""" | |
2486 | io.Term.cout.write(data) |
|
2487 | io.Term.cout.write(data) | |
2487 |
|
2488 | |||
2488 | # TODO: This should be removed when Term is refactored. |
|
2489 | # TODO: This should be removed when Term is refactored. | |
2489 | def write_err(self,data): |
|
2490 | def write_err(self,data): | |
2490 | """Write a string to the default error output""" |
|
2491 | """Write a string to the default error output""" | |
2491 | io.Term.cerr.write(data) |
|
2492 | io.Term.cerr.write(data) | |
2492 |
|
2493 | |||
2493 | def ask_yes_no(self,prompt,default=True): |
|
2494 | def ask_yes_no(self,prompt,default=True): | |
2494 | if self.quiet: |
|
2495 | if self.quiet: | |
2495 | return True |
|
2496 | return True | |
2496 | return ask_yes_no(prompt,default) |
|
2497 | return ask_yes_no(prompt,default) | |
2497 |
|
2498 | |||
2498 | def show_usage(self): |
|
2499 | def show_usage(self): | |
2499 | """Show a usage message""" |
|
2500 | """Show a usage message""" | |
2500 | page.page(IPython.core.usage.interactive_usage) |
|
2501 | page.page(IPython.core.usage.interactive_usage) | |
2501 |
|
2502 | |||
2502 | #------------------------------------------------------------------------- |
|
2503 | #------------------------------------------------------------------------- | |
2503 | # Things related to IPython exiting |
|
2504 | # Things related to IPython exiting | |
2504 | #------------------------------------------------------------------------- |
|
2505 | #------------------------------------------------------------------------- | |
2505 | def atexit_operations(self): |
|
2506 | def atexit_operations(self): | |
2506 | """This will be executed at the time of exit. |
|
2507 | """This will be executed at the time of exit. | |
2507 |
|
2508 | |||
2508 | Cleanup operations and saving of persistent data that is done |
|
2509 | Cleanup operations and saving of persistent data that is done | |
2509 | unconditionally by IPython should be performed here. |
|
2510 | unconditionally by IPython should be performed here. | |
2510 |
|
2511 | |||
2511 | For things that may depend on startup flags or platform specifics (such |
|
2512 | For things that may depend on startup flags or platform specifics (such | |
2512 | as having readline or not), register a separate atexit function in the |
|
2513 | as having readline or not), register a separate atexit function in the | |
2513 | code that has the appropriate information, rather than trying to |
|
2514 | code that has the appropriate information, rather than trying to | |
2514 | clutter |
|
2515 | clutter | |
2515 | """ |
|
2516 | """ | |
2516 | # Cleanup all tempfiles left around |
|
2517 | # Cleanup all tempfiles left around | |
2517 | for tfile in self.tempfiles: |
|
2518 | for tfile in self.tempfiles: | |
2518 | try: |
|
2519 | try: | |
2519 | os.unlink(tfile) |
|
2520 | os.unlink(tfile) | |
2520 | except OSError: |
|
2521 | except OSError: | |
2521 | pass |
|
2522 | pass | |
2522 |
|
2523 | |||
2523 | # Clear all user namespaces to release all references cleanly. |
|
2524 | # Clear all user namespaces to release all references cleanly. | |
2524 | self.reset() |
|
2525 | self.reset() | |
2525 |
|
2526 | |||
2526 | # Run user hooks |
|
2527 | # Run user hooks | |
2527 | self.hooks.shutdown_hook() |
|
2528 | self.hooks.shutdown_hook() | |
2528 |
|
2529 | |||
2529 | def cleanup(self): |
|
2530 | def cleanup(self): | |
2530 | self.restore_sys_module_state() |
|
2531 | self.restore_sys_module_state() | |
2531 |
|
2532 | |||
2532 |
|
2533 | |||
2533 | class InteractiveShellABC(object): |
|
2534 | class InteractiveShellABC(object): | |
2534 | """An abstract base class for InteractiveShell.""" |
|
2535 | """An abstract base class for InteractiveShell.""" | |
2535 | __metaclass__ = abc.ABCMeta |
|
2536 | __metaclass__ = abc.ABCMeta | |
2536 |
|
2537 | |||
2537 | InteractiveShellABC.register(InteractiveShell) |
|
2538 | InteractiveShellABC.register(InteractiveShell) |
General Comments 0
You need to be logged in to leave comments.
Login now