Show More
@@ -1,2820 +1,2822 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 codeop |
|
25 | import codeop | |
26 | import inspect |
|
26 | import inspect | |
27 | import os |
|
27 | import os | |
28 | import re |
|
28 | import re | |
29 | import runpy |
|
29 | import runpy | |
30 | import sys |
|
30 | import sys | |
31 | import tempfile |
|
31 | import tempfile | |
32 | import types |
|
32 | import types | |
33 |
|
33 | |||
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 page |
|
42 | from IPython.core import page | |
43 | from IPython.core import prefilter |
|
43 | from IPython.core import prefilter | |
44 | from IPython.core import shadowns |
|
44 | from IPython.core import shadowns | |
45 | from IPython.core import ultratb |
|
45 | from IPython.core import ultratb | |
46 | from IPython.core.alias import AliasManager, AliasError |
|
46 | from IPython.core.alias import AliasManager, AliasError | |
47 | from IPython.core.autocall import ExitAutocall |
|
47 | from IPython.core.autocall import ExitAutocall | |
48 | from IPython.core.builtin_trap import BuiltinTrap |
|
48 | from IPython.core.builtin_trap import BuiltinTrap | |
49 | from IPython.core.compilerop import CachingCompiler |
|
49 | from IPython.core.compilerop import CachingCompiler | |
50 | from IPython.core.display_trap import DisplayTrap |
|
50 | from IPython.core.display_trap import DisplayTrap | |
51 | from IPython.core.displayhook import DisplayHook |
|
51 | from IPython.core.displayhook import DisplayHook | |
52 | from IPython.core.displaypub import DisplayPublisher |
|
52 | from IPython.core.displaypub import DisplayPublisher | |
53 | from IPython.core.error import TryNext, UsageError |
|
53 | from IPython.core.error import TryNext, UsageError | |
54 | from IPython.core.extensions import ExtensionManager |
|
54 | from IPython.core.extensions import ExtensionManager | |
55 | from IPython.core.fakemodule import FakeModule, init_fakemod_dict |
|
55 | from IPython.core.fakemodule import FakeModule, init_fakemod_dict | |
56 | from IPython.core.formatters import DisplayFormatter |
|
56 | from IPython.core.formatters import DisplayFormatter | |
57 | from IPython.core.history import HistoryManager |
|
57 | from IPython.core.history import HistoryManager | |
58 | from IPython.core.inputsplitter import IPythonInputSplitter |
|
58 | from IPython.core.inputsplitter import IPythonInputSplitter | |
59 | from IPython.core.logger import Logger |
|
59 | from IPython.core.logger import Logger | |
60 | from IPython.core.macro import Macro |
|
60 | from IPython.core.macro import Macro | |
61 | from IPython.core.magic import Magic |
|
61 | from IPython.core.magic import Magic | |
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.doctestreload import doctest_reload |
|
71 | from IPython.utils.doctestreload import doctest_reload | |
72 | from IPython.utils.io import ask_yes_no, rprint |
|
72 | from IPython.utils.io import ask_yes_no, rprint | |
73 | from IPython.utils.ipstruct import Struct |
|
73 | from IPython.utils.ipstruct import Struct | |
74 | from IPython.utils.path import get_home_dir, get_ipython_dir, HomeDirError |
|
74 | from IPython.utils.path import get_home_dir, get_ipython_dir, HomeDirError | |
75 | from IPython.utils.pickleshare import PickleShareDB |
|
75 | from IPython.utils.pickleshare import PickleShareDB | |
76 | from IPython.utils.process import system, getoutput |
|
76 | from IPython.utils.process import system, getoutput | |
77 | from IPython.utils.strdispatch import StrDispatch |
|
77 | from IPython.utils.strdispatch import StrDispatch | |
78 | from IPython.utils.syspathcontext import prepended_to_syspath |
|
78 | from IPython.utils.syspathcontext import prepended_to_syspath | |
79 | from IPython.utils.text import (num_ini_spaces, format_screen, LSString, SList, |
|
79 | from IPython.utils.text import (num_ini_spaces, format_screen, LSString, SList, | |
80 | DollarFormatter) |
|
80 | DollarFormatter) | |
81 | from IPython.utils.traitlets import (Integer, CBool, CaselessStrEnum, Enum, |
|
81 | from IPython.utils.traitlets import (Integer, CBool, CaselessStrEnum, Enum, | |
82 | List, Unicode, Instance, Type) |
|
82 | List, Unicode, Instance, Type) | |
83 | from IPython.utils.warn import warn, error, fatal |
|
83 | from IPython.utils.warn import warn, error, fatal | |
84 | import IPython.core.hooks |
|
84 | import IPython.core.hooks | |
85 |
|
85 | |||
86 | #----------------------------------------------------------------------------- |
|
86 | #----------------------------------------------------------------------------- | |
87 | # Globals |
|
87 | # Globals | |
88 | #----------------------------------------------------------------------------- |
|
88 | #----------------------------------------------------------------------------- | |
89 |
|
89 | |||
90 | # compiled regexps for autoindent management |
|
90 | # compiled regexps for autoindent management | |
91 | dedent_re = re.compile(r'^\s+raise|^\s+return|^\s+pass') |
|
91 | dedent_re = re.compile(r'^\s+raise|^\s+return|^\s+pass') | |
92 |
|
92 | |||
93 | #----------------------------------------------------------------------------- |
|
93 | #----------------------------------------------------------------------------- | |
94 | # Utilities |
|
94 | # Utilities | |
95 | #----------------------------------------------------------------------------- |
|
95 | #----------------------------------------------------------------------------- | |
96 |
|
96 | |||
97 | def softspace(file, newvalue): |
|
97 | def softspace(file, newvalue): | |
98 | """Copied from code.py, to remove the dependency""" |
|
98 | """Copied from code.py, to remove the dependency""" | |
99 |
|
99 | |||
100 | oldvalue = 0 |
|
100 | oldvalue = 0 | |
101 | try: |
|
101 | try: | |
102 | oldvalue = file.softspace |
|
102 | oldvalue = file.softspace | |
103 | except AttributeError: |
|
103 | except AttributeError: | |
104 | pass |
|
104 | pass | |
105 | try: |
|
105 | try: | |
106 | file.softspace = newvalue |
|
106 | file.softspace = newvalue | |
107 | except (AttributeError, TypeError): |
|
107 | except (AttributeError, TypeError): | |
108 | # "attribute-less object" or "read-only attributes" |
|
108 | # "attribute-less object" or "read-only attributes" | |
109 | pass |
|
109 | pass | |
110 | return oldvalue |
|
110 | return oldvalue | |
111 |
|
111 | |||
112 |
|
112 | |||
113 | def no_op(*a, **kw): pass |
|
113 | def no_op(*a, **kw): pass | |
114 |
|
114 | |||
115 | class NoOpContext(object): |
|
115 | class NoOpContext(object): | |
116 | def __enter__(self): pass |
|
116 | def __enter__(self): pass | |
117 | def __exit__(self, type, value, traceback): pass |
|
117 | def __exit__(self, type, value, traceback): pass | |
118 | no_op_context = NoOpContext() |
|
118 | no_op_context = NoOpContext() | |
119 |
|
119 | |||
120 | class SpaceInInput(Exception): pass |
|
120 | class SpaceInInput(Exception): pass | |
121 |
|
121 | |||
122 | class Bunch: pass |
|
122 | class Bunch: pass | |
123 |
|
123 | |||
124 |
|
124 | |||
125 | def get_default_colors(): |
|
125 | def get_default_colors(): | |
126 | if sys.platform=='darwin': |
|
126 | if sys.platform=='darwin': | |
127 | return "LightBG" |
|
127 | return "LightBG" | |
128 | elif os.name=='nt': |
|
128 | elif os.name=='nt': | |
129 | return 'Linux' |
|
129 | return 'Linux' | |
130 | else: |
|
130 | else: | |
131 | return 'Linux' |
|
131 | return 'Linux' | |
132 |
|
132 | |||
133 |
|
133 | |||
134 | class SeparateUnicode(Unicode): |
|
134 | class SeparateUnicode(Unicode): | |
135 | """A Unicode subclass to validate separate_in, separate_out, etc. |
|
135 | """A Unicode subclass to validate separate_in, separate_out, etc. | |
136 |
|
136 | |||
137 | This is a Unicode based trait that converts '0'->'' and '\\n'->'\n'. |
|
137 | This is a Unicode based trait that converts '0'->'' and '\\n'->'\n'. | |
138 | """ |
|
138 | """ | |
139 |
|
139 | |||
140 | def validate(self, obj, value): |
|
140 | def validate(self, obj, value): | |
141 | if value == '0': value = '' |
|
141 | if value == '0': value = '' | |
142 | value = value.replace('\\n','\n') |
|
142 | value = value.replace('\\n','\n') | |
143 | return super(SeparateUnicode, self).validate(obj, value) |
|
143 | return super(SeparateUnicode, self).validate(obj, value) | |
144 |
|
144 | |||
145 |
|
145 | |||
146 | class ReadlineNoRecord(object): |
|
146 | class ReadlineNoRecord(object): | |
147 | """Context manager to execute some code, then reload readline history |
|
147 | """Context manager to execute some code, then reload readline history | |
148 | so that interactive input to the code doesn't appear when pressing up.""" |
|
148 | so that interactive input to the code doesn't appear when pressing up.""" | |
149 | def __init__(self, shell): |
|
149 | def __init__(self, shell): | |
150 | self.shell = shell |
|
150 | self.shell = shell | |
151 | self._nested_level = 0 |
|
151 | self._nested_level = 0 | |
152 |
|
152 | |||
153 | def __enter__(self): |
|
153 | def __enter__(self): | |
154 | if self._nested_level == 0: |
|
154 | if self._nested_level == 0: | |
155 | try: |
|
155 | try: | |
156 | self.orig_length = self.current_length() |
|
156 | self.orig_length = self.current_length() | |
157 | self.readline_tail = self.get_readline_tail() |
|
157 | self.readline_tail = self.get_readline_tail() | |
158 | except (AttributeError, IndexError): # Can fail with pyreadline |
|
158 | except (AttributeError, IndexError): # Can fail with pyreadline | |
159 | self.orig_length, self.readline_tail = 999999, [] |
|
159 | self.orig_length, self.readline_tail = 999999, [] | |
160 | self._nested_level += 1 |
|
160 | self._nested_level += 1 | |
161 |
|
161 | |||
162 | def __exit__(self, type, value, traceback): |
|
162 | def __exit__(self, type, value, traceback): | |
163 | self._nested_level -= 1 |
|
163 | self._nested_level -= 1 | |
164 | if self._nested_level == 0: |
|
164 | if self._nested_level == 0: | |
165 | # Try clipping the end if it's got longer |
|
165 | # Try clipping the end if it's got longer | |
166 | try: |
|
166 | try: | |
167 | e = self.current_length() - self.orig_length |
|
167 | e = self.current_length() - self.orig_length | |
168 | if e > 0: |
|
168 | if e > 0: | |
169 | for _ in range(e): |
|
169 | for _ in range(e): | |
170 | self.shell.readline.remove_history_item(self.orig_length) |
|
170 | self.shell.readline.remove_history_item(self.orig_length) | |
171 |
|
171 | |||
172 | # If it still doesn't match, just reload readline history. |
|
172 | # If it still doesn't match, just reload readline history. | |
173 | if self.current_length() != self.orig_length \ |
|
173 | if self.current_length() != self.orig_length \ | |
174 | or self.get_readline_tail() != self.readline_tail: |
|
174 | or self.get_readline_tail() != self.readline_tail: | |
175 | self.shell.refill_readline_hist() |
|
175 | self.shell.refill_readline_hist() | |
176 | except (AttributeError, IndexError): |
|
176 | except (AttributeError, IndexError): | |
177 | pass |
|
177 | pass | |
178 | # Returning False will cause exceptions to propagate |
|
178 | # Returning False will cause exceptions to propagate | |
179 | return False |
|
179 | return False | |
180 |
|
180 | |||
181 | def current_length(self): |
|
181 | def current_length(self): | |
182 | return self.shell.readline.get_current_history_length() |
|
182 | return self.shell.readline.get_current_history_length() | |
183 |
|
183 | |||
184 | def get_readline_tail(self, n=10): |
|
184 | def get_readline_tail(self, n=10): | |
185 | """Get the last n items in readline history.""" |
|
185 | """Get the last n items in readline history.""" | |
186 | end = self.shell.readline.get_current_history_length() + 1 |
|
186 | end = self.shell.readline.get_current_history_length() + 1 | |
187 | start = max(end-n, 1) |
|
187 | start = max(end-n, 1) | |
188 | ghi = self.shell.readline.get_history_item |
|
188 | ghi = self.shell.readline.get_history_item | |
189 | return [ghi(x) for x in range(start, end)] |
|
189 | return [ghi(x) for x in range(start, end)] | |
190 |
|
190 | |||
191 | #----------------------------------------------------------------------------- |
|
191 | #----------------------------------------------------------------------------- | |
192 | # Main IPython class |
|
192 | # Main IPython class | |
193 | #----------------------------------------------------------------------------- |
|
193 | #----------------------------------------------------------------------------- | |
194 |
|
194 | |||
195 | class InteractiveShell(SingletonConfigurable, Magic): |
|
195 | class InteractiveShell(SingletonConfigurable, Magic): | |
196 | """An enhanced, interactive shell for Python.""" |
|
196 | """An enhanced, interactive shell for Python.""" | |
197 |
|
197 | |||
198 | _instance = None |
|
198 | _instance = None | |
199 |
|
199 | |||
200 | autocall = Enum((0,1,2), default_value=0, config=True, help= |
|
200 | autocall = Enum((0,1,2), default_value=0, config=True, help= | |
201 | """ |
|
201 | """ | |
202 | Make IPython automatically call any callable object even if you didn't |
|
202 | Make IPython automatically call any callable object even if you didn't | |
203 | type explicit parentheses. For example, 'str 43' becomes 'str(43)' |
|
203 | type explicit parentheses. For example, 'str 43' becomes 'str(43)' | |
204 | automatically. The value can be '0' to disable the feature, '1' for |
|
204 | automatically. The value can be '0' to disable the feature, '1' for | |
205 | 'smart' autocall, where it is not applied if there are no more |
|
205 | 'smart' autocall, where it is not applied if there are no more | |
206 | arguments on the line, and '2' for 'full' autocall, where all callable |
|
206 | arguments on the line, and '2' for 'full' autocall, where all callable | |
207 | objects are automatically called (even if no arguments are present). |
|
207 | objects are automatically called (even if no arguments are present). | |
208 | """ |
|
208 | """ | |
209 | ) |
|
209 | ) | |
210 | # TODO: remove all autoindent logic and put into frontends. |
|
210 | # TODO: remove all autoindent logic and put into frontends. | |
211 | # We can't do this yet because even runlines uses the autoindent. |
|
211 | # We can't do this yet because even runlines uses the autoindent. | |
212 | autoindent = CBool(True, config=True, help= |
|
212 | autoindent = CBool(True, config=True, help= | |
213 | """ |
|
213 | """ | |
214 | Autoindent IPython code entered interactively. |
|
214 | Autoindent IPython code entered interactively. | |
215 | """ |
|
215 | """ | |
216 | ) |
|
216 | ) | |
217 | automagic = CBool(True, config=True, help= |
|
217 | automagic = CBool(True, config=True, help= | |
218 | """ |
|
218 | """ | |
219 | Enable magic commands to be called without the leading %. |
|
219 | Enable magic commands to be called without the leading %. | |
220 | """ |
|
220 | """ | |
221 | ) |
|
221 | ) | |
222 | cache_size = Integer(1000, config=True, help= |
|
222 | cache_size = Integer(1000, config=True, help= | |
223 | """ |
|
223 | """ | |
224 | Set the size of the output cache. The default is 1000, you can |
|
224 | Set the size of the output cache. The default is 1000, you can | |
225 | change it permanently in your config file. Setting it to 0 completely |
|
225 | change it permanently in your config file. Setting it to 0 completely | |
226 | disables the caching system, and the minimum value accepted is 20 (if |
|
226 | disables the caching system, and the minimum value accepted is 20 (if | |
227 | you provide a value less than 20, it is reset to 0 and a warning is |
|
227 | you provide a value less than 20, it is reset to 0 and a warning is | |
228 | issued). This limit is defined because otherwise you'll spend more |
|
228 | issued). This limit is defined because otherwise you'll spend more | |
229 | time re-flushing a too small cache than working |
|
229 | time re-flushing a too small cache than working | |
230 | """ |
|
230 | """ | |
231 | ) |
|
231 | ) | |
232 | color_info = CBool(True, config=True, help= |
|
232 | color_info = CBool(True, config=True, help= | |
233 | """ |
|
233 | """ | |
234 | Use colors for displaying information about objects. Because this |
|
234 | Use colors for displaying information about objects. Because this | |
235 | information is passed through a pager (like 'less'), and some pagers |
|
235 | information is passed through a pager (like 'less'), and some pagers | |
236 | get confused with color codes, this capability can be turned off. |
|
236 | get confused with color codes, this capability can be turned off. | |
237 | """ |
|
237 | """ | |
238 | ) |
|
238 | ) | |
239 | colors = CaselessStrEnum(('NoColor','LightBG','Linux'), |
|
239 | colors = CaselessStrEnum(('NoColor','LightBG','Linux'), | |
240 | default_value=get_default_colors(), config=True, |
|
240 | default_value=get_default_colors(), config=True, | |
241 | help="Set the color scheme (NoColor, Linux, or LightBG)." |
|
241 | help="Set the color scheme (NoColor, Linux, or LightBG)." | |
242 | ) |
|
242 | ) | |
243 | colors_force = CBool(False, help= |
|
243 | colors_force = CBool(False, help= | |
244 | """ |
|
244 | """ | |
245 | Force use of ANSI color codes, regardless of OS and readline |
|
245 | Force use of ANSI color codes, regardless of OS and readline | |
246 | availability. |
|
246 | availability. | |
247 | """ |
|
247 | """ | |
248 | # FIXME: This is essentially a hack to allow ZMQShell to show colors |
|
248 | # FIXME: This is essentially a hack to allow ZMQShell to show colors | |
249 | # without readline on Win32. When the ZMQ formatting system is |
|
249 | # without readline on Win32. When the ZMQ formatting system is | |
250 | # refactored, this should be removed. |
|
250 | # refactored, this should be removed. | |
251 | ) |
|
251 | ) | |
252 | debug = CBool(False, config=True) |
|
252 | debug = CBool(False, config=True) | |
253 | deep_reload = CBool(False, config=True, help= |
|
253 | deep_reload = CBool(False, config=True, help= | |
254 | """ |
|
254 | """ | |
255 | Enable deep (recursive) reloading by default. IPython can use the |
|
255 | Enable deep (recursive) reloading by default. IPython can use the | |
256 | deep_reload module which reloads changes in modules recursively (it |
|
256 | deep_reload module which reloads changes in modules recursively (it | |
257 | replaces the reload() function, so you don't need to change anything to |
|
257 | replaces the reload() function, so you don't need to change anything to | |
258 | use it). deep_reload() forces a full reload of modules whose code may |
|
258 | use it). deep_reload() forces a full reload of modules whose code may | |
259 | have changed, which the default reload() function does not. When |
|
259 | have changed, which the default reload() function does not. When | |
260 | deep_reload is off, IPython will use the normal reload(), but |
|
260 | deep_reload is off, IPython will use the normal reload(), but | |
261 | deep_reload will still be available as dreload(). |
|
261 | deep_reload will still be available as dreload(). | |
262 | """ |
|
262 | """ | |
263 | ) |
|
263 | ) | |
264 | disable_failing_post_execute = CBool(False, config=True, |
|
264 | disable_failing_post_execute = CBool(False, config=True, | |
265 | help="Don't call post-execute functions that have failed in the past.""" |
|
265 | help="Don't call post-execute functions that have failed in the past.""" | |
266 | ) |
|
266 | ) | |
267 | display_formatter = Instance(DisplayFormatter) |
|
267 | display_formatter = Instance(DisplayFormatter) | |
268 | displayhook_class = Type(DisplayHook) |
|
268 | displayhook_class = Type(DisplayHook) | |
269 | display_pub_class = Type(DisplayPublisher) |
|
269 | display_pub_class = Type(DisplayPublisher) | |
270 |
|
270 | |||
271 | exit_now = CBool(False) |
|
271 | exit_now = CBool(False) | |
272 | exiter = Instance(ExitAutocall) |
|
272 | exiter = Instance(ExitAutocall) | |
273 | def _exiter_default(self): |
|
273 | def _exiter_default(self): | |
274 | return ExitAutocall(self) |
|
274 | return ExitAutocall(self) | |
275 | # Monotonically increasing execution counter |
|
275 | # Monotonically increasing execution counter | |
276 | execution_count = Integer(1) |
|
276 | execution_count = Integer(1) | |
277 | filename = Unicode("<ipython console>") |
|
277 | filename = Unicode("<ipython console>") | |
278 | ipython_dir= Unicode('', config=True) # Set to get_ipython_dir() in __init__ |
|
278 | ipython_dir= Unicode('', config=True) # Set to get_ipython_dir() in __init__ | |
279 |
|
279 | |||
280 | # Input splitter, to split entire cells of input into either individual |
|
280 | # Input splitter, to split entire cells of input into either individual | |
281 | # interactive statements or whole blocks. |
|
281 | # interactive statements or whole blocks. | |
282 | input_splitter = Instance('IPython.core.inputsplitter.IPythonInputSplitter', |
|
282 | input_splitter = Instance('IPython.core.inputsplitter.IPythonInputSplitter', | |
283 | (), {}) |
|
283 | (), {}) | |
284 | logstart = CBool(False, config=True, help= |
|
284 | logstart = CBool(False, config=True, help= | |
285 | """ |
|
285 | """ | |
286 | Start logging to the default log file. |
|
286 | Start logging to the default log file. | |
287 | """ |
|
287 | """ | |
288 | ) |
|
288 | ) | |
289 | logfile = Unicode('', config=True, help= |
|
289 | logfile = Unicode('', config=True, help= | |
290 | """ |
|
290 | """ | |
291 | The name of the logfile to use. |
|
291 | The name of the logfile to use. | |
292 | """ |
|
292 | """ | |
293 | ) |
|
293 | ) | |
294 | logappend = Unicode('', config=True, help= |
|
294 | logappend = Unicode('', config=True, help= | |
295 | """ |
|
295 | """ | |
296 | Start logging to the given file in append mode. |
|
296 | Start logging to the given file in append mode. | |
297 | """ |
|
297 | """ | |
298 | ) |
|
298 | ) | |
299 | object_info_string_level = Enum((0,1,2), default_value=0, |
|
299 | object_info_string_level = Enum((0,1,2), default_value=0, | |
300 | config=True) |
|
300 | config=True) | |
301 | pdb = CBool(False, config=True, help= |
|
301 | pdb = CBool(False, config=True, help= | |
302 | """ |
|
302 | """ | |
303 | Automatically call the pdb debugger after every exception. |
|
303 | Automatically call the pdb debugger after every exception. | |
304 | """ |
|
304 | """ | |
305 | ) |
|
305 | ) | |
306 | multiline_history = CBool(sys.platform != 'win32', config=True, |
|
306 | multiline_history = CBool(sys.platform != 'win32', config=True, | |
307 | help="Save multi-line entries as one entry in readline history" |
|
307 | help="Save multi-line entries as one entry in readline history" | |
308 | ) |
|
308 | ) | |
309 |
|
309 | |||
310 | # deprecated prompt traits: |
|
310 | # deprecated prompt traits: | |
311 |
|
311 | |||
312 | prompt_in1 = Unicode('In [\\#]: ', config=True, |
|
312 | prompt_in1 = Unicode('In [\\#]: ', config=True, | |
313 | help="Deprecated, use PromptManager.in_template") |
|
313 | help="Deprecated, use PromptManager.in_template") | |
314 | prompt_in2 = Unicode(' .\\D.: ', config=True, |
|
314 | prompt_in2 = Unicode(' .\\D.: ', config=True, | |
315 | help="Deprecated, use PromptManager.in2_template") |
|
315 | help="Deprecated, use PromptManager.in2_template") | |
316 | prompt_out = Unicode('Out[\\#]: ', config=True, |
|
316 | prompt_out = Unicode('Out[\\#]: ', config=True, | |
317 | help="Deprecated, use PromptManager.out_template") |
|
317 | help="Deprecated, use PromptManager.out_template") | |
318 | prompts_pad_left = CBool(True, config=True, |
|
318 | prompts_pad_left = CBool(True, config=True, | |
319 | help="Deprecated, use PromptManager.justify") |
|
319 | help="Deprecated, use PromptManager.justify") | |
320 |
|
320 | |||
321 | def _prompt_trait_changed(self, name, old, new): |
|
321 | def _prompt_trait_changed(self, name, old, new): | |
322 | table = { |
|
322 | table = { | |
323 | 'prompt_in1' : 'in_template', |
|
323 | 'prompt_in1' : 'in_template', | |
324 | 'prompt_in2' : 'in2_template', |
|
324 | 'prompt_in2' : 'in2_template', | |
325 | 'prompt_out' : 'out_template', |
|
325 | 'prompt_out' : 'out_template', | |
326 | 'prompts_pad_left' : 'justify', |
|
326 | 'prompts_pad_left' : 'justify', | |
327 | } |
|
327 | } | |
328 | warn("InteractiveShell.{name} is deprecated, use PromptManager.{newname}\n".format( |
|
328 | warn("InteractiveShell.{name} is deprecated, use PromptManager.{newname}\n".format( | |
329 | name=name, newname=table[name]) |
|
329 | name=name, newname=table[name]) | |
330 | ) |
|
330 | ) | |
331 | # protect against weird cases where self.config may not exist: |
|
331 | # protect against weird cases where self.config may not exist: | |
332 | if self.config is not None: |
|
332 | if self.config is not None: | |
333 | # propagate to corresponding PromptManager trait |
|
333 | # propagate to corresponding PromptManager trait | |
334 | setattr(self.config.PromptManager, table[name], new) |
|
334 | setattr(self.config.PromptManager, table[name], new) | |
335 |
|
335 | |||
336 | _prompt_in1_changed = _prompt_trait_changed |
|
336 | _prompt_in1_changed = _prompt_trait_changed | |
337 | _prompt_in2_changed = _prompt_trait_changed |
|
337 | _prompt_in2_changed = _prompt_trait_changed | |
338 | _prompt_out_changed = _prompt_trait_changed |
|
338 | _prompt_out_changed = _prompt_trait_changed | |
339 | _prompt_pad_left_changed = _prompt_trait_changed |
|
339 | _prompt_pad_left_changed = _prompt_trait_changed | |
340 |
|
340 | |||
341 | show_rewritten_input = CBool(True, config=True, |
|
341 | show_rewritten_input = CBool(True, config=True, | |
342 | help="Show rewritten input, e.g. for autocall." |
|
342 | help="Show rewritten input, e.g. for autocall." | |
343 | ) |
|
343 | ) | |
344 |
|
344 | |||
345 | quiet = CBool(False, config=True) |
|
345 | quiet = CBool(False, config=True) | |
346 |
|
346 | |||
347 | history_length = Integer(10000, config=True) |
|
347 | history_length = Integer(10000, config=True) | |
348 |
|
348 | |||
349 | # The readline stuff will eventually be moved to the terminal subclass |
|
349 | # The readline stuff will eventually be moved to the terminal subclass | |
350 | # but for now, we can't do that as readline is welded in everywhere. |
|
350 | # but for now, we can't do that as readline is welded in everywhere. | |
351 | readline_use = CBool(True, config=True) |
|
351 | readline_use = CBool(True, config=True) | |
352 | readline_remove_delims = Unicode('-/~', config=True) |
|
352 | readline_remove_delims = Unicode('-/~', config=True) | |
353 | # don't use \M- bindings by default, because they |
|
353 | # don't use \M- bindings by default, because they | |
354 | # conflict with 8-bit encodings. See gh-58,gh-88 |
|
354 | # conflict with 8-bit encodings. See gh-58,gh-88 | |
355 | readline_parse_and_bind = List([ |
|
355 | readline_parse_and_bind = List([ | |
356 | 'tab: complete', |
|
356 | 'tab: complete', | |
357 | '"\C-l": clear-screen', |
|
357 | '"\C-l": clear-screen', | |
358 | 'set show-all-if-ambiguous on', |
|
358 | 'set show-all-if-ambiguous on', | |
359 | '"\C-o": tab-insert', |
|
359 | '"\C-o": tab-insert', | |
360 | '"\C-r": reverse-search-history', |
|
360 | '"\C-r": reverse-search-history', | |
361 | '"\C-s": forward-search-history', |
|
361 | '"\C-s": forward-search-history', | |
362 | '"\C-p": history-search-backward', |
|
362 | '"\C-p": history-search-backward', | |
363 | '"\C-n": history-search-forward', |
|
363 | '"\C-n": history-search-forward', | |
364 | '"\e[A": history-search-backward', |
|
364 | '"\e[A": history-search-backward', | |
365 | '"\e[B": history-search-forward', |
|
365 | '"\e[B": history-search-forward', | |
366 | '"\C-k": kill-line', |
|
366 | '"\C-k": kill-line', | |
367 | '"\C-u": unix-line-discard', |
|
367 | '"\C-u": unix-line-discard', | |
368 | ], allow_none=False, config=True) |
|
368 | ], allow_none=False, config=True) | |
369 |
|
369 | |||
370 | # TODO: this part of prompt management should be moved to the frontends. |
|
370 | # TODO: this part of prompt management should be moved to the frontends. | |
371 | # Use custom TraitTypes that convert '0'->'' and '\\n'->'\n' |
|
371 | # Use custom TraitTypes that convert '0'->'' and '\\n'->'\n' | |
372 | separate_in = SeparateUnicode('\n', config=True) |
|
372 | separate_in = SeparateUnicode('\n', config=True) | |
373 | separate_out = SeparateUnicode('', config=True) |
|
373 | separate_out = SeparateUnicode('', config=True) | |
374 | separate_out2 = SeparateUnicode('', config=True) |
|
374 | separate_out2 = SeparateUnicode('', config=True) | |
375 | wildcards_case_sensitive = CBool(True, config=True) |
|
375 | wildcards_case_sensitive = CBool(True, config=True) | |
376 | xmode = CaselessStrEnum(('Context','Plain', 'Verbose'), |
|
376 | xmode = CaselessStrEnum(('Context','Plain', 'Verbose'), | |
377 | default_value='Context', config=True) |
|
377 | default_value='Context', config=True) | |
378 |
|
378 | |||
379 | # Subcomponents of InteractiveShell |
|
379 | # Subcomponents of InteractiveShell | |
380 | alias_manager = Instance('IPython.core.alias.AliasManager') |
|
380 | alias_manager = Instance('IPython.core.alias.AliasManager') | |
381 | prefilter_manager = Instance('IPython.core.prefilter.PrefilterManager') |
|
381 | prefilter_manager = Instance('IPython.core.prefilter.PrefilterManager') | |
382 | builtin_trap = Instance('IPython.core.builtin_trap.BuiltinTrap') |
|
382 | builtin_trap = Instance('IPython.core.builtin_trap.BuiltinTrap') | |
383 | display_trap = Instance('IPython.core.display_trap.DisplayTrap') |
|
383 | display_trap = Instance('IPython.core.display_trap.DisplayTrap') | |
384 | extension_manager = Instance('IPython.core.extensions.ExtensionManager') |
|
384 | extension_manager = Instance('IPython.core.extensions.ExtensionManager') | |
385 | plugin_manager = Instance('IPython.core.plugin.PluginManager') |
|
385 | plugin_manager = Instance('IPython.core.plugin.PluginManager') | |
386 | payload_manager = Instance('IPython.core.payload.PayloadManager') |
|
386 | payload_manager = Instance('IPython.core.payload.PayloadManager') | |
387 | history_manager = Instance('IPython.core.history.HistoryManager') |
|
387 | history_manager = Instance('IPython.core.history.HistoryManager') | |
388 |
|
388 | |||
389 | profile_dir = Instance('IPython.core.application.ProfileDir') |
|
389 | profile_dir = Instance('IPython.core.application.ProfileDir') | |
390 | @property |
|
390 | @property | |
391 | def profile(self): |
|
391 | def profile(self): | |
392 | if self.profile_dir is not None: |
|
392 | if self.profile_dir is not None: | |
393 | name = os.path.basename(self.profile_dir.location) |
|
393 | name = os.path.basename(self.profile_dir.location) | |
394 | return name.replace('profile_','') |
|
394 | return name.replace('profile_','') | |
395 |
|
395 | |||
396 |
|
396 | |||
397 | # Private interface |
|
397 | # Private interface | |
398 | _post_execute = Instance(dict) |
|
398 | _post_execute = Instance(dict) | |
399 |
|
399 | |||
400 | def __init__(self, config=None, ipython_dir=None, profile_dir=None, |
|
400 | def __init__(self, config=None, ipython_dir=None, profile_dir=None, | |
401 | user_module=None, user_ns=None, |
|
401 | user_module=None, user_ns=None, | |
402 | custom_exceptions=((), None)): |
|
402 | custom_exceptions=((), None)): | |
403 |
|
403 | |||
404 | # This is where traits with a config_key argument are updated |
|
404 | # This is where traits with a config_key argument are updated | |
405 | # from the values on config. |
|
405 | # from the values on config. | |
406 | super(InteractiveShell, self).__init__(config=config) |
|
406 | super(InteractiveShell, self).__init__(config=config) | |
407 | self.configurables = [self] |
|
407 | self.configurables = [self] | |
408 |
|
408 | |||
409 | # These are relatively independent and stateless |
|
409 | # These are relatively independent and stateless | |
410 | self.init_ipython_dir(ipython_dir) |
|
410 | self.init_ipython_dir(ipython_dir) | |
411 | self.init_profile_dir(profile_dir) |
|
411 | self.init_profile_dir(profile_dir) | |
412 | self.init_instance_attrs() |
|
412 | self.init_instance_attrs() | |
413 | self.init_environment() |
|
413 | self.init_environment() | |
414 |
|
414 | |||
415 | # Check if we're in a virtualenv, and set up sys.path. |
|
415 | # Check if we're in a virtualenv, and set up sys.path. | |
416 | self.init_virtualenv() |
|
416 | self.init_virtualenv() | |
417 |
|
417 | |||
418 | # Create namespaces (user_ns, user_global_ns, etc.) |
|
418 | # Create namespaces (user_ns, user_global_ns, etc.) | |
419 | self.init_create_namespaces(user_module, user_ns) |
|
419 | self.init_create_namespaces(user_module, user_ns) | |
420 | # This has to be done after init_create_namespaces because it uses |
|
420 | # This has to be done after init_create_namespaces because it uses | |
421 | # something in self.user_ns, but before init_sys_modules, which |
|
421 | # something in self.user_ns, but before init_sys_modules, which | |
422 | # is the first thing to modify sys. |
|
422 | # is the first thing to modify sys. | |
423 | # TODO: When we override sys.stdout and sys.stderr before this class |
|
423 | # TODO: When we override sys.stdout and sys.stderr before this class | |
424 | # is created, we are saving the overridden ones here. Not sure if this |
|
424 | # is created, we are saving the overridden ones here. Not sure if this | |
425 | # is what we want to do. |
|
425 | # is what we want to do. | |
426 | self.save_sys_module_state() |
|
426 | self.save_sys_module_state() | |
427 | self.init_sys_modules() |
|
427 | self.init_sys_modules() | |
428 |
|
428 | |||
429 | # While we're trying to have each part of the code directly access what |
|
429 | # While we're trying to have each part of the code directly access what | |
430 | # it needs without keeping redundant references to objects, we have too |
|
430 | # it needs without keeping redundant references to objects, we have too | |
431 | # much legacy code that expects ip.db to exist. |
|
431 | # much legacy code that expects ip.db to exist. | |
432 | self.db = PickleShareDB(os.path.join(self.profile_dir.location, 'db')) |
|
432 | self.db = PickleShareDB(os.path.join(self.profile_dir.location, 'db')) | |
433 |
|
433 | |||
434 | self.init_history() |
|
434 | self.init_history() | |
435 | self.init_encoding() |
|
435 | self.init_encoding() | |
436 | self.init_prefilter() |
|
436 | self.init_prefilter() | |
437 |
|
437 | |||
438 | Magic.__init__(self, self) |
|
438 | Magic.__init__(self, self) | |
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(self.logappend + ' append') |
|
596 | self.magic_logstart(self.logappend + ' append') | |
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 |
|
640 | |||
641 | def init_display_formatter(self): |
|
641 | def init_display_formatter(self): | |
642 | self.display_formatter = DisplayFormatter(config=self.config) |
|
642 | self.display_formatter = DisplayFormatter(config=self.config) | |
643 | self.configurables.append(self.display_formatter) |
|
643 | self.configurables.append(self.display_formatter) | |
644 |
|
644 | |||
645 | def init_display_pub(self): |
|
645 | def init_display_pub(self): | |
646 | self.display_pub = self.display_pub_class(config=self.config) |
|
646 | self.display_pub = self.display_pub_class(config=self.config) | |
647 | self.configurables.append(self.display_pub) |
|
647 | self.configurables.append(self.display_pub) | |
648 |
|
648 | |||
649 | def init_displayhook(self): |
|
649 | def init_displayhook(self): | |
650 | # Initialize displayhook, set in/out prompts and printing system |
|
650 | # Initialize displayhook, set in/out prompts and printing system | |
651 | self.displayhook = self.displayhook_class( |
|
651 | self.displayhook = self.displayhook_class( | |
652 | config=self.config, |
|
652 | config=self.config, | |
653 | shell=self, |
|
653 | shell=self, | |
654 | cache_size=self.cache_size, |
|
654 | cache_size=self.cache_size, | |
655 | ) |
|
655 | ) | |
656 | self.configurables.append(self.displayhook) |
|
656 | self.configurables.append(self.displayhook) | |
657 | # This is a context manager that installs/revmoes the displayhook at |
|
657 | # This is a context manager that installs/revmoes the displayhook at | |
658 | # the appropriate time. |
|
658 | # the appropriate time. | |
659 | self.display_trap = DisplayTrap(hook=self.displayhook) |
|
659 | self.display_trap = DisplayTrap(hook=self.displayhook) | |
660 |
|
660 | |||
661 | def init_reload_doctest(self): |
|
661 | def init_reload_doctest(self): | |
662 | # Do a proper resetting of doctest, including the necessary displayhook |
|
662 | # Do a proper resetting of doctest, including the necessary displayhook | |
663 | # monkeypatching |
|
663 | # monkeypatching | |
664 | try: |
|
664 | try: | |
665 | doctest_reload() |
|
665 | doctest_reload() | |
666 | except ImportError: |
|
666 | except ImportError: | |
667 | warn("doctest module does not exist.") |
|
667 | warn("doctest module does not exist.") | |
668 |
|
668 | |||
669 | def init_virtualenv(self): |
|
669 | def init_virtualenv(self): | |
670 | """Add a virtualenv to sys.path so the user can import modules from it. |
|
670 | """Add a virtualenv to sys.path so the user can import modules from it. | |
671 | This isn't perfect: it doesn't use the Python interpreter with which the |
|
671 | This isn't perfect: it doesn't use the Python interpreter with which the | |
672 | virtualenv was built, and it ignores the --no-site-packages option. A |
|
672 | virtualenv was built, and it ignores the --no-site-packages option. A | |
673 | warning will appear suggesting the user installs IPython in the |
|
673 | warning will appear suggesting the user installs IPython in the | |
674 | virtualenv, but for many cases, it probably works well enough. |
|
674 | virtualenv, but for many cases, it probably works well enough. | |
675 |
|
675 | |||
676 | Adapted from code snippets online. |
|
676 | Adapted from code snippets online. | |
677 |
|
677 | |||
678 | http://blog.ufsoft.org/2009/1/29/ipython-and-virtualenv |
|
678 | http://blog.ufsoft.org/2009/1/29/ipython-and-virtualenv | |
679 | """ |
|
679 | """ | |
680 | if 'VIRTUAL_ENV' not in os.environ: |
|
680 | if 'VIRTUAL_ENV' not in os.environ: | |
681 | # Not in a virtualenv |
|
681 | # Not in a virtualenv | |
682 | return |
|
682 | return | |
683 |
|
683 | |||
684 | if sys.executable.startswith(os.environ['VIRTUAL_ENV']): |
|
684 | if sys.executable.startswith(os.environ['VIRTUAL_ENV']): | |
685 | # Running properly in the virtualenv, don't need to do anything |
|
685 | # Running properly in the virtualenv, don't need to do anything | |
686 | return |
|
686 | return | |
687 |
|
687 | |||
688 | warn("Attempting to work in a virtualenv. If you encounter problems, please " |
|
688 | warn("Attempting to work in a virtualenv. If you encounter problems, please " | |
689 | "install IPython inside the virtualenv.\n") |
|
689 | "install IPython inside the virtualenv.\n") | |
690 | if sys.platform == "win32": |
|
690 | if sys.platform == "win32": | |
691 | virtual_env = os.path.join(os.environ['VIRTUAL_ENV'], 'Lib', 'site-packages') |
|
691 | virtual_env = os.path.join(os.environ['VIRTUAL_ENV'], 'Lib', 'site-packages') | |
692 | else: |
|
692 | else: | |
693 | virtual_env = os.path.join(os.environ['VIRTUAL_ENV'], 'lib', |
|
693 | virtual_env = os.path.join(os.environ['VIRTUAL_ENV'], 'lib', | |
694 | 'python%d.%d' % sys.version_info[:2], 'site-packages') |
|
694 | 'python%d.%d' % sys.version_info[:2], 'site-packages') | |
695 |
|
695 | |||
696 | import site |
|
696 | import site | |
697 | sys.path.insert(0, virtual_env) |
|
697 | sys.path.insert(0, virtual_env) | |
698 | site.addsitedir(virtual_env) |
|
698 | site.addsitedir(virtual_env) | |
699 |
|
699 | |||
700 | #------------------------------------------------------------------------- |
|
700 | #------------------------------------------------------------------------- | |
701 | # Things related to injections into the sys module |
|
701 | # Things related to injections into the sys module | |
702 | #------------------------------------------------------------------------- |
|
702 | #------------------------------------------------------------------------- | |
703 |
|
703 | |||
704 | def save_sys_module_state(self): |
|
704 | def save_sys_module_state(self): | |
705 | """Save the state of hooks in the sys module. |
|
705 | """Save the state of hooks in the sys module. | |
706 |
|
706 | |||
707 | This has to be called after self.user_module is created. |
|
707 | This has to be called after self.user_module is created. | |
708 | """ |
|
708 | """ | |
709 | self._orig_sys_module_state = {} |
|
709 | self._orig_sys_module_state = {} | |
710 | self._orig_sys_module_state['stdin'] = sys.stdin |
|
710 | self._orig_sys_module_state['stdin'] = sys.stdin | |
711 | self._orig_sys_module_state['stdout'] = sys.stdout |
|
711 | self._orig_sys_module_state['stdout'] = sys.stdout | |
712 | self._orig_sys_module_state['stderr'] = sys.stderr |
|
712 | self._orig_sys_module_state['stderr'] = sys.stderr | |
713 | self._orig_sys_module_state['excepthook'] = sys.excepthook |
|
713 | self._orig_sys_module_state['excepthook'] = sys.excepthook | |
714 | self._orig_sys_modules_main_name = self.user_module.__name__ |
|
714 | self._orig_sys_modules_main_name = self.user_module.__name__ | |
715 |
|
715 | |||
716 | def restore_sys_module_state(self): |
|
716 | def restore_sys_module_state(self): | |
717 | """Restore the state of the sys module.""" |
|
717 | """Restore the state of the sys module.""" | |
718 | try: |
|
718 | try: | |
719 | for k, v in self._orig_sys_module_state.iteritems(): |
|
719 | for k, v in self._orig_sys_module_state.iteritems(): | |
720 | setattr(sys, k, v) |
|
720 | setattr(sys, k, v) | |
721 | except AttributeError: |
|
721 | except AttributeError: | |
722 | pass |
|
722 | pass | |
723 | # Reset what what done in self.init_sys_modules |
|
723 | # Reset what what done in self.init_sys_modules | |
724 | sys.modules[self.user_module.__name__] = self._orig_sys_modules_main_name |
|
724 | sys.modules[self.user_module.__name__] = self._orig_sys_modules_main_name | |
725 |
|
725 | |||
726 | #------------------------------------------------------------------------- |
|
726 | #------------------------------------------------------------------------- | |
727 | # Things related to hooks |
|
727 | # Things related to hooks | |
728 | #------------------------------------------------------------------------- |
|
728 | #------------------------------------------------------------------------- | |
729 |
|
729 | |||
730 | def init_hooks(self): |
|
730 | def init_hooks(self): | |
731 | # hooks holds pointers used for user-side customizations |
|
731 | # hooks holds pointers used for user-side customizations | |
732 | self.hooks = Struct() |
|
732 | self.hooks = Struct() | |
733 |
|
733 | |||
734 | self.strdispatchers = {} |
|
734 | self.strdispatchers = {} | |
735 |
|
735 | |||
736 | # Set all default hooks, defined in the IPython.hooks module. |
|
736 | # Set all default hooks, defined in the IPython.hooks module. | |
737 | hooks = IPython.core.hooks |
|
737 | hooks = IPython.core.hooks | |
738 | for hook_name in hooks.__all__: |
|
738 | for hook_name in hooks.__all__: | |
739 | # default hooks have priority 100, i.e. low; user hooks should have |
|
739 | # default hooks have priority 100, i.e. low; user hooks should have | |
740 | # 0-100 priority |
|
740 | # 0-100 priority | |
741 | self.set_hook(hook_name,getattr(hooks,hook_name), 100) |
|
741 | self.set_hook(hook_name,getattr(hooks,hook_name), 100) | |
742 |
|
742 | |||
743 | def set_hook(self,name,hook, priority = 50, str_key = None, re_key = None): |
|
743 | def set_hook(self,name,hook, priority = 50, str_key = None, re_key = None): | |
744 | """set_hook(name,hook) -> sets an internal IPython hook. |
|
744 | """set_hook(name,hook) -> sets an internal IPython hook. | |
745 |
|
745 | |||
746 | IPython exposes some of its internal API as user-modifiable hooks. By |
|
746 | IPython exposes some of its internal API as user-modifiable hooks. By | |
747 | adding your function to one of these hooks, you can modify IPython's |
|
747 | adding your function to one of these hooks, you can modify IPython's | |
748 | behavior to call at runtime your own routines.""" |
|
748 | behavior to call at runtime your own routines.""" | |
749 |
|
749 | |||
750 | # At some point in the future, this should validate the hook before it |
|
750 | # At some point in the future, this should validate the hook before it | |
751 | # accepts it. Probably at least check that the hook takes the number |
|
751 | # accepts it. Probably at least check that the hook takes the number | |
752 | # of args it's supposed to. |
|
752 | # of args it's supposed to. | |
753 |
|
753 | |||
754 | f = types.MethodType(hook,self) |
|
754 | f = types.MethodType(hook,self) | |
755 |
|
755 | |||
756 | # check if the hook is for strdispatcher first |
|
756 | # check if the hook is for strdispatcher first | |
757 | if str_key is not None: |
|
757 | if str_key is not None: | |
758 | sdp = self.strdispatchers.get(name, StrDispatch()) |
|
758 | sdp = self.strdispatchers.get(name, StrDispatch()) | |
759 | sdp.add_s(str_key, f, priority ) |
|
759 | sdp.add_s(str_key, f, priority ) | |
760 | self.strdispatchers[name] = sdp |
|
760 | self.strdispatchers[name] = sdp | |
761 | return |
|
761 | return | |
762 | if re_key is not None: |
|
762 | if re_key is not None: | |
763 | sdp = self.strdispatchers.get(name, StrDispatch()) |
|
763 | sdp = self.strdispatchers.get(name, StrDispatch()) | |
764 | sdp.add_re(re.compile(re_key), f, priority ) |
|
764 | sdp.add_re(re.compile(re_key), f, priority ) | |
765 | self.strdispatchers[name] = sdp |
|
765 | self.strdispatchers[name] = sdp | |
766 | return |
|
766 | return | |
767 |
|
767 | |||
768 | dp = getattr(self.hooks, name, None) |
|
768 | dp = getattr(self.hooks, name, None) | |
769 | if name not in IPython.core.hooks.__all__: |
|
769 | if name not in IPython.core.hooks.__all__: | |
770 | print "Warning! Hook '%s' is not one of %s" % \ |
|
770 | print "Warning! Hook '%s' is not one of %s" % \ | |
771 | (name, IPython.core.hooks.__all__ ) |
|
771 | (name, IPython.core.hooks.__all__ ) | |
772 | if not dp: |
|
772 | if not dp: | |
773 | dp = IPython.core.hooks.CommandChainDispatcher() |
|
773 | dp = IPython.core.hooks.CommandChainDispatcher() | |
774 |
|
774 | |||
775 | try: |
|
775 | try: | |
776 | dp.add(f,priority) |
|
776 | dp.add(f,priority) | |
777 | except AttributeError: |
|
777 | except AttributeError: | |
778 | # it was not commandchain, plain old func - replace |
|
778 | # it was not commandchain, plain old func - replace | |
779 | dp = f |
|
779 | dp = f | |
780 |
|
780 | |||
781 | setattr(self.hooks,name, dp) |
|
781 | setattr(self.hooks,name, dp) | |
782 |
|
782 | |||
783 | def register_post_execute(self, func): |
|
783 | def register_post_execute(self, func): | |
784 | """Register a function for calling after code execution. |
|
784 | """Register a function for calling after code execution. | |
785 | """ |
|
785 | """ | |
786 | if not callable(func): |
|
786 | if not callable(func): | |
787 | raise ValueError('argument %s must be callable' % func) |
|
787 | raise ValueError('argument %s must be callable' % func) | |
788 | self._post_execute[func] = True |
|
788 | self._post_execute[func] = True | |
789 |
|
789 | |||
790 | #------------------------------------------------------------------------- |
|
790 | #------------------------------------------------------------------------- | |
791 | # Things related to the "main" module |
|
791 | # Things related to the "main" module | |
792 | #------------------------------------------------------------------------- |
|
792 | #------------------------------------------------------------------------- | |
793 |
|
793 | |||
794 | def new_main_mod(self,ns=None): |
|
794 | def new_main_mod(self,ns=None): | |
795 | """Return a new 'main' module object for user code execution. |
|
795 | """Return a new 'main' module object for user code execution. | |
796 | """ |
|
796 | """ | |
797 | main_mod = self._user_main_module |
|
797 | main_mod = self._user_main_module | |
798 | init_fakemod_dict(main_mod,ns) |
|
798 | init_fakemod_dict(main_mod,ns) | |
799 | return main_mod |
|
799 | return main_mod | |
800 |
|
800 | |||
801 | def cache_main_mod(self,ns,fname): |
|
801 | def cache_main_mod(self,ns,fname): | |
802 | """Cache a main module's namespace. |
|
802 | """Cache a main module's namespace. | |
803 |
|
803 | |||
804 | When scripts are executed via %run, we must keep a reference to the |
|
804 | When scripts are executed via %run, we must keep a reference to the | |
805 | namespace of their __main__ module (a FakeModule instance) around so |
|
805 | namespace of their __main__ module (a FakeModule instance) around so | |
806 | that Python doesn't clear it, rendering objects defined therein |
|
806 | that Python doesn't clear it, rendering objects defined therein | |
807 | useless. |
|
807 | useless. | |
808 |
|
808 | |||
809 | This method keeps said reference in a private dict, keyed by the |
|
809 | This method keeps said reference in a private dict, keyed by the | |
810 | absolute path of the module object (which corresponds to the script |
|
810 | absolute path of the module object (which corresponds to the script | |
811 | path). This way, for multiple executions of the same script we only |
|
811 | path). This way, for multiple executions of the same script we only | |
812 | keep one copy of the namespace (the last one), thus preventing memory |
|
812 | keep one copy of the namespace (the last one), thus preventing memory | |
813 | leaks from old references while allowing the objects from the last |
|
813 | leaks from old references while allowing the objects from the last | |
814 | execution to be accessible. |
|
814 | execution to be accessible. | |
815 |
|
815 | |||
816 | Note: we can not allow the actual FakeModule instances to be deleted, |
|
816 | Note: we can not allow the actual FakeModule instances to be deleted, | |
817 | because of how Python tears down modules (it hard-sets all their |
|
817 | because of how Python tears down modules (it hard-sets all their | |
818 | references to None without regard for reference counts). This method |
|
818 | references to None without regard for reference counts). This method | |
819 | must therefore make a *copy* of the given namespace, to allow the |
|
819 | must therefore make a *copy* of the given namespace, to allow the | |
820 | original module's __dict__ to be cleared and reused. |
|
820 | original module's __dict__ to be cleared and reused. | |
821 |
|
821 | |||
822 |
|
822 | |||
823 | Parameters |
|
823 | Parameters | |
824 | ---------- |
|
824 | ---------- | |
825 | ns : a namespace (a dict, typically) |
|
825 | ns : a namespace (a dict, typically) | |
826 |
|
826 | |||
827 | fname : str |
|
827 | fname : str | |
828 | Filename associated with the namespace. |
|
828 | Filename associated with the namespace. | |
829 |
|
829 | |||
830 | Examples |
|
830 | Examples | |
831 | -------- |
|
831 | -------- | |
832 |
|
832 | |||
833 | In [10]: import IPython |
|
833 | In [10]: import IPython | |
834 |
|
834 | |||
835 | In [11]: _ip.cache_main_mod(IPython.__dict__,IPython.__file__) |
|
835 | In [11]: _ip.cache_main_mod(IPython.__dict__,IPython.__file__) | |
836 |
|
836 | |||
837 | In [12]: IPython.__file__ in _ip._main_ns_cache |
|
837 | In [12]: IPython.__file__ in _ip._main_ns_cache | |
838 | Out[12]: True |
|
838 | Out[12]: True | |
839 | """ |
|
839 | """ | |
840 | self._main_ns_cache[os.path.abspath(fname)] = ns.copy() |
|
840 | self._main_ns_cache[os.path.abspath(fname)] = ns.copy() | |
841 |
|
841 | |||
842 | def clear_main_mod_cache(self): |
|
842 | def clear_main_mod_cache(self): | |
843 | """Clear the cache of main modules. |
|
843 | """Clear the cache of main modules. | |
844 |
|
844 | |||
845 | Mainly for use by utilities like %reset. |
|
845 | Mainly for use by utilities like %reset. | |
846 |
|
846 | |||
847 | Examples |
|
847 | Examples | |
848 | -------- |
|
848 | -------- | |
849 |
|
849 | |||
850 | In [15]: import IPython |
|
850 | In [15]: import IPython | |
851 |
|
851 | |||
852 | In [16]: _ip.cache_main_mod(IPython.__dict__,IPython.__file__) |
|
852 | In [16]: _ip.cache_main_mod(IPython.__dict__,IPython.__file__) | |
853 |
|
853 | |||
854 | In [17]: len(_ip._main_ns_cache) > 0 |
|
854 | In [17]: len(_ip._main_ns_cache) > 0 | |
855 | Out[17]: True |
|
855 | Out[17]: True | |
856 |
|
856 | |||
857 | In [18]: _ip.clear_main_mod_cache() |
|
857 | In [18]: _ip.clear_main_mod_cache() | |
858 |
|
858 | |||
859 | In [19]: len(_ip._main_ns_cache) == 0 |
|
859 | In [19]: len(_ip._main_ns_cache) == 0 | |
860 | Out[19]: True |
|
860 | Out[19]: True | |
861 | """ |
|
861 | """ | |
862 | self._main_ns_cache.clear() |
|
862 | self._main_ns_cache.clear() | |
863 |
|
863 | |||
864 | #------------------------------------------------------------------------- |
|
864 | #------------------------------------------------------------------------- | |
865 | # Things related to debugging |
|
865 | # Things related to debugging | |
866 | #------------------------------------------------------------------------- |
|
866 | #------------------------------------------------------------------------- | |
867 |
|
867 | |||
868 | def init_pdb(self): |
|
868 | def init_pdb(self): | |
869 | # Set calling of pdb on exceptions |
|
869 | # Set calling of pdb on exceptions | |
870 | # self.call_pdb is a property |
|
870 | # self.call_pdb is a property | |
871 | self.call_pdb = self.pdb |
|
871 | self.call_pdb = self.pdb | |
872 |
|
872 | |||
873 | def _get_call_pdb(self): |
|
873 | def _get_call_pdb(self): | |
874 | return self._call_pdb |
|
874 | return self._call_pdb | |
875 |
|
875 | |||
876 | def _set_call_pdb(self,val): |
|
876 | def _set_call_pdb(self,val): | |
877 |
|
877 | |||
878 | if val not in (0,1,False,True): |
|
878 | if val not in (0,1,False,True): | |
879 | raise ValueError,'new call_pdb value must be boolean' |
|
879 | raise ValueError,'new call_pdb value must be boolean' | |
880 |
|
880 | |||
881 | # store value in instance |
|
881 | # store value in instance | |
882 | self._call_pdb = val |
|
882 | self._call_pdb = val | |
883 |
|
883 | |||
884 | # notify the actual exception handlers |
|
884 | # notify the actual exception handlers | |
885 | self.InteractiveTB.call_pdb = val |
|
885 | self.InteractiveTB.call_pdb = val | |
886 |
|
886 | |||
887 | call_pdb = property(_get_call_pdb,_set_call_pdb,None, |
|
887 | call_pdb = property(_get_call_pdb,_set_call_pdb,None, | |
888 | 'Control auto-activation of pdb at exceptions') |
|
888 | 'Control auto-activation of pdb at exceptions') | |
889 |
|
889 | |||
890 | def debugger(self,force=False): |
|
890 | def debugger(self,force=False): | |
891 | """Call the pydb/pdb debugger. |
|
891 | """Call the pydb/pdb debugger. | |
892 |
|
892 | |||
893 | Keywords: |
|
893 | Keywords: | |
894 |
|
894 | |||
895 | - force(False): by default, this routine checks the instance call_pdb |
|
895 | - force(False): by default, this routine checks the instance call_pdb | |
896 | flag and does not actually invoke the debugger if the flag is false. |
|
896 | flag and does not actually invoke the debugger if the flag is false. | |
897 | The 'force' option forces the debugger to activate even if the flag |
|
897 | The 'force' option forces the debugger to activate even if the flag | |
898 | is false. |
|
898 | is false. | |
899 | """ |
|
899 | """ | |
900 |
|
900 | |||
901 | if not (force or self.call_pdb): |
|
901 | if not (force or self.call_pdb): | |
902 | return |
|
902 | return | |
903 |
|
903 | |||
904 | if not hasattr(sys,'last_traceback'): |
|
904 | if not hasattr(sys,'last_traceback'): | |
905 | error('No traceback has been produced, nothing to debug.') |
|
905 | error('No traceback has been produced, nothing to debug.') | |
906 | return |
|
906 | return | |
907 |
|
907 | |||
908 | # use pydb if available |
|
908 | # use pydb if available | |
909 | if debugger.has_pydb: |
|
909 | if debugger.has_pydb: | |
910 | from pydb import pm |
|
910 | from pydb import pm | |
911 | else: |
|
911 | else: | |
912 | # fallback to our internal debugger |
|
912 | # fallback to our internal debugger | |
913 | pm = lambda : self.InteractiveTB.debugger(force=True) |
|
913 | pm = lambda : self.InteractiveTB.debugger(force=True) | |
914 |
|
914 | |||
915 | with self.readline_no_record: |
|
915 | with self.readline_no_record: | |
916 | pm() |
|
916 | pm() | |
917 |
|
917 | |||
918 | #------------------------------------------------------------------------- |
|
918 | #------------------------------------------------------------------------- | |
919 | # Things related to IPython's various namespaces |
|
919 | # Things related to IPython's various namespaces | |
920 | #------------------------------------------------------------------------- |
|
920 | #------------------------------------------------------------------------- | |
921 | default_user_namespaces = True |
|
921 | default_user_namespaces = True | |
922 |
|
922 | |||
923 | def init_create_namespaces(self, user_module=None, user_ns=None): |
|
923 | def init_create_namespaces(self, user_module=None, user_ns=None): | |
924 | # Create the namespace where the user will operate. user_ns is |
|
924 | # Create the namespace where the user will operate. user_ns is | |
925 | # normally the only one used, and it is passed to the exec calls as |
|
925 | # normally the only one used, and it is passed to the exec calls as | |
926 | # the locals argument. But we do carry a user_global_ns namespace |
|
926 | # the locals argument. But we do carry a user_global_ns namespace | |
927 | # given as the exec 'globals' argument, This is useful in embedding |
|
927 | # given as the exec 'globals' argument, This is useful in embedding | |
928 | # situations where the ipython shell opens in a context where the |
|
928 | # situations where the ipython shell opens in a context where the | |
929 | # distinction between locals and globals is meaningful. For |
|
929 | # distinction between locals and globals is meaningful. For | |
930 | # non-embedded contexts, it is just the same object as the user_ns dict. |
|
930 | # non-embedded contexts, it is just the same object as the user_ns dict. | |
931 |
|
931 | |||
932 | # FIXME. For some strange reason, __builtins__ is showing up at user |
|
932 | # FIXME. For some strange reason, __builtins__ is showing up at user | |
933 | # level as a dict instead of a module. This is a manual fix, but I |
|
933 | # level as a dict instead of a module. This is a manual fix, but I | |
934 | # should really track down where the problem is coming from. Alex |
|
934 | # should really track down where the problem is coming from. Alex | |
935 | # Schmolck reported this problem first. |
|
935 | # Schmolck reported this problem first. | |
936 |
|
936 | |||
937 | # A useful post by Alex Martelli on this topic: |
|
937 | # A useful post by Alex Martelli on this topic: | |
938 | # Re: inconsistent value from __builtins__ |
|
938 | # Re: inconsistent value from __builtins__ | |
939 | # Von: Alex Martelli <aleaxit@yahoo.com> |
|
939 | # Von: Alex Martelli <aleaxit@yahoo.com> | |
940 | # Datum: Freitag 01 Oktober 2004 04:45:34 nachmittags/abends |
|
940 | # Datum: Freitag 01 Oktober 2004 04:45:34 nachmittags/abends | |
941 | # Gruppen: comp.lang.python |
|
941 | # Gruppen: comp.lang.python | |
942 |
|
942 | |||
943 | # Michael Hohn <hohn@hooknose.lbl.gov> wrote: |
|
943 | # Michael Hohn <hohn@hooknose.lbl.gov> wrote: | |
944 | # > >>> print type(builtin_check.get_global_binding('__builtins__')) |
|
944 | # > >>> print type(builtin_check.get_global_binding('__builtins__')) | |
945 | # > <type 'dict'> |
|
945 | # > <type 'dict'> | |
946 | # > >>> print type(__builtins__) |
|
946 | # > >>> print type(__builtins__) | |
947 | # > <type 'module'> |
|
947 | # > <type 'module'> | |
948 | # > Is this difference in return value intentional? |
|
948 | # > Is this difference in return value intentional? | |
949 |
|
949 | |||
950 | # Well, it's documented that '__builtins__' can be either a dictionary |
|
950 | # Well, it's documented that '__builtins__' can be either a dictionary | |
951 | # or a module, and it's been that way for a long time. Whether it's |
|
951 | # or a module, and it's been that way for a long time. Whether it's | |
952 | # intentional (or sensible), I don't know. In any case, the idea is |
|
952 | # intentional (or sensible), I don't know. In any case, the idea is | |
953 | # that if you need to access the built-in namespace directly, you |
|
953 | # that if you need to access the built-in namespace directly, you | |
954 | # should start with "import __builtin__" (note, no 's') which will |
|
954 | # should start with "import __builtin__" (note, no 's') which will | |
955 | # definitely give you a module. Yeah, it's somewhat confusing:-(. |
|
955 | # definitely give you a module. Yeah, it's somewhat confusing:-(. | |
956 |
|
956 | |||
957 | # These routines return a properly built module and dict as needed by |
|
957 | # These routines return a properly built module and dict as needed by | |
958 | # the rest of the code, and can also be used by extension writers to |
|
958 | # the rest of the code, and can also be used by extension writers to | |
959 | # generate properly initialized namespaces. |
|
959 | # generate properly initialized namespaces. | |
960 | if (user_ns is not None) or (user_module is not None): |
|
960 | if (user_ns is not None) or (user_module is not None): | |
961 | self.default_user_namespaces = False |
|
961 | self.default_user_namespaces = False | |
962 | self.user_module, self.user_ns = self.prepare_user_module(user_module, user_ns) |
|
962 | self.user_module, self.user_ns = self.prepare_user_module(user_module, user_ns) | |
963 |
|
963 | |||
964 | # A record of hidden variables we have added to the user namespace, so |
|
964 | # A record of hidden variables we have added to the user namespace, so | |
965 | # we can list later only variables defined in actual interactive use. |
|
965 | # we can list later only variables defined in actual interactive use. | |
966 | self.user_ns_hidden = set() |
|
966 | self.user_ns_hidden = set() | |
967 |
|
967 | |||
968 | # Now that FakeModule produces a real module, we've run into a nasty |
|
968 | # Now that FakeModule produces a real module, we've run into a nasty | |
969 | # problem: after script execution (via %run), the module where the user |
|
969 | # problem: after script execution (via %run), the module where the user | |
970 | # code ran is deleted. Now that this object is a true module (needed |
|
970 | # code ran is deleted. Now that this object is a true module (needed | |
971 | # so docetst and other tools work correctly), the Python module |
|
971 | # so docetst and other tools work correctly), the Python module | |
972 | # teardown mechanism runs over it, and sets to None every variable |
|
972 | # teardown mechanism runs over it, and sets to None every variable | |
973 | # present in that module. Top-level references to objects from the |
|
973 | # present in that module. Top-level references to objects from the | |
974 | # script survive, because the user_ns is updated with them. However, |
|
974 | # script survive, because the user_ns is updated with them. However, | |
975 | # calling functions defined in the script that use other things from |
|
975 | # calling functions defined in the script that use other things from | |
976 | # the script will fail, because the function's closure had references |
|
976 | # the script will fail, because the function's closure had references | |
977 | # to the original objects, which are now all None. So we must protect |
|
977 | # to the original objects, which are now all None. So we must protect | |
978 | # these modules from deletion by keeping a cache. |
|
978 | # these modules from deletion by keeping a cache. | |
979 | # |
|
979 | # | |
980 | # To avoid keeping stale modules around (we only need the one from the |
|
980 | # To avoid keeping stale modules around (we only need the one from the | |
981 | # last run), we use a dict keyed with the full path to the script, so |
|
981 | # last run), we use a dict keyed with the full path to the script, so | |
982 | # only the last version of the module is held in the cache. Note, |
|
982 | # only the last version of the module is held in the cache. Note, | |
983 | # however, that we must cache the module *namespace contents* (their |
|
983 | # however, that we must cache the module *namespace contents* (their | |
984 | # __dict__). Because if we try to cache the actual modules, old ones |
|
984 | # __dict__). Because if we try to cache the actual modules, old ones | |
985 | # (uncached) could be destroyed while still holding references (such as |
|
985 | # (uncached) could be destroyed while still holding references (such as | |
986 | # those held by GUI objects that tend to be long-lived)> |
|
986 | # those held by GUI objects that tend to be long-lived)> | |
987 | # |
|
987 | # | |
988 | # The %reset command will flush this cache. See the cache_main_mod() |
|
988 | # The %reset command will flush this cache. See the cache_main_mod() | |
989 | # and clear_main_mod_cache() methods for details on use. |
|
989 | # and clear_main_mod_cache() methods for details on use. | |
990 |
|
990 | |||
991 | # This is the cache used for 'main' namespaces |
|
991 | # This is the cache used for 'main' namespaces | |
992 | self._main_ns_cache = {} |
|
992 | self._main_ns_cache = {} | |
993 | # And this is the single instance of FakeModule whose __dict__ we keep |
|
993 | # And this is the single instance of FakeModule whose __dict__ we keep | |
994 | # copying and clearing for reuse on each %run |
|
994 | # copying and clearing for reuse on each %run | |
995 | self._user_main_module = FakeModule() |
|
995 | self._user_main_module = FakeModule() | |
996 |
|
996 | |||
997 | # A table holding all the namespaces IPython deals with, so that |
|
997 | # A table holding all the namespaces IPython deals with, so that | |
998 | # introspection facilities can search easily. |
|
998 | # introspection facilities can search easily. | |
999 | self.ns_table = {'user_global':self.user_module.__dict__, |
|
999 | self.ns_table = {'user_global':self.user_module.__dict__, | |
1000 | 'user_local':self.user_ns, |
|
1000 | 'user_local':self.user_ns, | |
1001 | 'builtin':builtin_mod.__dict__ |
|
1001 | 'builtin':builtin_mod.__dict__ | |
1002 | } |
|
1002 | } | |
1003 |
|
1003 | |||
1004 | @property |
|
1004 | @property | |
1005 | def user_global_ns(self): |
|
1005 | def user_global_ns(self): | |
1006 | return self.user_module.__dict__ |
|
1006 | return self.user_module.__dict__ | |
1007 |
|
1007 | |||
1008 | def prepare_user_module(self, user_module=None, user_ns=None): |
|
1008 | def prepare_user_module(self, user_module=None, user_ns=None): | |
1009 | """Prepare the module and namespace in which user code will be run. |
|
1009 | """Prepare the module and namespace in which user code will be run. | |
1010 |
|
1010 | |||
1011 | When IPython is started normally, both parameters are None: a new module |
|
1011 | When IPython is started normally, both parameters are None: a new module | |
1012 | is created automatically, and its __dict__ used as the namespace. |
|
1012 | is created automatically, and its __dict__ used as the namespace. | |
1013 |
|
1013 | |||
1014 | If only user_module is provided, its __dict__ is used as the namespace. |
|
1014 | If only user_module is provided, its __dict__ is used as the namespace. | |
1015 | If only user_ns is provided, a dummy module is created, and user_ns |
|
1015 | If only user_ns is provided, a dummy module is created, and user_ns | |
1016 | becomes the global namespace. If both are provided (as they may be |
|
1016 | becomes the global namespace. If both are provided (as they may be | |
1017 | when embedding), user_ns is the local namespace, and user_module |
|
1017 | when embedding), user_ns is the local namespace, and user_module | |
1018 | provides the global namespace. |
|
1018 | provides the global namespace. | |
1019 |
|
1019 | |||
1020 | Parameters |
|
1020 | Parameters | |
1021 | ---------- |
|
1021 | ---------- | |
1022 | user_module : module, optional |
|
1022 | user_module : module, optional | |
1023 | The current user module in which IPython is being run. If None, |
|
1023 | The current user module in which IPython is being run. If None, | |
1024 | a clean module will be created. |
|
1024 | a clean module will be created. | |
1025 | user_ns : dict, optional |
|
1025 | user_ns : dict, optional | |
1026 | A namespace in which to run interactive commands. |
|
1026 | A namespace in which to run interactive commands. | |
1027 |
|
1027 | |||
1028 | Returns |
|
1028 | Returns | |
1029 | ------- |
|
1029 | ------- | |
1030 | A tuple of user_module and user_ns, each properly initialised. |
|
1030 | A tuple of user_module and user_ns, each properly initialised. | |
1031 | """ |
|
1031 | """ | |
1032 | if user_module is None and user_ns is not None: |
|
1032 | if user_module is None and user_ns is not None: | |
1033 | user_ns.setdefault("__name__", "__main__") |
|
1033 | user_ns.setdefault("__name__", "__main__") | |
1034 | class DummyMod(object): |
|
1034 | class DummyMod(object): | |
1035 | "A dummy module used for IPython's interactive namespace." |
|
1035 | "A dummy module used for IPython's interactive namespace." | |
1036 | pass |
|
1036 | pass | |
1037 | user_module = DummyMod() |
|
1037 | user_module = DummyMod() | |
1038 | user_module.__dict__ = user_ns |
|
1038 | user_module.__dict__ = user_ns | |
1039 |
|
1039 | |||
1040 | if user_module is None: |
|
1040 | if user_module is None: | |
1041 | user_module = types.ModuleType("__main__", |
|
1041 | user_module = types.ModuleType("__main__", | |
1042 | doc="Automatically created module for IPython interactive environment") |
|
1042 | doc="Automatically created module for IPython interactive environment") | |
1043 |
|
1043 | |||
1044 | # We must ensure that __builtin__ (without the final 's') is always |
|
1044 | # We must ensure that __builtin__ (without the final 's') is always | |
1045 | # available and pointing to the __builtin__ *module*. For more details: |
|
1045 | # available and pointing to the __builtin__ *module*. For more details: | |
1046 | # http://mail.python.org/pipermail/python-dev/2001-April/014068.html |
|
1046 | # http://mail.python.org/pipermail/python-dev/2001-April/014068.html | |
1047 | user_module.__dict__.setdefault('__builtin__', builtin_mod) |
|
1047 | user_module.__dict__.setdefault('__builtin__', builtin_mod) | |
1048 | user_module.__dict__.setdefault('__builtins__', builtin_mod) |
|
1048 | user_module.__dict__.setdefault('__builtins__', builtin_mod) | |
1049 |
|
1049 | |||
1050 | if user_ns is None: |
|
1050 | if user_ns is None: | |
1051 | user_ns = user_module.__dict__ |
|
1051 | user_ns = user_module.__dict__ | |
1052 |
|
1052 | |||
1053 | return user_module, user_ns |
|
1053 | return user_module, user_ns | |
1054 |
|
1054 | |||
1055 | def init_sys_modules(self): |
|
1055 | def init_sys_modules(self): | |
1056 | # We need to insert into sys.modules something that looks like a |
|
1056 | # We need to insert into sys.modules something that looks like a | |
1057 | # module but which accesses the IPython namespace, for shelve and |
|
1057 | # module but which accesses the IPython namespace, for shelve and | |
1058 | # pickle to work interactively. Normally they rely on getting |
|
1058 | # pickle to work interactively. Normally they rely on getting | |
1059 | # everything out of __main__, but for embedding purposes each IPython |
|
1059 | # everything out of __main__, but for embedding purposes each IPython | |
1060 | # instance has its own private namespace, so we can't go shoving |
|
1060 | # instance has its own private namespace, so we can't go shoving | |
1061 | # everything into __main__. |
|
1061 | # everything into __main__. | |
1062 |
|
1062 | |||
1063 | # note, however, that we should only do this for non-embedded |
|
1063 | # note, however, that we should only do this for non-embedded | |
1064 | # ipythons, which really mimic the __main__.__dict__ with their own |
|
1064 | # ipythons, which really mimic the __main__.__dict__ with their own | |
1065 | # namespace. Embedded instances, on the other hand, should not do |
|
1065 | # namespace. Embedded instances, on the other hand, should not do | |
1066 | # this because they need to manage the user local/global namespaces |
|
1066 | # this because they need to manage the user local/global namespaces | |
1067 | # only, but they live within a 'normal' __main__ (meaning, they |
|
1067 | # only, but they live within a 'normal' __main__ (meaning, they | |
1068 | # shouldn't overtake the execution environment of the script they're |
|
1068 | # shouldn't overtake the execution environment of the script they're | |
1069 | # embedded in). |
|
1069 | # embedded in). | |
1070 |
|
1070 | |||
1071 | # This is overridden in the InteractiveShellEmbed subclass to a no-op. |
|
1071 | # This is overridden in the InteractiveShellEmbed subclass to a no-op. | |
1072 | main_name = self.user_module.__name__ |
|
1072 | main_name = self.user_module.__name__ | |
1073 | sys.modules[main_name] = self.user_module |
|
1073 | sys.modules[main_name] = self.user_module | |
1074 |
|
1074 | |||
1075 | def init_user_ns(self): |
|
1075 | def init_user_ns(self): | |
1076 | """Initialize all user-visible namespaces to their minimum defaults. |
|
1076 | """Initialize all user-visible namespaces to their minimum defaults. | |
1077 |
|
1077 | |||
1078 | Certain history lists are also initialized here, as they effectively |
|
1078 | Certain history lists are also initialized here, as they effectively | |
1079 | act as user namespaces. |
|
1079 | act as user namespaces. | |
1080 |
|
1080 | |||
1081 | Notes |
|
1081 | Notes | |
1082 | ----- |
|
1082 | ----- | |
1083 | All data structures here are only filled in, they are NOT reset by this |
|
1083 | All data structures here are only filled in, they are NOT reset by this | |
1084 | method. If they were not empty before, data will simply be added to |
|
1084 | method. If they were not empty before, data will simply be added to | |
1085 | therm. |
|
1085 | therm. | |
1086 | """ |
|
1086 | """ | |
1087 | # This function works in two parts: first we put a few things in |
|
1087 | # This function works in two parts: first we put a few things in | |
1088 | # user_ns, and we sync that contents into user_ns_hidden so that these |
|
1088 | # user_ns, and we sync that contents into user_ns_hidden so that these | |
1089 | # initial variables aren't shown by %who. After the sync, we add the |
|
1089 | # initial variables aren't shown by %who. After the sync, we add the | |
1090 | # rest of what we *do* want the user to see with %who even on a new |
|
1090 | # rest of what we *do* want the user to see with %who even on a new | |
1091 | # session (probably nothing, so theye really only see their own stuff) |
|
1091 | # session (probably nothing, so theye really only see their own stuff) | |
1092 |
|
1092 | |||
1093 | # The user dict must *always* have a __builtin__ reference to the |
|
1093 | # The user dict must *always* have a __builtin__ reference to the | |
1094 | # Python standard __builtin__ namespace, which must be imported. |
|
1094 | # Python standard __builtin__ namespace, which must be imported. | |
1095 | # This is so that certain operations in prompt evaluation can be |
|
1095 | # This is so that certain operations in prompt evaluation can be | |
1096 | # reliably executed with builtins. Note that we can NOT use |
|
1096 | # reliably executed with builtins. Note that we can NOT use | |
1097 | # __builtins__ (note the 's'), because that can either be a dict or a |
|
1097 | # __builtins__ (note the 's'), because that can either be a dict or a | |
1098 | # module, and can even mutate at runtime, depending on the context |
|
1098 | # module, and can even mutate at runtime, depending on the context | |
1099 | # (Python makes no guarantees on it). In contrast, __builtin__ is |
|
1099 | # (Python makes no guarantees on it). In contrast, __builtin__ is | |
1100 | # always a module object, though it must be explicitly imported. |
|
1100 | # always a module object, though it must be explicitly imported. | |
1101 |
|
1101 | |||
1102 | # For more details: |
|
1102 | # For more details: | |
1103 | # http://mail.python.org/pipermail/python-dev/2001-April/014068.html |
|
1103 | # http://mail.python.org/pipermail/python-dev/2001-April/014068.html | |
1104 | ns = dict() |
|
1104 | ns = dict() | |
1105 |
|
1105 | |||
1106 | # Put 'help' in the user namespace |
|
1106 | # Put 'help' in the user namespace | |
1107 | try: |
|
1107 | try: | |
1108 | from site import _Helper |
|
1108 | from site import _Helper | |
1109 | ns['help'] = _Helper() |
|
1109 | ns['help'] = _Helper() | |
1110 | except ImportError: |
|
1110 | except ImportError: | |
1111 | warn('help() not available - check site.py') |
|
1111 | warn('help() not available - check site.py') | |
1112 |
|
1112 | |||
1113 | # make global variables for user access to the histories |
|
1113 | # make global variables for user access to the histories | |
1114 | ns['_ih'] = self.history_manager.input_hist_parsed |
|
1114 | ns['_ih'] = self.history_manager.input_hist_parsed | |
1115 | ns['_oh'] = self.history_manager.output_hist |
|
1115 | ns['_oh'] = self.history_manager.output_hist | |
1116 | ns['_dh'] = self.history_manager.dir_hist |
|
1116 | ns['_dh'] = self.history_manager.dir_hist | |
1117 |
|
1117 | |||
1118 | ns['_sh'] = shadowns |
|
1118 | ns['_sh'] = shadowns | |
1119 |
|
1119 | |||
1120 | # user aliases to input and output histories. These shouldn't show up |
|
1120 | # user aliases to input and output histories. These shouldn't show up | |
1121 | # in %who, as they can have very large reprs. |
|
1121 | # in %who, as they can have very large reprs. | |
1122 | ns['In'] = self.history_manager.input_hist_parsed |
|
1122 | ns['In'] = self.history_manager.input_hist_parsed | |
1123 | ns['Out'] = self.history_manager.output_hist |
|
1123 | ns['Out'] = self.history_manager.output_hist | |
1124 |
|
1124 | |||
1125 | # Store myself as the public api!!! |
|
1125 | # Store myself as the public api!!! | |
1126 | ns['get_ipython'] = self.get_ipython |
|
1126 | ns['get_ipython'] = self.get_ipython | |
1127 |
|
1127 | |||
1128 | ns['exit'] = self.exiter |
|
1128 | ns['exit'] = self.exiter | |
1129 | ns['quit'] = self.exiter |
|
1129 | ns['quit'] = self.exiter | |
1130 |
|
1130 | |||
1131 | # Sync what we've added so far to user_ns_hidden so these aren't seen |
|
1131 | # Sync what we've added so far to user_ns_hidden so these aren't seen | |
1132 | # by %who |
|
1132 | # by %who | |
1133 | self.user_ns_hidden.update(ns) |
|
1133 | self.user_ns_hidden.update(ns) | |
1134 |
|
1134 | |||
1135 | # Anything put into ns now would show up in %who. Think twice before |
|
1135 | # Anything put into ns now would show up in %who. Think twice before | |
1136 | # putting anything here, as we really want %who to show the user their |
|
1136 | # putting anything here, as we really want %who to show the user their | |
1137 | # stuff, not our variables. |
|
1137 | # stuff, not our variables. | |
1138 |
|
1138 | |||
1139 | # Finally, update the real user's namespace |
|
1139 | # Finally, update the real user's namespace | |
1140 | self.user_ns.update(ns) |
|
1140 | self.user_ns.update(ns) | |
1141 |
|
1141 | |||
1142 | @property |
|
1142 | @property | |
1143 | def all_ns_refs(self): |
|
1143 | def all_ns_refs(self): | |
1144 | """Get a list of references to all the namespace dictionaries in which |
|
1144 | """Get a list of references to all the namespace dictionaries in which | |
1145 | IPython might store a user-created object. |
|
1145 | IPython might store a user-created object. | |
1146 |
|
1146 | |||
1147 | Note that this does not include the displayhook, which also caches |
|
1147 | Note that this does not include the displayhook, which also caches | |
1148 | objects from the output.""" |
|
1148 | objects from the output.""" | |
1149 | return [self.user_ns, self.user_global_ns, |
|
1149 | return [self.user_ns, self.user_global_ns, | |
1150 | self._user_main_module.__dict__] + self._main_ns_cache.values() |
|
1150 | self._user_main_module.__dict__] + self._main_ns_cache.values() | |
1151 |
|
1151 | |||
1152 | def reset(self, new_session=True): |
|
1152 | def reset(self, new_session=True): | |
1153 | """Clear all internal namespaces, and attempt to release references to |
|
1153 | """Clear all internal namespaces, and attempt to release references to | |
1154 | user objects. |
|
1154 | user objects. | |
1155 |
|
1155 | |||
1156 | If new_session is True, a new history session will be opened. |
|
1156 | If new_session is True, a new history session will be opened. | |
1157 | """ |
|
1157 | """ | |
1158 | # Clear histories |
|
1158 | # Clear histories | |
1159 | self.history_manager.reset(new_session) |
|
1159 | self.history_manager.reset(new_session) | |
1160 | # Reset counter used to index all histories |
|
1160 | # Reset counter used to index all histories | |
1161 | if new_session: |
|
1161 | if new_session: | |
1162 | self.execution_count = 1 |
|
1162 | self.execution_count = 1 | |
1163 |
|
1163 | |||
1164 | # Flush cached output items |
|
1164 | # Flush cached output items | |
1165 | if self.displayhook.do_full_cache: |
|
1165 | if self.displayhook.do_full_cache: | |
1166 | self.displayhook.flush() |
|
1166 | self.displayhook.flush() | |
1167 |
|
1167 | |||
1168 | # The main execution namespaces must be cleared very carefully, |
|
1168 | # The main execution namespaces must be cleared very carefully, | |
1169 | # skipping the deletion of the builtin-related keys, because doing so |
|
1169 | # skipping the deletion of the builtin-related keys, because doing so | |
1170 | # would cause errors in many object's __del__ methods. |
|
1170 | # would cause errors in many object's __del__ methods. | |
1171 | if self.user_ns is not self.user_global_ns: |
|
1171 | if self.user_ns is not self.user_global_ns: | |
1172 | self.user_ns.clear() |
|
1172 | self.user_ns.clear() | |
1173 | ns = self.user_global_ns |
|
1173 | ns = self.user_global_ns | |
1174 | drop_keys = set(ns.keys()) |
|
1174 | drop_keys = set(ns.keys()) | |
1175 | drop_keys.discard('__builtin__') |
|
1175 | drop_keys.discard('__builtin__') | |
1176 | drop_keys.discard('__builtins__') |
|
1176 | drop_keys.discard('__builtins__') | |
1177 | drop_keys.discard('__name__') |
|
1177 | drop_keys.discard('__name__') | |
1178 | for k in drop_keys: |
|
1178 | for k in drop_keys: | |
1179 | del ns[k] |
|
1179 | del ns[k] | |
1180 |
|
1180 | |||
1181 | self.user_ns_hidden.clear() |
|
1181 | self.user_ns_hidden.clear() | |
1182 |
|
1182 | |||
1183 | # Restore the user namespaces to minimal usability |
|
1183 | # Restore the user namespaces to minimal usability | |
1184 | self.init_user_ns() |
|
1184 | self.init_user_ns() | |
1185 |
|
1185 | |||
1186 | # Restore the default and user aliases |
|
1186 | # Restore the default and user aliases | |
1187 | self.alias_manager.clear_aliases() |
|
1187 | self.alias_manager.clear_aliases() | |
1188 | self.alias_manager.init_aliases() |
|
1188 | self.alias_manager.init_aliases() | |
1189 |
|
1189 | |||
1190 | # Flush the private list of module references kept for script |
|
1190 | # Flush the private list of module references kept for script | |
1191 | # execution protection |
|
1191 | # execution protection | |
1192 | self.clear_main_mod_cache() |
|
1192 | self.clear_main_mod_cache() | |
1193 |
|
1193 | |||
1194 | # Clear out the namespace from the last %run |
|
1194 | # Clear out the namespace from the last %run | |
1195 | self.new_main_mod() |
|
1195 | self.new_main_mod() | |
1196 |
|
1196 | |||
1197 | def del_var(self, varname, by_name=False): |
|
1197 | def del_var(self, varname, by_name=False): | |
1198 | """Delete a variable from the various namespaces, so that, as |
|
1198 | """Delete a variable from the various namespaces, so that, as | |
1199 | far as possible, we're not keeping any hidden references to it. |
|
1199 | far as possible, we're not keeping any hidden references to it. | |
1200 |
|
1200 | |||
1201 | Parameters |
|
1201 | Parameters | |
1202 | ---------- |
|
1202 | ---------- | |
1203 | varname : str |
|
1203 | varname : str | |
1204 | The name of the variable to delete. |
|
1204 | The name of the variable to delete. | |
1205 | by_name : bool |
|
1205 | by_name : bool | |
1206 | If True, delete variables with the given name in each |
|
1206 | If True, delete variables with the given name in each | |
1207 | namespace. If False (default), find the variable in the user |
|
1207 | namespace. If False (default), find the variable in the user | |
1208 | namespace, and delete references to it. |
|
1208 | namespace, and delete references to it. | |
1209 | """ |
|
1209 | """ | |
1210 | if varname in ('__builtin__', '__builtins__'): |
|
1210 | if varname in ('__builtin__', '__builtins__'): | |
1211 | raise ValueError("Refusing to delete %s" % varname) |
|
1211 | raise ValueError("Refusing to delete %s" % varname) | |
1212 |
|
1212 | |||
1213 | ns_refs = self.all_ns_refs |
|
1213 | ns_refs = self.all_ns_refs | |
1214 |
|
1214 | |||
1215 | if by_name: # Delete by name |
|
1215 | if by_name: # Delete by name | |
1216 | for ns in ns_refs: |
|
1216 | for ns in ns_refs: | |
1217 | try: |
|
1217 | try: | |
1218 | del ns[varname] |
|
1218 | del ns[varname] | |
1219 | except KeyError: |
|
1219 | except KeyError: | |
1220 | pass |
|
1220 | pass | |
1221 | else: # Delete by object |
|
1221 | else: # Delete by object | |
1222 | try: |
|
1222 | try: | |
1223 | obj = self.user_ns[varname] |
|
1223 | obj = self.user_ns[varname] | |
1224 | except KeyError: |
|
1224 | except KeyError: | |
1225 | raise NameError("name '%s' is not defined" % varname) |
|
1225 | raise NameError("name '%s' is not defined" % varname) | |
1226 | # Also check in output history |
|
1226 | # Also check in output history | |
1227 | ns_refs.append(self.history_manager.output_hist) |
|
1227 | ns_refs.append(self.history_manager.output_hist) | |
1228 | for ns in ns_refs: |
|
1228 | for ns in ns_refs: | |
1229 | to_delete = [n for n, o in ns.iteritems() if o is obj] |
|
1229 | to_delete = [n for n, o in ns.iteritems() if o is obj] | |
1230 | for name in to_delete: |
|
1230 | for name in to_delete: | |
1231 | del ns[name] |
|
1231 | del ns[name] | |
1232 |
|
1232 | |||
1233 | # displayhook keeps extra references, but not in a dictionary |
|
1233 | # displayhook keeps extra references, but not in a dictionary | |
1234 | for name in ('_', '__', '___'): |
|
1234 | for name in ('_', '__', '___'): | |
1235 | if getattr(self.displayhook, name) is obj: |
|
1235 | if getattr(self.displayhook, name) is obj: | |
1236 | setattr(self.displayhook, name, None) |
|
1236 | setattr(self.displayhook, name, None) | |
1237 |
|
1237 | |||
1238 | def reset_selective(self, regex=None): |
|
1238 | def reset_selective(self, regex=None): | |
1239 | """Clear selective variables from internal namespaces based on a |
|
1239 | """Clear selective variables from internal namespaces based on a | |
1240 | specified regular expression. |
|
1240 | specified regular expression. | |
1241 |
|
1241 | |||
1242 | Parameters |
|
1242 | Parameters | |
1243 | ---------- |
|
1243 | ---------- | |
1244 | regex : string or compiled pattern, optional |
|
1244 | regex : string or compiled pattern, optional | |
1245 | A regular expression pattern that will be used in searching |
|
1245 | A regular expression pattern that will be used in searching | |
1246 | variable names in the users namespaces. |
|
1246 | variable names in the users namespaces. | |
1247 | """ |
|
1247 | """ | |
1248 | if regex is not None: |
|
1248 | if regex is not None: | |
1249 | try: |
|
1249 | try: | |
1250 | m = re.compile(regex) |
|
1250 | m = re.compile(regex) | |
1251 | except TypeError: |
|
1251 | except TypeError: | |
1252 | raise TypeError('regex must be a string or compiled pattern') |
|
1252 | raise TypeError('regex must be a string or compiled pattern') | |
1253 | # Search for keys in each namespace that match the given regex |
|
1253 | # Search for keys in each namespace that match the given regex | |
1254 | # If a match is found, delete the key/value pair. |
|
1254 | # If a match is found, delete the key/value pair. | |
1255 | for ns in self.all_ns_refs: |
|
1255 | for ns in self.all_ns_refs: | |
1256 | for var in ns: |
|
1256 | for var in ns: | |
1257 | if m.search(var): |
|
1257 | if m.search(var): | |
1258 | del ns[var] |
|
1258 | del ns[var] | |
1259 |
|
1259 | |||
1260 | def push(self, variables, interactive=True): |
|
1260 | def push(self, variables, interactive=True): | |
1261 | """Inject a group of variables into the IPython user namespace. |
|
1261 | """Inject a group of variables into the IPython user namespace. | |
1262 |
|
1262 | |||
1263 | Parameters |
|
1263 | Parameters | |
1264 | ---------- |
|
1264 | ---------- | |
1265 | variables : dict, str or list/tuple of str |
|
1265 | variables : dict, str or list/tuple of str | |
1266 | The variables to inject into the user's namespace. If a dict, a |
|
1266 | The variables to inject into the user's namespace. If a dict, a | |
1267 | simple update is done. If a str, the string is assumed to have |
|
1267 | simple update is done. If a str, the string is assumed to have | |
1268 | variable names separated by spaces. A list/tuple of str can also |
|
1268 | variable names separated by spaces. A list/tuple of str can also | |
1269 | be used to give the variable names. If just the variable names are |
|
1269 | be used to give the variable names. If just the variable names are | |
1270 | give (list/tuple/str) then the variable values looked up in the |
|
1270 | give (list/tuple/str) then the variable values looked up in the | |
1271 | callers frame. |
|
1271 | callers frame. | |
1272 | interactive : bool |
|
1272 | interactive : bool | |
1273 | If True (default), the variables will be listed with the ``who`` |
|
1273 | If True (default), the variables will be listed with the ``who`` | |
1274 | magic. |
|
1274 | magic. | |
1275 | """ |
|
1275 | """ | |
1276 | vdict = None |
|
1276 | vdict = None | |
1277 |
|
1277 | |||
1278 | # We need a dict of name/value pairs to do namespace updates. |
|
1278 | # We need a dict of name/value pairs to do namespace updates. | |
1279 | if isinstance(variables, dict): |
|
1279 | if isinstance(variables, dict): | |
1280 | vdict = variables |
|
1280 | vdict = variables | |
1281 | elif isinstance(variables, (basestring, list, tuple)): |
|
1281 | elif isinstance(variables, (basestring, list, tuple)): | |
1282 | if isinstance(variables, basestring): |
|
1282 | if isinstance(variables, basestring): | |
1283 | vlist = variables.split() |
|
1283 | vlist = variables.split() | |
1284 | else: |
|
1284 | else: | |
1285 | vlist = variables |
|
1285 | vlist = variables | |
1286 | vdict = {} |
|
1286 | vdict = {} | |
1287 | cf = sys._getframe(1) |
|
1287 | cf = sys._getframe(1) | |
1288 | for name in vlist: |
|
1288 | for name in vlist: | |
1289 | try: |
|
1289 | try: | |
1290 | vdict[name] = eval(name, cf.f_globals, cf.f_locals) |
|
1290 | vdict[name] = eval(name, cf.f_globals, cf.f_locals) | |
1291 | except: |
|
1291 | except: | |
1292 | print ('Could not get variable %s from %s' % |
|
1292 | print ('Could not get variable %s from %s' % | |
1293 | (name,cf.f_code.co_name)) |
|
1293 | (name,cf.f_code.co_name)) | |
1294 | else: |
|
1294 | else: | |
1295 | raise ValueError('variables must be a dict/str/list/tuple') |
|
1295 | raise ValueError('variables must be a dict/str/list/tuple') | |
1296 |
|
1296 | |||
1297 | # Propagate variables to user namespace |
|
1297 | # Propagate variables to user namespace | |
1298 | self.user_ns.update(vdict) |
|
1298 | self.user_ns.update(vdict) | |
1299 |
|
1299 | |||
1300 | # And configure interactive visibility |
|
1300 | # And configure interactive visibility | |
1301 | user_ns_hidden = self.user_ns_hidden |
|
1301 | user_ns_hidden = self.user_ns_hidden | |
1302 | if interactive: |
|
1302 | if interactive: | |
1303 | user_ns_hidden.difference_update(vdict) |
|
1303 | user_ns_hidden.difference_update(vdict) | |
1304 | else: |
|
1304 | else: | |
1305 | user_ns_hidden.update(vdict) |
|
1305 | user_ns_hidden.update(vdict) | |
1306 |
|
1306 | |||
1307 | def drop_by_id(self, variables): |
|
1307 | def drop_by_id(self, variables): | |
1308 | """Remove a dict of variables from the user namespace, if they are the |
|
1308 | """Remove a dict of variables from the user namespace, if they are the | |
1309 | same as the values in the dictionary. |
|
1309 | same as the values in the dictionary. | |
1310 |
|
1310 | |||
1311 | This is intended for use by extensions: variables that they've added can |
|
1311 | This is intended for use by extensions: variables that they've added can | |
1312 | be taken back out if they are unloaded, without removing any that the |
|
1312 | be taken back out if they are unloaded, without removing any that the | |
1313 | user has overwritten. |
|
1313 | user has overwritten. | |
1314 |
|
1314 | |||
1315 | Parameters |
|
1315 | Parameters | |
1316 | ---------- |
|
1316 | ---------- | |
1317 | variables : dict |
|
1317 | variables : dict | |
1318 | A dictionary mapping object names (as strings) to the objects. |
|
1318 | A dictionary mapping object names (as strings) to the objects. | |
1319 | """ |
|
1319 | """ | |
1320 | for name, obj in variables.iteritems(): |
|
1320 | for name, obj in variables.iteritems(): | |
1321 | if name in self.user_ns and self.user_ns[name] is obj: |
|
1321 | if name in self.user_ns and self.user_ns[name] is obj: | |
1322 | del self.user_ns[name] |
|
1322 | del self.user_ns[name] | |
1323 | self.user_ns_hidden.discard(name) |
|
1323 | self.user_ns_hidden.discard(name) | |
1324 |
|
1324 | |||
1325 | #------------------------------------------------------------------------- |
|
1325 | #------------------------------------------------------------------------- | |
1326 | # Things related to object introspection |
|
1326 | # Things related to object introspection | |
1327 | #------------------------------------------------------------------------- |
|
1327 | #------------------------------------------------------------------------- | |
1328 |
|
1328 | |||
1329 | def _ofind(self, oname, namespaces=None): |
|
1329 | def _ofind(self, oname, namespaces=None): | |
1330 | """Find an object in the available namespaces. |
|
1330 | """Find an object in the available namespaces. | |
1331 |
|
1331 | |||
1332 | self._ofind(oname) -> dict with keys: found,obj,ospace,ismagic |
|
1332 | self._ofind(oname) -> dict with keys: found,obj,ospace,ismagic | |
1333 |
|
1333 | |||
1334 | Has special code to detect magic functions. |
|
1334 | Has special code to detect magic functions. | |
1335 | """ |
|
1335 | """ | |
1336 | oname = oname.strip() |
|
1336 | oname = oname.strip() | |
1337 | #print '1- oname: <%r>' % oname # dbg |
|
1337 | #print '1- oname: <%r>' % oname # dbg | |
1338 | if not py3compat.isidentifier(oname.lstrip(ESC_MAGIC), dotted=True): |
|
1338 | if not py3compat.isidentifier(oname.lstrip(ESC_MAGIC), dotted=True): | |
1339 | return dict(found=False) |
|
1339 | return dict(found=False) | |
1340 |
|
1340 | |||
1341 | alias_ns = None |
|
1341 | alias_ns = None | |
1342 | if namespaces is None: |
|
1342 | if namespaces is None: | |
1343 | # Namespaces to search in: |
|
1343 | # Namespaces to search in: | |
1344 | # Put them in a list. The order is important so that we |
|
1344 | # Put them in a list. The order is important so that we | |
1345 | # find things in the same order that Python finds them. |
|
1345 | # find things in the same order that Python finds them. | |
1346 | namespaces = [ ('Interactive', self.user_ns), |
|
1346 | namespaces = [ ('Interactive', self.user_ns), | |
1347 | ('Interactive (global)', self.user_global_ns), |
|
1347 | ('Interactive (global)', self.user_global_ns), | |
1348 | ('Python builtin', builtin_mod.__dict__), |
|
1348 | ('Python builtin', builtin_mod.__dict__), | |
1349 | ('Alias', self.alias_manager.alias_table), |
|
1349 | ('Alias', self.alias_manager.alias_table), | |
1350 | ] |
|
1350 | ] | |
1351 | alias_ns = self.alias_manager.alias_table |
|
1351 | alias_ns = self.alias_manager.alias_table | |
1352 |
|
1352 | |||
1353 | # initialize results to 'null' |
|
1353 | # initialize results to 'null' | |
1354 | found = False; obj = None; ospace = None; ds = None; |
|
1354 | found = False; obj = None; ospace = None; ds = None; | |
1355 | ismagic = False; isalias = False; parent = None |
|
1355 | ismagic = False; isalias = False; parent = None | |
1356 |
|
1356 | |||
1357 | # We need to special-case 'print', which as of python2.6 registers as a |
|
1357 | # We need to special-case 'print', which as of python2.6 registers as a | |
1358 | # function but should only be treated as one if print_function was |
|
1358 | # function but should only be treated as one if print_function was | |
1359 | # loaded with a future import. In this case, just bail. |
|
1359 | # loaded with a future import. In this case, just bail. | |
1360 | if (oname == 'print' and not py3compat.PY3 and not \ |
|
1360 | if (oname == 'print' and not py3compat.PY3 and not \ | |
1361 | (self.compile.compiler_flags & __future__.CO_FUTURE_PRINT_FUNCTION)): |
|
1361 | (self.compile.compiler_flags & __future__.CO_FUTURE_PRINT_FUNCTION)): | |
1362 | return {'found':found, 'obj':obj, 'namespace':ospace, |
|
1362 | return {'found':found, 'obj':obj, 'namespace':ospace, | |
1363 | 'ismagic':ismagic, 'isalias':isalias, 'parent':parent} |
|
1363 | 'ismagic':ismagic, 'isalias':isalias, 'parent':parent} | |
1364 |
|
1364 | |||
1365 | # Look for the given name by splitting it in parts. If the head is |
|
1365 | # Look for the given name by splitting it in parts. If the head is | |
1366 | # found, then we look for all the remaining parts as members, and only |
|
1366 | # found, then we look for all the remaining parts as members, and only | |
1367 | # declare success if we can find them all. |
|
1367 | # declare success if we can find them all. | |
1368 | oname_parts = oname.split('.') |
|
1368 | oname_parts = oname.split('.') | |
1369 | oname_head, oname_rest = oname_parts[0],oname_parts[1:] |
|
1369 | oname_head, oname_rest = oname_parts[0],oname_parts[1:] | |
1370 | for nsname,ns in namespaces: |
|
1370 | for nsname,ns in namespaces: | |
1371 | try: |
|
1371 | try: | |
1372 | obj = ns[oname_head] |
|
1372 | obj = ns[oname_head] | |
1373 | except KeyError: |
|
1373 | except KeyError: | |
1374 | continue |
|
1374 | continue | |
1375 | else: |
|
1375 | else: | |
1376 | #print 'oname_rest:', oname_rest # dbg |
|
1376 | #print 'oname_rest:', oname_rest # dbg | |
1377 | for part in oname_rest: |
|
1377 | for part in oname_rest: | |
1378 | try: |
|
1378 | try: | |
1379 | parent = obj |
|
1379 | parent = obj | |
1380 | obj = getattr(obj,part) |
|
1380 | obj = getattr(obj,part) | |
1381 | except: |
|
1381 | except: | |
1382 | # Blanket except b/c some badly implemented objects |
|
1382 | # Blanket except b/c some badly implemented objects | |
1383 | # allow __getattr__ to raise exceptions other than |
|
1383 | # allow __getattr__ to raise exceptions other than | |
1384 | # AttributeError, which then crashes IPython. |
|
1384 | # AttributeError, which then crashes IPython. | |
1385 | break |
|
1385 | break | |
1386 | else: |
|
1386 | else: | |
1387 | # If we finish the for loop (no break), we got all members |
|
1387 | # If we finish the for loop (no break), we got all members | |
1388 | found = True |
|
1388 | found = True | |
1389 | ospace = nsname |
|
1389 | ospace = nsname | |
1390 | if ns == alias_ns: |
|
1390 | if ns == alias_ns: | |
1391 | isalias = True |
|
1391 | isalias = True | |
1392 | break # namespace loop |
|
1392 | break # namespace loop | |
1393 |
|
1393 | |||
1394 | # Try to see if it's magic |
|
1394 | # Try to see if it's magic | |
1395 | if not found: |
|
1395 | if not found: | |
1396 | if oname.startswith(ESC_MAGIC): |
|
1396 | if oname.startswith(ESC_MAGIC): | |
1397 | oname = oname[1:] |
|
1397 | oname = oname[1:] | |
1398 | obj = getattr(self,'magic_'+oname,None) |
|
1398 | obj = getattr(self,'magic_'+oname,None) | |
1399 | if obj is not None: |
|
1399 | if obj is not None: | |
1400 | found = True |
|
1400 | found = True | |
1401 | ospace = 'IPython internal' |
|
1401 | ospace = 'IPython internal' | |
1402 | ismagic = True |
|
1402 | ismagic = True | |
1403 |
|
1403 | |||
1404 | # Last try: special-case some literals like '', [], {}, etc: |
|
1404 | # Last try: special-case some literals like '', [], {}, etc: | |
1405 | if not found and oname_head in ["''",'""','[]','{}','()']: |
|
1405 | if not found and oname_head in ["''",'""','[]','{}','()']: | |
1406 | obj = eval(oname_head) |
|
1406 | obj = eval(oname_head) | |
1407 | found = True |
|
1407 | found = True | |
1408 | ospace = 'Interactive' |
|
1408 | ospace = 'Interactive' | |
1409 |
|
1409 | |||
1410 | return {'found':found, 'obj':obj, 'namespace':ospace, |
|
1410 | return {'found':found, 'obj':obj, 'namespace':ospace, | |
1411 | 'ismagic':ismagic, 'isalias':isalias, 'parent':parent} |
|
1411 | 'ismagic':ismagic, 'isalias':isalias, 'parent':parent} | |
1412 |
|
1412 | |||
1413 | def _ofind_property(self, oname, info): |
|
1413 | def _ofind_property(self, oname, info): | |
1414 | """Second part of object finding, to look for property details.""" |
|
1414 | """Second part of object finding, to look for property details.""" | |
1415 | if info.found: |
|
1415 | if info.found: | |
1416 | # Get the docstring of the class property if it exists. |
|
1416 | # Get the docstring of the class property if it exists. | |
1417 | path = oname.split('.') |
|
1417 | path = oname.split('.') | |
1418 | root = '.'.join(path[:-1]) |
|
1418 | root = '.'.join(path[:-1]) | |
1419 | if info.parent is not None: |
|
1419 | if info.parent is not None: | |
1420 | try: |
|
1420 | try: | |
1421 | target = getattr(info.parent, '__class__') |
|
1421 | target = getattr(info.parent, '__class__') | |
1422 | # The object belongs to a class instance. |
|
1422 | # The object belongs to a class instance. | |
1423 | try: |
|
1423 | try: | |
1424 | target = getattr(target, path[-1]) |
|
1424 | target = getattr(target, path[-1]) | |
1425 | # The class defines the object. |
|
1425 | # The class defines the object. | |
1426 | if isinstance(target, property): |
|
1426 | if isinstance(target, property): | |
1427 | oname = root + '.__class__.' + path[-1] |
|
1427 | oname = root + '.__class__.' + path[-1] | |
1428 | info = Struct(self._ofind(oname)) |
|
1428 | info = Struct(self._ofind(oname)) | |
1429 | except AttributeError: pass |
|
1429 | except AttributeError: pass | |
1430 | except AttributeError: pass |
|
1430 | except AttributeError: pass | |
1431 |
|
1431 | |||
1432 | # We return either the new info or the unmodified input if the object |
|
1432 | # We return either the new info or the unmodified input if the object | |
1433 | # hadn't been found |
|
1433 | # hadn't been found | |
1434 | return info |
|
1434 | return info | |
1435 |
|
1435 | |||
1436 | def _object_find(self, oname, namespaces=None): |
|
1436 | def _object_find(self, oname, namespaces=None): | |
1437 | """Find an object and return a struct with info about it.""" |
|
1437 | """Find an object and return a struct with info about it.""" | |
1438 | inf = Struct(self._ofind(oname, namespaces)) |
|
1438 | inf = Struct(self._ofind(oname, namespaces)) | |
1439 | return Struct(self._ofind_property(oname, inf)) |
|
1439 | return Struct(self._ofind_property(oname, inf)) | |
1440 |
|
1440 | |||
1441 | def _inspect(self, meth, oname, namespaces=None, **kw): |
|
1441 | def _inspect(self, meth, oname, namespaces=None, **kw): | |
1442 | """Generic interface to the inspector system. |
|
1442 | """Generic interface to the inspector system. | |
1443 |
|
1443 | |||
1444 | This function is meant to be called by pdef, pdoc & friends.""" |
|
1444 | This function is meant to be called by pdef, pdoc & friends.""" | |
1445 | info = self._object_find(oname) |
|
1445 | info = self._object_find(oname) | |
1446 | if info.found: |
|
1446 | if info.found: | |
1447 | pmethod = getattr(self.inspector, meth) |
|
1447 | pmethod = getattr(self.inspector, meth) | |
1448 | formatter = format_screen if info.ismagic else None |
|
1448 | formatter = format_screen if info.ismagic else None | |
1449 | if meth == 'pdoc': |
|
1449 | if meth == 'pdoc': | |
1450 | pmethod(info.obj, oname, formatter) |
|
1450 | pmethod(info.obj, oname, formatter) | |
1451 | elif meth == 'pinfo': |
|
1451 | elif meth == 'pinfo': | |
1452 | pmethod(info.obj, oname, formatter, info, **kw) |
|
1452 | pmethod(info.obj, oname, formatter, info, **kw) | |
1453 | else: |
|
1453 | else: | |
1454 | pmethod(info.obj, oname) |
|
1454 | pmethod(info.obj, oname) | |
1455 | else: |
|
1455 | else: | |
1456 | print 'Object `%s` not found.' % oname |
|
1456 | print 'Object `%s` not found.' % oname | |
1457 | return 'not found' # so callers can take other action |
|
1457 | return 'not found' # so callers can take other action | |
1458 |
|
1458 | |||
1459 | def object_inspect(self, oname): |
|
1459 | def object_inspect(self, oname, detail_level=0): | |
1460 | with self.builtin_trap: |
|
1460 | with self.builtin_trap: | |
1461 | info = self._object_find(oname) |
|
1461 | info = self._object_find(oname) | |
1462 | if info.found: |
|
1462 | if info.found: | |
1463 |
return self.inspector.info(info.obj, oname, info=info |
|
1463 | return self.inspector.info(info.obj, oname, info=info, | |
|
1464 | detail_level=detail_level | |||
|
1465 | ) | |||
1464 | else: |
|
1466 | else: | |
1465 | return oinspect.object_info(name=oname, found=False) |
|
1467 | return oinspect.object_info(name=oname, found=False) | |
1466 |
|
1468 | |||
1467 | #------------------------------------------------------------------------- |
|
1469 | #------------------------------------------------------------------------- | |
1468 | # Things related to history management |
|
1470 | # Things related to history management | |
1469 | #------------------------------------------------------------------------- |
|
1471 | #------------------------------------------------------------------------- | |
1470 |
|
1472 | |||
1471 | def init_history(self): |
|
1473 | def init_history(self): | |
1472 | """Sets up the command history, and starts regular autosaves.""" |
|
1474 | """Sets up the command history, and starts regular autosaves.""" | |
1473 | self.history_manager = HistoryManager(shell=self, config=self.config) |
|
1475 | self.history_manager = HistoryManager(shell=self, config=self.config) | |
1474 | self.configurables.append(self.history_manager) |
|
1476 | self.configurables.append(self.history_manager) | |
1475 |
|
1477 | |||
1476 | #------------------------------------------------------------------------- |
|
1478 | #------------------------------------------------------------------------- | |
1477 | # Things related to exception handling and tracebacks (not debugging) |
|
1479 | # Things related to exception handling and tracebacks (not debugging) | |
1478 | #------------------------------------------------------------------------- |
|
1480 | #------------------------------------------------------------------------- | |
1479 |
|
1481 | |||
1480 | def init_traceback_handlers(self, custom_exceptions): |
|
1482 | def init_traceback_handlers(self, custom_exceptions): | |
1481 | # Syntax error handler. |
|
1483 | # Syntax error handler. | |
1482 | self.SyntaxTB = ultratb.SyntaxTB(color_scheme='NoColor') |
|
1484 | self.SyntaxTB = ultratb.SyntaxTB(color_scheme='NoColor') | |
1483 |
|
1485 | |||
1484 | # The interactive one is initialized with an offset, meaning we always |
|
1486 | # The interactive one is initialized with an offset, meaning we always | |
1485 | # want to remove the topmost item in the traceback, which is our own |
|
1487 | # want to remove the topmost item in the traceback, which is our own | |
1486 | # internal code. Valid modes: ['Plain','Context','Verbose'] |
|
1488 | # internal code. Valid modes: ['Plain','Context','Verbose'] | |
1487 | self.InteractiveTB = ultratb.AutoFormattedTB(mode = 'Plain', |
|
1489 | self.InteractiveTB = ultratb.AutoFormattedTB(mode = 'Plain', | |
1488 | color_scheme='NoColor', |
|
1490 | color_scheme='NoColor', | |
1489 | tb_offset = 1, |
|
1491 | tb_offset = 1, | |
1490 | check_cache=self.compile.check_cache) |
|
1492 | check_cache=self.compile.check_cache) | |
1491 |
|
1493 | |||
1492 | # The instance will store a pointer to the system-wide exception hook, |
|
1494 | # The instance will store a pointer to the system-wide exception hook, | |
1493 | # so that runtime code (such as magics) can access it. This is because |
|
1495 | # so that runtime code (such as magics) can access it. This is because | |
1494 | # during the read-eval loop, it may get temporarily overwritten. |
|
1496 | # during the read-eval loop, it may get temporarily overwritten. | |
1495 | self.sys_excepthook = sys.excepthook |
|
1497 | self.sys_excepthook = sys.excepthook | |
1496 |
|
1498 | |||
1497 | # and add any custom exception handlers the user may have specified |
|
1499 | # and add any custom exception handlers the user may have specified | |
1498 | self.set_custom_exc(*custom_exceptions) |
|
1500 | self.set_custom_exc(*custom_exceptions) | |
1499 |
|
1501 | |||
1500 | # Set the exception mode |
|
1502 | # Set the exception mode | |
1501 | self.InteractiveTB.set_mode(mode=self.xmode) |
|
1503 | self.InteractiveTB.set_mode(mode=self.xmode) | |
1502 |
|
1504 | |||
1503 | def set_custom_exc(self, exc_tuple, handler): |
|
1505 | def set_custom_exc(self, exc_tuple, handler): | |
1504 | """set_custom_exc(exc_tuple,handler) |
|
1506 | """set_custom_exc(exc_tuple,handler) | |
1505 |
|
1507 | |||
1506 | Set a custom exception handler, which will be called if any of the |
|
1508 | Set a custom exception handler, which will be called if any of the | |
1507 | exceptions in exc_tuple occur in the mainloop (specifically, in the |
|
1509 | exceptions in exc_tuple occur in the mainloop (specifically, in the | |
1508 | run_code() method). |
|
1510 | run_code() method). | |
1509 |
|
1511 | |||
1510 | Parameters |
|
1512 | Parameters | |
1511 | ---------- |
|
1513 | ---------- | |
1512 |
|
1514 | |||
1513 | exc_tuple : tuple of exception classes |
|
1515 | exc_tuple : tuple of exception classes | |
1514 | A *tuple* of exception classes, for which to call the defined |
|
1516 | A *tuple* of exception classes, for which to call the defined | |
1515 | handler. It is very important that you use a tuple, and NOT A |
|
1517 | handler. It is very important that you use a tuple, and NOT A | |
1516 | LIST here, because of the way Python's except statement works. If |
|
1518 | LIST here, because of the way Python's except statement works. If | |
1517 | you only want to trap a single exception, use a singleton tuple:: |
|
1519 | you only want to trap a single exception, use a singleton tuple:: | |
1518 |
|
1520 | |||
1519 | exc_tuple == (MyCustomException,) |
|
1521 | exc_tuple == (MyCustomException,) | |
1520 |
|
1522 | |||
1521 | handler : callable |
|
1523 | handler : callable | |
1522 | handler must have the following signature:: |
|
1524 | handler must have the following signature:: | |
1523 |
|
1525 | |||
1524 | def my_handler(self, etype, value, tb, tb_offset=None): |
|
1526 | def my_handler(self, etype, value, tb, tb_offset=None): | |
1525 | ... |
|
1527 | ... | |
1526 | return structured_traceback |
|
1528 | return structured_traceback | |
1527 |
|
1529 | |||
1528 | Your handler must return a structured traceback (a list of strings), |
|
1530 | Your handler must return a structured traceback (a list of strings), | |
1529 | or None. |
|
1531 | or None. | |
1530 |
|
1532 | |||
1531 | This will be made into an instance method (via types.MethodType) |
|
1533 | This will be made into an instance method (via types.MethodType) | |
1532 | of IPython itself, and it will be called if any of the exceptions |
|
1534 | of IPython itself, and it will be called if any of the exceptions | |
1533 | listed in the exc_tuple are caught. If the handler is None, an |
|
1535 | listed in the exc_tuple are caught. If the handler is None, an | |
1534 | internal basic one is used, which just prints basic info. |
|
1536 | internal basic one is used, which just prints basic info. | |
1535 |
|
1537 | |||
1536 | To protect IPython from crashes, if your handler ever raises an |
|
1538 | To protect IPython from crashes, if your handler ever raises an | |
1537 | exception or returns an invalid result, it will be immediately |
|
1539 | exception or returns an invalid result, it will be immediately | |
1538 | disabled. |
|
1540 | disabled. | |
1539 |
|
1541 | |||
1540 | WARNING: by putting in your own exception handler into IPython's main |
|
1542 | WARNING: by putting in your own exception handler into IPython's main | |
1541 | execution loop, you run a very good chance of nasty crashes. This |
|
1543 | execution loop, you run a very good chance of nasty crashes. This | |
1542 | facility should only be used if you really know what you are doing.""" |
|
1544 | facility should only be used if you really know what you are doing.""" | |
1543 |
|
1545 | |||
1544 | assert type(exc_tuple)==type(()) , \ |
|
1546 | assert type(exc_tuple)==type(()) , \ | |
1545 | "The custom exceptions must be given AS A TUPLE." |
|
1547 | "The custom exceptions must be given AS A TUPLE." | |
1546 |
|
1548 | |||
1547 | def dummy_handler(self,etype,value,tb,tb_offset=None): |
|
1549 | def dummy_handler(self,etype,value,tb,tb_offset=None): | |
1548 | print '*** Simple custom exception handler ***' |
|
1550 | print '*** Simple custom exception handler ***' | |
1549 | print 'Exception type :',etype |
|
1551 | print 'Exception type :',etype | |
1550 | print 'Exception value:',value |
|
1552 | print 'Exception value:',value | |
1551 | print 'Traceback :',tb |
|
1553 | print 'Traceback :',tb | |
1552 | #print 'Source code :','\n'.join(self.buffer) |
|
1554 | #print 'Source code :','\n'.join(self.buffer) | |
1553 |
|
1555 | |||
1554 | def validate_stb(stb): |
|
1556 | def validate_stb(stb): | |
1555 | """validate structured traceback return type |
|
1557 | """validate structured traceback return type | |
1556 |
|
1558 | |||
1557 | return type of CustomTB *should* be a list of strings, but allow |
|
1559 | return type of CustomTB *should* be a list of strings, but allow | |
1558 | single strings or None, which are harmless. |
|
1560 | single strings or None, which are harmless. | |
1559 |
|
1561 | |||
1560 | This function will *always* return a list of strings, |
|
1562 | This function will *always* return a list of strings, | |
1561 | and will raise a TypeError if stb is inappropriate. |
|
1563 | and will raise a TypeError if stb is inappropriate. | |
1562 | """ |
|
1564 | """ | |
1563 | msg = "CustomTB must return list of strings, not %r" % stb |
|
1565 | msg = "CustomTB must return list of strings, not %r" % stb | |
1564 | if stb is None: |
|
1566 | if stb is None: | |
1565 | return [] |
|
1567 | return [] | |
1566 | elif isinstance(stb, basestring): |
|
1568 | elif isinstance(stb, basestring): | |
1567 | return [stb] |
|
1569 | return [stb] | |
1568 | elif not isinstance(stb, list): |
|
1570 | elif not isinstance(stb, list): | |
1569 | raise TypeError(msg) |
|
1571 | raise TypeError(msg) | |
1570 | # it's a list |
|
1572 | # it's a list | |
1571 | for line in stb: |
|
1573 | for line in stb: | |
1572 | # check every element |
|
1574 | # check every element | |
1573 | if not isinstance(line, basestring): |
|
1575 | if not isinstance(line, basestring): | |
1574 | raise TypeError(msg) |
|
1576 | raise TypeError(msg) | |
1575 | return stb |
|
1577 | return stb | |
1576 |
|
1578 | |||
1577 | if handler is None: |
|
1579 | if handler is None: | |
1578 | wrapped = dummy_handler |
|
1580 | wrapped = dummy_handler | |
1579 | else: |
|
1581 | else: | |
1580 | def wrapped(self,etype,value,tb,tb_offset=None): |
|
1582 | def wrapped(self,etype,value,tb,tb_offset=None): | |
1581 | """wrap CustomTB handler, to protect IPython from user code |
|
1583 | """wrap CustomTB handler, to protect IPython from user code | |
1582 |
|
1584 | |||
1583 | This makes it harder (but not impossible) for custom exception |
|
1585 | This makes it harder (but not impossible) for custom exception | |
1584 | handlers to crash IPython. |
|
1586 | handlers to crash IPython. | |
1585 | """ |
|
1587 | """ | |
1586 | try: |
|
1588 | try: | |
1587 | stb = handler(self,etype,value,tb,tb_offset=tb_offset) |
|
1589 | stb = handler(self,etype,value,tb,tb_offset=tb_offset) | |
1588 | return validate_stb(stb) |
|
1590 | return validate_stb(stb) | |
1589 | except: |
|
1591 | except: | |
1590 | # clear custom handler immediately |
|
1592 | # clear custom handler immediately | |
1591 | self.set_custom_exc((), None) |
|
1593 | self.set_custom_exc((), None) | |
1592 | print >> io.stderr, "Custom TB Handler failed, unregistering" |
|
1594 | print >> io.stderr, "Custom TB Handler failed, unregistering" | |
1593 | # show the exception in handler first |
|
1595 | # show the exception in handler first | |
1594 | stb = self.InteractiveTB.structured_traceback(*sys.exc_info()) |
|
1596 | stb = self.InteractiveTB.structured_traceback(*sys.exc_info()) | |
1595 | print >> io.stdout, self.InteractiveTB.stb2text(stb) |
|
1597 | print >> io.stdout, self.InteractiveTB.stb2text(stb) | |
1596 | print >> io.stdout, "The original exception:" |
|
1598 | print >> io.stdout, "The original exception:" | |
1597 | stb = self.InteractiveTB.structured_traceback( |
|
1599 | stb = self.InteractiveTB.structured_traceback( | |
1598 | (etype,value,tb), tb_offset=tb_offset |
|
1600 | (etype,value,tb), tb_offset=tb_offset | |
1599 | ) |
|
1601 | ) | |
1600 | return stb |
|
1602 | return stb | |
1601 |
|
1603 | |||
1602 | self.CustomTB = types.MethodType(wrapped,self) |
|
1604 | self.CustomTB = types.MethodType(wrapped,self) | |
1603 | self.custom_exceptions = exc_tuple |
|
1605 | self.custom_exceptions = exc_tuple | |
1604 |
|
1606 | |||
1605 | def excepthook(self, etype, value, tb): |
|
1607 | def excepthook(self, etype, value, tb): | |
1606 | """One more defense for GUI apps that call sys.excepthook. |
|
1608 | """One more defense for GUI apps that call sys.excepthook. | |
1607 |
|
1609 | |||
1608 | GUI frameworks like wxPython trap exceptions and call |
|
1610 | GUI frameworks like wxPython trap exceptions and call | |
1609 | sys.excepthook themselves. I guess this is a feature that |
|
1611 | sys.excepthook themselves. I guess this is a feature that | |
1610 | enables them to keep running after exceptions that would |
|
1612 | enables them to keep running after exceptions that would | |
1611 | otherwise kill their mainloop. This is a bother for IPython |
|
1613 | otherwise kill their mainloop. This is a bother for IPython | |
1612 | which excepts to catch all of the program exceptions with a try: |
|
1614 | which excepts to catch all of the program exceptions with a try: | |
1613 | except: statement. |
|
1615 | except: statement. | |
1614 |
|
1616 | |||
1615 | Normally, IPython sets sys.excepthook to a CrashHandler instance, so if |
|
1617 | Normally, IPython sets sys.excepthook to a CrashHandler instance, so if | |
1616 | any app directly invokes sys.excepthook, it will look to the user like |
|
1618 | any app directly invokes sys.excepthook, it will look to the user like | |
1617 | IPython crashed. In order to work around this, we can disable the |
|
1619 | IPython crashed. In order to work around this, we can disable the | |
1618 | CrashHandler and replace it with this excepthook instead, which prints a |
|
1620 | CrashHandler and replace it with this excepthook instead, which prints a | |
1619 | regular traceback using our InteractiveTB. In this fashion, apps which |
|
1621 | regular traceback using our InteractiveTB. In this fashion, apps which | |
1620 | call sys.excepthook will generate a regular-looking exception from |
|
1622 | call sys.excepthook will generate a regular-looking exception from | |
1621 | IPython, and the CrashHandler will only be triggered by real IPython |
|
1623 | IPython, and the CrashHandler will only be triggered by real IPython | |
1622 | crashes. |
|
1624 | crashes. | |
1623 |
|
1625 | |||
1624 | This hook should be used sparingly, only in places which are not likely |
|
1626 | This hook should be used sparingly, only in places which are not likely | |
1625 | to be true IPython errors. |
|
1627 | to be true IPython errors. | |
1626 | """ |
|
1628 | """ | |
1627 | self.showtraceback((etype,value,tb),tb_offset=0) |
|
1629 | self.showtraceback((etype,value,tb),tb_offset=0) | |
1628 |
|
1630 | |||
1629 | def _get_exc_info(self, exc_tuple=None): |
|
1631 | def _get_exc_info(self, exc_tuple=None): | |
1630 | """get exc_info from a given tuple, sys.exc_info() or sys.last_type etc. |
|
1632 | """get exc_info from a given tuple, sys.exc_info() or sys.last_type etc. | |
1631 |
|
1633 | |||
1632 | Ensures sys.last_type,value,traceback hold the exc_info we found, |
|
1634 | Ensures sys.last_type,value,traceback hold the exc_info we found, | |
1633 | from whichever source. |
|
1635 | from whichever source. | |
1634 |
|
1636 | |||
1635 | raises ValueError if none of these contain any information |
|
1637 | raises ValueError if none of these contain any information | |
1636 | """ |
|
1638 | """ | |
1637 | if exc_tuple is None: |
|
1639 | if exc_tuple is None: | |
1638 | etype, value, tb = sys.exc_info() |
|
1640 | etype, value, tb = sys.exc_info() | |
1639 | else: |
|
1641 | else: | |
1640 | etype, value, tb = exc_tuple |
|
1642 | etype, value, tb = exc_tuple | |
1641 |
|
1643 | |||
1642 | if etype is None: |
|
1644 | if etype is None: | |
1643 | if hasattr(sys, 'last_type'): |
|
1645 | if hasattr(sys, 'last_type'): | |
1644 | etype, value, tb = sys.last_type, sys.last_value, \ |
|
1646 | etype, value, tb = sys.last_type, sys.last_value, \ | |
1645 | sys.last_traceback |
|
1647 | sys.last_traceback | |
1646 |
|
1648 | |||
1647 | if etype is None: |
|
1649 | if etype is None: | |
1648 | raise ValueError("No exception to find") |
|
1650 | raise ValueError("No exception to find") | |
1649 |
|
1651 | |||
1650 | # Now store the exception info in sys.last_type etc. |
|
1652 | # Now store the exception info in sys.last_type etc. | |
1651 | # WARNING: these variables are somewhat deprecated and not |
|
1653 | # WARNING: these variables are somewhat deprecated and not | |
1652 | # necessarily safe to use in a threaded environment, but tools |
|
1654 | # necessarily safe to use in a threaded environment, but tools | |
1653 | # like pdb depend on their existence, so let's set them. If we |
|
1655 | # like pdb depend on their existence, so let's set them. If we | |
1654 | # find problems in the field, we'll need to revisit their use. |
|
1656 | # find problems in the field, we'll need to revisit their use. | |
1655 | sys.last_type = etype |
|
1657 | sys.last_type = etype | |
1656 | sys.last_value = value |
|
1658 | sys.last_value = value | |
1657 | sys.last_traceback = tb |
|
1659 | sys.last_traceback = tb | |
1658 |
|
1660 | |||
1659 | return etype, value, tb |
|
1661 | return etype, value, tb | |
1660 |
|
1662 | |||
1661 |
|
1663 | |||
1662 | def showtraceback(self,exc_tuple = None,filename=None,tb_offset=None, |
|
1664 | def showtraceback(self,exc_tuple = None,filename=None,tb_offset=None, | |
1663 | exception_only=False): |
|
1665 | exception_only=False): | |
1664 | """Display the exception that just occurred. |
|
1666 | """Display the exception that just occurred. | |
1665 |
|
1667 | |||
1666 | If nothing is known about the exception, this is the method which |
|
1668 | If nothing is known about the exception, this is the method which | |
1667 | should be used throughout the code for presenting user tracebacks, |
|
1669 | should be used throughout the code for presenting user tracebacks, | |
1668 | rather than directly invoking the InteractiveTB object. |
|
1670 | rather than directly invoking the InteractiveTB object. | |
1669 |
|
1671 | |||
1670 | A specific showsyntaxerror() also exists, but this method can take |
|
1672 | A specific showsyntaxerror() also exists, but this method can take | |
1671 | care of calling it if needed, so unless you are explicitly catching a |
|
1673 | care of calling it if needed, so unless you are explicitly catching a | |
1672 | SyntaxError exception, don't try to analyze the stack manually and |
|
1674 | SyntaxError exception, don't try to analyze the stack manually and | |
1673 | simply call this method.""" |
|
1675 | simply call this method.""" | |
1674 |
|
1676 | |||
1675 | try: |
|
1677 | try: | |
1676 | try: |
|
1678 | try: | |
1677 | etype, value, tb = self._get_exc_info(exc_tuple) |
|
1679 | etype, value, tb = self._get_exc_info(exc_tuple) | |
1678 | except ValueError: |
|
1680 | except ValueError: | |
1679 | self.write_err('No traceback available to show.\n') |
|
1681 | self.write_err('No traceback available to show.\n') | |
1680 | return |
|
1682 | return | |
1681 |
|
1683 | |||
1682 | if etype is SyntaxError: |
|
1684 | if etype is SyntaxError: | |
1683 | # Though this won't be called by syntax errors in the input |
|
1685 | # Though this won't be called by syntax errors in the input | |
1684 | # line, there may be SyntaxError cases with imported code. |
|
1686 | # line, there may be SyntaxError cases with imported code. | |
1685 | self.showsyntaxerror(filename) |
|
1687 | self.showsyntaxerror(filename) | |
1686 | elif etype is UsageError: |
|
1688 | elif etype is UsageError: | |
1687 | self.write_err("UsageError: %s" % value) |
|
1689 | self.write_err("UsageError: %s" % value) | |
1688 | else: |
|
1690 | else: | |
1689 | if etype in self.custom_exceptions: |
|
1691 | if etype in self.custom_exceptions: | |
1690 | stb = self.CustomTB(etype, value, tb, tb_offset) |
|
1692 | stb = self.CustomTB(etype, value, tb, tb_offset) | |
1691 | else: |
|
1693 | else: | |
1692 | if exception_only: |
|
1694 | if exception_only: | |
1693 | stb = ['An exception has occurred, use %tb to see ' |
|
1695 | stb = ['An exception has occurred, use %tb to see ' | |
1694 | 'the full traceback.\n'] |
|
1696 | 'the full traceback.\n'] | |
1695 | stb.extend(self.InteractiveTB.get_exception_only(etype, |
|
1697 | stb.extend(self.InteractiveTB.get_exception_only(etype, | |
1696 | value)) |
|
1698 | value)) | |
1697 | else: |
|
1699 | else: | |
1698 | stb = self.InteractiveTB.structured_traceback(etype, |
|
1700 | stb = self.InteractiveTB.structured_traceback(etype, | |
1699 | value, tb, tb_offset=tb_offset) |
|
1701 | value, tb, tb_offset=tb_offset) | |
1700 |
|
1702 | |||
1701 | self._showtraceback(etype, value, stb) |
|
1703 | self._showtraceback(etype, value, stb) | |
1702 | if self.call_pdb: |
|
1704 | if self.call_pdb: | |
1703 | # drop into debugger |
|
1705 | # drop into debugger | |
1704 | self.debugger(force=True) |
|
1706 | self.debugger(force=True) | |
1705 | return |
|
1707 | return | |
1706 |
|
1708 | |||
1707 | # Actually show the traceback |
|
1709 | # Actually show the traceback | |
1708 | self._showtraceback(etype, value, stb) |
|
1710 | self._showtraceback(etype, value, stb) | |
1709 |
|
1711 | |||
1710 | except KeyboardInterrupt: |
|
1712 | except KeyboardInterrupt: | |
1711 | self.write_err("\nKeyboardInterrupt\n") |
|
1713 | self.write_err("\nKeyboardInterrupt\n") | |
1712 |
|
1714 | |||
1713 | def _showtraceback(self, etype, evalue, stb): |
|
1715 | def _showtraceback(self, etype, evalue, stb): | |
1714 | """Actually show a traceback. |
|
1716 | """Actually show a traceback. | |
1715 |
|
1717 | |||
1716 | Subclasses may override this method to put the traceback on a different |
|
1718 | Subclasses may override this method to put the traceback on a different | |
1717 | place, like a side channel. |
|
1719 | place, like a side channel. | |
1718 | """ |
|
1720 | """ | |
1719 | print >> io.stdout, self.InteractiveTB.stb2text(stb) |
|
1721 | print >> io.stdout, self.InteractiveTB.stb2text(stb) | |
1720 |
|
1722 | |||
1721 | def showsyntaxerror(self, filename=None): |
|
1723 | def showsyntaxerror(self, filename=None): | |
1722 | """Display the syntax error that just occurred. |
|
1724 | """Display the syntax error that just occurred. | |
1723 |
|
1725 | |||
1724 | This doesn't display a stack trace because there isn't one. |
|
1726 | This doesn't display a stack trace because there isn't one. | |
1725 |
|
1727 | |||
1726 | If a filename is given, it is stuffed in the exception instead |
|
1728 | If a filename is given, it is stuffed in the exception instead | |
1727 | of what was there before (because Python's parser always uses |
|
1729 | of what was there before (because Python's parser always uses | |
1728 | "<string>" when reading from a string). |
|
1730 | "<string>" when reading from a string). | |
1729 | """ |
|
1731 | """ | |
1730 | etype, value, last_traceback = self._get_exc_info() |
|
1732 | etype, value, last_traceback = self._get_exc_info() | |
1731 |
|
1733 | |||
1732 | if filename and etype is SyntaxError: |
|
1734 | if filename and etype is SyntaxError: | |
1733 | try: |
|
1735 | try: | |
1734 | value.filename = filename |
|
1736 | value.filename = filename | |
1735 | except: |
|
1737 | except: | |
1736 | # Not the format we expect; leave it alone |
|
1738 | # Not the format we expect; leave it alone | |
1737 | pass |
|
1739 | pass | |
1738 |
|
1740 | |||
1739 | stb = self.SyntaxTB.structured_traceback(etype, value, []) |
|
1741 | stb = self.SyntaxTB.structured_traceback(etype, value, []) | |
1740 | self._showtraceback(etype, value, stb) |
|
1742 | self._showtraceback(etype, value, stb) | |
1741 |
|
1743 | |||
1742 | # This is overridden in TerminalInteractiveShell to show a message about |
|
1744 | # This is overridden in TerminalInteractiveShell to show a message about | |
1743 | # the %paste magic. |
|
1745 | # the %paste magic. | |
1744 | def showindentationerror(self): |
|
1746 | def showindentationerror(self): | |
1745 | """Called by run_cell when there's an IndentationError in code entered |
|
1747 | """Called by run_cell when there's an IndentationError in code entered | |
1746 | at the prompt. |
|
1748 | at the prompt. | |
1747 |
|
1749 | |||
1748 | This is overridden in TerminalInteractiveShell to show a message about |
|
1750 | This is overridden in TerminalInteractiveShell to show a message about | |
1749 | the %paste magic.""" |
|
1751 | the %paste magic.""" | |
1750 | self.showsyntaxerror() |
|
1752 | self.showsyntaxerror() | |
1751 |
|
1753 | |||
1752 | #------------------------------------------------------------------------- |
|
1754 | #------------------------------------------------------------------------- | |
1753 | # Things related to readline |
|
1755 | # Things related to readline | |
1754 | #------------------------------------------------------------------------- |
|
1756 | #------------------------------------------------------------------------- | |
1755 |
|
1757 | |||
1756 | def init_readline(self): |
|
1758 | def init_readline(self): | |
1757 | """Command history completion/saving/reloading.""" |
|
1759 | """Command history completion/saving/reloading.""" | |
1758 |
|
1760 | |||
1759 | if self.readline_use: |
|
1761 | if self.readline_use: | |
1760 | import IPython.utils.rlineimpl as readline |
|
1762 | import IPython.utils.rlineimpl as readline | |
1761 |
|
1763 | |||
1762 | self.rl_next_input = None |
|
1764 | self.rl_next_input = None | |
1763 | self.rl_do_indent = False |
|
1765 | self.rl_do_indent = False | |
1764 |
|
1766 | |||
1765 | if not self.readline_use or not readline.have_readline: |
|
1767 | if not self.readline_use or not readline.have_readline: | |
1766 | self.has_readline = False |
|
1768 | self.has_readline = False | |
1767 | self.readline = None |
|
1769 | self.readline = None | |
1768 | # Set a number of methods that depend on readline to be no-op |
|
1770 | # Set a number of methods that depend on readline to be no-op | |
1769 | self.readline_no_record = no_op_context |
|
1771 | self.readline_no_record = no_op_context | |
1770 | self.set_readline_completer = no_op |
|
1772 | self.set_readline_completer = no_op | |
1771 | self.set_custom_completer = no_op |
|
1773 | self.set_custom_completer = no_op | |
1772 | self.set_completer_frame = no_op |
|
1774 | self.set_completer_frame = no_op | |
1773 | if self.readline_use: |
|
1775 | if self.readline_use: | |
1774 | warn('Readline services not available or not loaded.') |
|
1776 | warn('Readline services not available or not loaded.') | |
1775 | else: |
|
1777 | else: | |
1776 | self.has_readline = True |
|
1778 | self.has_readline = True | |
1777 | self.readline = readline |
|
1779 | self.readline = readline | |
1778 | sys.modules['readline'] = readline |
|
1780 | sys.modules['readline'] = readline | |
1779 |
|
1781 | |||
1780 | # Platform-specific configuration |
|
1782 | # Platform-specific configuration | |
1781 | if os.name == 'nt': |
|
1783 | if os.name == 'nt': | |
1782 | # FIXME - check with Frederick to see if we can harmonize |
|
1784 | # FIXME - check with Frederick to see if we can harmonize | |
1783 | # naming conventions with pyreadline to avoid this |
|
1785 | # naming conventions with pyreadline to avoid this | |
1784 | # platform-dependent check |
|
1786 | # platform-dependent check | |
1785 | self.readline_startup_hook = readline.set_pre_input_hook |
|
1787 | self.readline_startup_hook = readline.set_pre_input_hook | |
1786 | else: |
|
1788 | else: | |
1787 | self.readline_startup_hook = readline.set_startup_hook |
|
1789 | self.readline_startup_hook = readline.set_startup_hook | |
1788 |
|
1790 | |||
1789 | # Load user's initrc file (readline config) |
|
1791 | # Load user's initrc file (readline config) | |
1790 | # Or if libedit is used, load editrc. |
|
1792 | # Or if libedit is used, load editrc. | |
1791 | inputrc_name = os.environ.get('INPUTRC') |
|
1793 | inputrc_name = os.environ.get('INPUTRC') | |
1792 | if inputrc_name is None: |
|
1794 | if inputrc_name is None: | |
1793 | inputrc_name = '.inputrc' |
|
1795 | inputrc_name = '.inputrc' | |
1794 | if readline.uses_libedit: |
|
1796 | if readline.uses_libedit: | |
1795 | inputrc_name = '.editrc' |
|
1797 | inputrc_name = '.editrc' | |
1796 | inputrc_name = os.path.join(self.home_dir, inputrc_name) |
|
1798 | inputrc_name = os.path.join(self.home_dir, inputrc_name) | |
1797 | if os.path.isfile(inputrc_name): |
|
1799 | if os.path.isfile(inputrc_name): | |
1798 | try: |
|
1800 | try: | |
1799 | readline.read_init_file(inputrc_name) |
|
1801 | readline.read_init_file(inputrc_name) | |
1800 | except: |
|
1802 | except: | |
1801 | warn('Problems reading readline initialization file <%s>' |
|
1803 | warn('Problems reading readline initialization file <%s>' | |
1802 | % inputrc_name) |
|
1804 | % inputrc_name) | |
1803 |
|
1805 | |||
1804 | # Configure readline according to user's prefs |
|
1806 | # Configure readline according to user's prefs | |
1805 | # This is only done if GNU readline is being used. If libedit |
|
1807 | # This is only done if GNU readline is being used. If libedit | |
1806 | # is being used (as on Leopard) the readline config is |
|
1808 | # is being used (as on Leopard) the readline config is | |
1807 | # not run as the syntax for libedit is different. |
|
1809 | # not run as the syntax for libedit is different. | |
1808 | if not readline.uses_libedit: |
|
1810 | if not readline.uses_libedit: | |
1809 | for rlcommand in self.readline_parse_and_bind: |
|
1811 | for rlcommand in self.readline_parse_and_bind: | |
1810 | #print "loading rl:",rlcommand # dbg |
|
1812 | #print "loading rl:",rlcommand # dbg | |
1811 | readline.parse_and_bind(rlcommand) |
|
1813 | readline.parse_and_bind(rlcommand) | |
1812 |
|
1814 | |||
1813 | # Remove some chars from the delimiters list. If we encounter |
|
1815 | # Remove some chars from the delimiters list. If we encounter | |
1814 | # unicode chars, discard them. |
|
1816 | # unicode chars, discard them. | |
1815 | delims = readline.get_completer_delims() |
|
1817 | delims = readline.get_completer_delims() | |
1816 | if not py3compat.PY3: |
|
1818 | if not py3compat.PY3: | |
1817 | delims = delims.encode("ascii", "ignore") |
|
1819 | delims = delims.encode("ascii", "ignore") | |
1818 | for d in self.readline_remove_delims: |
|
1820 | for d in self.readline_remove_delims: | |
1819 | delims = delims.replace(d, "") |
|
1821 | delims = delims.replace(d, "") | |
1820 | delims = delims.replace(ESC_MAGIC, '') |
|
1822 | delims = delims.replace(ESC_MAGIC, '') | |
1821 | readline.set_completer_delims(delims) |
|
1823 | readline.set_completer_delims(delims) | |
1822 | # otherwise we end up with a monster history after a while: |
|
1824 | # otherwise we end up with a monster history after a while: | |
1823 | readline.set_history_length(self.history_length) |
|
1825 | readline.set_history_length(self.history_length) | |
1824 |
|
1826 | |||
1825 | self.refill_readline_hist() |
|
1827 | self.refill_readline_hist() | |
1826 | self.readline_no_record = ReadlineNoRecord(self) |
|
1828 | self.readline_no_record = ReadlineNoRecord(self) | |
1827 |
|
1829 | |||
1828 | # Configure auto-indent for all platforms |
|
1830 | # Configure auto-indent for all platforms | |
1829 | self.set_autoindent(self.autoindent) |
|
1831 | self.set_autoindent(self.autoindent) | |
1830 |
|
1832 | |||
1831 | def refill_readline_hist(self): |
|
1833 | def refill_readline_hist(self): | |
1832 | # Load the last 1000 lines from history |
|
1834 | # Load the last 1000 lines from history | |
1833 | self.readline.clear_history() |
|
1835 | self.readline.clear_history() | |
1834 | stdin_encoding = sys.stdin.encoding or "utf-8" |
|
1836 | stdin_encoding = sys.stdin.encoding or "utf-8" | |
1835 | last_cell = u"" |
|
1837 | last_cell = u"" | |
1836 | for _, _, cell in self.history_manager.get_tail(1000, |
|
1838 | for _, _, cell in self.history_manager.get_tail(1000, | |
1837 | include_latest=True): |
|
1839 | include_latest=True): | |
1838 | # Ignore blank lines and consecutive duplicates |
|
1840 | # Ignore blank lines and consecutive duplicates | |
1839 | cell = cell.rstrip() |
|
1841 | cell = cell.rstrip() | |
1840 | if cell and (cell != last_cell): |
|
1842 | if cell and (cell != last_cell): | |
1841 | if self.multiline_history: |
|
1843 | if self.multiline_history: | |
1842 | self.readline.add_history(py3compat.unicode_to_str(cell, |
|
1844 | self.readline.add_history(py3compat.unicode_to_str(cell, | |
1843 | stdin_encoding)) |
|
1845 | stdin_encoding)) | |
1844 | else: |
|
1846 | else: | |
1845 | for line in cell.splitlines(): |
|
1847 | for line in cell.splitlines(): | |
1846 | self.readline.add_history(py3compat.unicode_to_str(line, |
|
1848 | self.readline.add_history(py3compat.unicode_to_str(line, | |
1847 | stdin_encoding)) |
|
1849 | stdin_encoding)) | |
1848 | last_cell = cell |
|
1850 | last_cell = cell | |
1849 |
|
1851 | |||
1850 | def set_next_input(self, s): |
|
1852 | def set_next_input(self, s): | |
1851 | """ Sets the 'default' input string for the next command line. |
|
1853 | """ Sets the 'default' input string for the next command line. | |
1852 |
|
1854 | |||
1853 | Requires readline. |
|
1855 | Requires readline. | |
1854 |
|
1856 | |||
1855 | Example: |
|
1857 | Example: | |
1856 |
|
1858 | |||
1857 | [D:\ipython]|1> _ip.set_next_input("Hello Word") |
|
1859 | [D:\ipython]|1> _ip.set_next_input("Hello Word") | |
1858 | [D:\ipython]|2> Hello Word_ # cursor is here |
|
1860 | [D:\ipython]|2> Hello Word_ # cursor is here | |
1859 | """ |
|
1861 | """ | |
1860 | self.rl_next_input = py3compat.cast_bytes_py2(s) |
|
1862 | self.rl_next_input = py3compat.cast_bytes_py2(s) | |
1861 |
|
1863 | |||
1862 | # Maybe move this to the terminal subclass? |
|
1864 | # Maybe move this to the terminal subclass? | |
1863 | def pre_readline(self): |
|
1865 | def pre_readline(self): | |
1864 | """readline hook to be used at the start of each line. |
|
1866 | """readline hook to be used at the start of each line. | |
1865 |
|
1867 | |||
1866 | Currently it handles auto-indent only.""" |
|
1868 | Currently it handles auto-indent only.""" | |
1867 |
|
1869 | |||
1868 | if self.rl_do_indent: |
|
1870 | if self.rl_do_indent: | |
1869 | self.readline.insert_text(self._indent_current_str()) |
|
1871 | self.readline.insert_text(self._indent_current_str()) | |
1870 | if self.rl_next_input is not None: |
|
1872 | if self.rl_next_input is not None: | |
1871 | self.readline.insert_text(self.rl_next_input) |
|
1873 | self.readline.insert_text(self.rl_next_input) | |
1872 | self.rl_next_input = None |
|
1874 | self.rl_next_input = None | |
1873 |
|
1875 | |||
1874 | def _indent_current_str(self): |
|
1876 | def _indent_current_str(self): | |
1875 | """return the current level of indentation as a string""" |
|
1877 | """return the current level of indentation as a string""" | |
1876 | return self.input_splitter.indent_spaces * ' ' |
|
1878 | return self.input_splitter.indent_spaces * ' ' | |
1877 |
|
1879 | |||
1878 | #------------------------------------------------------------------------- |
|
1880 | #------------------------------------------------------------------------- | |
1879 | # Things related to text completion |
|
1881 | # Things related to text completion | |
1880 | #------------------------------------------------------------------------- |
|
1882 | #------------------------------------------------------------------------- | |
1881 |
|
1883 | |||
1882 | def init_completer(self): |
|
1884 | def init_completer(self): | |
1883 | """Initialize the completion machinery. |
|
1885 | """Initialize the completion machinery. | |
1884 |
|
1886 | |||
1885 | This creates completion machinery that can be used by client code, |
|
1887 | This creates completion machinery that can be used by client code, | |
1886 | either interactively in-process (typically triggered by the readline |
|
1888 | either interactively in-process (typically triggered by the readline | |
1887 | library), programatically (such as in test suites) or out-of-prcess |
|
1889 | library), programatically (such as in test suites) or out-of-prcess | |
1888 | (typically over the network by remote frontends). |
|
1890 | (typically over the network by remote frontends). | |
1889 | """ |
|
1891 | """ | |
1890 | from IPython.core.completer import IPCompleter |
|
1892 | from IPython.core.completer import IPCompleter | |
1891 | from IPython.core.completerlib import (module_completer, |
|
1893 | from IPython.core.completerlib import (module_completer, | |
1892 | magic_run_completer, cd_completer, reset_completer) |
|
1894 | magic_run_completer, cd_completer, reset_completer) | |
1893 |
|
1895 | |||
1894 | self.Completer = IPCompleter(shell=self, |
|
1896 | self.Completer = IPCompleter(shell=self, | |
1895 | namespace=self.user_ns, |
|
1897 | namespace=self.user_ns, | |
1896 | global_namespace=self.user_global_ns, |
|
1898 | global_namespace=self.user_global_ns, | |
1897 | alias_table=self.alias_manager.alias_table, |
|
1899 | alias_table=self.alias_manager.alias_table, | |
1898 | use_readline=self.has_readline, |
|
1900 | use_readline=self.has_readline, | |
1899 | config=self.config, |
|
1901 | config=self.config, | |
1900 | ) |
|
1902 | ) | |
1901 | self.configurables.append(self.Completer) |
|
1903 | self.configurables.append(self.Completer) | |
1902 |
|
1904 | |||
1903 | # Add custom completers to the basic ones built into IPCompleter |
|
1905 | # Add custom completers to the basic ones built into IPCompleter | |
1904 | sdisp = self.strdispatchers.get('complete_command', StrDispatch()) |
|
1906 | sdisp = self.strdispatchers.get('complete_command', StrDispatch()) | |
1905 | self.strdispatchers['complete_command'] = sdisp |
|
1907 | self.strdispatchers['complete_command'] = sdisp | |
1906 | self.Completer.custom_completers = sdisp |
|
1908 | self.Completer.custom_completers = sdisp | |
1907 |
|
1909 | |||
1908 | self.set_hook('complete_command', module_completer, str_key = 'import') |
|
1910 | self.set_hook('complete_command', module_completer, str_key = 'import') | |
1909 | self.set_hook('complete_command', module_completer, str_key = 'from') |
|
1911 | self.set_hook('complete_command', module_completer, str_key = 'from') | |
1910 | self.set_hook('complete_command', magic_run_completer, str_key = '%run') |
|
1912 | self.set_hook('complete_command', magic_run_completer, str_key = '%run') | |
1911 | self.set_hook('complete_command', cd_completer, str_key = '%cd') |
|
1913 | self.set_hook('complete_command', cd_completer, str_key = '%cd') | |
1912 | self.set_hook('complete_command', reset_completer, str_key = '%reset') |
|
1914 | self.set_hook('complete_command', reset_completer, str_key = '%reset') | |
1913 |
|
1915 | |||
1914 | # Only configure readline if we truly are using readline. IPython can |
|
1916 | # Only configure readline if we truly are using readline. IPython can | |
1915 | # do tab-completion over the network, in GUIs, etc, where readline |
|
1917 | # do tab-completion over the network, in GUIs, etc, where readline | |
1916 | # itself may be absent |
|
1918 | # itself may be absent | |
1917 | if self.has_readline: |
|
1919 | if self.has_readline: | |
1918 | self.set_readline_completer() |
|
1920 | self.set_readline_completer() | |
1919 |
|
1921 | |||
1920 | def complete(self, text, line=None, cursor_pos=None): |
|
1922 | def complete(self, text, line=None, cursor_pos=None): | |
1921 | """Return the completed text and a list of completions. |
|
1923 | """Return the completed text and a list of completions. | |
1922 |
|
1924 | |||
1923 | Parameters |
|
1925 | Parameters | |
1924 | ---------- |
|
1926 | ---------- | |
1925 |
|
1927 | |||
1926 | text : string |
|
1928 | text : string | |
1927 | A string of text to be completed on. It can be given as empty and |
|
1929 | A string of text to be completed on. It can be given as empty and | |
1928 | instead a line/position pair are given. In this case, the |
|
1930 | instead a line/position pair are given. In this case, the | |
1929 | completer itself will split the line like readline does. |
|
1931 | completer itself will split the line like readline does. | |
1930 |
|
1932 | |||
1931 | line : string, optional |
|
1933 | line : string, optional | |
1932 | The complete line that text is part of. |
|
1934 | The complete line that text is part of. | |
1933 |
|
1935 | |||
1934 | cursor_pos : int, optional |
|
1936 | cursor_pos : int, optional | |
1935 | The position of the cursor on the input line. |
|
1937 | The position of the cursor on the input line. | |
1936 |
|
1938 | |||
1937 | Returns |
|
1939 | Returns | |
1938 | ------- |
|
1940 | ------- | |
1939 | text : string |
|
1941 | text : string | |
1940 | The actual text that was completed. |
|
1942 | The actual text that was completed. | |
1941 |
|
1943 | |||
1942 | matches : list |
|
1944 | matches : list | |
1943 | A sorted list with all possible completions. |
|
1945 | A sorted list with all possible completions. | |
1944 |
|
1946 | |||
1945 | The optional arguments allow the completion to take more context into |
|
1947 | The optional arguments allow the completion to take more context into | |
1946 | account, and are part of the low-level completion API. |
|
1948 | account, and are part of the low-level completion API. | |
1947 |
|
1949 | |||
1948 | This is a wrapper around the completion mechanism, similar to what |
|
1950 | This is a wrapper around the completion mechanism, similar to what | |
1949 | readline does at the command line when the TAB key is hit. By |
|
1951 | readline does at the command line when the TAB key is hit. By | |
1950 | exposing it as a method, it can be used by other non-readline |
|
1952 | exposing it as a method, it can be used by other non-readline | |
1951 | environments (such as GUIs) for text completion. |
|
1953 | environments (such as GUIs) for text completion. | |
1952 |
|
1954 | |||
1953 | Simple usage example: |
|
1955 | Simple usage example: | |
1954 |
|
1956 | |||
1955 | In [1]: x = 'hello' |
|
1957 | In [1]: x = 'hello' | |
1956 |
|
1958 | |||
1957 | In [2]: _ip.complete('x.l') |
|
1959 | In [2]: _ip.complete('x.l') | |
1958 | Out[2]: ('x.l', ['x.ljust', 'x.lower', 'x.lstrip']) |
|
1960 | Out[2]: ('x.l', ['x.ljust', 'x.lower', 'x.lstrip']) | |
1959 | """ |
|
1961 | """ | |
1960 |
|
1962 | |||
1961 | # Inject names into __builtin__ so we can complete on the added names. |
|
1963 | # Inject names into __builtin__ so we can complete on the added names. | |
1962 | with self.builtin_trap: |
|
1964 | with self.builtin_trap: | |
1963 | return self.Completer.complete(text, line, cursor_pos) |
|
1965 | return self.Completer.complete(text, line, cursor_pos) | |
1964 |
|
1966 | |||
1965 | def set_custom_completer(self, completer, pos=0): |
|
1967 | def set_custom_completer(self, completer, pos=0): | |
1966 | """Adds a new custom completer function. |
|
1968 | """Adds a new custom completer function. | |
1967 |
|
1969 | |||
1968 | The position argument (defaults to 0) is the index in the completers |
|
1970 | The position argument (defaults to 0) is the index in the completers | |
1969 | list where you want the completer to be inserted.""" |
|
1971 | list where you want the completer to be inserted.""" | |
1970 |
|
1972 | |||
1971 | newcomp = types.MethodType(completer,self.Completer) |
|
1973 | newcomp = types.MethodType(completer,self.Completer) | |
1972 | self.Completer.matchers.insert(pos,newcomp) |
|
1974 | self.Completer.matchers.insert(pos,newcomp) | |
1973 |
|
1975 | |||
1974 | def set_readline_completer(self): |
|
1976 | def set_readline_completer(self): | |
1975 | """Reset readline's completer to be our own.""" |
|
1977 | """Reset readline's completer to be our own.""" | |
1976 | self.readline.set_completer(self.Completer.rlcomplete) |
|
1978 | self.readline.set_completer(self.Completer.rlcomplete) | |
1977 |
|
1979 | |||
1978 | def set_completer_frame(self, frame=None): |
|
1980 | def set_completer_frame(self, frame=None): | |
1979 | """Set the frame of the completer.""" |
|
1981 | """Set the frame of the completer.""" | |
1980 | if frame: |
|
1982 | if frame: | |
1981 | self.Completer.namespace = frame.f_locals |
|
1983 | self.Completer.namespace = frame.f_locals | |
1982 | self.Completer.global_namespace = frame.f_globals |
|
1984 | self.Completer.global_namespace = frame.f_globals | |
1983 | else: |
|
1985 | else: | |
1984 | self.Completer.namespace = self.user_ns |
|
1986 | self.Completer.namespace = self.user_ns | |
1985 | self.Completer.global_namespace = self.user_global_ns |
|
1987 | self.Completer.global_namespace = self.user_global_ns | |
1986 |
|
1988 | |||
1987 | #------------------------------------------------------------------------- |
|
1989 | #------------------------------------------------------------------------- | |
1988 | # Things related to magics |
|
1990 | # Things related to magics | |
1989 | #------------------------------------------------------------------------- |
|
1991 | #------------------------------------------------------------------------- | |
1990 |
|
1992 | |||
1991 | def init_magics(self): |
|
1993 | def init_magics(self): | |
1992 | # FIXME: Move the color initialization to the DisplayHook, which |
|
1994 | # FIXME: Move the color initialization to the DisplayHook, which | |
1993 | # should be split into a prompt manager and displayhook. We probably |
|
1995 | # should be split into a prompt manager and displayhook. We probably | |
1994 | # even need a centralize colors management object. |
|
1996 | # even need a centralize colors management object. | |
1995 | self.magic_colors(self.colors) |
|
1997 | self.magic_colors(self.colors) | |
1996 | # History was moved to a separate module |
|
1998 | # History was moved to a separate module | |
1997 | from IPython.core import history |
|
1999 | from IPython.core import history | |
1998 | history.init_ipython(self) |
|
2000 | history.init_ipython(self) | |
1999 |
|
2001 | |||
2000 | def magic(self, arg_s, next_input=None): |
|
2002 | def magic(self, arg_s, next_input=None): | |
2001 | """Call a magic function by name. |
|
2003 | """Call a magic function by name. | |
2002 |
|
2004 | |||
2003 | Input: a string containing the name of the magic function to call and |
|
2005 | Input: a string containing the name of the magic function to call and | |
2004 | any additional arguments to be passed to the magic. |
|
2006 | any additional arguments to be passed to the magic. | |
2005 |
|
2007 | |||
2006 | magic('name -opt foo bar') is equivalent to typing at the ipython |
|
2008 | magic('name -opt foo bar') is equivalent to typing at the ipython | |
2007 | prompt: |
|
2009 | prompt: | |
2008 |
|
2010 | |||
2009 | In[1]: %name -opt foo bar |
|
2011 | In[1]: %name -opt foo bar | |
2010 |
|
2012 | |||
2011 | To call a magic without arguments, simply use magic('name'). |
|
2013 | To call a magic without arguments, simply use magic('name'). | |
2012 |
|
2014 | |||
2013 | This provides a proper Python function to call IPython's magics in any |
|
2015 | This provides a proper Python function to call IPython's magics in any | |
2014 | valid Python code you can type at the interpreter, including loops and |
|
2016 | valid Python code you can type at the interpreter, including loops and | |
2015 | compound statements. |
|
2017 | compound statements. | |
2016 | """ |
|
2018 | """ | |
2017 | # Allow setting the next input - this is used if the user does `a=abs?`. |
|
2019 | # Allow setting the next input - this is used if the user does `a=abs?`. | |
2018 | # We do this first so that magic functions can override it. |
|
2020 | # We do this first so that magic functions can override it. | |
2019 | if next_input: |
|
2021 | if next_input: | |
2020 | self.set_next_input(next_input) |
|
2022 | self.set_next_input(next_input) | |
2021 |
|
2023 | |||
2022 | magic_name, _, magic_args = arg_s.partition(' ') |
|
2024 | magic_name, _, magic_args = arg_s.partition(' ') | |
2023 | magic_name = magic_name.lstrip(prefilter.ESC_MAGIC) |
|
2025 | magic_name = magic_name.lstrip(prefilter.ESC_MAGIC) | |
2024 |
|
2026 | |||
2025 | fn = getattr(self,'magic_'+magic_name,None) |
|
2027 | fn = getattr(self,'magic_'+magic_name,None) | |
2026 | if fn is None: |
|
2028 | if fn is None: | |
2027 | error("Magic function `%s` not found." % magic_name) |
|
2029 | error("Magic function `%s` not found." % magic_name) | |
2028 | else: |
|
2030 | else: | |
2029 | magic_args = self.var_expand(magic_args,1) |
|
2031 | magic_args = self.var_expand(magic_args,1) | |
2030 | # Grab local namespace if we need it: |
|
2032 | # Grab local namespace if we need it: | |
2031 | if getattr(fn, "needs_local_scope", False): |
|
2033 | if getattr(fn, "needs_local_scope", False): | |
2032 | self._magic_locals = sys._getframe(1).f_locals |
|
2034 | self._magic_locals = sys._getframe(1).f_locals | |
2033 | with self.builtin_trap: |
|
2035 | with self.builtin_trap: | |
2034 | result = fn(magic_args) |
|
2036 | result = fn(magic_args) | |
2035 | # Ensure we're not keeping object references around: |
|
2037 | # Ensure we're not keeping object references around: | |
2036 | self._magic_locals = {} |
|
2038 | self._magic_locals = {} | |
2037 | return result |
|
2039 | return result | |
2038 |
|
2040 | |||
2039 | def define_magic(self, magicname, func): |
|
2041 | def define_magic(self, magicname, func): | |
2040 | """Expose own function as magic function for ipython |
|
2042 | """Expose own function as magic function for ipython | |
2041 |
|
2043 | |||
2042 | Example:: |
|
2044 | Example:: | |
2043 |
|
2045 | |||
2044 | def foo_impl(self,parameter_s=''): |
|
2046 | def foo_impl(self,parameter_s=''): | |
2045 | 'My very own magic!. (Use docstrings, IPython reads them).' |
|
2047 | 'My very own magic!. (Use docstrings, IPython reads them).' | |
2046 | print 'Magic function. Passed parameter is between < >:' |
|
2048 | print 'Magic function. Passed parameter is between < >:' | |
2047 | print '<%s>' % parameter_s |
|
2049 | print '<%s>' % parameter_s | |
2048 | print 'The self object is:', self |
|
2050 | print 'The self object is:', self | |
2049 |
|
2051 | |||
2050 | ip.define_magic('foo',foo_impl) |
|
2052 | ip.define_magic('foo',foo_impl) | |
2051 | """ |
|
2053 | """ | |
2052 | im = types.MethodType(func,self) |
|
2054 | im = types.MethodType(func,self) | |
2053 | old = getattr(self, "magic_" + magicname, None) |
|
2055 | old = getattr(self, "magic_" + magicname, None) | |
2054 | setattr(self, "magic_" + magicname, im) |
|
2056 | setattr(self, "magic_" + magicname, im) | |
2055 | return old |
|
2057 | return old | |
2056 |
|
2058 | |||
2057 | #------------------------------------------------------------------------- |
|
2059 | #------------------------------------------------------------------------- | |
2058 | # Things related to macros |
|
2060 | # Things related to macros | |
2059 | #------------------------------------------------------------------------- |
|
2061 | #------------------------------------------------------------------------- | |
2060 |
|
2062 | |||
2061 | def define_macro(self, name, themacro): |
|
2063 | def define_macro(self, name, themacro): | |
2062 | """Define a new macro |
|
2064 | """Define a new macro | |
2063 |
|
2065 | |||
2064 | Parameters |
|
2066 | Parameters | |
2065 | ---------- |
|
2067 | ---------- | |
2066 | name : str |
|
2068 | name : str | |
2067 | The name of the macro. |
|
2069 | The name of the macro. | |
2068 | themacro : str or Macro |
|
2070 | themacro : str or Macro | |
2069 | The action to do upon invoking the macro. If a string, a new |
|
2071 | The action to do upon invoking the macro. If a string, a new | |
2070 | Macro object is created by passing the string to it. |
|
2072 | Macro object is created by passing the string to it. | |
2071 | """ |
|
2073 | """ | |
2072 |
|
2074 | |||
2073 | from IPython.core import macro |
|
2075 | from IPython.core import macro | |
2074 |
|
2076 | |||
2075 | if isinstance(themacro, basestring): |
|
2077 | if isinstance(themacro, basestring): | |
2076 | themacro = macro.Macro(themacro) |
|
2078 | themacro = macro.Macro(themacro) | |
2077 | if not isinstance(themacro, macro.Macro): |
|
2079 | if not isinstance(themacro, macro.Macro): | |
2078 | raise ValueError('A macro must be a string or a Macro instance.') |
|
2080 | raise ValueError('A macro must be a string or a Macro instance.') | |
2079 | self.user_ns[name] = themacro |
|
2081 | self.user_ns[name] = themacro | |
2080 |
|
2082 | |||
2081 | #------------------------------------------------------------------------- |
|
2083 | #------------------------------------------------------------------------- | |
2082 | # Things related to the running of system commands |
|
2084 | # Things related to the running of system commands | |
2083 | #------------------------------------------------------------------------- |
|
2085 | #------------------------------------------------------------------------- | |
2084 |
|
2086 | |||
2085 | def system_piped(self, cmd): |
|
2087 | def system_piped(self, cmd): | |
2086 | """Call the given cmd in a subprocess, piping stdout/err |
|
2088 | """Call the given cmd in a subprocess, piping stdout/err | |
2087 |
|
2089 | |||
2088 | Parameters |
|
2090 | Parameters | |
2089 | ---------- |
|
2091 | ---------- | |
2090 | cmd : str |
|
2092 | cmd : str | |
2091 | Command to execute (can not end in '&', as background processes are |
|
2093 | Command to execute (can not end in '&', as background processes are | |
2092 | not supported. Should not be a command that expects input |
|
2094 | not supported. Should not be a command that expects input | |
2093 | other than simple text. |
|
2095 | other than simple text. | |
2094 | """ |
|
2096 | """ | |
2095 | if cmd.rstrip().endswith('&'): |
|
2097 | if cmd.rstrip().endswith('&'): | |
2096 | # this is *far* from a rigorous test |
|
2098 | # this is *far* from a rigorous test | |
2097 | # We do not support backgrounding processes because we either use |
|
2099 | # We do not support backgrounding processes because we either use | |
2098 | # pexpect or pipes to read from. Users can always just call |
|
2100 | # pexpect or pipes to read from. Users can always just call | |
2099 | # os.system() or use ip.system=ip.system_raw |
|
2101 | # os.system() or use ip.system=ip.system_raw | |
2100 | # if they really want a background process. |
|
2102 | # if they really want a background process. | |
2101 | raise OSError("Background processes not supported.") |
|
2103 | raise OSError("Background processes not supported.") | |
2102 |
|
2104 | |||
2103 | # we explicitly do NOT return the subprocess status code, because |
|
2105 | # we explicitly do NOT return the subprocess status code, because | |
2104 | # a non-None value would trigger :func:`sys.displayhook` calls. |
|
2106 | # a non-None value would trigger :func:`sys.displayhook` calls. | |
2105 | # Instead, we store the exit_code in user_ns. |
|
2107 | # Instead, we store the exit_code in user_ns. | |
2106 | self.user_ns['_exit_code'] = system(self.var_expand(cmd, depth=2)) |
|
2108 | self.user_ns['_exit_code'] = system(self.var_expand(cmd, depth=2)) | |
2107 |
|
2109 | |||
2108 | def system_raw(self, cmd): |
|
2110 | def system_raw(self, cmd): | |
2109 | """Call the given cmd in a subprocess using os.system |
|
2111 | """Call the given cmd in a subprocess using os.system | |
2110 |
|
2112 | |||
2111 | Parameters |
|
2113 | Parameters | |
2112 | ---------- |
|
2114 | ---------- | |
2113 | cmd : str |
|
2115 | cmd : str | |
2114 | Command to execute. |
|
2116 | Command to execute. | |
2115 | """ |
|
2117 | """ | |
2116 | cmd = self.var_expand(cmd, depth=2) |
|
2118 | cmd = self.var_expand(cmd, depth=2) | |
2117 | # protect os.system from UNC paths on Windows, which it can't handle: |
|
2119 | # protect os.system from UNC paths on Windows, which it can't handle: | |
2118 | if sys.platform == 'win32': |
|
2120 | if sys.platform == 'win32': | |
2119 | from IPython.utils._process_win32 import AvoidUNCPath |
|
2121 | from IPython.utils._process_win32 import AvoidUNCPath | |
2120 | with AvoidUNCPath() as path: |
|
2122 | with AvoidUNCPath() as path: | |
2121 | if path is not None: |
|
2123 | if path is not None: | |
2122 | cmd = '"pushd %s &&"%s' % (path, cmd) |
|
2124 | cmd = '"pushd %s &&"%s' % (path, cmd) | |
2123 | cmd = py3compat.unicode_to_str(cmd) |
|
2125 | cmd = py3compat.unicode_to_str(cmd) | |
2124 | ec = os.system(cmd) |
|
2126 | ec = os.system(cmd) | |
2125 | else: |
|
2127 | else: | |
2126 | cmd = py3compat.unicode_to_str(cmd) |
|
2128 | cmd = py3compat.unicode_to_str(cmd) | |
2127 | ec = os.system(cmd) |
|
2129 | ec = os.system(cmd) | |
2128 |
|
2130 | |||
2129 | # We explicitly do NOT return the subprocess status code, because |
|
2131 | # We explicitly do NOT return the subprocess status code, because | |
2130 | # a non-None value would trigger :func:`sys.displayhook` calls. |
|
2132 | # a non-None value would trigger :func:`sys.displayhook` calls. | |
2131 | # Instead, we store the exit_code in user_ns. |
|
2133 | # Instead, we store the exit_code in user_ns. | |
2132 | self.user_ns['_exit_code'] = ec |
|
2134 | self.user_ns['_exit_code'] = ec | |
2133 |
|
2135 | |||
2134 | # use piped system by default, because it is better behaved |
|
2136 | # use piped system by default, because it is better behaved | |
2135 | system = system_piped |
|
2137 | system = system_piped | |
2136 |
|
2138 | |||
2137 | def getoutput(self, cmd, split=True): |
|
2139 | def getoutput(self, cmd, split=True): | |
2138 | """Get output (possibly including stderr) from a subprocess. |
|
2140 | """Get output (possibly including stderr) from a subprocess. | |
2139 |
|
2141 | |||
2140 | Parameters |
|
2142 | Parameters | |
2141 | ---------- |
|
2143 | ---------- | |
2142 | cmd : str |
|
2144 | cmd : str | |
2143 | Command to execute (can not end in '&', as background processes are |
|
2145 | Command to execute (can not end in '&', as background processes are | |
2144 | not supported. |
|
2146 | not supported. | |
2145 | split : bool, optional |
|
2147 | split : bool, optional | |
2146 |
|
2148 | |||
2147 | If True, split the output into an IPython SList. Otherwise, an |
|
2149 | If True, split the output into an IPython SList. Otherwise, an | |
2148 | IPython LSString is returned. These are objects similar to normal |
|
2150 | IPython LSString is returned. These are objects similar to normal | |
2149 | lists and strings, with a few convenience attributes for easier |
|
2151 | lists and strings, with a few convenience attributes for easier | |
2150 | manipulation of line-based output. You can use '?' on them for |
|
2152 | manipulation of line-based output. You can use '?' on them for | |
2151 | details. |
|
2153 | details. | |
2152 | """ |
|
2154 | """ | |
2153 | if cmd.rstrip().endswith('&'): |
|
2155 | if cmd.rstrip().endswith('&'): | |
2154 | # this is *far* from a rigorous test |
|
2156 | # this is *far* from a rigorous test | |
2155 | raise OSError("Background processes not supported.") |
|
2157 | raise OSError("Background processes not supported.") | |
2156 | out = getoutput(self.var_expand(cmd, depth=2)) |
|
2158 | out = getoutput(self.var_expand(cmd, depth=2)) | |
2157 | if split: |
|
2159 | if split: | |
2158 | out = SList(out.splitlines()) |
|
2160 | out = SList(out.splitlines()) | |
2159 | else: |
|
2161 | else: | |
2160 | out = LSString(out) |
|
2162 | out = LSString(out) | |
2161 | return out |
|
2163 | return out | |
2162 |
|
2164 | |||
2163 | #------------------------------------------------------------------------- |
|
2165 | #------------------------------------------------------------------------- | |
2164 | # Things related to aliases |
|
2166 | # Things related to aliases | |
2165 | #------------------------------------------------------------------------- |
|
2167 | #------------------------------------------------------------------------- | |
2166 |
|
2168 | |||
2167 | def init_alias(self): |
|
2169 | def init_alias(self): | |
2168 | self.alias_manager = AliasManager(shell=self, config=self.config) |
|
2170 | self.alias_manager = AliasManager(shell=self, config=self.config) | |
2169 | self.configurables.append(self.alias_manager) |
|
2171 | self.configurables.append(self.alias_manager) | |
2170 | self.ns_table['alias'] = self.alias_manager.alias_table, |
|
2172 | self.ns_table['alias'] = self.alias_manager.alias_table, | |
2171 |
|
2173 | |||
2172 | #------------------------------------------------------------------------- |
|
2174 | #------------------------------------------------------------------------- | |
2173 | # Things related to extensions and plugins |
|
2175 | # Things related to extensions and plugins | |
2174 | #------------------------------------------------------------------------- |
|
2176 | #------------------------------------------------------------------------- | |
2175 |
|
2177 | |||
2176 | def init_extension_manager(self): |
|
2178 | def init_extension_manager(self): | |
2177 | self.extension_manager = ExtensionManager(shell=self, config=self.config) |
|
2179 | self.extension_manager = ExtensionManager(shell=self, config=self.config) | |
2178 | self.configurables.append(self.extension_manager) |
|
2180 | self.configurables.append(self.extension_manager) | |
2179 |
|
2181 | |||
2180 | def init_plugin_manager(self): |
|
2182 | def init_plugin_manager(self): | |
2181 | self.plugin_manager = PluginManager(config=self.config) |
|
2183 | self.plugin_manager = PluginManager(config=self.config) | |
2182 | self.configurables.append(self.plugin_manager) |
|
2184 | self.configurables.append(self.plugin_manager) | |
2183 |
|
2185 | |||
2184 |
|
2186 | |||
2185 | #------------------------------------------------------------------------- |
|
2187 | #------------------------------------------------------------------------- | |
2186 | # Things related to payloads |
|
2188 | # Things related to payloads | |
2187 | #------------------------------------------------------------------------- |
|
2189 | #------------------------------------------------------------------------- | |
2188 |
|
2190 | |||
2189 | def init_payload(self): |
|
2191 | def init_payload(self): | |
2190 | self.payload_manager = PayloadManager(config=self.config) |
|
2192 | self.payload_manager = PayloadManager(config=self.config) | |
2191 | self.configurables.append(self.payload_manager) |
|
2193 | self.configurables.append(self.payload_manager) | |
2192 |
|
2194 | |||
2193 | #------------------------------------------------------------------------- |
|
2195 | #------------------------------------------------------------------------- | |
2194 | # Things related to the prefilter |
|
2196 | # Things related to the prefilter | |
2195 | #------------------------------------------------------------------------- |
|
2197 | #------------------------------------------------------------------------- | |
2196 |
|
2198 | |||
2197 | def init_prefilter(self): |
|
2199 | def init_prefilter(self): | |
2198 | self.prefilter_manager = PrefilterManager(shell=self, config=self.config) |
|
2200 | self.prefilter_manager = PrefilterManager(shell=self, config=self.config) | |
2199 | self.configurables.append(self.prefilter_manager) |
|
2201 | self.configurables.append(self.prefilter_manager) | |
2200 | # Ultimately this will be refactored in the new interpreter code, but |
|
2202 | # Ultimately this will be refactored in the new interpreter code, but | |
2201 | # for now, we should expose the main prefilter method (there's legacy |
|
2203 | # for now, we should expose the main prefilter method (there's legacy | |
2202 | # code out there that may rely on this). |
|
2204 | # code out there that may rely on this). | |
2203 | self.prefilter = self.prefilter_manager.prefilter_lines |
|
2205 | self.prefilter = self.prefilter_manager.prefilter_lines | |
2204 |
|
2206 | |||
2205 | def auto_rewrite_input(self, cmd): |
|
2207 | def auto_rewrite_input(self, cmd): | |
2206 | """Print to the screen the rewritten form of the user's command. |
|
2208 | """Print to the screen the rewritten form of the user's command. | |
2207 |
|
2209 | |||
2208 | This shows visual feedback by rewriting input lines that cause |
|
2210 | This shows visual feedback by rewriting input lines that cause | |
2209 | automatic calling to kick in, like:: |
|
2211 | automatic calling to kick in, like:: | |
2210 |
|
2212 | |||
2211 | /f x |
|
2213 | /f x | |
2212 |
|
2214 | |||
2213 | into:: |
|
2215 | into:: | |
2214 |
|
2216 | |||
2215 | ------> f(x) |
|
2217 | ------> f(x) | |
2216 |
|
2218 | |||
2217 | after the user's input prompt. This helps the user understand that the |
|
2219 | after the user's input prompt. This helps the user understand that the | |
2218 | input line was transformed automatically by IPython. |
|
2220 | input line was transformed automatically by IPython. | |
2219 | """ |
|
2221 | """ | |
2220 | if not self.show_rewritten_input: |
|
2222 | if not self.show_rewritten_input: | |
2221 | return |
|
2223 | return | |
2222 |
|
2224 | |||
2223 | rw = self.prompt_manager.render('rewrite') + cmd |
|
2225 | rw = self.prompt_manager.render('rewrite') + cmd | |
2224 |
|
2226 | |||
2225 | try: |
|
2227 | try: | |
2226 | # plain ascii works better w/ pyreadline, on some machines, so |
|
2228 | # plain ascii works better w/ pyreadline, on some machines, so | |
2227 | # we use it and only print uncolored rewrite if we have unicode |
|
2229 | # we use it and only print uncolored rewrite if we have unicode | |
2228 | rw = str(rw) |
|
2230 | rw = str(rw) | |
2229 | print >> io.stdout, rw |
|
2231 | print >> io.stdout, rw | |
2230 | except UnicodeEncodeError: |
|
2232 | except UnicodeEncodeError: | |
2231 | print "------> " + cmd |
|
2233 | print "------> " + cmd | |
2232 |
|
2234 | |||
2233 | #------------------------------------------------------------------------- |
|
2235 | #------------------------------------------------------------------------- | |
2234 | # Things related to extracting values/expressions from kernel and user_ns |
|
2236 | # Things related to extracting values/expressions from kernel and user_ns | |
2235 | #------------------------------------------------------------------------- |
|
2237 | #------------------------------------------------------------------------- | |
2236 |
|
2238 | |||
2237 | def _simple_error(self): |
|
2239 | def _simple_error(self): | |
2238 | etype, value = sys.exc_info()[:2] |
|
2240 | etype, value = sys.exc_info()[:2] | |
2239 | return u'[ERROR] {e.__name__}: {v}'.format(e=etype, v=value) |
|
2241 | return u'[ERROR] {e.__name__}: {v}'.format(e=etype, v=value) | |
2240 |
|
2242 | |||
2241 | def user_variables(self, names): |
|
2243 | def user_variables(self, names): | |
2242 | """Get a list of variable names from the user's namespace. |
|
2244 | """Get a list of variable names from the user's namespace. | |
2243 |
|
2245 | |||
2244 | Parameters |
|
2246 | Parameters | |
2245 | ---------- |
|
2247 | ---------- | |
2246 | names : list of strings |
|
2248 | names : list of strings | |
2247 | A list of names of variables to be read from the user namespace. |
|
2249 | A list of names of variables to be read from the user namespace. | |
2248 |
|
2250 | |||
2249 | Returns |
|
2251 | Returns | |
2250 | ------- |
|
2252 | ------- | |
2251 | A dict, keyed by the input names and with the repr() of each value. |
|
2253 | A dict, keyed by the input names and with the repr() of each value. | |
2252 | """ |
|
2254 | """ | |
2253 | out = {} |
|
2255 | out = {} | |
2254 | user_ns = self.user_ns |
|
2256 | user_ns = self.user_ns | |
2255 | for varname in names: |
|
2257 | for varname in names: | |
2256 | try: |
|
2258 | try: | |
2257 | value = repr(user_ns[varname]) |
|
2259 | value = repr(user_ns[varname]) | |
2258 | except: |
|
2260 | except: | |
2259 | value = self._simple_error() |
|
2261 | value = self._simple_error() | |
2260 | out[varname] = value |
|
2262 | out[varname] = value | |
2261 | return out |
|
2263 | return out | |
2262 |
|
2264 | |||
2263 | def user_expressions(self, expressions): |
|
2265 | def user_expressions(self, expressions): | |
2264 | """Evaluate a dict of expressions in the user's namespace. |
|
2266 | """Evaluate a dict of expressions in the user's namespace. | |
2265 |
|
2267 | |||
2266 | Parameters |
|
2268 | Parameters | |
2267 | ---------- |
|
2269 | ---------- | |
2268 | expressions : dict |
|
2270 | expressions : dict | |
2269 | A dict with string keys and string values. The expression values |
|
2271 | A dict with string keys and string values. The expression values | |
2270 | should be valid Python expressions, each of which will be evaluated |
|
2272 | should be valid Python expressions, each of which will be evaluated | |
2271 | in the user namespace. |
|
2273 | in the user namespace. | |
2272 |
|
2274 | |||
2273 | Returns |
|
2275 | Returns | |
2274 | ------- |
|
2276 | ------- | |
2275 | A dict, keyed like the input expressions dict, with the repr() of each |
|
2277 | A dict, keyed like the input expressions dict, with the repr() of each | |
2276 | value. |
|
2278 | value. | |
2277 | """ |
|
2279 | """ | |
2278 | out = {} |
|
2280 | out = {} | |
2279 | user_ns = self.user_ns |
|
2281 | user_ns = self.user_ns | |
2280 | global_ns = self.user_global_ns |
|
2282 | global_ns = self.user_global_ns | |
2281 | for key, expr in expressions.iteritems(): |
|
2283 | for key, expr in expressions.iteritems(): | |
2282 | try: |
|
2284 | try: | |
2283 | value = repr(eval(expr, global_ns, user_ns)) |
|
2285 | value = repr(eval(expr, global_ns, user_ns)) | |
2284 | except: |
|
2286 | except: | |
2285 | value = self._simple_error() |
|
2287 | value = self._simple_error() | |
2286 | out[key] = value |
|
2288 | out[key] = value | |
2287 | return out |
|
2289 | return out | |
2288 |
|
2290 | |||
2289 | #------------------------------------------------------------------------- |
|
2291 | #------------------------------------------------------------------------- | |
2290 | # Things related to the running of code |
|
2292 | # Things related to the running of code | |
2291 | #------------------------------------------------------------------------- |
|
2293 | #------------------------------------------------------------------------- | |
2292 |
|
2294 | |||
2293 | def ex(self, cmd): |
|
2295 | def ex(self, cmd): | |
2294 | """Execute a normal python statement in user namespace.""" |
|
2296 | """Execute a normal python statement in user namespace.""" | |
2295 | with self.builtin_trap: |
|
2297 | with self.builtin_trap: | |
2296 | exec cmd in self.user_global_ns, self.user_ns |
|
2298 | exec cmd in self.user_global_ns, self.user_ns | |
2297 |
|
2299 | |||
2298 | def ev(self, expr): |
|
2300 | def ev(self, expr): | |
2299 | """Evaluate python expression expr in user namespace. |
|
2301 | """Evaluate python expression expr in user namespace. | |
2300 |
|
2302 | |||
2301 | Returns the result of evaluation |
|
2303 | Returns the result of evaluation | |
2302 | """ |
|
2304 | """ | |
2303 | with self.builtin_trap: |
|
2305 | with self.builtin_trap: | |
2304 | return eval(expr, self.user_global_ns, self.user_ns) |
|
2306 | return eval(expr, self.user_global_ns, self.user_ns) | |
2305 |
|
2307 | |||
2306 | def safe_execfile(self, fname, *where, **kw): |
|
2308 | def safe_execfile(self, fname, *where, **kw): | |
2307 | """A safe version of the builtin execfile(). |
|
2309 | """A safe version of the builtin execfile(). | |
2308 |
|
2310 | |||
2309 | This version will never throw an exception, but instead print |
|
2311 | This version will never throw an exception, but instead print | |
2310 | helpful error messages to the screen. This only works on pure |
|
2312 | helpful error messages to the screen. This only works on pure | |
2311 | Python files with the .py extension. |
|
2313 | Python files with the .py extension. | |
2312 |
|
2314 | |||
2313 | Parameters |
|
2315 | Parameters | |
2314 | ---------- |
|
2316 | ---------- | |
2315 | fname : string |
|
2317 | fname : string | |
2316 | The name of the file to be executed. |
|
2318 | The name of the file to be executed. | |
2317 | where : tuple |
|
2319 | where : tuple | |
2318 | One or two namespaces, passed to execfile() as (globals,locals). |
|
2320 | One or two namespaces, passed to execfile() as (globals,locals). | |
2319 | If only one is given, it is passed as both. |
|
2321 | If only one is given, it is passed as both. | |
2320 | exit_ignore : bool (False) |
|
2322 | exit_ignore : bool (False) | |
2321 | If True, then silence SystemExit for non-zero status (it is always |
|
2323 | If True, then silence SystemExit for non-zero status (it is always | |
2322 | silenced for zero status, as it is so common). |
|
2324 | silenced for zero status, as it is so common). | |
2323 | raise_exceptions : bool (False) |
|
2325 | raise_exceptions : bool (False) | |
2324 | If True raise exceptions everywhere. Meant for testing. |
|
2326 | If True raise exceptions everywhere. Meant for testing. | |
2325 |
|
2327 | |||
2326 | """ |
|
2328 | """ | |
2327 | kw.setdefault('exit_ignore', False) |
|
2329 | kw.setdefault('exit_ignore', False) | |
2328 | kw.setdefault('raise_exceptions', False) |
|
2330 | kw.setdefault('raise_exceptions', False) | |
2329 |
|
2331 | |||
2330 | fname = os.path.abspath(os.path.expanduser(fname)) |
|
2332 | fname = os.path.abspath(os.path.expanduser(fname)) | |
2331 |
|
2333 | |||
2332 | # Make sure we can open the file |
|
2334 | # Make sure we can open the file | |
2333 | try: |
|
2335 | try: | |
2334 | with open(fname) as thefile: |
|
2336 | with open(fname) as thefile: | |
2335 | pass |
|
2337 | pass | |
2336 | except: |
|
2338 | except: | |
2337 | warn('Could not open file <%s> for safe execution.' % fname) |
|
2339 | warn('Could not open file <%s> for safe execution.' % fname) | |
2338 | return |
|
2340 | return | |
2339 |
|
2341 | |||
2340 | # Find things also in current directory. This is needed to mimic the |
|
2342 | # Find things also in current directory. This is needed to mimic the | |
2341 | # behavior of running a script from the system command line, where |
|
2343 | # behavior of running a script from the system command line, where | |
2342 | # Python inserts the script's directory into sys.path |
|
2344 | # Python inserts the script's directory into sys.path | |
2343 | dname = os.path.dirname(fname) |
|
2345 | dname = os.path.dirname(fname) | |
2344 |
|
2346 | |||
2345 | with prepended_to_syspath(dname): |
|
2347 | with prepended_to_syspath(dname): | |
2346 | try: |
|
2348 | try: | |
2347 | py3compat.execfile(fname,*where) |
|
2349 | py3compat.execfile(fname,*where) | |
2348 | except SystemExit, status: |
|
2350 | except SystemExit, status: | |
2349 | # If the call was made with 0 or None exit status (sys.exit(0) |
|
2351 | # If the call was made with 0 or None exit status (sys.exit(0) | |
2350 | # or sys.exit() ), don't bother showing a traceback, as both of |
|
2352 | # or sys.exit() ), don't bother showing a traceback, as both of | |
2351 | # these are considered normal by the OS: |
|
2353 | # these are considered normal by the OS: | |
2352 | # > python -c'import sys;sys.exit(0)'; echo $? |
|
2354 | # > python -c'import sys;sys.exit(0)'; echo $? | |
2353 | # 0 |
|
2355 | # 0 | |
2354 | # > python -c'import sys;sys.exit()'; echo $? |
|
2356 | # > python -c'import sys;sys.exit()'; echo $? | |
2355 | # 0 |
|
2357 | # 0 | |
2356 | # For other exit status, we show the exception unless |
|
2358 | # For other exit status, we show the exception unless | |
2357 | # explicitly silenced, but only in short form. |
|
2359 | # explicitly silenced, but only in short form. | |
2358 | if kw['raise_exceptions']: |
|
2360 | if kw['raise_exceptions']: | |
2359 | raise |
|
2361 | raise | |
2360 | if status.code not in (0, None) and not kw['exit_ignore']: |
|
2362 | if status.code not in (0, None) and not kw['exit_ignore']: | |
2361 | self.showtraceback(exception_only=True) |
|
2363 | self.showtraceback(exception_only=True) | |
2362 | except: |
|
2364 | except: | |
2363 | if kw['raise_exceptions']: |
|
2365 | if kw['raise_exceptions']: | |
2364 | raise |
|
2366 | raise | |
2365 | self.showtraceback() |
|
2367 | self.showtraceback() | |
2366 |
|
2368 | |||
2367 | def safe_execfile_ipy(self, fname): |
|
2369 | def safe_execfile_ipy(self, fname): | |
2368 | """Like safe_execfile, but for .ipy files with IPython syntax. |
|
2370 | """Like safe_execfile, but for .ipy files with IPython syntax. | |
2369 |
|
2371 | |||
2370 | Parameters |
|
2372 | Parameters | |
2371 | ---------- |
|
2373 | ---------- | |
2372 | fname : str |
|
2374 | fname : str | |
2373 | The name of the file to execute. The filename must have a |
|
2375 | The name of the file to execute. The filename must have a | |
2374 | .ipy extension. |
|
2376 | .ipy extension. | |
2375 | """ |
|
2377 | """ | |
2376 | fname = os.path.abspath(os.path.expanduser(fname)) |
|
2378 | fname = os.path.abspath(os.path.expanduser(fname)) | |
2377 |
|
2379 | |||
2378 | # Make sure we can open the file |
|
2380 | # Make sure we can open the file | |
2379 | try: |
|
2381 | try: | |
2380 | with open(fname) as thefile: |
|
2382 | with open(fname) as thefile: | |
2381 | pass |
|
2383 | pass | |
2382 | except: |
|
2384 | except: | |
2383 | warn('Could not open file <%s> for safe execution.' % fname) |
|
2385 | warn('Could not open file <%s> for safe execution.' % fname) | |
2384 | return |
|
2386 | return | |
2385 |
|
2387 | |||
2386 | # Find things also in current directory. This is needed to mimic the |
|
2388 | # Find things also in current directory. This is needed to mimic the | |
2387 | # behavior of running a script from the system command line, where |
|
2389 | # behavior of running a script from the system command line, where | |
2388 | # Python inserts the script's directory into sys.path |
|
2390 | # Python inserts the script's directory into sys.path | |
2389 | dname = os.path.dirname(fname) |
|
2391 | dname = os.path.dirname(fname) | |
2390 |
|
2392 | |||
2391 | with prepended_to_syspath(dname): |
|
2393 | with prepended_to_syspath(dname): | |
2392 | try: |
|
2394 | try: | |
2393 | with open(fname) as thefile: |
|
2395 | with open(fname) as thefile: | |
2394 | # self.run_cell currently captures all exceptions |
|
2396 | # self.run_cell currently captures all exceptions | |
2395 | # raised in user code. It would be nice if there were |
|
2397 | # raised in user code. It would be nice if there were | |
2396 | # versions of runlines, execfile that did raise, so |
|
2398 | # versions of runlines, execfile that did raise, so | |
2397 | # we could catch the errors. |
|
2399 | # we could catch the errors. | |
2398 | self.run_cell(thefile.read(), store_history=False) |
|
2400 | self.run_cell(thefile.read(), store_history=False) | |
2399 | except: |
|
2401 | except: | |
2400 | self.showtraceback() |
|
2402 | self.showtraceback() | |
2401 | warn('Unknown failure executing file: <%s>' % fname) |
|
2403 | warn('Unknown failure executing file: <%s>' % fname) | |
2402 |
|
2404 | |||
2403 | def safe_run_module(self, mod_name, where): |
|
2405 | def safe_run_module(self, mod_name, where): | |
2404 | """A safe version of runpy.run_module(). |
|
2406 | """A safe version of runpy.run_module(). | |
2405 |
|
2407 | |||
2406 | This version will never throw an exception, but instead print |
|
2408 | This version will never throw an exception, but instead print | |
2407 | helpful error messages to the screen. |
|
2409 | helpful error messages to the screen. | |
2408 |
|
2410 | |||
2409 | Parameters |
|
2411 | Parameters | |
2410 | ---------- |
|
2412 | ---------- | |
2411 | mod_name : string |
|
2413 | mod_name : string | |
2412 | The name of the module to be executed. |
|
2414 | The name of the module to be executed. | |
2413 | where : dict |
|
2415 | where : dict | |
2414 | The globals namespace. |
|
2416 | The globals namespace. | |
2415 | """ |
|
2417 | """ | |
2416 | try: |
|
2418 | try: | |
2417 | where.update( |
|
2419 | where.update( | |
2418 | runpy.run_module(str(mod_name), run_name="__main__", |
|
2420 | runpy.run_module(str(mod_name), run_name="__main__", | |
2419 | alter_sys=True) |
|
2421 | alter_sys=True) | |
2420 | ) |
|
2422 | ) | |
2421 | except: |
|
2423 | except: | |
2422 | self.showtraceback() |
|
2424 | self.showtraceback() | |
2423 | warn('Unknown failure executing module: <%s>' % mod_name) |
|
2425 | warn('Unknown failure executing module: <%s>' % mod_name) | |
2424 |
|
2426 | |||
2425 | def run_cell(self, raw_cell, store_history=False): |
|
2427 | def run_cell(self, raw_cell, store_history=False): | |
2426 | """Run a complete IPython cell. |
|
2428 | """Run a complete IPython cell. | |
2427 |
|
2429 | |||
2428 | Parameters |
|
2430 | Parameters | |
2429 | ---------- |
|
2431 | ---------- | |
2430 | raw_cell : str |
|
2432 | raw_cell : str | |
2431 | The code (including IPython code such as %magic functions) to run. |
|
2433 | The code (including IPython code such as %magic functions) to run. | |
2432 | store_history : bool |
|
2434 | store_history : bool | |
2433 | If True, the raw and translated cell will be stored in IPython's |
|
2435 | If True, the raw and translated cell will be stored in IPython's | |
2434 | history. For user code calling back into IPython's machinery, this |
|
2436 | history. For user code calling back into IPython's machinery, this | |
2435 | should be set to False. |
|
2437 | should be set to False. | |
2436 | """ |
|
2438 | """ | |
2437 | if (not raw_cell) or raw_cell.isspace(): |
|
2439 | if (not raw_cell) or raw_cell.isspace(): | |
2438 | return |
|
2440 | return | |
2439 |
|
2441 | |||
2440 | for line in raw_cell.splitlines(): |
|
2442 | for line in raw_cell.splitlines(): | |
2441 | self.input_splitter.push(line) |
|
2443 | self.input_splitter.push(line) | |
2442 | cell = self.input_splitter.source_reset() |
|
2444 | cell = self.input_splitter.source_reset() | |
2443 |
|
2445 | |||
2444 | with self.builtin_trap: |
|
2446 | with self.builtin_trap: | |
2445 | prefilter_failed = False |
|
2447 | prefilter_failed = False | |
2446 | if len(cell.splitlines()) == 1: |
|
2448 | if len(cell.splitlines()) == 1: | |
2447 | try: |
|
2449 | try: | |
2448 | # use prefilter_lines to handle trailing newlines |
|
2450 | # use prefilter_lines to handle trailing newlines | |
2449 | # restore trailing newline for ast.parse |
|
2451 | # restore trailing newline for ast.parse | |
2450 | cell = self.prefilter_manager.prefilter_lines(cell) + '\n' |
|
2452 | cell = self.prefilter_manager.prefilter_lines(cell) + '\n' | |
2451 | except AliasError as e: |
|
2453 | except AliasError as e: | |
2452 | error(e) |
|
2454 | error(e) | |
2453 | prefilter_failed = True |
|
2455 | prefilter_failed = True | |
2454 | except Exception: |
|
2456 | except Exception: | |
2455 | # don't allow prefilter errors to crash IPython |
|
2457 | # don't allow prefilter errors to crash IPython | |
2456 | self.showtraceback() |
|
2458 | self.showtraceback() | |
2457 | prefilter_failed = True |
|
2459 | prefilter_failed = True | |
2458 |
|
2460 | |||
2459 | # Store raw and processed history |
|
2461 | # Store raw and processed history | |
2460 | if store_history: |
|
2462 | if store_history: | |
2461 | self.history_manager.store_inputs(self.execution_count, |
|
2463 | self.history_manager.store_inputs(self.execution_count, | |
2462 | cell, raw_cell) |
|
2464 | cell, raw_cell) | |
2463 |
|
2465 | |||
2464 | self.logger.log(cell, raw_cell) |
|
2466 | self.logger.log(cell, raw_cell) | |
2465 |
|
2467 | |||
2466 | if not prefilter_failed: |
|
2468 | if not prefilter_failed: | |
2467 | # don't run if prefilter failed |
|
2469 | # don't run if prefilter failed | |
2468 | cell_name = self.compile.cache(cell, self.execution_count) |
|
2470 | cell_name = self.compile.cache(cell, self.execution_count) | |
2469 |
|
2471 | |||
2470 | with self.display_trap: |
|
2472 | with self.display_trap: | |
2471 | try: |
|
2473 | try: | |
2472 | code_ast = self.compile.ast_parse(cell, filename=cell_name) |
|
2474 | code_ast = self.compile.ast_parse(cell, filename=cell_name) | |
2473 | except IndentationError: |
|
2475 | except IndentationError: | |
2474 | self.showindentationerror() |
|
2476 | self.showindentationerror() | |
2475 | if store_history: |
|
2477 | if store_history: | |
2476 | self.execution_count += 1 |
|
2478 | self.execution_count += 1 | |
2477 | return None |
|
2479 | return None | |
2478 | except (OverflowError, SyntaxError, ValueError, TypeError, |
|
2480 | except (OverflowError, SyntaxError, ValueError, TypeError, | |
2479 | MemoryError): |
|
2481 | MemoryError): | |
2480 | self.showsyntaxerror() |
|
2482 | self.showsyntaxerror() | |
2481 | if store_history: |
|
2483 | if store_history: | |
2482 | self.execution_count += 1 |
|
2484 | self.execution_count += 1 | |
2483 | return None |
|
2485 | return None | |
2484 |
|
2486 | |||
2485 | self.run_ast_nodes(code_ast.body, cell_name, |
|
2487 | self.run_ast_nodes(code_ast.body, cell_name, | |
2486 | interactivity="last_expr") |
|
2488 | interactivity="last_expr") | |
2487 |
|
2489 | |||
2488 | # Execute any registered post-execution functions. |
|
2490 | # Execute any registered post-execution functions. | |
2489 | for func, status in self._post_execute.iteritems(): |
|
2491 | for func, status in self._post_execute.iteritems(): | |
2490 | if self.disable_failing_post_execute and not status: |
|
2492 | if self.disable_failing_post_execute and not status: | |
2491 | continue |
|
2493 | continue | |
2492 | try: |
|
2494 | try: | |
2493 | func() |
|
2495 | func() | |
2494 | except KeyboardInterrupt: |
|
2496 | except KeyboardInterrupt: | |
2495 | print >> io.stderr, "\nKeyboardInterrupt" |
|
2497 | print >> io.stderr, "\nKeyboardInterrupt" | |
2496 | except Exception: |
|
2498 | except Exception: | |
2497 | # register as failing: |
|
2499 | # register as failing: | |
2498 | self._post_execute[func] = False |
|
2500 | self._post_execute[func] = False | |
2499 | self.showtraceback() |
|
2501 | self.showtraceback() | |
2500 | print >> io.stderr, '\n'.join([ |
|
2502 | print >> io.stderr, '\n'.join([ | |
2501 | "post-execution function %r produced an error." % func, |
|
2503 | "post-execution function %r produced an error." % func, | |
2502 | "If this problem persists, you can disable failing post-exec functions with:", |
|
2504 | "If this problem persists, you can disable failing post-exec functions with:", | |
2503 | "", |
|
2505 | "", | |
2504 | " get_ipython().disable_failing_post_execute = True" |
|
2506 | " get_ipython().disable_failing_post_execute = True" | |
2505 | ]) |
|
2507 | ]) | |
2506 |
|
2508 | |||
2507 | if store_history: |
|
2509 | if store_history: | |
2508 | # Write output to the database. Does nothing unless |
|
2510 | # Write output to the database. Does nothing unless | |
2509 | # history output logging is enabled. |
|
2511 | # history output logging is enabled. | |
2510 | self.history_manager.store_output(self.execution_count) |
|
2512 | self.history_manager.store_output(self.execution_count) | |
2511 | # Each cell is a *single* input, regardless of how many lines it has |
|
2513 | # Each cell is a *single* input, regardless of how many lines it has | |
2512 | self.execution_count += 1 |
|
2514 | self.execution_count += 1 | |
2513 |
|
2515 | |||
2514 | def run_ast_nodes(self, nodelist, cell_name, interactivity='last_expr'): |
|
2516 | def run_ast_nodes(self, nodelist, cell_name, interactivity='last_expr'): | |
2515 | """Run a sequence of AST nodes. The execution mode depends on the |
|
2517 | """Run a sequence of AST nodes. The execution mode depends on the | |
2516 | interactivity parameter. |
|
2518 | interactivity parameter. | |
2517 |
|
2519 | |||
2518 | Parameters |
|
2520 | Parameters | |
2519 | ---------- |
|
2521 | ---------- | |
2520 | nodelist : list |
|
2522 | nodelist : list | |
2521 | A sequence of AST nodes to run. |
|
2523 | A sequence of AST nodes to run. | |
2522 | cell_name : str |
|
2524 | cell_name : str | |
2523 | Will be passed to the compiler as the filename of the cell. Typically |
|
2525 | Will be passed to the compiler as the filename of the cell. Typically | |
2524 | the value returned by ip.compile.cache(cell). |
|
2526 | the value returned by ip.compile.cache(cell). | |
2525 | interactivity : str |
|
2527 | interactivity : str | |
2526 | 'all', 'last', 'last_expr' or 'none', specifying which nodes should be |
|
2528 | 'all', 'last', 'last_expr' or 'none', specifying which nodes should be | |
2527 | run interactively (displaying output from expressions). 'last_expr' |
|
2529 | run interactively (displaying output from expressions). 'last_expr' | |
2528 | will run the last node interactively only if it is an expression (i.e. |
|
2530 | will run the last node interactively only if it is an expression (i.e. | |
2529 | expressions in loops or other blocks are not displayed. Other values |
|
2531 | expressions in loops or other blocks are not displayed. Other values | |
2530 | for this parameter will raise a ValueError. |
|
2532 | for this parameter will raise a ValueError. | |
2531 | """ |
|
2533 | """ | |
2532 | if not nodelist: |
|
2534 | if not nodelist: | |
2533 | return |
|
2535 | return | |
2534 |
|
2536 | |||
2535 | if interactivity == 'last_expr': |
|
2537 | if interactivity == 'last_expr': | |
2536 | if isinstance(nodelist[-1], ast.Expr): |
|
2538 | if isinstance(nodelist[-1], ast.Expr): | |
2537 | interactivity = "last" |
|
2539 | interactivity = "last" | |
2538 | else: |
|
2540 | else: | |
2539 | interactivity = "none" |
|
2541 | interactivity = "none" | |
2540 |
|
2542 | |||
2541 | if interactivity == 'none': |
|
2543 | if interactivity == 'none': | |
2542 | to_run_exec, to_run_interactive = nodelist, [] |
|
2544 | to_run_exec, to_run_interactive = nodelist, [] | |
2543 | elif interactivity == 'last': |
|
2545 | elif interactivity == 'last': | |
2544 | to_run_exec, to_run_interactive = nodelist[:-1], nodelist[-1:] |
|
2546 | to_run_exec, to_run_interactive = nodelist[:-1], nodelist[-1:] | |
2545 | elif interactivity == 'all': |
|
2547 | elif interactivity == 'all': | |
2546 | to_run_exec, to_run_interactive = [], nodelist |
|
2548 | to_run_exec, to_run_interactive = [], nodelist | |
2547 | else: |
|
2549 | else: | |
2548 | raise ValueError("Interactivity was %r" % interactivity) |
|
2550 | raise ValueError("Interactivity was %r" % interactivity) | |
2549 |
|
2551 | |||
2550 | exec_count = self.execution_count |
|
2552 | exec_count = self.execution_count | |
2551 |
|
2553 | |||
2552 | try: |
|
2554 | try: | |
2553 | for i, node in enumerate(to_run_exec): |
|
2555 | for i, node in enumerate(to_run_exec): | |
2554 | mod = ast.Module([node]) |
|
2556 | mod = ast.Module([node]) | |
2555 | code = self.compile(mod, cell_name, "exec") |
|
2557 | code = self.compile(mod, cell_name, "exec") | |
2556 | if self.run_code(code): |
|
2558 | if self.run_code(code): | |
2557 | return True |
|
2559 | return True | |
2558 |
|
2560 | |||
2559 | for i, node in enumerate(to_run_interactive): |
|
2561 | for i, node in enumerate(to_run_interactive): | |
2560 | mod = ast.Interactive([node]) |
|
2562 | mod = ast.Interactive([node]) | |
2561 | code = self.compile(mod, cell_name, "single") |
|
2563 | code = self.compile(mod, cell_name, "single") | |
2562 | if self.run_code(code): |
|
2564 | if self.run_code(code): | |
2563 | return True |
|
2565 | return True | |
2564 | except: |
|
2566 | except: | |
2565 | # It's possible to have exceptions raised here, typically by |
|
2567 | # It's possible to have exceptions raised here, typically by | |
2566 | # compilation of odd code (such as a naked 'return' outside a |
|
2568 | # compilation of odd code (such as a naked 'return' outside a | |
2567 | # function) that did parse but isn't valid. Typically the exception |
|
2569 | # function) that did parse but isn't valid. Typically the exception | |
2568 | # is a SyntaxError, but it's safest just to catch anything and show |
|
2570 | # is a SyntaxError, but it's safest just to catch anything and show | |
2569 | # the user a traceback. |
|
2571 | # the user a traceback. | |
2570 |
|
2572 | |||
2571 | # We do only one try/except outside the loop to minimize the impact |
|
2573 | # We do only one try/except outside the loop to minimize the impact | |
2572 | # on runtime, and also because if any node in the node list is |
|
2574 | # on runtime, and also because if any node in the node list is | |
2573 | # broken, we should stop execution completely. |
|
2575 | # broken, we should stop execution completely. | |
2574 | self.showtraceback() |
|
2576 | self.showtraceback() | |
2575 |
|
2577 | |||
2576 | return False |
|
2578 | return False | |
2577 |
|
2579 | |||
2578 | def run_code(self, code_obj): |
|
2580 | def run_code(self, code_obj): | |
2579 | """Execute a code object. |
|
2581 | """Execute a code object. | |
2580 |
|
2582 | |||
2581 | When an exception occurs, self.showtraceback() is called to display a |
|
2583 | When an exception occurs, self.showtraceback() is called to display a | |
2582 | traceback. |
|
2584 | traceback. | |
2583 |
|
2585 | |||
2584 | Parameters |
|
2586 | Parameters | |
2585 | ---------- |
|
2587 | ---------- | |
2586 | code_obj : code object |
|
2588 | code_obj : code object | |
2587 | A compiled code object, to be executed |
|
2589 | A compiled code object, to be executed | |
2588 | post_execute : bool [default: True] |
|
2590 | post_execute : bool [default: True] | |
2589 | whether to call post_execute hooks after this particular execution. |
|
2591 | whether to call post_execute hooks after this particular execution. | |
2590 |
|
2592 | |||
2591 | Returns |
|
2593 | Returns | |
2592 | ------- |
|
2594 | ------- | |
2593 | False : successful execution. |
|
2595 | False : successful execution. | |
2594 | True : an error occurred. |
|
2596 | True : an error occurred. | |
2595 | """ |
|
2597 | """ | |
2596 |
|
2598 | |||
2597 | # Set our own excepthook in case the user code tries to call it |
|
2599 | # Set our own excepthook in case the user code tries to call it | |
2598 | # directly, so that the IPython crash handler doesn't get triggered |
|
2600 | # directly, so that the IPython crash handler doesn't get triggered | |
2599 | old_excepthook,sys.excepthook = sys.excepthook, self.excepthook |
|
2601 | old_excepthook,sys.excepthook = sys.excepthook, self.excepthook | |
2600 |
|
2602 | |||
2601 | # we save the original sys.excepthook in the instance, in case config |
|
2603 | # we save the original sys.excepthook in the instance, in case config | |
2602 | # code (such as magics) needs access to it. |
|
2604 | # code (such as magics) needs access to it. | |
2603 | self.sys_excepthook = old_excepthook |
|
2605 | self.sys_excepthook = old_excepthook | |
2604 | outflag = 1 # happens in more places, so it's easier as default |
|
2606 | outflag = 1 # happens in more places, so it's easier as default | |
2605 | try: |
|
2607 | try: | |
2606 | try: |
|
2608 | try: | |
2607 | self.hooks.pre_run_code_hook() |
|
2609 | self.hooks.pre_run_code_hook() | |
2608 | #rprint('Running code', repr(code_obj)) # dbg |
|
2610 | #rprint('Running code', repr(code_obj)) # dbg | |
2609 | exec code_obj in self.user_global_ns, self.user_ns |
|
2611 | exec code_obj in self.user_global_ns, self.user_ns | |
2610 | finally: |
|
2612 | finally: | |
2611 | # Reset our crash handler in place |
|
2613 | # Reset our crash handler in place | |
2612 | sys.excepthook = old_excepthook |
|
2614 | sys.excepthook = old_excepthook | |
2613 | except SystemExit: |
|
2615 | except SystemExit: | |
2614 | self.showtraceback(exception_only=True) |
|
2616 | self.showtraceback(exception_only=True) | |
2615 | warn("To exit: use 'exit', 'quit', or Ctrl-D.", level=1) |
|
2617 | warn("To exit: use 'exit', 'quit', or Ctrl-D.", level=1) | |
2616 | except self.custom_exceptions: |
|
2618 | except self.custom_exceptions: | |
2617 | etype,value,tb = sys.exc_info() |
|
2619 | etype,value,tb = sys.exc_info() | |
2618 | self.CustomTB(etype,value,tb) |
|
2620 | self.CustomTB(etype,value,tb) | |
2619 | except: |
|
2621 | except: | |
2620 | self.showtraceback() |
|
2622 | self.showtraceback() | |
2621 | else: |
|
2623 | else: | |
2622 | outflag = 0 |
|
2624 | outflag = 0 | |
2623 | if softspace(sys.stdout, 0): |
|
2625 | if softspace(sys.stdout, 0): | |
2624 |
|
2626 | |||
2625 |
|
2627 | |||
2626 | return outflag |
|
2628 | return outflag | |
2627 |
|
2629 | |||
2628 | # For backwards compatibility |
|
2630 | # For backwards compatibility | |
2629 | runcode = run_code |
|
2631 | runcode = run_code | |
2630 |
|
2632 | |||
2631 | #------------------------------------------------------------------------- |
|
2633 | #------------------------------------------------------------------------- | |
2632 | # Things related to GUI support and pylab |
|
2634 | # Things related to GUI support and pylab | |
2633 | #------------------------------------------------------------------------- |
|
2635 | #------------------------------------------------------------------------- | |
2634 |
|
2636 | |||
2635 | def enable_gui(self, gui=None): |
|
2637 | def enable_gui(self, gui=None): | |
2636 | raise NotImplementedError('Implement enable_gui in a subclass') |
|
2638 | raise NotImplementedError('Implement enable_gui in a subclass') | |
2637 |
|
2639 | |||
2638 | def enable_pylab(self, gui=None, import_all=True): |
|
2640 | def enable_pylab(self, gui=None, import_all=True): | |
2639 | """Activate pylab support at runtime. |
|
2641 | """Activate pylab support at runtime. | |
2640 |
|
2642 | |||
2641 | This turns on support for matplotlib, preloads into the interactive |
|
2643 | This turns on support for matplotlib, preloads into the interactive | |
2642 | namespace all of numpy and pylab, and configures IPython to correctly |
|
2644 | namespace all of numpy and pylab, and configures IPython to correctly | |
2643 | interact with the GUI event loop. The GUI backend to be used can be |
|
2645 | interact with the GUI event loop. The GUI backend to be used can be | |
2644 | optionally selected with the optional :param:`gui` argument. |
|
2646 | optionally selected with the optional :param:`gui` argument. | |
2645 |
|
2647 | |||
2646 | Parameters |
|
2648 | Parameters | |
2647 | ---------- |
|
2649 | ---------- | |
2648 | gui : optional, string |
|
2650 | gui : optional, string | |
2649 |
|
2651 | |||
2650 | If given, dictates the choice of matplotlib GUI backend to use |
|
2652 | If given, dictates the choice of matplotlib GUI backend to use | |
2651 | (should be one of IPython's supported backends, 'qt', 'osx', 'tk', |
|
2653 | (should be one of IPython's supported backends, 'qt', 'osx', 'tk', | |
2652 | 'gtk', 'wx' or 'inline'), otherwise we use the default chosen by |
|
2654 | 'gtk', 'wx' or 'inline'), otherwise we use the default chosen by | |
2653 | matplotlib (as dictated by the matplotlib build-time options plus the |
|
2655 | matplotlib (as dictated by the matplotlib build-time options plus the | |
2654 | user's matplotlibrc configuration file). Note that not all backends |
|
2656 | user's matplotlibrc configuration file). Note that not all backends | |
2655 | make sense in all contexts, for example a terminal ipython can't |
|
2657 | make sense in all contexts, for example a terminal ipython can't | |
2656 | display figures inline. |
|
2658 | display figures inline. | |
2657 | """ |
|
2659 | """ | |
2658 |
|
2660 | |||
2659 | # We want to prevent the loading of pylab to pollute the user's |
|
2661 | # We want to prevent the loading of pylab to pollute the user's | |
2660 | # namespace as shown by the %who* magics, so we execute the activation |
|
2662 | # namespace as shown by the %who* magics, so we execute the activation | |
2661 | # code in an empty namespace, and we update *both* user_ns and |
|
2663 | # code in an empty namespace, and we update *both* user_ns and | |
2662 | # user_ns_hidden with this information. |
|
2664 | # user_ns_hidden with this information. | |
2663 | ns = {} |
|
2665 | ns = {} | |
2664 | try: |
|
2666 | try: | |
2665 | gui = pylab_activate(ns, gui, import_all, self) |
|
2667 | gui = pylab_activate(ns, gui, import_all, self) | |
2666 | except KeyError: |
|
2668 | except KeyError: | |
2667 | error("Backend %r not supported" % gui) |
|
2669 | error("Backend %r not supported" % gui) | |
2668 | return |
|
2670 | return | |
2669 | self.user_ns.update(ns) |
|
2671 | self.user_ns.update(ns) | |
2670 | self.user_ns_hidden.update(ns) |
|
2672 | self.user_ns_hidden.update(ns) | |
2671 | # Now we must activate the gui pylab wants to use, and fix %run to take |
|
2673 | # Now we must activate the gui pylab wants to use, and fix %run to take | |
2672 | # plot updates into account |
|
2674 | # plot updates into account | |
2673 | self.enable_gui(gui) |
|
2675 | self.enable_gui(gui) | |
2674 | self.magic_run = self._pylab_magic_run |
|
2676 | self.magic_run = self._pylab_magic_run | |
2675 |
|
2677 | |||
2676 | #------------------------------------------------------------------------- |
|
2678 | #------------------------------------------------------------------------- | |
2677 | # Utilities |
|
2679 | # Utilities | |
2678 | #------------------------------------------------------------------------- |
|
2680 | #------------------------------------------------------------------------- | |
2679 |
|
2681 | |||
2680 | def var_expand(self, cmd, depth=0, formatter=DollarFormatter()): |
|
2682 | def var_expand(self, cmd, depth=0, formatter=DollarFormatter()): | |
2681 | """Expand python variables in a string. |
|
2683 | """Expand python variables in a string. | |
2682 |
|
2684 | |||
2683 | The depth argument indicates how many frames above the caller should |
|
2685 | The depth argument indicates how many frames above the caller should | |
2684 | be walked to look for the local namespace where to expand variables. |
|
2686 | be walked to look for the local namespace where to expand variables. | |
2685 |
|
2687 | |||
2686 | The global namespace for expansion is always the user's interactive |
|
2688 | The global namespace for expansion is always the user's interactive | |
2687 | namespace. |
|
2689 | namespace. | |
2688 | """ |
|
2690 | """ | |
2689 | ns = self.user_ns.copy() |
|
2691 | ns = self.user_ns.copy() | |
2690 | ns.update(sys._getframe(depth+1).f_locals) |
|
2692 | ns.update(sys._getframe(depth+1).f_locals) | |
2691 | ns.pop('self', None) |
|
2693 | ns.pop('self', None) | |
2692 | try: |
|
2694 | try: | |
2693 | cmd = formatter.format(cmd, **ns) |
|
2695 | cmd = formatter.format(cmd, **ns) | |
2694 | except Exception: |
|
2696 | except Exception: | |
2695 | # if formatter couldn't format, just let it go untransformed |
|
2697 | # if formatter couldn't format, just let it go untransformed | |
2696 | pass |
|
2698 | pass | |
2697 | return cmd |
|
2699 | return cmd | |
2698 |
|
2700 | |||
2699 | def mktempfile(self, data=None, prefix='ipython_edit_'): |
|
2701 | def mktempfile(self, data=None, prefix='ipython_edit_'): | |
2700 | """Make a new tempfile and return its filename. |
|
2702 | """Make a new tempfile and return its filename. | |
2701 |
|
2703 | |||
2702 | This makes a call to tempfile.mktemp, but it registers the created |
|
2704 | This makes a call to tempfile.mktemp, but it registers the created | |
2703 | filename internally so ipython cleans it up at exit time. |
|
2705 | filename internally so ipython cleans it up at exit time. | |
2704 |
|
2706 | |||
2705 | Optional inputs: |
|
2707 | Optional inputs: | |
2706 |
|
2708 | |||
2707 | - data(None): if data is given, it gets written out to the temp file |
|
2709 | - data(None): if data is given, it gets written out to the temp file | |
2708 | immediately, and the file is closed again.""" |
|
2710 | immediately, and the file is closed again.""" | |
2709 |
|
2711 | |||
2710 | filename = tempfile.mktemp('.py', prefix) |
|
2712 | filename = tempfile.mktemp('.py', prefix) | |
2711 | self.tempfiles.append(filename) |
|
2713 | self.tempfiles.append(filename) | |
2712 |
|
2714 | |||
2713 | if data: |
|
2715 | if data: | |
2714 | tmp_file = open(filename,'w') |
|
2716 | tmp_file = open(filename,'w') | |
2715 | tmp_file.write(data) |
|
2717 | tmp_file.write(data) | |
2716 | tmp_file.close() |
|
2718 | tmp_file.close() | |
2717 | return filename |
|
2719 | return filename | |
2718 |
|
2720 | |||
2719 | # TODO: This should be removed when Term is refactored. |
|
2721 | # TODO: This should be removed when Term is refactored. | |
2720 | def write(self,data): |
|
2722 | def write(self,data): | |
2721 | """Write a string to the default output""" |
|
2723 | """Write a string to the default output""" | |
2722 | io.stdout.write(data) |
|
2724 | io.stdout.write(data) | |
2723 |
|
2725 | |||
2724 | # TODO: This should be removed when Term is refactored. |
|
2726 | # TODO: This should be removed when Term is refactored. | |
2725 | def write_err(self,data): |
|
2727 | def write_err(self,data): | |
2726 | """Write a string to the default error output""" |
|
2728 | """Write a string to the default error output""" | |
2727 | io.stderr.write(data) |
|
2729 | io.stderr.write(data) | |
2728 |
|
2730 | |||
2729 | def ask_yes_no(self, prompt, default=None): |
|
2731 | def ask_yes_no(self, prompt, default=None): | |
2730 | if self.quiet: |
|
2732 | if self.quiet: | |
2731 | return True |
|
2733 | return True | |
2732 | return ask_yes_no(prompt,default) |
|
2734 | return ask_yes_no(prompt,default) | |
2733 |
|
2735 | |||
2734 | def show_usage(self): |
|
2736 | def show_usage(self): | |
2735 | """Show a usage message""" |
|
2737 | """Show a usage message""" | |
2736 | page.page(IPython.core.usage.interactive_usage) |
|
2738 | page.page(IPython.core.usage.interactive_usage) | |
2737 |
|
2739 | |||
2738 | def find_user_code(self, target, raw=True): |
|
2740 | def find_user_code(self, target, raw=True): | |
2739 | """Get a code string from history, file, or a string or macro. |
|
2741 | """Get a code string from history, file, or a string or macro. | |
2740 |
|
2742 | |||
2741 | This is mainly used by magic functions. |
|
2743 | This is mainly used by magic functions. | |
2742 |
|
2744 | |||
2743 | Parameters |
|
2745 | Parameters | |
2744 | ---------- |
|
2746 | ---------- | |
2745 | target : str |
|
2747 | target : str | |
2746 | A string specifying code to retrieve. This will be tried respectively |
|
2748 | A string specifying code to retrieve. This will be tried respectively | |
2747 | as: ranges of input history (see %history for syntax), a filename, or |
|
2749 | as: ranges of input history (see %history for syntax), a filename, or | |
2748 | an expression evaluating to a string or Macro in the user namespace. |
|
2750 | an expression evaluating to a string or Macro in the user namespace. | |
2749 | raw : bool |
|
2751 | raw : bool | |
2750 | If true (default), retrieve raw history. Has no effect on the other |
|
2752 | If true (default), retrieve raw history. Has no effect on the other | |
2751 | retrieval mechanisms. |
|
2753 | retrieval mechanisms. | |
2752 |
|
2754 | |||
2753 | Returns |
|
2755 | Returns | |
2754 | ------- |
|
2756 | ------- | |
2755 | A string of code. |
|
2757 | A string of code. | |
2756 |
|
2758 | |||
2757 | ValueError is raised if nothing is found, and TypeError if it evaluates |
|
2759 | ValueError is raised if nothing is found, and TypeError if it evaluates | |
2758 | to an object of another type. In each case, .args[0] is a printable |
|
2760 | to an object of another type. In each case, .args[0] is a printable | |
2759 | message. |
|
2761 | message. | |
2760 | """ |
|
2762 | """ | |
2761 | code = self.extract_input_lines(target, raw=raw) # Grab history |
|
2763 | code = self.extract_input_lines(target, raw=raw) # Grab history | |
2762 | if code: |
|
2764 | if code: | |
2763 | return code |
|
2765 | return code | |
2764 | if os.path.isfile(target): # Read file |
|
2766 | if os.path.isfile(target): # Read file | |
2765 | return open(target, "r").read() |
|
2767 | return open(target, "r").read() | |
2766 |
|
2768 | |||
2767 | try: # User namespace |
|
2769 | try: # User namespace | |
2768 | codeobj = eval(target, self.user_ns) |
|
2770 | codeobj = eval(target, self.user_ns) | |
2769 | except Exception: |
|
2771 | except Exception: | |
2770 | raise ValueError(("'%s' was not found in history, as a file, nor in" |
|
2772 | raise ValueError(("'%s' was not found in history, as a file, nor in" | |
2771 | " the user namespace.") % target) |
|
2773 | " the user namespace.") % target) | |
2772 | if isinstance(codeobj, basestring): |
|
2774 | if isinstance(codeobj, basestring): | |
2773 | return codeobj |
|
2775 | return codeobj | |
2774 | elif isinstance(codeobj, Macro): |
|
2776 | elif isinstance(codeobj, Macro): | |
2775 | return codeobj.value |
|
2777 | return codeobj.value | |
2776 |
|
2778 | |||
2777 | raise TypeError("%s is neither a string nor a macro." % target, |
|
2779 | raise TypeError("%s is neither a string nor a macro." % target, | |
2778 | codeobj) |
|
2780 | codeobj) | |
2779 |
|
2781 | |||
2780 | #------------------------------------------------------------------------- |
|
2782 | #------------------------------------------------------------------------- | |
2781 | # Things related to IPython exiting |
|
2783 | # Things related to IPython exiting | |
2782 | #------------------------------------------------------------------------- |
|
2784 | #------------------------------------------------------------------------- | |
2783 | def atexit_operations(self): |
|
2785 | def atexit_operations(self): | |
2784 | """This will be executed at the time of exit. |
|
2786 | """This will be executed at the time of exit. | |
2785 |
|
2787 | |||
2786 | Cleanup operations and saving of persistent data that is done |
|
2788 | Cleanup operations and saving of persistent data that is done | |
2787 | unconditionally by IPython should be performed here. |
|
2789 | unconditionally by IPython should be performed here. | |
2788 |
|
2790 | |||
2789 | For things that may depend on startup flags or platform specifics (such |
|
2791 | For things that may depend on startup flags or platform specifics (such | |
2790 | as having readline or not), register a separate atexit function in the |
|
2792 | as having readline or not), register a separate atexit function in the | |
2791 | code that has the appropriate information, rather than trying to |
|
2793 | code that has the appropriate information, rather than trying to | |
2792 | clutter |
|
2794 | clutter | |
2793 | """ |
|
2795 | """ | |
2794 | # Close the history session (this stores the end time and line count) |
|
2796 | # Close the history session (this stores the end time and line count) | |
2795 | # this must be *before* the tempfile cleanup, in case of temporary |
|
2797 | # this must be *before* the tempfile cleanup, in case of temporary | |
2796 | # history db |
|
2798 | # history db | |
2797 | self.history_manager.end_session() |
|
2799 | self.history_manager.end_session() | |
2798 |
|
2800 | |||
2799 | # Cleanup all tempfiles left around |
|
2801 | # Cleanup all tempfiles left around | |
2800 | for tfile in self.tempfiles: |
|
2802 | for tfile in self.tempfiles: | |
2801 | try: |
|
2803 | try: | |
2802 | os.unlink(tfile) |
|
2804 | os.unlink(tfile) | |
2803 | except OSError: |
|
2805 | except OSError: | |
2804 | pass |
|
2806 | pass | |
2805 |
|
2807 | |||
2806 | # Clear all user namespaces to release all references cleanly. |
|
2808 | # Clear all user namespaces to release all references cleanly. | |
2807 | self.reset(new_session=False) |
|
2809 | self.reset(new_session=False) | |
2808 |
|
2810 | |||
2809 | # Run user hooks |
|
2811 | # Run user hooks | |
2810 | self.hooks.shutdown_hook() |
|
2812 | self.hooks.shutdown_hook() | |
2811 |
|
2813 | |||
2812 | def cleanup(self): |
|
2814 | def cleanup(self): | |
2813 | self.restore_sys_module_state() |
|
2815 | self.restore_sys_module_state() | |
2814 |
|
2816 | |||
2815 |
|
2817 | |||
2816 | class InteractiveShellABC(object): |
|
2818 | class InteractiveShellABC(object): | |
2817 | """An abstract base class for InteractiveShell.""" |
|
2819 | """An abstract base class for InteractiveShell.""" | |
2818 | __metaclass__ = abc.ABCMeta |
|
2820 | __metaclass__ = abc.ABCMeta | |
2819 |
|
2821 | |||
2820 | InteractiveShellABC.register(InteractiveShell) |
|
2822 | InteractiveShellABC.register(InteractiveShell) |
@@ -1,657 +1,660 b'' | |||||
1 | #!/usr/bin/env python |
|
1 | #!/usr/bin/env python | |
2 | """A simple interactive kernel that talks to a frontend over 0MQ. |
|
2 | """A simple interactive kernel that talks to a frontend over 0MQ. | |
3 |
|
3 | |||
4 | Things to do: |
|
4 | Things to do: | |
5 |
|
5 | |||
6 | * Implement `set_parent` logic. Right before doing exec, the Kernel should |
|
6 | * Implement `set_parent` logic. Right before doing exec, the Kernel should | |
7 | call set_parent on all the PUB objects with the message about to be executed. |
|
7 | call set_parent on all the PUB objects with the message about to be executed. | |
8 | * Implement random port and security key logic. |
|
8 | * Implement random port and security key logic. | |
9 | * Implement control messages. |
|
9 | * Implement control messages. | |
10 | * Implement event loop and poll version. |
|
10 | * Implement event loop and poll version. | |
11 | """ |
|
11 | """ | |
12 |
|
12 | |||
13 | #----------------------------------------------------------------------------- |
|
13 | #----------------------------------------------------------------------------- | |
14 | # Imports |
|
14 | # Imports | |
15 | #----------------------------------------------------------------------------- |
|
15 | #----------------------------------------------------------------------------- | |
16 | from __future__ import print_function |
|
16 | from __future__ import print_function | |
17 |
|
17 | |||
18 | # Standard library imports. |
|
18 | # Standard library imports. | |
19 | import __builtin__ |
|
19 | import __builtin__ | |
20 | import atexit |
|
20 | import atexit | |
21 | import sys |
|
21 | import sys | |
22 | import time |
|
22 | import time | |
23 | import traceback |
|
23 | import traceback | |
24 | import logging |
|
24 | import logging | |
25 | from signal import ( |
|
25 | from signal import ( | |
26 | signal, default_int_handler, SIGINT, SIG_IGN |
|
26 | signal, default_int_handler, SIGINT, SIG_IGN | |
27 | ) |
|
27 | ) | |
28 | # System library imports. |
|
28 | # System library imports. | |
29 | import zmq |
|
29 | import zmq | |
30 |
|
30 | |||
31 | # Local imports. |
|
31 | # Local imports. | |
32 | from IPython.core import pylabtools |
|
32 | from IPython.core import pylabtools | |
33 | from IPython.config.configurable import Configurable |
|
33 | from IPython.config.configurable import Configurable | |
34 | from IPython.config.application import boolean_flag, catch_config_error |
|
34 | from IPython.config.application import boolean_flag, catch_config_error | |
35 | from IPython.core.application import ProfileDir |
|
35 | from IPython.core.application import ProfileDir | |
36 | from IPython.core.error import StdinNotImplementedError |
|
36 | from IPython.core.error import StdinNotImplementedError | |
37 | from IPython.core.shellapp import ( |
|
37 | from IPython.core.shellapp import ( | |
38 | InteractiveShellApp, shell_flags, shell_aliases |
|
38 | InteractiveShellApp, shell_flags, shell_aliases | |
39 | ) |
|
39 | ) | |
40 | from IPython.utils import io |
|
40 | from IPython.utils import io | |
41 | from IPython.utils import py3compat |
|
41 | from IPython.utils import py3compat | |
42 | from IPython.utils.jsonutil import json_clean |
|
42 | from IPython.utils.jsonutil import json_clean | |
43 | from IPython.utils.traitlets import ( |
|
43 | from IPython.utils.traitlets import ( | |
44 | Any, Instance, Float, Dict, CaselessStrEnum |
|
44 | Any, Instance, Float, Dict, CaselessStrEnum | |
45 | ) |
|
45 | ) | |
46 |
|
46 | |||
47 | from entry_point import base_launch_kernel |
|
47 | from entry_point import base_launch_kernel | |
48 | from kernelapp import KernelApp, kernel_flags, kernel_aliases |
|
48 | from kernelapp import KernelApp, kernel_flags, kernel_aliases | |
49 | from session import Session, Message |
|
49 | from session import Session, Message | |
50 | from zmqshell import ZMQInteractiveShell |
|
50 | from zmqshell import ZMQInteractiveShell | |
51 |
|
51 | |||
52 |
|
52 | |||
53 | #----------------------------------------------------------------------------- |
|
53 | #----------------------------------------------------------------------------- | |
54 | # Main kernel class |
|
54 | # Main kernel class | |
55 | #----------------------------------------------------------------------------- |
|
55 | #----------------------------------------------------------------------------- | |
56 |
|
56 | |||
57 | class Kernel(Configurable): |
|
57 | class Kernel(Configurable): | |
58 |
|
58 | |||
59 | #--------------------------------------------------------------------------- |
|
59 | #--------------------------------------------------------------------------- | |
60 | # Kernel interface |
|
60 | # Kernel interface | |
61 | #--------------------------------------------------------------------------- |
|
61 | #--------------------------------------------------------------------------- | |
62 |
|
62 | |||
63 | # attribute to override with a GUI |
|
63 | # attribute to override with a GUI | |
64 | eventloop = Any(None) |
|
64 | eventloop = Any(None) | |
65 |
|
65 | |||
66 | shell = Instance('IPython.core.interactiveshell.InteractiveShellABC') |
|
66 | shell = Instance('IPython.core.interactiveshell.InteractiveShellABC') | |
67 | session = Instance(Session) |
|
67 | session = Instance(Session) | |
68 | profile_dir = Instance('IPython.core.profiledir.ProfileDir') |
|
68 | profile_dir = Instance('IPython.core.profiledir.ProfileDir') | |
69 | shell_socket = Instance('zmq.Socket') |
|
69 | shell_socket = Instance('zmq.Socket') | |
70 | iopub_socket = Instance('zmq.Socket') |
|
70 | iopub_socket = Instance('zmq.Socket') | |
71 | stdin_socket = Instance('zmq.Socket') |
|
71 | stdin_socket = Instance('zmq.Socket') | |
72 | log = Instance(logging.Logger) |
|
72 | log = Instance(logging.Logger) | |
73 |
|
73 | |||
74 | # Private interface |
|
74 | # Private interface | |
75 |
|
75 | |||
76 | # Time to sleep after flushing the stdout/err buffers in each execute |
|
76 | # Time to sleep after flushing the stdout/err buffers in each execute | |
77 | # cycle. While this introduces a hard limit on the minimal latency of the |
|
77 | # cycle. While this introduces a hard limit on the minimal latency of the | |
78 | # execute cycle, it helps prevent output synchronization problems for |
|
78 | # execute cycle, it helps prevent output synchronization problems for | |
79 | # clients. |
|
79 | # clients. | |
80 | # Units are in seconds. The minimum zmq latency on local host is probably |
|
80 | # Units are in seconds. The minimum zmq latency on local host is probably | |
81 | # ~150 microseconds, set this to 500us for now. We may need to increase it |
|
81 | # ~150 microseconds, set this to 500us for now. We may need to increase it | |
82 | # a little if it's not enough after more interactive testing. |
|
82 | # a little if it's not enough after more interactive testing. | |
83 | _execute_sleep = Float(0.0005, config=True) |
|
83 | _execute_sleep = Float(0.0005, config=True) | |
84 |
|
84 | |||
85 | # Frequency of the kernel's event loop. |
|
85 | # Frequency of the kernel's event loop. | |
86 | # Units are in seconds, kernel subclasses for GUI toolkits may need to |
|
86 | # Units are in seconds, kernel subclasses for GUI toolkits may need to | |
87 | # adapt to milliseconds. |
|
87 | # adapt to milliseconds. | |
88 | _poll_interval = Float(0.05, config=True) |
|
88 | _poll_interval = Float(0.05, config=True) | |
89 |
|
89 | |||
90 | # If the shutdown was requested over the network, we leave here the |
|
90 | # If the shutdown was requested over the network, we leave here the | |
91 | # necessary reply message so it can be sent by our registered atexit |
|
91 | # necessary reply message so it can be sent by our registered atexit | |
92 | # handler. This ensures that the reply is only sent to clients truly at |
|
92 | # handler. This ensures that the reply is only sent to clients truly at | |
93 | # the end of our shutdown process (which happens after the underlying |
|
93 | # the end of our shutdown process (which happens after the underlying | |
94 | # IPython shell's own shutdown). |
|
94 | # IPython shell's own shutdown). | |
95 | _shutdown_message = None |
|
95 | _shutdown_message = None | |
96 |
|
96 | |||
97 | # This is a dict of port number that the kernel is listening on. It is set |
|
97 | # This is a dict of port number that the kernel is listening on. It is set | |
98 | # by record_ports and used by connect_request. |
|
98 | # by record_ports and used by connect_request. | |
99 | _recorded_ports = Dict() |
|
99 | _recorded_ports = Dict() | |
100 |
|
100 | |||
101 |
|
101 | |||
102 |
|
102 | |||
103 | def __init__(self, **kwargs): |
|
103 | def __init__(self, **kwargs): | |
104 | super(Kernel, self).__init__(**kwargs) |
|
104 | super(Kernel, self).__init__(**kwargs) | |
105 |
|
105 | |||
106 | # Before we even start up the shell, register *first* our exit handlers |
|
106 | # Before we even start up the shell, register *first* our exit handlers | |
107 | # so they come before the shell's |
|
107 | # so they come before the shell's | |
108 | atexit.register(self._at_shutdown) |
|
108 | atexit.register(self._at_shutdown) | |
109 |
|
109 | |||
110 | # Initialize the InteractiveShell subclass |
|
110 | # Initialize the InteractiveShell subclass | |
111 | self.shell = ZMQInteractiveShell.instance(config=self.config, |
|
111 | self.shell = ZMQInteractiveShell.instance(config=self.config, | |
112 | profile_dir = self.profile_dir, |
|
112 | profile_dir = self.profile_dir, | |
113 | ) |
|
113 | ) | |
114 | self.shell.displayhook.session = self.session |
|
114 | self.shell.displayhook.session = self.session | |
115 | self.shell.displayhook.pub_socket = self.iopub_socket |
|
115 | self.shell.displayhook.pub_socket = self.iopub_socket | |
116 | self.shell.display_pub.session = self.session |
|
116 | self.shell.display_pub.session = self.session | |
117 | self.shell.display_pub.pub_socket = self.iopub_socket |
|
117 | self.shell.display_pub.pub_socket = self.iopub_socket | |
118 |
|
118 | |||
119 | # TMP - hack while developing |
|
119 | # TMP - hack while developing | |
120 | self.shell._reply_content = None |
|
120 | self.shell._reply_content = None | |
121 |
|
121 | |||
122 | # Build dict of handlers for message types |
|
122 | # Build dict of handlers for message types | |
123 | msg_types = [ 'execute_request', 'complete_request', |
|
123 | msg_types = [ 'execute_request', 'complete_request', | |
124 | 'object_info_request', 'history_request', |
|
124 | 'object_info_request', 'history_request', | |
125 | 'connect_request', 'shutdown_request'] |
|
125 | 'connect_request', 'shutdown_request'] | |
126 | self.handlers = {} |
|
126 | self.handlers = {} | |
127 | for msg_type in msg_types: |
|
127 | for msg_type in msg_types: | |
128 | self.handlers[msg_type] = getattr(self, msg_type) |
|
128 | self.handlers[msg_type] = getattr(self, msg_type) | |
129 |
|
129 | |||
130 | def do_one_iteration(self): |
|
130 | def do_one_iteration(self): | |
131 | """Do one iteration of the kernel's evaluation loop. |
|
131 | """Do one iteration of the kernel's evaluation loop. | |
132 | """ |
|
132 | """ | |
133 | try: |
|
133 | try: | |
134 | ident,msg = self.session.recv(self.shell_socket, zmq.NOBLOCK) |
|
134 | ident,msg = self.session.recv(self.shell_socket, zmq.NOBLOCK) | |
135 | except Exception: |
|
135 | except Exception: | |
136 | self.log.warn("Invalid Message:", exc_info=True) |
|
136 | self.log.warn("Invalid Message:", exc_info=True) | |
137 | return |
|
137 | return | |
138 | if msg is None: |
|
138 | if msg is None: | |
139 | return |
|
139 | return | |
140 |
|
140 | |||
141 | msg_type = msg['header']['msg_type'] |
|
141 | msg_type = msg['header']['msg_type'] | |
142 |
|
142 | |||
143 | # This assert will raise in versions of zeromq 2.0.7 and lesser. |
|
143 | # This assert will raise in versions of zeromq 2.0.7 and lesser. | |
144 | # We now require 2.0.8 or above, so we can uncomment for safety. |
|
144 | # We now require 2.0.8 or above, so we can uncomment for safety. | |
145 | # print(ident,msg, file=sys.__stdout__) |
|
145 | # print(ident,msg, file=sys.__stdout__) | |
146 | assert ident is not None, "Missing message part." |
|
146 | assert ident is not None, "Missing message part." | |
147 |
|
147 | |||
148 | # Print some info about this message and leave a '--->' marker, so it's |
|
148 | # Print some info about this message and leave a '--->' marker, so it's | |
149 | # easier to trace visually the message chain when debugging. Each |
|
149 | # easier to trace visually the message chain when debugging. Each | |
150 | # handler prints its message at the end. |
|
150 | # handler prints its message at the end. | |
151 | self.log.debug('\n*** MESSAGE TYPE:'+str(msg_type)+'***') |
|
151 | self.log.debug('\n*** MESSAGE TYPE:'+str(msg_type)+'***') | |
152 | self.log.debug(' Content: '+str(msg['content'])+'\n --->\n ') |
|
152 | self.log.debug(' Content: '+str(msg['content'])+'\n --->\n ') | |
153 |
|
153 | |||
154 | # Find and call actual handler for message |
|
154 | # Find and call actual handler for message | |
155 | handler = self.handlers.get(msg_type, None) |
|
155 | handler = self.handlers.get(msg_type, None) | |
156 | if handler is None: |
|
156 | if handler is None: | |
157 | self.log.error("UNKNOWN MESSAGE TYPE:" +str(msg)) |
|
157 | self.log.error("UNKNOWN MESSAGE TYPE:" +str(msg)) | |
158 | else: |
|
158 | else: | |
159 | handler(ident, msg) |
|
159 | handler(ident, msg) | |
160 |
|
160 | |||
161 | # Check whether we should exit, in case the incoming message set the |
|
161 | # Check whether we should exit, in case the incoming message set the | |
162 | # exit flag on |
|
162 | # exit flag on | |
163 | if self.shell.exit_now: |
|
163 | if self.shell.exit_now: | |
164 | self.log.debug('\nExiting IPython kernel...') |
|
164 | self.log.debug('\nExiting IPython kernel...') | |
165 | # We do a normal, clean exit, which allows any actions registered |
|
165 | # We do a normal, clean exit, which allows any actions registered | |
166 | # via atexit (such as history saving) to take place. |
|
166 | # via atexit (such as history saving) to take place. | |
167 | sys.exit(0) |
|
167 | sys.exit(0) | |
168 |
|
168 | |||
169 |
|
169 | |||
170 | def start(self): |
|
170 | def start(self): | |
171 | """ Start the kernel main loop. |
|
171 | """ Start the kernel main loop. | |
172 | """ |
|
172 | """ | |
173 | # a KeyboardInterrupt (SIGINT) can occur on any python statement, so |
|
173 | # a KeyboardInterrupt (SIGINT) can occur on any python statement, so | |
174 | # let's ignore (SIG_IGN) them until we're in a place to handle them properly |
|
174 | # let's ignore (SIG_IGN) them until we're in a place to handle them properly | |
175 | signal(SIGINT,SIG_IGN) |
|
175 | signal(SIGINT,SIG_IGN) | |
176 | poller = zmq.Poller() |
|
176 | poller = zmq.Poller() | |
177 | poller.register(self.shell_socket, zmq.POLLIN) |
|
177 | poller.register(self.shell_socket, zmq.POLLIN) | |
178 | # loop while self.eventloop has not been overridden |
|
178 | # loop while self.eventloop has not been overridden | |
179 | while self.eventloop is None: |
|
179 | while self.eventloop is None: | |
180 | try: |
|
180 | try: | |
181 | # scale by extra factor of 10, because there is no |
|
181 | # scale by extra factor of 10, because there is no | |
182 | # reason for this to be anything less than ~ 0.1s |
|
182 | # reason for this to be anything less than ~ 0.1s | |
183 | # since it is a real poller and will respond |
|
183 | # since it is a real poller and will respond | |
184 | # to events immediately |
|
184 | # to events immediately | |
185 |
|
185 | |||
186 | # double nested try/except, to properly catch KeyboardInterrupt |
|
186 | # double nested try/except, to properly catch KeyboardInterrupt | |
187 | # due to pyzmq Issue #130 |
|
187 | # due to pyzmq Issue #130 | |
188 | try: |
|
188 | try: | |
189 | poller.poll(10*1000*self._poll_interval) |
|
189 | poller.poll(10*1000*self._poll_interval) | |
190 | # restore raising of KeyboardInterrupt |
|
190 | # restore raising of KeyboardInterrupt | |
191 | signal(SIGINT, default_int_handler) |
|
191 | signal(SIGINT, default_int_handler) | |
192 | self.do_one_iteration() |
|
192 | self.do_one_iteration() | |
193 | except: |
|
193 | except: | |
194 | raise |
|
194 | raise | |
195 | finally: |
|
195 | finally: | |
196 | # prevent raising of KeyboardInterrupt |
|
196 | # prevent raising of KeyboardInterrupt | |
197 | signal(SIGINT,SIG_IGN) |
|
197 | signal(SIGINT,SIG_IGN) | |
198 | except KeyboardInterrupt: |
|
198 | except KeyboardInterrupt: | |
199 | # Ctrl-C shouldn't crash the kernel |
|
199 | # Ctrl-C shouldn't crash the kernel | |
200 | io.raw_print("KeyboardInterrupt caught in kernel") |
|
200 | io.raw_print("KeyboardInterrupt caught in kernel") | |
201 | # stop ignoring sigint, now that we are out of our own loop, |
|
201 | # stop ignoring sigint, now that we are out of our own loop, | |
202 | # we don't want to prevent future code from handling it |
|
202 | # we don't want to prevent future code from handling it | |
203 | signal(SIGINT, default_int_handler) |
|
203 | signal(SIGINT, default_int_handler) | |
204 | while self.eventloop is not None: |
|
204 | while self.eventloop is not None: | |
205 | try: |
|
205 | try: | |
206 | self.eventloop(self) |
|
206 | self.eventloop(self) | |
207 | except KeyboardInterrupt: |
|
207 | except KeyboardInterrupt: | |
208 | # Ctrl-C shouldn't crash the kernel |
|
208 | # Ctrl-C shouldn't crash the kernel | |
209 | io.raw_print("KeyboardInterrupt caught in kernel") |
|
209 | io.raw_print("KeyboardInterrupt caught in kernel") | |
210 | continue |
|
210 | continue | |
211 | else: |
|
211 | else: | |
212 | # eventloop exited cleanly, this means we should stop (right?) |
|
212 | # eventloop exited cleanly, this means we should stop (right?) | |
213 | self.eventloop = None |
|
213 | self.eventloop = None | |
214 | break |
|
214 | break | |
215 |
|
215 | |||
216 |
|
216 | |||
217 | def record_ports(self, ports): |
|
217 | def record_ports(self, ports): | |
218 | """Record the ports that this kernel is using. |
|
218 | """Record the ports that this kernel is using. | |
219 |
|
219 | |||
220 | The creator of the Kernel instance must call this methods if they |
|
220 | The creator of the Kernel instance must call this methods if they | |
221 | want the :meth:`connect_request` method to return the port numbers. |
|
221 | want the :meth:`connect_request` method to return the port numbers. | |
222 | """ |
|
222 | """ | |
223 | self._recorded_ports = ports |
|
223 | self._recorded_ports = ports | |
224 |
|
224 | |||
225 | #--------------------------------------------------------------------------- |
|
225 | #--------------------------------------------------------------------------- | |
226 | # Kernel request handlers |
|
226 | # Kernel request handlers | |
227 | #--------------------------------------------------------------------------- |
|
227 | #--------------------------------------------------------------------------- | |
228 |
|
228 | |||
229 | def _publish_pyin(self, code, parent, execution_count): |
|
229 | def _publish_pyin(self, code, parent, execution_count): | |
230 | """Publish the code request on the pyin stream.""" |
|
230 | """Publish the code request on the pyin stream.""" | |
231 |
|
231 | |||
232 | self.session.send(self.iopub_socket, u'pyin', {u'code':code, |
|
232 | self.session.send(self.iopub_socket, u'pyin', {u'code':code, | |
233 | u'execution_count': execution_count}, parent=parent) |
|
233 | u'execution_count': execution_count}, parent=parent) | |
234 |
|
234 | |||
235 | def execute_request(self, ident, parent): |
|
235 | def execute_request(self, ident, parent): | |
236 |
|
236 | |||
237 | self.session.send(self.iopub_socket, |
|
237 | self.session.send(self.iopub_socket, | |
238 | u'status', |
|
238 | u'status', | |
239 | {u'execution_state':u'busy'}, |
|
239 | {u'execution_state':u'busy'}, | |
240 | parent=parent ) |
|
240 | parent=parent ) | |
241 |
|
241 | |||
242 | try: |
|
242 | try: | |
243 | content = parent[u'content'] |
|
243 | content = parent[u'content'] | |
244 | code = content[u'code'] |
|
244 | code = content[u'code'] | |
245 | silent = content[u'silent'] |
|
245 | silent = content[u'silent'] | |
246 | except: |
|
246 | except: | |
247 | self.log.error("Got bad msg: ") |
|
247 | self.log.error("Got bad msg: ") | |
248 | self.log.error(str(Message(parent))) |
|
248 | self.log.error(str(Message(parent))) | |
249 | return |
|
249 | return | |
250 |
|
250 | |||
251 | shell = self.shell # we'll need this a lot here |
|
251 | shell = self.shell # we'll need this a lot here | |
252 |
|
252 | |||
253 | # Replace raw_input. Note that is not sufficient to replace |
|
253 | # Replace raw_input. Note that is not sufficient to replace | |
254 | # raw_input in the user namespace. |
|
254 | # raw_input in the user namespace. | |
255 | if content.get('allow_stdin', False): |
|
255 | if content.get('allow_stdin', False): | |
256 | raw_input = lambda prompt='': self._raw_input(prompt, ident, parent) |
|
256 | raw_input = lambda prompt='': self._raw_input(prompt, ident, parent) | |
257 | else: |
|
257 | else: | |
258 | raw_input = lambda prompt='' : self._no_raw_input() |
|
258 | raw_input = lambda prompt='' : self._no_raw_input() | |
259 |
|
259 | |||
260 | if py3compat.PY3: |
|
260 | if py3compat.PY3: | |
261 | __builtin__.input = raw_input |
|
261 | __builtin__.input = raw_input | |
262 | else: |
|
262 | else: | |
263 | __builtin__.raw_input = raw_input |
|
263 | __builtin__.raw_input = raw_input | |
264 |
|
264 | |||
265 | # Set the parent message of the display hook and out streams. |
|
265 | # Set the parent message of the display hook and out streams. | |
266 | shell.displayhook.set_parent(parent) |
|
266 | shell.displayhook.set_parent(parent) | |
267 | shell.display_pub.set_parent(parent) |
|
267 | shell.display_pub.set_parent(parent) | |
268 | sys.stdout.set_parent(parent) |
|
268 | sys.stdout.set_parent(parent) | |
269 | sys.stderr.set_parent(parent) |
|
269 | sys.stderr.set_parent(parent) | |
270 |
|
270 | |||
271 | # Re-broadcast our input for the benefit of listening clients, and |
|
271 | # Re-broadcast our input for the benefit of listening clients, and | |
272 | # start computing output |
|
272 | # start computing output | |
273 | if not silent: |
|
273 | if not silent: | |
274 | self._publish_pyin(code, parent, shell.execution_count) |
|
274 | self._publish_pyin(code, parent, shell.execution_count) | |
275 |
|
275 | |||
276 | reply_content = {} |
|
276 | reply_content = {} | |
277 | try: |
|
277 | try: | |
278 | if silent: |
|
278 | if silent: | |
279 | # run_code uses 'exec' mode, so no displayhook will fire, and it |
|
279 | # run_code uses 'exec' mode, so no displayhook will fire, and it | |
280 | # doesn't call logging or history manipulations. Print |
|
280 | # doesn't call logging or history manipulations. Print | |
281 | # statements in that code will obviously still execute. |
|
281 | # statements in that code will obviously still execute. | |
282 | shell.run_code(code) |
|
282 | shell.run_code(code) | |
283 | else: |
|
283 | else: | |
284 | # FIXME: the shell calls the exception handler itself. |
|
284 | # FIXME: the shell calls the exception handler itself. | |
285 | shell.run_cell(code, store_history=True) |
|
285 | shell.run_cell(code, store_history=True) | |
286 | except: |
|
286 | except: | |
287 | status = u'error' |
|
287 | status = u'error' | |
288 | # FIXME: this code right now isn't being used yet by default, |
|
288 | # FIXME: this code right now isn't being used yet by default, | |
289 | # because the run_cell() call above directly fires off exception |
|
289 | # because the run_cell() call above directly fires off exception | |
290 | # reporting. This code, therefore, is only active in the scenario |
|
290 | # reporting. This code, therefore, is only active in the scenario | |
291 | # where runlines itself has an unhandled exception. We need to |
|
291 | # where runlines itself has an unhandled exception. We need to | |
292 | # uniformize this, for all exception construction to come from a |
|
292 | # uniformize this, for all exception construction to come from a | |
293 | # single location in the codbase. |
|
293 | # single location in the codbase. | |
294 | etype, evalue, tb = sys.exc_info() |
|
294 | etype, evalue, tb = sys.exc_info() | |
295 | tb_list = traceback.format_exception(etype, evalue, tb) |
|
295 | tb_list = traceback.format_exception(etype, evalue, tb) | |
296 | reply_content.update(shell._showtraceback(etype, evalue, tb_list)) |
|
296 | reply_content.update(shell._showtraceback(etype, evalue, tb_list)) | |
297 | else: |
|
297 | else: | |
298 | status = u'ok' |
|
298 | status = u'ok' | |
299 |
|
299 | |||
300 | reply_content[u'status'] = status |
|
300 | reply_content[u'status'] = status | |
301 |
|
301 | |||
302 | # Return the execution counter so clients can display prompts |
|
302 | # Return the execution counter so clients can display prompts | |
303 | reply_content['execution_count'] = shell.execution_count -1 |
|
303 | reply_content['execution_count'] = shell.execution_count -1 | |
304 |
|
304 | |||
305 | # FIXME - fish exception info out of shell, possibly left there by |
|
305 | # FIXME - fish exception info out of shell, possibly left there by | |
306 | # runlines. We'll need to clean up this logic later. |
|
306 | # runlines. We'll need to clean up this logic later. | |
307 | if shell._reply_content is not None: |
|
307 | if shell._reply_content is not None: | |
308 | reply_content.update(shell._reply_content) |
|
308 | reply_content.update(shell._reply_content) | |
309 | # reset after use |
|
309 | # reset after use | |
310 | shell._reply_content = None |
|
310 | shell._reply_content = None | |
311 |
|
311 | |||
312 | # At this point, we can tell whether the main code execution succeeded |
|
312 | # At this point, we can tell whether the main code execution succeeded | |
313 | # or not. If it did, we proceed to evaluate user_variables/expressions |
|
313 | # or not. If it did, we proceed to evaluate user_variables/expressions | |
314 | if reply_content['status'] == 'ok': |
|
314 | if reply_content['status'] == 'ok': | |
315 | reply_content[u'user_variables'] = \ |
|
315 | reply_content[u'user_variables'] = \ | |
316 | shell.user_variables(content[u'user_variables']) |
|
316 | shell.user_variables(content[u'user_variables']) | |
317 | reply_content[u'user_expressions'] = \ |
|
317 | reply_content[u'user_expressions'] = \ | |
318 | shell.user_expressions(content[u'user_expressions']) |
|
318 | shell.user_expressions(content[u'user_expressions']) | |
319 | else: |
|
319 | else: | |
320 | # If there was an error, don't even try to compute variables or |
|
320 | # If there was an error, don't even try to compute variables or | |
321 | # expressions |
|
321 | # expressions | |
322 | reply_content[u'user_variables'] = {} |
|
322 | reply_content[u'user_variables'] = {} | |
323 | reply_content[u'user_expressions'] = {} |
|
323 | reply_content[u'user_expressions'] = {} | |
324 |
|
324 | |||
325 | # Payloads should be retrieved regardless of outcome, so we can both |
|
325 | # Payloads should be retrieved regardless of outcome, so we can both | |
326 | # recover partial output (that could have been generated early in a |
|
326 | # recover partial output (that could have been generated early in a | |
327 | # block, before an error) and clear the payload system always. |
|
327 | # block, before an error) and clear the payload system always. | |
328 | reply_content[u'payload'] = shell.payload_manager.read_payload() |
|
328 | reply_content[u'payload'] = shell.payload_manager.read_payload() | |
329 | # Be agressive about clearing the payload because we don't want |
|
329 | # Be agressive about clearing the payload because we don't want | |
330 | # it to sit in memory until the next execute_request comes in. |
|
330 | # it to sit in memory until the next execute_request comes in. | |
331 | shell.payload_manager.clear_payload() |
|
331 | shell.payload_manager.clear_payload() | |
332 |
|
332 | |||
333 | # Flush output before sending the reply. |
|
333 | # Flush output before sending the reply. | |
334 | sys.stdout.flush() |
|
334 | sys.stdout.flush() | |
335 | sys.stderr.flush() |
|
335 | sys.stderr.flush() | |
336 | # FIXME: on rare occasions, the flush doesn't seem to make it to the |
|
336 | # FIXME: on rare occasions, the flush doesn't seem to make it to the | |
337 | # clients... This seems to mitigate the problem, but we definitely need |
|
337 | # clients... This seems to mitigate the problem, but we definitely need | |
338 | # to better understand what's going on. |
|
338 | # to better understand what's going on. | |
339 | if self._execute_sleep: |
|
339 | if self._execute_sleep: | |
340 | time.sleep(self._execute_sleep) |
|
340 | time.sleep(self._execute_sleep) | |
341 |
|
341 | |||
342 | # Send the reply. |
|
342 | # Send the reply. | |
343 | reply_content = json_clean(reply_content) |
|
343 | reply_content = json_clean(reply_content) | |
344 | reply_msg = self.session.send(self.shell_socket, u'execute_reply', |
|
344 | reply_msg = self.session.send(self.shell_socket, u'execute_reply', | |
345 | reply_content, parent, ident=ident) |
|
345 | reply_content, parent, ident=ident) | |
346 | self.log.debug(str(reply_msg)) |
|
346 | self.log.debug(str(reply_msg)) | |
347 |
|
347 | |||
348 | if reply_msg['content']['status'] == u'error': |
|
348 | if reply_msg['content']['status'] == u'error': | |
349 | self._abort_queue() |
|
349 | self._abort_queue() | |
350 |
|
350 | |||
351 | self.session.send(self.iopub_socket, |
|
351 | self.session.send(self.iopub_socket, | |
352 | u'status', |
|
352 | u'status', | |
353 | {u'execution_state':u'idle'}, |
|
353 | {u'execution_state':u'idle'}, | |
354 | parent=parent ) |
|
354 | parent=parent ) | |
355 |
|
355 | |||
356 | def complete_request(self, ident, parent): |
|
356 | def complete_request(self, ident, parent): | |
357 | txt, matches = self._complete(parent) |
|
357 | txt, matches = self._complete(parent) | |
358 | matches = {'matches' : matches, |
|
358 | matches = {'matches' : matches, | |
359 | 'matched_text' : txt, |
|
359 | 'matched_text' : txt, | |
360 | 'status' : 'ok'} |
|
360 | 'status' : 'ok'} | |
361 | matches = json_clean(matches) |
|
361 | matches = json_clean(matches) | |
362 | completion_msg = self.session.send(self.shell_socket, 'complete_reply', |
|
362 | completion_msg = self.session.send(self.shell_socket, 'complete_reply', | |
363 | matches, parent, ident) |
|
363 | matches, parent, ident) | |
364 | self.log.debug(str(completion_msg)) |
|
364 | self.log.debug(str(completion_msg)) | |
365 |
|
365 | |||
366 | def object_info_request(self, ident, parent): |
|
366 | def object_info_request(self, ident, parent): | |
367 | object_info = self.shell.object_inspect(parent['content']['oname']) |
|
367 | content = parent['content'] | |
|
368 | object_info = self.shell.object_inspect(content['oname'], | |||
|
369 | detail_level = content.get('detail_level', 0) | |||
|
370 | ) | |||
368 | # Before we send this object over, we scrub it for JSON usage |
|
371 | # Before we send this object over, we scrub it for JSON usage | |
369 | oinfo = json_clean(object_info) |
|
372 | oinfo = json_clean(object_info) | |
370 | msg = self.session.send(self.shell_socket, 'object_info_reply', |
|
373 | msg = self.session.send(self.shell_socket, 'object_info_reply', | |
371 | oinfo, parent, ident) |
|
374 | oinfo, parent, ident) | |
372 | self.log.debug(msg) |
|
375 | self.log.debug(msg) | |
373 |
|
376 | |||
374 | def history_request(self, ident, parent): |
|
377 | def history_request(self, ident, parent): | |
375 | # We need to pull these out, as passing **kwargs doesn't work with |
|
378 | # We need to pull these out, as passing **kwargs doesn't work with | |
376 | # unicode keys before Python 2.6.5. |
|
379 | # unicode keys before Python 2.6.5. | |
377 | hist_access_type = parent['content']['hist_access_type'] |
|
380 | hist_access_type = parent['content']['hist_access_type'] | |
378 | raw = parent['content']['raw'] |
|
381 | raw = parent['content']['raw'] | |
379 | output = parent['content']['output'] |
|
382 | output = parent['content']['output'] | |
380 | if hist_access_type == 'tail': |
|
383 | if hist_access_type == 'tail': | |
381 | n = parent['content']['n'] |
|
384 | n = parent['content']['n'] | |
382 | hist = self.shell.history_manager.get_tail(n, raw=raw, output=output, |
|
385 | hist = self.shell.history_manager.get_tail(n, raw=raw, output=output, | |
383 | include_latest=True) |
|
386 | include_latest=True) | |
384 |
|
387 | |||
385 | elif hist_access_type == 'range': |
|
388 | elif hist_access_type == 'range': | |
386 | session = parent['content']['session'] |
|
389 | session = parent['content']['session'] | |
387 | start = parent['content']['start'] |
|
390 | start = parent['content']['start'] | |
388 | stop = parent['content']['stop'] |
|
391 | stop = parent['content']['stop'] | |
389 | hist = self.shell.history_manager.get_range(session, start, stop, |
|
392 | hist = self.shell.history_manager.get_range(session, start, stop, | |
390 | raw=raw, output=output) |
|
393 | raw=raw, output=output) | |
391 |
|
394 | |||
392 | elif hist_access_type == 'search': |
|
395 | elif hist_access_type == 'search': | |
393 | pattern = parent['content']['pattern'] |
|
396 | pattern = parent['content']['pattern'] | |
394 | hist = self.shell.history_manager.search(pattern, raw=raw, |
|
397 | hist = self.shell.history_manager.search(pattern, raw=raw, | |
395 | output=output) |
|
398 | output=output) | |
396 |
|
399 | |||
397 | else: |
|
400 | else: | |
398 | hist = [] |
|
401 | hist = [] | |
399 | hist = list(hist) |
|
402 | hist = list(hist) | |
400 | content = {'history' : hist} |
|
403 | content = {'history' : hist} | |
401 | content = json_clean(content) |
|
404 | content = json_clean(content) | |
402 | msg = self.session.send(self.shell_socket, 'history_reply', |
|
405 | msg = self.session.send(self.shell_socket, 'history_reply', | |
403 | content, parent, ident) |
|
406 | content, parent, ident) | |
404 | self.log.debug("Sending history reply with %i entries", len(hist)) |
|
407 | self.log.debug("Sending history reply with %i entries", len(hist)) | |
405 |
|
408 | |||
406 | def connect_request(self, ident, parent): |
|
409 | def connect_request(self, ident, parent): | |
407 | if self._recorded_ports is not None: |
|
410 | if self._recorded_ports is not None: | |
408 | content = self._recorded_ports.copy() |
|
411 | content = self._recorded_ports.copy() | |
409 | else: |
|
412 | else: | |
410 | content = {} |
|
413 | content = {} | |
411 | msg = self.session.send(self.shell_socket, 'connect_reply', |
|
414 | msg = self.session.send(self.shell_socket, 'connect_reply', | |
412 | content, parent, ident) |
|
415 | content, parent, ident) | |
413 | self.log.debug(msg) |
|
416 | self.log.debug(msg) | |
414 |
|
417 | |||
415 | def shutdown_request(self, ident, parent): |
|
418 | def shutdown_request(self, ident, parent): | |
416 | self.shell.exit_now = True |
|
419 | self.shell.exit_now = True | |
417 | self._shutdown_message = self.session.msg(u'shutdown_reply', |
|
420 | self._shutdown_message = self.session.msg(u'shutdown_reply', | |
418 | parent['content'], parent) |
|
421 | parent['content'], parent) | |
419 | sys.exit(0) |
|
422 | sys.exit(0) | |
420 |
|
423 | |||
421 | #--------------------------------------------------------------------------- |
|
424 | #--------------------------------------------------------------------------- | |
422 | # Protected interface |
|
425 | # Protected interface | |
423 | #--------------------------------------------------------------------------- |
|
426 | #--------------------------------------------------------------------------- | |
424 |
|
427 | |||
425 | def _abort_queue(self): |
|
428 | def _abort_queue(self): | |
426 | while True: |
|
429 | while True: | |
427 | try: |
|
430 | try: | |
428 | ident,msg = self.session.recv(self.shell_socket, zmq.NOBLOCK) |
|
431 | ident,msg = self.session.recv(self.shell_socket, zmq.NOBLOCK) | |
429 | except Exception: |
|
432 | except Exception: | |
430 | self.log.warn("Invalid Message:", exc_info=True) |
|
433 | self.log.warn("Invalid Message:", exc_info=True) | |
431 | continue |
|
434 | continue | |
432 | if msg is None: |
|
435 | if msg is None: | |
433 | break |
|
436 | break | |
434 | else: |
|
437 | else: | |
435 | assert ident is not None, \ |
|
438 | assert ident is not None, \ | |
436 | "Unexpected missing message part." |
|
439 | "Unexpected missing message part." | |
437 |
|
440 | |||
438 | self.log.debug("Aborting:\n"+str(Message(msg))) |
|
441 | self.log.debug("Aborting:\n"+str(Message(msg))) | |
439 | msg_type = msg['header']['msg_type'] |
|
442 | msg_type = msg['header']['msg_type'] | |
440 | reply_type = msg_type.split('_')[0] + '_reply' |
|
443 | reply_type = msg_type.split('_')[0] + '_reply' | |
441 | reply_msg = self.session.send(self.shell_socket, reply_type, |
|
444 | reply_msg = self.session.send(self.shell_socket, reply_type, | |
442 | {'status' : 'aborted'}, msg, ident=ident) |
|
445 | {'status' : 'aborted'}, msg, ident=ident) | |
443 | self.log.debug(reply_msg) |
|
446 | self.log.debug(reply_msg) | |
444 | # We need to wait a bit for requests to come in. This can probably |
|
447 | # We need to wait a bit for requests to come in. This can probably | |
445 | # be set shorter for true asynchronous clients. |
|
448 | # be set shorter for true asynchronous clients. | |
446 | time.sleep(0.1) |
|
449 | time.sleep(0.1) | |
447 |
|
450 | |||
448 | def _no_raw_input(self): |
|
451 | def _no_raw_input(self): | |
449 | """Raise StdinNotImplentedError if active frontend doesn't support |
|
452 | """Raise StdinNotImplentedError if active frontend doesn't support | |
450 | stdin.""" |
|
453 | stdin.""" | |
451 | raise StdinNotImplementedError("raw_input was called, but this " |
|
454 | raise StdinNotImplementedError("raw_input was called, but this " | |
452 | "frontend does not support stdin.") |
|
455 | "frontend does not support stdin.") | |
453 |
|
456 | |||
454 | def _raw_input(self, prompt, ident, parent): |
|
457 | def _raw_input(self, prompt, ident, parent): | |
455 | # Flush output before making the request. |
|
458 | # Flush output before making the request. | |
456 | sys.stderr.flush() |
|
459 | sys.stderr.flush() | |
457 | sys.stdout.flush() |
|
460 | sys.stdout.flush() | |
458 |
|
461 | |||
459 | # Send the input request. |
|
462 | # Send the input request. | |
460 | content = json_clean(dict(prompt=prompt)) |
|
463 | content = json_clean(dict(prompt=prompt)) | |
461 | self.session.send(self.stdin_socket, u'input_request', content, parent, |
|
464 | self.session.send(self.stdin_socket, u'input_request', content, parent, | |
462 | ident=ident) |
|
465 | ident=ident) | |
463 |
|
466 | |||
464 | # Await a response. |
|
467 | # Await a response. | |
465 | while True: |
|
468 | while True: | |
466 | try: |
|
469 | try: | |
467 | ident, reply = self.session.recv(self.stdin_socket, 0) |
|
470 | ident, reply = self.session.recv(self.stdin_socket, 0) | |
468 | except Exception: |
|
471 | except Exception: | |
469 | self.log.warn("Invalid Message:", exc_info=True) |
|
472 | self.log.warn("Invalid Message:", exc_info=True) | |
470 | else: |
|
473 | else: | |
471 | break |
|
474 | break | |
472 | try: |
|
475 | try: | |
473 | value = reply['content']['value'] |
|
476 | value = reply['content']['value'] | |
474 | except: |
|
477 | except: | |
475 | self.log.error("Got bad raw_input reply: ") |
|
478 | self.log.error("Got bad raw_input reply: ") | |
476 | self.log.error(str(Message(parent))) |
|
479 | self.log.error(str(Message(parent))) | |
477 | value = '' |
|
480 | value = '' | |
478 | if value == '\x04': |
|
481 | if value == '\x04': | |
479 | # EOF |
|
482 | # EOF | |
480 | raise EOFError |
|
483 | raise EOFError | |
481 | return value |
|
484 | return value | |
482 |
|
485 | |||
483 | def _complete(self, msg): |
|
486 | def _complete(self, msg): | |
484 | c = msg['content'] |
|
487 | c = msg['content'] | |
485 | try: |
|
488 | try: | |
486 | cpos = int(c['cursor_pos']) |
|
489 | cpos = int(c['cursor_pos']) | |
487 | except: |
|
490 | except: | |
488 | # If we don't get something that we can convert to an integer, at |
|
491 | # If we don't get something that we can convert to an integer, at | |
489 | # least attempt the completion guessing the cursor is at the end of |
|
492 | # least attempt the completion guessing the cursor is at the end of | |
490 | # the text, if there's any, and otherwise of the line |
|
493 | # the text, if there's any, and otherwise of the line | |
491 | cpos = len(c['text']) |
|
494 | cpos = len(c['text']) | |
492 | if cpos==0: |
|
495 | if cpos==0: | |
493 | cpos = len(c['line']) |
|
496 | cpos = len(c['line']) | |
494 | return self.shell.complete(c['text'], c['line'], cpos) |
|
497 | return self.shell.complete(c['text'], c['line'], cpos) | |
495 |
|
498 | |||
496 | def _object_info(self, context): |
|
499 | def _object_info(self, context): | |
497 | symbol, leftover = self._symbol_from_context(context) |
|
500 | symbol, leftover = self._symbol_from_context(context) | |
498 | if symbol is not None and not leftover: |
|
501 | if symbol is not None and not leftover: | |
499 | doc = getattr(symbol, '__doc__', '') |
|
502 | doc = getattr(symbol, '__doc__', '') | |
500 | else: |
|
503 | else: | |
501 | doc = '' |
|
504 | doc = '' | |
502 | object_info = dict(docstring = doc) |
|
505 | object_info = dict(docstring = doc) | |
503 | return object_info |
|
506 | return object_info | |
504 |
|
507 | |||
505 | def _symbol_from_context(self, context): |
|
508 | def _symbol_from_context(self, context): | |
506 | if not context: |
|
509 | if not context: | |
507 | return None, context |
|
510 | return None, context | |
508 |
|
511 | |||
509 | base_symbol_string = context[0] |
|
512 | base_symbol_string = context[0] | |
510 | symbol = self.shell.user_ns.get(base_symbol_string, None) |
|
513 | symbol = self.shell.user_ns.get(base_symbol_string, None) | |
511 | if symbol is None: |
|
514 | if symbol is None: | |
512 | symbol = __builtin__.__dict__.get(base_symbol_string, None) |
|
515 | symbol = __builtin__.__dict__.get(base_symbol_string, None) | |
513 | if symbol is None: |
|
516 | if symbol is None: | |
514 | return None, context |
|
517 | return None, context | |
515 |
|
518 | |||
516 | context = context[1:] |
|
519 | context = context[1:] | |
517 | for i, name in enumerate(context): |
|
520 | for i, name in enumerate(context): | |
518 | new_symbol = getattr(symbol, name, None) |
|
521 | new_symbol = getattr(symbol, name, None) | |
519 | if new_symbol is None: |
|
522 | if new_symbol is None: | |
520 | return symbol, context[i:] |
|
523 | return symbol, context[i:] | |
521 | else: |
|
524 | else: | |
522 | symbol = new_symbol |
|
525 | symbol = new_symbol | |
523 |
|
526 | |||
524 | return symbol, [] |
|
527 | return symbol, [] | |
525 |
|
528 | |||
526 | def _at_shutdown(self): |
|
529 | def _at_shutdown(self): | |
527 | """Actions taken at shutdown by the kernel, called by python's atexit. |
|
530 | """Actions taken at shutdown by the kernel, called by python's atexit. | |
528 | """ |
|
531 | """ | |
529 | # io.rprint("Kernel at_shutdown") # dbg |
|
532 | # io.rprint("Kernel at_shutdown") # dbg | |
530 | if self._shutdown_message is not None: |
|
533 | if self._shutdown_message is not None: | |
531 | self.session.send(self.shell_socket, self._shutdown_message) |
|
534 | self.session.send(self.shell_socket, self._shutdown_message) | |
532 | self.session.send(self.iopub_socket, self._shutdown_message) |
|
535 | self.session.send(self.iopub_socket, self._shutdown_message) | |
533 | self.log.debug(str(self._shutdown_message)) |
|
536 | self.log.debug(str(self._shutdown_message)) | |
534 | # A very short sleep to give zmq time to flush its message buffers |
|
537 | # A very short sleep to give zmq time to flush its message buffers | |
535 | # before Python truly shuts down. |
|
538 | # before Python truly shuts down. | |
536 | time.sleep(0.01) |
|
539 | time.sleep(0.01) | |
537 |
|
540 | |||
538 | #----------------------------------------------------------------------------- |
|
541 | #----------------------------------------------------------------------------- | |
539 | # Aliases and Flags for the IPKernelApp |
|
542 | # Aliases and Flags for the IPKernelApp | |
540 | #----------------------------------------------------------------------------- |
|
543 | #----------------------------------------------------------------------------- | |
541 |
|
544 | |||
542 | flags = dict(kernel_flags) |
|
545 | flags = dict(kernel_flags) | |
543 | flags.update(shell_flags) |
|
546 | flags.update(shell_flags) | |
544 |
|
547 | |||
545 | addflag = lambda *args: flags.update(boolean_flag(*args)) |
|
548 | addflag = lambda *args: flags.update(boolean_flag(*args)) | |
546 |
|
549 | |||
547 | flags['pylab'] = ( |
|
550 | flags['pylab'] = ( | |
548 | {'IPKernelApp' : {'pylab' : 'auto'}}, |
|
551 | {'IPKernelApp' : {'pylab' : 'auto'}}, | |
549 | """Pre-load matplotlib and numpy for interactive use with |
|
552 | """Pre-load matplotlib and numpy for interactive use with | |
550 | the default matplotlib backend.""" |
|
553 | the default matplotlib backend.""" | |
551 | ) |
|
554 | ) | |
552 |
|
555 | |||
553 | aliases = dict(kernel_aliases) |
|
556 | aliases = dict(kernel_aliases) | |
554 | aliases.update(shell_aliases) |
|
557 | aliases.update(shell_aliases) | |
555 |
|
558 | |||
556 | # it's possible we don't want short aliases for *all* of these: |
|
559 | # it's possible we don't want short aliases for *all* of these: | |
557 | aliases.update(dict( |
|
560 | aliases.update(dict( | |
558 | pylab='IPKernelApp.pylab', |
|
561 | pylab='IPKernelApp.pylab', | |
559 | )) |
|
562 | )) | |
560 |
|
563 | |||
561 | #----------------------------------------------------------------------------- |
|
564 | #----------------------------------------------------------------------------- | |
562 | # The IPKernelApp class |
|
565 | # The IPKernelApp class | |
563 | #----------------------------------------------------------------------------- |
|
566 | #----------------------------------------------------------------------------- | |
564 |
|
567 | |||
565 | class IPKernelApp(KernelApp, InteractiveShellApp): |
|
568 | class IPKernelApp(KernelApp, InteractiveShellApp): | |
566 | name = 'ipkernel' |
|
569 | name = 'ipkernel' | |
567 |
|
570 | |||
568 | aliases = Dict(aliases) |
|
571 | aliases = Dict(aliases) | |
569 | flags = Dict(flags) |
|
572 | flags = Dict(flags) | |
570 | classes = [Kernel, ZMQInteractiveShell, ProfileDir, Session] |
|
573 | classes = [Kernel, ZMQInteractiveShell, ProfileDir, Session] | |
571 | # configurables |
|
574 | # configurables | |
572 | pylab = CaselessStrEnum(['tk', 'qt', 'wx', 'gtk', 'osx', 'inline', 'auto'], |
|
575 | pylab = CaselessStrEnum(['tk', 'qt', 'wx', 'gtk', 'osx', 'inline', 'auto'], | |
573 | config=True, |
|
576 | config=True, | |
574 | help="""Pre-load matplotlib and numpy for interactive use, |
|
577 | help="""Pre-load matplotlib and numpy for interactive use, | |
575 | selecting a particular matplotlib backend and loop integration. |
|
578 | selecting a particular matplotlib backend and loop integration. | |
576 | """ |
|
579 | """ | |
577 | ) |
|
580 | ) | |
578 |
|
581 | |||
579 | @catch_config_error |
|
582 | @catch_config_error | |
580 | def initialize(self, argv=None): |
|
583 | def initialize(self, argv=None): | |
581 | super(IPKernelApp, self).initialize(argv) |
|
584 | super(IPKernelApp, self).initialize(argv) | |
582 | self.init_shell() |
|
585 | self.init_shell() | |
583 | self.init_extensions() |
|
586 | self.init_extensions() | |
584 | self.init_code() |
|
587 | self.init_code() | |
585 |
|
588 | |||
586 | def init_kernel(self): |
|
589 | def init_kernel(self): | |
587 |
|
590 | |||
588 | kernel = Kernel(config=self.config, session=self.session, |
|
591 | kernel = Kernel(config=self.config, session=self.session, | |
589 | shell_socket=self.shell_socket, |
|
592 | shell_socket=self.shell_socket, | |
590 | iopub_socket=self.iopub_socket, |
|
593 | iopub_socket=self.iopub_socket, | |
591 | stdin_socket=self.stdin_socket, |
|
594 | stdin_socket=self.stdin_socket, | |
592 | log=self.log, |
|
595 | log=self.log, | |
593 | profile_dir=self.profile_dir, |
|
596 | profile_dir=self.profile_dir, | |
594 | ) |
|
597 | ) | |
595 | self.kernel = kernel |
|
598 | self.kernel = kernel | |
596 | kernel.record_ports(self.ports) |
|
599 | kernel.record_ports(self.ports) | |
597 | shell = kernel.shell |
|
600 | shell = kernel.shell | |
598 | if self.pylab: |
|
601 | if self.pylab: | |
599 | try: |
|
602 | try: | |
600 | gui, backend = pylabtools.find_gui_and_backend(self.pylab) |
|
603 | gui, backend = pylabtools.find_gui_and_backend(self.pylab) | |
601 | shell.enable_pylab(gui, import_all=self.pylab_import_all) |
|
604 | shell.enable_pylab(gui, import_all=self.pylab_import_all) | |
602 | except Exception: |
|
605 | except Exception: | |
603 | self.log.error("Pylab initialization failed", exc_info=True) |
|
606 | self.log.error("Pylab initialization failed", exc_info=True) | |
604 | # print exception straight to stdout, because normally |
|
607 | # print exception straight to stdout, because normally | |
605 | # _showtraceback associates the reply with an execution, |
|
608 | # _showtraceback associates the reply with an execution, | |
606 | # which means frontends will never draw it, as this exception |
|
609 | # which means frontends will never draw it, as this exception | |
607 | # is not associated with any execute request. |
|
610 | # is not associated with any execute request. | |
608 |
|
611 | |||
609 | # replace pyerr-sending traceback with stdout |
|
612 | # replace pyerr-sending traceback with stdout | |
610 | _showtraceback = shell._showtraceback |
|
613 | _showtraceback = shell._showtraceback | |
611 | def print_tb(etype, evalue, stb): |
|
614 | def print_tb(etype, evalue, stb): | |
612 | print ("Error initializing pylab, pylab mode will not " |
|
615 | print ("Error initializing pylab, pylab mode will not " | |
613 | "be active", file=io.stderr) |
|
616 | "be active", file=io.stderr) | |
614 | print (shell.InteractiveTB.stb2text(stb), file=io.stdout) |
|
617 | print (shell.InteractiveTB.stb2text(stb), file=io.stdout) | |
615 | shell._showtraceback = print_tb |
|
618 | shell._showtraceback = print_tb | |
616 |
|
619 | |||
617 | # send the traceback over stdout |
|
620 | # send the traceback over stdout | |
618 | shell.showtraceback(tb_offset=0) |
|
621 | shell.showtraceback(tb_offset=0) | |
619 |
|
622 | |||
620 | # restore proper _showtraceback method |
|
623 | # restore proper _showtraceback method | |
621 | shell._showtraceback = _showtraceback |
|
624 | shell._showtraceback = _showtraceback | |
622 |
|
625 | |||
623 |
|
626 | |||
624 | def init_shell(self): |
|
627 | def init_shell(self): | |
625 | self.shell = self.kernel.shell |
|
628 | self.shell = self.kernel.shell | |
626 | self.shell.configurables.append(self) |
|
629 | self.shell.configurables.append(self) | |
627 |
|
630 | |||
628 |
|
631 | |||
629 | #----------------------------------------------------------------------------- |
|
632 | #----------------------------------------------------------------------------- | |
630 | # Kernel main and launch functions |
|
633 | # Kernel main and launch functions | |
631 | #----------------------------------------------------------------------------- |
|
634 | #----------------------------------------------------------------------------- | |
632 |
|
635 | |||
633 | def launch_kernel(*args, **kwargs): |
|
636 | def launch_kernel(*args, **kwargs): | |
634 | """Launches a localhost IPython kernel, binding to the specified ports. |
|
637 | """Launches a localhost IPython kernel, binding to the specified ports. | |
635 |
|
638 | |||
636 | This function simply calls entry_point.base_launch_kernel with the right |
|
639 | This function simply calls entry_point.base_launch_kernel with the right | |
637 | first command to start an ipkernel. See base_launch_kernel for arguments. |
|
640 | first command to start an ipkernel. See base_launch_kernel for arguments. | |
638 |
|
641 | |||
639 | Returns |
|
642 | Returns | |
640 | ------- |
|
643 | ------- | |
641 | A tuple of form: |
|
644 | A tuple of form: | |
642 | (kernel_process, shell_port, iopub_port, stdin_port, hb_port) |
|
645 | (kernel_process, shell_port, iopub_port, stdin_port, hb_port) | |
643 | where kernel_process is a Popen object and the ports are integers. |
|
646 | where kernel_process is a Popen object and the ports are integers. | |
644 | """ |
|
647 | """ | |
645 | return base_launch_kernel('from IPython.zmq.ipkernel import main; main()', |
|
648 | return base_launch_kernel('from IPython.zmq.ipkernel import main; main()', | |
646 | *args, **kwargs) |
|
649 | *args, **kwargs) | |
647 |
|
650 | |||
648 |
|
651 | |||
649 | def main(): |
|
652 | def main(): | |
650 | """Run an IPKernel as an application""" |
|
653 | """Run an IPKernel as an application""" | |
651 | app = IPKernelApp.instance() |
|
654 | app = IPKernelApp.instance() | |
652 | app.initialize() |
|
655 | app.initialize() | |
653 | app.start() |
|
656 | app.start() | |
654 |
|
657 | |||
655 |
|
658 | |||
656 | if __name__ == '__main__': |
|
659 | if __name__ == '__main__': | |
657 | main() |
|
660 | main() |
@@ -1,981 +1,983 b'' | |||||
1 | """Base classes to manage the interaction with a running kernel. |
|
1 | """Base classes to manage the interaction with a running kernel. | |
2 |
|
2 | |||
3 | TODO |
|
3 | TODO | |
4 | * Create logger to handle debugging and console messages. |
|
4 | * Create logger to handle debugging and console messages. | |
5 | """ |
|
5 | """ | |
6 |
|
6 | |||
7 | #----------------------------------------------------------------------------- |
|
7 | #----------------------------------------------------------------------------- | |
8 | # Copyright (C) 2008-2011 The IPython Development Team |
|
8 | # Copyright (C) 2008-2011 The IPython Development Team | |
9 | # |
|
9 | # | |
10 | # Distributed under the terms of the BSD License. The full license is in |
|
10 | # Distributed under the terms of the BSD License. The full license is in | |
11 | # the file COPYING, distributed as part of this software. |
|
11 | # the file COPYING, distributed as part of this software. | |
12 | #----------------------------------------------------------------------------- |
|
12 | #----------------------------------------------------------------------------- | |
13 |
|
13 | |||
14 | #----------------------------------------------------------------------------- |
|
14 | #----------------------------------------------------------------------------- | |
15 | # Imports |
|
15 | # Imports | |
16 | #----------------------------------------------------------------------------- |
|
16 | #----------------------------------------------------------------------------- | |
17 |
|
17 | |||
18 | # Standard library imports. |
|
18 | # Standard library imports. | |
19 | import atexit |
|
19 | import atexit | |
20 | import errno |
|
20 | import errno | |
21 | import json |
|
21 | import json | |
22 | from subprocess import Popen |
|
22 | from subprocess import Popen | |
23 | import os |
|
23 | import os | |
24 | import signal |
|
24 | import signal | |
25 | import sys |
|
25 | import sys | |
26 | from threading import Thread |
|
26 | from threading import Thread | |
27 | import time |
|
27 | import time | |
28 |
|
28 | |||
29 | # System library imports. |
|
29 | # System library imports. | |
30 | import zmq |
|
30 | import zmq | |
31 | # import ZMQError in top-level namespace, to avoid ugly attribute-error messages |
|
31 | # import ZMQError in top-level namespace, to avoid ugly attribute-error messages | |
32 | # during garbage collection of threads at exit: |
|
32 | # during garbage collection of threads at exit: | |
33 | from zmq import ZMQError |
|
33 | from zmq import ZMQError | |
34 | from zmq.eventloop import ioloop, zmqstream |
|
34 | from zmq.eventloop import ioloop, zmqstream | |
35 |
|
35 | |||
36 | # Local imports. |
|
36 | # Local imports. | |
37 | from IPython.config.loader import Config |
|
37 | from IPython.config.loader import Config | |
38 | from IPython.utils.localinterfaces import LOCALHOST, LOCAL_IPS |
|
38 | from IPython.utils.localinterfaces import LOCALHOST, LOCAL_IPS | |
39 | from IPython.utils.traitlets import ( |
|
39 | from IPython.utils.traitlets import ( | |
40 | HasTraits, Any, Instance, Type, Unicode, Integer, Bool |
|
40 | HasTraits, Any, Instance, Type, Unicode, Integer, Bool | |
41 | ) |
|
41 | ) | |
42 | from IPython.utils.py3compat import str_to_bytes |
|
42 | from IPython.utils.py3compat import str_to_bytes | |
43 | from IPython.zmq.entry_point import write_connection_file |
|
43 | from IPython.zmq.entry_point import write_connection_file | |
44 | from session import Session |
|
44 | from session import Session | |
45 |
|
45 | |||
46 | #----------------------------------------------------------------------------- |
|
46 | #----------------------------------------------------------------------------- | |
47 | # Constants and exceptions |
|
47 | # Constants and exceptions | |
48 | #----------------------------------------------------------------------------- |
|
48 | #----------------------------------------------------------------------------- | |
49 |
|
49 | |||
50 | class InvalidPortNumber(Exception): |
|
50 | class InvalidPortNumber(Exception): | |
51 | pass |
|
51 | pass | |
52 |
|
52 | |||
53 | #----------------------------------------------------------------------------- |
|
53 | #----------------------------------------------------------------------------- | |
54 | # Utility functions |
|
54 | # Utility functions | |
55 | #----------------------------------------------------------------------------- |
|
55 | #----------------------------------------------------------------------------- | |
56 |
|
56 | |||
57 | # some utilities to validate message structure, these might get moved elsewhere |
|
57 | # some utilities to validate message structure, these might get moved elsewhere | |
58 | # if they prove to have more generic utility |
|
58 | # if they prove to have more generic utility | |
59 |
|
59 | |||
60 | def validate_string_list(lst): |
|
60 | def validate_string_list(lst): | |
61 | """Validate that the input is a list of strings. |
|
61 | """Validate that the input is a list of strings. | |
62 |
|
62 | |||
63 | Raises ValueError if not.""" |
|
63 | Raises ValueError if not.""" | |
64 | if not isinstance(lst, list): |
|
64 | if not isinstance(lst, list): | |
65 | raise ValueError('input %r must be a list' % lst) |
|
65 | raise ValueError('input %r must be a list' % lst) | |
66 | for x in lst: |
|
66 | for x in lst: | |
67 | if not isinstance(x, basestring): |
|
67 | if not isinstance(x, basestring): | |
68 | raise ValueError('element %r in list must be a string' % x) |
|
68 | raise ValueError('element %r in list must be a string' % x) | |
69 |
|
69 | |||
70 |
|
70 | |||
71 | def validate_string_dict(dct): |
|
71 | def validate_string_dict(dct): | |
72 | """Validate that the input is a dict with string keys and values. |
|
72 | """Validate that the input is a dict with string keys and values. | |
73 |
|
73 | |||
74 | Raises ValueError if not.""" |
|
74 | Raises ValueError if not.""" | |
75 | for k,v in dct.iteritems(): |
|
75 | for k,v in dct.iteritems(): | |
76 | if not isinstance(k, basestring): |
|
76 | if not isinstance(k, basestring): | |
77 | raise ValueError('key %r in dict must be a string' % k) |
|
77 | raise ValueError('key %r in dict must be a string' % k) | |
78 | if not isinstance(v, basestring): |
|
78 | if not isinstance(v, basestring): | |
79 | raise ValueError('value %r in dict must be a string' % v) |
|
79 | raise ValueError('value %r in dict must be a string' % v) | |
80 |
|
80 | |||
81 |
|
81 | |||
82 | #----------------------------------------------------------------------------- |
|
82 | #----------------------------------------------------------------------------- | |
83 | # ZMQ Socket Channel classes |
|
83 | # ZMQ Socket Channel classes | |
84 | #----------------------------------------------------------------------------- |
|
84 | #----------------------------------------------------------------------------- | |
85 |
|
85 | |||
86 | class ZMQSocketChannel(Thread): |
|
86 | class ZMQSocketChannel(Thread): | |
87 | """The base class for the channels that use ZMQ sockets. |
|
87 | """The base class for the channels that use ZMQ sockets. | |
88 | """ |
|
88 | """ | |
89 | context = None |
|
89 | context = None | |
90 | session = None |
|
90 | session = None | |
91 | socket = None |
|
91 | socket = None | |
92 | ioloop = None |
|
92 | ioloop = None | |
93 | stream = None |
|
93 | stream = None | |
94 | _address = None |
|
94 | _address = None | |
95 | _exiting = False |
|
95 | _exiting = False | |
96 |
|
96 | |||
97 | def __init__(self, context, session, address): |
|
97 | def __init__(self, context, session, address): | |
98 | """Create a channel |
|
98 | """Create a channel | |
99 |
|
99 | |||
100 | Parameters |
|
100 | Parameters | |
101 | ---------- |
|
101 | ---------- | |
102 | context : :class:`zmq.Context` |
|
102 | context : :class:`zmq.Context` | |
103 | The ZMQ context to use. |
|
103 | The ZMQ context to use. | |
104 | session : :class:`session.Session` |
|
104 | session : :class:`session.Session` | |
105 | The session to use. |
|
105 | The session to use. | |
106 | address : tuple |
|
106 | address : tuple | |
107 | Standard (ip, port) tuple that the kernel is listening on. |
|
107 | Standard (ip, port) tuple that the kernel is listening on. | |
108 | """ |
|
108 | """ | |
109 | super(ZMQSocketChannel, self).__init__() |
|
109 | super(ZMQSocketChannel, self).__init__() | |
110 | self.daemon = True |
|
110 | self.daemon = True | |
111 |
|
111 | |||
112 | self.context = context |
|
112 | self.context = context | |
113 | self.session = session |
|
113 | self.session = session | |
114 | if address[1] == 0: |
|
114 | if address[1] == 0: | |
115 | message = 'The port number for a channel cannot be 0.' |
|
115 | message = 'The port number for a channel cannot be 0.' | |
116 | raise InvalidPortNumber(message) |
|
116 | raise InvalidPortNumber(message) | |
117 | self._address = address |
|
117 | self._address = address | |
118 | atexit.register(self._notice_exit) |
|
118 | atexit.register(self._notice_exit) | |
119 |
|
119 | |||
120 | def _notice_exit(self): |
|
120 | def _notice_exit(self): | |
121 | self._exiting = True |
|
121 | self._exiting = True | |
122 |
|
122 | |||
123 | def _run_loop(self): |
|
123 | def _run_loop(self): | |
124 | """Run my loop, ignoring EINTR events in the poller""" |
|
124 | """Run my loop, ignoring EINTR events in the poller""" | |
125 | while True: |
|
125 | while True: | |
126 | try: |
|
126 | try: | |
127 | self.ioloop.start() |
|
127 | self.ioloop.start() | |
128 | except ZMQError as e: |
|
128 | except ZMQError as e: | |
129 | if e.errno == errno.EINTR: |
|
129 | if e.errno == errno.EINTR: | |
130 | continue |
|
130 | continue | |
131 | else: |
|
131 | else: | |
132 | raise |
|
132 | raise | |
133 | except Exception: |
|
133 | except Exception: | |
134 | if self._exiting: |
|
134 | if self._exiting: | |
135 | break |
|
135 | break | |
136 | else: |
|
136 | else: | |
137 | raise |
|
137 | raise | |
138 | else: |
|
138 | else: | |
139 | break |
|
139 | break | |
140 |
|
140 | |||
141 | def stop(self): |
|
141 | def stop(self): | |
142 | """Stop the channel's activity. |
|
142 | """Stop the channel's activity. | |
143 |
|
143 | |||
144 | This calls :method:`Thread.join` and returns when the thread |
|
144 | This calls :method:`Thread.join` and returns when the thread | |
145 | terminates. :class:`RuntimeError` will be raised if |
|
145 | terminates. :class:`RuntimeError` will be raised if | |
146 | :method:`self.start` is called again. |
|
146 | :method:`self.start` is called again. | |
147 | """ |
|
147 | """ | |
148 | self.join() |
|
148 | self.join() | |
149 |
|
149 | |||
150 | @property |
|
150 | @property | |
151 | def address(self): |
|
151 | def address(self): | |
152 | """Get the channel's address as an (ip, port) tuple. |
|
152 | """Get the channel's address as an (ip, port) tuple. | |
153 |
|
153 | |||
154 | By the default, the address is (localhost, 0), where 0 means a random |
|
154 | By the default, the address is (localhost, 0), where 0 means a random | |
155 | port. |
|
155 | port. | |
156 | """ |
|
156 | """ | |
157 | return self._address |
|
157 | return self._address | |
158 |
|
158 | |||
159 | def _queue_send(self, msg): |
|
159 | def _queue_send(self, msg): | |
160 | """Queue a message to be sent from the IOLoop's thread. |
|
160 | """Queue a message to be sent from the IOLoop's thread. | |
161 |
|
161 | |||
162 | Parameters |
|
162 | Parameters | |
163 | ---------- |
|
163 | ---------- | |
164 | msg : message to send |
|
164 | msg : message to send | |
165 |
|
165 | |||
166 | This is threadsafe, as it uses IOLoop.add_callback to give the loop's |
|
166 | This is threadsafe, as it uses IOLoop.add_callback to give the loop's | |
167 | thread control of the action. |
|
167 | thread control of the action. | |
168 | """ |
|
168 | """ | |
169 | def thread_send(): |
|
169 | def thread_send(): | |
170 | self.session.send(self.stream, msg) |
|
170 | self.session.send(self.stream, msg) | |
171 | self.ioloop.add_callback(thread_send) |
|
171 | self.ioloop.add_callback(thread_send) | |
172 |
|
172 | |||
173 | def _handle_recv(self, msg): |
|
173 | def _handle_recv(self, msg): | |
174 | """callback for stream.on_recv |
|
174 | """callback for stream.on_recv | |
175 |
|
175 | |||
176 | unpacks message, and calls handlers with it. |
|
176 | unpacks message, and calls handlers with it. | |
177 | """ |
|
177 | """ | |
178 | ident,smsg = self.session.feed_identities(msg) |
|
178 | ident,smsg = self.session.feed_identities(msg) | |
179 | self.call_handlers(self.session.unserialize(smsg)) |
|
179 | self.call_handlers(self.session.unserialize(smsg)) | |
180 |
|
180 | |||
181 |
|
181 | |||
182 |
|
182 | |||
183 | class ShellSocketChannel(ZMQSocketChannel): |
|
183 | class ShellSocketChannel(ZMQSocketChannel): | |
184 | """The XREQ channel for issues request/replies to the kernel. |
|
184 | """The XREQ channel for issues request/replies to the kernel. | |
185 | """ |
|
185 | """ | |
186 |
|
186 | |||
187 | command_queue = None |
|
187 | command_queue = None | |
188 | # flag for whether execute requests should be allowed to call raw_input: |
|
188 | # flag for whether execute requests should be allowed to call raw_input: | |
189 | allow_stdin = True |
|
189 | allow_stdin = True | |
190 |
|
190 | |||
191 | def __init__(self, context, session, address): |
|
191 | def __init__(self, context, session, address): | |
192 | super(ShellSocketChannel, self).__init__(context, session, address) |
|
192 | super(ShellSocketChannel, self).__init__(context, session, address) | |
193 | self.ioloop = ioloop.IOLoop() |
|
193 | self.ioloop = ioloop.IOLoop() | |
194 |
|
194 | |||
195 | def run(self): |
|
195 | def run(self): | |
196 | """The thread's main activity. Call start() instead.""" |
|
196 | """The thread's main activity. Call start() instead.""" | |
197 | self.socket = self.context.socket(zmq.DEALER) |
|
197 | self.socket = self.context.socket(zmq.DEALER) | |
198 | self.socket.setsockopt(zmq.IDENTITY, self.session.bsession) |
|
198 | self.socket.setsockopt(zmq.IDENTITY, self.session.bsession) | |
199 | self.socket.connect('tcp://%s:%i' % self.address) |
|
199 | self.socket.connect('tcp://%s:%i' % self.address) | |
200 | self.stream = zmqstream.ZMQStream(self.socket, self.ioloop) |
|
200 | self.stream = zmqstream.ZMQStream(self.socket, self.ioloop) | |
201 | self.stream.on_recv(self._handle_recv) |
|
201 | self.stream.on_recv(self._handle_recv) | |
202 | self._run_loop() |
|
202 | self._run_loop() | |
203 |
|
203 | |||
204 | def stop(self): |
|
204 | def stop(self): | |
205 | self.ioloop.stop() |
|
205 | self.ioloop.stop() | |
206 | super(ShellSocketChannel, self).stop() |
|
206 | super(ShellSocketChannel, self).stop() | |
207 |
|
207 | |||
208 | def call_handlers(self, msg): |
|
208 | def call_handlers(self, msg): | |
209 | """This method is called in the ioloop thread when a message arrives. |
|
209 | """This method is called in the ioloop thread when a message arrives. | |
210 |
|
210 | |||
211 | Subclasses should override this method to handle incoming messages. |
|
211 | Subclasses should override this method to handle incoming messages. | |
212 | It is important to remember that this method is called in the thread |
|
212 | It is important to remember that this method is called in the thread | |
213 | so that some logic must be done to ensure that the application leve |
|
213 | so that some logic must be done to ensure that the application leve | |
214 | handlers are called in the application thread. |
|
214 | handlers are called in the application thread. | |
215 | """ |
|
215 | """ | |
216 | raise NotImplementedError('call_handlers must be defined in a subclass.') |
|
216 | raise NotImplementedError('call_handlers must be defined in a subclass.') | |
217 |
|
217 | |||
218 | def execute(self, code, silent=False, |
|
218 | def execute(self, code, silent=False, | |
219 | user_variables=None, user_expressions=None, allow_stdin=None): |
|
219 | user_variables=None, user_expressions=None, allow_stdin=None): | |
220 | """Execute code in the kernel. |
|
220 | """Execute code in the kernel. | |
221 |
|
221 | |||
222 | Parameters |
|
222 | Parameters | |
223 | ---------- |
|
223 | ---------- | |
224 | code : str |
|
224 | code : str | |
225 | A string of Python code. |
|
225 | A string of Python code. | |
226 |
|
226 | |||
227 | silent : bool, optional (default False) |
|
227 | silent : bool, optional (default False) | |
228 | If set, the kernel will execute the code as quietly possible. |
|
228 | If set, the kernel will execute the code as quietly possible. | |
229 |
|
229 | |||
230 | user_variables : list, optional |
|
230 | user_variables : list, optional | |
231 | A list of variable names to pull from the user's namespace. They |
|
231 | A list of variable names to pull from the user's namespace. They | |
232 | will come back as a dict with these names as keys and their |
|
232 | will come back as a dict with these names as keys and their | |
233 | :func:`repr` as values. |
|
233 | :func:`repr` as values. | |
234 |
|
234 | |||
235 | user_expressions : dict, optional |
|
235 | user_expressions : dict, optional | |
236 | A dict with string keys and to pull from the user's |
|
236 | A dict with string keys and to pull from the user's | |
237 | namespace. They will come back as a dict with these names as keys |
|
237 | namespace. They will come back as a dict with these names as keys | |
238 | and their :func:`repr` as values. |
|
238 | and their :func:`repr` as values. | |
239 |
|
239 | |||
240 | allow_stdin : bool, optional |
|
240 | allow_stdin : bool, optional | |
241 | Flag for |
|
241 | Flag for | |
242 | A dict with string keys and to pull from the user's |
|
242 | A dict with string keys and to pull from the user's | |
243 | namespace. They will come back as a dict with these names as keys |
|
243 | namespace. They will come back as a dict with these names as keys | |
244 | and their :func:`repr` as values. |
|
244 | and their :func:`repr` as values. | |
245 |
|
245 | |||
246 | Returns |
|
246 | Returns | |
247 | ------- |
|
247 | ------- | |
248 | The msg_id of the message sent. |
|
248 | The msg_id of the message sent. | |
249 | """ |
|
249 | """ | |
250 | if user_variables is None: |
|
250 | if user_variables is None: | |
251 | user_variables = [] |
|
251 | user_variables = [] | |
252 | if user_expressions is None: |
|
252 | if user_expressions is None: | |
253 | user_expressions = {} |
|
253 | user_expressions = {} | |
254 | if allow_stdin is None: |
|
254 | if allow_stdin is None: | |
255 | allow_stdin = self.allow_stdin |
|
255 | allow_stdin = self.allow_stdin | |
256 |
|
256 | |||
257 |
|
257 | |||
258 | # Don't waste network traffic if inputs are invalid |
|
258 | # Don't waste network traffic if inputs are invalid | |
259 | if not isinstance(code, basestring): |
|
259 | if not isinstance(code, basestring): | |
260 | raise ValueError('code %r must be a string' % code) |
|
260 | raise ValueError('code %r must be a string' % code) | |
261 | validate_string_list(user_variables) |
|
261 | validate_string_list(user_variables) | |
262 | validate_string_dict(user_expressions) |
|
262 | validate_string_dict(user_expressions) | |
263 |
|
263 | |||
264 | # Create class for content/msg creation. Related to, but possibly |
|
264 | # Create class for content/msg creation. Related to, but possibly | |
265 | # not in Session. |
|
265 | # not in Session. | |
266 | content = dict(code=code, silent=silent, |
|
266 | content = dict(code=code, silent=silent, | |
267 | user_variables=user_variables, |
|
267 | user_variables=user_variables, | |
268 | user_expressions=user_expressions, |
|
268 | user_expressions=user_expressions, | |
269 | allow_stdin=allow_stdin, |
|
269 | allow_stdin=allow_stdin, | |
270 | ) |
|
270 | ) | |
271 | msg = self.session.msg('execute_request', content) |
|
271 | msg = self.session.msg('execute_request', content) | |
272 | self._queue_send(msg) |
|
272 | self._queue_send(msg) | |
273 | return msg['header']['msg_id'] |
|
273 | return msg['header']['msg_id'] | |
274 |
|
274 | |||
275 | def complete(self, text, line, cursor_pos, block=None): |
|
275 | def complete(self, text, line, cursor_pos, block=None): | |
276 | """Tab complete text in the kernel's namespace. |
|
276 | """Tab complete text in the kernel's namespace. | |
277 |
|
277 | |||
278 | Parameters |
|
278 | Parameters | |
279 | ---------- |
|
279 | ---------- | |
280 | text : str |
|
280 | text : str | |
281 | The text to complete. |
|
281 | The text to complete. | |
282 | line : str |
|
282 | line : str | |
283 | The full line of text that is the surrounding context for the |
|
283 | The full line of text that is the surrounding context for the | |
284 | text to complete. |
|
284 | text to complete. | |
285 | cursor_pos : int |
|
285 | cursor_pos : int | |
286 | The position of the cursor in the line where the completion was |
|
286 | The position of the cursor in the line where the completion was | |
287 | requested. |
|
287 | requested. | |
288 | block : str, optional |
|
288 | block : str, optional | |
289 | The full block of code in which the completion is being requested. |
|
289 | The full block of code in which the completion is being requested. | |
290 |
|
290 | |||
291 | Returns |
|
291 | Returns | |
292 | ------- |
|
292 | ------- | |
293 | The msg_id of the message sent. |
|
293 | The msg_id of the message sent. | |
294 | """ |
|
294 | """ | |
295 | content = dict(text=text, line=line, block=block, cursor_pos=cursor_pos) |
|
295 | content = dict(text=text, line=line, block=block, cursor_pos=cursor_pos) | |
296 | msg = self.session.msg('complete_request', content) |
|
296 | msg = self.session.msg('complete_request', content) | |
297 | self._queue_send(msg) |
|
297 | self._queue_send(msg) | |
298 | return msg['header']['msg_id'] |
|
298 | return msg['header']['msg_id'] | |
299 |
|
299 | |||
300 | def object_info(self, oname): |
|
300 | def object_info(self, oname, detail_level=0): | |
301 | """Get metadata information about an object. |
|
301 | """Get metadata information about an object. | |
302 |
|
302 | |||
303 | Parameters |
|
303 | Parameters | |
304 | ---------- |
|
304 | ---------- | |
305 | oname : str |
|
305 | oname : str | |
306 | A string specifying the object name. |
|
306 | A string specifying the object name. | |
|
307 | detail_level : int, optional | |||
|
308 | The level of detail for the introspection (0-2) | |||
307 |
|
309 | |||
308 | Returns |
|
310 | Returns | |
309 | ------- |
|
311 | ------- | |
310 | The msg_id of the message sent. |
|
312 | The msg_id of the message sent. | |
311 | """ |
|
313 | """ | |
312 | content = dict(oname=oname) |
|
314 | content = dict(oname=oname, detail_level=detail_level) | |
313 | msg = self.session.msg('object_info_request', content) |
|
315 | msg = self.session.msg('object_info_request', content) | |
314 | self._queue_send(msg) |
|
316 | self._queue_send(msg) | |
315 | return msg['header']['msg_id'] |
|
317 | return msg['header']['msg_id'] | |
316 |
|
318 | |||
317 | def history(self, raw=True, output=False, hist_access_type='range', **kwargs): |
|
319 | def history(self, raw=True, output=False, hist_access_type='range', **kwargs): | |
318 | """Get entries from the history list. |
|
320 | """Get entries from the history list. | |
319 |
|
321 | |||
320 | Parameters |
|
322 | Parameters | |
321 | ---------- |
|
323 | ---------- | |
322 | raw : bool |
|
324 | raw : bool | |
323 | If True, return the raw input. |
|
325 | If True, return the raw input. | |
324 | output : bool |
|
326 | output : bool | |
325 | If True, then return the output as well. |
|
327 | If True, then return the output as well. | |
326 | hist_access_type : str |
|
328 | hist_access_type : str | |
327 | 'range' (fill in session, start and stop params), 'tail' (fill in n) |
|
329 | 'range' (fill in session, start and stop params), 'tail' (fill in n) | |
328 | or 'search' (fill in pattern param). |
|
330 | or 'search' (fill in pattern param). | |
329 |
|
331 | |||
330 | session : int |
|
332 | session : int | |
331 | For a range request, the session from which to get lines. Session |
|
333 | For a range request, the session from which to get lines. Session | |
332 | numbers are positive integers; negative ones count back from the |
|
334 | numbers are positive integers; negative ones count back from the | |
333 | current session. |
|
335 | current session. | |
334 | start : int |
|
336 | start : int | |
335 | The first line number of a history range. |
|
337 | The first line number of a history range. | |
336 | stop : int |
|
338 | stop : int | |
337 | The final (excluded) line number of a history range. |
|
339 | The final (excluded) line number of a history range. | |
338 |
|
340 | |||
339 | n : int |
|
341 | n : int | |
340 | The number of lines of history to get for a tail request. |
|
342 | The number of lines of history to get for a tail request. | |
341 |
|
343 | |||
342 | pattern : str |
|
344 | pattern : str | |
343 | The glob-syntax pattern for a search request. |
|
345 | The glob-syntax pattern for a search request. | |
344 |
|
346 | |||
345 | Returns |
|
347 | Returns | |
346 | ------- |
|
348 | ------- | |
347 | The msg_id of the message sent. |
|
349 | The msg_id of the message sent. | |
348 | """ |
|
350 | """ | |
349 | content = dict(raw=raw, output=output, hist_access_type=hist_access_type, |
|
351 | content = dict(raw=raw, output=output, hist_access_type=hist_access_type, | |
350 | **kwargs) |
|
352 | **kwargs) | |
351 | msg = self.session.msg('history_request', content) |
|
353 | msg = self.session.msg('history_request', content) | |
352 | self._queue_send(msg) |
|
354 | self._queue_send(msg) | |
353 | return msg['header']['msg_id'] |
|
355 | return msg['header']['msg_id'] | |
354 |
|
356 | |||
355 | def shutdown(self, restart=False): |
|
357 | def shutdown(self, restart=False): | |
356 | """Request an immediate kernel shutdown. |
|
358 | """Request an immediate kernel shutdown. | |
357 |
|
359 | |||
358 | Upon receipt of the (empty) reply, client code can safely assume that |
|
360 | Upon receipt of the (empty) reply, client code can safely assume that | |
359 | the kernel has shut down and it's safe to forcefully terminate it if |
|
361 | the kernel has shut down and it's safe to forcefully terminate it if | |
360 | it's still alive. |
|
362 | it's still alive. | |
361 |
|
363 | |||
362 | The kernel will send the reply via a function registered with Python's |
|
364 | The kernel will send the reply via a function registered with Python's | |
363 | atexit module, ensuring it's truly done as the kernel is done with all |
|
365 | atexit module, ensuring it's truly done as the kernel is done with all | |
364 | normal operation. |
|
366 | normal operation. | |
365 | """ |
|
367 | """ | |
366 | # Send quit message to kernel. Once we implement kernel-side setattr, |
|
368 | # Send quit message to kernel. Once we implement kernel-side setattr, | |
367 | # this should probably be done that way, but for now this will do. |
|
369 | # this should probably be done that way, but for now this will do. | |
368 | msg = self.session.msg('shutdown_request', {'restart':restart}) |
|
370 | msg = self.session.msg('shutdown_request', {'restart':restart}) | |
369 | self._queue_send(msg) |
|
371 | self._queue_send(msg) | |
370 | return msg['header']['msg_id'] |
|
372 | return msg['header']['msg_id'] | |
371 |
|
373 | |||
372 |
|
374 | |||
373 |
|
375 | |||
374 | class SubSocketChannel(ZMQSocketChannel): |
|
376 | class SubSocketChannel(ZMQSocketChannel): | |
375 | """The SUB channel which listens for messages that the kernel publishes. |
|
377 | """The SUB channel which listens for messages that the kernel publishes. | |
376 | """ |
|
378 | """ | |
377 |
|
379 | |||
378 | def __init__(self, context, session, address): |
|
380 | def __init__(self, context, session, address): | |
379 | super(SubSocketChannel, self).__init__(context, session, address) |
|
381 | super(SubSocketChannel, self).__init__(context, session, address) | |
380 | self.ioloop = ioloop.IOLoop() |
|
382 | self.ioloop = ioloop.IOLoop() | |
381 |
|
383 | |||
382 | def run(self): |
|
384 | def run(self): | |
383 | """The thread's main activity. Call start() instead.""" |
|
385 | """The thread's main activity. Call start() instead.""" | |
384 | self.socket = self.context.socket(zmq.SUB) |
|
386 | self.socket = self.context.socket(zmq.SUB) | |
385 | self.socket.setsockopt(zmq.SUBSCRIBE,b'') |
|
387 | self.socket.setsockopt(zmq.SUBSCRIBE,b'') | |
386 | self.socket.setsockopt(zmq.IDENTITY, self.session.bsession) |
|
388 | self.socket.setsockopt(zmq.IDENTITY, self.session.bsession) | |
387 | self.socket.connect('tcp://%s:%i' % self.address) |
|
389 | self.socket.connect('tcp://%s:%i' % self.address) | |
388 | self.stream = zmqstream.ZMQStream(self.socket, self.ioloop) |
|
390 | self.stream = zmqstream.ZMQStream(self.socket, self.ioloop) | |
389 | self.stream.on_recv(self._handle_recv) |
|
391 | self.stream.on_recv(self._handle_recv) | |
390 | self._run_loop() |
|
392 | self._run_loop() | |
391 |
|
393 | |||
392 | def stop(self): |
|
394 | def stop(self): | |
393 | self.ioloop.stop() |
|
395 | self.ioloop.stop() | |
394 | super(SubSocketChannel, self).stop() |
|
396 | super(SubSocketChannel, self).stop() | |
395 |
|
397 | |||
396 | def call_handlers(self, msg): |
|
398 | def call_handlers(self, msg): | |
397 | """This method is called in the ioloop thread when a message arrives. |
|
399 | """This method is called in the ioloop thread when a message arrives. | |
398 |
|
400 | |||
399 | Subclasses should override this method to handle incoming messages. |
|
401 | Subclasses should override this method to handle incoming messages. | |
400 | It is important to remember that this method is called in the thread |
|
402 | It is important to remember that this method is called in the thread | |
401 | so that some logic must be done to ensure that the application leve |
|
403 | so that some logic must be done to ensure that the application leve | |
402 | handlers are called in the application thread. |
|
404 | handlers are called in the application thread. | |
403 | """ |
|
405 | """ | |
404 | raise NotImplementedError('call_handlers must be defined in a subclass.') |
|
406 | raise NotImplementedError('call_handlers must be defined in a subclass.') | |
405 |
|
407 | |||
406 | def flush(self, timeout=1.0): |
|
408 | def flush(self, timeout=1.0): | |
407 | """Immediately processes all pending messages on the SUB channel. |
|
409 | """Immediately processes all pending messages on the SUB channel. | |
408 |
|
410 | |||
409 | Callers should use this method to ensure that :method:`call_handlers` |
|
411 | Callers should use this method to ensure that :method:`call_handlers` | |
410 | has been called for all messages that have been received on the |
|
412 | has been called for all messages that have been received on the | |
411 | 0MQ SUB socket of this channel. |
|
413 | 0MQ SUB socket of this channel. | |
412 |
|
414 | |||
413 | This method is thread safe. |
|
415 | This method is thread safe. | |
414 |
|
416 | |||
415 | Parameters |
|
417 | Parameters | |
416 | ---------- |
|
418 | ---------- | |
417 | timeout : float, optional |
|
419 | timeout : float, optional | |
418 | The maximum amount of time to spend flushing, in seconds. The |
|
420 | The maximum amount of time to spend flushing, in seconds. The | |
419 | default is one second. |
|
421 | default is one second. | |
420 | """ |
|
422 | """ | |
421 | # We do the IOLoop callback process twice to ensure that the IOLoop |
|
423 | # We do the IOLoop callback process twice to ensure that the IOLoop | |
422 | # gets to perform at least one full poll. |
|
424 | # gets to perform at least one full poll. | |
423 | stop_time = time.time() + timeout |
|
425 | stop_time = time.time() + timeout | |
424 | for i in xrange(2): |
|
426 | for i in xrange(2): | |
425 | self._flushed = False |
|
427 | self._flushed = False | |
426 | self.ioloop.add_callback(self._flush) |
|
428 | self.ioloop.add_callback(self._flush) | |
427 | while not self._flushed and time.time() < stop_time: |
|
429 | while not self._flushed and time.time() < stop_time: | |
428 | time.sleep(0.01) |
|
430 | time.sleep(0.01) | |
429 |
|
431 | |||
430 | def _flush(self): |
|
432 | def _flush(self): | |
431 | """Callback for :method:`self.flush`.""" |
|
433 | """Callback for :method:`self.flush`.""" | |
432 | self.stream.flush() |
|
434 | self.stream.flush() | |
433 | self._flushed = True |
|
435 | self._flushed = True | |
434 |
|
436 | |||
435 |
|
437 | |||
436 | class StdInSocketChannel(ZMQSocketChannel): |
|
438 | class StdInSocketChannel(ZMQSocketChannel): | |
437 | """A reply channel to handle raw_input requests that the kernel makes.""" |
|
439 | """A reply channel to handle raw_input requests that the kernel makes.""" | |
438 |
|
440 | |||
439 | msg_queue = None |
|
441 | msg_queue = None | |
440 |
|
442 | |||
441 | def __init__(self, context, session, address): |
|
443 | def __init__(self, context, session, address): | |
442 | super(StdInSocketChannel, self).__init__(context, session, address) |
|
444 | super(StdInSocketChannel, self).__init__(context, session, address) | |
443 | self.ioloop = ioloop.IOLoop() |
|
445 | self.ioloop = ioloop.IOLoop() | |
444 |
|
446 | |||
445 | def run(self): |
|
447 | def run(self): | |
446 | """The thread's main activity. Call start() instead.""" |
|
448 | """The thread's main activity. Call start() instead.""" | |
447 | self.socket = self.context.socket(zmq.DEALER) |
|
449 | self.socket = self.context.socket(zmq.DEALER) | |
448 | self.socket.setsockopt(zmq.IDENTITY, self.session.bsession) |
|
450 | self.socket.setsockopt(zmq.IDENTITY, self.session.bsession) | |
449 | self.socket.connect('tcp://%s:%i' % self.address) |
|
451 | self.socket.connect('tcp://%s:%i' % self.address) | |
450 | self.stream = zmqstream.ZMQStream(self.socket, self.ioloop) |
|
452 | self.stream = zmqstream.ZMQStream(self.socket, self.ioloop) | |
451 | self.stream.on_recv(self._handle_recv) |
|
453 | self.stream.on_recv(self._handle_recv) | |
452 | self._run_loop() |
|
454 | self._run_loop() | |
453 |
|
455 | |||
454 | def stop(self): |
|
456 | def stop(self): | |
455 | self.ioloop.stop() |
|
457 | self.ioloop.stop() | |
456 | super(StdInSocketChannel, self).stop() |
|
458 | super(StdInSocketChannel, self).stop() | |
457 |
|
459 | |||
458 | def call_handlers(self, msg): |
|
460 | def call_handlers(self, msg): | |
459 | """This method is called in the ioloop thread when a message arrives. |
|
461 | """This method is called in the ioloop thread when a message arrives. | |
460 |
|
462 | |||
461 | Subclasses should override this method to handle incoming messages. |
|
463 | Subclasses should override this method to handle incoming messages. | |
462 | It is important to remember that this method is called in the thread |
|
464 | It is important to remember that this method is called in the thread | |
463 | so that some logic must be done to ensure that the application leve |
|
465 | so that some logic must be done to ensure that the application leve | |
464 | handlers are called in the application thread. |
|
466 | handlers are called in the application thread. | |
465 | """ |
|
467 | """ | |
466 | raise NotImplementedError('call_handlers must be defined in a subclass.') |
|
468 | raise NotImplementedError('call_handlers must be defined in a subclass.') | |
467 |
|
469 | |||
468 | def input(self, string): |
|
470 | def input(self, string): | |
469 | """Send a string of raw input to the kernel.""" |
|
471 | """Send a string of raw input to the kernel.""" | |
470 | content = dict(value=string) |
|
472 | content = dict(value=string) | |
471 | msg = self.session.msg('input_reply', content) |
|
473 | msg = self.session.msg('input_reply', content) | |
472 | self._queue_send(msg) |
|
474 | self._queue_send(msg) | |
473 |
|
475 | |||
474 |
|
476 | |||
475 | class HBSocketChannel(ZMQSocketChannel): |
|
477 | class HBSocketChannel(ZMQSocketChannel): | |
476 | """The heartbeat channel which monitors the kernel heartbeat. |
|
478 | """The heartbeat channel which monitors the kernel heartbeat. | |
477 |
|
479 | |||
478 | Note that the heartbeat channel is paused by default. As long as you start |
|
480 | Note that the heartbeat channel is paused by default. As long as you start | |
479 | this channel, the kernel manager will ensure that it is paused and un-paused |
|
481 | this channel, the kernel manager will ensure that it is paused and un-paused | |
480 | as appropriate. |
|
482 | as appropriate. | |
481 | """ |
|
483 | """ | |
482 |
|
484 | |||
483 | time_to_dead = 3.0 |
|
485 | time_to_dead = 3.0 | |
484 | socket = None |
|
486 | socket = None | |
485 | poller = None |
|
487 | poller = None | |
486 | _running = None |
|
488 | _running = None | |
487 | _pause = None |
|
489 | _pause = None | |
488 | _beating = None |
|
490 | _beating = None | |
489 |
|
491 | |||
490 | def __init__(self, context, session, address): |
|
492 | def __init__(self, context, session, address): | |
491 | super(HBSocketChannel, self).__init__(context, session, address) |
|
493 | super(HBSocketChannel, self).__init__(context, session, address) | |
492 | self._running = False |
|
494 | self._running = False | |
493 | self._pause =True |
|
495 | self._pause =True | |
494 | self.poller = zmq.Poller() |
|
496 | self.poller = zmq.Poller() | |
495 |
|
497 | |||
496 | def _create_socket(self): |
|
498 | def _create_socket(self): | |
497 | if self.socket is not None: |
|
499 | if self.socket is not None: | |
498 | # close previous socket, before opening a new one |
|
500 | # close previous socket, before opening a new one | |
499 | self.poller.unregister(self.socket) |
|
501 | self.poller.unregister(self.socket) | |
500 | self.socket.close() |
|
502 | self.socket.close() | |
501 | self.socket = self.context.socket(zmq.REQ) |
|
503 | self.socket = self.context.socket(zmq.REQ) | |
502 | self.socket.setsockopt(zmq.LINGER, 0) |
|
504 | self.socket.setsockopt(zmq.LINGER, 0) | |
503 | self.socket.connect('tcp://%s:%i' % self.address) |
|
505 | self.socket.connect('tcp://%s:%i' % self.address) | |
504 |
|
506 | |||
505 | self.poller.register(self.socket, zmq.POLLIN) |
|
507 | self.poller.register(self.socket, zmq.POLLIN) | |
506 |
|
508 | |||
507 | def _poll(self, start_time): |
|
509 | def _poll(self, start_time): | |
508 | """poll for heartbeat replies until we reach self.time_to_dead |
|
510 | """poll for heartbeat replies until we reach self.time_to_dead | |
509 |
|
511 | |||
510 | Ignores interrupts, and returns the result of poll(), which |
|
512 | Ignores interrupts, and returns the result of poll(), which | |
511 | will be an empty list if no messages arrived before the timeout, |
|
513 | will be an empty list if no messages arrived before the timeout, | |
512 | or the event tuple if there is a message to receive. |
|
514 | or the event tuple if there is a message to receive. | |
513 | """ |
|
515 | """ | |
514 |
|
516 | |||
515 | until_dead = self.time_to_dead - (time.time() - start_time) |
|
517 | until_dead = self.time_to_dead - (time.time() - start_time) | |
516 | # ensure poll at least once |
|
518 | # ensure poll at least once | |
517 | until_dead = max(until_dead, 1e-3) |
|
519 | until_dead = max(until_dead, 1e-3) | |
518 | events = [] |
|
520 | events = [] | |
519 | while True: |
|
521 | while True: | |
520 | try: |
|
522 | try: | |
521 | events = self.poller.poll(1000 * until_dead) |
|
523 | events = self.poller.poll(1000 * until_dead) | |
522 | except ZMQError as e: |
|
524 | except ZMQError as e: | |
523 | if e.errno == errno.EINTR: |
|
525 | if e.errno == errno.EINTR: | |
524 | # ignore interrupts during heartbeat |
|
526 | # ignore interrupts during heartbeat | |
525 | # this may never actually happen |
|
527 | # this may never actually happen | |
526 | until_dead = self.time_to_dead - (time.time() - start_time) |
|
528 | until_dead = self.time_to_dead - (time.time() - start_time) | |
527 | until_dead = max(until_dead, 1e-3) |
|
529 | until_dead = max(until_dead, 1e-3) | |
528 | pass |
|
530 | pass | |
529 | else: |
|
531 | else: | |
530 | raise |
|
532 | raise | |
531 | except Exception: |
|
533 | except Exception: | |
532 | if self._exiting: |
|
534 | if self._exiting: | |
533 | break |
|
535 | break | |
534 | else: |
|
536 | else: | |
535 | raise |
|
537 | raise | |
536 | else: |
|
538 | else: | |
537 | break |
|
539 | break | |
538 | return events |
|
540 | return events | |
539 |
|
541 | |||
540 | def run(self): |
|
542 | def run(self): | |
541 | """The thread's main activity. Call start() instead.""" |
|
543 | """The thread's main activity. Call start() instead.""" | |
542 | self._create_socket() |
|
544 | self._create_socket() | |
543 | self._running = True |
|
545 | self._running = True | |
544 | self._beating = True |
|
546 | self._beating = True | |
545 |
|
547 | |||
546 | while self._running: |
|
548 | while self._running: | |
547 | if self._pause: |
|
549 | if self._pause: | |
548 | # just sleep, and skip the rest of the loop |
|
550 | # just sleep, and skip the rest of the loop | |
549 | time.sleep(self.time_to_dead) |
|
551 | time.sleep(self.time_to_dead) | |
550 | continue |
|
552 | continue | |
551 |
|
553 | |||
552 | since_last_heartbeat = 0.0 |
|
554 | since_last_heartbeat = 0.0 | |
553 | # io.rprint('Ping from HB channel') # dbg |
|
555 | # io.rprint('Ping from HB channel') # dbg | |
554 | # no need to catch EFSM here, because the previous event was |
|
556 | # no need to catch EFSM here, because the previous event was | |
555 | # either a recv or connect, which cannot be followed by EFSM |
|
557 | # either a recv or connect, which cannot be followed by EFSM | |
556 | self.socket.send(b'ping') |
|
558 | self.socket.send(b'ping') | |
557 | request_time = time.time() |
|
559 | request_time = time.time() | |
558 | ready = self._poll(request_time) |
|
560 | ready = self._poll(request_time) | |
559 | if ready: |
|
561 | if ready: | |
560 | self._beating = True |
|
562 | self._beating = True | |
561 | # the poll above guarantees we have something to recv |
|
563 | # the poll above guarantees we have something to recv | |
562 | self.socket.recv() |
|
564 | self.socket.recv() | |
563 | # sleep the remainder of the cycle |
|
565 | # sleep the remainder of the cycle | |
564 | remainder = self.time_to_dead - (time.time() - request_time) |
|
566 | remainder = self.time_to_dead - (time.time() - request_time) | |
565 | if remainder > 0: |
|
567 | if remainder > 0: | |
566 | time.sleep(remainder) |
|
568 | time.sleep(remainder) | |
567 | continue |
|
569 | continue | |
568 | else: |
|
570 | else: | |
569 | # nothing was received within the time limit, signal heart failure |
|
571 | # nothing was received within the time limit, signal heart failure | |
570 | self._beating = False |
|
572 | self._beating = False | |
571 | since_last_heartbeat = time.time() - request_time |
|
573 | since_last_heartbeat = time.time() - request_time | |
572 | self.call_handlers(since_last_heartbeat) |
|
574 | self.call_handlers(since_last_heartbeat) | |
573 | # and close/reopen the socket, because the REQ/REP cycle has been broken |
|
575 | # and close/reopen the socket, because the REQ/REP cycle has been broken | |
574 | self._create_socket() |
|
576 | self._create_socket() | |
575 | continue |
|
577 | continue | |
576 |
|
578 | |||
577 | def pause(self): |
|
579 | def pause(self): | |
578 | """Pause the heartbeat.""" |
|
580 | """Pause the heartbeat.""" | |
579 | self._pause = True |
|
581 | self._pause = True | |
580 |
|
582 | |||
581 | def unpause(self): |
|
583 | def unpause(self): | |
582 | """Unpause the heartbeat.""" |
|
584 | """Unpause the heartbeat.""" | |
583 | self._pause = False |
|
585 | self._pause = False | |
584 |
|
586 | |||
585 | def is_beating(self): |
|
587 | def is_beating(self): | |
586 | """Is the heartbeat running and responsive (and not paused).""" |
|
588 | """Is the heartbeat running and responsive (and not paused).""" | |
587 | if self.is_alive() and not self._pause and self._beating: |
|
589 | if self.is_alive() and not self._pause and self._beating: | |
588 | return True |
|
590 | return True | |
589 | else: |
|
591 | else: | |
590 | return False |
|
592 | return False | |
591 |
|
593 | |||
592 | def stop(self): |
|
594 | def stop(self): | |
593 | self._running = False |
|
595 | self._running = False | |
594 | super(HBSocketChannel, self).stop() |
|
596 | super(HBSocketChannel, self).stop() | |
595 |
|
597 | |||
596 | def call_handlers(self, since_last_heartbeat): |
|
598 | def call_handlers(self, since_last_heartbeat): | |
597 | """This method is called in the ioloop thread when a message arrives. |
|
599 | """This method is called in the ioloop thread when a message arrives. | |
598 |
|
600 | |||
599 | Subclasses should override this method to handle incoming messages. |
|
601 | Subclasses should override this method to handle incoming messages. | |
600 | It is important to remember that this method is called in the thread |
|
602 | It is important to remember that this method is called in the thread | |
601 | so that some logic must be done to ensure that the application level |
|
603 | so that some logic must be done to ensure that the application level | |
602 | handlers are called in the application thread. |
|
604 | handlers are called in the application thread. | |
603 | """ |
|
605 | """ | |
604 | raise NotImplementedError('call_handlers must be defined in a subclass.') |
|
606 | raise NotImplementedError('call_handlers must be defined in a subclass.') | |
605 |
|
607 | |||
606 |
|
608 | |||
607 | #----------------------------------------------------------------------------- |
|
609 | #----------------------------------------------------------------------------- | |
608 | # Main kernel manager class |
|
610 | # Main kernel manager class | |
609 | #----------------------------------------------------------------------------- |
|
611 | #----------------------------------------------------------------------------- | |
610 |
|
612 | |||
611 | class KernelManager(HasTraits): |
|
613 | class KernelManager(HasTraits): | |
612 | """ Manages a kernel for a frontend. |
|
614 | """ Manages a kernel for a frontend. | |
613 |
|
615 | |||
614 | The SUB channel is for the frontend to receive messages published by the |
|
616 | The SUB channel is for the frontend to receive messages published by the | |
615 | kernel. |
|
617 | kernel. | |
616 |
|
618 | |||
617 | The REQ channel is for the frontend to make requests of the kernel. |
|
619 | The REQ channel is for the frontend to make requests of the kernel. | |
618 |
|
620 | |||
619 | The REP channel is for the kernel to request stdin (raw_input) from the |
|
621 | The REP channel is for the kernel to request stdin (raw_input) from the | |
620 | frontend. |
|
622 | frontend. | |
621 | """ |
|
623 | """ | |
622 | # config object for passing to child configurables |
|
624 | # config object for passing to child configurables | |
623 | config = Instance(Config) |
|
625 | config = Instance(Config) | |
624 |
|
626 | |||
625 | # The PyZMQ Context to use for communication with the kernel. |
|
627 | # The PyZMQ Context to use for communication with the kernel. | |
626 | context = Instance(zmq.Context) |
|
628 | context = Instance(zmq.Context) | |
627 | def _context_default(self): |
|
629 | def _context_default(self): | |
628 | return zmq.Context.instance() |
|
630 | return zmq.Context.instance() | |
629 |
|
631 | |||
630 | # The Session to use for communication with the kernel. |
|
632 | # The Session to use for communication with the kernel. | |
631 | session = Instance(Session) |
|
633 | session = Instance(Session) | |
632 |
|
634 | |||
633 | # The kernel process with which the KernelManager is communicating. |
|
635 | # The kernel process with which the KernelManager is communicating. | |
634 | kernel = Instance(Popen) |
|
636 | kernel = Instance(Popen) | |
635 |
|
637 | |||
636 | # The addresses for the communication channels. |
|
638 | # The addresses for the communication channels. | |
637 | connection_file = Unicode('') |
|
639 | connection_file = Unicode('') | |
638 | ip = Unicode(LOCALHOST) |
|
640 | ip = Unicode(LOCALHOST) | |
639 | def _ip_changed(self, name, old, new): |
|
641 | def _ip_changed(self, name, old, new): | |
640 | if new == '*': |
|
642 | if new == '*': | |
641 | self.ip = '0.0.0.0' |
|
643 | self.ip = '0.0.0.0' | |
642 | shell_port = Integer(0) |
|
644 | shell_port = Integer(0) | |
643 | iopub_port = Integer(0) |
|
645 | iopub_port = Integer(0) | |
644 | stdin_port = Integer(0) |
|
646 | stdin_port = Integer(0) | |
645 | hb_port = Integer(0) |
|
647 | hb_port = Integer(0) | |
646 |
|
648 | |||
647 | # The classes to use for the various channels. |
|
649 | # The classes to use for the various channels. | |
648 | shell_channel_class = Type(ShellSocketChannel) |
|
650 | shell_channel_class = Type(ShellSocketChannel) | |
649 | sub_channel_class = Type(SubSocketChannel) |
|
651 | sub_channel_class = Type(SubSocketChannel) | |
650 | stdin_channel_class = Type(StdInSocketChannel) |
|
652 | stdin_channel_class = Type(StdInSocketChannel) | |
651 | hb_channel_class = Type(HBSocketChannel) |
|
653 | hb_channel_class = Type(HBSocketChannel) | |
652 |
|
654 | |||
653 | # Protected traits. |
|
655 | # Protected traits. | |
654 | _launch_args = Any |
|
656 | _launch_args = Any | |
655 | _shell_channel = Any |
|
657 | _shell_channel = Any | |
656 | _sub_channel = Any |
|
658 | _sub_channel = Any | |
657 | _stdin_channel = Any |
|
659 | _stdin_channel = Any | |
658 | _hb_channel = Any |
|
660 | _hb_channel = Any | |
659 | _connection_file_written=Bool(False) |
|
661 | _connection_file_written=Bool(False) | |
660 |
|
662 | |||
661 | def __init__(self, **kwargs): |
|
663 | def __init__(self, **kwargs): | |
662 | super(KernelManager, self).__init__(**kwargs) |
|
664 | super(KernelManager, self).__init__(**kwargs) | |
663 | if self.session is None: |
|
665 | if self.session is None: | |
664 | self.session = Session(config=self.config) |
|
666 | self.session = Session(config=self.config) | |
665 |
|
667 | |||
666 | def __del__(self): |
|
668 | def __del__(self): | |
667 | self.cleanup_connection_file() |
|
669 | self.cleanup_connection_file() | |
668 |
|
670 | |||
669 |
|
671 | |||
670 | #-------------------------------------------------------------------------- |
|
672 | #-------------------------------------------------------------------------- | |
671 | # Channel management methods: |
|
673 | # Channel management methods: | |
672 | #-------------------------------------------------------------------------- |
|
674 | #-------------------------------------------------------------------------- | |
673 |
|
675 | |||
674 | def start_channels(self, shell=True, sub=True, stdin=True, hb=True): |
|
676 | def start_channels(self, shell=True, sub=True, stdin=True, hb=True): | |
675 | """Starts the channels for this kernel. |
|
677 | """Starts the channels for this kernel. | |
676 |
|
678 | |||
677 | This will create the channels if they do not exist and then start |
|
679 | This will create the channels if they do not exist and then start | |
678 | them. If port numbers of 0 are being used (random ports) then you |
|
680 | them. If port numbers of 0 are being used (random ports) then you | |
679 | must first call :method:`start_kernel`. If the channels have been |
|
681 | must first call :method:`start_kernel`. If the channels have been | |
680 | stopped and you call this, :class:`RuntimeError` will be raised. |
|
682 | stopped and you call this, :class:`RuntimeError` will be raised. | |
681 | """ |
|
683 | """ | |
682 | if shell: |
|
684 | if shell: | |
683 | self.shell_channel.start() |
|
685 | self.shell_channel.start() | |
684 | if sub: |
|
686 | if sub: | |
685 | self.sub_channel.start() |
|
687 | self.sub_channel.start() | |
686 | if stdin: |
|
688 | if stdin: | |
687 | self.stdin_channel.start() |
|
689 | self.stdin_channel.start() | |
688 | self.shell_channel.allow_stdin = True |
|
690 | self.shell_channel.allow_stdin = True | |
689 | else: |
|
691 | else: | |
690 | self.shell_channel.allow_stdin = False |
|
692 | self.shell_channel.allow_stdin = False | |
691 | if hb: |
|
693 | if hb: | |
692 | self.hb_channel.start() |
|
694 | self.hb_channel.start() | |
693 |
|
695 | |||
694 | def stop_channels(self): |
|
696 | def stop_channels(self): | |
695 | """Stops all the running channels for this kernel. |
|
697 | """Stops all the running channels for this kernel. | |
696 | """ |
|
698 | """ | |
697 | if self.shell_channel.is_alive(): |
|
699 | if self.shell_channel.is_alive(): | |
698 | self.shell_channel.stop() |
|
700 | self.shell_channel.stop() | |
699 | if self.sub_channel.is_alive(): |
|
701 | if self.sub_channel.is_alive(): | |
700 | self.sub_channel.stop() |
|
702 | self.sub_channel.stop() | |
701 | if self.stdin_channel.is_alive(): |
|
703 | if self.stdin_channel.is_alive(): | |
702 | self.stdin_channel.stop() |
|
704 | self.stdin_channel.stop() | |
703 | if self.hb_channel.is_alive(): |
|
705 | if self.hb_channel.is_alive(): | |
704 | self.hb_channel.stop() |
|
706 | self.hb_channel.stop() | |
705 |
|
707 | |||
706 | @property |
|
708 | @property | |
707 | def channels_running(self): |
|
709 | def channels_running(self): | |
708 | """Are any of the channels created and running?""" |
|
710 | """Are any of the channels created and running?""" | |
709 | return (self.shell_channel.is_alive() or self.sub_channel.is_alive() or |
|
711 | return (self.shell_channel.is_alive() or self.sub_channel.is_alive() or | |
710 | self.stdin_channel.is_alive() or self.hb_channel.is_alive()) |
|
712 | self.stdin_channel.is_alive() or self.hb_channel.is_alive()) | |
711 |
|
713 | |||
712 | #-------------------------------------------------------------------------- |
|
714 | #-------------------------------------------------------------------------- | |
713 | # Kernel process management methods: |
|
715 | # Kernel process management methods: | |
714 | #-------------------------------------------------------------------------- |
|
716 | #-------------------------------------------------------------------------- | |
715 |
|
717 | |||
716 | def cleanup_connection_file(self): |
|
718 | def cleanup_connection_file(self): | |
717 | """cleanup connection file *if we wrote it* |
|
719 | """cleanup connection file *if we wrote it* | |
718 |
|
720 | |||
719 | Will not raise if the connection file was already removed somehow. |
|
721 | Will not raise if the connection file was already removed somehow. | |
720 | """ |
|
722 | """ | |
721 | if self._connection_file_written: |
|
723 | if self._connection_file_written: | |
722 | # cleanup connection files on full shutdown of kernel we started |
|
724 | # cleanup connection files on full shutdown of kernel we started | |
723 | self._connection_file_written = False |
|
725 | self._connection_file_written = False | |
724 | try: |
|
726 | try: | |
725 | os.remove(self.connection_file) |
|
727 | os.remove(self.connection_file) | |
726 | except OSError: |
|
728 | except OSError: | |
727 | pass |
|
729 | pass | |
728 |
|
730 | |||
729 | def load_connection_file(self): |
|
731 | def load_connection_file(self): | |
730 | """load connection info from JSON dict in self.connection_file""" |
|
732 | """load connection info from JSON dict in self.connection_file""" | |
731 | with open(self.connection_file) as f: |
|
733 | with open(self.connection_file) as f: | |
732 | cfg = json.loads(f.read()) |
|
734 | cfg = json.loads(f.read()) | |
733 |
|
735 | |||
734 | self.ip = cfg['ip'] |
|
736 | self.ip = cfg['ip'] | |
735 | self.shell_port = cfg['shell_port'] |
|
737 | self.shell_port = cfg['shell_port'] | |
736 | self.stdin_port = cfg['stdin_port'] |
|
738 | self.stdin_port = cfg['stdin_port'] | |
737 | self.iopub_port = cfg['iopub_port'] |
|
739 | self.iopub_port = cfg['iopub_port'] | |
738 | self.hb_port = cfg['hb_port'] |
|
740 | self.hb_port = cfg['hb_port'] | |
739 | self.session.key = str_to_bytes(cfg['key']) |
|
741 | self.session.key = str_to_bytes(cfg['key']) | |
740 |
|
742 | |||
741 | def write_connection_file(self): |
|
743 | def write_connection_file(self): | |
742 | """write connection info to JSON dict in self.connection_file""" |
|
744 | """write connection info to JSON dict in self.connection_file""" | |
743 | if self._connection_file_written: |
|
745 | if self._connection_file_written: | |
744 | return |
|
746 | return | |
745 | self.connection_file,cfg = write_connection_file(self.connection_file, |
|
747 | self.connection_file,cfg = write_connection_file(self.connection_file, | |
746 | ip=self.ip, key=self.session.key, |
|
748 | ip=self.ip, key=self.session.key, | |
747 | stdin_port=self.stdin_port, iopub_port=self.iopub_port, |
|
749 | stdin_port=self.stdin_port, iopub_port=self.iopub_port, | |
748 | shell_port=self.shell_port, hb_port=self.hb_port) |
|
750 | shell_port=self.shell_port, hb_port=self.hb_port) | |
749 | # write_connection_file also sets default ports: |
|
751 | # write_connection_file also sets default ports: | |
750 | self.shell_port = cfg['shell_port'] |
|
752 | self.shell_port = cfg['shell_port'] | |
751 | self.stdin_port = cfg['stdin_port'] |
|
753 | self.stdin_port = cfg['stdin_port'] | |
752 | self.iopub_port = cfg['iopub_port'] |
|
754 | self.iopub_port = cfg['iopub_port'] | |
753 | self.hb_port = cfg['hb_port'] |
|
755 | self.hb_port = cfg['hb_port'] | |
754 |
|
756 | |||
755 | self._connection_file_written = True |
|
757 | self._connection_file_written = True | |
756 |
|
758 | |||
757 | def start_kernel(self, **kw): |
|
759 | def start_kernel(self, **kw): | |
758 | """Starts a kernel process and configures the manager to use it. |
|
760 | """Starts a kernel process and configures the manager to use it. | |
759 |
|
761 | |||
760 | If random ports (port=0) are being used, this method must be called |
|
762 | If random ports (port=0) are being used, this method must be called | |
761 | before the channels are created. |
|
763 | before the channels are created. | |
762 |
|
764 | |||
763 | Parameters: |
|
765 | Parameters: | |
764 | ----------- |
|
766 | ----------- | |
765 | ipython : bool, optional (default True) |
|
767 | ipython : bool, optional (default True) | |
766 | Whether to use an IPython kernel instead of a plain Python kernel. |
|
768 | Whether to use an IPython kernel instead of a plain Python kernel. | |
767 |
|
769 | |||
768 | launcher : callable, optional (default None) |
|
770 | launcher : callable, optional (default None) | |
769 | A custom function for launching the kernel process (generally a |
|
771 | A custom function for launching the kernel process (generally a | |
770 | wrapper around ``entry_point.base_launch_kernel``). In most cases, |
|
772 | wrapper around ``entry_point.base_launch_kernel``). In most cases, | |
771 | it should not be necessary to use this parameter. |
|
773 | it should not be necessary to use this parameter. | |
772 |
|
774 | |||
773 | **kw : optional |
|
775 | **kw : optional | |
774 | See respective options for IPython and Python kernels. |
|
776 | See respective options for IPython and Python kernels. | |
775 | """ |
|
777 | """ | |
776 | if self.ip not in LOCAL_IPS: |
|
778 | if self.ip not in LOCAL_IPS: | |
777 | raise RuntimeError("Can only launch a kernel on a local interface. " |
|
779 | raise RuntimeError("Can only launch a kernel on a local interface. " | |
778 | "Make sure that the '*_address' attributes are " |
|
780 | "Make sure that the '*_address' attributes are " | |
779 | "configured properly. " |
|
781 | "configured properly. " | |
780 | "Currently valid addresses are: %s"%LOCAL_IPS |
|
782 | "Currently valid addresses are: %s"%LOCAL_IPS | |
781 | ) |
|
783 | ) | |
782 |
|
784 | |||
783 | # write connection file / get default ports |
|
785 | # write connection file / get default ports | |
784 | self.write_connection_file() |
|
786 | self.write_connection_file() | |
785 |
|
787 | |||
786 | self._launch_args = kw.copy() |
|
788 | self._launch_args = kw.copy() | |
787 | launch_kernel = kw.pop('launcher', None) |
|
789 | launch_kernel = kw.pop('launcher', None) | |
788 | if launch_kernel is None: |
|
790 | if launch_kernel is None: | |
789 | if kw.pop('ipython', True): |
|
791 | if kw.pop('ipython', True): | |
790 | from ipkernel import launch_kernel |
|
792 | from ipkernel import launch_kernel | |
791 | else: |
|
793 | else: | |
792 | from pykernel import launch_kernel |
|
794 | from pykernel import launch_kernel | |
793 | self.kernel = launch_kernel(fname=self.connection_file, **kw) |
|
795 | self.kernel = launch_kernel(fname=self.connection_file, **kw) | |
794 |
|
796 | |||
795 | def shutdown_kernel(self, restart=False): |
|
797 | def shutdown_kernel(self, restart=False): | |
796 | """ Attempts to the stop the kernel process cleanly. If the kernel |
|
798 | """ Attempts to the stop the kernel process cleanly. If the kernel | |
797 | cannot be stopped, it is killed, if possible. |
|
799 | cannot be stopped, it is killed, if possible. | |
798 | """ |
|
800 | """ | |
799 | # FIXME: Shutdown does not work on Windows due to ZMQ errors! |
|
801 | # FIXME: Shutdown does not work on Windows due to ZMQ errors! | |
800 | if sys.platform == 'win32': |
|
802 | if sys.platform == 'win32': | |
801 | self.kill_kernel() |
|
803 | self.kill_kernel() | |
802 | return |
|
804 | return | |
803 |
|
805 | |||
804 | # Pause the heart beat channel if it exists. |
|
806 | # Pause the heart beat channel if it exists. | |
805 | if self._hb_channel is not None: |
|
807 | if self._hb_channel is not None: | |
806 | self._hb_channel.pause() |
|
808 | self._hb_channel.pause() | |
807 |
|
809 | |||
808 | # Don't send any additional kernel kill messages immediately, to give |
|
810 | # Don't send any additional kernel kill messages immediately, to give | |
809 | # the kernel a chance to properly execute shutdown actions. Wait for at |
|
811 | # the kernel a chance to properly execute shutdown actions. Wait for at | |
810 | # most 1s, checking every 0.1s. |
|
812 | # most 1s, checking every 0.1s. | |
811 | self.shell_channel.shutdown(restart=restart) |
|
813 | self.shell_channel.shutdown(restart=restart) | |
812 | for i in range(10): |
|
814 | for i in range(10): | |
813 | if self.is_alive: |
|
815 | if self.is_alive: | |
814 | time.sleep(0.1) |
|
816 | time.sleep(0.1) | |
815 | else: |
|
817 | else: | |
816 | break |
|
818 | break | |
817 | else: |
|
819 | else: | |
818 | # OK, we've waited long enough. |
|
820 | # OK, we've waited long enough. | |
819 | if self.has_kernel: |
|
821 | if self.has_kernel: | |
820 | self.kill_kernel() |
|
822 | self.kill_kernel() | |
821 |
|
823 | |||
822 | if not restart and self._connection_file_written: |
|
824 | if not restart and self._connection_file_written: | |
823 | # cleanup connection files on full shutdown of kernel we started |
|
825 | # cleanup connection files on full shutdown of kernel we started | |
824 | self._connection_file_written = False |
|
826 | self._connection_file_written = False | |
825 | try: |
|
827 | try: | |
826 | os.remove(self.connection_file) |
|
828 | os.remove(self.connection_file) | |
827 | except IOError: |
|
829 | except IOError: | |
828 | pass |
|
830 | pass | |
829 |
|
831 | |||
830 | def restart_kernel(self, now=False, **kw): |
|
832 | def restart_kernel(self, now=False, **kw): | |
831 | """Restarts a kernel with the arguments that were used to launch it. |
|
833 | """Restarts a kernel with the arguments that were used to launch it. | |
832 |
|
834 | |||
833 | If the old kernel was launched with random ports, the same ports will be |
|
835 | If the old kernel was launched with random ports, the same ports will be | |
834 | used for the new kernel. |
|
836 | used for the new kernel. | |
835 |
|
837 | |||
836 | Parameters |
|
838 | Parameters | |
837 | ---------- |
|
839 | ---------- | |
838 | now : bool, optional |
|
840 | now : bool, optional | |
839 | If True, the kernel is forcefully restarted *immediately*, without |
|
841 | If True, the kernel is forcefully restarted *immediately*, without | |
840 | having a chance to do any cleanup action. Otherwise the kernel is |
|
842 | having a chance to do any cleanup action. Otherwise the kernel is | |
841 | given 1s to clean up before a forceful restart is issued. |
|
843 | given 1s to clean up before a forceful restart is issued. | |
842 |
|
844 | |||
843 | In all cases the kernel is restarted, the only difference is whether |
|
845 | In all cases the kernel is restarted, the only difference is whether | |
844 | it is given a chance to perform a clean shutdown or not. |
|
846 | it is given a chance to perform a clean shutdown or not. | |
845 |
|
847 | |||
846 | **kw : optional |
|
848 | **kw : optional | |
847 | Any options specified here will replace those used to launch the |
|
849 | Any options specified here will replace those used to launch the | |
848 | kernel. |
|
850 | kernel. | |
849 | """ |
|
851 | """ | |
850 | if self._launch_args is None: |
|
852 | if self._launch_args is None: | |
851 | raise RuntimeError("Cannot restart the kernel. " |
|
853 | raise RuntimeError("Cannot restart the kernel. " | |
852 | "No previous call to 'start_kernel'.") |
|
854 | "No previous call to 'start_kernel'.") | |
853 | else: |
|
855 | else: | |
854 | # Stop currently running kernel. |
|
856 | # Stop currently running kernel. | |
855 | if self.has_kernel: |
|
857 | if self.has_kernel: | |
856 | if now: |
|
858 | if now: | |
857 | self.kill_kernel() |
|
859 | self.kill_kernel() | |
858 | else: |
|
860 | else: | |
859 | self.shutdown_kernel(restart=True) |
|
861 | self.shutdown_kernel(restart=True) | |
860 |
|
862 | |||
861 | # Start new kernel. |
|
863 | # Start new kernel. | |
862 | self._launch_args.update(kw) |
|
864 | self._launch_args.update(kw) | |
863 | self.start_kernel(**self._launch_args) |
|
865 | self.start_kernel(**self._launch_args) | |
864 |
|
866 | |||
865 | # FIXME: Messages get dropped in Windows due to probable ZMQ bug |
|
867 | # FIXME: Messages get dropped in Windows due to probable ZMQ bug | |
866 | # unless there is some delay here. |
|
868 | # unless there is some delay here. | |
867 | if sys.platform == 'win32': |
|
869 | if sys.platform == 'win32': | |
868 | time.sleep(0.2) |
|
870 | time.sleep(0.2) | |
869 |
|
871 | |||
870 | @property |
|
872 | @property | |
871 | def has_kernel(self): |
|
873 | def has_kernel(self): | |
872 | """Returns whether a kernel process has been specified for the kernel |
|
874 | """Returns whether a kernel process has been specified for the kernel | |
873 | manager. |
|
875 | manager. | |
874 | """ |
|
876 | """ | |
875 | return self.kernel is not None |
|
877 | return self.kernel is not None | |
876 |
|
878 | |||
877 | def kill_kernel(self): |
|
879 | def kill_kernel(self): | |
878 | """ Kill the running kernel. """ |
|
880 | """ Kill the running kernel. """ | |
879 | if self.has_kernel: |
|
881 | if self.has_kernel: | |
880 | # Pause the heart beat channel if it exists. |
|
882 | # Pause the heart beat channel if it exists. | |
881 | if self._hb_channel is not None: |
|
883 | if self._hb_channel is not None: | |
882 | self._hb_channel.pause() |
|
884 | self._hb_channel.pause() | |
883 |
|
885 | |||
884 | # Attempt to kill the kernel. |
|
886 | # Attempt to kill the kernel. | |
885 | try: |
|
887 | try: | |
886 | self.kernel.kill() |
|
888 | self.kernel.kill() | |
887 | except OSError, e: |
|
889 | except OSError, e: | |
888 | # In Windows, we will get an Access Denied error if the process |
|
890 | # In Windows, we will get an Access Denied error if the process | |
889 | # has already terminated. Ignore it. |
|
891 | # has already terminated. Ignore it. | |
890 | if sys.platform == 'win32': |
|
892 | if sys.platform == 'win32': | |
891 | if e.winerror != 5: |
|
893 | if e.winerror != 5: | |
892 | raise |
|
894 | raise | |
893 | # On Unix, we may get an ESRCH error if the process has already |
|
895 | # On Unix, we may get an ESRCH error if the process has already | |
894 | # terminated. Ignore it. |
|
896 | # terminated. Ignore it. | |
895 | else: |
|
897 | else: | |
896 | from errno import ESRCH |
|
898 | from errno import ESRCH | |
897 | if e.errno != ESRCH: |
|
899 | if e.errno != ESRCH: | |
898 | raise |
|
900 | raise | |
899 | self.kernel = None |
|
901 | self.kernel = None | |
900 | else: |
|
902 | else: | |
901 | raise RuntimeError("Cannot kill kernel. No kernel is running!") |
|
903 | raise RuntimeError("Cannot kill kernel. No kernel is running!") | |
902 |
|
904 | |||
903 | def interrupt_kernel(self): |
|
905 | def interrupt_kernel(self): | |
904 | """ Interrupts the kernel. Unlike ``signal_kernel``, this operation is |
|
906 | """ Interrupts the kernel. Unlike ``signal_kernel``, this operation is | |
905 | well supported on all platforms. |
|
907 | well supported on all platforms. | |
906 | """ |
|
908 | """ | |
907 | if self.has_kernel: |
|
909 | if self.has_kernel: | |
908 | if sys.platform == 'win32': |
|
910 | if sys.platform == 'win32': | |
909 | from parentpoller import ParentPollerWindows as Poller |
|
911 | from parentpoller import ParentPollerWindows as Poller | |
910 | Poller.send_interrupt(self.kernel.win32_interrupt_event) |
|
912 | Poller.send_interrupt(self.kernel.win32_interrupt_event) | |
911 | else: |
|
913 | else: | |
912 | self.kernel.send_signal(signal.SIGINT) |
|
914 | self.kernel.send_signal(signal.SIGINT) | |
913 | else: |
|
915 | else: | |
914 | raise RuntimeError("Cannot interrupt kernel. No kernel is running!") |
|
916 | raise RuntimeError("Cannot interrupt kernel. No kernel is running!") | |
915 |
|
917 | |||
916 | def signal_kernel(self, signum): |
|
918 | def signal_kernel(self, signum): | |
917 | """ Sends a signal to the kernel. Note that since only SIGTERM is |
|
919 | """ Sends a signal to the kernel. Note that since only SIGTERM is | |
918 | supported on Windows, this function is only useful on Unix systems. |
|
920 | supported on Windows, this function is only useful on Unix systems. | |
919 | """ |
|
921 | """ | |
920 | if self.has_kernel: |
|
922 | if self.has_kernel: | |
921 | self.kernel.send_signal(signum) |
|
923 | self.kernel.send_signal(signum) | |
922 | else: |
|
924 | else: | |
923 | raise RuntimeError("Cannot signal kernel. No kernel is running!") |
|
925 | raise RuntimeError("Cannot signal kernel. No kernel is running!") | |
924 |
|
926 | |||
925 | @property |
|
927 | @property | |
926 | def is_alive(self): |
|
928 | def is_alive(self): | |
927 | """Is the kernel process still running?""" |
|
929 | """Is the kernel process still running?""" | |
928 | if self.has_kernel: |
|
930 | if self.has_kernel: | |
929 | if self.kernel.poll() is None: |
|
931 | if self.kernel.poll() is None: | |
930 | return True |
|
932 | return True | |
931 | else: |
|
933 | else: | |
932 | return False |
|
934 | return False | |
933 | elif self._hb_channel is not None: |
|
935 | elif self._hb_channel is not None: | |
934 | # We didn't start the kernel with this KernelManager so we |
|
936 | # We didn't start the kernel with this KernelManager so we | |
935 | # use the heartbeat. |
|
937 | # use the heartbeat. | |
936 | return self._hb_channel.is_beating() |
|
938 | return self._hb_channel.is_beating() | |
937 | else: |
|
939 | else: | |
938 | # no heartbeat and not local, we can't tell if it's running, |
|
940 | # no heartbeat and not local, we can't tell if it's running, | |
939 | # so naively return True |
|
941 | # so naively return True | |
940 | return True |
|
942 | return True | |
941 |
|
943 | |||
942 | #-------------------------------------------------------------------------- |
|
944 | #-------------------------------------------------------------------------- | |
943 | # Channels used for communication with the kernel: |
|
945 | # Channels used for communication with the kernel: | |
944 | #-------------------------------------------------------------------------- |
|
946 | #-------------------------------------------------------------------------- | |
945 |
|
947 | |||
946 | @property |
|
948 | @property | |
947 | def shell_channel(self): |
|
949 | def shell_channel(self): | |
948 | """Get the REQ socket channel object to make requests of the kernel.""" |
|
950 | """Get the REQ socket channel object to make requests of the kernel.""" | |
949 | if self._shell_channel is None: |
|
951 | if self._shell_channel is None: | |
950 | self._shell_channel = self.shell_channel_class(self.context, |
|
952 | self._shell_channel = self.shell_channel_class(self.context, | |
951 | self.session, |
|
953 | self.session, | |
952 | (self.ip, self.shell_port)) |
|
954 | (self.ip, self.shell_port)) | |
953 | return self._shell_channel |
|
955 | return self._shell_channel | |
954 |
|
956 | |||
955 | @property |
|
957 | @property | |
956 | def sub_channel(self): |
|
958 | def sub_channel(self): | |
957 | """Get the SUB socket channel object.""" |
|
959 | """Get the SUB socket channel object.""" | |
958 | if self._sub_channel is None: |
|
960 | if self._sub_channel is None: | |
959 | self._sub_channel = self.sub_channel_class(self.context, |
|
961 | self._sub_channel = self.sub_channel_class(self.context, | |
960 | self.session, |
|
962 | self.session, | |
961 | (self.ip, self.iopub_port)) |
|
963 | (self.ip, self.iopub_port)) | |
962 | return self._sub_channel |
|
964 | return self._sub_channel | |
963 |
|
965 | |||
964 | @property |
|
966 | @property | |
965 | def stdin_channel(self): |
|
967 | def stdin_channel(self): | |
966 | """Get the REP socket channel object to handle stdin (raw_input).""" |
|
968 | """Get the REP socket channel object to handle stdin (raw_input).""" | |
967 | if self._stdin_channel is None: |
|
969 | if self._stdin_channel is None: | |
968 | self._stdin_channel = self.stdin_channel_class(self.context, |
|
970 | self._stdin_channel = self.stdin_channel_class(self.context, | |
969 | self.session, |
|
971 | self.session, | |
970 | (self.ip, self.stdin_port)) |
|
972 | (self.ip, self.stdin_port)) | |
971 | return self._stdin_channel |
|
973 | return self._stdin_channel | |
972 |
|
974 | |||
973 | @property |
|
975 | @property | |
974 | def hb_channel(self): |
|
976 | def hb_channel(self): | |
975 | """Get the heartbeat socket channel object to check that the |
|
977 | """Get the heartbeat socket channel object to check that the | |
976 | kernel is alive.""" |
|
978 | kernel is alive.""" | |
977 | if self._hb_channel is None: |
|
979 | if self._hb_channel is None: | |
978 | self._hb_channel = self.hb_channel_class(self.context, |
|
980 | self._hb_channel = self.hb_channel_class(self.context, | |
979 | self.session, |
|
981 | self.session, | |
980 | (self.ip, self.hb_port)) |
|
982 | (self.ip, self.hb_port)) | |
981 | return self._hb_channel |
|
983 | return self._hb_channel |
General Comments 0
You need to be logged in to leave comments.
Login now