##// END OF EJS Templates
Repair various failures in the test suite.
Thomas Kluyver -
Show More
@@ -1,2577 +1,2577 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 sys
29 import sys
30 import tempfile
30 import tempfile
31 import types
31 import types
32 from contextlib import nested
32 from contextlib import nested
33
33
34 from IPython.config.configurable import SingletonConfigurable
34 from IPython.config.configurable import SingletonConfigurable
35 from IPython.core import debugger, oinspect
35 from IPython.core import debugger, oinspect
36 from IPython.core import history as ipcorehist
36 from IPython.core import history as ipcorehist
37 from IPython.core import page
37 from IPython.core import page
38 from IPython.core import prefilter
38 from IPython.core import prefilter
39 from IPython.core import shadowns
39 from IPython.core import shadowns
40 from IPython.core import ultratb
40 from IPython.core import ultratb
41 from IPython.core.alias import AliasManager, AliasError
41 from IPython.core.alias import AliasManager, AliasError
42 from IPython.core.autocall import ExitAutocall
42 from IPython.core.autocall import ExitAutocall
43 from IPython.core.builtin_trap import BuiltinTrap
43 from IPython.core.builtin_trap import BuiltinTrap
44 from IPython.core.compilerop import CachingCompiler
44 from IPython.core.compilerop import CachingCompiler
45 from IPython.core.display_trap import DisplayTrap
45 from IPython.core.display_trap import DisplayTrap
46 from IPython.core.displayhook import DisplayHook
46 from IPython.core.displayhook import DisplayHook
47 from IPython.core.displaypub import DisplayPublisher
47 from IPython.core.displaypub import DisplayPublisher
48 from IPython.core.error import TryNext, UsageError
48 from IPython.core.error import TryNext, UsageError
49 from IPython.core.extensions import ExtensionManager
49 from IPython.core.extensions import ExtensionManager
50 from IPython.core.fakemodule import FakeModule, init_fakemod_dict
50 from IPython.core.fakemodule import FakeModule, init_fakemod_dict
51 from IPython.core.formatters import DisplayFormatter
51 from IPython.core.formatters import DisplayFormatter
52 from IPython.core.history import HistoryManager
52 from IPython.core.history import HistoryManager
53 from IPython.core.inputsplitter import IPythonInputSplitter
53 from IPython.core.inputsplitter import IPythonInputSplitter
54 from IPython.core.logger import Logger
54 from IPython.core.logger import Logger
55 from IPython.core.macro import Macro
55 from IPython.core.macro import Macro
56 from IPython.core.magic import Magic
56 from IPython.core.magic import Magic
57 from IPython.core.payload import PayloadManager
57 from IPython.core.payload import PayloadManager
58 from IPython.core.plugin import PluginManager
58 from IPython.core.plugin import PluginManager
59 from IPython.core.prefilter import PrefilterManager, ESC_MAGIC
59 from IPython.core.prefilter import PrefilterManager, ESC_MAGIC
60 from IPython.core.profiledir import ProfileDir
60 from IPython.core.profiledir import ProfileDir
61 from IPython.external.Itpl import ItplNS
61 from IPython.external.Itpl import ItplNS
62 from IPython.utils import PyColorize
62 from IPython.utils import PyColorize
63 from IPython.utils import io
63 from IPython.utils import io
64 from IPython.utils import py3compat
64 from IPython.utils import py3compat
65 from IPython.utils.doctestreload import doctest_reload
65 from IPython.utils.doctestreload import doctest_reload
66 from IPython.utils.io import ask_yes_no, rprint
66 from IPython.utils.io import ask_yes_no, rprint
67 from IPython.utils.ipstruct import Struct
67 from IPython.utils.ipstruct import Struct
68 from IPython.utils.path import get_home_dir, get_ipython_dir, HomeDirError
68 from IPython.utils.path import get_home_dir, get_ipython_dir, HomeDirError
69 from IPython.utils.pickleshare import PickleShareDB
69 from IPython.utils.pickleshare import PickleShareDB
70 from IPython.utils.process import system, getoutput
70 from IPython.utils.process import system, getoutput
71 from IPython.utils.strdispatch import StrDispatch
71 from IPython.utils.strdispatch import StrDispatch
72 from IPython.utils.syspathcontext import prepended_to_syspath
72 from IPython.utils.syspathcontext import prepended_to_syspath
73 from IPython.utils.text import num_ini_spaces, format_screen, LSString, SList
73 from IPython.utils.text import num_ini_spaces, format_screen, LSString, SList
74 from IPython.utils.traitlets import (Int, CBool, CaselessStrEnum, Enum,
74 from IPython.utils.traitlets import (Int, CBool, CaselessStrEnum, Enum,
75 List, Unicode, Instance, Type)
75 List, Unicode, Instance, Type)
76 from IPython.utils.warn import warn, error, fatal
76 from IPython.utils.warn import warn, error, fatal
77 import IPython.core.hooks
77 import IPython.core.hooks
78
78
79 #-----------------------------------------------------------------------------
79 #-----------------------------------------------------------------------------
80 # Globals
80 # Globals
81 #-----------------------------------------------------------------------------
81 #-----------------------------------------------------------------------------
82
82
83 # compiled regexps for autoindent management
83 # compiled regexps for autoindent management
84 dedent_re = re.compile(r'^\s+raise|^\s+return|^\s+pass')
84 dedent_re = re.compile(r'^\s+raise|^\s+return|^\s+pass')
85
85
86 #-----------------------------------------------------------------------------
86 #-----------------------------------------------------------------------------
87 # Utilities
87 # Utilities
88 #-----------------------------------------------------------------------------
88 #-----------------------------------------------------------------------------
89
89
90 def softspace(file, newvalue):
90 def softspace(file, newvalue):
91 """Copied from code.py, to remove the dependency"""
91 """Copied from code.py, to remove the dependency"""
92
92
93 oldvalue = 0
93 oldvalue = 0
94 try:
94 try:
95 oldvalue = file.softspace
95 oldvalue = file.softspace
96 except AttributeError:
96 except AttributeError:
97 pass
97 pass
98 try:
98 try:
99 file.softspace = newvalue
99 file.softspace = newvalue
100 except (AttributeError, TypeError):
100 except (AttributeError, TypeError):
101 # "attribute-less object" or "read-only attributes"
101 # "attribute-less object" or "read-only attributes"
102 pass
102 pass
103 return oldvalue
103 return oldvalue
104
104
105
105
106 def no_op(*a, **kw): pass
106 def no_op(*a, **kw): pass
107
107
108 class SpaceInInput(Exception): pass
108 class SpaceInInput(Exception): pass
109
109
110 class Bunch: pass
110 class Bunch: pass
111
111
112
112
113 def get_default_colors():
113 def get_default_colors():
114 if sys.platform=='darwin':
114 if sys.platform=='darwin':
115 return "LightBG"
115 return "LightBG"
116 elif os.name=='nt':
116 elif os.name=='nt':
117 return 'Linux'
117 return 'Linux'
118 else:
118 else:
119 return 'Linux'
119 return 'Linux'
120
120
121
121
122 class SeparateUnicode(Unicode):
122 class SeparateUnicode(Unicode):
123 """A Unicode subclass to validate separate_in, separate_out, etc.
123 """A Unicode subclass to validate separate_in, separate_out, etc.
124
124
125 This is a Unicode based trait that converts '0'->'' and '\\n'->'\n'.
125 This is a Unicode based trait that converts '0'->'' and '\\n'->'\n'.
126 """
126 """
127
127
128 def validate(self, obj, value):
128 def validate(self, obj, value):
129 if value == '0': value = ''
129 if value == '0': value = ''
130 value = value.replace('\\n','\n')
130 value = value.replace('\\n','\n')
131 return super(SeparateUnicode, self).validate(obj, value)
131 return super(SeparateUnicode, self).validate(obj, value)
132
132
133
133
134 class ReadlineNoRecord(object):
134 class ReadlineNoRecord(object):
135 """Context manager to execute some code, then reload readline history
135 """Context manager to execute some code, then reload readline history
136 so that interactive input to the code doesn't appear when pressing up."""
136 so that interactive input to the code doesn't appear when pressing up."""
137 def __init__(self, shell):
137 def __init__(self, shell):
138 self.shell = shell
138 self.shell = shell
139 self._nested_level = 0
139 self._nested_level = 0
140
140
141 def __enter__(self):
141 def __enter__(self):
142 if self._nested_level == 0:
142 if self._nested_level == 0:
143 try:
143 try:
144 self.orig_length = self.current_length()
144 self.orig_length = self.current_length()
145 self.readline_tail = self.get_readline_tail()
145 self.readline_tail = self.get_readline_tail()
146 except (AttributeError, IndexError): # Can fail with pyreadline
146 except (AttributeError, IndexError): # Can fail with pyreadline
147 self.orig_length, self.readline_tail = 999999, []
147 self.orig_length, self.readline_tail = 999999, []
148 self._nested_level += 1
148 self._nested_level += 1
149
149
150 def __exit__(self, type, value, traceback):
150 def __exit__(self, type, value, traceback):
151 self._nested_level -= 1
151 self._nested_level -= 1
152 if self._nested_level == 0:
152 if self._nested_level == 0:
153 # Try clipping the end if it's got longer
153 # Try clipping the end if it's got longer
154 try:
154 try:
155 e = self.current_length() - self.orig_length
155 e = self.current_length() - self.orig_length
156 if e > 0:
156 if e > 0:
157 for _ in range(e):
157 for _ in range(e):
158 self.shell.readline.remove_history_item(self.orig_length)
158 self.shell.readline.remove_history_item(self.orig_length)
159
159
160 # If it still doesn't match, just reload readline history.
160 # If it still doesn't match, just reload readline history.
161 if self.current_length() != self.orig_length \
161 if self.current_length() != self.orig_length \
162 or self.get_readline_tail() != self.readline_tail:
162 or self.get_readline_tail() != self.readline_tail:
163 self.shell.refill_readline_hist()
163 self.shell.refill_readline_hist()
164 except (AttributeError, IndexError):
164 except (AttributeError, IndexError):
165 pass
165 pass
166 # Returning False will cause exceptions to propagate
166 # Returning False will cause exceptions to propagate
167 return False
167 return False
168
168
169 def current_length(self):
169 def current_length(self):
170 return self.shell.readline.get_current_history_length()
170 return self.shell.readline.get_current_history_length()
171
171
172 def get_readline_tail(self, n=10):
172 def get_readline_tail(self, n=10):
173 """Get the last n items in readline history."""
173 """Get the last n items in readline history."""
174 end = self.shell.readline.get_current_history_length() + 1
174 end = self.shell.readline.get_current_history_length() + 1
175 start = max(end-n, 1)
175 start = max(end-n, 1)
176 ghi = self.shell.readline.get_history_item
176 ghi = self.shell.readline.get_history_item
177 return [ghi(x) for x in range(start, end)]
177 return [ghi(x) for x in range(start, end)]
178
178
179
179
180 _autocall_help = """
180 _autocall_help = """
181 Make IPython automatically call any callable object even if
181 Make IPython automatically call any callable object even if
182 you didn't type explicit parentheses. For example, 'str 43' becomes 'str(43)'
182 you didn't type explicit parentheses. For example, 'str 43' becomes 'str(43)'
183 automatically. The value can be '0' to disable the feature, '1' for 'smart'
183 automatically. The value can be '0' to disable the feature, '1' for 'smart'
184 autocall, where it is not applied if there are no more arguments on the line,
184 autocall, where it is not applied if there are no more arguments on the line,
185 and '2' for 'full' autocall, where all callable objects are automatically
185 and '2' for 'full' autocall, where all callable objects are automatically
186 called (even if no arguments are present). The default is '1'.
186 called (even if no arguments are present). The default is '1'.
187 """
187 """
188
188
189 #-----------------------------------------------------------------------------
189 #-----------------------------------------------------------------------------
190 # Main IPython class
190 # Main IPython class
191 #-----------------------------------------------------------------------------
191 #-----------------------------------------------------------------------------
192
192
193 class InteractiveShell(SingletonConfigurable, Magic):
193 class InteractiveShell(SingletonConfigurable, Magic):
194 """An enhanced, interactive shell for Python."""
194 """An enhanced, interactive shell for Python."""
195
195
196 _instance = None
196 _instance = None
197
197
198 autocall = Enum((0,1,2), default_value=1, config=True, help=
198 autocall = Enum((0,1,2), default_value=1, config=True, help=
199 """
199 """
200 Make IPython automatically call any callable object even if you didn't
200 Make IPython automatically call any callable object even if you didn't
201 type explicit parentheses. For example, 'str 43' becomes 'str(43)'
201 type explicit parentheses. For example, 'str 43' becomes 'str(43)'
202 automatically. The value can be '0' to disable the feature, '1' for
202 automatically. The value can be '0' to disable the feature, '1' for
203 'smart' autocall, where it is not applied if there are no more
203 'smart' autocall, where it is not applied if there are no more
204 arguments on the line, and '2' for 'full' autocall, where all callable
204 arguments on the line, and '2' for 'full' autocall, where all callable
205 objects are automatically called (even if no arguments are present).
205 objects are automatically called (even if no arguments are present).
206 The default is '1'.
206 The default is '1'.
207 """
207 """
208 )
208 )
209 # TODO: remove all autoindent logic and put into frontends.
209 # TODO: remove all autoindent logic and put into frontends.
210 # We can't do this yet because even runlines uses the autoindent.
210 # We can't do this yet because even runlines uses the autoindent.
211 autoindent = CBool(True, config=True, help=
211 autoindent = CBool(True, config=True, help=
212 """
212 """
213 Autoindent IPython code entered interactively.
213 Autoindent IPython code entered interactively.
214 """
214 """
215 )
215 )
216 automagic = CBool(True, config=True, help=
216 automagic = CBool(True, config=True, help=
217 """
217 """
218 Enable magic commands to be called without the leading %.
218 Enable magic commands to be called without the leading %.
219 """
219 """
220 )
220 )
221 cache_size = Int(1000, config=True, help=
221 cache_size = Int(1000, config=True, help=
222 """
222 """
223 Set the size of the output cache. The default is 1000, you can
223 Set the size of the output cache. The default is 1000, you can
224 change it permanently in your config file. Setting it to 0 completely
224 change it permanently in your config file. Setting it to 0 completely
225 disables the caching system, and the minimum value accepted is 20 (if
225 disables the caching system, and the minimum value accepted is 20 (if
226 you provide a value less than 20, it is reset to 0 and a warning is
226 you provide a value less than 20, it is reset to 0 and a warning is
227 issued). This limit is defined because otherwise you'll spend more
227 issued). This limit is defined because otherwise you'll spend more
228 time re-flushing a too small cache than working
228 time re-flushing a too small cache than working
229 """
229 """
230 )
230 )
231 color_info = CBool(True, config=True, help=
231 color_info = CBool(True, config=True, help=
232 """
232 """
233 Use colors for displaying information about objects. Because this
233 Use colors for displaying information about objects. Because this
234 information is passed through a pager (like 'less'), and some pagers
234 information is passed through a pager (like 'less'), and some pagers
235 get confused with color codes, this capability can be turned off.
235 get confused with color codes, this capability can be turned off.
236 """
236 """
237 )
237 )
238 colors = CaselessStrEnum(('NoColor','LightBG','Linux'),
238 colors = CaselessStrEnum(('NoColor','LightBG','Linux'),
239 default_value=get_default_colors(), config=True,
239 default_value=get_default_colors(), config=True,
240 help="Set the color scheme (NoColor, Linux, or LightBG)."
240 help="Set the color scheme (NoColor, Linux, or LightBG)."
241 )
241 )
242 debug = CBool(False, config=True)
242 debug = CBool(False, config=True)
243 deep_reload = CBool(False, config=True, help=
243 deep_reload = CBool(False, config=True, help=
244 """
244 """
245 Enable deep (recursive) reloading by default. IPython can use the
245 Enable deep (recursive) reloading by default. IPython can use the
246 deep_reload module which reloads changes in modules recursively (it
246 deep_reload module which reloads changes in modules recursively (it
247 replaces the reload() function, so you don't need to change anything to
247 replaces the reload() function, so you don't need to change anything to
248 use it). deep_reload() forces a full reload of modules whose code may
248 use it). deep_reload() forces a full reload of modules whose code may
249 have changed, which the default reload() function does not. When
249 have changed, which the default reload() function does not. When
250 deep_reload is off, IPython will use the normal reload(), but
250 deep_reload is off, IPython will use the normal reload(), but
251 deep_reload will still be available as dreload().
251 deep_reload will still be available as dreload().
252 """
252 """
253 )
253 )
254 display_formatter = Instance(DisplayFormatter)
254 display_formatter = Instance(DisplayFormatter)
255 displayhook_class = Type(DisplayHook)
255 displayhook_class = Type(DisplayHook)
256 display_pub_class = Type(DisplayPublisher)
256 display_pub_class = Type(DisplayPublisher)
257
257
258 exit_now = CBool(False)
258 exit_now = CBool(False)
259 exiter = Instance(ExitAutocall)
259 exiter = Instance(ExitAutocall)
260 def _exiter_default(self):
260 def _exiter_default(self):
261 return ExitAutocall(self)
261 return ExitAutocall(self)
262 # Monotonically increasing execution counter
262 # Monotonically increasing execution counter
263 execution_count = Int(1)
263 execution_count = Int(1)
264 filename = Unicode("<ipython console>")
264 filename = Unicode("<ipython console>")
265 ipython_dir= Unicode('', config=True) # Set to get_ipython_dir() in __init__
265 ipython_dir= Unicode('', config=True) # Set to get_ipython_dir() in __init__
266
266
267 # Input splitter, to split entire cells of input into either individual
267 # Input splitter, to split entire cells of input into either individual
268 # interactive statements or whole blocks.
268 # interactive statements or whole blocks.
269 input_splitter = Instance('IPython.core.inputsplitter.IPythonInputSplitter',
269 input_splitter = Instance('IPython.core.inputsplitter.IPythonInputSplitter',
270 (), {})
270 (), {})
271 logstart = CBool(False, config=True, help=
271 logstart = CBool(False, config=True, help=
272 """
272 """
273 Start logging to the default log file.
273 Start logging to the default log file.
274 """
274 """
275 )
275 )
276 logfile = Unicode('', config=True, help=
276 logfile = Unicode('', config=True, help=
277 """
277 """
278 The name of the logfile to use.
278 The name of the logfile to use.
279 """
279 """
280 )
280 )
281 logappend = Unicode('', config=True, help=
281 logappend = Unicode('', config=True, help=
282 """
282 """
283 Start logging to the given file in append mode.
283 Start logging to the given file in append mode.
284 """
284 """
285 )
285 )
286 object_info_string_level = Enum((0,1,2), default_value=0,
286 object_info_string_level = Enum((0,1,2), default_value=0,
287 config=True)
287 config=True)
288 pdb = CBool(False, config=True, help=
288 pdb = CBool(False, config=True, help=
289 """
289 """
290 Automatically call the pdb debugger after every exception.
290 Automatically call the pdb debugger after every exception.
291 """
291 """
292 )
292 )
293
293
294 prompt_in1 = Unicode('In [\\#]: ', config=True)
294 prompt_in1 = Unicode('In [\\#]: ', config=True)
295 prompt_in2 = Unicode(' .\\D.: ', config=True)
295 prompt_in2 = Unicode(' .\\D.: ', config=True)
296 prompt_out = Unicode('Out[\\#]: ', config=True)
296 prompt_out = Unicode('Out[\\#]: ', config=True)
297 prompts_pad_left = CBool(True, config=True)
297 prompts_pad_left = CBool(True, config=True)
298 quiet = CBool(False, config=True)
298 quiet = CBool(False, config=True)
299
299
300 history_length = Int(10000, config=True)
300 history_length = Int(10000, config=True)
301
301
302 # The readline stuff will eventually be moved to the terminal subclass
302 # The readline stuff will eventually be moved to the terminal subclass
303 # but for now, we can't do that as readline is welded in everywhere.
303 # but for now, we can't do that as readline is welded in everywhere.
304 readline_use = CBool(True, config=True)
304 readline_use = CBool(True, config=True)
305 readline_merge_completions = CBool(True, config=True)
305 readline_merge_completions = CBool(True, config=True)
306 readline_omit__names = Enum((0,1,2), default_value=2, config=True)
306 readline_omit__names = Enum((0,1,2), default_value=2, config=True)
307 readline_remove_delims = Unicode('-/~', config=True)
307 readline_remove_delims = Unicode('-/~', config=True)
308 # don't use \M- bindings by default, because they
308 # don't use \M- bindings by default, because they
309 # conflict with 8-bit encodings. See gh-58,gh-88
309 # conflict with 8-bit encodings. See gh-58,gh-88
310 readline_parse_and_bind = List([
310 readline_parse_and_bind = List([
311 'tab: complete',
311 'tab: complete',
312 '"\C-l": clear-screen',
312 '"\C-l": clear-screen',
313 'set show-all-if-ambiguous on',
313 'set show-all-if-ambiguous on',
314 '"\C-o": tab-insert',
314 '"\C-o": tab-insert',
315 '"\C-r": reverse-search-history',
315 '"\C-r": reverse-search-history',
316 '"\C-s": forward-search-history',
316 '"\C-s": forward-search-history',
317 '"\C-p": history-search-backward',
317 '"\C-p": history-search-backward',
318 '"\C-n": history-search-forward',
318 '"\C-n": history-search-forward',
319 '"\e[A": history-search-backward',
319 '"\e[A": history-search-backward',
320 '"\e[B": history-search-forward',
320 '"\e[B": history-search-forward',
321 '"\C-k": kill-line',
321 '"\C-k": kill-line',
322 '"\C-u": unix-line-discard',
322 '"\C-u": unix-line-discard',
323 ], allow_none=False, config=True)
323 ], allow_none=False, config=True)
324
324
325 # TODO: this part of prompt management should be moved to the frontends.
325 # TODO: this part of prompt management should be moved to the frontends.
326 # Use custom TraitTypes that convert '0'->'' and '\\n'->'\n'
326 # Use custom TraitTypes that convert '0'->'' and '\\n'->'\n'
327 separate_in = SeparateUnicode('\n', config=True)
327 separate_in = SeparateUnicode('\n', config=True)
328 separate_out = SeparateUnicode('', config=True)
328 separate_out = SeparateUnicode('', config=True)
329 separate_out2 = SeparateUnicode('', config=True)
329 separate_out2 = SeparateUnicode('', config=True)
330 wildcards_case_sensitive = CBool(True, config=True)
330 wildcards_case_sensitive = CBool(True, config=True)
331 xmode = CaselessStrEnum(('Context','Plain', 'Verbose'),
331 xmode = CaselessStrEnum(('Context','Plain', 'Verbose'),
332 default_value='Context', config=True)
332 default_value='Context', config=True)
333
333
334 # Subcomponents of InteractiveShell
334 # Subcomponents of InteractiveShell
335 alias_manager = Instance('IPython.core.alias.AliasManager')
335 alias_manager = Instance('IPython.core.alias.AliasManager')
336 prefilter_manager = Instance('IPython.core.prefilter.PrefilterManager')
336 prefilter_manager = Instance('IPython.core.prefilter.PrefilterManager')
337 builtin_trap = Instance('IPython.core.builtin_trap.BuiltinTrap')
337 builtin_trap = Instance('IPython.core.builtin_trap.BuiltinTrap')
338 display_trap = Instance('IPython.core.display_trap.DisplayTrap')
338 display_trap = Instance('IPython.core.display_trap.DisplayTrap')
339 extension_manager = Instance('IPython.core.extensions.ExtensionManager')
339 extension_manager = Instance('IPython.core.extensions.ExtensionManager')
340 plugin_manager = Instance('IPython.core.plugin.PluginManager')
340 plugin_manager = Instance('IPython.core.plugin.PluginManager')
341 payload_manager = Instance('IPython.core.payload.PayloadManager')
341 payload_manager = Instance('IPython.core.payload.PayloadManager')
342 history_manager = Instance('IPython.core.history.HistoryManager')
342 history_manager = Instance('IPython.core.history.HistoryManager')
343
343
344 profile_dir = Instance('IPython.core.application.ProfileDir')
344 profile_dir = Instance('IPython.core.application.ProfileDir')
345 @property
345 @property
346 def profile(self):
346 def profile(self):
347 if self.profile_dir is not None:
347 if self.profile_dir is not None:
348 name = os.path.basename(self.profile_dir.location)
348 name = os.path.basename(self.profile_dir.location)
349 return name.replace('profile_','')
349 return name.replace('profile_','')
350
350
351
351
352 # Private interface
352 # Private interface
353 _post_execute = Instance(dict)
353 _post_execute = Instance(dict)
354
354
355 def __init__(self, config=None, ipython_dir=None, profile_dir=None,
355 def __init__(self, config=None, ipython_dir=None, profile_dir=None,
356 user_ns=None, user_global_ns=None,
356 user_ns=None, user_global_ns=None,
357 custom_exceptions=((), None)):
357 custom_exceptions=((), None)):
358
358
359 # This is where traits with a config_key argument are updated
359 # This is where traits with a config_key argument are updated
360 # from the values on config.
360 # from the values on config.
361 super(InteractiveShell, self).__init__(config=config)
361 super(InteractiveShell, self).__init__(config=config)
362
362
363 # These are relatively independent and stateless
363 # These are relatively independent and stateless
364 self.init_ipython_dir(ipython_dir)
364 self.init_ipython_dir(ipython_dir)
365 self.init_profile_dir(profile_dir)
365 self.init_profile_dir(profile_dir)
366 self.init_instance_attrs()
366 self.init_instance_attrs()
367 self.init_environment()
367 self.init_environment()
368
368
369 # Create namespaces (user_ns, user_global_ns, etc.)
369 # Create namespaces (user_ns, user_global_ns, etc.)
370 self.init_create_namespaces(user_ns, user_global_ns)
370 self.init_create_namespaces(user_ns, user_global_ns)
371 # This has to be done after init_create_namespaces because it uses
371 # This has to be done after init_create_namespaces because it uses
372 # something in self.user_ns, but before init_sys_modules, which
372 # something in self.user_ns, but before init_sys_modules, which
373 # is the first thing to modify sys.
373 # is the first thing to modify sys.
374 # TODO: When we override sys.stdout and sys.stderr before this class
374 # TODO: When we override sys.stdout and sys.stderr before this class
375 # is created, we are saving the overridden ones here. Not sure if this
375 # is created, we are saving the overridden ones here. Not sure if this
376 # is what we want to do.
376 # is what we want to do.
377 self.save_sys_module_state()
377 self.save_sys_module_state()
378 self.init_sys_modules()
378 self.init_sys_modules()
379
379
380 # While we're trying to have each part of the code directly access what
380 # While we're trying to have each part of the code directly access what
381 # it needs without keeping redundant references to objects, we have too
381 # it needs without keeping redundant references to objects, we have too
382 # much legacy code that expects ip.db to exist.
382 # much legacy code that expects ip.db to exist.
383 self.db = PickleShareDB(os.path.join(self.profile_dir.location, 'db'))
383 self.db = PickleShareDB(os.path.join(self.profile_dir.location, 'db'))
384
384
385 self.init_history()
385 self.init_history()
386 self.init_encoding()
386 self.init_encoding()
387 self.init_prefilter()
387 self.init_prefilter()
388
388
389 Magic.__init__(self, self)
389 Magic.__init__(self, self)
390
390
391 self.init_syntax_highlighting()
391 self.init_syntax_highlighting()
392 self.init_hooks()
392 self.init_hooks()
393 self.init_pushd_popd_magic()
393 self.init_pushd_popd_magic()
394 # self.init_traceback_handlers use to be here, but we moved it below
394 # self.init_traceback_handlers use to be here, but we moved it below
395 # because it and init_io have to come after init_readline.
395 # because it and init_io have to come after init_readline.
396 self.init_user_ns()
396 self.init_user_ns()
397 self.init_logger()
397 self.init_logger()
398 self.init_alias()
398 self.init_alias()
399 self.init_builtins()
399 self.init_builtins()
400
400
401 # pre_config_initialization
401 # pre_config_initialization
402
402
403 # The next section should contain everything that was in ipmaker.
403 # The next section should contain everything that was in ipmaker.
404 self.init_logstart()
404 self.init_logstart()
405
405
406 # The following was in post_config_initialization
406 # The following was in post_config_initialization
407 self.init_inspector()
407 self.init_inspector()
408 # init_readline() must come before init_io(), because init_io uses
408 # init_readline() must come before init_io(), because init_io uses
409 # readline related things.
409 # readline related things.
410 self.init_readline()
410 self.init_readline()
411 # We save this here in case user code replaces raw_input, but it needs
411 # We save this here in case user code replaces raw_input, but it needs
412 # to be after init_readline(), because PyPy's readline works by replacing
412 # to be after init_readline(), because PyPy's readline works by replacing
413 # raw_input.
413 # raw_input.
414 self.raw_input_original = raw_input
414 self.raw_input_original = raw_input
415 # init_completer must come after init_readline, because it needs to
415 # init_completer must come after init_readline, because it needs to
416 # know whether readline is present or not system-wide to configure the
416 # know whether readline is present or not system-wide to configure the
417 # completers, since the completion machinery can now operate
417 # completers, since the completion machinery can now operate
418 # independently of readline (e.g. over the network)
418 # independently of readline (e.g. over the network)
419 self.init_completer()
419 self.init_completer()
420 # TODO: init_io() needs to happen before init_traceback handlers
420 # TODO: init_io() needs to happen before init_traceback handlers
421 # because the traceback handlers hardcode the stdout/stderr streams.
421 # because the traceback handlers hardcode the stdout/stderr streams.
422 # This logic in in debugger.Pdb and should eventually be changed.
422 # This logic in in debugger.Pdb and should eventually be changed.
423 self.init_io()
423 self.init_io()
424 self.init_traceback_handlers(custom_exceptions)
424 self.init_traceback_handlers(custom_exceptions)
425 self.init_prompts()
425 self.init_prompts()
426 self.init_display_formatter()
426 self.init_display_formatter()
427 self.init_display_pub()
427 self.init_display_pub()
428 self.init_displayhook()
428 self.init_displayhook()
429 self.init_reload_doctest()
429 self.init_reload_doctest()
430 self.init_magics()
430 self.init_magics()
431 self.init_pdb()
431 self.init_pdb()
432 self.init_extension_manager()
432 self.init_extension_manager()
433 self.init_plugin_manager()
433 self.init_plugin_manager()
434 self.init_payload()
434 self.init_payload()
435 self.hooks.late_startup_hook()
435 self.hooks.late_startup_hook()
436 atexit.register(self.atexit_operations)
436 atexit.register(self.atexit_operations)
437
437
438 def get_ipython(self):
438 def get_ipython(self):
439 """Return the currently running IPython instance."""
439 """Return the currently running IPython instance."""
440 return self
440 return self
441
441
442 #-------------------------------------------------------------------------
442 #-------------------------------------------------------------------------
443 # Trait changed handlers
443 # Trait changed handlers
444 #-------------------------------------------------------------------------
444 #-------------------------------------------------------------------------
445
445
446 def _ipython_dir_changed(self, name, new):
446 def _ipython_dir_changed(self, name, new):
447 if not os.path.isdir(new):
447 if not os.path.isdir(new):
448 os.makedirs(new, mode = 0777)
448 os.makedirs(new, mode = 0777)
449
449
450 def set_autoindent(self,value=None):
450 def set_autoindent(self,value=None):
451 """Set the autoindent flag, checking for readline support.
451 """Set the autoindent flag, checking for readline support.
452
452
453 If called with no arguments, it acts as a toggle."""
453 If called with no arguments, it acts as a toggle."""
454
454
455 if not self.has_readline:
455 if not self.has_readline:
456 if os.name == 'posix':
456 if os.name == 'posix':
457 warn("The auto-indent feature requires the readline library")
457 warn("The auto-indent feature requires the readline library")
458 self.autoindent = 0
458 self.autoindent = 0
459 return
459 return
460 if value is None:
460 if value is None:
461 self.autoindent = not self.autoindent
461 self.autoindent = not self.autoindent
462 else:
462 else:
463 self.autoindent = value
463 self.autoindent = value
464
464
465 #-------------------------------------------------------------------------
465 #-------------------------------------------------------------------------
466 # init_* methods called by __init__
466 # init_* methods called by __init__
467 #-------------------------------------------------------------------------
467 #-------------------------------------------------------------------------
468
468
469 def init_ipython_dir(self, ipython_dir):
469 def init_ipython_dir(self, ipython_dir):
470 if ipython_dir is not None:
470 if ipython_dir is not None:
471 self.ipython_dir = ipython_dir
471 self.ipython_dir = ipython_dir
472 return
472 return
473
473
474 self.ipython_dir = get_ipython_dir()
474 self.ipython_dir = get_ipython_dir()
475
475
476 def init_profile_dir(self, profile_dir):
476 def init_profile_dir(self, profile_dir):
477 if profile_dir is not None:
477 if profile_dir is not None:
478 self.profile_dir = profile_dir
478 self.profile_dir = profile_dir
479 return
479 return
480 self.profile_dir =\
480 self.profile_dir =\
481 ProfileDir.create_profile_dir_by_name(self.ipython_dir, 'default')
481 ProfileDir.create_profile_dir_by_name(self.ipython_dir, 'default')
482
482
483 def init_instance_attrs(self):
483 def init_instance_attrs(self):
484 self.more = False
484 self.more = False
485
485
486 # command compiler
486 # command compiler
487 self.compile = CachingCompiler()
487 self.compile = CachingCompiler()
488
488
489 # Make an empty namespace, which extension writers can rely on both
489 # Make an empty namespace, which extension writers can rely on both
490 # existing and NEVER being used by ipython itself. This gives them a
490 # existing and NEVER being used by ipython itself. This gives them a
491 # convenient location for storing additional information and state
491 # convenient location for storing additional information and state
492 # their extensions may require, without fear of collisions with other
492 # their extensions may require, without fear of collisions with other
493 # ipython names that may develop later.
493 # ipython names that may develop later.
494 self.meta = Struct()
494 self.meta = Struct()
495
495
496 # Temporary files used for various purposes. Deleted at exit.
496 # Temporary files used for various purposes. Deleted at exit.
497 self.tempfiles = []
497 self.tempfiles = []
498
498
499 # Keep track of readline usage (later set by init_readline)
499 # Keep track of readline usage (later set by init_readline)
500 self.has_readline = False
500 self.has_readline = False
501
501
502 # keep track of where we started running (mainly for crash post-mortem)
502 # keep track of where we started running (mainly for crash post-mortem)
503 # This is not being used anywhere currently.
503 # This is not being used anywhere currently.
504 self.starting_dir = os.getcwdu()
504 self.starting_dir = os.getcwdu()
505
505
506 # Indentation management
506 # Indentation management
507 self.indent_current_nsp = 0
507 self.indent_current_nsp = 0
508
508
509 # Dict to track post-execution functions that have been registered
509 # Dict to track post-execution functions that have been registered
510 self._post_execute = {}
510 self._post_execute = {}
511
511
512 def init_environment(self):
512 def init_environment(self):
513 """Any changes we need to make to the user's environment."""
513 """Any changes we need to make to the user's environment."""
514 pass
514 pass
515
515
516 def init_encoding(self):
516 def init_encoding(self):
517 # Get system encoding at startup time. Certain terminals (like Emacs
517 # Get system encoding at startup time. Certain terminals (like Emacs
518 # under Win32 have it set to None, and we need to have a known valid
518 # under Win32 have it set to None, and we need to have a known valid
519 # encoding to use in the raw_input() method
519 # encoding to use in the raw_input() method
520 try:
520 try:
521 self.stdin_encoding = sys.stdin.encoding or 'ascii'
521 self.stdin_encoding = sys.stdin.encoding or 'ascii'
522 except AttributeError:
522 except AttributeError:
523 self.stdin_encoding = 'ascii'
523 self.stdin_encoding = 'ascii'
524
524
525 def init_syntax_highlighting(self):
525 def init_syntax_highlighting(self):
526 # Python source parser/formatter for syntax highlighting
526 # Python source parser/formatter for syntax highlighting
527 pyformat = PyColorize.Parser().format
527 pyformat = PyColorize.Parser().format
528 self.pycolorize = lambda src: pyformat(src,'str',self.colors)
528 self.pycolorize = lambda src: pyformat(src,'str',self.colors)
529
529
530 def init_pushd_popd_magic(self):
530 def init_pushd_popd_magic(self):
531 # for pushd/popd management
531 # for pushd/popd management
532 try:
532 try:
533 self.home_dir = get_home_dir()
533 self.home_dir = get_home_dir()
534 except HomeDirError, msg:
534 except HomeDirError, msg:
535 fatal(msg)
535 fatal(msg)
536
536
537 self.dir_stack = []
537 self.dir_stack = []
538
538
539 def init_logger(self):
539 def init_logger(self):
540 self.logger = Logger(self.home_dir, logfname='ipython_log.py',
540 self.logger = Logger(self.home_dir, logfname='ipython_log.py',
541 logmode='rotate')
541 logmode='rotate')
542
542
543 def init_logstart(self):
543 def init_logstart(self):
544 """Initialize logging in case it was requested at the command line.
544 """Initialize logging in case it was requested at the command line.
545 """
545 """
546 if self.logappend:
546 if self.logappend:
547 self.magic_logstart(self.logappend + ' append')
547 self.magic_logstart(self.logappend + ' append')
548 elif self.logfile:
548 elif self.logfile:
549 self.magic_logstart(self.logfile)
549 self.magic_logstart(self.logfile)
550 elif self.logstart:
550 elif self.logstart:
551 self.magic_logstart()
551 self.magic_logstart()
552
552
553 def init_builtins(self):
553 def init_builtins(self):
554 self.builtin_trap = BuiltinTrap(shell=self)
554 self.builtin_trap = BuiltinTrap(shell=self)
555
555
556 def init_inspector(self):
556 def init_inspector(self):
557 # Object inspector
557 # Object inspector
558 self.inspector = oinspect.Inspector(oinspect.InspectColors,
558 self.inspector = oinspect.Inspector(oinspect.InspectColors,
559 PyColorize.ANSICodeColors,
559 PyColorize.ANSICodeColors,
560 'NoColor',
560 'NoColor',
561 self.object_info_string_level)
561 self.object_info_string_level)
562
562
563 def init_io(self):
563 def init_io(self):
564 # This will just use sys.stdout and sys.stderr. If you want to
564 # This will just use sys.stdout and sys.stderr. If you want to
565 # override sys.stdout and sys.stderr themselves, you need to do that
565 # override sys.stdout and sys.stderr themselves, you need to do that
566 # *before* instantiating this class, because io holds onto
566 # *before* instantiating this class, because io holds onto
567 # references to the underlying streams.
567 # references to the underlying streams.
568 if sys.platform == 'win32' and self.has_readline:
568 if sys.platform == 'win32' and self.has_readline:
569 io.stdout = io.stderr = io.IOStream(self.readline._outputfile)
569 io.stdout = io.stderr = io.IOStream(self.readline._outputfile)
570 else:
570 else:
571 io.stdout = io.IOStream(sys.stdout)
571 io.stdout = io.IOStream(sys.stdout)
572 io.stderr = io.IOStream(sys.stderr)
572 io.stderr = io.IOStream(sys.stderr)
573
573
574 def init_prompts(self):
574 def init_prompts(self):
575 # TODO: This is a pass for now because the prompts are managed inside
575 # TODO: This is a pass for now because the prompts are managed inside
576 # the DisplayHook. Once there is a separate prompt manager, this
576 # the DisplayHook. Once there is a separate prompt manager, this
577 # will initialize that object and all prompt related information.
577 # will initialize that object and all prompt related information.
578 pass
578 pass
579
579
580 def init_display_formatter(self):
580 def init_display_formatter(self):
581 self.display_formatter = DisplayFormatter(config=self.config)
581 self.display_formatter = DisplayFormatter(config=self.config)
582
582
583 def init_display_pub(self):
583 def init_display_pub(self):
584 self.display_pub = self.display_pub_class(config=self.config)
584 self.display_pub = self.display_pub_class(config=self.config)
585
585
586 def init_displayhook(self):
586 def init_displayhook(self):
587 # Initialize displayhook, set in/out prompts and printing system
587 # Initialize displayhook, set in/out prompts and printing system
588 self.displayhook = self.displayhook_class(
588 self.displayhook = self.displayhook_class(
589 config=self.config,
589 config=self.config,
590 shell=self,
590 shell=self,
591 cache_size=self.cache_size,
591 cache_size=self.cache_size,
592 input_sep = self.separate_in,
592 input_sep = self.separate_in,
593 output_sep = self.separate_out,
593 output_sep = self.separate_out,
594 output_sep2 = self.separate_out2,
594 output_sep2 = self.separate_out2,
595 ps1 = self.prompt_in1,
595 ps1 = self.prompt_in1,
596 ps2 = self.prompt_in2,
596 ps2 = self.prompt_in2,
597 ps_out = self.prompt_out,
597 ps_out = self.prompt_out,
598 pad_left = self.prompts_pad_left
598 pad_left = self.prompts_pad_left
599 )
599 )
600 # This is a context manager that installs/revmoes the displayhook at
600 # This is a context manager that installs/revmoes the displayhook at
601 # the appropriate time.
601 # the appropriate time.
602 self.display_trap = DisplayTrap(hook=self.displayhook)
602 self.display_trap = DisplayTrap(hook=self.displayhook)
603
603
604 def init_reload_doctest(self):
604 def init_reload_doctest(self):
605 # Do a proper resetting of doctest, including the necessary displayhook
605 # Do a proper resetting of doctest, including the necessary displayhook
606 # monkeypatching
606 # monkeypatching
607 try:
607 try:
608 doctest_reload()
608 doctest_reload()
609 except ImportError:
609 except ImportError:
610 warn("doctest module does not exist.")
610 warn("doctest module does not exist.")
611
611
612 #-------------------------------------------------------------------------
612 #-------------------------------------------------------------------------
613 # Things related to injections into the sys module
613 # Things related to injections into the sys module
614 #-------------------------------------------------------------------------
614 #-------------------------------------------------------------------------
615
615
616 def save_sys_module_state(self):
616 def save_sys_module_state(self):
617 """Save the state of hooks in the sys module.
617 """Save the state of hooks in the sys module.
618
618
619 This has to be called after self.user_ns is created.
619 This has to be called after self.user_ns is created.
620 """
620 """
621 self._orig_sys_module_state = {}
621 self._orig_sys_module_state = {}
622 self._orig_sys_module_state['stdin'] = sys.stdin
622 self._orig_sys_module_state['stdin'] = sys.stdin
623 self._orig_sys_module_state['stdout'] = sys.stdout
623 self._orig_sys_module_state['stdout'] = sys.stdout
624 self._orig_sys_module_state['stderr'] = sys.stderr
624 self._orig_sys_module_state['stderr'] = sys.stderr
625 self._orig_sys_module_state['excepthook'] = sys.excepthook
625 self._orig_sys_module_state['excepthook'] = sys.excepthook
626 try:
626 try:
627 self._orig_sys_modules_main_name = self.user_ns['__name__']
627 self._orig_sys_modules_main_name = self.user_ns['__name__']
628 except KeyError:
628 except KeyError:
629 pass
629 pass
630
630
631 def restore_sys_module_state(self):
631 def restore_sys_module_state(self):
632 """Restore the state of the sys module."""
632 """Restore the state of the sys module."""
633 try:
633 try:
634 for k, v in self._orig_sys_module_state.iteritems():
634 for k, v in self._orig_sys_module_state.iteritems():
635 setattr(sys, k, v)
635 setattr(sys, k, v)
636 except AttributeError:
636 except AttributeError:
637 pass
637 pass
638 # Reset what what done in self.init_sys_modules
638 # Reset what what done in self.init_sys_modules
639 try:
639 try:
640 sys.modules[self.user_ns['__name__']] = self._orig_sys_modules_main_name
640 sys.modules[self.user_ns['__name__']] = self._orig_sys_modules_main_name
641 except (AttributeError, KeyError):
641 except (AttributeError, KeyError):
642 pass
642 pass
643
643
644 #-------------------------------------------------------------------------
644 #-------------------------------------------------------------------------
645 # Things related to hooks
645 # Things related to hooks
646 #-------------------------------------------------------------------------
646 #-------------------------------------------------------------------------
647
647
648 def init_hooks(self):
648 def init_hooks(self):
649 # hooks holds pointers used for user-side customizations
649 # hooks holds pointers used for user-side customizations
650 self.hooks = Struct()
650 self.hooks = Struct()
651
651
652 self.strdispatchers = {}
652 self.strdispatchers = {}
653
653
654 # Set all default hooks, defined in the IPython.hooks module.
654 # Set all default hooks, defined in the IPython.hooks module.
655 hooks = IPython.core.hooks
655 hooks = IPython.core.hooks
656 for hook_name in hooks.__all__:
656 for hook_name in hooks.__all__:
657 # default hooks have priority 100, i.e. low; user hooks should have
657 # default hooks have priority 100, i.e. low; user hooks should have
658 # 0-100 priority
658 # 0-100 priority
659 self.set_hook(hook_name,getattr(hooks,hook_name), 100)
659 self.set_hook(hook_name,getattr(hooks,hook_name), 100)
660
660
661 def set_hook(self,name,hook, priority = 50, str_key = None, re_key = None):
661 def set_hook(self,name,hook, priority = 50, str_key = None, re_key = None):
662 """set_hook(name,hook) -> sets an internal IPython hook.
662 """set_hook(name,hook) -> sets an internal IPython hook.
663
663
664 IPython exposes some of its internal API as user-modifiable hooks. By
664 IPython exposes some of its internal API as user-modifiable hooks. By
665 adding your function to one of these hooks, you can modify IPython's
665 adding your function to one of these hooks, you can modify IPython's
666 behavior to call at runtime your own routines."""
666 behavior to call at runtime your own routines."""
667
667
668 # At some point in the future, this should validate the hook before it
668 # At some point in the future, this should validate the hook before it
669 # accepts it. Probably at least check that the hook takes the number
669 # accepts it. Probably at least check that the hook takes the number
670 # of args it's supposed to.
670 # of args it's supposed to.
671
671
672 f = types.MethodType(hook,self)
672 f = types.MethodType(hook,self)
673
673
674 # check if the hook is for strdispatcher first
674 # check if the hook is for strdispatcher first
675 if str_key is not None:
675 if str_key is not None:
676 sdp = self.strdispatchers.get(name, StrDispatch())
676 sdp = self.strdispatchers.get(name, StrDispatch())
677 sdp.add_s(str_key, f, priority )
677 sdp.add_s(str_key, f, priority )
678 self.strdispatchers[name] = sdp
678 self.strdispatchers[name] = sdp
679 return
679 return
680 if re_key is not None:
680 if re_key is not None:
681 sdp = self.strdispatchers.get(name, StrDispatch())
681 sdp = self.strdispatchers.get(name, StrDispatch())
682 sdp.add_re(re.compile(re_key), f, priority )
682 sdp.add_re(re.compile(re_key), f, priority )
683 self.strdispatchers[name] = sdp
683 self.strdispatchers[name] = sdp
684 return
684 return
685
685
686 dp = getattr(self.hooks, name, None)
686 dp = getattr(self.hooks, name, None)
687 if name not in IPython.core.hooks.__all__:
687 if name not in IPython.core.hooks.__all__:
688 print "Warning! Hook '%s' is not one of %s" % \
688 print "Warning! Hook '%s' is not one of %s" % \
689 (name, IPython.core.hooks.__all__ )
689 (name, IPython.core.hooks.__all__ )
690 if not dp:
690 if not dp:
691 dp = IPython.core.hooks.CommandChainDispatcher()
691 dp = IPython.core.hooks.CommandChainDispatcher()
692
692
693 try:
693 try:
694 dp.add(f,priority)
694 dp.add(f,priority)
695 except AttributeError:
695 except AttributeError:
696 # it was not commandchain, plain old func - replace
696 # it was not commandchain, plain old func - replace
697 dp = f
697 dp = f
698
698
699 setattr(self.hooks,name, dp)
699 setattr(self.hooks,name, dp)
700
700
701 def register_post_execute(self, func):
701 def register_post_execute(self, func):
702 """Register a function for calling after code execution.
702 """Register a function for calling after code execution.
703 """
703 """
704 if not callable(func):
704 if not callable(func):
705 raise ValueError('argument %s must be callable' % func)
705 raise ValueError('argument %s must be callable' % func)
706 self._post_execute[func] = True
706 self._post_execute[func] = True
707
707
708 #-------------------------------------------------------------------------
708 #-------------------------------------------------------------------------
709 # Things related to the "main" module
709 # Things related to the "main" module
710 #-------------------------------------------------------------------------
710 #-------------------------------------------------------------------------
711
711
712 def new_main_mod(self,ns=None):
712 def new_main_mod(self,ns=None):
713 """Return a new 'main' module object for user code execution.
713 """Return a new 'main' module object for user code execution.
714 """
714 """
715 main_mod = self._user_main_module
715 main_mod = self._user_main_module
716 init_fakemod_dict(main_mod,ns)
716 init_fakemod_dict(main_mod,ns)
717 return main_mod
717 return main_mod
718
718
719 def cache_main_mod(self,ns,fname):
719 def cache_main_mod(self,ns,fname):
720 """Cache a main module's namespace.
720 """Cache a main module's namespace.
721
721
722 When scripts are executed via %run, we must keep a reference to the
722 When scripts are executed via %run, we must keep a reference to the
723 namespace of their __main__ module (a FakeModule instance) around so
723 namespace of their __main__ module (a FakeModule instance) around so
724 that Python doesn't clear it, rendering objects defined therein
724 that Python doesn't clear it, rendering objects defined therein
725 useless.
725 useless.
726
726
727 This method keeps said reference in a private dict, keyed by the
727 This method keeps said reference in a private dict, keyed by the
728 absolute path of the module object (which corresponds to the script
728 absolute path of the module object (which corresponds to the script
729 path). This way, for multiple executions of the same script we only
729 path). This way, for multiple executions of the same script we only
730 keep one copy of the namespace (the last one), thus preventing memory
730 keep one copy of the namespace (the last one), thus preventing memory
731 leaks from old references while allowing the objects from the last
731 leaks from old references while allowing the objects from the last
732 execution to be accessible.
732 execution to be accessible.
733
733
734 Note: we can not allow the actual FakeModule instances to be deleted,
734 Note: we can not allow the actual FakeModule instances to be deleted,
735 because of how Python tears down modules (it hard-sets all their
735 because of how Python tears down modules (it hard-sets all their
736 references to None without regard for reference counts). This method
736 references to None without regard for reference counts). This method
737 must therefore make a *copy* of the given namespace, to allow the
737 must therefore make a *copy* of the given namespace, to allow the
738 original module's __dict__ to be cleared and reused.
738 original module's __dict__ to be cleared and reused.
739
739
740
740
741 Parameters
741 Parameters
742 ----------
742 ----------
743 ns : a namespace (a dict, typically)
743 ns : a namespace (a dict, typically)
744
744
745 fname : str
745 fname : str
746 Filename associated with the namespace.
746 Filename associated with the namespace.
747
747
748 Examples
748 Examples
749 --------
749 --------
750
750
751 In [10]: import IPython
751 In [10]: import IPython
752
752
753 In [11]: _ip.cache_main_mod(IPython.__dict__,IPython.__file__)
753 In [11]: _ip.cache_main_mod(IPython.__dict__,IPython.__file__)
754
754
755 In [12]: IPython.__file__ in _ip._main_ns_cache
755 In [12]: IPython.__file__ in _ip._main_ns_cache
756 Out[12]: True
756 Out[12]: True
757 """
757 """
758 self._main_ns_cache[os.path.abspath(fname)] = ns.copy()
758 self._main_ns_cache[os.path.abspath(fname)] = ns.copy()
759
759
760 def clear_main_mod_cache(self):
760 def clear_main_mod_cache(self):
761 """Clear the cache of main modules.
761 """Clear the cache of main modules.
762
762
763 Mainly for use by utilities like %reset.
763 Mainly for use by utilities like %reset.
764
764
765 Examples
765 Examples
766 --------
766 --------
767
767
768 In [15]: import IPython
768 In [15]: import IPython
769
769
770 In [16]: _ip.cache_main_mod(IPython.__dict__,IPython.__file__)
770 In [16]: _ip.cache_main_mod(IPython.__dict__,IPython.__file__)
771
771
772 In [17]: len(_ip._main_ns_cache) > 0
772 In [17]: len(_ip._main_ns_cache) > 0
773 Out[17]: True
773 Out[17]: True
774
774
775 In [18]: _ip.clear_main_mod_cache()
775 In [18]: _ip.clear_main_mod_cache()
776
776
777 In [19]: len(_ip._main_ns_cache) == 0
777 In [19]: len(_ip._main_ns_cache) == 0
778 Out[19]: True
778 Out[19]: True
779 """
779 """
780 self._main_ns_cache.clear()
780 self._main_ns_cache.clear()
781
781
782 #-------------------------------------------------------------------------
782 #-------------------------------------------------------------------------
783 # Things related to debugging
783 # Things related to debugging
784 #-------------------------------------------------------------------------
784 #-------------------------------------------------------------------------
785
785
786 def init_pdb(self):
786 def init_pdb(self):
787 # Set calling of pdb on exceptions
787 # Set calling of pdb on exceptions
788 # self.call_pdb is a property
788 # self.call_pdb is a property
789 self.call_pdb = self.pdb
789 self.call_pdb = self.pdb
790
790
791 def _get_call_pdb(self):
791 def _get_call_pdb(self):
792 return self._call_pdb
792 return self._call_pdb
793
793
794 def _set_call_pdb(self,val):
794 def _set_call_pdb(self,val):
795
795
796 if val not in (0,1,False,True):
796 if val not in (0,1,False,True):
797 raise ValueError,'new call_pdb value must be boolean'
797 raise ValueError,'new call_pdb value must be boolean'
798
798
799 # store value in instance
799 # store value in instance
800 self._call_pdb = val
800 self._call_pdb = val
801
801
802 # notify the actual exception handlers
802 # notify the actual exception handlers
803 self.InteractiveTB.call_pdb = val
803 self.InteractiveTB.call_pdb = val
804
804
805 call_pdb = property(_get_call_pdb,_set_call_pdb,None,
805 call_pdb = property(_get_call_pdb,_set_call_pdb,None,
806 'Control auto-activation of pdb at exceptions')
806 'Control auto-activation of pdb at exceptions')
807
807
808 def debugger(self,force=False):
808 def debugger(self,force=False):
809 """Call the pydb/pdb debugger.
809 """Call the pydb/pdb debugger.
810
810
811 Keywords:
811 Keywords:
812
812
813 - force(False): by default, this routine checks the instance call_pdb
813 - force(False): by default, this routine checks the instance call_pdb
814 flag and does not actually invoke the debugger if the flag is false.
814 flag and does not actually invoke the debugger if the flag is false.
815 The 'force' option forces the debugger to activate even if the flag
815 The 'force' option forces the debugger to activate even if the flag
816 is false.
816 is false.
817 """
817 """
818
818
819 if not (force or self.call_pdb):
819 if not (force or self.call_pdb):
820 return
820 return
821
821
822 if not hasattr(sys,'last_traceback'):
822 if not hasattr(sys,'last_traceback'):
823 error('No traceback has been produced, nothing to debug.')
823 error('No traceback has been produced, nothing to debug.')
824 return
824 return
825
825
826 # use pydb if available
826 # use pydb if available
827 if debugger.has_pydb:
827 if debugger.has_pydb:
828 from pydb import pm
828 from pydb import pm
829 else:
829 else:
830 # fallback to our internal debugger
830 # fallback to our internal debugger
831 pm = lambda : self.InteractiveTB.debugger(force=True)
831 pm = lambda : self.InteractiveTB.debugger(force=True)
832
832
833 with self.readline_no_record:
833 with self.readline_no_record:
834 pm()
834 pm()
835
835
836 #-------------------------------------------------------------------------
836 #-------------------------------------------------------------------------
837 # Things related to IPython's various namespaces
837 # Things related to IPython's various namespaces
838 #-------------------------------------------------------------------------
838 #-------------------------------------------------------------------------
839
839
840 def init_create_namespaces(self, user_ns=None, user_global_ns=None):
840 def init_create_namespaces(self, user_ns=None, user_global_ns=None):
841 # Create the namespace where the user will operate. user_ns is
841 # Create the namespace where the user will operate. user_ns is
842 # normally the only one used, and it is passed to the exec calls as
842 # normally the only one used, and it is passed to the exec calls as
843 # the locals argument. But we do carry a user_global_ns namespace
843 # the locals argument. But we do carry a user_global_ns namespace
844 # given as the exec 'globals' argument, This is useful in embedding
844 # given as the exec 'globals' argument, This is useful in embedding
845 # situations where the ipython shell opens in a context where the
845 # situations where the ipython shell opens in a context where the
846 # distinction between locals and globals is meaningful. For
846 # distinction between locals and globals is meaningful. For
847 # non-embedded contexts, it is just the same object as the user_ns dict.
847 # non-embedded contexts, it is just the same object as the user_ns dict.
848
848
849 # FIXME. For some strange reason, __builtins__ is showing up at user
849 # FIXME. For some strange reason, __builtins__ is showing up at user
850 # level as a dict instead of a module. This is a manual fix, but I
850 # level as a dict instead of a module. This is a manual fix, but I
851 # should really track down where the problem is coming from. Alex
851 # should really track down where the problem is coming from. Alex
852 # Schmolck reported this problem first.
852 # Schmolck reported this problem first.
853
853
854 # A useful post by Alex Martelli on this topic:
854 # A useful post by Alex Martelli on this topic:
855 # Re: inconsistent value from __builtins__
855 # Re: inconsistent value from __builtins__
856 # Von: Alex Martelli <aleaxit@yahoo.com>
856 # Von: Alex Martelli <aleaxit@yahoo.com>
857 # Datum: Freitag 01 Oktober 2004 04:45:34 nachmittags/abends
857 # Datum: Freitag 01 Oktober 2004 04:45:34 nachmittags/abends
858 # Gruppen: comp.lang.python
858 # Gruppen: comp.lang.python
859
859
860 # Michael Hohn <hohn@hooknose.lbl.gov> wrote:
860 # Michael Hohn <hohn@hooknose.lbl.gov> wrote:
861 # > >>> print type(builtin_check.get_global_binding('__builtins__'))
861 # > >>> print type(builtin_check.get_global_binding('__builtins__'))
862 # > <type 'dict'>
862 # > <type 'dict'>
863 # > >>> print type(__builtins__)
863 # > >>> print type(__builtins__)
864 # > <type 'module'>
864 # > <type 'module'>
865 # > Is this difference in return value intentional?
865 # > Is this difference in return value intentional?
866
866
867 # Well, it's documented that '__builtins__' can be either a dictionary
867 # Well, it's documented that '__builtins__' can be either a dictionary
868 # or a module, and it's been that way for a long time. Whether it's
868 # or a module, and it's been that way for a long time. Whether it's
869 # intentional (or sensible), I don't know. In any case, the idea is
869 # intentional (or sensible), I don't know. In any case, the idea is
870 # that if you need to access the built-in namespace directly, you
870 # that if you need to access the built-in namespace directly, you
871 # should start with "import __builtin__" (note, no 's') which will
871 # should start with "import __builtin__" (note, no 's') which will
872 # definitely give you a module. Yeah, it's somewhat confusing:-(.
872 # definitely give you a module. Yeah, it's somewhat confusing:-(.
873
873
874 # These routines return properly built dicts as needed by the rest of
874 # These routines return properly built dicts as needed by the rest of
875 # the code, and can also be used by extension writers to generate
875 # the code, and can also be used by extension writers to generate
876 # properly initialized namespaces.
876 # properly initialized namespaces.
877 user_ns, user_global_ns = self.make_user_namespaces(user_ns,
877 user_ns, user_global_ns = self.make_user_namespaces(user_ns,
878 user_global_ns)
878 user_global_ns)
879
879
880 # Assign namespaces
880 # Assign namespaces
881 # This is the namespace where all normal user variables live
881 # This is the namespace where all normal user variables live
882 self.user_ns = user_ns
882 self.user_ns = user_ns
883 self.user_global_ns = user_global_ns
883 self.user_global_ns = user_global_ns
884
884
885 # An auxiliary namespace that checks what parts of the user_ns were
885 # An auxiliary namespace that checks what parts of the user_ns were
886 # loaded at startup, so we can list later only variables defined in
886 # loaded at startup, so we can list later only variables defined in
887 # actual interactive use. Since it is always a subset of user_ns, it
887 # actual interactive use. Since it is always a subset of user_ns, it
888 # doesn't need to be separately tracked in the ns_table.
888 # doesn't need to be separately tracked in the ns_table.
889 self.user_ns_hidden = {}
889 self.user_ns_hidden = {}
890
890
891 # A namespace to keep track of internal data structures to prevent
891 # A namespace to keep track of internal data structures to prevent
892 # them from cluttering user-visible stuff. Will be updated later
892 # them from cluttering user-visible stuff. Will be updated later
893 self.internal_ns = {}
893 self.internal_ns = {}
894
894
895 # Now that FakeModule produces a real module, we've run into a nasty
895 # Now that FakeModule produces a real module, we've run into a nasty
896 # problem: after script execution (via %run), the module where the user
896 # problem: after script execution (via %run), the module where the user
897 # code ran is deleted. Now that this object is a true module (needed
897 # code ran is deleted. Now that this object is a true module (needed
898 # so docetst and other tools work correctly), the Python module
898 # so docetst and other tools work correctly), the Python module
899 # teardown mechanism runs over it, and sets to None every variable
899 # teardown mechanism runs over it, and sets to None every variable
900 # present in that module. Top-level references to objects from the
900 # present in that module. Top-level references to objects from the
901 # script survive, because the user_ns is updated with them. However,
901 # script survive, because the user_ns is updated with them. However,
902 # calling functions defined in the script that use other things from
902 # calling functions defined in the script that use other things from
903 # the script will fail, because the function's closure had references
903 # the script will fail, because the function's closure had references
904 # to the original objects, which are now all None. So we must protect
904 # to the original objects, which are now all None. So we must protect
905 # these modules from deletion by keeping a cache.
905 # these modules from deletion by keeping a cache.
906 #
906 #
907 # To avoid keeping stale modules around (we only need the one from the
907 # To avoid keeping stale modules around (we only need the one from the
908 # last run), we use a dict keyed with the full path to the script, so
908 # last run), we use a dict keyed with the full path to the script, so
909 # only the last version of the module is held in the cache. Note,
909 # only the last version of the module is held in the cache. Note,
910 # however, that we must cache the module *namespace contents* (their
910 # however, that we must cache the module *namespace contents* (their
911 # __dict__). Because if we try to cache the actual modules, old ones
911 # __dict__). Because if we try to cache the actual modules, old ones
912 # (uncached) could be destroyed while still holding references (such as
912 # (uncached) could be destroyed while still holding references (such as
913 # those held by GUI objects that tend to be long-lived)>
913 # those held by GUI objects that tend to be long-lived)>
914 #
914 #
915 # The %reset command will flush this cache. See the cache_main_mod()
915 # The %reset command will flush this cache. See the cache_main_mod()
916 # and clear_main_mod_cache() methods for details on use.
916 # and clear_main_mod_cache() methods for details on use.
917
917
918 # This is the cache used for 'main' namespaces
918 # This is the cache used for 'main' namespaces
919 self._main_ns_cache = {}
919 self._main_ns_cache = {}
920 # And this is the single instance of FakeModule whose __dict__ we keep
920 # And this is the single instance of FakeModule whose __dict__ we keep
921 # copying and clearing for reuse on each %run
921 # copying and clearing for reuse on each %run
922 self._user_main_module = FakeModule()
922 self._user_main_module = FakeModule()
923
923
924 # A table holding all the namespaces IPython deals with, so that
924 # A table holding all the namespaces IPython deals with, so that
925 # introspection facilities can search easily.
925 # introspection facilities can search easily.
926 self.ns_table = {'user':user_ns,
926 self.ns_table = {'user':user_ns,
927 'user_global':user_global_ns,
927 'user_global':user_global_ns,
928 'internal':self.internal_ns,
928 'internal':self.internal_ns,
929 'builtin':__builtin__.__dict__
929 'builtin':builtin_mod.__dict__
930 }
930 }
931
931
932 # Similarly, track all namespaces where references can be held and that
932 # Similarly, track all namespaces where references can be held and that
933 # we can safely clear (so it can NOT include builtin). This one can be
933 # we can safely clear (so it can NOT include builtin). This one can be
934 # a simple list. Note that the main execution namespaces, user_ns and
934 # a simple list. Note that the main execution namespaces, user_ns and
935 # user_global_ns, can NOT be listed here, as clearing them blindly
935 # user_global_ns, can NOT be listed here, as clearing them blindly
936 # causes errors in object __del__ methods. Instead, the reset() method
936 # causes errors in object __del__ methods. Instead, the reset() method
937 # clears them manually and carefully.
937 # clears them manually and carefully.
938 self.ns_refs_table = [ self.user_ns_hidden,
938 self.ns_refs_table = [ self.user_ns_hidden,
939 self.internal_ns, self._main_ns_cache ]
939 self.internal_ns, self._main_ns_cache ]
940
940
941 def make_user_namespaces(self, user_ns=None, user_global_ns=None):
941 def make_user_namespaces(self, user_ns=None, user_global_ns=None):
942 """Return a valid local and global user interactive namespaces.
942 """Return a valid local and global user interactive namespaces.
943
943
944 This builds a dict with the minimal information needed to operate as a
944 This builds a dict with the minimal information needed to operate as a
945 valid IPython user namespace, which you can pass to the various
945 valid IPython user namespace, which you can pass to the various
946 embedding classes in ipython. The default implementation returns the
946 embedding classes in ipython. The default implementation returns the
947 same dict for both the locals and the globals to allow functions to
947 same dict for both the locals and the globals to allow functions to
948 refer to variables in the namespace. Customized implementations can
948 refer to variables in the namespace. Customized implementations can
949 return different dicts. The locals dictionary can actually be anything
949 return different dicts. The locals dictionary can actually be anything
950 following the basic mapping protocol of a dict, but the globals dict
950 following the basic mapping protocol of a dict, but the globals dict
951 must be a true dict, not even a subclass. It is recommended that any
951 must be a true dict, not even a subclass. It is recommended that any
952 custom object for the locals namespace synchronize with the globals
952 custom object for the locals namespace synchronize with the globals
953 dict somehow.
953 dict somehow.
954
954
955 Raises TypeError if the provided globals namespace is not a true dict.
955 Raises TypeError if the provided globals namespace is not a true dict.
956
956
957 Parameters
957 Parameters
958 ----------
958 ----------
959 user_ns : dict-like, optional
959 user_ns : dict-like, optional
960 The current user namespace. The items in this namespace should
960 The current user namespace. The items in this namespace should
961 be included in the output. If None, an appropriate blank
961 be included in the output. If None, an appropriate blank
962 namespace should be created.
962 namespace should be created.
963 user_global_ns : dict, optional
963 user_global_ns : dict, optional
964 The current user global namespace. The items in this namespace
964 The current user global namespace. The items in this namespace
965 should be included in the output. If None, an appropriate
965 should be included in the output. If None, an appropriate
966 blank namespace should be created.
966 blank namespace should be created.
967
967
968 Returns
968 Returns
969 -------
969 -------
970 A pair of dictionary-like object to be used as the local namespace
970 A pair of dictionary-like object to be used as the local namespace
971 of the interpreter and a dict to be used as the global namespace.
971 of the interpreter and a dict to be used as the global namespace.
972 """
972 """
973
973
974
974
975 # We must ensure that __builtin__ (without the final 's') is always
975 # We must ensure that __builtin__ (without the final 's') is always
976 # available and pointing to the __builtin__ *module*. For more details:
976 # available and pointing to the __builtin__ *module*. For more details:
977 # http://mail.python.org/pipermail/python-dev/2001-April/014068.html
977 # http://mail.python.org/pipermail/python-dev/2001-April/014068.html
978
978
979 if user_ns is None:
979 if user_ns is None:
980 # Set __name__ to __main__ to better match the behavior of the
980 # Set __name__ to __main__ to better match the behavior of the
981 # normal interpreter.
981 # normal interpreter.
982 user_ns = {'__name__' :'__main__',
982 user_ns = {'__name__' :'__main__',
983 py3compat.builtin_mod_name: builtin_mod,
983 py3compat.builtin_mod_name: builtin_mod,
984 '__builtins__' : builtin_mod,
984 '__builtins__' : builtin_mod,
985 }
985 }
986 else:
986 else:
987 user_ns.setdefault('__name__','__main__')
987 user_ns.setdefault('__name__','__main__')
988 user_ns.setdefault(py3compat.builtin_mod_name,builtin_mod)
988 user_ns.setdefault(py3compat.builtin_mod_name,builtin_mod)
989 user_ns.setdefault('__builtins__',builtin_mod)
989 user_ns.setdefault('__builtins__',builtin_mod)
990
990
991 if user_global_ns is None:
991 if user_global_ns is None:
992 user_global_ns = user_ns
992 user_global_ns = user_ns
993 if type(user_global_ns) is not dict:
993 if type(user_global_ns) is not dict:
994 raise TypeError("user_global_ns must be a true dict; got %r"
994 raise TypeError("user_global_ns must be a true dict; got %r"
995 % type(user_global_ns))
995 % type(user_global_ns))
996
996
997 return user_ns, user_global_ns
997 return user_ns, user_global_ns
998
998
999 def init_sys_modules(self):
999 def init_sys_modules(self):
1000 # We need to insert into sys.modules something that looks like a
1000 # We need to insert into sys.modules something that looks like a
1001 # module but which accesses the IPython namespace, for shelve and
1001 # module but which accesses the IPython namespace, for shelve and
1002 # pickle to work interactively. Normally they rely on getting
1002 # pickle to work interactively. Normally they rely on getting
1003 # everything out of __main__, but for embedding purposes each IPython
1003 # everything out of __main__, but for embedding purposes each IPython
1004 # instance has its own private namespace, so we can't go shoving
1004 # instance has its own private namespace, so we can't go shoving
1005 # everything into __main__.
1005 # everything into __main__.
1006
1006
1007 # note, however, that we should only do this for non-embedded
1007 # note, however, that we should only do this for non-embedded
1008 # ipythons, which really mimic the __main__.__dict__ with their own
1008 # ipythons, which really mimic the __main__.__dict__ with their own
1009 # namespace. Embedded instances, on the other hand, should not do
1009 # namespace. Embedded instances, on the other hand, should not do
1010 # this because they need to manage the user local/global namespaces
1010 # this because they need to manage the user local/global namespaces
1011 # only, but they live within a 'normal' __main__ (meaning, they
1011 # only, but they live within a 'normal' __main__ (meaning, they
1012 # shouldn't overtake the execution environment of the script they're
1012 # shouldn't overtake the execution environment of the script they're
1013 # embedded in).
1013 # embedded in).
1014
1014
1015 # This is overridden in the InteractiveShellEmbed subclass to a no-op.
1015 # This is overridden in the InteractiveShellEmbed subclass to a no-op.
1016
1016
1017 try:
1017 try:
1018 main_name = self.user_ns['__name__']
1018 main_name = self.user_ns['__name__']
1019 except KeyError:
1019 except KeyError:
1020 raise KeyError('user_ns dictionary MUST have a "__name__" key')
1020 raise KeyError('user_ns dictionary MUST have a "__name__" key')
1021 else:
1021 else:
1022 sys.modules[main_name] = FakeModule(self.user_ns)
1022 sys.modules[main_name] = FakeModule(self.user_ns)
1023
1023
1024 def init_user_ns(self):
1024 def init_user_ns(self):
1025 """Initialize all user-visible namespaces to their minimum defaults.
1025 """Initialize all user-visible namespaces to their minimum defaults.
1026
1026
1027 Certain history lists are also initialized here, as they effectively
1027 Certain history lists are also initialized here, as they effectively
1028 act as user namespaces.
1028 act as user namespaces.
1029
1029
1030 Notes
1030 Notes
1031 -----
1031 -----
1032 All data structures here are only filled in, they are NOT reset by this
1032 All data structures here are only filled in, they are NOT reset by this
1033 method. If they were not empty before, data will simply be added to
1033 method. If they were not empty before, data will simply be added to
1034 therm.
1034 therm.
1035 """
1035 """
1036 # This function works in two parts: first we put a few things in
1036 # This function works in two parts: first we put a few things in
1037 # user_ns, and we sync that contents into user_ns_hidden so that these
1037 # user_ns, and we sync that contents into user_ns_hidden so that these
1038 # initial variables aren't shown by %who. After the sync, we add the
1038 # initial variables aren't shown by %who. After the sync, we add the
1039 # rest of what we *do* want the user to see with %who even on a new
1039 # rest of what we *do* want the user to see with %who even on a new
1040 # session (probably nothing, so theye really only see their own stuff)
1040 # session (probably nothing, so theye really only see their own stuff)
1041
1041
1042 # The user dict must *always* have a __builtin__ reference to the
1042 # The user dict must *always* have a __builtin__ reference to the
1043 # Python standard __builtin__ namespace, which must be imported.
1043 # Python standard __builtin__ namespace, which must be imported.
1044 # This is so that certain operations in prompt evaluation can be
1044 # This is so that certain operations in prompt evaluation can be
1045 # reliably executed with builtins. Note that we can NOT use
1045 # reliably executed with builtins. Note that we can NOT use
1046 # __builtins__ (note the 's'), because that can either be a dict or a
1046 # __builtins__ (note the 's'), because that can either be a dict or a
1047 # module, and can even mutate at runtime, depending on the context
1047 # module, and can even mutate at runtime, depending on the context
1048 # (Python makes no guarantees on it). In contrast, __builtin__ is
1048 # (Python makes no guarantees on it). In contrast, __builtin__ is
1049 # always a module object, though it must be explicitly imported.
1049 # always a module object, though it must be explicitly imported.
1050
1050
1051 # For more details:
1051 # For more details:
1052 # http://mail.python.org/pipermail/python-dev/2001-April/014068.html
1052 # http://mail.python.org/pipermail/python-dev/2001-April/014068.html
1053 ns = dict(__builtin__ = __builtin__)
1053 ns = dict(__builtin__ = builtin_mod)
1054
1054
1055 # Put 'help' in the user namespace
1055 # Put 'help' in the user namespace
1056 try:
1056 try:
1057 from site import _Helper
1057 from site import _Helper
1058 ns['help'] = _Helper()
1058 ns['help'] = _Helper()
1059 except ImportError:
1059 except ImportError:
1060 warn('help() not available - check site.py')
1060 warn('help() not available - check site.py')
1061
1061
1062 # make global variables for user access to the histories
1062 # make global variables for user access to the histories
1063 ns['_ih'] = self.history_manager.input_hist_parsed
1063 ns['_ih'] = self.history_manager.input_hist_parsed
1064 ns['_oh'] = self.history_manager.output_hist
1064 ns['_oh'] = self.history_manager.output_hist
1065 ns['_dh'] = self.history_manager.dir_hist
1065 ns['_dh'] = self.history_manager.dir_hist
1066
1066
1067 ns['_sh'] = shadowns
1067 ns['_sh'] = shadowns
1068
1068
1069 # user aliases to input and output histories. These shouldn't show up
1069 # user aliases to input and output histories. These shouldn't show up
1070 # in %who, as they can have very large reprs.
1070 # in %who, as they can have very large reprs.
1071 ns['In'] = self.history_manager.input_hist_parsed
1071 ns['In'] = self.history_manager.input_hist_parsed
1072 ns['Out'] = self.history_manager.output_hist
1072 ns['Out'] = self.history_manager.output_hist
1073
1073
1074 # Store myself as the public api!!!
1074 # Store myself as the public api!!!
1075 ns['get_ipython'] = self.get_ipython
1075 ns['get_ipython'] = self.get_ipython
1076
1076
1077 ns['exit'] = self.exiter
1077 ns['exit'] = self.exiter
1078 ns['quit'] = self.exiter
1078 ns['quit'] = self.exiter
1079
1079
1080 # Sync what we've added so far to user_ns_hidden so these aren't seen
1080 # Sync what we've added so far to user_ns_hidden so these aren't seen
1081 # by %who
1081 # by %who
1082 self.user_ns_hidden.update(ns)
1082 self.user_ns_hidden.update(ns)
1083
1083
1084 # Anything put into ns now would show up in %who. Think twice before
1084 # Anything put into ns now would show up in %who. Think twice before
1085 # putting anything here, as we really want %who to show the user their
1085 # putting anything here, as we really want %who to show the user their
1086 # stuff, not our variables.
1086 # stuff, not our variables.
1087
1087
1088 # Finally, update the real user's namespace
1088 # Finally, update the real user's namespace
1089 self.user_ns.update(ns)
1089 self.user_ns.update(ns)
1090
1090
1091 def reset(self, new_session=True):
1091 def reset(self, new_session=True):
1092 """Clear all internal namespaces, and attempt to release references to
1092 """Clear all internal namespaces, and attempt to release references to
1093 user objects.
1093 user objects.
1094
1094
1095 If new_session is True, a new history session will be opened.
1095 If new_session is True, a new history session will be opened.
1096 """
1096 """
1097 # Clear histories
1097 # Clear histories
1098 self.history_manager.reset(new_session)
1098 self.history_manager.reset(new_session)
1099 # Reset counter used to index all histories
1099 # Reset counter used to index all histories
1100 if new_session:
1100 if new_session:
1101 self.execution_count = 1
1101 self.execution_count = 1
1102
1102
1103 # Flush cached output items
1103 # Flush cached output items
1104 if self.displayhook.do_full_cache:
1104 if self.displayhook.do_full_cache:
1105 self.displayhook.flush()
1105 self.displayhook.flush()
1106
1106
1107 # Restore the user namespaces to minimal usability
1107 # Restore the user namespaces to minimal usability
1108 for ns in self.ns_refs_table:
1108 for ns in self.ns_refs_table:
1109 ns.clear()
1109 ns.clear()
1110
1110
1111 # The main execution namespaces must be cleared very carefully,
1111 # The main execution namespaces must be cleared very carefully,
1112 # skipping the deletion of the builtin-related keys, because doing so
1112 # skipping the deletion of the builtin-related keys, because doing so
1113 # would cause errors in many object's __del__ methods.
1113 # would cause errors in many object's __del__ methods.
1114 for ns in [self.user_ns, self.user_global_ns]:
1114 for ns in [self.user_ns, self.user_global_ns]:
1115 drop_keys = set(ns.keys())
1115 drop_keys = set(ns.keys())
1116 drop_keys.discard('__builtin__')
1116 drop_keys.discard('__builtin__')
1117 drop_keys.discard('__builtins__')
1117 drop_keys.discard('__builtins__')
1118 for k in drop_keys:
1118 for k in drop_keys:
1119 del ns[k]
1119 del ns[k]
1120
1120
1121 # Restore the user namespaces to minimal usability
1121 # Restore the user namespaces to minimal usability
1122 self.init_user_ns()
1122 self.init_user_ns()
1123
1123
1124 # Restore the default and user aliases
1124 # Restore the default and user aliases
1125 self.alias_manager.clear_aliases()
1125 self.alias_manager.clear_aliases()
1126 self.alias_manager.init_aliases()
1126 self.alias_manager.init_aliases()
1127
1127
1128 # Flush the private list of module references kept for script
1128 # Flush the private list of module references kept for script
1129 # execution protection
1129 # execution protection
1130 self.clear_main_mod_cache()
1130 self.clear_main_mod_cache()
1131
1131
1132 # Clear out the namespace from the last %run
1132 # Clear out the namespace from the last %run
1133 self.new_main_mod()
1133 self.new_main_mod()
1134
1134
1135 def del_var(self, varname, by_name=False):
1135 def del_var(self, varname, by_name=False):
1136 """Delete a variable from the various namespaces, so that, as
1136 """Delete a variable from the various namespaces, so that, as
1137 far as possible, we're not keeping any hidden references to it.
1137 far as possible, we're not keeping any hidden references to it.
1138
1138
1139 Parameters
1139 Parameters
1140 ----------
1140 ----------
1141 varname : str
1141 varname : str
1142 The name of the variable to delete.
1142 The name of the variable to delete.
1143 by_name : bool
1143 by_name : bool
1144 If True, delete variables with the given name in each
1144 If True, delete variables with the given name in each
1145 namespace. If False (default), find the variable in the user
1145 namespace. If False (default), find the variable in the user
1146 namespace, and delete references to it.
1146 namespace, and delete references to it.
1147 """
1147 """
1148 if varname in ('__builtin__', '__builtins__'):
1148 if varname in ('__builtin__', '__builtins__'):
1149 raise ValueError("Refusing to delete %s" % varname)
1149 raise ValueError("Refusing to delete %s" % varname)
1150 ns_refs = self.ns_refs_table + [self.user_ns,
1150 ns_refs = self.ns_refs_table + [self.user_ns,
1151 self.user_global_ns, self._user_main_module.__dict__] +\
1151 self.user_global_ns, self._user_main_module.__dict__] +\
1152 self._main_ns_cache.values()
1152 self._main_ns_cache.values()
1153
1153
1154 if by_name: # Delete by name
1154 if by_name: # Delete by name
1155 for ns in ns_refs:
1155 for ns in ns_refs:
1156 try:
1156 try:
1157 del ns[varname]
1157 del ns[varname]
1158 except KeyError:
1158 except KeyError:
1159 pass
1159 pass
1160 else: # Delete by object
1160 else: # Delete by object
1161 try:
1161 try:
1162 obj = self.user_ns[varname]
1162 obj = self.user_ns[varname]
1163 except KeyError:
1163 except KeyError:
1164 raise NameError("name '%s' is not defined" % varname)
1164 raise NameError("name '%s' is not defined" % varname)
1165 # Also check in output history
1165 # Also check in output history
1166 ns_refs.append(self.history_manager.output_hist)
1166 ns_refs.append(self.history_manager.output_hist)
1167 for ns in ns_refs:
1167 for ns in ns_refs:
1168 to_delete = [n for n, o in ns.iteritems() if o is obj]
1168 to_delete = [n for n, o in ns.iteritems() if o is obj]
1169 for name in to_delete:
1169 for name in to_delete:
1170 del ns[name]
1170 del ns[name]
1171
1171
1172 # displayhook keeps extra references, but not in a dictionary
1172 # displayhook keeps extra references, but not in a dictionary
1173 for name in ('_', '__', '___'):
1173 for name in ('_', '__', '___'):
1174 if getattr(self.displayhook, name) is obj:
1174 if getattr(self.displayhook, name) is obj:
1175 setattr(self.displayhook, name, None)
1175 setattr(self.displayhook, name, None)
1176
1176
1177 def reset_selective(self, regex=None):
1177 def reset_selective(self, regex=None):
1178 """Clear selective variables from internal namespaces based on a
1178 """Clear selective variables from internal namespaces based on a
1179 specified regular expression.
1179 specified regular expression.
1180
1180
1181 Parameters
1181 Parameters
1182 ----------
1182 ----------
1183 regex : string or compiled pattern, optional
1183 regex : string or compiled pattern, optional
1184 A regular expression pattern that will be used in searching
1184 A regular expression pattern that will be used in searching
1185 variable names in the users namespaces.
1185 variable names in the users namespaces.
1186 """
1186 """
1187 if regex is not None:
1187 if regex is not None:
1188 try:
1188 try:
1189 m = re.compile(regex)
1189 m = re.compile(regex)
1190 except TypeError:
1190 except TypeError:
1191 raise TypeError('regex must be a string or compiled pattern')
1191 raise TypeError('regex must be a string or compiled pattern')
1192 # Search for keys in each namespace that match the given regex
1192 # Search for keys in each namespace that match the given regex
1193 # If a match is found, delete the key/value pair.
1193 # If a match is found, delete the key/value pair.
1194 for ns in self.ns_refs_table:
1194 for ns in self.ns_refs_table:
1195 for var in ns:
1195 for var in ns:
1196 if m.search(var):
1196 if m.search(var):
1197 del ns[var]
1197 del ns[var]
1198
1198
1199 def push(self, variables, interactive=True):
1199 def push(self, variables, interactive=True):
1200 """Inject a group of variables into the IPython user namespace.
1200 """Inject a group of variables into the IPython user namespace.
1201
1201
1202 Parameters
1202 Parameters
1203 ----------
1203 ----------
1204 variables : dict, str or list/tuple of str
1204 variables : dict, str or list/tuple of str
1205 The variables to inject into the user's namespace. If a dict, a
1205 The variables to inject into the user's namespace. If a dict, a
1206 simple update is done. If a str, the string is assumed to have
1206 simple update is done. If a str, the string is assumed to have
1207 variable names separated by spaces. A list/tuple of str can also
1207 variable names separated by spaces. A list/tuple of str can also
1208 be used to give the variable names. If just the variable names are
1208 be used to give the variable names. If just the variable names are
1209 give (list/tuple/str) then the variable values looked up in the
1209 give (list/tuple/str) then the variable values looked up in the
1210 callers frame.
1210 callers frame.
1211 interactive : bool
1211 interactive : bool
1212 If True (default), the variables will be listed with the ``who``
1212 If True (default), the variables will be listed with the ``who``
1213 magic.
1213 magic.
1214 """
1214 """
1215 vdict = None
1215 vdict = None
1216
1216
1217 # We need a dict of name/value pairs to do namespace updates.
1217 # We need a dict of name/value pairs to do namespace updates.
1218 if isinstance(variables, dict):
1218 if isinstance(variables, dict):
1219 vdict = variables
1219 vdict = variables
1220 elif isinstance(variables, (basestring, list, tuple)):
1220 elif isinstance(variables, (basestring, list, tuple)):
1221 if isinstance(variables, basestring):
1221 if isinstance(variables, basestring):
1222 vlist = variables.split()
1222 vlist = variables.split()
1223 else:
1223 else:
1224 vlist = variables
1224 vlist = variables
1225 vdict = {}
1225 vdict = {}
1226 cf = sys._getframe(1)
1226 cf = sys._getframe(1)
1227 for name in vlist:
1227 for name in vlist:
1228 try:
1228 try:
1229 vdict[name] = eval(name, cf.f_globals, cf.f_locals)
1229 vdict[name] = eval(name, cf.f_globals, cf.f_locals)
1230 except:
1230 except:
1231 print ('Could not get variable %s from %s' %
1231 print ('Could not get variable %s from %s' %
1232 (name,cf.f_code.co_name))
1232 (name,cf.f_code.co_name))
1233 else:
1233 else:
1234 raise ValueError('variables must be a dict/str/list/tuple')
1234 raise ValueError('variables must be a dict/str/list/tuple')
1235
1235
1236 # Propagate variables to user namespace
1236 # Propagate variables to user namespace
1237 self.user_ns.update(vdict)
1237 self.user_ns.update(vdict)
1238
1238
1239 # And configure interactive visibility
1239 # And configure interactive visibility
1240 config_ns = self.user_ns_hidden
1240 config_ns = self.user_ns_hidden
1241 if interactive:
1241 if interactive:
1242 for name, val in vdict.iteritems():
1242 for name, val in vdict.iteritems():
1243 config_ns.pop(name, None)
1243 config_ns.pop(name, None)
1244 else:
1244 else:
1245 for name,val in vdict.iteritems():
1245 for name,val in vdict.iteritems():
1246 config_ns[name] = val
1246 config_ns[name] = val
1247
1247
1248 #-------------------------------------------------------------------------
1248 #-------------------------------------------------------------------------
1249 # Things related to object introspection
1249 # Things related to object introspection
1250 #-------------------------------------------------------------------------
1250 #-------------------------------------------------------------------------
1251
1251
1252 def _ofind(self, oname, namespaces=None):
1252 def _ofind(self, oname, namespaces=None):
1253 """Find an object in the available namespaces.
1253 """Find an object in the available namespaces.
1254
1254
1255 self._ofind(oname) -> dict with keys: found,obj,ospace,ismagic
1255 self._ofind(oname) -> dict with keys: found,obj,ospace,ismagic
1256
1256
1257 Has special code to detect magic functions.
1257 Has special code to detect magic functions.
1258 """
1258 """
1259 oname = oname.strip()
1259 oname = oname.strip()
1260 #print '1- oname: <%r>' % oname # dbg
1260 #print '1- oname: <%r>' % oname # dbg
1261 if not py3compat.PY3:
1261 if not py3compat.PY3:
1262 try:
1262 try:
1263 oname = oname.encode('ascii')
1263 oname = oname.encode('ascii')
1264 #print '2- oname: <%r>' % oname # dbg
1264 #print '2- oname: <%r>' % oname # dbg
1265 except UnicodeError:
1265 except UnicodeError:
1266 print 'Python identifiers can only contain ascii characters.'
1266 print 'Python identifiers can only contain ascii characters.'
1267 return dict(found=False)
1267 return dict(found=False)
1268
1268
1269 alias_ns = None
1269 alias_ns = None
1270 if namespaces is None:
1270 if namespaces is None:
1271 # Namespaces to search in:
1271 # Namespaces to search in:
1272 # Put them in a list. The order is important so that we
1272 # Put them in a list. The order is important so that we
1273 # find things in the same order that Python finds them.
1273 # find things in the same order that Python finds them.
1274 namespaces = [ ('Interactive', self.user_ns),
1274 namespaces = [ ('Interactive', self.user_ns),
1275 ('IPython internal', self.internal_ns),
1275 ('IPython internal', self.internal_ns),
1276 ('Python builtin', __builtin__.__dict__),
1276 ('Python builtin', builtin_mod.__dict__),
1277 ('Alias', self.alias_manager.alias_table),
1277 ('Alias', self.alias_manager.alias_table),
1278 ]
1278 ]
1279 alias_ns = self.alias_manager.alias_table
1279 alias_ns = self.alias_manager.alias_table
1280
1280
1281 # initialize results to 'null'
1281 # initialize results to 'null'
1282 found = False; obj = None; ospace = None; ds = None;
1282 found = False; obj = None; ospace = None; ds = None;
1283 ismagic = False; isalias = False; parent = None
1283 ismagic = False; isalias = False; parent = None
1284
1284
1285 # We need to special-case 'print', which as of python2.6 registers as a
1285 # We need to special-case 'print', which as of python2.6 registers as a
1286 # function but should only be treated as one if print_function was
1286 # function but should only be treated as one if print_function was
1287 # loaded with a future import. In this case, just bail.
1287 # loaded with a future import. In this case, just bail.
1288 if (oname == 'print' and not (self.compile.compiler_flags &
1288 if (oname == 'print' and not (self.compile.compiler_flags &
1289 __future__.CO_FUTURE_PRINT_FUNCTION)):
1289 __future__.CO_FUTURE_PRINT_FUNCTION)):
1290 return {'found':found, 'obj':obj, 'namespace':ospace,
1290 return {'found':found, 'obj':obj, 'namespace':ospace,
1291 'ismagic':ismagic, 'isalias':isalias, 'parent':parent}
1291 'ismagic':ismagic, 'isalias':isalias, 'parent':parent}
1292
1292
1293 # Look for the given name by splitting it in parts. If the head is
1293 # Look for the given name by splitting it in parts. If the head is
1294 # found, then we look for all the remaining parts as members, and only
1294 # found, then we look for all the remaining parts as members, and only
1295 # declare success if we can find them all.
1295 # declare success if we can find them all.
1296 oname_parts = oname.split('.')
1296 oname_parts = oname.split('.')
1297 oname_head, oname_rest = oname_parts[0],oname_parts[1:]
1297 oname_head, oname_rest = oname_parts[0],oname_parts[1:]
1298 for nsname,ns in namespaces:
1298 for nsname,ns in namespaces:
1299 try:
1299 try:
1300 obj = ns[oname_head]
1300 obj = ns[oname_head]
1301 except KeyError:
1301 except KeyError:
1302 continue
1302 continue
1303 else:
1303 else:
1304 #print 'oname_rest:', oname_rest # dbg
1304 #print 'oname_rest:', oname_rest # dbg
1305 for part in oname_rest:
1305 for part in oname_rest:
1306 try:
1306 try:
1307 parent = obj
1307 parent = obj
1308 obj = getattr(obj,part)
1308 obj = getattr(obj,part)
1309 except:
1309 except:
1310 # Blanket except b/c some badly implemented objects
1310 # Blanket except b/c some badly implemented objects
1311 # allow __getattr__ to raise exceptions other than
1311 # allow __getattr__ to raise exceptions other than
1312 # AttributeError, which then crashes IPython.
1312 # AttributeError, which then crashes IPython.
1313 break
1313 break
1314 else:
1314 else:
1315 # If we finish the for loop (no break), we got all members
1315 # If we finish the for loop (no break), we got all members
1316 found = True
1316 found = True
1317 ospace = nsname
1317 ospace = nsname
1318 if ns == alias_ns:
1318 if ns == alias_ns:
1319 isalias = True
1319 isalias = True
1320 break # namespace loop
1320 break # namespace loop
1321
1321
1322 # Try to see if it's magic
1322 # Try to see if it's magic
1323 if not found:
1323 if not found:
1324 if oname.startswith(ESC_MAGIC):
1324 if oname.startswith(ESC_MAGIC):
1325 oname = oname[1:]
1325 oname = oname[1:]
1326 obj = getattr(self,'magic_'+oname,None)
1326 obj = getattr(self,'magic_'+oname,None)
1327 if obj is not None:
1327 if obj is not None:
1328 found = True
1328 found = True
1329 ospace = 'IPython internal'
1329 ospace = 'IPython internal'
1330 ismagic = True
1330 ismagic = True
1331
1331
1332 # Last try: special-case some literals like '', [], {}, etc:
1332 # Last try: special-case some literals like '', [], {}, etc:
1333 if not found and oname_head in ["''",'""','[]','{}','()']:
1333 if not found and oname_head in ["''",'""','[]','{}','()']:
1334 obj = eval(oname_head)
1334 obj = eval(oname_head)
1335 found = True
1335 found = True
1336 ospace = 'Interactive'
1336 ospace = 'Interactive'
1337
1337
1338 return {'found':found, 'obj':obj, 'namespace':ospace,
1338 return {'found':found, 'obj':obj, 'namespace':ospace,
1339 'ismagic':ismagic, 'isalias':isalias, 'parent':parent}
1339 'ismagic':ismagic, 'isalias':isalias, 'parent':parent}
1340
1340
1341 def _ofind_property(self, oname, info):
1341 def _ofind_property(self, oname, info):
1342 """Second part of object finding, to look for property details."""
1342 """Second part of object finding, to look for property details."""
1343 if info.found:
1343 if info.found:
1344 # Get the docstring of the class property if it exists.
1344 # Get the docstring of the class property if it exists.
1345 path = oname.split('.')
1345 path = oname.split('.')
1346 root = '.'.join(path[:-1])
1346 root = '.'.join(path[:-1])
1347 if info.parent is not None:
1347 if info.parent is not None:
1348 try:
1348 try:
1349 target = getattr(info.parent, '__class__')
1349 target = getattr(info.parent, '__class__')
1350 # The object belongs to a class instance.
1350 # The object belongs to a class instance.
1351 try:
1351 try:
1352 target = getattr(target, path[-1])
1352 target = getattr(target, path[-1])
1353 # The class defines the object.
1353 # The class defines the object.
1354 if isinstance(target, property):
1354 if isinstance(target, property):
1355 oname = root + '.__class__.' + path[-1]
1355 oname = root + '.__class__.' + path[-1]
1356 info = Struct(self._ofind(oname))
1356 info = Struct(self._ofind(oname))
1357 except AttributeError: pass
1357 except AttributeError: pass
1358 except AttributeError: pass
1358 except AttributeError: pass
1359
1359
1360 # We return either the new info or the unmodified input if the object
1360 # We return either the new info or the unmodified input if the object
1361 # hadn't been found
1361 # hadn't been found
1362 return info
1362 return info
1363
1363
1364 def _object_find(self, oname, namespaces=None):
1364 def _object_find(self, oname, namespaces=None):
1365 """Find an object and return a struct with info about it."""
1365 """Find an object and return a struct with info about it."""
1366 inf = Struct(self._ofind(oname, namespaces))
1366 inf = Struct(self._ofind(oname, namespaces))
1367 return Struct(self._ofind_property(oname, inf))
1367 return Struct(self._ofind_property(oname, inf))
1368
1368
1369 def _inspect(self, meth, oname, namespaces=None, **kw):
1369 def _inspect(self, meth, oname, namespaces=None, **kw):
1370 """Generic interface to the inspector system.
1370 """Generic interface to the inspector system.
1371
1371
1372 This function is meant to be called by pdef, pdoc & friends."""
1372 This function is meant to be called by pdef, pdoc & friends."""
1373 info = self._object_find(oname)
1373 info = self._object_find(oname)
1374 if info.found:
1374 if info.found:
1375 pmethod = getattr(self.inspector, meth)
1375 pmethod = getattr(self.inspector, meth)
1376 formatter = format_screen if info.ismagic else None
1376 formatter = format_screen if info.ismagic else None
1377 if meth == 'pdoc':
1377 if meth == 'pdoc':
1378 pmethod(info.obj, oname, formatter)
1378 pmethod(info.obj, oname, formatter)
1379 elif meth == 'pinfo':
1379 elif meth == 'pinfo':
1380 pmethod(info.obj, oname, formatter, info, **kw)
1380 pmethod(info.obj, oname, formatter, info, **kw)
1381 else:
1381 else:
1382 pmethod(info.obj, oname)
1382 pmethod(info.obj, oname)
1383 else:
1383 else:
1384 print 'Object `%s` not found.' % oname
1384 print 'Object `%s` not found.' % oname
1385 return 'not found' # so callers can take other action
1385 return 'not found' # so callers can take other action
1386
1386
1387 def object_inspect(self, oname):
1387 def object_inspect(self, oname):
1388 with self.builtin_trap:
1388 with self.builtin_trap:
1389 info = self._object_find(oname)
1389 info = self._object_find(oname)
1390 if info.found:
1390 if info.found:
1391 return self.inspector.info(info.obj, oname, info=info)
1391 return self.inspector.info(info.obj, oname, info=info)
1392 else:
1392 else:
1393 return oinspect.object_info(name=oname, found=False)
1393 return oinspect.object_info(name=oname, found=False)
1394
1394
1395 #-------------------------------------------------------------------------
1395 #-------------------------------------------------------------------------
1396 # Things related to history management
1396 # Things related to history management
1397 #-------------------------------------------------------------------------
1397 #-------------------------------------------------------------------------
1398
1398
1399 def init_history(self):
1399 def init_history(self):
1400 """Sets up the command history, and starts regular autosaves."""
1400 """Sets up the command history, and starts regular autosaves."""
1401 self.history_manager = HistoryManager(shell=self, config=self.config)
1401 self.history_manager = HistoryManager(shell=self, config=self.config)
1402
1402
1403 #-------------------------------------------------------------------------
1403 #-------------------------------------------------------------------------
1404 # Things related to exception handling and tracebacks (not debugging)
1404 # Things related to exception handling and tracebacks (not debugging)
1405 #-------------------------------------------------------------------------
1405 #-------------------------------------------------------------------------
1406
1406
1407 def init_traceback_handlers(self, custom_exceptions):
1407 def init_traceback_handlers(self, custom_exceptions):
1408 # Syntax error handler.
1408 # Syntax error handler.
1409 self.SyntaxTB = ultratb.SyntaxTB(color_scheme='NoColor')
1409 self.SyntaxTB = ultratb.SyntaxTB(color_scheme='NoColor')
1410
1410
1411 # The interactive one is initialized with an offset, meaning we always
1411 # The interactive one is initialized with an offset, meaning we always
1412 # want to remove the topmost item in the traceback, which is our own
1412 # want to remove the topmost item in the traceback, which is our own
1413 # internal code. Valid modes: ['Plain','Context','Verbose']
1413 # internal code. Valid modes: ['Plain','Context','Verbose']
1414 self.InteractiveTB = ultratb.AutoFormattedTB(mode = 'Plain',
1414 self.InteractiveTB = ultratb.AutoFormattedTB(mode = 'Plain',
1415 color_scheme='NoColor',
1415 color_scheme='NoColor',
1416 tb_offset = 1,
1416 tb_offset = 1,
1417 check_cache=self.compile.check_cache)
1417 check_cache=self.compile.check_cache)
1418
1418
1419 # The instance will store a pointer to the system-wide exception hook,
1419 # The instance will store a pointer to the system-wide exception hook,
1420 # so that runtime code (such as magics) can access it. This is because
1420 # so that runtime code (such as magics) can access it. This is because
1421 # during the read-eval loop, it may get temporarily overwritten.
1421 # during the read-eval loop, it may get temporarily overwritten.
1422 self.sys_excepthook = sys.excepthook
1422 self.sys_excepthook = sys.excepthook
1423
1423
1424 # and add any custom exception handlers the user may have specified
1424 # and add any custom exception handlers the user may have specified
1425 self.set_custom_exc(*custom_exceptions)
1425 self.set_custom_exc(*custom_exceptions)
1426
1426
1427 # Set the exception mode
1427 # Set the exception mode
1428 self.InteractiveTB.set_mode(mode=self.xmode)
1428 self.InteractiveTB.set_mode(mode=self.xmode)
1429
1429
1430 def set_custom_exc(self, exc_tuple, handler):
1430 def set_custom_exc(self, exc_tuple, handler):
1431 """set_custom_exc(exc_tuple,handler)
1431 """set_custom_exc(exc_tuple,handler)
1432
1432
1433 Set a custom exception handler, which will be called if any of the
1433 Set a custom exception handler, which will be called if any of the
1434 exceptions in exc_tuple occur in the mainloop (specifically, in the
1434 exceptions in exc_tuple occur in the mainloop (specifically, in the
1435 run_code() method.
1435 run_code() method.
1436
1436
1437 Inputs:
1437 Inputs:
1438
1438
1439 - exc_tuple: a *tuple* of valid exceptions to call the defined
1439 - exc_tuple: a *tuple* of valid exceptions to call the defined
1440 handler for. It is very important that you use a tuple, and NOT A
1440 handler for. It is very important that you use a tuple, and NOT A
1441 LIST here, because of the way Python's except statement works. If
1441 LIST here, because of the way Python's except statement works. If
1442 you only want to trap a single exception, use a singleton tuple:
1442 you only want to trap a single exception, use a singleton tuple:
1443
1443
1444 exc_tuple == (MyCustomException,)
1444 exc_tuple == (MyCustomException,)
1445
1445
1446 - handler: this must be defined as a function with the following
1446 - handler: this must be defined as a function with the following
1447 basic interface::
1447 basic interface::
1448
1448
1449 def my_handler(self, etype, value, tb, tb_offset=None)
1449 def my_handler(self, etype, value, tb, tb_offset=None)
1450 ...
1450 ...
1451 # The return value must be
1451 # The return value must be
1452 return structured_traceback
1452 return structured_traceback
1453
1453
1454 This will be made into an instance method (via types.MethodType)
1454 This will be made into an instance method (via types.MethodType)
1455 of IPython itself, and it will be called if any of the exceptions
1455 of IPython itself, and it will be called if any of the exceptions
1456 listed in the exc_tuple are caught. If the handler is None, an
1456 listed in the exc_tuple are caught. If the handler is None, an
1457 internal basic one is used, which just prints basic info.
1457 internal basic one is used, which just prints basic info.
1458
1458
1459 WARNING: by putting in your own exception handler into IPython's main
1459 WARNING: by putting in your own exception handler into IPython's main
1460 execution loop, you run a very good chance of nasty crashes. This
1460 execution loop, you run a very good chance of nasty crashes. This
1461 facility should only be used if you really know what you are doing."""
1461 facility should only be used if you really know what you are doing."""
1462
1462
1463 assert type(exc_tuple)==type(()) , \
1463 assert type(exc_tuple)==type(()) , \
1464 "The custom exceptions must be given AS A TUPLE."
1464 "The custom exceptions must be given AS A TUPLE."
1465
1465
1466 def dummy_handler(self,etype,value,tb):
1466 def dummy_handler(self,etype,value,tb):
1467 print '*** Simple custom exception handler ***'
1467 print '*** Simple custom exception handler ***'
1468 print 'Exception type :',etype
1468 print 'Exception type :',etype
1469 print 'Exception value:',value
1469 print 'Exception value:',value
1470 print 'Traceback :',tb
1470 print 'Traceback :',tb
1471 #print 'Source code :','\n'.join(self.buffer)
1471 #print 'Source code :','\n'.join(self.buffer)
1472
1472
1473 if handler is None: handler = dummy_handler
1473 if handler is None: handler = dummy_handler
1474
1474
1475 self.CustomTB = types.MethodType(handler,self)
1475 self.CustomTB = types.MethodType(handler,self)
1476 self.custom_exceptions = exc_tuple
1476 self.custom_exceptions = exc_tuple
1477
1477
1478 def excepthook(self, etype, value, tb):
1478 def excepthook(self, etype, value, tb):
1479 """One more defense for GUI apps that call sys.excepthook.
1479 """One more defense for GUI apps that call sys.excepthook.
1480
1480
1481 GUI frameworks like wxPython trap exceptions and call
1481 GUI frameworks like wxPython trap exceptions and call
1482 sys.excepthook themselves. I guess this is a feature that
1482 sys.excepthook themselves. I guess this is a feature that
1483 enables them to keep running after exceptions that would
1483 enables them to keep running after exceptions that would
1484 otherwise kill their mainloop. This is a bother for IPython
1484 otherwise kill their mainloop. This is a bother for IPython
1485 which excepts to catch all of the program exceptions with a try:
1485 which excepts to catch all of the program exceptions with a try:
1486 except: statement.
1486 except: statement.
1487
1487
1488 Normally, IPython sets sys.excepthook to a CrashHandler instance, so if
1488 Normally, IPython sets sys.excepthook to a CrashHandler instance, so if
1489 any app directly invokes sys.excepthook, it will look to the user like
1489 any app directly invokes sys.excepthook, it will look to the user like
1490 IPython crashed. In order to work around this, we can disable the
1490 IPython crashed. In order to work around this, we can disable the
1491 CrashHandler and replace it with this excepthook instead, which prints a
1491 CrashHandler and replace it with this excepthook instead, which prints a
1492 regular traceback using our InteractiveTB. In this fashion, apps which
1492 regular traceback using our InteractiveTB. In this fashion, apps which
1493 call sys.excepthook will generate a regular-looking exception from
1493 call sys.excepthook will generate a regular-looking exception from
1494 IPython, and the CrashHandler will only be triggered by real IPython
1494 IPython, and the CrashHandler will only be triggered by real IPython
1495 crashes.
1495 crashes.
1496
1496
1497 This hook should be used sparingly, only in places which are not likely
1497 This hook should be used sparingly, only in places which are not likely
1498 to be true IPython errors.
1498 to be true IPython errors.
1499 """
1499 """
1500 self.showtraceback((etype,value,tb),tb_offset=0)
1500 self.showtraceback((etype,value,tb),tb_offset=0)
1501
1501
1502 def showtraceback(self,exc_tuple = None,filename=None,tb_offset=None,
1502 def showtraceback(self,exc_tuple = None,filename=None,tb_offset=None,
1503 exception_only=False):
1503 exception_only=False):
1504 """Display the exception that just occurred.
1504 """Display the exception that just occurred.
1505
1505
1506 If nothing is known about the exception, this is the method which
1506 If nothing is known about the exception, this is the method which
1507 should be used throughout the code for presenting user tracebacks,
1507 should be used throughout the code for presenting user tracebacks,
1508 rather than directly invoking the InteractiveTB object.
1508 rather than directly invoking the InteractiveTB object.
1509
1509
1510 A specific showsyntaxerror() also exists, but this method can take
1510 A specific showsyntaxerror() also exists, but this method can take
1511 care of calling it if needed, so unless you are explicitly catching a
1511 care of calling it if needed, so unless you are explicitly catching a
1512 SyntaxError exception, don't try to analyze the stack manually and
1512 SyntaxError exception, don't try to analyze the stack manually and
1513 simply call this method."""
1513 simply call this method."""
1514
1514
1515 try:
1515 try:
1516 if exc_tuple is None:
1516 if exc_tuple is None:
1517 etype, value, tb = sys.exc_info()
1517 etype, value, tb = sys.exc_info()
1518 else:
1518 else:
1519 etype, value, tb = exc_tuple
1519 etype, value, tb = exc_tuple
1520
1520
1521 if etype is None:
1521 if etype is None:
1522 if hasattr(sys, 'last_type'):
1522 if hasattr(sys, 'last_type'):
1523 etype, value, tb = sys.last_type, sys.last_value, \
1523 etype, value, tb = sys.last_type, sys.last_value, \
1524 sys.last_traceback
1524 sys.last_traceback
1525 else:
1525 else:
1526 self.write_err('No traceback available to show.\n')
1526 self.write_err('No traceback available to show.\n')
1527 return
1527 return
1528
1528
1529 if etype is SyntaxError:
1529 if etype is SyntaxError:
1530 # Though this won't be called by syntax errors in the input
1530 # Though this won't be called by syntax errors in the input
1531 # line, there may be SyntaxError cases whith imported code.
1531 # line, there may be SyntaxError cases whith imported code.
1532 self.showsyntaxerror(filename)
1532 self.showsyntaxerror(filename)
1533 elif etype is UsageError:
1533 elif etype is UsageError:
1534 print "UsageError:", value
1534 print "UsageError:", value
1535 else:
1535 else:
1536 # WARNING: these variables are somewhat deprecated and not
1536 # WARNING: these variables are somewhat deprecated and not
1537 # necessarily safe to use in a threaded environment, but tools
1537 # necessarily safe to use in a threaded environment, but tools
1538 # like pdb depend on their existence, so let's set them. If we
1538 # like pdb depend on their existence, so let's set them. If we
1539 # find problems in the field, we'll need to revisit their use.
1539 # find problems in the field, we'll need to revisit their use.
1540 sys.last_type = etype
1540 sys.last_type = etype
1541 sys.last_value = value
1541 sys.last_value = value
1542 sys.last_traceback = tb
1542 sys.last_traceback = tb
1543 if etype in self.custom_exceptions:
1543 if etype in self.custom_exceptions:
1544 # FIXME: Old custom traceback objects may just return a
1544 # FIXME: Old custom traceback objects may just return a
1545 # string, in that case we just put it into a list
1545 # string, in that case we just put it into a list
1546 stb = self.CustomTB(etype, value, tb, tb_offset)
1546 stb = self.CustomTB(etype, value, tb, tb_offset)
1547 if isinstance(ctb, basestring):
1547 if isinstance(ctb, basestring):
1548 stb = [stb]
1548 stb = [stb]
1549 else:
1549 else:
1550 if exception_only:
1550 if exception_only:
1551 stb = ['An exception has occurred, use %tb to see '
1551 stb = ['An exception has occurred, use %tb to see '
1552 'the full traceback.\n']
1552 'the full traceback.\n']
1553 stb.extend(self.InteractiveTB.get_exception_only(etype,
1553 stb.extend(self.InteractiveTB.get_exception_only(etype,
1554 value))
1554 value))
1555 else:
1555 else:
1556 stb = self.InteractiveTB.structured_traceback(etype,
1556 stb = self.InteractiveTB.structured_traceback(etype,
1557 value, tb, tb_offset=tb_offset)
1557 value, tb, tb_offset=tb_offset)
1558
1558
1559 if self.call_pdb:
1559 if self.call_pdb:
1560 # drop into debugger
1560 # drop into debugger
1561 self.debugger(force=True)
1561 self.debugger(force=True)
1562
1562
1563 # Actually show the traceback
1563 # Actually show the traceback
1564 self._showtraceback(etype, value, stb)
1564 self._showtraceback(etype, value, stb)
1565
1565
1566 except KeyboardInterrupt:
1566 except KeyboardInterrupt:
1567 self.write_err("\nKeyboardInterrupt\n")
1567 self.write_err("\nKeyboardInterrupt\n")
1568
1568
1569 def _showtraceback(self, etype, evalue, stb):
1569 def _showtraceback(self, etype, evalue, stb):
1570 """Actually show a traceback.
1570 """Actually show a traceback.
1571
1571
1572 Subclasses may override this method to put the traceback on a different
1572 Subclasses may override this method to put the traceback on a different
1573 place, like a side channel.
1573 place, like a side channel.
1574 """
1574 """
1575 print >> io.stdout, self.InteractiveTB.stb2text(stb)
1575 print >> io.stdout, self.InteractiveTB.stb2text(stb)
1576
1576
1577 def showsyntaxerror(self, filename=None):
1577 def showsyntaxerror(self, filename=None):
1578 """Display the syntax error that just occurred.
1578 """Display the syntax error that just occurred.
1579
1579
1580 This doesn't display a stack trace because there isn't one.
1580 This doesn't display a stack trace because there isn't one.
1581
1581
1582 If a filename is given, it is stuffed in the exception instead
1582 If a filename is given, it is stuffed in the exception instead
1583 of what was there before (because Python's parser always uses
1583 of what was there before (because Python's parser always uses
1584 "<string>" when reading from a string).
1584 "<string>" when reading from a string).
1585 """
1585 """
1586 etype, value, last_traceback = sys.exc_info()
1586 etype, value, last_traceback = sys.exc_info()
1587
1587
1588 # See note about these variables in showtraceback() above
1588 # See note about these variables in showtraceback() above
1589 sys.last_type = etype
1589 sys.last_type = etype
1590 sys.last_value = value
1590 sys.last_value = value
1591 sys.last_traceback = last_traceback
1591 sys.last_traceback = last_traceback
1592
1592
1593 if filename and etype is SyntaxError:
1593 if filename and etype is SyntaxError:
1594 # Work hard to stuff the correct filename in the exception
1594 # Work hard to stuff the correct filename in the exception
1595 try:
1595 try:
1596 msg, (dummy_filename, lineno, offset, line) = value
1596 msg, (dummy_filename, lineno, offset, line) = value
1597 except:
1597 except:
1598 # Not the format we expect; leave it alone
1598 # Not the format we expect; leave it alone
1599 pass
1599 pass
1600 else:
1600 else:
1601 # Stuff in the right filename
1601 # Stuff in the right filename
1602 try:
1602 try:
1603 # Assume SyntaxError is a class exception
1603 # Assume SyntaxError is a class exception
1604 value = SyntaxError(msg, (filename, lineno, offset, line))
1604 value = SyntaxError(msg, (filename, lineno, offset, line))
1605 except:
1605 except:
1606 # If that failed, assume SyntaxError is a string
1606 # If that failed, assume SyntaxError is a string
1607 value = msg, (filename, lineno, offset, line)
1607 value = msg, (filename, lineno, offset, line)
1608 stb = self.SyntaxTB.structured_traceback(etype, value, [])
1608 stb = self.SyntaxTB.structured_traceback(etype, value, [])
1609 self._showtraceback(etype, value, stb)
1609 self._showtraceback(etype, value, stb)
1610
1610
1611 # This is overridden in TerminalInteractiveShell to show a message about
1611 # This is overridden in TerminalInteractiveShell to show a message about
1612 # the %paste magic.
1612 # the %paste magic.
1613 def showindentationerror(self):
1613 def showindentationerror(self):
1614 """Called by run_cell when there's an IndentationError in code entered
1614 """Called by run_cell when there's an IndentationError in code entered
1615 at the prompt.
1615 at the prompt.
1616
1616
1617 This is overridden in TerminalInteractiveShell to show a message about
1617 This is overridden in TerminalInteractiveShell to show a message about
1618 the %paste magic."""
1618 the %paste magic."""
1619 self.showsyntaxerror()
1619 self.showsyntaxerror()
1620
1620
1621 #-------------------------------------------------------------------------
1621 #-------------------------------------------------------------------------
1622 # Things related to readline
1622 # Things related to readline
1623 #-------------------------------------------------------------------------
1623 #-------------------------------------------------------------------------
1624
1624
1625 def init_readline(self):
1625 def init_readline(self):
1626 """Command history completion/saving/reloading."""
1626 """Command history completion/saving/reloading."""
1627
1627
1628 if self.readline_use:
1628 if self.readline_use:
1629 import IPython.utils.rlineimpl as readline
1629 import IPython.utils.rlineimpl as readline
1630
1630
1631 self.rl_next_input = None
1631 self.rl_next_input = None
1632 self.rl_do_indent = False
1632 self.rl_do_indent = False
1633
1633
1634 if not self.readline_use or not readline.have_readline:
1634 if not self.readline_use or not readline.have_readline:
1635 self.has_readline = False
1635 self.has_readline = False
1636 self.readline = None
1636 self.readline = None
1637 # Set a number of methods that depend on readline to be no-op
1637 # Set a number of methods that depend on readline to be no-op
1638 self.set_readline_completer = no_op
1638 self.set_readline_completer = no_op
1639 self.set_custom_completer = no_op
1639 self.set_custom_completer = no_op
1640 self.set_completer_frame = no_op
1640 self.set_completer_frame = no_op
1641 warn('Readline services not available or not loaded.')
1641 warn('Readline services not available or not loaded.')
1642 else:
1642 else:
1643 self.has_readline = True
1643 self.has_readline = True
1644 self.readline = readline
1644 self.readline = readline
1645 sys.modules['readline'] = readline
1645 sys.modules['readline'] = readline
1646
1646
1647 # Platform-specific configuration
1647 # Platform-specific configuration
1648 if os.name == 'nt':
1648 if os.name == 'nt':
1649 # FIXME - check with Frederick to see if we can harmonize
1649 # FIXME - check with Frederick to see if we can harmonize
1650 # naming conventions with pyreadline to avoid this
1650 # naming conventions with pyreadline to avoid this
1651 # platform-dependent check
1651 # platform-dependent check
1652 self.readline_startup_hook = readline.set_pre_input_hook
1652 self.readline_startup_hook = readline.set_pre_input_hook
1653 else:
1653 else:
1654 self.readline_startup_hook = readline.set_startup_hook
1654 self.readline_startup_hook = readline.set_startup_hook
1655
1655
1656 # Load user's initrc file (readline config)
1656 # Load user's initrc file (readline config)
1657 # Or if libedit is used, load editrc.
1657 # Or if libedit is used, load editrc.
1658 inputrc_name = os.environ.get('INPUTRC')
1658 inputrc_name = os.environ.get('INPUTRC')
1659 if inputrc_name is None:
1659 if inputrc_name is None:
1660 home_dir = get_home_dir()
1660 home_dir = get_home_dir()
1661 if home_dir is not None:
1661 if home_dir is not None:
1662 inputrc_name = '.inputrc'
1662 inputrc_name = '.inputrc'
1663 if readline.uses_libedit:
1663 if readline.uses_libedit:
1664 inputrc_name = '.editrc'
1664 inputrc_name = '.editrc'
1665 inputrc_name = os.path.join(home_dir, inputrc_name)
1665 inputrc_name = os.path.join(home_dir, inputrc_name)
1666 if os.path.isfile(inputrc_name):
1666 if os.path.isfile(inputrc_name):
1667 try:
1667 try:
1668 readline.read_init_file(inputrc_name)
1668 readline.read_init_file(inputrc_name)
1669 except:
1669 except:
1670 warn('Problems reading readline initialization file <%s>'
1670 warn('Problems reading readline initialization file <%s>'
1671 % inputrc_name)
1671 % inputrc_name)
1672
1672
1673 # Configure readline according to user's prefs
1673 # Configure readline according to user's prefs
1674 # This is only done if GNU readline is being used. If libedit
1674 # This is only done if GNU readline is being used. If libedit
1675 # is being used (as on Leopard) the readline config is
1675 # is being used (as on Leopard) the readline config is
1676 # not run as the syntax for libedit is different.
1676 # not run as the syntax for libedit is different.
1677 if not readline.uses_libedit:
1677 if not readline.uses_libedit:
1678 for rlcommand in self.readline_parse_and_bind:
1678 for rlcommand in self.readline_parse_and_bind:
1679 #print "loading rl:",rlcommand # dbg
1679 #print "loading rl:",rlcommand # dbg
1680 readline.parse_and_bind(rlcommand)
1680 readline.parse_and_bind(rlcommand)
1681
1681
1682 # Remove some chars from the delimiters list. If we encounter
1682 # Remove some chars from the delimiters list. If we encounter
1683 # unicode chars, discard them.
1683 # unicode chars, discard them.
1684 delims = readline.get_completer_delims().encode("ascii", "ignore")
1684 delims = readline.get_completer_delims().encode("ascii", "ignore")
1685 for d in self.readline_remove_delims:
1685 for d in self.readline_remove_delims:
1686 delims = delims.replace(d, "")
1686 delims = delims.replace(d, "")
1687 delims = delims.replace(ESC_MAGIC, '')
1687 delims = delims.replace(ESC_MAGIC, '')
1688 readline.set_completer_delims(delims)
1688 readline.set_completer_delims(delims)
1689 # otherwise we end up with a monster history after a while:
1689 # otherwise we end up with a monster history after a while:
1690 readline.set_history_length(self.history_length)
1690 readline.set_history_length(self.history_length)
1691
1691
1692 self.refill_readline_hist()
1692 self.refill_readline_hist()
1693 self.readline_no_record = ReadlineNoRecord(self)
1693 self.readline_no_record = ReadlineNoRecord(self)
1694
1694
1695 # Configure auto-indent for all platforms
1695 # Configure auto-indent for all platforms
1696 self.set_autoindent(self.autoindent)
1696 self.set_autoindent(self.autoindent)
1697
1697
1698 def refill_readline_hist(self):
1698 def refill_readline_hist(self):
1699 # Load the last 1000 lines from history
1699 # Load the last 1000 lines from history
1700 self.readline.clear_history()
1700 self.readline.clear_history()
1701 stdin_encoding = sys.stdin.encoding or "utf-8"
1701 stdin_encoding = sys.stdin.encoding or "utf-8"
1702 for _, _, cell in self.history_manager.get_tail(1000,
1702 for _, _, cell in self.history_manager.get_tail(1000,
1703 include_latest=True):
1703 include_latest=True):
1704 if cell.strip(): # Ignore blank lines
1704 if cell.strip(): # Ignore blank lines
1705 for line in cell.splitlines():
1705 for line in cell.splitlines():
1706 self.readline.add_history(py3compat.unicode_to_str(line,
1706 self.readline.add_history(py3compat.unicode_to_str(line,
1707 stdin_encoding))
1707 stdin_encoding))
1708
1708
1709 def set_next_input(self, s):
1709 def set_next_input(self, s):
1710 """ Sets the 'default' input string for the next command line.
1710 """ Sets the 'default' input string for the next command line.
1711
1711
1712 Requires readline.
1712 Requires readline.
1713
1713
1714 Example:
1714 Example:
1715
1715
1716 [D:\ipython]|1> _ip.set_next_input("Hello Word")
1716 [D:\ipython]|1> _ip.set_next_input("Hello Word")
1717 [D:\ipython]|2> Hello Word_ # cursor is here
1717 [D:\ipython]|2> Hello Word_ # cursor is here
1718 """
1718 """
1719 if isinstance(s, unicode):
1719 if isinstance(s, unicode):
1720 s = s.encode(self.stdin_encoding, 'replace')
1720 s = s.encode(self.stdin_encoding, 'replace')
1721 self.rl_next_input = s
1721 self.rl_next_input = s
1722
1722
1723 # Maybe move this to the terminal subclass?
1723 # Maybe move this to the terminal subclass?
1724 def pre_readline(self):
1724 def pre_readline(self):
1725 """readline hook to be used at the start of each line.
1725 """readline hook to be used at the start of each line.
1726
1726
1727 Currently it handles auto-indent only."""
1727 Currently it handles auto-indent only."""
1728
1728
1729 if self.rl_do_indent:
1729 if self.rl_do_indent:
1730 self.readline.insert_text(self._indent_current_str())
1730 self.readline.insert_text(self._indent_current_str())
1731 if self.rl_next_input is not None:
1731 if self.rl_next_input is not None:
1732 self.readline.insert_text(self.rl_next_input)
1732 self.readline.insert_text(self.rl_next_input)
1733 self.rl_next_input = None
1733 self.rl_next_input = None
1734
1734
1735 def _indent_current_str(self):
1735 def _indent_current_str(self):
1736 """return the current level of indentation as a string"""
1736 """return the current level of indentation as a string"""
1737 return self.input_splitter.indent_spaces * ' '
1737 return self.input_splitter.indent_spaces * ' '
1738
1738
1739 #-------------------------------------------------------------------------
1739 #-------------------------------------------------------------------------
1740 # Things related to text completion
1740 # Things related to text completion
1741 #-------------------------------------------------------------------------
1741 #-------------------------------------------------------------------------
1742
1742
1743 def init_completer(self):
1743 def init_completer(self):
1744 """Initialize the completion machinery.
1744 """Initialize the completion machinery.
1745
1745
1746 This creates completion machinery that can be used by client code,
1746 This creates completion machinery that can be used by client code,
1747 either interactively in-process (typically triggered by the readline
1747 either interactively in-process (typically triggered by the readline
1748 library), programatically (such as in test suites) or out-of-prcess
1748 library), programatically (such as in test suites) or out-of-prcess
1749 (typically over the network by remote frontends).
1749 (typically over the network by remote frontends).
1750 """
1750 """
1751 from IPython.core.completer import IPCompleter
1751 from IPython.core.completer import IPCompleter
1752 from IPython.core.completerlib import (module_completer,
1752 from IPython.core.completerlib import (module_completer,
1753 magic_run_completer, cd_completer)
1753 magic_run_completer, cd_completer)
1754
1754
1755 self.Completer = IPCompleter(self,
1755 self.Completer = IPCompleter(self,
1756 self.user_ns,
1756 self.user_ns,
1757 self.user_global_ns,
1757 self.user_global_ns,
1758 self.readline_omit__names,
1758 self.readline_omit__names,
1759 self.alias_manager.alias_table,
1759 self.alias_manager.alias_table,
1760 self.has_readline)
1760 self.has_readline)
1761
1761
1762 # Add custom completers to the basic ones built into IPCompleter
1762 # Add custom completers to the basic ones built into IPCompleter
1763 sdisp = self.strdispatchers.get('complete_command', StrDispatch())
1763 sdisp = self.strdispatchers.get('complete_command', StrDispatch())
1764 self.strdispatchers['complete_command'] = sdisp
1764 self.strdispatchers['complete_command'] = sdisp
1765 self.Completer.custom_completers = sdisp
1765 self.Completer.custom_completers = sdisp
1766
1766
1767 self.set_hook('complete_command', module_completer, str_key = 'import')
1767 self.set_hook('complete_command', module_completer, str_key = 'import')
1768 self.set_hook('complete_command', module_completer, str_key = 'from')
1768 self.set_hook('complete_command', module_completer, str_key = 'from')
1769 self.set_hook('complete_command', magic_run_completer, str_key = '%run')
1769 self.set_hook('complete_command', magic_run_completer, str_key = '%run')
1770 self.set_hook('complete_command', cd_completer, str_key = '%cd')
1770 self.set_hook('complete_command', cd_completer, str_key = '%cd')
1771
1771
1772 # Only configure readline if we truly are using readline. IPython can
1772 # Only configure readline if we truly are using readline. IPython can
1773 # do tab-completion over the network, in GUIs, etc, where readline
1773 # do tab-completion over the network, in GUIs, etc, where readline
1774 # itself may be absent
1774 # itself may be absent
1775 if self.has_readline:
1775 if self.has_readline:
1776 self.set_readline_completer()
1776 self.set_readline_completer()
1777
1777
1778 def complete(self, text, line=None, cursor_pos=None):
1778 def complete(self, text, line=None, cursor_pos=None):
1779 """Return the completed text and a list of completions.
1779 """Return the completed text and a list of completions.
1780
1780
1781 Parameters
1781 Parameters
1782 ----------
1782 ----------
1783
1783
1784 text : string
1784 text : string
1785 A string of text to be completed on. It can be given as empty and
1785 A string of text to be completed on. It can be given as empty and
1786 instead a line/position pair are given. In this case, the
1786 instead a line/position pair are given. In this case, the
1787 completer itself will split the line like readline does.
1787 completer itself will split the line like readline does.
1788
1788
1789 line : string, optional
1789 line : string, optional
1790 The complete line that text is part of.
1790 The complete line that text is part of.
1791
1791
1792 cursor_pos : int, optional
1792 cursor_pos : int, optional
1793 The position of the cursor on the input line.
1793 The position of the cursor on the input line.
1794
1794
1795 Returns
1795 Returns
1796 -------
1796 -------
1797 text : string
1797 text : string
1798 The actual text that was completed.
1798 The actual text that was completed.
1799
1799
1800 matches : list
1800 matches : list
1801 A sorted list with all possible completions.
1801 A sorted list with all possible completions.
1802
1802
1803 The optional arguments allow the completion to take more context into
1803 The optional arguments allow the completion to take more context into
1804 account, and are part of the low-level completion API.
1804 account, and are part of the low-level completion API.
1805
1805
1806 This is a wrapper around the completion mechanism, similar to what
1806 This is a wrapper around the completion mechanism, similar to what
1807 readline does at the command line when the TAB key is hit. By
1807 readline does at the command line when the TAB key is hit. By
1808 exposing it as a method, it can be used by other non-readline
1808 exposing it as a method, it can be used by other non-readline
1809 environments (such as GUIs) for text completion.
1809 environments (such as GUIs) for text completion.
1810
1810
1811 Simple usage example:
1811 Simple usage example:
1812
1812
1813 In [1]: x = 'hello'
1813 In [1]: x = 'hello'
1814
1814
1815 In [2]: _ip.complete('x.l')
1815 In [2]: _ip.complete('x.l')
1816 Out[2]: ('x.l', ['x.ljust', 'x.lower', 'x.lstrip'])
1816 Out[2]: ('x.l', ['x.ljust', 'x.lower', 'x.lstrip'])
1817 """
1817 """
1818
1818
1819 # Inject names into __builtin__ so we can complete on the added names.
1819 # Inject names into __builtin__ so we can complete on the added names.
1820 with self.builtin_trap:
1820 with self.builtin_trap:
1821 return self.Completer.complete(text, line, cursor_pos)
1821 return self.Completer.complete(text, line, cursor_pos)
1822
1822
1823 def set_custom_completer(self, completer, pos=0):
1823 def set_custom_completer(self, completer, pos=0):
1824 """Adds a new custom completer function.
1824 """Adds a new custom completer function.
1825
1825
1826 The position argument (defaults to 0) is the index in the completers
1826 The position argument (defaults to 0) is the index in the completers
1827 list where you want the completer to be inserted."""
1827 list where you want the completer to be inserted."""
1828
1828
1829 newcomp = types.MethodType(completer,self.Completer)
1829 newcomp = types.MethodType(completer,self.Completer)
1830 self.Completer.matchers.insert(pos,newcomp)
1830 self.Completer.matchers.insert(pos,newcomp)
1831
1831
1832 def set_readline_completer(self):
1832 def set_readline_completer(self):
1833 """Reset readline's completer to be our own."""
1833 """Reset readline's completer to be our own."""
1834 self.readline.set_completer(self.Completer.rlcomplete)
1834 self.readline.set_completer(self.Completer.rlcomplete)
1835
1835
1836 def set_completer_frame(self, frame=None):
1836 def set_completer_frame(self, frame=None):
1837 """Set the frame of the completer."""
1837 """Set the frame of the completer."""
1838 if frame:
1838 if frame:
1839 self.Completer.namespace = frame.f_locals
1839 self.Completer.namespace = frame.f_locals
1840 self.Completer.global_namespace = frame.f_globals
1840 self.Completer.global_namespace = frame.f_globals
1841 else:
1841 else:
1842 self.Completer.namespace = self.user_ns
1842 self.Completer.namespace = self.user_ns
1843 self.Completer.global_namespace = self.user_global_ns
1843 self.Completer.global_namespace = self.user_global_ns
1844
1844
1845 #-------------------------------------------------------------------------
1845 #-------------------------------------------------------------------------
1846 # Things related to magics
1846 # Things related to magics
1847 #-------------------------------------------------------------------------
1847 #-------------------------------------------------------------------------
1848
1848
1849 def init_magics(self):
1849 def init_magics(self):
1850 # FIXME: Move the color initialization to the DisplayHook, which
1850 # FIXME: Move the color initialization to the DisplayHook, which
1851 # should be split into a prompt manager and displayhook. We probably
1851 # should be split into a prompt manager and displayhook. We probably
1852 # even need a centralize colors management object.
1852 # even need a centralize colors management object.
1853 self.magic_colors(self.colors)
1853 self.magic_colors(self.colors)
1854 # History was moved to a separate module
1854 # History was moved to a separate module
1855 from . import history
1855 from . import history
1856 history.init_ipython(self)
1856 history.init_ipython(self)
1857
1857
1858 def magic(self, arg_s, next_input=None):
1858 def magic(self, arg_s, next_input=None):
1859 """Call a magic function by name.
1859 """Call a magic function by name.
1860
1860
1861 Input: a string containing the name of the magic function to call and
1861 Input: a string containing the name of the magic function to call and
1862 any additional arguments to be passed to the magic.
1862 any additional arguments to be passed to the magic.
1863
1863
1864 magic('name -opt foo bar') is equivalent to typing at the ipython
1864 magic('name -opt foo bar') is equivalent to typing at the ipython
1865 prompt:
1865 prompt:
1866
1866
1867 In[1]: %name -opt foo bar
1867 In[1]: %name -opt foo bar
1868
1868
1869 To call a magic without arguments, simply use magic('name').
1869 To call a magic without arguments, simply use magic('name').
1870
1870
1871 This provides a proper Python function to call IPython's magics in any
1871 This provides a proper Python function to call IPython's magics in any
1872 valid Python code you can type at the interpreter, including loops and
1872 valid Python code you can type at the interpreter, including loops and
1873 compound statements.
1873 compound statements.
1874 """
1874 """
1875 # Allow setting the next input - this is used if the user does `a=abs?`.
1875 # Allow setting the next input - this is used if the user does `a=abs?`.
1876 # We do this first so that magic functions can override it.
1876 # We do this first so that magic functions can override it.
1877 if next_input:
1877 if next_input:
1878 self.set_next_input(next_input)
1878 self.set_next_input(next_input)
1879
1879
1880 args = arg_s.split(' ',1)
1880 args = arg_s.split(' ',1)
1881 magic_name = args[0]
1881 magic_name = args[0]
1882 magic_name = magic_name.lstrip(prefilter.ESC_MAGIC)
1882 magic_name = magic_name.lstrip(prefilter.ESC_MAGIC)
1883
1883
1884 try:
1884 try:
1885 magic_args = args[1]
1885 magic_args = args[1]
1886 except IndexError:
1886 except IndexError:
1887 magic_args = ''
1887 magic_args = ''
1888 fn = getattr(self,'magic_'+magic_name,None)
1888 fn = getattr(self,'magic_'+magic_name,None)
1889 if fn is None:
1889 if fn is None:
1890 error("Magic function `%s` not found." % magic_name)
1890 error("Magic function `%s` not found." % magic_name)
1891 else:
1891 else:
1892 magic_args = self.var_expand(magic_args,1)
1892 magic_args = self.var_expand(magic_args,1)
1893 # Grab local namespace if we need it:
1893 # Grab local namespace if we need it:
1894 if getattr(fn, "needs_local_scope", False):
1894 if getattr(fn, "needs_local_scope", False):
1895 self._magic_locals = sys._getframe(1).f_locals
1895 self._magic_locals = sys._getframe(1).f_locals
1896 with self.builtin_trap:
1896 with self.builtin_trap:
1897 result = fn(magic_args)
1897 result = fn(magic_args)
1898 # Ensure we're not keeping object references around:
1898 # Ensure we're not keeping object references around:
1899 self._magic_locals = {}
1899 self._magic_locals = {}
1900 return result
1900 return result
1901
1901
1902 def define_magic(self, magicname, func):
1902 def define_magic(self, magicname, func):
1903 """Expose own function as magic function for ipython
1903 """Expose own function as magic function for ipython
1904
1904
1905 def foo_impl(self,parameter_s=''):
1905 def foo_impl(self,parameter_s=''):
1906 'My very own magic!. (Use docstrings, IPython reads them).'
1906 'My very own magic!. (Use docstrings, IPython reads them).'
1907 print 'Magic function. Passed parameter is between < >:'
1907 print 'Magic function. Passed parameter is between < >:'
1908 print '<%s>' % parameter_s
1908 print '<%s>' % parameter_s
1909 print 'The self object is:',self
1909 print 'The self object is:',self
1910
1910
1911 self.define_magic('foo',foo_impl)
1911 self.define_magic('foo',foo_impl)
1912 """
1912 """
1913 im = types.MethodType(func,self)
1913 im = types.MethodType(func,self)
1914 old = getattr(self, "magic_" + magicname, None)
1914 old = getattr(self, "magic_" + magicname, None)
1915 setattr(self, "magic_" + magicname, im)
1915 setattr(self, "magic_" + magicname, im)
1916 return old
1916 return old
1917
1917
1918 #-------------------------------------------------------------------------
1918 #-------------------------------------------------------------------------
1919 # Things related to macros
1919 # Things related to macros
1920 #-------------------------------------------------------------------------
1920 #-------------------------------------------------------------------------
1921
1921
1922 def define_macro(self, name, themacro):
1922 def define_macro(self, name, themacro):
1923 """Define a new macro
1923 """Define a new macro
1924
1924
1925 Parameters
1925 Parameters
1926 ----------
1926 ----------
1927 name : str
1927 name : str
1928 The name of the macro.
1928 The name of the macro.
1929 themacro : str or Macro
1929 themacro : str or Macro
1930 The action to do upon invoking the macro. If a string, a new
1930 The action to do upon invoking the macro. If a string, a new
1931 Macro object is created by passing the string to it.
1931 Macro object is created by passing the string to it.
1932 """
1932 """
1933
1933
1934 from IPython.core import macro
1934 from IPython.core import macro
1935
1935
1936 if isinstance(themacro, basestring):
1936 if isinstance(themacro, basestring):
1937 themacro = macro.Macro(themacro)
1937 themacro = macro.Macro(themacro)
1938 if not isinstance(themacro, macro.Macro):
1938 if not isinstance(themacro, macro.Macro):
1939 raise ValueError('A macro must be a string or a Macro instance.')
1939 raise ValueError('A macro must be a string or a Macro instance.')
1940 self.user_ns[name] = themacro
1940 self.user_ns[name] = themacro
1941
1941
1942 #-------------------------------------------------------------------------
1942 #-------------------------------------------------------------------------
1943 # Things related to the running of system commands
1943 # Things related to the running of system commands
1944 #-------------------------------------------------------------------------
1944 #-------------------------------------------------------------------------
1945
1945
1946 def system_piped(self, cmd):
1946 def system_piped(self, cmd):
1947 """Call the given cmd in a subprocess, piping stdout/err
1947 """Call the given cmd in a subprocess, piping stdout/err
1948
1948
1949 Parameters
1949 Parameters
1950 ----------
1950 ----------
1951 cmd : str
1951 cmd : str
1952 Command to execute (can not end in '&', as background processes are
1952 Command to execute (can not end in '&', as background processes are
1953 not supported. Should not be a command that expects input
1953 not supported. Should not be a command that expects input
1954 other than simple text.
1954 other than simple text.
1955 """
1955 """
1956 if cmd.rstrip().endswith('&'):
1956 if cmd.rstrip().endswith('&'):
1957 # this is *far* from a rigorous test
1957 # this is *far* from a rigorous test
1958 # We do not support backgrounding processes because we either use
1958 # We do not support backgrounding processes because we either use
1959 # pexpect or pipes to read from. Users can always just call
1959 # pexpect or pipes to read from. Users can always just call
1960 # os.system() or use ip.system=ip.system_raw
1960 # os.system() or use ip.system=ip.system_raw
1961 # if they really want a background process.
1961 # if they really want a background process.
1962 raise OSError("Background processes not supported.")
1962 raise OSError("Background processes not supported.")
1963
1963
1964 # we explicitly do NOT return the subprocess status code, because
1964 # we explicitly do NOT return the subprocess status code, because
1965 # a non-None value would trigger :func:`sys.displayhook` calls.
1965 # a non-None value would trigger :func:`sys.displayhook` calls.
1966 # Instead, we store the exit_code in user_ns.
1966 # Instead, we store the exit_code in user_ns.
1967 self.user_ns['_exit_code'] = system(self.var_expand(cmd, depth=2))
1967 self.user_ns['_exit_code'] = system(self.var_expand(cmd, depth=2))
1968
1968
1969 def system_raw(self, cmd):
1969 def system_raw(self, cmd):
1970 """Call the given cmd in a subprocess using os.system
1970 """Call the given cmd in a subprocess using os.system
1971
1971
1972 Parameters
1972 Parameters
1973 ----------
1973 ----------
1974 cmd : str
1974 cmd : str
1975 Command to execute.
1975 Command to execute.
1976 """
1976 """
1977 # We explicitly do NOT return the subprocess status code, because
1977 # We explicitly do NOT return the subprocess status code, because
1978 # a non-None value would trigger :func:`sys.displayhook` calls.
1978 # a non-None value would trigger :func:`sys.displayhook` calls.
1979 # Instead, we store the exit_code in user_ns.
1979 # Instead, we store the exit_code in user_ns.
1980 self.user_ns['_exit_code'] = os.system(self.var_expand(cmd, depth=2))
1980 self.user_ns['_exit_code'] = os.system(self.var_expand(cmd, depth=2))
1981
1981
1982 # use piped system by default, because it is better behaved
1982 # use piped system by default, because it is better behaved
1983 system = system_piped
1983 system = system_piped
1984
1984
1985 def getoutput(self, cmd, split=True):
1985 def getoutput(self, cmd, split=True):
1986 """Get output (possibly including stderr) from a subprocess.
1986 """Get output (possibly including stderr) from a subprocess.
1987
1987
1988 Parameters
1988 Parameters
1989 ----------
1989 ----------
1990 cmd : str
1990 cmd : str
1991 Command to execute (can not end in '&', as background processes are
1991 Command to execute (can not end in '&', as background processes are
1992 not supported.
1992 not supported.
1993 split : bool, optional
1993 split : bool, optional
1994
1994
1995 If True, split the output into an IPython SList. Otherwise, an
1995 If True, split the output into an IPython SList. Otherwise, an
1996 IPython LSString is returned. These are objects similar to normal
1996 IPython LSString is returned. These are objects similar to normal
1997 lists and strings, with a few convenience attributes for easier
1997 lists and strings, with a few convenience attributes for easier
1998 manipulation of line-based output. You can use '?' on them for
1998 manipulation of line-based output. You can use '?' on them for
1999 details.
1999 details.
2000 """
2000 """
2001 if cmd.rstrip().endswith('&'):
2001 if cmd.rstrip().endswith('&'):
2002 # this is *far* from a rigorous test
2002 # this is *far* from a rigorous test
2003 raise OSError("Background processes not supported.")
2003 raise OSError("Background processes not supported.")
2004 out = getoutput(self.var_expand(cmd, depth=2))
2004 out = getoutput(self.var_expand(cmd, depth=2))
2005 if split:
2005 if split:
2006 out = SList(out.splitlines())
2006 out = SList(out.splitlines())
2007 else:
2007 else:
2008 out = LSString(out)
2008 out = LSString(out)
2009 return out
2009 return out
2010
2010
2011 #-------------------------------------------------------------------------
2011 #-------------------------------------------------------------------------
2012 # Things related to aliases
2012 # Things related to aliases
2013 #-------------------------------------------------------------------------
2013 #-------------------------------------------------------------------------
2014
2014
2015 def init_alias(self):
2015 def init_alias(self):
2016 self.alias_manager = AliasManager(shell=self, config=self.config)
2016 self.alias_manager = AliasManager(shell=self, config=self.config)
2017 self.ns_table['alias'] = self.alias_manager.alias_table,
2017 self.ns_table['alias'] = self.alias_manager.alias_table,
2018
2018
2019 #-------------------------------------------------------------------------
2019 #-------------------------------------------------------------------------
2020 # Things related to extensions and plugins
2020 # Things related to extensions and plugins
2021 #-------------------------------------------------------------------------
2021 #-------------------------------------------------------------------------
2022
2022
2023 def init_extension_manager(self):
2023 def init_extension_manager(self):
2024 self.extension_manager = ExtensionManager(shell=self, config=self.config)
2024 self.extension_manager = ExtensionManager(shell=self, config=self.config)
2025
2025
2026 def init_plugin_manager(self):
2026 def init_plugin_manager(self):
2027 self.plugin_manager = PluginManager(config=self.config)
2027 self.plugin_manager = PluginManager(config=self.config)
2028
2028
2029 #-------------------------------------------------------------------------
2029 #-------------------------------------------------------------------------
2030 # Things related to payloads
2030 # Things related to payloads
2031 #-------------------------------------------------------------------------
2031 #-------------------------------------------------------------------------
2032
2032
2033 def init_payload(self):
2033 def init_payload(self):
2034 self.payload_manager = PayloadManager(config=self.config)
2034 self.payload_manager = PayloadManager(config=self.config)
2035
2035
2036 #-------------------------------------------------------------------------
2036 #-------------------------------------------------------------------------
2037 # Things related to the prefilter
2037 # Things related to the prefilter
2038 #-------------------------------------------------------------------------
2038 #-------------------------------------------------------------------------
2039
2039
2040 def init_prefilter(self):
2040 def init_prefilter(self):
2041 self.prefilter_manager = PrefilterManager(shell=self, config=self.config)
2041 self.prefilter_manager = PrefilterManager(shell=self, config=self.config)
2042 # Ultimately this will be refactored in the new interpreter code, but
2042 # Ultimately this will be refactored in the new interpreter code, but
2043 # for now, we should expose the main prefilter method (there's legacy
2043 # for now, we should expose the main prefilter method (there's legacy
2044 # code out there that may rely on this).
2044 # code out there that may rely on this).
2045 self.prefilter = self.prefilter_manager.prefilter_lines
2045 self.prefilter = self.prefilter_manager.prefilter_lines
2046
2046
2047 def auto_rewrite_input(self, cmd):
2047 def auto_rewrite_input(self, cmd):
2048 """Print to the screen the rewritten form of the user's command.
2048 """Print to the screen the rewritten form of the user's command.
2049
2049
2050 This shows visual feedback by rewriting input lines that cause
2050 This shows visual feedback by rewriting input lines that cause
2051 automatic calling to kick in, like::
2051 automatic calling to kick in, like::
2052
2052
2053 /f x
2053 /f x
2054
2054
2055 into::
2055 into::
2056
2056
2057 ------> f(x)
2057 ------> f(x)
2058
2058
2059 after the user's input prompt. This helps the user understand that the
2059 after the user's input prompt. This helps the user understand that the
2060 input line was transformed automatically by IPython.
2060 input line was transformed automatically by IPython.
2061 """
2061 """
2062 rw = self.displayhook.prompt1.auto_rewrite() + cmd
2062 rw = self.displayhook.prompt1.auto_rewrite() + cmd
2063
2063
2064 try:
2064 try:
2065 # plain ascii works better w/ pyreadline, on some machines, so
2065 # plain ascii works better w/ pyreadline, on some machines, so
2066 # we use it and only print uncolored rewrite if we have unicode
2066 # we use it and only print uncolored rewrite if we have unicode
2067 rw = str(rw)
2067 rw = str(rw)
2068 print >> io.stdout, rw
2068 print >> io.stdout, rw
2069 except UnicodeEncodeError:
2069 except UnicodeEncodeError:
2070 print "------> " + cmd
2070 print "------> " + cmd
2071
2071
2072 #-------------------------------------------------------------------------
2072 #-------------------------------------------------------------------------
2073 # Things related to extracting values/expressions from kernel and user_ns
2073 # Things related to extracting values/expressions from kernel and user_ns
2074 #-------------------------------------------------------------------------
2074 #-------------------------------------------------------------------------
2075
2075
2076 def _simple_error(self):
2076 def _simple_error(self):
2077 etype, value = sys.exc_info()[:2]
2077 etype, value = sys.exc_info()[:2]
2078 return u'[ERROR] {e.__name__}: {v}'.format(e=etype, v=value)
2078 return u'[ERROR] {e.__name__}: {v}'.format(e=etype, v=value)
2079
2079
2080 def user_variables(self, names):
2080 def user_variables(self, names):
2081 """Get a list of variable names from the user's namespace.
2081 """Get a list of variable names from the user's namespace.
2082
2082
2083 Parameters
2083 Parameters
2084 ----------
2084 ----------
2085 names : list of strings
2085 names : list of strings
2086 A list of names of variables to be read from the user namespace.
2086 A list of names of variables to be read from the user namespace.
2087
2087
2088 Returns
2088 Returns
2089 -------
2089 -------
2090 A dict, keyed by the input names and with the repr() of each value.
2090 A dict, keyed by the input names and with the repr() of each value.
2091 """
2091 """
2092 out = {}
2092 out = {}
2093 user_ns = self.user_ns
2093 user_ns = self.user_ns
2094 for varname in names:
2094 for varname in names:
2095 try:
2095 try:
2096 value = repr(user_ns[varname])
2096 value = repr(user_ns[varname])
2097 except:
2097 except:
2098 value = self._simple_error()
2098 value = self._simple_error()
2099 out[varname] = value
2099 out[varname] = value
2100 return out
2100 return out
2101
2101
2102 def user_expressions(self, expressions):
2102 def user_expressions(self, expressions):
2103 """Evaluate a dict of expressions in the user's namespace.
2103 """Evaluate a dict of expressions in the user's namespace.
2104
2104
2105 Parameters
2105 Parameters
2106 ----------
2106 ----------
2107 expressions : dict
2107 expressions : dict
2108 A dict with string keys and string values. The expression values
2108 A dict with string keys and string values. The expression values
2109 should be valid Python expressions, each of which will be evaluated
2109 should be valid Python expressions, each of which will be evaluated
2110 in the user namespace.
2110 in the user namespace.
2111
2111
2112 Returns
2112 Returns
2113 -------
2113 -------
2114 A dict, keyed like the input expressions dict, with the repr() of each
2114 A dict, keyed like the input expressions dict, with the repr() of each
2115 value.
2115 value.
2116 """
2116 """
2117 out = {}
2117 out = {}
2118 user_ns = self.user_ns
2118 user_ns = self.user_ns
2119 global_ns = self.user_global_ns
2119 global_ns = self.user_global_ns
2120 for key, expr in expressions.iteritems():
2120 for key, expr in expressions.iteritems():
2121 try:
2121 try:
2122 value = repr(eval(expr, global_ns, user_ns))
2122 value = repr(eval(expr, global_ns, user_ns))
2123 except:
2123 except:
2124 value = self._simple_error()
2124 value = self._simple_error()
2125 out[key] = value
2125 out[key] = value
2126 return out
2126 return out
2127
2127
2128 #-------------------------------------------------------------------------
2128 #-------------------------------------------------------------------------
2129 # Things related to the running of code
2129 # Things related to the running of code
2130 #-------------------------------------------------------------------------
2130 #-------------------------------------------------------------------------
2131
2131
2132 def ex(self, cmd):
2132 def ex(self, cmd):
2133 """Execute a normal python statement in user namespace."""
2133 """Execute a normal python statement in user namespace."""
2134 with self.builtin_trap:
2134 with self.builtin_trap:
2135 exec cmd in self.user_global_ns, self.user_ns
2135 exec cmd in self.user_global_ns, self.user_ns
2136
2136
2137 def ev(self, expr):
2137 def ev(self, expr):
2138 """Evaluate python expression expr in user namespace.
2138 """Evaluate python expression expr in user namespace.
2139
2139
2140 Returns the result of evaluation
2140 Returns the result of evaluation
2141 """
2141 """
2142 with self.builtin_trap:
2142 with self.builtin_trap:
2143 return eval(expr, self.user_global_ns, self.user_ns)
2143 return eval(expr, self.user_global_ns, self.user_ns)
2144
2144
2145 def safe_execfile(self, fname, *where, **kw):
2145 def safe_execfile(self, fname, *where, **kw):
2146 """A safe version of the builtin execfile().
2146 """A safe version of the builtin execfile().
2147
2147
2148 This version will never throw an exception, but instead print
2148 This version will never throw an exception, but instead print
2149 helpful error messages to the screen. This only works on pure
2149 helpful error messages to the screen. This only works on pure
2150 Python files with the .py extension.
2150 Python files with the .py extension.
2151
2151
2152 Parameters
2152 Parameters
2153 ----------
2153 ----------
2154 fname : string
2154 fname : string
2155 The name of the file to be executed.
2155 The name of the file to be executed.
2156 where : tuple
2156 where : tuple
2157 One or two namespaces, passed to execfile() as (globals,locals).
2157 One or two namespaces, passed to execfile() as (globals,locals).
2158 If only one is given, it is passed as both.
2158 If only one is given, it is passed as both.
2159 exit_ignore : bool (False)
2159 exit_ignore : bool (False)
2160 If True, then silence SystemExit for non-zero status (it is always
2160 If True, then silence SystemExit for non-zero status (it is always
2161 silenced for zero status, as it is so common).
2161 silenced for zero status, as it is so common).
2162 """
2162 """
2163 kw.setdefault('exit_ignore', False)
2163 kw.setdefault('exit_ignore', False)
2164
2164
2165 fname = os.path.abspath(os.path.expanduser(fname))
2165 fname = os.path.abspath(os.path.expanduser(fname))
2166
2166
2167 # Make sure we can open the file
2167 # Make sure we can open the file
2168 try:
2168 try:
2169 with open(fname) as thefile:
2169 with open(fname) as thefile:
2170 pass
2170 pass
2171 except:
2171 except:
2172 warn('Could not open file <%s> for safe execution.' % fname)
2172 warn('Could not open file <%s> for safe execution.' % fname)
2173 return
2173 return
2174
2174
2175 # Find things also in current directory. This is needed to mimic the
2175 # Find things also in current directory. This is needed to mimic the
2176 # behavior of running a script from the system command line, where
2176 # behavior of running a script from the system command line, where
2177 # Python inserts the script's directory into sys.path
2177 # Python inserts the script's directory into sys.path
2178 dname = os.path.dirname(fname)
2178 dname = os.path.dirname(fname)
2179
2179
2180 with prepended_to_syspath(dname):
2180 with prepended_to_syspath(dname):
2181 try:
2181 try:
2182 py3compat.execfile(fname,*where)
2182 py3compat.execfile(fname,*where)
2183 except SystemExit, status:
2183 except SystemExit, status:
2184 # If the call was made with 0 or None exit status (sys.exit(0)
2184 # If the call was made with 0 or None exit status (sys.exit(0)
2185 # or sys.exit() ), don't bother showing a traceback, as both of
2185 # or sys.exit() ), don't bother showing a traceback, as both of
2186 # these are considered normal by the OS:
2186 # these are considered normal by the OS:
2187 # > python -c'import sys;sys.exit(0)'; echo $?
2187 # > python -c'import sys;sys.exit(0)'; echo $?
2188 # 0
2188 # 0
2189 # > python -c'import sys;sys.exit()'; echo $?
2189 # > python -c'import sys;sys.exit()'; echo $?
2190 # 0
2190 # 0
2191 # For other exit status, we show the exception unless
2191 # For other exit status, we show the exception unless
2192 # explicitly silenced, but only in short form.
2192 # explicitly silenced, but only in short form.
2193 if status.code not in (0, None) and not kw['exit_ignore']:
2193 if status.code not in (0, None) and not kw['exit_ignore']:
2194 self.showtraceback(exception_only=True)
2194 self.showtraceback(exception_only=True)
2195 except:
2195 except:
2196 self.showtraceback()
2196 self.showtraceback()
2197
2197
2198 def safe_execfile_ipy(self, fname):
2198 def safe_execfile_ipy(self, fname):
2199 """Like safe_execfile, but for .ipy files with IPython syntax.
2199 """Like safe_execfile, but for .ipy files with IPython syntax.
2200
2200
2201 Parameters
2201 Parameters
2202 ----------
2202 ----------
2203 fname : str
2203 fname : str
2204 The name of the file to execute. The filename must have a
2204 The name of the file to execute. The filename must have a
2205 .ipy extension.
2205 .ipy extension.
2206 """
2206 """
2207 fname = os.path.abspath(os.path.expanduser(fname))
2207 fname = os.path.abspath(os.path.expanduser(fname))
2208
2208
2209 # Make sure we can open the file
2209 # Make sure we can open the file
2210 try:
2210 try:
2211 with open(fname) as thefile:
2211 with open(fname) as thefile:
2212 pass
2212 pass
2213 except:
2213 except:
2214 warn('Could not open file <%s> for safe execution.' % fname)
2214 warn('Could not open file <%s> for safe execution.' % fname)
2215 return
2215 return
2216
2216
2217 # Find things also in current directory. This is needed to mimic the
2217 # Find things also in current directory. This is needed to mimic the
2218 # behavior of running a script from the system command line, where
2218 # behavior of running a script from the system command line, where
2219 # Python inserts the script's directory into sys.path
2219 # Python inserts the script's directory into sys.path
2220 dname = os.path.dirname(fname)
2220 dname = os.path.dirname(fname)
2221
2221
2222 with prepended_to_syspath(dname):
2222 with prepended_to_syspath(dname):
2223 try:
2223 try:
2224 with open(fname) as thefile:
2224 with open(fname) as thefile:
2225 # self.run_cell currently captures all exceptions
2225 # self.run_cell currently captures all exceptions
2226 # raised in user code. It would be nice if there were
2226 # raised in user code. It would be nice if there were
2227 # versions of runlines, execfile that did raise, so
2227 # versions of runlines, execfile that did raise, so
2228 # we could catch the errors.
2228 # we could catch the errors.
2229 self.run_cell(thefile.read(), store_history=False)
2229 self.run_cell(thefile.read(), store_history=False)
2230 except:
2230 except:
2231 self.showtraceback()
2231 self.showtraceback()
2232 warn('Unknown failure executing file: <%s>' % fname)
2232 warn('Unknown failure executing file: <%s>' % fname)
2233
2233
2234 def run_cell(self, raw_cell, store_history=True):
2234 def run_cell(self, raw_cell, store_history=True):
2235 """Run a complete IPython cell.
2235 """Run a complete IPython cell.
2236
2236
2237 Parameters
2237 Parameters
2238 ----------
2238 ----------
2239 raw_cell : str
2239 raw_cell : str
2240 The code (including IPython code such as %magic functions) to run.
2240 The code (including IPython code such as %magic functions) to run.
2241 store_history : bool
2241 store_history : bool
2242 If True, the raw and translated cell will be stored in IPython's
2242 If True, the raw and translated cell will be stored in IPython's
2243 history. For user code calling back into IPython's machinery, this
2243 history. For user code calling back into IPython's machinery, this
2244 should be set to False.
2244 should be set to False.
2245 """
2245 """
2246 if (not raw_cell) or raw_cell.isspace():
2246 if (not raw_cell) or raw_cell.isspace():
2247 return
2247 return
2248
2248
2249 for line in raw_cell.splitlines():
2249 for line in raw_cell.splitlines():
2250 self.input_splitter.push(line)
2250 self.input_splitter.push(line)
2251 cell = self.input_splitter.source_reset()
2251 cell = self.input_splitter.source_reset()
2252
2252
2253 with self.builtin_trap:
2253 with self.builtin_trap:
2254 prefilter_failed = False
2254 prefilter_failed = False
2255 if len(cell.splitlines()) == 1:
2255 if len(cell.splitlines()) == 1:
2256 try:
2256 try:
2257 # use prefilter_lines to handle trailing newlines
2257 # use prefilter_lines to handle trailing newlines
2258 # restore trailing newline for ast.parse
2258 # restore trailing newline for ast.parse
2259 cell = self.prefilter_manager.prefilter_lines(cell) + '\n'
2259 cell = self.prefilter_manager.prefilter_lines(cell) + '\n'
2260 except AliasError as e:
2260 except AliasError as e:
2261 error(e)
2261 error(e)
2262 prefilter_failed = True
2262 prefilter_failed = True
2263 except Exception:
2263 except Exception:
2264 # don't allow prefilter errors to crash IPython
2264 # don't allow prefilter errors to crash IPython
2265 self.showtraceback()
2265 self.showtraceback()
2266 prefilter_failed = True
2266 prefilter_failed = True
2267
2267
2268 # Store raw and processed history
2268 # Store raw and processed history
2269 if store_history:
2269 if store_history:
2270 self.history_manager.store_inputs(self.execution_count,
2270 self.history_manager.store_inputs(self.execution_count,
2271 cell, raw_cell)
2271 cell, raw_cell)
2272
2272
2273 self.logger.log(cell, raw_cell)
2273 self.logger.log(cell, raw_cell)
2274
2274
2275 if not prefilter_failed:
2275 if not prefilter_failed:
2276 # don't run if prefilter failed
2276 # don't run if prefilter failed
2277 cell_name = self.compile.cache(cell, self.execution_count)
2277 cell_name = self.compile.cache(cell, self.execution_count)
2278
2278
2279 with self.display_trap:
2279 with self.display_trap:
2280 try:
2280 try:
2281 code_ast = ast.parse(cell, filename=cell_name)
2281 code_ast = ast.parse(cell, filename=cell_name)
2282 except IndentationError:
2282 except IndentationError:
2283 self.showindentationerror()
2283 self.showindentationerror()
2284 self.execution_count += 1
2284 self.execution_count += 1
2285 return None
2285 return None
2286 except (OverflowError, SyntaxError, ValueError, TypeError,
2286 except (OverflowError, SyntaxError, ValueError, TypeError,
2287 MemoryError):
2287 MemoryError):
2288 self.showsyntaxerror()
2288 self.showsyntaxerror()
2289 self.execution_count += 1
2289 self.execution_count += 1
2290 return None
2290 return None
2291
2291
2292 self.run_ast_nodes(code_ast.body, cell_name,
2292 self.run_ast_nodes(code_ast.body, cell_name,
2293 interactivity="last_expr")
2293 interactivity="last_expr")
2294
2294
2295 # Execute any registered post-execution functions.
2295 # Execute any registered post-execution functions.
2296 for func, status in self._post_execute.iteritems():
2296 for func, status in self._post_execute.iteritems():
2297 if not status:
2297 if not status:
2298 continue
2298 continue
2299 try:
2299 try:
2300 func()
2300 func()
2301 except:
2301 except:
2302 self.showtraceback()
2302 self.showtraceback()
2303 # Deactivate failing function
2303 # Deactivate failing function
2304 self._post_execute[func] = False
2304 self._post_execute[func] = False
2305
2305
2306 if store_history:
2306 if store_history:
2307 # Write output to the database. Does nothing unless
2307 # Write output to the database. Does nothing unless
2308 # history output logging is enabled.
2308 # history output logging is enabled.
2309 self.history_manager.store_output(self.execution_count)
2309 self.history_manager.store_output(self.execution_count)
2310 # Each cell is a *single* input, regardless of how many lines it has
2310 # Each cell is a *single* input, regardless of how many lines it has
2311 self.execution_count += 1
2311 self.execution_count += 1
2312
2312
2313 def run_ast_nodes(self, nodelist, cell_name, interactivity='last_expr'):
2313 def run_ast_nodes(self, nodelist, cell_name, interactivity='last_expr'):
2314 """Run a sequence of AST nodes. The execution mode depends on the
2314 """Run a sequence of AST nodes. The execution mode depends on the
2315 interactivity parameter.
2315 interactivity parameter.
2316
2316
2317 Parameters
2317 Parameters
2318 ----------
2318 ----------
2319 nodelist : list
2319 nodelist : list
2320 A sequence of AST nodes to run.
2320 A sequence of AST nodes to run.
2321 cell_name : str
2321 cell_name : str
2322 Will be passed to the compiler as the filename of the cell. Typically
2322 Will be passed to the compiler as the filename of the cell. Typically
2323 the value returned by ip.compile.cache(cell).
2323 the value returned by ip.compile.cache(cell).
2324 interactivity : str
2324 interactivity : str
2325 'all', 'last', 'last_expr' or 'none', specifying which nodes should be
2325 'all', 'last', 'last_expr' or 'none', specifying which nodes should be
2326 run interactively (displaying output from expressions). 'last_expr'
2326 run interactively (displaying output from expressions). 'last_expr'
2327 will run the last node interactively only if it is an expression (i.e.
2327 will run the last node interactively only if it is an expression (i.e.
2328 expressions in loops or other blocks are not displayed. Other values
2328 expressions in loops or other blocks are not displayed. Other values
2329 for this parameter will raise a ValueError.
2329 for this parameter will raise a ValueError.
2330 """
2330 """
2331 if not nodelist:
2331 if not nodelist:
2332 return
2332 return
2333
2333
2334 if interactivity == 'last_expr':
2334 if interactivity == 'last_expr':
2335 if isinstance(nodelist[-1], ast.Expr):
2335 if isinstance(nodelist[-1], ast.Expr):
2336 interactivity = "last"
2336 interactivity = "last"
2337 else:
2337 else:
2338 interactivity = "none"
2338 interactivity = "none"
2339
2339
2340 if interactivity == 'none':
2340 if interactivity == 'none':
2341 to_run_exec, to_run_interactive = nodelist, []
2341 to_run_exec, to_run_interactive = nodelist, []
2342 elif interactivity == 'last':
2342 elif interactivity == 'last':
2343 to_run_exec, to_run_interactive = nodelist[:-1], nodelist[-1:]
2343 to_run_exec, to_run_interactive = nodelist[:-1], nodelist[-1:]
2344 elif interactivity == 'all':
2344 elif interactivity == 'all':
2345 to_run_exec, to_run_interactive = [], nodelist
2345 to_run_exec, to_run_interactive = [], nodelist
2346 else:
2346 else:
2347 raise ValueError("Interactivity was %r" % interactivity)
2347 raise ValueError("Interactivity was %r" % interactivity)
2348
2348
2349 exec_count = self.execution_count
2349 exec_count = self.execution_count
2350
2350
2351 try:
2351 try:
2352 for i, node in enumerate(to_run_exec):
2352 for i, node in enumerate(to_run_exec):
2353 mod = ast.Module([node])
2353 mod = ast.Module([node])
2354 code = self.compile(mod, cell_name, "exec")
2354 code = self.compile(mod, cell_name, "exec")
2355 if self.run_code(code):
2355 if self.run_code(code):
2356 return True
2356 return True
2357
2357
2358 for i, node in enumerate(to_run_interactive):
2358 for i, node in enumerate(to_run_interactive):
2359 mod = ast.Interactive([node])
2359 mod = ast.Interactive([node])
2360 code = self.compile(mod, cell_name, "single")
2360 code = self.compile(mod, cell_name, "single")
2361 if self.run_code(code):
2361 if self.run_code(code):
2362 return True
2362 return True
2363 except:
2363 except:
2364 # It's possible to have exceptions raised here, typically by
2364 # It's possible to have exceptions raised here, typically by
2365 # compilation of odd code (such as a naked 'return' outside a
2365 # compilation of odd code (such as a naked 'return' outside a
2366 # function) that did parse but isn't valid. Typically the exception
2366 # function) that did parse but isn't valid. Typically the exception
2367 # is a SyntaxError, but it's safest just to catch anything and show
2367 # is a SyntaxError, but it's safest just to catch anything and show
2368 # the user a traceback.
2368 # the user a traceback.
2369
2369
2370 # We do only one try/except outside the loop to minimize the impact
2370 # We do only one try/except outside the loop to minimize the impact
2371 # on runtime, and also because if any node in the node list is
2371 # on runtime, and also because if any node in the node list is
2372 # broken, we should stop execution completely.
2372 # broken, we should stop execution completely.
2373 self.showtraceback()
2373 self.showtraceback()
2374
2374
2375 return False
2375 return False
2376
2376
2377 def run_code(self, code_obj):
2377 def run_code(self, code_obj):
2378 """Execute a code object.
2378 """Execute a code object.
2379
2379
2380 When an exception occurs, self.showtraceback() is called to display a
2380 When an exception occurs, self.showtraceback() is called to display a
2381 traceback.
2381 traceback.
2382
2382
2383 Parameters
2383 Parameters
2384 ----------
2384 ----------
2385 code_obj : code object
2385 code_obj : code object
2386 A compiled code object, to be executed
2386 A compiled code object, to be executed
2387 post_execute : bool [default: True]
2387 post_execute : bool [default: True]
2388 whether to call post_execute hooks after this particular execution.
2388 whether to call post_execute hooks after this particular execution.
2389
2389
2390 Returns
2390 Returns
2391 -------
2391 -------
2392 False : successful execution.
2392 False : successful execution.
2393 True : an error occurred.
2393 True : an error occurred.
2394 """
2394 """
2395
2395
2396 # Set our own excepthook in case the user code tries to call it
2396 # Set our own excepthook in case the user code tries to call it
2397 # directly, so that the IPython crash handler doesn't get triggered
2397 # directly, so that the IPython crash handler doesn't get triggered
2398 old_excepthook,sys.excepthook = sys.excepthook, self.excepthook
2398 old_excepthook,sys.excepthook = sys.excepthook, self.excepthook
2399
2399
2400 # we save the original sys.excepthook in the instance, in case config
2400 # we save the original sys.excepthook in the instance, in case config
2401 # code (such as magics) needs access to it.
2401 # code (such as magics) needs access to it.
2402 self.sys_excepthook = old_excepthook
2402 self.sys_excepthook = old_excepthook
2403 outflag = 1 # happens in more places, so it's easier as default
2403 outflag = 1 # happens in more places, so it's easier as default
2404 try:
2404 try:
2405 try:
2405 try:
2406 self.hooks.pre_run_code_hook()
2406 self.hooks.pre_run_code_hook()
2407 #rprint('Running code', repr(code_obj)) # dbg
2407 #rprint('Running code', repr(code_obj)) # dbg
2408 exec code_obj in self.user_global_ns, self.user_ns
2408 exec code_obj in self.user_global_ns, self.user_ns
2409 finally:
2409 finally:
2410 # Reset our crash handler in place
2410 # Reset our crash handler in place
2411 sys.excepthook = old_excepthook
2411 sys.excepthook = old_excepthook
2412 except SystemExit:
2412 except SystemExit:
2413 self.showtraceback(exception_only=True)
2413 self.showtraceback(exception_only=True)
2414 warn("To exit: use 'exit', 'quit', or Ctrl-D.", level=1)
2414 warn("To exit: use 'exit', 'quit', or Ctrl-D.", level=1)
2415 except self.custom_exceptions:
2415 except self.custom_exceptions:
2416 etype,value,tb = sys.exc_info()
2416 etype,value,tb = sys.exc_info()
2417 self.CustomTB(etype,value,tb)
2417 self.CustomTB(etype,value,tb)
2418 except:
2418 except:
2419 self.showtraceback()
2419 self.showtraceback()
2420 else:
2420 else:
2421 outflag = 0
2421 outflag = 0
2422 if softspace(sys.stdout, 0):
2422 if softspace(sys.stdout, 0):
2423 print
2423 print
2424
2424
2425 return outflag
2425 return outflag
2426
2426
2427 # For backwards compatibility
2427 # For backwards compatibility
2428 runcode = run_code
2428 runcode = run_code
2429
2429
2430 #-------------------------------------------------------------------------
2430 #-------------------------------------------------------------------------
2431 # Things related to GUI support and pylab
2431 # Things related to GUI support and pylab
2432 #-------------------------------------------------------------------------
2432 #-------------------------------------------------------------------------
2433
2433
2434 def enable_pylab(self, gui=None, import_all=True):
2434 def enable_pylab(self, gui=None, import_all=True):
2435 raise NotImplementedError('Implement enable_pylab in a subclass')
2435 raise NotImplementedError('Implement enable_pylab in a subclass')
2436
2436
2437 #-------------------------------------------------------------------------
2437 #-------------------------------------------------------------------------
2438 # Utilities
2438 # Utilities
2439 #-------------------------------------------------------------------------
2439 #-------------------------------------------------------------------------
2440
2440
2441 def var_expand(self,cmd,depth=0):
2441 def var_expand(self,cmd,depth=0):
2442 """Expand python variables in a string.
2442 """Expand python variables in a string.
2443
2443
2444 The depth argument indicates how many frames above the caller should
2444 The depth argument indicates how many frames above the caller should
2445 be walked to look for the local namespace where to expand variables.
2445 be walked to look for the local namespace where to expand variables.
2446
2446
2447 The global namespace for expansion is always the user's interactive
2447 The global namespace for expansion is always the user's interactive
2448 namespace.
2448 namespace.
2449 """
2449 """
2450 res = ItplNS(cmd, self.user_ns, # globals
2450 res = ItplNS(cmd, self.user_ns, # globals
2451 # Skip our own frame in searching for locals:
2451 # Skip our own frame in searching for locals:
2452 sys._getframe(depth+1).f_locals # locals
2452 sys._getframe(depth+1).f_locals # locals
2453 )
2453 )
2454 return str(res).decode(res.codec)
2454 return str(res).decode(res.codec)
2455
2455
2456 def mktempfile(self, data=None, prefix='ipython_edit_'):
2456 def mktempfile(self, data=None, prefix='ipython_edit_'):
2457 """Make a new tempfile and return its filename.
2457 """Make a new tempfile and return its filename.
2458
2458
2459 This makes a call to tempfile.mktemp, but it registers the created
2459 This makes a call to tempfile.mktemp, but it registers the created
2460 filename internally so ipython cleans it up at exit time.
2460 filename internally so ipython cleans it up at exit time.
2461
2461
2462 Optional inputs:
2462 Optional inputs:
2463
2463
2464 - data(None): if data is given, it gets written out to the temp file
2464 - data(None): if data is given, it gets written out to the temp file
2465 immediately, and the file is closed again."""
2465 immediately, and the file is closed again."""
2466
2466
2467 filename = tempfile.mktemp('.py', prefix)
2467 filename = tempfile.mktemp('.py', prefix)
2468 self.tempfiles.append(filename)
2468 self.tempfiles.append(filename)
2469
2469
2470 if data:
2470 if data:
2471 tmp_file = open(filename,'w')
2471 tmp_file = open(filename,'w')
2472 tmp_file.write(data)
2472 tmp_file.write(data)
2473 tmp_file.close()
2473 tmp_file.close()
2474 return filename
2474 return filename
2475
2475
2476 # TODO: This should be removed when Term is refactored.
2476 # TODO: This should be removed when Term is refactored.
2477 def write(self,data):
2477 def write(self,data):
2478 """Write a string to the default output"""
2478 """Write a string to the default output"""
2479 io.stdout.write(data)
2479 io.stdout.write(data)
2480
2480
2481 # TODO: This should be removed when Term is refactored.
2481 # TODO: This should be removed when Term is refactored.
2482 def write_err(self,data):
2482 def write_err(self,data):
2483 """Write a string to the default error output"""
2483 """Write a string to the default error output"""
2484 io.stderr.write(data)
2484 io.stderr.write(data)
2485
2485
2486 def ask_yes_no(self,prompt,default=True):
2486 def ask_yes_no(self,prompt,default=True):
2487 if self.quiet:
2487 if self.quiet:
2488 return True
2488 return True
2489 return ask_yes_no(prompt,default)
2489 return ask_yes_no(prompt,default)
2490
2490
2491 def show_usage(self):
2491 def show_usage(self):
2492 """Show a usage message"""
2492 """Show a usage message"""
2493 page.page(IPython.core.usage.interactive_usage)
2493 page.page(IPython.core.usage.interactive_usage)
2494
2494
2495 def find_user_code(self, target, raw=True):
2495 def find_user_code(self, target, raw=True):
2496 """Get a code string from history, file, or a string or macro.
2496 """Get a code string from history, file, or a string or macro.
2497
2497
2498 This is mainly used by magic functions.
2498 This is mainly used by magic functions.
2499
2499
2500 Parameters
2500 Parameters
2501 ----------
2501 ----------
2502 target : str
2502 target : str
2503 A string specifying code to retrieve. This will be tried respectively
2503 A string specifying code to retrieve. This will be tried respectively
2504 as: ranges of input history (see %history for syntax), a filename, or
2504 as: ranges of input history (see %history for syntax), a filename, or
2505 an expression evaluating to a string or Macro in the user namespace.
2505 an expression evaluating to a string or Macro in the user namespace.
2506 raw : bool
2506 raw : bool
2507 If true (default), retrieve raw history. Has no effect on the other
2507 If true (default), retrieve raw history. Has no effect on the other
2508 retrieval mechanisms.
2508 retrieval mechanisms.
2509
2509
2510 Returns
2510 Returns
2511 -------
2511 -------
2512 A string of code.
2512 A string of code.
2513
2513
2514 ValueError is raised if nothing is found, and TypeError if it evaluates
2514 ValueError is raised if nothing is found, and TypeError if it evaluates
2515 to an object of another type. In each case, .args[0] is a printable
2515 to an object of another type. In each case, .args[0] is a printable
2516 message.
2516 message.
2517 """
2517 """
2518 code = self.extract_input_lines(target, raw=raw) # Grab history
2518 code = self.extract_input_lines(target, raw=raw) # Grab history
2519 if code:
2519 if code:
2520 return code
2520 return code
2521 if os.path.isfile(target): # Read file
2521 if os.path.isfile(target): # Read file
2522 return open(target, "r").read()
2522 return open(target, "r").read()
2523
2523
2524 try: # User namespace
2524 try: # User namespace
2525 codeobj = eval(target, self.user_ns)
2525 codeobj = eval(target, self.user_ns)
2526 except Exception:
2526 except Exception:
2527 raise ValueError(("'%s' was not found in history, as a file, nor in"
2527 raise ValueError(("'%s' was not found in history, as a file, nor in"
2528 " the user namespace.") % target)
2528 " the user namespace.") % target)
2529 if isinstance(codeobj, basestring):
2529 if isinstance(codeobj, basestring):
2530 return codeobj
2530 return codeobj
2531 elif isinstance(codeobj, Macro):
2531 elif isinstance(codeobj, Macro):
2532 return codeobj.value
2532 return codeobj.value
2533
2533
2534 raise TypeError("%s is neither a string nor a macro." % target,
2534 raise TypeError("%s is neither a string nor a macro." % target,
2535 codeobj)
2535 codeobj)
2536
2536
2537 #-------------------------------------------------------------------------
2537 #-------------------------------------------------------------------------
2538 # Things related to IPython exiting
2538 # Things related to IPython exiting
2539 #-------------------------------------------------------------------------
2539 #-------------------------------------------------------------------------
2540 def atexit_operations(self):
2540 def atexit_operations(self):
2541 """This will be executed at the time of exit.
2541 """This will be executed at the time of exit.
2542
2542
2543 Cleanup operations and saving of persistent data that is done
2543 Cleanup operations and saving of persistent data that is done
2544 unconditionally by IPython should be performed here.
2544 unconditionally by IPython should be performed here.
2545
2545
2546 For things that may depend on startup flags or platform specifics (such
2546 For things that may depend on startup flags or platform specifics (such
2547 as having readline or not), register a separate atexit function in the
2547 as having readline or not), register a separate atexit function in the
2548 code that has the appropriate information, rather than trying to
2548 code that has the appropriate information, rather than trying to
2549 clutter
2549 clutter
2550 """
2550 """
2551 # Close the history session (this stores the end time and line count)
2551 # Close the history session (this stores the end time and line count)
2552 # this must be *before* the tempfile cleanup, in case of temporary
2552 # this must be *before* the tempfile cleanup, in case of temporary
2553 # history db
2553 # history db
2554 self.history_manager.end_session()
2554 self.history_manager.end_session()
2555
2555
2556 # Cleanup all tempfiles left around
2556 # Cleanup all tempfiles left around
2557 for tfile in self.tempfiles:
2557 for tfile in self.tempfiles:
2558 try:
2558 try:
2559 os.unlink(tfile)
2559 os.unlink(tfile)
2560 except OSError:
2560 except OSError:
2561 pass
2561 pass
2562
2562
2563 # Clear all user namespaces to release all references cleanly.
2563 # Clear all user namespaces to release all references cleanly.
2564 self.reset(new_session=False)
2564 self.reset(new_session=False)
2565
2565
2566 # Run user hooks
2566 # Run user hooks
2567 self.hooks.shutdown_hook()
2567 self.hooks.shutdown_hook()
2568
2568
2569 def cleanup(self):
2569 def cleanup(self):
2570 self.restore_sys_module_state()
2570 self.restore_sys_module_state()
2571
2571
2572
2572
2573 class InteractiveShellABC(object):
2573 class InteractiveShellABC(object):
2574 """An abstract base class for InteractiveShell."""
2574 """An abstract base class for InteractiveShell."""
2575 __metaclass__ = abc.ABCMeta
2575 __metaclass__ = abc.ABCMeta
2576
2576
2577 InteractiveShellABC.register(InteractiveShell)
2577 InteractiveShellABC.register(InteractiveShell)
@@ -1,35 +1,35 b''
1 """Simple script to be run *twice*, to check reference counting bugs.
1 """Simple script to be run *twice*, to check reference counting bugs.
2
2
3 See test_run for details."""
3 See test_run for details."""
4
4
5 from __future__ import print_function
5 from __future__ import print_function
6
6
7 import sys
7 import sys
8
8
9 # We want to ensure that while objects remain available for immediate access,
9 # We want to ensure that while objects remain available for immediate access,
10 # objects from *previous* runs of the same script get collected, to avoid
10 # objects from *previous* runs of the same script get collected, to avoid
11 # accumulating massive amounts of old references.
11 # accumulating massive amounts of old references.
12 class C(object):
12 class C(object):
13 def __init__(self,name):
13 def __init__(self,name):
14 self.name = name
14 self.name = name
15 self.p = print
15 self.p = print
16 self.flush_stdout = sys.stdout.flush
16 self.flush_stdout = sys.stdout.flush
17
17
18 def __del__(self):
18 def __del__(self):
19 self.p('tclass.py: deleting object:',self.name)
19 self.p('tclass.py: deleting object:',self.name)
20 self.flush_stdout()
20 self.flush_stdout()
21
21
22 try:
22 try:
23 name = sys.argv[1]
23 name = sys.argv[1]
24 except IndexError:
24 except IndexError:
25 pass
25 pass
26 else:
26 else:
27 if name.startswith('C'):
27 if name.startswith('C'):
28 c = C(name)
28 c = C(name)
29
29
30 #print >> sys.stderr, "ARGV:", sys.argv # dbg
30 #print >> sys.stderr, "ARGV:", sys.argv # dbg
31
31
32 # This next print statement is NOT debugging, we're making the check on a
32 # This next print statement is NOT debugging, we're making the check on a
33 # completely separate process so we verify by capturing stdout:
33 # completely separate process so we verify by capturing stdout:
34 print 'ARGV 1-:', sys.argv[1:]
34 print('ARGV 1-:', sys.argv[1:])
35 sys.stdout.flush()
35 sys.stdout.flush()
@@ -1,592 +1,593 b''
1 # -*- coding: utf-8 -*-
1 # -*- coding: utf-8 -*-
2 """Subclass of InteractiveShell for terminal based frontends."""
2 """Subclass of InteractiveShell for terminal based frontends."""
3
3
4 #-----------------------------------------------------------------------------
4 #-----------------------------------------------------------------------------
5 # Copyright (C) 2001 Janko Hauser <jhauser@zscout.de>
5 # Copyright (C) 2001 Janko Hauser <jhauser@zscout.de>
6 # Copyright (C) 2001-2007 Fernando Perez. <fperez@colorado.edu>
6 # Copyright (C) 2001-2007 Fernando Perez. <fperez@colorado.edu>
7 # Copyright (C) 2008-2010 The IPython Development Team
7 # Copyright (C) 2008-2010 The IPython Development Team
8 #
8 #
9 # Distributed under the terms of the BSD License. The full license is in
9 # Distributed under the terms of the BSD License. The full license is in
10 # the file COPYING, distributed as part of this software.
10 # the file COPYING, distributed as part of this software.
11 #-----------------------------------------------------------------------------
11 #-----------------------------------------------------------------------------
12
12
13 #-----------------------------------------------------------------------------
13 #-----------------------------------------------------------------------------
14 # Imports
14 # Imports
15 #-----------------------------------------------------------------------------
15 #-----------------------------------------------------------------------------
16
16
17 import __builtin__
17 import __builtin__
18 import bdb
18 import bdb
19 from contextlib import nested
19 from contextlib import nested
20 import os
20 import os
21 import re
21 import re
22 import sys
22 import sys
23
23
24 from IPython.core.error import TryNext
24 from IPython.core.error import TryNext
25 from IPython.core.usage import interactive_usage, default_banner
25 from IPython.core.usage import interactive_usage, default_banner
26 from IPython.core.interactiveshell import InteractiveShell, InteractiveShellABC
26 from IPython.core.interactiveshell import InteractiveShell, InteractiveShellABC
27 from IPython.lib.inputhook import enable_gui
27 from IPython.lib.inputhook import enable_gui
28 from IPython.lib.pylabtools import pylab_activate
28 from IPython.lib.pylabtools import pylab_activate
29 from IPython.testing.skipdoctest import skip_doctest
29 from IPython.testing.skipdoctest import skip_doctest
30 from IPython.utils import py3compat
30 from IPython.utils.terminal import toggle_set_term_title, set_term_title
31 from IPython.utils.terminal import toggle_set_term_title, set_term_title
31 from IPython.utils.process import abbrev_cwd
32 from IPython.utils.process import abbrev_cwd
32 from IPython.utils.warn import warn
33 from IPython.utils.warn import warn
33 from IPython.utils.text import num_ini_spaces
34 from IPython.utils.text import num_ini_spaces
34 from IPython.utils.traitlets import Int, CBool, Unicode
35 from IPython.utils.traitlets import Int, CBool, Unicode
35
36
36 #-----------------------------------------------------------------------------
37 #-----------------------------------------------------------------------------
37 # Utilities
38 # Utilities
38 #-----------------------------------------------------------------------------
39 #-----------------------------------------------------------------------------
39
40
40 def get_default_editor():
41 def get_default_editor():
41 try:
42 try:
42 ed = os.environ['EDITOR']
43 ed = os.environ['EDITOR']
43 except KeyError:
44 except KeyError:
44 if os.name == 'posix':
45 if os.name == 'posix':
45 ed = 'vi' # the only one guaranteed to be there!
46 ed = 'vi' # the only one guaranteed to be there!
46 else:
47 else:
47 ed = 'notepad' # same in Windows!
48 ed = 'notepad' # same in Windows!
48 return ed
49 return ed
49
50
50 #-----------------------------------------------------------------------------
51 #-----------------------------------------------------------------------------
51 # Main class
52 # Main class
52 #-----------------------------------------------------------------------------
53 #-----------------------------------------------------------------------------
53
54
54 class TerminalInteractiveShell(InteractiveShell):
55 class TerminalInteractiveShell(InteractiveShell):
55
56
56 autoedit_syntax = CBool(False, config=True,
57 autoedit_syntax = CBool(False, config=True,
57 help="auto editing of files with syntax errors.")
58 help="auto editing of files with syntax errors.")
58 banner = Unicode('')
59 banner = Unicode('')
59 banner1 = Unicode(default_banner, config=True,
60 banner1 = Unicode(default_banner, config=True,
60 help="""The part of the banner to be printed before the profile"""
61 help="""The part of the banner to be printed before the profile"""
61 )
62 )
62 banner2 = Unicode('', config=True,
63 banner2 = Unicode('', config=True,
63 help="""The part of the banner to be printed after the profile"""
64 help="""The part of the banner to be printed after the profile"""
64 )
65 )
65 confirm_exit = CBool(True, config=True,
66 confirm_exit = CBool(True, config=True,
66 help="""
67 help="""
67 Set to confirm when you try to exit IPython with an EOF (Control-D
68 Set to confirm when you try to exit IPython with an EOF (Control-D
68 in Unix, Control-Z/Enter in Windows). By typing 'exit' or 'quit',
69 in Unix, Control-Z/Enter in Windows). By typing 'exit' or 'quit',
69 you can force a direct exit without any confirmation.""",
70 you can force a direct exit without any confirmation.""",
70 )
71 )
71 # This display_banner only controls whether or not self.show_banner()
72 # This display_banner only controls whether or not self.show_banner()
72 # is called when mainloop/interact are called. The default is False
73 # is called when mainloop/interact are called. The default is False
73 # because for the terminal based application, the banner behavior
74 # because for the terminal based application, the banner behavior
74 # is controlled by Global.display_banner, which IPythonApp looks at
75 # is controlled by Global.display_banner, which IPythonApp looks at
75 # to determine if *it* should call show_banner() by hand or not.
76 # to determine if *it* should call show_banner() by hand or not.
76 display_banner = CBool(False) # This isn't configurable!
77 display_banner = CBool(False) # This isn't configurable!
77 embedded = CBool(False)
78 embedded = CBool(False)
78 embedded_active = CBool(False)
79 embedded_active = CBool(False)
79 editor = Unicode(get_default_editor(), config=True,
80 editor = Unicode(get_default_editor(), config=True,
80 help="Set the editor used by IPython (default to $EDITOR/vi/notepad)."
81 help="Set the editor used by IPython (default to $EDITOR/vi/notepad)."
81 )
82 )
82 pager = Unicode('less', config=True,
83 pager = Unicode('less', config=True,
83 help="The shell program to be used for paging.")
84 help="The shell program to be used for paging.")
84
85
85 screen_length = Int(0, config=True,
86 screen_length = Int(0, config=True,
86 help=
87 help=
87 """Number of lines of your screen, used to control printing of very
88 """Number of lines of your screen, used to control printing of very
88 long strings. Strings longer than this number of lines will be sent
89 long strings. Strings longer than this number of lines will be sent
89 through a pager instead of directly printed. The default value for
90 through a pager instead of directly printed. The default value for
90 this is 0, which means IPython will auto-detect your screen size every
91 this is 0, which means IPython will auto-detect your screen size every
91 time it needs to print certain potentially long strings (this doesn't
92 time it needs to print certain potentially long strings (this doesn't
92 change the behavior of the 'print' keyword, it's only triggered
93 change the behavior of the 'print' keyword, it's only triggered
93 internally). If for some reason this isn't working well (it needs
94 internally). If for some reason this isn't working well (it needs
94 curses support), specify it yourself. Otherwise don't change the
95 curses support), specify it yourself. Otherwise don't change the
95 default.""",
96 default.""",
96 )
97 )
97 term_title = CBool(False, config=True,
98 term_title = CBool(False, config=True,
98 help="Enable auto setting the terminal title."
99 help="Enable auto setting the terminal title."
99 )
100 )
100
101
101 def __init__(self, config=None, ipython_dir=None, profile_dir=None, user_ns=None,
102 def __init__(self, config=None, ipython_dir=None, profile_dir=None, user_ns=None,
102 user_global_ns=None, custom_exceptions=((),None),
103 user_global_ns=None, custom_exceptions=((),None),
103 usage=None, banner1=None, banner2=None,
104 usage=None, banner1=None, banner2=None,
104 display_banner=None):
105 display_banner=None):
105
106
106 super(TerminalInteractiveShell, self).__init__(
107 super(TerminalInteractiveShell, self).__init__(
107 config=config, profile_dir=profile_dir, user_ns=user_ns,
108 config=config, profile_dir=profile_dir, user_ns=user_ns,
108 user_global_ns=user_global_ns, custom_exceptions=custom_exceptions
109 user_global_ns=user_global_ns, custom_exceptions=custom_exceptions
109 )
110 )
110 # use os.system instead of utils.process.system by default, except on Windows
111 # use os.system instead of utils.process.system by default, except on Windows
111 if os.name == 'nt':
112 if os.name == 'nt':
112 self.system = self.system_piped
113 self.system = self.system_piped
113 else:
114 else:
114 self.system = self.system_raw
115 self.system = self.system_raw
115
116
116 self.init_term_title()
117 self.init_term_title()
117 self.init_usage(usage)
118 self.init_usage(usage)
118 self.init_banner(banner1, banner2, display_banner)
119 self.init_banner(banner1, banner2, display_banner)
119
120
120 #-------------------------------------------------------------------------
121 #-------------------------------------------------------------------------
121 # Things related to the terminal
122 # Things related to the terminal
122 #-------------------------------------------------------------------------
123 #-------------------------------------------------------------------------
123
124
124 @property
125 @property
125 def usable_screen_length(self):
126 def usable_screen_length(self):
126 if self.screen_length == 0:
127 if self.screen_length == 0:
127 return 0
128 return 0
128 else:
129 else:
129 num_lines_bot = self.separate_in.count('\n')+1
130 num_lines_bot = self.separate_in.count('\n')+1
130 return self.screen_length - num_lines_bot
131 return self.screen_length - num_lines_bot
131
132
132 def init_term_title(self):
133 def init_term_title(self):
133 # Enable or disable the terminal title.
134 # Enable or disable the terminal title.
134 if self.term_title:
135 if self.term_title:
135 toggle_set_term_title(True)
136 toggle_set_term_title(True)
136 set_term_title('IPython: ' + abbrev_cwd())
137 set_term_title('IPython: ' + abbrev_cwd())
137 else:
138 else:
138 toggle_set_term_title(False)
139 toggle_set_term_title(False)
139
140
140 #-------------------------------------------------------------------------
141 #-------------------------------------------------------------------------
141 # Things related to aliases
142 # Things related to aliases
142 #-------------------------------------------------------------------------
143 #-------------------------------------------------------------------------
143
144
144 def init_alias(self):
145 def init_alias(self):
145 # The parent class defines aliases that can be safely used with any
146 # The parent class defines aliases that can be safely used with any
146 # frontend.
147 # frontend.
147 super(TerminalInteractiveShell, self).init_alias()
148 super(TerminalInteractiveShell, self).init_alias()
148
149
149 # Now define aliases that only make sense on the terminal, because they
150 # Now define aliases that only make sense on the terminal, because they
150 # need direct access to the console in a way that we can't emulate in
151 # need direct access to the console in a way that we can't emulate in
151 # GUI or web frontend
152 # GUI or web frontend
152 if os.name == 'posix':
153 if os.name == 'posix':
153 aliases = [('clear', 'clear'), ('more', 'more'), ('less', 'less'),
154 aliases = [('clear', 'clear'), ('more', 'more'), ('less', 'less'),
154 ('man', 'man')]
155 ('man', 'man')]
155 elif os.name == 'nt':
156 elif os.name == 'nt':
156 aliases = [('cls', 'cls')]
157 aliases = [('cls', 'cls')]
157
158
158
159
159 for name, cmd in aliases:
160 for name, cmd in aliases:
160 self.alias_manager.define_alias(name, cmd)
161 self.alias_manager.define_alias(name, cmd)
161
162
162 #-------------------------------------------------------------------------
163 #-------------------------------------------------------------------------
163 # Things related to the banner and usage
164 # Things related to the banner and usage
164 #-------------------------------------------------------------------------
165 #-------------------------------------------------------------------------
165
166
166 def _banner1_changed(self):
167 def _banner1_changed(self):
167 self.compute_banner()
168 self.compute_banner()
168
169
169 def _banner2_changed(self):
170 def _banner2_changed(self):
170 self.compute_banner()
171 self.compute_banner()
171
172
172 def _term_title_changed(self, name, new_value):
173 def _term_title_changed(self, name, new_value):
173 self.init_term_title()
174 self.init_term_title()
174
175
175 def init_banner(self, banner1, banner2, display_banner):
176 def init_banner(self, banner1, banner2, display_banner):
176 if banner1 is not None:
177 if banner1 is not None:
177 self.banner1 = banner1
178 self.banner1 = banner1
178 if banner2 is not None:
179 if banner2 is not None:
179 self.banner2 = banner2
180 self.banner2 = banner2
180 if display_banner is not None:
181 if display_banner is not None:
181 self.display_banner = display_banner
182 self.display_banner = display_banner
182 self.compute_banner()
183 self.compute_banner()
183
184
184 def show_banner(self, banner=None):
185 def show_banner(self, banner=None):
185 if banner is None:
186 if banner is None:
186 banner = self.banner
187 banner = self.banner
187 self.write(banner)
188 self.write(banner)
188
189
189 def compute_banner(self):
190 def compute_banner(self):
190 self.banner = self.banner1
191 self.banner = self.banner1
191 if self.profile and self.profile != 'default':
192 if self.profile and self.profile != 'default':
192 self.banner += '\nIPython profile: %s\n' % self.profile
193 self.banner += '\nIPython profile: %s\n' % self.profile
193 if self.banner2:
194 if self.banner2:
194 self.banner += '\n' + self.banner2
195 self.banner += '\n' + self.banner2
195
196
196 def init_usage(self, usage=None):
197 def init_usage(self, usage=None):
197 if usage is None:
198 if usage is None:
198 self.usage = interactive_usage
199 self.usage = interactive_usage
199 else:
200 else:
200 self.usage = usage
201 self.usage = usage
201
202
202 #-------------------------------------------------------------------------
203 #-------------------------------------------------------------------------
203 # Mainloop and code execution logic
204 # Mainloop and code execution logic
204 #-------------------------------------------------------------------------
205 #-------------------------------------------------------------------------
205
206
206 def mainloop(self, display_banner=None):
207 def mainloop(self, display_banner=None):
207 """Start the mainloop.
208 """Start the mainloop.
208
209
209 If an optional banner argument is given, it will override the
210 If an optional banner argument is given, it will override the
210 internally created default banner.
211 internally created default banner.
211 """
212 """
212
213
213 with nested(self.builtin_trap, self.display_trap):
214 with nested(self.builtin_trap, self.display_trap):
214
215
215 while 1:
216 while 1:
216 try:
217 try:
217 self.interact(display_banner=display_banner)
218 self.interact(display_banner=display_banner)
218 #self.interact_with_readline()
219 #self.interact_with_readline()
219 # XXX for testing of a readline-decoupled repl loop, call
220 # XXX for testing of a readline-decoupled repl loop, call
220 # interact_with_readline above
221 # interact_with_readline above
221 break
222 break
222 except KeyboardInterrupt:
223 except KeyboardInterrupt:
223 # this should not be necessary, but KeyboardInterrupt
224 # this should not be necessary, but KeyboardInterrupt
224 # handling seems rather unpredictable...
225 # handling seems rather unpredictable...
225 self.write("\nKeyboardInterrupt in interact()\n")
226 self.write("\nKeyboardInterrupt in interact()\n")
226
227
227 def interact(self, display_banner=None):
228 def interact(self, display_banner=None):
228 """Closely emulate the interactive Python console."""
229 """Closely emulate the interactive Python console."""
229
230
230 # batch run -> do not interact
231 # batch run -> do not interact
231 if self.exit_now:
232 if self.exit_now:
232 return
233 return
233
234
234 if display_banner is None:
235 if display_banner is None:
235 display_banner = self.display_banner
236 display_banner = self.display_banner
236
237
237 if isinstance(display_banner, basestring):
238 if isinstance(display_banner, basestring):
238 self.show_banner(display_banner)
239 self.show_banner(display_banner)
239 elif display_banner:
240 elif display_banner:
240 self.show_banner()
241 self.show_banner()
241
242
242 more = False
243 more = False
243
244
244 # Mark activity in the builtins
245 # Mark activity in the builtins
245 __builtin__.__dict__['__IPYTHON__active'] += 1
246 __builtin__.__dict__['__IPYTHON__active'] += 1
246
247
247 if self.has_readline:
248 if self.has_readline:
248 self.readline_startup_hook(self.pre_readline)
249 self.readline_startup_hook(self.pre_readline)
249 # exit_now is set by a call to %Exit or %Quit, through the
250 # exit_now is set by a call to %Exit or %Quit, through the
250 # ask_exit callback.
251 # ask_exit callback.
251
252
252 while not self.exit_now:
253 while not self.exit_now:
253 self.hooks.pre_prompt_hook()
254 self.hooks.pre_prompt_hook()
254 if more:
255 if more:
255 try:
256 try:
256 prompt = self.hooks.generate_prompt(True)
257 prompt = self.hooks.generate_prompt(True)
257 except:
258 except:
258 self.showtraceback()
259 self.showtraceback()
259 if self.autoindent:
260 if self.autoindent:
260 self.rl_do_indent = True
261 self.rl_do_indent = True
261
262
262 else:
263 else:
263 try:
264 try:
264 prompt = self.hooks.generate_prompt(False)
265 prompt = self.hooks.generate_prompt(False)
265 except:
266 except:
266 self.showtraceback()
267 self.showtraceback()
267 try:
268 try:
268 line = self.raw_input(prompt)
269 line = self.raw_input(prompt)
269 if self.exit_now:
270 if self.exit_now:
270 # quick exit on sys.std[in|out] close
271 # quick exit on sys.std[in|out] close
271 break
272 break
272 if self.autoindent:
273 if self.autoindent:
273 self.rl_do_indent = False
274 self.rl_do_indent = False
274
275
275 except KeyboardInterrupt:
276 except KeyboardInterrupt:
276 #double-guard against keyboardinterrupts during kbdint handling
277 #double-guard against keyboardinterrupts during kbdint handling
277 try:
278 try:
278 self.write('\nKeyboardInterrupt\n')
279 self.write('\nKeyboardInterrupt\n')
279 self.input_splitter.reset()
280 self.input_splitter.reset()
280 more = False
281 more = False
281 except KeyboardInterrupt:
282 except KeyboardInterrupt:
282 pass
283 pass
283 except EOFError:
284 except EOFError:
284 if self.autoindent:
285 if self.autoindent:
285 self.rl_do_indent = False
286 self.rl_do_indent = False
286 if self.has_readline:
287 if self.has_readline:
287 self.readline_startup_hook(None)
288 self.readline_startup_hook(None)
288 self.write('\n')
289 self.write('\n')
289 self.exit()
290 self.exit()
290 except bdb.BdbQuit:
291 except bdb.BdbQuit:
291 warn('The Python debugger has exited with a BdbQuit exception.\n'
292 warn('The Python debugger has exited with a BdbQuit exception.\n'
292 'Because of how pdb handles the stack, it is impossible\n'
293 'Because of how pdb handles the stack, it is impossible\n'
293 'for IPython to properly format this particular exception.\n'
294 'for IPython to properly format this particular exception.\n'
294 'IPython will resume normal operation.')
295 'IPython will resume normal operation.')
295 except:
296 except:
296 # exceptions here are VERY RARE, but they can be triggered
297 # exceptions here are VERY RARE, but they can be triggered
297 # asynchronously by signal handlers, for example.
298 # asynchronously by signal handlers, for example.
298 self.showtraceback()
299 self.showtraceback()
299 else:
300 else:
300 self.input_splitter.push(line)
301 self.input_splitter.push(line)
301 more = self.input_splitter.push_accepts_more()
302 more = self.input_splitter.push_accepts_more()
302 if (self.SyntaxTB.last_syntax_error and
303 if (self.SyntaxTB.last_syntax_error and
303 self.autoedit_syntax):
304 self.autoedit_syntax):
304 self.edit_syntax_error()
305 self.edit_syntax_error()
305 if not more:
306 if not more:
306 source_raw = self.input_splitter.source_raw_reset()[1]
307 source_raw = self.input_splitter.source_raw_reset()[1]
307 self.run_cell(source_raw)
308 self.run_cell(source_raw)
308
309
309 # We are off again...
310 # We are off again...
310 __builtin__.__dict__['__IPYTHON__active'] -= 1
311 __builtin__.__dict__['__IPYTHON__active'] -= 1
311
312
312 # Turn off the exit flag, so the mainloop can be restarted if desired
313 # Turn off the exit flag, so the mainloop can be restarted if desired
313 self.exit_now = False
314 self.exit_now = False
314
315
315 def raw_input(self, prompt=''):
316 def raw_input(self, prompt=''):
316 """Write a prompt and read a line.
317 """Write a prompt and read a line.
317
318
318 The returned line does not include the trailing newline.
319 The returned line does not include the trailing newline.
319 When the user enters the EOF key sequence, EOFError is raised.
320 When the user enters the EOF key sequence, EOFError is raised.
320
321
321 Optional inputs:
322 Optional inputs:
322
323
323 - prompt(''): a string to be printed to prompt the user.
324 - prompt(''): a string to be printed to prompt the user.
324
325
325 - continue_prompt(False): whether this line is the first one or a
326 - continue_prompt(False): whether this line is the first one or a
326 continuation in a sequence of inputs.
327 continuation in a sequence of inputs.
327 """
328 """
328 # Code run by the user may have modified the readline completer state.
329 # Code run by the user may have modified the readline completer state.
329 # We must ensure that our completer is back in place.
330 # We must ensure that our completer is back in place.
330
331
331 if self.has_readline:
332 if self.has_readline:
332 self.set_readline_completer()
333 self.set_readline_completer()
333
334
334 try:
335 try:
335 line = py3compat.str_to_unicode(self.raw_input_original(prompt))
336 line = py3compat.str_to_unicode(self.raw_input_original(prompt))
336 except ValueError:
337 except ValueError:
337 warn("\n********\nYou or a %run:ed script called sys.stdin.close()"
338 warn("\n********\nYou or a %run:ed script called sys.stdin.close()"
338 " or sys.stdout.close()!\nExiting IPython!")
339 " or sys.stdout.close()!\nExiting IPython!")
339 self.ask_exit()
340 self.ask_exit()
340 return ""
341 return ""
341
342
342 # Try to be reasonably smart about not re-indenting pasted input more
343 # Try to be reasonably smart about not re-indenting pasted input more
343 # than necessary. We do this by trimming out the auto-indent initial
344 # than necessary. We do this by trimming out the auto-indent initial
344 # spaces, if the user's actual input started itself with whitespace.
345 # spaces, if the user's actual input started itself with whitespace.
345 if self.autoindent:
346 if self.autoindent:
346 if num_ini_spaces(line) > self.indent_current_nsp:
347 if num_ini_spaces(line) > self.indent_current_nsp:
347 line = line[self.indent_current_nsp:]
348 line = line[self.indent_current_nsp:]
348 self.indent_current_nsp = 0
349 self.indent_current_nsp = 0
349
350
350 return line
351 return line
351
352
352 #-------------------------------------------------------------------------
353 #-------------------------------------------------------------------------
353 # Methods to support auto-editing of SyntaxErrors.
354 # Methods to support auto-editing of SyntaxErrors.
354 #-------------------------------------------------------------------------
355 #-------------------------------------------------------------------------
355
356
356 def edit_syntax_error(self):
357 def edit_syntax_error(self):
357 """The bottom half of the syntax error handler called in the main loop.
358 """The bottom half of the syntax error handler called in the main loop.
358
359
359 Loop until syntax error is fixed or user cancels.
360 Loop until syntax error is fixed or user cancels.
360 """
361 """
361
362
362 while self.SyntaxTB.last_syntax_error:
363 while self.SyntaxTB.last_syntax_error:
363 # copy and clear last_syntax_error
364 # copy and clear last_syntax_error
364 err = self.SyntaxTB.clear_err_state()
365 err = self.SyntaxTB.clear_err_state()
365 if not self._should_recompile(err):
366 if not self._should_recompile(err):
366 return
367 return
367 try:
368 try:
368 # may set last_syntax_error again if a SyntaxError is raised
369 # may set last_syntax_error again if a SyntaxError is raised
369 self.safe_execfile(err.filename,self.user_ns)
370 self.safe_execfile(err.filename,self.user_ns)
370 except:
371 except:
371 self.showtraceback()
372 self.showtraceback()
372 else:
373 else:
373 try:
374 try:
374 f = file(err.filename)
375 f = file(err.filename)
375 try:
376 try:
376 # This should be inside a display_trap block and I
377 # This should be inside a display_trap block and I
377 # think it is.
378 # think it is.
378 sys.displayhook(f.read())
379 sys.displayhook(f.read())
379 finally:
380 finally:
380 f.close()
381 f.close()
381 except:
382 except:
382 self.showtraceback()
383 self.showtraceback()
383
384
384 def _should_recompile(self,e):
385 def _should_recompile(self,e):
385 """Utility routine for edit_syntax_error"""
386 """Utility routine for edit_syntax_error"""
386
387
387 if e.filename in ('<ipython console>','<input>','<string>',
388 if e.filename in ('<ipython console>','<input>','<string>',
388 '<console>','<BackgroundJob compilation>',
389 '<console>','<BackgroundJob compilation>',
389 None):
390 None):
390
391
391 return False
392 return False
392 try:
393 try:
393 if (self.autoedit_syntax and
394 if (self.autoedit_syntax and
394 not self.ask_yes_no('Return to editor to correct syntax error? '
395 not self.ask_yes_no('Return to editor to correct syntax error? '
395 '[Y/n] ','y')):
396 '[Y/n] ','y')):
396 return False
397 return False
397 except EOFError:
398 except EOFError:
398 return False
399 return False
399
400
400 def int0(x):
401 def int0(x):
401 try:
402 try:
402 return int(x)
403 return int(x)
403 except TypeError:
404 except TypeError:
404 return 0
405 return 0
405 # always pass integer line and offset values to editor hook
406 # always pass integer line and offset values to editor hook
406 try:
407 try:
407 self.hooks.fix_error_editor(e.filename,
408 self.hooks.fix_error_editor(e.filename,
408 int0(e.lineno),int0(e.offset),e.msg)
409 int0(e.lineno),int0(e.offset),e.msg)
409 except TryNext:
410 except TryNext:
410 warn('Could not open editor')
411 warn('Could not open editor')
411 return False
412 return False
412 return True
413 return True
413
414
414 #-------------------------------------------------------------------------
415 #-------------------------------------------------------------------------
415 # Things related to GUI support and pylab
416 # Things related to GUI support and pylab
416 #-------------------------------------------------------------------------
417 #-------------------------------------------------------------------------
417
418
418 def enable_pylab(self, gui=None, import_all=True):
419 def enable_pylab(self, gui=None, import_all=True):
419 """Activate pylab support at runtime.
420 """Activate pylab support at runtime.
420
421
421 This turns on support for matplotlib, preloads into the interactive
422 This turns on support for matplotlib, preloads into the interactive
422 namespace all of numpy and pylab, and configures IPython to correcdtly
423 namespace all of numpy and pylab, and configures IPython to correcdtly
423 interact with the GUI event loop. The GUI backend to be used can be
424 interact with the GUI event loop. The GUI backend to be used can be
424 optionally selected with the optional :param:`gui` argument.
425 optionally selected with the optional :param:`gui` argument.
425
426
426 Parameters
427 Parameters
427 ----------
428 ----------
428 gui : optional, string
429 gui : optional, string
429
430
430 If given, dictates the choice of matplotlib GUI backend to use
431 If given, dictates the choice of matplotlib GUI backend to use
431 (should be one of IPython's supported backends, 'tk', 'qt', 'wx' or
432 (should be one of IPython's supported backends, 'tk', 'qt', 'wx' or
432 'gtk'), otherwise we use the default chosen by matplotlib (as
433 'gtk'), otherwise we use the default chosen by matplotlib (as
433 dictated by the matplotlib build-time options plus the user's
434 dictated by the matplotlib build-time options plus the user's
434 matplotlibrc configuration file).
435 matplotlibrc configuration file).
435 """
436 """
436 # We want to prevent the loading of pylab to pollute the user's
437 # We want to prevent the loading of pylab to pollute the user's
437 # namespace as shown by the %who* magics, so we execute the activation
438 # namespace as shown by the %who* magics, so we execute the activation
438 # code in an empty namespace, and we update *both* user_ns and
439 # code in an empty namespace, and we update *both* user_ns and
439 # user_ns_hidden with this information.
440 # user_ns_hidden with this information.
440 ns = {}
441 ns = {}
441 gui = pylab_activate(ns, gui, import_all)
442 gui = pylab_activate(ns, gui, import_all)
442 self.user_ns.update(ns)
443 self.user_ns.update(ns)
443 self.user_ns_hidden.update(ns)
444 self.user_ns_hidden.update(ns)
444 # Now we must activate the gui pylab wants to use, and fix %run to take
445 # Now we must activate the gui pylab wants to use, and fix %run to take
445 # plot updates into account
446 # plot updates into account
446 enable_gui(gui)
447 enable_gui(gui)
447 self.magic_run = self._pylab_magic_run
448 self.magic_run = self._pylab_magic_run
448
449
449 #-------------------------------------------------------------------------
450 #-------------------------------------------------------------------------
450 # Things related to exiting
451 # Things related to exiting
451 #-------------------------------------------------------------------------
452 #-------------------------------------------------------------------------
452
453
453 def ask_exit(self):
454 def ask_exit(self):
454 """ Ask the shell to exit. Can be overiden and used as a callback. """
455 """ Ask the shell to exit. Can be overiden and used as a callback. """
455 self.exit_now = True
456 self.exit_now = True
456
457
457 def exit(self):
458 def exit(self):
458 """Handle interactive exit.
459 """Handle interactive exit.
459
460
460 This method calls the ask_exit callback."""
461 This method calls the ask_exit callback."""
461 if self.confirm_exit:
462 if self.confirm_exit:
462 if self.ask_yes_no('Do you really want to exit ([y]/n)?','y'):
463 if self.ask_yes_no('Do you really want to exit ([y]/n)?','y'):
463 self.ask_exit()
464 self.ask_exit()
464 else:
465 else:
465 self.ask_exit()
466 self.ask_exit()
466
467
467 #------------------------------------------------------------------------
468 #------------------------------------------------------------------------
468 # Magic overrides
469 # Magic overrides
469 #------------------------------------------------------------------------
470 #------------------------------------------------------------------------
470 # Once the base class stops inheriting from magic, this code needs to be
471 # Once the base class stops inheriting from magic, this code needs to be
471 # moved into a separate machinery as well. For now, at least isolate here
472 # moved into a separate machinery as well. For now, at least isolate here
472 # the magics which this class needs to implement differently from the base
473 # the magics which this class needs to implement differently from the base
473 # class, or that are unique to it.
474 # class, or that are unique to it.
474
475
475 def magic_autoindent(self, parameter_s = ''):
476 def magic_autoindent(self, parameter_s = ''):
476 """Toggle autoindent on/off (if available)."""
477 """Toggle autoindent on/off (if available)."""
477
478
478 self.shell.set_autoindent()
479 self.shell.set_autoindent()
479 print "Automatic indentation is:",['OFF','ON'][self.shell.autoindent]
480 print "Automatic indentation is:",['OFF','ON'][self.shell.autoindent]
480
481
481 @skip_doctest
482 @skip_doctest
482 def magic_cpaste(self, parameter_s=''):
483 def magic_cpaste(self, parameter_s=''):
483 """Paste & execute a pre-formatted code block from clipboard.
484 """Paste & execute a pre-formatted code block from clipboard.
484
485
485 You must terminate the block with '--' (two minus-signs) alone on the
486 You must terminate the block with '--' (two minus-signs) alone on the
486 line. You can also provide your own sentinel with '%paste -s %%' ('%%'
487 line. You can also provide your own sentinel with '%paste -s %%' ('%%'
487 is the new sentinel for this operation)
488 is the new sentinel for this operation)
488
489
489 The block is dedented prior to execution to enable execution of method
490 The block is dedented prior to execution to enable execution of method
490 definitions. '>' and '+' characters at the beginning of a line are
491 definitions. '>' and '+' characters at the beginning of a line are
491 ignored, to allow pasting directly from e-mails, diff files and
492 ignored, to allow pasting directly from e-mails, diff files and
492 doctests (the '...' continuation prompt is also stripped). The
493 doctests (the '...' continuation prompt is also stripped). The
493 executed block is also assigned to variable named 'pasted_block' for
494 executed block is also assigned to variable named 'pasted_block' for
494 later editing with '%edit pasted_block'.
495 later editing with '%edit pasted_block'.
495
496
496 You can also pass a variable name as an argument, e.g. '%cpaste foo'.
497 You can also pass a variable name as an argument, e.g. '%cpaste foo'.
497 This assigns the pasted block to variable 'foo' as string, without
498 This assigns the pasted block to variable 'foo' as string, without
498 dedenting or executing it (preceding >>> and + is still stripped)
499 dedenting or executing it (preceding >>> and + is still stripped)
499
500
500 '%cpaste -r' re-executes the block previously entered by cpaste.
501 '%cpaste -r' re-executes the block previously entered by cpaste.
501
502
502 Do not be alarmed by garbled output on Windows (it's a readline bug).
503 Do not be alarmed by garbled output on Windows (it's a readline bug).
503 Just press enter and type -- (and press enter again) and the block
504 Just press enter and type -- (and press enter again) and the block
504 will be what was just pasted.
505 will be what was just pasted.
505
506
506 IPython statements (magics, shell escapes) are not supported (yet).
507 IPython statements (magics, shell escapes) are not supported (yet).
507
508
508 See also
509 See also
509 --------
510 --------
510 paste: automatically pull code from clipboard.
511 paste: automatically pull code from clipboard.
511
512
512 Examples
513 Examples
513 --------
514 --------
514 ::
515 ::
515
516
516 In [8]: %cpaste
517 In [8]: %cpaste
517 Pasting code; enter '--' alone on the line to stop.
518 Pasting code; enter '--' alone on the line to stop.
518 :>>> a = ["world!", "Hello"]
519 :>>> a = ["world!", "Hello"]
519 :>>> print " ".join(sorted(a))
520 :>>> print " ".join(sorted(a))
520 :--
521 :--
521 Hello world!
522 Hello world!
522 """
523 """
523
524
524 opts,args = self.parse_options(parameter_s,'rs:',mode='string')
525 opts,args = self.parse_options(parameter_s,'rs:',mode='string')
525 par = args.strip()
526 par = args.strip()
526 if opts.has_key('r'):
527 if opts.has_key('r'):
527 self._rerun_pasted()
528 self._rerun_pasted()
528 return
529 return
529
530
530 sentinel = opts.get('s','--')
531 sentinel = opts.get('s','--')
531
532
532 block = self._strip_pasted_lines_for_code(
533 block = self._strip_pasted_lines_for_code(
533 self._get_pasted_lines(sentinel))
534 self._get_pasted_lines(sentinel))
534
535
535 self._execute_block(block, par)
536 self._execute_block(block, par)
536
537
537 def magic_paste(self, parameter_s=''):
538 def magic_paste(self, parameter_s=''):
538 """Paste & execute a pre-formatted code block from clipboard.
539 """Paste & execute a pre-formatted code block from clipboard.
539
540
540 The text is pulled directly from the clipboard without user
541 The text is pulled directly from the clipboard without user
541 intervention and printed back on the screen before execution (unless
542 intervention and printed back on the screen before execution (unless
542 the -q flag is given to force quiet mode).
543 the -q flag is given to force quiet mode).
543
544
544 The block is dedented prior to execution to enable execution of method
545 The block is dedented prior to execution to enable execution of method
545 definitions. '>' and '+' characters at the beginning of a line are
546 definitions. '>' and '+' characters at the beginning of a line are
546 ignored, to allow pasting directly from e-mails, diff files and
547 ignored, to allow pasting directly from e-mails, diff files and
547 doctests (the '...' continuation prompt is also stripped). The
548 doctests (the '...' continuation prompt is also stripped). The
548 executed block is also assigned to variable named 'pasted_block' for
549 executed block is also assigned to variable named 'pasted_block' for
549 later editing with '%edit pasted_block'.
550 later editing with '%edit pasted_block'.
550
551
551 You can also pass a variable name as an argument, e.g. '%paste foo'.
552 You can also pass a variable name as an argument, e.g. '%paste foo'.
552 This assigns the pasted block to variable 'foo' as string, without
553 This assigns the pasted block to variable 'foo' as string, without
553 dedenting or executing it (preceding >>> and + is still stripped)
554 dedenting or executing it (preceding >>> and + is still stripped)
554
555
555 Options
556 Options
556 -------
557 -------
557
558
558 -r: re-executes the block previously entered by cpaste.
559 -r: re-executes the block previously entered by cpaste.
559
560
560 -q: quiet mode: do not echo the pasted text back to the terminal.
561 -q: quiet mode: do not echo the pasted text back to the terminal.
561
562
562 IPython statements (magics, shell escapes) are not supported (yet).
563 IPython statements (magics, shell escapes) are not supported (yet).
563
564
564 See also
565 See also
565 --------
566 --------
566 cpaste: manually paste code into terminal until you mark its end.
567 cpaste: manually paste code into terminal until you mark its end.
567 """
568 """
568 opts,args = self.parse_options(parameter_s,'rq',mode='string')
569 opts,args = self.parse_options(parameter_s,'rq',mode='string')
569 par = args.strip()
570 par = args.strip()
570 if opts.has_key('r'):
571 if opts.has_key('r'):
571 self._rerun_pasted()
572 self._rerun_pasted()
572 return
573 return
573
574
574 text = self.shell.hooks.clipboard_get()
575 text = self.shell.hooks.clipboard_get()
575 block = self._strip_pasted_lines_for_code(text.splitlines())
576 block = self._strip_pasted_lines_for_code(text.splitlines())
576
577
577 # By default, echo back to terminal unless quiet mode is requested
578 # By default, echo back to terminal unless quiet mode is requested
578 if not opts.has_key('q'):
579 if not opts.has_key('q'):
579 write = self.shell.write
580 write = self.shell.write
580 write(self.shell.pycolorize(block))
581 write(self.shell.pycolorize(block))
581 if not block.endswith('\n'):
582 if not block.endswith('\n'):
582 write('\n')
583 write('\n')
583 write("## -- End pasted text --\n")
584 write("## -- End pasted text --\n")
584
585
585 self._execute_block(block, par)
586 self._execute_block(block, par)
586
587
587 def showindentationerror(self):
588 def showindentationerror(self):
588 super(TerminalInteractiveShell, self).showindentationerror()
589 super(TerminalInteractiveShell, self).showindentationerror()
589 print("If you want to paste code into IPython, try the %paste magic function.")
590 print("If you want to paste code into IPython, try the %paste magic function.")
590
591
591
592
592 InteractiveShellABC.register(TerminalInteractiveShell)
593 InteractiveShellABC.register(TerminalInteractiveShell)
@@ -1,233 +1,233 b''
1 """Global IPython app to support test running.
1 """Global IPython app to support test running.
2
2
3 We must start our own ipython object and heavily muck with it so that all the
3 We must start our own ipython object and heavily muck with it so that all the
4 modifications IPython makes to system behavior don't send the doctest machinery
4 modifications IPython makes to system behavior don't send the doctest machinery
5 into a fit. This code should be considered a gross hack, but it gets the job
5 into a fit. This code should be considered a gross hack, but it gets the job
6 done.
6 done.
7 """
7 """
8 from __future__ import absolute_import
8 from __future__ import absolute_import
9 from __future__ import print_function
9 from __future__ import print_function
10
10
11 #-----------------------------------------------------------------------------
11 #-----------------------------------------------------------------------------
12 # Copyright (C) 2009-2010 The IPython Development Team
12 # Copyright (C) 2009-2010 The IPython Development Team
13 #
13 #
14 # Distributed under the terms of the BSD License. The full license is in
14 # Distributed under the terms of the BSD License. The full license is in
15 # the file COPYING, distributed as part of this software.
15 # the file COPYING, distributed as part of this software.
16 #-----------------------------------------------------------------------------
16 #-----------------------------------------------------------------------------
17
17
18 #-----------------------------------------------------------------------------
18 #-----------------------------------------------------------------------------
19 # Imports
19 # Imports
20 #-----------------------------------------------------------------------------
20 #-----------------------------------------------------------------------------
21
21
22 # stdlib
22 # stdlib
23 import __builtin__ as builtin_mod
23 import __builtin__ as builtin_mod
24 import os
24 import os
25 import sys
25 import sys
26 from types import MethodType
26 from types import MethodType
27
27
28 # our own
28 # our own
29 from . import tools
29 from . import tools
30
30
31 from IPython.utils import io
31 from IPython.utils import io
32 from IPython.frontend.terminal.interactiveshell import TerminalInteractiveShell
32 from IPython.frontend.terminal.interactiveshell import TerminalInteractiveShell
33
33
34 #-----------------------------------------------------------------------------
34 #-----------------------------------------------------------------------------
35 # Functions
35 # Functions
36 #-----------------------------------------------------------------------------
36 #-----------------------------------------------------------------------------
37
37
38 class StreamProxy(io.IOStream):
38 class StreamProxy(io.IOStream):
39 """Proxy for sys.stdout/err. This will request the stream *at call time*
39 """Proxy for sys.stdout/err. This will request the stream *at call time*
40 allowing for nose's Capture plugin's redirection of sys.stdout/err.
40 allowing for nose's Capture plugin's redirection of sys.stdout/err.
41
41
42 Parameters
42 Parameters
43 ----------
43 ----------
44 name : str
44 name : str
45 The name of the stream. This will be requested anew at every call
45 The name of the stream. This will be requested anew at every call
46 """
46 """
47
47
48 def __init__(self, name):
48 def __init__(self, name):
49 self.name=name
49 self.name=name
50
50
51 @property
51 @property
52 def stream(self):
52 def stream(self):
53 return getattr(sys, self.name)
53 return getattr(sys, self.name)
54
54
55 def flush(self):
55 def flush(self):
56 self.stream.flush()
56 self.stream.flush()
57
57
58 # Hack to modify the %run command so we can sync the user's namespace with the
58 # Hack to modify the %run command so we can sync the user's namespace with the
59 # test globals. Once we move over to a clean magic system, this will be done
59 # test globals. Once we move over to a clean magic system, this will be done
60 # with much less ugliness.
60 # with much less ugliness.
61
61
62 class py_file_finder(object):
62 class py_file_finder(object):
63 def __init__(self,test_filename):
63 def __init__(self,test_filename):
64 self.test_filename = test_filename
64 self.test_filename = test_filename
65
65
66 def __call__(self,name,win32=False):
66 def __call__(self,name,win32=False):
67 from IPython.utils.path import get_py_filename
67 from IPython.utils.path import get_py_filename
68 try:
68 try:
69 return get_py_filename(name,win32=win32)
69 return get_py_filename(name,win32=win32)
70 except IOError:
70 except IOError:
71 test_dir = os.path.dirname(self.test_filename)
71 test_dir = os.path.dirname(self.test_filename)
72 new_path = os.path.join(test_dir,name)
72 new_path = os.path.join(test_dir,name)
73 return get_py_filename(new_path,win32=win32)
73 return get_py_filename(new_path,win32=win32)
74
74
75
75
76 def _run_ns_sync(self,arg_s,runner=None):
76 def _run_ns_sync(self,arg_s,runner=None):
77 """Modified version of %run that syncs testing namespaces.
77 """Modified version of %run that syncs testing namespaces.
78
78
79 This is strictly needed for running doctests that call %run.
79 This is strictly needed for running doctests that call %run.
80 """
80 """
81 #print('in run_ns_sync', arg_s, file=sys.stderr) # dbg
81 #print('in run_ns_sync', arg_s, file=sys.stderr) # dbg
82 finder = py_file_finder(arg_s)
82 finder = py_file_finder(arg_s)
83 return get_ipython().magic_run_ori(arg_s, runner, finder)
83 return get_ipython().magic_run_ori(arg_s, runner, finder)
84
84
85
85
86 class ipnsdict(dict):
86 class ipnsdict(dict):
87 """A special subclass of dict for use as an IPython namespace in doctests.
87 """A special subclass of dict for use as an IPython namespace in doctests.
88
88
89 This subclass adds a simple checkpointing capability so that when testing
89 This subclass adds a simple checkpointing capability so that when testing
90 machinery clears it (we use it as the test execution context), it doesn't
90 machinery clears it (we use it as the test execution context), it doesn't
91 get completely destroyed.
91 get completely destroyed.
92
92
93 In addition, it can handle the presence of the '_' key in a special manner,
93 In addition, it can handle the presence of the '_' key in a special manner,
94 which is needed because of how Python's doctest machinery operates with
94 which is needed because of how Python's doctest machinery operates with
95 '_'. See constructor and :meth:`update` for details.
95 '_'. See constructor and :meth:`update` for details.
96 """
96 """
97
97
98 def __init__(self,*a):
98 def __init__(self,*a):
99 dict.__init__(self,*a)
99 dict.__init__(self,*a)
100 self._savedict = {}
100 self._savedict = {}
101 # If this flag is True, the .update() method will unconditionally
101 # If this flag is True, the .update() method will unconditionally
102 # remove a key named '_'. This is so that such a dict can be used as a
102 # remove a key named '_'. This is so that such a dict can be used as a
103 # namespace in doctests that call '_'.
103 # namespace in doctests that call '_'.
104 self.protect_underscore = False
104 self.protect_underscore = False
105
105
106 def clear(self):
106 def clear(self):
107 dict.clear(self)
107 dict.clear(self)
108 self.update(self._savedict)
108 self.update(self._savedict)
109
109
110 def _checkpoint(self):
110 def _checkpoint(self):
111 self._savedict.clear()
111 self._savedict.clear()
112 self._savedict.update(self)
112 self._savedict.update(self)
113
113
114 def update(self,other):
114 def update(self,other):
115 self._checkpoint()
115 self._checkpoint()
116 dict.update(self,other)
116 dict.update(self,other)
117
117
118 if self.protect_underscore:
118 if self.protect_underscore:
119 # If '_' is in the namespace, python won't set it when executing
119 # If '_' is in the namespace, python won't set it when executing
120 # code *in doctests*, and we have multiple doctests that use '_'.
120 # code *in doctests*, and we have multiple doctests that use '_'.
121 # So we ensure that the namespace is always 'clean' of it before
121 # So we ensure that the namespace is always 'clean' of it before
122 # it's used for test code execution.
122 # it's used for test code execution.
123 # This flag is only turned on by the doctest machinery, so that
123 # This flag is only turned on by the doctest machinery, so that
124 # normal test code can assume the _ key is updated like any other
124 # normal test code can assume the _ key is updated like any other
125 # key and can test for its presence after cell executions.
125 # key and can test for its presence after cell executions.
126 self.pop('_', None)
126 self.pop('_', None)
127
127
128 # The builtins namespace must *always* be the real __builtin__ module,
128 # The builtins namespace must *always* be the real __builtin__ module,
129 # else weird stuff happens. The main ipython code does have provisions
129 # else weird stuff happens. The main ipython code does have provisions
130 # to ensure this after %run, but since in this class we do some
130 # to ensure this after %run, but since in this class we do some
131 # aggressive low-level cleaning of the execution namespace, we need to
131 # aggressive low-level cleaning of the execution namespace, we need to
132 # correct for that ourselves, to ensure consitency with the 'real'
132 # correct for that ourselves, to ensure consitency with the 'real'
133 # ipython.
133 # ipython.
134 self['__builtins__'] = builtin_mod
134 self['__builtins__'] = builtin_mod
135
135
136 def __delitem__(self, key):
136 def __delitem__(self, key):
137 """Part of the test suite checks that we can release all
137 """Part of the test suite checks that we can release all
138 references to an object. So we need to make sure that we're not
138 references to an object. So we need to make sure that we're not
139 keeping a reference in _savedict."""
139 keeping a reference in _savedict."""
140 dict.__delitem__(self, key)
140 dict.__delitem__(self, key)
141 try:
141 try:
142 del self._savedict[key]
142 del self._savedict[key]
143 except KeyError:
143 except KeyError:
144 pass
144 pass
145
145
146
146
147 def get_ipython():
147 def get_ipython():
148 # This will get replaced by the real thing once we start IPython below
148 # This will get replaced by the real thing once we start IPython below
149 return start_ipython()
149 return start_ipython()
150
150
151
151
152 # A couple of methods to override those in the running IPython to interact
152 # A couple of methods to override those in the running IPython to interact
153 # better with doctest (doctest captures on raw stdout, so we need to direct
153 # better with doctest (doctest captures on raw stdout, so we need to direct
154 # various types of output there otherwise it will miss them).
154 # various types of output there otherwise it will miss them).
155
155
156 def xsys(self, cmd):
156 def xsys(self, cmd):
157 """Replace the default system call with a capturing one for doctest.
157 """Replace the default system call with a capturing one for doctest.
158 """
158 """
159 # We use getoutput, but we need to strip it because pexpect captures
159 # We use getoutput, but we need to strip it because pexpect captures
160 # the trailing newline differently from commands.getoutput
160 # the trailing newline differently from commands.getoutput
161 print(self.getoutput(cmd, split=False).rstrip(), end='', file=sys.stdout)
161 print(self.getoutput(cmd, split=False).rstrip(), end='', file=sys.stdout)
162 sys.stdout.flush()
162 sys.stdout.flush()
163
163
164
164
165 def _showtraceback(self, etype, evalue, stb):
165 def _showtraceback(self, etype, evalue, stb):
166 """Print the traceback purely on stdout for doctest to capture it.
166 """Print the traceback purely on stdout for doctest to capture it.
167 """
167 """
168 print(self.InteractiveTB.stb2text(stb), file=sys.stdout)
168 print(self.InteractiveTB.stb2text(stb), file=sys.stdout)
169
169
170
170
171 def start_ipython():
171 def start_ipython():
172 """Start a global IPython shell, which we need for IPython-specific syntax.
172 """Start a global IPython shell, which we need for IPython-specific syntax.
173 """
173 """
174 global get_ipython
174 global get_ipython
175
175
176 # This function should only ever run once!
176 # This function should only ever run once!
177 if hasattr(start_ipython, 'already_called'):
177 if hasattr(start_ipython, 'already_called'):
178 return
178 return
179 start_ipython.already_called = True
179 start_ipython.already_called = True
180
180
181 # Store certain global objects that IPython modifies
181 # Store certain global objects that IPython modifies
182 _displayhook = sys.displayhook
182 _displayhook = sys.displayhook
183 _excepthook = sys.excepthook
183 _excepthook = sys.excepthook
184 _main = sys.modules.get('__main__')
184 _main = sys.modules.get('__main__')
185
185
186 # Create custom argv and namespaces for our IPython to be test-friendly
186 # Create custom argv and namespaces for our IPython to be test-friendly
187 config = tools.default_config()
187 config = tools.default_config()
188
188
189 # Create and initialize our test-friendly IPython instance.
189 # Create and initialize our test-friendly IPython instance.
190 shell = TerminalInteractiveShell.instance(config=config,
190 shell = TerminalInteractiveShell.instance(config=config,
191 user_ns=ipnsdict(),
191 user_ns=ipnsdict(),
192 user_global_ns={}
192 user_global_ns={}
193 )
193 )
194
194
195 # A few more tweaks needed for playing nicely with doctests...
195 # A few more tweaks needed for playing nicely with doctests...
196
196
197 # remove history file
197 # remove history file
198 shell.tempfiles.append(config.HistoryManager.hist_file)
198 shell.tempfiles.append(config.HistoryManager.hist_file)
199
199
200 # These traps are normally only active for interactive use, set them
200 # These traps are normally only active for interactive use, set them
201 # permanently since we'll be mocking interactive sessions.
201 # permanently since we'll be mocking interactive sessions.
202 shell.builtin_trap.activate()
202 shell.builtin_trap.activate()
203
203
204 # Modify the IPython system call with one that uses getoutput, so that we
204 # Modify the IPython system call with one that uses getoutput, so that we
205 # can capture subcommands and print them to Python's stdout, otherwise the
205 # can capture subcommands and print them to Python's stdout, otherwise the
206 # doctest machinery would miss them.
206 # doctest machinery would miss them.
207 shell.system = MethodType(xsys, shell, TerminalInteractiveShell)
207 shell.system = MethodType(xsys, shell, TerminalInteractiveShell)
208
208
209
209
210 shell._showtraceback = MethodType(_showtraceback, shell,
210 shell._showtraceback = MethodType(_showtraceback, shell,
211 TerminalInteractiveShell)
211 TerminalInteractiveShell)
212
212
213 # IPython is ready, now clean up some global state...
213 # IPython is ready, now clean up some global state...
214
214
215 # Deactivate the various python system hooks added by ipython for
215 # Deactivate the various python system hooks added by ipython for
216 # interactive convenience so we don't confuse the doctest system
216 # interactive convenience so we don't confuse the doctest system
217 sys.modules['__main__'] = _main
217 sys.modules['__main__'] = _main
218 sys.displayhook = _displayhook
218 sys.displayhook = _displayhook
219 sys.excepthook = _excepthook
219 sys.excepthook = _excepthook
220
220
221 # So that ipython magics and aliases can be doctested (they work by making
221 # So that ipython magics and aliases can be doctested (they work by making
222 # a call into a global _ip object). Also make the top-level get_ipython
222 # a call into a global _ip object). Also make the top-level get_ipython
223 # now return this without recursively calling here again.
223 # now return this without recursively calling here again.
224 _ip = shell
224 _ip = shell
225 get_ipython = _ip.get_ipython
225 get_ipython = _ip.get_ipython
226 __builtin__._ip = _ip
226 builtin_mod._ip = _ip
227 __builtin__.get_ipython = get_ipython
227 builtin_mod.get_ipython = get_ipython
228
228
229 # To avoid extra IPython messages during testing, suppress io.stdout/stderr
229 # To avoid extra IPython messages during testing, suppress io.stdout/stderr
230 io.stdout = StreamProxy('stdout')
230 io.stdout = StreamProxy('stdout')
231 io.stderr = StreamProxy('stderr')
231 io.stderr = StreamProxy('stderr')
232
232
233 return _ip
233 return _ip
@@ -1,703 +1,704 b''
1 """Session object for building, serializing, sending, and receiving messages in
1 """Session object for building, serializing, sending, and receiving messages in
2 IPython. The Session object supports serialization, HMAC signatures, and
2 IPython. The Session object supports serialization, HMAC signatures, and
3 metadata on messages.
3 metadata on messages.
4
4
5 Also defined here are utilities for working with Sessions:
5 Also defined here are utilities for working with Sessions:
6 * A SessionFactory to be used as a base class for configurables that work with
6 * A SessionFactory to be used as a base class for configurables that work with
7 Sessions.
7 Sessions.
8 * A Message object for convenience that allows attribute-access to the msg dict.
8 * A Message object for convenience that allows attribute-access to the msg dict.
9
9
10 Authors:
10 Authors:
11
11
12 * Min RK
12 * Min RK
13 * Brian Granger
13 * Brian Granger
14 * Fernando Perez
14 * Fernando Perez
15 """
15 """
16 #-----------------------------------------------------------------------------
16 #-----------------------------------------------------------------------------
17 # Copyright (C) 2010-2011 The IPython Development Team
17 # Copyright (C) 2010-2011 The IPython Development Team
18 #
18 #
19 # Distributed under the terms of the BSD License. The full license is in
19 # Distributed under the terms of the BSD License. The full license is in
20 # the file COPYING, distributed as part of this software.
20 # the file COPYING, distributed as part of this software.
21 #-----------------------------------------------------------------------------
21 #-----------------------------------------------------------------------------
22
22
23 #-----------------------------------------------------------------------------
23 #-----------------------------------------------------------------------------
24 # Imports
24 # Imports
25 #-----------------------------------------------------------------------------
25 #-----------------------------------------------------------------------------
26
26
27 import hmac
27 import hmac
28 import logging
28 import logging
29 import os
29 import os
30 import pprint
30 import pprint
31 import uuid
31 import uuid
32 from datetime import datetime
32 from datetime import datetime
33
33
34 try:
34 try:
35 import cPickle
35 import cPickle
36 pickle = cPickle
36 pickle = cPickle
37 except:
37 except:
38 cPickle = None
38 cPickle = None
39 import pickle
39 import pickle
40
40
41 import zmq
41 import zmq
42 from zmq.utils import jsonapi
42 from zmq.utils import jsonapi
43 from zmq.eventloop.ioloop import IOLoop
43 from zmq.eventloop.ioloop import IOLoop
44 from zmq.eventloop.zmqstream import ZMQStream
44 from zmq.eventloop.zmqstream import ZMQStream
45
45
46 from IPython.config.configurable import Configurable, LoggingConfigurable
46 from IPython.config.configurable import Configurable, LoggingConfigurable
47 from IPython.utils.importstring import import_item
47 from IPython.utils.importstring import import_item
48 from IPython.utils.jsonutil import extract_dates, squash_dates, date_default
48 from IPython.utils.jsonutil import extract_dates, squash_dates, date_default
49 from IPython.utils.py3compat import str_to_bytes
49 from IPython.utils.traitlets import (CBytes, Unicode, Bool, Any, Instance, Set,
50 from IPython.utils.traitlets import (CBytes, Unicode, Bool, Any, Instance, Set,
50 DottedObjectName)
51 DottedObjectName)
51
52
52 #-----------------------------------------------------------------------------
53 #-----------------------------------------------------------------------------
53 # utility functions
54 # utility functions
54 #-----------------------------------------------------------------------------
55 #-----------------------------------------------------------------------------
55
56
56 def squash_unicode(obj):
57 def squash_unicode(obj):
57 """coerce unicode back to bytestrings."""
58 """coerce unicode back to bytestrings."""
58 if isinstance(obj,dict):
59 if isinstance(obj,dict):
59 for key in obj.keys():
60 for key in obj.keys():
60 obj[key] = squash_unicode(obj[key])
61 obj[key] = squash_unicode(obj[key])
61 if isinstance(key, unicode):
62 if isinstance(key, unicode):
62 obj[squash_unicode(key)] = obj.pop(key)
63 obj[squash_unicode(key)] = obj.pop(key)
63 elif isinstance(obj, list):
64 elif isinstance(obj, list):
64 for i,v in enumerate(obj):
65 for i,v in enumerate(obj):
65 obj[i] = squash_unicode(v)
66 obj[i] = squash_unicode(v)
66 elif isinstance(obj, unicode):
67 elif isinstance(obj, unicode):
67 obj = obj.encode('utf8')
68 obj = obj.encode('utf8')
68 return obj
69 return obj
69
70
70 #-----------------------------------------------------------------------------
71 #-----------------------------------------------------------------------------
71 # globals and defaults
72 # globals and defaults
72 #-----------------------------------------------------------------------------
73 #-----------------------------------------------------------------------------
73 key = 'on_unknown' if jsonapi.jsonmod.__name__ == 'jsonlib' else 'default'
74 key = 'on_unknown' if jsonapi.jsonmod.__name__ == 'jsonlib' else 'default'
74 json_packer = lambda obj: jsonapi.dumps(obj, **{key:date_default})
75 json_packer = lambda obj: jsonapi.dumps(obj, **{key:date_default})
75 json_unpacker = lambda s: extract_dates(jsonapi.loads(s))
76 json_unpacker = lambda s: extract_dates(jsonapi.loads(s))
76
77
77 pickle_packer = lambda o: pickle.dumps(o,-1)
78 pickle_packer = lambda o: pickle.dumps(o,-1)
78 pickle_unpacker = pickle.loads
79 pickle_unpacker = pickle.loads
79
80
80 default_packer = json_packer
81 default_packer = json_packer
81 default_unpacker = json_unpacker
82 default_unpacker = json_unpacker
82
83
83
84
84 DELIM=b"<IDS|MSG>"
85 DELIM=b"<IDS|MSG>"
85
86
86 #-----------------------------------------------------------------------------
87 #-----------------------------------------------------------------------------
87 # Classes
88 # Classes
88 #-----------------------------------------------------------------------------
89 #-----------------------------------------------------------------------------
89
90
90 class SessionFactory(LoggingConfigurable):
91 class SessionFactory(LoggingConfigurable):
91 """The Base class for configurables that have a Session, Context, logger,
92 """The Base class for configurables that have a Session, Context, logger,
92 and IOLoop.
93 and IOLoop.
93 """
94 """
94
95
95 logname = Unicode('')
96 logname = Unicode('')
96 def _logname_changed(self, name, old, new):
97 def _logname_changed(self, name, old, new):
97 self.log = logging.getLogger(new)
98 self.log = logging.getLogger(new)
98
99
99 # not configurable:
100 # not configurable:
100 context = Instance('zmq.Context')
101 context = Instance('zmq.Context')
101 def _context_default(self):
102 def _context_default(self):
102 return zmq.Context.instance()
103 return zmq.Context.instance()
103
104
104 session = Instance('IPython.zmq.session.Session')
105 session = Instance('IPython.zmq.session.Session')
105
106
106 loop = Instance('zmq.eventloop.ioloop.IOLoop', allow_none=False)
107 loop = Instance('zmq.eventloop.ioloop.IOLoop', allow_none=False)
107 def _loop_default(self):
108 def _loop_default(self):
108 return IOLoop.instance()
109 return IOLoop.instance()
109
110
110 def __init__(self, **kwargs):
111 def __init__(self, **kwargs):
111 super(SessionFactory, self).__init__(**kwargs)
112 super(SessionFactory, self).__init__(**kwargs)
112
113
113 if self.session is None:
114 if self.session is None:
114 # construct the session
115 # construct the session
115 self.session = Session(**kwargs)
116 self.session = Session(**kwargs)
116
117
117
118
118 class Message(object):
119 class Message(object):
119 """A simple message object that maps dict keys to attributes.
120 """A simple message object that maps dict keys to attributes.
120
121
121 A Message can be created from a dict and a dict from a Message instance
122 A Message can be created from a dict and a dict from a Message instance
122 simply by calling dict(msg_obj)."""
123 simply by calling dict(msg_obj)."""
123
124
124 def __init__(self, msg_dict):
125 def __init__(self, msg_dict):
125 dct = self.__dict__
126 dct = self.__dict__
126 for k, v in dict(msg_dict).iteritems():
127 for k, v in dict(msg_dict).iteritems():
127 if isinstance(v, dict):
128 if isinstance(v, dict):
128 v = Message(v)
129 v = Message(v)
129 dct[k] = v
130 dct[k] = v
130
131
131 # Having this iterator lets dict(msg_obj) work out of the box.
132 # Having this iterator lets dict(msg_obj) work out of the box.
132 def __iter__(self):
133 def __iter__(self):
133 return iter(self.__dict__.iteritems())
134 return iter(self.__dict__.iteritems())
134
135
135 def __repr__(self):
136 def __repr__(self):
136 return repr(self.__dict__)
137 return repr(self.__dict__)
137
138
138 def __str__(self):
139 def __str__(self):
139 return pprint.pformat(self.__dict__)
140 return pprint.pformat(self.__dict__)
140
141
141 def __contains__(self, k):
142 def __contains__(self, k):
142 return k in self.__dict__
143 return k in self.__dict__
143
144
144 def __getitem__(self, k):
145 def __getitem__(self, k):
145 return self.__dict__[k]
146 return self.__dict__[k]
146
147
147
148
148 def msg_header(msg_id, msg_type, username, session):
149 def msg_header(msg_id, msg_type, username, session):
149 date = datetime.now()
150 date = datetime.now()
150 return locals()
151 return locals()
151
152
152 def extract_header(msg_or_header):
153 def extract_header(msg_or_header):
153 """Given a message or header, return the header."""
154 """Given a message or header, return the header."""
154 if not msg_or_header:
155 if not msg_or_header:
155 return {}
156 return {}
156 try:
157 try:
157 # See if msg_or_header is the entire message.
158 # See if msg_or_header is the entire message.
158 h = msg_or_header['header']
159 h = msg_or_header['header']
159 except KeyError:
160 except KeyError:
160 try:
161 try:
161 # See if msg_or_header is just the header
162 # See if msg_or_header is just the header
162 h = msg_or_header['msg_id']
163 h = msg_or_header['msg_id']
163 except KeyError:
164 except KeyError:
164 raise
165 raise
165 else:
166 else:
166 h = msg_or_header
167 h = msg_or_header
167 if not isinstance(h, dict):
168 if not isinstance(h, dict):
168 h = dict(h)
169 h = dict(h)
169 return h
170 return h
170
171
171 class Session(Configurable):
172 class Session(Configurable):
172 """Object for handling serialization and sending of messages.
173 """Object for handling serialization and sending of messages.
173
174
174 The Session object handles building messages and sending them
175 The Session object handles building messages and sending them
175 with ZMQ sockets or ZMQStream objects. Objects can communicate with each
176 with ZMQ sockets or ZMQStream objects. Objects can communicate with each
176 other over the network via Session objects, and only need to work with the
177 other over the network via Session objects, and only need to work with the
177 dict-based IPython message spec. The Session will handle
178 dict-based IPython message spec. The Session will handle
178 serialization/deserialization, security, and metadata.
179 serialization/deserialization, security, and metadata.
179
180
180 Sessions support configurable serialiization via packer/unpacker traits,
181 Sessions support configurable serialiization via packer/unpacker traits,
181 and signing with HMAC digests via the key/keyfile traits.
182 and signing with HMAC digests via the key/keyfile traits.
182
183
183 Parameters
184 Parameters
184 ----------
185 ----------
185
186
186 debug : bool
187 debug : bool
187 whether to trigger extra debugging statements
188 whether to trigger extra debugging statements
188 packer/unpacker : str : 'json', 'pickle' or import_string
189 packer/unpacker : str : 'json', 'pickle' or import_string
189 importstrings for methods to serialize message parts. If just
190 importstrings for methods to serialize message parts. If just
190 'json' or 'pickle', predefined JSON and pickle packers will be used.
191 'json' or 'pickle', predefined JSON and pickle packers will be used.
191 Otherwise, the entire importstring must be used.
192 Otherwise, the entire importstring must be used.
192
193
193 The functions must accept at least valid JSON input, and output *bytes*.
194 The functions must accept at least valid JSON input, and output *bytes*.
194
195
195 For example, to use msgpack:
196 For example, to use msgpack:
196 packer = 'msgpack.packb', unpacker='msgpack.unpackb'
197 packer = 'msgpack.packb', unpacker='msgpack.unpackb'
197 pack/unpack : callables
198 pack/unpack : callables
198 You can also set the pack/unpack callables for serialization directly.
199 You can also set the pack/unpack callables for serialization directly.
199 session : bytes
200 session : bytes
200 the ID of this Session object. The default is to generate a new UUID.
201 the ID of this Session object. The default is to generate a new UUID.
201 username : unicode
202 username : unicode
202 username added to message headers. The default is to ask the OS.
203 username added to message headers. The default is to ask the OS.
203 key : bytes
204 key : bytes
204 The key used to initialize an HMAC signature. If unset, messages
205 The key used to initialize an HMAC signature. If unset, messages
205 will not be signed or checked.
206 will not be signed or checked.
206 keyfile : filepath
207 keyfile : filepath
207 The file containing a key. If this is set, `key` will be initialized
208 The file containing a key. If this is set, `key` will be initialized
208 to the contents of the file.
209 to the contents of the file.
209
210
210 """
211 """
211
212
212 debug=Bool(False, config=True, help="""Debug output in the Session""")
213 debug=Bool(False, config=True, help="""Debug output in the Session""")
213
214
214 packer = DottedObjectName('json',config=True,
215 packer = DottedObjectName('json',config=True,
215 help="""The name of the packer for serializing messages.
216 help="""The name of the packer for serializing messages.
216 Should be one of 'json', 'pickle', or an import name
217 Should be one of 'json', 'pickle', or an import name
217 for a custom callable serializer.""")
218 for a custom callable serializer.""")
218 def _packer_changed(self, name, old, new):
219 def _packer_changed(self, name, old, new):
219 if new.lower() == 'json':
220 if new.lower() == 'json':
220 self.pack = json_packer
221 self.pack = json_packer
221 self.unpack = json_unpacker
222 self.unpack = json_unpacker
222 elif new.lower() == 'pickle':
223 elif new.lower() == 'pickle':
223 self.pack = pickle_packer
224 self.pack = pickle_packer
224 self.unpack = pickle_unpacker
225 self.unpack = pickle_unpacker
225 else:
226 else:
226 self.pack = import_item(str(new))
227 self.pack = import_item(str(new))
227
228
228 unpacker = DottedObjectName('json', config=True,
229 unpacker = DottedObjectName('json', config=True,
229 help="""The name of the unpacker for unserializing messages.
230 help="""The name of the unpacker for unserializing messages.
230 Only used with custom functions for `packer`.""")
231 Only used with custom functions for `packer`.""")
231 def _unpacker_changed(self, name, old, new):
232 def _unpacker_changed(self, name, old, new):
232 if new.lower() == 'json':
233 if new.lower() == 'json':
233 self.pack = json_packer
234 self.pack = json_packer
234 self.unpack = json_unpacker
235 self.unpack = json_unpacker
235 elif new.lower() == 'pickle':
236 elif new.lower() == 'pickle':
236 self.pack = pickle_packer
237 self.pack = pickle_packer
237 self.unpack = pickle_unpacker
238 self.unpack = pickle_unpacker
238 else:
239 else:
239 self.unpack = import_item(str(new))
240 self.unpack = import_item(str(new))
240
241
241 session = CBytes(b'', config=True,
242 session = CBytes(b'', config=True,
242 help="""The UUID identifying this session.""")
243 help="""The UUID identifying this session.""")
243 def _session_default(self):
244 def _session_default(self):
244 return bytes(uuid.uuid4())
245 return bytes(uuid.uuid4())
245
246
246 username = Unicode(os.environ.get('USER',u'username'), config=True,
247 username = Unicode(os.environ.get('USER',u'username'), config=True,
247 help="""Username for the Session. Default is your system username.""")
248 help="""Username for the Session. Default is your system username.""")
248
249
249 # message signature related traits:
250 # message signature related traits:
250 key = CBytes(b'', config=True,
251 key = CBytes(b'', config=True,
251 help="""execution key, for extra authentication.""")
252 help="""execution key, for extra authentication.""")
252 def _key_changed(self, name, old, new):
253 def _key_changed(self, name, old, new):
253 if new:
254 if new:
254 self.auth = hmac.HMAC(new)
255 self.auth = hmac.HMAC(new)
255 else:
256 else:
256 self.auth = None
257 self.auth = None
257 auth = Instance(hmac.HMAC)
258 auth = Instance(hmac.HMAC)
258 digest_history = Set()
259 digest_history = Set()
259
260
260 keyfile = Unicode('', config=True,
261 keyfile = Unicode('', config=True,
261 help="""path to file containing execution key.""")
262 help="""path to file containing execution key.""")
262 def _keyfile_changed(self, name, old, new):
263 def _keyfile_changed(self, name, old, new):
263 with open(new, 'rb') as f:
264 with open(new, 'rb') as f:
264 self.key = f.read().strip()
265 self.key = f.read().strip()
265
266
266 pack = Any(default_packer) # the actual packer function
267 pack = Any(default_packer) # the actual packer function
267 def _pack_changed(self, name, old, new):
268 def _pack_changed(self, name, old, new):
268 if not callable(new):
269 if not callable(new):
269 raise TypeError("packer must be callable, not %s"%type(new))
270 raise TypeError("packer must be callable, not %s"%type(new))
270
271
271 unpack = Any(default_unpacker) # the actual packer function
272 unpack = Any(default_unpacker) # the actual packer function
272 def _unpack_changed(self, name, old, new):
273 def _unpack_changed(self, name, old, new):
273 # unpacker is not checked - it is assumed to be
274 # unpacker is not checked - it is assumed to be
274 if not callable(new):
275 if not callable(new):
275 raise TypeError("unpacker must be callable, not %s"%type(new))
276 raise TypeError("unpacker must be callable, not %s"%type(new))
276
277
277 def __init__(self, **kwargs):
278 def __init__(self, **kwargs):
278 """create a Session object
279 """create a Session object
279
280
280 Parameters
281 Parameters
281 ----------
282 ----------
282
283
283 debug : bool
284 debug : bool
284 whether to trigger extra debugging statements
285 whether to trigger extra debugging statements
285 packer/unpacker : str : 'json', 'pickle' or import_string
286 packer/unpacker : str : 'json', 'pickle' or import_string
286 importstrings for methods to serialize message parts. If just
287 importstrings for methods to serialize message parts. If just
287 'json' or 'pickle', predefined JSON and pickle packers will be used.
288 'json' or 'pickle', predefined JSON and pickle packers will be used.
288 Otherwise, the entire importstring must be used.
289 Otherwise, the entire importstring must be used.
289
290
290 The functions must accept at least valid JSON input, and output
291 The functions must accept at least valid JSON input, and output
291 *bytes*.
292 *bytes*.
292
293
293 For example, to use msgpack:
294 For example, to use msgpack:
294 packer = 'msgpack.packb', unpacker='msgpack.unpackb'
295 packer = 'msgpack.packb', unpacker='msgpack.unpackb'
295 pack/unpack : callables
296 pack/unpack : callables
296 You can also set the pack/unpack callables for serialization
297 You can also set the pack/unpack callables for serialization
297 directly.
298 directly.
298 session : bytes
299 session : bytes
299 the ID of this Session object. The default is to generate a new
300 the ID of this Session object. The default is to generate a new
300 UUID.
301 UUID.
301 username : unicode
302 username : unicode
302 username added to message headers. The default is to ask the OS.
303 username added to message headers. The default is to ask the OS.
303 key : bytes
304 key : bytes
304 The key used to initialize an HMAC signature. If unset, messages
305 The key used to initialize an HMAC signature. If unset, messages
305 will not be signed or checked.
306 will not be signed or checked.
306 keyfile : filepath
307 keyfile : filepath
307 The file containing a key. If this is set, `key` will be
308 The file containing a key. If this is set, `key` will be
308 initialized to the contents of the file.
309 initialized to the contents of the file.
309 """
310 """
310 super(Session, self).__init__(**kwargs)
311 super(Session, self).__init__(**kwargs)
311 self._check_packers()
312 self._check_packers()
312 self.none = self.pack({})
313 self.none = self.pack({})
313
314
314 @property
315 @property
315 def msg_id(self):
316 def msg_id(self):
316 """always return new uuid"""
317 """always return new uuid"""
317 return str(uuid.uuid4())
318 return str(uuid.uuid4())
318
319
319 def _check_packers(self):
320 def _check_packers(self):
320 """check packers for binary data and datetime support."""
321 """check packers for binary data and datetime support."""
321 pack = self.pack
322 pack = self.pack
322 unpack = self.unpack
323 unpack = self.unpack
323
324
324 # check simple serialization
325 # check simple serialization
325 msg = dict(a=[1,'hi'])
326 msg = dict(a=[1,'hi'])
326 try:
327 try:
327 packed = pack(msg)
328 packed = pack(msg)
328 except Exception:
329 except Exception:
329 raise ValueError("packer could not serialize a simple message")
330 raise ValueError("packer could not serialize a simple message")
330
331
331 # ensure packed message is bytes
332 # ensure packed message is bytes
332 if not isinstance(packed, bytes):
333 if not isinstance(packed, bytes):
333 raise ValueError("message packed to %r, but bytes are required"%type(packed))
334 raise ValueError("message packed to %r, but bytes are required"%type(packed))
334
335
335 # check that unpack is pack's inverse
336 # check that unpack is pack's inverse
336 try:
337 try:
337 unpacked = unpack(packed)
338 unpacked = unpack(packed)
338 except Exception:
339 except Exception:
339 raise ValueError("unpacker could not handle the packer's output")
340 raise ValueError("unpacker could not handle the packer's output")
340
341
341 # check datetime support
342 # check datetime support
342 msg = dict(t=datetime.now())
343 msg = dict(t=datetime.now())
343 try:
344 try:
344 unpacked = unpack(pack(msg))
345 unpacked = unpack(pack(msg))
345 except Exception:
346 except Exception:
346 self.pack = lambda o: pack(squash_dates(o))
347 self.pack = lambda o: pack(squash_dates(o))
347 self.unpack = lambda s: extract_dates(unpack(s))
348 self.unpack = lambda s: extract_dates(unpack(s))
348
349
349 def msg_header(self, msg_type):
350 def msg_header(self, msg_type):
350 return msg_header(self.msg_id, msg_type, self.username, self.session)
351 return msg_header(self.msg_id, msg_type, self.username, self.session)
351
352
352 def msg(self, msg_type, content=None, parent=None, subheader=None, header=None):
353 def msg(self, msg_type, content=None, parent=None, subheader=None, header=None):
353 """Return the nested message dict.
354 """Return the nested message dict.
354
355
355 This format is different from what is sent over the wire. The
356 This format is different from what is sent over the wire. The
356 serialize/unserialize methods converts this nested message dict to the wire
357 serialize/unserialize methods converts this nested message dict to the wire
357 format, which is a list of message parts.
358 format, which is a list of message parts.
358 """
359 """
359 msg = {}
360 msg = {}
360 header = self.msg_header(msg_type) if header is None else header
361 header = self.msg_header(msg_type) if header is None else header
361 msg['header'] = header
362 msg['header'] = header
362 msg['msg_id'] = header['msg_id']
363 msg['msg_id'] = header['msg_id']
363 msg['msg_type'] = header['msg_type']
364 msg['msg_type'] = header['msg_type']
364 msg['parent_header'] = {} if parent is None else extract_header(parent)
365 msg['parent_header'] = {} if parent is None else extract_header(parent)
365 msg['content'] = {} if content is None else content
366 msg['content'] = {} if content is None else content
366 sub = {} if subheader is None else subheader
367 sub = {} if subheader is None else subheader
367 msg['header'].update(sub)
368 msg['header'].update(sub)
368 return msg
369 return msg
369
370
370 def sign(self, msg_list):
371 def sign(self, msg_list):
371 """Sign a message with HMAC digest. If no auth, return b''.
372 """Sign a message with HMAC digest. If no auth, return b''.
372
373
373 Parameters
374 Parameters
374 ----------
375 ----------
375 msg_list : list
376 msg_list : list
376 The [p_header,p_parent,p_content] part of the message list.
377 The [p_header,p_parent,p_content] part of the message list.
377 """
378 """
378 if self.auth is None:
379 if self.auth is None:
379 return b''
380 return b''
380 h = self.auth.copy()
381 h = self.auth.copy()
381 for m in msg_list:
382 for m in msg_list:
382 h.update(m)
383 h.update(m)
383 return str_to_bytes(h.hexdigest())
384 return str_to_bytes(h.hexdigest())
384
385
385 def serialize(self, msg, ident=None):
386 def serialize(self, msg, ident=None):
386 """Serialize the message components to bytes.
387 """Serialize the message components to bytes.
387
388
388 This is roughly the inverse of unserialize. The serialize/unserialize
389 This is roughly the inverse of unserialize. The serialize/unserialize
389 methods work with full message lists, whereas pack/unpack work with
390 methods work with full message lists, whereas pack/unpack work with
390 the individual message parts in the message list.
391 the individual message parts in the message list.
391
392
392 Parameters
393 Parameters
393 ----------
394 ----------
394 msg : dict or Message
395 msg : dict or Message
395 The nexted message dict as returned by the self.msg method.
396 The nexted message dict as returned by the self.msg method.
396
397
397 Returns
398 Returns
398 -------
399 -------
399 msg_list : list
400 msg_list : list
400 The list of bytes objects to be sent with the format:
401 The list of bytes objects to be sent with the format:
401 [ident1,ident2,...,DELIM,HMAC,p_header,p_parent,p_content,
402 [ident1,ident2,...,DELIM,HMAC,p_header,p_parent,p_content,
402 buffer1,buffer2,...]. In this list, the p_* entities are
403 buffer1,buffer2,...]. In this list, the p_* entities are
403 the packed or serialized versions, so if JSON is used, these
404 the packed or serialized versions, so if JSON is used, these
404 are utf8 encoded JSON strings.
405 are utf8 encoded JSON strings.
405 """
406 """
406 content = msg.get('content', {})
407 content = msg.get('content', {})
407 if content is None:
408 if content is None:
408 content = self.none
409 content = self.none
409 elif isinstance(content, dict):
410 elif isinstance(content, dict):
410 content = self.pack(content)
411 content = self.pack(content)
411 elif isinstance(content, bytes):
412 elif isinstance(content, bytes):
412 # content is already packed, as in a relayed message
413 # content is already packed, as in a relayed message
413 pass
414 pass
414 elif isinstance(content, unicode):
415 elif isinstance(content, unicode):
415 # should be bytes, but JSON often spits out unicode
416 # should be bytes, but JSON often spits out unicode
416 content = content.encode('utf8')
417 content = content.encode('utf8')
417 else:
418 else:
418 raise TypeError("Content incorrect type: %s"%type(content))
419 raise TypeError("Content incorrect type: %s"%type(content))
419
420
420 real_message = [self.pack(msg['header']),
421 real_message = [self.pack(msg['header']),
421 self.pack(msg['parent_header']),
422 self.pack(msg['parent_header']),
422 content
423 content
423 ]
424 ]
424
425
425 to_send = []
426 to_send = []
426
427
427 if isinstance(ident, list):
428 if isinstance(ident, list):
428 # accept list of idents
429 # accept list of idents
429 to_send.extend(ident)
430 to_send.extend(ident)
430 elif ident is not None:
431 elif ident is not None:
431 to_send.append(ident)
432 to_send.append(ident)
432 to_send.append(DELIM)
433 to_send.append(DELIM)
433
434
434 signature = self.sign(real_message)
435 signature = self.sign(real_message)
435 to_send.append(signature)
436 to_send.append(signature)
436
437
437 to_send.extend(real_message)
438 to_send.extend(real_message)
438
439
439 return to_send
440 return to_send
440
441
441 def send(self, stream, msg_or_type, content=None, parent=None, ident=None,
442 def send(self, stream, msg_or_type, content=None, parent=None, ident=None,
442 buffers=None, subheader=None, track=False, header=None):
443 buffers=None, subheader=None, track=False, header=None):
443 """Build and send a message via stream or socket.
444 """Build and send a message via stream or socket.
444
445
445 The message format used by this function internally is as follows:
446 The message format used by this function internally is as follows:
446
447
447 [ident1,ident2,...,DELIM,HMAC,p_header,p_parent,p_content,
448 [ident1,ident2,...,DELIM,HMAC,p_header,p_parent,p_content,
448 buffer1,buffer2,...]
449 buffer1,buffer2,...]
449
450
450 The serialize/unserialize methods convert the nested message dict into this
451 The serialize/unserialize methods convert the nested message dict into this
451 format.
452 format.
452
453
453 Parameters
454 Parameters
454 ----------
455 ----------
455
456
456 stream : zmq.Socket or ZMQStream
457 stream : zmq.Socket or ZMQStream
457 The socket-like object used to send the data.
458 The socket-like object used to send the data.
458 msg_or_type : str or Message/dict
459 msg_or_type : str or Message/dict
459 Normally, msg_or_type will be a msg_type unless a message is being
460 Normally, msg_or_type will be a msg_type unless a message is being
460 sent more than once. If a header is supplied, this can be set to
461 sent more than once. If a header is supplied, this can be set to
461 None and the msg_type will be pulled from the header.
462 None and the msg_type will be pulled from the header.
462
463
463 content : dict or None
464 content : dict or None
464 The content of the message (ignored if msg_or_type is a message).
465 The content of the message (ignored if msg_or_type is a message).
465 header : dict or None
466 header : dict or None
466 The header dict for the message (ignores if msg_to_type is a message).
467 The header dict for the message (ignores if msg_to_type is a message).
467 parent : Message or dict or None
468 parent : Message or dict or None
468 The parent or parent header describing the parent of this message
469 The parent or parent header describing the parent of this message
469 (ignored if msg_or_type is a message).
470 (ignored if msg_or_type is a message).
470 ident : bytes or list of bytes
471 ident : bytes or list of bytes
471 The zmq.IDENTITY routing path.
472 The zmq.IDENTITY routing path.
472 subheader : dict or None
473 subheader : dict or None
473 Extra header keys for this message's header (ignored if msg_or_type
474 Extra header keys for this message's header (ignored if msg_or_type
474 is a message).
475 is a message).
475 buffers : list or None
476 buffers : list or None
476 The already-serialized buffers to be appended to the message.
477 The already-serialized buffers to be appended to the message.
477 track : bool
478 track : bool
478 Whether to track. Only for use with Sockets, because ZMQStream
479 Whether to track. Only for use with Sockets, because ZMQStream
479 objects cannot track messages.
480 objects cannot track messages.
480
481
481 Returns
482 Returns
482 -------
483 -------
483 msg : dict
484 msg : dict
484 The constructed message.
485 The constructed message.
485 (msg,tracker) : (dict, MessageTracker)
486 (msg,tracker) : (dict, MessageTracker)
486 if track=True, then a 2-tuple will be returned,
487 if track=True, then a 2-tuple will be returned,
487 the first element being the constructed
488 the first element being the constructed
488 message, and the second being the MessageTracker
489 message, and the second being the MessageTracker
489
490
490 """
491 """
491
492
492 if not isinstance(stream, (zmq.Socket, ZMQStream)):
493 if not isinstance(stream, (zmq.Socket, ZMQStream)):
493 raise TypeError("stream must be Socket or ZMQStream, not %r"%type(stream))
494 raise TypeError("stream must be Socket or ZMQStream, not %r"%type(stream))
494 elif track and isinstance(stream, ZMQStream):
495 elif track and isinstance(stream, ZMQStream):
495 raise TypeError("ZMQStream cannot track messages")
496 raise TypeError("ZMQStream cannot track messages")
496
497
497 if isinstance(msg_or_type, (Message, dict)):
498 if isinstance(msg_or_type, (Message, dict)):
498 # We got a Message or message dict, not a msg_type so don't
499 # We got a Message or message dict, not a msg_type so don't
499 # build a new Message.
500 # build a new Message.
500 msg = msg_or_type
501 msg = msg_or_type
501 else:
502 else:
502 msg = self.msg(msg_or_type, content=content, parent=parent,
503 msg = self.msg(msg_or_type, content=content, parent=parent,
503 subheader=subheader, header=header)
504 subheader=subheader, header=header)
504
505
505 buffers = [] if buffers is None else buffers
506 buffers = [] if buffers is None else buffers
506 to_send = self.serialize(msg, ident)
507 to_send = self.serialize(msg, ident)
507 flag = 0
508 flag = 0
508 if buffers:
509 if buffers:
509 flag = zmq.SNDMORE
510 flag = zmq.SNDMORE
510 _track = False
511 _track = False
511 else:
512 else:
512 _track=track
513 _track=track
513 if track:
514 if track:
514 tracker = stream.send_multipart(to_send, flag, copy=False, track=_track)
515 tracker = stream.send_multipart(to_send, flag, copy=False, track=_track)
515 else:
516 else:
516 tracker = stream.send_multipart(to_send, flag, copy=False)
517 tracker = stream.send_multipart(to_send, flag, copy=False)
517 for b in buffers[:-1]:
518 for b in buffers[:-1]:
518 stream.send(b, flag, copy=False)
519 stream.send(b, flag, copy=False)
519 if buffers:
520 if buffers:
520 if track:
521 if track:
521 tracker = stream.send(buffers[-1], copy=False, track=track)
522 tracker = stream.send(buffers[-1], copy=False, track=track)
522 else:
523 else:
523 tracker = stream.send(buffers[-1], copy=False)
524 tracker = stream.send(buffers[-1], copy=False)
524
525
525 # omsg = Message(msg)
526 # omsg = Message(msg)
526 if self.debug:
527 if self.debug:
527 pprint.pprint(msg)
528 pprint.pprint(msg)
528 pprint.pprint(to_send)
529 pprint.pprint(to_send)
529 pprint.pprint(buffers)
530 pprint.pprint(buffers)
530
531
531 msg['tracker'] = tracker
532 msg['tracker'] = tracker
532
533
533 return msg
534 return msg
534
535
535 def send_raw(self, stream, msg_list, flags=0, copy=True, ident=None):
536 def send_raw(self, stream, msg_list, flags=0, copy=True, ident=None):
536 """Send a raw message via ident path.
537 """Send a raw message via ident path.
537
538
538 This method is used to send a already serialized message.
539 This method is used to send a already serialized message.
539
540
540 Parameters
541 Parameters
541 ----------
542 ----------
542 stream : ZMQStream or Socket
543 stream : ZMQStream or Socket
543 The ZMQ stream or socket to use for sending the message.
544 The ZMQ stream or socket to use for sending the message.
544 msg_list : list
545 msg_list : list
545 The serialized list of messages to send. This only includes the
546 The serialized list of messages to send. This only includes the
546 [p_header,p_parent,p_content,buffer1,buffer2,...] portion of
547 [p_header,p_parent,p_content,buffer1,buffer2,...] portion of
547 the message.
548 the message.
548 ident : ident or list
549 ident : ident or list
549 A single ident or a list of idents to use in sending.
550 A single ident or a list of idents to use in sending.
550 """
551 """
551 to_send = []
552 to_send = []
552 if isinstance(ident, bytes):
553 if isinstance(ident, bytes):
553 ident = [ident]
554 ident = [ident]
554 if ident is not None:
555 if ident is not None:
555 to_send.extend(ident)
556 to_send.extend(ident)
556
557
557 to_send.append(DELIM)
558 to_send.append(DELIM)
558 to_send.append(self.sign(msg_list))
559 to_send.append(self.sign(msg_list))
559 to_send.extend(msg_list)
560 to_send.extend(msg_list)
560 stream.send_multipart(msg_list, flags, copy=copy)
561 stream.send_multipart(msg_list, flags, copy=copy)
561
562
562 def recv(self, socket, mode=zmq.NOBLOCK, content=True, copy=True):
563 def recv(self, socket, mode=zmq.NOBLOCK, content=True, copy=True):
563 """Receive and unpack a message.
564 """Receive and unpack a message.
564
565
565 Parameters
566 Parameters
566 ----------
567 ----------
567 socket : ZMQStream or Socket
568 socket : ZMQStream or Socket
568 The socket or stream to use in receiving.
569 The socket or stream to use in receiving.
569
570
570 Returns
571 Returns
571 -------
572 -------
572 [idents], msg
573 [idents], msg
573 [idents] is a list of idents and msg is a nested message dict of
574 [idents] is a list of idents and msg is a nested message dict of
574 same format as self.msg returns.
575 same format as self.msg returns.
575 """
576 """
576 if isinstance(socket, ZMQStream):
577 if isinstance(socket, ZMQStream):
577 socket = socket.socket
578 socket = socket.socket
578 try:
579 try:
579 msg_list = socket.recv_multipart(mode)
580 msg_list = socket.recv_multipart(mode)
580 except zmq.ZMQError as e:
581 except zmq.ZMQError as e:
581 if e.errno == zmq.EAGAIN:
582 if e.errno == zmq.EAGAIN:
582 # We can convert EAGAIN to None as we know in this case
583 # We can convert EAGAIN to None as we know in this case
583 # recv_multipart won't return None.
584 # recv_multipart won't return None.
584 return None,None
585 return None,None
585 else:
586 else:
586 raise
587 raise
587 # split multipart message into identity list and message dict
588 # split multipart message into identity list and message dict
588 # invalid large messages can cause very expensive string comparisons
589 # invalid large messages can cause very expensive string comparisons
589 idents, msg_list = self.feed_identities(msg_list, copy)
590 idents, msg_list = self.feed_identities(msg_list, copy)
590 try:
591 try:
591 return idents, self.unserialize(msg_list, content=content, copy=copy)
592 return idents, self.unserialize(msg_list, content=content, copy=copy)
592 except Exception as e:
593 except Exception as e:
593 # TODO: handle it
594 # TODO: handle it
594 raise e
595 raise e
595
596
596 def feed_identities(self, msg_list, copy=True):
597 def feed_identities(self, msg_list, copy=True):
597 """Split the identities from the rest of the message.
598 """Split the identities from the rest of the message.
598
599
599 Feed until DELIM is reached, then return the prefix as idents and
600 Feed until DELIM is reached, then return the prefix as idents and
600 remainder as msg_list. This is easily broken by setting an IDENT to DELIM,
601 remainder as msg_list. This is easily broken by setting an IDENT to DELIM,
601 but that would be silly.
602 but that would be silly.
602
603
603 Parameters
604 Parameters
604 ----------
605 ----------
605 msg_list : a list of Message or bytes objects
606 msg_list : a list of Message or bytes objects
606 The message to be split.
607 The message to be split.
607 copy : bool
608 copy : bool
608 flag determining whether the arguments are bytes or Messages
609 flag determining whether the arguments are bytes or Messages
609
610
610 Returns
611 Returns
611 -------
612 -------
612 (idents, msg_list) : two lists
613 (idents, msg_list) : two lists
613 idents will always be a list of bytes, each of which is a ZMQ
614 idents will always be a list of bytes, each of which is a ZMQ
614 identity. msg_list will be a list of bytes or zmq.Messages of the
615 identity. msg_list will be a list of bytes or zmq.Messages of the
615 form [HMAC,p_header,p_parent,p_content,buffer1,buffer2,...] and
616 form [HMAC,p_header,p_parent,p_content,buffer1,buffer2,...] and
616 should be unpackable/unserializable via self.unserialize at this
617 should be unpackable/unserializable via self.unserialize at this
617 point.
618 point.
618 """
619 """
619 if copy:
620 if copy:
620 idx = msg_list.index(DELIM)
621 idx = msg_list.index(DELIM)
621 return msg_list[:idx], msg_list[idx+1:]
622 return msg_list[:idx], msg_list[idx+1:]
622 else:
623 else:
623 failed = True
624 failed = True
624 for idx,m in enumerate(msg_list):
625 for idx,m in enumerate(msg_list):
625 if m.bytes == DELIM:
626 if m.bytes == DELIM:
626 failed = False
627 failed = False
627 break
628 break
628 if failed:
629 if failed:
629 raise ValueError("DELIM not in msg_list")
630 raise ValueError("DELIM not in msg_list")
630 idents, msg_list = msg_list[:idx], msg_list[idx+1:]
631 idents, msg_list = msg_list[:idx], msg_list[idx+1:]
631 return [m.bytes for m in idents], msg_list
632 return [m.bytes for m in idents], msg_list
632
633
633 def unserialize(self, msg_list, content=True, copy=True):
634 def unserialize(self, msg_list, content=True, copy=True):
634 """Unserialize a msg_list to a nested message dict.
635 """Unserialize a msg_list to a nested message dict.
635
636
636 This is roughly the inverse of serialize. The serialize/unserialize
637 This is roughly the inverse of serialize. The serialize/unserialize
637 methods work with full message lists, whereas pack/unpack work with
638 methods work with full message lists, whereas pack/unpack work with
638 the individual message parts in the message list.
639 the individual message parts in the message list.
639
640
640 Parameters:
641 Parameters:
641 -----------
642 -----------
642 msg_list : list of bytes or Message objects
643 msg_list : list of bytes or Message objects
643 The list of message parts of the form [HMAC,p_header,p_parent,
644 The list of message parts of the form [HMAC,p_header,p_parent,
644 p_content,buffer1,buffer2,...].
645 p_content,buffer1,buffer2,...].
645 content : bool (True)
646 content : bool (True)
646 Whether to unpack the content dict (True), or leave it packed
647 Whether to unpack the content dict (True), or leave it packed
647 (False).
648 (False).
648 copy : bool (True)
649 copy : bool (True)
649 Whether to return the bytes (True), or the non-copying Message
650 Whether to return the bytes (True), or the non-copying Message
650 object in each place (False).
651 object in each place (False).
651
652
652 Returns
653 Returns
653 -------
654 -------
654 msg : dict
655 msg : dict
655 The nested message dict with top-level keys [header, parent_header,
656 The nested message dict with top-level keys [header, parent_header,
656 content, buffers].
657 content, buffers].
657 """
658 """
658 minlen = 4
659 minlen = 4
659 message = {}
660 message = {}
660 if not copy:
661 if not copy:
661 for i in range(minlen):
662 for i in range(minlen):
662 msg_list[i] = msg_list[i].bytes
663 msg_list[i] = msg_list[i].bytes
663 if self.auth is not None:
664 if self.auth is not None:
664 signature = msg_list[0]
665 signature = msg_list[0]
665 if not signature:
666 if not signature:
666 raise ValueError("Unsigned Message")
667 raise ValueError("Unsigned Message")
667 if signature in self.digest_history:
668 if signature in self.digest_history:
668 raise ValueError("Duplicate Signature: %r"%signature)
669 raise ValueError("Duplicate Signature: %r"%signature)
669 self.digest_history.add(signature)
670 self.digest_history.add(signature)
670 check = self.sign(msg_list[1:4])
671 check = self.sign(msg_list[1:4])
671 if not signature == check:
672 if not signature == check:
672 raise ValueError("Invalid Signature: %r"%signature)
673 raise ValueError("Invalid Signature: %r"%signature)
673 if not len(msg_list) >= minlen:
674 if not len(msg_list) >= minlen:
674 raise TypeError("malformed message, must have at least %i elements"%minlen)
675 raise TypeError("malformed message, must have at least %i elements"%minlen)
675 header = self.unpack(msg_list[1])
676 header = self.unpack(msg_list[1])
676 message['header'] = header
677 message['header'] = header
677 message['msg_id'] = header['msg_id']
678 message['msg_id'] = header['msg_id']
678 message['msg_type'] = header['msg_type']
679 message['msg_type'] = header['msg_type']
679 message['parent_header'] = self.unpack(msg_list[2])
680 message['parent_header'] = self.unpack(msg_list[2])
680 if content:
681 if content:
681 message['content'] = self.unpack(msg_list[3])
682 message['content'] = self.unpack(msg_list[3])
682 else:
683 else:
683 message['content'] = msg_list[3]
684 message['content'] = msg_list[3]
684
685
685 message['buffers'] = msg_list[4:]
686 message['buffers'] = msg_list[4:]
686 return message
687 return message
687
688
688 def test_msg2obj():
689 def test_msg2obj():
689 am = dict(x=1)
690 am = dict(x=1)
690 ao = Message(am)
691 ao = Message(am)
691 assert ao.x == am['x']
692 assert ao.x == am['x']
692
693
693 am['y'] = dict(z=1)
694 am['y'] = dict(z=1)
694 ao = Message(am)
695 ao = Message(am)
695 assert ao.y.z == am['y']['z']
696 assert ao.y.z == am['y']['z']
696
697
697 k1, k2 = 'y', 'z'
698 k1, k2 = 'y', 'z'
698 assert ao[k1][k2] == am[k1][k2]
699 assert ao[k1][k2] == am[k1][k2]
699
700
700 am2 = dict(ao)
701 am2 = dict(ao)
701 assert am['x'] == am2['x']
702 assert am['x'] == am2['x']
702 assert am['y']['z'] == am2['y']['z']
703 assert am['y']['z'] == am2['y']['z']
703
704
General Comments 0
You need to be logged in to leave comments. Login now