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