Show More
@@ -1,902 +1,902 b'' | |||||
1 | """Analysis of text input into executable blocks. |
|
1 | """Analysis of text input into executable blocks. | |
2 |
|
2 | |||
3 | The main class in this module, :class:`InputSplitter`, is designed to break |
|
3 | The main class in this module, :class:`InputSplitter`, is designed to break | |
4 | input from either interactive, line-by-line environments or block-based ones, |
|
4 | input from either interactive, line-by-line environments or block-based ones, | |
5 | into standalone blocks that can be executed by Python as 'single' statements |
|
5 | into standalone blocks that can be executed by Python as 'single' statements | |
6 | (thus triggering sys.displayhook). |
|
6 | (thus triggering sys.displayhook). | |
7 |
|
7 | |||
8 | A companion, :class:`IPythonInputSplitter`, provides the same functionality but |
|
8 | A companion, :class:`IPythonInputSplitter`, provides the same functionality but | |
9 | with full support for the extended IPython syntax (magics, system calls, etc). |
|
9 | with full support for the extended IPython syntax (magics, system calls, etc). | |
10 |
|
10 | |||
11 | For more details, see the class docstring below. |
|
11 | For more details, see the class docstring below. | |
12 |
|
12 | |||
13 | Syntax Transformations |
|
13 | Syntax Transformations | |
14 | ---------------------- |
|
14 | ---------------------- | |
15 |
|
15 | |||
16 | One of the main jobs of the code in this file is to apply all syntax |
|
16 | One of the main jobs of the code in this file is to apply all syntax | |
17 | transformations that make up 'the IPython language', i.e. magics, shell |
|
17 | transformations that make up 'the IPython language', i.e. magics, shell | |
18 | escapes, etc. All transformations should be implemented as *fully stateless* |
|
18 | escapes, etc. All transformations should be implemented as *fully stateless* | |
19 | entities, that simply take one line as their input and return a line. |
|
19 | entities, that simply take one line as their input and return a line. | |
20 | Internally for implementation purposes they may be a normal function or a |
|
20 | Internally for implementation purposes they may be a normal function or a | |
21 | callable object, but the only input they receive will be a single line and they |
|
21 | callable object, but the only input they receive will be a single line and they | |
22 | should only return a line, without holding any data-dependent state between |
|
22 | should only return a line, without holding any data-dependent state between | |
23 | calls. |
|
23 | calls. | |
24 |
|
24 | |||
25 | As an example, the EscapedTransformer is a class so we can more clearly group |
|
25 | As an example, the EscapedTransformer is a class so we can more clearly group | |
26 | together the functionality of dispatching to individual functions based on the |
|
26 | together the functionality of dispatching to individual functions based on the | |
27 | starting escape character, but the only method for public use is its call |
|
27 | starting escape character, but the only method for public use is its call | |
28 | method. |
|
28 | method. | |
29 |
|
29 | |||
30 |
|
30 | |||
31 | ToDo |
|
31 | ToDo | |
32 | ---- |
|
32 | ---- | |
33 |
|
33 | |||
34 | - Should we make push() actually raise an exception once push_accepts_more() |
|
34 | - Should we make push() actually raise an exception once push_accepts_more() | |
35 | returns False? |
|
35 | returns False? | |
36 |
|
36 | |||
37 | - Naming cleanups. The tr_* names aren't the most elegant, though now they are |
|
37 | - Naming cleanups. The tr_* names aren't the most elegant, though now they are | |
38 | at least just attributes of a class so not really very exposed. |
|
38 | at least just attributes of a class so not really very exposed. | |
39 |
|
39 | |||
40 | - Think about the best way to support dynamic things: automagic, autocall, |
|
40 | - Think about the best way to support dynamic things: automagic, autocall, | |
41 | macros, etc. |
|
41 | macros, etc. | |
42 |
|
42 | |||
43 | - Think of a better heuristic for the application of the transforms in |
|
43 | - Think of a better heuristic for the application of the transforms in | |
44 | IPythonInputSplitter.push() than looking at the buffer ending in ':'. Idea: |
|
44 | IPythonInputSplitter.push() than looking at the buffer ending in ':'. Idea: | |
45 | track indentation change events (indent, dedent, nothing) and apply them only |
|
45 | track indentation change events (indent, dedent, nothing) and apply them only | |
46 | if the indentation went up, but not otherwise. |
|
46 | if the indentation went up, but not otherwise. | |
47 |
|
47 | |||
48 | - Think of the cleanest way for supporting user-specified transformations (the |
|
48 | - Think of the cleanest way for supporting user-specified transformations (the | |
49 | user prefilters we had before). |
|
49 | user prefilters we had before). | |
50 |
|
50 | |||
51 | Authors |
|
51 | Authors | |
52 | ------- |
|
52 | ------- | |
53 |
|
53 | |||
54 | * Fernando Perez |
|
54 | * Fernando Perez | |
55 | * Brian Granger |
|
55 | * Brian Granger | |
56 | """ |
|
56 | """ | |
57 | #----------------------------------------------------------------------------- |
|
57 | #----------------------------------------------------------------------------- | |
58 | # Copyright (C) 2010 The IPython Development Team |
|
58 | # Copyright (C) 2010 The IPython Development Team | |
59 | # |
|
59 | # | |
60 | # Distributed under the terms of the BSD License. The full license is in |
|
60 | # Distributed under the terms of the BSD License. The full license is in | |
61 | # the file COPYING, distributed as part of this software. |
|
61 | # the file COPYING, distributed as part of this software. | |
62 | #----------------------------------------------------------------------------- |
|
62 | #----------------------------------------------------------------------------- | |
63 |
|
63 | |||
64 | #----------------------------------------------------------------------------- |
|
64 | #----------------------------------------------------------------------------- | |
65 | # Imports |
|
65 | # Imports | |
66 | #----------------------------------------------------------------------------- |
|
66 | #----------------------------------------------------------------------------- | |
67 | # stdlib |
|
67 | # stdlib | |
68 | import ast |
|
68 | import ast | |
69 | import codeop |
|
69 | import codeop | |
70 | import re |
|
70 | import re | |
71 | import sys |
|
71 | import sys | |
72 | import tokenize |
|
72 | import tokenize | |
73 | from StringIO import StringIO |
|
73 | from StringIO import StringIO | |
74 |
|
74 | |||
75 | # IPython modules |
|
75 | # IPython modules | |
76 | from IPython.core.splitinput import split_user_input, LineInfo |
|
76 | from IPython.core.splitinput import split_user_input, LineInfo | |
77 | from IPython.utils.py3compat import cast_unicode |
|
77 | from IPython.utils.py3compat import cast_unicode | |
78 |
|
78 | |||
79 | #----------------------------------------------------------------------------- |
|
79 | #----------------------------------------------------------------------------- | |
80 | # Globals |
|
80 | # Globals | |
81 | #----------------------------------------------------------------------------- |
|
81 | #----------------------------------------------------------------------------- | |
82 |
|
82 | |||
83 | # The escape sequences that define the syntax transformations IPython will |
|
83 | # The escape sequences that define the syntax transformations IPython will | |
84 | # apply to user input. These can NOT be just changed here: many regular |
|
84 | # apply to user input. These can NOT be just changed here: many regular | |
85 | # expressions and other parts of the code may use their hardcoded values, and |
|
85 | # expressions and other parts of the code may use their hardcoded values, and | |
86 | # for all intents and purposes they constitute the 'IPython syntax', so they |
|
86 | # for all intents and purposes they constitute the 'IPython syntax', so they | |
87 | # should be considered fixed. |
|
87 | # should be considered fixed. | |
88 |
|
88 | |||
89 | ESC_SHELL = '!' # Send line to underlying system shell |
|
89 | ESC_SHELL = '!' # Send line to underlying system shell | |
90 | ESC_SH_CAP = '!!' # Send line to system shell and capture output |
|
90 | ESC_SH_CAP = '!!' # Send line to system shell and capture output | |
91 | ESC_HELP = '?' # Find information about object |
|
91 | ESC_HELP = '?' # Find information about object | |
92 | ESC_HELP2 = '??' # Find extra-detailed information about object |
|
92 | ESC_HELP2 = '??' # Find extra-detailed information about object | |
93 | ESC_MAGIC = '%' # Call magic function |
|
93 | ESC_MAGIC = '%' # Call magic function | |
94 | ESC_QUOTE = ',' # Split args on whitespace, quote each as string and call |
|
94 | ESC_QUOTE = ',' # Split args on whitespace, quote each as string and call | |
95 | ESC_QUOTE2 = ';' # Quote all args as a single string, call |
|
95 | ESC_QUOTE2 = ';' # Quote all args as a single string, call | |
96 | ESC_PAREN = '/' # Call first argument with rest of line as arguments |
|
96 | ESC_PAREN = '/' # Call first argument with rest of line as arguments | |
97 |
|
97 | |||
98 | #----------------------------------------------------------------------------- |
|
98 | #----------------------------------------------------------------------------- | |
99 | # Utilities |
|
99 | # Utilities | |
100 | #----------------------------------------------------------------------------- |
|
100 | #----------------------------------------------------------------------------- | |
101 |
|
101 | |||
102 | # FIXME: These are general-purpose utilities that later can be moved to the |
|
102 | # FIXME: These are general-purpose utilities that later can be moved to the | |
103 | # general ward. Kept here for now because we're being very strict about test |
|
103 | # general ward. Kept here for now because we're being very strict about test | |
104 | # coverage with this code, and this lets us ensure that we keep 100% coverage |
|
104 | # coverage with this code, and this lets us ensure that we keep 100% coverage | |
105 | # while developing. |
|
105 | # while developing. | |
106 |
|
106 | |||
107 | # compiled regexps for autoindent management |
|
107 | # compiled regexps for autoindent management | |
108 | dedent_re = re.compile('|'.join([ |
|
108 | dedent_re = re.compile('|'.join([ | |
109 | r'^\s+raise(\s.*)?$', # raise statement (+ space + other stuff, maybe) |
|
109 | r'^\s+raise(\s.*)?$', # raise statement (+ space + other stuff, maybe) | |
110 | r'^\s+raise\([^\)]*\).*$', # wacky raise with immediate open paren |
|
110 | r'^\s+raise\([^\)]*\).*$', # wacky raise with immediate open paren | |
111 | r'^\s+return(\s.*)?$', # normal return (+ space + other stuff, maybe) |
|
111 | r'^\s+return(\s.*)?$', # normal return (+ space + other stuff, maybe) | |
112 | r'^\s+return\([^\)]*\).*$', # wacky return with immediate open paren |
|
112 | r'^\s+return\([^\)]*\).*$', # wacky return with immediate open paren | |
113 | r'^\s+pass\s*$' # pass (optionally followed by trailing spaces) |
|
113 | r'^\s+pass\s*$' # pass (optionally followed by trailing spaces) | |
114 | ])) |
|
114 | ])) | |
115 | ini_spaces_re = re.compile(r'^([ \t\r\f\v]+)') |
|
115 | ini_spaces_re = re.compile(r'^([ \t\r\f\v]+)') | |
116 |
|
116 | |||
117 | # regexp to match pure comment lines so we don't accidentally insert 'if 1:' |
|
117 | # regexp to match pure comment lines so we don't accidentally insert 'if 1:' | |
118 | # before pure comments |
|
118 | # before pure comments | |
119 | comment_line_re = re.compile('^\s*\#') |
|
119 | comment_line_re = re.compile('^\s*\#') | |
120 |
|
120 | |||
121 |
|
121 | |||
122 | def num_ini_spaces(s): |
|
122 | def num_ini_spaces(s): | |
123 | """Return the number of initial spaces in a string. |
|
123 | """Return the number of initial spaces in a string. | |
124 |
|
124 | |||
125 | Note that tabs are counted as a single space. For now, we do *not* support |
|
125 | Note that tabs are counted as a single space. For now, we do *not* support | |
126 | mixing of tabs and spaces in the user's input. |
|
126 | mixing of tabs and spaces in the user's input. | |
127 |
|
127 | |||
128 | Parameters |
|
128 | Parameters | |
129 | ---------- |
|
129 | ---------- | |
130 | s : string |
|
130 | s : string | |
131 |
|
131 | |||
132 | Returns |
|
132 | Returns | |
133 | ------- |
|
133 | ------- | |
134 | n : int |
|
134 | n : int | |
135 | """ |
|
135 | """ | |
136 |
|
136 | |||
137 | ini_spaces = ini_spaces_re.match(s) |
|
137 | ini_spaces = ini_spaces_re.match(s) | |
138 | if ini_spaces: |
|
138 | if ini_spaces: | |
139 | return ini_spaces.end() |
|
139 | return ini_spaces.end() | |
140 | else: |
|
140 | else: | |
141 | return 0 |
|
141 | return 0 | |
142 |
|
142 | |||
143 | def last_blank(src): |
|
143 | def last_blank(src): | |
144 | """Determine if the input source ends in a blank. |
|
144 | """Determine if the input source ends in a blank. | |
145 |
|
145 | |||
146 | A blank is either a newline or a line consisting of whitespace. |
|
146 | A blank is either a newline or a line consisting of whitespace. | |
147 |
|
147 | |||
148 | Parameters |
|
148 | Parameters | |
149 | ---------- |
|
149 | ---------- | |
150 | src : string |
|
150 | src : string | |
151 | A single or multiline string. |
|
151 | A single or multiline string. | |
152 | """ |
|
152 | """ | |
153 | if not src: return False |
|
153 | if not src: return False | |
154 | ll = src.splitlines()[-1] |
|
154 | ll = src.splitlines()[-1] | |
155 | return (ll == '') or ll.isspace() |
|
155 | return (ll == '') or ll.isspace() | |
156 |
|
156 | |||
157 |
|
157 | |||
158 | last_two_blanks_re = re.compile(r'\n\s*\n\s*$', re.MULTILINE) |
|
158 | last_two_blanks_re = re.compile(r'\n\s*\n\s*$', re.MULTILINE) | |
159 | last_two_blanks_re2 = re.compile(r'.+\n\s*\n\s+$', re.MULTILINE) |
|
159 | last_two_blanks_re2 = re.compile(r'.+\n\s*\n\s+$', re.MULTILINE) | |
160 |
|
160 | |||
161 | def last_two_blanks(src): |
|
161 | def last_two_blanks(src): | |
162 | """Determine if the input source ends in two blanks. |
|
162 | """Determine if the input source ends in two blanks. | |
163 |
|
163 | |||
164 | A blank is either a newline or a line consisting of whitespace. |
|
164 | A blank is either a newline or a line consisting of whitespace. | |
165 |
|
165 | |||
166 | Parameters |
|
166 | Parameters | |
167 | ---------- |
|
167 | ---------- | |
168 | src : string |
|
168 | src : string | |
169 | A single or multiline string. |
|
169 | A single or multiline string. | |
170 | """ |
|
170 | """ | |
171 | if not src: return False |
|
171 | if not src: return False | |
172 | # The logic here is tricky: I couldn't get a regexp to work and pass all |
|
172 | # The logic here is tricky: I couldn't get a regexp to work and pass all | |
173 | # the tests, so I took a different approach: split the source by lines, |
|
173 | # the tests, so I took a different approach: split the source by lines, | |
174 | # grab the last two and prepend '###\n' as a stand-in for whatever was in |
|
174 | # grab the last two and prepend '###\n' as a stand-in for whatever was in | |
175 | # the body before the last two lines. Then, with that structure, it's |
|
175 | # the body before the last two lines. Then, with that structure, it's | |
176 | # possible to analyze with two regexps. Not the most elegant solution, but |
|
176 | # possible to analyze with two regexps. Not the most elegant solution, but | |
177 | # it works. If anyone tries to change this logic, make sure to validate |
|
177 | # it works. If anyone tries to change this logic, make sure to validate | |
178 | # the whole test suite first! |
|
178 | # the whole test suite first! | |
179 | new_src = '\n'.join(['###\n'] + src.splitlines()[-2:]) |
|
179 | new_src = '\n'.join(['###\n'] + src.splitlines()[-2:]) | |
180 | return (bool(last_two_blanks_re.match(new_src)) or |
|
180 | return (bool(last_two_blanks_re.match(new_src)) or | |
181 | bool(last_two_blanks_re2.match(new_src)) ) |
|
181 | bool(last_two_blanks_re2.match(new_src)) ) | |
182 |
|
182 | |||
183 |
|
183 | |||
184 | def remove_comments(src): |
|
184 | def remove_comments(src): | |
185 | """Remove all comments from input source. |
|
185 | """Remove all comments from input source. | |
186 |
|
186 | |||
187 | Note: comments are NOT recognized inside of strings! |
|
187 | Note: comments are NOT recognized inside of strings! | |
188 |
|
188 | |||
189 | Parameters |
|
189 | Parameters | |
190 | ---------- |
|
190 | ---------- | |
191 | src : string |
|
191 | src : string | |
192 | A single or multiline input string. |
|
192 | A single or multiline input string. | |
193 |
|
193 | |||
194 | Returns |
|
194 | Returns | |
195 | ------- |
|
195 | ------- | |
196 | String with all Python comments removed. |
|
196 | String with all Python comments removed. | |
197 | """ |
|
197 | """ | |
198 |
|
198 | |||
199 | return re.sub('#.*', '', src) |
|
199 | return re.sub('#.*', '', src) | |
200 |
|
200 | |||
201 | def has_comment(src): |
|
201 | def has_comment(src): | |
202 | """Indicate whether an input line has (i.e. ends in, or is) a comment. |
|
202 | """Indicate whether an input line has (i.e. ends in, or is) a comment. | |
203 |
|
203 | |||
204 | This uses tokenize, so it can distinguish comments from # inside strings. |
|
204 | This uses tokenize, so it can distinguish comments from # inside strings. | |
205 |
|
205 | |||
206 | Parameters |
|
206 | Parameters | |
207 | ---------- |
|
207 | ---------- | |
208 | src : string |
|
208 | src : string | |
209 | A single line input string. |
|
209 | A single line input string. | |
210 |
|
210 | |||
211 | Returns |
|
211 | Returns | |
212 | ------- |
|
212 | ------- | |
213 | Boolean: True if source has a comment. |
|
213 | Boolean: True if source has a comment. | |
214 | """ |
|
214 | """ | |
215 | readline = StringIO(src).readline |
|
215 | readline = StringIO(src).readline | |
216 | toktypes = set() |
|
216 | toktypes = set() | |
217 | try: |
|
217 | try: | |
218 | for t in tokenize.generate_tokens(readline): |
|
218 | for t in tokenize.generate_tokens(readline): | |
219 | toktypes.add(t[0]) |
|
219 | toktypes.add(t[0]) | |
220 | except tokenize.TokenError: |
|
220 | except tokenize.TokenError: | |
221 | pass |
|
221 | pass | |
222 | return(tokenize.COMMENT in toktypes) |
|
222 | return(tokenize.COMMENT in toktypes) | |
223 |
|
223 | |||
224 |
|
224 | |||
225 | def get_input_encoding(): |
|
225 | def get_input_encoding(): | |
226 | """Return the default standard input encoding. |
|
226 | """Return the default standard input encoding. | |
227 |
|
227 | |||
228 | If sys.stdin has no encoding, 'ascii' is returned.""" |
|
228 | If sys.stdin has no encoding, 'ascii' is returned.""" | |
229 | # There are strange environments for which sys.stdin.encoding is None. We |
|
229 | # There are strange environments for which sys.stdin.encoding is None. We | |
230 | # ensure that a valid encoding is returned. |
|
230 | # ensure that a valid encoding is returned. | |
231 | encoding = getattr(sys.stdin, 'encoding', None) |
|
231 | encoding = getattr(sys.stdin, 'encoding', None) | |
232 | if encoding is None: |
|
232 | if encoding is None: | |
233 | encoding = 'ascii' |
|
233 | encoding = 'ascii' | |
234 | return encoding |
|
234 | return encoding | |
235 |
|
235 | |||
236 | #----------------------------------------------------------------------------- |
|
236 | #----------------------------------------------------------------------------- | |
237 | # Classes and functions for normal Python syntax handling |
|
237 | # Classes and functions for normal Python syntax handling | |
238 | #----------------------------------------------------------------------------- |
|
238 | #----------------------------------------------------------------------------- | |
239 |
|
239 | |||
240 | class InputSplitter(object): |
|
240 | class InputSplitter(object): | |
241 | """An object that can accumulate lines of Python source before execution. |
|
241 | """An object that can accumulate lines of Python source before execution. | |
242 |
|
242 | |||
243 | This object is designed to be fed python source line-by-line, using |
|
243 | This object is designed to be fed python source line-by-line, using | |
244 | :meth:`push`. It will return on each push whether the currently pushed |
|
244 | :meth:`push`. It will return on each push whether the currently pushed | |
245 | code could be executed already. In addition, it provides a method called |
|
245 | code could be executed already. In addition, it provides a method called | |
246 | :meth:`push_accepts_more` that can be used to query whether more input |
|
246 | :meth:`push_accepts_more` that can be used to query whether more input | |
247 | can be pushed into a single interactive block. |
|
247 | can be pushed into a single interactive block. | |
248 |
|
248 | |||
249 | This is a simple example of how an interactive terminal-based client can use |
|
249 | This is a simple example of how an interactive terminal-based client can use | |
250 | this tool:: |
|
250 | this tool:: | |
251 |
|
251 | |||
252 | isp = InputSplitter() |
|
252 | isp = InputSplitter() | |
253 | while isp.push_accepts_more(): |
|
253 | while isp.push_accepts_more(): | |
254 | indent = ' '*isp.indent_spaces |
|
254 | indent = ' '*isp.indent_spaces | |
255 | prompt = '>>> ' + indent |
|
255 | prompt = '>>> ' + indent | |
256 | line = indent + raw_input(prompt) |
|
256 | line = indent + raw_input(prompt) | |
257 | isp.push(line) |
|
257 | isp.push(line) | |
258 | print 'Input source was:\n', isp.source_reset(), |
|
258 | print 'Input source was:\n', isp.source_reset(), | |
259 | """ |
|
259 | """ | |
260 | # Number of spaces of indentation computed from input that has been pushed |
|
260 | # Number of spaces of indentation computed from input that has been pushed | |
261 | # so far. This is the attributes callers should query to get the current |
|
261 | # so far. This is the attributes callers should query to get the current | |
262 | # indentation level, in order to provide auto-indent facilities. |
|
262 | # indentation level, in order to provide auto-indent facilities. | |
263 | indent_spaces = 0 |
|
263 | indent_spaces = 0 | |
264 | # String, indicating the default input encoding. It is computed by default |
|
264 | # String, indicating the default input encoding. It is computed by default | |
265 | # at initialization time via get_input_encoding(), but it can be reset by a |
|
265 | # at initialization time via get_input_encoding(), but it can be reset by a | |
266 | # client with specific knowledge of the encoding. |
|
266 | # client with specific knowledge of the encoding. | |
267 | encoding = '' |
|
267 | encoding = '' | |
268 | # String where the current full source input is stored, properly encoded. |
|
268 | # String where the current full source input is stored, properly encoded. | |
269 | # Reading this attribute is the normal way of querying the currently pushed |
|
269 | # Reading this attribute is the normal way of querying the currently pushed | |
270 | # source code, that has been properly encoded. |
|
270 | # source code, that has been properly encoded. | |
271 | source = '' |
|
271 | source = '' | |
272 | # Code object corresponding to the current source. It is automatically |
|
272 | # Code object corresponding to the current source. It is automatically | |
273 | # synced to the source, so it can be queried at any time to obtain the code |
|
273 | # synced to the source, so it can be queried at any time to obtain the code | |
274 | # object; it will be None if the source doesn't compile to valid Python. |
|
274 | # object; it will be None if the source doesn't compile to valid Python. | |
275 | code = None |
|
275 | code = None | |
276 | # Input mode |
|
276 | # Input mode | |
277 | input_mode = 'line' |
|
277 | input_mode = 'line' | |
278 |
|
278 | |||
279 | # Private attributes |
|
279 | # Private attributes | |
280 |
|
280 | |||
281 | # List with lines of input accumulated so far |
|
281 | # List with lines of input accumulated so far | |
282 | _buffer = None |
|
282 | _buffer = None | |
283 | # Command compiler |
|
283 | # Command compiler | |
284 | _compile = None |
|
284 | _compile = None | |
285 | # Mark when input has changed indentation all the way back to flush-left |
|
285 | # Mark when input has changed indentation all the way back to flush-left | |
286 | _full_dedent = False |
|
286 | _full_dedent = False | |
287 | # Boolean indicating whether the current block is complete |
|
287 | # Boolean indicating whether the current block is complete | |
288 | _is_complete = None |
|
288 | _is_complete = None | |
289 |
|
289 | |||
290 | def __init__(self, input_mode=None): |
|
290 | def __init__(self, input_mode=None): | |
291 | """Create a new InputSplitter instance. |
|
291 | """Create a new InputSplitter instance. | |
292 |
|
292 | |||
293 | Parameters |
|
293 | Parameters | |
294 | ---------- |
|
294 | ---------- | |
295 | input_mode : str |
|
295 | input_mode : str | |
296 |
|
296 | |||
297 | One of ['line', 'cell']; default is 'line'. |
|
297 | One of ['line', 'cell']; default is 'line'. | |
298 |
|
298 | |||
299 | The input_mode parameter controls how new inputs are used when fed via |
|
299 | The input_mode parameter controls how new inputs are used when fed via | |
300 | the :meth:`push` method: |
|
300 | the :meth:`push` method: | |
301 |
|
301 | |||
302 | - 'line': meant for line-oriented clients, inputs are appended one at a |
|
302 | - 'line': meant for line-oriented clients, inputs are appended one at a | |
303 | time to the internal buffer and the whole buffer is compiled. |
|
303 | time to the internal buffer and the whole buffer is compiled. | |
304 |
|
304 | |||
305 | - 'cell': meant for clients that can edit multi-line 'cells' of text at |
|
305 | - 'cell': meant for clients that can edit multi-line 'cells' of text at | |
306 | a time. A cell can contain one or more blocks that can be compile in |
|
306 | a time. A cell can contain one or more blocks that can be compile in | |
307 | 'single' mode by Python. In this mode, each new input new input |
|
307 | 'single' mode by Python. In this mode, each new input new input | |
308 | completely replaces all prior inputs. Cell mode is thus equivalent |
|
308 | completely replaces all prior inputs. Cell mode is thus equivalent | |
309 | to prepending a full reset() to every push() call. |
|
309 | to prepending a full reset() to every push() call. | |
310 | """ |
|
310 | """ | |
311 | self._buffer = [] |
|
311 | self._buffer = [] | |
312 | self._compile = codeop.CommandCompiler() |
|
312 | self._compile = codeop.CommandCompiler() | |
313 | self.encoding = get_input_encoding() |
|
313 | self.encoding = get_input_encoding() | |
314 | self.input_mode = InputSplitter.input_mode if input_mode is None \ |
|
314 | self.input_mode = InputSplitter.input_mode if input_mode is None \ | |
315 | else input_mode |
|
315 | else input_mode | |
316 |
|
316 | |||
317 | def reset(self): |
|
317 | def reset(self): | |
318 | """Reset the input buffer and associated state.""" |
|
318 | """Reset the input buffer and associated state.""" | |
319 | self.indent_spaces = 0 |
|
319 | self.indent_spaces = 0 | |
320 | self._buffer[:] = [] |
|
320 | self._buffer[:] = [] | |
321 | self.source = '' |
|
321 | self.source = '' | |
322 | self.code = None |
|
322 | self.code = None | |
323 | self._is_complete = False |
|
323 | self._is_complete = False | |
324 | self._full_dedent = False |
|
324 | self._full_dedent = False | |
325 |
|
325 | |||
326 | def source_reset(self): |
|
326 | def source_reset(self): | |
327 | """Return the input source and perform a full reset. |
|
327 | """Return the input source and perform a full reset. | |
328 | """ |
|
328 | """ | |
329 | out = self.source |
|
329 | out = self.source | |
330 | self.reset() |
|
330 | self.reset() | |
331 | return out |
|
331 | return out | |
332 |
|
332 | |||
333 | def push(self, lines): |
|
333 | def push(self, lines): | |
334 | """Push one or more lines of input. |
|
334 | """Push one or more lines of input. | |
335 |
|
335 | |||
336 | This stores the given lines and returns a status code indicating |
|
336 | This stores the given lines and returns a status code indicating | |
337 | whether the code forms a complete Python block or not. |
|
337 | whether the code forms a complete Python block or not. | |
338 |
|
338 | |||
339 | Any exceptions generated in compilation are swallowed, but if an |
|
339 | Any exceptions generated in compilation are swallowed, but if an | |
340 | exception was produced, the method returns True. |
|
340 | exception was produced, the method returns True. | |
341 |
|
341 | |||
342 | Parameters |
|
342 | Parameters | |
343 | ---------- |
|
343 | ---------- | |
344 | lines : string |
|
344 | lines : string | |
345 | One or more lines of Python input. |
|
345 | One or more lines of Python input. | |
346 |
|
346 | |||
347 | Returns |
|
347 | Returns | |
348 | ------- |
|
348 | ------- | |
349 | is_complete : boolean |
|
349 | is_complete : boolean | |
350 | True if the current input source (the result of the current input |
|
350 | True if the current input source (the result of the current input | |
351 | plus prior inputs) forms a complete Python execution block. Note that |
|
351 | plus prior inputs) forms a complete Python execution block. Note that | |
352 | this value is also stored as a private attribute (_is_complete), so it |
|
352 | this value is also stored as a private attribute (_is_complete), so it | |
353 | can be queried at any time. |
|
353 | can be queried at any time. | |
354 | """ |
|
354 | """ | |
355 | if self.input_mode == 'cell': |
|
355 | if self.input_mode == 'cell': | |
356 | self.reset() |
|
356 | self.reset() | |
357 |
|
357 | |||
358 | self._store(lines) |
|
358 | self._store(lines) | |
359 | source = self.source |
|
359 | source = self.source | |
360 |
|
360 | |||
361 | # Before calling _compile(), reset the code object to None so that if an |
|
361 | # Before calling _compile(), reset the code object to None so that if an | |
362 | # exception is raised in compilation, we don't mislead by having |
|
362 | # exception is raised in compilation, we don't mislead by having | |
363 | # inconsistent code/source attributes. |
|
363 | # inconsistent code/source attributes. | |
364 | self.code, self._is_complete = None, None |
|
364 | self.code, self._is_complete = None, None | |
365 |
|
365 | |||
366 | # Honor termination lines properly |
|
366 | # Honor termination lines properly | |
367 | if source.rstrip().endswith('\\'): |
|
367 | if source.rstrip().endswith('\\'): | |
368 | return False |
|
368 | return False | |
369 |
|
369 | |||
370 | self._update_indent(lines) |
|
370 | self._update_indent(lines) | |
371 | try: |
|
371 | try: | |
372 | self.code = self._compile(source, symbol="exec") |
|
372 | self.code = self._compile(source, symbol="exec") | |
373 | # Invalid syntax can produce any of a number of different errors from |
|
373 | # Invalid syntax can produce any of a number of different errors from | |
374 | # inside the compiler, so we have to catch them all. Syntax errors |
|
374 | # inside the compiler, so we have to catch them all. Syntax errors | |
375 | # immediately produce a 'ready' block, so the invalid Python can be |
|
375 | # immediately produce a 'ready' block, so the invalid Python can be | |
376 | # sent to the kernel for evaluation with possible ipython |
|
376 | # sent to the kernel for evaluation with possible ipython | |
377 | # special-syntax conversion. |
|
377 | # special-syntax conversion. | |
378 | except (SyntaxError, OverflowError, ValueError, TypeError, |
|
378 | except (SyntaxError, OverflowError, ValueError, TypeError, | |
379 | MemoryError): |
|
379 | MemoryError): | |
380 | self._is_complete = True |
|
380 | self._is_complete = True | |
381 | else: |
|
381 | else: | |
382 | # Compilation didn't produce any exceptions (though it may not have |
|
382 | # Compilation didn't produce any exceptions (though it may not have | |
383 | # given a complete code object) |
|
383 | # given a complete code object) | |
384 | self._is_complete = self.code is not None |
|
384 | self._is_complete = self.code is not None | |
385 |
|
385 | |||
386 | return self._is_complete |
|
386 | return self._is_complete | |
387 |
|
387 | |||
388 | def push_accepts_more(self): |
|
388 | def push_accepts_more(self): | |
389 | """Return whether a block of interactive input can accept more input. |
|
389 | """Return whether a block of interactive input can accept more input. | |
390 |
|
390 | |||
391 | This method is meant to be used by line-oriented frontends, who need to |
|
391 | This method is meant to be used by line-oriented frontends, who need to | |
392 | guess whether a block is complete or not based solely on prior and |
|
392 | guess whether a block is complete or not based solely on prior and | |
393 | current input lines. The InputSplitter considers it has a complete |
|
393 | current input lines. The InputSplitter considers it has a complete | |
394 | interactive block and will not accept more input only when either a |
|
394 | interactive block and will not accept more input only when either a | |
395 | SyntaxError is raised, or *all* of the following are true: |
|
395 | SyntaxError is raised, or *all* of the following are true: | |
396 |
|
396 | |||
397 | 1. The input compiles to a complete statement. |
|
397 | 1. The input compiles to a complete statement. | |
398 |
|
398 | |||
399 | 2. The indentation level is flush-left (because if we are indented, |
|
399 | 2. The indentation level is flush-left (because if we are indented, | |
400 | like inside a function definition or for loop, we need to keep |
|
400 | like inside a function definition or for loop, we need to keep | |
401 | reading new input). |
|
401 | reading new input). | |
402 |
|
402 | |||
403 | 3. There is one extra line consisting only of whitespace. |
|
403 | 3. There is one extra line consisting only of whitespace. | |
404 |
|
404 | |||
405 | Because of condition #3, this method should be used only by |
|
405 | Because of condition #3, this method should be used only by | |
406 | *line-oriented* frontends, since it means that intermediate blank lines |
|
406 | *line-oriented* frontends, since it means that intermediate blank lines | |
407 | are not allowed in function definitions (or any other indented block). |
|
407 | are not allowed in function definitions (or any other indented block). | |
408 |
|
408 | |||
409 | If the current input produces a syntax error, this method immediately |
|
409 | If the current input produces a syntax error, this method immediately | |
410 | returns False but does *not* raise the syntax error exception, as |
|
410 | returns False but does *not* raise the syntax error exception, as | |
411 | typically clients will want to send invalid syntax to an execution |
|
411 | typically clients will want to send invalid syntax to an execution | |
412 | backend which might convert the invalid syntax into valid Python via |
|
412 | backend which might convert the invalid syntax into valid Python via | |
413 | one of the dynamic IPython mechanisms. |
|
413 | one of the dynamic IPython mechanisms. | |
414 | """ |
|
414 | """ | |
415 |
|
415 | |||
416 | # With incomplete input, unconditionally accept more |
|
416 | # With incomplete input, unconditionally accept more | |
417 | if not self._is_complete: |
|
417 | if not self._is_complete: | |
418 | return True |
|
418 | return True | |
419 |
|
419 | |||
420 | # If we already have complete input and we're flush left, the answer |
|
420 | # If we already have complete input and we're flush left, the answer | |
421 | # depends. In line mode, if there hasn't been any indentation, |
|
421 | # depends. In line mode, if there hasn't been any indentation, | |
422 | # that's it. If we've come back from some indentation, we need |
|
422 | # that's it. If we've come back from some indentation, we need | |
423 | # the blank final line to finish. |
|
423 | # the blank final line to finish. | |
424 | # In cell mode, we need to check how many blocks the input so far |
|
424 | # In cell mode, we need to check how many blocks the input so far | |
425 | # compiles into, because if there's already more than one full |
|
425 | # compiles into, because if there's already more than one full | |
426 | # independent block of input, then the client has entered full |
|
426 | # independent block of input, then the client has entered full | |
427 | # 'cell' mode and is feeding lines that each is complete. In this |
|
427 | # 'cell' mode and is feeding lines that each is complete. In this | |
428 | # case we should then keep accepting. The Qt terminal-like console |
|
428 | # case we should then keep accepting. The Qt terminal-like console | |
429 | # does precisely this, to provide the convenience of terminal-like |
|
429 | # does precisely this, to provide the convenience of terminal-like | |
430 | # input of single expressions, but allowing the user (with a |
|
430 | # input of single expressions, but allowing the user (with a | |
431 | # separate keystroke) to switch to 'cell' mode and type multiple |
|
431 | # separate keystroke) to switch to 'cell' mode and type multiple | |
432 | # expressions in one shot. |
|
432 | # expressions in one shot. | |
433 | if self.indent_spaces==0: |
|
433 | if self.indent_spaces==0: | |
434 | if self.input_mode=='line': |
|
434 | if self.input_mode=='line': | |
435 | if not self._full_dedent: |
|
435 | if not self._full_dedent: | |
436 | return False |
|
436 | return False | |
437 | else: |
|
437 | else: | |
438 | try: |
|
438 | try: | |
439 | code_ast = ast.parse(u''.join(self._buffer)) |
|
439 | code_ast = ast.parse(u''.join(self._buffer)) | |
440 | except Exception: |
|
440 | except Exception: | |
441 | return False |
|
441 | return False | |
442 | else: |
|
442 | else: | |
443 | if len(code_ast.body) == 1: |
|
443 | if len(code_ast.body) == 1: | |
444 | return False |
|
444 | return False | |
445 |
|
445 | |||
446 | # When input is complete, then termination is marked by an extra blank |
|
446 | # When input is complete, then termination is marked by an extra blank | |
447 | # line at the end. |
|
447 | # line at the end. | |
448 | last_line = self.source.splitlines()[-1] |
|
448 | last_line = self.source.splitlines()[-1] | |
449 | return bool(last_line and not last_line.isspace()) |
|
449 | return bool(last_line and not last_line.isspace()) | |
450 |
|
450 | |||
451 | #------------------------------------------------------------------------ |
|
451 | #------------------------------------------------------------------------ | |
452 | # Private interface |
|
452 | # Private interface | |
453 | #------------------------------------------------------------------------ |
|
453 | #------------------------------------------------------------------------ | |
454 |
|
454 | |||
455 | def _find_indent(self, line): |
|
455 | def _find_indent(self, line): | |
456 | """Compute the new indentation level for a single line. |
|
456 | """Compute the new indentation level for a single line. | |
457 |
|
457 | |||
458 | Parameters |
|
458 | Parameters | |
459 | ---------- |
|
459 | ---------- | |
460 | line : str |
|
460 | line : str | |
461 | A single new line of non-whitespace, non-comment Python input. |
|
461 | A single new line of non-whitespace, non-comment Python input. | |
462 |
|
462 | |||
463 | Returns |
|
463 | Returns | |
464 | ------- |
|
464 | ------- | |
465 | indent_spaces : int |
|
465 | indent_spaces : int | |
466 | New value for the indent level (it may be equal to self.indent_spaces |
|
466 | New value for the indent level (it may be equal to self.indent_spaces | |
467 | if indentation doesn't change. |
|
467 | if indentation doesn't change. | |
468 |
|
468 | |||
469 | full_dedent : boolean |
|
469 | full_dedent : boolean | |
470 | Whether the new line causes a full flush-left dedent. |
|
470 | Whether the new line causes a full flush-left dedent. | |
471 | """ |
|
471 | """ | |
472 | indent_spaces = self.indent_spaces |
|
472 | indent_spaces = self.indent_spaces | |
473 | full_dedent = self._full_dedent |
|
473 | full_dedent = self._full_dedent | |
474 |
|
474 | |||
475 | inisp = num_ini_spaces(line) |
|
475 | inisp = num_ini_spaces(line) | |
476 | if inisp < indent_spaces: |
|
476 | if inisp < indent_spaces: | |
477 | indent_spaces = inisp |
|
477 | indent_spaces = inisp | |
478 | if indent_spaces <= 0: |
|
478 | if indent_spaces <= 0: | |
479 | #print 'Full dedent in text',self.source # dbg |
|
479 | #print 'Full dedent in text',self.source # dbg | |
480 | full_dedent = True |
|
480 | full_dedent = True | |
481 |
|
481 | |||
482 | if line.rstrip()[-1] == ':': |
|
482 | if line.rstrip()[-1] == ':': | |
483 | indent_spaces += 4 |
|
483 | indent_spaces += 4 | |
484 | elif dedent_re.match(line): |
|
484 | elif dedent_re.match(line): | |
485 | indent_spaces -= 4 |
|
485 | indent_spaces -= 4 | |
486 | if indent_spaces <= 0: |
|
486 | if indent_spaces <= 0: | |
487 | full_dedent = True |
|
487 | full_dedent = True | |
488 |
|
488 | |||
489 | # Safety |
|
489 | # Safety | |
490 | if indent_spaces < 0: |
|
490 | if indent_spaces < 0: | |
491 | indent_spaces = 0 |
|
491 | indent_spaces = 0 | |
492 | #print 'safety' # dbg |
|
492 | #print 'safety' # dbg | |
493 |
|
493 | |||
494 | return indent_spaces, full_dedent |
|
494 | return indent_spaces, full_dedent | |
495 |
|
495 | |||
496 | def _update_indent(self, lines): |
|
496 | def _update_indent(self, lines): | |
497 | for line in remove_comments(lines).splitlines(): |
|
497 | for line in remove_comments(lines).splitlines(): | |
498 | if line and not line.isspace(): |
|
498 | if line and not line.isspace(): | |
499 | self.indent_spaces, self._full_dedent = self._find_indent(line) |
|
499 | self.indent_spaces, self._full_dedent = self._find_indent(line) | |
500 |
|
500 | |||
501 | def _store(self, lines, buffer=None, store='source'): |
|
501 | def _store(self, lines, buffer=None, store='source'): | |
502 | """Store one or more lines of input. |
|
502 | """Store one or more lines of input. | |
503 |
|
503 | |||
504 | If input lines are not newline-terminated, a newline is automatically |
|
504 | If input lines are not newline-terminated, a newline is automatically | |
505 | appended.""" |
|
505 | appended.""" | |
506 |
|
506 | |||
507 | if buffer is None: |
|
507 | if buffer is None: | |
508 | buffer = self._buffer |
|
508 | buffer = self._buffer | |
509 |
|
509 | |||
510 | if lines.endswith('\n'): |
|
510 | if lines.endswith('\n'): | |
511 | buffer.append(lines) |
|
511 | buffer.append(lines) | |
512 | else: |
|
512 | else: | |
513 | buffer.append(lines+'\n') |
|
513 | buffer.append(lines+'\n') | |
514 | setattr(self, store, self._set_source(buffer)) |
|
514 | setattr(self, store, self._set_source(buffer)) | |
515 |
|
515 | |||
516 | def _set_source(self, buffer): |
|
516 | def _set_source(self, buffer): | |
517 | return u''.join(buffer) |
|
517 | return u''.join(buffer) | |
518 |
|
518 | |||
519 |
|
519 | |||
520 | #----------------------------------------------------------------------------- |
|
520 | #----------------------------------------------------------------------------- | |
521 | # Functions and classes for IPython-specific syntactic support |
|
521 | # Functions and classes for IPython-specific syntactic support | |
522 | #----------------------------------------------------------------------------- |
|
522 | #----------------------------------------------------------------------------- | |
523 |
|
523 | |||
524 | # The escaped translators ALL receive a line where their own escape has been |
|
524 | # The escaped translators ALL receive a line where their own escape has been | |
525 | # stripped. Only '?' is valid at the end of the line, all others can only be |
|
525 | # stripped. Only '?' is valid at the end of the line, all others can only be | |
526 | # placed at the start. |
|
526 | # placed at the start. | |
527 |
|
527 | |||
528 | # Transformations of the special syntaxes that don't rely on an explicit escape |
|
528 | # Transformations of the special syntaxes that don't rely on an explicit escape | |
529 | # character but instead on patterns on the input line |
|
529 | # character but instead on patterns on the input line | |
530 |
|
530 | |||
531 | # The core transformations are implemented as standalone functions that can be |
|
531 | # The core transformations are implemented as standalone functions that can be | |
532 | # tested and validated in isolation. Each of these uses a regexp, we |
|
532 | # tested and validated in isolation. Each of these uses a regexp, we | |
533 | # pre-compile these and keep them close to each function definition for clarity |
|
533 | # pre-compile these and keep them close to each function definition for clarity | |
534 |
|
534 | |||
535 | _assign_system_re = re.compile(r'(?P<lhs>(\s*)([\w\.]+)((\s*,\s*[\w\.]+)*))' |
|
535 | _assign_system_re = re.compile(r'(?P<lhs>(\s*)([\w\.]+)((\s*,\s*[\w\.]+)*))' | |
536 | r'\s*=\s*!\s*(?P<cmd>.*)') |
|
536 | r'\s*=\s*!\s*(?P<cmd>.*)') | |
537 |
|
537 | |||
538 | def transform_assign_system(line): |
|
538 | def transform_assign_system(line): | |
539 | """Handle the `files = !ls` syntax.""" |
|
539 | """Handle the `files = !ls` syntax.""" | |
540 | m = _assign_system_re.match(line) |
|
540 | m = _assign_system_re.match(line) | |
541 | if m is not None: |
|
541 | if m is not None: | |
542 | cmd = m.group('cmd') |
|
542 | cmd = m.group('cmd') | |
543 | lhs = m.group('lhs') |
|
543 | lhs = m.group('lhs') | |
544 | new_line = '%s = get_ipython().getoutput(%r)' % (lhs, cmd) |
|
544 | new_line = '%s = get_ipython().getoutput(%r)' % (lhs, cmd) | |
545 | return new_line |
|
545 | return new_line | |
546 | return line |
|
546 | return line | |
547 |
|
547 | |||
548 |
|
548 | |||
549 | _assign_magic_re = re.compile(r'(?P<lhs>(\s*)([\w\.]+)((\s*,\s*[\w\.]+)*))' |
|
549 | _assign_magic_re = re.compile(r'(?P<lhs>(\s*)([\w\.]+)((\s*,\s*[\w\.]+)*))' | |
550 | r'\s*=\s*%\s*(?P<cmd>.*)') |
|
550 | r'\s*=\s*%\s*(?P<cmd>.*)') | |
551 |
|
551 | |||
552 | def transform_assign_magic(line): |
|
552 | def transform_assign_magic(line): | |
553 | """Handle the `a = %who` syntax.""" |
|
553 | """Handle the `a = %who` syntax.""" | |
554 | m = _assign_magic_re.match(line) |
|
554 | m = _assign_magic_re.match(line) | |
555 | if m is not None: |
|
555 | if m is not None: | |
556 | cmd = m.group('cmd') |
|
556 | cmd = m.group('cmd') | |
557 | lhs = m.group('lhs') |
|
557 | lhs = m.group('lhs') | |
558 | new_line = '%s = get_ipython().magic(%r)' % (lhs, cmd) |
|
558 | new_line = '%s = get_ipython().magic(%r)' % (lhs, cmd) | |
559 | return new_line |
|
559 | return new_line | |
560 | return line |
|
560 | return line | |
561 |
|
561 | |||
562 |
|
562 | |||
563 | _classic_prompt_re = re.compile(r'^([ \t]*>>> |^[ \t]*\.\.\. )') |
|
563 | _classic_prompt_re = re.compile(r'^([ \t]*>>> |^[ \t]*\.\.\. )') | |
564 |
|
564 | |||
565 | def transform_classic_prompt(line): |
|
565 | def transform_classic_prompt(line): | |
566 | """Handle inputs that start with '>>> ' syntax.""" |
|
566 | """Handle inputs that start with '>>> ' syntax.""" | |
567 |
|
567 | |||
568 | if not line or line.isspace(): |
|
568 | if not line or line.isspace(): | |
569 | return line |
|
569 | return line | |
570 | m = _classic_prompt_re.match(line) |
|
570 | m = _classic_prompt_re.match(line) | |
571 | if m: |
|
571 | if m: | |
572 | return line[len(m.group(0)):] |
|
572 | return line[len(m.group(0)):] | |
573 | else: |
|
573 | else: | |
574 | return line |
|
574 | return line | |
575 |
|
575 | |||
576 |
|
576 | |||
577 | _ipy_prompt_re = re.compile(r'^([ \t]*In \[\d+\]: |^[ \t]*\ \ \ \.\.\.+: )') |
|
577 | _ipy_prompt_re = re.compile(r'^([ \t]*In \[\d+\]: |^[ \t]*\ \ \ \.\.\.+: )') | |
578 |
|
578 | |||
579 | def transform_ipy_prompt(line): |
|
579 | def transform_ipy_prompt(line): | |
580 | """Handle inputs that start classic IPython prompt syntax.""" |
|
580 | """Handle inputs that start classic IPython prompt syntax.""" | |
581 |
|
581 | |||
582 | if not line or line.isspace(): |
|
582 | if not line or line.isspace(): | |
583 | return line |
|
583 | return line | |
584 | #print 'LINE: %r' % line # dbg |
|
584 | #print 'LINE: %r' % line # dbg | |
585 | m = _ipy_prompt_re.match(line) |
|
585 | m = _ipy_prompt_re.match(line) | |
586 | if m: |
|
586 | if m: | |
587 | #print 'MATCH! %r -> %r' % (line, line[len(m.group(0)):]) # dbg |
|
587 | #print 'MATCH! %r -> %r' % (line, line[len(m.group(0)):]) # dbg | |
588 | return line[len(m.group(0)):] |
|
588 | return line[len(m.group(0)):] | |
589 | else: |
|
589 | else: | |
590 | return line |
|
590 | return line | |
591 |
|
591 | |||
592 |
|
592 | |||
593 | def _make_help_call(target, esc, lspace, next_input=None): |
|
593 | def _make_help_call(target, esc, lspace, next_input=None): | |
594 | """Prepares a pinfo(2)/psearch call from a target name and the escape |
|
594 | """Prepares a pinfo(2)/psearch call from a target name and the escape | |
595 | (i.e. ? or ??)""" |
|
595 | (i.e. ? or ??)""" | |
596 | method = 'pinfo2' if esc == '??' \ |
|
596 | method = 'pinfo2' if esc == '??' \ | |
597 | else 'psearch' if '*' in target \ |
|
597 | else 'psearch' if '*' in target \ | |
598 | else 'pinfo' |
|
598 | else 'pinfo' | |
599 | arg = " ".join([method, target]) |
|
599 | arg = " ".join([method, target]) | |
600 | if next_input is None: |
|
600 | if next_input is None: | |
601 | return '%sget_ipython().magic(%r)' % (lspace, arg) |
|
601 | return '%sget_ipython().magic(%r)' % (lspace, arg) | |
602 | else: |
|
602 | else: | |
603 | return '%sget_ipython().set_next_input(%r);get_ipython().magic(%r)' % \ |
|
603 | return '%sget_ipython().set_next_input(%r);get_ipython().magic(%r)' % \ | |
604 | (lspace, next_input, arg) |
|
604 | (lspace, next_input, arg) | |
605 |
|
605 | |||
606 |
|
606 | |||
607 | _initial_space_re = re.compile(r'\s*') |
|
607 | _initial_space_re = re.compile(r'\s*') | |
608 |
|
608 | |||
609 | _help_end_re = re.compile(r"""(%{0,2} |
|
609 | _help_end_re = re.compile(r"""(%{0,2} | |
610 | [a-zA-Z_*][\w*]* # Variable name |
|
610 | [a-zA-Z_*][\w*]* # Variable name | |
611 | (\.[a-zA-Z_*][\w*]*)* # .etc.etc |
|
611 | (\.[a-zA-Z_*][\w*]*)* # .etc.etc | |
612 | ) |
|
612 | ) | |
613 | (\?\??)$ # ? or ??""", |
|
613 | (\?\??)$ # ? or ??""", | |
614 | re.VERBOSE) |
|
614 | re.VERBOSE) | |
615 |
|
615 | |||
616 |
|
616 | |||
617 | def transform_help_end(line): |
|
617 | def transform_help_end(line): | |
618 | """Translate lines with ?/?? at the end""" |
|
618 | """Translate lines with ?/?? at the end""" | |
619 | m = _help_end_re.search(line) |
|
619 | m = _help_end_re.search(line) | |
620 | if m is None or has_comment(line): |
|
620 | if m is None or has_comment(line): | |
621 | return line |
|
621 | return line | |
622 | target = m.group(1) |
|
622 | target = m.group(1) | |
623 | esc = m.group(3) |
|
623 | esc = m.group(3) | |
624 | lspace = _initial_space_re.match(line).group(0) |
|
624 | lspace = _initial_space_re.match(line).group(0) | |
625 |
|
625 | |||
626 | # If we're mid-command, put it back on the next prompt for the user. |
|
626 | # If we're mid-command, put it back on the next prompt for the user. | |
627 | next_input = line.rstrip('?') if line.strip() != m.group(0) else None |
|
627 | next_input = line.rstrip('?') if line.strip() != m.group(0) else None | |
628 |
|
628 | |||
629 | return _make_help_call(target, esc, lspace, next_input) |
|
629 | return _make_help_call(target, esc, lspace, next_input) | |
630 |
|
630 | |||
631 |
|
631 | |||
632 | class EscapedTransformer(object): |
|
632 | class EscapedTransformer(object): | |
633 | """Class to transform lines that are explicitly escaped out.""" |
|
633 | """Class to transform lines that are explicitly escaped out.""" | |
634 |
|
634 | |||
635 | def __init__(self): |
|
635 | def __init__(self): | |
636 | tr = { ESC_SHELL : self._tr_system, |
|
636 | tr = { ESC_SHELL : self._tr_system, | |
637 | ESC_SH_CAP : self._tr_system2, |
|
637 | ESC_SH_CAP : self._tr_system2, | |
638 | ESC_HELP : self._tr_help, |
|
638 | ESC_HELP : self._tr_help, | |
639 | ESC_HELP2 : self._tr_help, |
|
639 | ESC_HELP2 : self._tr_help, | |
640 | ESC_MAGIC : self._tr_magic, |
|
640 | ESC_MAGIC : self._tr_magic, | |
641 | ESC_QUOTE : self._tr_quote, |
|
641 | ESC_QUOTE : self._tr_quote, | |
642 | ESC_QUOTE2 : self._tr_quote2, |
|
642 | ESC_QUOTE2 : self._tr_quote2, | |
643 | ESC_PAREN : self._tr_paren } |
|
643 | ESC_PAREN : self._tr_paren } | |
644 | self.tr = tr |
|
644 | self.tr = tr | |
645 |
|
645 | |||
646 | # Support for syntax transformations that use explicit escapes typed by the |
|
646 | # Support for syntax transformations that use explicit escapes typed by the | |
647 | # user at the beginning of a line |
|
647 | # user at the beginning of a line | |
648 | @staticmethod |
|
648 | @staticmethod | |
649 | def _tr_system(line_info): |
|
649 | def _tr_system(line_info): | |
650 | "Translate lines escaped with: !" |
|
650 | "Translate lines escaped with: !" | |
651 | cmd = line_info.line.lstrip().lstrip(ESC_SHELL) |
|
651 | cmd = line_info.line.lstrip().lstrip(ESC_SHELL) | |
652 | return '%sget_ipython().system(%r)' % (line_info.pre, cmd) |
|
652 | return '%sget_ipython().system(%r)' % (line_info.pre, cmd) | |
653 |
|
653 | |||
654 | @staticmethod |
|
654 | @staticmethod | |
655 | def _tr_system2(line_info): |
|
655 | def _tr_system2(line_info): | |
656 | "Translate lines escaped with: !!" |
|
656 | "Translate lines escaped with: !!" | |
657 | cmd = line_info.line.lstrip()[2:] |
|
657 | cmd = line_info.line.lstrip()[2:] | |
658 | return '%sget_ipython().getoutput(%r)' % (line_info.pre, cmd) |
|
658 | return '%sget_ipython().getoutput(%r)' % (line_info.pre, cmd) | |
659 |
|
659 | |||
660 | @staticmethod |
|
660 | @staticmethod | |
661 | def _tr_help(line_info): |
|
661 | def _tr_help(line_info): | |
662 | "Translate lines escaped with: ?/??" |
|
662 | "Translate lines escaped with: ?/??" | |
663 | # A naked help line should just fire the intro help screen |
|
663 | # A naked help line should just fire the intro help screen | |
664 | if not line_info.line[1:]: |
|
664 | if not line_info.line[1:]: | |
665 | return 'get_ipython().show_usage()' |
|
665 | return 'get_ipython().show_usage()' | |
666 |
|
666 | |||
667 | return _make_help_call(line_info.ifun, line_info.esc, line_info.pre) |
|
667 | return _make_help_call(line_info.ifun, line_info.esc, line_info.pre) | |
668 |
|
668 | |||
669 | @staticmethod |
|
669 | @staticmethod | |
670 | def _tr_magic(line_info): |
|
670 | def _tr_magic(line_info): | |
671 | "Translate lines escaped with: %" |
|
671 | "Translate lines escaped with: %" | |
672 | tpl = '%sget_ipython().magic(%r)' |
|
672 | tpl = '%sget_ipython().magic(%r)' | |
673 | cmd = ' '.join([line_info.ifun, line_info.the_rest]).strip() |
|
673 | cmd = ' '.join([line_info.ifun, line_info.the_rest]).strip() | |
674 | return tpl % (line_info.pre, cmd) |
|
674 | return tpl % (line_info.pre, cmd) | |
675 |
|
675 | |||
676 | @staticmethod |
|
676 | @staticmethod | |
677 | def _tr_quote(line_info): |
|
677 | def _tr_quote(line_info): | |
678 | "Translate lines escaped with: ," |
|
678 | "Translate lines escaped with: ," | |
679 | return '%s%s("%s")' % (line_info.pre, line_info.ifun, |
|
679 | return '%s%s("%s")' % (line_info.pre, line_info.ifun, | |
680 | '", "'.join(line_info.the_rest.split()) ) |
|
680 | '", "'.join(line_info.the_rest.split()) ) | |
681 |
|
681 | |||
682 | @staticmethod |
|
682 | @staticmethod | |
683 | def _tr_quote2(line_info): |
|
683 | def _tr_quote2(line_info): | |
684 | "Translate lines escaped with: ;" |
|
684 | "Translate lines escaped with: ;" | |
685 | return '%s%s("%s")' % (line_info.pre, line_info.ifun, |
|
685 | return '%s%s("%s")' % (line_info.pre, line_info.ifun, | |
686 | line_info.the_rest) |
|
686 | line_info.the_rest) | |
687 |
|
687 | |||
688 | @staticmethod |
|
688 | @staticmethod | |
689 | def _tr_paren(line_info): |
|
689 | def _tr_paren(line_info): | |
690 | "Translate lines escaped with: /" |
|
690 | "Translate lines escaped with: /" | |
691 | return '%s%s(%s)' % (line_info.pre, line_info.ifun, |
|
691 | return '%s%s(%s)' % (line_info.pre, line_info.ifun, | |
692 | ", ".join(line_info.the_rest.split())) |
|
692 | ", ".join(line_info.the_rest.split())) | |
693 |
|
693 | |||
694 | def __call__(self, line): |
|
694 | def __call__(self, line): | |
695 | """Class to transform lines that are explicitly escaped out. |
|
695 | """Class to transform lines that are explicitly escaped out. | |
696 |
|
696 | |||
697 | This calls the above _tr_* static methods for the actual line |
|
697 | This calls the above _tr_* static methods for the actual line | |
698 | translations.""" |
|
698 | translations.""" | |
699 |
|
699 | |||
700 | # Empty lines just get returned unmodified |
|
700 | # Empty lines just get returned unmodified | |
701 | if not line or line.isspace(): |
|
701 | if not line or line.isspace(): | |
702 | return line |
|
702 | return line | |
703 |
|
703 | |||
704 | # Get line endpoints, where the escapes can be |
|
704 | # Get line endpoints, where the escapes can be | |
705 | line_info = LineInfo(line) |
|
705 | line_info = LineInfo(line) | |
706 |
|
706 | |||
707 | if not line_info.esc in self.tr: |
|
707 | if not line_info.esc in self.tr: | |
708 | # If we don't recognize the escape, don't modify the line |
|
708 | # If we don't recognize the escape, don't modify the line | |
709 | return line |
|
709 | return line | |
710 |
|
710 | |||
711 | return self.tr[line_info.esc](line_info) |
|
711 | return self.tr[line_info.esc](line_info) | |
712 |
|
712 | |||
713 |
|
713 | |||
714 | # A function-looking object to be used by the rest of the code. The purpose of |
|
714 | # A function-looking object to be used by the rest of the code. The purpose of | |
715 | # the class in this case is to organize related functionality, more than to |
|
715 | # the class in this case is to organize related functionality, more than to | |
716 | # manage state. |
|
716 | # manage state. | |
717 | transform_escaped = EscapedTransformer() |
|
717 | transform_escaped = EscapedTransformer() | |
718 |
|
718 | |||
719 |
|
719 | |||
720 | class IPythonInputSplitter(InputSplitter): |
|
720 | class IPythonInputSplitter(InputSplitter): | |
721 | """An input splitter that recognizes all of IPython's special syntax.""" |
|
721 | """An input splitter that recognizes all of IPython's special syntax.""" | |
722 |
|
722 | |||
723 | # String with raw, untransformed input. |
|
723 | # String with raw, untransformed input. | |
724 | source_raw = '' |
|
724 | source_raw = '' | |
725 |
|
725 | |||
726 | # Flag to track when we're in the middle of processing a cell magic, since |
|
726 | # Flag to track when we're in the middle of processing a cell magic, since | |
727 | # the logic has to change. In that case, we apply no transformations at |
|
727 | # the logic has to change. In that case, we apply no transformations at | |
728 | # all. |
|
728 | # all. | |
729 | processing_cell_magic = False |
|
729 | processing_cell_magic = False | |
730 |
|
730 | |||
731 | # Storage for all blocks of input that make up a cell magic |
|
731 | # Storage for all blocks of input that make up a cell magic | |
732 | cell_magic_parts = [] |
|
732 | cell_magic_parts = [] | |
733 |
|
733 | |||
734 | # Private attributes |
|
734 | # Private attributes | |
735 |
|
735 | |||
736 | # List with lines of raw input accumulated so far. |
|
736 | # List with lines of raw input accumulated so far. | |
737 | _buffer_raw = None |
|
737 | _buffer_raw = None | |
738 |
|
738 | |||
739 | def __init__(self, input_mode=None): |
|
739 | def __init__(self, input_mode=None): | |
740 | super(IPythonInputSplitter, self).__init__(input_mode) |
|
740 | super(IPythonInputSplitter, self).__init__(input_mode) | |
741 | self._buffer_raw = [] |
|
741 | self._buffer_raw = [] | |
742 | self._validate = True |
|
742 | self._validate = True | |
743 |
|
743 | |||
744 | def reset(self): |
|
744 | def reset(self): | |
745 | """Reset the input buffer and associated state.""" |
|
745 | """Reset the input buffer and associated state.""" | |
746 | super(IPythonInputSplitter, self).reset() |
|
746 | super(IPythonInputSplitter, self).reset() | |
747 | self._buffer_raw[:] = [] |
|
747 | self._buffer_raw[:] = [] | |
748 | self.source_raw = '' |
|
748 | self.source_raw = '' | |
749 | self.cell_magic_parts = [] |
|
749 | self.cell_magic_parts = [] | |
750 | self.processing_cell_magic = False |
|
750 | self.processing_cell_magic = False | |
751 |
|
751 | |||
752 | def source_raw_reset(self): |
|
752 | def source_raw_reset(self): | |
753 | """Return input and raw source and perform a full reset. |
|
753 | """Return input and raw source and perform a full reset. | |
754 | """ |
|
754 | """ | |
755 | out = self.source |
|
755 | out = self.source | |
756 | out_r = self.source_raw |
|
756 | out_r = self.source_raw | |
757 | self.reset() |
|
757 | self.reset() | |
758 | return out, out_r |
|
758 | return out, out_r | |
759 |
|
759 | |||
760 | def push_accepts_more(self): |
|
760 | def push_accepts_more(self): | |
761 | if self.processing_cell_magic: |
|
761 | if self.processing_cell_magic: | |
762 | return not self._is_complete |
|
762 | return not self._is_complete | |
763 | else: |
|
763 | else: | |
764 | return super(IPythonInputSplitter, self).push_accepts_more() |
|
764 | return super(IPythonInputSplitter, self).push_accepts_more() | |
765 |
|
765 | |||
766 | def _handle_cell_magic(self, lines): |
|
766 | def _handle_cell_magic(self, lines): | |
767 | """Process lines when they start with %%, which marks cell magics. |
|
767 | """Process lines when they start with %%, which marks cell magics. | |
768 | """ |
|
768 | """ | |
769 | self.processing_cell_magic = True |
|
769 | self.processing_cell_magic = True | |
770 | first, _, body = lines.partition('\n') |
|
770 | first, _, body = lines.partition('\n') | |
771 | magic_name, _, line = first.partition(' ') |
|
771 | magic_name, _, line = first.partition(' ') | |
772 | magic_name = magic_name.lstrip(ESC_MAGIC) |
|
772 | magic_name = magic_name.lstrip(ESC_MAGIC) | |
773 | # We store the body of the cell and create a call to a method that |
|
773 | # We store the body of the cell and create a call to a method that | |
774 | # will use this stored value. This is ugly, but it's a first cut to |
|
774 | # will use this stored value. This is ugly, but it's a first cut to | |
775 | # get it all working, as right now changing the return API of our |
|
775 | # get it all working, as right now changing the return API of our | |
776 | # methods would require major refactoring. |
|
776 | # methods would require major refactoring. | |
777 | self.cell_magic_parts = [body] |
|
777 | self.cell_magic_parts = [body] | |
778 | tpl = 'get_ipython()._cell_magic(%r, %r)' |
|
778 | tpl = 'get_ipython()._run_cached_cell_magic(%r, %r)' | |
779 | tlines = tpl % (magic_name, line) |
|
779 | tlines = tpl % (magic_name, line) | |
780 | self._store(tlines) |
|
780 | self._store(tlines) | |
781 | self._store(lines, self._buffer_raw, 'source_raw') |
|
781 | self._store(lines, self._buffer_raw, 'source_raw') | |
782 | # We can actually choose whether to allow for single blank lines here |
|
782 | # We can actually choose whether to allow for single blank lines here | |
783 | # during input for clients that use cell mode to decide when to stop |
|
783 | # during input for clients that use cell mode to decide when to stop | |
784 | # pushing input (currently only the Qt console). |
|
784 | # pushing input (currently only the Qt console). | |
785 | # My first implementation did that, and then I realized it wasn't |
|
785 | # My first implementation did that, and then I realized it wasn't | |
786 | # consistent with the terminal behavior, so I've reverted it to one |
|
786 | # consistent with the terminal behavior, so I've reverted it to one | |
787 | # line. But I'm leaving it here so we can easily test both behaviors, |
|
787 | # line. But I'm leaving it here so we can easily test both behaviors, | |
788 | # I kind of liked having full blank lines allowed in the cell magics... |
|
788 | # I kind of liked having full blank lines allowed in the cell magics... | |
789 | #self._is_complete = last_two_blanks(lines) |
|
789 | #self._is_complete = last_two_blanks(lines) | |
790 | self._is_complete = last_blank(lines) |
|
790 | self._is_complete = last_blank(lines) | |
791 | return self._is_complete |
|
791 | return self._is_complete | |
792 |
|
792 | |||
793 | def _line_mode_cell_append(self, lines): |
|
793 | def _line_mode_cell_append(self, lines): | |
794 | """Append new content for a cell magic in line mode. |
|
794 | """Append new content for a cell magic in line mode. | |
795 | """ |
|
795 | """ | |
796 | # Only store the raw input. Lines beyond the first one are only only |
|
796 | # Only store the raw input. Lines beyond the first one are only only | |
797 | # stored for history purposes; for execution the caller will grab the |
|
797 | # stored for history purposes; for execution the caller will grab the | |
798 | # magic pieces from cell_magic_parts and will assemble the cell body |
|
798 | # magic pieces from cell_magic_parts and will assemble the cell body | |
799 | self._store(lines, self._buffer_raw, 'source_raw') |
|
799 | self._store(lines, self._buffer_raw, 'source_raw') | |
800 | self.cell_magic_parts.append(lines) |
|
800 | self.cell_magic_parts.append(lines) | |
801 | # Find out if the last stored block has a whitespace line as its |
|
801 | # Find out if the last stored block has a whitespace line as its | |
802 | # last line and also this line is whitespace, case in which we're |
|
802 | # last line and also this line is whitespace, case in which we're | |
803 | # done (two contiguous blank lines signal termination). Note that |
|
803 | # done (two contiguous blank lines signal termination). Note that | |
804 | # the storage logic *enforces* that every stored block is |
|
804 | # the storage logic *enforces* that every stored block is | |
805 | # newline-terminated, so we grab everything but the last character |
|
805 | # newline-terminated, so we grab everything but the last character | |
806 | # so we can have the body of the block alone. |
|
806 | # so we can have the body of the block alone. | |
807 | last_block = self.cell_magic_parts[-1] |
|
807 | last_block = self.cell_magic_parts[-1] | |
808 | self._is_complete = last_blank(last_block) and lines.isspace() |
|
808 | self._is_complete = last_blank(last_block) and lines.isspace() | |
809 | return self._is_complete |
|
809 | return self._is_complete | |
810 |
|
810 | |||
811 | def push(self, lines): |
|
811 | def push(self, lines): | |
812 | """Push one or more lines of IPython input. |
|
812 | """Push one or more lines of IPython input. | |
813 |
|
813 | |||
814 | This stores the given lines and returns a status code indicating |
|
814 | This stores the given lines and returns a status code indicating | |
815 | whether the code forms a complete Python block or not, after processing |
|
815 | whether the code forms a complete Python block or not, after processing | |
816 | all input lines for special IPython syntax. |
|
816 | all input lines for special IPython syntax. | |
817 |
|
817 | |||
818 | Any exceptions generated in compilation are swallowed, but if an |
|
818 | Any exceptions generated in compilation are swallowed, but if an | |
819 | exception was produced, the method returns True. |
|
819 | exception was produced, the method returns True. | |
820 |
|
820 | |||
821 | Parameters |
|
821 | Parameters | |
822 | ---------- |
|
822 | ---------- | |
823 | lines : string |
|
823 | lines : string | |
824 | One or more lines of Python input. |
|
824 | One or more lines of Python input. | |
825 |
|
825 | |||
826 | Returns |
|
826 | Returns | |
827 | ------- |
|
827 | ------- | |
828 | is_complete : boolean |
|
828 | is_complete : boolean | |
829 | True if the current input source (the result of the current input |
|
829 | True if the current input source (the result of the current input | |
830 | plus prior inputs) forms a complete Python execution block. Note that |
|
830 | plus prior inputs) forms a complete Python execution block. Note that | |
831 | this value is also stored as a private attribute (_is_complete), so it |
|
831 | this value is also stored as a private attribute (_is_complete), so it | |
832 | can be queried at any time. |
|
832 | can be queried at any time. | |
833 | """ |
|
833 | """ | |
834 | if not lines: |
|
834 | if not lines: | |
835 | return super(IPythonInputSplitter, self).push(lines) |
|
835 | return super(IPythonInputSplitter, self).push(lines) | |
836 |
|
836 | |||
837 | # We must ensure all input is pure unicode |
|
837 | # We must ensure all input is pure unicode | |
838 | lines = cast_unicode(lines, self.encoding) |
|
838 | lines = cast_unicode(lines, self.encoding) | |
839 |
|
839 | |||
840 | # If the entire input block is a cell magic, return after handling it |
|
840 | # If the entire input block is a cell magic, return after handling it | |
841 | # as the rest of the transformation logic should be skipped. |
|
841 | # as the rest of the transformation logic should be skipped. | |
842 | if lines.startswith('%%') and not \ |
|
842 | if lines.startswith('%%') and not \ | |
843 | (len(lines.splitlines()) == 1 and lines.strip().endswith('?')): |
|
843 | (len(lines.splitlines()) == 1 and lines.strip().endswith('?')): | |
844 | return self._handle_cell_magic(lines) |
|
844 | return self._handle_cell_magic(lines) | |
845 |
|
845 | |||
846 | # In line mode, a cell magic can arrive in separate pieces |
|
846 | # In line mode, a cell magic can arrive in separate pieces | |
847 | if self.input_mode == 'line' and self.processing_cell_magic: |
|
847 | if self.input_mode == 'line' and self.processing_cell_magic: | |
848 | return self._line_mode_cell_append(lines) |
|
848 | return self._line_mode_cell_append(lines) | |
849 |
|
849 | |||
850 | # The rest of the processing is for 'normal' content, i.e. IPython |
|
850 | # The rest of the processing is for 'normal' content, i.e. IPython | |
851 | # source that we process through our transformations pipeline. |
|
851 | # source that we process through our transformations pipeline. | |
852 | lines_list = lines.splitlines() |
|
852 | lines_list = lines.splitlines() | |
853 |
|
853 | |||
854 | transforms = [transform_ipy_prompt, transform_classic_prompt, |
|
854 | transforms = [transform_ipy_prompt, transform_classic_prompt, | |
855 | transform_help_end, transform_escaped, |
|
855 | transform_help_end, transform_escaped, | |
856 | transform_assign_system, transform_assign_magic] |
|
856 | transform_assign_system, transform_assign_magic] | |
857 |
|
857 | |||
858 | # Transform logic |
|
858 | # Transform logic | |
859 | # |
|
859 | # | |
860 | # We only apply the line transformers to the input if we have either no |
|
860 | # We only apply the line transformers to the input if we have either no | |
861 | # input yet, or complete input, or if the last line of the buffer ends |
|
861 | # input yet, or complete input, or if the last line of the buffer ends | |
862 | # with ':' (opening an indented block). This prevents the accidental |
|
862 | # with ':' (opening an indented block). This prevents the accidental | |
863 | # transformation of escapes inside multiline expressions like |
|
863 | # transformation of escapes inside multiline expressions like | |
864 | # triple-quoted strings or parenthesized expressions. |
|
864 | # triple-quoted strings or parenthesized expressions. | |
865 | # |
|
865 | # | |
866 | # The last heuristic, while ugly, ensures that the first line of an |
|
866 | # The last heuristic, while ugly, ensures that the first line of an | |
867 | # indented block is correctly transformed. |
|
867 | # indented block is correctly transformed. | |
868 | # |
|
868 | # | |
869 | # FIXME: try to find a cleaner approach for this last bit. |
|
869 | # FIXME: try to find a cleaner approach for this last bit. | |
870 |
|
870 | |||
871 | # If we were in 'block' mode, since we're going to pump the parent |
|
871 | # If we were in 'block' mode, since we're going to pump the parent | |
872 | # class by hand line by line, we need to temporarily switch out to |
|
872 | # class by hand line by line, we need to temporarily switch out to | |
873 | # 'line' mode, do a single manual reset and then feed the lines one |
|
873 | # 'line' mode, do a single manual reset and then feed the lines one | |
874 | # by one. Note that this only matters if the input has more than one |
|
874 | # by one. Note that this only matters if the input has more than one | |
875 | # line. |
|
875 | # line. | |
876 | changed_input_mode = False |
|
876 | changed_input_mode = False | |
877 |
|
877 | |||
878 | if self.input_mode == 'cell': |
|
878 | if self.input_mode == 'cell': | |
879 | self.reset() |
|
879 | self.reset() | |
880 | changed_input_mode = True |
|
880 | changed_input_mode = True | |
881 | saved_input_mode = 'cell' |
|
881 | saved_input_mode = 'cell' | |
882 | self.input_mode = 'line' |
|
882 | self.input_mode = 'line' | |
883 |
|
883 | |||
884 | # Store raw source before applying any transformations to it. Note |
|
884 | # Store raw source before applying any transformations to it. Note | |
885 | # that this must be done *after* the reset() call that would otherwise |
|
885 | # that this must be done *after* the reset() call that would otherwise | |
886 | # flush the buffer. |
|
886 | # flush the buffer. | |
887 | self._store(lines, self._buffer_raw, 'source_raw') |
|
887 | self._store(lines, self._buffer_raw, 'source_raw') | |
888 |
|
888 | |||
889 | try: |
|
889 | try: | |
890 | push = super(IPythonInputSplitter, self).push |
|
890 | push = super(IPythonInputSplitter, self).push | |
891 | buf = self._buffer |
|
891 | buf = self._buffer | |
892 | for line in lines_list: |
|
892 | for line in lines_list: | |
893 | if self._is_complete or not buf or \ |
|
893 | if self._is_complete or not buf or \ | |
894 | (buf and buf[-1].rstrip().endswith((':', ','))): |
|
894 | (buf and buf[-1].rstrip().endswith((':', ','))): | |
895 | for f in transforms: |
|
895 | for f in transforms: | |
896 | line = f(line) |
|
896 | line = f(line) | |
897 |
|
897 | |||
898 | out = push(line) |
|
898 | out = push(line) | |
899 | finally: |
|
899 | finally: | |
900 | if changed_input_mode: |
|
900 | if changed_input_mode: | |
901 | self.input_mode = saved_input_mode |
|
901 | self.input_mode = saved_input_mode | |
902 | return out |
|
902 | return out |
@@ -1,2962 +1,2973 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-2011 The IPython Development Team |
|
7 | # Copyright (C) 2008-2011 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__ as builtin_mod |
|
20 | import __builtin__ as builtin_mod | |
21 | import __future__ |
|
21 | import __future__ | |
22 | import abc |
|
22 | import abc | |
23 | import ast |
|
23 | import ast | |
24 | import atexit |
|
24 | import atexit | |
25 | import os |
|
25 | import os | |
26 | import re |
|
26 | import re | |
27 | import runpy |
|
27 | import runpy | |
28 | import sys |
|
28 | import sys | |
29 | import tempfile |
|
29 | import tempfile | |
30 | import types |
|
30 | import types | |
31 |
|
31 | |||
32 | # We need to use nested to support python 2.6, once we move to >=2.7, we can |
|
32 | # We need to use nested to support python 2.6, once we move to >=2.7, we can | |
33 | # use the with keyword's new builtin support for nested managers |
|
33 | # use the with keyword's new builtin support for nested managers | |
34 | try: |
|
34 | try: | |
35 | from contextlib import nested |
|
35 | from contextlib import nested | |
36 | except: |
|
36 | except: | |
37 | from IPython.utils.nested_context import nested |
|
37 | from IPython.utils.nested_context import nested | |
38 |
|
38 | |||
39 | from IPython.config.configurable import SingletonConfigurable |
|
39 | from IPython.config.configurable import SingletonConfigurable | |
40 | from IPython.core import debugger, oinspect |
|
40 | from IPython.core import debugger, oinspect | |
41 | from IPython.core import history as ipcorehist |
|
41 | from IPython.core import history as ipcorehist | |
42 | from IPython.core import magic |
|
42 | from IPython.core import magic | |
43 | from IPython.core import page |
|
43 | from IPython.core import page | |
44 | from IPython.core import prefilter |
|
44 | from IPython.core import prefilter | |
45 | from IPython.core import shadowns |
|
45 | from IPython.core import shadowns | |
46 | from IPython.core import ultratb |
|
46 | from IPython.core import ultratb | |
47 | from IPython.core.alias import AliasManager, AliasError |
|
47 | from IPython.core.alias import AliasManager, AliasError | |
48 | from IPython.core.autocall import ExitAutocall |
|
48 | from IPython.core.autocall import ExitAutocall | |
49 | from IPython.core.builtin_trap import BuiltinTrap |
|
49 | from IPython.core.builtin_trap import BuiltinTrap | |
50 | from IPython.core.compilerop import CachingCompiler |
|
50 | from IPython.core.compilerop import CachingCompiler | |
51 | from IPython.core.display_trap import DisplayTrap |
|
51 | from IPython.core.display_trap import DisplayTrap | |
52 | from IPython.core.displayhook import DisplayHook |
|
52 | from IPython.core.displayhook import DisplayHook | |
53 | from IPython.core.displaypub import DisplayPublisher |
|
53 | from IPython.core.displaypub import DisplayPublisher | |
54 | from IPython.core.error import UsageError |
|
54 | from IPython.core.error import UsageError | |
55 | from IPython.core.extensions import ExtensionManager |
|
55 | from IPython.core.extensions import ExtensionManager | |
56 | from IPython.core.fakemodule import FakeModule, init_fakemod_dict |
|
56 | from IPython.core.fakemodule import FakeModule, init_fakemod_dict | |
57 | from IPython.core.formatters import DisplayFormatter |
|
57 | from IPython.core.formatters import DisplayFormatter | |
58 | from IPython.core.history import HistoryManager |
|
58 | from IPython.core.history import HistoryManager | |
59 | from IPython.core.inputsplitter import IPythonInputSplitter |
|
59 | from IPython.core.inputsplitter import IPythonInputSplitter | |
60 | from IPython.core.logger import Logger |
|
60 | from IPython.core.logger import Logger | |
61 | from IPython.core.macro import Macro |
|
61 | from IPython.core.macro import Macro | |
62 | from IPython.core.payload import PayloadManager |
|
62 | from IPython.core.payload import PayloadManager | |
63 | from IPython.core.plugin import PluginManager |
|
63 | from IPython.core.plugin import PluginManager | |
64 | from IPython.core.prefilter import PrefilterManager, ESC_MAGIC |
|
64 | from IPython.core.prefilter import PrefilterManager, ESC_MAGIC | |
65 | from IPython.core.profiledir import ProfileDir |
|
65 | from IPython.core.profiledir import ProfileDir | |
66 | from IPython.core.pylabtools import pylab_activate |
|
66 | from IPython.core.pylabtools import pylab_activate | |
67 | from IPython.core.prompts import PromptManager |
|
67 | from IPython.core.prompts import PromptManager | |
68 | from IPython.utils import PyColorize |
|
68 | from IPython.utils import PyColorize | |
69 | from IPython.utils import io |
|
69 | from IPython.utils import io | |
70 | from IPython.utils import py3compat |
|
70 | from IPython.utils import py3compat | |
71 | from IPython.utils import openpy |
|
71 | from IPython.utils import openpy | |
72 | from IPython.utils.doctestreload import doctest_reload |
|
72 | from IPython.utils.doctestreload import doctest_reload | |
73 | from IPython.utils.io import ask_yes_no |
|
73 | from IPython.utils.io import ask_yes_no | |
74 | from IPython.utils.ipstruct import Struct |
|
74 | from IPython.utils.ipstruct import Struct | |
75 | from IPython.utils.path import get_home_dir, get_ipython_dir, get_py_filename, unquote_filename |
|
75 | from IPython.utils.path import get_home_dir, get_ipython_dir, get_py_filename, unquote_filename | |
76 | from IPython.utils.pickleshare import PickleShareDB |
|
76 | from IPython.utils.pickleshare import PickleShareDB | |
77 | from IPython.utils.process import system, getoutput |
|
77 | from IPython.utils.process import system, getoutput | |
78 | from IPython.utils.strdispatch import StrDispatch |
|
78 | from IPython.utils.strdispatch import StrDispatch | |
79 | from IPython.utils.syspathcontext import prepended_to_syspath |
|
79 | from IPython.utils.syspathcontext import prepended_to_syspath | |
80 | from IPython.utils.text import (format_screen, LSString, SList, |
|
80 | from IPython.utils.text import (format_screen, LSString, SList, | |
81 | DollarFormatter) |
|
81 | DollarFormatter) | |
82 | from IPython.utils.traitlets import (Integer, CBool, CaselessStrEnum, Enum, |
|
82 | from IPython.utils.traitlets import (Integer, CBool, CaselessStrEnum, Enum, | |
83 | List, Unicode, Instance, Type) |
|
83 | List, Unicode, Instance, Type) | |
84 | from IPython.utils.warn import warn, error |
|
84 | from IPython.utils.warn import warn, error | |
85 | import IPython.core.hooks |
|
85 | import IPython.core.hooks | |
86 |
|
86 | |||
87 | #----------------------------------------------------------------------------- |
|
87 | #----------------------------------------------------------------------------- | |
88 | # Globals |
|
88 | # Globals | |
89 | #----------------------------------------------------------------------------- |
|
89 | #----------------------------------------------------------------------------- | |
90 |
|
90 | |||
91 | # compiled regexps for autoindent management |
|
91 | # compiled regexps for autoindent management | |
92 | dedent_re = re.compile(r'^\s+raise|^\s+return|^\s+pass') |
|
92 | dedent_re = re.compile(r'^\s+raise|^\s+return|^\s+pass') | |
93 |
|
93 | |||
94 | #----------------------------------------------------------------------------- |
|
94 | #----------------------------------------------------------------------------- | |
95 | # Utilities |
|
95 | # Utilities | |
96 | #----------------------------------------------------------------------------- |
|
96 | #----------------------------------------------------------------------------- | |
97 |
|
97 | |||
98 | def softspace(file, newvalue): |
|
98 | def softspace(file, newvalue): | |
99 | """Copied from code.py, to remove the dependency""" |
|
99 | """Copied from code.py, to remove the dependency""" | |
100 |
|
100 | |||
101 | oldvalue = 0 |
|
101 | oldvalue = 0 | |
102 | try: |
|
102 | try: | |
103 | oldvalue = file.softspace |
|
103 | oldvalue = file.softspace | |
104 | except AttributeError: |
|
104 | except AttributeError: | |
105 | pass |
|
105 | pass | |
106 | try: |
|
106 | try: | |
107 | file.softspace = newvalue |
|
107 | file.softspace = newvalue | |
108 | except (AttributeError, TypeError): |
|
108 | except (AttributeError, TypeError): | |
109 | # "attribute-less object" or "read-only attributes" |
|
109 | # "attribute-less object" or "read-only attributes" | |
110 | pass |
|
110 | pass | |
111 | return oldvalue |
|
111 | return oldvalue | |
112 |
|
112 | |||
113 |
|
113 | |||
114 | def no_op(*a, **kw): pass |
|
114 | def no_op(*a, **kw): pass | |
115 |
|
115 | |||
116 | class NoOpContext(object): |
|
116 | class NoOpContext(object): | |
117 | def __enter__(self): pass |
|
117 | def __enter__(self): pass | |
118 | def __exit__(self, type, value, traceback): pass |
|
118 | def __exit__(self, type, value, traceback): pass | |
119 | no_op_context = NoOpContext() |
|
119 | no_op_context = NoOpContext() | |
120 |
|
120 | |||
121 | class SpaceInInput(Exception): pass |
|
121 | class SpaceInInput(Exception): pass | |
122 |
|
122 | |||
123 | class Bunch: pass |
|
123 | class Bunch: pass | |
124 |
|
124 | |||
125 |
|
125 | |||
126 | def get_default_colors(): |
|
126 | def get_default_colors(): | |
127 | if sys.platform=='darwin': |
|
127 | if sys.platform=='darwin': | |
128 | return "LightBG" |
|
128 | return "LightBG" | |
129 | elif os.name=='nt': |
|
129 | elif os.name=='nt': | |
130 | return 'Linux' |
|
130 | return 'Linux' | |
131 | else: |
|
131 | else: | |
132 | return 'Linux' |
|
132 | return 'Linux' | |
133 |
|
133 | |||
134 |
|
134 | |||
135 | class SeparateUnicode(Unicode): |
|
135 | class SeparateUnicode(Unicode): | |
136 | """A Unicode subclass to validate separate_in, separate_out, etc. |
|
136 | """A Unicode subclass to validate separate_in, separate_out, etc. | |
137 |
|
137 | |||
138 | This is a Unicode based trait that converts '0'->'' and '\\n'->'\n'. |
|
138 | This is a Unicode based trait that converts '0'->'' and '\\n'->'\n'. | |
139 | """ |
|
139 | """ | |
140 |
|
140 | |||
141 | def validate(self, obj, value): |
|
141 | def validate(self, obj, value): | |
142 | if value == '0': value = '' |
|
142 | if value == '0': value = '' | |
143 | value = value.replace('\\n','\n') |
|
143 | value = value.replace('\\n','\n') | |
144 | return super(SeparateUnicode, self).validate(obj, value) |
|
144 | return super(SeparateUnicode, self).validate(obj, value) | |
145 |
|
145 | |||
146 |
|
146 | |||
147 | class ReadlineNoRecord(object): |
|
147 | class ReadlineNoRecord(object): | |
148 | """Context manager to execute some code, then reload readline history |
|
148 | """Context manager to execute some code, then reload readline history | |
149 | so that interactive input to the code doesn't appear when pressing up.""" |
|
149 | so that interactive input to the code doesn't appear when pressing up.""" | |
150 | def __init__(self, shell): |
|
150 | def __init__(self, shell): | |
151 | self.shell = shell |
|
151 | self.shell = shell | |
152 | self._nested_level = 0 |
|
152 | self._nested_level = 0 | |
153 |
|
153 | |||
154 | def __enter__(self): |
|
154 | def __enter__(self): | |
155 | if self._nested_level == 0: |
|
155 | if self._nested_level == 0: | |
156 | try: |
|
156 | try: | |
157 | self.orig_length = self.current_length() |
|
157 | self.orig_length = self.current_length() | |
158 | self.readline_tail = self.get_readline_tail() |
|
158 | self.readline_tail = self.get_readline_tail() | |
159 | except (AttributeError, IndexError): # Can fail with pyreadline |
|
159 | except (AttributeError, IndexError): # Can fail with pyreadline | |
160 | self.orig_length, self.readline_tail = 999999, [] |
|
160 | self.orig_length, self.readline_tail = 999999, [] | |
161 | self._nested_level += 1 |
|
161 | self._nested_level += 1 | |
162 |
|
162 | |||
163 | def __exit__(self, type, value, traceback): |
|
163 | def __exit__(self, type, value, traceback): | |
164 | self._nested_level -= 1 |
|
164 | self._nested_level -= 1 | |
165 | if self._nested_level == 0: |
|
165 | if self._nested_level == 0: | |
166 | # Try clipping the end if it's got longer |
|
166 | # Try clipping the end if it's got longer | |
167 | try: |
|
167 | try: | |
168 | e = self.current_length() - self.orig_length |
|
168 | e = self.current_length() - self.orig_length | |
169 | if e > 0: |
|
169 | if e > 0: | |
170 | for _ in range(e): |
|
170 | for _ in range(e): | |
171 | self.shell.readline.remove_history_item(self.orig_length) |
|
171 | self.shell.readline.remove_history_item(self.orig_length) | |
172 |
|
172 | |||
173 | # If it still doesn't match, just reload readline history. |
|
173 | # If it still doesn't match, just reload readline history. | |
174 | if self.current_length() != self.orig_length \ |
|
174 | if self.current_length() != self.orig_length \ | |
175 | or self.get_readline_tail() != self.readline_tail: |
|
175 | or self.get_readline_tail() != self.readline_tail: | |
176 | self.shell.refill_readline_hist() |
|
176 | self.shell.refill_readline_hist() | |
177 | except (AttributeError, IndexError): |
|
177 | except (AttributeError, IndexError): | |
178 | pass |
|
178 | pass | |
179 | # Returning False will cause exceptions to propagate |
|
179 | # Returning False will cause exceptions to propagate | |
180 | return False |
|
180 | return False | |
181 |
|
181 | |||
182 | def current_length(self): |
|
182 | def current_length(self): | |
183 | return self.shell.readline.get_current_history_length() |
|
183 | return self.shell.readline.get_current_history_length() | |
184 |
|
184 | |||
185 | def get_readline_tail(self, n=10): |
|
185 | def get_readline_tail(self, n=10): | |
186 | """Get the last n items in readline history.""" |
|
186 | """Get the last n items in readline history.""" | |
187 | end = self.shell.readline.get_current_history_length() + 1 |
|
187 | end = self.shell.readline.get_current_history_length() + 1 | |
188 | start = max(end-n, 1) |
|
188 | start = max(end-n, 1) | |
189 | ghi = self.shell.readline.get_history_item |
|
189 | ghi = self.shell.readline.get_history_item | |
190 | return [ghi(x) for x in range(start, end)] |
|
190 | return [ghi(x) for x in range(start, end)] | |
191 |
|
191 | |||
192 | #----------------------------------------------------------------------------- |
|
192 | #----------------------------------------------------------------------------- | |
193 | # Main IPython class |
|
193 | # Main IPython class | |
194 | #----------------------------------------------------------------------------- |
|
194 | #----------------------------------------------------------------------------- | |
195 |
|
195 | |||
196 | class InteractiveShell(SingletonConfigurable): |
|
196 | class InteractiveShell(SingletonConfigurable): | |
197 | """An enhanced, interactive shell for Python.""" |
|
197 | """An enhanced, interactive shell for Python.""" | |
198 |
|
198 | |||
199 | _instance = None |
|
199 | _instance = None | |
200 |
|
200 | |||
201 | autocall = Enum((0,1,2), default_value=0, config=True, help= |
|
201 | autocall = Enum((0,1,2), default_value=0, config=True, help= | |
202 | """ |
|
202 | """ | |
203 | Make IPython automatically call any callable object even if you didn't |
|
203 | Make IPython automatically call any callable object even if you didn't | |
204 | type explicit parentheses. For example, 'str 43' becomes 'str(43)' |
|
204 | type explicit parentheses. For example, 'str 43' becomes 'str(43)' | |
205 | automatically. The value can be '0' to disable the feature, '1' for |
|
205 | automatically. The value can be '0' to disable the feature, '1' for | |
206 | 'smart' autocall, where it is not applied if there are no more |
|
206 | 'smart' autocall, where it is not applied if there are no more | |
207 | arguments on the line, and '2' for 'full' autocall, where all callable |
|
207 | arguments on the line, and '2' for 'full' autocall, where all callable | |
208 | objects are automatically called (even if no arguments are present). |
|
208 | objects are automatically called (even if no arguments are present). | |
209 | """ |
|
209 | """ | |
210 | ) |
|
210 | ) | |
211 | # TODO: remove all autoindent logic and put into frontends. |
|
211 | # TODO: remove all autoindent logic and put into frontends. | |
212 | # We can't do this yet because even runlines uses the autoindent. |
|
212 | # We can't do this yet because even runlines uses the autoindent. | |
213 | autoindent = CBool(True, config=True, help= |
|
213 | autoindent = CBool(True, config=True, help= | |
214 | """ |
|
214 | """ | |
215 | Autoindent IPython code entered interactively. |
|
215 | Autoindent IPython code entered interactively. | |
216 | """ |
|
216 | """ | |
217 | ) |
|
217 | ) | |
218 | automagic = CBool(True, config=True, help= |
|
218 | automagic = CBool(True, config=True, help= | |
219 | """ |
|
219 | """ | |
220 | Enable magic commands to be called without the leading %. |
|
220 | Enable magic commands to be called without the leading %. | |
221 | """ |
|
221 | """ | |
222 | ) |
|
222 | ) | |
223 | cache_size = Integer(1000, config=True, help= |
|
223 | cache_size = Integer(1000, config=True, help= | |
224 | """ |
|
224 | """ | |
225 | Set the size of the output cache. The default is 1000, you can |
|
225 | Set the size of the output cache. The default is 1000, you can | |
226 | change it permanently in your config file. Setting it to 0 completely |
|
226 | change it permanently in your config file. Setting it to 0 completely | |
227 | disables the caching system, and the minimum value accepted is 20 (if |
|
227 | disables the caching system, and the minimum value accepted is 20 (if | |
228 | you provide a value less than 20, it is reset to 0 and a warning is |
|
228 | you provide a value less than 20, it is reset to 0 and a warning is | |
229 | issued). This limit is defined because otherwise you'll spend more |
|
229 | issued). This limit is defined because otherwise you'll spend more | |
230 | time re-flushing a too small cache than working |
|
230 | time re-flushing a too small cache than working | |
231 | """ |
|
231 | """ | |
232 | ) |
|
232 | ) | |
233 | color_info = CBool(True, config=True, help= |
|
233 | color_info = CBool(True, config=True, help= | |
234 | """ |
|
234 | """ | |
235 | Use colors for displaying information about objects. Because this |
|
235 | Use colors for displaying information about objects. Because this | |
236 | information is passed through a pager (like 'less'), and some pagers |
|
236 | information is passed through a pager (like 'less'), and some pagers | |
237 | get confused with color codes, this capability can be turned off. |
|
237 | get confused with color codes, this capability can be turned off. | |
238 | """ |
|
238 | """ | |
239 | ) |
|
239 | ) | |
240 | colors = CaselessStrEnum(('NoColor','LightBG','Linux'), |
|
240 | colors = CaselessStrEnum(('NoColor','LightBG','Linux'), | |
241 | default_value=get_default_colors(), config=True, |
|
241 | default_value=get_default_colors(), config=True, | |
242 | help="Set the color scheme (NoColor, Linux, or LightBG)." |
|
242 | help="Set the color scheme (NoColor, Linux, or LightBG)." | |
243 | ) |
|
243 | ) | |
244 | colors_force = CBool(False, help= |
|
244 | colors_force = CBool(False, help= | |
245 | """ |
|
245 | """ | |
246 | Force use of ANSI color codes, regardless of OS and readline |
|
246 | Force use of ANSI color codes, regardless of OS and readline | |
247 | availability. |
|
247 | availability. | |
248 | """ |
|
248 | """ | |
249 | # FIXME: This is essentially a hack to allow ZMQShell to show colors |
|
249 | # FIXME: This is essentially a hack to allow ZMQShell to show colors | |
250 | # without readline on Win32. When the ZMQ formatting system is |
|
250 | # without readline on Win32. When the ZMQ formatting system is | |
251 | # refactored, this should be removed. |
|
251 | # refactored, this should be removed. | |
252 | ) |
|
252 | ) | |
253 | debug = CBool(False, config=True) |
|
253 | debug = CBool(False, config=True) | |
254 | deep_reload = CBool(False, config=True, help= |
|
254 | deep_reload = CBool(False, config=True, help= | |
255 | """ |
|
255 | """ | |
256 | Enable deep (recursive) reloading by default. IPython can use the |
|
256 | Enable deep (recursive) reloading by default. IPython can use the | |
257 | deep_reload module which reloads changes in modules recursively (it |
|
257 | deep_reload module which reloads changes in modules recursively (it | |
258 | replaces the reload() function, so you don't need to change anything to |
|
258 | replaces the reload() function, so you don't need to change anything to | |
259 | use it). deep_reload() forces a full reload of modules whose code may |
|
259 | use it). deep_reload() forces a full reload of modules whose code may | |
260 | have changed, which the default reload() function does not. When |
|
260 | have changed, which the default reload() function does not. When | |
261 | deep_reload is off, IPython will use the normal reload(), but |
|
261 | deep_reload is off, IPython will use the normal reload(), but | |
262 | deep_reload will still be available as dreload(). |
|
262 | deep_reload will still be available as dreload(). | |
263 | """ |
|
263 | """ | |
264 | ) |
|
264 | ) | |
265 | disable_failing_post_execute = CBool(False, config=True, |
|
265 | disable_failing_post_execute = CBool(False, config=True, | |
266 | help="Don't call post-execute functions that have failed in the past.""" |
|
266 | help="Don't call post-execute functions that have failed in the past.""" | |
267 | ) |
|
267 | ) | |
268 | display_formatter = Instance(DisplayFormatter) |
|
268 | display_formatter = Instance(DisplayFormatter) | |
269 | displayhook_class = Type(DisplayHook) |
|
269 | displayhook_class = Type(DisplayHook) | |
270 | display_pub_class = Type(DisplayPublisher) |
|
270 | display_pub_class = Type(DisplayPublisher) | |
271 |
|
271 | |||
272 | exit_now = CBool(False) |
|
272 | exit_now = CBool(False) | |
273 | exiter = Instance(ExitAutocall) |
|
273 | exiter = Instance(ExitAutocall) | |
274 | def _exiter_default(self): |
|
274 | def _exiter_default(self): | |
275 | return ExitAutocall(self) |
|
275 | return ExitAutocall(self) | |
276 | # Monotonically increasing execution counter |
|
276 | # Monotonically increasing execution counter | |
277 | execution_count = Integer(1) |
|
277 | execution_count = Integer(1) | |
278 | filename = Unicode("<ipython console>") |
|
278 | filename = Unicode("<ipython console>") | |
279 | ipython_dir= Unicode('', config=True) # Set to get_ipython_dir() in __init__ |
|
279 | ipython_dir= Unicode('', config=True) # Set to get_ipython_dir() in __init__ | |
280 |
|
280 | |||
281 | # Input splitter, to split entire cells of input into either individual |
|
281 | # Input splitter, to split entire cells of input into either individual | |
282 | # interactive statements or whole blocks. |
|
282 | # interactive statements or whole blocks. | |
283 | input_splitter = Instance('IPython.core.inputsplitter.IPythonInputSplitter', |
|
283 | input_splitter = Instance('IPython.core.inputsplitter.IPythonInputSplitter', | |
284 | (), {}) |
|
284 | (), {}) | |
285 | logstart = CBool(False, config=True, help= |
|
285 | logstart = CBool(False, config=True, help= | |
286 | """ |
|
286 | """ | |
287 | Start logging to the default log file. |
|
287 | Start logging to the default log file. | |
288 | """ |
|
288 | """ | |
289 | ) |
|
289 | ) | |
290 | logfile = Unicode('', config=True, help= |
|
290 | logfile = Unicode('', config=True, help= | |
291 | """ |
|
291 | """ | |
292 | The name of the logfile to use. |
|
292 | The name of the logfile to use. | |
293 | """ |
|
293 | """ | |
294 | ) |
|
294 | ) | |
295 | logappend = Unicode('', config=True, help= |
|
295 | logappend = Unicode('', config=True, help= | |
296 | """ |
|
296 | """ | |
297 | Start logging to the given file in append mode. |
|
297 | Start logging to the given file in append mode. | |
298 | """ |
|
298 | """ | |
299 | ) |
|
299 | ) | |
300 | object_info_string_level = Enum((0,1,2), default_value=0, |
|
300 | object_info_string_level = Enum((0,1,2), default_value=0, | |
301 | config=True) |
|
301 | config=True) | |
302 | pdb = CBool(False, config=True, help= |
|
302 | pdb = CBool(False, config=True, help= | |
303 | """ |
|
303 | """ | |
304 | Automatically call the pdb debugger after every exception. |
|
304 | Automatically call the pdb debugger after every exception. | |
305 | """ |
|
305 | """ | |
306 | ) |
|
306 | ) | |
307 | multiline_history = CBool(sys.platform != 'win32', config=True, |
|
307 | multiline_history = CBool(sys.platform != 'win32', config=True, | |
308 | help="Save multi-line entries as one entry in readline history" |
|
308 | help="Save multi-line entries as one entry in readline history" | |
309 | ) |
|
309 | ) | |
310 |
|
310 | |||
311 | # deprecated prompt traits: |
|
311 | # deprecated prompt traits: | |
312 |
|
312 | |||
313 | prompt_in1 = Unicode('In [\\#]: ', config=True, |
|
313 | prompt_in1 = Unicode('In [\\#]: ', config=True, | |
314 | help="Deprecated, use PromptManager.in_template") |
|
314 | help="Deprecated, use PromptManager.in_template") | |
315 | prompt_in2 = Unicode(' .\\D.: ', config=True, |
|
315 | prompt_in2 = Unicode(' .\\D.: ', config=True, | |
316 | help="Deprecated, use PromptManager.in2_template") |
|
316 | help="Deprecated, use PromptManager.in2_template") | |
317 | prompt_out = Unicode('Out[\\#]: ', config=True, |
|
317 | prompt_out = Unicode('Out[\\#]: ', config=True, | |
318 | help="Deprecated, use PromptManager.out_template") |
|
318 | help="Deprecated, use PromptManager.out_template") | |
319 | prompts_pad_left = CBool(True, config=True, |
|
319 | prompts_pad_left = CBool(True, config=True, | |
320 | help="Deprecated, use PromptManager.justify") |
|
320 | help="Deprecated, use PromptManager.justify") | |
321 |
|
321 | |||
322 | def _prompt_trait_changed(self, name, old, new): |
|
322 | def _prompt_trait_changed(self, name, old, new): | |
323 | table = { |
|
323 | table = { | |
324 | 'prompt_in1' : 'in_template', |
|
324 | 'prompt_in1' : 'in_template', | |
325 | 'prompt_in2' : 'in2_template', |
|
325 | 'prompt_in2' : 'in2_template', | |
326 | 'prompt_out' : 'out_template', |
|
326 | 'prompt_out' : 'out_template', | |
327 | 'prompts_pad_left' : 'justify', |
|
327 | 'prompts_pad_left' : 'justify', | |
328 | } |
|
328 | } | |
329 | warn("InteractiveShell.{name} is deprecated, use PromptManager.{newname}\n".format( |
|
329 | warn("InteractiveShell.{name} is deprecated, use PromptManager.{newname}\n".format( | |
330 | name=name, newname=table[name]) |
|
330 | name=name, newname=table[name]) | |
331 | ) |
|
331 | ) | |
332 | # protect against weird cases where self.config may not exist: |
|
332 | # protect against weird cases where self.config may not exist: | |
333 | if self.config is not None: |
|
333 | if self.config is not None: | |
334 | # propagate to corresponding PromptManager trait |
|
334 | # propagate to corresponding PromptManager trait | |
335 | setattr(self.config.PromptManager, table[name], new) |
|
335 | setattr(self.config.PromptManager, table[name], new) | |
336 |
|
336 | |||
337 | _prompt_in1_changed = _prompt_trait_changed |
|
337 | _prompt_in1_changed = _prompt_trait_changed | |
338 | _prompt_in2_changed = _prompt_trait_changed |
|
338 | _prompt_in2_changed = _prompt_trait_changed | |
339 | _prompt_out_changed = _prompt_trait_changed |
|
339 | _prompt_out_changed = _prompt_trait_changed | |
340 | _prompt_pad_left_changed = _prompt_trait_changed |
|
340 | _prompt_pad_left_changed = _prompt_trait_changed | |
341 |
|
341 | |||
342 | show_rewritten_input = CBool(True, config=True, |
|
342 | show_rewritten_input = CBool(True, config=True, | |
343 | help="Show rewritten input, e.g. for autocall." |
|
343 | help="Show rewritten input, e.g. for autocall." | |
344 | ) |
|
344 | ) | |
345 |
|
345 | |||
346 | quiet = CBool(False, config=True) |
|
346 | quiet = CBool(False, config=True) | |
347 |
|
347 | |||
348 | history_length = Integer(10000, config=True) |
|
348 | history_length = Integer(10000, config=True) | |
349 |
|
349 | |||
350 | # The readline stuff will eventually be moved to the terminal subclass |
|
350 | # The readline stuff will eventually be moved to the terminal subclass | |
351 | # but for now, we can't do that as readline is welded in everywhere. |
|
351 | # but for now, we can't do that as readline is welded in everywhere. | |
352 | readline_use = CBool(True, config=True) |
|
352 | readline_use = CBool(True, config=True) | |
353 | readline_remove_delims = Unicode('-/~', config=True) |
|
353 | readline_remove_delims = Unicode('-/~', config=True) | |
354 | # don't use \M- bindings by default, because they |
|
354 | # don't use \M- bindings by default, because they | |
355 | # conflict with 8-bit encodings. See gh-58,gh-88 |
|
355 | # conflict with 8-bit encodings. See gh-58,gh-88 | |
356 | readline_parse_and_bind = List([ |
|
356 | readline_parse_and_bind = List([ | |
357 | 'tab: complete', |
|
357 | 'tab: complete', | |
358 | '"\C-l": clear-screen', |
|
358 | '"\C-l": clear-screen', | |
359 | 'set show-all-if-ambiguous on', |
|
359 | 'set show-all-if-ambiguous on', | |
360 | '"\C-o": tab-insert', |
|
360 | '"\C-o": tab-insert', | |
361 | '"\C-r": reverse-search-history', |
|
361 | '"\C-r": reverse-search-history', | |
362 | '"\C-s": forward-search-history', |
|
362 | '"\C-s": forward-search-history', | |
363 | '"\C-p": history-search-backward', |
|
363 | '"\C-p": history-search-backward', | |
364 | '"\C-n": history-search-forward', |
|
364 | '"\C-n": history-search-forward', | |
365 | '"\e[A": history-search-backward', |
|
365 | '"\e[A": history-search-backward', | |
366 | '"\e[B": history-search-forward', |
|
366 | '"\e[B": history-search-forward', | |
367 | '"\C-k": kill-line', |
|
367 | '"\C-k": kill-line', | |
368 | '"\C-u": unix-line-discard', |
|
368 | '"\C-u": unix-line-discard', | |
369 | ], allow_none=False, config=True) |
|
369 | ], allow_none=False, config=True) | |
370 |
|
370 | |||
371 | # TODO: this part of prompt management should be moved to the frontends. |
|
371 | # TODO: this part of prompt management should be moved to the frontends. | |
372 | # Use custom TraitTypes that convert '0'->'' and '\\n'->'\n' |
|
372 | # Use custom TraitTypes that convert '0'->'' and '\\n'->'\n' | |
373 | separate_in = SeparateUnicode('\n', config=True) |
|
373 | separate_in = SeparateUnicode('\n', config=True) | |
374 | separate_out = SeparateUnicode('', config=True) |
|
374 | separate_out = SeparateUnicode('', config=True) | |
375 | separate_out2 = SeparateUnicode('', config=True) |
|
375 | separate_out2 = SeparateUnicode('', config=True) | |
376 | wildcards_case_sensitive = CBool(True, config=True) |
|
376 | wildcards_case_sensitive = CBool(True, config=True) | |
377 | xmode = CaselessStrEnum(('Context','Plain', 'Verbose'), |
|
377 | xmode = CaselessStrEnum(('Context','Plain', 'Verbose'), | |
378 | default_value='Context', config=True) |
|
378 | default_value='Context', config=True) | |
379 |
|
379 | |||
380 | # Subcomponents of InteractiveShell |
|
380 | # Subcomponents of InteractiveShell | |
381 | alias_manager = Instance('IPython.core.alias.AliasManager') |
|
381 | alias_manager = Instance('IPython.core.alias.AliasManager') | |
382 | prefilter_manager = Instance('IPython.core.prefilter.PrefilterManager') |
|
382 | prefilter_manager = Instance('IPython.core.prefilter.PrefilterManager') | |
383 | builtin_trap = Instance('IPython.core.builtin_trap.BuiltinTrap') |
|
383 | builtin_trap = Instance('IPython.core.builtin_trap.BuiltinTrap') | |
384 | display_trap = Instance('IPython.core.display_trap.DisplayTrap') |
|
384 | display_trap = Instance('IPython.core.display_trap.DisplayTrap') | |
385 | extension_manager = Instance('IPython.core.extensions.ExtensionManager') |
|
385 | extension_manager = Instance('IPython.core.extensions.ExtensionManager') | |
386 | plugin_manager = Instance('IPython.core.plugin.PluginManager') |
|
386 | plugin_manager = Instance('IPython.core.plugin.PluginManager') | |
387 | payload_manager = Instance('IPython.core.payload.PayloadManager') |
|
387 | payload_manager = Instance('IPython.core.payload.PayloadManager') | |
388 | history_manager = Instance('IPython.core.history.HistoryManager') |
|
388 | history_manager = Instance('IPython.core.history.HistoryManager') | |
389 | magics_manager = Instance('IPython.core.magic.MagicsManager') |
|
389 | magics_manager = Instance('IPython.core.magic.MagicsManager') | |
390 |
|
390 | |||
391 | profile_dir = Instance('IPython.core.application.ProfileDir') |
|
391 | profile_dir = Instance('IPython.core.application.ProfileDir') | |
392 | @property |
|
392 | @property | |
393 | def profile(self): |
|
393 | def profile(self): | |
394 | if self.profile_dir is not None: |
|
394 | if self.profile_dir is not None: | |
395 | name = os.path.basename(self.profile_dir.location) |
|
395 | name = os.path.basename(self.profile_dir.location) | |
396 | return name.replace('profile_','') |
|
396 | return name.replace('profile_','') | |
397 |
|
397 | |||
398 |
|
398 | |||
399 | # Private interface |
|
399 | # Private interface | |
400 | _post_execute = Instance(dict) |
|
400 | _post_execute = Instance(dict) | |
401 |
|
401 | |||
402 | def __init__(self, config=None, ipython_dir=None, profile_dir=None, |
|
402 | def __init__(self, config=None, ipython_dir=None, profile_dir=None, | |
403 | user_module=None, user_ns=None, |
|
403 | user_module=None, user_ns=None, | |
404 | custom_exceptions=((), None)): |
|
404 | custom_exceptions=((), None)): | |
405 |
|
405 | |||
406 | # This is where traits with a config_key argument are updated |
|
406 | # This is where traits with a config_key argument are updated | |
407 | # from the values on config. |
|
407 | # from the values on config. | |
408 | super(InteractiveShell, self).__init__(config=config) |
|
408 | super(InteractiveShell, self).__init__(config=config) | |
409 | self.configurables = [self] |
|
409 | self.configurables = [self] | |
410 |
|
410 | |||
411 | # These are relatively independent and stateless |
|
411 | # These are relatively independent and stateless | |
412 | self.init_ipython_dir(ipython_dir) |
|
412 | self.init_ipython_dir(ipython_dir) | |
413 | self.init_profile_dir(profile_dir) |
|
413 | self.init_profile_dir(profile_dir) | |
414 | self.init_instance_attrs() |
|
414 | self.init_instance_attrs() | |
415 | self.init_environment() |
|
415 | self.init_environment() | |
416 |
|
416 | |||
417 | # Check if we're in a virtualenv, and set up sys.path. |
|
417 | # Check if we're in a virtualenv, and set up sys.path. | |
418 | self.init_virtualenv() |
|
418 | self.init_virtualenv() | |
419 |
|
419 | |||
420 | # Create namespaces (user_ns, user_global_ns, etc.) |
|
420 | # Create namespaces (user_ns, user_global_ns, etc.) | |
421 | self.init_create_namespaces(user_module, user_ns) |
|
421 | self.init_create_namespaces(user_module, user_ns) | |
422 | # This has to be done after init_create_namespaces because it uses |
|
422 | # This has to be done after init_create_namespaces because it uses | |
423 | # something in self.user_ns, but before init_sys_modules, which |
|
423 | # something in self.user_ns, but before init_sys_modules, which | |
424 | # is the first thing to modify sys. |
|
424 | # is the first thing to modify sys. | |
425 | # TODO: When we override sys.stdout and sys.stderr before this class |
|
425 | # TODO: When we override sys.stdout and sys.stderr before this class | |
426 | # is created, we are saving the overridden ones here. Not sure if this |
|
426 | # is created, we are saving the overridden ones here. Not sure if this | |
427 | # is what we want to do. |
|
427 | # is what we want to do. | |
428 | self.save_sys_module_state() |
|
428 | self.save_sys_module_state() | |
429 | self.init_sys_modules() |
|
429 | self.init_sys_modules() | |
430 |
|
430 | |||
431 | # While we're trying to have each part of the code directly access what |
|
431 | # While we're trying to have each part of the code directly access what | |
432 | # it needs without keeping redundant references to objects, we have too |
|
432 | # it needs without keeping redundant references to objects, we have too | |
433 | # much legacy code that expects ip.db to exist. |
|
433 | # much legacy code that expects ip.db to exist. | |
434 | self.db = PickleShareDB(os.path.join(self.profile_dir.location, 'db')) |
|
434 | self.db = PickleShareDB(os.path.join(self.profile_dir.location, 'db')) | |
435 |
|
435 | |||
436 | self.init_history() |
|
436 | self.init_history() | |
437 | self.init_encoding() |
|
437 | self.init_encoding() | |
438 | self.init_prefilter() |
|
438 | self.init_prefilter() | |
439 |
|
439 | |||
440 | self.init_syntax_highlighting() |
|
440 | self.init_syntax_highlighting() | |
441 | self.init_hooks() |
|
441 | self.init_hooks() | |
442 | self.init_pushd_popd_magic() |
|
442 | self.init_pushd_popd_magic() | |
443 | # self.init_traceback_handlers use to be here, but we moved it below |
|
443 | # self.init_traceback_handlers use to be here, but we moved it below | |
444 | # because it and init_io have to come after init_readline. |
|
444 | # because it and init_io have to come after init_readline. | |
445 | self.init_user_ns() |
|
445 | self.init_user_ns() | |
446 | self.init_logger() |
|
446 | self.init_logger() | |
447 | self.init_alias() |
|
447 | self.init_alias() | |
448 | self.init_builtins() |
|
448 | self.init_builtins() | |
449 |
|
449 | |||
450 | # pre_config_initialization |
|
450 | # pre_config_initialization | |
451 |
|
451 | |||
452 | # The next section should contain everything that was in ipmaker. |
|
452 | # The next section should contain everything that was in ipmaker. | |
453 | self.init_logstart() |
|
453 | self.init_logstart() | |
454 |
|
454 | |||
455 | # The following was in post_config_initialization |
|
455 | # The following was in post_config_initialization | |
456 | self.init_inspector() |
|
456 | self.init_inspector() | |
457 | # init_readline() must come before init_io(), because init_io uses |
|
457 | # init_readline() must come before init_io(), because init_io uses | |
458 | # readline related things. |
|
458 | # readline related things. | |
459 | self.init_readline() |
|
459 | self.init_readline() | |
460 | # We save this here in case user code replaces raw_input, but it needs |
|
460 | # We save this here in case user code replaces raw_input, but it needs | |
461 | # to be after init_readline(), because PyPy's readline works by replacing |
|
461 | # to be after init_readline(), because PyPy's readline works by replacing | |
462 | # raw_input. |
|
462 | # raw_input. | |
463 | if py3compat.PY3: |
|
463 | if py3compat.PY3: | |
464 | self.raw_input_original = input |
|
464 | self.raw_input_original = input | |
465 | else: |
|
465 | else: | |
466 | self.raw_input_original = raw_input |
|
466 | self.raw_input_original = raw_input | |
467 | # init_completer must come after init_readline, because it needs to |
|
467 | # init_completer must come after init_readline, because it needs to | |
468 | # know whether readline is present or not system-wide to configure the |
|
468 | # know whether readline is present or not system-wide to configure the | |
469 | # completers, since the completion machinery can now operate |
|
469 | # completers, since the completion machinery can now operate | |
470 | # independently of readline (e.g. over the network) |
|
470 | # independently of readline (e.g. over the network) | |
471 | self.init_completer() |
|
471 | self.init_completer() | |
472 | # TODO: init_io() needs to happen before init_traceback handlers |
|
472 | # TODO: init_io() needs to happen before init_traceback handlers | |
473 | # because the traceback handlers hardcode the stdout/stderr streams. |
|
473 | # because the traceback handlers hardcode the stdout/stderr streams. | |
474 | # This logic in in debugger.Pdb and should eventually be changed. |
|
474 | # This logic in in debugger.Pdb and should eventually be changed. | |
475 | self.init_io() |
|
475 | self.init_io() | |
476 | self.init_traceback_handlers(custom_exceptions) |
|
476 | self.init_traceback_handlers(custom_exceptions) | |
477 | self.init_prompts() |
|
477 | self.init_prompts() | |
478 | self.init_display_formatter() |
|
478 | self.init_display_formatter() | |
479 | self.init_display_pub() |
|
479 | self.init_display_pub() | |
480 | self.init_displayhook() |
|
480 | self.init_displayhook() | |
481 | self.init_reload_doctest() |
|
481 | self.init_reload_doctest() | |
482 | self.init_magics() |
|
482 | self.init_magics() | |
483 | self.init_pdb() |
|
483 | self.init_pdb() | |
484 | self.init_extension_manager() |
|
484 | self.init_extension_manager() | |
485 | self.init_plugin_manager() |
|
485 | self.init_plugin_manager() | |
486 | self.init_payload() |
|
486 | self.init_payload() | |
487 | self.hooks.late_startup_hook() |
|
487 | self.hooks.late_startup_hook() | |
488 | atexit.register(self.atexit_operations) |
|
488 | atexit.register(self.atexit_operations) | |
489 |
|
489 | |||
490 | def get_ipython(self): |
|
490 | def get_ipython(self): | |
491 | """Return the currently running IPython instance.""" |
|
491 | """Return the currently running IPython instance.""" | |
492 | return self |
|
492 | return self | |
493 |
|
493 | |||
494 | #------------------------------------------------------------------------- |
|
494 | #------------------------------------------------------------------------- | |
495 | # Trait changed handlers |
|
495 | # Trait changed handlers | |
496 | #------------------------------------------------------------------------- |
|
496 | #------------------------------------------------------------------------- | |
497 |
|
497 | |||
498 | def _ipython_dir_changed(self, name, new): |
|
498 | def _ipython_dir_changed(self, name, new): | |
499 | if not os.path.isdir(new): |
|
499 | if not os.path.isdir(new): | |
500 | os.makedirs(new, mode = 0777) |
|
500 | os.makedirs(new, mode = 0777) | |
501 |
|
501 | |||
502 | def set_autoindent(self,value=None): |
|
502 | def set_autoindent(self,value=None): | |
503 | """Set the autoindent flag, checking for readline support. |
|
503 | """Set the autoindent flag, checking for readline support. | |
504 |
|
504 | |||
505 | If called with no arguments, it acts as a toggle.""" |
|
505 | If called with no arguments, it acts as a toggle.""" | |
506 |
|
506 | |||
507 | if value != 0 and not self.has_readline: |
|
507 | if value != 0 and not self.has_readline: | |
508 | if os.name == 'posix': |
|
508 | if os.name == 'posix': | |
509 | warn("The auto-indent feature requires the readline library") |
|
509 | warn("The auto-indent feature requires the readline library") | |
510 | self.autoindent = 0 |
|
510 | self.autoindent = 0 | |
511 | return |
|
511 | return | |
512 | if value is None: |
|
512 | if value is None: | |
513 | self.autoindent = not self.autoindent |
|
513 | self.autoindent = not self.autoindent | |
514 | else: |
|
514 | else: | |
515 | self.autoindent = value |
|
515 | self.autoindent = value | |
516 |
|
516 | |||
517 | #------------------------------------------------------------------------- |
|
517 | #------------------------------------------------------------------------- | |
518 | # init_* methods called by __init__ |
|
518 | # init_* methods called by __init__ | |
519 | #------------------------------------------------------------------------- |
|
519 | #------------------------------------------------------------------------- | |
520 |
|
520 | |||
521 | def init_ipython_dir(self, ipython_dir): |
|
521 | def init_ipython_dir(self, ipython_dir): | |
522 | if ipython_dir is not None: |
|
522 | if ipython_dir is not None: | |
523 | self.ipython_dir = ipython_dir |
|
523 | self.ipython_dir = ipython_dir | |
524 | return |
|
524 | return | |
525 |
|
525 | |||
526 | self.ipython_dir = get_ipython_dir() |
|
526 | self.ipython_dir = get_ipython_dir() | |
527 |
|
527 | |||
528 | def init_profile_dir(self, profile_dir): |
|
528 | def init_profile_dir(self, profile_dir): | |
529 | if profile_dir is not None: |
|
529 | if profile_dir is not None: | |
530 | self.profile_dir = profile_dir |
|
530 | self.profile_dir = profile_dir | |
531 | return |
|
531 | return | |
532 | self.profile_dir =\ |
|
532 | self.profile_dir =\ | |
533 | ProfileDir.create_profile_dir_by_name(self.ipython_dir, 'default') |
|
533 | ProfileDir.create_profile_dir_by_name(self.ipython_dir, 'default') | |
534 |
|
534 | |||
535 | def init_instance_attrs(self): |
|
535 | def init_instance_attrs(self): | |
536 | self.more = False |
|
536 | self.more = False | |
537 |
|
537 | |||
538 | # command compiler |
|
538 | # command compiler | |
539 | self.compile = CachingCompiler() |
|
539 | self.compile = CachingCompiler() | |
540 |
|
540 | |||
541 | # Make an empty namespace, which extension writers can rely on both |
|
541 | # Make an empty namespace, which extension writers can rely on both | |
542 | # existing and NEVER being used by ipython itself. This gives them a |
|
542 | # existing and NEVER being used by ipython itself. This gives them a | |
543 | # convenient location for storing additional information and state |
|
543 | # convenient location for storing additional information and state | |
544 | # their extensions may require, without fear of collisions with other |
|
544 | # their extensions may require, without fear of collisions with other | |
545 | # ipython names that may develop later. |
|
545 | # ipython names that may develop later. | |
546 | self.meta = Struct() |
|
546 | self.meta = Struct() | |
547 |
|
547 | |||
548 | # Temporary files used for various purposes. Deleted at exit. |
|
548 | # Temporary files used for various purposes. Deleted at exit. | |
549 | self.tempfiles = [] |
|
549 | self.tempfiles = [] | |
550 |
|
550 | |||
551 | # Keep track of readline usage (later set by init_readline) |
|
551 | # Keep track of readline usage (later set by init_readline) | |
552 | self.has_readline = False |
|
552 | self.has_readline = False | |
553 |
|
553 | |||
554 | # keep track of where we started running (mainly for crash post-mortem) |
|
554 | # keep track of where we started running (mainly for crash post-mortem) | |
555 | # This is not being used anywhere currently. |
|
555 | # This is not being used anywhere currently. | |
556 | self.starting_dir = os.getcwdu() |
|
556 | self.starting_dir = os.getcwdu() | |
557 |
|
557 | |||
558 | # Indentation management |
|
558 | # Indentation management | |
559 | self.indent_current_nsp = 0 |
|
559 | self.indent_current_nsp = 0 | |
560 |
|
560 | |||
561 | # Dict to track post-execution functions that have been registered |
|
561 | # Dict to track post-execution functions that have been registered | |
562 | self._post_execute = {} |
|
562 | self._post_execute = {} | |
563 |
|
563 | |||
564 | def init_environment(self): |
|
564 | def init_environment(self): | |
565 | """Any changes we need to make to the user's environment.""" |
|
565 | """Any changes we need to make to the user's environment.""" | |
566 | pass |
|
566 | pass | |
567 |
|
567 | |||
568 | def init_encoding(self): |
|
568 | def init_encoding(self): | |
569 | # Get system encoding at startup time. Certain terminals (like Emacs |
|
569 | # Get system encoding at startup time. Certain terminals (like Emacs | |
570 | # under Win32 have it set to None, and we need to have a known valid |
|
570 | # under Win32 have it set to None, and we need to have a known valid | |
571 | # encoding to use in the raw_input() method |
|
571 | # encoding to use in the raw_input() method | |
572 | try: |
|
572 | try: | |
573 | self.stdin_encoding = sys.stdin.encoding or 'ascii' |
|
573 | self.stdin_encoding = sys.stdin.encoding or 'ascii' | |
574 | except AttributeError: |
|
574 | except AttributeError: | |
575 | self.stdin_encoding = 'ascii' |
|
575 | self.stdin_encoding = 'ascii' | |
576 |
|
576 | |||
577 | def init_syntax_highlighting(self): |
|
577 | def init_syntax_highlighting(self): | |
578 | # Python source parser/formatter for syntax highlighting |
|
578 | # Python source parser/formatter for syntax highlighting | |
579 | pyformat = PyColorize.Parser().format |
|
579 | pyformat = PyColorize.Parser().format | |
580 | self.pycolorize = lambda src: pyformat(src,'str',self.colors) |
|
580 | self.pycolorize = lambda src: pyformat(src,'str',self.colors) | |
581 |
|
581 | |||
582 | def init_pushd_popd_magic(self): |
|
582 | def init_pushd_popd_magic(self): | |
583 | # for pushd/popd management |
|
583 | # for pushd/popd management | |
584 | self.home_dir = get_home_dir() |
|
584 | self.home_dir = get_home_dir() | |
585 |
|
585 | |||
586 | self.dir_stack = [] |
|
586 | self.dir_stack = [] | |
587 |
|
587 | |||
588 | def init_logger(self): |
|
588 | def init_logger(self): | |
589 | self.logger = Logger(self.home_dir, logfname='ipython_log.py', |
|
589 | self.logger = Logger(self.home_dir, logfname='ipython_log.py', | |
590 | logmode='rotate') |
|
590 | logmode='rotate') | |
591 |
|
591 | |||
592 | def init_logstart(self): |
|
592 | def init_logstart(self): | |
593 | """Initialize logging in case it was requested at the command line. |
|
593 | """Initialize logging in case it was requested at the command line. | |
594 | """ |
|
594 | """ | |
595 | if self.logappend: |
|
595 | if self.logappend: | |
596 | self.magic('logstart %s append' % self.logappend) |
|
596 | self.magic('logstart %s append' % self.logappend) | |
597 | elif self.logfile: |
|
597 | elif self.logfile: | |
598 | self.magic('logstart %' % self.logfile) |
|
598 | self.magic('logstart %' % self.logfile) | |
599 | elif self.logstart: |
|
599 | elif self.logstart: | |
600 | self.magic('logstart') |
|
600 | self.magic('logstart') | |
601 |
|
601 | |||
602 | def init_builtins(self): |
|
602 | def init_builtins(self): | |
603 | # A single, static flag that we set to True. Its presence indicates |
|
603 | # A single, static flag that we set to True. Its presence indicates | |
604 | # that an IPython shell has been created, and we make no attempts at |
|
604 | # that an IPython shell has been created, and we make no attempts at | |
605 | # removing on exit or representing the existence of more than one |
|
605 | # removing on exit or representing the existence of more than one | |
606 | # IPython at a time. |
|
606 | # IPython at a time. | |
607 | builtin_mod.__dict__['__IPYTHON__'] = True |
|
607 | builtin_mod.__dict__['__IPYTHON__'] = True | |
608 |
|
608 | |||
609 | # In 0.11 we introduced '__IPYTHON__active' as an integer we'd try to |
|
609 | # In 0.11 we introduced '__IPYTHON__active' as an integer we'd try to | |
610 | # manage on enter/exit, but with all our shells it's virtually |
|
610 | # manage on enter/exit, but with all our shells it's virtually | |
611 | # impossible to get all the cases right. We're leaving the name in for |
|
611 | # impossible to get all the cases right. We're leaving the name in for | |
612 | # those who adapted their codes to check for this flag, but will |
|
612 | # those who adapted their codes to check for this flag, but will | |
613 | # eventually remove it after a few more releases. |
|
613 | # eventually remove it after a few more releases. | |
614 | builtin_mod.__dict__['__IPYTHON__active'] = \ |
|
614 | builtin_mod.__dict__['__IPYTHON__active'] = \ | |
615 | 'Deprecated, check for __IPYTHON__' |
|
615 | 'Deprecated, check for __IPYTHON__' | |
616 |
|
616 | |||
617 | self.builtin_trap = BuiltinTrap(shell=self) |
|
617 | self.builtin_trap = BuiltinTrap(shell=self) | |
618 |
|
618 | |||
619 | def init_inspector(self): |
|
619 | def init_inspector(self): | |
620 | # Object inspector |
|
620 | # Object inspector | |
621 | self.inspector = oinspect.Inspector(oinspect.InspectColors, |
|
621 | self.inspector = oinspect.Inspector(oinspect.InspectColors, | |
622 | PyColorize.ANSICodeColors, |
|
622 | PyColorize.ANSICodeColors, | |
623 | 'NoColor', |
|
623 | 'NoColor', | |
624 | self.object_info_string_level) |
|
624 | self.object_info_string_level) | |
625 |
|
625 | |||
626 | def init_io(self): |
|
626 | def init_io(self): | |
627 | # This will just use sys.stdout and sys.stderr. If you want to |
|
627 | # This will just use sys.stdout and sys.stderr. If you want to | |
628 | # override sys.stdout and sys.stderr themselves, you need to do that |
|
628 | # override sys.stdout and sys.stderr themselves, you need to do that | |
629 | # *before* instantiating this class, because io holds onto |
|
629 | # *before* instantiating this class, because io holds onto | |
630 | # references to the underlying streams. |
|
630 | # references to the underlying streams. | |
631 | if sys.platform == 'win32' and self.has_readline: |
|
631 | if sys.platform == 'win32' and self.has_readline: | |
632 | io.stdout = io.stderr = io.IOStream(self.readline._outputfile) |
|
632 | io.stdout = io.stderr = io.IOStream(self.readline._outputfile) | |
633 | else: |
|
633 | else: | |
634 | io.stdout = io.IOStream(sys.stdout) |
|
634 | io.stdout = io.IOStream(sys.stdout) | |
635 | io.stderr = io.IOStream(sys.stderr) |
|
635 | io.stderr = io.IOStream(sys.stderr) | |
636 |
|
636 | |||
637 | def init_prompts(self): |
|
637 | def init_prompts(self): | |
638 | self.prompt_manager = PromptManager(shell=self, config=self.config) |
|
638 | self.prompt_manager = PromptManager(shell=self, config=self.config) | |
639 | self.configurables.append(self.prompt_manager) |
|
639 | self.configurables.append(self.prompt_manager) | |
640 | # Set system prompts, so that scripts can decide if they are running |
|
640 | # Set system prompts, so that scripts can decide if they are running | |
641 | # interactively. |
|
641 | # interactively. | |
642 | sys.ps1 = 'In : ' |
|
642 | sys.ps1 = 'In : ' | |
643 | sys.ps2 = '...: ' |
|
643 | sys.ps2 = '...: ' | |
644 | sys.ps3 = 'Out: ' |
|
644 | sys.ps3 = 'Out: ' | |
645 |
|
645 | |||
646 | def init_display_formatter(self): |
|
646 | def init_display_formatter(self): | |
647 | self.display_formatter = DisplayFormatter(config=self.config) |
|
647 | self.display_formatter = DisplayFormatter(config=self.config) | |
648 | self.configurables.append(self.display_formatter) |
|
648 | self.configurables.append(self.display_formatter) | |
649 |
|
649 | |||
650 | def init_display_pub(self): |
|
650 | def init_display_pub(self): | |
651 | self.display_pub = self.display_pub_class(config=self.config) |
|
651 | self.display_pub = self.display_pub_class(config=self.config) | |
652 | self.configurables.append(self.display_pub) |
|
652 | self.configurables.append(self.display_pub) | |
653 |
|
653 | |||
654 | def init_displayhook(self): |
|
654 | def init_displayhook(self): | |
655 | # Initialize displayhook, set in/out prompts and printing system |
|
655 | # Initialize displayhook, set in/out prompts and printing system | |
656 | self.displayhook = self.displayhook_class( |
|
656 | self.displayhook = self.displayhook_class( | |
657 | config=self.config, |
|
657 | config=self.config, | |
658 | shell=self, |
|
658 | shell=self, | |
659 | cache_size=self.cache_size, |
|
659 | cache_size=self.cache_size, | |
660 | ) |
|
660 | ) | |
661 | self.configurables.append(self.displayhook) |
|
661 | self.configurables.append(self.displayhook) | |
662 | # This is a context manager that installs/revmoes the displayhook at |
|
662 | # This is a context manager that installs/revmoes the displayhook at | |
663 | # the appropriate time. |
|
663 | # the appropriate time. | |
664 | self.display_trap = DisplayTrap(hook=self.displayhook) |
|
664 | self.display_trap = DisplayTrap(hook=self.displayhook) | |
665 |
|
665 | |||
666 | def init_reload_doctest(self): |
|
666 | def init_reload_doctest(self): | |
667 | # Do a proper resetting of doctest, including the necessary displayhook |
|
667 | # Do a proper resetting of doctest, including the necessary displayhook | |
668 | # monkeypatching |
|
668 | # monkeypatching | |
669 | try: |
|
669 | try: | |
670 | doctest_reload() |
|
670 | doctest_reload() | |
671 | except ImportError: |
|
671 | except ImportError: | |
672 | warn("doctest module does not exist.") |
|
672 | warn("doctest module does not exist.") | |
673 |
|
673 | |||
674 | def init_virtualenv(self): |
|
674 | def init_virtualenv(self): | |
675 | """Add a virtualenv to sys.path so the user can import modules from it. |
|
675 | """Add a virtualenv to sys.path so the user can import modules from it. | |
676 | This isn't perfect: it doesn't use the Python interpreter with which the |
|
676 | This isn't perfect: it doesn't use the Python interpreter with which the | |
677 | virtualenv was built, and it ignores the --no-site-packages option. A |
|
677 | virtualenv was built, and it ignores the --no-site-packages option. A | |
678 | warning will appear suggesting the user installs IPython in the |
|
678 | warning will appear suggesting the user installs IPython in the | |
679 | virtualenv, but for many cases, it probably works well enough. |
|
679 | virtualenv, but for many cases, it probably works well enough. | |
680 |
|
680 | |||
681 | Adapted from code snippets online. |
|
681 | Adapted from code snippets online. | |
682 |
|
682 | |||
683 | http://blog.ufsoft.org/2009/1/29/ipython-and-virtualenv |
|
683 | http://blog.ufsoft.org/2009/1/29/ipython-and-virtualenv | |
684 | """ |
|
684 | """ | |
685 | if 'VIRTUAL_ENV' not in os.environ: |
|
685 | if 'VIRTUAL_ENV' not in os.environ: | |
686 | # Not in a virtualenv |
|
686 | # Not in a virtualenv | |
687 | return |
|
687 | return | |
688 |
|
688 | |||
689 | if sys.executable.startswith(os.environ['VIRTUAL_ENV']): |
|
689 | if sys.executable.startswith(os.environ['VIRTUAL_ENV']): | |
690 | # Running properly in the virtualenv, don't need to do anything |
|
690 | # Running properly in the virtualenv, don't need to do anything | |
691 | return |
|
691 | return | |
692 |
|
692 | |||
693 | warn("Attempting to work in a virtualenv. If you encounter problems, please " |
|
693 | warn("Attempting to work in a virtualenv. If you encounter problems, please " | |
694 | "install IPython inside the virtualenv.\n") |
|
694 | "install IPython inside the virtualenv.\n") | |
695 | if sys.platform == "win32": |
|
695 | if sys.platform == "win32": | |
696 | virtual_env = os.path.join(os.environ['VIRTUAL_ENV'], 'Lib', 'site-packages') |
|
696 | virtual_env = os.path.join(os.environ['VIRTUAL_ENV'], 'Lib', 'site-packages') | |
697 | else: |
|
697 | else: | |
698 | virtual_env = os.path.join(os.environ['VIRTUAL_ENV'], 'lib', |
|
698 | virtual_env = os.path.join(os.environ['VIRTUAL_ENV'], 'lib', | |
699 | 'python%d.%d' % sys.version_info[:2], 'site-packages') |
|
699 | 'python%d.%d' % sys.version_info[:2], 'site-packages') | |
700 |
|
700 | |||
701 | import site |
|
701 | import site | |
702 | sys.path.insert(0, virtual_env) |
|
702 | sys.path.insert(0, virtual_env) | |
703 | site.addsitedir(virtual_env) |
|
703 | site.addsitedir(virtual_env) | |
704 |
|
704 | |||
705 | #------------------------------------------------------------------------- |
|
705 | #------------------------------------------------------------------------- | |
706 | # Things related to injections into the sys module |
|
706 | # Things related to injections into the sys module | |
707 | #------------------------------------------------------------------------- |
|
707 | #------------------------------------------------------------------------- | |
708 |
|
708 | |||
709 | def save_sys_module_state(self): |
|
709 | def save_sys_module_state(self): | |
710 | """Save the state of hooks in the sys module. |
|
710 | """Save the state of hooks in the sys module. | |
711 |
|
711 | |||
712 | This has to be called after self.user_module is created. |
|
712 | This has to be called after self.user_module is created. | |
713 | """ |
|
713 | """ | |
714 | self._orig_sys_module_state = {} |
|
714 | self._orig_sys_module_state = {} | |
715 | self._orig_sys_module_state['stdin'] = sys.stdin |
|
715 | self._orig_sys_module_state['stdin'] = sys.stdin | |
716 | self._orig_sys_module_state['stdout'] = sys.stdout |
|
716 | self._orig_sys_module_state['stdout'] = sys.stdout | |
717 | self._orig_sys_module_state['stderr'] = sys.stderr |
|
717 | self._orig_sys_module_state['stderr'] = sys.stderr | |
718 | self._orig_sys_module_state['excepthook'] = sys.excepthook |
|
718 | self._orig_sys_module_state['excepthook'] = sys.excepthook | |
719 | self._orig_sys_modules_main_name = self.user_module.__name__ |
|
719 | self._orig_sys_modules_main_name = self.user_module.__name__ | |
720 | self._orig_sys_modules_main_mod = sys.modules.get(self.user_module.__name__) |
|
720 | self._orig_sys_modules_main_mod = sys.modules.get(self.user_module.__name__) | |
721 |
|
721 | |||
722 | def restore_sys_module_state(self): |
|
722 | def restore_sys_module_state(self): | |
723 | """Restore the state of the sys module.""" |
|
723 | """Restore the state of the sys module.""" | |
724 | try: |
|
724 | try: | |
725 | for k, v in self._orig_sys_module_state.iteritems(): |
|
725 | for k, v in self._orig_sys_module_state.iteritems(): | |
726 | setattr(sys, k, v) |
|
726 | setattr(sys, k, v) | |
727 | except AttributeError: |
|
727 | except AttributeError: | |
728 | pass |
|
728 | pass | |
729 | # Reset what what done in self.init_sys_modules |
|
729 | # Reset what what done in self.init_sys_modules | |
730 | if self._orig_sys_modules_main_mod is not None: |
|
730 | if self._orig_sys_modules_main_mod is not None: | |
731 | sys.modules[self._orig_sys_modules_main_name] = self._orig_sys_modules_main_mod |
|
731 | sys.modules[self._orig_sys_modules_main_name] = self._orig_sys_modules_main_mod | |
732 |
|
732 | |||
733 | #------------------------------------------------------------------------- |
|
733 | #------------------------------------------------------------------------- | |
734 | # Things related to hooks |
|
734 | # Things related to hooks | |
735 | #------------------------------------------------------------------------- |
|
735 | #------------------------------------------------------------------------- | |
736 |
|
736 | |||
737 | def init_hooks(self): |
|
737 | def init_hooks(self): | |
738 | # hooks holds pointers used for user-side customizations |
|
738 | # hooks holds pointers used for user-side customizations | |
739 | self.hooks = Struct() |
|
739 | self.hooks = Struct() | |
740 |
|
740 | |||
741 | self.strdispatchers = {} |
|
741 | self.strdispatchers = {} | |
742 |
|
742 | |||
743 | # Set all default hooks, defined in the IPython.hooks module. |
|
743 | # Set all default hooks, defined in the IPython.hooks module. | |
744 | hooks = IPython.core.hooks |
|
744 | hooks = IPython.core.hooks | |
745 | for hook_name in hooks.__all__: |
|
745 | for hook_name in hooks.__all__: | |
746 | # default hooks have priority 100, i.e. low; user hooks should have |
|
746 | # default hooks have priority 100, i.e. low; user hooks should have | |
747 | # 0-100 priority |
|
747 | # 0-100 priority | |
748 | self.set_hook(hook_name,getattr(hooks,hook_name), 100) |
|
748 | self.set_hook(hook_name,getattr(hooks,hook_name), 100) | |
749 |
|
749 | |||
750 | def set_hook(self,name,hook, priority = 50, str_key = None, re_key = None): |
|
750 | def set_hook(self,name,hook, priority = 50, str_key = None, re_key = None): | |
751 | """set_hook(name,hook) -> sets an internal IPython hook. |
|
751 | """set_hook(name,hook) -> sets an internal IPython hook. | |
752 |
|
752 | |||
753 | IPython exposes some of its internal API as user-modifiable hooks. By |
|
753 | IPython exposes some of its internal API as user-modifiable hooks. By | |
754 | adding your function to one of these hooks, you can modify IPython's |
|
754 | adding your function to one of these hooks, you can modify IPython's | |
755 | behavior to call at runtime your own routines.""" |
|
755 | behavior to call at runtime your own routines.""" | |
756 |
|
756 | |||
757 | # At some point in the future, this should validate the hook before it |
|
757 | # At some point in the future, this should validate the hook before it | |
758 | # accepts it. Probably at least check that the hook takes the number |
|
758 | # accepts it. Probably at least check that the hook takes the number | |
759 | # of args it's supposed to. |
|
759 | # of args it's supposed to. | |
760 |
|
760 | |||
761 | f = types.MethodType(hook,self) |
|
761 | f = types.MethodType(hook,self) | |
762 |
|
762 | |||
763 | # check if the hook is for strdispatcher first |
|
763 | # check if the hook is for strdispatcher first | |
764 | if str_key is not None: |
|
764 | if str_key is not None: | |
765 | sdp = self.strdispatchers.get(name, StrDispatch()) |
|
765 | sdp = self.strdispatchers.get(name, StrDispatch()) | |
766 | sdp.add_s(str_key, f, priority ) |
|
766 | sdp.add_s(str_key, f, priority ) | |
767 | self.strdispatchers[name] = sdp |
|
767 | self.strdispatchers[name] = sdp | |
768 | return |
|
768 | return | |
769 | if re_key is not None: |
|
769 | if re_key is not None: | |
770 | sdp = self.strdispatchers.get(name, StrDispatch()) |
|
770 | sdp = self.strdispatchers.get(name, StrDispatch()) | |
771 | sdp.add_re(re.compile(re_key), f, priority ) |
|
771 | sdp.add_re(re.compile(re_key), f, priority ) | |
772 | self.strdispatchers[name] = sdp |
|
772 | self.strdispatchers[name] = sdp | |
773 | return |
|
773 | return | |
774 |
|
774 | |||
775 | dp = getattr(self.hooks, name, None) |
|
775 | dp = getattr(self.hooks, name, None) | |
776 | if name not in IPython.core.hooks.__all__: |
|
776 | if name not in IPython.core.hooks.__all__: | |
777 | print "Warning! Hook '%s' is not one of %s" % \ |
|
777 | print "Warning! Hook '%s' is not one of %s" % \ | |
778 | (name, IPython.core.hooks.__all__ ) |
|
778 | (name, IPython.core.hooks.__all__ ) | |
779 | if not dp: |
|
779 | if not dp: | |
780 | dp = IPython.core.hooks.CommandChainDispatcher() |
|
780 | dp = IPython.core.hooks.CommandChainDispatcher() | |
781 |
|
781 | |||
782 | try: |
|
782 | try: | |
783 | dp.add(f,priority) |
|
783 | dp.add(f,priority) | |
784 | except AttributeError: |
|
784 | except AttributeError: | |
785 | # it was not commandchain, plain old func - replace |
|
785 | # it was not commandchain, plain old func - replace | |
786 | dp = f |
|
786 | dp = f | |
787 |
|
787 | |||
788 | setattr(self.hooks,name, dp) |
|
788 | setattr(self.hooks,name, dp) | |
789 |
|
789 | |||
790 | def register_post_execute(self, func): |
|
790 | def register_post_execute(self, func): | |
791 | """Register a function for calling after code execution. |
|
791 | """Register a function for calling after code execution. | |
792 | """ |
|
792 | """ | |
793 | if not callable(func): |
|
793 | if not callable(func): | |
794 | raise ValueError('argument %s must be callable' % func) |
|
794 | raise ValueError('argument %s must be callable' % func) | |
795 | self._post_execute[func] = True |
|
795 | self._post_execute[func] = True | |
796 |
|
796 | |||
797 | #------------------------------------------------------------------------- |
|
797 | #------------------------------------------------------------------------- | |
798 | # Things related to the "main" module |
|
798 | # Things related to the "main" module | |
799 | #------------------------------------------------------------------------- |
|
799 | #------------------------------------------------------------------------- | |
800 |
|
800 | |||
801 | def new_main_mod(self,ns=None): |
|
801 | def new_main_mod(self,ns=None): | |
802 | """Return a new 'main' module object for user code execution. |
|
802 | """Return a new 'main' module object for user code execution. | |
803 | """ |
|
803 | """ | |
804 | main_mod = self._user_main_module |
|
804 | main_mod = self._user_main_module | |
805 | init_fakemod_dict(main_mod,ns) |
|
805 | init_fakemod_dict(main_mod,ns) | |
806 | return main_mod |
|
806 | return main_mod | |
807 |
|
807 | |||
808 | def cache_main_mod(self,ns,fname): |
|
808 | def cache_main_mod(self,ns,fname): | |
809 | """Cache a main module's namespace. |
|
809 | """Cache a main module's namespace. | |
810 |
|
810 | |||
811 | When scripts are executed via %run, we must keep a reference to the |
|
811 | When scripts are executed via %run, we must keep a reference to the | |
812 | namespace of their __main__ module (a FakeModule instance) around so |
|
812 | namespace of their __main__ module (a FakeModule instance) around so | |
813 | that Python doesn't clear it, rendering objects defined therein |
|
813 | that Python doesn't clear it, rendering objects defined therein | |
814 | useless. |
|
814 | useless. | |
815 |
|
815 | |||
816 | This method keeps said reference in a private dict, keyed by the |
|
816 | This method keeps said reference in a private dict, keyed by the | |
817 | absolute path of the module object (which corresponds to the script |
|
817 | absolute path of the module object (which corresponds to the script | |
818 | path). This way, for multiple executions of the same script we only |
|
818 | path). This way, for multiple executions of the same script we only | |
819 | keep one copy of the namespace (the last one), thus preventing memory |
|
819 | keep one copy of the namespace (the last one), thus preventing memory | |
820 | leaks from old references while allowing the objects from the last |
|
820 | leaks from old references while allowing the objects from the last | |
821 | execution to be accessible. |
|
821 | execution to be accessible. | |
822 |
|
822 | |||
823 | Note: we can not allow the actual FakeModule instances to be deleted, |
|
823 | Note: we can not allow the actual FakeModule instances to be deleted, | |
824 | because of how Python tears down modules (it hard-sets all their |
|
824 | because of how Python tears down modules (it hard-sets all their | |
825 | references to None without regard for reference counts). This method |
|
825 | references to None without regard for reference counts). This method | |
826 | must therefore make a *copy* of the given namespace, to allow the |
|
826 | must therefore make a *copy* of the given namespace, to allow the | |
827 | original module's __dict__ to be cleared and reused. |
|
827 | original module's __dict__ to be cleared and reused. | |
828 |
|
828 | |||
829 |
|
829 | |||
830 | Parameters |
|
830 | Parameters | |
831 | ---------- |
|
831 | ---------- | |
832 | ns : a namespace (a dict, typically) |
|
832 | ns : a namespace (a dict, typically) | |
833 |
|
833 | |||
834 | fname : str |
|
834 | fname : str | |
835 | Filename associated with the namespace. |
|
835 | Filename associated with the namespace. | |
836 |
|
836 | |||
837 | Examples |
|
837 | Examples | |
838 | -------- |
|
838 | -------- | |
839 |
|
839 | |||
840 | In [10]: import IPython |
|
840 | In [10]: import IPython | |
841 |
|
841 | |||
842 | In [11]: _ip.cache_main_mod(IPython.__dict__,IPython.__file__) |
|
842 | In [11]: _ip.cache_main_mod(IPython.__dict__,IPython.__file__) | |
843 |
|
843 | |||
844 | In [12]: IPython.__file__ in _ip._main_ns_cache |
|
844 | In [12]: IPython.__file__ in _ip._main_ns_cache | |
845 | Out[12]: True |
|
845 | Out[12]: True | |
846 | """ |
|
846 | """ | |
847 | self._main_ns_cache[os.path.abspath(fname)] = ns.copy() |
|
847 | self._main_ns_cache[os.path.abspath(fname)] = ns.copy() | |
848 |
|
848 | |||
849 | def clear_main_mod_cache(self): |
|
849 | def clear_main_mod_cache(self): | |
850 | """Clear the cache of main modules. |
|
850 | """Clear the cache of main modules. | |
851 |
|
851 | |||
852 | Mainly for use by utilities like %reset. |
|
852 | Mainly for use by utilities like %reset. | |
853 |
|
853 | |||
854 | Examples |
|
854 | Examples | |
855 | -------- |
|
855 | -------- | |
856 |
|
856 | |||
857 | In [15]: import IPython |
|
857 | In [15]: import IPython | |
858 |
|
858 | |||
859 | In [16]: _ip.cache_main_mod(IPython.__dict__,IPython.__file__) |
|
859 | In [16]: _ip.cache_main_mod(IPython.__dict__,IPython.__file__) | |
860 |
|
860 | |||
861 | In [17]: len(_ip._main_ns_cache) > 0 |
|
861 | In [17]: len(_ip._main_ns_cache) > 0 | |
862 | Out[17]: True |
|
862 | Out[17]: True | |
863 |
|
863 | |||
864 | In [18]: _ip.clear_main_mod_cache() |
|
864 | In [18]: _ip.clear_main_mod_cache() | |
865 |
|
865 | |||
866 | In [19]: len(_ip._main_ns_cache) == 0 |
|
866 | In [19]: len(_ip._main_ns_cache) == 0 | |
867 | Out[19]: True |
|
867 | Out[19]: True | |
868 | """ |
|
868 | """ | |
869 | self._main_ns_cache.clear() |
|
869 | self._main_ns_cache.clear() | |
870 |
|
870 | |||
871 | #------------------------------------------------------------------------- |
|
871 | #------------------------------------------------------------------------- | |
872 | # Things related to debugging |
|
872 | # Things related to debugging | |
873 | #------------------------------------------------------------------------- |
|
873 | #------------------------------------------------------------------------- | |
874 |
|
874 | |||
875 | def init_pdb(self): |
|
875 | def init_pdb(self): | |
876 | # Set calling of pdb on exceptions |
|
876 | # Set calling of pdb on exceptions | |
877 | # self.call_pdb is a property |
|
877 | # self.call_pdb is a property | |
878 | self.call_pdb = self.pdb |
|
878 | self.call_pdb = self.pdb | |
879 |
|
879 | |||
880 | def _get_call_pdb(self): |
|
880 | def _get_call_pdb(self): | |
881 | return self._call_pdb |
|
881 | return self._call_pdb | |
882 |
|
882 | |||
883 | def _set_call_pdb(self,val): |
|
883 | def _set_call_pdb(self,val): | |
884 |
|
884 | |||
885 | if val not in (0,1,False,True): |
|
885 | if val not in (0,1,False,True): | |
886 | raise ValueError,'new call_pdb value must be boolean' |
|
886 | raise ValueError,'new call_pdb value must be boolean' | |
887 |
|
887 | |||
888 | # store value in instance |
|
888 | # store value in instance | |
889 | self._call_pdb = val |
|
889 | self._call_pdb = val | |
890 |
|
890 | |||
891 | # notify the actual exception handlers |
|
891 | # notify the actual exception handlers | |
892 | self.InteractiveTB.call_pdb = val |
|
892 | self.InteractiveTB.call_pdb = val | |
893 |
|
893 | |||
894 | call_pdb = property(_get_call_pdb,_set_call_pdb,None, |
|
894 | call_pdb = property(_get_call_pdb,_set_call_pdb,None, | |
895 | 'Control auto-activation of pdb at exceptions') |
|
895 | 'Control auto-activation of pdb at exceptions') | |
896 |
|
896 | |||
897 | def debugger(self,force=False): |
|
897 | def debugger(self,force=False): | |
898 | """Call the pydb/pdb debugger. |
|
898 | """Call the pydb/pdb debugger. | |
899 |
|
899 | |||
900 | Keywords: |
|
900 | Keywords: | |
901 |
|
901 | |||
902 | - force(False): by default, this routine checks the instance call_pdb |
|
902 | - force(False): by default, this routine checks the instance call_pdb | |
903 | flag and does not actually invoke the debugger if the flag is false. |
|
903 | flag and does not actually invoke the debugger if the flag is false. | |
904 | The 'force' option forces the debugger to activate even if the flag |
|
904 | The 'force' option forces the debugger to activate even if the flag | |
905 | is false. |
|
905 | is false. | |
906 | """ |
|
906 | """ | |
907 |
|
907 | |||
908 | if not (force or self.call_pdb): |
|
908 | if not (force or self.call_pdb): | |
909 | return |
|
909 | return | |
910 |
|
910 | |||
911 | if not hasattr(sys,'last_traceback'): |
|
911 | if not hasattr(sys,'last_traceback'): | |
912 | error('No traceback has been produced, nothing to debug.') |
|
912 | error('No traceback has been produced, nothing to debug.') | |
913 | return |
|
913 | return | |
914 |
|
914 | |||
915 | # use pydb if available |
|
915 | # use pydb if available | |
916 | if debugger.has_pydb: |
|
916 | if debugger.has_pydb: | |
917 | from pydb import pm |
|
917 | from pydb import pm | |
918 | else: |
|
918 | else: | |
919 | # fallback to our internal debugger |
|
919 | # fallback to our internal debugger | |
920 | pm = lambda : self.InteractiveTB.debugger(force=True) |
|
920 | pm = lambda : self.InteractiveTB.debugger(force=True) | |
921 |
|
921 | |||
922 | with self.readline_no_record: |
|
922 | with self.readline_no_record: | |
923 | pm() |
|
923 | pm() | |
924 |
|
924 | |||
925 | #------------------------------------------------------------------------- |
|
925 | #------------------------------------------------------------------------- | |
926 | # Things related to IPython's various namespaces |
|
926 | # Things related to IPython's various namespaces | |
927 | #------------------------------------------------------------------------- |
|
927 | #------------------------------------------------------------------------- | |
928 | default_user_namespaces = True |
|
928 | default_user_namespaces = True | |
929 |
|
929 | |||
930 | def init_create_namespaces(self, user_module=None, user_ns=None): |
|
930 | def init_create_namespaces(self, user_module=None, user_ns=None): | |
931 | # Create the namespace where the user will operate. user_ns is |
|
931 | # Create the namespace where the user will operate. user_ns is | |
932 | # normally the only one used, and it is passed to the exec calls as |
|
932 | # normally the only one used, and it is passed to the exec calls as | |
933 | # the locals argument. But we do carry a user_global_ns namespace |
|
933 | # the locals argument. But we do carry a user_global_ns namespace | |
934 | # given as the exec 'globals' argument, This is useful in embedding |
|
934 | # given as the exec 'globals' argument, This is useful in embedding | |
935 | # situations where the ipython shell opens in a context where the |
|
935 | # situations where the ipython shell opens in a context where the | |
936 | # distinction between locals and globals is meaningful. For |
|
936 | # distinction between locals and globals is meaningful. For | |
937 | # non-embedded contexts, it is just the same object as the user_ns dict. |
|
937 | # non-embedded contexts, it is just the same object as the user_ns dict. | |
938 |
|
938 | |||
939 | # FIXME. For some strange reason, __builtins__ is showing up at user |
|
939 | # FIXME. For some strange reason, __builtins__ is showing up at user | |
940 | # level as a dict instead of a module. This is a manual fix, but I |
|
940 | # level as a dict instead of a module. This is a manual fix, but I | |
941 | # should really track down where the problem is coming from. Alex |
|
941 | # should really track down where the problem is coming from. Alex | |
942 | # Schmolck reported this problem first. |
|
942 | # Schmolck reported this problem first. | |
943 |
|
943 | |||
944 | # A useful post by Alex Martelli on this topic: |
|
944 | # A useful post by Alex Martelli on this topic: | |
945 | # Re: inconsistent value from __builtins__ |
|
945 | # Re: inconsistent value from __builtins__ | |
946 | # Von: Alex Martelli <aleaxit@yahoo.com> |
|
946 | # Von: Alex Martelli <aleaxit@yahoo.com> | |
947 | # Datum: Freitag 01 Oktober 2004 04:45:34 nachmittags/abends |
|
947 | # Datum: Freitag 01 Oktober 2004 04:45:34 nachmittags/abends | |
948 | # Gruppen: comp.lang.python |
|
948 | # Gruppen: comp.lang.python | |
949 |
|
949 | |||
950 | # Michael Hohn <hohn@hooknose.lbl.gov> wrote: |
|
950 | # Michael Hohn <hohn@hooknose.lbl.gov> wrote: | |
951 | # > >>> print type(builtin_check.get_global_binding('__builtins__')) |
|
951 | # > >>> print type(builtin_check.get_global_binding('__builtins__')) | |
952 | # > <type 'dict'> |
|
952 | # > <type 'dict'> | |
953 | # > >>> print type(__builtins__) |
|
953 | # > >>> print type(__builtins__) | |
954 | # > <type 'module'> |
|
954 | # > <type 'module'> | |
955 | # > Is this difference in return value intentional? |
|
955 | # > Is this difference in return value intentional? | |
956 |
|
956 | |||
957 | # Well, it's documented that '__builtins__' can be either a dictionary |
|
957 | # Well, it's documented that '__builtins__' can be either a dictionary | |
958 | # or a module, and it's been that way for a long time. Whether it's |
|
958 | # or a module, and it's been that way for a long time. Whether it's | |
959 | # intentional (or sensible), I don't know. In any case, the idea is |
|
959 | # intentional (or sensible), I don't know. In any case, the idea is | |
960 | # that if you need to access the built-in namespace directly, you |
|
960 | # that if you need to access the built-in namespace directly, you | |
961 | # should start with "import __builtin__" (note, no 's') which will |
|
961 | # should start with "import __builtin__" (note, no 's') which will | |
962 | # definitely give you a module. Yeah, it's somewhat confusing:-(. |
|
962 | # definitely give you a module. Yeah, it's somewhat confusing:-(. | |
963 |
|
963 | |||
964 | # These routines return a properly built module and dict as needed by |
|
964 | # These routines return a properly built module and dict as needed by | |
965 | # the rest of the code, and can also be used by extension writers to |
|
965 | # the rest of the code, and can also be used by extension writers to | |
966 | # generate properly initialized namespaces. |
|
966 | # generate properly initialized namespaces. | |
967 | if (user_ns is not None) or (user_module is not None): |
|
967 | if (user_ns is not None) or (user_module is not None): | |
968 | self.default_user_namespaces = False |
|
968 | self.default_user_namespaces = False | |
969 | self.user_module, self.user_ns = self.prepare_user_module(user_module, user_ns) |
|
969 | self.user_module, self.user_ns = self.prepare_user_module(user_module, user_ns) | |
970 |
|
970 | |||
971 | # A record of hidden variables we have added to the user namespace, so |
|
971 | # A record of hidden variables we have added to the user namespace, so | |
972 | # we can list later only variables defined in actual interactive use. |
|
972 | # we can list later only variables defined in actual interactive use. | |
973 | self.user_ns_hidden = set() |
|
973 | self.user_ns_hidden = set() | |
974 |
|
974 | |||
975 | # Now that FakeModule produces a real module, we've run into a nasty |
|
975 | # Now that FakeModule produces a real module, we've run into a nasty | |
976 | # problem: after script execution (via %run), the module where the user |
|
976 | # problem: after script execution (via %run), the module where the user | |
977 | # code ran is deleted. Now that this object is a true module (needed |
|
977 | # code ran is deleted. Now that this object is a true module (needed | |
978 | # so docetst and other tools work correctly), the Python module |
|
978 | # so docetst and other tools work correctly), the Python module | |
979 | # teardown mechanism runs over it, and sets to None every variable |
|
979 | # teardown mechanism runs over it, and sets to None every variable | |
980 | # present in that module. Top-level references to objects from the |
|
980 | # present in that module. Top-level references to objects from the | |
981 | # script survive, because the user_ns is updated with them. However, |
|
981 | # script survive, because the user_ns is updated with them. However, | |
982 | # calling functions defined in the script that use other things from |
|
982 | # calling functions defined in the script that use other things from | |
983 | # the script will fail, because the function's closure had references |
|
983 | # the script will fail, because the function's closure had references | |
984 | # to the original objects, which are now all None. So we must protect |
|
984 | # to the original objects, which are now all None. So we must protect | |
985 | # these modules from deletion by keeping a cache. |
|
985 | # these modules from deletion by keeping a cache. | |
986 | # |
|
986 | # | |
987 | # To avoid keeping stale modules around (we only need the one from the |
|
987 | # To avoid keeping stale modules around (we only need the one from the | |
988 | # last run), we use a dict keyed with the full path to the script, so |
|
988 | # last run), we use a dict keyed with the full path to the script, so | |
989 | # only the last version of the module is held in the cache. Note, |
|
989 | # only the last version of the module is held in the cache. Note, | |
990 | # however, that we must cache the module *namespace contents* (their |
|
990 | # however, that we must cache the module *namespace contents* (their | |
991 | # __dict__). Because if we try to cache the actual modules, old ones |
|
991 | # __dict__). Because if we try to cache the actual modules, old ones | |
992 | # (uncached) could be destroyed while still holding references (such as |
|
992 | # (uncached) could be destroyed while still holding references (such as | |
993 | # those held by GUI objects that tend to be long-lived)> |
|
993 | # those held by GUI objects that tend to be long-lived)> | |
994 | # |
|
994 | # | |
995 | # The %reset command will flush this cache. See the cache_main_mod() |
|
995 | # The %reset command will flush this cache. See the cache_main_mod() | |
996 | # and clear_main_mod_cache() methods for details on use. |
|
996 | # and clear_main_mod_cache() methods for details on use. | |
997 |
|
997 | |||
998 | # This is the cache used for 'main' namespaces |
|
998 | # This is the cache used for 'main' namespaces | |
999 | self._main_ns_cache = {} |
|
999 | self._main_ns_cache = {} | |
1000 | # And this is the single instance of FakeModule whose __dict__ we keep |
|
1000 | # And this is the single instance of FakeModule whose __dict__ we keep | |
1001 | # copying and clearing for reuse on each %run |
|
1001 | # copying and clearing for reuse on each %run | |
1002 | self._user_main_module = FakeModule() |
|
1002 | self._user_main_module = FakeModule() | |
1003 |
|
1003 | |||
1004 | # A table holding all the namespaces IPython deals with, so that |
|
1004 | # A table holding all the namespaces IPython deals with, so that | |
1005 | # introspection facilities can search easily. |
|
1005 | # introspection facilities can search easily. | |
1006 | self.ns_table = {'user_global':self.user_module.__dict__, |
|
1006 | self.ns_table = {'user_global':self.user_module.__dict__, | |
1007 | 'user_local':self.user_ns, |
|
1007 | 'user_local':self.user_ns, | |
1008 | 'builtin':builtin_mod.__dict__ |
|
1008 | 'builtin':builtin_mod.__dict__ | |
1009 | } |
|
1009 | } | |
1010 |
|
1010 | |||
1011 | @property |
|
1011 | @property | |
1012 | def user_global_ns(self): |
|
1012 | def user_global_ns(self): | |
1013 | return self.user_module.__dict__ |
|
1013 | return self.user_module.__dict__ | |
1014 |
|
1014 | |||
1015 | def prepare_user_module(self, user_module=None, user_ns=None): |
|
1015 | def prepare_user_module(self, user_module=None, user_ns=None): | |
1016 | """Prepare the module and namespace in which user code will be run. |
|
1016 | """Prepare the module and namespace in which user code will be run. | |
1017 |
|
1017 | |||
1018 | When IPython is started normally, both parameters are None: a new module |
|
1018 | When IPython is started normally, both parameters are None: a new module | |
1019 | is created automatically, and its __dict__ used as the namespace. |
|
1019 | is created automatically, and its __dict__ used as the namespace. | |
1020 |
|
1020 | |||
1021 | If only user_module is provided, its __dict__ is used as the namespace. |
|
1021 | If only user_module is provided, its __dict__ is used as the namespace. | |
1022 | If only user_ns is provided, a dummy module is created, and user_ns |
|
1022 | If only user_ns is provided, a dummy module is created, and user_ns | |
1023 | becomes the global namespace. If both are provided (as they may be |
|
1023 | becomes the global namespace. If both are provided (as they may be | |
1024 | when embedding), user_ns is the local namespace, and user_module |
|
1024 | when embedding), user_ns is the local namespace, and user_module | |
1025 | provides the global namespace. |
|
1025 | provides the global namespace. | |
1026 |
|
1026 | |||
1027 | Parameters |
|
1027 | Parameters | |
1028 | ---------- |
|
1028 | ---------- | |
1029 | user_module : module, optional |
|
1029 | user_module : module, optional | |
1030 | The current user module in which IPython is being run. If None, |
|
1030 | The current user module in which IPython is being run. If None, | |
1031 | a clean module will be created. |
|
1031 | a clean module will be created. | |
1032 | user_ns : dict, optional |
|
1032 | user_ns : dict, optional | |
1033 | A namespace in which to run interactive commands. |
|
1033 | A namespace in which to run interactive commands. | |
1034 |
|
1034 | |||
1035 | Returns |
|
1035 | Returns | |
1036 | ------- |
|
1036 | ------- | |
1037 | A tuple of user_module and user_ns, each properly initialised. |
|
1037 | A tuple of user_module and user_ns, each properly initialised. | |
1038 | """ |
|
1038 | """ | |
1039 | if user_module is None and user_ns is not None: |
|
1039 | if user_module is None and user_ns is not None: | |
1040 | user_ns.setdefault("__name__", "__main__") |
|
1040 | user_ns.setdefault("__name__", "__main__") | |
1041 | class DummyMod(object): |
|
1041 | class DummyMod(object): | |
1042 | "A dummy module used for IPython's interactive namespace." |
|
1042 | "A dummy module used for IPython's interactive namespace." | |
1043 | pass |
|
1043 | pass | |
1044 | user_module = DummyMod() |
|
1044 | user_module = DummyMod() | |
1045 | user_module.__dict__ = user_ns |
|
1045 | user_module.__dict__ = user_ns | |
1046 |
|
1046 | |||
1047 | if user_module is None: |
|
1047 | if user_module is None: | |
1048 | user_module = types.ModuleType("__main__", |
|
1048 | user_module = types.ModuleType("__main__", | |
1049 | doc="Automatically created module for IPython interactive environment") |
|
1049 | doc="Automatically created module for IPython interactive environment") | |
1050 |
|
1050 | |||
1051 | # We must ensure that __builtin__ (without the final 's') is always |
|
1051 | # We must ensure that __builtin__ (without the final 's') is always | |
1052 | # available and pointing to the __builtin__ *module*. For more details: |
|
1052 | # available and pointing to the __builtin__ *module*. For more details: | |
1053 | # http://mail.python.org/pipermail/python-dev/2001-April/014068.html |
|
1053 | # http://mail.python.org/pipermail/python-dev/2001-April/014068.html | |
1054 | user_module.__dict__.setdefault('__builtin__', builtin_mod) |
|
1054 | user_module.__dict__.setdefault('__builtin__', builtin_mod) | |
1055 | user_module.__dict__.setdefault('__builtins__', builtin_mod) |
|
1055 | user_module.__dict__.setdefault('__builtins__', builtin_mod) | |
1056 |
|
1056 | |||
1057 | if user_ns is None: |
|
1057 | if user_ns is None: | |
1058 | user_ns = user_module.__dict__ |
|
1058 | user_ns = user_module.__dict__ | |
1059 |
|
1059 | |||
1060 | return user_module, user_ns |
|
1060 | return user_module, user_ns | |
1061 |
|
1061 | |||
1062 | def init_sys_modules(self): |
|
1062 | def init_sys_modules(self): | |
1063 | # We need to insert into sys.modules something that looks like a |
|
1063 | # We need to insert into sys.modules something that looks like a | |
1064 | # module but which accesses the IPython namespace, for shelve and |
|
1064 | # module but which accesses the IPython namespace, for shelve and | |
1065 | # pickle to work interactively. Normally they rely on getting |
|
1065 | # pickle to work interactively. Normally they rely on getting | |
1066 | # everything out of __main__, but for embedding purposes each IPython |
|
1066 | # everything out of __main__, but for embedding purposes each IPython | |
1067 | # instance has its own private namespace, so we can't go shoving |
|
1067 | # instance has its own private namespace, so we can't go shoving | |
1068 | # everything into __main__. |
|
1068 | # everything into __main__. | |
1069 |
|
1069 | |||
1070 | # note, however, that we should only do this for non-embedded |
|
1070 | # note, however, that we should only do this for non-embedded | |
1071 | # ipythons, which really mimic the __main__.__dict__ with their own |
|
1071 | # ipythons, which really mimic the __main__.__dict__ with their own | |
1072 | # namespace. Embedded instances, on the other hand, should not do |
|
1072 | # namespace. Embedded instances, on the other hand, should not do | |
1073 | # this because they need to manage the user local/global namespaces |
|
1073 | # this because they need to manage the user local/global namespaces | |
1074 | # only, but they live within a 'normal' __main__ (meaning, they |
|
1074 | # only, but they live within a 'normal' __main__ (meaning, they | |
1075 | # shouldn't overtake the execution environment of the script they're |
|
1075 | # shouldn't overtake the execution environment of the script they're | |
1076 | # embedded in). |
|
1076 | # embedded in). | |
1077 |
|
1077 | |||
1078 | # This is overridden in the InteractiveShellEmbed subclass to a no-op. |
|
1078 | # This is overridden in the InteractiveShellEmbed subclass to a no-op. | |
1079 | main_name = self.user_module.__name__ |
|
1079 | main_name = self.user_module.__name__ | |
1080 | sys.modules[main_name] = self.user_module |
|
1080 | sys.modules[main_name] = self.user_module | |
1081 |
|
1081 | |||
1082 | def init_user_ns(self): |
|
1082 | def init_user_ns(self): | |
1083 | """Initialize all user-visible namespaces to their minimum defaults. |
|
1083 | """Initialize all user-visible namespaces to their minimum defaults. | |
1084 |
|
1084 | |||
1085 | Certain history lists are also initialized here, as they effectively |
|
1085 | Certain history lists are also initialized here, as they effectively | |
1086 | act as user namespaces. |
|
1086 | act as user namespaces. | |
1087 |
|
1087 | |||
1088 | Notes |
|
1088 | Notes | |
1089 | ----- |
|
1089 | ----- | |
1090 | All data structures here are only filled in, they are NOT reset by this |
|
1090 | All data structures here are only filled in, they are NOT reset by this | |
1091 | method. If they were not empty before, data will simply be added to |
|
1091 | method. If they were not empty before, data will simply be added to | |
1092 | therm. |
|
1092 | therm. | |
1093 | """ |
|
1093 | """ | |
1094 | # This function works in two parts: first we put a few things in |
|
1094 | # This function works in two parts: first we put a few things in | |
1095 | # user_ns, and we sync that contents into user_ns_hidden so that these |
|
1095 | # user_ns, and we sync that contents into user_ns_hidden so that these | |
1096 | # initial variables aren't shown by %who. After the sync, we add the |
|
1096 | # initial variables aren't shown by %who. After the sync, we add the | |
1097 | # rest of what we *do* want the user to see with %who even on a new |
|
1097 | # rest of what we *do* want the user to see with %who even on a new | |
1098 | # session (probably nothing, so theye really only see their own stuff) |
|
1098 | # session (probably nothing, so theye really only see their own stuff) | |
1099 |
|
1099 | |||
1100 | # The user dict must *always* have a __builtin__ reference to the |
|
1100 | # The user dict must *always* have a __builtin__ reference to the | |
1101 | # Python standard __builtin__ namespace, which must be imported. |
|
1101 | # Python standard __builtin__ namespace, which must be imported. | |
1102 | # This is so that certain operations in prompt evaluation can be |
|
1102 | # This is so that certain operations in prompt evaluation can be | |
1103 | # reliably executed with builtins. Note that we can NOT use |
|
1103 | # reliably executed with builtins. Note that we can NOT use | |
1104 | # __builtins__ (note the 's'), because that can either be a dict or a |
|
1104 | # __builtins__ (note the 's'), because that can either be a dict or a | |
1105 | # module, and can even mutate at runtime, depending on the context |
|
1105 | # module, and can even mutate at runtime, depending on the context | |
1106 | # (Python makes no guarantees on it). In contrast, __builtin__ is |
|
1106 | # (Python makes no guarantees on it). In contrast, __builtin__ is | |
1107 | # always a module object, though it must be explicitly imported. |
|
1107 | # always a module object, though it must be explicitly imported. | |
1108 |
|
1108 | |||
1109 | # For more details: |
|
1109 | # For more details: | |
1110 | # http://mail.python.org/pipermail/python-dev/2001-April/014068.html |
|
1110 | # http://mail.python.org/pipermail/python-dev/2001-April/014068.html | |
1111 | ns = dict() |
|
1111 | ns = dict() | |
1112 |
|
1112 | |||
1113 | # Put 'help' in the user namespace |
|
1113 | # Put 'help' in the user namespace | |
1114 | try: |
|
1114 | try: | |
1115 | from site import _Helper |
|
1115 | from site import _Helper | |
1116 | ns['help'] = _Helper() |
|
1116 | ns['help'] = _Helper() | |
1117 | except ImportError: |
|
1117 | except ImportError: | |
1118 | warn('help() not available - check site.py') |
|
1118 | warn('help() not available - check site.py') | |
1119 |
|
1119 | |||
1120 | # make global variables for user access to the histories |
|
1120 | # make global variables for user access to the histories | |
1121 | ns['_ih'] = self.history_manager.input_hist_parsed |
|
1121 | ns['_ih'] = self.history_manager.input_hist_parsed | |
1122 | ns['_oh'] = self.history_manager.output_hist |
|
1122 | ns['_oh'] = self.history_manager.output_hist | |
1123 | ns['_dh'] = self.history_manager.dir_hist |
|
1123 | ns['_dh'] = self.history_manager.dir_hist | |
1124 |
|
1124 | |||
1125 | ns['_sh'] = shadowns |
|
1125 | ns['_sh'] = shadowns | |
1126 |
|
1126 | |||
1127 | # user aliases to input and output histories. These shouldn't show up |
|
1127 | # user aliases to input and output histories. These shouldn't show up | |
1128 | # in %who, as they can have very large reprs. |
|
1128 | # in %who, as they can have very large reprs. | |
1129 | ns['In'] = self.history_manager.input_hist_parsed |
|
1129 | ns['In'] = self.history_manager.input_hist_parsed | |
1130 | ns['Out'] = self.history_manager.output_hist |
|
1130 | ns['Out'] = self.history_manager.output_hist | |
1131 |
|
1131 | |||
1132 | # Store myself as the public api!!! |
|
1132 | # Store myself as the public api!!! | |
1133 | ns['get_ipython'] = self.get_ipython |
|
1133 | ns['get_ipython'] = self.get_ipython | |
1134 |
|
1134 | |||
1135 | ns['exit'] = self.exiter |
|
1135 | ns['exit'] = self.exiter | |
1136 | ns['quit'] = self.exiter |
|
1136 | ns['quit'] = self.exiter | |
1137 |
|
1137 | |||
1138 | # Sync what we've added so far to user_ns_hidden so these aren't seen |
|
1138 | # Sync what we've added so far to user_ns_hidden so these aren't seen | |
1139 | # by %who |
|
1139 | # by %who | |
1140 | self.user_ns_hidden.update(ns) |
|
1140 | self.user_ns_hidden.update(ns) | |
1141 |
|
1141 | |||
1142 | # Anything put into ns now would show up in %who. Think twice before |
|
1142 | # Anything put into ns now would show up in %who. Think twice before | |
1143 | # putting anything here, as we really want %who to show the user their |
|
1143 | # putting anything here, as we really want %who to show the user their | |
1144 | # stuff, not our variables. |
|
1144 | # stuff, not our variables. | |
1145 |
|
1145 | |||
1146 | # Finally, update the real user's namespace |
|
1146 | # Finally, update the real user's namespace | |
1147 | self.user_ns.update(ns) |
|
1147 | self.user_ns.update(ns) | |
1148 |
|
1148 | |||
1149 | @property |
|
1149 | @property | |
1150 | def all_ns_refs(self): |
|
1150 | def all_ns_refs(self): | |
1151 | """Get a list of references to all the namespace dictionaries in which |
|
1151 | """Get a list of references to all the namespace dictionaries in which | |
1152 | IPython might store a user-created object. |
|
1152 | IPython might store a user-created object. | |
1153 |
|
1153 | |||
1154 | Note that this does not include the displayhook, which also caches |
|
1154 | Note that this does not include the displayhook, which also caches | |
1155 | objects from the output.""" |
|
1155 | objects from the output.""" | |
1156 | return [self.user_ns, self.user_global_ns, |
|
1156 | return [self.user_ns, self.user_global_ns, | |
1157 | self._user_main_module.__dict__] + self._main_ns_cache.values() |
|
1157 | self._user_main_module.__dict__] + self._main_ns_cache.values() | |
1158 |
|
1158 | |||
1159 | def reset(self, new_session=True): |
|
1159 | def reset(self, new_session=True): | |
1160 | """Clear all internal namespaces, and attempt to release references to |
|
1160 | """Clear all internal namespaces, and attempt to release references to | |
1161 | user objects. |
|
1161 | user objects. | |
1162 |
|
1162 | |||
1163 | If new_session is True, a new history session will be opened. |
|
1163 | If new_session is True, a new history session will be opened. | |
1164 | """ |
|
1164 | """ | |
1165 | # Clear histories |
|
1165 | # Clear histories | |
1166 | self.history_manager.reset(new_session) |
|
1166 | self.history_manager.reset(new_session) | |
1167 | # Reset counter used to index all histories |
|
1167 | # Reset counter used to index all histories | |
1168 | if new_session: |
|
1168 | if new_session: | |
1169 | self.execution_count = 1 |
|
1169 | self.execution_count = 1 | |
1170 |
|
1170 | |||
1171 | # Flush cached output items |
|
1171 | # Flush cached output items | |
1172 | if self.displayhook.do_full_cache: |
|
1172 | if self.displayhook.do_full_cache: | |
1173 | self.displayhook.flush() |
|
1173 | self.displayhook.flush() | |
1174 |
|
1174 | |||
1175 | # The main execution namespaces must be cleared very carefully, |
|
1175 | # The main execution namespaces must be cleared very carefully, | |
1176 | # skipping the deletion of the builtin-related keys, because doing so |
|
1176 | # skipping the deletion of the builtin-related keys, because doing so | |
1177 | # would cause errors in many object's __del__ methods. |
|
1177 | # would cause errors in many object's __del__ methods. | |
1178 | if self.user_ns is not self.user_global_ns: |
|
1178 | if self.user_ns is not self.user_global_ns: | |
1179 | self.user_ns.clear() |
|
1179 | self.user_ns.clear() | |
1180 | ns = self.user_global_ns |
|
1180 | ns = self.user_global_ns | |
1181 | drop_keys = set(ns.keys()) |
|
1181 | drop_keys = set(ns.keys()) | |
1182 | drop_keys.discard('__builtin__') |
|
1182 | drop_keys.discard('__builtin__') | |
1183 | drop_keys.discard('__builtins__') |
|
1183 | drop_keys.discard('__builtins__') | |
1184 | drop_keys.discard('__name__') |
|
1184 | drop_keys.discard('__name__') | |
1185 | for k in drop_keys: |
|
1185 | for k in drop_keys: | |
1186 | del ns[k] |
|
1186 | del ns[k] | |
1187 |
|
1187 | |||
1188 | self.user_ns_hidden.clear() |
|
1188 | self.user_ns_hidden.clear() | |
1189 |
|
1189 | |||
1190 | # Restore the user namespaces to minimal usability |
|
1190 | # Restore the user namespaces to minimal usability | |
1191 | self.init_user_ns() |
|
1191 | self.init_user_ns() | |
1192 |
|
1192 | |||
1193 | # Restore the default and user aliases |
|
1193 | # Restore the default and user aliases | |
1194 | self.alias_manager.clear_aliases() |
|
1194 | self.alias_manager.clear_aliases() | |
1195 | self.alias_manager.init_aliases() |
|
1195 | self.alias_manager.init_aliases() | |
1196 |
|
1196 | |||
1197 | # Flush the private list of module references kept for script |
|
1197 | # Flush the private list of module references kept for script | |
1198 | # execution protection |
|
1198 | # execution protection | |
1199 | self.clear_main_mod_cache() |
|
1199 | self.clear_main_mod_cache() | |
1200 |
|
1200 | |||
1201 | # Clear out the namespace from the last %run |
|
1201 | # Clear out the namespace from the last %run | |
1202 | self.new_main_mod() |
|
1202 | self.new_main_mod() | |
1203 |
|
1203 | |||
1204 | def del_var(self, varname, by_name=False): |
|
1204 | def del_var(self, varname, by_name=False): | |
1205 | """Delete a variable from the various namespaces, so that, as |
|
1205 | """Delete a variable from the various namespaces, so that, as | |
1206 | far as possible, we're not keeping any hidden references to it. |
|
1206 | far as possible, we're not keeping any hidden references to it. | |
1207 |
|
1207 | |||
1208 | Parameters |
|
1208 | Parameters | |
1209 | ---------- |
|
1209 | ---------- | |
1210 | varname : str |
|
1210 | varname : str | |
1211 | The name of the variable to delete. |
|
1211 | The name of the variable to delete. | |
1212 | by_name : bool |
|
1212 | by_name : bool | |
1213 | If True, delete variables with the given name in each |
|
1213 | If True, delete variables with the given name in each | |
1214 | namespace. If False (default), find the variable in the user |
|
1214 | namespace. If False (default), find the variable in the user | |
1215 | namespace, and delete references to it. |
|
1215 | namespace, and delete references to it. | |
1216 | """ |
|
1216 | """ | |
1217 | if varname in ('__builtin__', '__builtins__'): |
|
1217 | if varname in ('__builtin__', '__builtins__'): | |
1218 | raise ValueError("Refusing to delete %s" % varname) |
|
1218 | raise ValueError("Refusing to delete %s" % varname) | |
1219 |
|
1219 | |||
1220 | ns_refs = self.all_ns_refs |
|
1220 | ns_refs = self.all_ns_refs | |
1221 |
|
1221 | |||
1222 | if by_name: # Delete by name |
|
1222 | if by_name: # Delete by name | |
1223 | for ns in ns_refs: |
|
1223 | for ns in ns_refs: | |
1224 | try: |
|
1224 | try: | |
1225 | del ns[varname] |
|
1225 | del ns[varname] | |
1226 | except KeyError: |
|
1226 | except KeyError: | |
1227 | pass |
|
1227 | pass | |
1228 | else: # Delete by object |
|
1228 | else: # Delete by object | |
1229 | try: |
|
1229 | try: | |
1230 | obj = self.user_ns[varname] |
|
1230 | obj = self.user_ns[varname] | |
1231 | except KeyError: |
|
1231 | except KeyError: | |
1232 | raise NameError("name '%s' is not defined" % varname) |
|
1232 | raise NameError("name '%s' is not defined" % varname) | |
1233 | # Also check in output history |
|
1233 | # Also check in output history | |
1234 | ns_refs.append(self.history_manager.output_hist) |
|
1234 | ns_refs.append(self.history_manager.output_hist) | |
1235 | for ns in ns_refs: |
|
1235 | for ns in ns_refs: | |
1236 | to_delete = [n for n, o in ns.iteritems() if o is obj] |
|
1236 | to_delete = [n for n, o in ns.iteritems() if o is obj] | |
1237 | for name in to_delete: |
|
1237 | for name in to_delete: | |
1238 | del ns[name] |
|
1238 | del ns[name] | |
1239 |
|
1239 | |||
1240 | # displayhook keeps extra references, but not in a dictionary |
|
1240 | # displayhook keeps extra references, but not in a dictionary | |
1241 | for name in ('_', '__', '___'): |
|
1241 | for name in ('_', '__', '___'): | |
1242 | if getattr(self.displayhook, name) is obj: |
|
1242 | if getattr(self.displayhook, name) is obj: | |
1243 | setattr(self.displayhook, name, None) |
|
1243 | setattr(self.displayhook, name, None) | |
1244 |
|
1244 | |||
1245 | def reset_selective(self, regex=None): |
|
1245 | def reset_selective(self, regex=None): | |
1246 | """Clear selective variables from internal namespaces based on a |
|
1246 | """Clear selective variables from internal namespaces based on a | |
1247 | specified regular expression. |
|
1247 | specified regular expression. | |
1248 |
|
1248 | |||
1249 | Parameters |
|
1249 | Parameters | |
1250 | ---------- |
|
1250 | ---------- | |
1251 | regex : string or compiled pattern, optional |
|
1251 | regex : string or compiled pattern, optional | |
1252 | A regular expression pattern that will be used in searching |
|
1252 | A regular expression pattern that will be used in searching | |
1253 | variable names in the users namespaces. |
|
1253 | variable names in the users namespaces. | |
1254 | """ |
|
1254 | """ | |
1255 | if regex is not None: |
|
1255 | if regex is not None: | |
1256 | try: |
|
1256 | try: | |
1257 | m = re.compile(regex) |
|
1257 | m = re.compile(regex) | |
1258 | except TypeError: |
|
1258 | except TypeError: | |
1259 | raise TypeError('regex must be a string or compiled pattern') |
|
1259 | raise TypeError('regex must be a string or compiled pattern') | |
1260 | # Search for keys in each namespace that match the given regex |
|
1260 | # Search for keys in each namespace that match the given regex | |
1261 | # If a match is found, delete the key/value pair. |
|
1261 | # If a match is found, delete the key/value pair. | |
1262 | for ns in self.all_ns_refs: |
|
1262 | for ns in self.all_ns_refs: | |
1263 | for var in ns: |
|
1263 | for var in ns: | |
1264 | if m.search(var): |
|
1264 | if m.search(var): | |
1265 | del ns[var] |
|
1265 | del ns[var] | |
1266 |
|
1266 | |||
1267 | def push(self, variables, interactive=True): |
|
1267 | def push(self, variables, interactive=True): | |
1268 | """Inject a group of variables into the IPython user namespace. |
|
1268 | """Inject a group of variables into the IPython user namespace. | |
1269 |
|
1269 | |||
1270 | Parameters |
|
1270 | Parameters | |
1271 | ---------- |
|
1271 | ---------- | |
1272 | variables : dict, str or list/tuple of str |
|
1272 | variables : dict, str or list/tuple of str | |
1273 | The variables to inject into the user's namespace. If a dict, a |
|
1273 | The variables to inject into the user's namespace. If a dict, a | |
1274 | simple update is done. If a str, the string is assumed to have |
|
1274 | simple update is done. If a str, the string is assumed to have | |
1275 | variable names separated by spaces. A list/tuple of str can also |
|
1275 | variable names separated by spaces. A list/tuple of str can also | |
1276 | be used to give the variable names. If just the variable names are |
|
1276 | be used to give the variable names. If just the variable names are | |
1277 | give (list/tuple/str) then the variable values looked up in the |
|
1277 | give (list/tuple/str) then the variable values looked up in the | |
1278 | callers frame. |
|
1278 | callers frame. | |
1279 | interactive : bool |
|
1279 | interactive : bool | |
1280 | If True (default), the variables will be listed with the ``who`` |
|
1280 | If True (default), the variables will be listed with the ``who`` | |
1281 | magic. |
|
1281 | magic. | |
1282 | """ |
|
1282 | """ | |
1283 | vdict = None |
|
1283 | vdict = None | |
1284 |
|
1284 | |||
1285 | # We need a dict of name/value pairs to do namespace updates. |
|
1285 | # We need a dict of name/value pairs to do namespace updates. | |
1286 | if isinstance(variables, dict): |
|
1286 | if isinstance(variables, dict): | |
1287 | vdict = variables |
|
1287 | vdict = variables | |
1288 | elif isinstance(variables, (basestring, list, tuple)): |
|
1288 | elif isinstance(variables, (basestring, list, tuple)): | |
1289 | if isinstance(variables, basestring): |
|
1289 | if isinstance(variables, basestring): | |
1290 | vlist = variables.split() |
|
1290 | vlist = variables.split() | |
1291 | else: |
|
1291 | else: | |
1292 | vlist = variables |
|
1292 | vlist = variables | |
1293 | vdict = {} |
|
1293 | vdict = {} | |
1294 | cf = sys._getframe(1) |
|
1294 | cf = sys._getframe(1) | |
1295 | for name in vlist: |
|
1295 | for name in vlist: | |
1296 | try: |
|
1296 | try: | |
1297 | vdict[name] = eval(name, cf.f_globals, cf.f_locals) |
|
1297 | vdict[name] = eval(name, cf.f_globals, cf.f_locals) | |
1298 | except: |
|
1298 | except: | |
1299 | print ('Could not get variable %s from %s' % |
|
1299 | print ('Could not get variable %s from %s' % | |
1300 | (name,cf.f_code.co_name)) |
|
1300 | (name,cf.f_code.co_name)) | |
1301 | else: |
|
1301 | else: | |
1302 | raise ValueError('variables must be a dict/str/list/tuple') |
|
1302 | raise ValueError('variables must be a dict/str/list/tuple') | |
1303 |
|
1303 | |||
1304 | # Propagate variables to user namespace |
|
1304 | # Propagate variables to user namespace | |
1305 | self.user_ns.update(vdict) |
|
1305 | self.user_ns.update(vdict) | |
1306 |
|
1306 | |||
1307 | # And configure interactive visibility |
|
1307 | # And configure interactive visibility | |
1308 | user_ns_hidden = self.user_ns_hidden |
|
1308 | user_ns_hidden = self.user_ns_hidden | |
1309 | if interactive: |
|
1309 | if interactive: | |
1310 | user_ns_hidden.difference_update(vdict) |
|
1310 | user_ns_hidden.difference_update(vdict) | |
1311 | else: |
|
1311 | else: | |
1312 | user_ns_hidden.update(vdict) |
|
1312 | user_ns_hidden.update(vdict) | |
1313 |
|
1313 | |||
1314 | def drop_by_id(self, variables): |
|
1314 | def drop_by_id(self, variables): | |
1315 | """Remove a dict of variables from the user namespace, if they are the |
|
1315 | """Remove a dict of variables from the user namespace, if they are the | |
1316 | same as the values in the dictionary. |
|
1316 | same as the values in the dictionary. | |
1317 |
|
1317 | |||
1318 | This is intended for use by extensions: variables that they've added can |
|
1318 | This is intended for use by extensions: variables that they've added can | |
1319 | be taken back out if they are unloaded, without removing any that the |
|
1319 | be taken back out if they are unloaded, without removing any that the | |
1320 | user has overwritten. |
|
1320 | user has overwritten. | |
1321 |
|
1321 | |||
1322 | Parameters |
|
1322 | Parameters | |
1323 | ---------- |
|
1323 | ---------- | |
1324 | variables : dict |
|
1324 | variables : dict | |
1325 | A dictionary mapping object names (as strings) to the objects. |
|
1325 | A dictionary mapping object names (as strings) to the objects. | |
1326 | """ |
|
1326 | """ | |
1327 | for name, obj in variables.iteritems(): |
|
1327 | for name, obj in variables.iteritems(): | |
1328 | if name in self.user_ns and self.user_ns[name] is obj: |
|
1328 | if name in self.user_ns and self.user_ns[name] is obj: | |
1329 | del self.user_ns[name] |
|
1329 | del self.user_ns[name] | |
1330 | self.user_ns_hidden.discard(name) |
|
1330 | self.user_ns_hidden.discard(name) | |
1331 |
|
1331 | |||
1332 | #------------------------------------------------------------------------- |
|
1332 | #------------------------------------------------------------------------- | |
1333 | # Things related to object introspection |
|
1333 | # Things related to object introspection | |
1334 | #------------------------------------------------------------------------- |
|
1334 | #------------------------------------------------------------------------- | |
1335 |
|
1335 | |||
1336 | def _ofind(self, oname, namespaces=None): |
|
1336 | def _ofind(self, oname, namespaces=None): | |
1337 | """Find an object in the available namespaces. |
|
1337 | """Find an object in the available namespaces. | |
1338 |
|
1338 | |||
1339 | self._ofind(oname) -> dict with keys: found,obj,ospace,ismagic |
|
1339 | self._ofind(oname) -> dict with keys: found,obj,ospace,ismagic | |
1340 |
|
1340 | |||
1341 | Has special code to detect magic functions. |
|
1341 | Has special code to detect magic functions. | |
1342 | """ |
|
1342 | """ | |
1343 | oname = oname.strip() |
|
1343 | oname = oname.strip() | |
1344 | #print '1- oname: <%r>' % oname # dbg |
|
1344 | #print '1- oname: <%r>' % oname # dbg | |
1345 | if not py3compat.isidentifier(oname.lstrip(ESC_MAGIC), dotted=True): |
|
1345 | if not py3compat.isidentifier(oname.lstrip(ESC_MAGIC), dotted=True): | |
1346 | return dict(found=False) |
|
1346 | return dict(found=False) | |
1347 |
|
1347 | |||
1348 | alias_ns = None |
|
1348 | alias_ns = None | |
1349 | if namespaces is None: |
|
1349 | if namespaces is None: | |
1350 | # Namespaces to search in: |
|
1350 | # Namespaces to search in: | |
1351 | # Put them in a list. The order is important so that we |
|
1351 | # Put them in a list. The order is important so that we | |
1352 | # find things in the same order that Python finds them. |
|
1352 | # find things in the same order that Python finds them. | |
1353 | namespaces = [ ('Interactive', self.user_ns), |
|
1353 | namespaces = [ ('Interactive', self.user_ns), | |
1354 | ('Interactive (global)', self.user_global_ns), |
|
1354 | ('Interactive (global)', self.user_global_ns), | |
1355 | ('Python builtin', builtin_mod.__dict__), |
|
1355 | ('Python builtin', builtin_mod.__dict__), | |
1356 | ('Alias', self.alias_manager.alias_table), |
|
1356 | ('Alias', self.alias_manager.alias_table), | |
1357 | ] |
|
1357 | ] | |
1358 | alias_ns = self.alias_manager.alias_table |
|
1358 | alias_ns = self.alias_manager.alias_table | |
1359 |
|
1359 | |||
1360 | # initialize results to 'null' |
|
1360 | # initialize results to 'null' | |
1361 | found = False; obj = None; ospace = None; ds = None; |
|
1361 | found = False; obj = None; ospace = None; ds = None; | |
1362 | ismagic = False; isalias = False; parent = None |
|
1362 | ismagic = False; isalias = False; parent = None | |
1363 |
|
1363 | |||
1364 | # We need to special-case 'print', which as of python2.6 registers as a |
|
1364 | # We need to special-case 'print', which as of python2.6 registers as a | |
1365 | # function but should only be treated as one if print_function was |
|
1365 | # function but should only be treated as one if print_function was | |
1366 | # loaded with a future import. In this case, just bail. |
|
1366 | # loaded with a future import. In this case, just bail. | |
1367 | if (oname == 'print' and not py3compat.PY3 and not \ |
|
1367 | if (oname == 'print' and not py3compat.PY3 and not \ | |
1368 | (self.compile.compiler_flags & __future__.CO_FUTURE_PRINT_FUNCTION)): |
|
1368 | (self.compile.compiler_flags & __future__.CO_FUTURE_PRINT_FUNCTION)): | |
1369 | return {'found':found, 'obj':obj, 'namespace':ospace, |
|
1369 | return {'found':found, 'obj':obj, 'namespace':ospace, | |
1370 | 'ismagic':ismagic, 'isalias':isalias, 'parent':parent} |
|
1370 | 'ismagic':ismagic, 'isalias':isalias, 'parent':parent} | |
1371 |
|
1371 | |||
1372 | # Look for the given name by splitting it in parts. If the head is |
|
1372 | # Look for the given name by splitting it in parts. If the head is | |
1373 | # found, then we look for all the remaining parts as members, and only |
|
1373 | # found, then we look for all the remaining parts as members, and only | |
1374 | # declare success if we can find them all. |
|
1374 | # declare success if we can find them all. | |
1375 | oname_parts = oname.split('.') |
|
1375 | oname_parts = oname.split('.') | |
1376 | oname_head, oname_rest = oname_parts[0],oname_parts[1:] |
|
1376 | oname_head, oname_rest = oname_parts[0],oname_parts[1:] | |
1377 | for nsname,ns in namespaces: |
|
1377 | for nsname,ns in namespaces: | |
1378 | try: |
|
1378 | try: | |
1379 | obj = ns[oname_head] |
|
1379 | obj = ns[oname_head] | |
1380 | except KeyError: |
|
1380 | except KeyError: | |
1381 | continue |
|
1381 | continue | |
1382 | else: |
|
1382 | else: | |
1383 | #print 'oname_rest:', oname_rest # dbg |
|
1383 | #print 'oname_rest:', oname_rest # dbg | |
1384 | for part in oname_rest: |
|
1384 | for part in oname_rest: | |
1385 | try: |
|
1385 | try: | |
1386 | parent = obj |
|
1386 | parent = obj | |
1387 | obj = getattr(obj,part) |
|
1387 | obj = getattr(obj,part) | |
1388 | except: |
|
1388 | except: | |
1389 | # Blanket except b/c some badly implemented objects |
|
1389 | # Blanket except b/c some badly implemented objects | |
1390 | # allow __getattr__ to raise exceptions other than |
|
1390 | # allow __getattr__ to raise exceptions other than | |
1391 | # AttributeError, which then crashes IPython. |
|
1391 | # AttributeError, which then crashes IPython. | |
1392 | break |
|
1392 | break | |
1393 | else: |
|
1393 | else: | |
1394 | # If we finish the for loop (no break), we got all members |
|
1394 | # If we finish the for loop (no break), we got all members | |
1395 | found = True |
|
1395 | found = True | |
1396 | ospace = nsname |
|
1396 | ospace = nsname | |
1397 | if ns == alias_ns: |
|
1397 | if ns == alias_ns: | |
1398 | isalias = True |
|
1398 | isalias = True | |
1399 | break # namespace loop |
|
1399 | break # namespace loop | |
1400 |
|
1400 | |||
1401 | # Try to see if it's magic |
|
1401 | # Try to see if it's magic | |
1402 | if not found: |
|
1402 | if not found: | |
1403 | if oname.startswith(ESC_MAGIC): |
|
1403 | if oname.startswith(ESC_MAGIC): | |
1404 | oname = oname.lstrip(ESC_MAGIC) |
|
1404 | oname = oname.lstrip(ESC_MAGIC) | |
1405 | obj = self.find_line_magic(oname) |
|
1405 | obj = self.find_line_magic(oname) | |
1406 | if obj is None: |
|
1406 | if obj is None: | |
1407 | obj = self.find_cell_magic(oname) |
|
1407 | obj = self.find_cell_magic(oname) | |
1408 | if obj is not None: |
|
1408 | if obj is not None: | |
1409 | found = True |
|
1409 | found = True | |
1410 | ospace = 'IPython internal' |
|
1410 | ospace = 'IPython internal' | |
1411 | ismagic = True |
|
1411 | ismagic = True | |
1412 |
|
1412 | |||
1413 | # Last try: special-case some literals like '', [], {}, etc: |
|
1413 | # Last try: special-case some literals like '', [], {}, etc: | |
1414 | if not found and oname_head in ["''",'""','[]','{}','()']: |
|
1414 | if not found and oname_head in ["''",'""','[]','{}','()']: | |
1415 | obj = eval(oname_head) |
|
1415 | obj = eval(oname_head) | |
1416 | found = True |
|
1416 | found = True | |
1417 | ospace = 'Interactive' |
|
1417 | ospace = 'Interactive' | |
1418 |
|
1418 | |||
1419 | return {'found':found, 'obj':obj, 'namespace':ospace, |
|
1419 | return {'found':found, 'obj':obj, 'namespace':ospace, | |
1420 | 'ismagic':ismagic, 'isalias':isalias, 'parent':parent} |
|
1420 | 'ismagic':ismagic, 'isalias':isalias, 'parent':parent} | |
1421 |
|
1421 | |||
1422 | def _ofind_property(self, oname, info): |
|
1422 | def _ofind_property(self, oname, info): | |
1423 | """Second part of object finding, to look for property details.""" |
|
1423 | """Second part of object finding, to look for property details.""" | |
1424 | if info.found: |
|
1424 | if info.found: | |
1425 | # Get the docstring of the class property if it exists. |
|
1425 | # Get the docstring of the class property if it exists. | |
1426 | path = oname.split('.') |
|
1426 | path = oname.split('.') | |
1427 | root = '.'.join(path[:-1]) |
|
1427 | root = '.'.join(path[:-1]) | |
1428 | if info.parent is not None: |
|
1428 | if info.parent is not None: | |
1429 | try: |
|
1429 | try: | |
1430 | target = getattr(info.parent, '__class__') |
|
1430 | target = getattr(info.parent, '__class__') | |
1431 | # The object belongs to a class instance. |
|
1431 | # The object belongs to a class instance. | |
1432 | try: |
|
1432 | try: | |
1433 | target = getattr(target, path[-1]) |
|
1433 | target = getattr(target, path[-1]) | |
1434 | # The class defines the object. |
|
1434 | # The class defines the object. | |
1435 | if isinstance(target, property): |
|
1435 | if isinstance(target, property): | |
1436 | oname = root + '.__class__.' + path[-1] |
|
1436 | oname = root + '.__class__.' + path[-1] | |
1437 | info = Struct(self._ofind(oname)) |
|
1437 | info = Struct(self._ofind(oname)) | |
1438 | except AttributeError: pass |
|
1438 | except AttributeError: pass | |
1439 | except AttributeError: pass |
|
1439 | except AttributeError: pass | |
1440 |
|
1440 | |||
1441 | # We return either the new info or the unmodified input if the object |
|
1441 | # We return either the new info or the unmodified input if the object | |
1442 | # hadn't been found |
|
1442 | # hadn't been found | |
1443 | return info |
|
1443 | return info | |
1444 |
|
1444 | |||
1445 | def _object_find(self, oname, namespaces=None): |
|
1445 | def _object_find(self, oname, namespaces=None): | |
1446 | """Find an object and return a struct with info about it.""" |
|
1446 | """Find an object and return a struct with info about it.""" | |
1447 | inf = Struct(self._ofind(oname, namespaces)) |
|
1447 | inf = Struct(self._ofind(oname, namespaces)) | |
1448 | return Struct(self._ofind_property(oname, inf)) |
|
1448 | return Struct(self._ofind_property(oname, inf)) | |
1449 |
|
1449 | |||
1450 | def _inspect(self, meth, oname, namespaces=None, **kw): |
|
1450 | def _inspect(self, meth, oname, namespaces=None, **kw): | |
1451 | """Generic interface to the inspector system. |
|
1451 | """Generic interface to the inspector system. | |
1452 |
|
1452 | |||
1453 | This function is meant to be called by pdef, pdoc & friends.""" |
|
1453 | This function is meant to be called by pdef, pdoc & friends.""" | |
1454 | info = self._object_find(oname) |
|
1454 | info = self._object_find(oname) | |
1455 | if info.found: |
|
1455 | if info.found: | |
1456 | pmethod = getattr(self.inspector, meth) |
|
1456 | pmethod = getattr(self.inspector, meth) | |
1457 | formatter = format_screen if info.ismagic else None |
|
1457 | formatter = format_screen if info.ismagic else None | |
1458 | if meth == 'pdoc': |
|
1458 | if meth == 'pdoc': | |
1459 | pmethod(info.obj, oname, formatter) |
|
1459 | pmethod(info.obj, oname, formatter) | |
1460 | elif meth == 'pinfo': |
|
1460 | elif meth == 'pinfo': | |
1461 | pmethod(info.obj, oname, formatter, info, **kw) |
|
1461 | pmethod(info.obj, oname, formatter, info, **kw) | |
1462 | else: |
|
1462 | else: | |
1463 | pmethod(info.obj, oname) |
|
1463 | pmethod(info.obj, oname) | |
1464 | else: |
|
1464 | else: | |
1465 | print 'Object `%s` not found.' % oname |
|
1465 | print 'Object `%s` not found.' % oname | |
1466 | return 'not found' # so callers can take other action |
|
1466 | return 'not found' # so callers can take other action | |
1467 |
|
1467 | |||
1468 | def object_inspect(self, oname, detail_level=0): |
|
1468 | def object_inspect(self, oname, detail_level=0): | |
1469 | with self.builtin_trap: |
|
1469 | with self.builtin_trap: | |
1470 | info = self._object_find(oname) |
|
1470 | info = self._object_find(oname) | |
1471 | if info.found: |
|
1471 | if info.found: | |
1472 | return self.inspector.info(info.obj, oname, info=info, |
|
1472 | return self.inspector.info(info.obj, oname, info=info, | |
1473 | detail_level=detail_level |
|
1473 | detail_level=detail_level | |
1474 | ) |
|
1474 | ) | |
1475 | else: |
|
1475 | else: | |
1476 | return oinspect.object_info(name=oname, found=False) |
|
1476 | return oinspect.object_info(name=oname, found=False) | |
1477 |
|
1477 | |||
1478 | #------------------------------------------------------------------------- |
|
1478 | #------------------------------------------------------------------------- | |
1479 | # Things related to history management |
|
1479 | # Things related to history management | |
1480 | #------------------------------------------------------------------------- |
|
1480 | #------------------------------------------------------------------------- | |
1481 |
|
1481 | |||
1482 | def init_history(self): |
|
1482 | def init_history(self): | |
1483 | """Sets up the command history, and starts regular autosaves.""" |
|
1483 | """Sets up the command history, and starts regular autosaves.""" | |
1484 | self.history_manager = HistoryManager(shell=self, config=self.config) |
|
1484 | self.history_manager = HistoryManager(shell=self, config=self.config) | |
1485 | self.configurables.append(self.history_manager) |
|
1485 | self.configurables.append(self.history_manager) | |
1486 |
|
1486 | |||
1487 | #------------------------------------------------------------------------- |
|
1487 | #------------------------------------------------------------------------- | |
1488 | # Things related to exception handling and tracebacks (not debugging) |
|
1488 | # Things related to exception handling and tracebacks (not debugging) | |
1489 | #------------------------------------------------------------------------- |
|
1489 | #------------------------------------------------------------------------- | |
1490 |
|
1490 | |||
1491 | def init_traceback_handlers(self, custom_exceptions): |
|
1491 | def init_traceback_handlers(self, custom_exceptions): | |
1492 | # Syntax error handler. |
|
1492 | # Syntax error handler. | |
1493 | self.SyntaxTB = ultratb.SyntaxTB(color_scheme='NoColor') |
|
1493 | self.SyntaxTB = ultratb.SyntaxTB(color_scheme='NoColor') | |
1494 |
|
1494 | |||
1495 | # The interactive one is initialized with an offset, meaning we always |
|
1495 | # The interactive one is initialized with an offset, meaning we always | |
1496 | # want to remove the topmost item in the traceback, which is our own |
|
1496 | # want to remove the topmost item in the traceback, which is our own | |
1497 | # internal code. Valid modes: ['Plain','Context','Verbose'] |
|
1497 | # internal code. Valid modes: ['Plain','Context','Verbose'] | |
1498 | self.InteractiveTB = ultratb.AutoFormattedTB(mode = 'Plain', |
|
1498 | self.InteractiveTB = ultratb.AutoFormattedTB(mode = 'Plain', | |
1499 | color_scheme='NoColor', |
|
1499 | color_scheme='NoColor', | |
1500 | tb_offset = 1, |
|
1500 | tb_offset = 1, | |
1501 | check_cache=self.compile.check_cache) |
|
1501 | check_cache=self.compile.check_cache) | |
1502 |
|
1502 | |||
1503 | # The instance will store a pointer to the system-wide exception hook, |
|
1503 | # The instance will store a pointer to the system-wide exception hook, | |
1504 | # so that runtime code (such as magics) can access it. This is because |
|
1504 | # so that runtime code (such as magics) can access it. This is because | |
1505 | # during the read-eval loop, it may get temporarily overwritten. |
|
1505 | # during the read-eval loop, it may get temporarily overwritten. | |
1506 | self.sys_excepthook = sys.excepthook |
|
1506 | self.sys_excepthook = sys.excepthook | |
1507 |
|
1507 | |||
1508 | # and add any custom exception handlers the user may have specified |
|
1508 | # and add any custom exception handlers the user may have specified | |
1509 | self.set_custom_exc(*custom_exceptions) |
|
1509 | self.set_custom_exc(*custom_exceptions) | |
1510 |
|
1510 | |||
1511 | # Set the exception mode |
|
1511 | # Set the exception mode | |
1512 | self.InteractiveTB.set_mode(mode=self.xmode) |
|
1512 | self.InteractiveTB.set_mode(mode=self.xmode) | |
1513 |
|
1513 | |||
1514 | def set_custom_exc(self, exc_tuple, handler): |
|
1514 | def set_custom_exc(self, exc_tuple, handler): | |
1515 | """set_custom_exc(exc_tuple,handler) |
|
1515 | """set_custom_exc(exc_tuple,handler) | |
1516 |
|
1516 | |||
1517 | Set a custom exception handler, which will be called if any of the |
|
1517 | Set a custom exception handler, which will be called if any of the | |
1518 | exceptions in exc_tuple occur in the mainloop (specifically, in the |
|
1518 | exceptions in exc_tuple occur in the mainloop (specifically, in the | |
1519 | run_code() method). |
|
1519 | run_code() method). | |
1520 |
|
1520 | |||
1521 | Parameters |
|
1521 | Parameters | |
1522 | ---------- |
|
1522 | ---------- | |
1523 |
|
1523 | |||
1524 | exc_tuple : tuple of exception classes |
|
1524 | exc_tuple : tuple of exception classes | |
1525 | A *tuple* of exception classes, for which to call the defined |
|
1525 | A *tuple* of exception classes, for which to call the defined | |
1526 | handler. It is very important that you use a tuple, and NOT A |
|
1526 | handler. It is very important that you use a tuple, and NOT A | |
1527 | LIST here, because of the way Python's except statement works. If |
|
1527 | LIST here, because of the way Python's except statement works. If | |
1528 | you only want to trap a single exception, use a singleton tuple:: |
|
1528 | you only want to trap a single exception, use a singleton tuple:: | |
1529 |
|
1529 | |||
1530 | exc_tuple == (MyCustomException,) |
|
1530 | exc_tuple == (MyCustomException,) | |
1531 |
|
1531 | |||
1532 | handler : callable |
|
1532 | handler : callable | |
1533 | handler must have the following signature:: |
|
1533 | handler must have the following signature:: | |
1534 |
|
1534 | |||
1535 | def my_handler(self, etype, value, tb, tb_offset=None): |
|
1535 | def my_handler(self, etype, value, tb, tb_offset=None): | |
1536 | ... |
|
1536 | ... | |
1537 | return structured_traceback |
|
1537 | return structured_traceback | |
1538 |
|
1538 | |||
1539 | Your handler must return a structured traceback (a list of strings), |
|
1539 | Your handler must return a structured traceback (a list of strings), | |
1540 | or None. |
|
1540 | or None. | |
1541 |
|
1541 | |||
1542 | This will be made into an instance method (via types.MethodType) |
|
1542 | This will be made into an instance method (via types.MethodType) | |
1543 | of IPython itself, and it will be called if any of the exceptions |
|
1543 | of IPython itself, and it will be called if any of the exceptions | |
1544 | listed in the exc_tuple are caught. If the handler is None, an |
|
1544 | listed in the exc_tuple are caught. If the handler is None, an | |
1545 | internal basic one is used, which just prints basic info. |
|
1545 | internal basic one is used, which just prints basic info. | |
1546 |
|
1546 | |||
1547 | To protect IPython from crashes, if your handler ever raises an |
|
1547 | To protect IPython from crashes, if your handler ever raises an | |
1548 | exception or returns an invalid result, it will be immediately |
|
1548 | exception or returns an invalid result, it will be immediately | |
1549 | disabled. |
|
1549 | disabled. | |
1550 |
|
1550 | |||
1551 | WARNING: by putting in your own exception handler into IPython's main |
|
1551 | WARNING: by putting in your own exception handler into IPython's main | |
1552 | execution loop, you run a very good chance of nasty crashes. This |
|
1552 | execution loop, you run a very good chance of nasty crashes. This | |
1553 | facility should only be used if you really know what you are doing.""" |
|
1553 | facility should only be used if you really know what you are doing.""" | |
1554 |
|
1554 | |||
1555 | assert type(exc_tuple)==type(()) , \ |
|
1555 | assert type(exc_tuple)==type(()) , \ | |
1556 | "The custom exceptions must be given AS A TUPLE." |
|
1556 | "The custom exceptions must be given AS A TUPLE." | |
1557 |
|
1557 | |||
1558 | def dummy_handler(self,etype,value,tb,tb_offset=None): |
|
1558 | def dummy_handler(self,etype,value,tb,tb_offset=None): | |
1559 | print '*** Simple custom exception handler ***' |
|
1559 | print '*** Simple custom exception handler ***' | |
1560 | print 'Exception type :',etype |
|
1560 | print 'Exception type :',etype | |
1561 | print 'Exception value:',value |
|
1561 | print 'Exception value:',value | |
1562 | print 'Traceback :',tb |
|
1562 | print 'Traceback :',tb | |
1563 | #print 'Source code :','\n'.join(self.buffer) |
|
1563 | #print 'Source code :','\n'.join(self.buffer) | |
1564 |
|
1564 | |||
1565 | def validate_stb(stb): |
|
1565 | def validate_stb(stb): | |
1566 | """validate structured traceback return type |
|
1566 | """validate structured traceback return type | |
1567 |
|
1567 | |||
1568 | return type of CustomTB *should* be a list of strings, but allow |
|
1568 | return type of CustomTB *should* be a list of strings, but allow | |
1569 | single strings or None, which are harmless. |
|
1569 | single strings or None, which are harmless. | |
1570 |
|
1570 | |||
1571 | This function will *always* return a list of strings, |
|
1571 | This function will *always* return a list of strings, | |
1572 | and will raise a TypeError if stb is inappropriate. |
|
1572 | and will raise a TypeError if stb is inappropriate. | |
1573 | """ |
|
1573 | """ | |
1574 | msg = "CustomTB must return list of strings, not %r" % stb |
|
1574 | msg = "CustomTB must return list of strings, not %r" % stb | |
1575 | if stb is None: |
|
1575 | if stb is None: | |
1576 | return [] |
|
1576 | return [] | |
1577 | elif isinstance(stb, basestring): |
|
1577 | elif isinstance(stb, basestring): | |
1578 | return [stb] |
|
1578 | return [stb] | |
1579 | elif not isinstance(stb, list): |
|
1579 | elif not isinstance(stb, list): | |
1580 | raise TypeError(msg) |
|
1580 | raise TypeError(msg) | |
1581 | # it's a list |
|
1581 | # it's a list | |
1582 | for line in stb: |
|
1582 | for line in stb: | |
1583 | # check every element |
|
1583 | # check every element | |
1584 | if not isinstance(line, basestring): |
|
1584 | if not isinstance(line, basestring): | |
1585 | raise TypeError(msg) |
|
1585 | raise TypeError(msg) | |
1586 | return stb |
|
1586 | return stb | |
1587 |
|
1587 | |||
1588 | if handler is None: |
|
1588 | if handler is None: | |
1589 | wrapped = dummy_handler |
|
1589 | wrapped = dummy_handler | |
1590 | else: |
|
1590 | else: | |
1591 | def wrapped(self,etype,value,tb,tb_offset=None): |
|
1591 | def wrapped(self,etype,value,tb,tb_offset=None): | |
1592 | """wrap CustomTB handler, to protect IPython from user code |
|
1592 | """wrap CustomTB handler, to protect IPython from user code | |
1593 |
|
1593 | |||
1594 | This makes it harder (but not impossible) for custom exception |
|
1594 | This makes it harder (but not impossible) for custom exception | |
1595 | handlers to crash IPython. |
|
1595 | handlers to crash IPython. | |
1596 | """ |
|
1596 | """ | |
1597 | try: |
|
1597 | try: | |
1598 | stb = handler(self,etype,value,tb,tb_offset=tb_offset) |
|
1598 | stb = handler(self,etype,value,tb,tb_offset=tb_offset) | |
1599 | return validate_stb(stb) |
|
1599 | return validate_stb(stb) | |
1600 | except: |
|
1600 | except: | |
1601 | # clear custom handler immediately |
|
1601 | # clear custom handler immediately | |
1602 | self.set_custom_exc((), None) |
|
1602 | self.set_custom_exc((), None) | |
1603 | print >> io.stderr, "Custom TB Handler failed, unregistering" |
|
1603 | print >> io.stderr, "Custom TB Handler failed, unregistering" | |
1604 | # show the exception in handler first |
|
1604 | # show the exception in handler first | |
1605 | stb = self.InteractiveTB.structured_traceback(*sys.exc_info()) |
|
1605 | stb = self.InteractiveTB.structured_traceback(*sys.exc_info()) | |
1606 | print >> io.stdout, self.InteractiveTB.stb2text(stb) |
|
1606 | print >> io.stdout, self.InteractiveTB.stb2text(stb) | |
1607 | print >> io.stdout, "The original exception:" |
|
1607 | print >> io.stdout, "The original exception:" | |
1608 | stb = self.InteractiveTB.structured_traceback( |
|
1608 | stb = self.InteractiveTB.structured_traceback( | |
1609 | (etype,value,tb), tb_offset=tb_offset |
|
1609 | (etype,value,tb), tb_offset=tb_offset | |
1610 | ) |
|
1610 | ) | |
1611 | return stb |
|
1611 | return stb | |
1612 |
|
1612 | |||
1613 | self.CustomTB = types.MethodType(wrapped,self) |
|
1613 | self.CustomTB = types.MethodType(wrapped,self) | |
1614 | self.custom_exceptions = exc_tuple |
|
1614 | self.custom_exceptions = exc_tuple | |
1615 |
|
1615 | |||
1616 | def excepthook(self, etype, value, tb): |
|
1616 | def excepthook(self, etype, value, tb): | |
1617 | """One more defense for GUI apps that call sys.excepthook. |
|
1617 | """One more defense for GUI apps that call sys.excepthook. | |
1618 |
|
1618 | |||
1619 | GUI frameworks like wxPython trap exceptions and call |
|
1619 | GUI frameworks like wxPython trap exceptions and call | |
1620 | sys.excepthook themselves. I guess this is a feature that |
|
1620 | sys.excepthook themselves. I guess this is a feature that | |
1621 | enables them to keep running after exceptions that would |
|
1621 | enables them to keep running after exceptions that would | |
1622 | otherwise kill their mainloop. This is a bother for IPython |
|
1622 | otherwise kill their mainloop. This is a bother for IPython | |
1623 | which excepts to catch all of the program exceptions with a try: |
|
1623 | which excepts to catch all of the program exceptions with a try: | |
1624 | except: statement. |
|
1624 | except: statement. | |
1625 |
|
1625 | |||
1626 | Normally, IPython sets sys.excepthook to a CrashHandler instance, so if |
|
1626 | Normally, IPython sets sys.excepthook to a CrashHandler instance, so if | |
1627 | any app directly invokes sys.excepthook, it will look to the user like |
|
1627 | any app directly invokes sys.excepthook, it will look to the user like | |
1628 | IPython crashed. In order to work around this, we can disable the |
|
1628 | IPython crashed. In order to work around this, we can disable the | |
1629 | CrashHandler and replace it with this excepthook instead, which prints a |
|
1629 | CrashHandler and replace it with this excepthook instead, which prints a | |
1630 | regular traceback using our InteractiveTB. In this fashion, apps which |
|
1630 | regular traceback using our InteractiveTB. In this fashion, apps which | |
1631 | call sys.excepthook will generate a regular-looking exception from |
|
1631 | call sys.excepthook will generate a regular-looking exception from | |
1632 | IPython, and the CrashHandler will only be triggered by real IPython |
|
1632 | IPython, and the CrashHandler will only be triggered by real IPython | |
1633 | crashes. |
|
1633 | crashes. | |
1634 |
|
1634 | |||
1635 | This hook should be used sparingly, only in places which are not likely |
|
1635 | This hook should be used sparingly, only in places which are not likely | |
1636 | to be true IPython errors. |
|
1636 | to be true IPython errors. | |
1637 | """ |
|
1637 | """ | |
1638 | self.showtraceback((etype,value,tb),tb_offset=0) |
|
1638 | self.showtraceback((etype,value,tb),tb_offset=0) | |
1639 |
|
1639 | |||
1640 | def _get_exc_info(self, exc_tuple=None): |
|
1640 | def _get_exc_info(self, exc_tuple=None): | |
1641 | """get exc_info from a given tuple, sys.exc_info() or sys.last_type etc. |
|
1641 | """get exc_info from a given tuple, sys.exc_info() or sys.last_type etc. | |
1642 |
|
1642 | |||
1643 | Ensures sys.last_type,value,traceback hold the exc_info we found, |
|
1643 | Ensures sys.last_type,value,traceback hold the exc_info we found, | |
1644 | from whichever source. |
|
1644 | from whichever source. | |
1645 |
|
1645 | |||
1646 | raises ValueError if none of these contain any information |
|
1646 | raises ValueError if none of these contain any information | |
1647 | """ |
|
1647 | """ | |
1648 | if exc_tuple is None: |
|
1648 | if exc_tuple is None: | |
1649 | etype, value, tb = sys.exc_info() |
|
1649 | etype, value, tb = sys.exc_info() | |
1650 | else: |
|
1650 | else: | |
1651 | etype, value, tb = exc_tuple |
|
1651 | etype, value, tb = exc_tuple | |
1652 |
|
1652 | |||
1653 | if etype is None: |
|
1653 | if etype is None: | |
1654 | if hasattr(sys, 'last_type'): |
|
1654 | if hasattr(sys, 'last_type'): | |
1655 | etype, value, tb = sys.last_type, sys.last_value, \ |
|
1655 | etype, value, tb = sys.last_type, sys.last_value, \ | |
1656 | sys.last_traceback |
|
1656 | sys.last_traceback | |
1657 |
|
1657 | |||
1658 | if etype is None: |
|
1658 | if etype is None: | |
1659 | raise ValueError("No exception to find") |
|
1659 | raise ValueError("No exception to find") | |
1660 |
|
1660 | |||
1661 | # Now store the exception info in sys.last_type etc. |
|
1661 | # Now store the exception info in sys.last_type etc. | |
1662 | # WARNING: these variables are somewhat deprecated and not |
|
1662 | # WARNING: these variables are somewhat deprecated and not | |
1663 | # necessarily safe to use in a threaded environment, but tools |
|
1663 | # necessarily safe to use in a threaded environment, but tools | |
1664 | # like pdb depend on their existence, so let's set them. If we |
|
1664 | # like pdb depend on their existence, so let's set them. If we | |
1665 | # find problems in the field, we'll need to revisit their use. |
|
1665 | # find problems in the field, we'll need to revisit their use. | |
1666 | sys.last_type = etype |
|
1666 | sys.last_type = etype | |
1667 | sys.last_value = value |
|
1667 | sys.last_value = value | |
1668 | sys.last_traceback = tb |
|
1668 | sys.last_traceback = tb | |
1669 |
|
1669 | |||
1670 | return etype, value, tb |
|
1670 | return etype, value, tb | |
1671 |
|
1671 | |||
1672 |
|
1672 | |||
1673 | def showtraceback(self,exc_tuple = None,filename=None,tb_offset=None, |
|
1673 | def showtraceback(self,exc_tuple = None,filename=None,tb_offset=None, | |
1674 | exception_only=False): |
|
1674 | exception_only=False): | |
1675 | """Display the exception that just occurred. |
|
1675 | """Display the exception that just occurred. | |
1676 |
|
1676 | |||
1677 | If nothing is known about the exception, this is the method which |
|
1677 | If nothing is known about the exception, this is the method which | |
1678 | should be used throughout the code for presenting user tracebacks, |
|
1678 | should be used throughout the code for presenting user tracebacks, | |
1679 | rather than directly invoking the InteractiveTB object. |
|
1679 | rather than directly invoking the InteractiveTB object. | |
1680 |
|
1680 | |||
1681 | A specific showsyntaxerror() also exists, but this method can take |
|
1681 | A specific showsyntaxerror() also exists, but this method can take | |
1682 | care of calling it if needed, so unless you are explicitly catching a |
|
1682 | care of calling it if needed, so unless you are explicitly catching a | |
1683 | SyntaxError exception, don't try to analyze the stack manually and |
|
1683 | SyntaxError exception, don't try to analyze the stack manually and | |
1684 | simply call this method.""" |
|
1684 | simply call this method.""" | |
1685 |
|
1685 | |||
1686 | try: |
|
1686 | try: | |
1687 | try: |
|
1687 | try: | |
1688 | etype, value, tb = self._get_exc_info(exc_tuple) |
|
1688 | etype, value, tb = self._get_exc_info(exc_tuple) | |
1689 | except ValueError: |
|
1689 | except ValueError: | |
1690 | self.write_err('No traceback available to show.\n') |
|
1690 | self.write_err('No traceback available to show.\n') | |
1691 | return |
|
1691 | return | |
1692 |
|
1692 | |||
1693 | if etype is SyntaxError: |
|
1693 | if etype is SyntaxError: | |
1694 | # Though this won't be called by syntax errors in the input |
|
1694 | # Though this won't be called by syntax errors in the input | |
1695 | # line, there may be SyntaxError cases with imported code. |
|
1695 | # line, there may be SyntaxError cases with imported code. | |
1696 | self.showsyntaxerror(filename) |
|
1696 | self.showsyntaxerror(filename) | |
1697 | elif etype is UsageError: |
|
1697 | elif etype is UsageError: | |
1698 | self.write_err("UsageError: %s" % value) |
|
1698 | self.write_err("UsageError: %s" % value) | |
1699 | else: |
|
1699 | else: | |
1700 | if etype in self.custom_exceptions: |
|
1700 | if etype in self.custom_exceptions: | |
1701 | stb = self.CustomTB(etype, value, tb, tb_offset) |
|
1701 | stb = self.CustomTB(etype, value, tb, tb_offset) | |
1702 | else: |
|
1702 | else: | |
1703 | if exception_only: |
|
1703 | if exception_only: | |
1704 | stb = ['An exception has occurred, use %tb to see ' |
|
1704 | stb = ['An exception has occurred, use %tb to see ' | |
1705 | 'the full traceback.\n'] |
|
1705 | 'the full traceback.\n'] | |
1706 | stb.extend(self.InteractiveTB.get_exception_only(etype, |
|
1706 | stb.extend(self.InteractiveTB.get_exception_only(etype, | |
1707 | value)) |
|
1707 | value)) | |
1708 | else: |
|
1708 | else: | |
1709 | stb = self.InteractiveTB.structured_traceback(etype, |
|
1709 | stb = self.InteractiveTB.structured_traceback(etype, | |
1710 | value, tb, tb_offset=tb_offset) |
|
1710 | value, tb, tb_offset=tb_offset) | |
1711 |
|
1711 | |||
1712 | self._showtraceback(etype, value, stb) |
|
1712 | self._showtraceback(etype, value, stb) | |
1713 | if self.call_pdb: |
|
1713 | if self.call_pdb: | |
1714 | # drop into debugger |
|
1714 | # drop into debugger | |
1715 | self.debugger(force=True) |
|
1715 | self.debugger(force=True) | |
1716 | return |
|
1716 | return | |
1717 |
|
1717 | |||
1718 | # Actually show the traceback |
|
1718 | # Actually show the traceback | |
1719 | self._showtraceback(etype, value, stb) |
|
1719 | self._showtraceback(etype, value, stb) | |
1720 |
|
1720 | |||
1721 | except KeyboardInterrupt: |
|
1721 | except KeyboardInterrupt: | |
1722 | self.write_err("\nKeyboardInterrupt\n") |
|
1722 | self.write_err("\nKeyboardInterrupt\n") | |
1723 |
|
1723 | |||
1724 | def _showtraceback(self, etype, evalue, stb): |
|
1724 | def _showtraceback(self, etype, evalue, stb): | |
1725 | """Actually show a traceback. |
|
1725 | """Actually show a traceback. | |
1726 |
|
1726 | |||
1727 | Subclasses may override this method to put the traceback on a different |
|
1727 | Subclasses may override this method to put the traceback on a different | |
1728 | place, like a side channel. |
|
1728 | place, like a side channel. | |
1729 | """ |
|
1729 | """ | |
1730 | print >> io.stdout, self.InteractiveTB.stb2text(stb) |
|
1730 | print >> io.stdout, self.InteractiveTB.stb2text(stb) | |
1731 |
|
1731 | |||
1732 | def showsyntaxerror(self, filename=None): |
|
1732 | def showsyntaxerror(self, filename=None): | |
1733 | """Display the syntax error that just occurred. |
|
1733 | """Display the syntax error that just occurred. | |
1734 |
|
1734 | |||
1735 | This doesn't display a stack trace because there isn't one. |
|
1735 | This doesn't display a stack trace because there isn't one. | |
1736 |
|
1736 | |||
1737 | If a filename is given, it is stuffed in the exception instead |
|
1737 | If a filename is given, it is stuffed in the exception instead | |
1738 | of what was there before (because Python's parser always uses |
|
1738 | of what was there before (because Python's parser always uses | |
1739 | "<string>" when reading from a string). |
|
1739 | "<string>" when reading from a string). | |
1740 | """ |
|
1740 | """ | |
1741 | etype, value, last_traceback = self._get_exc_info() |
|
1741 | etype, value, last_traceback = self._get_exc_info() | |
1742 |
|
1742 | |||
1743 | if filename and etype is SyntaxError: |
|
1743 | if filename and etype is SyntaxError: | |
1744 | try: |
|
1744 | try: | |
1745 | value.filename = filename |
|
1745 | value.filename = filename | |
1746 | except: |
|
1746 | except: | |
1747 | # Not the format we expect; leave it alone |
|
1747 | # Not the format we expect; leave it alone | |
1748 | pass |
|
1748 | pass | |
1749 |
|
1749 | |||
1750 | stb = self.SyntaxTB.structured_traceback(etype, value, []) |
|
1750 | stb = self.SyntaxTB.structured_traceback(etype, value, []) | |
1751 | self._showtraceback(etype, value, stb) |
|
1751 | self._showtraceback(etype, value, stb) | |
1752 |
|
1752 | |||
1753 | # This is overridden in TerminalInteractiveShell to show a message about |
|
1753 | # This is overridden in TerminalInteractiveShell to show a message about | |
1754 | # the %paste magic. |
|
1754 | # the %paste magic. | |
1755 | def showindentationerror(self): |
|
1755 | def showindentationerror(self): | |
1756 | """Called by run_cell when there's an IndentationError in code entered |
|
1756 | """Called by run_cell when there's an IndentationError in code entered | |
1757 | at the prompt. |
|
1757 | at the prompt. | |
1758 |
|
1758 | |||
1759 | This is overridden in TerminalInteractiveShell to show a message about |
|
1759 | This is overridden in TerminalInteractiveShell to show a message about | |
1760 | the %paste magic.""" |
|
1760 | the %paste magic.""" | |
1761 | self.showsyntaxerror() |
|
1761 | self.showsyntaxerror() | |
1762 |
|
1762 | |||
1763 | #------------------------------------------------------------------------- |
|
1763 | #------------------------------------------------------------------------- | |
1764 | # Things related to readline |
|
1764 | # Things related to readline | |
1765 | #------------------------------------------------------------------------- |
|
1765 | #------------------------------------------------------------------------- | |
1766 |
|
1766 | |||
1767 | def init_readline(self): |
|
1767 | def init_readline(self): | |
1768 | """Command history completion/saving/reloading.""" |
|
1768 | """Command history completion/saving/reloading.""" | |
1769 |
|
1769 | |||
1770 | if self.readline_use: |
|
1770 | if self.readline_use: | |
1771 | import IPython.utils.rlineimpl as readline |
|
1771 | import IPython.utils.rlineimpl as readline | |
1772 |
|
1772 | |||
1773 | self.rl_next_input = None |
|
1773 | self.rl_next_input = None | |
1774 | self.rl_do_indent = False |
|
1774 | self.rl_do_indent = False | |
1775 |
|
1775 | |||
1776 | if not self.readline_use or not readline.have_readline: |
|
1776 | if not self.readline_use or not readline.have_readline: | |
1777 | self.has_readline = False |
|
1777 | self.has_readline = False | |
1778 | self.readline = None |
|
1778 | self.readline = None | |
1779 | # Set a number of methods that depend on readline to be no-op |
|
1779 | # Set a number of methods that depend on readline to be no-op | |
1780 | self.readline_no_record = no_op_context |
|
1780 | self.readline_no_record = no_op_context | |
1781 | self.set_readline_completer = no_op |
|
1781 | self.set_readline_completer = no_op | |
1782 | self.set_custom_completer = no_op |
|
1782 | self.set_custom_completer = no_op | |
1783 | self.set_completer_frame = no_op |
|
1783 | self.set_completer_frame = no_op | |
1784 | if self.readline_use: |
|
1784 | if self.readline_use: | |
1785 | warn('Readline services not available or not loaded.') |
|
1785 | warn('Readline services not available or not loaded.') | |
1786 | else: |
|
1786 | else: | |
1787 | self.has_readline = True |
|
1787 | self.has_readline = True | |
1788 | self.readline = readline |
|
1788 | self.readline = readline | |
1789 | sys.modules['readline'] = readline |
|
1789 | sys.modules['readline'] = readline | |
1790 |
|
1790 | |||
1791 | # Platform-specific configuration |
|
1791 | # Platform-specific configuration | |
1792 | if os.name == 'nt': |
|
1792 | if os.name == 'nt': | |
1793 | # FIXME - check with Frederick to see if we can harmonize |
|
1793 | # FIXME - check with Frederick to see if we can harmonize | |
1794 | # naming conventions with pyreadline to avoid this |
|
1794 | # naming conventions with pyreadline to avoid this | |
1795 | # platform-dependent check |
|
1795 | # platform-dependent check | |
1796 | self.readline_startup_hook = readline.set_pre_input_hook |
|
1796 | self.readline_startup_hook = readline.set_pre_input_hook | |
1797 | else: |
|
1797 | else: | |
1798 | self.readline_startup_hook = readline.set_startup_hook |
|
1798 | self.readline_startup_hook = readline.set_startup_hook | |
1799 |
|
1799 | |||
1800 | # Load user's initrc file (readline config) |
|
1800 | # Load user's initrc file (readline config) | |
1801 | # Or if libedit is used, load editrc. |
|
1801 | # Or if libedit is used, load editrc. | |
1802 | inputrc_name = os.environ.get('INPUTRC') |
|
1802 | inputrc_name = os.environ.get('INPUTRC') | |
1803 | if inputrc_name is None: |
|
1803 | if inputrc_name is None: | |
1804 | inputrc_name = '.inputrc' |
|
1804 | inputrc_name = '.inputrc' | |
1805 | if readline.uses_libedit: |
|
1805 | if readline.uses_libedit: | |
1806 | inputrc_name = '.editrc' |
|
1806 | inputrc_name = '.editrc' | |
1807 | inputrc_name = os.path.join(self.home_dir, inputrc_name) |
|
1807 | inputrc_name = os.path.join(self.home_dir, inputrc_name) | |
1808 | if os.path.isfile(inputrc_name): |
|
1808 | if os.path.isfile(inputrc_name): | |
1809 | try: |
|
1809 | try: | |
1810 | readline.read_init_file(inputrc_name) |
|
1810 | readline.read_init_file(inputrc_name) | |
1811 | except: |
|
1811 | except: | |
1812 | warn('Problems reading readline initialization file <%s>' |
|
1812 | warn('Problems reading readline initialization file <%s>' | |
1813 | % inputrc_name) |
|
1813 | % inputrc_name) | |
1814 |
|
1814 | |||
1815 | # Configure readline according to user's prefs |
|
1815 | # Configure readline according to user's prefs | |
1816 | # This is only done if GNU readline is being used. If libedit |
|
1816 | # This is only done if GNU readline is being used. If libedit | |
1817 | # is being used (as on Leopard) the readline config is |
|
1817 | # is being used (as on Leopard) the readline config is | |
1818 | # not run as the syntax for libedit is different. |
|
1818 | # not run as the syntax for libedit is different. | |
1819 | if not readline.uses_libedit: |
|
1819 | if not readline.uses_libedit: | |
1820 | for rlcommand in self.readline_parse_and_bind: |
|
1820 | for rlcommand in self.readline_parse_and_bind: | |
1821 | #print "loading rl:",rlcommand # dbg |
|
1821 | #print "loading rl:",rlcommand # dbg | |
1822 | readline.parse_and_bind(rlcommand) |
|
1822 | readline.parse_and_bind(rlcommand) | |
1823 |
|
1823 | |||
1824 | # Remove some chars from the delimiters list. If we encounter |
|
1824 | # Remove some chars from the delimiters list. If we encounter | |
1825 | # unicode chars, discard them. |
|
1825 | # unicode chars, discard them. | |
1826 | delims = readline.get_completer_delims() |
|
1826 | delims = readline.get_completer_delims() | |
1827 | if not py3compat.PY3: |
|
1827 | if not py3compat.PY3: | |
1828 | delims = delims.encode("ascii", "ignore") |
|
1828 | delims = delims.encode("ascii", "ignore") | |
1829 | for d in self.readline_remove_delims: |
|
1829 | for d in self.readline_remove_delims: | |
1830 | delims = delims.replace(d, "") |
|
1830 | delims = delims.replace(d, "") | |
1831 | delims = delims.replace(ESC_MAGIC, '') |
|
1831 | delims = delims.replace(ESC_MAGIC, '') | |
1832 | readline.set_completer_delims(delims) |
|
1832 | readline.set_completer_delims(delims) | |
1833 | # otherwise we end up with a monster history after a while: |
|
1833 | # otherwise we end up with a monster history after a while: | |
1834 | readline.set_history_length(self.history_length) |
|
1834 | readline.set_history_length(self.history_length) | |
1835 |
|
1835 | |||
1836 | self.refill_readline_hist() |
|
1836 | self.refill_readline_hist() | |
1837 | self.readline_no_record = ReadlineNoRecord(self) |
|
1837 | self.readline_no_record = ReadlineNoRecord(self) | |
1838 |
|
1838 | |||
1839 | # Configure auto-indent for all platforms |
|
1839 | # Configure auto-indent for all platforms | |
1840 | self.set_autoindent(self.autoindent) |
|
1840 | self.set_autoindent(self.autoindent) | |
1841 |
|
1841 | |||
1842 | def refill_readline_hist(self): |
|
1842 | def refill_readline_hist(self): | |
1843 | # Load the last 1000 lines from history |
|
1843 | # Load the last 1000 lines from history | |
1844 | self.readline.clear_history() |
|
1844 | self.readline.clear_history() | |
1845 | stdin_encoding = sys.stdin.encoding or "utf-8" |
|
1845 | stdin_encoding = sys.stdin.encoding or "utf-8" | |
1846 | last_cell = u"" |
|
1846 | last_cell = u"" | |
1847 | for _, _, cell in self.history_manager.get_tail(1000, |
|
1847 | for _, _, cell in self.history_manager.get_tail(1000, | |
1848 | include_latest=True): |
|
1848 | include_latest=True): | |
1849 | # Ignore blank lines and consecutive duplicates |
|
1849 | # Ignore blank lines and consecutive duplicates | |
1850 | cell = cell.rstrip() |
|
1850 | cell = cell.rstrip() | |
1851 | if cell and (cell != last_cell): |
|
1851 | if cell and (cell != last_cell): | |
1852 | if self.multiline_history: |
|
1852 | if self.multiline_history: | |
1853 | self.readline.add_history(py3compat.unicode_to_str(cell, |
|
1853 | self.readline.add_history(py3compat.unicode_to_str(cell, | |
1854 | stdin_encoding)) |
|
1854 | stdin_encoding)) | |
1855 | else: |
|
1855 | else: | |
1856 | for line in cell.splitlines(): |
|
1856 | for line in cell.splitlines(): | |
1857 | self.readline.add_history(py3compat.unicode_to_str(line, |
|
1857 | self.readline.add_history(py3compat.unicode_to_str(line, | |
1858 | stdin_encoding)) |
|
1858 | stdin_encoding)) | |
1859 | last_cell = cell |
|
1859 | last_cell = cell | |
1860 |
|
1860 | |||
1861 | def set_next_input(self, s): |
|
1861 | def set_next_input(self, s): | |
1862 | """ Sets the 'default' input string for the next command line. |
|
1862 | """ Sets the 'default' input string for the next command line. | |
1863 |
|
1863 | |||
1864 | Requires readline. |
|
1864 | Requires readline. | |
1865 |
|
1865 | |||
1866 | Example: |
|
1866 | Example: | |
1867 |
|
1867 | |||
1868 | [D:\ipython]|1> _ip.set_next_input("Hello Word") |
|
1868 | [D:\ipython]|1> _ip.set_next_input("Hello Word") | |
1869 | [D:\ipython]|2> Hello Word_ # cursor is here |
|
1869 | [D:\ipython]|2> Hello Word_ # cursor is here | |
1870 | """ |
|
1870 | """ | |
1871 | self.rl_next_input = py3compat.cast_bytes_py2(s) |
|
1871 | self.rl_next_input = py3compat.cast_bytes_py2(s) | |
1872 |
|
1872 | |||
1873 | # Maybe move this to the terminal subclass? |
|
1873 | # Maybe move this to the terminal subclass? | |
1874 | def pre_readline(self): |
|
1874 | def pre_readline(self): | |
1875 | """readline hook to be used at the start of each line. |
|
1875 | """readline hook to be used at the start of each line. | |
1876 |
|
1876 | |||
1877 | Currently it handles auto-indent only.""" |
|
1877 | Currently it handles auto-indent only.""" | |
1878 |
|
1878 | |||
1879 | if self.rl_do_indent: |
|
1879 | if self.rl_do_indent: | |
1880 | self.readline.insert_text(self._indent_current_str()) |
|
1880 | self.readline.insert_text(self._indent_current_str()) | |
1881 | if self.rl_next_input is not None: |
|
1881 | if self.rl_next_input is not None: | |
1882 | self.readline.insert_text(self.rl_next_input) |
|
1882 | self.readline.insert_text(self.rl_next_input) | |
1883 | self.rl_next_input = None |
|
1883 | self.rl_next_input = None | |
1884 |
|
1884 | |||
1885 | def _indent_current_str(self): |
|
1885 | def _indent_current_str(self): | |
1886 | """return the current level of indentation as a string""" |
|
1886 | """return the current level of indentation as a string""" | |
1887 | return self.input_splitter.indent_spaces * ' ' |
|
1887 | return self.input_splitter.indent_spaces * ' ' | |
1888 |
|
1888 | |||
1889 | #------------------------------------------------------------------------- |
|
1889 | #------------------------------------------------------------------------- | |
1890 | # Things related to text completion |
|
1890 | # Things related to text completion | |
1891 | #------------------------------------------------------------------------- |
|
1891 | #------------------------------------------------------------------------- | |
1892 |
|
1892 | |||
1893 | def init_completer(self): |
|
1893 | def init_completer(self): | |
1894 | """Initialize the completion machinery. |
|
1894 | """Initialize the completion machinery. | |
1895 |
|
1895 | |||
1896 | This creates completion machinery that can be used by client code, |
|
1896 | This creates completion machinery that can be used by client code, | |
1897 | either interactively in-process (typically triggered by the readline |
|
1897 | either interactively in-process (typically triggered by the readline | |
1898 | library), programatically (such as in test suites) or out-of-prcess |
|
1898 | library), programatically (such as in test suites) or out-of-prcess | |
1899 | (typically over the network by remote frontends). |
|
1899 | (typically over the network by remote frontends). | |
1900 | """ |
|
1900 | """ | |
1901 | from IPython.core.completer import IPCompleter |
|
1901 | from IPython.core.completer import IPCompleter | |
1902 | from IPython.core.completerlib import (module_completer, |
|
1902 | from IPython.core.completerlib import (module_completer, | |
1903 | magic_run_completer, cd_completer, reset_completer) |
|
1903 | magic_run_completer, cd_completer, reset_completer) | |
1904 |
|
1904 | |||
1905 | self.Completer = IPCompleter(shell=self, |
|
1905 | self.Completer = IPCompleter(shell=self, | |
1906 | namespace=self.user_ns, |
|
1906 | namespace=self.user_ns, | |
1907 | global_namespace=self.user_global_ns, |
|
1907 | global_namespace=self.user_global_ns, | |
1908 | alias_table=self.alias_manager.alias_table, |
|
1908 | alias_table=self.alias_manager.alias_table, | |
1909 | use_readline=self.has_readline, |
|
1909 | use_readline=self.has_readline, | |
1910 | config=self.config, |
|
1910 | config=self.config, | |
1911 | ) |
|
1911 | ) | |
1912 | self.configurables.append(self.Completer) |
|
1912 | self.configurables.append(self.Completer) | |
1913 |
|
1913 | |||
1914 | # Add custom completers to the basic ones built into IPCompleter |
|
1914 | # Add custom completers to the basic ones built into IPCompleter | |
1915 | sdisp = self.strdispatchers.get('complete_command', StrDispatch()) |
|
1915 | sdisp = self.strdispatchers.get('complete_command', StrDispatch()) | |
1916 | self.strdispatchers['complete_command'] = sdisp |
|
1916 | self.strdispatchers['complete_command'] = sdisp | |
1917 | self.Completer.custom_completers = sdisp |
|
1917 | self.Completer.custom_completers = sdisp | |
1918 |
|
1918 | |||
1919 | self.set_hook('complete_command', module_completer, str_key = 'import') |
|
1919 | self.set_hook('complete_command', module_completer, str_key = 'import') | |
1920 | self.set_hook('complete_command', module_completer, str_key = 'from') |
|
1920 | self.set_hook('complete_command', module_completer, str_key = 'from') | |
1921 | self.set_hook('complete_command', magic_run_completer, str_key = '%run') |
|
1921 | self.set_hook('complete_command', magic_run_completer, str_key = '%run') | |
1922 | self.set_hook('complete_command', cd_completer, str_key = '%cd') |
|
1922 | self.set_hook('complete_command', cd_completer, str_key = '%cd') | |
1923 | self.set_hook('complete_command', reset_completer, str_key = '%reset') |
|
1923 | self.set_hook('complete_command', reset_completer, str_key = '%reset') | |
1924 |
|
1924 | |||
1925 | # Only configure readline if we truly are using readline. IPython can |
|
1925 | # Only configure readline if we truly are using readline. IPython can | |
1926 | # do tab-completion over the network, in GUIs, etc, where readline |
|
1926 | # do tab-completion over the network, in GUIs, etc, where readline | |
1927 | # itself may be absent |
|
1927 | # itself may be absent | |
1928 | if self.has_readline: |
|
1928 | if self.has_readline: | |
1929 | self.set_readline_completer() |
|
1929 | self.set_readline_completer() | |
1930 |
|
1930 | |||
1931 | def complete(self, text, line=None, cursor_pos=None): |
|
1931 | def complete(self, text, line=None, cursor_pos=None): | |
1932 | """Return the completed text and a list of completions. |
|
1932 | """Return the completed text and a list of completions. | |
1933 |
|
1933 | |||
1934 | Parameters |
|
1934 | Parameters | |
1935 | ---------- |
|
1935 | ---------- | |
1936 |
|
1936 | |||
1937 | text : string |
|
1937 | text : string | |
1938 | A string of text to be completed on. It can be given as empty and |
|
1938 | A string of text to be completed on. It can be given as empty and | |
1939 | instead a line/position pair are given. In this case, the |
|
1939 | instead a line/position pair are given. In this case, the | |
1940 | completer itself will split the line like readline does. |
|
1940 | completer itself will split the line like readline does. | |
1941 |
|
1941 | |||
1942 | line : string, optional |
|
1942 | line : string, optional | |
1943 | The complete line that text is part of. |
|
1943 | The complete line that text is part of. | |
1944 |
|
1944 | |||
1945 | cursor_pos : int, optional |
|
1945 | cursor_pos : int, optional | |
1946 | The position of the cursor on the input line. |
|
1946 | The position of the cursor on the input line. | |
1947 |
|
1947 | |||
1948 | Returns |
|
1948 | Returns | |
1949 | ------- |
|
1949 | ------- | |
1950 | text : string |
|
1950 | text : string | |
1951 | The actual text that was completed. |
|
1951 | The actual text that was completed. | |
1952 |
|
1952 | |||
1953 | matches : list |
|
1953 | matches : list | |
1954 | A sorted list with all possible completions. |
|
1954 | A sorted list with all possible completions. | |
1955 |
|
1955 | |||
1956 | The optional arguments allow the completion to take more context into |
|
1956 | The optional arguments allow the completion to take more context into | |
1957 | account, and are part of the low-level completion API. |
|
1957 | account, and are part of the low-level completion API. | |
1958 |
|
1958 | |||
1959 | This is a wrapper around the completion mechanism, similar to what |
|
1959 | This is a wrapper around the completion mechanism, similar to what | |
1960 | readline does at the command line when the TAB key is hit. By |
|
1960 | readline does at the command line when the TAB key is hit. By | |
1961 | exposing it as a method, it can be used by other non-readline |
|
1961 | exposing it as a method, it can be used by other non-readline | |
1962 | environments (such as GUIs) for text completion. |
|
1962 | environments (such as GUIs) for text completion. | |
1963 |
|
1963 | |||
1964 | Simple usage example: |
|
1964 | Simple usage example: | |
1965 |
|
1965 | |||
1966 | In [1]: x = 'hello' |
|
1966 | In [1]: x = 'hello' | |
1967 |
|
1967 | |||
1968 | In [2]: _ip.complete('x.l') |
|
1968 | In [2]: _ip.complete('x.l') | |
1969 | Out[2]: ('x.l', ['x.ljust', 'x.lower', 'x.lstrip']) |
|
1969 | Out[2]: ('x.l', ['x.ljust', 'x.lower', 'x.lstrip']) | |
1970 | """ |
|
1970 | """ | |
1971 |
|
1971 | |||
1972 | # Inject names into __builtin__ so we can complete on the added names. |
|
1972 | # Inject names into __builtin__ so we can complete on the added names. | |
1973 | with self.builtin_trap: |
|
1973 | with self.builtin_trap: | |
1974 | return self.Completer.complete(text, line, cursor_pos) |
|
1974 | return self.Completer.complete(text, line, cursor_pos) | |
1975 |
|
1975 | |||
1976 | def set_custom_completer(self, completer, pos=0): |
|
1976 | def set_custom_completer(self, completer, pos=0): | |
1977 | """Adds a new custom completer function. |
|
1977 | """Adds a new custom completer function. | |
1978 |
|
1978 | |||
1979 | The position argument (defaults to 0) is the index in the completers |
|
1979 | The position argument (defaults to 0) is the index in the completers | |
1980 | list where you want the completer to be inserted.""" |
|
1980 | list where you want the completer to be inserted.""" | |
1981 |
|
1981 | |||
1982 | newcomp = types.MethodType(completer,self.Completer) |
|
1982 | newcomp = types.MethodType(completer,self.Completer) | |
1983 | self.Completer.matchers.insert(pos,newcomp) |
|
1983 | self.Completer.matchers.insert(pos,newcomp) | |
1984 |
|
1984 | |||
1985 | def set_readline_completer(self): |
|
1985 | def set_readline_completer(self): | |
1986 | """Reset readline's completer to be our own.""" |
|
1986 | """Reset readline's completer to be our own.""" | |
1987 | self.readline.set_completer(self.Completer.rlcomplete) |
|
1987 | self.readline.set_completer(self.Completer.rlcomplete) | |
1988 |
|
1988 | |||
1989 | def set_completer_frame(self, frame=None): |
|
1989 | def set_completer_frame(self, frame=None): | |
1990 | """Set the frame of the completer.""" |
|
1990 | """Set the frame of the completer.""" | |
1991 | if frame: |
|
1991 | if frame: | |
1992 | self.Completer.namespace = frame.f_locals |
|
1992 | self.Completer.namespace = frame.f_locals | |
1993 | self.Completer.global_namespace = frame.f_globals |
|
1993 | self.Completer.global_namespace = frame.f_globals | |
1994 | else: |
|
1994 | else: | |
1995 | self.Completer.namespace = self.user_ns |
|
1995 | self.Completer.namespace = self.user_ns | |
1996 | self.Completer.global_namespace = self.user_global_ns |
|
1996 | self.Completer.global_namespace = self.user_global_ns | |
1997 |
|
1997 | |||
1998 | #------------------------------------------------------------------------- |
|
1998 | #------------------------------------------------------------------------- | |
1999 | # Things related to magics |
|
1999 | # Things related to magics | |
2000 | #------------------------------------------------------------------------- |
|
2000 | #------------------------------------------------------------------------- | |
2001 |
|
2001 | |||
2002 | def init_magics(self): |
|
2002 | def init_magics(self): | |
2003 | from IPython.core import magics as m |
|
2003 | from IPython.core import magics as m | |
2004 | self.magics_manager = magic.MagicsManager(shell=self, |
|
2004 | self.magics_manager = magic.MagicsManager(shell=self, | |
2005 | confg=self.config, |
|
2005 | confg=self.config, | |
2006 | user_magics=m.UserMagics(self)) |
|
2006 | user_magics=m.UserMagics(self)) | |
2007 | self.configurables.append(self.magics_manager) |
|
2007 | self.configurables.append(self.magics_manager) | |
2008 |
|
2008 | |||
2009 | # Expose as public API from the magics manager |
|
2009 | # Expose as public API from the magics manager | |
2010 | self.register_magics = self.magics_manager.register |
|
2010 | self.register_magics = self.magics_manager.register | |
2011 | self.register_magic_function = self.magics_manager.register_function |
|
2011 | self.register_magic_function = self.magics_manager.register_function | |
2012 | self.define_magic = self.magics_manager.define_magic |
|
2012 | self.define_magic = self.magics_manager.define_magic | |
2013 |
|
2013 | |||
2014 | self.register_magics(m.AutoMagics, m.BasicMagics, m.CodeMagics, |
|
2014 | self.register_magics(m.AutoMagics, m.BasicMagics, m.CodeMagics, | |
2015 | m.ConfigMagics, m.DeprecatedMagics, m.ExecutionMagics, |
|
2015 | m.ConfigMagics, m.DeprecatedMagics, m.ExecutionMagics, | |
2016 | m.ExtensionMagics, m.HistoryMagics, m.LoggingMagics, |
|
2016 | m.ExtensionMagics, m.HistoryMagics, m.LoggingMagics, | |
2017 | m.NamespaceMagics, m.OSMagics, m.PylabMagics ) |
|
2017 | m.NamespaceMagics, m.OSMagics, m.PylabMagics ) | |
2018 |
|
2018 | |||
2019 | # FIXME: Move the color initialization to the DisplayHook, which |
|
2019 | # FIXME: Move the color initialization to the DisplayHook, which | |
2020 | # should be split into a prompt manager and displayhook. We probably |
|
2020 | # should be split into a prompt manager and displayhook. We probably | |
2021 | # even need a centralize colors management object. |
|
2021 | # even need a centralize colors management object. | |
2022 | self.magic('colors %s' % self.colors) |
|
2022 | self.magic('colors %s' % self.colors) | |
2023 |
|
2023 | |||
2024 | def line_magic(self, magic_name, line): |
|
2024 | def run_line_magic(self, magic_name, line): | |
2025 | """Execute the given line magic. |
|
2025 | """Execute the given line magic. | |
2026 |
|
2026 | |||
2027 | Parameters |
|
2027 | Parameters | |
2028 | ---------- |
|
2028 | ---------- | |
2029 | magic_name : str |
|
2029 | magic_name : str | |
2030 | Name of the desired magic function, without '%' prefix. |
|
2030 | Name of the desired magic function, without '%' prefix. | |
2031 |
|
2031 | |||
2032 | line : str |
|
2032 | line : str | |
2033 | The rest of the input line as a single string. |
|
2033 | The rest of the input line as a single string. | |
2034 | """ |
|
2034 | """ | |
2035 | fn = self.find_line_magic(magic_name) |
|
2035 | fn = self.find_line_magic(magic_name) | |
2036 | if fn is None: |
|
2036 | if fn is None: | |
2037 | cm = self.find_cell_magic(magic_name) |
|
2037 | cm = self.find_cell_magic(magic_name) | |
2038 | etpl = "Line magic function `%%%s` not found%s." |
|
2038 | etpl = "Line magic function `%%%s` not found%s." | |
2039 | extra = '' if cm is None else (' (But cell magic `%%%%%s` exists, ' |
|
2039 | extra = '' if cm is None else (' (But cell magic `%%%%%s` exists, ' | |
2040 | 'did you mean that instead?)' % magic_name ) |
|
2040 | 'did you mean that instead?)' % magic_name ) | |
2041 | error(etpl % (magic_name, extra)) |
|
2041 | error(etpl % (magic_name, extra)) | |
2042 | else: |
|
2042 | else: | |
2043 | # Note: this is the distance in the stack to the user's frame. |
|
2043 | # Note: this is the distance in the stack to the user's frame. | |
2044 | # This will need to be updated if the internal calling logic gets |
|
2044 | # This will need to be updated if the internal calling logic gets | |
2045 | # refactored, or else we'll be expanding the wrong variables. |
|
2045 | # refactored, or else we'll be expanding the wrong variables. | |
2046 | stack_depth = 2 |
|
2046 | stack_depth = 2 | |
2047 | magic_arg_s = self.var_expand(line, stack_depth) |
|
2047 | magic_arg_s = self.var_expand(line, stack_depth) | |
2048 | # Put magic args in a list so we can call with f(*a) syntax |
|
2048 | # Put magic args in a list so we can call with f(*a) syntax | |
2049 | args = [magic_arg_s] |
|
2049 | args = [magic_arg_s] | |
2050 | # Grab local namespace if we need it: |
|
2050 | # Grab local namespace if we need it: | |
2051 | if getattr(fn, "needs_local_scope", False): |
|
2051 | if getattr(fn, "needs_local_scope", False): | |
2052 | args.append(sys._getframe(stack_depth).f_locals) |
|
2052 | args.append(sys._getframe(stack_depth).f_locals) | |
2053 | with self.builtin_trap: |
|
2053 | with self.builtin_trap: | |
2054 | result = fn(*args) |
|
2054 | result = fn(*args) | |
2055 | return result |
|
2055 | return result | |
2056 |
|
2056 | |||
2057 | def cell_magic(self, magic_name, line, cell): |
|
2057 | def run_cell_magic(self, magic_name, line, cell): | |
2058 | """Execute the given cell magic. |
|
2058 | """Execute the given cell magic. | |
|
2059 | ||||
|
2060 | Parameters | |||
|
2061 | ---------- | |||
|
2062 | magic_name : str | |||
|
2063 | Name of the desired magic function, without '%' prefix. | |||
|
2064 | ||||
|
2065 | line : str | |||
|
2066 | The rest of the first input line as a single string. | |||
|
2067 | ||||
|
2068 | cell : str | |||
|
2069 | The body of the cell as a (possibly multiline) string. | |||
2059 | """ |
|
2070 | """ | |
2060 | fn = self.find_cell_magic(magic_name) |
|
2071 | fn = self.find_cell_magic(magic_name) | |
2061 | if fn is None: |
|
2072 | if fn is None: | |
2062 | lm = self.find_line_magic(magic_name) |
|
2073 | lm = self.find_line_magic(magic_name) | |
2063 | etpl = "Cell magic function `%%%%%s` not found%s." |
|
2074 | etpl = "Cell magic function `%%%%%s` not found%s." | |
2064 | extra = '' if lm is None else (' (But line magic `%%%s` exists, ' |
|
2075 | extra = '' if lm is None else (' (But line magic `%%%s` exists, ' | |
2065 | 'did you mean that instead?)' % magic_name ) |
|
2076 | 'did you mean that instead?)' % magic_name ) | |
2066 | error(etpl % (magic_name, extra)) |
|
2077 | error(etpl % (magic_name, extra)) | |
2067 | else: |
|
2078 | else: | |
2068 | # Note: this is the distance in the stack to the user's frame. |
|
2079 | # Note: this is the distance in the stack to the user's frame. | |
2069 | # This will need to be updated if the internal calling logic gets |
|
2080 | # This will need to be updated if the internal calling logic gets | |
2070 | # refactored, or else we'll be expanding the wrong variables. |
|
2081 | # refactored, or else we'll be expanding the wrong variables. | |
2071 | stack_depth = 2 |
|
2082 | stack_depth = 2 | |
2072 | magic_arg_s = self.var_expand(line, stack_depth) |
|
2083 | magic_arg_s = self.var_expand(line, stack_depth) | |
2073 | with self.builtin_trap: |
|
2084 | with self.builtin_trap: | |
2074 | result = fn(line, cell) |
|
2085 | result = fn(line, cell) | |
2075 | return result |
|
2086 | return result | |
2076 |
|
2087 | |||
2077 | def find_line_magic(self, magic_name): |
|
2088 | def find_line_magic(self, magic_name): | |
2078 | """Find and return a line magic by name. |
|
2089 | """Find and return a line magic by name. | |
2079 |
|
2090 | |||
2080 | Returns None if the magic isn't found.""" |
|
2091 | Returns None if the magic isn't found.""" | |
2081 | return self.magics_manager.magics['line'].get(magic_name) |
|
2092 | return self.magics_manager.magics['line'].get(magic_name) | |
2082 |
|
2093 | |||
2083 | def find_cell_magic(self, magic_name): |
|
2094 | def find_cell_magic(self, magic_name): | |
2084 | """Find and return a cell magic by name. |
|
2095 | """Find and return a cell magic by name. | |
2085 |
|
2096 | |||
2086 | Returns None if the magic isn't found.""" |
|
2097 | Returns None if the magic isn't found.""" | |
2087 | return self.magics_manager.magics['cell'].get(magic_name) |
|
2098 | return self.magics_manager.magics['cell'].get(magic_name) | |
2088 |
|
2099 | |||
2089 | def find_magic(self, magic_name, magic_kind='line'): |
|
2100 | def find_magic(self, magic_name, magic_kind='line'): | |
2090 | """Find and return a magic of the given type by name. |
|
2101 | """Find and return a magic of the given type by name. | |
2091 |
|
2102 | |||
2092 | Returns None if the magic isn't found.""" |
|
2103 | Returns None if the magic isn't found.""" | |
2093 | return self.magics_manager.magics[magic_kind].get(magic_name) |
|
2104 | return self.magics_manager.magics[magic_kind].get(magic_name) | |
2094 |
|
2105 | |||
2095 | def magic(self, arg_s): |
|
2106 | def magic(self, arg_s): | |
2096 | """DEPRECATED. Use line_magic() instead. |
|
2107 | """DEPRECATED. Use run_line_magic() instead. | |
2097 |
|
2108 | |||
2098 | Call a magic function by name. |
|
2109 | Call a magic function by name. | |
2099 |
|
2110 | |||
2100 | Input: a string containing the name of the magic function to call and |
|
2111 | Input: a string containing the name of the magic function to call and | |
2101 | any additional arguments to be passed to the magic. |
|
2112 | any additional arguments to be passed to the magic. | |
2102 |
|
2113 | |||
2103 | magic('name -opt foo bar') is equivalent to typing at the ipython |
|
2114 | magic('name -opt foo bar') is equivalent to typing at the ipython | |
2104 | prompt: |
|
2115 | prompt: | |
2105 |
|
2116 | |||
2106 | In[1]: %name -opt foo bar |
|
2117 | In[1]: %name -opt foo bar | |
2107 |
|
2118 | |||
2108 | To call a magic without arguments, simply use magic('name'). |
|
2119 | To call a magic without arguments, simply use magic('name'). | |
2109 |
|
2120 | |||
2110 | This provides a proper Python function to call IPython's magics in any |
|
2121 | This provides a proper Python function to call IPython's magics in any | |
2111 | valid Python code you can type at the interpreter, including loops and |
|
2122 | valid Python code you can type at the interpreter, including loops and | |
2112 | compound statements. |
|
2123 | compound statements. | |
2113 | """ |
|
2124 | """ | |
2114 | # TODO: should we issue a loud deprecation warning here? |
|
2125 | # TODO: should we issue a loud deprecation warning here? | |
2115 | magic_name, _, magic_arg_s = arg_s.partition(' ') |
|
2126 | magic_name, _, magic_arg_s = arg_s.partition(' ') | |
2116 | magic_name = magic_name.lstrip(prefilter.ESC_MAGIC) |
|
2127 | magic_name = magic_name.lstrip(prefilter.ESC_MAGIC) | |
2117 | return self.line_magic(magic_name, magic_arg_s) |
|
2128 | return self.run_line_magic(magic_name, magic_arg_s) | |
2118 |
|
2129 | |||
2119 | #------------------------------------------------------------------------- |
|
2130 | #------------------------------------------------------------------------- | |
2120 | # Things related to macros |
|
2131 | # Things related to macros | |
2121 | #------------------------------------------------------------------------- |
|
2132 | #------------------------------------------------------------------------- | |
2122 |
|
2133 | |||
2123 | def define_macro(self, name, themacro): |
|
2134 | def define_macro(self, name, themacro): | |
2124 | """Define a new macro |
|
2135 | """Define a new macro | |
2125 |
|
2136 | |||
2126 | Parameters |
|
2137 | Parameters | |
2127 | ---------- |
|
2138 | ---------- | |
2128 | name : str |
|
2139 | name : str | |
2129 | The name of the macro. |
|
2140 | The name of the macro. | |
2130 | themacro : str or Macro |
|
2141 | themacro : str or Macro | |
2131 | The action to do upon invoking the macro. If a string, a new |
|
2142 | The action to do upon invoking the macro. If a string, a new | |
2132 | Macro object is created by passing the string to it. |
|
2143 | Macro object is created by passing the string to it. | |
2133 | """ |
|
2144 | """ | |
2134 |
|
2145 | |||
2135 | from IPython.core import macro |
|
2146 | from IPython.core import macro | |
2136 |
|
2147 | |||
2137 | if isinstance(themacro, basestring): |
|
2148 | if isinstance(themacro, basestring): | |
2138 | themacro = macro.Macro(themacro) |
|
2149 | themacro = macro.Macro(themacro) | |
2139 | if not isinstance(themacro, macro.Macro): |
|
2150 | if not isinstance(themacro, macro.Macro): | |
2140 | raise ValueError('A macro must be a string or a Macro instance.') |
|
2151 | raise ValueError('A macro must be a string or a Macro instance.') | |
2141 | self.user_ns[name] = themacro |
|
2152 | self.user_ns[name] = themacro | |
2142 |
|
2153 | |||
2143 | #------------------------------------------------------------------------- |
|
2154 | #------------------------------------------------------------------------- | |
2144 | # Things related to the running of system commands |
|
2155 | # Things related to the running of system commands | |
2145 | #------------------------------------------------------------------------- |
|
2156 | #------------------------------------------------------------------------- | |
2146 |
|
2157 | |||
2147 | def system_piped(self, cmd): |
|
2158 | def system_piped(self, cmd): | |
2148 | """Call the given cmd in a subprocess, piping stdout/err |
|
2159 | """Call the given cmd in a subprocess, piping stdout/err | |
2149 |
|
2160 | |||
2150 | Parameters |
|
2161 | Parameters | |
2151 | ---------- |
|
2162 | ---------- | |
2152 | cmd : str |
|
2163 | cmd : str | |
2153 | Command to execute (can not end in '&', as background processes are |
|
2164 | Command to execute (can not end in '&', as background processes are | |
2154 | not supported. Should not be a command that expects input |
|
2165 | not supported. Should not be a command that expects input | |
2155 | other than simple text. |
|
2166 | other than simple text. | |
2156 | """ |
|
2167 | """ | |
2157 | if cmd.rstrip().endswith('&'): |
|
2168 | if cmd.rstrip().endswith('&'): | |
2158 | # this is *far* from a rigorous test |
|
2169 | # this is *far* from a rigorous test | |
2159 | # We do not support backgrounding processes because we either use |
|
2170 | # We do not support backgrounding processes because we either use | |
2160 | # pexpect or pipes to read from. Users can always just call |
|
2171 | # pexpect or pipes to read from. Users can always just call | |
2161 | # os.system() or use ip.system=ip.system_raw |
|
2172 | # os.system() or use ip.system=ip.system_raw | |
2162 | # if they really want a background process. |
|
2173 | # if they really want a background process. | |
2163 | raise OSError("Background processes not supported.") |
|
2174 | raise OSError("Background processes not supported.") | |
2164 |
|
2175 | |||
2165 | # we explicitly do NOT return the subprocess status code, because |
|
2176 | # we explicitly do NOT return the subprocess status code, because | |
2166 | # a non-None value would trigger :func:`sys.displayhook` calls. |
|
2177 | # a non-None value would trigger :func:`sys.displayhook` calls. | |
2167 | # Instead, we store the exit_code in user_ns. |
|
2178 | # Instead, we store the exit_code in user_ns. | |
2168 | self.user_ns['_exit_code'] = system(self.var_expand(cmd, depth=2)) |
|
2179 | self.user_ns['_exit_code'] = system(self.var_expand(cmd, depth=2)) | |
2169 |
|
2180 | |||
2170 | def system_raw(self, cmd): |
|
2181 | def system_raw(self, cmd): | |
2171 | """Call the given cmd in a subprocess using os.system |
|
2182 | """Call the given cmd in a subprocess using os.system | |
2172 |
|
2183 | |||
2173 | Parameters |
|
2184 | Parameters | |
2174 | ---------- |
|
2185 | ---------- | |
2175 | cmd : str |
|
2186 | cmd : str | |
2176 | Command to execute. |
|
2187 | Command to execute. | |
2177 | """ |
|
2188 | """ | |
2178 | cmd = self.var_expand(cmd, depth=2) |
|
2189 | cmd = self.var_expand(cmd, depth=2) | |
2179 | # protect os.system from UNC paths on Windows, which it can't handle: |
|
2190 | # protect os.system from UNC paths on Windows, which it can't handle: | |
2180 | if sys.platform == 'win32': |
|
2191 | if sys.platform == 'win32': | |
2181 | from IPython.utils._process_win32 import AvoidUNCPath |
|
2192 | from IPython.utils._process_win32 import AvoidUNCPath | |
2182 | with AvoidUNCPath() as path: |
|
2193 | with AvoidUNCPath() as path: | |
2183 | if path is not None: |
|
2194 | if path is not None: | |
2184 | cmd = '"pushd %s &&"%s' % (path, cmd) |
|
2195 | cmd = '"pushd %s &&"%s' % (path, cmd) | |
2185 | cmd = py3compat.unicode_to_str(cmd) |
|
2196 | cmd = py3compat.unicode_to_str(cmd) | |
2186 | ec = os.system(cmd) |
|
2197 | ec = os.system(cmd) | |
2187 | else: |
|
2198 | else: | |
2188 | cmd = py3compat.unicode_to_str(cmd) |
|
2199 | cmd = py3compat.unicode_to_str(cmd) | |
2189 | ec = os.system(cmd) |
|
2200 | ec = os.system(cmd) | |
2190 |
|
2201 | |||
2191 | # We explicitly do NOT return the subprocess status code, because |
|
2202 | # We explicitly do NOT return the subprocess status code, because | |
2192 | # a non-None value would trigger :func:`sys.displayhook` calls. |
|
2203 | # a non-None value would trigger :func:`sys.displayhook` calls. | |
2193 | # Instead, we store the exit_code in user_ns. |
|
2204 | # Instead, we store the exit_code in user_ns. | |
2194 | self.user_ns['_exit_code'] = ec |
|
2205 | self.user_ns['_exit_code'] = ec | |
2195 |
|
2206 | |||
2196 | # use piped system by default, because it is better behaved |
|
2207 | # use piped system by default, because it is better behaved | |
2197 | system = system_piped |
|
2208 | system = system_piped | |
2198 |
|
2209 | |||
2199 | def getoutput(self, cmd, split=True): |
|
2210 | def getoutput(self, cmd, split=True): | |
2200 | """Get output (possibly including stderr) from a subprocess. |
|
2211 | """Get output (possibly including stderr) from a subprocess. | |
2201 |
|
2212 | |||
2202 | Parameters |
|
2213 | Parameters | |
2203 | ---------- |
|
2214 | ---------- | |
2204 | cmd : str |
|
2215 | cmd : str | |
2205 | Command to execute (can not end in '&', as background processes are |
|
2216 | Command to execute (can not end in '&', as background processes are | |
2206 | not supported. |
|
2217 | not supported. | |
2207 | split : bool, optional |
|
2218 | split : bool, optional | |
2208 |
|
2219 | |||
2209 | If True, split the output into an IPython SList. Otherwise, an |
|
2220 | If True, split the output into an IPython SList. Otherwise, an | |
2210 | IPython LSString is returned. These are objects similar to normal |
|
2221 | IPython LSString is returned. These are objects similar to normal | |
2211 | lists and strings, with a few convenience attributes for easier |
|
2222 | lists and strings, with a few convenience attributes for easier | |
2212 | manipulation of line-based output. You can use '?' on them for |
|
2223 | manipulation of line-based output. You can use '?' on them for | |
2213 | details. |
|
2224 | details. | |
2214 | """ |
|
2225 | """ | |
2215 | if cmd.rstrip().endswith('&'): |
|
2226 | if cmd.rstrip().endswith('&'): | |
2216 | # this is *far* from a rigorous test |
|
2227 | # this is *far* from a rigorous test | |
2217 | raise OSError("Background processes not supported.") |
|
2228 | raise OSError("Background processes not supported.") | |
2218 | out = getoutput(self.var_expand(cmd, depth=2)) |
|
2229 | out = getoutput(self.var_expand(cmd, depth=2)) | |
2219 | if split: |
|
2230 | if split: | |
2220 | out = SList(out.splitlines()) |
|
2231 | out = SList(out.splitlines()) | |
2221 | else: |
|
2232 | else: | |
2222 | out = LSString(out) |
|
2233 | out = LSString(out) | |
2223 | return out |
|
2234 | return out | |
2224 |
|
2235 | |||
2225 | #------------------------------------------------------------------------- |
|
2236 | #------------------------------------------------------------------------- | |
2226 | # Things related to aliases |
|
2237 | # Things related to aliases | |
2227 | #------------------------------------------------------------------------- |
|
2238 | #------------------------------------------------------------------------- | |
2228 |
|
2239 | |||
2229 | def init_alias(self): |
|
2240 | def init_alias(self): | |
2230 | self.alias_manager = AliasManager(shell=self, config=self.config) |
|
2241 | self.alias_manager = AliasManager(shell=self, config=self.config) | |
2231 | self.configurables.append(self.alias_manager) |
|
2242 | self.configurables.append(self.alias_manager) | |
2232 | self.ns_table['alias'] = self.alias_manager.alias_table, |
|
2243 | self.ns_table['alias'] = self.alias_manager.alias_table, | |
2233 |
|
2244 | |||
2234 | #------------------------------------------------------------------------- |
|
2245 | #------------------------------------------------------------------------- | |
2235 | # Things related to extensions and plugins |
|
2246 | # Things related to extensions and plugins | |
2236 | #------------------------------------------------------------------------- |
|
2247 | #------------------------------------------------------------------------- | |
2237 |
|
2248 | |||
2238 | def init_extension_manager(self): |
|
2249 | def init_extension_manager(self): | |
2239 | self.extension_manager = ExtensionManager(shell=self, config=self.config) |
|
2250 | self.extension_manager = ExtensionManager(shell=self, config=self.config) | |
2240 | self.configurables.append(self.extension_manager) |
|
2251 | self.configurables.append(self.extension_manager) | |
2241 |
|
2252 | |||
2242 | def init_plugin_manager(self): |
|
2253 | def init_plugin_manager(self): | |
2243 | self.plugin_manager = PluginManager(config=self.config) |
|
2254 | self.plugin_manager = PluginManager(config=self.config) | |
2244 | self.configurables.append(self.plugin_manager) |
|
2255 | self.configurables.append(self.plugin_manager) | |
2245 |
|
2256 | |||
2246 |
|
2257 | |||
2247 | #------------------------------------------------------------------------- |
|
2258 | #------------------------------------------------------------------------- | |
2248 | # Things related to payloads |
|
2259 | # Things related to payloads | |
2249 | #------------------------------------------------------------------------- |
|
2260 | #------------------------------------------------------------------------- | |
2250 |
|
2261 | |||
2251 | def init_payload(self): |
|
2262 | def init_payload(self): | |
2252 | self.payload_manager = PayloadManager(config=self.config) |
|
2263 | self.payload_manager = PayloadManager(config=self.config) | |
2253 | self.configurables.append(self.payload_manager) |
|
2264 | self.configurables.append(self.payload_manager) | |
2254 |
|
2265 | |||
2255 | #------------------------------------------------------------------------- |
|
2266 | #------------------------------------------------------------------------- | |
2256 | # Things related to the prefilter |
|
2267 | # Things related to the prefilter | |
2257 | #------------------------------------------------------------------------- |
|
2268 | #------------------------------------------------------------------------- | |
2258 |
|
2269 | |||
2259 | def init_prefilter(self): |
|
2270 | def init_prefilter(self): | |
2260 | self.prefilter_manager = PrefilterManager(shell=self, config=self.config) |
|
2271 | self.prefilter_manager = PrefilterManager(shell=self, config=self.config) | |
2261 | self.configurables.append(self.prefilter_manager) |
|
2272 | self.configurables.append(self.prefilter_manager) | |
2262 | # Ultimately this will be refactored in the new interpreter code, but |
|
2273 | # Ultimately this will be refactored in the new interpreter code, but | |
2263 | # for now, we should expose the main prefilter method (there's legacy |
|
2274 | # for now, we should expose the main prefilter method (there's legacy | |
2264 | # code out there that may rely on this). |
|
2275 | # code out there that may rely on this). | |
2265 | self.prefilter = self.prefilter_manager.prefilter_lines |
|
2276 | self.prefilter = self.prefilter_manager.prefilter_lines | |
2266 |
|
2277 | |||
2267 | def auto_rewrite_input(self, cmd): |
|
2278 | def auto_rewrite_input(self, cmd): | |
2268 | """Print to the screen the rewritten form of the user's command. |
|
2279 | """Print to the screen the rewritten form of the user's command. | |
2269 |
|
2280 | |||
2270 | This shows visual feedback by rewriting input lines that cause |
|
2281 | This shows visual feedback by rewriting input lines that cause | |
2271 | automatic calling to kick in, like:: |
|
2282 | automatic calling to kick in, like:: | |
2272 |
|
2283 | |||
2273 | /f x |
|
2284 | /f x | |
2274 |
|
2285 | |||
2275 | into:: |
|
2286 | into:: | |
2276 |
|
2287 | |||
2277 | ------> f(x) |
|
2288 | ------> f(x) | |
2278 |
|
2289 | |||
2279 | after the user's input prompt. This helps the user understand that the |
|
2290 | after the user's input prompt. This helps the user understand that the | |
2280 | input line was transformed automatically by IPython. |
|
2291 | input line was transformed automatically by IPython. | |
2281 | """ |
|
2292 | """ | |
2282 | if not self.show_rewritten_input: |
|
2293 | if not self.show_rewritten_input: | |
2283 | return |
|
2294 | return | |
2284 |
|
2295 | |||
2285 | rw = self.prompt_manager.render('rewrite') + cmd |
|
2296 | rw = self.prompt_manager.render('rewrite') + cmd | |
2286 |
|
2297 | |||
2287 | try: |
|
2298 | try: | |
2288 | # plain ascii works better w/ pyreadline, on some machines, so |
|
2299 | # plain ascii works better w/ pyreadline, on some machines, so | |
2289 | # we use it and only print uncolored rewrite if we have unicode |
|
2300 | # we use it and only print uncolored rewrite if we have unicode | |
2290 | rw = str(rw) |
|
2301 | rw = str(rw) | |
2291 | print >> io.stdout, rw |
|
2302 | print >> io.stdout, rw | |
2292 | except UnicodeEncodeError: |
|
2303 | except UnicodeEncodeError: | |
2293 | print "------> " + cmd |
|
2304 | print "------> " + cmd | |
2294 |
|
2305 | |||
2295 | #------------------------------------------------------------------------- |
|
2306 | #------------------------------------------------------------------------- | |
2296 | # Things related to extracting values/expressions from kernel and user_ns |
|
2307 | # Things related to extracting values/expressions from kernel and user_ns | |
2297 | #------------------------------------------------------------------------- |
|
2308 | #------------------------------------------------------------------------- | |
2298 |
|
2309 | |||
2299 | def _simple_error(self): |
|
2310 | def _simple_error(self): | |
2300 | etype, value = sys.exc_info()[:2] |
|
2311 | etype, value = sys.exc_info()[:2] | |
2301 | return u'[ERROR] {e.__name__}: {v}'.format(e=etype, v=value) |
|
2312 | return u'[ERROR] {e.__name__}: {v}'.format(e=etype, v=value) | |
2302 |
|
2313 | |||
2303 | def user_variables(self, names): |
|
2314 | def user_variables(self, names): | |
2304 | """Get a list of variable names from the user's namespace. |
|
2315 | """Get a list of variable names from the user's namespace. | |
2305 |
|
2316 | |||
2306 | Parameters |
|
2317 | Parameters | |
2307 | ---------- |
|
2318 | ---------- | |
2308 | names : list of strings |
|
2319 | names : list of strings | |
2309 | A list of names of variables to be read from the user namespace. |
|
2320 | A list of names of variables to be read from the user namespace. | |
2310 |
|
2321 | |||
2311 | Returns |
|
2322 | Returns | |
2312 | ------- |
|
2323 | ------- | |
2313 | A dict, keyed by the input names and with the repr() of each value. |
|
2324 | A dict, keyed by the input names and with the repr() of each value. | |
2314 | """ |
|
2325 | """ | |
2315 | out = {} |
|
2326 | out = {} | |
2316 | user_ns = self.user_ns |
|
2327 | user_ns = self.user_ns | |
2317 | for varname in names: |
|
2328 | for varname in names: | |
2318 | try: |
|
2329 | try: | |
2319 | value = repr(user_ns[varname]) |
|
2330 | value = repr(user_ns[varname]) | |
2320 | except: |
|
2331 | except: | |
2321 | value = self._simple_error() |
|
2332 | value = self._simple_error() | |
2322 | out[varname] = value |
|
2333 | out[varname] = value | |
2323 | return out |
|
2334 | return out | |
2324 |
|
2335 | |||
2325 | def user_expressions(self, expressions): |
|
2336 | def user_expressions(self, expressions): | |
2326 | """Evaluate a dict of expressions in the user's namespace. |
|
2337 | """Evaluate a dict of expressions in the user's namespace. | |
2327 |
|
2338 | |||
2328 | Parameters |
|
2339 | Parameters | |
2329 | ---------- |
|
2340 | ---------- | |
2330 | expressions : dict |
|
2341 | expressions : dict | |
2331 | A dict with string keys and string values. The expression values |
|
2342 | A dict with string keys and string values. The expression values | |
2332 | should be valid Python expressions, each of which will be evaluated |
|
2343 | should be valid Python expressions, each of which will be evaluated | |
2333 | in the user namespace. |
|
2344 | in the user namespace. | |
2334 |
|
2345 | |||
2335 | Returns |
|
2346 | Returns | |
2336 | ------- |
|
2347 | ------- | |
2337 | A dict, keyed like the input expressions dict, with the repr() of each |
|
2348 | A dict, keyed like the input expressions dict, with the repr() of each | |
2338 | value. |
|
2349 | value. | |
2339 | """ |
|
2350 | """ | |
2340 | out = {} |
|
2351 | out = {} | |
2341 | user_ns = self.user_ns |
|
2352 | user_ns = self.user_ns | |
2342 | global_ns = self.user_global_ns |
|
2353 | global_ns = self.user_global_ns | |
2343 | for key, expr in expressions.iteritems(): |
|
2354 | for key, expr in expressions.iteritems(): | |
2344 | try: |
|
2355 | try: | |
2345 | value = repr(eval(expr, global_ns, user_ns)) |
|
2356 | value = repr(eval(expr, global_ns, user_ns)) | |
2346 | except: |
|
2357 | except: | |
2347 | value = self._simple_error() |
|
2358 | value = self._simple_error() | |
2348 | out[key] = value |
|
2359 | out[key] = value | |
2349 | return out |
|
2360 | return out | |
2350 |
|
2361 | |||
2351 | #------------------------------------------------------------------------- |
|
2362 | #------------------------------------------------------------------------- | |
2352 | # Things related to the running of code |
|
2363 | # Things related to the running of code | |
2353 | #------------------------------------------------------------------------- |
|
2364 | #------------------------------------------------------------------------- | |
2354 |
|
2365 | |||
2355 | def ex(self, cmd): |
|
2366 | def ex(self, cmd): | |
2356 | """Execute a normal python statement in user namespace.""" |
|
2367 | """Execute a normal python statement in user namespace.""" | |
2357 | with self.builtin_trap: |
|
2368 | with self.builtin_trap: | |
2358 | exec cmd in self.user_global_ns, self.user_ns |
|
2369 | exec cmd in self.user_global_ns, self.user_ns | |
2359 |
|
2370 | |||
2360 | def ev(self, expr): |
|
2371 | def ev(self, expr): | |
2361 | """Evaluate python expression expr in user namespace. |
|
2372 | """Evaluate python expression expr in user namespace. | |
2362 |
|
2373 | |||
2363 | Returns the result of evaluation |
|
2374 | Returns the result of evaluation | |
2364 | """ |
|
2375 | """ | |
2365 | with self.builtin_trap: |
|
2376 | with self.builtin_trap: | |
2366 | return eval(expr, self.user_global_ns, self.user_ns) |
|
2377 | return eval(expr, self.user_global_ns, self.user_ns) | |
2367 |
|
2378 | |||
2368 | def safe_execfile(self, fname, *where, **kw): |
|
2379 | def safe_execfile(self, fname, *where, **kw): | |
2369 | """A safe version of the builtin execfile(). |
|
2380 | """A safe version of the builtin execfile(). | |
2370 |
|
2381 | |||
2371 | This version will never throw an exception, but instead print |
|
2382 | This version will never throw an exception, but instead print | |
2372 | helpful error messages to the screen. This only works on pure |
|
2383 | helpful error messages to the screen. This only works on pure | |
2373 | Python files with the .py extension. |
|
2384 | Python files with the .py extension. | |
2374 |
|
2385 | |||
2375 | Parameters |
|
2386 | Parameters | |
2376 | ---------- |
|
2387 | ---------- | |
2377 | fname : string |
|
2388 | fname : string | |
2378 | The name of the file to be executed. |
|
2389 | The name of the file to be executed. | |
2379 | where : tuple |
|
2390 | where : tuple | |
2380 | One or two namespaces, passed to execfile() as (globals,locals). |
|
2391 | One or two namespaces, passed to execfile() as (globals,locals). | |
2381 | If only one is given, it is passed as both. |
|
2392 | If only one is given, it is passed as both. | |
2382 | exit_ignore : bool (False) |
|
2393 | exit_ignore : bool (False) | |
2383 | If True, then silence SystemExit for non-zero status (it is always |
|
2394 | If True, then silence SystemExit for non-zero status (it is always | |
2384 | silenced for zero status, as it is so common). |
|
2395 | silenced for zero status, as it is so common). | |
2385 | raise_exceptions : bool (False) |
|
2396 | raise_exceptions : bool (False) | |
2386 | If True raise exceptions everywhere. Meant for testing. |
|
2397 | If True raise exceptions everywhere. Meant for testing. | |
2387 |
|
2398 | |||
2388 | """ |
|
2399 | """ | |
2389 | kw.setdefault('exit_ignore', False) |
|
2400 | kw.setdefault('exit_ignore', False) | |
2390 | kw.setdefault('raise_exceptions', False) |
|
2401 | kw.setdefault('raise_exceptions', False) | |
2391 |
|
2402 | |||
2392 | fname = os.path.abspath(os.path.expanduser(fname)) |
|
2403 | fname = os.path.abspath(os.path.expanduser(fname)) | |
2393 |
|
2404 | |||
2394 | # Make sure we can open the file |
|
2405 | # Make sure we can open the file | |
2395 | try: |
|
2406 | try: | |
2396 | with open(fname) as thefile: |
|
2407 | with open(fname) as thefile: | |
2397 | pass |
|
2408 | pass | |
2398 | except: |
|
2409 | except: | |
2399 | warn('Could not open file <%s> for safe execution.' % fname) |
|
2410 | warn('Could not open file <%s> for safe execution.' % fname) | |
2400 | return |
|
2411 | return | |
2401 |
|
2412 | |||
2402 | # Find things also in current directory. This is needed to mimic the |
|
2413 | # Find things also in current directory. This is needed to mimic the | |
2403 | # behavior of running a script from the system command line, where |
|
2414 | # behavior of running a script from the system command line, where | |
2404 | # Python inserts the script's directory into sys.path |
|
2415 | # Python inserts the script's directory into sys.path | |
2405 | dname = os.path.dirname(fname) |
|
2416 | dname = os.path.dirname(fname) | |
2406 |
|
2417 | |||
2407 | with prepended_to_syspath(dname): |
|
2418 | with prepended_to_syspath(dname): | |
2408 | try: |
|
2419 | try: | |
2409 | py3compat.execfile(fname,*where) |
|
2420 | py3compat.execfile(fname,*where) | |
2410 | except SystemExit, status: |
|
2421 | except SystemExit, status: | |
2411 | # If the call was made with 0 or None exit status (sys.exit(0) |
|
2422 | # If the call was made with 0 or None exit status (sys.exit(0) | |
2412 | # or sys.exit() ), don't bother showing a traceback, as both of |
|
2423 | # or sys.exit() ), don't bother showing a traceback, as both of | |
2413 | # these are considered normal by the OS: |
|
2424 | # these are considered normal by the OS: | |
2414 | # > python -c'import sys;sys.exit(0)'; echo $? |
|
2425 | # > python -c'import sys;sys.exit(0)'; echo $? | |
2415 | # 0 |
|
2426 | # 0 | |
2416 | # > python -c'import sys;sys.exit()'; echo $? |
|
2427 | # > python -c'import sys;sys.exit()'; echo $? | |
2417 | # 0 |
|
2428 | # 0 | |
2418 | # For other exit status, we show the exception unless |
|
2429 | # For other exit status, we show the exception unless | |
2419 | # explicitly silenced, but only in short form. |
|
2430 | # explicitly silenced, but only in short form. | |
2420 | if kw['raise_exceptions']: |
|
2431 | if kw['raise_exceptions']: | |
2421 | raise |
|
2432 | raise | |
2422 | if status.code not in (0, None) and not kw['exit_ignore']: |
|
2433 | if status.code not in (0, None) and not kw['exit_ignore']: | |
2423 | self.showtraceback(exception_only=True) |
|
2434 | self.showtraceback(exception_only=True) | |
2424 | except: |
|
2435 | except: | |
2425 | if kw['raise_exceptions']: |
|
2436 | if kw['raise_exceptions']: | |
2426 | raise |
|
2437 | raise | |
2427 | self.showtraceback() |
|
2438 | self.showtraceback() | |
2428 |
|
2439 | |||
2429 | def safe_execfile_ipy(self, fname): |
|
2440 | def safe_execfile_ipy(self, fname): | |
2430 | """Like safe_execfile, but for .ipy files with IPython syntax. |
|
2441 | """Like safe_execfile, but for .ipy files with IPython syntax. | |
2431 |
|
2442 | |||
2432 | Parameters |
|
2443 | Parameters | |
2433 | ---------- |
|
2444 | ---------- | |
2434 | fname : str |
|
2445 | fname : str | |
2435 | The name of the file to execute. The filename must have a |
|
2446 | The name of the file to execute. The filename must have a | |
2436 | .ipy extension. |
|
2447 | .ipy extension. | |
2437 | """ |
|
2448 | """ | |
2438 | fname = os.path.abspath(os.path.expanduser(fname)) |
|
2449 | fname = os.path.abspath(os.path.expanduser(fname)) | |
2439 |
|
2450 | |||
2440 | # Make sure we can open the file |
|
2451 | # Make sure we can open the file | |
2441 | try: |
|
2452 | try: | |
2442 | with open(fname) as thefile: |
|
2453 | with open(fname) as thefile: | |
2443 | pass |
|
2454 | pass | |
2444 | except: |
|
2455 | except: | |
2445 | warn('Could not open file <%s> for safe execution.' % fname) |
|
2456 | warn('Could not open file <%s> for safe execution.' % fname) | |
2446 | return |
|
2457 | return | |
2447 |
|
2458 | |||
2448 | # Find things also in current directory. This is needed to mimic the |
|
2459 | # Find things also in current directory. This is needed to mimic the | |
2449 | # behavior of running a script from the system command line, where |
|
2460 | # behavior of running a script from the system command line, where | |
2450 | # Python inserts the script's directory into sys.path |
|
2461 | # Python inserts the script's directory into sys.path | |
2451 | dname = os.path.dirname(fname) |
|
2462 | dname = os.path.dirname(fname) | |
2452 |
|
2463 | |||
2453 | with prepended_to_syspath(dname): |
|
2464 | with prepended_to_syspath(dname): | |
2454 | try: |
|
2465 | try: | |
2455 | with open(fname) as thefile: |
|
2466 | with open(fname) as thefile: | |
2456 | # self.run_cell currently captures all exceptions |
|
2467 | # self.run_cell currently captures all exceptions | |
2457 | # raised in user code. It would be nice if there were |
|
2468 | # raised in user code. It would be nice if there were | |
2458 | # versions of runlines, execfile that did raise, so |
|
2469 | # versions of runlines, execfile that did raise, so | |
2459 | # we could catch the errors. |
|
2470 | # we could catch the errors. | |
2460 | self.run_cell(thefile.read(), store_history=False) |
|
2471 | self.run_cell(thefile.read(), store_history=False) | |
2461 | except: |
|
2472 | except: | |
2462 | self.showtraceback() |
|
2473 | self.showtraceback() | |
2463 | warn('Unknown failure executing file: <%s>' % fname) |
|
2474 | warn('Unknown failure executing file: <%s>' % fname) | |
2464 |
|
2475 | |||
2465 | def safe_run_module(self, mod_name, where): |
|
2476 | def safe_run_module(self, mod_name, where): | |
2466 | """A safe version of runpy.run_module(). |
|
2477 | """A safe version of runpy.run_module(). | |
2467 |
|
2478 | |||
2468 | This version will never throw an exception, but instead print |
|
2479 | This version will never throw an exception, but instead print | |
2469 | helpful error messages to the screen. |
|
2480 | helpful error messages to the screen. | |
2470 |
|
2481 | |||
2471 | Parameters |
|
2482 | Parameters | |
2472 | ---------- |
|
2483 | ---------- | |
2473 | mod_name : string |
|
2484 | mod_name : string | |
2474 | The name of the module to be executed. |
|
2485 | The name of the module to be executed. | |
2475 | where : dict |
|
2486 | where : dict | |
2476 | The globals namespace. |
|
2487 | The globals namespace. | |
2477 | """ |
|
2488 | """ | |
2478 | try: |
|
2489 | try: | |
2479 | where.update( |
|
2490 | where.update( | |
2480 | runpy.run_module(str(mod_name), run_name="__main__", |
|
2491 | runpy.run_module(str(mod_name), run_name="__main__", | |
2481 | alter_sys=True) |
|
2492 | alter_sys=True) | |
2482 | ) |
|
2493 | ) | |
2483 | except: |
|
2494 | except: | |
2484 | self.showtraceback() |
|
2495 | self.showtraceback() | |
2485 | warn('Unknown failure executing module: <%s>' % mod_name) |
|
2496 | warn('Unknown failure executing module: <%s>' % mod_name) | |
2486 |
|
2497 | |||
2487 | def _cell_magic(self, magic_name, line): |
|
2498 | def _run_cached_cell_magic(self, magic_name, line): | |
2488 | """Special method to call a cell magic with the data stored in self. |
|
2499 | """Special method to call a cell magic with the data stored in self. | |
2489 | """ |
|
2500 | """ | |
2490 | cell = self._current_cell_magic_body |
|
2501 | cell = self._current_cell_magic_body | |
2491 | self._current_cell_magic_body = None |
|
2502 | self._current_cell_magic_body = None | |
2492 | return self.cell_magic(magic_name, line, cell) |
|
2503 | return self.run_cell_magic(magic_name, line, cell) | |
2493 |
|
2504 | |||
2494 | def run_cell(self, raw_cell, store_history=False, silent=False): |
|
2505 | def run_cell(self, raw_cell, store_history=False, silent=False): | |
2495 | """Run a complete IPython cell. |
|
2506 | """Run a complete IPython cell. | |
2496 |
|
2507 | |||
2497 | Parameters |
|
2508 | Parameters | |
2498 | ---------- |
|
2509 | ---------- | |
2499 | raw_cell : str |
|
2510 | raw_cell : str | |
2500 | The code (including IPython code such as %magic functions) to run. |
|
2511 | The code (including IPython code such as %magic functions) to run. | |
2501 | store_history : bool |
|
2512 | store_history : bool | |
2502 | If True, the raw and translated cell will be stored in IPython's |
|
2513 | If True, the raw and translated cell will be stored in IPython's | |
2503 | history. For user code calling back into IPython's machinery, this |
|
2514 | history. For user code calling back into IPython's machinery, this | |
2504 | should be set to False. |
|
2515 | should be set to False. | |
2505 | silent : bool |
|
2516 | silent : bool | |
2506 | If True, avoid side-effets, such as implicit displayhooks, history, |
|
2517 | If True, avoid side-effets, such as implicit displayhooks, history, | |
2507 | and logging. silent=True forces store_history=False. |
|
2518 | and logging. silent=True forces store_history=False. | |
2508 | """ |
|
2519 | """ | |
2509 | if (not raw_cell) or raw_cell.isspace(): |
|
2520 | if (not raw_cell) or raw_cell.isspace(): | |
2510 | return |
|
2521 | return | |
2511 |
|
2522 | |||
2512 | if silent: |
|
2523 | if silent: | |
2513 | store_history = False |
|
2524 | store_history = False | |
2514 |
|
2525 | |||
2515 | self.input_splitter.push(raw_cell) |
|
2526 | self.input_splitter.push(raw_cell) | |
2516 |
|
2527 | |||
2517 | # Check for cell magics, which leave state behind. This interface is |
|
2528 | # Check for cell magics, which leave state behind. This interface is | |
2518 | # ugly, we need to do something cleaner later... Now the logic is |
|
2529 | # ugly, we need to do something cleaner later... Now the logic is | |
2519 | # simply that the input_splitter remembers if there was a cell magic, |
|
2530 | # simply that the input_splitter remembers if there was a cell magic, | |
2520 | # and in that case we grab the cell body. |
|
2531 | # and in that case we grab the cell body. | |
2521 | if self.input_splitter.cell_magic_parts: |
|
2532 | if self.input_splitter.cell_magic_parts: | |
2522 | self._current_cell_magic_body = \ |
|
2533 | self._current_cell_magic_body = \ | |
2523 | ''.join(self.input_splitter.cell_magic_parts) |
|
2534 | ''.join(self.input_splitter.cell_magic_parts) | |
2524 | cell = self.input_splitter.source_reset() |
|
2535 | cell = self.input_splitter.source_reset() | |
2525 |
|
2536 | |||
2526 | with self.builtin_trap: |
|
2537 | with self.builtin_trap: | |
2527 | prefilter_failed = False |
|
2538 | prefilter_failed = False | |
2528 | if len(cell.splitlines()) == 1: |
|
2539 | if len(cell.splitlines()) == 1: | |
2529 | try: |
|
2540 | try: | |
2530 | # use prefilter_lines to handle trailing newlines |
|
2541 | # use prefilter_lines to handle trailing newlines | |
2531 | # restore trailing newline for ast.parse |
|
2542 | # restore trailing newline for ast.parse | |
2532 | cell = self.prefilter_manager.prefilter_lines(cell) + '\n' |
|
2543 | cell = self.prefilter_manager.prefilter_lines(cell) + '\n' | |
2533 | except AliasError as e: |
|
2544 | except AliasError as e: | |
2534 | error(e) |
|
2545 | error(e) | |
2535 | prefilter_failed = True |
|
2546 | prefilter_failed = True | |
2536 | except Exception: |
|
2547 | except Exception: | |
2537 | # don't allow prefilter errors to crash IPython |
|
2548 | # don't allow prefilter errors to crash IPython | |
2538 | self.showtraceback() |
|
2549 | self.showtraceback() | |
2539 | prefilter_failed = True |
|
2550 | prefilter_failed = True | |
2540 |
|
2551 | |||
2541 | # Store raw and processed history |
|
2552 | # Store raw and processed history | |
2542 | if store_history: |
|
2553 | if store_history: | |
2543 | self.history_manager.store_inputs(self.execution_count, |
|
2554 | self.history_manager.store_inputs(self.execution_count, | |
2544 | cell, raw_cell) |
|
2555 | cell, raw_cell) | |
2545 | if not silent: |
|
2556 | if not silent: | |
2546 | self.logger.log(cell, raw_cell) |
|
2557 | self.logger.log(cell, raw_cell) | |
2547 |
|
2558 | |||
2548 | if not prefilter_failed: |
|
2559 | if not prefilter_failed: | |
2549 | # don't run if prefilter failed |
|
2560 | # don't run if prefilter failed | |
2550 | cell_name = self.compile.cache(cell, self.execution_count) |
|
2561 | cell_name = self.compile.cache(cell, self.execution_count) | |
2551 |
|
2562 | |||
2552 | with self.display_trap: |
|
2563 | with self.display_trap: | |
2553 | try: |
|
2564 | try: | |
2554 | code_ast = self.compile.ast_parse(cell, |
|
2565 | code_ast = self.compile.ast_parse(cell, | |
2555 | filename=cell_name) |
|
2566 | filename=cell_name) | |
2556 | except IndentationError: |
|
2567 | except IndentationError: | |
2557 | self.showindentationerror() |
|
2568 | self.showindentationerror() | |
2558 | if store_history: |
|
2569 | if store_history: | |
2559 | self.execution_count += 1 |
|
2570 | self.execution_count += 1 | |
2560 | return None |
|
2571 | return None | |
2561 | except (OverflowError, SyntaxError, ValueError, TypeError, |
|
2572 | except (OverflowError, SyntaxError, ValueError, TypeError, | |
2562 | MemoryError): |
|
2573 | MemoryError): | |
2563 | self.showsyntaxerror() |
|
2574 | self.showsyntaxerror() | |
2564 | if store_history: |
|
2575 | if store_history: | |
2565 | self.execution_count += 1 |
|
2576 | self.execution_count += 1 | |
2566 | return None |
|
2577 | return None | |
2567 |
|
2578 | |||
2568 | interactivity = "none" if silent else "last_expr" |
|
2579 | interactivity = "none" if silent else "last_expr" | |
2569 | self.run_ast_nodes(code_ast.body, cell_name, |
|
2580 | self.run_ast_nodes(code_ast.body, cell_name, | |
2570 | interactivity=interactivity) |
|
2581 | interactivity=interactivity) | |
2571 |
|
2582 | |||
2572 | # Execute any registered post-execution functions. |
|
2583 | # Execute any registered post-execution functions. | |
2573 | # unless we are silent |
|
2584 | # unless we are silent | |
2574 | post_exec = [] if silent else self._post_execute.iteritems() |
|
2585 | post_exec = [] if silent else self._post_execute.iteritems() | |
2575 |
|
2586 | |||
2576 | for func, status in post_exec: |
|
2587 | for func, status in post_exec: | |
2577 | if self.disable_failing_post_execute and not status: |
|
2588 | if self.disable_failing_post_execute and not status: | |
2578 | continue |
|
2589 | continue | |
2579 | try: |
|
2590 | try: | |
2580 | func() |
|
2591 | func() | |
2581 | except KeyboardInterrupt: |
|
2592 | except KeyboardInterrupt: | |
2582 | print >> io.stderr, "\nKeyboardInterrupt" |
|
2593 | print >> io.stderr, "\nKeyboardInterrupt" | |
2583 | except Exception: |
|
2594 | except Exception: | |
2584 | # register as failing: |
|
2595 | # register as failing: | |
2585 | self._post_execute[func] = False |
|
2596 | self._post_execute[func] = False | |
2586 | self.showtraceback() |
|
2597 | self.showtraceback() | |
2587 | print >> io.stderr, '\n'.join([ |
|
2598 | print >> io.stderr, '\n'.join([ | |
2588 | "post-execution function %r produced an error." % func, |
|
2599 | "post-execution function %r produced an error." % func, | |
2589 | "If this problem persists, you can disable failing post-exec functions with:", |
|
2600 | "If this problem persists, you can disable failing post-exec functions with:", | |
2590 | "", |
|
2601 | "", | |
2591 | " get_ipython().disable_failing_post_execute = True" |
|
2602 | " get_ipython().disable_failing_post_execute = True" | |
2592 | ]) |
|
2603 | ]) | |
2593 |
|
2604 | |||
2594 | if store_history: |
|
2605 | if store_history: | |
2595 | # Write output to the database. Does nothing unless |
|
2606 | # Write output to the database. Does nothing unless | |
2596 | # history output logging is enabled. |
|
2607 | # history output logging is enabled. | |
2597 | self.history_manager.store_output(self.execution_count) |
|
2608 | self.history_manager.store_output(self.execution_count) | |
2598 | # Each cell is a *single* input, regardless of how many lines it has |
|
2609 | # Each cell is a *single* input, regardless of how many lines it has | |
2599 | self.execution_count += 1 |
|
2610 | self.execution_count += 1 | |
2600 |
|
2611 | |||
2601 | def run_ast_nodes(self, nodelist, cell_name, interactivity='last_expr'): |
|
2612 | def run_ast_nodes(self, nodelist, cell_name, interactivity='last_expr'): | |
2602 | """Run a sequence of AST nodes. The execution mode depends on the |
|
2613 | """Run a sequence of AST nodes. The execution mode depends on the | |
2603 | interactivity parameter. |
|
2614 | interactivity parameter. | |
2604 |
|
2615 | |||
2605 | Parameters |
|
2616 | Parameters | |
2606 | ---------- |
|
2617 | ---------- | |
2607 | nodelist : list |
|
2618 | nodelist : list | |
2608 | A sequence of AST nodes to run. |
|
2619 | A sequence of AST nodes to run. | |
2609 | cell_name : str |
|
2620 | cell_name : str | |
2610 | Will be passed to the compiler as the filename of the cell. Typically |
|
2621 | Will be passed to the compiler as the filename of the cell. Typically | |
2611 | the value returned by ip.compile.cache(cell). |
|
2622 | the value returned by ip.compile.cache(cell). | |
2612 | interactivity : str |
|
2623 | interactivity : str | |
2613 | 'all', 'last', 'last_expr' or 'none', specifying which nodes should be |
|
2624 | 'all', 'last', 'last_expr' or 'none', specifying which nodes should be | |
2614 | run interactively (displaying output from expressions). 'last_expr' |
|
2625 | run interactively (displaying output from expressions). 'last_expr' | |
2615 | will run the last node interactively only if it is an expression (i.e. |
|
2626 | will run the last node interactively only if it is an expression (i.e. | |
2616 | expressions in loops or other blocks are not displayed. Other values |
|
2627 | expressions in loops or other blocks are not displayed. Other values | |
2617 | for this parameter will raise a ValueError. |
|
2628 | for this parameter will raise a ValueError. | |
2618 | """ |
|
2629 | """ | |
2619 | if not nodelist: |
|
2630 | if not nodelist: | |
2620 | return |
|
2631 | return | |
2621 |
|
2632 | |||
2622 | if interactivity == 'last_expr': |
|
2633 | if interactivity == 'last_expr': | |
2623 | if isinstance(nodelist[-1], ast.Expr): |
|
2634 | if isinstance(nodelist[-1], ast.Expr): | |
2624 | interactivity = "last" |
|
2635 | interactivity = "last" | |
2625 | else: |
|
2636 | else: | |
2626 | interactivity = "none" |
|
2637 | interactivity = "none" | |
2627 |
|
2638 | |||
2628 | if interactivity == 'none': |
|
2639 | if interactivity == 'none': | |
2629 | to_run_exec, to_run_interactive = nodelist, [] |
|
2640 | to_run_exec, to_run_interactive = nodelist, [] | |
2630 | elif interactivity == 'last': |
|
2641 | elif interactivity == 'last': | |
2631 | to_run_exec, to_run_interactive = nodelist[:-1], nodelist[-1:] |
|
2642 | to_run_exec, to_run_interactive = nodelist[:-1], nodelist[-1:] | |
2632 | elif interactivity == 'all': |
|
2643 | elif interactivity == 'all': | |
2633 | to_run_exec, to_run_interactive = [], nodelist |
|
2644 | to_run_exec, to_run_interactive = [], nodelist | |
2634 | else: |
|
2645 | else: | |
2635 | raise ValueError("Interactivity was %r" % interactivity) |
|
2646 | raise ValueError("Interactivity was %r" % interactivity) | |
2636 |
|
2647 | |||
2637 | exec_count = self.execution_count |
|
2648 | exec_count = self.execution_count | |
2638 |
|
2649 | |||
2639 | try: |
|
2650 | try: | |
2640 | for i, node in enumerate(to_run_exec): |
|
2651 | for i, node in enumerate(to_run_exec): | |
2641 | mod = ast.Module([node]) |
|
2652 | mod = ast.Module([node]) | |
2642 | code = self.compile(mod, cell_name, "exec") |
|
2653 | code = self.compile(mod, cell_name, "exec") | |
2643 | if self.run_code(code): |
|
2654 | if self.run_code(code): | |
2644 | return True |
|
2655 | return True | |
2645 |
|
2656 | |||
2646 | for i, node in enumerate(to_run_interactive): |
|
2657 | for i, node in enumerate(to_run_interactive): | |
2647 | mod = ast.Interactive([node]) |
|
2658 | mod = ast.Interactive([node]) | |
2648 | code = self.compile(mod, cell_name, "single") |
|
2659 | code = self.compile(mod, cell_name, "single") | |
2649 | if self.run_code(code): |
|
2660 | if self.run_code(code): | |
2650 | return True |
|
2661 | return True | |
2651 |
|
2662 | |||
2652 | # Flush softspace |
|
2663 | # Flush softspace | |
2653 | if softspace(sys.stdout, 0): |
|
2664 | if softspace(sys.stdout, 0): | |
2654 |
|
2665 | |||
2655 |
|
2666 | |||
2656 | except: |
|
2667 | except: | |
2657 | # It's possible to have exceptions raised here, typically by |
|
2668 | # It's possible to have exceptions raised here, typically by | |
2658 | # compilation of odd code (such as a naked 'return' outside a |
|
2669 | # compilation of odd code (such as a naked 'return' outside a | |
2659 | # function) that did parse but isn't valid. Typically the exception |
|
2670 | # function) that did parse but isn't valid. Typically the exception | |
2660 | # is a SyntaxError, but it's safest just to catch anything and show |
|
2671 | # is a SyntaxError, but it's safest just to catch anything and show | |
2661 | # the user a traceback. |
|
2672 | # the user a traceback. | |
2662 |
|
2673 | |||
2663 | # We do only one try/except outside the loop to minimize the impact |
|
2674 | # We do only one try/except outside the loop to minimize the impact | |
2664 | # on runtime, and also because if any node in the node list is |
|
2675 | # on runtime, and also because if any node in the node list is | |
2665 | # broken, we should stop execution completely. |
|
2676 | # broken, we should stop execution completely. | |
2666 | self.showtraceback() |
|
2677 | self.showtraceback() | |
2667 |
|
2678 | |||
2668 | return False |
|
2679 | return False | |
2669 |
|
2680 | |||
2670 | def run_code(self, code_obj): |
|
2681 | def run_code(self, code_obj): | |
2671 | """Execute a code object. |
|
2682 | """Execute a code object. | |
2672 |
|
2683 | |||
2673 | When an exception occurs, self.showtraceback() is called to display a |
|
2684 | When an exception occurs, self.showtraceback() is called to display a | |
2674 | traceback. |
|
2685 | traceback. | |
2675 |
|
2686 | |||
2676 | Parameters |
|
2687 | Parameters | |
2677 | ---------- |
|
2688 | ---------- | |
2678 | code_obj : code object |
|
2689 | code_obj : code object | |
2679 | A compiled code object, to be executed |
|
2690 | A compiled code object, to be executed | |
2680 |
|
2691 | |||
2681 | Returns |
|
2692 | Returns | |
2682 | ------- |
|
2693 | ------- | |
2683 | False : successful execution. |
|
2694 | False : successful execution. | |
2684 | True : an error occurred. |
|
2695 | True : an error occurred. | |
2685 | """ |
|
2696 | """ | |
2686 |
|
2697 | |||
2687 | # Set our own excepthook in case the user code tries to call it |
|
2698 | # Set our own excepthook in case the user code tries to call it | |
2688 | # directly, so that the IPython crash handler doesn't get triggered |
|
2699 | # directly, so that the IPython crash handler doesn't get triggered | |
2689 | old_excepthook,sys.excepthook = sys.excepthook, self.excepthook |
|
2700 | old_excepthook,sys.excepthook = sys.excepthook, self.excepthook | |
2690 |
|
2701 | |||
2691 | # we save the original sys.excepthook in the instance, in case config |
|
2702 | # we save the original sys.excepthook in the instance, in case config | |
2692 | # code (such as magics) needs access to it. |
|
2703 | # code (such as magics) needs access to it. | |
2693 | self.sys_excepthook = old_excepthook |
|
2704 | self.sys_excepthook = old_excepthook | |
2694 | outflag = 1 # happens in more places, so it's easier as default |
|
2705 | outflag = 1 # happens in more places, so it's easier as default | |
2695 | try: |
|
2706 | try: | |
2696 | try: |
|
2707 | try: | |
2697 | self.hooks.pre_run_code_hook() |
|
2708 | self.hooks.pre_run_code_hook() | |
2698 | #rprint('Running code', repr(code_obj)) # dbg |
|
2709 | #rprint('Running code', repr(code_obj)) # dbg | |
2699 | exec code_obj in self.user_global_ns, self.user_ns |
|
2710 | exec code_obj in self.user_global_ns, self.user_ns | |
2700 | finally: |
|
2711 | finally: | |
2701 | # Reset our crash handler in place |
|
2712 | # Reset our crash handler in place | |
2702 | sys.excepthook = old_excepthook |
|
2713 | sys.excepthook = old_excepthook | |
2703 | except SystemExit: |
|
2714 | except SystemExit: | |
2704 | self.showtraceback(exception_only=True) |
|
2715 | self.showtraceback(exception_only=True) | |
2705 | warn("To exit: use 'exit', 'quit', or Ctrl-D.", level=1) |
|
2716 | warn("To exit: use 'exit', 'quit', or Ctrl-D.", level=1) | |
2706 | except self.custom_exceptions: |
|
2717 | except self.custom_exceptions: | |
2707 | etype,value,tb = sys.exc_info() |
|
2718 | etype,value,tb = sys.exc_info() | |
2708 | self.CustomTB(etype,value,tb) |
|
2719 | self.CustomTB(etype,value,tb) | |
2709 | except: |
|
2720 | except: | |
2710 | self.showtraceback() |
|
2721 | self.showtraceback() | |
2711 | else: |
|
2722 | else: | |
2712 | outflag = 0 |
|
2723 | outflag = 0 | |
2713 | return outflag |
|
2724 | return outflag | |
2714 |
|
2725 | |||
2715 | # For backwards compatibility |
|
2726 | # For backwards compatibility | |
2716 | runcode = run_code |
|
2727 | runcode = run_code | |
2717 |
|
2728 | |||
2718 | #------------------------------------------------------------------------- |
|
2729 | #------------------------------------------------------------------------- | |
2719 | # Things related to GUI support and pylab |
|
2730 | # Things related to GUI support and pylab | |
2720 | #------------------------------------------------------------------------- |
|
2731 | #------------------------------------------------------------------------- | |
2721 |
|
2732 | |||
2722 | def enable_gui(self, gui=None): |
|
2733 | def enable_gui(self, gui=None): | |
2723 | raise NotImplementedError('Implement enable_gui in a subclass') |
|
2734 | raise NotImplementedError('Implement enable_gui in a subclass') | |
2724 |
|
2735 | |||
2725 | def enable_pylab(self, gui=None, import_all=True): |
|
2736 | def enable_pylab(self, gui=None, import_all=True): | |
2726 | """Activate pylab support at runtime. |
|
2737 | """Activate pylab support at runtime. | |
2727 |
|
2738 | |||
2728 | This turns on support for matplotlib, preloads into the interactive |
|
2739 | This turns on support for matplotlib, preloads into the interactive | |
2729 | namespace all of numpy and pylab, and configures IPython to correctly |
|
2740 | namespace all of numpy and pylab, and configures IPython to correctly | |
2730 | interact with the GUI event loop. The GUI backend to be used can be |
|
2741 | interact with the GUI event loop. The GUI backend to be used can be | |
2731 | optionally selected with the optional :param:`gui` argument. |
|
2742 | optionally selected with the optional :param:`gui` argument. | |
2732 |
|
2743 | |||
2733 | Parameters |
|
2744 | Parameters | |
2734 | ---------- |
|
2745 | ---------- | |
2735 | gui : optional, string |
|
2746 | gui : optional, string | |
2736 |
|
2747 | |||
2737 | If given, dictates the choice of matplotlib GUI backend to use |
|
2748 | If given, dictates the choice of matplotlib GUI backend to use | |
2738 | (should be one of IPython's supported backends, 'qt', 'osx', 'tk', |
|
2749 | (should be one of IPython's supported backends, 'qt', 'osx', 'tk', | |
2739 | 'gtk', 'wx' or 'inline'), otherwise we use the default chosen by |
|
2750 | 'gtk', 'wx' or 'inline'), otherwise we use the default chosen by | |
2740 | matplotlib (as dictated by the matplotlib build-time options plus the |
|
2751 | matplotlib (as dictated by the matplotlib build-time options plus the | |
2741 | user's matplotlibrc configuration file). Note that not all backends |
|
2752 | user's matplotlibrc configuration file). Note that not all backends | |
2742 | make sense in all contexts, for example a terminal ipython can't |
|
2753 | make sense in all contexts, for example a terminal ipython can't | |
2743 | display figures inline. |
|
2754 | display figures inline. | |
2744 | """ |
|
2755 | """ | |
2745 | from IPython.core.pylabtools import mpl_runner |
|
2756 | from IPython.core.pylabtools import mpl_runner | |
2746 | # We want to prevent the loading of pylab to pollute the user's |
|
2757 | # We want to prevent the loading of pylab to pollute the user's | |
2747 | # namespace as shown by the %who* magics, so we execute the activation |
|
2758 | # namespace as shown by the %who* magics, so we execute the activation | |
2748 | # code in an empty namespace, and we update *both* user_ns and |
|
2759 | # code in an empty namespace, and we update *both* user_ns and | |
2749 | # user_ns_hidden with this information. |
|
2760 | # user_ns_hidden with this information. | |
2750 | ns = {} |
|
2761 | ns = {} | |
2751 | try: |
|
2762 | try: | |
2752 | gui = pylab_activate(ns, gui, import_all, self) |
|
2763 | gui = pylab_activate(ns, gui, import_all, self) | |
2753 | except KeyError: |
|
2764 | except KeyError: | |
2754 | error("Backend %r not supported" % gui) |
|
2765 | error("Backend %r not supported" % gui) | |
2755 | return |
|
2766 | return | |
2756 | self.user_ns.update(ns) |
|
2767 | self.user_ns.update(ns) | |
2757 | self.user_ns_hidden.update(ns) |
|
2768 | self.user_ns_hidden.update(ns) | |
2758 | # Now we must activate the gui pylab wants to use, and fix %run to take |
|
2769 | # Now we must activate the gui pylab wants to use, and fix %run to take | |
2759 | # plot updates into account |
|
2770 | # plot updates into account | |
2760 | self.enable_gui(gui) |
|
2771 | self.enable_gui(gui) | |
2761 | self.magics_manager.registry['ExecutionMagics'].default_runner = \ |
|
2772 | self.magics_manager.registry['ExecutionMagics'].default_runner = \ | |
2762 | mpl_runner(self.safe_execfile) |
|
2773 | mpl_runner(self.safe_execfile) | |
2763 |
|
2774 | |||
2764 | #------------------------------------------------------------------------- |
|
2775 | #------------------------------------------------------------------------- | |
2765 | # Utilities |
|
2776 | # Utilities | |
2766 | #------------------------------------------------------------------------- |
|
2777 | #------------------------------------------------------------------------- | |
2767 |
|
2778 | |||
2768 | def var_expand(self, cmd, depth=0, formatter=DollarFormatter()): |
|
2779 | def var_expand(self, cmd, depth=0, formatter=DollarFormatter()): | |
2769 | """Expand python variables in a string. |
|
2780 | """Expand python variables in a string. | |
2770 |
|
2781 | |||
2771 | The depth argument indicates how many frames above the caller should |
|
2782 | The depth argument indicates how many frames above the caller should | |
2772 | be walked to look for the local namespace where to expand variables. |
|
2783 | be walked to look for the local namespace where to expand variables. | |
2773 |
|
2784 | |||
2774 | The global namespace for expansion is always the user's interactive |
|
2785 | The global namespace for expansion is always the user's interactive | |
2775 | namespace. |
|
2786 | namespace. | |
2776 | """ |
|
2787 | """ | |
2777 | ns = self.user_ns.copy() |
|
2788 | ns = self.user_ns.copy() | |
2778 | ns.update(sys._getframe(depth+1).f_locals) |
|
2789 | ns.update(sys._getframe(depth+1).f_locals) | |
2779 | ns.pop('self', None) |
|
2790 | ns.pop('self', None) | |
2780 | try: |
|
2791 | try: | |
2781 | cmd = formatter.format(cmd, **ns) |
|
2792 | cmd = formatter.format(cmd, **ns) | |
2782 | except Exception: |
|
2793 | except Exception: | |
2783 | # if formatter couldn't format, just let it go untransformed |
|
2794 | # if formatter couldn't format, just let it go untransformed | |
2784 | pass |
|
2795 | pass | |
2785 | return cmd |
|
2796 | return cmd | |
2786 |
|
2797 | |||
2787 | def mktempfile(self, data=None, prefix='ipython_edit_'): |
|
2798 | def mktempfile(self, data=None, prefix='ipython_edit_'): | |
2788 | """Make a new tempfile and return its filename. |
|
2799 | """Make a new tempfile and return its filename. | |
2789 |
|
2800 | |||
2790 | This makes a call to tempfile.mktemp, but it registers the created |
|
2801 | This makes a call to tempfile.mktemp, but it registers the created | |
2791 | filename internally so ipython cleans it up at exit time. |
|
2802 | filename internally so ipython cleans it up at exit time. | |
2792 |
|
2803 | |||
2793 | Optional inputs: |
|
2804 | Optional inputs: | |
2794 |
|
2805 | |||
2795 | - data(None): if data is given, it gets written out to the temp file |
|
2806 | - data(None): if data is given, it gets written out to the temp file | |
2796 | immediately, and the file is closed again.""" |
|
2807 | immediately, and the file is closed again.""" | |
2797 |
|
2808 | |||
2798 | filename = tempfile.mktemp('.py', prefix) |
|
2809 | filename = tempfile.mktemp('.py', prefix) | |
2799 | self.tempfiles.append(filename) |
|
2810 | self.tempfiles.append(filename) | |
2800 |
|
2811 | |||
2801 | if data: |
|
2812 | if data: | |
2802 | tmp_file = open(filename,'w') |
|
2813 | tmp_file = open(filename,'w') | |
2803 | tmp_file.write(data) |
|
2814 | tmp_file.write(data) | |
2804 | tmp_file.close() |
|
2815 | tmp_file.close() | |
2805 | return filename |
|
2816 | return filename | |
2806 |
|
2817 | |||
2807 | # TODO: This should be removed when Term is refactored. |
|
2818 | # TODO: This should be removed when Term is refactored. | |
2808 | def write(self,data): |
|
2819 | def write(self,data): | |
2809 | """Write a string to the default output""" |
|
2820 | """Write a string to the default output""" | |
2810 | io.stdout.write(data) |
|
2821 | io.stdout.write(data) | |
2811 |
|
2822 | |||
2812 | # TODO: This should be removed when Term is refactored. |
|
2823 | # TODO: This should be removed when Term is refactored. | |
2813 | def write_err(self,data): |
|
2824 | def write_err(self,data): | |
2814 | """Write a string to the default error output""" |
|
2825 | """Write a string to the default error output""" | |
2815 | io.stderr.write(data) |
|
2826 | io.stderr.write(data) | |
2816 |
|
2827 | |||
2817 | def ask_yes_no(self, prompt, default=None): |
|
2828 | def ask_yes_no(self, prompt, default=None): | |
2818 | if self.quiet: |
|
2829 | if self.quiet: | |
2819 | return True |
|
2830 | return True | |
2820 | return ask_yes_no(prompt,default) |
|
2831 | return ask_yes_no(prompt,default) | |
2821 |
|
2832 | |||
2822 | def show_usage(self): |
|
2833 | def show_usage(self): | |
2823 | """Show a usage message""" |
|
2834 | """Show a usage message""" | |
2824 | page.page(IPython.core.usage.interactive_usage) |
|
2835 | page.page(IPython.core.usage.interactive_usage) | |
2825 |
|
2836 | |||
2826 | def extract_input_lines(self, range_str, raw=False): |
|
2837 | def extract_input_lines(self, range_str, raw=False): | |
2827 | """Return as a string a set of input history slices. |
|
2838 | """Return as a string a set of input history slices. | |
2828 |
|
2839 | |||
2829 | Parameters |
|
2840 | Parameters | |
2830 | ---------- |
|
2841 | ---------- | |
2831 | range_str : string |
|
2842 | range_str : string | |
2832 | The set of slices is given as a string, like "~5/6-~4/2 4:8 9", |
|
2843 | The set of slices is given as a string, like "~5/6-~4/2 4:8 9", | |
2833 | since this function is for use by magic functions which get their |
|
2844 | since this function is for use by magic functions which get their | |
2834 | arguments as strings. The number before the / is the session |
|
2845 | arguments as strings. The number before the / is the session | |
2835 | number: ~n goes n back from the current session. |
|
2846 | number: ~n goes n back from the current session. | |
2836 |
|
2847 | |||
2837 | Optional Parameters: |
|
2848 | Optional Parameters: | |
2838 | - raw(False): by default, the processed input is used. If this is |
|
2849 | - raw(False): by default, the processed input is used. If this is | |
2839 | true, the raw input history is used instead. |
|
2850 | true, the raw input history is used instead. | |
2840 |
|
2851 | |||
2841 | Note that slices can be called with two notations: |
|
2852 | Note that slices can be called with two notations: | |
2842 |
|
2853 | |||
2843 | N:M -> standard python form, means including items N...(M-1). |
|
2854 | N:M -> standard python form, means including items N...(M-1). | |
2844 |
|
2855 | |||
2845 | N-M -> include items N..M (closed endpoint).""" |
|
2856 | N-M -> include items N..M (closed endpoint).""" | |
2846 | lines = self.history_manager.get_range_by_str(range_str, raw=raw) |
|
2857 | lines = self.history_manager.get_range_by_str(range_str, raw=raw) | |
2847 | return "\n".join(x for _, _, x in lines) |
|
2858 | return "\n".join(x for _, _, x in lines) | |
2848 |
|
2859 | |||
2849 | def find_user_code(self, target, raw=True, py_only=False): |
|
2860 | def find_user_code(self, target, raw=True, py_only=False): | |
2850 | """Get a code string from history, file, url, or a string or macro. |
|
2861 | """Get a code string from history, file, url, or a string or macro. | |
2851 |
|
2862 | |||
2852 | This is mainly used by magic functions. |
|
2863 | This is mainly used by magic functions. | |
2853 |
|
2864 | |||
2854 | Parameters |
|
2865 | Parameters | |
2855 | ---------- |
|
2866 | ---------- | |
2856 |
|
2867 | |||
2857 | target : str |
|
2868 | target : str | |
2858 |
|
2869 | |||
2859 | A string specifying code to retrieve. This will be tried respectively |
|
2870 | A string specifying code to retrieve. This will be tried respectively | |
2860 | as: ranges of input history (see %history for syntax), url, |
|
2871 | as: ranges of input history (see %history for syntax), url, | |
2861 | correspnding .py file, filename, or an expression evaluating to a |
|
2872 | correspnding .py file, filename, or an expression evaluating to a | |
2862 | string or Macro in the user namespace. |
|
2873 | string or Macro in the user namespace. | |
2863 |
|
2874 | |||
2864 | raw : bool |
|
2875 | raw : bool | |
2865 | If true (default), retrieve raw history. Has no effect on the other |
|
2876 | If true (default), retrieve raw history. Has no effect on the other | |
2866 | retrieval mechanisms. |
|
2877 | retrieval mechanisms. | |
2867 |
|
2878 | |||
2868 | py_only : bool (default False) |
|
2879 | py_only : bool (default False) | |
2869 | Only try to fetch python code, do not try alternative methods to decode file |
|
2880 | Only try to fetch python code, do not try alternative methods to decode file | |
2870 | if unicode fails. |
|
2881 | if unicode fails. | |
2871 |
|
2882 | |||
2872 | Returns |
|
2883 | Returns | |
2873 | ------- |
|
2884 | ------- | |
2874 | A string of code. |
|
2885 | A string of code. | |
2875 |
|
2886 | |||
2876 | ValueError is raised if nothing is found, and TypeError if it evaluates |
|
2887 | ValueError is raised if nothing is found, and TypeError if it evaluates | |
2877 | to an object of another type. In each case, .args[0] is a printable |
|
2888 | to an object of another type. In each case, .args[0] is a printable | |
2878 | message. |
|
2889 | message. | |
2879 | """ |
|
2890 | """ | |
2880 | code = self.extract_input_lines(target, raw=raw) # Grab history |
|
2891 | code = self.extract_input_lines(target, raw=raw) # Grab history | |
2881 | if code: |
|
2892 | if code: | |
2882 | return code |
|
2893 | return code | |
2883 | utarget = unquote_filename(target) |
|
2894 | utarget = unquote_filename(target) | |
2884 | try: |
|
2895 | try: | |
2885 | if utarget.startswith(('http://', 'https://')): |
|
2896 | if utarget.startswith(('http://', 'https://')): | |
2886 | return openpy.read_py_url(utarget, skip_encoding_cookie=True) |
|
2897 | return openpy.read_py_url(utarget, skip_encoding_cookie=True) | |
2887 | except UnicodeDecodeError: |
|
2898 | except UnicodeDecodeError: | |
2888 | if not py_only : |
|
2899 | if not py_only : | |
2889 | response = urllib.urlopen(target) |
|
2900 | response = urllib.urlopen(target) | |
2890 | return response.read().decode('latin1') |
|
2901 | return response.read().decode('latin1') | |
2891 | raise ValueError(("'%s' seem to be unreadable.") % utarget) |
|
2902 | raise ValueError(("'%s' seem to be unreadable.") % utarget) | |
2892 |
|
2903 | |||
2893 | potential_target = [target] |
|
2904 | potential_target = [target] | |
2894 | try : |
|
2905 | try : | |
2895 | potential_target.insert(0,get_py_filename(target)) |
|
2906 | potential_target.insert(0,get_py_filename(target)) | |
2896 | except IOError: |
|
2907 | except IOError: | |
2897 | pass |
|
2908 | pass | |
2898 |
|
2909 | |||
2899 | for tgt in potential_target : |
|
2910 | for tgt in potential_target : | |
2900 | if os.path.isfile(tgt): # Read file |
|
2911 | if os.path.isfile(tgt): # Read file | |
2901 | try : |
|
2912 | try : | |
2902 | return openpy.read_py_file(tgt, skip_encoding_cookie=True) |
|
2913 | return openpy.read_py_file(tgt, skip_encoding_cookie=True) | |
2903 | except UnicodeDecodeError : |
|
2914 | except UnicodeDecodeError : | |
2904 | if not py_only : |
|
2915 | if not py_only : | |
2905 | with io_open(tgt,'r', encoding='latin1') as f : |
|
2916 | with io_open(tgt,'r', encoding='latin1') as f : | |
2906 | return f.read() |
|
2917 | return f.read() | |
2907 | raise ValueError(("'%s' seem to be unreadable.") % target) |
|
2918 | raise ValueError(("'%s' seem to be unreadable.") % target) | |
2908 |
|
2919 | |||
2909 | try: # User namespace |
|
2920 | try: # User namespace | |
2910 | codeobj = eval(target, self.user_ns) |
|
2921 | codeobj = eval(target, self.user_ns) | |
2911 | except Exception: |
|
2922 | except Exception: | |
2912 | raise ValueError(("'%s' was not found in history, as a file, url, " |
|
2923 | raise ValueError(("'%s' was not found in history, as a file, url, " | |
2913 | "nor in the user namespace.") % target) |
|
2924 | "nor in the user namespace.") % target) | |
2914 | if isinstance(codeobj, basestring): |
|
2925 | if isinstance(codeobj, basestring): | |
2915 | return codeobj |
|
2926 | return codeobj | |
2916 | elif isinstance(codeobj, Macro): |
|
2927 | elif isinstance(codeobj, Macro): | |
2917 | return codeobj.value |
|
2928 | return codeobj.value | |
2918 |
|
2929 | |||
2919 | raise TypeError("%s is neither a string nor a macro." % target, |
|
2930 | raise TypeError("%s is neither a string nor a macro." % target, | |
2920 | codeobj) |
|
2931 | codeobj) | |
2921 |
|
2932 | |||
2922 | #------------------------------------------------------------------------- |
|
2933 | #------------------------------------------------------------------------- | |
2923 | # Things related to IPython exiting |
|
2934 | # Things related to IPython exiting | |
2924 | #------------------------------------------------------------------------- |
|
2935 | #------------------------------------------------------------------------- | |
2925 | def atexit_operations(self): |
|
2936 | def atexit_operations(self): | |
2926 | """This will be executed at the time of exit. |
|
2937 | """This will be executed at the time of exit. | |
2927 |
|
2938 | |||
2928 | Cleanup operations and saving of persistent data that is done |
|
2939 | Cleanup operations and saving of persistent data that is done | |
2929 | unconditionally by IPython should be performed here. |
|
2940 | unconditionally by IPython should be performed here. | |
2930 |
|
2941 | |||
2931 | For things that may depend on startup flags or platform specifics (such |
|
2942 | For things that may depend on startup flags or platform specifics (such | |
2932 | as having readline or not), register a separate atexit function in the |
|
2943 | as having readline or not), register a separate atexit function in the | |
2933 | code that has the appropriate information, rather than trying to |
|
2944 | code that has the appropriate information, rather than trying to | |
2934 | clutter |
|
2945 | clutter | |
2935 | """ |
|
2946 | """ | |
2936 | # Close the history session (this stores the end time and line count) |
|
2947 | # Close the history session (this stores the end time and line count) | |
2937 | # this must be *before* the tempfile cleanup, in case of temporary |
|
2948 | # this must be *before* the tempfile cleanup, in case of temporary | |
2938 | # history db |
|
2949 | # history db | |
2939 | self.history_manager.end_session() |
|
2950 | self.history_manager.end_session() | |
2940 |
|
2951 | |||
2941 | # Cleanup all tempfiles left around |
|
2952 | # Cleanup all tempfiles left around | |
2942 | for tfile in self.tempfiles: |
|
2953 | for tfile in self.tempfiles: | |
2943 | try: |
|
2954 | try: | |
2944 | os.unlink(tfile) |
|
2955 | os.unlink(tfile) | |
2945 | except OSError: |
|
2956 | except OSError: | |
2946 | pass |
|
2957 | pass | |
2947 |
|
2958 | |||
2948 | # Clear all user namespaces to release all references cleanly. |
|
2959 | # Clear all user namespaces to release all references cleanly. | |
2949 | self.reset(new_session=False) |
|
2960 | self.reset(new_session=False) | |
2950 |
|
2961 | |||
2951 | # Run user hooks |
|
2962 | # Run user hooks | |
2952 | self.hooks.shutdown_hook() |
|
2963 | self.hooks.shutdown_hook() | |
2953 |
|
2964 | |||
2954 | def cleanup(self): |
|
2965 | def cleanup(self): | |
2955 | self.restore_sys_module_state() |
|
2966 | self.restore_sys_module_state() | |
2956 |
|
2967 | |||
2957 |
|
2968 | |||
2958 | class InteractiveShellABC(object): |
|
2969 | class InteractiveShellABC(object): | |
2959 | """An abstract base class for InteractiveShell.""" |
|
2970 | """An abstract base class for InteractiveShell.""" | |
2960 | __metaclass__ = abc.ABCMeta |
|
2971 | __metaclass__ = abc.ABCMeta | |
2961 |
|
2972 | |||
2962 | InteractiveShellABC.register(InteractiveShell) |
|
2973 | InteractiveShellABC.register(InteractiveShell) |
@@ -1,807 +1,807 b'' | |||||
1 | # -*- coding: utf-8 -*- |
|
1 | # -*- coding: utf-8 -*- | |
2 | """Tests for the inputsplitter module. |
|
2 | """Tests for the inputsplitter module. | |
3 |
|
3 | |||
4 | Authors |
|
4 | Authors | |
5 | ------- |
|
5 | ------- | |
6 | * Fernando Perez |
|
6 | * Fernando Perez | |
7 | * Robert Kern |
|
7 | * Robert Kern | |
8 | """ |
|
8 | """ | |
9 | #----------------------------------------------------------------------------- |
|
9 | #----------------------------------------------------------------------------- | |
10 | # Copyright (C) 2010-2011 The IPython Development Team |
|
10 | # Copyright (C) 2010-2011 The IPython Development Team | |
11 | # |
|
11 | # | |
12 | # Distributed under the terms of the BSD License. The full license is in |
|
12 | # Distributed under the terms of the BSD License. The full license is in | |
13 | # the file COPYING, distributed as part of this software. |
|
13 | # the file COPYING, distributed as part of this software. | |
14 | #----------------------------------------------------------------------------- |
|
14 | #----------------------------------------------------------------------------- | |
15 |
|
15 | |||
16 | #----------------------------------------------------------------------------- |
|
16 | #----------------------------------------------------------------------------- | |
17 | # Imports |
|
17 | # Imports | |
18 | #----------------------------------------------------------------------------- |
|
18 | #----------------------------------------------------------------------------- | |
19 | # stdlib |
|
19 | # stdlib | |
20 | import unittest |
|
20 | import unittest | |
21 | import sys |
|
21 | import sys | |
22 |
|
22 | |||
23 | # Third party |
|
23 | # Third party | |
24 | import nose.tools as nt |
|
24 | import nose.tools as nt | |
25 |
|
25 | |||
26 | # Our own |
|
26 | # Our own | |
27 | from IPython.core import inputsplitter as isp |
|
27 | from IPython.core import inputsplitter as isp | |
28 | from IPython.testing import tools as tt |
|
28 | from IPython.testing import tools as tt | |
29 | from IPython.utils import py3compat |
|
29 | from IPython.utils import py3compat | |
30 |
|
30 | |||
31 | #----------------------------------------------------------------------------- |
|
31 | #----------------------------------------------------------------------------- | |
32 | # Semi-complete examples (also used as tests) |
|
32 | # Semi-complete examples (also used as tests) | |
33 | #----------------------------------------------------------------------------- |
|
33 | #----------------------------------------------------------------------------- | |
34 |
|
34 | |||
35 | # Note: at the bottom, there's a slightly more complete version of this that |
|
35 | # Note: at the bottom, there's a slightly more complete version of this that | |
36 | # can be useful during development of code here. |
|
36 | # can be useful during development of code here. | |
37 |
|
37 | |||
38 | def mini_interactive_loop(input_func): |
|
38 | def mini_interactive_loop(input_func): | |
39 | """Minimal example of the logic of an interactive interpreter loop. |
|
39 | """Minimal example of the logic of an interactive interpreter loop. | |
40 |
|
40 | |||
41 | This serves as an example, and it is used by the test system with a fake |
|
41 | This serves as an example, and it is used by the test system with a fake | |
42 | raw_input that simulates interactive input.""" |
|
42 | raw_input that simulates interactive input.""" | |
43 |
|
43 | |||
44 | from IPython.core.inputsplitter import InputSplitter |
|
44 | from IPython.core.inputsplitter import InputSplitter | |
45 |
|
45 | |||
46 | isp = InputSplitter() |
|
46 | isp = InputSplitter() | |
47 | # In practice, this input loop would be wrapped in an outside loop to read |
|
47 | # In practice, this input loop would be wrapped in an outside loop to read | |
48 | # input indefinitely, until some exit/quit command was issued. Here we |
|
48 | # input indefinitely, until some exit/quit command was issued. Here we | |
49 | # only illustrate the basic inner loop. |
|
49 | # only illustrate the basic inner loop. | |
50 | while isp.push_accepts_more(): |
|
50 | while isp.push_accepts_more(): | |
51 | indent = ' '*isp.indent_spaces |
|
51 | indent = ' '*isp.indent_spaces | |
52 | prompt = '>>> ' + indent |
|
52 | prompt = '>>> ' + indent | |
53 | line = indent + input_func(prompt) |
|
53 | line = indent + input_func(prompt) | |
54 | isp.push(line) |
|
54 | isp.push(line) | |
55 |
|
55 | |||
56 | # Here we just return input so we can use it in a test suite, but a real |
|
56 | # Here we just return input so we can use it in a test suite, but a real | |
57 | # interpreter would instead send it for execution somewhere. |
|
57 | # interpreter would instead send it for execution somewhere. | |
58 | src = isp.source_reset() |
|
58 | src = isp.source_reset() | |
59 | #print 'Input source was:\n', src # dbg |
|
59 | #print 'Input source was:\n', src # dbg | |
60 | return src |
|
60 | return src | |
61 |
|
61 | |||
62 | #----------------------------------------------------------------------------- |
|
62 | #----------------------------------------------------------------------------- | |
63 | # Test utilities, just for local use |
|
63 | # Test utilities, just for local use | |
64 | #----------------------------------------------------------------------------- |
|
64 | #----------------------------------------------------------------------------- | |
65 |
|
65 | |||
66 | def assemble(block): |
|
66 | def assemble(block): | |
67 | """Assemble a block into multi-line sub-blocks.""" |
|
67 | """Assemble a block into multi-line sub-blocks.""" | |
68 | return ['\n'.join(sub_block)+'\n' for sub_block in block] |
|
68 | return ['\n'.join(sub_block)+'\n' for sub_block in block] | |
69 |
|
69 | |||
70 |
|
70 | |||
71 | def pseudo_input(lines): |
|
71 | def pseudo_input(lines): | |
72 | """Return a function that acts like raw_input but feeds the input list.""" |
|
72 | """Return a function that acts like raw_input but feeds the input list.""" | |
73 | ilines = iter(lines) |
|
73 | ilines = iter(lines) | |
74 | def raw_in(prompt): |
|
74 | def raw_in(prompt): | |
75 | try: |
|
75 | try: | |
76 | return next(ilines) |
|
76 | return next(ilines) | |
77 | except StopIteration: |
|
77 | except StopIteration: | |
78 | return '' |
|
78 | return '' | |
79 | return raw_in |
|
79 | return raw_in | |
80 |
|
80 | |||
81 | #----------------------------------------------------------------------------- |
|
81 | #----------------------------------------------------------------------------- | |
82 | # Tests |
|
82 | # Tests | |
83 | #----------------------------------------------------------------------------- |
|
83 | #----------------------------------------------------------------------------- | |
84 | def test_spaces(): |
|
84 | def test_spaces(): | |
85 | tests = [('', 0), |
|
85 | tests = [('', 0), | |
86 | (' ', 1), |
|
86 | (' ', 1), | |
87 | ('\n', 0), |
|
87 | ('\n', 0), | |
88 | (' \n', 1), |
|
88 | (' \n', 1), | |
89 | ('x', 0), |
|
89 | ('x', 0), | |
90 | (' x', 1), |
|
90 | (' x', 1), | |
91 | (' x',2), |
|
91 | (' x',2), | |
92 | (' x',4), |
|
92 | (' x',4), | |
93 | # Note: tabs are counted as a single whitespace! |
|
93 | # Note: tabs are counted as a single whitespace! | |
94 | ('\tx', 1), |
|
94 | ('\tx', 1), | |
95 | ('\t x', 2), |
|
95 | ('\t x', 2), | |
96 | ] |
|
96 | ] | |
97 | tt.check_pairs(isp.num_ini_spaces, tests) |
|
97 | tt.check_pairs(isp.num_ini_spaces, tests) | |
98 |
|
98 | |||
99 |
|
99 | |||
100 | def test_remove_comments(): |
|
100 | def test_remove_comments(): | |
101 | tests = [('text', 'text'), |
|
101 | tests = [('text', 'text'), | |
102 | ('text # comment', 'text '), |
|
102 | ('text # comment', 'text '), | |
103 | ('text # comment\n', 'text \n'), |
|
103 | ('text # comment\n', 'text \n'), | |
104 | ('text # comment \n', 'text \n'), |
|
104 | ('text # comment \n', 'text \n'), | |
105 | ('line # c \nline\n','line \nline\n'), |
|
105 | ('line # c \nline\n','line \nline\n'), | |
106 | ('line # c \nline#c2 \nline\nline #c\n\n', |
|
106 | ('line # c \nline#c2 \nline\nline #c\n\n', | |
107 | 'line \nline\nline\nline \n\n'), |
|
107 | 'line \nline\nline\nline \n\n'), | |
108 | ] |
|
108 | ] | |
109 | tt.check_pairs(isp.remove_comments, tests) |
|
109 | tt.check_pairs(isp.remove_comments, tests) | |
110 |
|
110 | |||
111 | def test_has_comment(): |
|
111 | def test_has_comment(): | |
112 | tests = [('text', False), |
|
112 | tests = [('text', False), | |
113 | ('text #comment', True), |
|
113 | ('text #comment', True), | |
114 | ('text #comment\n', True), |
|
114 | ('text #comment\n', True), | |
115 | ('#comment', True), |
|
115 | ('#comment', True), | |
116 | ('#comment\n', True), |
|
116 | ('#comment\n', True), | |
117 | ('a = "#string"', False), |
|
117 | ('a = "#string"', False), | |
118 | ('a = "#string" # comment', True), |
|
118 | ('a = "#string" # comment', True), | |
119 | ('a #comment not "string"', True), |
|
119 | ('a #comment not "string"', True), | |
120 | ] |
|
120 | ] | |
121 | tt.check_pairs(isp.has_comment, tests) |
|
121 | tt.check_pairs(isp.has_comment, tests) | |
122 |
|
122 | |||
123 |
|
123 | |||
124 | def test_get_input_encoding(): |
|
124 | def test_get_input_encoding(): | |
125 | encoding = isp.get_input_encoding() |
|
125 | encoding = isp.get_input_encoding() | |
126 | nt.assert_true(isinstance(encoding, basestring)) |
|
126 | nt.assert_true(isinstance(encoding, basestring)) | |
127 | # simple-minded check that at least encoding a simple string works with the |
|
127 | # simple-minded check that at least encoding a simple string works with the | |
128 | # encoding we got. |
|
128 | # encoding we got. | |
129 | nt.assert_equal(u'test'.encode(encoding), b'test') |
|
129 | nt.assert_equal(u'test'.encode(encoding), b'test') | |
130 |
|
130 | |||
131 |
|
131 | |||
132 | class NoInputEncodingTestCase(unittest.TestCase): |
|
132 | class NoInputEncodingTestCase(unittest.TestCase): | |
133 | def setUp(self): |
|
133 | def setUp(self): | |
134 | self.old_stdin = sys.stdin |
|
134 | self.old_stdin = sys.stdin | |
135 | class X: pass |
|
135 | class X: pass | |
136 | fake_stdin = X() |
|
136 | fake_stdin = X() | |
137 | sys.stdin = fake_stdin |
|
137 | sys.stdin = fake_stdin | |
138 |
|
138 | |||
139 | def test(self): |
|
139 | def test(self): | |
140 | # Verify that if sys.stdin has no 'encoding' attribute we do the right |
|
140 | # Verify that if sys.stdin has no 'encoding' attribute we do the right | |
141 | # thing |
|
141 | # thing | |
142 | enc = isp.get_input_encoding() |
|
142 | enc = isp.get_input_encoding() | |
143 | self.assertEqual(enc, 'ascii') |
|
143 | self.assertEqual(enc, 'ascii') | |
144 |
|
144 | |||
145 | def tearDown(self): |
|
145 | def tearDown(self): | |
146 | sys.stdin = self.old_stdin |
|
146 | sys.stdin = self.old_stdin | |
147 |
|
147 | |||
148 |
|
148 | |||
149 | class InputSplitterTestCase(unittest.TestCase): |
|
149 | class InputSplitterTestCase(unittest.TestCase): | |
150 | def setUp(self): |
|
150 | def setUp(self): | |
151 | self.isp = isp.InputSplitter() |
|
151 | self.isp = isp.InputSplitter() | |
152 |
|
152 | |||
153 | def test_reset(self): |
|
153 | def test_reset(self): | |
154 | isp = self.isp |
|
154 | isp = self.isp | |
155 | isp.push('x=1') |
|
155 | isp.push('x=1') | |
156 | isp.reset() |
|
156 | isp.reset() | |
157 | self.assertEqual(isp._buffer, []) |
|
157 | self.assertEqual(isp._buffer, []) | |
158 | self.assertEqual(isp.indent_spaces, 0) |
|
158 | self.assertEqual(isp.indent_spaces, 0) | |
159 | self.assertEqual(isp.source, '') |
|
159 | self.assertEqual(isp.source, '') | |
160 | self.assertEqual(isp.code, None) |
|
160 | self.assertEqual(isp.code, None) | |
161 | self.assertEqual(isp._is_complete, False) |
|
161 | self.assertEqual(isp._is_complete, False) | |
162 |
|
162 | |||
163 | def test_source(self): |
|
163 | def test_source(self): | |
164 | self.isp._store('1') |
|
164 | self.isp._store('1') | |
165 | self.isp._store('2') |
|
165 | self.isp._store('2') | |
166 | self.assertEqual(self.isp.source, '1\n2\n') |
|
166 | self.assertEqual(self.isp.source, '1\n2\n') | |
167 | self.assertTrue(len(self.isp._buffer)>0) |
|
167 | self.assertTrue(len(self.isp._buffer)>0) | |
168 | self.assertEqual(self.isp.source_reset(), '1\n2\n') |
|
168 | self.assertEqual(self.isp.source_reset(), '1\n2\n') | |
169 | self.assertEqual(self.isp._buffer, []) |
|
169 | self.assertEqual(self.isp._buffer, []) | |
170 | self.assertEqual(self.isp.source, '') |
|
170 | self.assertEqual(self.isp.source, '') | |
171 |
|
171 | |||
172 | def test_indent(self): |
|
172 | def test_indent(self): | |
173 | isp = self.isp # shorthand |
|
173 | isp = self.isp # shorthand | |
174 | isp.push('x=1') |
|
174 | isp.push('x=1') | |
175 | self.assertEqual(isp.indent_spaces, 0) |
|
175 | self.assertEqual(isp.indent_spaces, 0) | |
176 | isp.push('if 1:\n x=1') |
|
176 | isp.push('if 1:\n x=1') | |
177 | self.assertEqual(isp.indent_spaces, 4) |
|
177 | self.assertEqual(isp.indent_spaces, 4) | |
178 | isp.push('y=2\n') |
|
178 | isp.push('y=2\n') | |
179 | self.assertEqual(isp.indent_spaces, 0) |
|
179 | self.assertEqual(isp.indent_spaces, 0) | |
180 |
|
180 | |||
181 | def test_indent2(self): |
|
181 | def test_indent2(self): | |
182 | # In cell mode, inputs must be fed in whole blocks, so skip this test |
|
182 | # In cell mode, inputs must be fed in whole blocks, so skip this test | |
183 | if self.isp.input_mode == 'cell': return |
|
183 | if self.isp.input_mode == 'cell': return | |
184 |
|
184 | |||
185 | isp = self.isp |
|
185 | isp = self.isp | |
186 | isp.push('if 1:') |
|
186 | isp.push('if 1:') | |
187 | self.assertEqual(isp.indent_spaces, 4) |
|
187 | self.assertEqual(isp.indent_spaces, 4) | |
188 | isp.push(' x=1') |
|
188 | isp.push(' x=1') | |
189 | self.assertEqual(isp.indent_spaces, 4) |
|
189 | self.assertEqual(isp.indent_spaces, 4) | |
190 | # Blank lines shouldn't change the indent level |
|
190 | # Blank lines shouldn't change the indent level | |
191 | isp.push(' '*2) |
|
191 | isp.push(' '*2) | |
192 | self.assertEqual(isp.indent_spaces, 4) |
|
192 | self.assertEqual(isp.indent_spaces, 4) | |
193 |
|
193 | |||
194 | def test_indent3(self): |
|
194 | def test_indent3(self): | |
195 | # In cell mode, inputs must be fed in whole blocks, so skip this test |
|
195 | # In cell mode, inputs must be fed in whole blocks, so skip this test | |
196 | if self.isp.input_mode == 'cell': return |
|
196 | if self.isp.input_mode == 'cell': return | |
197 |
|
197 | |||
198 | isp = self.isp |
|
198 | isp = self.isp | |
199 | # When a multiline statement contains parens or multiline strings, we |
|
199 | # When a multiline statement contains parens or multiline strings, we | |
200 | # shouldn't get confused. |
|
200 | # shouldn't get confused. | |
201 | isp.push("if 1:") |
|
201 | isp.push("if 1:") | |
202 | isp.push(" x = (1+\n 2)") |
|
202 | isp.push(" x = (1+\n 2)") | |
203 | self.assertEqual(isp.indent_spaces, 4) |
|
203 | self.assertEqual(isp.indent_spaces, 4) | |
204 |
|
204 | |||
205 | def test_indent4(self): |
|
205 | def test_indent4(self): | |
206 | # In cell mode, inputs must be fed in whole blocks, so skip this test |
|
206 | # In cell mode, inputs must be fed in whole blocks, so skip this test | |
207 | if self.isp.input_mode == 'cell': return |
|
207 | if self.isp.input_mode == 'cell': return | |
208 |
|
208 | |||
209 | isp = self.isp |
|
209 | isp = self.isp | |
210 | # whitespace after ':' should not screw up indent level |
|
210 | # whitespace after ':' should not screw up indent level | |
211 | isp.push('if 1: \n x=1') |
|
211 | isp.push('if 1: \n x=1') | |
212 | self.assertEqual(isp.indent_spaces, 4) |
|
212 | self.assertEqual(isp.indent_spaces, 4) | |
213 | isp.push('y=2\n') |
|
213 | isp.push('y=2\n') | |
214 | self.assertEqual(isp.indent_spaces, 0) |
|
214 | self.assertEqual(isp.indent_spaces, 0) | |
215 | isp.push('if 1:\t\n x=1') |
|
215 | isp.push('if 1:\t\n x=1') | |
216 | self.assertEqual(isp.indent_spaces, 4) |
|
216 | self.assertEqual(isp.indent_spaces, 4) | |
217 | isp.push('y=2\n') |
|
217 | isp.push('y=2\n') | |
218 | self.assertEqual(isp.indent_spaces, 0) |
|
218 | self.assertEqual(isp.indent_spaces, 0) | |
219 |
|
219 | |||
220 | def test_dedent_pass(self): |
|
220 | def test_dedent_pass(self): | |
221 | isp = self.isp # shorthand |
|
221 | isp = self.isp # shorthand | |
222 | # should NOT cause dedent |
|
222 | # should NOT cause dedent | |
223 | isp.push('if 1:\n passes = 5') |
|
223 | isp.push('if 1:\n passes = 5') | |
224 | self.assertEqual(isp.indent_spaces, 4) |
|
224 | self.assertEqual(isp.indent_spaces, 4) | |
225 | isp.push('if 1:\n pass') |
|
225 | isp.push('if 1:\n pass') | |
226 | self.assertEqual(isp.indent_spaces, 0) |
|
226 | self.assertEqual(isp.indent_spaces, 0) | |
227 | isp.push('if 1:\n pass ') |
|
227 | isp.push('if 1:\n pass ') | |
228 | self.assertEqual(isp.indent_spaces, 0) |
|
228 | self.assertEqual(isp.indent_spaces, 0) | |
229 |
|
229 | |||
230 | def test_dedent_raise(self): |
|
230 | def test_dedent_raise(self): | |
231 | isp = self.isp # shorthand |
|
231 | isp = self.isp # shorthand | |
232 | # should NOT cause dedent |
|
232 | # should NOT cause dedent | |
233 | isp.push('if 1:\n raised = 4') |
|
233 | isp.push('if 1:\n raised = 4') | |
234 | self.assertEqual(isp.indent_spaces, 4) |
|
234 | self.assertEqual(isp.indent_spaces, 4) | |
235 | isp.push('if 1:\n raise TypeError()') |
|
235 | isp.push('if 1:\n raise TypeError()') | |
236 | self.assertEqual(isp.indent_spaces, 0) |
|
236 | self.assertEqual(isp.indent_spaces, 0) | |
237 | isp.push('if 1:\n raise') |
|
237 | isp.push('if 1:\n raise') | |
238 | self.assertEqual(isp.indent_spaces, 0) |
|
238 | self.assertEqual(isp.indent_spaces, 0) | |
239 | isp.push('if 1:\n raise ') |
|
239 | isp.push('if 1:\n raise ') | |
240 | self.assertEqual(isp.indent_spaces, 0) |
|
240 | self.assertEqual(isp.indent_spaces, 0) | |
241 |
|
241 | |||
242 | def test_dedent_return(self): |
|
242 | def test_dedent_return(self): | |
243 | isp = self.isp # shorthand |
|
243 | isp = self.isp # shorthand | |
244 | # should NOT cause dedent |
|
244 | # should NOT cause dedent | |
245 | isp.push('if 1:\n returning = 4') |
|
245 | isp.push('if 1:\n returning = 4') | |
246 | self.assertEqual(isp.indent_spaces, 4) |
|
246 | self.assertEqual(isp.indent_spaces, 4) | |
247 | isp.push('if 1:\n return 5 + 493') |
|
247 | isp.push('if 1:\n return 5 + 493') | |
248 | self.assertEqual(isp.indent_spaces, 0) |
|
248 | self.assertEqual(isp.indent_spaces, 0) | |
249 | isp.push('if 1:\n return') |
|
249 | isp.push('if 1:\n return') | |
250 | self.assertEqual(isp.indent_spaces, 0) |
|
250 | self.assertEqual(isp.indent_spaces, 0) | |
251 | isp.push('if 1:\n return ') |
|
251 | isp.push('if 1:\n return ') | |
252 | self.assertEqual(isp.indent_spaces, 0) |
|
252 | self.assertEqual(isp.indent_spaces, 0) | |
253 | isp.push('if 1:\n return(0)') |
|
253 | isp.push('if 1:\n return(0)') | |
254 | self.assertEqual(isp.indent_spaces, 0) |
|
254 | self.assertEqual(isp.indent_spaces, 0) | |
255 |
|
255 | |||
256 | def test_push(self): |
|
256 | def test_push(self): | |
257 | isp = self.isp |
|
257 | isp = self.isp | |
258 | self.assertTrue(isp.push('x=1')) |
|
258 | self.assertTrue(isp.push('x=1')) | |
259 |
|
259 | |||
260 | def test_push2(self): |
|
260 | def test_push2(self): | |
261 | isp = self.isp |
|
261 | isp = self.isp | |
262 | self.assertFalse(isp.push('if 1:')) |
|
262 | self.assertFalse(isp.push('if 1:')) | |
263 | for line in [' x=1', '# a comment', ' y=2']: |
|
263 | for line in [' x=1', '# a comment', ' y=2']: | |
264 | self.assertTrue(isp.push(line)) |
|
264 | self.assertTrue(isp.push(line)) | |
265 |
|
265 | |||
266 | def test_push3(self): |
|
266 | def test_push3(self): | |
267 | isp = self.isp |
|
267 | isp = self.isp | |
268 | isp.push('if True:') |
|
268 | isp.push('if True:') | |
269 | isp.push(' a = 1') |
|
269 | isp.push(' a = 1') | |
270 | self.assertFalse(isp.push('b = [1,')) |
|
270 | self.assertFalse(isp.push('b = [1,')) | |
271 |
|
271 | |||
272 | def test_replace_mode(self): |
|
272 | def test_replace_mode(self): | |
273 | isp = self.isp |
|
273 | isp = self.isp | |
274 | isp.input_mode = 'cell' |
|
274 | isp.input_mode = 'cell' | |
275 | isp.push('x=1') |
|
275 | isp.push('x=1') | |
276 | self.assertEqual(isp.source, 'x=1\n') |
|
276 | self.assertEqual(isp.source, 'x=1\n') | |
277 | isp.push('x=2') |
|
277 | isp.push('x=2') | |
278 | self.assertEqual(isp.source, 'x=2\n') |
|
278 | self.assertEqual(isp.source, 'x=2\n') | |
279 |
|
279 | |||
280 | def test_push_accepts_more(self): |
|
280 | def test_push_accepts_more(self): | |
281 | isp = self.isp |
|
281 | isp = self.isp | |
282 | isp.push('x=1') |
|
282 | isp.push('x=1') | |
283 | self.assertFalse(isp.push_accepts_more()) |
|
283 | self.assertFalse(isp.push_accepts_more()) | |
284 |
|
284 | |||
285 | def test_push_accepts_more2(self): |
|
285 | def test_push_accepts_more2(self): | |
286 | # In cell mode, inputs must be fed in whole blocks, so skip this test |
|
286 | # In cell mode, inputs must be fed in whole blocks, so skip this test | |
287 | if self.isp.input_mode == 'cell': return |
|
287 | if self.isp.input_mode == 'cell': return | |
288 |
|
288 | |||
289 | isp = self.isp |
|
289 | isp = self.isp | |
290 | isp.push('if 1:') |
|
290 | isp.push('if 1:') | |
291 | self.assertTrue(isp.push_accepts_more()) |
|
291 | self.assertTrue(isp.push_accepts_more()) | |
292 | isp.push(' x=1') |
|
292 | isp.push(' x=1') | |
293 | self.assertTrue(isp.push_accepts_more()) |
|
293 | self.assertTrue(isp.push_accepts_more()) | |
294 | isp.push('') |
|
294 | isp.push('') | |
295 | self.assertFalse(isp.push_accepts_more()) |
|
295 | self.assertFalse(isp.push_accepts_more()) | |
296 |
|
296 | |||
297 | def test_push_accepts_more3(self): |
|
297 | def test_push_accepts_more3(self): | |
298 | isp = self.isp |
|
298 | isp = self.isp | |
299 | isp.push("x = (2+\n3)") |
|
299 | isp.push("x = (2+\n3)") | |
300 | self.assertFalse(isp.push_accepts_more()) |
|
300 | self.assertFalse(isp.push_accepts_more()) | |
301 |
|
301 | |||
302 | def test_push_accepts_more4(self): |
|
302 | def test_push_accepts_more4(self): | |
303 | # In cell mode, inputs must be fed in whole blocks, so skip this test |
|
303 | # In cell mode, inputs must be fed in whole blocks, so skip this test | |
304 | if self.isp.input_mode == 'cell': return |
|
304 | if self.isp.input_mode == 'cell': return | |
305 |
|
305 | |||
306 | isp = self.isp |
|
306 | isp = self.isp | |
307 | # When a multiline statement contains parens or multiline strings, we |
|
307 | # When a multiline statement contains parens or multiline strings, we | |
308 | # shouldn't get confused. |
|
308 | # shouldn't get confused. | |
309 | # FIXME: we should be able to better handle de-dents in statements like |
|
309 | # FIXME: we should be able to better handle de-dents in statements like | |
310 | # multiline strings and multiline expressions (continued with \ or |
|
310 | # multiline strings and multiline expressions (continued with \ or | |
311 | # parens). Right now we aren't handling the indentation tracking quite |
|
311 | # parens). Right now we aren't handling the indentation tracking quite | |
312 | # correctly with this, though in practice it may not be too much of a |
|
312 | # correctly with this, though in practice it may not be too much of a | |
313 | # problem. We'll need to see. |
|
313 | # problem. We'll need to see. | |
314 | isp.push("if 1:") |
|
314 | isp.push("if 1:") | |
315 | isp.push(" x = (2+") |
|
315 | isp.push(" x = (2+") | |
316 | isp.push(" 3)") |
|
316 | isp.push(" 3)") | |
317 | self.assertTrue(isp.push_accepts_more()) |
|
317 | self.assertTrue(isp.push_accepts_more()) | |
318 | isp.push(" y = 3") |
|
318 | isp.push(" y = 3") | |
319 | self.assertTrue(isp.push_accepts_more()) |
|
319 | self.assertTrue(isp.push_accepts_more()) | |
320 | isp.push('') |
|
320 | isp.push('') | |
321 | self.assertFalse(isp.push_accepts_more()) |
|
321 | self.assertFalse(isp.push_accepts_more()) | |
322 |
|
322 | |||
323 | def test_push_accepts_more5(self): |
|
323 | def test_push_accepts_more5(self): | |
324 | # In cell mode, inputs must be fed in whole blocks, so skip this test |
|
324 | # In cell mode, inputs must be fed in whole blocks, so skip this test | |
325 | if self.isp.input_mode == 'cell': return |
|
325 | if self.isp.input_mode == 'cell': return | |
326 |
|
326 | |||
327 | isp = self.isp |
|
327 | isp = self.isp | |
328 | isp.push('try:') |
|
328 | isp.push('try:') | |
329 | isp.push(' a = 5') |
|
329 | isp.push(' a = 5') | |
330 | isp.push('except:') |
|
330 | isp.push('except:') | |
331 | isp.push(' raise') |
|
331 | isp.push(' raise') | |
332 | self.assertTrue(isp.push_accepts_more()) |
|
332 | self.assertTrue(isp.push_accepts_more()) | |
333 |
|
333 | |||
334 | def test_continuation(self): |
|
334 | def test_continuation(self): | |
335 | isp = self.isp |
|
335 | isp = self.isp | |
336 | isp.push("import os, \\") |
|
336 | isp.push("import os, \\") | |
337 | self.assertTrue(isp.push_accepts_more()) |
|
337 | self.assertTrue(isp.push_accepts_more()) | |
338 | isp.push("sys") |
|
338 | isp.push("sys") | |
339 | self.assertFalse(isp.push_accepts_more()) |
|
339 | self.assertFalse(isp.push_accepts_more()) | |
340 |
|
340 | |||
341 | def test_syntax_error(self): |
|
341 | def test_syntax_error(self): | |
342 | isp = self.isp |
|
342 | isp = self.isp | |
343 | # Syntax errors immediately produce a 'ready' block, so the invalid |
|
343 | # Syntax errors immediately produce a 'ready' block, so the invalid | |
344 | # Python can be sent to the kernel for evaluation with possible ipython |
|
344 | # Python can be sent to the kernel for evaluation with possible ipython | |
345 | # special-syntax conversion. |
|
345 | # special-syntax conversion. | |
346 | isp.push('run foo') |
|
346 | isp.push('run foo') | |
347 | self.assertFalse(isp.push_accepts_more()) |
|
347 | self.assertFalse(isp.push_accepts_more()) | |
348 |
|
348 | |||
349 | def test_unicode(self): |
|
349 | def test_unicode(self): | |
350 | self.isp.push(u"PΓ©rez") |
|
350 | self.isp.push(u"PΓ©rez") | |
351 | self.isp.push(u'\xc3\xa9') |
|
351 | self.isp.push(u'\xc3\xa9') | |
352 | self.isp.push(u"u'\xc3\xa9'") |
|
352 | self.isp.push(u"u'\xc3\xa9'") | |
353 |
|
353 | |||
354 | class InteractiveLoopTestCase(unittest.TestCase): |
|
354 | class InteractiveLoopTestCase(unittest.TestCase): | |
355 | """Tests for an interactive loop like a python shell. |
|
355 | """Tests for an interactive loop like a python shell. | |
356 | """ |
|
356 | """ | |
357 | def check_ns(self, lines, ns): |
|
357 | def check_ns(self, lines, ns): | |
358 | """Validate that the given input lines produce the resulting namespace. |
|
358 | """Validate that the given input lines produce the resulting namespace. | |
359 |
|
359 | |||
360 | Note: the input lines are given exactly as they would be typed in an |
|
360 | Note: the input lines are given exactly as they would be typed in an | |
361 | auto-indenting environment, as mini_interactive_loop above already does |
|
361 | auto-indenting environment, as mini_interactive_loop above already does | |
362 | auto-indenting and prepends spaces to the input. |
|
362 | auto-indenting and prepends spaces to the input. | |
363 | """ |
|
363 | """ | |
364 | src = mini_interactive_loop(pseudo_input(lines)) |
|
364 | src = mini_interactive_loop(pseudo_input(lines)) | |
365 | test_ns = {} |
|
365 | test_ns = {} | |
366 | exec src in test_ns |
|
366 | exec src in test_ns | |
367 | # We can't check that the provided ns is identical to the test_ns, |
|
367 | # We can't check that the provided ns is identical to the test_ns, | |
368 | # because Python fills test_ns with extra keys (copyright, etc). But |
|
368 | # because Python fills test_ns with extra keys (copyright, etc). But | |
369 | # we can check that the given dict is *contained* in test_ns |
|
369 | # we can check that the given dict is *contained* in test_ns | |
370 | for k,v in ns.iteritems(): |
|
370 | for k,v in ns.iteritems(): | |
371 | self.assertEqual(test_ns[k], v) |
|
371 | self.assertEqual(test_ns[k], v) | |
372 |
|
372 | |||
373 | def test_simple(self): |
|
373 | def test_simple(self): | |
374 | self.check_ns(['x=1'], dict(x=1)) |
|
374 | self.check_ns(['x=1'], dict(x=1)) | |
375 |
|
375 | |||
376 | def test_simple2(self): |
|
376 | def test_simple2(self): | |
377 | self.check_ns(['if 1:', 'x=2'], dict(x=2)) |
|
377 | self.check_ns(['if 1:', 'x=2'], dict(x=2)) | |
378 |
|
378 | |||
379 | def test_xy(self): |
|
379 | def test_xy(self): | |
380 | self.check_ns(['x=1; y=2'], dict(x=1, y=2)) |
|
380 | self.check_ns(['x=1; y=2'], dict(x=1, y=2)) | |
381 |
|
381 | |||
382 | def test_abc(self): |
|
382 | def test_abc(self): | |
383 | self.check_ns(['if 1:','a=1','b=2','c=3'], dict(a=1, b=2, c=3)) |
|
383 | self.check_ns(['if 1:','a=1','b=2','c=3'], dict(a=1, b=2, c=3)) | |
384 |
|
384 | |||
385 | def test_multi(self): |
|
385 | def test_multi(self): | |
386 | self.check_ns(['x =(1+','1+','2)'], dict(x=4)) |
|
386 | self.check_ns(['x =(1+','1+','2)'], dict(x=4)) | |
387 |
|
387 | |||
388 |
|
388 | |||
389 | def test_LineInfo(): |
|
389 | def test_LineInfo(): | |
390 | """Simple test for LineInfo construction and str()""" |
|
390 | """Simple test for LineInfo construction and str()""" | |
391 | linfo = isp.LineInfo(' %cd /home') |
|
391 | linfo = isp.LineInfo(' %cd /home') | |
392 | nt.assert_equals(str(linfo), 'LineInfo [ |%|cd|/home]') |
|
392 | nt.assert_equals(str(linfo), 'LineInfo [ |%|cd|/home]') | |
393 |
|
393 | |||
394 | # Transformer tests |
|
394 | # Transformer tests | |
395 | def transform_checker(tests, func): |
|
395 | def transform_checker(tests, func): | |
396 | """Utility to loop over test inputs""" |
|
396 | """Utility to loop over test inputs""" | |
397 | for inp, tr in tests: |
|
397 | for inp, tr in tests: | |
398 | nt.assert_equals(func(inp), tr) |
|
398 | nt.assert_equals(func(inp), tr) | |
399 |
|
399 | |||
400 | # Data for all the syntax tests in the form of lists of pairs of |
|
400 | # Data for all the syntax tests in the form of lists of pairs of | |
401 | # raw/transformed input. We store it here as a global dict so that we can use |
|
401 | # raw/transformed input. We store it here as a global dict so that we can use | |
402 | # it both within single-function tests and also to validate the behavior of the |
|
402 | # it both within single-function tests and also to validate the behavior of the | |
403 | # larger objects |
|
403 | # larger objects | |
404 |
|
404 | |||
405 | syntax = \ |
|
405 | syntax = \ | |
406 | dict(assign_system = |
|
406 | dict(assign_system = | |
407 | [(i,py3compat.u_format(o)) for i,o in \ |
|
407 | [(i,py3compat.u_format(o)) for i,o in \ | |
408 | [(u'a =! ls', "a = get_ipython().getoutput({u}'ls')"), |
|
408 | [(u'a =! ls', "a = get_ipython().getoutput({u}'ls')"), | |
409 | (u'b = !ls', "b = get_ipython().getoutput({u}'ls')"), |
|
409 | (u'b = !ls', "b = get_ipython().getoutput({u}'ls')"), | |
410 | ('x=1', 'x=1'), # normal input is unmodified |
|
410 | ('x=1', 'x=1'), # normal input is unmodified | |
411 | (' ',' '), # blank lines are kept intact |
|
411 | (' ',' '), # blank lines are kept intact | |
412 | ]], |
|
412 | ]], | |
413 |
|
413 | |||
414 | assign_magic = |
|
414 | assign_magic = | |
415 | [(i,py3compat.u_format(o)) for i,o in \ |
|
415 | [(i,py3compat.u_format(o)) for i,o in \ | |
416 | [(u'a =% who', "a = get_ipython().magic({u}'who')"), |
|
416 | [(u'a =% who', "a = get_ipython().magic({u}'who')"), | |
417 | (u'b = %who', "b = get_ipython().magic({u}'who')"), |
|
417 | (u'b = %who', "b = get_ipython().magic({u}'who')"), | |
418 | ('x=1', 'x=1'), # normal input is unmodified |
|
418 | ('x=1', 'x=1'), # normal input is unmodified | |
419 | (' ',' '), # blank lines are kept intact |
|
419 | (' ',' '), # blank lines are kept intact | |
420 | ]], |
|
420 | ]], | |
421 |
|
421 | |||
422 | classic_prompt = |
|
422 | classic_prompt = | |
423 | [('>>> x=1', 'x=1'), |
|
423 | [('>>> x=1', 'x=1'), | |
424 | ('x=1', 'x=1'), # normal input is unmodified |
|
424 | ('x=1', 'x=1'), # normal input is unmodified | |
425 | (' ', ' '), # blank lines are kept intact |
|
425 | (' ', ' '), # blank lines are kept intact | |
426 | ('... ', ''), # continuation prompts |
|
426 | ('... ', ''), # continuation prompts | |
427 | ], |
|
427 | ], | |
428 |
|
428 | |||
429 | ipy_prompt = |
|
429 | ipy_prompt = | |
430 | [('In [1]: x=1', 'x=1'), |
|
430 | [('In [1]: x=1', 'x=1'), | |
431 | ('x=1', 'x=1'), # normal input is unmodified |
|
431 | ('x=1', 'x=1'), # normal input is unmodified | |
432 | (' ',' '), # blank lines are kept intact |
|
432 | (' ',' '), # blank lines are kept intact | |
433 | (' ....: ', ''), # continuation prompts |
|
433 | (' ....: ', ''), # continuation prompts | |
434 | ], |
|
434 | ], | |
435 |
|
435 | |||
436 | # Tests for the escape transformer to leave normal code alone |
|
436 | # Tests for the escape transformer to leave normal code alone | |
437 | escaped_noesc = |
|
437 | escaped_noesc = | |
438 | [ (' ', ' '), |
|
438 | [ (' ', ' '), | |
439 | ('x=1', 'x=1'), |
|
439 | ('x=1', 'x=1'), | |
440 | ], |
|
440 | ], | |
441 |
|
441 | |||
442 | # System calls |
|
442 | # System calls | |
443 | escaped_shell = |
|
443 | escaped_shell = | |
444 | [(i,py3compat.u_format(o)) for i,o in \ |
|
444 | [(i,py3compat.u_format(o)) for i,o in \ | |
445 | [ (u'!ls', "get_ipython().system({u}'ls')"), |
|
445 | [ (u'!ls', "get_ipython().system({u}'ls')"), | |
446 | # Double-escape shell, this means to capture the output of the |
|
446 | # Double-escape shell, this means to capture the output of the | |
447 | # subprocess and return it |
|
447 | # subprocess and return it | |
448 | (u'!!ls', "get_ipython().getoutput({u}'ls')"), |
|
448 | (u'!!ls', "get_ipython().getoutput({u}'ls')"), | |
449 | ]], |
|
449 | ]], | |
450 |
|
450 | |||
451 | # Help/object info |
|
451 | # Help/object info | |
452 | escaped_help = |
|
452 | escaped_help = | |
453 | [(i,py3compat.u_format(o)) for i,o in \ |
|
453 | [(i,py3compat.u_format(o)) for i,o in \ | |
454 | [ (u'?', 'get_ipython().show_usage()'), |
|
454 | [ (u'?', 'get_ipython().show_usage()'), | |
455 | (u'?x1', "get_ipython().magic({u}'pinfo x1')"), |
|
455 | (u'?x1', "get_ipython().magic({u}'pinfo x1')"), | |
456 | (u'??x2', "get_ipython().magic({u}'pinfo2 x2')"), |
|
456 | (u'??x2', "get_ipython().magic({u}'pinfo2 x2')"), | |
457 | (u'?a.*s', "get_ipython().magic({u}'psearch a.*s')"), |
|
457 | (u'?a.*s', "get_ipython().magic({u}'psearch a.*s')"), | |
458 | (u'?%hist1', "get_ipython().magic({u}'pinfo %hist1')"), |
|
458 | (u'?%hist1', "get_ipython().magic({u}'pinfo %hist1')"), | |
459 | (u'?%%hist2', "get_ipython().magic({u}'pinfo %%hist2')"), |
|
459 | (u'?%%hist2', "get_ipython().magic({u}'pinfo %%hist2')"), | |
460 | (u'?abc = qwe', "get_ipython().magic({u}'pinfo abc')"), |
|
460 | (u'?abc = qwe', "get_ipython().magic({u}'pinfo abc')"), | |
461 | ]], |
|
461 | ]], | |
462 |
|
462 | |||
463 | end_help = |
|
463 | end_help = | |
464 | [(i,py3compat.u_format(o)) for i,o in \ |
|
464 | [(i,py3compat.u_format(o)) for i,o in \ | |
465 | [ (u'x3?', "get_ipython().magic({u}'pinfo x3')"), |
|
465 | [ (u'x3?', "get_ipython().magic({u}'pinfo x3')"), | |
466 | (u'x4??', "get_ipython().magic({u}'pinfo2 x4')"), |
|
466 | (u'x4??', "get_ipython().magic({u}'pinfo2 x4')"), | |
467 | (u'%hist1?', "get_ipython().magic({u}'pinfo %hist1')"), |
|
467 | (u'%hist1?', "get_ipython().magic({u}'pinfo %hist1')"), | |
468 | (u'%hist2??', "get_ipython().magic({u}'pinfo2 %hist2')"), |
|
468 | (u'%hist2??', "get_ipython().magic({u}'pinfo2 %hist2')"), | |
469 | (u'%%hist3?', "get_ipython().magic({u}'pinfo %%hist3')"), |
|
469 | (u'%%hist3?', "get_ipython().magic({u}'pinfo %%hist3')"), | |
470 | (u'%%hist4??', "get_ipython().magic({u}'pinfo2 %%hist4')"), |
|
470 | (u'%%hist4??', "get_ipython().magic({u}'pinfo2 %%hist4')"), | |
471 | (u'f*?', "get_ipython().magic({u}'psearch f*')"), |
|
471 | (u'f*?', "get_ipython().magic({u}'psearch f*')"), | |
472 | (u'ax.*aspe*?', "get_ipython().magic({u}'psearch ax.*aspe*')"), |
|
472 | (u'ax.*aspe*?', "get_ipython().magic({u}'psearch ax.*aspe*')"), | |
473 | (u'a = abc?', "get_ipython().set_next_input({u}'a = abc');" |
|
473 | (u'a = abc?', "get_ipython().set_next_input({u}'a = abc');" | |
474 | "get_ipython().magic({u}'pinfo abc')"), |
|
474 | "get_ipython().magic({u}'pinfo abc')"), | |
475 | (u'a = abc.qe??', "get_ipython().set_next_input({u}'a = abc.qe');" |
|
475 | (u'a = abc.qe??', "get_ipython().set_next_input({u}'a = abc.qe');" | |
476 | "get_ipython().magic({u}'pinfo2 abc.qe')"), |
|
476 | "get_ipython().magic({u}'pinfo2 abc.qe')"), | |
477 | (u'a = *.items?', "get_ipython().set_next_input({u}'a = *.items');" |
|
477 | (u'a = *.items?', "get_ipython().set_next_input({u}'a = *.items');" | |
478 | "get_ipython().magic({u}'psearch *.items')"), |
|
478 | "get_ipython().magic({u}'psearch *.items')"), | |
479 | (u'plot(a?', "get_ipython().set_next_input({u}'plot(a');" |
|
479 | (u'plot(a?', "get_ipython().set_next_input({u}'plot(a');" | |
480 | "get_ipython().magic({u}'pinfo a')"), |
|
480 | "get_ipython().magic({u}'pinfo a')"), | |
481 | (u'a*2 #comment?', 'a*2 #comment?'), |
|
481 | (u'a*2 #comment?', 'a*2 #comment?'), | |
482 | ]], |
|
482 | ]], | |
483 |
|
483 | |||
484 | # Explicit magic calls |
|
484 | # Explicit magic calls | |
485 | escaped_magic = |
|
485 | escaped_magic = | |
486 | [(i,py3compat.u_format(o)) for i,o in \ |
|
486 | [(i,py3compat.u_format(o)) for i,o in \ | |
487 | [ (u'%cd', "get_ipython().magic({u}'cd')"), |
|
487 | [ (u'%cd', "get_ipython().magic({u}'cd')"), | |
488 | (u'%cd /home', "get_ipython().magic({u}'cd /home')"), |
|
488 | (u'%cd /home', "get_ipython().magic({u}'cd /home')"), | |
489 | # Backslashes need to be escaped. |
|
489 | # Backslashes need to be escaped. | |
490 | (u'%cd C:\\User', "get_ipython().magic({u}'cd C:\\\\User')"), |
|
490 | (u'%cd C:\\User', "get_ipython().magic({u}'cd C:\\\\User')"), | |
491 | (u' %magic', " get_ipython().magic({u}'magic')"), |
|
491 | (u' %magic', " get_ipython().magic({u}'magic')"), | |
492 | ]], |
|
492 | ]], | |
493 |
|
493 | |||
494 | # Quoting with separate arguments |
|
494 | # Quoting with separate arguments | |
495 | escaped_quote = |
|
495 | escaped_quote = | |
496 | [ (',f', 'f("")'), |
|
496 | [ (',f', 'f("")'), | |
497 | (',f x', 'f("x")'), |
|
497 | (',f x', 'f("x")'), | |
498 | (' ,f y', ' f("y")'), |
|
498 | (' ,f y', ' f("y")'), | |
499 | (',f a b', 'f("a", "b")'), |
|
499 | (',f a b', 'f("a", "b")'), | |
500 | ], |
|
500 | ], | |
501 |
|
501 | |||
502 | # Quoting with single argument |
|
502 | # Quoting with single argument | |
503 | escaped_quote2 = |
|
503 | escaped_quote2 = | |
504 | [ (';f', 'f("")'), |
|
504 | [ (';f', 'f("")'), | |
505 | (';f x', 'f("x")'), |
|
505 | (';f x', 'f("x")'), | |
506 | (' ;f y', ' f("y")'), |
|
506 | (' ;f y', ' f("y")'), | |
507 | (';f a b', 'f("a b")'), |
|
507 | (';f a b', 'f("a b")'), | |
508 | ], |
|
508 | ], | |
509 |
|
509 | |||
510 | # Simply apply parens |
|
510 | # Simply apply parens | |
511 | escaped_paren = |
|
511 | escaped_paren = | |
512 | [ ('/f', 'f()'), |
|
512 | [ ('/f', 'f()'), | |
513 | ('/f x', 'f(x)'), |
|
513 | ('/f x', 'f(x)'), | |
514 | (' /f y', ' f(y)'), |
|
514 | (' /f y', ' f(y)'), | |
515 | ('/f a b', 'f(a, b)'), |
|
515 | ('/f a b', 'f(a, b)'), | |
516 | ], |
|
516 | ], | |
517 |
|
517 | |||
518 | # Check that we transform prompts before other transforms |
|
518 | # Check that we transform prompts before other transforms | |
519 | mixed = |
|
519 | mixed = | |
520 | [(i,py3compat.u_format(o)) for i,o in \ |
|
520 | [(i,py3compat.u_format(o)) for i,o in \ | |
521 | [ (u'In [1]: %lsmagic', "get_ipython().magic({u}'lsmagic')"), |
|
521 | [ (u'In [1]: %lsmagic', "get_ipython().magic({u}'lsmagic')"), | |
522 | (u'>>> %lsmagic', "get_ipython().magic({u}'lsmagic')"), |
|
522 | (u'>>> %lsmagic', "get_ipython().magic({u}'lsmagic')"), | |
523 | (u'In [2]: !ls', "get_ipython().system({u}'ls')"), |
|
523 | (u'In [2]: !ls', "get_ipython().system({u}'ls')"), | |
524 | (u'In [3]: abs?', "get_ipython().magic({u}'pinfo abs')"), |
|
524 | (u'In [3]: abs?', "get_ipython().magic({u}'pinfo abs')"), | |
525 | (u'In [4]: b = %who', "b = get_ipython().magic({u}'who')"), |
|
525 | (u'In [4]: b = %who', "b = get_ipython().magic({u}'who')"), | |
526 | ]], |
|
526 | ]], | |
527 | ) |
|
527 | ) | |
528 |
|
528 | |||
529 | # multiline syntax examples. Each of these should be a list of lists, with |
|
529 | # multiline syntax examples. Each of these should be a list of lists, with | |
530 | # each entry itself having pairs of raw/transformed input. The union (with |
|
530 | # each entry itself having pairs of raw/transformed input. The union (with | |
531 | # '\n'.join() of the transformed inputs is what the splitter should produce |
|
531 | # '\n'.join() of the transformed inputs is what the splitter should produce | |
532 | # when fed the raw lines one at a time via push. |
|
532 | # when fed the raw lines one at a time via push. | |
533 | syntax_ml = \ |
|
533 | syntax_ml = \ | |
534 | dict(classic_prompt = |
|
534 | dict(classic_prompt = | |
535 | [ [('>>> for i in range(10):','for i in range(10):'), |
|
535 | [ [('>>> for i in range(10):','for i in range(10):'), | |
536 | ('... print i',' print i'), |
|
536 | ('... print i',' print i'), | |
537 | ('... ', ''), |
|
537 | ('... ', ''), | |
538 | ], |
|
538 | ], | |
539 | ], |
|
539 | ], | |
540 |
|
540 | |||
541 | ipy_prompt = |
|
541 | ipy_prompt = | |
542 | [ [('In [24]: for i in range(10):','for i in range(10):'), |
|
542 | [ [('In [24]: for i in range(10):','for i in range(10):'), | |
543 | (' ....: print i',' print i'), |
|
543 | (' ....: print i',' print i'), | |
544 | (' ....: ', ''), |
|
544 | (' ....: ', ''), | |
545 | ], |
|
545 | ], | |
546 | ], |
|
546 | ], | |
547 |
|
547 | |||
548 | multiline_datastructure = |
|
548 | multiline_datastructure = | |
549 | [ [('>>> a = [1,','a = [1,'), |
|
549 | [ [('>>> a = [1,','a = [1,'), | |
550 | ('... 2]','2]'), |
|
550 | ('... 2]','2]'), | |
551 | ], |
|
551 | ], | |
552 | ], |
|
552 | ], | |
553 | ) |
|
553 | ) | |
554 |
|
554 | |||
555 |
|
555 | |||
556 | def test_assign_system(): |
|
556 | def test_assign_system(): | |
557 | tt.check_pairs(isp.transform_assign_system, syntax['assign_system']) |
|
557 | tt.check_pairs(isp.transform_assign_system, syntax['assign_system']) | |
558 |
|
558 | |||
559 |
|
559 | |||
560 | def test_assign_magic(): |
|
560 | def test_assign_magic(): | |
561 | tt.check_pairs(isp.transform_assign_magic, syntax['assign_magic']) |
|
561 | tt.check_pairs(isp.transform_assign_magic, syntax['assign_magic']) | |
562 |
|
562 | |||
563 |
|
563 | |||
564 | def test_classic_prompt(): |
|
564 | def test_classic_prompt(): | |
565 | transform_checker(syntax['classic_prompt'], isp.transform_classic_prompt) |
|
565 | transform_checker(syntax['classic_prompt'], isp.transform_classic_prompt) | |
566 | for example in syntax_ml['classic_prompt']: |
|
566 | for example in syntax_ml['classic_prompt']: | |
567 | transform_checker(example, isp.transform_classic_prompt) |
|
567 | transform_checker(example, isp.transform_classic_prompt) | |
568 |
|
568 | |||
569 |
|
569 | |||
570 | def test_ipy_prompt(): |
|
570 | def test_ipy_prompt(): | |
571 | transform_checker(syntax['ipy_prompt'], isp.transform_ipy_prompt) |
|
571 | transform_checker(syntax['ipy_prompt'], isp.transform_ipy_prompt) | |
572 | for example in syntax_ml['ipy_prompt']: |
|
572 | for example in syntax_ml['ipy_prompt']: | |
573 | transform_checker(example, isp.transform_ipy_prompt) |
|
573 | transform_checker(example, isp.transform_ipy_prompt) | |
574 |
|
574 | |||
575 | def test_end_help(): |
|
575 | def test_end_help(): | |
576 | tt.check_pairs(isp.transform_help_end, syntax['end_help']) |
|
576 | tt.check_pairs(isp.transform_help_end, syntax['end_help']) | |
577 |
|
577 | |||
578 | def test_escaped_noesc(): |
|
578 | def test_escaped_noesc(): | |
579 | tt.check_pairs(isp.transform_escaped, syntax['escaped_noesc']) |
|
579 | tt.check_pairs(isp.transform_escaped, syntax['escaped_noesc']) | |
580 |
|
580 | |||
581 |
|
581 | |||
582 | def test_escaped_shell(): |
|
582 | def test_escaped_shell(): | |
583 | tt.check_pairs(isp.transform_escaped, syntax['escaped_shell']) |
|
583 | tt.check_pairs(isp.transform_escaped, syntax['escaped_shell']) | |
584 |
|
584 | |||
585 |
|
585 | |||
586 | def test_escaped_help(): |
|
586 | def test_escaped_help(): | |
587 | tt.check_pairs(isp.transform_escaped, syntax['escaped_help']) |
|
587 | tt.check_pairs(isp.transform_escaped, syntax['escaped_help']) | |
588 |
|
588 | |||
589 |
|
589 | |||
590 | def test_escaped_magic(): |
|
590 | def test_escaped_magic(): | |
591 | tt.check_pairs(isp.transform_escaped, syntax['escaped_magic']) |
|
591 | tt.check_pairs(isp.transform_escaped, syntax['escaped_magic']) | |
592 |
|
592 | |||
593 |
|
593 | |||
594 | def test_escaped_quote(): |
|
594 | def test_escaped_quote(): | |
595 | tt.check_pairs(isp.transform_escaped, syntax['escaped_quote']) |
|
595 | tt.check_pairs(isp.transform_escaped, syntax['escaped_quote']) | |
596 |
|
596 | |||
597 |
|
597 | |||
598 | def test_escaped_quote2(): |
|
598 | def test_escaped_quote2(): | |
599 | tt.check_pairs(isp.transform_escaped, syntax['escaped_quote2']) |
|
599 | tt.check_pairs(isp.transform_escaped, syntax['escaped_quote2']) | |
600 |
|
600 | |||
601 |
|
601 | |||
602 | def test_escaped_paren(): |
|
602 | def test_escaped_paren(): | |
603 | tt.check_pairs(isp.transform_escaped, syntax['escaped_paren']) |
|
603 | tt.check_pairs(isp.transform_escaped, syntax['escaped_paren']) | |
604 |
|
604 | |||
605 |
|
605 | |||
606 | class IPythonInputTestCase(InputSplitterTestCase): |
|
606 | class IPythonInputTestCase(InputSplitterTestCase): | |
607 | """By just creating a new class whose .isp is a different instance, we |
|
607 | """By just creating a new class whose .isp is a different instance, we | |
608 | re-run the same test battery on the new input splitter. |
|
608 | re-run the same test battery on the new input splitter. | |
609 |
|
609 | |||
610 | In addition, this runs the tests over the syntax and syntax_ml dicts that |
|
610 | In addition, this runs the tests over the syntax and syntax_ml dicts that | |
611 | were tested by individual functions, as part of the OO interface. |
|
611 | were tested by individual functions, as part of the OO interface. | |
612 |
|
612 | |||
613 | It also makes some checks on the raw buffer storage. |
|
613 | It also makes some checks on the raw buffer storage. | |
614 | """ |
|
614 | """ | |
615 |
|
615 | |||
616 | def setUp(self): |
|
616 | def setUp(self): | |
617 | self.isp = isp.IPythonInputSplitter(input_mode='line') |
|
617 | self.isp = isp.IPythonInputSplitter(input_mode='line') | |
618 |
|
618 | |||
619 | def test_syntax(self): |
|
619 | def test_syntax(self): | |
620 | """Call all single-line syntax tests from the main object""" |
|
620 | """Call all single-line syntax tests from the main object""" | |
621 | isp = self.isp |
|
621 | isp = self.isp | |
622 | for example in syntax.itervalues(): |
|
622 | for example in syntax.itervalues(): | |
623 | for raw, out_t in example: |
|
623 | for raw, out_t in example: | |
624 | if raw.startswith(' '): |
|
624 | if raw.startswith(' '): | |
625 | continue |
|
625 | continue | |
626 |
|
626 | |||
627 | isp.push(raw+'\n') |
|
627 | isp.push(raw+'\n') | |
628 | out, out_raw = isp.source_raw_reset() |
|
628 | out, out_raw = isp.source_raw_reset() | |
629 | self.assertEqual(out.rstrip(), out_t, |
|
629 | self.assertEqual(out.rstrip(), out_t, | |
630 | tt.pair_fail_msg.format("inputsplitter",raw, out_t, out)) |
|
630 | tt.pair_fail_msg.format("inputsplitter",raw, out_t, out)) | |
631 | self.assertEqual(out_raw.rstrip(), raw.rstrip()) |
|
631 | self.assertEqual(out_raw.rstrip(), raw.rstrip()) | |
632 |
|
632 | |||
633 | def test_syntax_multiline(self): |
|
633 | def test_syntax_multiline(self): | |
634 | isp = self.isp |
|
634 | isp = self.isp | |
635 | for example in syntax_ml.itervalues(): |
|
635 | for example in syntax_ml.itervalues(): | |
636 | out_t_parts = [] |
|
636 | out_t_parts = [] | |
637 | raw_parts = [] |
|
637 | raw_parts = [] | |
638 | for line_pairs in example: |
|
638 | for line_pairs in example: | |
639 | for lraw, out_t_part in line_pairs: |
|
639 | for lraw, out_t_part in line_pairs: | |
640 | isp.push(lraw) |
|
640 | isp.push(lraw) | |
641 | out_t_parts.append(out_t_part) |
|
641 | out_t_parts.append(out_t_part) | |
642 | raw_parts.append(lraw) |
|
642 | raw_parts.append(lraw) | |
643 |
|
643 | |||
644 | out, out_raw = isp.source_raw_reset() |
|
644 | out, out_raw = isp.source_raw_reset() | |
645 | out_t = '\n'.join(out_t_parts).rstrip() |
|
645 | out_t = '\n'.join(out_t_parts).rstrip() | |
646 | raw = '\n'.join(raw_parts).rstrip() |
|
646 | raw = '\n'.join(raw_parts).rstrip() | |
647 | self.assertEqual(out.rstrip(), out_t) |
|
647 | self.assertEqual(out.rstrip(), out_t) | |
648 | self.assertEqual(out_raw.rstrip(), raw) |
|
648 | self.assertEqual(out_raw.rstrip(), raw) | |
649 |
|
649 | |||
650 |
|
650 | |||
651 | class BlockIPythonInputTestCase(IPythonInputTestCase): |
|
651 | class BlockIPythonInputTestCase(IPythonInputTestCase): | |
652 |
|
652 | |||
653 | # Deactivate tests that don't make sense for the block mode |
|
653 | # Deactivate tests that don't make sense for the block mode | |
654 | test_push3 = test_split = lambda s: None |
|
654 | test_push3 = test_split = lambda s: None | |
655 |
|
655 | |||
656 | def setUp(self): |
|
656 | def setUp(self): | |
657 | self.isp = isp.IPythonInputSplitter(input_mode='cell') |
|
657 | self.isp = isp.IPythonInputSplitter(input_mode='cell') | |
658 |
|
658 | |||
659 | def test_syntax_multiline(self): |
|
659 | def test_syntax_multiline(self): | |
660 | isp = self.isp |
|
660 | isp = self.isp | |
661 | for example in syntax_ml.itervalues(): |
|
661 | for example in syntax_ml.itervalues(): | |
662 | raw_parts = [] |
|
662 | raw_parts = [] | |
663 | out_t_parts = [] |
|
663 | out_t_parts = [] | |
664 | for line_pairs in example: |
|
664 | for line_pairs in example: | |
665 | for raw, out_t_part in line_pairs: |
|
665 | for raw, out_t_part in line_pairs: | |
666 | raw_parts.append(raw) |
|
666 | raw_parts.append(raw) | |
667 | out_t_parts.append(out_t_part) |
|
667 | out_t_parts.append(out_t_part) | |
668 |
|
668 | |||
669 | raw = '\n'.join(raw_parts) |
|
669 | raw = '\n'.join(raw_parts) | |
670 | out_t = '\n'.join(out_t_parts) |
|
670 | out_t = '\n'.join(out_t_parts) | |
671 |
|
671 | |||
672 | isp.push(raw) |
|
672 | isp.push(raw) | |
673 | out, out_raw = isp.source_raw_reset() |
|
673 | out, out_raw = isp.source_raw_reset() | |
674 | # Match ignoring trailing whitespace |
|
674 | # Match ignoring trailing whitespace | |
675 | self.assertEqual(out.rstrip(), out_t.rstrip()) |
|
675 | self.assertEqual(out.rstrip(), out_t.rstrip()) | |
676 | self.assertEqual(out_raw.rstrip(), raw.rstrip()) |
|
676 | self.assertEqual(out_raw.rstrip(), raw.rstrip()) | |
677 |
|
677 | |||
678 |
|
678 | |||
679 | #----------------------------------------------------------------------------- |
|
679 | #----------------------------------------------------------------------------- | |
680 | # Main - use as a script, mostly for developer experiments |
|
680 | # Main - use as a script, mostly for developer experiments | |
681 | #----------------------------------------------------------------------------- |
|
681 | #----------------------------------------------------------------------------- | |
682 |
|
682 | |||
683 | if __name__ == '__main__': |
|
683 | if __name__ == '__main__': | |
684 | # A simple demo for interactive experimentation. This code will not get |
|
684 | # A simple demo for interactive experimentation. This code will not get | |
685 | # picked up by any test suite. |
|
685 | # picked up by any test suite. | |
686 | from IPython.core.inputsplitter import InputSplitter, IPythonInputSplitter |
|
686 | from IPython.core.inputsplitter import InputSplitter, IPythonInputSplitter | |
687 |
|
687 | |||
688 | # configure here the syntax to use, prompt and whether to autoindent |
|
688 | # configure here the syntax to use, prompt and whether to autoindent | |
689 | #isp, start_prompt = InputSplitter(), '>>> ' |
|
689 | #isp, start_prompt = InputSplitter(), '>>> ' | |
690 | isp, start_prompt = IPythonInputSplitter(), 'In> ' |
|
690 | isp, start_prompt = IPythonInputSplitter(), 'In> ' | |
691 |
|
691 | |||
692 | autoindent = True |
|
692 | autoindent = True | |
693 | #autoindent = False |
|
693 | #autoindent = False | |
694 |
|
694 | |||
695 | try: |
|
695 | try: | |
696 | while True: |
|
696 | while True: | |
697 | prompt = start_prompt |
|
697 | prompt = start_prompt | |
698 | while isp.push_accepts_more(): |
|
698 | while isp.push_accepts_more(): | |
699 | indent = ' '*isp.indent_spaces |
|
699 | indent = ' '*isp.indent_spaces | |
700 | if autoindent: |
|
700 | if autoindent: | |
701 | line = indent + raw_input(prompt+indent) |
|
701 | line = indent + raw_input(prompt+indent) | |
702 | else: |
|
702 | else: | |
703 | line = raw_input(prompt) |
|
703 | line = raw_input(prompt) | |
704 | isp.push(line) |
|
704 | isp.push(line) | |
705 | prompt = '... ' |
|
705 | prompt = '... ' | |
706 |
|
706 | |||
707 | # Here we just return input so we can use it in a test suite, but a |
|
707 | # Here we just return input so we can use it in a test suite, but a | |
708 | # real interpreter would instead send it for execution somewhere. |
|
708 | # real interpreter would instead send it for execution somewhere. | |
709 | #src = isp.source; raise EOFError # dbg |
|
709 | #src = isp.source; raise EOFError # dbg | |
710 | src, raw = isp.source_raw_reset() |
|
710 | src, raw = isp.source_raw_reset() | |
711 | print 'Input source was:\n', src |
|
711 | print 'Input source was:\n', src | |
712 | print 'Raw source was:\n', raw |
|
712 | print 'Raw source was:\n', raw | |
713 | except EOFError: |
|
713 | except EOFError: | |
714 | print 'Bye' |
|
714 | print 'Bye' | |
715 |
|
715 | |||
716 | # Tests for cell magics support |
|
716 | # Tests for cell magics support | |
717 |
|
717 | |||
718 | def test_last_blank(): |
|
718 | def test_last_blank(): | |
719 | nt.assert_false(isp.last_blank('')) |
|
719 | nt.assert_false(isp.last_blank('')) | |
720 | nt.assert_false(isp.last_blank('abc')) |
|
720 | nt.assert_false(isp.last_blank('abc')) | |
721 | nt.assert_false(isp.last_blank('abc\n')) |
|
721 | nt.assert_false(isp.last_blank('abc\n')) | |
722 | nt.assert_false(isp.last_blank('abc\na')) |
|
722 | nt.assert_false(isp.last_blank('abc\na')) | |
723 |
|
723 | |||
724 | nt.assert_true(isp.last_blank('\n')) |
|
724 | nt.assert_true(isp.last_blank('\n')) | |
725 | nt.assert_true(isp.last_blank('\n ')) |
|
725 | nt.assert_true(isp.last_blank('\n ')) | |
726 | nt.assert_true(isp.last_blank('abc\n ')) |
|
726 | nt.assert_true(isp.last_blank('abc\n ')) | |
727 | nt.assert_true(isp.last_blank('abc\n\n')) |
|
727 | nt.assert_true(isp.last_blank('abc\n\n')) | |
728 | nt.assert_true(isp.last_blank('abc\nd\n\n')) |
|
728 | nt.assert_true(isp.last_blank('abc\nd\n\n')) | |
729 | nt.assert_true(isp.last_blank('abc\nd\ne\n\n')) |
|
729 | nt.assert_true(isp.last_blank('abc\nd\ne\n\n')) | |
730 | nt.assert_true(isp.last_blank('abc \n \n \n\n')) |
|
730 | nt.assert_true(isp.last_blank('abc \n \n \n\n')) | |
731 |
|
731 | |||
732 |
|
732 | |||
733 | def test_last_two_blanks(): |
|
733 | def test_last_two_blanks(): | |
734 | nt.assert_false(isp.last_two_blanks('')) |
|
734 | nt.assert_false(isp.last_two_blanks('')) | |
735 | nt.assert_false(isp.last_two_blanks('abc')) |
|
735 | nt.assert_false(isp.last_two_blanks('abc')) | |
736 | nt.assert_false(isp.last_two_blanks('abc\n')) |
|
736 | nt.assert_false(isp.last_two_blanks('abc\n')) | |
737 | nt.assert_false(isp.last_two_blanks('abc\n\na')) |
|
737 | nt.assert_false(isp.last_two_blanks('abc\n\na')) | |
738 | nt.assert_false(isp.last_two_blanks('abc\n \n')) |
|
738 | nt.assert_false(isp.last_two_blanks('abc\n \n')) | |
739 | nt.assert_false(isp.last_two_blanks('abc\n\n')) |
|
739 | nt.assert_false(isp.last_two_blanks('abc\n\n')) | |
740 |
|
740 | |||
741 | nt.assert_true(isp.last_two_blanks('\n\n')) |
|
741 | nt.assert_true(isp.last_two_blanks('\n\n')) | |
742 | nt.assert_true(isp.last_two_blanks('\n\n ')) |
|
742 | nt.assert_true(isp.last_two_blanks('\n\n ')) | |
743 | nt.assert_true(isp.last_two_blanks('\n \n')) |
|
743 | nt.assert_true(isp.last_two_blanks('\n \n')) | |
744 | nt.assert_true(isp.last_two_blanks('abc\n\n ')) |
|
744 | nt.assert_true(isp.last_two_blanks('abc\n\n ')) | |
745 | nt.assert_true(isp.last_two_blanks('abc\n\n\n')) |
|
745 | nt.assert_true(isp.last_two_blanks('abc\n\n\n')) | |
746 | nt.assert_true(isp.last_two_blanks('abc\n\n \n')) |
|
746 | nt.assert_true(isp.last_two_blanks('abc\n\n \n')) | |
747 | nt.assert_true(isp.last_two_blanks('abc\n\n \n ')) |
|
747 | nt.assert_true(isp.last_two_blanks('abc\n\n \n ')) | |
748 | nt.assert_true(isp.last_two_blanks('abc\n\n \n \n')) |
|
748 | nt.assert_true(isp.last_two_blanks('abc\n\n \n \n')) | |
749 | nt.assert_true(isp.last_two_blanks('abc\nd\n\n\n')) |
|
749 | nt.assert_true(isp.last_two_blanks('abc\nd\n\n\n')) | |
750 | nt.assert_true(isp.last_two_blanks('abc\nd\ne\nf\n\n\n')) |
|
750 | nt.assert_true(isp.last_two_blanks('abc\nd\ne\nf\n\n\n')) | |
751 |
|
751 | |||
752 |
|
752 | |||
753 | class CellModeCellMagics(unittest.TestCase): |
|
753 | class CellModeCellMagics(unittest.TestCase): | |
754 | sp = isp.IPythonInputSplitter(input_mode='cell') |
|
754 | sp = isp.IPythonInputSplitter(input_mode='cell') | |
755 |
|
755 | |||
756 | def test_whole_cell(self): |
|
756 | def test_whole_cell(self): | |
757 | src = "%%cellm line\nbody\n" |
|
757 | src = "%%cellm line\nbody\n" | |
758 | sp = self.sp |
|
758 | sp = self.sp | |
759 | sp.push(src) |
|
759 | sp.push(src) | |
760 | nt.assert_equal(sp.cell_magic_parts, ['body\n']) |
|
760 | nt.assert_equal(sp.cell_magic_parts, ['body\n']) | |
761 | out = sp.source |
|
761 | out = sp.source | |
762 | ref = u"get_ipython()._cell_magic(u'cellm', u'line')\n" |
|
762 | ref = u"get_ipython()._run_cached_cell_magic(u'cellm', u'line')\n" | |
763 | nt.assert_equal(out, ref) |
|
763 | nt.assert_equal(out, ref) | |
764 |
|
764 | |||
765 | def test_incremental(self): |
|
765 | def test_incremental(self): | |
766 | sp = self.sp |
|
766 | sp = self.sp | |
767 | src = '%%cellm line2\n' |
|
767 | src = '%%cellm line2\n' | |
768 | sp.push(src) |
|
768 | sp.push(src) | |
769 | nt.assert_true(sp.push_accepts_more()) #1 |
|
769 | nt.assert_true(sp.push_accepts_more()) #1 | |
770 | src += '\n' |
|
770 | src += '\n' | |
771 | sp.push(src) |
|
771 | sp.push(src) | |
772 | # Note: if we ever change the logic to allow full blank lines (see |
|
772 | # Note: if we ever change the logic to allow full blank lines (see | |
773 | # _handle_cell_magic), then the following test should change to true |
|
773 | # _handle_cell_magic), then the following test should change to true | |
774 | nt.assert_false(sp.push_accepts_more()) #2 |
|
774 | nt.assert_false(sp.push_accepts_more()) #2 | |
775 | # By now, even with full blanks allowed, a second blank should signal |
|
775 | # By now, even with full blanks allowed, a second blank should signal | |
776 | # the end. For now this test is only a redundancy safety, but don't |
|
776 | # the end. For now this test is only a redundancy safety, but don't | |
777 | # delete it in case we change our mind and the previous one goes to |
|
777 | # delete it in case we change our mind and the previous one goes to | |
778 | # true. |
|
778 | # true. | |
779 | src += '\n' |
|
779 | src += '\n' | |
780 | sp.push(src) |
|
780 | sp.push(src) | |
781 | nt.assert_false(sp.push_accepts_more()) #3 |
|
781 | nt.assert_false(sp.push_accepts_more()) #3 | |
782 |
|
782 | |||
783 | def tearDown(self): |
|
783 | def tearDown(self): | |
784 | self.sp.reset() |
|
784 | self.sp.reset() | |
785 |
|
785 | |||
786 |
|
786 | |||
787 | class LineModeCellMagics(unittest.TestCase): |
|
787 | class LineModeCellMagics(unittest.TestCase): | |
788 | sp = isp.IPythonInputSplitter(input_mode='line') |
|
788 | sp = isp.IPythonInputSplitter(input_mode='line') | |
789 |
|
789 | |||
790 | def test_whole_cell(self): |
|
790 | def test_whole_cell(self): | |
791 | src = "%%cellm line\nbody\n" |
|
791 | src = "%%cellm line\nbody\n" | |
792 | sp = self.sp |
|
792 | sp = self.sp | |
793 | sp.push(src) |
|
793 | sp.push(src) | |
794 | nt.assert_equal(sp.cell_magic_parts, ['body\n']) |
|
794 | nt.assert_equal(sp.cell_magic_parts, ['body\n']) | |
795 | out = sp.source |
|
795 | out = sp.source | |
796 | ref = u"get_ipython()._cell_magic(u'cellm', u'line')\n" |
|
796 | ref = u"get_ipython()._run_cached_cell_magic(u'cellm', u'line')\n" | |
797 | nt.assert_equal(out, ref) |
|
797 | nt.assert_equal(out, ref) | |
798 |
|
798 | |||
799 | def test_incremental(self): |
|
799 | def test_incremental(self): | |
800 | sp = self.sp |
|
800 | sp = self.sp | |
801 | sp.push('%%cellm line2\n') |
|
801 | sp.push('%%cellm line2\n') | |
802 | nt.assert_true(sp.push_accepts_more()) #1 |
|
802 | nt.assert_true(sp.push_accepts_more()) #1 | |
803 | sp.push('\n') |
|
803 | sp.push('\n') | |
804 | nt.assert_false(sp.push_accepts_more()) #2 |
|
804 | nt.assert_false(sp.push_accepts_more()) #2 | |
805 |
|
805 | |||
806 | def tearDown(self): |
|
806 | def tearDown(self): | |
807 | self.sp.reset() |
|
807 | self.sp.reset() |
@@ -1,547 +1,547 b'' | |||||
1 | # -*- coding: utf-8 -*- |
|
1 | # -*- coding: utf-8 -*- | |
2 | """Tests for various magic functions. |
|
2 | """Tests for various magic functions. | |
3 |
|
3 | |||
4 | Needs to be run by nose (to make ipython session available). |
|
4 | Needs to be run by nose (to make ipython session available). | |
5 | """ |
|
5 | """ | |
6 | from __future__ import absolute_import |
|
6 | from __future__ import absolute_import | |
7 |
|
7 | |||
8 | #----------------------------------------------------------------------------- |
|
8 | #----------------------------------------------------------------------------- | |
9 | # Imports |
|
9 | # Imports | |
10 | #----------------------------------------------------------------------------- |
|
10 | #----------------------------------------------------------------------------- | |
11 |
|
11 | |||
12 | import io |
|
12 | import io | |
13 | import os |
|
13 | import os | |
14 | import sys |
|
14 | import sys | |
15 | from StringIO import StringIO |
|
15 | from StringIO import StringIO | |
16 | from unittest import TestCase |
|
16 | from unittest import TestCase | |
17 |
|
17 | |||
18 | import nose.tools as nt |
|
18 | import nose.tools as nt | |
19 |
|
19 | |||
20 | from IPython.core import magic |
|
20 | from IPython.core import magic | |
21 | from IPython.core.magic import (Magics, magics_class, line_magic, |
|
21 | from IPython.core.magic import (Magics, magics_class, line_magic, | |
22 | cell_magic, line_cell_magic, |
|
22 | cell_magic, line_cell_magic, | |
23 | register_line_magic, register_cell_magic, |
|
23 | register_line_magic, register_cell_magic, | |
24 | register_line_cell_magic) |
|
24 | register_line_cell_magic) | |
25 | from IPython.core.magics import execution |
|
25 | from IPython.core.magics import execution | |
26 | from IPython.nbformat.v3.tests.nbexamples import nb0 |
|
26 | from IPython.nbformat.v3.tests.nbexamples import nb0 | |
27 | from IPython.nbformat import current |
|
27 | from IPython.nbformat import current | |
28 | from IPython.testing import decorators as dec |
|
28 | from IPython.testing import decorators as dec | |
29 | from IPython.testing import tools as tt |
|
29 | from IPython.testing import tools as tt | |
30 | from IPython.utils import py3compat |
|
30 | from IPython.utils import py3compat | |
31 | from IPython.utils.tempdir import TemporaryDirectory |
|
31 | from IPython.utils.tempdir import TemporaryDirectory | |
32 |
|
32 | |||
33 | #----------------------------------------------------------------------------- |
|
33 | #----------------------------------------------------------------------------- | |
34 | # Test functions begin |
|
34 | # Test functions begin | |
35 | #----------------------------------------------------------------------------- |
|
35 | #----------------------------------------------------------------------------- | |
36 |
|
36 | |||
37 | @magic.magics_class |
|
37 | @magic.magics_class | |
38 | class DummyMagics(magic.Magics): pass |
|
38 | class DummyMagics(magic.Magics): pass | |
39 |
|
39 | |||
40 | def test_rehashx(): |
|
40 | def test_rehashx(): | |
41 | # clear up everything |
|
41 | # clear up everything | |
42 | _ip = get_ipython() |
|
42 | _ip = get_ipython() | |
43 | _ip.alias_manager.alias_table.clear() |
|
43 | _ip.alias_manager.alias_table.clear() | |
44 | del _ip.db['syscmdlist'] |
|
44 | del _ip.db['syscmdlist'] | |
45 |
|
45 | |||
46 | _ip.magic('rehashx') |
|
46 | _ip.magic('rehashx') | |
47 | # Practically ALL ipython development systems will have more than 10 aliases |
|
47 | # Practically ALL ipython development systems will have more than 10 aliases | |
48 |
|
48 | |||
49 | yield (nt.assert_true, len(_ip.alias_manager.alias_table) > 10) |
|
49 | yield (nt.assert_true, len(_ip.alias_manager.alias_table) > 10) | |
50 | for key, val in _ip.alias_manager.alias_table.iteritems(): |
|
50 | for key, val in _ip.alias_manager.alias_table.iteritems(): | |
51 | # we must strip dots from alias names |
|
51 | # we must strip dots from alias names | |
52 | nt.assert_true('.' not in key) |
|
52 | nt.assert_true('.' not in key) | |
53 |
|
53 | |||
54 | # rehashx must fill up syscmdlist |
|
54 | # rehashx must fill up syscmdlist | |
55 | scoms = _ip.db['syscmdlist'] |
|
55 | scoms = _ip.db['syscmdlist'] | |
56 | yield (nt.assert_true, len(scoms) > 10) |
|
56 | yield (nt.assert_true, len(scoms) > 10) | |
57 |
|
57 | |||
58 |
|
58 | |||
59 | def test_magic_parse_options(): |
|
59 | def test_magic_parse_options(): | |
60 | """Test that we don't mangle paths when parsing magic options.""" |
|
60 | """Test that we don't mangle paths when parsing magic options.""" | |
61 | ip = get_ipython() |
|
61 | ip = get_ipython() | |
62 | path = 'c:\\x' |
|
62 | path = 'c:\\x' | |
63 | m = DummyMagics(ip) |
|
63 | m = DummyMagics(ip) | |
64 | opts = m.parse_options('-f %s' % path,'f:')[0] |
|
64 | opts = m.parse_options('-f %s' % path,'f:')[0] | |
65 | # argv splitting is os-dependent |
|
65 | # argv splitting is os-dependent | |
66 | if os.name == 'posix': |
|
66 | if os.name == 'posix': | |
67 | expected = 'c:x' |
|
67 | expected = 'c:x' | |
68 | else: |
|
68 | else: | |
69 | expected = path |
|
69 | expected = path | |
70 | nt.assert_equals(opts['f'], expected) |
|
70 | nt.assert_equals(opts['f'], expected) | |
71 |
|
71 | |||
72 |
|
72 | |||
73 | @dec.skip_without('sqlite3') |
|
73 | @dec.skip_without('sqlite3') | |
74 | def doctest_hist_f(): |
|
74 | def doctest_hist_f(): | |
75 | """Test %hist -f with temporary filename. |
|
75 | """Test %hist -f with temporary filename. | |
76 |
|
76 | |||
77 | In [9]: import tempfile |
|
77 | In [9]: import tempfile | |
78 |
|
78 | |||
79 | In [10]: tfile = tempfile.mktemp('.py','tmp-ipython-') |
|
79 | In [10]: tfile = tempfile.mktemp('.py','tmp-ipython-') | |
80 |
|
80 | |||
81 | In [11]: %hist -nl -f $tfile 3 |
|
81 | In [11]: %hist -nl -f $tfile 3 | |
82 |
|
82 | |||
83 | In [13]: import os; os.unlink(tfile) |
|
83 | In [13]: import os; os.unlink(tfile) | |
84 | """ |
|
84 | """ | |
85 |
|
85 | |||
86 |
|
86 | |||
87 | @dec.skip_without('sqlite3') |
|
87 | @dec.skip_without('sqlite3') | |
88 | def doctest_hist_r(): |
|
88 | def doctest_hist_r(): | |
89 | """Test %hist -r |
|
89 | """Test %hist -r | |
90 |
|
90 | |||
91 | XXX - This test is not recording the output correctly. For some reason, in |
|
91 | XXX - This test is not recording the output correctly. For some reason, in | |
92 | testing mode the raw history isn't getting populated. No idea why. |
|
92 | testing mode the raw history isn't getting populated. No idea why. | |
93 | Disabling the output checking for now, though at least we do run it. |
|
93 | Disabling the output checking for now, though at least we do run it. | |
94 |
|
94 | |||
95 | In [1]: 'hist' in _ip.lsmagic() |
|
95 | In [1]: 'hist' in _ip.lsmagic() | |
96 | Out[1]: True |
|
96 | Out[1]: True | |
97 |
|
97 | |||
98 | In [2]: x=1 |
|
98 | In [2]: x=1 | |
99 |
|
99 | |||
100 | In [3]: %hist -rl 2 |
|
100 | In [3]: %hist -rl 2 | |
101 | x=1 # random |
|
101 | x=1 # random | |
102 | %hist -r 2 |
|
102 | %hist -r 2 | |
103 | """ |
|
103 | """ | |
104 |
|
104 | |||
105 |
|
105 | |||
106 | @dec.skip_without('sqlite3') |
|
106 | @dec.skip_without('sqlite3') | |
107 | def doctest_hist_op(): |
|
107 | def doctest_hist_op(): | |
108 | """Test %hist -op |
|
108 | """Test %hist -op | |
109 |
|
109 | |||
110 | In [1]: class b(float): |
|
110 | In [1]: class b(float): | |
111 | ...: pass |
|
111 | ...: pass | |
112 | ...: |
|
112 | ...: | |
113 |
|
113 | |||
114 | In [2]: class s(object): |
|
114 | In [2]: class s(object): | |
115 | ...: def __str__(self): |
|
115 | ...: def __str__(self): | |
116 | ...: return 's' |
|
116 | ...: return 's' | |
117 | ...: |
|
117 | ...: | |
118 |
|
118 | |||
119 | In [3]: |
|
119 | In [3]: | |
120 |
|
120 | |||
121 | In [4]: class r(b): |
|
121 | In [4]: class r(b): | |
122 | ...: def __repr__(self): |
|
122 | ...: def __repr__(self): | |
123 | ...: return 'r' |
|
123 | ...: return 'r' | |
124 | ...: |
|
124 | ...: | |
125 |
|
125 | |||
126 | In [5]: class sr(s,r): pass |
|
126 | In [5]: class sr(s,r): pass | |
127 | ...: |
|
127 | ...: | |
128 |
|
128 | |||
129 | In [6]: |
|
129 | In [6]: | |
130 |
|
130 | |||
131 | In [7]: bb=b() |
|
131 | In [7]: bb=b() | |
132 |
|
132 | |||
133 | In [8]: ss=s() |
|
133 | In [8]: ss=s() | |
134 |
|
134 | |||
135 | In [9]: rr=r() |
|
135 | In [9]: rr=r() | |
136 |
|
136 | |||
137 | In [10]: ssrr=sr() |
|
137 | In [10]: ssrr=sr() | |
138 |
|
138 | |||
139 | In [11]: 4.5 |
|
139 | In [11]: 4.5 | |
140 | Out[11]: 4.5 |
|
140 | Out[11]: 4.5 | |
141 |
|
141 | |||
142 | In [12]: str(ss) |
|
142 | In [12]: str(ss) | |
143 | Out[12]: 's' |
|
143 | Out[12]: 's' | |
144 |
|
144 | |||
145 | In [13]: |
|
145 | In [13]: | |
146 |
|
146 | |||
147 | In [14]: %hist -op |
|
147 | In [14]: %hist -op | |
148 | >>> class b: |
|
148 | >>> class b: | |
149 | ... pass |
|
149 | ... pass | |
150 | ... |
|
150 | ... | |
151 | >>> class s(b): |
|
151 | >>> class s(b): | |
152 | ... def __str__(self): |
|
152 | ... def __str__(self): | |
153 | ... return 's' |
|
153 | ... return 's' | |
154 | ... |
|
154 | ... | |
155 | >>> |
|
155 | >>> | |
156 | >>> class r(b): |
|
156 | >>> class r(b): | |
157 | ... def __repr__(self): |
|
157 | ... def __repr__(self): | |
158 | ... return 'r' |
|
158 | ... return 'r' | |
159 | ... |
|
159 | ... | |
160 | >>> class sr(s,r): pass |
|
160 | >>> class sr(s,r): pass | |
161 | >>> |
|
161 | >>> | |
162 | >>> bb=b() |
|
162 | >>> bb=b() | |
163 | >>> ss=s() |
|
163 | >>> ss=s() | |
164 | >>> rr=r() |
|
164 | >>> rr=r() | |
165 | >>> ssrr=sr() |
|
165 | >>> ssrr=sr() | |
166 | >>> 4.5 |
|
166 | >>> 4.5 | |
167 | 4.5 |
|
167 | 4.5 | |
168 | >>> str(ss) |
|
168 | >>> str(ss) | |
169 | 's' |
|
169 | 's' | |
170 | >>> |
|
170 | >>> | |
171 | """ |
|
171 | """ | |
172 |
|
172 | |||
173 |
|
173 | |||
174 | @dec.skip_without('sqlite3') |
|
174 | @dec.skip_without('sqlite3') | |
175 | def test_macro(): |
|
175 | def test_macro(): | |
176 | ip = get_ipython() |
|
176 | ip = get_ipython() | |
177 | ip.history_manager.reset() # Clear any existing history. |
|
177 | ip.history_manager.reset() # Clear any existing history. | |
178 | cmds = ["a=1", "def b():\n return a**2", "print(a,b())"] |
|
178 | cmds = ["a=1", "def b():\n return a**2", "print(a,b())"] | |
179 | for i, cmd in enumerate(cmds, start=1): |
|
179 | for i, cmd in enumerate(cmds, start=1): | |
180 | ip.history_manager.store_inputs(i, cmd) |
|
180 | ip.history_manager.store_inputs(i, cmd) | |
181 | ip.magic("macro test 1-3") |
|
181 | ip.magic("macro test 1-3") | |
182 | nt.assert_equal(ip.user_ns["test"].value, "\n".join(cmds)+"\n") |
|
182 | nt.assert_equal(ip.user_ns["test"].value, "\n".join(cmds)+"\n") | |
183 |
|
183 | |||
184 | # List macros. |
|
184 | # List macros. | |
185 | assert "test" in ip.magic("macro") |
|
185 | assert "test" in ip.magic("macro") | |
186 |
|
186 | |||
187 |
|
187 | |||
188 | @dec.skip_without('sqlite3') |
|
188 | @dec.skip_without('sqlite3') | |
189 | def test_macro_run(): |
|
189 | def test_macro_run(): | |
190 | """Test that we can run a multi-line macro successfully.""" |
|
190 | """Test that we can run a multi-line macro successfully.""" | |
191 | ip = get_ipython() |
|
191 | ip = get_ipython() | |
192 | ip.history_manager.reset() |
|
192 | ip.history_manager.reset() | |
193 | cmds = ["a=10", "a+=1", py3compat.doctest_refactor_print("print a"), |
|
193 | cmds = ["a=10", "a+=1", py3compat.doctest_refactor_print("print a"), | |
194 | "%macro test 2-3"] |
|
194 | "%macro test 2-3"] | |
195 | for cmd in cmds: |
|
195 | for cmd in cmds: | |
196 | ip.run_cell(cmd, store_history=True) |
|
196 | ip.run_cell(cmd, store_history=True) | |
197 | nt.assert_equal(ip.user_ns["test"].value, |
|
197 | nt.assert_equal(ip.user_ns["test"].value, | |
198 | py3compat.doctest_refactor_print("a+=1\nprint a\n")) |
|
198 | py3compat.doctest_refactor_print("a+=1\nprint a\n")) | |
199 | with tt.AssertPrints("12"): |
|
199 | with tt.AssertPrints("12"): | |
200 | ip.run_cell("test") |
|
200 | ip.run_cell("test") | |
201 | with tt.AssertPrints("13"): |
|
201 | with tt.AssertPrints("13"): | |
202 | ip.run_cell("test") |
|
202 | ip.run_cell("test") | |
203 |
|
203 | |||
204 |
|
204 | |||
205 | @dec.skipif_not_numpy |
|
205 | @dec.skipif_not_numpy | |
206 | def test_numpy_reset_array_undec(): |
|
206 | def test_numpy_reset_array_undec(): | |
207 | "Test '%reset array' functionality" |
|
207 | "Test '%reset array' functionality" | |
208 | _ip.ex('import numpy as np') |
|
208 | _ip.ex('import numpy as np') | |
209 | _ip.ex('a = np.empty(2)') |
|
209 | _ip.ex('a = np.empty(2)') | |
210 | yield (nt.assert_true, 'a' in _ip.user_ns) |
|
210 | yield (nt.assert_true, 'a' in _ip.user_ns) | |
211 | _ip.magic('reset -f array') |
|
211 | _ip.magic('reset -f array') | |
212 | yield (nt.assert_false, 'a' in _ip.user_ns) |
|
212 | yield (nt.assert_false, 'a' in _ip.user_ns) | |
213 |
|
213 | |||
214 | def test_reset_out(): |
|
214 | def test_reset_out(): | |
215 | "Test '%reset out' magic" |
|
215 | "Test '%reset out' magic" | |
216 | _ip.run_cell("parrot = 'dead'", store_history=True) |
|
216 | _ip.run_cell("parrot = 'dead'", store_history=True) | |
217 | # test '%reset -f out', make an Out prompt |
|
217 | # test '%reset -f out', make an Out prompt | |
218 | _ip.run_cell("parrot", store_history=True) |
|
218 | _ip.run_cell("parrot", store_history=True) | |
219 | nt.assert_true('dead' in [_ip.user_ns[x] for x in '_','__','___']) |
|
219 | nt.assert_true('dead' in [_ip.user_ns[x] for x in '_','__','___']) | |
220 | _ip.magic('reset -f out') |
|
220 | _ip.magic('reset -f out') | |
221 | nt.assert_false('dead' in [_ip.user_ns[x] for x in '_','__','___']) |
|
221 | nt.assert_false('dead' in [_ip.user_ns[x] for x in '_','__','___']) | |
222 | nt.assert_true(len(_ip.user_ns['Out']) == 0) |
|
222 | nt.assert_true(len(_ip.user_ns['Out']) == 0) | |
223 |
|
223 | |||
224 | def test_reset_in(): |
|
224 | def test_reset_in(): | |
225 | "Test '%reset in' magic" |
|
225 | "Test '%reset in' magic" | |
226 | # test '%reset -f in' |
|
226 | # test '%reset -f in' | |
227 | _ip.run_cell("parrot", store_history=True) |
|
227 | _ip.run_cell("parrot", store_history=True) | |
228 | nt.assert_true('parrot' in [_ip.user_ns[x] for x in '_i','_ii','_iii']) |
|
228 | nt.assert_true('parrot' in [_ip.user_ns[x] for x in '_i','_ii','_iii']) | |
229 | _ip.magic('%reset -f in') |
|
229 | _ip.magic('%reset -f in') | |
230 | nt.assert_false('parrot' in [_ip.user_ns[x] for x in '_i','_ii','_iii']) |
|
230 | nt.assert_false('parrot' in [_ip.user_ns[x] for x in '_i','_ii','_iii']) | |
231 | nt.assert_true(len(set(_ip.user_ns['In'])) == 1) |
|
231 | nt.assert_true(len(set(_ip.user_ns['In'])) == 1) | |
232 |
|
232 | |||
233 | def test_reset_dhist(): |
|
233 | def test_reset_dhist(): | |
234 | "Test '%reset dhist' magic" |
|
234 | "Test '%reset dhist' magic" | |
235 | _ip.run_cell("tmp = [d for d in _dh]") # copy before clearing |
|
235 | _ip.run_cell("tmp = [d for d in _dh]") # copy before clearing | |
236 | _ip.magic('cd ' + os.path.dirname(nt.__file__)) |
|
236 | _ip.magic('cd ' + os.path.dirname(nt.__file__)) | |
237 | _ip.magic('cd -') |
|
237 | _ip.magic('cd -') | |
238 | nt.assert_true(len(_ip.user_ns['_dh']) > 0) |
|
238 | nt.assert_true(len(_ip.user_ns['_dh']) > 0) | |
239 | _ip.magic('reset -f dhist') |
|
239 | _ip.magic('reset -f dhist') | |
240 | nt.assert_true(len(_ip.user_ns['_dh']) == 0) |
|
240 | nt.assert_true(len(_ip.user_ns['_dh']) == 0) | |
241 | _ip.run_cell("_dh = [d for d in tmp]") #restore |
|
241 | _ip.run_cell("_dh = [d for d in tmp]") #restore | |
242 |
|
242 | |||
243 | def test_reset_in_length(): |
|
243 | def test_reset_in_length(): | |
244 | "Test that '%reset in' preserves In[] length" |
|
244 | "Test that '%reset in' preserves In[] length" | |
245 | _ip.run_cell("print 'foo'") |
|
245 | _ip.run_cell("print 'foo'") | |
246 | _ip.run_cell("reset -f in") |
|
246 | _ip.run_cell("reset -f in") | |
247 | nt.assert_true(len(_ip.user_ns['In']) == _ip.displayhook.prompt_count+1) |
|
247 | nt.assert_true(len(_ip.user_ns['In']) == _ip.displayhook.prompt_count+1) | |
248 |
|
248 | |||
249 | def test_time(): |
|
249 | def test_time(): | |
250 | _ip.magic('time None') |
|
250 | _ip.magic('time None') | |
251 |
|
251 | |||
252 | def test_tb_syntaxerror(): |
|
252 | def test_tb_syntaxerror(): | |
253 | """test %tb after a SyntaxError""" |
|
253 | """test %tb after a SyntaxError""" | |
254 | ip = get_ipython() |
|
254 | ip = get_ipython() | |
255 | ip.run_cell("for") |
|
255 | ip.run_cell("for") | |
256 |
|
256 | |||
257 | # trap and validate stdout |
|
257 | # trap and validate stdout | |
258 | save_stdout = sys.stdout |
|
258 | save_stdout = sys.stdout | |
259 | try: |
|
259 | try: | |
260 | sys.stdout = StringIO() |
|
260 | sys.stdout = StringIO() | |
261 | ip.run_cell("%tb") |
|
261 | ip.run_cell("%tb") | |
262 | out = sys.stdout.getvalue() |
|
262 | out = sys.stdout.getvalue() | |
263 | finally: |
|
263 | finally: | |
264 | sys.stdout = save_stdout |
|
264 | sys.stdout = save_stdout | |
265 | # trim output, and only check the last line |
|
265 | # trim output, and only check the last line | |
266 | last_line = out.rstrip().splitlines()[-1].strip() |
|
266 | last_line = out.rstrip().splitlines()[-1].strip() | |
267 | nt.assert_equals(last_line, "SyntaxError: invalid syntax") |
|
267 | nt.assert_equals(last_line, "SyntaxError: invalid syntax") | |
268 |
|
268 | |||
269 |
|
269 | |||
270 | @py3compat.doctest_refactor_print |
|
270 | @py3compat.doctest_refactor_print | |
271 | def doctest_time(): |
|
271 | def doctest_time(): | |
272 | """ |
|
272 | """ | |
273 | In [10]: %time None |
|
273 | In [10]: %time None | |
274 | CPU times: user 0.00 s, sys: 0.00 s, total: 0.00 s |
|
274 | CPU times: user 0.00 s, sys: 0.00 s, total: 0.00 s | |
275 | Wall time: 0.00 s |
|
275 | Wall time: 0.00 s | |
276 |
|
276 | |||
277 | In [11]: def f(kmjy): |
|
277 | In [11]: def f(kmjy): | |
278 | ....: %time print 2*kmjy |
|
278 | ....: %time print 2*kmjy | |
279 |
|
279 | |||
280 | In [12]: f(3) |
|
280 | In [12]: f(3) | |
281 | 6 |
|
281 | 6 | |
282 | CPU times: user 0.00 s, sys: 0.00 s, total: 0.00 s |
|
282 | CPU times: user 0.00 s, sys: 0.00 s, total: 0.00 s | |
283 | Wall time: 0.00 s |
|
283 | Wall time: 0.00 s | |
284 | """ |
|
284 | """ | |
285 |
|
285 | |||
286 |
|
286 | |||
287 | def test_doctest_mode(): |
|
287 | def test_doctest_mode(): | |
288 | "Toggle doctest_mode twice, it should be a no-op and run without error" |
|
288 | "Toggle doctest_mode twice, it should be a no-op and run without error" | |
289 | _ip.magic('doctest_mode') |
|
289 | _ip.magic('doctest_mode') | |
290 | _ip.magic('doctest_mode') |
|
290 | _ip.magic('doctest_mode') | |
291 |
|
291 | |||
292 |
|
292 | |||
293 | def test_parse_options(): |
|
293 | def test_parse_options(): | |
294 | """Tests for basic options parsing in magics.""" |
|
294 | """Tests for basic options parsing in magics.""" | |
295 | # These are only the most minimal of tests, more should be added later. At |
|
295 | # These are only the most minimal of tests, more should be added later. At | |
296 | # the very least we check that basic text/unicode calls work OK. |
|
296 | # the very least we check that basic text/unicode calls work OK. | |
297 | m = DummyMagics(_ip) |
|
297 | m = DummyMagics(_ip) | |
298 | nt.assert_equal(m.parse_options('foo', '')[1], 'foo') |
|
298 | nt.assert_equal(m.parse_options('foo', '')[1], 'foo') | |
299 | nt.assert_equal(m.parse_options(u'foo', '')[1], u'foo') |
|
299 | nt.assert_equal(m.parse_options(u'foo', '')[1], u'foo') | |
300 |
|
300 | |||
301 |
|
301 | |||
302 | def test_dirops(): |
|
302 | def test_dirops(): | |
303 | """Test various directory handling operations.""" |
|
303 | """Test various directory handling operations.""" | |
304 | # curpath = lambda :os.path.splitdrive(os.getcwdu())[1].replace('\\','/') |
|
304 | # curpath = lambda :os.path.splitdrive(os.getcwdu())[1].replace('\\','/') | |
305 | curpath = os.getcwdu |
|
305 | curpath = os.getcwdu | |
306 | startdir = os.getcwdu() |
|
306 | startdir = os.getcwdu() | |
307 | ipdir = os.path.realpath(_ip.ipython_dir) |
|
307 | ipdir = os.path.realpath(_ip.ipython_dir) | |
308 | try: |
|
308 | try: | |
309 | _ip.magic('cd "%s"' % ipdir) |
|
309 | _ip.magic('cd "%s"' % ipdir) | |
310 | nt.assert_equal(curpath(), ipdir) |
|
310 | nt.assert_equal(curpath(), ipdir) | |
311 | _ip.magic('cd -') |
|
311 | _ip.magic('cd -') | |
312 | nt.assert_equal(curpath(), startdir) |
|
312 | nt.assert_equal(curpath(), startdir) | |
313 | _ip.magic('pushd "%s"' % ipdir) |
|
313 | _ip.magic('pushd "%s"' % ipdir) | |
314 | nt.assert_equal(curpath(), ipdir) |
|
314 | nt.assert_equal(curpath(), ipdir) | |
315 | _ip.magic('popd') |
|
315 | _ip.magic('popd') | |
316 | nt.assert_equal(curpath(), startdir) |
|
316 | nt.assert_equal(curpath(), startdir) | |
317 | finally: |
|
317 | finally: | |
318 | os.chdir(startdir) |
|
318 | os.chdir(startdir) | |
319 |
|
319 | |||
320 |
|
320 | |||
321 | def test_xmode(): |
|
321 | def test_xmode(): | |
322 | # Calling xmode three times should be a no-op |
|
322 | # Calling xmode three times should be a no-op | |
323 | xmode = _ip.InteractiveTB.mode |
|
323 | xmode = _ip.InteractiveTB.mode | |
324 | for i in range(3): |
|
324 | for i in range(3): | |
325 | _ip.magic("xmode") |
|
325 | _ip.magic("xmode") | |
326 | nt.assert_equal(_ip.InteractiveTB.mode, xmode) |
|
326 | nt.assert_equal(_ip.InteractiveTB.mode, xmode) | |
327 |
|
327 | |||
328 | def test_reset_hard(): |
|
328 | def test_reset_hard(): | |
329 | monitor = [] |
|
329 | monitor = [] | |
330 | class A(object): |
|
330 | class A(object): | |
331 | def __del__(self): |
|
331 | def __del__(self): | |
332 | monitor.append(1) |
|
332 | monitor.append(1) | |
333 | def __repr__(self): |
|
333 | def __repr__(self): | |
334 | return "<A instance>" |
|
334 | return "<A instance>" | |
335 |
|
335 | |||
336 | _ip.user_ns["a"] = A() |
|
336 | _ip.user_ns["a"] = A() | |
337 | _ip.run_cell("a") |
|
337 | _ip.run_cell("a") | |
338 |
|
338 | |||
339 | nt.assert_equal(monitor, []) |
|
339 | nt.assert_equal(monitor, []) | |
340 | _ip.magic("reset -f") |
|
340 | _ip.magic("reset -f") | |
341 | nt.assert_equal(monitor, [1]) |
|
341 | nt.assert_equal(monitor, [1]) | |
342 |
|
342 | |||
343 | class TestXdel(tt.TempFileMixin): |
|
343 | class TestXdel(tt.TempFileMixin): | |
344 | def test_xdel(self): |
|
344 | def test_xdel(self): | |
345 | """Test that references from %run are cleared by xdel.""" |
|
345 | """Test that references from %run are cleared by xdel.""" | |
346 | src = ("class A(object):\n" |
|
346 | src = ("class A(object):\n" | |
347 | " monitor = []\n" |
|
347 | " monitor = []\n" | |
348 | " def __del__(self):\n" |
|
348 | " def __del__(self):\n" | |
349 | " self.monitor.append(1)\n" |
|
349 | " self.monitor.append(1)\n" | |
350 | "a = A()\n") |
|
350 | "a = A()\n") | |
351 | self.mktmp(src) |
|
351 | self.mktmp(src) | |
352 | # %run creates some hidden references... |
|
352 | # %run creates some hidden references... | |
353 | _ip.magic("run %s" % self.fname) |
|
353 | _ip.magic("run %s" % self.fname) | |
354 | # ... as does the displayhook. |
|
354 | # ... as does the displayhook. | |
355 | _ip.run_cell("a") |
|
355 | _ip.run_cell("a") | |
356 |
|
356 | |||
357 | monitor = _ip.user_ns["A"].monitor |
|
357 | monitor = _ip.user_ns["A"].monitor | |
358 | nt.assert_equal(monitor, []) |
|
358 | nt.assert_equal(monitor, []) | |
359 |
|
359 | |||
360 | _ip.magic("xdel a") |
|
360 | _ip.magic("xdel a") | |
361 |
|
361 | |||
362 | # Check that a's __del__ method has been called. |
|
362 | # Check that a's __del__ method has been called. | |
363 | nt.assert_equal(monitor, [1]) |
|
363 | nt.assert_equal(monitor, [1]) | |
364 |
|
364 | |||
365 | def doctest_who(): |
|
365 | def doctest_who(): | |
366 | """doctest for %who |
|
366 | """doctest for %who | |
367 |
|
367 | |||
368 | In [1]: %reset -f |
|
368 | In [1]: %reset -f | |
369 |
|
369 | |||
370 | In [2]: alpha = 123 |
|
370 | In [2]: alpha = 123 | |
371 |
|
371 | |||
372 | In [3]: beta = 'beta' |
|
372 | In [3]: beta = 'beta' | |
373 |
|
373 | |||
374 | In [4]: %who int |
|
374 | In [4]: %who int | |
375 | alpha |
|
375 | alpha | |
376 |
|
376 | |||
377 | In [5]: %who str |
|
377 | In [5]: %who str | |
378 | beta |
|
378 | beta | |
379 |
|
379 | |||
380 | In [6]: %whos |
|
380 | In [6]: %whos | |
381 | Variable Type Data/Info |
|
381 | Variable Type Data/Info | |
382 | ---------------------------- |
|
382 | ---------------------------- | |
383 | alpha int 123 |
|
383 | alpha int 123 | |
384 | beta str beta |
|
384 | beta str beta | |
385 |
|
385 | |||
386 | In [7]: %who_ls |
|
386 | In [7]: %who_ls | |
387 | Out[7]: ['alpha', 'beta'] |
|
387 | Out[7]: ['alpha', 'beta'] | |
388 | """ |
|
388 | """ | |
389 |
|
389 | |||
390 | def test_whos(): |
|
390 | def test_whos(): | |
391 | """Check that whos is protected against objects where repr() fails.""" |
|
391 | """Check that whos is protected against objects where repr() fails.""" | |
392 | class A(object): |
|
392 | class A(object): | |
393 | def __repr__(self): |
|
393 | def __repr__(self): | |
394 | raise Exception() |
|
394 | raise Exception() | |
395 | _ip.user_ns['a'] = A() |
|
395 | _ip.user_ns['a'] = A() | |
396 | _ip.magic("whos") |
|
396 | _ip.magic("whos") | |
397 |
|
397 | |||
398 | @py3compat.u_format |
|
398 | @py3compat.u_format | |
399 | def doctest_precision(): |
|
399 | def doctest_precision(): | |
400 | """doctest for %precision |
|
400 | """doctest for %precision | |
401 |
|
401 | |||
402 | In [1]: f = get_ipython().display_formatter.formatters['text/plain'] |
|
402 | In [1]: f = get_ipython().display_formatter.formatters['text/plain'] | |
403 |
|
403 | |||
404 | In [2]: %precision 5 |
|
404 | In [2]: %precision 5 | |
405 | Out[2]: {u}'%.5f' |
|
405 | Out[2]: {u}'%.5f' | |
406 |
|
406 | |||
407 | In [3]: f.float_format |
|
407 | In [3]: f.float_format | |
408 | Out[3]: {u}'%.5f' |
|
408 | Out[3]: {u}'%.5f' | |
409 |
|
409 | |||
410 | In [4]: %precision %e |
|
410 | In [4]: %precision %e | |
411 | Out[4]: {u}'%e' |
|
411 | Out[4]: {u}'%e' | |
412 |
|
412 | |||
413 | In [5]: f(3.1415927) |
|
413 | In [5]: f(3.1415927) | |
414 | Out[5]: {u}'3.141593e+00' |
|
414 | Out[5]: {u}'3.141593e+00' | |
415 | """ |
|
415 | """ | |
416 |
|
416 | |||
417 | def test_psearch(): |
|
417 | def test_psearch(): | |
418 | with tt.AssertPrints("dict.fromkeys"): |
|
418 | with tt.AssertPrints("dict.fromkeys"): | |
419 | _ip.run_cell("dict.fr*?") |
|
419 | _ip.run_cell("dict.fr*?") | |
420 |
|
420 | |||
421 | def test_timeit_shlex(): |
|
421 | def test_timeit_shlex(): | |
422 | """test shlex issues with timeit (#1109)""" |
|
422 | """test shlex issues with timeit (#1109)""" | |
423 | _ip.ex("def f(*a,**kw): pass") |
|
423 | _ip.ex("def f(*a,**kw): pass") | |
424 | _ip.magic('timeit -n1 "this is a bug".count(" ")') |
|
424 | _ip.magic('timeit -n1 "this is a bug".count(" ")') | |
425 | _ip.magic('timeit -r1 -n1 f(" ", 1)') |
|
425 | _ip.magic('timeit -r1 -n1 f(" ", 1)') | |
426 | _ip.magic('timeit -r1 -n1 f(" ", 1, " ", 2, " ")') |
|
426 | _ip.magic('timeit -r1 -n1 f(" ", 1, " ", 2, " ")') | |
427 | _ip.magic('timeit -r1 -n1 ("a " + "b")') |
|
427 | _ip.magic('timeit -r1 -n1 ("a " + "b")') | |
428 | _ip.magic('timeit -r1 -n1 f("a " + "b")') |
|
428 | _ip.magic('timeit -r1 -n1 f("a " + "b")') | |
429 | _ip.magic('timeit -r1 -n1 f("a " + "b ")') |
|
429 | _ip.magic('timeit -r1 -n1 f("a " + "b ")') | |
430 |
|
430 | |||
431 |
|
431 | |||
432 | def test_timeit_arguments(): |
|
432 | def test_timeit_arguments(): | |
433 | "Test valid timeit arguments, should not cause SyntaxError (GH #1269)" |
|
433 | "Test valid timeit arguments, should not cause SyntaxError (GH #1269)" | |
434 | _ip.magic("timeit ('#')") |
|
434 | _ip.magic("timeit ('#')") | |
435 |
|
435 | |||
436 |
|
436 | |||
437 | @dec.skipif(execution.profile is None) |
|
437 | @dec.skipif(execution.profile is None) | |
438 | def test_prun_quotes(): |
|
438 | def test_prun_quotes(): | |
439 | "Test that prun does not clobber string escapes (GH #1302)" |
|
439 | "Test that prun does not clobber string escapes (GH #1302)" | |
440 | _ip.magic("prun -q x = '\t'") |
|
440 | _ip.magic("prun -q x = '\t'") | |
441 | nt.assert_equal(_ip.user_ns['x'], '\t') |
|
441 | nt.assert_equal(_ip.user_ns['x'], '\t') | |
442 |
|
442 | |||
443 | def test_extension(): |
|
443 | def test_extension(): | |
444 | tmpdir = TemporaryDirectory() |
|
444 | tmpdir = TemporaryDirectory() | |
445 | orig_ipython_dir = _ip.ipython_dir |
|
445 | orig_ipython_dir = _ip.ipython_dir | |
446 | try: |
|
446 | try: | |
447 | _ip.ipython_dir = tmpdir.name |
|
447 | _ip.ipython_dir = tmpdir.name | |
448 | nt.assert_raises(ImportError, _ip.magic, "load_ext daft_extension") |
|
448 | nt.assert_raises(ImportError, _ip.magic, "load_ext daft_extension") | |
449 | url = os.path.join(os.path.dirname(__file__), "daft_extension.py") |
|
449 | url = os.path.join(os.path.dirname(__file__), "daft_extension.py") | |
450 | _ip.magic("install_ext %s" % url) |
|
450 | _ip.magic("install_ext %s" % url) | |
451 | _ip.user_ns.pop('arq', None) |
|
451 | _ip.user_ns.pop('arq', None) | |
452 | _ip.magic("load_ext daft_extension") |
|
452 | _ip.magic("load_ext daft_extension") | |
453 | tt.assert_equal(_ip.user_ns['arq'], 185) |
|
453 | tt.assert_equal(_ip.user_ns['arq'], 185) | |
454 | _ip.magic("unload_ext daft_extension") |
|
454 | _ip.magic("unload_ext daft_extension") | |
455 | assert 'arq' not in _ip.user_ns |
|
455 | assert 'arq' not in _ip.user_ns | |
456 | finally: |
|
456 | finally: | |
457 | _ip.ipython_dir = orig_ipython_dir |
|
457 | _ip.ipython_dir = orig_ipython_dir | |
458 |
|
458 | |||
459 | def test_notebook_export_json(): |
|
459 | def test_notebook_export_json(): | |
460 | with TemporaryDirectory() as td: |
|
460 | with TemporaryDirectory() as td: | |
461 | outfile = os.path.join(td, "nb.ipynb") |
|
461 | outfile = os.path.join(td, "nb.ipynb") | |
462 | _ip.ex(py3compat.u_format(u"u = {u}'hΓ©llo'")) |
|
462 | _ip.ex(py3compat.u_format(u"u = {u}'hΓ©llo'")) | |
463 | _ip.magic("notebook -e %s" % outfile) |
|
463 | _ip.magic("notebook -e %s" % outfile) | |
464 |
|
464 | |||
465 | def test_notebook_export_py(): |
|
465 | def test_notebook_export_py(): | |
466 | with TemporaryDirectory() as td: |
|
466 | with TemporaryDirectory() as td: | |
467 | outfile = os.path.join(td, "nb.py") |
|
467 | outfile = os.path.join(td, "nb.py") | |
468 | _ip.ex(py3compat.u_format(u"u = {u}'hΓ©llo'")) |
|
468 | _ip.ex(py3compat.u_format(u"u = {u}'hΓ©llo'")) | |
469 | _ip.magic("notebook -e %s" % outfile) |
|
469 | _ip.magic("notebook -e %s" % outfile) | |
470 |
|
470 | |||
471 | def test_notebook_reformat_py(): |
|
471 | def test_notebook_reformat_py(): | |
472 | with TemporaryDirectory() as td: |
|
472 | with TemporaryDirectory() as td: | |
473 | infile = os.path.join(td, "nb.ipynb") |
|
473 | infile = os.path.join(td, "nb.ipynb") | |
474 | with io.open(infile, 'w', encoding='utf-8') as f: |
|
474 | with io.open(infile, 'w', encoding='utf-8') as f: | |
475 | current.write(nb0, f, 'json') |
|
475 | current.write(nb0, f, 'json') | |
476 |
|
476 | |||
477 | _ip.ex(py3compat.u_format(u"u = {u}'hΓ©llo'")) |
|
477 | _ip.ex(py3compat.u_format(u"u = {u}'hΓ©llo'")) | |
478 | _ip.magic("notebook -f py %s" % infile) |
|
478 | _ip.magic("notebook -f py %s" % infile) | |
479 |
|
479 | |||
480 | def test_notebook_reformat_json(): |
|
480 | def test_notebook_reformat_json(): | |
481 | with TemporaryDirectory() as td: |
|
481 | with TemporaryDirectory() as td: | |
482 | infile = os.path.join(td, "nb.py") |
|
482 | infile = os.path.join(td, "nb.py") | |
483 | with io.open(infile, 'w', encoding='utf-8') as f: |
|
483 | with io.open(infile, 'w', encoding='utf-8') as f: | |
484 | current.write(nb0, f, 'py') |
|
484 | current.write(nb0, f, 'py') | |
485 |
|
485 | |||
486 | _ip.ex(py3compat.u_format(u"u = {u}'hΓ©llo'")) |
|
486 | _ip.ex(py3compat.u_format(u"u = {u}'hΓ©llo'")) | |
487 | _ip.magic("notebook -f ipynb %s" % infile) |
|
487 | _ip.magic("notebook -f ipynb %s" % infile) | |
488 | _ip.magic("notebook -f json %s" % infile) |
|
488 | _ip.magic("notebook -f json %s" % infile) | |
489 |
|
489 | |||
490 | def test_env(): |
|
490 | def test_env(): | |
491 | env = _ip.magic("env") |
|
491 | env = _ip.magic("env") | |
492 | assert isinstance(env, dict), type(env) |
|
492 | assert isinstance(env, dict), type(env) | |
493 |
|
493 | |||
494 |
|
494 | |||
495 | class CellMagicTestCase(TestCase): |
|
495 | class CellMagicTestCase(TestCase): | |
496 |
|
496 | |||
497 | def check_ident(self, magic): |
|
497 | def check_ident(self, magic): | |
498 | # Manually called, we get the result |
|
498 | # Manually called, we get the result | |
499 | out = _ip.cell_magic(magic, 'a', 'b') |
|
499 | out = _ip.run_cell_magic(magic, 'a', 'b') | |
500 | nt.assert_equals(out, ('a','b')) |
|
500 | nt.assert_equals(out, ('a','b')) | |
501 | # Via run_cell, it goes into the user's namespace via displayhook |
|
501 | # Via run_cell, it goes into the user's namespace via displayhook | |
502 | _ip.run_cell('%%' + magic +' c\nd') |
|
502 | _ip.run_cell('%%' + magic +' c\nd') | |
503 | nt.assert_equals(_ip.user_ns['_'], ('c','d')) |
|
503 | nt.assert_equals(_ip.user_ns['_'], ('c','d')) | |
504 |
|
504 | |||
505 | def test_cell_magic_func_deco(self): |
|
505 | def test_cell_magic_func_deco(self): | |
506 | "Cell magic using simple decorator" |
|
506 | "Cell magic using simple decorator" | |
507 | @register_cell_magic |
|
507 | @register_cell_magic | |
508 | def cellm(line, cell): |
|
508 | def cellm(line, cell): | |
509 | return line, cell |
|
509 | return line, cell | |
510 |
|
510 | |||
511 | self.check_ident('cellm') |
|
511 | self.check_ident('cellm') | |
512 |
|
512 | |||
513 | def test_cell_magic_reg(self): |
|
513 | def test_cell_magic_reg(self): | |
514 | "Cell magic manually registered" |
|
514 | "Cell magic manually registered" | |
515 | def cellm(line, cell): |
|
515 | def cellm(line, cell): | |
516 | return line, cell |
|
516 | return line, cell | |
517 |
|
517 | |||
518 | _ip.register_magic_function(cellm, 'cell', 'cellm2') |
|
518 | _ip.register_magic_function(cellm, 'cell', 'cellm2') | |
519 | self.check_ident('cellm2') |
|
519 | self.check_ident('cellm2') | |
520 |
|
520 | |||
521 | def test_cell_magic_class(self): |
|
521 | def test_cell_magic_class(self): | |
522 | "Cell magics declared via a class" |
|
522 | "Cell magics declared via a class" | |
523 | @magics_class |
|
523 | @magics_class | |
524 | class MyMagics(Magics): |
|
524 | class MyMagics(Magics): | |
525 |
|
525 | |||
526 | @cell_magic |
|
526 | @cell_magic | |
527 | def cellm3(self, line, cell): |
|
527 | def cellm3(self, line, cell): | |
528 | return line, cell |
|
528 | return line, cell | |
529 |
|
529 | |||
530 | _ip.register_magics(MyMagics) |
|
530 | _ip.register_magics(MyMagics) | |
531 | self.check_ident('cellm3') |
|
531 | self.check_ident('cellm3') | |
532 |
|
532 | |||
533 | def test_cell_magic_class2(self): |
|
533 | def test_cell_magic_class2(self): | |
534 | "Cell magics declared via a class, #2" |
|
534 | "Cell magics declared via a class, #2" | |
535 | @magics_class |
|
535 | @magics_class | |
536 | class MyMagics2(Magics): |
|
536 | class MyMagics2(Magics): | |
537 |
|
537 | |||
538 | @cell_magic('cellm4') |
|
538 | @cell_magic('cellm4') | |
539 | def cellm33(self, line, cell): |
|
539 | def cellm33(self, line, cell): | |
540 | return line, cell |
|
540 | return line, cell | |
541 |
|
541 | |||
542 | _ip.register_magics(MyMagics2) |
|
542 | _ip.register_magics(MyMagics2) | |
543 | self.check_ident('cellm4') |
|
543 | self.check_ident('cellm4') | |
544 | # Check that nothing is registered as 'cellm33' |
|
544 | # Check that nothing is registered as 'cellm33' | |
545 | c33 = _ip.find_cell_magic('cellm33') |
|
545 | c33 = _ip.find_cell_magic('cellm33') | |
546 | nt.assert_equals(c33, None) |
|
546 | nt.assert_equals(c33, None) | |
547 |
|
547 |
General Comments 0
You need to be logged in to leave comments.
Login now