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