Show More
@@ -1,757 +1,757 b'' | |||||
1 | """ History related magics and functionality """ |
|
1 | """ History related magics and functionality """ | |
2 | #----------------------------------------------------------------------------- |
|
2 | #----------------------------------------------------------------------------- | |
3 | # Copyright (C) 2010-2011 The IPython Development Team. |
|
3 | # Copyright (C) 2010-2011 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 atexit |
|
16 | import atexit | |
17 | import datetime |
|
17 | import datetime | |
18 | import os |
|
18 | import os | |
19 | import re |
|
19 | import re | |
20 | try: |
|
20 | try: | |
21 | import sqlite3 |
|
21 | import sqlite3 | |
22 | except ImportError: |
|
22 | except ImportError: | |
23 | sqlite3 = None |
|
23 | sqlite3 = None | |
24 | import threading |
|
24 | import threading | |
25 |
|
25 | |||
26 | # Our own packages |
|
26 | # Our own packages | |
27 | from IPython.config.configurable import Configurable |
|
27 | from IPython.config.configurable import Configurable | |
28 | from IPython.external.decorator import decorator |
|
28 | from IPython.external.decorator import decorator | |
29 | from IPython.utils.path import locate_profile |
|
29 | from IPython.utils.path import locate_profile | |
30 | from IPython.utils.traitlets import ( |
|
30 | from IPython.utils.traitlets import ( | |
31 | Any, Bool, Dict, Instance, Integer, List, Unicode, TraitError, |
|
31 | Any, Bool, Dict, Instance, Integer, List, Unicode, TraitError, | |
32 | ) |
|
32 | ) | |
33 | from IPython.utils.warn import warn |
|
33 | from IPython.utils.warn import warn | |
34 |
|
34 | |||
35 | #----------------------------------------------------------------------------- |
|
35 | #----------------------------------------------------------------------------- | |
36 | # Classes and functions |
|
36 | # Classes and functions | |
37 | #----------------------------------------------------------------------------- |
|
37 | #----------------------------------------------------------------------------- | |
38 |
|
38 | |||
39 | class DummyDB(object): |
|
39 | class DummyDB(object): | |
40 | """Dummy DB that will act as a black hole for history. |
|
40 | """Dummy DB that will act as a black hole for history. | |
41 |
|
41 | |||
42 | Only used in the absence of sqlite""" |
|
42 | Only used in the absence of sqlite""" | |
43 | def execute(*args, **kwargs): |
|
43 | def execute(*args, **kwargs): | |
44 | return [] |
|
44 | return [] | |
45 |
|
45 | |||
46 | def commit(self, *args, **kwargs): |
|
46 | def commit(self, *args, **kwargs): | |
47 | pass |
|
47 | pass | |
48 |
|
48 | |||
49 | def __enter__(self, *args, **kwargs): |
|
49 | def __enter__(self, *args, **kwargs): | |
50 | pass |
|
50 | pass | |
51 |
|
51 | |||
52 | def __exit__(self, *args, **kwargs): |
|
52 | def __exit__(self, *args, **kwargs): | |
53 | pass |
|
53 | pass | |
54 |
|
54 | |||
55 |
|
55 | |||
56 | @decorator |
|
56 | @decorator | |
57 | def needs_sqlite(f, self, *a, **kw): |
|
57 | def needs_sqlite(f, self, *a, **kw): | |
58 | """return an empty list in the absence of sqlite""" |
|
58 | """return an empty list in the absence of sqlite""" | |
59 | if sqlite3 is None or not self.enabled: |
|
59 | if sqlite3 is None or not self.enabled: | |
60 | return [] |
|
60 | return [] | |
61 | else: |
|
61 | else: | |
62 | return f(self, *a, **kw) |
|
62 | return f(self, *a, **kw) | |
63 |
|
63 | |||
64 |
|
64 | |||
65 | class HistoryAccessor(Configurable): |
|
65 | class HistoryAccessor(Configurable): | |
66 | """Access the history database without adding to it. |
|
66 | """Access the history database without adding to it. | |
67 |
|
67 | |||
68 | This is intended for use by standalone history tools. IPython shells use |
|
68 | This is intended for use by standalone history tools. IPython shells use | |
69 | HistoryManager, below, which is a subclass of this.""" |
|
69 | HistoryManager, below, which is a subclass of this.""" | |
70 |
|
70 | |||
71 | # String holding the path to the history file |
|
71 | # String holding the path to the history file | |
72 | hist_file = Unicode(config=True, |
|
72 | hist_file = Unicode(config=True, | |
73 | help="""Path to file to use for SQLite history database. |
|
73 | help="""Path to file to use for SQLite history database. | |
74 |
|
74 | |||
75 | By default, IPython will put the history database in the IPython |
|
75 | By default, IPython will put the history database in the IPython | |
76 | profile directory. If you would rather share one history among |
|
76 | profile directory. If you would rather share one history among | |
77 | profiles, you can set this value in each, so that they are consistent. |
|
77 | profiles, you can set this value in each, so that they are consistent. | |
78 |
|
78 | |||
79 | Due to an issue with fcntl, SQLite is known to misbehave on some NFS |
|
79 | Due to an issue with fcntl, SQLite is known to misbehave on some NFS | |
80 | mounts. If you see IPython hanging, try setting this to something on a |
|
80 | mounts. If you see IPython hanging, try setting this to something on a | |
81 | local disk, e.g:: |
|
81 | local disk, e.g:: | |
82 |
|
82 | |||
83 | ipython --HistoryManager.hist_file=/tmp/ipython_hist.sqlite |
|
83 | ipython --HistoryManager.hist_file=/tmp/ipython_hist.sqlite | |
84 |
|
84 | |||
85 | """) |
|
85 | """) | |
86 |
|
86 | |||
87 | enabled = Bool(True, config=True, |
|
87 | enabled = Bool(True, config=True, | |
88 | help="""enable the SQLite history |
|
88 | help="""enable the SQLite history | |
89 |
|
89 | |||
90 | set enabled=False to disable the SQLite history, |
|
90 | set enabled=False to disable the SQLite history, | |
91 | in which case there will be no stored history, no SQLite connection, |
|
91 | in which case there will be no stored history, no SQLite connection, | |
92 | and no background saving thread. This may be necessary in some |
|
92 | and no background saving thread. This may be necessary in some | |
93 | threaded environments where IPython is embedded. |
|
93 | threaded environments where IPython is embedded. | |
94 | """ |
|
94 | """ | |
95 | ) |
|
95 | ) | |
96 |
|
96 | |||
97 | connection_options = Dict(config=True, |
|
97 | connection_options = Dict(config=True, | |
98 | help="""Options for configuring the SQLite connection |
|
98 | help="""Options for configuring the SQLite connection | |
99 |
|
99 | |||
100 | These options are passed as keyword args to sqlite3.connect |
|
100 | These options are passed as keyword args to sqlite3.connect | |
101 | when establishing database conenctions. |
|
101 | when establishing database conenctions. | |
102 | """ |
|
102 | """ | |
103 | ) |
|
103 | ) | |
104 |
|
104 | |||
105 | # The SQLite database |
|
105 | # The SQLite database | |
106 | db = Any() |
|
106 | db = Any() | |
107 | def _db_changed(self, name, old, new): |
|
107 | def _db_changed(self, name, old, new): | |
108 | """validate the db, since it can be an Instance of two different types""" |
|
108 | """validate the db, since it can be an Instance of two different types""" | |
109 | if not isinstance(new, (sqlite3.Connection, DummyDB)): |
|
109 | if not isinstance(new, (sqlite3.Connection, DummyDB)): | |
110 | msg = "%s.db must be sqlite3 Connection or DummyDB, not %r" % \ |
|
110 | msg = "%s.db must be sqlite3 Connection or DummyDB, not %r" % \ | |
111 | (self.__class__.__name__, new) |
|
111 | (self.__class__.__name__, new) | |
112 | raise TraitError(msg) |
|
112 | raise TraitError(msg) | |
113 |
|
113 | |||
114 | def __init__(self, profile='default', hist_file=u'', config=None, **traits): |
|
114 | def __init__(self, profile='default', hist_file=u'', config=None, **traits): | |
115 | """Create a new history accessor. |
|
115 | """Create a new history accessor. | |
116 |
|
116 | |||
117 | Parameters |
|
117 | Parameters | |
118 | ---------- |
|
118 | ---------- | |
119 | profile : str |
|
119 | profile : str | |
120 | The name of the profile from which to open history. |
|
120 | The name of the profile from which to open history. | |
121 | hist_file : str |
|
121 | hist_file : str | |
122 | Path to an SQLite history database stored by IPython. If specified, |
|
122 | Path to an SQLite history database stored by IPython. If specified, | |
123 | hist_file overrides profile. |
|
123 | hist_file overrides profile. | |
124 | config : |
|
124 | config : | |
125 | Config object. hist_file can also be set through this. |
|
125 | Config object. hist_file can also be set through this. | |
126 | """ |
|
126 | """ | |
127 | # We need a pointer back to the shell for various tasks. |
|
127 | # We need a pointer back to the shell for various tasks. | |
128 | super(HistoryAccessor, self).__init__(config=config, **traits) |
|
128 | super(HistoryAccessor, self).__init__(config=config, **traits) | |
129 | # defer setting hist_file from kwarg until after init, |
|
129 | # defer setting hist_file from kwarg until after init, | |
130 | # otherwise the default kwarg value would clobber any value |
|
130 | # otherwise the default kwarg value would clobber any value | |
131 | # set by config |
|
131 | # set by config | |
132 | if hist_file: |
|
132 | if hist_file: | |
133 | self.hist_file = hist_file |
|
133 | self.hist_file = hist_file | |
134 |
|
134 | |||
135 | if self.hist_file == u'': |
|
135 | if self.hist_file == u'': | |
136 | # No one has set the hist_file, yet. |
|
136 | # No one has set the hist_file, yet. | |
137 | self.hist_file = self._get_hist_file_name(profile) |
|
137 | self.hist_file = self._get_hist_file_name(profile) | |
138 |
|
138 | |||
139 | if sqlite3 is None and self.enabled: |
|
139 | if sqlite3 is None and self.enabled: | |
140 |
warn("IPython History requires SQLite, your history will not be saved |
|
140 | warn("IPython History requires SQLite, your history will not be saved") | |
141 | self.enabled = False |
|
141 | self.enabled = False | |
142 |
|
142 | |||
143 | if sqlite3 is not None: |
|
143 | if sqlite3 is not None: | |
144 | DatabaseError = sqlite3.DatabaseError |
|
144 | DatabaseError = sqlite3.DatabaseError | |
145 | else: |
|
145 | else: | |
146 | DatabaseError = Exception |
|
146 | DatabaseError = Exception | |
147 |
|
147 | |||
148 | try: |
|
148 | try: | |
149 | self.init_db() |
|
149 | self.init_db() | |
150 | except DatabaseError: |
|
150 | except DatabaseError: | |
151 | if os.path.isfile(self.hist_file): |
|
151 | if os.path.isfile(self.hist_file): | |
152 | # Try to move the file out of the way |
|
152 | # Try to move the file out of the way | |
153 | base,ext = os.path.splitext(self.hist_file) |
|
153 | base,ext = os.path.splitext(self.hist_file) | |
154 | newpath = base + '-corrupt' + ext |
|
154 | newpath = base + '-corrupt' + ext | |
155 | os.rename(self.hist_file, newpath) |
|
155 | os.rename(self.hist_file, newpath) | |
156 | print("ERROR! History file wasn't a valid SQLite database.", |
|
156 | print("ERROR! History file wasn't a valid SQLite database.", | |
157 | "It was moved to %s" % newpath, "and a new file created.") |
|
157 | "It was moved to %s" % newpath, "and a new file created.") | |
158 | self.init_db() |
|
158 | self.init_db() | |
159 | else: |
|
159 | else: | |
160 | # The hist_file is probably :memory: or something else. |
|
160 | # The hist_file is probably :memory: or something else. | |
161 | raise |
|
161 | raise | |
162 |
|
162 | |||
163 | def _get_hist_file_name(self, profile='default'): |
|
163 | def _get_hist_file_name(self, profile='default'): | |
164 | """Find the history file for the given profile name. |
|
164 | """Find the history file for the given profile name. | |
165 |
|
165 | |||
166 | This is overridden by the HistoryManager subclass, to use the shell's |
|
166 | This is overridden by the HistoryManager subclass, to use the shell's | |
167 | active profile. |
|
167 | active profile. | |
168 |
|
168 | |||
169 | Parameters |
|
169 | Parameters | |
170 | ---------- |
|
170 | ---------- | |
171 | profile : str |
|
171 | profile : str | |
172 | The name of a profile which has a history file. |
|
172 | The name of a profile which has a history file. | |
173 | """ |
|
173 | """ | |
174 | return os.path.join(locate_profile(profile), 'history.sqlite') |
|
174 | return os.path.join(locate_profile(profile), 'history.sqlite') | |
175 |
|
175 | |||
176 | def init_db(self): |
|
176 | def init_db(self): | |
177 | """Connect to the database, and create tables if necessary.""" |
|
177 | """Connect to the database, and create tables if necessary.""" | |
178 | if not self.enabled: |
|
178 | if not self.enabled: | |
179 | self.db = DummyDB() |
|
179 | self.db = DummyDB() | |
180 | return |
|
180 | return | |
181 |
|
181 | |||
182 | # use detect_types so that timestamps return datetime objects |
|
182 | # use detect_types so that timestamps return datetime objects | |
183 | kwargs = dict(detect_types=sqlite3.PARSE_DECLTYPES|sqlite3.PARSE_COLNAMES) |
|
183 | kwargs = dict(detect_types=sqlite3.PARSE_DECLTYPES|sqlite3.PARSE_COLNAMES) | |
184 | kwargs.update(self.connection_options) |
|
184 | kwargs.update(self.connection_options) | |
185 | self.db = sqlite3.connect(self.hist_file, **kwargs) |
|
185 | self.db = sqlite3.connect(self.hist_file, **kwargs) | |
186 | self.db.execute("""CREATE TABLE IF NOT EXISTS sessions (session integer |
|
186 | self.db.execute("""CREATE TABLE IF NOT EXISTS sessions (session integer | |
187 | primary key autoincrement, start timestamp, |
|
187 | primary key autoincrement, start timestamp, | |
188 | end timestamp, num_cmds integer, remark text)""") |
|
188 | end timestamp, num_cmds integer, remark text)""") | |
189 | self.db.execute("""CREATE TABLE IF NOT EXISTS history |
|
189 | self.db.execute("""CREATE TABLE IF NOT EXISTS history | |
190 | (session integer, line integer, source text, source_raw text, |
|
190 | (session integer, line integer, source text, source_raw text, | |
191 | PRIMARY KEY (session, line))""") |
|
191 | PRIMARY KEY (session, line))""") | |
192 | # Output history is optional, but ensure the table's there so it can be |
|
192 | # Output history is optional, but ensure the table's there so it can be | |
193 | # enabled later. |
|
193 | # enabled later. | |
194 | self.db.execute("""CREATE TABLE IF NOT EXISTS output_history |
|
194 | self.db.execute("""CREATE TABLE IF NOT EXISTS output_history | |
195 | (session integer, line integer, output text, |
|
195 | (session integer, line integer, output text, | |
196 | PRIMARY KEY (session, line))""") |
|
196 | PRIMARY KEY (session, line))""") | |
197 | self.db.commit() |
|
197 | self.db.commit() | |
198 |
|
198 | |||
199 | def writeout_cache(self): |
|
199 | def writeout_cache(self): | |
200 | """Overridden by HistoryManager to dump the cache before certain |
|
200 | """Overridden by HistoryManager to dump the cache before certain | |
201 | database lookups.""" |
|
201 | database lookups.""" | |
202 | pass |
|
202 | pass | |
203 |
|
203 | |||
204 | ## ------------------------------- |
|
204 | ## ------------------------------- | |
205 | ## Methods for retrieving history: |
|
205 | ## Methods for retrieving history: | |
206 | ## ------------------------------- |
|
206 | ## ------------------------------- | |
207 | def _run_sql(self, sql, params, raw=True, output=False): |
|
207 | def _run_sql(self, sql, params, raw=True, output=False): | |
208 | """Prepares and runs an SQL query for the history database. |
|
208 | """Prepares and runs an SQL query for the history database. | |
209 |
|
209 | |||
210 | Parameters |
|
210 | Parameters | |
211 | ---------- |
|
211 | ---------- | |
212 | sql : str |
|
212 | sql : str | |
213 | Any filtering expressions to go after SELECT ... FROM ... |
|
213 | Any filtering expressions to go after SELECT ... FROM ... | |
214 | params : tuple |
|
214 | params : tuple | |
215 | Parameters passed to the SQL query (to replace "?") |
|
215 | Parameters passed to the SQL query (to replace "?") | |
216 | raw, output : bool |
|
216 | raw, output : bool | |
217 | See :meth:`get_range` |
|
217 | See :meth:`get_range` | |
218 |
|
218 | |||
219 | Returns |
|
219 | Returns | |
220 | ------- |
|
220 | ------- | |
221 | Tuples as :meth:`get_range` |
|
221 | Tuples as :meth:`get_range` | |
222 | """ |
|
222 | """ | |
223 | toget = 'source_raw' if raw else 'source' |
|
223 | toget = 'source_raw' if raw else 'source' | |
224 | sqlfrom = "history" |
|
224 | sqlfrom = "history" | |
225 | if output: |
|
225 | if output: | |
226 | sqlfrom = "history LEFT JOIN output_history USING (session, line)" |
|
226 | sqlfrom = "history LEFT JOIN output_history USING (session, line)" | |
227 | toget = "history.%s, output_history.output" % toget |
|
227 | toget = "history.%s, output_history.output" % toget | |
228 | cur = self.db.execute("SELECT session, line, %s FROM %s " %\ |
|
228 | cur = self.db.execute("SELECT session, line, %s FROM %s " %\ | |
229 | (toget, sqlfrom) + sql, params) |
|
229 | (toget, sqlfrom) + sql, params) | |
230 | if output: # Regroup into 3-tuples, and parse JSON |
|
230 | if output: # Regroup into 3-tuples, and parse JSON | |
231 | return ((ses, lin, (inp, out)) for ses, lin, inp, out in cur) |
|
231 | return ((ses, lin, (inp, out)) for ses, lin, inp, out in cur) | |
232 | return cur |
|
232 | return cur | |
233 |
|
233 | |||
234 | @needs_sqlite |
|
234 | @needs_sqlite | |
235 | def get_session_info(self, session=0): |
|
235 | def get_session_info(self, session=0): | |
236 | """get info about a session |
|
236 | """get info about a session | |
237 |
|
237 | |||
238 | Parameters |
|
238 | Parameters | |
239 | ---------- |
|
239 | ---------- | |
240 |
|
240 | |||
241 | session : int |
|
241 | session : int | |
242 | Session number to retrieve. The current session is 0, and negative |
|
242 | Session number to retrieve. The current session is 0, and negative | |
243 | numbers count back from current session, so -1 is previous session. |
|
243 | numbers count back from current session, so -1 is previous session. | |
244 |
|
244 | |||
245 | Returns |
|
245 | Returns | |
246 | ------- |
|
246 | ------- | |
247 |
|
247 | |||
248 | (session_id [int], start [datetime], end [datetime], num_cmds [int], |
|
248 | (session_id [int], start [datetime], end [datetime], num_cmds [int], | |
249 | remark [unicode]) |
|
249 | remark [unicode]) | |
250 |
|
250 | |||
251 | Sessions that are running or did not exit cleanly will have `end=None` |
|
251 | Sessions that are running or did not exit cleanly will have `end=None` | |
252 | and `num_cmds=None`. |
|
252 | and `num_cmds=None`. | |
253 |
|
253 | |||
254 | """ |
|
254 | """ | |
255 |
|
255 | |||
256 | if session <= 0: |
|
256 | if session <= 0: | |
257 | session += self.session_number |
|
257 | session += self.session_number | |
258 |
|
258 | |||
259 | query = "SELECT * from sessions where session == ?" |
|
259 | query = "SELECT * from sessions where session == ?" | |
260 | return self.db.execute(query, (session,)).fetchone() |
|
260 | return self.db.execute(query, (session,)).fetchone() | |
261 |
|
261 | |||
262 | def get_tail(self, n=10, raw=True, output=False, include_latest=False): |
|
262 | def get_tail(self, n=10, raw=True, output=False, include_latest=False): | |
263 | """Get the last n lines from the history database. |
|
263 | """Get the last n lines from the history database. | |
264 |
|
264 | |||
265 | Parameters |
|
265 | Parameters | |
266 | ---------- |
|
266 | ---------- | |
267 | n : int |
|
267 | n : int | |
268 | The number of lines to get |
|
268 | The number of lines to get | |
269 | raw, output : bool |
|
269 | raw, output : bool | |
270 | See :meth:`get_range` |
|
270 | See :meth:`get_range` | |
271 | include_latest : bool |
|
271 | include_latest : bool | |
272 | If False (default), n+1 lines are fetched, and the latest one |
|
272 | If False (default), n+1 lines are fetched, and the latest one | |
273 | is discarded. This is intended to be used where the function |
|
273 | is discarded. This is intended to be used where the function | |
274 | is called by a user command, which it should not return. |
|
274 | is called by a user command, which it should not return. | |
275 |
|
275 | |||
276 | Returns |
|
276 | Returns | |
277 | ------- |
|
277 | ------- | |
278 | Tuples as :meth:`get_range` |
|
278 | Tuples as :meth:`get_range` | |
279 | """ |
|
279 | """ | |
280 | self.writeout_cache() |
|
280 | self.writeout_cache() | |
281 | if not include_latest: |
|
281 | if not include_latest: | |
282 | n += 1 |
|
282 | n += 1 | |
283 | cur = self._run_sql("ORDER BY session DESC, line DESC LIMIT ?", |
|
283 | cur = self._run_sql("ORDER BY session DESC, line DESC LIMIT ?", | |
284 | (n,), raw=raw, output=output) |
|
284 | (n,), raw=raw, output=output) | |
285 | if not include_latest: |
|
285 | if not include_latest: | |
286 | return reversed(list(cur)[1:]) |
|
286 | return reversed(list(cur)[1:]) | |
287 | return reversed(list(cur)) |
|
287 | return reversed(list(cur)) | |
288 |
|
288 | |||
289 | def search(self, pattern="*", raw=True, search_raw=True, |
|
289 | def search(self, pattern="*", raw=True, search_raw=True, | |
290 | output=False): |
|
290 | output=False): | |
291 | """Search the database using unix glob-style matching (wildcards |
|
291 | """Search the database using unix glob-style matching (wildcards | |
292 | * and ?). |
|
292 | * and ?). | |
293 |
|
293 | |||
294 | Parameters |
|
294 | Parameters | |
295 | ---------- |
|
295 | ---------- | |
296 | pattern : str |
|
296 | pattern : str | |
297 | The wildcarded pattern to match when searching |
|
297 | The wildcarded pattern to match when searching | |
298 | search_raw : bool |
|
298 | search_raw : bool | |
299 | If True, search the raw input, otherwise, the parsed input |
|
299 | If True, search the raw input, otherwise, the parsed input | |
300 | raw, output : bool |
|
300 | raw, output : bool | |
301 | See :meth:`get_range` |
|
301 | See :meth:`get_range` | |
302 |
|
302 | |||
303 | Returns |
|
303 | Returns | |
304 | ------- |
|
304 | ------- | |
305 | Tuples as :meth:`get_range` |
|
305 | Tuples as :meth:`get_range` | |
306 | """ |
|
306 | """ | |
307 | tosearch = "source_raw" if search_raw else "source" |
|
307 | tosearch = "source_raw" if search_raw else "source" | |
308 | if output: |
|
308 | if output: | |
309 | tosearch = "history." + tosearch |
|
309 | tosearch = "history." + tosearch | |
310 | self.writeout_cache() |
|
310 | self.writeout_cache() | |
311 | return self._run_sql("WHERE %s GLOB ?" % tosearch, (pattern,), |
|
311 | return self._run_sql("WHERE %s GLOB ?" % tosearch, (pattern,), | |
312 | raw=raw, output=output) |
|
312 | raw=raw, output=output) | |
313 |
|
313 | |||
314 | def get_range(self, session, start=1, stop=None, raw=True,output=False): |
|
314 | def get_range(self, session, start=1, stop=None, raw=True,output=False): | |
315 | """Retrieve input by session. |
|
315 | """Retrieve input by session. | |
316 |
|
316 | |||
317 | Parameters |
|
317 | Parameters | |
318 | ---------- |
|
318 | ---------- | |
319 | session : int |
|
319 | session : int | |
320 | Session number to retrieve. |
|
320 | Session number to retrieve. | |
321 | start : int |
|
321 | start : int | |
322 | First line to retrieve. |
|
322 | First line to retrieve. | |
323 | stop : int |
|
323 | stop : int | |
324 | End of line range (excluded from output itself). If None, retrieve |
|
324 | End of line range (excluded from output itself). If None, retrieve | |
325 | to the end of the session. |
|
325 | to the end of the session. | |
326 | raw : bool |
|
326 | raw : bool | |
327 | If True, return untranslated input |
|
327 | If True, return untranslated input | |
328 | output : bool |
|
328 | output : bool | |
329 | If True, attempt to include output. This will be 'real' Python |
|
329 | If True, attempt to include output. This will be 'real' Python | |
330 | objects for the current session, or text reprs from previous |
|
330 | objects for the current session, or text reprs from previous | |
331 | sessions if db_log_output was enabled at the time. Where no output |
|
331 | sessions if db_log_output was enabled at the time. Where no output | |
332 | is found, None is used. |
|
332 | is found, None is used. | |
333 |
|
333 | |||
334 | Returns |
|
334 | Returns | |
335 | ------- |
|
335 | ------- | |
336 | An iterator over the desired lines. Each line is a 3-tuple, either |
|
336 | An iterator over the desired lines. Each line is a 3-tuple, either | |
337 | (session, line, input) if output is False, or |
|
337 | (session, line, input) if output is False, or | |
338 | (session, line, (input, output)) if output is True. |
|
338 | (session, line, (input, output)) if output is True. | |
339 | """ |
|
339 | """ | |
340 | if stop: |
|
340 | if stop: | |
341 | lineclause = "line >= ? AND line < ?" |
|
341 | lineclause = "line >= ? AND line < ?" | |
342 | params = (session, start, stop) |
|
342 | params = (session, start, stop) | |
343 | else: |
|
343 | else: | |
344 | lineclause = "line>=?" |
|
344 | lineclause = "line>=?" | |
345 | params = (session, start) |
|
345 | params = (session, start) | |
346 |
|
346 | |||
347 | return self._run_sql("WHERE session==? AND %s""" % lineclause, |
|
347 | return self._run_sql("WHERE session==? AND %s""" % lineclause, | |
348 | params, raw=raw, output=output) |
|
348 | params, raw=raw, output=output) | |
349 |
|
349 | |||
350 | def get_range_by_str(self, rangestr, raw=True, output=False): |
|
350 | def get_range_by_str(self, rangestr, raw=True, output=False): | |
351 | """Get lines of history from a string of ranges, as used by magic |
|
351 | """Get lines of history from a string of ranges, as used by magic | |
352 | commands %hist, %save, %macro, etc. |
|
352 | commands %hist, %save, %macro, etc. | |
353 |
|
353 | |||
354 | Parameters |
|
354 | Parameters | |
355 | ---------- |
|
355 | ---------- | |
356 | rangestr : str |
|
356 | rangestr : str | |
357 | A string specifying ranges, e.g. "5 ~2/1-4". See |
|
357 | A string specifying ranges, e.g. "5 ~2/1-4". See | |
358 | :func:`magic_history` for full details. |
|
358 | :func:`magic_history` for full details. | |
359 | raw, output : bool |
|
359 | raw, output : bool | |
360 | As :meth:`get_range` |
|
360 | As :meth:`get_range` | |
361 |
|
361 | |||
362 | Returns |
|
362 | Returns | |
363 | ------- |
|
363 | ------- | |
364 | Tuples as :meth:`get_range` |
|
364 | Tuples as :meth:`get_range` | |
365 | """ |
|
365 | """ | |
366 | for sess, s, e in extract_hist_ranges(rangestr): |
|
366 | for sess, s, e in extract_hist_ranges(rangestr): | |
367 | for line in self.get_range(sess, s, e, raw=raw, output=output): |
|
367 | for line in self.get_range(sess, s, e, raw=raw, output=output): | |
368 | yield line |
|
368 | yield line | |
369 |
|
369 | |||
370 |
|
370 | |||
371 | class HistoryManager(HistoryAccessor): |
|
371 | class HistoryManager(HistoryAccessor): | |
372 | """A class to organize all history-related functionality in one place. |
|
372 | """A class to organize all history-related functionality in one place. | |
373 | """ |
|
373 | """ | |
374 | # Public interface |
|
374 | # Public interface | |
375 |
|
375 | |||
376 | # An instance of the IPython shell we are attached to |
|
376 | # An instance of the IPython shell we are attached to | |
377 | shell = Instance('IPython.core.interactiveshell.InteractiveShellABC') |
|
377 | shell = Instance('IPython.core.interactiveshell.InteractiveShellABC') | |
378 | # Lists to hold processed and raw history. These start with a blank entry |
|
378 | # Lists to hold processed and raw history. These start with a blank entry | |
379 | # so that we can index them starting from 1 |
|
379 | # so that we can index them starting from 1 | |
380 | input_hist_parsed = List([""]) |
|
380 | input_hist_parsed = List([""]) | |
381 | input_hist_raw = List([""]) |
|
381 | input_hist_raw = List([""]) | |
382 | # A list of directories visited during session |
|
382 | # A list of directories visited during session | |
383 | dir_hist = List() |
|
383 | dir_hist = List() | |
384 | def _dir_hist_default(self): |
|
384 | def _dir_hist_default(self): | |
385 | try: |
|
385 | try: | |
386 | return [os.getcwdu()] |
|
386 | return [os.getcwdu()] | |
387 | except OSError: |
|
387 | except OSError: | |
388 | return [] |
|
388 | return [] | |
389 |
|
389 | |||
390 | # A dict of output history, keyed with ints from the shell's |
|
390 | # A dict of output history, keyed with ints from the shell's | |
391 | # execution count. |
|
391 | # execution count. | |
392 | output_hist = Dict() |
|
392 | output_hist = Dict() | |
393 | # The text/plain repr of outputs. |
|
393 | # The text/plain repr of outputs. | |
394 | output_hist_reprs = Dict() |
|
394 | output_hist_reprs = Dict() | |
395 |
|
395 | |||
396 | # The number of the current session in the history database |
|
396 | # The number of the current session in the history database | |
397 | session_number = Integer() |
|
397 | session_number = Integer() | |
398 | # Should we log output to the database? (default no) |
|
398 | # Should we log output to the database? (default no) | |
399 | db_log_output = Bool(False, config=True) |
|
399 | db_log_output = Bool(False, config=True) | |
400 | # Write to database every x commands (higher values save disk access & power) |
|
400 | # Write to database every x commands (higher values save disk access & power) | |
401 | # Values of 1 or less effectively disable caching. |
|
401 | # Values of 1 or less effectively disable caching. | |
402 | db_cache_size = Integer(0, config=True) |
|
402 | db_cache_size = Integer(0, config=True) | |
403 | # The input and output caches |
|
403 | # The input and output caches | |
404 | db_input_cache = List() |
|
404 | db_input_cache = List() | |
405 | db_output_cache = List() |
|
405 | db_output_cache = List() | |
406 |
|
406 | |||
407 | # History saving in separate thread |
|
407 | # History saving in separate thread | |
408 | save_thread = Instance('IPython.core.history.HistorySavingThread') |
|
408 | save_thread = Instance('IPython.core.history.HistorySavingThread') | |
409 | try: # Event is a function returning an instance of _Event... |
|
409 | try: # Event is a function returning an instance of _Event... | |
410 | save_flag = Instance(threading._Event) |
|
410 | save_flag = Instance(threading._Event) | |
411 | except AttributeError: # ...until Python 3.3, when it's a class. |
|
411 | except AttributeError: # ...until Python 3.3, when it's a class. | |
412 | save_flag = Instance(threading.Event) |
|
412 | save_flag = Instance(threading.Event) | |
413 |
|
413 | |||
414 | # Private interface |
|
414 | # Private interface | |
415 | # Variables used to store the three last inputs from the user. On each new |
|
415 | # Variables used to store the three last inputs from the user. On each new | |
416 | # history update, we populate the user's namespace with these, shifted as |
|
416 | # history update, we populate the user's namespace with these, shifted as | |
417 | # necessary. |
|
417 | # necessary. | |
418 | _i00 = Unicode(u'') |
|
418 | _i00 = Unicode(u'') | |
419 | _i = Unicode(u'') |
|
419 | _i = Unicode(u'') | |
420 | _ii = Unicode(u'') |
|
420 | _ii = Unicode(u'') | |
421 | _iii = Unicode(u'') |
|
421 | _iii = Unicode(u'') | |
422 |
|
422 | |||
423 | # A regex matching all forms of the exit command, so that we don't store |
|
423 | # A regex matching all forms of the exit command, so that we don't store | |
424 | # them in the history (it's annoying to rewind the first entry and land on |
|
424 | # them in the history (it's annoying to rewind the first entry and land on | |
425 | # an exit call). |
|
425 | # an exit call). | |
426 | _exit_re = re.compile(r"(exit|quit)(\s*\(.*\))?$") |
|
426 | _exit_re = re.compile(r"(exit|quit)(\s*\(.*\))?$") | |
427 |
|
427 | |||
428 | def __init__(self, shell=None, config=None, **traits): |
|
428 | def __init__(self, shell=None, config=None, **traits): | |
429 | """Create a new history manager associated with a shell instance. |
|
429 | """Create a new history manager associated with a shell instance. | |
430 | """ |
|
430 | """ | |
431 | # We need a pointer back to the shell for various tasks. |
|
431 | # We need a pointer back to the shell for various tasks. | |
432 | super(HistoryManager, self).__init__(shell=shell, config=config, |
|
432 | super(HistoryManager, self).__init__(shell=shell, config=config, | |
433 | **traits) |
|
433 | **traits) | |
434 | self.save_flag = threading.Event() |
|
434 | self.save_flag = threading.Event() | |
435 | self.db_input_cache_lock = threading.Lock() |
|
435 | self.db_input_cache_lock = threading.Lock() | |
436 | self.db_output_cache_lock = threading.Lock() |
|
436 | self.db_output_cache_lock = threading.Lock() | |
437 | if self.enabled and self.hist_file != ':memory:': |
|
437 | if self.enabled and self.hist_file != ':memory:': | |
438 | self.save_thread = HistorySavingThread(self) |
|
438 | self.save_thread = HistorySavingThread(self) | |
439 | self.save_thread.start() |
|
439 | self.save_thread.start() | |
440 |
|
440 | |||
441 | self.new_session() |
|
441 | self.new_session() | |
442 |
|
442 | |||
443 | def _get_hist_file_name(self, profile=None): |
|
443 | def _get_hist_file_name(self, profile=None): | |
444 | """Get default history file name based on the Shell's profile. |
|
444 | """Get default history file name based on the Shell's profile. | |
445 |
|
445 | |||
446 | The profile parameter is ignored, but must exist for compatibility with |
|
446 | The profile parameter is ignored, but must exist for compatibility with | |
447 | the parent class.""" |
|
447 | the parent class.""" | |
448 | profile_dir = self.shell.profile_dir.location |
|
448 | profile_dir = self.shell.profile_dir.location | |
449 | return os.path.join(profile_dir, 'history.sqlite') |
|
449 | return os.path.join(profile_dir, 'history.sqlite') | |
450 |
|
450 | |||
451 | @needs_sqlite |
|
451 | @needs_sqlite | |
452 | def new_session(self, conn=None): |
|
452 | def new_session(self, conn=None): | |
453 | """Get a new session number.""" |
|
453 | """Get a new session number.""" | |
454 | if conn is None: |
|
454 | if conn is None: | |
455 | conn = self.db |
|
455 | conn = self.db | |
456 |
|
456 | |||
457 | with conn: |
|
457 | with conn: | |
458 | cur = conn.execute("""INSERT INTO sessions VALUES (NULL, ?, NULL, |
|
458 | cur = conn.execute("""INSERT INTO sessions VALUES (NULL, ?, NULL, | |
459 | NULL, "") """, (datetime.datetime.now(),)) |
|
459 | NULL, "") """, (datetime.datetime.now(),)) | |
460 | self.session_number = cur.lastrowid |
|
460 | self.session_number = cur.lastrowid | |
461 |
|
461 | |||
462 | def end_session(self): |
|
462 | def end_session(self): | |
463 | """Close the database session, filling in the end time and line count.""" |
|
463 | """Close the database session, filling in the end time and line count.""" | |
464 | self.writeout_cache() |
|
464 | self.writeout_cache() | |
465 | with self.db: |
|
465 | with self.db: | |
466 | self.db.execute("""UPDATE sessions SET end=?, num_cmds=? WHERE |
|
466 | self.db.execute("""UPDATE sessions SET end=?, num_cmds=? WHERE | |
467 | session==?""", (datetime.datetime.now(), |
|
467 | session==?""", (datetime.datetime.now(), | |
468 | len(self.input_hist_parsed)-1, self.session_number)) |
|
468 | len(self.input_hist_parsed)-1, self.session_number)) | |
469 | self.session_number = 0 |
|
469 | self.session_number = 0 | |
470 |
|
470 | |||
471 | def name_session(self, name): |
|
471 | def name_session(self, name): | |
472 | """Give the current session a name in the history database.""" |
|
472 | """Give the current session a name in the history database.""" | |
473 | with self.db: |
|
473 | with self.db: | |
474 | self.db.execute("UPDATE sessions SET remark=? WHERE session==?", |
|
474 | self.db.execute("UPDATE sessions SET remark=? WHERE session==?", | |
475 | (name, self.session_number)) |
|
475 | (name, self.session_number)) | |
476 |
|
476 | |||
477 | def reset(self, new_session=True): |
|
477 | def reset(self, new_session=True): | |
478 | """Clear the session history, releasing all object references, and |
|
478 | """Clear the session history, releasing all object references, and | |
479 | optionally open a new session.""" |
|
479 | optionally open a new session.""" | |
480 | self.output_hist.clear() |
|
480 | self.output_hist.clear() | |
481 | # The directory history can't be completely empty |
|
481 | # The directory history can't be completely empty | |
482 | self.dir_hist[:] = [os.getcwdu()] |
|
482 | self.dir_hist[:] = [os.getcwdu()] | |
483 |
|
483 | |||
484 | if new_session: |
|
484 | if new_session: | |
485 | if self.session_number: |
|
485 | if self.session_number: | |
486 | self.end_session() |
|
486 | self.end_session() | |
487 | self.input_hist_parsed[:] = [""] |
|
487 | self.input_hist_parsed[:] = [""] | |
488 | self.input_hist_raw[:] = [""] |
|
488 | self.input_hist_raw[:] = [""] | |
489 | self.new_session() |
|
489 | self.new_session() | |
490 |
|
490 | |||
491 | # ------------------------------ |
|
491 | # ------------------------------ | |
492 | # Methods for retrieving history |
|
492 | # Methods for retrieving history | |
493 | # ------------------------------ |
|
493 | # ------------------------------ | |
494 | def _get_range_session(self, start=1, stop=None, raw=True, output=False): |
|
494 | def _get_range_session(self, start=1, stop=None, raw=True, output=False): | |
495 | """Get input and output history from the current session. Called by |
|
495 | """Get input and output history from the current session. Called by | |
496 | get_range, and takes similar parameters.""" |
|
496 | get_range, and takes similar parameters.""" | |
497 | input_hist = self.input_hist_raw if raw else self.input_hist_parsed |
|
497 | input_hist = self.input_hist_raw if raw else self.input_hist_parsed | |
498 |
|
498 | |||
499 | n = len(input_hist) |
|
499 | n = len(input_hist) | |
500 | if start < 0: |
|
500 | if start < 0: | |
501 | start += n |
|
501 | start += n | |
502 | if not stop or (stop > n): |
|
502 | if not stop or (stop > n): | |
503 | stop = n |
|
503 | stop = n | |
504 | elif stop < 0: |
|
504 | elif stop < 0: | |
505 | stop += n |
|
505 | stop += n | |
506 |
|
506 | |||
507 | for i in range(start, stop): |
|
507 | for i in range(start, stop): | |
508 | if output: |
|
508 | if output: | |
509 | line = (input_hist[i], self.output_hist_reprs.get(i)) |
|
509 | line = (input_hist[i], self.output_hist_reprs.get(i)) | |
510 | else: |
|
510 | else: | |
511 | line = input_hist[i] |
|
511 | line = input_hist[i] | |
512 | yield (0, i, line) |
|
512 | yield (0, i, line) | |
513 |
|
513 | |||
514 | def get_range(self, session=0, start=1, stop=None, raw=True,output=False): |
|
514 | def get_range(self, session=0, start=1, stop=None, raw=True,output=False): | |
515 | """Retrieve input by session. |
|
515 | """Retrieve input by session. | |
516 |
|
516 | |||
517 | Parameters |
|
517 | Parameters | |
518 | ---------- |
|
518 | ---------- | |
519 | session : int |
|
519 | session : int | |
520 | Session number to retrieve. The current session is 0, and negative |
|
520 | Session number to retrieve. The current session is 0, and negative | |
521 | numbers count back from current session, so -1 is previous session. |
|
521 | numbers count back from current session, so -1 is previous session. | |
522 | start : int |
|
522 | start : int | |
523 | First line to retrieve. |
|
523 | First line to retrieve. | |
524 | stop : int |
|
524 | stop : int | |
525 | End of line range (excluded from output itself). If None, retrieve |
|
525 | End of line range (excluded from output itself). If None, retrieve | |
526 | to the end of the session. |
|
526 | to the end of the session. | |
527 | raw : bool |
|
527 | raw : bool | |
528 | If True, return untranslated input |
|
528 | If True, return untranslated input | |
529 | output : bool |
|
529 | output : bool | |
530 | If True, attempt to include output. This will be 'real' Python |
|
530 | If True, attempt to include output. This will be 'real' Python | |
531 | objects for the current session, or text reprs from previous |
|
531 | objects for the current session, or text reprs from previous | |
532 | sessions if db_log_output was enabled at the time. Where no output |
|
532 | sessions if db_log_output was enabled at the time. Where no output | |
533 | is found, None is used. |
|
533 | is found, None is used. | |
534 |
|
534 | |||
535 | Returns |
|
535 | Returns | |
536 | ------- |
|
536 | ------- | |
537 | An iterator over the desired lines. Each line is a 3-tuple, either |
|
537 | An iterator over the desired lines. Each line is a 3-tuple, either | |
538 | (session, line, input) if output is False, or |
|
538 | (session, line, input) if output is False, or | |
539 | (session, line, (input, output)) if output is True. |
|
539 | (session, line, (input, output)) if output is True. | |
540 | """ |
|
540 | """ | |
541 | if session <= 0: |
|
541 | if session <= 0: | |
542 | session += self.session_number |
|
542 | session += self.session_number | |
543 | if session==self.session_number: # Current session |
|
543 | if session==self.session_number: # Current session | |
544 | return self._get_range_session(start, stop, raw, output) |
|
544 | return self._get_range_session(start, stop, raw, output) | |
545 | return super(HistoryManager, self).get_range(session, start, stop, raw, |
|
545 | return super(HistoryManager, self).get_range(session, start, stop, raw, | |
546 | output) |
|
546 | output) | |
547 |
|
547 | |||
548 | ## ---------------------------- |
|
548 | ## ---------------------------- | |
549 | ## Methods for storing history: |
|
549 | ## Methods for storing history: | |
550 | ## ---------------------------- |
|
550 | ## ---------------------------- | |
551 | def store_inputs(self, line_num, source, source_raw=None): |
|
551 | def store_inputs(self, line_num, source, source_raw=None): | |
552 | """Store source and raw input in history and create input cache |
|
552 | """Store source and raw input in history and create input cache | |
553 | variables _i*. |
|
553 | variables _i*. | |
554 |
|
554 | |||
555 | Parameters |
|
555 | Parameters | |
556 | ---------- |
|
556 | ---------- | |
557 | line_num : int |
|
557 | line_num : int | |
558 | The prompt number of this input. |
|
558 | The prompt number of this input. | |
559 |
|
559 | |||
560 | source : str |
|
560 | source : str | |
561 | Python input. |
|
561 | Python input. | |
562 |
|
562 | |||
563 | source_raw : str, optional |
|
563 | source_raw : str, optional | |
564 | If given, this is the raw input without any IPython transformations |
|
564 | If given, this is the raw input without any IPython transformations | |
565 | applied to it. If not given, ``source`` is used. |
|
565 | applied to it. If not given, ``source`` is used. | |
566 | """ |
|
566 | """ | |
567 | if source_raw is None: |
|
567 | if source_raw is None: | |
568 | source_raw = source |
|
568 | source_raw = source | |
569 | source = source.rstrip('\n') |
|
569 | source = source.rstrip('\n') | |
570 | source_raw = source_raw.rstrip('\n') |
|
570 | source_raw = source_raw.rstrip('\n') | |
571 |
|
571 | |||
572 | # do not store exit/quit commands |
|
572 | # do not store exit/quit commands | |
573 | if self._exit_re.match(source_raw.strip()): |
|
573 | if self._exit_re.match(source_raw.strip()): | |
574 | return |
|
574 | return | |
575 |
|
575 | |||
576 | self.input_hist_parsed.append(source) |
|
576 | self.input_hist_parsed.append(source) | |
577 | self.input_hist_raw.append(source_raw) |
|
577 | self.input_hist_raw.append(source_raw) | |
578 |
|
578 | |||
579 | with self.db_input_cache_lock: |
|
579 | with self.db_input_cache_lock: | |
580 | self.db_input_cache.append((line_num, source, source_raw)) |
|
580 | self.db_input_cache.append((line_num, source, source_raw)) | |
581 | # Trigger to flush cache and write to DB. |
|
581 | # Trigger to flush cache and write to DB. | |
582 | if len(self.db_input_cache) >= self.db_cache_size: |
|
582 | if len(self.db_input_cache) >= self.db_cache_size: | |
583 | self.save_flag.set() |
|
583 | self.save_flag.set() | |
584 |
|
584 | |||
585 | # update the auto _i variables |
|
585 | # update the auto _i variables | |
586 | self._iii = self._ii |
|
586 | self._iii = self._ii | |
587 | self._ii = self._i |
|
587 | self._ii = self._i | |
588 | self._i = self._i00 |
|
588 | self._i = self._i00 | |
589 | self._i00 = source_raw |
|
589 | self._i00 = source_raw | |
590 |
|
590 | |||
591 | # hackish access to user namespace to create _i1,_i2... dynamically |
|
591 | # hackish access to user namespace to create _i1,_i2... dynamically | |
592 | new_i = '_i%s' % line_num |
|
592 | new_i = '_i%s' % line_num | |
593 | to_main = {'_i': self._i, |
|
593 | to_main = {'_i': self._i, | |
594 | '_ii': self._ii, |
|
594 | '_ii': self._ii, | |
595 | '_iii': self._iii, |
|
595 | '_iii': self._iii, | |
596 | new_i : self._i00 } |
|
596 | new_i : self._i00 } | |
597 |
|
597 | |||
598 | self.shell.push(to_main, interactive=False) |
|
598 | self.shell.push(to_main, interactive=False) | |
599 |
|
599 | |||
600 | def store_output(self, line_num): |
|
600 | def store_output(self, line_num): | |
601 | """If database output logging is enabled, this saves all the |
|
601 | """If database output logging is enabled, this saves all the | |
602 | outputs from the indicated prompt number to the database. It's |
|
602 | outputs from the indicated prompt number to the database. It's | |
603 | called by run_cell after code has been executed. |
|
603 | called by run_cell after code has been executed. | |
604 |
|
604 | |||
605 | Parameters |
|
605 | Parameters | |
606 | ---------- |
|
606 | ---------- | |
607 | line_num : int |
|
607 | line_num : int | |
608 | The line number from which to save outputs |
|
608 | The line number from which to save outputs | |
609 | """ |
|
609 | """ | |
610 | if (not self.db_log_output) or (line_num not in self.output_hist_reprs): |
|
610 | if (not self.db_log_output) or (line_num not in self.output_hist_reprs): | |
611 | return |
|
611 | return | |
612 | output = self.output_hist_reprs[line_num] |
|
612 | output = self.output_hist_reprs[line_num] | |
613 |
|
613 | |||
614 | with self.db_output_cache_lock: |
|
614 | with self.db_output_cache_lock: | |
615 | self.db_output_cache.append((line_num, output)) |
|
615 | self.db_output_cache.append((line_num, output)) | |
616 | if self.db_cache_size <= 1: |
|
616 | if self.db_cache_size <= 1: | |
617 | self.save_flag.set() |
|
617 | self.save_flag.set() | |
618 |
|
618 | |||
619 | def _writeout_input_cache(self, conn): |
|
619 | def _writeout_input_cache(self, conn): | |
620 | with conn: |
|
620 | with conn: | |
621 | for line in self.db_input_cache: |
|
621 | for line in self.db_input_cache: | |
622 | conn.execute("INSERT INTO history VALUES (?, ?, ?, ?)", |
|
622 | conn.execute("INSERT INTO history VALUES (?, ?, ?, ?)", | |
623 | (self.session_number,)+line) |
|
623 | (self.session_number,)+line) | |
624 |
|
624 | |||
625 | def _writeout_output_cache(self, conn): |
|
625 | def _writeout_output_cache(self, conn): | |
626 | with conn: |
|
626 | with conn: | |
627 | for line in self.db_output_cache: |
|
627 | for line in self.db_output_cache: | |
628 | conn.execute("INSERT INTO output_history VALUES (?, ?, ?)", |
|
628 | conn.execute("INSERT INTO output_history VALUES (?, ?, ?)", | |
629 | (self.session_number,)+line) |
|
629 | (self.session_number,)+line) | |
630 |
|
630 | |||
631 | @needs_sqlite |
|
631 | @needs_sqlite | |
632 | def writeout_cache(self, conn=None): |
|
632 | def writeout_cache(self, conn=None): | |
633 | """Write any entries in the cache to the database.""" |
|
633 | """Write any entries in the cache to the database.""" | |
634 | if conn is None: |
|
634 | if conn is None: | |
635 | conn = self.db |
|
635 | conn = self.db | |
636 |
|
636 | |||
637 | with self.db_input_cache_lock: |
|
637 | with self.db_input_cache_lock: | |
638 | try: |
|
638 | try: | |
639 | self._writeout_input_cache(conn) |
|
639 | self._writeout_input_cache(conn) | |
640 | except sqlite3.IntegrityError: |
|
640 | except sqlite3.IntegrityError: | |
641 | self.new_session(conn) |
|
641 | self.new_session(conn) | |
642 | print("ERROR! Session/line number was not unique in", |
|
642 | print("ERROR! Session/line number was not unique in", | |
643 | "database. History logging moved to new session", |
|
643 | "database. History logging moved to new session", | |
644 | self.session_number) |
|
644 | self.session_number) | |
645 | try: |
|
645 | try: | |
646 | # Try writing to the new session. If this fails, don't |
|
646 | # Try writing to the new session. If this fails, don't | |
647 | # recurse |
|
647 | # recurse | |
648 | self._writeout_input_cache(conn) |
|
648 | self._writeout_input_cache(conn) | |
649 | except sqlite3.IntegrityError: |
|
649 | except sqlite3.IntegrityError: | |
650 | pass |
|
650 | pass | |
651 | finally: |
|
651 | finally: | |
652 | self.db_input_cache = [] |
|
652 | self.db_input_cache = [] | |
653 |
|
653 | |||
654 | with self.db_output_cache_lock: |
|
654 | with self.db_output_cache_lock: | |
655 | try: |
|
655 | try: | |
656 | self._writeout_output_cache(conn) |
|
656 | self._writeout_output_cache(conn) | |
657 | except sqlite3.IntegrityError: |
|
657 | except sqlite3.IntegrityError: | |
658 | print("!! Session/line number for output was not unique", |
|
658 | print("!! Session/line number for output was not unique", | |
659 | "in database. Output will not be stored.") |
|
659 | "in database. Output will not be stored.") | |
660 | finally: |
|
660 | finally: | |
661 | self.db_output_cache = [] |
|
661 | self.db_output_cache = [] | |
662 |
|
662 | |||
663 |
|
663 | |||
664 | class HistorySavingThread(threading.Thread): |
|
664 | class HistorySavingThread(threading.Thread): | |
665 | """This thread takes care of writing history to the database, so that |
|
665 | """This thread takes care of writing history to the database, so that | |
666 | the UI isn't held up while that happens. |
|
666 | the UI isn't held up while that happens. | |
667 |
|
667 | |||
668 | It waits for the HistoryManager's save_flag to be set, then writes out |
|
668 | It waits for the HistoryManager's save_flag to be set, then writes out | |
669 | the history cache. The main thread is responsible for setting the flag when |
|
669 | the history cache. The main thread is responsible for setting the flag when | |
670 | the cache size reaches a defined threshold.""" |
|
670 | the cache size reaches a defined threshold.""" | |
671 | daemon = True |
|
671 | daemon = True | |
672 | stop_now = False |
|
672 | stop_now = False | |
673 | enabled = True |
|
673 | enabled = True | |
674 | def __init__(self, history_manager): |
|
674 | def __init__(self, history_manager): | |
675 | super(HistorySavingThread, self).__init__() |
|
675 | super(HistorySavingThread, self).__init__() | |
676 | self.history_manager = history_manager |
|
676 | self.history_manager = history_manager | |
677 | self.enabled = history_manager.enabled |
|
677 | self.enabled = history_manager.enabled | |
678 | atexit.register(self.stop) |
|
678 | atexit.register(self.stop) | |
679 |
|
679 | |||
680 | @needs_sqlite |
|
680 | @needs_sqlite | |
681 | def run(self): |
|
681 | def run(self): | |
682 | # We need a separate db connection per thread: |
|
682 | # We need a separate db connection per thread: | |
683 | try: |
|
683 | try: | |
684 | self.db = sqlite3.connect(self.history_manager.hist_file, |
|
684 | self.db = sqlite3.connect(self.history_manager.hist_file, | |
685 | **self.history_manager.connection_options |
|
685 | **self.history_manager.connection_options | |
686 | ) |
|
686 | ) | |
687 | while True: |
|
687 | while True: | |
688 | self.history_manager.save_flag.wait() |
|
688 | self.history_manager.save_flag.wait() | |
689 | if self.stop_now: |
|
689 | if self.stop_now: | |
690 | return |
|
690 | return | |
691 | self.history_manager.save_flag.clear() |
|
691 | self.history_manager.save_flag.clear() | |
692 | self.history_manager.writeout_cache(self.db) |
|
692 | self.history_manager.writeout_cache(self.db) | |
693 | except Exception as e: |
|
693 | except Exception as e: | |
694 | print(("The history saving thread hit an unexpected error (%s)." |
|
694 | print(("The history saving thread hit an unexpected error (%s)." | |
695 | "History will not be written to the database.") % repr(e)) |
|
695 | "History will not be written to the database.") % repr(e)) | |
696 |
|
696 | |||
697 | def stop(self): |
|
697 | def stop(self): | |
698 | """This can be called from the main thread to safely stop this thread. |
|
698 | """This can be called from the main thread to safely stop this thread. | |
699 |
|
699 | |||
700 | Note that it does not attempt to write out remaining history before |
|
700 | Note that it does not attempt to write out remaining history before | |
701 | exiting. That should be done by calling the HistoryManager's |
|
701 | exiting. That should be done by calling the HistoryManager's | |
702 | end_session method.""" |
|
702 | end_session method.""" | |
703 | self.stop_now = True |
|
703 | self.stop_now = True | |
704 | self.history_manager.save_flag.set() |
|
704 | self.history_manager.save_flag.set() | |
705 | self.join() |
|
705 | self.join() | |
706 |
|
706 | |||
707 |
|
707 | |||
708 | # To match, e.g. ~5/8-~2/3 |
|
708 | # To match, e.g. ~5/8-~2/3 | |
709 | range_re = re.compile(r""" |
|
709 | range_re = re.compile(r""" | |
710 | ((?P<startsess>~?\d+)/)? |
|
710 | ((?P<startsess>~?\d+)/)? | |
711 | (?P<start>\d+) # Only the start line num is compulsory |
|
711 | (?P<start>\d+) # Only the start line num is compulsory | |
712 | ((?P<sep>[\-:]) |
|
712 | ((?P<sep>[\-:]) | |
713 | ((?P<endsess>~?\d+)/)? |
|
713 | ((?P<endsess>~?\d+)/)? | |
714 | (?P<end>\d+))? |
|
714 | (?P<end>\d+))? | |
715 | $""", re.VERBOSE) |
|
715 | $""", re.VERBOSE) | |
716 |
|
716 | |||
717 |
|
717 | |||
718 | def extract_hist_ranges(ranges_str): |
|
718 | def extract_hist_ranges(ranges_str): | |
719 | """Turn a string of history ranges into 3-tuples of (session, start, stop). |
|
719 | """Turn a string of history ranges into 3-tuples of (session, start, stop). | |
720 |
|
720 | |||
721 | Examples |
|
721 | Examples | |
722 | -------- |
|
722 | -------- | |
723 | list(extract_input_ranges("~8/5-~7/4 2")) |
|
723 | list(extract_input_ranges("~8/5-~7/4 2")) | |
724 | [(-8, 5, None), (-7, 1, 4), (0, 2, 3)] |
|
724 | [(-8, 5, None), (-7, 1, 4), (0, 2, 3)] | |
725 | """ |
|
725 | """ | |
726 | for range_str in ranges_str.split(): |
|
726 | for range_str in ranges_str.split(): | |
727 | rmatch = range_re.match(range_str) |
|
727 | rmatch = range_re.match(range_str) | |
728 | if not rmatch: |
|
728 | if not rmatch: | |
729 | continue |
|
729 | continue | |
730 | start = int(rmatch.group("start")) |
|
730 | start = int(rmatch.group("start")) | |
731 | end = rmatch.group("end") |
|
731 | end = rmatch.group("end") | |
732 | end = int(end) if end else start+1 # If no end specified, get (a, a+1) |
|
732 | end = int(end) if end else start+1 # If no end specified, get (a, a+1) | |
733 | if rmatch.group("sep") == "-": # 1-3 == 1:4 --> [1, 2, 3] |
|
733 | if rmatch.group("sep") == "-": # 1-3 == 1:4 --> [1, 2, 3] | |
734 | end += 1 |
|
734 | end += 1 | |
735 | startsess = rmatch.group("startsess") or "0" |
|
735 | startsess = rmatch.group("startsess") or "0" | |
736 | endsess = rmatch.group("endsess") or startsess |
|
736 | endsess = rmatch.group("endsess") or startsess | |
737 | startsess = int(startsess.replace("~","-")) |
|
737 | startsess = int(startsess.replace("~","-")) | |
738 | endsess = int(endsess.replace("~","-")) |
|
738 | endsess = int(endsess.replace("~","-")) | |
739 | assert endsess >= startsess |
|
739 | assert endsess >= startsess | |
740 |
|
740 | |||
741 | if endsess == startsess: |
|
741 | if endsess == startsess: | |
742 | yield (startsess, start, end) |
|
742 | yield (startsess, start, end) | |
743 | continue |
|
743 | continue | |
744 | # Multiple sessions in one range: |
|
744 | # Multiple sessions in one range: | |
745 | yield (startsess, start, None) |
|
745 | yield (startsess, start, None) | |
746 | for sess in range(startsess+1, endsess): |
|
746 | for sess in range(startsess+1, endsess): | |
747 | yield (sess, 1, None) |
|
747 | yield (sess, 1, None) | |
748 | yield (endsess, 1, end) |
|
748 | yield (endsess, 1, end) | |
749 |
|
749 | |||
750 |
|
750 | |||
751 | def _format_lineno(session, line): |
|
751 | def _format_lineno(session, line): | |
752 | """Helper function to format line numbers properly.""" |
|
752 | """Helper function to format line numbers properly.""" | |
753 | if session == 0: |
|
753 | if session == 0: | |
754 | return str(line) |
|
754 | return str(line) | |
755 | return "%s#%s" % (session, line) |
|
755 | return "%s#%s" % (session, line) | |
756 |
|
756 | |||
757 |
|
757 |
@@ -1,3061 +1,3061 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 | from __future__ import print_function |
|
19 | from __future__ import print_function | |
20 |
|
20 | |||
21 | import __builtin__ as builtin_mod |
|
21 | import __builtin__ as builtin_mod | |
22 | import __future__ |
|
22 | import __future__ | |
23 | import abc |
|
23 | import abc | |
24 | import ast |
|
24 | import ast | |
25 | import atexit |
|
25 | import atexit | |
26 | import os |
|
26 | import os | |
27 | import re |
|
27 | import re | |
28 | import runpy |
|
28 | import runpy | |
29 | import sys |
|
29 | import sys | |
30 | import tempfile |
|
30 | import tempfile | |
31 | import types |
|
31 | import types | |
32 |
|
32 | |||
33 | # We need to use nested to support python 2.6, once we move to >=2.7, we can |
|
33 | # We need to use nested to support python 2.6, once we move to >=2.7, we can | |
34 | # use the with keyword's new builtin support for nested managers |
|
34 | # use the with keyword's new builtin support for nested managers | |
35 | try: |
|
35 | try: | |
36 | from contextlib import nested |
|
36 | from contextlib import nested | |
37 | except: |
|
37 | except: | |
38 | from IPython.utils.nested_context import nested |
|
38 | from IPython.utils.nested_context import nested | |
39 |
|
39 | |||
40 | from IPython.config.configurable import SingletonConfigurable |
|
40 | from IPython.config.configurable import SingletonConfigurable | |
41 | from IPython.core import debugger, oinspect |
|
41 | from IPython.core import debugger, oinspect | |
42 | from IPython.core import history as ipcorehist |
|
42 | from IPython.core import history as ipcorehist | |
43 | from IPython.core import magic |
|
43 | from IPython.core import magic | |
44 | from IPython.core import page |
|
44 | from IPython.core import page | |
45 | from IPython.core import prefilter |
|
45 | from IPython.core import prefilter | |
46 | from IPython.core import shadowns |
|
46 | from IPython.core import shadowns | |
47 | from IPython.core import ultratb |
|
47 | from IPython.core import ultratb | |
48 | from IPython.core.alias import AliasManager, AliasError |
|
48 | from IPython.core.alias import AliasManager, AliasError | |
49 | from IPython.core.autocall import ExitAutocall |
|
49 | from IPython.core.autocall import ExitAutocall | |
50 | from IPython.core.builtin_trap import BuiltinTrap |
|
50 | from IPython.core.builtin_trap import BuiltinTrap | |
51 | from IPython.core.compilerop import CachingCompiler |
|
51 | from IPython.core.compilerop import CachingCompiler | |
52 | from IPython.core.display_trap import DisplayTrap |
|
52 | from IPython.core.display_trap import DisplayTrap | |
53 | from IPython.core.displayhook import DisplayHook |
|
53 | from IPython.core.displayhook import DisplayHook | |
54 | from IPython.core.displaypub import DisplayPublisher |
|
54 | from IPython.core.displaypub import DisplayPublisher | |
55 | from IPython.core.error import UsageError |
|
55 | from IPython.core.error import UsageError | |
56 | from IPython.core.extensions import ExtensionManager |
|
56 | from IPython.core.extensions import ExtensionManager | |
57 | from IPython.core.fakemodule import FakeModule, init_fakemod_dict |
|
57 | from IPython.core.fakemodule import FakeModule, init_fakemod_dict | |
58 | from IPython.core.formatters import DisplayFormatter |
|
58 | from IPython.core.formatters import DisplayFormatter | |
59 | from IPython.core.history import HistoryManager |
|
59 | from IPython.core.history import HistoryManager | |
60 | from IPython.core.inputsplitter import IPythonInputSplitter, ESC_MAGIC, ESC_MAGIC2 |
|
60 | from IPython.core.inputsplitter import IPythonInputSplitter, ESC_MAGIC, ESC_MAGIC2 | |
61 | from IPython.core.logger import Logger |
|
61 | from IPython.core.logger import Logger | |
62 | from IPython.core.macro import Macro |
|
62 | from IPython.core.macro import Macro | |
63 | from IPython.core.payload import PayloadManager |
|
63 | from IPython.core.payload import PayloadManager | |
64 | from IPython.core.plugin import PluginManager |
|
64 | from IPython.core.plugin import PluginManager | |
65 | from IPython.core.prefilter import PrefilterManager |
|
65 | from IPython.core.prefilter import PrefilterManager | |
66 | from IPython.core.profiledir import ProfileDir |
|
66 | from IPython.core.profiledir import ProfileDir | |
67 | from IPython.core.pylabtools import pylab_activate |
|
67 | from IPython.core.pylabtools import pylab_activate | |
68 | from IPython.core.prompts import PromptManager |
|
68 | from IPython.core.prompts import PromptManager | |
69 | from IPython.lib.latextools import LaTeXTool |
|
69 | from IPython.lib.latextools import LaTeXTool | |
70 | from IPython.utils import PyColorize |
|
70 | from IPython.utils import PyColorize | |
71 | from IPython.utils import io |
|
71 | from IPython.utils import io | |
72 | from IPython.utils import py3compat |
|
72 | from IPython.utils import py3compat | |
73 | from IPython.utils import openpy |
|
73 | from IPython.utils import openpy | |
74 | from IPython.utils.doctestreload import doctest_reload |
|
74 | from IPython.utils.doctestreload import doctest_reload | |
75 | from IPython.utils.io import ask_yes_no |
|
75 | from IPython.utils.io import ask_yes_no | |
76 | from IPython.utils.ipstruct import Struct |
|
76 | from IPython.utils.ipstruct import Struct | |
77 | from IPython.utils.path import get_home_dir, get_ipython_dir, get_py_filename, unquote_filename |
|
77 | from IPython.utils.path import get_home_dir, get_ipython_dir, get_py_filename, unquote_filename | |
78 | from IPython.utils.pickleshare import PickleShareDB |
|
78 | from IPython.utils.pickleshare import PickleShareDB | |
79 | from IPython.utils.process import system, getoutput |
|
79 | from IPython.utils.process import system, getoutput | |
80 | from IPython.utils.strdispatch import StrDispatch |
|
80 | from IPython.utils.strdispatch import StrDispatch | |
81 | from IPython.utils.syspathcontext import prepended_to_syspath |
|
81 | from IPython.utils.syspathcontext import prepended_to_syspath | |
82 | from IPython.utils.text import (format_screen, LSString, SList, |
|
82 | from IPython.utils.text import (format_screen, LSString, SList, | |
83 | DollarFormatter) |
|
83 | DollarFormatter) | |
84 | from IPython.utils.traitlets import (Integer, CBool, CaselessStrEnum, Enum, |
|
84 | from IPython.utils.traitlets import (Integer, CBool, CaselessStrEnum, Enum, | |
85 | List, Unicode, Instance, Type) |
|
85 | List, Unicode, Instance, Type) | |
86 | from IPython.utils.warn import warn, error |
|
86 | from IPython.utils.warn import warn, error | |
87 | import IPython.core.hooks |
|
87 | import IPython.core.hooks | |
88 |
|
88 | |||
89 | #----------------------------------------------------------------------------- |
|
89 | #----------------------------------------------------------------------------- | |
90 | # Globals |
|
90 | # Globals | |
91 | #----------------------------------------------------------------------------- |
|
91 | #----------------------------------------------------------------------------- | |
92 |
|
92 | |||
93 | # compiled regexps for autoindent management |
|
93 | # compiled regexps for autoindent management | |
94 | dedent_re = re.compile(r'^\s+raise|^\s+return|^\s+pass') |
|
94 | dedent_re = re.compile(r'^\s+raise|^\s+return|^\s+pass') | |
95 |
|
95 | |||
96 | #----------------------------------------------------------------------------- |
|
96 | #----------------------------------------------------------------------------- | |
97 | # Utilities |
|
97 | # Utilities | |
98 | #----------------------------------------------------------------------------- |
|
98 | #----------------------------------------------------------------------------- | |
99 |
|
99 | |||
100 | def softspace(file, newvalue): |
|
100 | def softspace(file, newvalue): | |
101 | """Copied from code.py, to remove the dependency""" |
|
101 | """Copied from code.py, to remove the dependency""" | |
102 |
|
102 | |||
103 | oldvalue = 0 |
|
103 | oldvalue = 0 | |
104 | try: |
|
104 | try: | |
105 | oldvalue = file.softspace |
|
105 | oldvalue = file.softspace | |
106 | except AttributeError: |
|
106 | except AttributeError: | |
107 | pass |
|
107 | pass | |
108 | try: |
|
108 | try: | |
109 | file.softspace = newvalue |
|
109 | file.softspace = newvalue | |
110 | except (AttributeError, TypeError): |
|
110 | except (AttributeError, TypeError): | |
111 | # "attribute-less object" or "read-only attributes" |
|
111 | # "attribute-less object" or "read-only attributes" | |
112 | pass |
|
112 | pass | |
113 | return oldvalue |
|
113 | return oldvalue | |
114 |
|
114 | |||
115 |
|
115 | |||
116 | def no_op(*a, **kw): pass |
|
116 | def no_op(*a, **kw): pass | |
117 |
|
117 | |||
118 | class NoOpContext(object): |
|
118 | class NoOpContext(object): | |
119 | def __enter__(self): pass |
|
119 | def __enter__(self): pass | |
120 | def __exit__(self, type, value, traceback): pass |
|
120 | def __exit__(self, type, value, traceback): pass | |
121 | no_op_context = NoOpContext() |
|
121 | no_op_context = NoOpContext() | |
122 |
|
122 | |||
123 | class SpaceInInput(Exception): pass |
|
123 | class SpaceInInput(Exception): pass | |
124 |
|
124 | |||
125 | class Bunch: pass |
|
125 | class Bunch: pass | |
126 |
|
126 | |||
127 |
|
127 | |||
128 | def get_default_colors(): |
|
128 | def get_default_colors(): | |
129 | if sys.platform=='darwin': |
|
129 | if sys.platform=='darwin': | |
130 | return "LightBG" |
|
130 | return "LightBG" | |
131 | elif os.name=='nt': |
|
131 | elif os.name=='nt': | |
132 | return 'Linux' |
|
132 | return 'Linux' | |
133 | else: |
|
133 | else: | |
134 | return 'Linux' |
|
134 | return 'Linux' | |
135 |
|
135 | |||
136 |
|
136 | |||
137 | class SeparateUnicode(Unicode): |
|
137 | class SeparateUnicode(Unicode): | |
138 | """A Unicode subclass to validate separate_in, separate_out, etc. |
|
138 | """A Unicode subclass to validate separate_in, separate_out, etc. | |
139 |
|
139 | |||
140 | This is a Unicode based trait that converts '0'->'' and '\\n'->'\n'. |
|
140 | This is a Unicode based trait that converts '0'->'' and '\\n'->'\n'. | |
141 | """ |
|
141 | """ | |
142 |
|
142 | |||
143 | def validate(self, obj, value): |
|
143 | def validate(self, obj, value): | |
144 | if value == '0': value = '' |
|
144 | if value == '0': value = '' | |
145 | value = value.replace('\\n','\n') |
|
145 | value = value.replace('\\n','\n') | |
146 | return super(SeparateUnicode, self).validate(obj, value) |
|
146 | return super(SeparateUnicode, self).validate(obj, value) | |
147 |
|
147 | |||
148 |
|
148 | |||
149 | class ReadlineNoRecord(object): |
|
149 | class ReadlineNoRecord(object): | |
150 | """Context manager to execute some code, then reload readline history |
|
150 | """Context manager to execute some code, then reload readline history | |
151 | so that interactive input to the code doesn't appear when pressing up.""" |
|
151 | so that interactive input to the code doesn't appear when pressing up.""" | |
152 | def __init__(self, shell): |
|
152 | def __init__(self, shell): | |
153 | self.shell = shell |
|
153 | self.shell = shell | |
154 | self._nested_level = 0 |
|
154 | self._nested_level = 0 | |
155 |
|
155 | |||
156 | def __enter__(self): |
|
156 | def __enter__(self): | |
157 | if self._nested_level == 0: |
|
157 | if self._nested_level == 0: | |
158 | try: |
|
158 | try: | |
159 | self.orig_length = self.current_length() |
|
159 | self.orig_length = self.current_length() | |
160 | self.readline_tail = self.get_readline_tail() |
|
160 | self.readline_tail = self.get_readline_tail() | |
161 | except (AttributeError, IndexError): # Can fail with pyreadline |
|
161 | except (AttributeError, IndexError): # Can fail with pyreadline | |
162 | self.orig_length, self.readline_tail = 999999, [] |
|
162 | self.orig_length, self.readline_tail = 999999, [] | |
163 | self._nested_level += 1 |
|
163 | self._nested_level += 1 | |
164 |
|
164 | |||
165 | def __exit__(self, type, value, traceback): |
|
165 | def __exit__(self, type, value, traceback): | |
166 | self._nested_level -= 1 |
|
166 | self._nested_level -= 1 | |
167 | if self._nested_level == 0: |
|
167 | if self._nested_level == 0: | |
168 | # Try clipping the end if it's got longer |
|
168 | # Try clipping the end if it's got longer | |
169 | try: |
|
169 | try: | |
170 | e = self.current_length() - self.orig_length |
|
170 | e = self.current_length() - self.orig_length | |
171 | if e > 0: |
|
171 | if e > 0: | |
172 | for _ in range(e): |
|
172 | for _ in range(e): | |
173 | self.shell.readline.remove_history_item(self.orig_length) |
|
173 | self.shell.readline.remove_history_item(self.orig_length) | |
174 |
|
174 | |||
175 | # If it still doesn't match, just reload readline history. |
|
175 | # If it still doesn't match, just reload readline history. | |
176 | if self.current_length() != self.orig_length \ |
|
176 | if self.current_length() != self.orig_length \ | |
177 | or self.get_readline_tail() != self.readline_tail: |
|
177 | or self.get_readline_tail() != self.readline_tail: | |
178 | self.shell.refill_readline_hist() |
|
178 | self.shell.refill_readline_hist() | |
179 | except (AttributeError, IndexError): |
|
179 | except (AttributeError, IndexError): | |
180 | pass |
|
180 | pass | |
181 | # Returning False will cause exceptions to propagate |
|
181 | # Returning False will cause exceptions to propagate | |
182 | return False |
|
182 | return False | |
183 |
|
183 | |||
184 | def current_length(self): |
|
184 | def current_length(self): | |
185 | return self.shell.readline.get_current_history_length() |
|
185 | return self.shell.readline.get_current_history_length() | |
186 |
|
186 | |||
187 | def get_readline_tail(self, n=10): |
|
187 | def get_readline_tail(self, n=10): | |
188 | """Get the last n items in readline history.""" |
|
188 | """Get the last n items in readline history.""" | |
189 | end = self.shell.readline.get_current_history_length() + 1 |
|
189 | end = self.shell.readline.get_current_history_length() + 1 | |
190 | start = max(end-n, 1) |
|
190 | start = max(end-n, 1) | |
191 | ghi = self.shell.readline.get_history_item |
|
191 | ghi = self.shell.readline.get_history_item | |
192 | return [ghi(x) for x in range(start, end)] |
|
192 | return [ghi(x) for x in range(start, end)] | |
193 |
|
193 | |||
194 | #----------------------------------------------------------------------------- |
|
194 | #----------------------------------------------------------------------------- | |
195 | # Main IPython class |
|
195 | # Main IPython class | |
196 | #----------------------------------------------------------------------------- |
|
196 | #----------------------------------------------------------------------------- | |
197 |
|
197 | |||
198 | class InteractiveShell(SingletonConfigurable): |
|
198 | class InteractiveShell(SingletonConfigurable): | |
199 | """An enhanced, interactive shell for Python.""" |
|
199 | """An enhanced, interactive shell for Python.""" | |
200 |
|
200 | |||
201 | _instance = None |
|
201 | _instance = None | |
202 |
|
202 | |||
203 | ast_transformers = List([], config=True, help= |
|
203 | ast_transformers = List([], config=True, help= | |
204 | """ |
|
204 | """ | |
205 | A list of ast.NodeTransformer subclass instances, which will be applied |
|
205 | A list of ast.NodeTransformer subclass instances, which will be applied | |
206 | to user input before code is run. |
|
206 | to user input before code is run. | |
207 | """ |
|
207 | """ | |
208 | ) |
|
208 | ) | |
209 |
|
209 | |||
210 | autocall = Enum((0,1,2), default_value=0, config=True, help= |
|
210 | autocall = Enum((0,1,2), default_value=0, config=True, help= | |
211 | """ |
|
211 | """ | |
212 | Make IPython automatically call any callable object even if you didn't |
|
212 | Make IPython automatically call any callable object even if you didn't | |
213 | type explicit parentheses. For example, 'str 43' becomes 'str(43)' |
|
213 | type explicit parentheses. For example, 'str 43' becomes 'str(43)' | |
214 | automatically. The value can be '0' to disable the feature, '1' for |
|
214 | automatically. The value can be '0' to disable the feature, '1' for | |
215 | 'smart' autocall, where it is not applied if there are no more |
|
215 | 'smart' autocall, where it is not applied if there are no more | |
216 | arguments on the line, and '2' for 'full' autocall, where all callable |
|
216 | arguments on the line, and '2' for 'full' autocall, where all callable | |
217 | objects are automatically called (even if no arguments are present). |
|
217 | objects are automatically called (even if no arguments are present). | |
218 | """ |
|
218 | """ | |
219 | ) |
|
219 | ) | |
220 | # TODO: remove all autoindent logic and put into frontends. |
|
220 | # TODO: remove all autoindent logic and put into frontends. | |
221 | # We can't do this yet because even runlines uses the autoindent. |
|
221 | # We can't do this yet because even runlines uses the autoindent. | |
222 | autoindent = CBool(True, config=True, help= |
|
222 | autoindent = CBool(True, config=True, help= | |
223 | """ |
|
223 | """ | |
224 | Autoindent IPython code entered interactively. |
|
224 | Autoindent IPython code entered interactively. | |
225 | """ |
|
225 | """ | |
226 | ) |
|
226 | ) | |
227 | automagic = CBool(True, config=True, help= |
|
227 | automagic = CBool(True, config=True, help= | |
228 | """ |
|
228 | """ | |
229 | Enable magic commands to be called without the leading %. |
|
229 | Enable magic commands to be called without the leading %. | |
230 | """ |
|
230 | """ | |
231 | ) |
|
231 | ) | |
232 | cache_size = Integer(1000, config=True, help= |
|
232 | cache_size = Integer(1000, config=True, help= | |
233 | """ |
|
233 | """ | |
234 | Set the size of the output cache. The default is 1000, you can |
|
234 | Set the size of the output cache. The default is 1000, you can | |
235 | change it permanently in your config file. Setting it to 0 completely |
|
235 | change it permanently in your config file. Setting it to 0 completely | |
236 | disables the caching system, and the minimum value accepted is 20 (if |
|
236 | disables the caching system, and the minimum value accepted is 20 (if | |
237 | you provide a value less than 20, it is reset to 0 and a warning is |
|
237 | you provide a value less than 20, it is reset to 0 and a warning is | |
238 | issued). This limit is defined because otherwise you'll spend more |
|
238 | issued). This limit is defined because otherwise you'll spend more | |
239 | time re-flushing a too small cache than working |
|
239 | time re-flushing a too small cache than working | |
240 | """ |
|
240 | """ | |
241 | ) |
|
241 | ) | |
242 | color_info = CBool(True, config=True, help= |
|
242 | color_info = CBool(True, config=True, help= | |
243 | """ |
|
243 | """ | |
244 | Use colors for displaying information about objects. Because this |
|
244 | Use colors for displaying information about objects. Because this | |
245 | information is passed through a pager (like 'less'), and some pagers |
|
245 | information is passed through a pager (like 'less'), and some pagers | |
246 | get confused with color codes, this capability can be turned off. |
|
246 | get confused with color codes, this capability can be turned off. | |
247 | """ |
|
247 | """ | |
248 | ) |
|
248 | ) | |
249 | colors = CaselessStrEnum(('NoColor','LightBG','Linux'), |
|
249 | colors = CaselessStrEnum(('NoColor','LightBG','Linux'), | |
250 | default_value=get_default_colors(), config=True, |
|
250 | default_value=get_default_colors(), config=True, | |
251 | help="Set the color scheme (NoColor, Linux, or LightBG)." |
|
251 | help="Set the color scheme (NoColor, Linux, or LightBG)." | |
252 | ) |
|
252 | ) | |
253 | colors_force = CBool(False, help= |
|
253 | colors_force = CBool(False, help= | |
254 | """ |
|
254 | """ | |
255 | Force use of ANSI color codes, regardless of OS and readline |
|
255 | Force use of ANSI color codes, regardless of OS and readline | |
256 | availability. |
|
256 | availability. | |
257 | """ |
|
257 | """ | |
258 | # FIXME: This is essentially a hack to allow ZMQShell to show colors |
|
258 | # FIXME: This is essentially a hack to allow ZMQShell to show colors | |
259 | # without readline on Win32. When the ZMQ formatting system is |
|
259 | # without readline on Win32. When the ZMQ formatting system is | |
260 | # refactored, this should be removed. |
|
260 | # refactored, this should be removed. | |
261 | ) |
|
261 | ) | |
262 | debug = CBool(False, config=True) |
|
262 | debug = CBool(False, config=True) | |
263 | deep_reload = CBool(False, config=True, help= |
|
263 | deep_reload = CBool(False, config=True, help= | |
264 | """ |
|
264 | """ | |
265 | Enable deep (recursive) reloading by default. IPython can use the |
|
265 | Enable deep (recursive) reloading by default. IPython can use the | |
266 | deep_reload module which reloads changes in modules recursively (it |
|
266 | deep_reload module which reloads changes in modules recursively (it | |
267 | replaces the reload() function, so you don't need to change anything to |
|
267 | replaces the reload() function, so you don't need to change anything to | |
268 | use it). deep_reload() forces a full reload of modules whose code may |
|
268 | use it). deep_reload() forces a full reload of modules whose code may | |
269 | have changed, which the default reload() function does not. When |
|
269 | have changed, which the default reload() function does not. When | |
270 | deep_reload is off, IPython will use the normal reload(), but |
|
270 | deep_reload is off, IPython will use the normal reload(), but | |
271 | deep_reload will still be available as dreload(). |
|
271 | deep_reload will still be available as dreload(). | |
272 | """ |
|
272 | """ | |
273 | ) |
|
273 | ) | |
274 | disable_failing_post_execute = CBool(False, config=True, |
|
274 | disable_failing_post_execute = CBool(False, config=True, | |
275 | help="Don't call post-execute functions that have failed in the past." |
|
275 | help="Don't call post-execute functions that have failed in the past." | |
276 | ) |
|
276 | ) | |
277 | display_formatter = Instance(DisplayFormatter) |
|
277 | display_formatter = Instance(DisplayFormatter) | |
278 | displayhook_class = Type(DisplayHook) |
|
278 | displayhook_class = Type(DisplayHook) | |
279 | display_pub_class = Type(DisplayPublisher) |
|
279 | display_pub_class = Type(DisplayPublisher) | |
280 | data_pub_class = None |
|
280 | data_pub_class = None | |
281 |
|
281 | |||
282 | exit_now = CBool(False) |
|
282 | exit_now = CBool(False) | |
283 | exiter = Instance(ExitAutocall) |
|
283 | exiter = Instance(ExitAutocall) | |
284 | def _exiter_default(self): |
|
284 | def _exiter_default(self): | |
285 | return ExitAutocall(self) |
|
285 | return ExitAutocall(self) | |
286 | # Monotonically increasing execution counter |
|
286 | # Monotonically increasing execution counter | |
287 | execution_count = Integer(1) |
|
287 | execution_count = Integer(1) | |
288 | filename = Unicode("<ipython console>") |
|
288 | filename = Unicode("<ipython console>") | |
289 | ipython_dir= Unicode('', config=True) # Set to get_ipython_dir() in __init__ |
|
289 | ipython_dir= Unicode('', config=True) # Set to get_ipython_dir() in __init__ | |
290 |
|
290 | |||
291 | # Input splitter, to split entire cells of input into either individual |
|
291 | # Input splitter, to split entire cells of input into either individual | |
292 | # interactive statements or whole blocks. |
|
292 | # interactive statements or whole blocks. | |
293 | input_splitter = Instance('IPython.core.inputsplitter.IPythonInputSplitter', |
|
293 | input_splitter = Instance('IPython.core.inputsplitter.IPythonInputSplitter', | |
294 | (), {}) |
|
294 | (), {}) | |
295 | logstart = CBool(False, config=True, help= |
|
295 | logstart = CBool(False, config=True, help= | |
296 | """ |
|
296 | """ | |
297 | Start logging to the default log file. |
|
297 | Start logging to the default log file. | |
298 | """ |
|
298 | """ | |
299 | ) |
|
299 | ) | |
300 | logfile = Unicode('', config=True, help= |
|
300 | logfile = Unicode('', config=True, help= | |
301 | """ |
|
301 | """ | |
302 | The name of the logfile to use. |
|
302 | The name of the logfile to use. | |
303 | """ |
|
303 | """ | |
304 | ) |
|
304 | ) | |
305 | logappend = Unicode('', config=True, help= |
|
305 | logappend = Unicode('', config=True, help= | |
306 | """ |
|
306 | """ | |
307 | Start logging to the given file in append mode. |
|
307 | Start logging to the given file in append mode. | |
308 | """ |
|
308 | """ | |
309 | ) |
|
309 | ) | |
310 | object_info_string_level = Enum((0,1,2), default_value=0, |
|
310 | object_info_string_level = Enum((0,1,2), default_value=0, | |
311 | config=True) |
|
311 | config=True) | |
312 | pdb = CBool(False, config=True, help= |
|
312 | pdb = CBool(False, config=True, help= | |
313 | """ |
|
313 | """ | |
314 | Automatically call the pdb debugger after every exception. |
|
314 | Automatically call the pdb debugger after every exception. | |
315 | """ |
|
315 | """ | |
316 | ) |
|
316 | ) | |
317 | multiline_history = CBool(sys.platform != 'win32', config=True, |
|
317 | multiline_history = CBool(sys.platform != 'win32', config=True, | |
318 | help="Save multi-line entries as one entry in readline history" |
|
318 | help="Save multi-line entries as one entry in readline history" | |
319 | ) |
|
319 | ) | |
320 |
|
320 | |||
321 | # deprecated prompt traits: |
|
321 | # deprecated prompt traits: | |
322 |
|
322 | |||
323 | prompt_in1 = Unicode('In [\\#]: ', config=True, |
|
323 | prompt_in1 = Unicode('In [\\#]: ', config=True, | |
324 | help="Deprecated, use PromptManager.in_template") |
|
324 | help="Deprecated, use PromptManager.in_template") | |
325 | prompt_in2 = Unicode(' .\\D.: ', config=True, |
|
325 | prompt_in2 = Unicode(' .\\D.: ', config=True, | |
326 | help="Deprecated, use PromptManager.in2_template") |
|
326 | help="Deprecated, use PromptManager.in2_template") | |
327 | prompt_out = Unicode('Out[\\#]: ', config=True, |
|
327 | prompt_out = Unicode('Out[\\#]: ', config=True, | |
328 | help="Deprecated, use PromptManager.out_template") |
|
328 | help="Deprecated, use PromptManager.out_template") | |
329 | prompts_pad_left = CBool(True, config=True, |
|
329 | prompts_pad_left = CBool(True, config=True, | |
330 | help="Deprecated, use PromptManager.justify") |
|
330 | help="Deprecated, use PromptManager.justify") | |
331 |
|
331 | |||
332 | def _prompt_trait_changed(self, name, old, new): |
|
332 | def _prompt_trait_changed(self, name, old, new): | |
333 | table = { |
|
333 | table = { | |
334 | 'prompt_in1' : 'in_template', |
|
334 | 'prompt_in1' : 'in_template', | |
335 | 'prompt_in2' : 'in2_template', |
|
335 | 'prompt_in2' : 'in2_template', | |
336 | 'prompt_out' : 'out_template', |
|
336 | 'prompt_out' : 'out_template', | |
337 | 'prompts_pad_left' : 'justify', |
|
337 | 'prompts_pad_left' : 'justify', | |
338 | } |
|
338 | } | |
339 |
warn("InteractiveShell.{name} is deprecated, use PromptManager.{newname} |
|
339 | warn("InteractiveShell.{name} is deprecated, use PromptManager.{newname}".format( | |
340 | name=name, newname=table[name]) |
|
340 | name=name, newname=table[name]) | |
341 | ) |
|
341 | ) | |
342 | # protect against weird cases where self.config may not exist: |
|
342 | # protect against weird cases where self.config may not exist: | |
343 | if self.config is not None: |
|
343 | if self.config is not None: | |
344 | # propagate to corresponding PromptManager trait |
|
344 | # propagate to corresponding PromptManager trait | |
345 | setattr(self.config.PromptManager, table[name], new) |
|
345 | setattr(self.config.PromptManager, table[name], new) | |
346 |
|
346 | |||
347 | _prompt_in1_changed = _prompt_trait_changed |
|
347 | _prompt_in1_changed = _prompt_trait_changed | |
348 | _prompt_in2_changed = _prompt_trait_changed |
|
348 | _prompt_in2_changed = _prompt_trait_changed | |
349 | _prompt_out_changed = _prompt_trait_changed |
|
349 | _prompt_out_changed = _prompt_trait_changed | |
350 | _prompt_pad_left_changed = _prompt_trait_changed |
|
350 | _prompt_pad_left_changed = _prompt_trait_changed | |
351 |
|
351 | |||
352 | show_rewritten_input = CBool(True, config=True, |
|
352 | show_rewritten_input = CBool(True, config=True, | |
353 | help="Show rewritten input, e.g. for autocall." |
|
353 | help="Show rewritten input, e.g. for autocall." | |
354 | ) |
|
354 | ) | |
355 |
|
355 | |||
356 | quiet = CBool(False, config=True) |
|
356 | quiet = CBool(False, config=True) | |
357 |
|
357 | |||
358 | history_length = Integer(10000, config=True) |
|
358 | history_length = Integer(10000, config=True) | |
359 |
|
359 | |||
360 | # The readline stuff will eventually be moved to the terminal subclass |
|
360 | # The readline stuff will eventually be moved to the terminal subclass | |
361 | # but for now, we can't do that as readline is welded in everywhere. |
|
361 | # but for now, we can't do that as readline is welded in everywhere. | |
362 | readline_use = CBool(True, config=True) |
|
362 | readline_use = CBool(True, config=True) | |
363 | readline_remove_delims = Unicode('-/~', config=True) |
|
363 | readline_remove_delims = Unicode('-/~', config=True) | |
364 | # don't use \M- bindings by default, because they |
|
364 | # don't use \M- bindings by default, because they | |
365 | # conflict with 8-bit encodings. See gh-58,gh-88 |
|
365 | # conflict with 8-bit encodings. See gh-58,gh-88 | |
366 | readline_parse_and_bind = List([ |
|
366 | readline_parse_and_bind = List([ | |
367 | 'tab: complete', |
|
367 | 'tab: complete', | |
368 | '"\C-l": clear-screen', |
|
368 | '"\C-l": clear-screen', | |
369 | 'set show-all-if-ambiguous on', |
|
369 | 'set show-all-if-ambiguous on', | |
370 | '"\C-o": tab-insert', |
|
370 | '"\C-o": tab-insert', | |
371 | '"\C-r": reverse-search-history', |
|
371 | '"\C-r": reverse-search-history', | |
372 | '"\C-s": forward-search-history', |
|
372 | '"\C-s": forward-search-history', | |
373 | '"\C-p": history-search-backward', |
|
373 | '"\C-p": history-search-backward', | |
374 | '"\C-n": history-search-forward', |
|
374 | '"\C-n": history-search-forward', | |
375 | '"\e[A": history-search-backward', |
|
375 | '"\e[A": history-search-backward', | |
376 | '"\e[B": history-search-forward', |
|
376 | '"\e[B": history-search-forward', | |
377 | '"\C-k": kill-line', |
|
377 | '"\C-k": kill-line', | |
378 | '"\C-u": unix-line-discard', |
|
378 | '"\C-u": unix-line-discard', | |
379 | ], allow_none=False, config=True) |
|
379 | ], allow_none=False, config=True) | |
380 |
|
380 | |||
381 | ast_node_interactivity = Enum(['all', 'last', 'last_expr', 'none'], |
|
381 | ast_node_interactivity = Enum(['all', 'last', 'last_expr', 'none'], | |
382 | default_value='last_expr', config=True, |
|
382 | default_value='last_expr', config=True, | |
383 | help=""" |
|
383 | help=""" | |
384 | 'all', 'last', 'last_expr' or 'none', specifying which nodes should be |
|
384 | 'all', 'last', 'last_expr' or 'none', specifying which nodes should be | |
385 | run interactively (displaying output from expressions).""") |
|
385 | run interactively (displaying output from expressions).""") | |
386 |
|
386 | |||
387 | # TODO: this part of prompt management should be moved to the frontends. |
|
387 | # TODO: this part of prompt management should be moved to the frontends. | |
388 | # Use custom TraitTypes that convert '0'->'' and '\\n'->'\n' |
|
388 | # Use custom TraitTypes that convert '0'->'' and '\\n'->'\n' | |
389 | separate_in = SeparateUnicode('\n', config=True) |
|
389 | separate_in = SeparateUnicode('\n', config=True) | |
390 | separate_out = SeparateUnicode('', config=True) |
|
390 | separate_out = SeparateUnicode('', config=True) | |
391 | separate_out2 = SeparateUnicode('', config=True) |
|
391 | separate_out2 = SeparateUnicode('', config=True) | |
392 | wildcards_case_sensitive = CBool(True, config=True) |
|
392 | wildcards_case_sensitive = CBool(True, config=True) | |
393 | xmode = CaselessStrEnum(('Context','Plain', 'Verbose'), |
|
393 | xmode = CaselessStrEnum(('Context','Plain', 'Verbose'), | |
394 | default_value='Context', config=True) |
|
394 | default_value='Context', config=True) | |
395 |
|
395 | |||
396 | # Subcomponents of InteractiveShell |
|
396 | # Subcomponents of InteractiveShell | |
397 | alias_manager = Instance('IPython.core.alias.AliasManager') |
|
397 | alias_manager = Instance('IPython.core.alias.AliasManager') | |
398 | prefilter_manager = Instance('IPython.core.prefilter.PrefilterManager') |
|
398 | prefilter_manager = Instance('IPython.core.prefilter.PrefilterManager') | |
399 | builtin_trap = Instance('IPython.core.builtin_trap.BuiltinTrap') |
|
399 | builtin_trap = Instance('IPython.core.builtin_trap.BuiltinTrap') | |
400 | display_trap = Instance('IPython.core.display_trap.DisplayTrap') |
|
400 | display_trap = Instance('IPython.core.display_trap.DisplayTrap') | |
401 | extension_manager = Instance('IPython.core.extensions.ExtensionManager') |
|
401 | extension_manager = Instance('IPython.core.extensions.ExtensionManager') | |
402 | plugin_manager = Instance('IPython.core.plugin.PluginManager') |
|
402 | plugin_manager = Instance('IPython.core.plugin.PluginManager') | |
403 | payload_manager = Instance('IPython.core.payload.PayloadManager') |
|
403 | payload_manager = Instance('IPython.core.payload.PayloadManager') | |
404 | history_manager = Instance('IPython.core.history.HistoryManager') |
|
404 | history_manager = Instance('IPython.core.history.HistoryManager') | |
405 | magics_manager = Instance('IPython.core.magic.MagicsManager') |
|
405 | magics_manager = Instance('IPython.core.magic.MagicsManager') | |
406 |
|
406 | |||
407 | profile_dir = Instance('IPython.core.application.ProfileDir') |
|
407 | profile_dir = Instance('IPython.core.application.ProfileDir') | |
408 | @property |
|
408 | @property | |
409 | def profile(self): |
|
409 | def profile(self): | |
410 | if self.profile_dir is not None: |
|
410 | if self.profile_dir is not None: | |
411 | name = os.path.basename(self.profile_dir.location) |
|
411 | name = os.path.basename(self.profile_dir.location) | |
412 | return name.replace('profile_','') |
|
412 | return name.replace('profile_','') | |
413 |
|
413 | |||
414 |
|
414 | |||
415 | # Private interface |
|
415 | # Private interface | |
416 | _post_execute = Instance(dict) |
|
416 | _post_execute = Instance(dict) | |
417 |
|
417 | |||
418 | # Tracks any GUI loop loaded for pylab |
|
418 | # Tracks any GUI loop loaded for pylab | |
419 | pylab_gui_select = None |
|
419 | pylab_gui_select = None | |
420 |
|
420 | |||
421 | def __init__(self, config=None, ipython_dir=None, profile_dir=None, |
|
421 | def __init__(self, config=None, ipython_dir=None, profile_dir=None, | |
422 | user_module=None, user_ns=None, |
|
422 | user_module=None, user_ns=None, | |
423 | custom_exceptions=((), None)): |
|
423 | custom_exceptions=((), None)): | |
424 |
|
424 | |||
425 | # This is where traits with a config_key argument are updated |
|
425 | # This is where traits with a config_key argument are updated | |
426 | # from the values on config. |
|
426 | # from the values on config. | |
427 | super(InteractiveShell, self).__init__(config=config) |
|
427 | super(InteractiveShell, self).__init__(config=config) | |
428 | self.configurables = [self] |
|
428 | self.configurables = [self] | |
429 |
|
429 | |||
430 | # These are relatively independent and stateless |
|
430 | # These are relatively independent and stateless | |
431 | self.init_ipython_dir(ipython_dir) |
|
431 | self.init_ipython_dir(ipython_dir) | |
432 | self.init_profile_dir(profile_dir) |
|
432 | self.init_profile_dir(profile_dir) | |
433 | self.init_instance_attrs() |
|
433 | self.init_instance_attrs() | |
434 | self.init_environment() |
|
434 | self.init_environment() | |
435 |
|
435 | |||
436 | # Check if we're in a virtualenv, and set up sys.path. |
|
436 | # Check if we're in a virtualenv, and set up sys.path. | |
437 | self.init_virtualenv() |
|
437 | self.init_virtualenv() | |
438 |
|
438 | |||
439 | # Create namespaces (user_ns, user_global_ns, etc.) |
|
439 | # Create namespaces (user_ns, user_global_ns, etc.) | |
440 | self.init_create_namespaces(user_module, user_ns) |
|
440 | self.init_create_namespaces(user_module, user_ns) | |
441 | # This has to be done after init_create_namespaces because it uses |
|
441 | # This has to be done after init_create_namespaces because it uses | |
442 | # something in self.user_ns, but before init_sys_modules, which |
|
442 | # something in self.user_ns, but before init_sys_modules, which | |
443 | # is the first thing to modify sys. |
|
443 | # is the first thing to modify sys. | |
444 | # TODO: When we override sys.stdout and sys.stderr before this class |
|
444 | # TODO: When we override sys.stdout and sys.stderr before this class | |
445 | # is created, we are saving the overridden ones here. Not sure if this |
|
445 | # is created, we are saving the overridden ones here. Not sure if this | |
446 | # is what we want to do. |
|
446 | # is what we want to do. | |
447 | self.save_sys_module_state() |
|
447 | self.save_sys_module_state() | |
448 | self.init_sys_modules() |
|
448 | self.init_sys_modules() | |
449 |
|
449 | |||
450 | # While we're trying to have each part of the code directly access what |
|
450 | # While we're trying to have each part of the code directly access what | |
451 | # it needs without keeping redundant references to objects, we have too |
|
451 | # it needs without keeping redundant references to objects, we have too | |
452 | # much legacy code that expects ip.db to exist. |
|
452 | # much legacy code that expects ip.db to exist. | |
453 | self.db = PickleShareDB(os.path.join(self.profile_dir.location, 'db')) |
|
453 | self.db = PickleShareDB(os.path.join(self.profile_dir.location, 'db')) | |
454 |
|
454 | |||
455 | self.init_history() |
|
455 | self.init_history() | |
456 | self.init_encoding() |
|
456 | self.init_encoding() | |
457 | self.init_prefilter() |
|
457 | self.init_prefilter() | |
458 |
|
458 | |||
459 | self.init_syntax_highlighting() |
|
459 | self.init_syntax_highlighting() | |
460 | self.init_hooks() |
|
460 | self.init_hooks() | |
461 | self.init_pushd_popd_magic() |
|
461 | self.init_pushd_popd_magic() | |
462 | # self.init_traceback_handlers use to be here, but we moved it below |
|
462 | # self.init_traceback_handlers use to be here, but we moved it below | |
463 | # because it and init_io have to come after init_readline. |
|
463 | # because it and init_io have to come after init_readline. | |
464 | self.init_user_ns() |
|
464 | self.init_user_ns() | |
465 | self.init_logger() |
|
465 | self.init_logger() | |
466 | self.init_alias() |
|
466 | self.init_alias() | |
467 | self.init_builtins() |
|
467 | self.init_builtins() | |
468 |
|
468 | |||
469 | # The following was in post_config_initialization |
|
469 | # The following was in post_config_initialization | |
470 | self.init_inspector() |
|
470 | self.init_inspector() | |
471 | # init_readline() must come before init_io(), because init_io uses |
|
471 | # init_readline() must come before init_io(), because init_io uses | |
472 | # readline related things. |
|
472 | # readline related things. | |
473 | self.init_readline() |
|
473 | self.init_readline() | |
474 | # We save this here in case user code replaces raw_input, but it needs |
|
474 | # We save this here in case user code replaces raw_input, but it needs | |
475 | # to be after init_readline(), because PyPy's readline works by replacing |
|
475 | # to be after init_readline(), because PyPy's readline works by replacing | |
476 | # raw_input. |
|
476 | # raw_input. | |
477 | if py3compat.PY3: |
|
477 | if py3compat.PY3: | |
478 | self.raw_input_original = input |
|
478 | self.raw_input_original = input | |
479 | else: |
|
479 | else: | |
480 | self.raw_input_original = raw_input |
|
480 | self.raw_input_original = raw_input | |
481 | # init_completer must come after init_readline, because it needs to |
|
481 | # init_completer must come after init_readline, because it needs to | |
482 | # know whether readline is present or not system-wide to configure the |
|
482 | # know whether readline is present or not system-wide to configure the | |
483 | # completers, since the completion machinery can now operate |
|
483 | # completers, since the completion machinery can now operate | |
484 | # independently of readline (e.g. over the network) |
|
484 | # independently of readline (e.g. over the network) | |
485 | self.init_completer() |
|
485 | self.init_completer() | |
486 | # TODO: init_io() needs to happen before init_traceback handlers |
|
486 | # TODO: init_io() needs to happen before init_traceback handlers | |
487 | # because the traceback handlers hardcode the stdout/stderr streams. |
|
487 | # because the traceback handlers hardcode the stdout/stderr streams. | |
488 | # This logic in in debugger.Pdb and should eventually be changed. |
|
488 | # This logic in in debugger.Pdb and should eventually be changed. | |
489 | self.init_io() |
|
489 | self.init_io() | |
490 | self.init_traceback_handlers(custom_exceptions) |
|
490 | self.init_traceback_handlers(custom_exceptions) | |
491 | self.init_prompts() |
|
491 | self.init_prompts() | |
492 | self.init_display_formatter() |
|
492 | self.init_display_formatter() | |
493 | self.init_display_pub() |
|
493 | self.init_display_pub() | |
494 | self.init_data_pub() |
|
494 | self.init_data_pub() | |
495 | self.init_displayhook() |
|
495 | self.init_displayhook() | |
496 | self.init_reload_doctest() |
|
496 | self.init_reload_doctest() | |
497 | self.init_latextool() |
|
497 | self.init_latextool() | |
498 | self.init_magics() |
|
498 | self.init_magics() | |
499 | self.init_logstart() |
|
499 | self.init_logstart() | |
500 | self.init_pdb() |
|
500 | self.init_pdb() | |
501 | self.init_extension_manager() |
|
501 | self.init_extension_manager() | |
502 | self.init_plugin_manager() |
|
502 | self.init_plugin_manager() | |
503 | self.init_payload() |
|
503 | self.init_payload() | |
504 | self.hooks.late_startup_hook() |
|
504 | self.hooks.late_startup_hook() | |
505 | atexit.register(self.atexit_operations) |
|
505 | atexit.register(self.atexit_operations) | |
506 |
|
506 | |||
507 | def get_ipython(self): |
|
507 | def get_ipython(self): | |
508 | """Return the currently running IPython instance.""" |
|
508 | """Return the currently running IPython instance.""" | |
509 | return self |
|
509 | return self | |
510 |
|
510 | |||
511 | #------------------------------------------------------------------------- |
|
511 | #------------------------------------------------------------------------- | |
512 | # Trait changed handlers |
|
512 | # Trait changed handlers | |
513 | #------------------------------------------------------------------------- |
|
513 | #------------------------------------------------------------------------- | |
514 |
|
514 | |||
515 | def _ipython_dir_changed(self, name, new): |
|
515 | def _ipython_dir_changed(self, name, new): | |
516 | if not os.path.isdir(new): |
|
516 | if not os.path.isdir(new): | |
517 | os.makedirs(new, mode = 0777) |
|
517 | os.makedirs(new, mode = 0777) | |
518 |
|
518 | |||
519 | def set_autoindent(self,value=None): |
|
519 | def set_autoindent(self,value=None): | |
520 | """Set the autoindent flag, checking for readline support. |
|
520 | """Set the autoindent flag, checking for readline support. | |
521 |
|
521 | |||
522 | If called with no arguments, it acts as a toggle.""" |
|
522 | If called with no arguments, it acts as a toggle.""" | |
523 |
|
523 | |||
524 | if value != 0 and not self.has_readline: |
|
524 | if value != 0 and not self.has_readline: | |
525 | if os.name == 'posix': |
|
525 | if os.name == 'posix': | |
526 | warn("The auto-indent feature requires the readline library") |
|
526 | warn("The auto-indent feature requires the readline library") | |
527 | self.autoindent = 0 |
|
527 | self.autoindent = 0 | |
528 | return |
|
528 | return | |
529 | if value is None: |
|
529 | if value is None: | |
530 | self.autoindent = not self.autoindent |
|
530 | self.autoindent = not self.autoindent | |
531 | else: |
|
531 | else: | |
532 | self.autoindent = value |
|
532 | self.autoindent = value | |
533 |
|
533 | |||
534 | #------------------------------------------------------------------------- |
|
534 | #------------------------------------------------------------------------- | |
535 | # init_* methods called by __init__ |
|
535 | # init_* methods called by __init__ | |
536 | #------------------------------------------------------------------------- |
|
536 | #------------------------------------------------------------------------- | |
537 |
|
537 | |||
538 | def init_ipython_dir(self, ipython_dir): |
|
538 | def init_ipython_dir(self, ipython_dir): | |
539 | if ipython_dir is not None: |
|
539 | if ipython_dir is not None: | |
540 | self.ipython_dir = ipython_dir |
|
540 | self.ipython_dir = ipython_dir | |
541 | return |
|
541 | return | |
542 |
|
542 | |||
543 | self.ipython_dir = get_ipython_dir() |
|
543 | self.ipython_dir = get_ipython_dir() | |
544 |
|
544 | |||
545 | def init_profile_dir(self, profile_dir): |
|
545 | def init_profile_dir(self, profile_dir): | |
546 | if profile_dir is not None: |
|
546 | if profile_dir is not None: | |
547 | self.profile_dir = profile_dir |
|
547 | self.profile_dir = profile_dir | |
548 | return |
|
548 | return | |
549 | self.profile_dir =\ |
|
549 | self.profile_dir =\ | |
550 | ProfileDir.create_profile_dir_by_name(self.ipython_dir, 'default') |
|
550 | ProfileDir.create_profile_dir_by_name(self.ipython_dir, 'default') | |
551 |
|
551 | |||
552 | def init_instance_attrs(self): |
|
552 | def init_instance_attrs(self): | |
553 | self.more = False |
|
553 | self.more = False | |
554 |
|
554 | |||
555 | # command compiler |
|
555 | # command compiler | |
556 | self.compile = CachingCompiler() |
|
556 | self.compile = CachingCompiler() | |
557 |
|
557 | |||
558 | # Make an empty namespace, which extension writers can rely on both |
|
558 | # Make an empty namespace, which extension writers can rely on both | |
559 | # existing and NEVER being used by ipython itself. This gives them a |
|
559 | # existing and NEVER being used by ipython itself. This gives them a | |
560 | # convenient location for storing additional information and state |
|
560 | # convenient location for storing additional information and state | |
561 | # their extensions may require, without fear of collisions with other |
|
561 | # their extensions may require, without fear of collisions with other | |
562 | # ipython names that may develop later. |
|
562 | # ipython names that may develop later. | |
563 | self.meta = Struct() |
|
563 | self.meta = Struct() | |
564 |
|
564 | |||
565 | # Temporary files used for various purposes. Deleted at exit. |
|
565 | # Temporary files used for various purposes. Deleted at exit. | |
566 | self.tempfiles = [] |
|
566 | self.tempfiles = [] | |
567 |
|
567 | |||
568 | # Keep track of readline usage (later set by init_readline) |
|
568 | # Keep track of readline usage (later set by init_readline) | |
569 | self.has_readline = False |
|
569 | self.has_readline = False | |
570 |
|
570 | |||
571 | # keep track of where we started running (mainly for crash post-mortem) |
|
571 | # keep track of where we started running (mainly for crash post-mortem) | |
572 | # This is not being used anywhere currently. |
|
572 | # This is not being used anywhere currently. | |
573 | self.starting_dir = os.getcwdu() |
|
573 | self.starting_dir = os.getcwdu() | |
574 |
|
574 | |||
575 | # Indentation management |
|
575 | # Indentation management | |
576 | self.indent_current_nsp = 0 |
|
576 | self.indent_current_nsp = 0 | |
577 |
|
577 | |||
578 | # Dict to track post-execution functions that have been registered |
|
578 | # Dict to track post-execution functions that have been registered | |
579 | self._post_execute = {} |
|
579 | self._post_execute = {} | |
580 |
|
580 | |||
581 | def init_environment(self): |
|
581 | def init_environment(self): | |
582 | """Any changes we need to make to the user's environment.""" |
|
582 | """Any changes we need to make to the user's environment.""" | |
583 | pass |
|
583 | pass | |
584 |
|
584 | |||
585 | def init_encoding(self): |
|
585 | def init_encoding(self): | |
586 | # Get system encoding at startup time. Certain terminals (like Emacs |
|
586 | # Get system encoding at startup time. Certain terminals (like Emacs | |
587 | # under Win32 have it set to None, and we need to have a known valid |
|
587 | # under Win32 have it set to None, and we need to have a known valid | |
588 | # encoding to use in the raw_input() method |
|
588 | # encoding to use in the raw_input() method | |
589 | try: |
|
589 | try: | |
590 | self.stdin_encoding = sys.stdin.encoding or 'ascii' |
|
590 | self.stdin_encoding = sys.stdin.encoding or 'ascii' | |
591 | except AttributeError: |
|
591 | except AttributeError: | |
592 | self.stdin_encoding = 'ascii' |
|
592 | self.stdin_encoding = 'ascii' | |
593 |
|
593 | |||
594 | def init_syntax_highlighting(self): |
|
594 | def init_syntax_highlighting(self): | |
595 | # Python source parser/formatter for syntax highlighting |
|
595 | # Python source parser/formatter for syntax highlighting | |
596 | pyformat = PyColorize.Parser().format |
|
596 | pyformat = PyColorize.Parser().format | |
597 | self.pycolorize = lambda src: pyformat(src,'str',self.colors) |
|
597 | self.pycolorize = lambda src: pyformat(src,'str',self.colors) | |
598 |
|
598 | |||
599 | def init_pushd_popd_magic(self): |
|
599 | def init_pushd_popd_magic(self): | |
600 | # for pushd/popd management |
|
600 | # for pushd/popd management | |
601 | self.home_dir = get_home_dir() |
|
601 | self.home_dir = get_home_dir() | |
602 |
|
602 | |||
603 | self.dir_stack = [] |
|
603 | self.dir_stack = [] | |
604 |
|
604 | |||
605 | def init_logger(self): |
|
605 | def init_logger(self): | |
606 | self.logger = Logger(self.home_dir, logfname='ipython_log.py', |
|
606 | self.logger = Logger(self.home_dir, logfname='ipython_log.py', | |
607 | logmode='rotate') |
|
607 | logmode='rotate') | |
608 |
|
608 | |||
609 | def init_logstart(self): |
|
609 | def init_logstart(self): | |
610 | """Initialize logging in case it was requested at the command line. |
|
610 | """Initialize logging in case it was requested at the command line. | |
611 | """ |
|
611 | """ | |
612 | if self.logappend: |
|
612 | if self.logappend: | |
613 | self.magic('logstart %s append' % self.logappend) |
|
613 | self.magic('logstart %s append' % self.logappend) | |
614 | elif self.logfile: |
|
614 | elif self.logfile: | |
615 | self.magic('logstart %s' % self.logfile) |
|
615 | self.magic('logstart %s' % self.logfile) | |
616 | elif self.logstart: |
|
616 | elif self.logstart: | |
617 | self.magic('logstart') |
|
617 | self.magic('logstart') | |
618 |
|
618 | |||
619 | def init_builtins(self): |
|
619 | def init_builtins(self): | |
620 | # A single, static flag that we set to True. Its presence indicates |
|
620 | # A single, static flag that we set to True. Its presence indicates | |
621 | # that an IPython shell has been created, and we make no attempts at |
|
621 | # that an IPython shell has been created, and we make no attempts at | |
622 | # removing on exit or representing the existence of more than one |
|
622 | # removing on exit or representing the existence of more than one | |
623 | # IPython at a time. |
|
623 | # IPython at a time. | |
624 | builtin_mod.__dict__['__IPYTHON__'] = True |
|
624 | builtin_mod.__dict__['__IPYTHON__'] = True | |
625 |
|
625 | |||
626 | # In 0.11 we introduced '__IPYTHON__active' as an integer we'd try to |
|
626 | # In 0.11 we introduced '__IPYTHON__active' as an integer we'd try to | |
627 | # manage on enter/exit, but with all our shells it's virtually |
|
627 | # manage on enter/exit, but with all our shells it's virtually | |
628 | # impossible to get all the cases right. We're leaving the name in for |
|
628 | # impossible to get all the cases right. We're leaving the name in for | |
629 | # those who adapted their codes to check for this flag, but will |
|
629 | # those who adapted their codes to check for this flag, but will | |
630 | # eventually remove it after a few more releases. |
|
630 | # eventually remove it after a few more releases. | |
631 | builtin_mod.__dict__['__IPYTHON__active'] = \ |
|
631 | builtin_mod.__dict__['__IPYTHON__active'] = \ | |
632 | 'Deprecated, check for __IPYTHON__' |
|
632 | 'Deprecated, check for __IPYTHON__' | |
633 |
|
633 | |||
634 | self.builtin_trap = BuiltinTrap(shell=self) |
|
634 | self.builtin_trap = BuiltinTrap(shell=self) | |
635 |
|
635 | |||
636 | def init_inspector(self): |
|
636 | def init_inspector(self): | |
637 | # Object inspector |
|
637 | # Object inspector | |
638 | self.inspector = oinspect.Inspector(oinspect.InspectColors, |
|
638 | self.inspector = oinspect.Inspector(oinspect.InspectColors, | |
639 | PyColorize.ANSICodeColors, |
|
639 | PyColorize.ANSICodeColors, | |
640 | 'NoColor', |
|
640 | 'NoColor', | |
641 | self.object_info_string_level) |
|
641 | self.object_info_string_level) | |
642 |
|
642 | |||
643 | def init_io(self): |
|
643 | def init_io(self): | |
644 | # This will just use sys.stdout and sys.stderr. If you want to |
|
644 | # This will just use sys.stdout and sys.stderr. If you want to | |
645 | # override sys.stdout and sys.stderr themselves, you need to do that |
|
645 | # override sys.stdout and sys.stderr themselves, you need to do that | |
646 | # *before* instantiating this class, because io holds onto |
|
646 | # *before* instantiating this class, because io holds onto | |
647 | # references to the underlying streams. |
|
647 | # references to the underlying streams. | |
648 | if sys.platform == 'win32' and self.has_readline: |
|
648 | if sys.platform == 'win32' and self.has_readline: | |
649 | io.stdout = io.stderr = io.IOStream(self.readline._outputfile) |
|
649 | io.stdout = io.stderr = io.IOStream(self.readline._outputfile) | |
650 | else: |
|
650 | else: | |
651 | io.stdout = io.IOStream(sys.stdout) |
|
651 | io.stdout = io.IOStream(sys.stdout) | |
652 | io.stderr = io.IOStream(sys.stderr) |
|
652 | io.stderr = io.IOStream(sys.stderr) | |
653 |
|
653 | |||
654 | def init_prompts(self): |
|
654 | def init_prompts(self): | |
655 | self.prompt_manager = PromptManager(shell=self, config=self.config) |
|
655 | self.prompt_manager = PromptManager(shell=self, config=self.config) | |
656 | self.configurables.append(self.prompt_manager) |
|
656 | self.configurables.append(self.prompt_manager) | |
657 | # Set system prompts, so that scripts can decide if they are running |
|
657 | # Set system prompts, so that scripts can decide if they are running | |
658 | # interactively. |
|
658 | # interactively. | |
659 | sys.ps1 = 'In : ' |
|
659 | sys.ps1 = 'In : ' | |
660 | sys.ps2 = '...: ' |
|
660 | sys.ps2 = '...: ' | |
661 | sys.ps3 = 'Out: ' |
|
661 | sys.ps3 = 'Out: ' | |
662 |
|
662 | |||
663 | def init_display_formatter(self): |
|
663 | def init_display_formatter(self): | |
664 | self.display_formatter = DisplayFormatter(config=self.config) |
|
664 | self.display_formatter = DisplayFormatter(config=self.config) | |
665 | self.configurables.append(self.display_formatter) |
|
665 | self.configurables.append(self.display_formatter) | |
666 |
|
666 | |||
667 | def init_display_pub(self): |
|
667 | def init_display_pub(self): | |
668 | self.display_pub = self.display_pub_class(config=self.config) |
|
668 | self.display_pub = self.display_pub_class(config=self.config) | |
669 | self.configurables.append(self.display_pub) |
|
669 | self.configurables.append(self.display_pub) | |
670 |
|
670 | |||
671 | def init_data_pub(self): |
|
671 | def init_data_pub(self): | |
672 | if not self.data_pub_class: |
|
672 | if not self.data_pub_class: | |
673 | self.data_pub = None |
|
673 | self.data_pub = None | |
674 | return |
|
674 | return | |
675 | self.data_pub = self.data_pub_class(config=self.config) |
|
675 | self.data_pub = self.data_pub_class(config=self.config) | |
676 | self.configurables.append(self.data_pub) |
|
676 | self.configurables.append(self.data_pub) | |
677 |
|
677 | |||
678 | def init_displayhook(self): |
|
678 | def init_displayhook(self): | |
679 | # Initialize displayhook, set in/out prompts and printing system |
|
679 | # Initialize displayhook, set in/out prompts and printing system | |
680 | self.displayhook = self.displayhook_class( |
|
680 | self.displayhook = self.displayhook_class( | |
681 | config=self.config, |
|
681 | config=self.config, | |
682 | shell=self, |
|
682 | shell=self, | |
683 | cache_size=self.cache_size, |
|
683 | cache_size=self.cache_size, | |
684 | ) |
|
684 | ) | |
685 | self.configurables.append(self.displayhook) |
|
685 | self.configurables.append(self.displayhook) | |
686 | # This is a context manager that installs/revmoes the displayhook at |
|
686 | # This is a context manager that installs/revmoes the displayhook at | |
687 | # the appropriate time. |
|
687 | # the appropriate time. | |
688 | self.display_trap = DisplayTrap(hook=self.displayhook) |
|
688 | self.display_trap = DisplayTrap(hook=self.displayhook) | |
689 |
|
689 | |||
690 | def init_reload_doctest(self): |
|
690 | def init_reload_doctest(self): | |
691 | # Do a proper resetting of doctest, including the necessary displayhook |
|
691 | # Do a proper resetting of doctest, including the necessary displayhook | |
692 | # monkeypatching |
|
692 | # monkeypatching | |
693 | try: |
|
693 | try: | |
694 | doctest_reload() |
|
694 | doctest_reload() | |
695 | except ImportError: |
|
695 | except ImportError: | |
696 | warn("doctest module does not exist.") |
|
696 | warn("doctest module does not exist.") | |
697 |
|
697 | |||
698 | def init_latextool(self): |
|
698 | def init_latextool(self): | |
699 | """Configure LaTeXTool.""" |
|
699 | """Configure LaTeXTool.""" | |
700 | cfg = LaTeXTool.instance(config=self.config) |
|
700 | cfg = LaTeXTool.instance(config=self.config) | |
701 | if cfg not in self.configurables: |
|
701 | if cfg not in self.configurables: | |
702 | self.configurables.append(cfg) |
|
702 | self.configurables.append(cfg) | |
703 |
|
703 | |||
704 | def init_virtualenv(self): |
|
704 | def init_virtualenv(self): | |
705 | """Add a virtualenv to sys.path so the user can import modules from it. |
|
705 | """Add a virtualenv to sys.path so the user can import modules from it. | |
706 | This isn't perfect: it doesn't use the Python interpreter with which the |
|
706 | This isn't perfect: it doesn't use the Python interpreter with which the | |
707 | virtualenv was built, and it ignores the --no-site-packages option. A |
|
707 | virtualenv was built, and it ignores the --no-site-packages option. A | |
708 | warning will appear suggesting the user installs IPython in the |
|
708 | warning will appear suggesting the user installs IPython in the | |
709 | virtualenv, but for many cases, it probably works well enough. |
|
709 | virtualenv, but for many cases, it probably works well enough. | |
710 |
|
710 | |||
711 | Adapted from code snippets online. |
|
711 | Adapted from code snippets online. | |
712 |
|
712 | |||
713 | http://blog.ufsoft.org/2009/1/29/ipython-and-virtualenv |
|
713 | http://blog.ufsoft.org/2009/1/29/ipython-and-virtualenv | |
714 | """ |
|
714 | """ | |
715 | if 'VIRTUAL_ENV' not in os.environ: |
|
715 | if 'VIRTUAL_ENV' not in os.environ: | |
716 | # Not in a virtualenv |
|
716 | # Not in a virtualenv | |
717 | return |
|
717 | return | |
718 |
|
718 | |||
719 | if sys.executable.startswith(os.environ['VIRTUAL_ENV']): |
|
719 | if sys.executable.startswith(os.environ['VIRTUAL_ENV']): | |
720 | # Running properly in the virtualenv, don't need to do anything |
|
720 | # Running properly in the virtualenv, don't need to do anything | |
721 | return |
|
721 | return | |
722 |
|
722 | |||
723 | warn("Attempting to work in a virtualenv. If you encounter problems, please " |
|
723 | warn("Attempting to work in a virtualenv. If you encounter problems, please " | |
724 |
"install IPython inside the virtualenv. |
|
724 | "install IPython inside the virtualenv.") | |
725 | if sys.platform == "win32": |
|
725 | if sys.platform == "win32": | |
726 | virtual_env = os.path.join(os.environ['VIRTUAL_ENV'], 'Lib', 'site-packages') |
|
726 | virtual_env = os.path.join(os.environ['VIRTUAL_ENV'], 'Lib', 'site-packages') | |
727 | else: |
|
727 | else: | |
728 | virtual_env = os.path.join(os.environ['VIRTUAL_ENV'], 'lib', |
|
728 | virtual_env = os.path.join(os.environ['VIRTUAL_ENV'], 'lib', | |
729 | 'python%d.%d' % sys.version_info[:2], 'site-packages') |
|
729 | 'python%d.%d' % sys.version_info[:2], 'site-packages') | |
730 |
|
730 | |||
731 | import site |
|
731 | import site | |
732 | sys.path.insert(0, virtual_env) |
|
732 | sys.path.insert(0, virtual_env) | |
733 | site.addsitedir(virtual_env) |
|
733 | site.addsitedir(virtual_env) | |
734 |
|
734 | |||
735 | #------------------------------------------------------------------------- |
|
735 | #------------------------------------------------------------------------- | |
736 | # Things related to injections into the sys module |
|
736 | # Things related to injections into the sys module | |
737 | #------------------------------------------------------------------------- |
|
737 | #------------------------------------------------------------------------- | |
738 |
|
738 | |||
739 | def save_sys_module_state(self): |
|
739 | def save_sys_module_state(self): | |
740 | """Save the state of hooks in the sys module. |
|
740 | """Save the state of hooks in the sys module. | |
741 |
|
741 | |||
742 | This has to be called after self.user_module is created. |
|
742 | This has to be called after self.user_module is created. | |
743 | """ |
|
743 | """ | |
744 | self._orig_sys_module_state = {} |
|
744 | self._orig_sys_module_state = {} | |
745 | self._orig_sys_module_state['stdin'] = sys.stdin |
|
745 | self._orig_sys_module_state['stdin'] = sys.stdin | |
746 | self._orig_sys_module_state['stdout'] = sys.stdout |
|
746 | self._orig_sys_module_state['stdout'] = sys.stdout | |
747 | self._orig_sys_module_state['stderr'] = sys.stderr |
|
747 | self._orig_sys_module_state['stderr'] = sys.stderr | |
748 | self._orig_sys_module_state['excepthook'] = sys.excepthook |
|
748 | self._orig_sys_module_state['excepthook'] = sys.excepthook | |
749 | self._orig_sys_modules_main_name = self.user_module.__name__ |
|
749 | self._orig_sys_modules_main_name = self.user_module.__name__ | |
750 | self._orig_sys_modules_main_mod = sys.modules.get(self.user_module.__name__) |
|
750 | self._orig_sys_modules_main_mod = sys.modules.get(self.user_module.__name__) | |
751 |
|
751 | |||
752 | def restore_sys_module_state(self): |
|
752 | def restore_sys_module_state(self): | |
753 | """Restore the state of the sys module.""" |
|
753 | """Restore the state of the sys module.""" | |
754 | try: |
|
754 | try: | |
755 | for k, v in self._orig_sys_module_state.iteritems(): |
|
755 | for k, v in self._orig_sys_module_state.iteritems(): | |
756 | setattr(sys, k, v) |
|
756 | setattr(sys, k, v) | |
757 | except AttributeError: |
|
757 | except AttributeError: | |
758 | pass |
|
758 | pass | |
759 | # Reset what what done in self.init_sys_modules |
|
759 | # Reset what what done in self.init_sys_modules | |
760 | if self._orig_sys_modules_main_mod is not None: |
|
760 | if self._orig_sys_modules_main_mod is not None: | |
761 | sys.modules[self._orig_sys_modules_main_name] = self._orig_sys_modules_main_mod |
|
761 | sys.modules[self._orig_sys_modules_main_name] = self._orig_sys_modules_main_mod | |
762 |
|
762 | |||
763 | #------------------------------------------------------------------------- |
|
763 | #------------------------------------------------------------------------- | |
764 | # Things related to hooks |
|
764 | # Things related to hooks | |
765 | #------------------------------------------------------------------------- |
|
765 | #------------------------------------------------------------------------- | |
766 |
|
766 | |||
767 | def init_hooks(self): |
|
767 | def init_hooks(self): | |
768 | # hooks holds pointers used for user-side customizations |
|
768 | # hooks holds pointers used for user-side customizations | |
769 | self.hooks = Struct() |
|
769 | self.hooks = Struct() | |
770 |
|
770 | |||
771 | self.strdispatchers = {} |
|
771 | self.strdispatchers = {} | |
772 |
|
772 | |||
773 | # Set all default hooks, defined in the IPython.hooks module. |
|
773 | # Set all default hooks, defined in the IPython.hooks module. | |
774 | hooks = IPython.core.hooks |
|
774 | hooks = IPython.core.hooks | |
775 | for hook_name in hooks.__all__: |
|
775 | for hook_name in hooks.__all__: | |
776 | # default hooks have priority 100, i.e. low; user hooks should have |
|
776 | # default hooks have priority 100, i.e. low; user hooks should have | |
777 | # 0-100 priority |
|
777 | # 0-100 priority | |
778 | self.set_hook(hook_name,getattr(hooks,hook_name), 100) |
|
778 | self.set_hook(hook_name,getattr(hooks,hook_name), 100) | |
779 |
|
779 | |||
780 | def set_hook(self,name,hook, priority = 50, str_key = None, re_key = None): |
|
780 | def set_hook(self,name,hook, priority = 50, str_key = None, re_key = None): | |
781 | """set_hook(name,hook) -> sets an internal IPython hook. |
|
781 | """set_hook(name,hook) -> sets an internal IPython hook. | |
782 |
|
782 | |||
783 | IPython exposes some of its internal API as user-modifiable hooks. By |
|
783 | IPython exposes some of its internal API as user-modifiable hooks. By | |
784 | adding your function to one of these hooks, you can modify IPython's |
|
784 | adding your function to one of these hooks, you can modify IPython's | |
785 | behavior to call at runtime your own routines.""" |
|
785 | behavior to call at runtime your own routines.""" | |
786 |
|
786 | |||
787 | # At some point in the future, this should validate the hook before it |
|
787 | # At some point in the future, this should validate the hook before it | |
788 | # accepts it. Probably at least check that the hook takes the number |
|
788 | # accepts it. Probably at least check that the hook takes the number | |
789 | # of args it's supposed to. |
|
789 | # of args it's supposed to. | |
790 |
|
790 | |||
791 | f = types.MethodType(hook,self) |
|
791 | f = types.MethodType(hook,self) | |
792 |
|
792 | |||
793 | # check if the hook is for strdispatcher first |
|
793 | # check if the hook is for strdispatcher first | |
794 | if str_key is not None: |
|
794 | if str_key is not None: | |
795 | sdp = self.strdispatchers.get(name, StrDispatch()) |
|
795 | sdp = self.strdispatchers.get(name, StrDispatch()) | |
796 | sdp.add_s(str_key, f, priority ) |
|
796 | sdp.add_s(str_key, f, priority ) | |
797 | self.strdispatchers[name] = sdp |
|
797 | self.strdispatchers[name] = sdp | |
798 | return |
|
798 | return | |
799 | if re_key is not None: |
|
799 | if re_key is not None: | |
800 | sdp = self.strdispatchers.get(name, StrDispatch()) |
|
800 | sdp = self.strdispatchers.get(name, StrDispatch()) | |
801 | sdp.add_re(re.compile(re_key), f, priority ) |
|
801 | sdp.add_re(re.compile(re_key), f, priority ) | |
802 | self.strdispatchers[name] = sdp |
|
802 | self.strdispatchers[name] = sdp | |
803 | return |
|
803 | return | |
804 |
|
804 | |||
805 | dp = getattr(self.hooks, name, None) |
|
805 | dp = getattr(self.hooks, name, None) | |
806 | if name not in IPython.core.hooks.__all__: |
|
806 | if name not in IPython.core.hooks.__all__: | |
807 | print("Warning! Hook '%s' is not one of %s" % \ |
|
807 | print("Warning! Hook '%s' is not one of %s" % \ | |
808 | (name, IPython.core.hooks.__all__ )) |
|
808 | (name, IPython.core.hooks.__all__ )) | |
809 | if not dp: |
|
809 | if not dp: | |
810 | dp = IPython.core.hooks.CommandChainDispatcher() |
|
810 | dp = IPython.core.hooks.CommandChainDispatcher() | |
811 |
|
811 | |||
812 | try: |
|
812 | try: | |
813 | dp.add(f,priority) |
|
813 | dp.add(f,priority) | |
814 | except AttributeError: |
|
814 | except AttributeError: | |
815 | # it was not commandchain, plain old func - replace |
|
815 | # it was not commandchain, plain old func - replace | |
816 | dp = f |
|
816 | dp = f | |
817 |
|
817 | |||
818 | setattr(self.hooks,name, dp) |
|
818 | setattr(self.hooks,name, dp) | |
819 |
|
819 | |||
820 | def register_post_execute(self, func): |
|
820 | def register_post_execute(self, func): | |
821 | """Register a function for calling after code execution. |
|
821 | """Register a function for calling after code execution. | |
822 | """ |
|
822 | """ | |
823 | if not callable(func): |
|
823 | if not callable(func): | |
824 | raise ValueError('argument %s must be callable' % func) |
|
824 | raise ValueError('argument %s must be callable' % func) | |
825 | self._post_execute[func] = True |
|
825 | self._post_execute[func] = True | |
826 |
|
826 | |||
827 | #------------------------------------------------------------------------- |
|
827 | #------------------------------------------------------------------------- | |
828 | # Things related to the "main" module |
|
828 | # Things related to the "main" module | |
829 | #------------------------------------------------------------------------- |
|
829 | #------------------------------------------------------------------------- | |
830 |
|
830 | |||
831 | def new_main_mod(self,ns=None): |
|
831 | def new_main_mod(self,ns=None): | |
832 | """Return a new 'main' module object for user code execution. |
|
832 | """Return a new 'main' module object for user code execution. | |
833 | """ |
|
833 | """ | |
834 | main_mod = self._user_main_module |
|
834 | main_mod = self._user_main_module | |
835 | init_fakemod_dict(main_mod,ns) |
|
835 | init_fakemod_dict(main_mod,ns) | |
836 | return main_mod |
|
836 | return main_mod | |
837 |
|
837 | |||
838 | def cache_main_mod(self,ns,fname): |
|
838 | def cache_main_mod(self,ns,fname): | |
839 | """Cache a main module's namespace. |
|
839 | """Cache a main module's namespace. | |
840 |
|
840 | |||
841 | When scripts are executed via %run, we must keep a reference to the |
|
841 | When scripts are executed via %run, we must keep a reference to the | |
842 | namespace of their __main__ module (a FakeModule instance) around so |
|
842 | namespace of their __main__ module (a FakeModule instance) around so | |
843 | that Python doesn't clear it, rendering objects defined therein |
|
843 | that Python doesn't clear it, rendering objects defined therein | |
844 | useless. |
|
844 | useless. | |
845 |
|
845 | |||
846 | This method keeps said reference in a private dict, keyed by the |
|
846 | This method keeps said reference in a private dict, keyed by the | |
847 | absolute path of the module object (which corresponds to the script |
|
847 | absolute path of the module object (which corresponds to the script | |
848 | path). This way, for multiple executions of the same script we only |
|
848 | path). This way, for multiple executions of the same script we only | |
849 | keep one copy of the namespace (the last one), thus preventing memory |
|
849 | keep one copy of the namespace (the last one), thus preventing memory | |
850 | leaks from old references while allowing the objects from the last |
|
850 | leaks from old references while allowing the objects from the last | |
851 | execution to be accessible. |
|
851 | execution to be accessible. | |
852 |
|
852 | |||
853 | Note: we can not allow the actual FakeModule instances to be deleted, |
|
853 | Note: we can not allow the actual FakeModule instances to be deleted, | |
854 | because of how Python tears down modules (it hard-sets all their |
|
854 | because of how Python tears down modules (it hard-sets all their | |
855 | references to None without regard for reference counts). This method |
|
855 | references to None without regard for reference counts). This method | |
856 | must therefore make a *copy* of the given namespace, to allow the |
|
856 | must therefore make a *copy* of the given namespace, to allow the | |
857 | original module's __dict__ to be cleared and reused. |
|
857 | original module's __dict__ to be cleared and reused. | |
858 |
|
858 | |||
859 |
|
859 | |||
860 | Parameters |
|
860 | Parameters | |
861 | ---------- |
|
861 | ---------- | |
862 | ns : a namespace (a dict, typically) |
|
862 | ns : a namespace (a dict, typically) | |
863 |
|
863 | |||
864 | fname : str |
|
864 | fname : str | |
865 | Filename associated with the namespace. |
|
865 | Filename associated with the namespace. | |
866 |
|
866 | |||
867 | Examples |
|
867 | Examples | |
868 | -------- |
|
868 | -------- | |
869 |
|
869 | |||
870 | In [10]: import IPython |
|
870 | In [10]: import IPython | |
871 |
|
871 | |||
872 | In [11]: _ip.cache_main_mod(IPython.__dict__,IPython.__file__) |
|
872 | In [11]: _ip.cache_main_mod(IPython.__dict__,IPython.__file__) | |
873 |
|
873 | |||
874 | In [12]: IPython.__file__ in _ip._main_ns_cache |
|
874 | In [12]: IPython.__file__ in _ip._main_ns_cache | |
875 | Out[12]: True |
|
875 | Out[12]: True | |
876 | """ |
|
876 | """ | |
877 | self._main_ns_cache[os.path.abspath(fname)] = ns.copy() |
|
877 | self._main_ns_cache[os.path.abspath(fname)] = ns.copy() | |
878 |
|
878 | |||
879 | def clear_main_mod_cache(self): |
|
879 | def clear_main_mod_cache(self): | |
880 | """Clear the cache of main modules. |
|
880 | """Clear the cache of main modules. | |
881 |
|
881 | |||
882 | Mainly for use by utilities like %reset. |
|
882 | Mainly for use by utilities like %reset. | |
883 |
|
883 | |||
884 | Examples |
|
884 | Examples | |
885 | -------- |
|
885 | -------- | |
886 |
|
886 | |||
887 | In [15]: import IPython |
|
887 | In [15]: import IPython | |
888 |
|
888 | |||
889 | In [16]: _ip.cache_main_mod(IPython.__dict__,IPython.__file__) |
|
889 | In [16]: _ip.cache_main_mod(IPython.__dict__,IPython.__file__) | |
890 |
|
890 | |||
891 | In [17]: len(_ip._main_ns_cache) > 0 |
|
891 | In [17]: len(_ip._main_ns_cache) > 0 | |
892 | Out[17]: True |
|
892 | Out[17]: True | |
893 |
|
893 | |||
894 | In [18]: _ip.clear_main_mod_cache() |
|
894 | In [18]: _ip.clear_main_mod_cache() | |
895 |
|
895 | |||
896 | In [19]: len(_ip._main_ns_cache) == 0 |
|
896 | In [19]: len(_ip._main_ns_cache) == 0 | |
897 | Out[19]: True |
|
897 | Out[19]: True | |
898 | """ |
|
898 | """ | |
899 | self._main_ns_cache.clear() |
|
899 | self._main_ns_cache.clear() | |
900 |
|
900 | |||
901 | #------------------------------------------------------------------------- |
|
901 | #------------------------------------------------------------------------- | |
902 | # Things related to debugging |
|
902 | # Things related to debugging | |
903 | #------------------------------------------------------------------------- |
|
903 | #------------------------------------------------------------------------- | |
904 |
|
904 | |||
905 | def init_pdb(self): |
|
905 | def init_pdb(self): | |
906 | # Set calling of pdb on exceptions |
|
906 | # Set calling of pdb on exceptions | |
907 | # self.call_pdb is a property |
|
907 | # self.call_pdb is a property | |
908 | self.call_pdb = self.pdb |
|
908 | self.call_pdb = self.pdb | |
909 |
|
909 | |||
910 | def _get_call_pdb(self): |
|
910 | def _get_call_pdb(self): | |
911 | return self._call_pdb |
|
911 | return self._call_pdb | |
912 |
|
912 | |||
913 | def _set_call_pdb(self,val): |
|
913 | def _set_call_pdb(self,val): | |
914 |
|
914 | |||
915 | if val not in (0,1,False,True): |
|
915 | if val not in (0,1,False,True): | |
916 | raise ValueError('new call_pdb value must be boolean') |
|
916 | raise ValueError('new call_pdb value must be boolean') | |
917 |
|
917 | |||
918 | # store value in instance |
|
918 | # store value in instance | |
919 | self._call_pdb = val |
|
919 | self._call_pdb = val | |
920 |
|
920 | |||
921 | # notify the actual exception handlers |
|
921 | # notify the actual exception handlers | |
922 | self.InteractiveTB.call_pdb = val |
|
922 | self.InteractiveTB.call_pdb = val | |
923 |
|
923 | |||
924 | call_pdb = property(_get_call_pdb,_set_call_pdb,None, |
|
924 | call_pdb = property(_get_call_pdb,_set_call_pdb,None, | |
925 | 'Control auto-activation of pdb at exceptions') |
|
925 | 'Control auto-activation of pdb at exceptions') | |
926 |
|
926 | |||
927 | def debugger(self,force=False): |
|
927 | def debugger(self,force=False): | |
928 | """Call the pydb/pdb debugger. |
|
928 | """Call the pydb/pdb debugger. | |
929 |
|
929 | |||
930 | Keywords: |
|
930 | Keywords: | |
931 |
|
931 | |||
932 | - force(False): by default, this routine checks the instance call_pdb |
|
932 | - force(False): by default, this routine checks the instance call_pdb | |
933 | flag and does not actually invoke the debugger if the flag is false. |
|
933 | flag and does not actually invoke the debugger if the flag is false. | |
934 | The 'force' option forces the debugger to activate even if the flag |
|
934 | The 'force' option forces the debugger to activate even if the flag | |
935 | is false. |
|
935 | is false. | |
936 | """ |
|
936 | """ | |
937 |
|
937 | |||
938 | if not (force or self.call_pdb): |
|
938 | if not (force or self.call_pdb): | |
939 | return |
|
939 | return | |
940 |
|
940 | |||
941 | if not hasattr(sys,'last_traceback'): |
|
941 | if not hasattr(sys,'last_traceback'): | |
942 | error('No traceback has been produced, nothing to debug.') |
|
942 | error('No traceback has been produced, nothing to debug.') | |
943 | return |
|
943 | return | |
944 |
|
944 | |||
945 | # use pydb if available |
|
945 | # use pydb if available | |
946 | if debugger.has_pydb: |
|
946 | if debugger.has_pydb: | |
947 | from pydb import pm |
|
947 | from pydb import pm | |
948 | else: |
|
948 | else: | |
949 | # fallback to our internal debugger |
|
949 | # fallback to our internal debugger | |
950 | pm = lambda : self.InteractiveTB.debugger(force=True) |
|
950 | pm = lambda : self.InteractiveTB.debugger(force=True) | |
951 |
|
951 | |||
952 | with self.readline_no_record: |
|
952 | with self.readline_no_record: | |
953 | pm() |
|
953 | pm() | |
954 |
|
954 | |||
955 | #------------------------------------------------------------------------- |
|
955 | #------------------------------------------------------------------------- | |
956 | # Things related to IPython's various namespaces |
|
956 | # Things related to IPython's various namespaces | |
957 | #------------------------------------------------------------------------- |
|
957 | #------------------------------------------------------------------------- | |
958 | default_user_namespaces = True |
|
958 | default_user_namespaces = True | |
959 |
|
959 | |||
960 | def init_create_namespaces(self, user_module=None, user_ns=None): |
|
960 | def init_create_namespaces(self, user_module=None, user_ns=None): | |
961 | # Create the namespace where the user will operate. user_ns is |
|
961 | # Create the namespace where the user will operate. user_ns is | |
962 | # normally the only one used, and it is passed to the exec calls as |
|
962 | # normally the only one used, and it is passed to the exec calls as | |
963 | # the locals argument. But we do carry a user_global_ns namespace |
|
963 | # the locals argument. But we do carry a user_global_ns namespace | |
964 | # given as the exec 'globals' argument, This is useful in embedding |
|
964 | # given as the exec 'globals' argument, This is useful in embedding | |
965 | # situations where the ipython shell opens in a context where the |
|
965 | # situations where the ipython shell opens in a context where the | |
966 | # distinction between locals and globals is meaningful. For |
|
966 | # distinction between locals and globals is meaningful. For | |
967 | # non-embedded contexts, it is just the same object as the user_ns dict. |
|
967 | # non-embedded contexts, it is just the same object as the user_ns dict. | |
968 |
|
968 | |||
969 | # FIXME. For some strange reason, __builtins__ is showing up at user |
|
969 | # FIXME. For some strange reason, __builtins__ is showing up at user | |
970 | # level as a dict instead of a module. This is a manual fix, but I |
|
970 | # level as a dict instead of a module. This is a manual fix, but I | |
971 | # should really track down where the problem is coming from. Alex |
|
971 | # should really track down where the problem is coming from. Alex | |
972 | # Schmolck reported this problem first. |
|
972 | # Schmolck reported this problem first. | |
973 |
|
973 | |||
974 | # A useful post by Alex Martelli on this topic: |
|
974 | # A useful post by Alex Martelli on this topic: | |
975 | # Re: inconsistent value from __builtins__ |
|
975 | # Re: inconsistent value from __builtins__ | |
976 | # Von: Alex Martelli <aleaxit@yahoo.com> |
|
976 | # Von: Alex Martelli <aleaxit@yahoo.com> | |
977 | # Datum: Freitag 01 Oktober 2004 04:45:34 nachmittags/abends |
|
977 | # Datum: Freitag 01 Oktober 2004 04:45:34 nachmittags/abends | |
978 | # Gruppen: comp.lang.python |
|
978 | # Gruppen: comp.lang.python | |
979 |
|
979 | |||
980 | # Michael Hohn <hohn@hooknose.lbl.gov> wrote: |
|
980 | # Michael Hohn <hohn@hooknose.lbl.gov> wrote: | |
981 | # > >>> print type(builtin_check.get_global_binding('__builtins__')) |
|
981 | # > >>> print type(builtin_check.get_global_binding('__builtins__')) | |
982 | # > <type 'dict'> |
|
982 | # > <type 'dict'> | |
983 | # > >>> print type(__builtins__) |
|
983 | # > >>> print type(__builtins__) | |
984 | # > <type 'module'> |
|
984 | # > <type 'module'> | |
985 | # > Is this difference in return value intentional? |
|
985 | # > Is this difference in return value intentional? | |
986 |
|
986 | |||
987 | # Well, it's documented that '__builtins__' can be either a dictionary |
|
987 | # Well, it's documented that '__builtins__' can be either a dictionary | |
988 | # or a module, and it's been that way for a long time. Whether it's |
|
988 | # or a module, and it's been that way for a long time. Whether it's | |
989 | # intentional (or sensible), I don't know. In any case, the idea is |
|
989 | # intentional (or sensible), I don't know. In any case, the idea is | |
990 | # that if you need to access the built-in namespace directly, you |
|
990 | # that if you need to access the built-in namespace directly, you | |
991 | # should start with "import __builtin__" (note, no 's') which will |
|
991 | # should start with "import __builtin__" (note, no 's') which will | |
992 | # definitely give you a module. Yeah, it's somewhat confusing:-(. |
|
992 | # definitely give you a module. Yeah, it's somewhat confusing:-(. | |
993 |
|
993 | |||
994 | # These routines return a properly built module and dict as needed by |
|
994 | # These routines return a properly built module and dict as needed by | |
995 | # the rest of the code, and can also be used by extension writers to |
|
995 | # the rest of the code, and can also be used by extension writers to | |
996 | # generate properly initialized namespaces. |
|
996 | # generate properly initialized namespaces. | |
997 | if (user_ns is not None) or (user_module is not None): |
|
997 | if (user_ns is not None) or (user_module is not None): | |
998 | self.default_user_namespaces = False |
|
998 | self.default_user_namespaces = False | |
999 | self.user_module, self.user_ns = self.prepare_user_module(user_module, user_ns) |
|
999 | self.user_module, self.user_ns = self.prepare_user_module(user_module, user_ns) | |
1000 |
|
1000 | |||
1001 | # A record of hidden variables we have added to the user namespace, so |
|
1001 | # A record of hidden variables we have added to the user namespace, so | |
1002 | # we can list later only variables defined in actual interactive use. |
|
1002 | # we can list later only variables defined in actual interactive use. | |
1003 | self.user_ns_hidden = set() |
|
1003 | self.user_ns_hidden = set() | |
1004 |
|
1004 | |||
1005 | # Now that FakeModule produces a real module, we've run into a nasty |
|
1005 | # Now that FakeModule produces a real module, we've run into a nasty | |
1006 | # problem: after script execution (via %run), the module where the user |
|
1006 | # problem: after script execution (via %run), the module where the user | |
1007 | # code ran is deleted. Now that this object is a true module (needed |
|
1007 | # code ran is deleted. Now that this object is a true module (needed | |
1008 | # so docetst and other tools work correctly), the Python module |
|
1008 | # so docetst and other tools work correctly), the Python module | |
1009 | # teardown mechanism runs over it, and sets to None every variable |
|
1009 | # teardown mechanism runs over it, and sets to None every variable | |
1010 | # present in that module. Top-level references to objects from the |
|
1010 | # present in that module. Top-level references to objects from the | |
1011 | # script survive, because the user_ns is updated with them. However, |
|
1011 | # script survive, because the user_ns is updated with them. However, | |
1012 | # calling functions defined in the script that use other things from |
|
1012 | # calling functions defined in the script that use other things from | |
1013 | # the script will fail, because the function's closure had references |
|
1013 | # the script will fail, because the function's closure had references | |
1014 | # to the original objects, which are now all None. So we must protect |
|
1014 | # to the original objects, which are now all None. So we must protect | |
1015 | # these modules from deletion by keeping a cache. |
|
1015 | # these modules from deletion by keeping a cache. | |
1016 | # |
|
1016 | # | |
1017 | # To avoid keeping stale modules around (we only need the one from the |
|
1017 | # To avoid keeping stale modules around (we only need the one from the | |
1018 | # last run), we use a dict keyed with the full path to the script, so |
|
1018 | # last run), we use a dict keyed with the full path to the script, so | |
1019 | # only the last version of the module is held in the cache. Note, |
|
1019 | # only the last version of the module is held in the cache. Note, | |
1020 | # however, that we must cache the module *namespace contents* (their |
|
1020 | # however, that we must cache the module *namespace contents* (their | |
1021 | # __dict__). Because if we try to cache the actual modules, old ones |
|
1021 | # __dict__). Because if we try to cache the actual modules, old ones | |
1022 | # (uncached) could be destroyed while still holding references (such as |
|
1022 | # (uncached) could be destroyed while still holding references (such as | |
1023 | # those held by GUI objects that tend to be long-lived)> |
|
1023 | # those held by GUI objects that tend to be long-lived)> | |
1024 | # |
|
1024 | # | |
1025 | # The %reset command will flush this cache. See the cache_main_mod() |
|
1025 | # The %reset command will flush this cache. See the cache_main_mod() | |
1026 | # and clear_main_mod_cache() methods for details on use. |
|
1026 | # and clear_main_mod_cache() methods for details on use. | |
1027 |
|
1027 | |||
1028 | # This is the cache used for 'main' namespaces |
|
1028 | # This is the cache used for 'main' namespaces | |
1029 | self._main_ns_cache = {} |
|
1029 | self._main_ns_cache = {} | |
1030 | # And this is the single instance of FakeModule whose __dict__ we keep |
|
1030 | # And this is the single instance of FakeModule whose __dict__ we keep | |
1031 | # copying and clearing for reuse on each %run |
|
1031 | # copying and clearing for reuse on each %run | |
1032 | self._user_main_module = FakeModule() |
|
1032 | self._user_main_module = FakeModule() | |
1033 |
|
1033 | |||
1034 | # A table holding all the namespaces IPython deals with, so that |
|
1034 | # A table holding all the namespaces IPython deals with, so that | |
1035 | # introspection facilities can search easily. |
|
1035 | # introspection facilities can search easily. | |
1036 | self.ns_table = {'user_global':self.user_module.__dict__, |
|
1036 | self.ns_table = {'user_global':self.user_module.__dict__, | |
1037 | 'user_local':self.user_ns, |
|
1037 | 'user_local':self.user_ns, | |
1038 | 'builtin':builtin_mod.__dict__ |
|
1038 | 'builtin':builtin_mod.__dict__ | |
1039 | } |
|
1039 | } | |
1040 |
|
1040 | |||
1041 | @property |
|
1041 | @property | |
1042 | def user_global_ns(self): |
|
1042 | def user_global_ns(self): | |
1043 | return self.user_module.__dict__ |
|
1043 | return self.user_module.__dict__ | |
1044 |
|
1044 | |||
1045 | def prepare_user_module(self, user_module=None, user_ns=None): |
|
1045 | def prepare_user_module(self, user_module=None, user_ns=None): | |
1046 | """Prepare the module and namespace in which user code will be run. |
|
1046 | """Prepare the module and namespace in which user code will be run. | |
1047 |
|
1047 | |||
1048 | When IPython is started normally, both parameters are None: a new module |
|
1048 | When IPython is started normally, both parameters are None: a new module | |
1049 | is created automatically, and its __dict__ used as the namespace. |
|
1049 | is created automatically, and its __dict__ used as the namespace. | |
1050 |
|
1050 | |||
1051 | If only user_module is provided, its __dict__ is used as the namespace. |
|
1051 | If only user_module is provided, its __dict__ is used as the namespace. | |
1052 | If only user_ns is provided, a dummy module is created, and user_ns |
|
1052 | If only user_ns is provided, a dummy module is created, and user_ns | |
1053 | becomes the global namespace. If both are provided (as they may be |
|
1053 | becomes the global namespace. If both are provided (as they may be | |
1054 | when embedding), user_ns is the local namespace, and user_module |
|
1054 | when embedding), user_ns is the local namespace, and user_module | |
1055 | provides the global namespace. |
|
1055 | provides the global namespace. | |
1056 |
|
1056 | |||
1057 | Parameters |
|
1057 | Parameters | |
1058 | ---------- |
|
1058 | ---------- | |
1059 | user_module : module, optional |
|
1059 | user_module : module, optional | |
1060 | The current user module in which IPython is being run. If None, |
|
1060 | The current user module in which IPython is being run. If None, | |
1061 | a clean module will be created. |
|
1061 | a clean module will be created. | |
1062 | user_ns : dict, optional |
|
1062 | user_ns : dict, optional | |
1063 | A namespace in which to run interactive commands. |
|
1063 | A namespace in which to run interactive commands. | |
1064 |
|
1064 | |||
1065 | Returns |
|
1065 | Returns | |
1066 | ------- |
|
1066 | ------- | |
1067 | A tuple of user_module and user_ns, each properly initialised. |
|
1067 | A tuple of user_module and user_ns, each properly initialised. | |
1068 | """ |
|
1068 | """ | |
1069 | if user_module is None and user_ns is not None: |
|
1069 | if user_module is None and user_ns is not None: | |
1070 | user_ns.setdefault("__name__", "__main__") |
|
1070 | user_ns.setdefault("__name__", "__main__") | |
1071 | class DummyMod(object): |
|
1071 | class DummyMod(object): | |
1072 | "A dummy module used for IPython's interactive namespace." |
|
1072 | "A dummy module used for IPython's interactive namespace." | |
1073 | pass |
|
1073 | pass | |
1074 | user_module = DummyMod() |
|
1074 | user_module = DummyMod() | |
1075 | user_module.__dict__ = user_ns |
|
1075 | user_module.__dict__ = user_ns | |
1076 |
|
1076 | |||
1077 | if user_module is None: |
|
1077 | if user_module is None: | |
1078 | user_module = types.ModuleType("__main__", |
|
1078 | user_module = types.ModuleType("__main__", | |
1079 | doc="Automatically created module for IPython interactive environment") |
|
1079 | doc="Automatically created module for IPython interactive environment") | |
1080 |
|
1080 | |||
1081 | # We must ensure that __builtin__ (without the final 's') is always |
|
1081 | # We must ensure that __builtin__ (without the final 's') is always | |
1082 | # available and pointing to the __builtin__ *module*. For more details: |
|
1082 | # available and pointing to the __builtin__ *module*. For more details: | |
1083 | # http://mail.python.org/pipermail/python-dev/2001-April/014068.html |
|
1083 | # http://mail.python.org/pipermail/python-dev/2001-April/014068.html | |
1084 | user_module.__dict__.setdefault('__builtin__', builtin_mod) |
|
1084 | user_module.__dict__.setdefault('__builtin__', builtin_mod) | |
1085 | user_module.__dict__.setdefault('__builtins__', builtin_mod) |
|
1085 | user_module.__dict__.setdefault('__builtins__', builtin_mod) | |
1086 |
|
1086 | |||
1087 | if user_ns is None: |
|
1087 | if user_ns is None: | |
1088 | user_ns = user_module.__dict__ |
|
1088 | user_ns = user_module.__dict__ | |
1089 |
|
1089 | |||
1090 | return user_module, user_ns |
|
1090 | return user_module, user_ns | |
1091 |
|
1091 | |||
1092 | def init_sys_modules(self): |
|
1092 | def init_sys_modules(self): | |
1093 | # We need to insert into sys.modules something that looks like a |
|
1093 | # We need to insert into sys.modules something that looks like a | |
1094 | # module but which accesses the IPython namespace, for shelve and |
|
1094 | # module but which accesses the IPython namespace, for shelve and | |
1095 | # pickle to work interactively. Normally they rely on getting |
|
1095 | # pickle to work interactively. Normally they rely on getting | |
1096 | # everything out of __main__, but for embedding purposes each IPython |
|
1096 | # everything out of __main__, but for embedding purposes each IPython | |
1097 | # instance has its own private namespace, so we can't go shoving |
|
1097 | # instance has its own private namespace, so we can't go shoving | |
1098 | # everything into __main__. |
|
1098 | # everything into __main__. | |
1099 |
|
1099 | |||
1100 | # note, however, that we should only do this for non-embedded |
|
1100 | # note, however, that we should only do this for non-embedded | |
1101 | # ipythons, which really mimic the __main__.__dict__ with their own |
|
1101 | # ipythons, which really mimic the __main__.__dict__ with their own | |
1102 | # namespace. Embedded instances, on the other hand, should not do |
|
1102 | # namespace. Embedded instances, on the other hand, should not do | |
1103 | # this because they need to manage the user local/global namespaces |
|
1103 | # this because they need to manage the user local/global namespaces | |
1104 | # only, but they live within a 'normal' __main__ (meaning, they |
|
1104 | # only, but they live within a 'normal' __main__ (meaning, they | |
1105 | # shouldn't overtake the execution environment of the script they're |
|
1105 | # shouldn't overtake the execution environment of the script they're | |
1106 | # embedded in). |
|
1106 | # embedded in). | |
1107 |
|
1107 | |||
1108 | # This is overridden in the InteractiveShellEmbed subclass to a no-op. |
|
1108 | # This is overridden in the InteractiveShellEmbed subclass to a no-op. | |
1109 | main_name = self.user_module.__name__ |
|
1109 | main_name = self.user_module.__name__ | |
1110 | sys.modules[main_name] = self.user_module |
|
1110 | sys.modules[main_name] = self.user_module | |
1111 |
|
1111 | |||
1112 | def init_user_ns(self): |
|
1112 | def init_user_ns(self): | |
1113 | """Initialize all user-visible namespaces to their minimum defaults. |
|
1113 | """Initialize all user-visible namespaces to their minimum defaults. | |
1114 |
|
1114 | |||
1115 | Certain history lists are also initialized here, as they effectively |
|
1115 | Certain history lists are also initialized here, as they effectively | |
1116 | act as user namespaces. |
|
1116 | act as user namespaces. | |
1117 |
|
1117 | |||
1118 | Notes |
|
1118 | Notes | |
1119 | ----- |
|
1119 | ----- | |
1120 | All data structures here are only filled in, they are NOT reset by this |
|
1120 | All data structures here are only filled in, they are NOT reset by this | |
1121 | method. If they were not empty before, data will simply be added to |
|
1121 | method. If they were not empty before, data will simply be added to | |
1122 | therm. |
|
1122 | therm. | |
1123 | """ |
|
1123 | """ | |
1124 | # This function works in two parts: first we put a few things in |
|
1124 | # This function works in two parts: first we put a few things in | |
1125 | # user_ns, and we sync that contents into user_ns_hidden so that these |
|
1125 | # user_ns, and we sync that contents into user_ns_hidden so that these | |
1126 | # initial variables aren't shown by %who. After the sync, we add the |
|
1126 | # initial variables aren't shown by %who. After the sync, we add the | |
1127 | # rest of what we *do* want the user to see with %who even on a new |
|
1127 | # rest of what we *do* want the user to see with %who even on a new | |
1128 | # session (probably nothing, so theye really only see their own stuff) |
|
1128 | # session (probably nothing, so theye really only see their own stuff) | |
1129 |
|
1129 | |||
1130 | # The user dict must *always* have a __builtin__ reference to the |
|
1130 | # The user dict must *always* have a __builtin__ reference to the | |
1131 | # Python standard __builtin__ namespace, which must be imported. |
|
1131 | # Python standard __builtin__ namespace, which must be imported. | |
1132 | # This is so that certain operations in prompt evaluation can be |
|
1132 | # This is so that certain operations in prompt evaluation can be | |
1133 | # reliably executed with builtins. Note that we can NOT use |
|
1133 | # reliably executed with builtins. Note that we can NOT use | |
1134 | # __builtins__ (note the 's'), because that can either be a dict or a |
|
1134 | # __builtins__ (note the 's'), because that can either be a dict or a | |
1135 | # module, and can even mutate at runtime, depending on the context |
|
1135 | # module, and can even mutate at runtime, depending on the context | |
1136 | # (Python makes no guarantees on it). In contrast, __builtin__ is |
|
1136 | # (Python makes no guarantees on it). In contrast, __builtin__ is | |
1137 | # always a module object, though it must be explicitly imported. |
|
1137 | # always a module object, though it must be explicitly imported. | |
1138 |
|
1138 | |||
1139 | # For more details: |
|
1139 | # For more details: | |
1140 | # http://mail.python.org/pipermail/python-dev/2001-April/014068.html |
|
1140 | # http://mail.python.org/pipermail/python-dev/2001-April/014068.html | |
1141 | ns = dict() |
|
1141 | ns = dict() | |
1142 |
|
1142 | |||
1143 | # Put 'help' in the user namespace |
|
1143 | # Put 'help' in the user namespace | |
1144 | try: |
|
1144 | try: | |
1145 | from site import _Helper |
|
1145 | from site import _Helper | |
1146 | ns['help'] = _Helper() |
|
1146 | ns['help'] = _Helper() | |
1147 | except ImportError: |
|
1147 | except ImportError: | |
1148 | warn('help() not available - check site.py') |
|
1148 | warn('help() not available - check site.py') | |
1149 |
|
1149 | |||
1150 | # make global variables for user access to the histories |
|
1150 | # make global variables for user access to the histories | |
1151 | ns['_ih'] = self.history_manager.input_hist_parsed |
|
1151 | ns['_ih'] = self.history_manager.input_hist_parsed | |
1152 | ns['_oh'] = self.history_manager.output_hist |
|
1152 | ns['_oh'] = self.history_manager.output_hist | |
1153 | ns['_dh'] = self.history_manager.dir_hist |
|
1153 | ns['_dh'] = self.history_manager.dir_hist | |
1154 |
|
1154 | |||
1155 | ns['_sh'] = shadowns |
|
1155 | ns['_sh'] = shadowns | |
1156 |
|
1156 | |||
1157 | # user aliases to input and output histories. These shouldn't show up |
|
1157 | # user aliases to input and output histories. These shouldn't show up | |
1158 | # in %who, as they can have very large reprs. |
|
1158 | # in %who, as they can have very large reprs. | |
1159 | ns['In'] = self.history_manager.input_hist_parsed |
|
1159 | ns['In'] = self.history_manager.input_hist_parsed | |
1160 | ns['Out'] = self.history_manager.output_hist |
|
1160 | ns['Out'] = self.history_manager.output_hist | |
1161 |
|
1161 | |||
1162 | # Store myself as the public api!!! |
|
1162 | # Store myself as the public api!!! | |
1163 | ns['get_ipython'] = self.get_ipython |
|
1163 | ns['get_ipython'] = self.get_ipython | |
1164 |
|
1164 | |||
1165 | ns['exit'] = self.exiter |
|
1165 | ns['exit'] = self.exiter | |
1166 | ns['quit'] = self.exiter |
|
1166 | ns['quit'] = self.exiter | |
1167 |
|
1167 | |||
1168 | # Sync what we've added so far to user_ns_hidden so these aren't seen |
|
1168 | # Sync what we've added so far to user_ns_hidden so these aren't seen | |
1169 | # by %who |
|
1169 | # by %who | |
1170 | self.user_ns_hidden.update(ns) |
|
1170 | self.user_ns_hidden.update(ns) | |
1171 |
|
1171 | |||
1172 | # Anything put into ns now would show up in %who. Think twice before |
|
1172 | # Anything put into ns now would show up in %who. Think twice before | |
1173 | # putting anything here, as we really want %who to show the user their |
|
1173 | # putting anything here, as we really want %who to show the user their | |
1174 | # stuff, not our variables. |
|
1174 | # stuff, not our variables. | |
1175 |
|
1175 | |||
1176 | # Finally, update the real user's namespace |
|
1176 | # Finally, update the real user's namespace | |
1177 | self.user_ns.update(ns) |
|
1177 | self.user_ns.update(ns) | |
1178 |
|
1178 | |||
1179 | @property |
|
1179 | @property | |
1180 | def all_ns_refs(self): |
|
1180 | def all_ns_refs(self): | |
1181 | """Get a list of references to all the namespace dictionaries in which |
|
1181 | """Get a list of references to all the namespace dictionaries in which | |
1182 | IPython might store a user-created object. |
|
1182 | IPython might store a user-created object. | |
1183 |
|
1183 | |||
1184 | Note that this does not include the displayhook, which also caches |
|
1184 | Note that this does not include the displayhook, which also caches | |
1185 | objects from the output.""" |
|
1185 | objects from the output.""" | |
1186 | return [self.user_ns, self.user_global_ns, |
|
1186 | return [self.user_ns, self.user_global_ns, | |
1187 | self._user_main_module.__dict__] + self._main_ns_cache.values() |
|
1187 | self._user_main_module.__dict__] + self._main_ns_cache.values() | |
1188 |
|
1188 | |||
1189 | def reset(self, new_session=True): |
|
1189 | def reset(self, new_session=True): | |
1190 | """Clear all internal namespaces, and attempt to release references to |
|
1190 | """Clear all internal namespaces, and attempt to release references to | |
1191 | user objects. |
|
1191 | user objects. | |
1192 |
|
1192 | |||
1193 | If new_session is True, a new history session will be opened. |
|
1193 | If new_session is True, a new history session will be opened. | |
1194 | """ |
|
1194 | """ | |
1195 | # Clear histories |
|
1195 | # Clear histories | |
1196 | self.history_manager.reset(new_session) |
|
1196 | self.history_manager.reset(new_session) | |
1197 | # Reset counter used to index all histories |
|
1197 | # Reset counter used to index all histories | |
1198 | if new_session: |
|
1198 | if new_session: | |
1199 | self.execution_count = 1 |
|
1199 | self.execution_count = 1 | |
1200 |
|
1200 | |||
1201 | # Flush cached output items |
|
1201 | # Flush cached output items | |
1202 | if self.displayhook.do_full_cache: |
|
1202 | if self.displayhook.do_full_cache: | |
1203 | self.displayhook.flush() |
|
1203 | self.displayhook.flush() | |
1204 |
|
1204 | |||
1205 | # The main execution namespaces must be cleared very carefully, |
|
1205 | # The main execution namespaces must be cleared very carefully, | |
1206 | # skipping the deletion of the builtin-related keys, because doing so |
|
1206 | # skipping the deletion of the builtin-related keys, because doing so | |
1207 | # would cause errors in many object's __del__ methods. |
|
1207 | # would cause errors in many object's __del__ methods. | |
1208 | if self.user_ns is not self.user_global_ns: |
|
1208 | if self.user_ns is not self.user_global_ns: | |
1209 | self.user_ns.clear() |
|
1209 | self.user_ns.clear() | |
1210 | ns = self.user_global_ns |
|
1210 | ns = self.user_global_ns | |
1211 | drop_keys = set(ns.keys()) |
|
1211 | drop_keys = set(ns.keys()) | |
1212 | drop_keys.discard('__builtin__') |
|
1212 | drop_keys.discard('__builtin__') | |
1213 | drop_keys.discard('__builtins__') |
|
1213 | drop_keys.discard('__builtins__') | |
1214 | drop_keys.discard('__name__') |
|
1214 | drop_keys.discard('__name__') | |
1215 | for k in drop_keys: |
|
1215 | for k in drop_keys: | |
1216 | del ns[k] |
|
1216 | del ns[k] | |
1217 |
|
1217 | |||
1218 | self.user_ns_hidden.clear() |
|
1218 | self.user_ns_hidden.clear() | |
1219 |
|
1219 | |||
1220 | # Restore the user namespaces to minimal usability |
|
1220 | # Restore the user namespaces to minimal usability | |
1221 | self.init_user_ns() |
|
1221 | self.init_user_ns() | |
1222 |
|
1222 | |||
1223 | # Restore the default and user aliases |
|
1223 | # Restore the default and user aliases | |
1224 | self.alias_manager.clear_aliases() |
|
1224 | self.alias_manager.clear_aliases() | |
1225 | self.alias_manager.init_aliases() |
|
1225 | self.alias_manager.init_aliases() | |
1226 |
|
1226 | |||
1227 | # Flush the private list of module references kept for script |
|
1227 | # Flush the private list of module references kept for script | |
1228 | # execution protection |
|
1228 | # execution protection | |
1229 | self.clear_main_mod_cache() |
|
1229 | self.clear_main_mod_cache() | |
1230 |
|
1230 | |||
1231 | # Clear out the namespace from the last %run |
|
1231 | # Clear out the namespace from the last %run | |
1232 | self.new_main_mod() |
|
1232 | self.new_main_mod() | |
1233 |
|
1233 | |||
1234 | def del_var(self, varname, by_name=False): |
|
1234 | def del_var(self, varname, by_name=False): | |
1235 | """Delete a variable from the various namespaces, so that, as |
|
1235 | """Delete a variable from the various namespaces, so that, as | |
1236 | far as possible, we're not keeping any hidden references to it. |
|
1236 | far as possible, we're not keeping any hidden references to it. | |
1237 |
|
1237 | |||
1238 | Parameters |
|
1238 | Parameters | |
1239 | ---------- |
|
1239 | ---------- | |
1240 | varname : str |
|
1240 | varname : str | |
1241 | The name of the variable to delete. |
|
1241 | The name of the variable to delete. | |
1242 | by_name : bool |
|
1242 | by_name : bool | |
1243 | If True, delete variables with the given name in each |
|
1243 | If True, delete variables with the given name in each | |
1244 | namespace. If False (default), find the variable in the user |
|
1244 | namespace. If False (default), find the variable in the user | |
1245 | namespace, and delete references to it. |
|
1245 | namespace, and delete references to it. | |
1246 | """ |
|
1246 | """ | |
1247 | if varname in ('__builtin__', '__builtins__'): |
|
1247 | if varname in ('__builtin__', '__builtins__'): | |
1248 | raise ValueError("Refusing to delete %s" % varname) |
|
1248 | raise ValueError("Refusing to delete %s" % varname) | |
1249 |
|
1249 | |||
1250 | ns_refs = self.all_ns_refs |
|
1250 | ns_refs = self.all_ns_refs | |
1251 |
|
1251 | |||
1252 | if by_name: # Delete by name |
|
1252 | if by_name: # Delete by name | |
1253 | for ns in ns_refs: |
|
1253 | for ns in ns_refs: | |
1254 | try: |
|
1254 | try: | |
1255 | del ns[varname] |
|
1255 | del ns[varname] | |
1256 | except KeyError: |
|
1256 | except KeyError: | |
1257 | pass |
|
1257 | pass | |
1258 | else: # Delete by object |
|
1258 | else: # Delete by object | |
1259 | try: |
|
1259 | try: | |
1260 | obj = self.user_ns[varname] |
|
1260 | obj = self.user_ns[varname] | |
1261 | except KeyError: |
|
1261 | except KeyError: | |
1262 | raise NameError("name '%s' is not defined" % varname) |
|
1262 | raise NameError("name '%s' is not defined" % varname) | |
1263 | # Also check in output history |
|
1263 | # Also check in output history | |
1264 | ns_refs.append(self.history_manager.output_hist) |
|
1264 | ns_refs.append(self.history_manager.output_hist) | |
1265 | for ns in ns_refs: |
|
1265 | for ns in ns_refs: | |
1266 | to_delete = [n for n, o in ns.iteritems() if o is obj] |
|
1266 | to_delete = [n for n, o in ns.iteritems() if o is obj] | |
1267 | for name in to_delete: |
|
1267 | for name in to_delete: | |
1268 | del ns[name] |
|
1268 | del ns[name] | |
1269 |
|
1269 | |||
1270 | # displayhook keeps extra references, but not in a dictionary |
|
1270 | # displayhook keeps extra references, but not in a dictionary | |
1271 | for name in ('_', '__', '___'): |
|
1271 | for name in ('_', '__', '___'): | |
1272 | if getattr(self.displayhook, name) is obj: |
|
1272 | if getattr(self.displayhook, name) is obj: | |
1273 | setattr(self.displayhook, name, None) |
|
1273 | setattr(self.displayhook, name, None) | |
1274 |
|
1274 | |||
1275 | def reset_selective(self, regex=None): |
|
1275 | def reset_selective(self, regex=None): | |
1276 | """Clear selective variables from internal namespaces based on a |
|
1276 | """Clear selective variables from internal namespaces based on a | |
1277 | specified regular expression. |
|
1277 | specified regular expression. | |
1278 |
|
1278 | |||
1279 | Parameters |
|
1279 | Parameters | |
1280 | ---------- |
|
1280 | ---------- | |
1281 | regex : string or compiled pattern, optional |
|
1281 | regex : string or compiled pattern, optional | |
1282 | A regular expression pattern that will be used in searching |
|
1282 | A regular expression pattern that will be used in searching | |
1283 | variable names in the users namespaces. |
|
1283 | variable names in the users namespaces. | |
1284 | """ |
|
1284 | """ | |
1285 | if regex is not None: |
|
1285 | if regex is not None: | |
1286 | try: |
|
1286 | try: | |
1287 | m = re.compile(regex) |
|
1287 | m = re.compile(regex) | |
1288 | except TypeError: |
|
1288 | except TypeError: | |
1289 | raise TypeError('regex must be a string or compiled pattern') |
|
1289 | raise TypeError('regex must be a string or compiled pattern') | |
1290 | # Search for keys in each namespace that match the given regex |
|
1290 | # Search for keys in each namespace that match the given regex | |
1291 | # If a match is found, delete the key/value pair. |
|
1291 | # If a match is found, delete the key/value pair. | |
1292 | for ns in self.all_ns_refs: |
|
1292 | for ns in self.all_ns_refs: | |
1293 | for var in ns: |
|
1293 | for var in ns: | |
1294 | if m.search(var): |
|
1294 | if m.search(var): | |
1295 | del ns[var] |
|
1295 | del ns[var] | |
1296 |
|
1296 | |||
1297 | def push(self, variables, interactive=True): |
|
1297 | def push(self, variables, interactive=True): | |
1298 | """Inject a group of variables into the IPython user namespace. |
|
1298 | """Inject a group of variables into the IPython user namespace. | |
1299 |
|
1299 | |||
1300 | Parameters |
|
1300 | Parameters | |
1301 | ---------- |
|
1301 | ---------- | |
1302 | variables : dict, str or list/tuple of str |
|
1302 | variables : dict, str or list/tuple of str | |
1303 | The variables to inject into the user's namespace. If a dict, a |
|
1303 | The variables to inject into the user's namespace. If a dict, a | |
1304 | simple update is done. If a str, the string is assumed to have |
|
1304 | simple update is done. If a str, the string is assumed to have | |
1305 | variable names separated by spaces. A list/tuple of str can also |
|
1305 | variable names separated by spaces. A list/tuple of str can also | |
1306 | be used to give the variable names. If just the variable names are |
|
1306 | be used to give the variable names. If just the variable names are | |
1307 | give (list/tuple/str) then the variable values looked up in the |
|
1307 | give (list/tuple/str) then the variable values looked up in the | |
1308 | callers frame. |
|
1308 | callers frame. | |
1309 | interactive : bool |
|
1309 | interactive : bool | |
1310 | If True (default), the variables will be listed with the ``who`` |
|
1310 | If True (default), the variables will be listed with the ``who`` | |
1311 | magic. |
|
1311 | magic. | |
1312 | """ |
|
1312 | """ | |
1313 | vdict = None |
|
1313 | vdict = None | |
1314 |
|
1314 | |||
1315 | # We need a dict of name/value pairs to do namespace updates. |
|
1315 | # We need a dict of name/value pairs to do namespace updates. | |
1316 | if isinstance(variables, dict): |
|
1316 | if isinstance(variables, dict): | |
1317 | vdict = variables |
|
1317 | vdict = variables | |
1318 | elif isinstance(variables, (basestring, list, tuple)): |
|
1318 | elif isinstance(variables, (basestring, list, tuple)): | |
1319 | if isinstance(variables, basestring): |
|
1319 | if isinstance(variables, basestring): | |
1320 | vlist = variables.split() |
|
1320 | vlist = variables.split() | |
1321 | else: |
|
1321 | else: | |
1322 | vlist = variables |
|
1322 | vlist = variables | |
1323 | vdict = {} |
|
1323 | vdict = {} | |
1324 | cf = sys._getframe(1) |
|
1324 | cf = sys._getframe(1) | |
1325 | for name in vlist: |
|
1325 | for name in vlist: | |
1326 | try: |
|
1326 | try: | |
1327 | vdict[name] = eval(name, cf.f_globals, cf.f_locals) |
|
1327 | vdict[name] = eval(name, cf.f_globals, cf.f_locals) | |
1328 | except: |
|
1328 | except: | |
1329 | print('Could not get variable %s from %s' % |
|
1329 | print('Could not get variable %s from %s' % | |
1330 | (name,cf.f_code.co_name)) |
|
1330 | (name,cf.f_code.co_name)) | |
1331 | else: |
|
1331 | else: | |
1332 | raise ValueError('variables must be a dict/str/list/tuple') |
|
1332 | raise ValueError('variables must be a dict/str/list/tuple') | |
1333 |
|
1333 | |||
1334 | # Propagate variables to user namespace |
|
1334 | # Propagate variables to user namespace | |
1335 | self.user_ns.update(vdict) |
|
1335 | self.user_ns.update(vdict) | |
1336 |
|
1336 | |||
1337 | # And configure interactive visibility |
|
1337 | # And configure interactive visibility | |
1338 | user_ns_hidden = self.user_ns_hidden |
|
1338 | user_ns_hidden = self.user_ns_hidden | |
1339 | if interactive: |
|
1339 | if interactive: | |
1340 | user_ns_hidden.difference_update(vdict) |
|
1340 | user_ns_hidden.difference_update(vdict) | |
1341 | else: |
|
1341 | else: | |
1342 | user_ns_hidden.update(vdict) |
|
1342 | user_ns_hidden.update(vdict) | |
1343 |
|
1343 | |||
1344 | def drop_by_id(self, variables): |
|
1344 | def drop_by_id(self, variables): | |
1345 | """Remove a dict of variables from the user namespace, if they are the |
|
1345 | """Remove a dict of variables from the user namespace, if they are the | |
1346 | same as the values in the dictionary. |
|
1346 | same as the values in the dictionary. | |
1347 |
|
1347 | |||
1348 | This is intended for use by extensions: variables that they've added can |
|
1348 | This is intended for use by extensions: variables that they've added can | |
1349 | be taken back out if they are unloaded, without removing any that the |
|
1349 | be taken back out if they are unloaded, without removing any that the | |
1350 | user has overwritten. |
|
1350 | user has overwritten. | |
1351 |
|
1351 | |||
1352 | Parameters |
|
1352 | Parameters | |
1353 | ---------- |
|
1353 | ---------- | |
1354 | variables : dict |
|
1354 | variables : dict | |
1355 | A dictionary mapping object names (as strings) to the objects. |
|
1355 | A dictionary mapping object names (as strings) to the objects. | |
1356 | """ |
|
1356 | """ | |
1357 | for name, obj in variables.iteritems(): |
|
1357 | for name, obj in variables.iteritems(): | |
1358 | if name in self.user_ns and self.user_ns[name] is obj: |
|
1358 | if name in self.user_ns and self.user_ns[name] is obj: | |
1359 | del self.user_ns[name] |
|
1359 | del self.user_ns[name] | |
1360 | self.user_ns_hidden.discard(name) |
|
1360 | self.user_ns_hidden.discard(name) | |
1361 |
|
1361 | |||
1362 | #------------------------------------------------------------------------- |
|
1362 | #------------------------------------------------------------------------- | |
1363 | # Things related to object introspection |
|
1363 | # Things related to object introspection | |
1364 | #------------------------------------------------------------------------- |
|
1364 | #------------------------------------------------------------------------- | |
1365 |
|
1365 | |||
1366 | def _ofind(self, oname, namespaces=None): |
|
1366 | def _ofind(self, oname, namespaces=None): | |
1367 | """Find an object in the available namespaces. |
|
1367 | """Find an object in the available namespaces. | |
1368 |
|
1368 | |||
1369 | self._ofind(oname) -> dict with keys: found,obj,ospace,ismagic |
|
1369 | self._ofind(oname) -> dict with keys: found,obj,ospace,ismagic | |
1370 |
|
1370 | |||
1371 | Has special code to detect magic functions. |
|
1371 | Has special code to detect magic functions. | |
1372 | """ |
|
1372 | """ | |
1373 | oname = oname.strip() |
|
1373 | oname = oname.strip() | |
1374 | #print '1- oname: <%r>' % oname # dbg |
|
1374 | #print '1- oname: <%r>' % oname # dbg | |
1375 | if not oname.startswith(ESC_MAGIC) and \ |
|
1375 | if not oname.startswith(ESC_MAGIC) and \ | |
1376 | not oname.startswith(ESC_MAGIC2) and \ |
|
1376 | not oname.startswith(ESC_MAGIC2) and \ | |
1377 | not py3compat.isidentifier(oname, dotted=True): |
|
1377 | not py3compat.isidentifier(oname, dotted=True): | |
1378 | return dict(found=False) |
|
1378 | return dict(found=False) | |
1379 |
|
1379 | |||
1380 | alias_ns = None |
|
1380 | alias_ns = None | |
1381 | if namespaces is None: |
|
1381 | if namespaces is None: | |
1382 | # Namespaces to search in: |
|
1382 | # Namespaces to search in: | |
1383 | # Put them in a list. The order is important so that we |
|
1383 | # Put them in a list. The order is important so that we | |
1384 | # find things in the same order that Python finds them. |
|
1384 | # find things in the same order that Python finds them. | |
1385 | namespaces = [ ('Interactive', self.user_ns), |
|
1385 | namespaces = [ ('Interactive', self.user_ns), | |
1386 | ('Interactive (global)', self.user_global_ns), |
|
1386 | ('Interactive (global)', self.user_global_ns), | |
1387 | ('Python builtin', builtin_mod.__dict__), |
|
1387 | ('Python builtin', builtin_mod.__dict__), | |
1388 | ('Alias', self.alias_manager.alias_table), |
|
1388 | ('Alias', self.alias_manager.alias_table), | |
1389 | ] |
|
1389 | ] | |
1390 | alias_ns = self.alias_manager.alias_table |
|
1390 | alias_ns = self.alias_manager.alias_table | |
1391 |
|
1391 | |||
1392 | # initialize results to 'null' |
|
1392 | # initialize results to 'null' | |
1393 | found = False; obj = None; ospace = None; ds = None; |
|
1393 | found = False; obj = None; ospace = None; ds = None; | |
1394 | ismagic = False; isalias = False; parent = None |
|
1394 | ismagic = False; isalias = False; parent = None | |
1395 |
|
1395 | |||
1396 | # We need to special-case 'print', which as of python2.6 registers as a |
|
1396 | # We need to special-case 'print', which as of python2.6 registers as a | |
1397 | # function but should only be treated as one if print_function was |
|
1397 | # function but should only be treated as one if print_function was | |
1398 | # loaded with a future import. In this case, just bail. |
|
1398 | # loaded with a future import. In this case, just bail. | |
1399 | if (oname == 'print' and not py3compat.PY3 and not \ |
|
1399 | if (oname == 'print' and not py3compat.PY3 and not \ | |
1400 | (self.compile.compiler_flags & __future__.CO_FUTURE_PRINT_FUNCTION)): |
|
1400 | (self.compile.compiler_flags & __future__.CO_FUTURE_PRINT_FUNCTION)): | |
1401 | return {'found':found, 'obj':obj, 'namespace':ospace, |
|
1401 | return {'found':found, 'obj':obj, 'namespace':ospace, | |
1402 | 'ismagic':ismagic, 'isalias':isalias, 'parent':parent} |
|
1402 | 'ismagic':ismagic, 'isalias':isalias, 'parent':parent} | |
1403 |
|
1403 | |||
1404 | # Look for the given name by splitting it in parts. If the head is |
|
1404 | # Look for the given name by splitting it in parts. If the head is | |
1405 | # found, then we look for all the remaining parts as members, and only |
|
1405 | # found, then we look for all the remaining parts as members, and only | |
1406 | # declare success if we can find them all. |
|
1406 | # declare success if we can find them all. | |
1407 | oname_parts = oname.split('.') |
|
1407 | oname_parts = oname.split('.') | |
1408 | oname_head, oname_rest = oname_parts[0],oname_parts[1:] |
|
1408 | oname_head, oname_rest = oname_parts[0],oname_parts[1:] | |
1409 | for nsname,ns in namespaces: |
|
1409 | for nsname,ns in namespaces: | |
1410 | try: |
|
1410 | try: | |
1411 | obj = ns[oname_head] |
|
1411 | obj = ns[oname_head] | |
1412 | except KeyError: |
|
1412 | except KeyError: | |
1413 | continue |
|
1413 | continue | |
1414 | else: |
|
1414 | else: | |
1415 | #print 'oname_rest:', oname_rest # dbg |
|
1415 | #print 'oname_rest:', oname_rest # dbg | |
1416 | for part in oname_rest: |
|
1416 | for part in oname_rest: | |
1417 | try: |
|
1417 | try: | |
1418 | parent = obj |
|
1418 | parent = obj | |
1419 | obj = getattr(obj,part) |
|
1419 | obj = getattr(obj,part) | |
1420 | except: |
|
1420 | except: | |
1421 | # Blanket except b/c some badly implemented objects |
|
1421 | # Blanket except b/c some badly implemented objects | |
1422 | # allow __getattr__ to raise exceptions other than |
|
1422 | # allow __getattr__ to raise exceptions other than | |
1423 | # AttributeError, which then crashes IPython. |
|
1423 | # AttributeError, which then crashes IPython. | |
1424 | break |
|
1424 | break | |
1425 | else: |
|
1425 | else: | |
1426 | # If we finish the for loop (no break), we got all members |
|
1426 | # If we finish the for loop (no break), we got all members | |
1427 | found = True |
|
1427 | found = True | |
1428 | ospace = nsname |
|
1428 | ospace = nsname | |
1429 | if ns == alias_ns: |
|
1429 | if ns == alias_ns: | |
1430 | isalias = True |
|
1430 | isalias = True | |
1431 | break # namespace loop |
|
1431 | break # namespace loop | |
1432 |
|
1432 | |||
1433 | # Try to see if it's magic |
|
1433 | # Try to see if it's magic | |
1434 | if not found: |
|
1434 | if not found: | |
1435 | obj = None |
|
1435 | obj = None | |
1436 | if oname.startswith(ESC_MAGIC2): |
|
1436 | if oname.startswith(ESC_MAGIC2): | |
1437 | oname = oname.lstrip(ESC_MAGIC2) |
|
1437 | oname = oname.lstrip(ESC_MAGIC2) | |
1438 | obj = self.find_cell_magic(oname) |
|
1438 | obj = self.find_cell_magic(oname) | |
1439 | elif oname.startswith(ESC_MAGIC): |
|
1439 | elif oname.startswith(ESC_MAGIC): | |
1440 | oname = oname.lstrip(ESC_MAGIC) |
|
1440 | oname = oname.lstrip(ESC_MAGIC) | |
1441 | obj = self.find_line_magic(oname) |
|
1441 | obj = self.find_line_magic(oname) | |
1442 | else: |
|
1442 | else: | |
1443 | # search without prefix, so run? will find %run? |
|
1443 | # search without prefix, so run? will find %run? | |
1444 | obj = self.find_line_magic(oname) |
|
1444 | obj = self.find_line_magic(oname) | |
1445 | if obj is None: |
|
1445 | if obj is None: | |
1446 | obj = self.find_cell_magic(oname) |
|
1446 | obj = self.find_cell_magic(oname) | |
1447 | if obj is not None: |
|
1447 | if obj is not None: | |
1448 | found = True |
|
1448 | found = True | |
1449 | ospace = 'IPython internal' |
|
1449 | ospace = 'IPython internal' | |
1450 | ismagic = True |
|
1450 | ismagic = True | |
1451 |
|
1451 | |||
1452 | # Last try: special-case some literals like '', [], {}, etc: |
|
1452 | # Last try: special-case some literals like '', [], {}, etc: | |
1453 | if not found and oname_head in ["''",'""','[]','{}','()']: |
|
1453 | if not found and oname_head in ["''",'""','[]','{}','()']: | |
1454 | obj = eval(oname_head) |
|
1454 | obj = eval(oname_head) | |
1455 | found = True |
|
1455 | found = True | |
1456 | ospace = 'Interactive' |
|
1456 | ospace = 'Interactive' | |
1457 |
|
1457 | |||
1458 | return {'found':found, 'obj':obj, 'namespace':ospace, |
|
1458 | return {'found':found, 'obj':obj, 'namespace':ospace, | |
1459 | 'ismagic':ismagic, 'isalias':isalias, 'parent':parent} |
|
1459 | 'ismagic':ismagic, 'isalias':isalias, 'parent':parent} | |
1460 |
|
1460 | |||
1461 | def _ofind_property(self, oname, info): |
|
1461 | def _ofind_property(self, oname, info): | |
1462 | """Second part of object finding, to look for property details.""" |
|
1462 | """Second part of object finding, to look for property details.""" | |
1463 | if info.found: |
|
1463 | if info.found: | |
1464 | # Get the docstring of the class property if it exists. |
|
1464 | # Get the docstring of the class property if it exists. | |
1465 | path = oname.split('.') |
|
1465 | path = oname.split('.') | |
1466 | root = '.'.join(path[:-1]) |
|
1466 | root = '.'.join(path[:-1]) | |
1467 | if info.parent is not None: |
|
1467 | if info.parent is not None: | |
1468 | try: |
|
1468 | try: | |
1469 | target = getattr(info.parent, '__class__') |
|
1469 | target = getattr(info.parent, '__class__') | |
1470 | # The object belongs to a class instance. |
|
1470 | # The object belongs to a class instance. | |
1471 | try: |
|
1471 | try: | |
1472 | target = getattr(target, path[-1]) |
|
1472 | target = getattr(target, path[-1]) | |
1473 | # The class defines the object. |
|
1473 | # The class defines the object. | |
1474 | if isinstance(target, property): |
|
1474 | if isinstance(target, property): | |
1475 | oname = root + '.__class__.' + path[-1] |
|
1475 | oname = root + '.__class__.' + path[-1] | |
1476 | info = Struct(self._ofind(oname)) |
|
1476 | info = Struct(self._ofind(oname)) | |
1477 | except AttributeError: pass |
|
1477 | except AttributeError: pass | |
1478 | except AttributeError: pass |
|
1478 | except AttributeError: pass | |
1479 |
|
1479 | |||
1480 | # We return either the new info or the unmodified input if the object |
|
1480 | # We return either the new info or the unmodified input if the object | |
1481 | # hadn't been found |
|
1481 | # hadn't been found | |
1482 | return info |
|
1482 | return info | |
1483 |
|
1483 | |||
1484 | def _object_find(self, oname, namespaces=None): |
|
1484 | def _object_find(self, oname, namespaces=None): | |
1485 | """Find an object and return a struct with info about it.""" |
|
1485 | """Find an object and return a struct with info about it.""" | |
1486 | inf = Struct(self._ofind(oname, namespaces)) |
|
1486 | inf = Struct(self._ofind(oname, namespaces)) | |
1487 | return Struct(self._ofind_property(oname, inf)) |
|
1487 | return Struct(self._ofind_property(oname, inf)) | |
1488 |
|
1488 | |||
1489 | def _inspect(self, meth, oname, namespaces=None, **kw): |
|
1489 | def _inspect(self, meth, oname, namespaces=None, **kw): | |
1490 | """Generic interface to the inspector system. |
|
1490 | """Generic interface to the inspector system. | |
1491 |
|
1491 | |||
1492 | This function is meant to be called by pdef, pdoc & friends.""" |
|
1492 | This function is meant to be called by pdef, pdoc & friends.""" | |
1493 | info = self._object_find(oname, namespaces) |
|
1493 | info = self._object_find(oname, namespaces) | |
1494 | if info.found: |
|
1494 | if info.found: | |
1495 | pmethod = getattr(self.inspector, meth) |
|
1495 | pmethod = getattr(self.inspector, meth) | |
1496 | formatter = format_screen if info.ismagic else None |
|
1496 | formatter = format_screen if info.ismagic else None | |
1497 | if meth == 'pdoc': |
|
1497 | if meth == 'pdoc': | |
1498 | pmethod(info.obj, oname, formatter) |
|
1498 | pmethod(info.obj, oname, formatter) | |
1499 | elif meth == 'pinfo': |
|
1499 | elif meth == 'pinfo': | |
1500 | pmethod(info.obj, oname, formatter, info, **kw) |
|
1500 | pmethod(info.obj, oname, formatter, info, **kw) | |
1501 | else: |
|
1501 | else: | |
1502 | pmethod(info.obj, oname) |
|
1502 | pmethod(info.obj, oname) | |
1503 | else: |
|
1503 | else: | |
1504 | print('Object `%s` not found.' % oname) |
|
1504 | print('Object `%s` not found.' % oname) | |
1505 | return 'not found' # so callers can take other action |
|
1505 | return 'not found' # so callers can take other action | |
1506 |
|
1506 | |||
1507 | def object_inspect(self, oname, detail_level=0): |
|
1507 | def object_inspect(self, oname, detail_level=0): | |
1508 | with self.builtin_trap: |
|
1508 | with self.builtin_trap: | |
1509 | info = self._object_find(oname) |
|
1509 | info = self._object_find(oname) | |
1510 | if info.found: |
|
1510 | if info.found: | |
1511 | return self.inspector.info(info.obj, oname, info=info, |
|
1511 | return self.inspector.info(info.obj, oname, info=info, | |
1512 | detail_level=detail_level |
|
1512 | detail_level=detail_level | |
1513 | ) |
|
1513 | ) | |
1514 | else: |
|
1514 | else: | |
1515 | return oinspect.object_info(name=oname, found=False) |
|
1515 | return oinspect.object_info(name=oname, found=False) | |
1516 |
|
1516 | |||
1517 | #------------------------------------------------------------------------- |
|
1517 | #------------------------------------------------------------------------- | |
1518 | # Things related to history management |
|
1518 | # Things related to history management | |
1519 | #------------------------------------------------------------------------- |
|
1519 | #------------------------------------------------------------------------- | |
1520 |
|
1520 | |||
1521 | def init_history(self): |
|
1521 | def init_history(self): | |
1522 | """Sets up the command history, and starts regular autosaves.""" |
|
1522 | """Sets up the command history, and starts regular autosaves.""" | |
1523 | self.history_manager = HistoryManager(shell=self, config=self.config) |
|
1523 | self.history_manager = HistoryManager(shell=self, config=self.config) | |
1524 | self.configurables.append(self.history_manager) |
|
1524 | self.configurables.append(self.history_manager) | |
1525 |
|
1525 | |||
1526 | #------------------------------------------------------------------------- |
|
1526 | #------------------------------------------------------------------------- | |
1527 | # Things related to exception handling and tracebacks (not debugging) |
|
1527 | # Things related to exception handling and tracebacks (not debugging) | |
1528 | #------------------------------------------------------------------------- |
|
1528 | #------------------------------------------------------------------------- | |
1529 |
|
1529 | |||
1530 | def init_traceback_handlers(self, custom_exceptions): |
|
1530 | def init_traceback_handlers(self, custom_exceptions): | |
1531 | # Syntax error handler. |
|
1531 | # Syntax error handler. | |
1532 | self.SyntaxTB = ultratb.SyntaxTB(color_scheme='NoColor') |
|
1532 | self.SyntaxTB = ultratb.SyntaxTB(color_scheme='NoColor') | |
1533 |
|
1533 | |||
1534 | # The interactive one is initialized with an offset, meaning we always |
|
1534 | # The interactive one is initialized with an offset, meaning we always | |
1535 | # want to remove the topmost item in the traceback, which is our own |
|
1535 | # want to remove the topmost item in the traceback, which is our own | |
1536 | # internal code. Valid modes: ['Plain','Context','Verbose'] |
|
1536 | # internal code. Valid modes: ['Plain','Context','Verbose'] | |
1537 | self.InteractiveTB = ultratb.AutoFormattedTB(mode = 'Plain', |
|
1537 | self.InteractiveTB = ultratb.AutoFormattedTB(mode = 'Plain', | |
1538 | color_scheme='NoColor', |
|
1538 | color_scheme='NoColor', | |
1539 | tb_offset = 1, |
|
1539 | tb_offset = 1, | |
1540 | check_cache=self.compile.check_cache) |
|
1540 | check_cache=self.compile.check_cache) | |
1541 |
|
1541 | |||
1542 | # The instance will store a pointer to the system-wide exception hook, |
|
1542 | # The instance will store a pointer to the system-wide exception hook, | |
1543 | # so that runtime code (such as magics) can access it. This is because |
|
1543 | # so that runtime code (such as magics) can access it. This is because | |
1544 | # during the read-eval loop, it may get temporarily overwritten. |
|
1544 | # during the read-eval loop, it may get temporarily overwritten. | |
1545 | self.sys_excepthook = sys.excepthook |
|
1545 | self.sys_excepthook = sys.excepthook | |
1546 |
|
1546 | |||
1547 | # and add any custom exception handlers the user may have specified |
|
1547 | # and add any custom exception handlers the user may have specified | |
1548 | self.set_custom_exc(*custom_exceptions) |
|
1548 | self.set_custom_exc(*custom_exceptions) | |
1549 |
|
1549 | |||
1550 | # Set the exception mode |
|
1550 | # Set the exception mode | |
1551 | self.InteractiveTB.set_mode(mode=self.xmode) |
|
1551 | self.InteractiveTB.set_mode(mode=self.xmode) | |
1552 |
|
1552 | |||
1553 | def set_custom_exc(self, exc_tuple, handler): |
|
1553 | def set_custom_exc(self, exc_tuple, handler): | |
1554 | """set_custom_exc(exc_tuple,handler) |
|
1554 | """set_custom_exc(exc_tuple,handler) | |
1555 |
|
1555 | |||
1556 | Set a custom exception handler, which will be called if any of the |
|
1556 | Set a custom exception handler, which will be called if any of the | |
1557 | exceptions in exc_tuple occur in the mainloop (specifically, in the |
|
1557 | exceptions in exc_tuple occur in the mainloop (specifically, in the | |
1558 | run_code() method). |
|
1558 | run_code() method). | |
1559 |
|
1559 | |||
1560 | Parameters |
|
1560 | Parameters | |
1561 | ---------- |
|
1561 | ---------- | |
1562 |
|
1562 | |||
1563 | exc_tuple : tuple of exception classes |
|
1563 | exc_tuple : tuple of exception classes | |
1564 | A *tuple* of exception classes, for which to call the defined |
|
1564 | A *tuple* of exception classes, for which to call the defined | |
1565 | handler. It is very important that you use a tuple, and NOT A |
|
1565 | handler. It is very important that you use a tuple, and NOT A | |
1566 | LIST here, because of the way Python's except statement works. If |
|
1566 | LIST here, because of the way Python's except statement works. If | |
1567 | you only want to trap a single exception, use a singleton tuple:: |
|
1567 | you only want to trap a single exception, use a singleton tuple:: | |
1568 |
|
1568 | |||
1569 | exc_tuple == (MyCustomException,) |
|
1569 | exc_tuple == (MyCustomException,) | |
1570 |
|
1570 | |||
1571 | handler : callable |
|
1571 | handler : callable | |
1572 | handler must have the following signature:: |
|
1572 | handler must have the following signature:: | |
1573 |
|
1573 | |||
1574 | def my_handler(self, etype, value, tb, tb_offset=None): |
|
1574 | def my_handler(self, etype, value, tb, tb_offset=None): | |
1575 | ... |
|
1575 | ... | |
1576 | return structured_traceback |
|
1576 | return structured_traceback | |
1577 |
|
1577 | |||
1578 | Your handler must return a structured traceback (a list of strings), |
|
1578 | Your handler must return a structured traceback (a list of strings), | |
1579 | or None. |
|
1579 | or None. | |
1580 |
|
1580 | |||
1581 | This will be made into an instance method (via types.MethodType) |
|
1581 | This will be made into an instance method (via types.MethodType) | |
1582 | of IPython itself, and it will be called if any of the exceptions |
|
1582 | of IPython itself, and it will be called if any of the exceptions | |
1583 | listed in the exc_tuple are caught. If the handler is None, an |
|
1583 | listed in the exc_tuple are caught. If the handler is None, an | |
1584 | internal basic one is used, which just prints basic info. |
|
1584 | internal basic one is used, which just prints basic info. | |
1585 |
|
1585 | |||
1586 | To protect IPython from crashes, if your handler ever raises an |
|
1586 | To protect IPython from crashes, if your handler ever raises an | |
1587 | exception or returns an invalid result, it will be immediately |
|
1587 | exception or returns an invalid result, it will be immediately | |
1588 | disabled. |
|
1588 | disabled. | |
1589 |
|
1589 | |||
1590 | WARNING: by putting in your own exception handler into IPython's main |
|
1590 | WARNING: by putting in your own exception handler into IPython's main | |
1591 | execution loop, you run a very good chance of nasty crashes. This |
|
1591 | execution loop, you run a very good chance of nasty crashes. This | |
1592 | facility should only be used if you really know what you are doing.""" |
|
1592 | facility should only be used if you really know what you are doing.""" | |
1593 |
|
1593 | |||
1594 | assert type(exc_tuple)==type(()) , \ |
|
1594 | assert type(exc_tuple)==type(()) , \ | |
1595 | "The custom exceptions must be given AS A TUPLE." |
|
1595 | "The custom exceptions must be given AS A TUPLE." | |
1596 |
|
1596 | |||
1597 | def dummy_handler(self,etype,value,tb,tb_offset=None): |
|
1597 | def dummy_handler(self,etype,value,tb,tb_offset=None): | |
1598 | print('*** Simple custom exception handler ***') |
|
1598 | print('*** Simple custom exception handler ***') | |
1599 | print('Exception type :',etype) |
|
1599 | print('Exception type :',etype) | |
1600 | print('Exception value:',value) |
|
1600 | print('Exception value:',value) | |
1601 | print('Traceback :',tb) |
|
1601 | print('Traceback :',tb) | |
1602 | #print 'Source code :','\n'.join(self.buffer) |
|
1602 | #print 'Source code :','\n'.join(self.buffer) | |
1603 |
|
1603 | |||
1604 | def validate_stb(stb): |
|
1604 | def validate_stb(stb): | |
1605 | """validate structured traceback return type |
|
1605 | """validate structured traceback return type | |
1606 |
|
1606 | |||
1607 | return type of CustomTB *should* be a list of strings, but allow |
|
1607 | return type of CustomTB *should* be a list of strings, but allow | |
1608 | single strings or None, which are harmless. |
|
1608 | single strings or None, which are harmless. | |
1609 |
|
1609 | |||
1610 | This function will *always* return a list of strings, |
|
1610 | This function will *always* return a list of strings, | |
1611 | and will raise a TypeError if stb is inappropriate. |
|
1611 | and will raise a TypeError if stb is inappropriate. | |
1612 | """ |
|
1612 | """ | |
1613 | msg = "CustomTB must return list of strings, not %r" % stb |
|
1613 | msg = "CustomTB must return list of strings, not %r" % stb | |
1614 | if stb is None: |
|
1614 | if stb is None: | |
1615 | return [] |
|
1615 | return [] | |
1616 | elif isinstance(stb, basestring): |
|
1616 | elif isinstance(stb, basestring): | |
1617 | return [stb] |
|
1617 | return [stb] | |
1618 | elif not isinstance(stb, list): |
|
1618 | elif not isinstance(stb, list): | |
1619 | raise TypeError(msg) |
|
1619 | raise TypeError(msg) | |
1620 | # it's a list |
|
1620 | # it's a list | |
1621 | for line in stb: |
|
1621 | for line in stb: | |
1622 | # check every element |
|
1622 | # check every element | |
1623 | if not isinstance(line, basestring): |
|
1623 | if not isinstance(line, basestring): | |
1624 | raise TypeError(msg) |
|
1624 | raise TypeError(msg) | |
1625 | return stb |
|
1625 | return stb | |
1626 |
|
1626 | |||
1627 | if handler is None: |
|
1627 | if handler is None: | |
1628 | wrapped = dummy_handler |
|
1628 | wrapped = dummy_handler | |
1629 | else: |
|
1629 | else: | |
1630 | def wrapped(self,etype,value,tb,tb_offset=None): |
|
1630 | def wrapped(self,etype,value,tb,tb_offset=None): | |
1631 | """wrap CustomTB handler, to protect IPython from user code |
|
1631 | """wrap CustomTB handler, to protect IPython from user code | |
1632 |
|
1632 | |||
1633 | This makes it harder (but not impossible) for custom exception |
|
1633 | This makes it harder (but not impossible) for custom exception | |
1634 | handlers to crash IPython. |
|
1634 | handlers to crash IPython. | |
1635 | """ |
|
1635 | """ | |
1636 | try: |
|
1636 | try: | |
1637 | stb = handler(self,etype,value,tb,tb_offset=tb_offset) |
|
1637 | stb = handler(self,etype,value,tb,tb_offset=tb_offset) | |
1638 | return validate_stb(stb) |
|
1638 | return validate_stb(stb) | |
1639 | except: |
|
1639 | except: | |
1640 | # clear custom handler immediately |
|
1640 | # clear custom handler immediately | |
1641 | self.set_custom_exc((), None) |
|
1641 | self.set_custom_exc((), None) | |
1642 | print("Custom TB Handler failed, unregistering", file=io.stderr) |
|
1642 | print("Custom TB Handler failed, unregistering", file=io.stderr) | |
1643 | # show the exception in handler first |
|
1643 | # show the exception in handler first | |
1644 | stb = self.InteractiveTB.structured_traceback(*sys.exc_info()) |
|
1644 | stb = self.InteractiveTB.structured_traceback(*sys.exc_info()) | |
1645 | print(self.InteractiveTB.stb2text(stb), file=io.stdout) |
|
1645 | print(self.InteractiveTB.stb2text(stb), file=io.stdout) | |
1646 | print("The original exception:", file=io.stdout) |
|
1646 | print("The original exception:", file=io.stdout) | |
1647 | stb = self.InteractiveTB.structured_traceback( |
|
1647 | stb = self.InteractiveTB.structured_traceback( | |
1648 | (etype,value,tb), tb_offset=tb_offset |
|
1648 | (etype,value,tb), tb_offset=tb_offset | |
1649 | ) |
|
1649 | ) | |
1650 | return stb |
|
1650 | return stb | |
1651 |
|
1651 | |||
1652 | self.CustomTB = types.MethodType(wrapped,self) |
|
1652 | self.CustomTB = types.MethodType(wrapped,self) | |
1653 | self.custom_exceptions = exc_tuple |
|
1653 | self.custom_exceptions = exc_tuple | |
1654 |
|
1654 | |||
1655 | def excepthook(self, etype, value, tb): |
|
1655 | def excepthook(self, etype, value, tb): | |
1656 | """One more defense for GUI apps that call sys.excepthook. |
|
1656 | """One more defense for GUI apps that call sys.excepthook. | |
1657 |
|
1657 | |||
1658 | GUI frameworks like wxPython trap exceptions and call |
|
1658 | GUI frameworks like wxPython trap exceptions and call | |
1659 | sys.excepthook themselves. I guess this is a feature that |
|
1659 | sys.excepthook themselves. I guess this is a feature that | |
1660 | enables them to keep running after exceptions that would |
|
1660 | enables them to keep running after exceptions that would | |
1661 | otherwise kill their mainloop. This is a bother for IPython |
|
1661 | otherwise kill their mainloop. This is a bother for IPython | |
1662 | which excepts to catch all of the program exceptions with a try: |
|
1662 | which excepts to catch all of the program exceptions with a try: | |
1663 | except: statement. |
|
1663 | except: statement. | |
1664 |
|
1664 | |||
1665 | Normally, IPython sets sys.excepthook to a CrashHandler instance, so if |
|
1665 | Normally, IPython sets sys.excepthook to a CrashHandler instance, so if | |
1666 | any app directly invokes sys.excepthook, it will look to the user like |
|
1666 | any app directly invokes sys.excepthook, it will look to the user like | |
1667 | IPython crashed. In order to work around this, we can disable the |
|
1667 | IPython crashed. In order to work around this, we can disable the | |
1668 | CrashHandler and replace it with this excepthook instead, which prints a |
|
1668 | CrashHandler and replace it with this excepthook instead, which prints a | |
1669 | regular traceback using our InteractiveTB. In this fashion, apps which |
|
1669 | regular traceback using our InteractiveTB. In this fashion, apps which | |
1670 | call sys.excepthook will generate a regular-looking exception from |
|
1670 | call sys.excepthook will generate a regular-looking exception from | |
1671 | IPython, and the CrashHandler will only be triggered by real IPython |
|
1671 | IPython, and the CrashHandler will only be triggered by real IPython | |
1672 | crashes. |
|
1672 | crashes. | |
1673 |
|
1673 | |||
1674 | This hook should be used sparingly, only in places which are not likely |
|
1674 | This hook should be used sparingly, only in places which are not likely | |
1675 | to be true IPython errors. |
|
1675 | to be true IPython errors. | |
1676 | """ |
|
1676 | """ | |
1677 | self.showtraceback((etype,value,tb),tb_offset=0) |
|
1677 | self.showtraceback((etype,value,tb),tb_offset=0) | |
1678 |
|
1678 | |||
1679 | def _get_exc_info(self, exc_tuple=None): |
|
1679 | def _get_exc_info(self, exc_tuple=None): | |
1680 | """get exc_info from a given tuple, sys.exc_info() or sys.last_type etc. |
|
1680 | """get exc_info from a given tuple, sys.exc_info() or sys.last_type etc. | |
1681 |
|
1681 | |||
1682 | Ensures sys.last_type,value,traceback hold the exc_info we found, |
|
1682 | Ensures sys.last_type,value,traceback hold the exc_info we found, | |
1683 | from whichever source. |
|
1683 | from whichever source. | |
1684 |
|
1684 | |||
1685 | raises ValueError if none of these contain any information |
|
1685 | raises ValueError if none of these contain any information | |
1686 | """ |
|
1686 | """ | |
1687 | if exc_tuple is None: |
|
1687 | if exc_tuple is None: | |
1688 | etype, value, tb = sys.exc_info() |
|
1688 | etype, value, tb = sys.exc_info() | |
1689 | else: |
|
1689 | else: | |
1690 | etype, value, tb = exc_tuple |
|
1690 | etype, value, tb = exc_tuple | |
1691 |
|
1691 | |||
1692 | if etype is None: |
|
1692 | if etype is None: | |
1693 | if hasattr(sys, 'last_type'): |
|
1693 | if hasattr(sys, 'last_type'): | |
1694 | etype, value, tb = sys.last_type, sys.last_value, \ |
|
1694 | etype, value, tb = sys.last_type, sys.last_value, \ | |
1695 | sys.last_traceback |
|
1695 | sys.last_traceback | |
1696 |
|
1696 | |||
1697 | if etype is None: |
|
1697 | if etype is None: | |
1698 | raise ValueError("No exception to find") |
|
1698 | raise ValueError("No exception to find") | |
1699 |
|
1699 | |||
1700 | # Now store the exception info in sys.last_type etc. |
|
1700 | # Now store the exception info in sys.last_type etc. | |
1701 | # WARNING: these variables are somewhat deprecated and not |
|
1701 | # WARNING: these variables are somewhat deprecated and not | |
1702 | # necessarily safe to use in a threaded environment, but tools |
|
1702 | # necessarily safe to use in a threaded environment, but tools | |
1703 | # like pdb depend on their existence, so let's set them. If we |
|
1703 | # like pdb depend on their existence, so let's set them. If we | |
1704 | # find problems in the field, we'll need to revisit their use. |
|
1704 | # find problems in the field, we'll need to revisit their use. | |
1705 | sys.last_type = etype |
|
1705 | sys.last_type = etype | |
1706 | sys.last_value = value |
|
1706 | sys.last_value = value | |
1707 | sys.last_traceback = tb |
|
1707 | sys.last_traceback = tb | |
1708 |
|
1708 | |||
1709 | return etype, value, tb |
|
1709 | return etype, value, tb | |
1710 |
|
1710 | |||
1711 |
|
1711 | |||
1712 | def showtraceback(self,exc_tuple = None,filename=None,tb_offset=None, |
|
1712 | def showtraceback(self,exc_tuple = None,filename=None,tb_offset=None, | |
1713 | exception_only=False): |
|
1713 | exception_only=False): | |
1714 | """Display the exception that just occurred. |
|
1714 | """Display the exception that just occurred. | |
1715 |
|
1715 | |||
1716 | If nothing is known about the exception, this is the method which |
|
1716 | If nothing is known about the exception, this is the method which | |
1717 | should be used throughout the code for presenting user tracebacks, |
|
1717 | should be used throughout the code for presenting user tracebacks, | |
1718 | rather than directly invoking the InteractiveTB object. |
|
1718 | rather than directly invoking the InteractiveTB object. | |
1719 |
|
1719 | |||
1720 | A specific showsyntaxerror() also exists, but this method can take |
|
1720 | A specific showsyntaxerror() also exists, but this method can take | |
1721 | care of calling it if needed, so unless you are explicitly catching a |
|
1721 | care of calling it if needed, so unless you are explicitly catching a | |
1722 | SyntaxError exception, don't try to analyze the stack manually and |
|
1722 | SyntaxError exception, don't try to analyze the stack manually and | |
1723 | simply call this method.""" |
|
1723 | simply call this method.""" | |
1724 |
|
1724 | |||
1725 | try: |
|
1725 | try: | |
1726 | try: |
|
1726 | try: | |
1727 | etype, value, tb = self._get_exc_info(exc_tuple) |
|
1727 | etype, value, tb = self._get_exc_info(exc_tuple) | |
1728 | except ValueError: |
|
1728 | except ValueError: | |
1729 | self.write_err('No traceback available to show.\n') |
|
1729 | self.write_err('No traceback available to show.\n') | |
1730 | return |
|
1730 | return | |
1731 |
|
1731 | |||
1732 | if etype is SyntaxError: |
|
1732 | if etype is SyntaxError: | |
1733 | # Though this won't be called by syntax errors in the input |
|
1733 | # Though this won't be called by syntax errors in the input | |
1734 | # line, there may be SyntaxError cases with imported code. |
|
1734 | # line, there may be SyntaxError cases with imported code. | |
1735 | self.showsyntaxerror(filename) |
|
1735 | self.showsyntaxerror(filename) | |
1736 | elif etype is UsageError: |
|
1736 | elif etype is UsageError: | |
1737 | self.write_err("UsageError: %s" % value) |
|
1737 | self.write_err("UsageError: %s" % value) | |
1738 | else: |
|
1738 | else: | |
1739 | if exception_only: |
|
1739 | if exception_only: | |
1740 | stb = ['An exception has occurred, use %tb to see ' |
|
1740 | stb = ['An exception has occurred, use %tb to see ' | |
1741 | 'the full traceback.\n'] |
|
1741 | 'the full traceback.\n'] | |
1742 | stb.extend(self.InteractiveTB.get_exception_only(etype, |
|
1742 | stb.extend(self.InteractiveTB.get_exception_only(etype, | |
1743 | value)) |
|
1743 | value)) | |
1744 | else: |
|
1744 | else: | |
1745 | try: |
|
1745 | try: | |
1746 | # Exception classes can customise their traceback - we |
|
1746 | # Exception classes can customise their traceback - we | |
1747 | # use this in IPython.parallel for exceptions occurring |
|
1747 | # use this in IPython.parallel for exceptions occurring | |
1748 | # in the engines. This should return a list of strings. |
|
1748 | # in the engines. This should return a list of strings. | |
1749 | stb = value._render_traceback_() |
|
1749 | stb = value._render_traceback_() | |
1750 | except Exception: |
|
1750 | except Exception: | |
1751 | stb = self.InteractiveTB.structured_traceback(etype, |
|
1751 | stb = self.InteractiveTB.structured_traceback(etype, | |
1752 | value, tb, tb_offset=tb_offset) |
|
1752 | value, tb, tb_offset=tb_offset) | |
1753 |
|
1753 | |||
1754 | self._showtraceback(etype, value, stb) |
|
1754 | self._showtraceback(etype, value, stb) | |
1755 | if self.call_pdb: |
|
1755 | if self.call_pdb: | |
1756 | # drop into debugger |
|
1756 | # drop into debugger | |
1757 | self.debugger(force=True) |
|
1757 | self.debugger(force=True) | |
1758 | return |
|
1758 | return | |
1759 |
|
1759 | |||
1760 | # Actually show the traceback |
|
1760 | # Actually show the traceback | |
1761 | self._showtraceback(etype, value, stb) |
|
1761 | self._showtraceback(etype, value, stb) | |
1762 |
|
1762 | |||
1763 | except KeyboardInterrupt: |
|
1763 | except KeyboardInterrupt: | |
1764 | self.write_err("\nKeyboardInterrupt\n") |
|
1764 | self.write_err("\nKeyboardInterrupt\n") | |
1765 |
|
1765 | |||
1766 | def _showtraceback(self, etype, evalue, stb): |
|
1766 | def _showtraceback(self, etype, evalue, stb): | |
1767 | """Actually show a traceback. |
|
1767 | """Actually show a traceback. | |
1768 |
|
1768 | |||
1769 | Subclasses may override this method to put the traceback on a different |
|
1769 | Subclasses may override this method to put the traceback on a different | |
1770 | place, like a side channel. |
|
1770 | place, like a side channel. | |
1771 | """ |
|
1771 | """ | |
1772 | print(self.InteractiveTB.stb2text(stb), file=io.stdout) |
|
1772 | print(self.InteractiveTB.stb2text(stb), file=io.stdout) | |
1773 |
|
1773 | |||
1774 | def showsyntaxerror(self, filename=None): |
|
1774 | def showsyntaxerror(self, filename=None): | |
1775 | """Display the syntax error that just occurred. |
|
1775 | """Display the syntax error that just occurred. | |
1776 |
|
1776 | |||
1777 | This doesn't display a stack trace because there isn't one. |
|
1777 | This doesn't display a stack trace because there isn't one. | |
1778 |
|
1778 | |||
1779 | If a filename is given, it is stuffed in the exception instead |
|
1779 | If a filename is given, it is stuffed in the exception instead | |
1780 | of what was there before (because Python's parser always uses |
|
1780 | of what was there before (because Python's parser always uses | |
1781 | "<string>" when reading from a string). |
|
1781 | "<string>" when reading from a string). | |
1782 | """ |
|
1782 | """ | |
1783 | etype, value, last_traceback = self._get_exc_info() |
|
1783 | etype, value, last_traceback = self._get_exc_info() | |
1784 |
|
1784 | |||
1785 | if filename and etype is SyntaxError: |
|
1785 | if filename and etype is SyntaxError: | |
1786 | try: |
|
1786 | try: | |
1787 | value.filename = filename |
|
1787 | value.filename = filename | |
1788 | except: |
|
1788 | except: | |
1789 | # Not the format we expect; leave it alone |
|
1789 | # Not the format we expect; leave it alone | |
1790 | pass |
|
1790 | pass | |
1791 |
|
1791 | |||
1792 | stb = self.SyntaxTB.structured_traceback(etype, value, []) |
|
1792 | stb = self.SyntaxTB.structured_traceback(etype, value, []) | |
1793 | self._showtraceback(etype, value, stb) |
|
1793 | self._showtraceback(etype, value, stb) | |
1794 |
|
1794 | |||
1795 | # This is overridden in TerminalInteractiveShell to show a message about |
|
1795 | # This is overridden in TerminalInteractiveShell to show a message about | |
1796 | # the %paste magic. |
|
1796 | # the %paste magic. | |
1797 | def showindentationerror(self): |
|
1797 | def showindentationerror(self): | |
1798 | """Called by run_cell when there's an IndentationError in code entered |
|
1798 | """Called by run_cell when there's an IndentationError in code entered | |
1799 | at the prompt. |
|
1799 | at the prompt. | |
1800 |
|
1800 | |||
1801 | This is overridden in TerminalInteractiveShell to show a message about |
|
1801 | This is overridden in TerminalInteractiveShell to show a message about | |
1802 | the %paste magic.""" |
|
1802 | the %paste magic.""" | |
1803 | self.showsyntaxerror() |
|
1803 | self.showsyntaxerror() | |
1804 |
|
1804 | |||
1805 | #------------------------------------------------------------------------- |
|
1805 | #------------------------------------------------------------------------- | |
1806 | # Things related to readline |
|
1806 | # Things related to readline | |
1807 | #------------------------------------------------------------------------- |
|
1807 | #------------------------------------------------------------------------- | |
1808 |
|
1808 | |||
1809 | def init_readline(self): |
|
1809 | def init_readline(self): | |
1810 | """Command history completion/saving/reloading.""" |
|
1810 | """Command history completion/saving/reloading.""" | |
1811 |
|
1811 | |||
1812 | if self.readline_use: |
|
1812 | if self.readline_use: | |
1813 | import IPython.utils.rlineimpl as readline |
|
1813 | import IPython.utils.rlineimpl as readline | |
1814 |
|
1814 | |||
1815 | self.rl_next_input = None |
|
1815 | self.rl_next_input = None | |
1816 | self.rl_do_indent = False |
|
1816 | self.rl_do_indent = False | |
1817 |
|
1817 | |||
1818 | if not self.readline_use or not readline.have_readline: |
|
1818 | if not self.readline_use or not readline.have_readline: | |
1819 | self.has_readline = False |
|
1819 | self.has_readline = False | |
1820 | self.readline = None |
|
1820 | self.readline = None | |
1821 | # Set a number of methods that depend on readline to be no-op |
|
1821 | # Set a number of methods that depend on readline to be no-op | |
1822 | self.readline_no_record = no_op_context |
|
1822 | self.readline_no_record = no_op_context | |
1823 | self.set_readline_completer = no_op |
|
1823 | self.set_readline_completer = no_op | |
1824 | self.set_custom_completer = no_op |
|
1824 | self.set_custom_completer = no_op | |
1825 | if self.readline_use: |
|
1825 | if self.readline_use: | |
1826 | warn('Readline services not available or not loaded.') |
|
1826 | warn('Readline services not available or not loaded.') | |
1827 | else: |
|
1827 | else: | |
1828 | self.has_readline = True |
|
1828 | self.has_readline = True | |
1829 | self.readline = readline |
|
1829 | self.readline = readline | |
1830 | sys.modules['readline'] = readline |
|
1830 | sys.modules['readline'] = readline | |
1831 |
|
1831 | |||
1832 | # Platform-specific configuration |
|
1832 | # Platform-specific configuration | |
1833 | if os.name == 'nt': |
|
1833 | if os.name == 'nt': | |
1834 | # FIXME - check with Frederick to see if we can harmonize |
|
1834 | # FIXME - check with Frederick to see if we can harmonize | |
1835 | # naming conventions with pyreadline to avoid this |
|
1835 | # naming conventions with pyreadline to avoid this | |
1836 | # platform-dependent check |
|
1836 | # platform-dependent check | |
1837 | self.readline_startup_hook = readline.set_pre_input_hook |
|
1837 | self.readline_startup_hook = readline.set_pre_input_hook | |
1838 | else: |
|
1838 | else: | |
1839 | self.readline_startup_hook = readline.set_startup_hook |
|
1839 | self.readline_startup_hook = readline.set_startup_hook | |
1840 |
|
1840 | |||
1841 | # Load user's initrc file (readline config) |
|
1841 | # Load user's initrc file (readline config) | |
1842 | # Or if libedit is used, load editrc. |
|
1842 | # Or if libedit is used, load editrc. | |
1843 | inputrc_name = os.environ.get('INPUTRC') |
|
1843 | inputrc_name = os.environ.get('INPUTRC') | |
1844 | if inputrc_name is None: |
|
1844 | if inputrc_name is None: | |
1845 | inputrc_name = '.inputrc' |
|
1845 | inputrc_name = '.inputrc' | |
1846 | if readline.uses_libedit: |
|
1846 | if readline.uses_libedit: | |
1847 | inputrc_name = '.editrc' |
|
1847 | inputrc_name = '.editrc' | |
1848 | inputrc_name = os.path.join(self.home_dir, inputrc_name) |
|
1848 | inputrc_name = os.path.join(self.home_dir, inputrc_name) | |
1849 | if os.path.isfile(inputrc_name): |
|
1849 | if os.path.isfile(inputrc_name): | |
1850 | try: |
|
1850 | try: | |
1851 | readline.read_init_file(inputrc_name) |
|
1851 | readline.read_init_file(inputrc_name) | |
1852 | except: |
|
1852 | except: | |
1853 | warn('Problems reading readline initialization file <%s>' |
|
1853 | warn('Problems reading readline initialization file <%s>' | |
1854 | % inputrc_name) |
|
1854 | % inputrc_name) | |
1855 |
|
1855 | |||
1856 | # Configure readline according to user's prefs |
|
1856 | # Configure readline according to user's prefs | |
1857 | # This is only done if GNU readline is being used. If libedit |
|
1857 | # This is only done if GNU readline is being used. If libedit | |
1858 | # is being used (as on Leopard) the readline config is |
|
1858 | # is being used (as on Leopard) the readline config is | |
1859 | # not run as the syntax for libedit is different. |
|
1859 | # not run as the syntax for libedit is different. | |
1860 | if not readline.uses_libedit: |
|
1860 | if not readline.uses_libedit: | |
1861 | for rlcommand in self.readline_parse_and_bind: |
|
1861 | for rlcommand in self.readline_parse_and_bind: | |
1862 | #print "loading rl:",rlcommand # dbg |
|
1862 | #print "loading rl:",rlcommand # dbg | |
1863 | readline.parse_and_bind(rlcommand) |
|
1863 | readline.parse_and_bind(rlcommand) | |
1864 |
|
1864 | |||
1865 | # Remove some chars from the delimiters list. If we encounter |
|
1865 | # Remove some chars from the delimiters list. If we encounter | |
1866 | # unicode chars, discard them. |
|
1866 | # unicode chars, discard them. | |
1867 | delims = readline.get_completer_delims() |
|
1867 | delims = readline.get_completer_delims() | |
1868 | if not py3compat.PY3: |
|
1868 | if not py3compat.PY3: | |
1869 | delims = delims.encode("ascii", "ignore") |
|
1869 | delims = delims.encode("ascii", "ignore") | |
1870 | for d in self.readline_remove_delims: |
|
1870 | for d in self.readline_remove_delims: | |
1871 | delims = delims.replace(d, "") |
|
1871 | delims = delims.replace(d, "") | |
1872 | delims = delims.replace(ESC_MAGIC, '') |
|
1872 | delims = delims.replace(ESC_MAGIC, '') | |
1873 | readline.set_completer_delims(delims) |
|
1873 | readline.set_completer_delims(delims) | |
1874 | # otherwise we end up with a monster history after a while: |
|
1874 | # otherwise we end up with a monster history after a while: | |
1875 | readline.set_history_length(self.history_length) |
|
1875 | readline.set_history_length(self.history_length) | |
1876 |
|
1876 | |||
1877 | self.refill_readline_hist() |
|
1877 | self.refill_readline_hist() | |
1878 | self.readline_no_record = ReadlineNoRecord(self) |
|
1878 | self.readline_no_record = ReadlineNoRecord(self) | |
1879 |
|
1879 | |||
1880 | # Configure auto-indent for all platforms |
|
1880 | # Configure auto-indent for all platforms | |
1881 | self.set_autoindent(self.autoindent) |
|
1881 | self.set_autoindent(self.autoindent) | |
1882 |
|
1882 | |||
1883 | def refill_readline_hist(self): |
|
1883 | def refill_readline_hist(self): | |
1884 | # Load the last 1000 lines from history |
|
1884 | # Load the last 1000 lines from history | |
1885 | self.readline.clear_history() |
|
1885 | self.readline.clear_history() | |
1886 | stdin_encoding = sys.stdin.encoding or "utf-8" |
|
1886 | stdin_encoding = sys.stdin.encoding or "utf-8" | |
1887 | last_cell = u"" |
|
1887 | last_cell = u"" | |
1888 | for _, _, cell in self.history_manager.get_tail(1000, |
|
1888 | for _, _, cell in self.history_manager.get_tail(1000, | |
1889 | include_latest=True): |
|
1889 | include_latest=True): | |
1890 | # Ignore blank lines and consecutive duplicates |
|
1890 | # Ignore blank lines and consecutive duplicates | |
1891 | cell = cell.rstrip() |
|
1891 | cell = cell.rstrip() | |
1892 | if cell and (cell != last_cell): |
|
1892 | if cell and (cell != last_cell): | |
1893 | if self.multiline_history: |
|
1893 | if self.multiline_history: | |
1894 | self.readline.add_history(py3compat.unicode_to_str(cell, |
|
1894 | self.readline.add_history(py3compat.unicode_to_str(cell, | |
1895 | stdin_encoding)) |
|
1895 | stdin_encoding)) | |
1896 | else: |
|
1896 | else: | |
1897 | for line in cell.splitlines(): |
|
1897 | for line in cell.splitlines(): | |
1898 | self.readline.add_history(py3compat.unicode_to_str(line, |
|
1898 | self.readline.add_history(py3compat.unicode_to_str(line, | |
1899 | stdin_encoding)) |
|
1899 | stdin_encoding)) | |
1900 | last_cell = cell |
|
1900 | last_cell = cell | |
1901 |
|
1901 | |||
1902 | def set_next_input(self, s): |
|
1902 | def set_next_input(self, s): | |
1903 | """ Sets the 'default' input string for the next command line. |
|
1903 | """ Sets the 'default' input string for the next command line. | |
1904 |
|
1904 | |||
1905 | Requires readline. |
|
1905 | Requires readline. | |
1906 |
|
1906 | |||
1907 | Example: |
|
1907 | Example: | |
1908 |
|
1908 | |||
1909 | [D:\ipython]|1> _ip.set_next_input("Hello Word") |
|
1909 | [D:\ipython]|1> _ip.set_next_input("Hello Word") | |
1910 | [D:\ipython]|2> Hello Word_ # cursor is here |
|
1910 | [D:\ipython]|2> Hello Word_ # cursor is here | |
1911 | """ |
|
1911 | """ | |
1912 | self.rl_next_input = py3compat.cast_bytes_py2(s) |
|
1912 | self.rl_next_input = py3compat.cast_bytes_py2(s) | |
1913 |
|
1913 | |||
1914 | # Maybe move this to the terminal subclass? |
|
1914 | # Maybe move this to the terminal subclass? | |
1915 | def pre_readline(self): |
|
1915 | def pre_readline(self): | |
1916 | """readline hook to be used at the start of each line. |
|
1916 | """readline hook to be used at the start of each line. | |
1917 |
|
1917 | |||
1918 | Currently it handles auto-indent only.""" |
|
1918 | Currently it handles auto-indent only.""" | |
1919 |
|
1919 | |||
1920 | if self.rl_do_indent: |
|
1920 | if self.rl_do_indent: | |
1921 | self.readline.insert_text(self._indent_current_str()) |
|
1921 | self.readline.insert_text(self._indent_current_str()) | |
1922 | if self.rl_next_input is not None: |
|
1922 | if self.rl_next_input is not None: | |
1923 | self.readline.insert_text(self.rl_next_input) |
|
1923 | self.readline.insert_text(self.rl_next_input) | |
1924 | self.rl_next_input = None |
|
1924 | self.rl_next_input = None | |
1925 |
|
1925 | |||
1926 | def _indent_current_str(self): |
|
1926 | def _indent_current_str(self): | |
1927 | """return the current level of indentation as a string""" |
|
1927 | """return the current level of indentation as a string""" | |
1928 | return self.input_splitter.indent_spaces * ' ' |
|
1928 | return self.input_splitter.indent_spaces * ' ' | |
1929 |
|
1929 | |||
1930 | #------------------------------------------------------------------------- |
|
1930 | #------------------------------------------------------------------------- | |
1931 | # Things related to text completion |
|
1931 | # Things related to text completion | |
1932 | #------------------------------------------------------------------------- |
|
1932 | #------------------------------------------------------------------------- | |
1933 |
|
1933 | |||
1934 | def init_completer(self): |
|
1934 | def init_completer(self): | |
1935 | """Initialize the completion machinery. |
|
1935 | """Initialize the completion machinery. | |
1936 |
|
1936 | |||
1937 | This creates completion machinery that can be used by client code, |
|
1937 | This creates completion machinery that can be used by client code, | |
1938 | either interactively in-process (typically triggered by the readline |
|
1938 | either interactively in-process (typically triggered by the readline | |
1939 | library), programatically (such as in test suites) or out-of-prcess |
|
1939 | library), programatically (such as in test suites) or out-of-prcess | |
1940 | (typically over the network by remote frontends). |
|
1940 | (typically over the network by remote frontends). | |
1941 | """ |
|
1941 | """ | |
1942 | from IPython.core.completer import IPCompleter |
|
1942 | from IPython.core.completer import IPCompleter | |
1943 | from IPython.core.completerlib import (module_completer, |
|
1943 | from IPython.core.completerlib import (module_completer, | |
1944 | magic_run_completer, cd_completer, reset_completer) |
|
1944 | magic_run_completer, cd_completer, reset_completer) | |
1945 |
|
1945 | |||
1946 | self.Completer = IPCompleter(shell=self, |
|
1946 | self.Completer = IPCompleter(shell=self, | |
1947 | namespace=self.user_ns, |
|
1947 | namespace=self.user_ns, | |
1948 | global_namespace=self.user_global_ns, |
|
1948 | global_namespace=self.user_global_ns, | |
1949 | alias_table=self.alias_manager.alias_table, |
|
1949 | alias_table=self.alias_manager.alias_table, | |
1950 | use_readline=self.has_readline, |
|
1950 | use_readline=self.has_readline, | |
1951 | config=self.config, |
|
1951 | config=self.config, | |
1952 | ) |
|
1952 | ) | |
1953 | self.configurables.append(self.Completer) |
|
1953 | self.configurables.append(self.Completer) | |
1954 |
|
1954 | |||
1955 | # Add custom completers to the basic ones built into IPCompleter |
|
1955 | # Add custom completers to the basic ones built into IPCompleter | |
1956 | sdisp = self.strdispatchers.get('complete_command', StrDispatch()) |
|
1956 | sdisp = self.strdispatchers.get('complete_command', StrDispatch()) | |
1957 | self.strdispatchers['complete_command'] = sdisp |
|
1957 | self.strdispatchers['complete_command'] = sdisp | |
1958 | self.Completer.custom_completers = sdisp |
|
1958 | self.Completer.custom_completers = sdisp | |
1959 |
|
1959 | |||
1960 | self.set_hook('complete_command', module_completer, str_key = 'import') |
|
1960 | self.set_hook('complete_command', module_completer, str_key = 'import') | |
1961 | self.set_hook('complete_command', module_completer, str_key = 'from') |
|
1961 | self.set_hook('complete_command', module_completer, str_key = 'from') | |
1962 | self.set_hook('complete_command', magic_run_completer, str_key = '%run') |
|
1962 | self.set_hook('complete_command', magic_run_completer, str_key = '%run') | |
1963 | self.set_hook('complete_command', cd_completer, str_key = '%cd') |
|
1963 | self.set_hook('complete_command', cd_completer, str_key = '%cd') | |
1964 | self.set_hook('complete_command', reset_completer, str_key = '%reset') |
|
1964 | self.set_hook('complete_command', reset_completer, str_key = '%reset') | |
1965 |
|
1965 | |||
1966 | # Only configure readline if we truly are using readline. IPython can |
|
1966 | # Only configure readline if we truly are using readline. IPython can | |
1967 | # do tab-completion over the network, in GUIs, etc, where readline |
|
1967 | # do tab-completion over the network, in GUIs, etc, where readline | |
1968 | # itself may be absent |
|
1968 | # itself may be absent | |
1969 | if self.has_readline: |
|
1969 | if self.has_readline: | |
1970 | self.set_readline_completer() |
|
1970 | self.set_readline_completer() | |
1971 |
|
1971 | |||
1972 | def complete(self, text, line=None, cursor_pos=None): |
|
1972 | def complete(self, text, line=None, cursor_pos=None): | |
1973 | """Return the completed text and a list of completions. |
|
1973 | """Return the completed text and a list of completions. | |
1974 |
|
1974 | |||
1975 | Parameters |
|
1975 | Parameters | |
1976 | ---------- |
|
1976 | ---------- | |
1977 |
|
1977 | |||
1978 | text : string |
|
1978 | text : string | |
1979 | A string of text to be completed on. It can be given as empty and |
|
1979 | A string of text to be completed on. It can be given as empty and | |
1980 | instead a line/position pair are given. In this case, the |
|
1980 | instead a line/position pair are given. In this case, the | |
1981 | completer itself will split the line like readline does. |
|
1981 | completer itself will split the line like readline does. | |
1982 |
|
1982 | |||
1983 | line : string, optional |
|
1983 | line : string, optional | |
1984 | The complete line that text is part of. |
|
1984 | The complete line that text is part of. | |
1985 |
|
1985 | |||
1986 | cursor_pos : int, optional |
|
1986 | cursor_pos : int, optional | |
1987 | The position of the cursor on the input line. |
|
1987 | The position of the cursor on the input line. | |
1988 |
|
1988 | |||
1989 | Returns |
|
1989 | Returns | |
1990 | ------- |
|
1990 | ------- | |
1991 | text : string |
|
1991 | text : string | |
1992 | The actual text that was completed. |
|
1992 | The actual text that was completed. | |
1993 |
|
1993 | |||
1994 | matches : list |
|
1994 | matches : list | |
1995 | A sorted list with all possible completions. |
|
1995 | A sorted list with all possible completions. | |
1996 |
|
1996 | |||
1997 | The optional arguments allow the completion to take more context into |
|
1997 | The optional arguments allow the completion to take more context into | |
1998 | account, and are part of the low-level completion API. |
|
1998 | account, and are part of the low-level completion API. | |
1999 |
|
1999 | |||
2000 | This is a wrapper around the completion mechanism, similar to what |
|
2000 | This is a wrapper around the completion mechanism, similar to what | |
2001 | readline does at the command line when the TAB key is hit. By |
|
2001 | readline does at the command line when the TAB key is hit. By | |
2002 | exposing it as a method, it can be used by other non-readline |
|
2002 | exposing it as a method, it can be used by other non-readline | |
2003 | environments (such as GUIs) for text completion. |
|
2003 | environments (such as GUIs) for text completion. | |
2004 |
|
2004 | |||
2005 | Simple usage example: |
|
2005 | Simple usage example: | |
2006 |
|
2006 | |||
2007 | In [1]: x = 'hello' |
|
2007 | In [1]: x = 'hello' | |
2008 |
|
2008 | |||
2009 | In [2]: _ip.complete('x.l') |
|
2009 | In [2]: _ip.complete('x.l') | |
2010 | Out[2]: ('x.l', ['x.ljust', 'x.lower', 'x.lstrip']) |
|
2010 | Out[2]: ('x.l', ['x.ljust', 'x.lower', 'x.lstrip']) | |
2011 | """ |
|
2011 | """ | |
2012 |
|
2012 | |||
2013 | # Inject names into __builtin__ so we can complete on the added names. |
|
2013 | # Inject names into __builtin__ so we can complete on the added names. | |
2014 | with self.builtin_trap: |
|
2014 | with self.builtin_trap: | |
2015 | return self.Completer.complete(text, line, cursor_pos) |
|
2015 | return self.Completer.complete(text, line, cursor_pos) | |
2016 |
|
2016 | |||
2017 | def set_custom_completer(self, completer, pos=0): |
|
2017 | def set_custom_completer(self, completer, pos=0): | |
2018 | """Adds a new custom completer function. |
|
2018 | """Adds a new custom completer function. | |
2019 |
|
2019 | |||
2020 | The position argument (defaults to 0) is the index in the completers |
|
2020 | The position argument (defaults to 0) is the index in the completers | |
2021 | list where you want the completer to be inserted.""" |
|
2021 | list where you want the completer to be inserted.""" | |
2022 |
|
2022 | |||
2023 | newcomp = types.MethodType(completer,self.Completer) |
|
2023 | newcomp = types.MethodType(completer,self.Completer) | |
2024 | self.Completer.matchers.insert(pos,newcomp) |
|
2024 | self.Completer.matchers.insert(pos,newcomp) | |
2025 |
|
2025 | |||
2026 | def set_readline_completer(self): |
|
2026 | def set_readline_completer(self): | |
2027 | """Reset readline's completer to be our own.""" |
|
2027 | """Reset readline's completer to be our own.""" | |
2028 | self.readline.set_completer(self.Completer.rlcomplete) |
|
2028 | self.readline.set_completer(self.Completer.rlcomplete) | |
2029 |
|
2029 | |||
2030 | def set_completer_frame(self, frame=None): |
|
2030 | def set_completer_frame(self, frame=None): | |
2031 | """Set the frame of the completer.""" |
|
2031 | """Set the frame of the completer.""" | |
2032 | if frame: |
|
2032 | if frame: | |
2033 | self.Completer.namespace = frame.f_locals |
|
2033 | self.Completer.namespace = frame.f_locals | |
2034 | self.Completer.global_namespace = frame.f_globals |
|
2034 | self.Completer.global_namespace = frame.f_globals | |
2035 | else: |
|
2035 | else: | |
2036 | self.Completer.namespace = self.user_ns |
|
2036 | self.Completer.namespace = self.user_ns | |
2037 | self.Completer.global_namespace = self.user_global_ns |
|
2037 | self.Completer.global_namespace = self.user_global_ns | |
2038 |
|
2038 | |||
2039 | #------------------------------------------------------------------------- |
|
2039 | #------------------------------------------------------------------------- | |
2040 | # Things related to magics |
|
2040 | # Things related to magics | |
2041 | #------------------------------------------------------------------------- |
|
2041 | #------------------------------------------------------------------------- | |
2042 |
|
2042 | |||
2043 | def init_magics(self): |
|
2043 | def init_magics(self): | |
2044 | from IPython.core import magics as m |
|
2044 | from IPython.core import magics as m | |
2045 | self.magics_manager = magic.MagicsManager(shell=self, |
|
2045 | self.magics_manager = magic.MagicsManager(shell=self, | |
2046 | confg=self.config, |
|
2046 | confg=self.config, | |
2047 | user_magics=m.UserMagics(self)) |
|
2047 | user_magics=m.UserMagics(self)) | |
2048 | self.configurables.append(self.magics_manager) |
|
2048 | self.configurables.append(self.magics_manager) | |
2049 |
|
2049 | |||
2050 | # Expose as public API from the magics manager |
|
2050 | # Expose as public API from the magics manager | |
2051 | self.register_magics = self.magics_manager.register |
|
2051 | self.register_magics = self.magics_manager.register | |
2052 | self.register_magic_function = self.magics_manager.register_function |
|
2052 | self.register_magic_function = self.magics_manager.register_function | |
2053 | self.define_magic = self.magics_manager.define_magic |
|
2053 | self.define_magic = self.magics_manager.define_magic | |
2054 |
|
2054 | |||
2055 | self.register_magics(m.AutoMagics, m.BasicMagics, m.CodeMagics, |
|
2055 | self.register_magics(m.AutoMagics, m.BasicMagics, m.CodeMagics, | |
2056 | m.ConfigMagics, m.DeprecatedMagics, m.DisplayMagics, m.ExecutionMagics, |
|
2056 | m.ConfigMagics, m.DeprecatedMagics, m.DisplayMagics, m.ExecutionMagics, | |
2057 | m.ExtensionMagics, m.HistoryMagics, m.LoggingMagics, |
|
2057 | m.ExtensionMagics, m.HistoryMagics, m.LoggingMagics, | |
2058 | m.NamespaceMagics, m.OSMagics, m.PylabMagics, m.ScriptMagics, |
|
2058 | m.NamespaceMagics, m.OSMagics, m.PylabMagics, m.ScriptMagics, | |
2059 | ) |
|
2059 | ) | |
2060 |
|
2060 | |||
2061 | # Register Magic Aliases |
|
2061 | # Register Magic Aliases | |
2062 | mman = self.magics_manager |
|
2062 | mman = self.magics_manager | |
2063 | mman.register_alias('ed', 'edit') |
|
2063 | mman.register_alias('ed', 'edit') | |
2064 | mman.register_alias('hist', 'history') |
|
2064 | mman.register_alias('hist', 'history') | |
2065 | mman.register_alias('rep', 'recall') |
|
2065 | mman.register_alias('rep', 'recall') | |
2066 |
|
2066 | |||
2067 | # FIXME: Move the color initialization to the DisplayHook, which |
|
2067 | # FIXME: Move the color initialization to the DisplayHook, which | |
2068 | # should be split into a prompt manager and displayhook. We probably |
|
2068 | # should be split into a prompt manager and displayhook. We probably | |
2069 | # even need a centralize colors management object. |
|
2069 | # even need a centralize colors management object. | |
2070 | self.magic('colors %s' % self.colors) |
|
2070 | self.magic('colors %s' % self.colors) | |
2071 |
|
2071 | |||
2072 | def run_line_magic(self, magic_name, line): |
|
2072 | def run_line_magic(self, magic_name, line): | |
2073 | """Execute the given line magic. |
|
2073 | """Execute the given line magic. | |
2074 |
|
2074 | |||
2075 | Parameters |
|
2075 | Parameters | |
2076 | ---------- |
|
2076 | ---------- | |
2077 | magic_name : str |
|
2077 | magic_name : str | |
2078 | Name of the desired magic function, without '%' prefix. |
|
2078 | Name of the desired magic function, without '%' prefix. | |
2079 |
|
2079 | |||
2080 | line : str |
|
2080 | line : str | |
2081 | The rest of the input line as a single string. |
|
2081 | The rest of the input line as a single string. | |
2082 | """ |
|
2082 | """ | |
2083 | fn = self.find_line_magic(magic_name) |
|
2083 | fn = self.find_line_magic(magic_name) | |
2084 | if fn is None: |
|
2084 | if fn is None: | |
2085 | cm = self.find_cell_magic(magic_name) |
|
2085 | cm = self.find_cell_magic(magic_name) | |
2086 | etpl = "Line magic function `%%%s` not found%s." |
|
2086 | etpl = "Line magic function `%%%s` not found%s." | |
2087 | extra = '' if cm is None else (' (But cell magic `%%%%%s` exists, ' |
|
2087 | extra = '' if cm is None else (' (But cell magic `%%%%%s` exists, ' | |
2088 | 'did you mean that instead?)' % magic_name ) |
|
2088 | 'did you mean that instead?)' % magic_name ) | |
2089 | error(etpl % (magic_name, extra)) |
|
2089 | error(etpl % (magic_name, extra)) | |
2090 | else: |
|
2090 | else: | |
2091 | # Note: this is the distance in the stack to the user's frame. |
|
2091 | # Note: this is the distance in the stack to the user's frame. | |
2092 | # This will need to be updated if the internal calling logic gets |
|
2092 | # This will need to be updated if the internal calling logic gets | |
2093 | # refactored, or else we'll be expanding the wrong variables. |
|
2093 | # refactored, or else we'll be expanding the wrong variables. | |
2094 | stack_depth = 2 |
|
2094 | stack_depth = 2 | |
2095 | magic_arg_s = self.var_expand(line, stack_depth) |
|
2095 | magic_arg_s = self.var_expand(line, stack_depth) | |
2096 | # Put magic args in a list so we can call with f(*a) syntax |
|
2096 | # Put magic args in a list so we can call with f(*a) syntax | |
2097 | args = [magic_arg_s] |
|
2097 | args = [magic_arg_s] | |
2098 | # Grab local namespace if we need it: |
|
2098 | # Grab local namespace if we need it: | |
2099 | if getattr(fn, "needs_local_scope", False): |
|
2099 | if getattr(fn, "needs_local_scope", False): | |
2100 | args.append(sys._getframe(stack_depth).f_locals) |
|
2100 | args.append(sys._getframe(stack_depth).f_locals) | |
2101 | with self.builtin_trap: |
|
2101 | with self.builtin_trap: | |
2102 | result = fn(*args) |
|
2102 | result = fn(*args) | |
2103 | return result |
|
2103 | return result | |
2104 |
|
2104 | |||
2105 | def run_cell_magic(self, magic_name, line, cell): |
|
2105 | def run_cell_magic(self, magic_name, line, cell): | |
2106 | """Execute the given cell magic. |
|
2106 | """Execute the given cell magic. | |
2107 |
|
2107 | |||
2108 | Parameters |
|
2108 | Parameters | |
2109 | ---------- |
|
2109 | ---------- | |
2110 | magic_name : str |
|
2110 | magic_name : str | |
2111 | Name of the desired magic function, without '%' prefix. |
|
2111 | Name of the desired magic function, without '%' prefix. | |
2112 |
|
2112 | |||
2113 | line : str |
|
2113 | line : str | |
2114 | The rest of the first input line as a single string. |
|
2114 | The rest of the first input line as a single string. | |
2115 |
|
2115 | |||
2116 | cell : str |
|
2116 | cell : str | |
2117 | The body of the cell as a (possibly multiline) string. |
|
2117 | The body of the cell as a (possibly multiline) string. | |
2118 | """ |
|
2118 | """ | |
2119 | fn = self.find_cell_magic(magic_name) |
|
2119 | fn = self.find_cell_magic(magic_name) | |
2120 | if fn is None: |
|
2120 | if fn is None: | |
2121 | lm = self.find_line_magic(magic_name) |
|
2121 | lm = self.find_line_magic(magic_name) | |
2122 | etpl = "Cell magic function `%%%%%s` not found%s." |
|
2122 | etpl = "Cell magic function `%%%%%s` not found%s." | |
2123 | extra = '' if lm is None else (' (But line magic `%%%s` exists, ' |
|
2123 | extra = '' if lm is None else (' (But line magic `%%%s` exists, ' | |
2124 | 'did you mean that instead?)' % magic_name ) |
|
2124 | 'did you mean that instead?)' % magic_name ) | |
2125 | error(etpl % (magic_name, extra)) |
|
2125 | error(etpl % (magic_name, extra)) | |
2126 | else: |
|
2126 | else: | |
2127 | # Note: this is the distance in the stack to the user's frame. |
|
2127 | # Note: this is the distance in the stack to the user's frame. | |
2128 | # This will need to be updated if the internal calling logic gets |
|
2128 | # This will need to be updated if the internal calling logic gets | |
2129 | # refactored, or else we'll be expanding the wrong variables. |
|
2129 | # refactored, or else we'll be expanding the wrong variables. | |
2130 | stack_depth = 2 |
|
2130 | stack_depth = 2 | |
2131 | magic_arg_s = self.var_expand(line, stack_depth) |
|
2131 | magic_arg_s = self.var_expand(line, stack_depth) | |
2132 | with self.builtin_trap: |
|
2132 | with self.builtin_trap: | |
2133 | result = fn(magic_arg_s, cell) |
|
2133 | result = fn(magic_arg_s, cell) | |
2134 | return result |
|
2134 | return result | |
2135 |
|
2135 | |||
2136 | def find_line_magic(self, magic_name): |
|
2136 | def find_line_magic(self, magic_name): | |
2137 | """Find and return a line magic by name. |
|
2137 | """Find and return a line magic by name. | |
2138 |
|
2138 | |||
2139 | Returns None if the magic isn't found.""" |
|
2139 | Returns None if the magic isn't found.""" | |
2140 | return self.magics_manager.magics['line'].get(magic_name) |
|
2140 | return self.magics_manager.magics['line'].get(magic_name) | |
2141 |
|
2141 | |||
2142 | def find_cell_magic(self, magic_name): |
|
2142 | def find_cell_magic(self, magic_name): | |
2143 | """Find and return a cell magic by name. |
|
2143 | """Find and return a cell magic by name. | |
2144 |
|
2144 | |||
2145 | Returns None if the magic isn't found.""" |
|
2145 | Returns None if the magic isn't found.""" | |
2146 | return self.magics_manager.magics['cell'].get(magic_name) |
|
2146 | return self.magics_manager.magics['cell'].get(magic_name) | |
2147 |
|
2147 | |||
2148 | def find_magic(self, magic_name, magic_kind='line'): |
|
2148 | def find_magic(self, magic_name, magic_kind='line'): | |
2149 | """Find and return a magic of the given type by name. |
|
2149 | """Find and return a magic of the given type by name. | |
2150 |
|
2150 | |||
2151 | Returns None if the magic isn't found.""" |
|
2151 | Returns None if the magic isn't found.""" | |
2152 | return self.magics_manager.magics[magic_kind].get(magic_name) |
|
2152 | return self.magics_manager.magics[magic_kind].get(magic_name) | |
2153 |
|
2153 | |||
2154 | def magic(self, arg_s): |
|
2154 | def magic(self, arg_s): | |
2155 | """DEPRECATED. Use run_line_magic() instead. |
|
2155 | """DEPRECATED. Use run_line_magic() instead. | |
2156 |
|
2156 | |||
2157 | Call a magic function by name. |
|
2157 | Call a magic function by name. | |
2158 |
|
2158 | |||
2159 | Input: a string containing the name of the magic function to call and |
|
2159 | Input: a string containing the name of the magic function to call and | |
2160 | any additional arguments to be passed to the magic. |
|
2160 | any additional arguments to be passed to the magic. | |
2161 |
|
2161 | |||
2162 | magic('name -opt foo bar') is equivalent to typing at the ipython |
|
2162 | magic('name -opt foo bar') is equivalent to typing at the ipython | |
2163 | prompt: |
|
2163 | prompt: | |
2164 |
|
2164 | |||
2165 | In[1]: %name -opt foo bar |
|
2165 | In[1]: %name -opt foo bar | |
2166 |
|
2166 | |||
2167 | To call a magic without arguments, simply use magic('name'). |
|
2167 | To call a magic without arguments, simply use magic('name'). | |
2168 |
|
2168 | |||
2169 | This provides a proper Python function to call IPython's magics in any |
|
2169 | This provides a proper Python function to call IPython's magics in any | |
2170 | valid Python code you can type at the interpreter, including loops and |
|
2170 | valid Python code you can type at the interpreter, including loops and | |
2171 | compound statements. |
|
2171 | compound statements. | |
2172 | """ |
|
2172 | """ | |
2173 | # TODO: should we issue a loud deprecation warning here? |
|
2173 | # TODO: should we issue a loud deprecation warning here? | |
2174 | magic_name, _, magic_arg_s = arg_s.partition(' ') |
|
2174 | magic_name, _, magic_arg_s = arg_s.partition(' ') | |
2175 | magic_name = magic_name.lstrip(prefilter.ESC_MAGIC) |
|
2175 | magic_name = magic_name.lstrip(prefilter.ESC_MAGIC) | |
2176 | return self.run_line_magic(magic_name, magic_arg_s) |
|
2176 | return self.run_line_magic(magic_name, magic_arg_s) | |
2177 |
|
2177 | |||
2178 | #------------------------------------------------------------------------- |
|
2178 | #------------------------------------------------------------------------- | |
2179 | # Things related to macros |
|
2179 | # Things related to macros | |
2180 | #------------------------------------------------------------------------- |
|
2180 | #------------------------------------------------------------------------- | |
2181 |
|
2181 | |||
2182 | def define_macro(self, name, themacro): |
|
2182 | def define_macro(self, name, themacro): | |
2183 | """Define a new macro |
|
2183 | """Define a new macro | |
2184 |
|
2184 | |||
2185 | Parameters |
|
2185 | Parameters | |
2186 | ---------- |
|
2186 | ---------- | |
2187 | name : str |
|
2187 | name : str | |
2188 | The name of the macro. |
|
2188 | The name of the macro. | |
2189 | themacro : str or Macro |
|
2189 | themacro : str or Macro | |
2190 | The action to do upon invoking the macro. If a string, a new |
|
2190 | The action to do upon invoking the macro. If a string, a new | |
2191 | Macro object is created by passing the string to it. |
|
2191 | Macro object is created by passing the string to it. | |
2192 | """ |
|
2192 | """ | |
2193 |
|
2193 | |||
2194 | from IPython.core import macro |
|
2194 | from IPython.core import macro | |
2195 |
|
2195 | |||
2196 | if isinstance(themacro, basestring): |
|
2196 | if isinstance(themacro, basestring): | |
2197 | themacro = macro.Macro(themacro) |
|
2197 | themacro = macro.Macro(themacro) | |
2198 | if not isinstance(themacro, macro.Macro): |
|
2198 | if not isinstance(themacro, macro.Macro): | |
2199 | raise ValueError('A macro must be a string or a Macro instance.') |
|
2199 | raise ValueError('A macro must be a string or a Macro instance.') | |
2200 | self.user_ns[name] = themacro |
|
2200 | self.user_ns[name] = themacro | |
2201 |
|
2201 | |||
2202 | #------------------------------------------------------------------------- |
|
2202 | #------------------------------------------------------------------------- | |
2203 | # Things related to the running of system commands |
|
2203 | # Things related to the running of system commands | |
2204 | #------------------------------------------------------------------------- |
|
2204 | #------------------------------------------------------------------------- | |
2205 |
|
2205 | |||
2206 | def system_piped(self, cmd): |
|
2206 | def system_piped(self, cmd): | |
2207 | """Call the given cmd in a subprocess, piping stdout/err |
|
2207 | """Call the given cmd in a subprocess, piping stdout/err | |
2208 |
|
2208 | |||
2209 | Parameters |
|
2209 | Parameters | |
2210 | ---------- |
|
2210 | ---------- | |
2211 | cmd : str |
|
2211 | cmd : str | |
2212 | Command to execute (can not end in '&', as background processes are |
|
2212 | Command to execute (can not end in '&', as background processes are | |
2213 | not supported. Should not be a command that expects input |
|
2213 | not supported. Should not be a command that expects input | |
2214 | other than simple text. |
|
2214 | other than simple text. | |
2215 | """ |
|
2215 | """ | |
2216 | if cmd.rstrip().endswith('&'): |
|
2216 | if cmd.rstrip().endswith('&'): | |
2217 | # this is *far* from a rigorous test |
|
2217 | # this is *far* from a rigorous test | |
2218 | # We do not support backgrounding processes because we either use |
|
2218 | # We do not support backgrounding processes because we either use | |
2219 | # pexpect or pipes to read from. Users can always just call |
|
2219 | # pexpect or pipes to read from. Users can always just call | |
2220 | # os.system() or use ip.system=ip.system_raw |
|
2220 | # os.system() or use ip.system=ip.system_raw | |
2221 | # if they really want a background process. |
|
2221 | # if they really want a background process. | |
2222 | raise OSError("Background processes not supported.") |
|
2222 | raise OSError("Background processes not supported.") | |
2223 |
|
2223 | |||
2224 | # we explicitly do NOT return the subprocess status code, because |
|
2224 | # we explicitly do NOT return the subprocess status code, because | |
2225 | # a non-None value would trigger :func:`sys.displayhook` calls. |
|
2225 | # a non-None value would trigger :func:`sys.displayhook` calls. | |
2226 | # Instead, we store the exit_code in user_ns. |
|
2226 | # Instead, we store the exit_code in user_ns. | |
2227 | self.user_ns['_exit_code'] = system(self.var_expand(cmd, depth=1)) |
|
2227 | self.user_ns['_exit_code'] = system(self.var_expand(cmd, depth=1)) | |
2228 |
|
2228 | |||
2229 | def system_raw(self, cmd): |
|
2229 | def system_raw(self, cmd): | |
2230 | """Call the given cmd in a subprocess using os.system |
|
2230 | """Call the given cmd in a subprocess using os.system | |
2231 |
|
2231 | |||
2232 | Parameters |
|
2232 | Parameters | |
2233 | ---------- |
|
2233 | ---------- | |
2234 | cmd : str |
|
2234 | cmd : str | |
2235 | Command to execute. |
|
2235 | Command to execute. | |
2236 | """ |
|
2236 | """ | |
2237 | cmd = self.var_expand(cmd, depth=1) |
|
2237 | cmd = self.var_expand(cmd, depth=1) | |
2238 | # protect os.system from UNC paths on Windows, which it can't handle: |
|
2238 | # protect os.system from UNC paths on Windows, which it can't handle: | |
2239 | if sys.platform == 'win32': |
|
2239 | if sys.platform == 'win32': | |
2240 | from IPython.utils._process_win32 import AvoidUNCPath |
|
2240 | from IPython.utils._process_win32 import AvoidUNCPath | |
2241 | with AvoidUNCPath() as path: |
|
2241 | with AvoidUNCPath() as path: | |
2242 | if path is not None: |
|
2242 | if path is not None: | |
2243 | cmd = '"pushd %s &&"%s' % (path, cmd) |
|
2243 | cmd = '"pushd %s &&"%s' % (path, cmd) | |
2244 | cmd = py3compat.unicode_to_str(cmd) |
|
2244 | cmd = py3compat.unicode_to_str(cmd) | |
2245 | ec = os.system(cmd) |
|
2245 | ec = os.system(cmd) | |
2246 | else: |
|
2246 | else: | |
2247 | cmd = py3compat.unicode_to_str(cmd) |
|
2247 | cmd = py3compat.unicode_to_str(cmd) | |
2248 | ec = os.system(cmd) |
|
2248 | ec = os.system(cmd) | |
2249 |
|
2249 | |||
2250 | # We explicitly do NOT return the subprocess status code, because |
|
2250 | # We explicitly do NOT return the subprocess status code, because | |
2251 | # a non-None value would trigger :func:`sys.displayhook` calls. |
|
2251 | # a non-None value would trigger :func:`sys.displayhook` calls. | |
2252 | # Instead, we store the exit_code in user_ns. |
|
2252 | # Instead, we store the exit_code in user_ns. | |
2253 | self.user_ns['_exit_code'] = ec |
|
2253 | self.user_ns['_exit_code'] = ec | |
2254 |
|
2254 | |||
2255 | # use piped system by default, because it is better behaved |
|
2255 | # use piped system by default, because it is better behaved | |
2256 | system = system_piped |
|
2256 | system = system_piped | |
2257 |
|
2257 | |||
2258 | def getoutput(self, cmd, split=True, depth=0): |
|
2258 | def getoutput(self, cmd, split=True, depth=0): | |
2259 | """Get output (possibly including stderr) from a subprocess. |
|
2259 | """Get output (possibly including stderr) from a subprocess. | |
2260 |
|
2260 | |||
2261 | Parameters |
|
2261 | Parameters | |
2262 | ---------- |
|
2262 | ---------- | |
2263 | cmd : str |
|
2263 | cmd : str | |
2264 | Command to execute (can not end in '&', as background processes are |
|
2264 | Command to execute (can not end in '&', as background processes are | |
2265 | not supported. |
|
2265 | not supported. | |
2266 | split : bool, optional |
|
2266 | split : bool, optional | |
2267 | If True, split the output into an IPython SList. Otherwise, an |
|
2267 | If True, split the output into an IPython SList. Otherwise, an | |
2268 | IPython LSString is returned. These are objects similar to normal |
|
2268 | IPython LSString is returned. These are objects similar to normal | |
2269 | lists and strings, with a few convenience attributes for easier |
|
2269 | lists and strings, with a few convenience attributes for easier | |
2270 | manipulation of line-based output. You can use '?' on them for |
|
2270 | manipulation of line-based output. You can use '?' on them for | |
2271 | details. |
|
2271 | details. | |
2272 | depth : int, optional |
|
2272 | depth : int, optional | |
2273 | How many frames above the caller are the local variables which should |
|
2273 | How many frames above the caller are the local variables which should | |
2274 | be expanded in the command string? The default (0) assumes that the |
|
2274 | be expanded in the command string? The default (0) assumes that the | |
2275 | expansion variables are in the stack frame calling this function. |
|
2275 | expansion variables are in the stack frame calling this function. | |
2276 | """ |
|
2276 | """ | |
2277 | if cmd.rstrip().endswith('&'): |
|
2277 | if cmd.rstrip().endswith('&'): | |
2278 | # this is *far* from a rigorous test |
|
2278 | # this is *far* from a rigorous test | |
2279 | raise OSError("Background processes not supported.") |
|
2279 | raise OSError("Background processes not supported.") | |
2280 | out = getoutput(self.var_expand(cmd, depth=depth+1)) |
|
2280 | out = getoutput(self.var_expand(cmd, depth=depth+1)) | |
2281 | if split: |
|
2281 | if split: | |
2282 | out = SList(out.splitlines()) |
|
2282 | out = SList(out.splitlines()) | |
2283 | else: |
|
2283 | else: | |
2284 | out = LSString(out) |
|
2284 | out = LSString(out) | |
2285 | return out |
|
2285 | return out | |
2286 |
|
2286 | |||
2287 | #------------------------------------------------------------------------- |
|
2287 | #------------------------------------------------------------------------- | |
2288 | # Things related to aliases |
|
2288 | # Things related to aliases | |
2289 | #------------------------------------------------------------------------- |
|
2289 | #------------------------------------------------------------------------- | |
2290 |
|
2290 | |||
2291 | def init_alias(self): |
|
2291 | def init_alias(self): | |
2292 | self.alias_manager = AliasManager(shell=self, config=self.config) |
|
2292 | self.alias_manager = AliasManager(shell=self, config=self.config) | |
2293 | self.configurables.append(self.alias_manager) |
|
2293 | self.configurables.append(self.alias_manager) | |
2294 | self.ns_table['alias'] = self.alias_manager.alias_table, |
|
2294 | self.ns_table['alias'] = self.alias_manager.alias_table, | |
2295 |
|
2295 | |||
2296 | #------------------------------------------------------------------------- |
|
2296 | #------------------------------------------------------------------------- | |
2297 | # Things related to extensions and plugins |
|
2297 | # Things related to extensions and plugins | |
2298 | #------------------------------------------------------------------------- |
|
2298 | #------------------------------------------------------------------------- | |
2299 |
|
2299 | |||
2300 | def init_extension_manager(self): |
|
2300 | def init_extension_manager(self): | |
2301 | self.extension_manager = ExtensionManager(shell=self, config=self.config) |
|
2301 | self.extension_manager = ExtensionManager(shell=self, config=self.config) | |
2302 | self.configurables.append(self.extension_manager) |
|
2302 | self.configurables.append(self.extension_manager) | |
2303 |
|
2303 | |||
2304 | def init_plugin_manager(self): |
|
2304 | def init_plugin_manager(self): | |
2305 | self.plugin_manager = PluginManager(config=self.config) |
|
2305 | self.plugin_manager = PluginManager(config=self.config) | |
2306 | self.configurables.append(self.plugin_manager) |
|
2306 | self.configurables.append(self.plugin_manager) | |
2307 |
|
2307 | |||
2308 |
|
2308 | |||
2309 | #------------------------------------------------------------------------- |
|
2309 | #------------------------------------------------------------------------- | |
2310 | # Things related to payloads |
|
2310 | # Things related to payloads | |
2311 | #------------------------------------------------------------------------- |
|
2311 | #------------------------------------------------------------------------- | |
2312 |
|
2312 | |||
2313 | def init_payload(self): |
|
2313 | def init_payload(self): | |
2314 | self.payload_manager = PayloadManager(config=self.config) |
|
2314 | self.payload_manager = PayloadManager(config=self.config) | |
2315 | self.configurables.append(self.payload_manager) |
|
2315 | self.configurables.append(self.payload_manager) | |
2316 |
|
2316 | |||
2317 | #------------------------------------------------------------------------- |
|
2317 | #------------------------------------------------------------------------- | |
2318 | # Things related to the prefilter |
|
2318 | # Things related to the prefilter | |
2319 | #------------------------------------------------------------------------- |
|
2319 | #------------------------------------------------------------------------- | |
2320 |
|
2320 | |||
2321 | def init_prefilter(self): |
|
2321 | def init_prefilter(self): | |
2322 | self.prefilter_manager = PrefilterManager(shell=self, config=self.config) |
|
2322 | self.prefilter_manager = PrefilterManager(shell=self, config=self.config) | |
2323 | self.configurables.append(self.prefilter_manager) |
|
2323 | self.configurables.append(self.prefilter_manager) | |
2324 | # Ultimately this will be refactored in the new interpreter code, but |
|
2324 | # Ultimately this will be refactored in the new interpreter code, but | |
2325 | # for now, we should expose the main prefilter method (there's legacy |
|
2325 | # for now, we should expose the main prefilter method (there's legacy | |
2326 | # code out there that may rely on this). |
|
2326 | # code out there that may rely on this). | |
2327 | self.prefilter = self.prefilter_manager.prefilter_lines |
|
2327 | self.prefilter = self.prefilter_manager.prefilter_lines | |
2328 |
|
2328 | |||
2329 | def auto_rewrite_input(self, cmd): |
|
2329 | def auto_rewrite_input(self, cmd): | |
2330 | """Print to the screen the rewritten form of the user's command. |
|
2330 | """Print to the screen the rewritten form of the user's command. | |
2331 |
|
2331 | |||
2332 | This shows visual feedback by rewriting input lines that cause |
|
2332 | This shows visual feedback by rewriting input lines that cause | |
2333 | automatic calling to kick in, like:: |
|
2333 | automatic calling to kick in, like:: | |
2334 |
|
2334 | |||
2335 | /f x |
|
2335 | /f x | |
2336 |
|
2336 | |||
2337 | into:: |
|
2337 | into:: | |
2338 |
|
2338 | |||
2339 | ------> f(x) |
|
2339 | ------> f(x) | |
2340 |
|
2340 | |||
2341 | after the user's input prompt. This helps the user understand that the |
|
2341 | after the user's input prompt. This helps the user understand that the | |
2342 | input line was transformed automatically by IPython. |
|
2342 | input line was transformed automatically by IPython. | |
2343 | """ |
|
2343 | """ | |
2344 | if not self.show_rewritten_input: |
|
2344 | if not self.show_rewritten_input: | |
2345 | return |
|
2345 | return | |
2346 |
|
2346 | |||
2347 | rw = self.prompt_manager.render('rewrite') + cmd |
|
2347 | rw = self.prompt_manager.render('rewrite') + cmd | |
2348 |
|
2348 | |||
2349 | try: |
|
2349 | try: | |
2350 | # plain ascii works better w/ pyreadline, on some machines, so |
|
2350 | # plain ascii works better w/ pyreadline, on some machines, so | |
2351 | # we use it and only print uncolored rewrite if we have unicode |
|
2351 | # we use it and only print uncolored rewrite if we have unicode | |
2352 | rw = str(rw) |
|
2352 | rw = str(rw) | |
2353 | print(rw, file=io.stdout) |
|
2353 | print(rw, file=io.stdout) | |
2354 | except UnicodeEncodeError: |
|
2354 | except UnicodeEncodeError: | |
2355 | print("------> " + cmd) |
|
2355 | print("------> " + cmd) | |
2356 |
|
2356 | |||
2357 | #------------------------------------------------------------------------- |
|
2357 | #------------------------------------------------------------------------- | |
2358 | # Things related to extracting values/expressions from kernel and user_ns |
|
2358 | # Things related to extracting values/expressions from kernel and user_ns | |
2359 | #------------------------------------------------------------------------- |
|
2359 | #------------------------------------------------------------------------- | |
2360 |
|
2360 | |||
2361 | def _simple_error(self): |
|
2361 | def _simple_error(self): | |
2362 | etype, value = sys.exc_info()[:2] |
|
2362 | etype, value = sys.exc_info()[:2] | |
2363 | return u'[ERROR] {e.__name__}: {v}'.format(e=etype, v=value) |
|
2363 | return u'[ERROR] {e.__name__}: {v}'.format(e=etype, v=value) | |
2364 |
|
2364 | |||
2365 | def user_variables(self, names): |
|
2365 | def user_variables(self, names): | |
2366 | """Get a list of variable names from the user's namespace. |
|
2366 | """Get a list of variable names from the user's namespace. | |
2367 |
|
2367 | |||
2368 | Parameters |
|
2368 | Parameters | |
2369 | ---------- |
|
2369 | ---------- | |
2370 | names : list of strings |
|
2370 | names : list of strings | |
2371 | A list of names of variables to be read from the user namespace. |
|
2371 | A list of names of variables to be read from the user namespace. | |
2372 |
|
2372 | |||
2373 | Returns |
|
2373 | Returns | |
2374 | ------- |
|
2374 | ------- | |
2375 | A dict, keyed by the input names and with the repr() of each value. |
|
2375 | A dict, keyed by the input names and with the repr() of each value. | |
2376 | """ |
|
2376 | """ | |
2377 | out = {} |
|
2377 | out = {} | |
2378 | user_ns = self.user_ns |
|
2378 | user_ns = self.user_ns | |
2379 | for varname in names: |
|
2379 | for varname in names: | |
2380 | try: |
|
2380 | try: | |
2381 | value = repr(user_ns[varname]) |
|
2381 | value = repr(user_ns[varname]) | |
2382 | except: |
|
2382 | except: | |
2383 | value = self._simple_error() |
|
2383 | value = self._simple_error() | |
2384 | out[varname] = value |
|
2384 | out[varname] = value | |
2385 | return out |
|
2385 | return out | |
2386 |
|
2386 | |||
2387 | def user_expressions(self, expressions): |
|
2387 | def user_expressions(self, expressions): | |
2388 | """Evaluate a dict of expressions in the user's namespace. |
|
2388 | """Evaluate a dict of expressions in the user's namespace. | |
2389 |
|
2389 | |||
2390 | Parameters |
|
2390 | Parameters | |
2391 | ---------- |
|
2391 | ---------- | |
2392 | expressions : dict |
|
2392 | expressions : dict | |
2393 | A dict with string keys and string values. The expression values |
|
2393 | A dict with string keys and string values. The expression values | |
2394 | should be valid Python expressions, each of which will be evaluated |
|
2394 | should be valid Python expressions, each of which will be evaluated | |
2395 | in the user namespace. |
|
2395 | in the user namespace. | |
2396 |
|
2396 | |||
2397 | Returns |
|
2397 | Returns | |
2398 | ------- |
|
2398 | ------- | |
2399 | A dict, keyed like the input expressions dict, with the repr() of each |
|
2399 | A dict, keyed like the input expressions dict, with the repr() of each | |
2400 | value. |
|
2400 | value. | |
2401 | """ |
|
2401 | """ | |
2402 | out = {} |
|
2402 | out = {} | |
2403 | user_ns = self.user_ns |
|
2403 | user_ns = self.user_ns | |
2404 | global_ns = self.user_global_ns |
|
2404 | global_ns = self.user_global_ns | |
2405 | for key, expr in expressions.iteritems(): |
|
2405 | for key, expr in expressions.iteritems(): | |
2406 | try: |
|
2406 | try: | |
2407 | value = repr(eval(expr, global_ns, user_ns)) |
|
2407 | value = repr(eval(expr, global_ns, user_ns)) | |
2408 | except: |
|
2408 | except: | |
2409 | value = self._simple_error() |
|
2409 | value = self._simple_error() | |
2410 | out[key] = value |
|
2410 | out[key] = value | |
2411 | return out |
|
2411 | return out | |
2412 |
|
2412 | |||
2413 | #------------------------------------------------------------------------- |
|
2413 | #------------------------------------------------------------------------- | |
2414 | # Things related to the running of code |
|
2414 | # Things related to the running of code | |
2415 | #------------------------------------------------------------------------- |
|
2415 | #------------------------------------------------------------------------- | |
2416 |
|
2416 | |||
2417 | def ex(self, cmd): |
|
2417 | def ex(self, cmd): | |
2418 | """Execute a normal python statement in user namespace.""" |
|
2418 | """Execute a normal python statement in user namespace.""" | |
2419 | with self.builtin_trap: |
|
2419 | with self.builtin_trap: | |
2420 | exec cmd in self.user_global_ns, self.user_ns |
|
2420 | exec cmd in self.user_global_ns, self.user_ns | |
2421 |
|
2421 | |||
2422 | def ev(self, expr): |
|
2422 | def ev(self, expr): | |
2423 | """Evaluate python expression expr in user namespace. |
|
2423 | """Evaluate python expression expr in user namespace. | |
2424 |
|
2424 | |||
2425 | Returns the result of evaluation |
|
2425 | Returns the result of evaluation | |
2426 | """ |
|
2426 | """ | |
2427 | with self.builtin_trap: |
|
2427 | with self.builtin_trap: | |
2428 | return eval(expr, self.user_global_ns, self.user_ns) |
|
2428 | return eval(expr, self.user_global_ns, self.user_ns) | |
2429 |
|
2429 | |||
2430 | def safe_execfile(self, fname, *where, **kw): |
|
2430 | def safe_execfile(self, fname, *where, **kw): | |
2431 | """A safe version of the builtin execfile(). |
|
2431 | """A safe version of the builtin execfile(). | |
2432 |
|
2432 | |||
2433 | This version will never throw an exception, but instead print |
|
2433 | This version will never throw an exception, but instead print | |
2434 | helpful error messages to the screen. This only works on pure |
|
2434 | helpful error messages to the screen. This only works on pure | |
2435 | Python files with the .py extension. |
|
2435 | Python files with the .py extension. | |
2436 |
|
2436 | |||
2437 | Parameters |
|
2437 | Parameters | |
2438 | ---------- |
|
2438 | ---------- | |
2439 | fname : string |
|
2439 | fname : string | |
2440 | The name of the file to be executed. |
|
2440 | The name of the file to be executed. | |
2441 | where : tuple |
|
2441 | where : tuple | |
2442 | One or two namespaces, passed to execfile() as (globals,locals). |
|
2442 | One or two namespaces, passed to execfile() as (globals,locals). | |
2443 | If only one is given, it is passed as both. |
|
2443 | If only one is given, it is passed as both. | |
2444 | exit_ignore : bool (False) |
|
2444 | exit_ignore : bool (False) | |
2445 | If True, then silence SystemExit for non-zero status (it is always |
|
2445 | If True, then silence SystemExit for non-zero status (it is always | |
2446 | silenced for zero status, as it is so common). |
|
2446 | silenced for zero status, as it is so common). | |
2447 | raise_exceptions : bool (False) |
|
2447 | raise_exceptions : bool (False) | |
2448 | If True raise exceptions everywhere. Meant for testing. |
|
2448 | If True raise exceptions everywhere. Meant for testing. | |
2449 |
|
2449 | |||
2450 | """ |
|
2450 | """ | |
2451 | kw.setdefault('exit_ignore', False) |
|
2451 | kw.setdefault('exit_ignore', False) | |
2452 | kw.setdefault('raise_exceptions', False) |
|
2452 | kw.setdefault('raise_exceptions', False) | |
2453 |
|
2453 | |||
2454 | fname = os.path.abspath(os.path.expanduser(fname)) |
|
2454 | fname = os.path.abspath(os.path.expanduser(fname)) | |
2455 |
|
2455 | |||
2456 | # Make sure we can open the file |
|
2456 | # Make sure we can open the file | |
2457 | try: |
|
2457 | try: | |
2458 | with open(fname) as thefile: |
|
2458 | with open(fname) as thefile: | |
2459 | pass |
|
2459 | pass | |
2460 | except: |
|
2460 | except: | |
2461 | warn('Could not open file <%s> for safe execution.' % fname) |
|
2461 | warn('Could not open file <%s> for safe execution.' % fname) | |
2462 | return |
|
2462 | return | |
2463 |
|
2463 | |||
2464 | # Find things also in current directory. This is needed to mimic the |
|
2464 | # Find things also in current directory. This is needed to mimic the | |
2465 | # behavior of running a script from the system command line, where |
|
2465 | # behavior of running a script from the system command line, where | |
2466 | # Python inserts the script's directory into sys.path |
|
2466 | # Python inserts the script's directory into sys.path | |
2467 | dname = os.path.dirname(fname) |
|
2467 | dname = os.path.dirname(fname) | |
2468 |
|
2468 | |||
2469 | with prepended_to_syspath(dname): |
|
2469 | with prepended_to_syspath(dname): | |
2470 | # Ensure that __file__ is always defined to match Python behavior |
|
2470 | # Ensure that __file__ is always defined to match Python behavior | |
2471 | save_fname = self.user_ns.get('__file__',None) |
|
2471 | save_fname = self.user_ns.get('__file__',None) | |
2472 | self.user_ns['__file__'] = fname |
|
2472 | self.user_ns['__file__'] = fname | |
2473 | try: |
|
2473 | try: | |
2474 | py3compat.execfile(fname,*where) |
|
2474 | py3compat.execfile(fname,*where) | |
2475 | except SystemExit as status: |
|
2475 | except SystemExit as status: | |
2476 | # If the call was made with 0 or None exit status (sys.exit(0) |
|
2476 | # If the call was made with 0 or None exit status (sys.exit(0) | |
2477 | # or sys.exit() ), don't bother showing a traceback, as both of |
|
2477 | # or sys.exit() ), don't bother showing a traceback, as both of | |
2478 | # these are considered normal by the OS: |
|
2478 | # these are considered normal by the OS: | |
2479 | # > python -c'import sys;sys.exit(0)'; echo $? |
|
2479 | # > python -c'import sys;sys.exit(0)'; echo $? | |
2480 | # 0 |
|
2480 | # 0 | |
2481 | # > python -c'import sys;sys.exit()'; echo $? |
|
2481 | # > python -c'import sys;sys.exit()'; echo $? | |
2482 | # 0 |
|
2482 | # 0 | |
2483 | # For other exit status, we show the exception unless |
|
2483 | # For other exit status, we show the exception unless | |
2484 | # explicitly silenced, but only in short form. |
|
2484 | # explicitly silenced, but only in short form. | |
2485 | if kw['raise_exceptions']: |
|
2485 | if kw['raise_exceptions']: | |
2486 | raise |
|
2486 | raise | |
2487 | if status.code not in (0, None) and not kw['exit_ignore']: |
|
2487 | if status.code not in (0, None) and not kw['exit_ignore']: | |
2488 | self.showtraceback(exception_only=True) |
|
2488 | self.showtraceback(exception_only=True) | |
2489 | except: |
|
2489 | except: | |
2490 | if kw['raise_exceptions']: |
|
2490 | if kw['raise_exceptions']: | |
2491 | raise |
|
2491 | raise | |
2492 | self.showtraceback() |
|
2492 | self.showtraceback() | |
2493 | finally: |
|
2493 | finally: | |
2494 | self.user_ns['__file__'] = save_fname |
|
2494 | self.user_ns['__file__'] = save_fname | |
2495 |
|
2495 | |||
2496 | def safe_execfile_ipy(self, fname): |
|
2496 | def safe_execfile_ipy(self, fname): | |
2497 | """Like safe_execfile, but for .ipy files with IPython syntax. |
|
2497 | """Like safe_execfile, but for .ipy files with IPython syntax. | |
2498 |
|
2498 | |||
2499 | Parameters |
|
2499 | Parameters | |
2500 | ---------- |
|
2500 | ---------- | |
2501 | fname : str |
|
2501 | fname : str | |
2502 | The name of the file to execute. The filename must have a |
|
2502 | The name of the file to execute. The filename must have a | |
2503 | .ipy extension. |
|
2503 | .ipy extension. | |
2504 | """ |
|
2504 | """ | |
2505 | fname = os.path.abspath(os.path.expanduser(fname)) |
|
2505 | fname = os.path.abspath(os.path.expanduser(fname)) | |
2506 |
|
2506 | |||
2507 | # Make sure we can open the file |
|
2507 | # Make sure we can open the file | |
2508 | try: |
|
2508 | try: | |
2509 | with open(fname) as thefile: |
|
2509 | with open(fname) as thefile: | |
2510 | pass |
|
2510 | pass | |
2511 | except: |
|
2511 | except: | |
2512 | warn('Could not open file <%s> for safe execution.' % fname) |
|
2512 | warn('Could not open file <%s> for safe execution.' % fname) | |
2513 | return |
|
2513 | return | |
2514 |
|
2514 | |||
2515 | # Find things also in current directory. This is needed to mimic the |
|
2515 | # Find things also in current directory. This is needed to mimic the | |
2516 | # behavior of running a script from the system command line, where |
|
2516 | # behavior of running a script from the system command line, where | |
2517 | # Python inserts the script's directory into sys.path |
|
2517 | # Python inserts the script's directory into sys.path | |
2518 | dname = os.path.dirname(fname) |
|
2518 | dname = os.path.dirname(fname) | |
2519 |
|
2519 | |||
2520 | with prepended_to_syspath(dname): |
|
2520 | with prepended_to_syspath(dname): | |
2521 | # Ensure that __file__ is always defined to match Python behavior |
|
2521 | # Ensure that __file__ is always defined to match Python behavior | |
2522 | save_fname = self.user_ns.get('__file__',None) |
|
2522 | save_fname = self.user_ns.get('__file__',None) | |
2523 | self.user_ns['__file__'] = fname |
|
2523 | self.user_ns['__file__'] = fname | |
2524 | try: |
|
2524 | try: | |
2525 | with open(fname) as thefile: |
|
2525 | with open(fname) as thefile: | |
2526 | # self.run_cell currently captures all exceptions |
|
2526 | # self.run_cell currently captures all exceptions | |
2527 | # raised in user code. It would be nice if there were |
|
2527 | # raised in user code. It would be nice if there were | |
2528 | # versions of runlines, execfile that did raise, so |
|
2528 | # versions of runlines, execfile that did raise, so | |
2529 | # we could catch the errors. |
|
2529 | # we could catch the errors. | |
2530 | self.run_cell(thefile.read(), store_history=False) |
|
2530 | self.run_cell(thefile.read(), store_history=False) | |
2531 | except: |
|
2531 | except: | |
2532 | self.showtraceback() |
|
2532 | self.showtraceback() | |
2533 | warn('Unknown failure executing file: <%s>' % fname) |
|
2533 | warn('Unknown failure executing file: <%s>' % fname) | |
2534 | finally: |
|
2534 | finally: | |
2535 | self.user_ns['__file__'] = save_fname |
|
2535 | self.user_ns['__file__'] = save_fname | |
2536 |
|
2536 | |||
2537 | def safe_run_module(self, mod_name, where): |
|
2537 | def safe_run_module(self, mod_name, where): | |
2538 | """A safe version of runpy.run_module(). |
|
2538 | """A safe version of runpy.run_module(). | |
2539 |
|
2539 | |||
2540 | This version will never throw an exception, but instead print |
|
2540 | This version will never throw an exception, but instead print | |
2541 | helpful error messages to the screen. |
|
2541 | helpful error messages to the screen. | |
2542 |
|
2542 | |||
2543 | Parameters |
|
2543 | Parameters | |
2544 | ---------- |
|
2544 | ---------- | |
2545 | mod_name : string |
|
2545 | mod_name : string | |
2546 | The name of the module to be executed. |
|
2546 | The name of the module to be executed. | |
2547 | where : dict |
|
2547 | where : dict | |
2548 | The globals namespace. |
|
2548 | The globals namespace. | |
2549 | """ |
|
2549 | """ | |
2550 | try: |
|
2550 | try: | |
2551 | where.update( |
|
2551 | where.update( | |
2552 | runpy.run_module(str(mod_name), run_name="__main__", |
|
2552 | runpy.run_module(str(mod_name), run_name="__main__", | |
2553 | alter_sys=True) |
|
2553 | alter_sys=True) | |
2554 | ) |
|
2554 | ) | |
2555 | except: |
|
2555 | except: | |
2556 | self.showtraceback() |
|
2556 | self.showtraceback() | |
2557 | warn('Unknown failure executing module: <%s>' % mod_name) |
|
2557 | warn('Unknown failure executing module: <%s>' % mod_name) | |
2558 |
|
2558 | |||
2559 | def _run_cached_cell_magic(self, magic_name, line): |
|
2559 | def _run_cached_cell_magic(self, magic_name, line): | |
2560 | """Special method to call a cell magic with the data stored in self. |
|
2560 | """Special method to call a cell magic with the data stored in self. | |
2561 | """ |
|
2561 | """ | |
2562 | cell = self._current_cell_magic_body |
|
2562 | cell = self._current_cell_magic_body | |
2563 | self._current_cell_magic_body = None |
|
2563 | self._current_cell_magic_body = None | |
2564 | return self.run_cell_magic(magic_name, line, cell) |
|
2564 | return self.run_cell_magic(magic_name, line, cell) | |
2565 |
|
2565 | |||
2566 | def run_cell(self, raw_cell, store_history=False, silent=False): |
|
2566 | def run_cell(self, raw_cell, store_history=False, silent=False): | |
2567 | """Run a complete IPython cell. |
|
2567 | """Run a complete IPython cell. | |
2568 |
|
2568 | |||
2569 | Parameters |
|
2569 | Parameters | |
2570 | ---------- |
|
2570 | ---------- | |
2571 | raw_cell : str |
|
2571 | raw_cell : str | |
2572 | The code (including IPython code such as %magic functions) to run. |
|
2572 | The code (including IPython code such as %magic functions) to run. | |
2573 | store_history : bool |
|
2573 | store_history : bool | |
2574 | If True, the raw and translated cell will be stored in IPython's |
|
2574 | If True, the raw and translated cell will be stored in IPython's | |
2575 | history. For user code calling back into IPython's machinery, this |
|
2575 | history. For user code calling back into IPython's machinery, this | |
2576 | should be set to False. |
|
2576 | should be set to False. | |
2577 | silent : bool |
|
2577 | silent : bool | |
2578 | If True, avoid side-effets, such as implicit displayhooks, history, |
|
2578 | If True, avoid side-effets, such as implicit displayhooks, history, | |
2579 | and logging. silent=True forces store_history=False. |
|
2579 | and logging. silent=True forces store_history=False. | |
2580 | """ |
|
2580 | """ | |
2581 | if (not raw_cell) or raw_cell.isspace(): |
|
2581 | if (not raw_cell) or raw_cell.isspace(): | |
2582 | return |
|
2582 | return | |
2583 |
|
2583 | |||
2584 | if silent: |
|
2584 | if silent: | |
2585 | store_history = False |
|
2585 | store_history = False | |
2586 |
|
2586 | |||
2587 | self.input_splitter.push(raw_cell) |
|
2587 | self.input_splitter.push(raw_cell) | |
2588 |
|
2588 | |||
2589 | # Check for cell magics, which leave state behind. This interface is |
|
2589 | # Check for cell magics, which leave state behind. This interface is | |
2590 | # ugly, we need to do something cleaner later... Now the logic is |
|
2590 | # ugly, we need to do something cleaner later... Now the logic is | |
2591 | # simply that the input_splitter remembers if there was a cell magic, |
|
2591 | # simply that the input_splitter remembers if there was a cell magic, | |
2592 | # and in that case we grab the cell body. |
|
2592 | # and in that case we grab the cell body. | |
2593 | if self.input_splitter.cell_magic_parts: |
|
2593 | if self.input_splitter.cell_magic_parts: | |
2594 | self._current_cell_magic_body = \ |
|
2594 | self._current_cell_magic_body = \ | |
2595 | ''.join(self.input_splitter.cell_magic_parts) |
|
2595 | ''.join(self.input_splitter.cell_magic_parts) | |
2596 | cell = self.input_splitter.source_reset() |
|
2596 | cell = self.input_splitter.source_reset() | |
2597 |
|
2597 | |||
2598 | with self.builtin_trap: |
|
2598 | with self.builtin_trap: | |
2599 | prefilter_failed = False |
|
2599 | prefilter_failed = False | |
2600 | if len(cell.splitlines()) == 1: |
|
2600 | if len(cell.splitlines()) == 1: | |
2601 | try: |
|
2601 | try: | |
2602 | # use prefilter_lines to handle trailing newlines |
|
2602 | # use prefilter_lines to handle trailing newlines | |
2603 | # restore trailing newline for ast.parse |
|
2603 | # restore trailing newline for ast.parse | |
2604 | cell = self.prefilter_manager.prefilter_lines(cell) + '\n' |
|
2604 | cell = self.prefilter_manager.prefilter_lines(cell) + '\n' | |
2605 | except AliasError as e: |
|
2605 | except AliasError as e: | |
2606 | error(e) |
|
2606 | error(e) | |
2607 | prefilter_failed = True |
|
2607 | prefilter_failed = True | |
2608 | except Exception: |
|
2608 | except Exception: | |
2609 | # don't allow prefilter errors to crash IPython |
|
2609 | # don't allow prefilter errors to crash IPython | |
2610 | self.showtraceback() |
|
2610 | self.showtraceback() | |
2611 | prefilter_failed = True |
|
2611 | prefilter_failed = True | |
2612 |
|
2612 | |||
2613 | # Store raw and processed history |
|
2613 | # Store raw and processed history | |
2614 | if store_history: |
|
2614 | if store_history: | |
2615 | self.history_manager.store_inputs(self.execution_count, |
|
2615 | self.history_manager.store_inputs(self.execution_count, | |
2616 | cell, raw_cell) |
|
2616 | cell, raw_cell) | |
2617 | if not silent: |
|
2617 | if not silent: | |
2618 | self.logger.log(cell, raw_cell) |
|
2618 | self.logger.log(cell, raw_cell) | |
2619 |
|
2619 | |||
2620 | if not prefilter_failed: |
|
2620 | if not prefilter_failed: | |
2621 | # don't run if prefilter failed |
|
2621 | # don't run if prefilter failed | |
2622 | cell_name = self.compile.cache(cell, self.execution_count) |
|
2622 | cell_name = self.compile.cache(cell, self.execution_count) | |
2623 |
|
2623 | |||
2624 | with self.display_trap: |
|
2624 | with self.display_trap: | |
2625 | try: |
|
2625 | try: | |
2626 | code_ast = self.compile.ast_parse(cell, |
|
2626 | code_ast = self.compile.ast_parse(cell, | |
2627 | filename=cell_name) |
|
2627 | filename=cell_name) | |
2628 | except IndentationError: |
|
2628 | except IndentationError: | |
2629 | self.showindentationerror() |
|
2629 | self.showindentationerror() | |
2630 | if store_history: |
|
2630 | if store_history: | |
2631 | self.execution_count += 1 |
|
2631 | self.execution_count += 1 | |
2632 | return None |
|
2632 | return None | |
2633 | except (OverflowError, SyntaxError, ValueError, TypeError, |
|
2633 | except (OverflowError, SyntaxError, ValueError, TypeError, | |
2634 | MemoryError): |
|
2634 | MemoryError): | |
2635 | self.showsyntaxerror() |
|
2635 | self.showsyntaxerror() | |
2636 | if store_history: |
|
2636 | if store_history: | |
2637 | self.execution_count += 1 |
|
2637 | self.execution_count += 1 | |
2638 | return None |
|
2638 | return None | |
2639 |
|
2639 | |||
2640 | code_ast = self.transform_ast(code_ast) |
|
2640 | code_ast = self.transform_ast(code_ast) | |
2641 |
|
2641 | |||
2642 | interactivity = "none" if silent else self.ast_node_interactivity |
|
2642 | interactivity = "none" if silent else self.ast_node_interactivity | |
2643 | self.run_ast_nodes(code_ast.body, cell_name, |
|
2643 | self.run_ast_nodes(code_ast.body, cell_name, | |
2644 | interactivity=interactivity) |
|
2644 | interactivity=interactivity) | |
2645 |
|
2645 | |||
2646 | # Execute any registered post-execution functions. |
|
2646 | # Execute any registered post-execution functions. | |
2647 | # unless we are silent |
|
2647 | # unless we are silent | |
2648 | post_exec = [] if silent else self._post_execute.iteritems() |
|
2648 | post_exec = [] if silent else self._post_execute.iteritems() | |
2649 |
|
2649 | |||
2650 | for func, status in post_exec: |
|
2650 | for func, status in post_exec: | |
2651 | if self.disable_failing_post_execute and not status: |
|
2651 | if self.disable_failing_post_execute and not status: | |
2652 | continue |
|
2652 | continue | |
2653 | try: |
|
2653 | try: | |
2654 | func() |
|
2654 | func() | |
2655 | except KeyboardInterrupt: |
|
2655 | except KeyboardInterrupt: | |
2656 | print("\nKeyboardInterrupt", file=io.stderr) |
|
2656 | print("\nKeyboardInterrupt", file=io.stderr) | |
2657 | except Exception: |
|
2657 | except Exception: | |
2658 | # register as failing: |
|
2658 | # register as failing: | |
2659 | self._post_execute[func] = False |
|
2659 | self._post_execute[func] = False | |
2660 | self.showtraceback() |
|
2660 | self.showtraceback() | |
2661 | print('\n'.join([ |
|
2661 | print('\n'.join([ | |
2662 | "post-execution function %r produced an error." % func, |
|
2662 | "post-execution function %r produced an error." % func, | |
2663 | "If this problem persists, you can disable failing post-exec functions with:", |
|
2663 | "If this problem persists, you can disable failing post-exec functions with:", | |
2664 | "", |
|
2664 | "", | |
2665 | " get_ipython().disable_failing_post_execute = True" |
|
2665 | " get_ipython().disable_failing_post_execute = True" | |
2666 | ]), file=io.stderr) |
|
2666 | ]), file=io.stderr) | |
2667 |
|
2667 | |||
2668 | if store_history: |
|
2668 | if store_history: | |
2669 | # Write output to the database. Does nothing unless |
|
2669 | # Write output to the database. Does nothing unless | |
2670 | # history output logging is enabled. |
|
2670 | # history output logging is enabled. | |
2671 | self.history_manager.store_output(self.execution_count) |
|
2671 | self.history_manager.store_output(self.execution_count) | |
2672 | # Each cell is a *single* input, regardless of how many lines it has |
|
2672 | # Each cell is a *single* input, regardless of how many lines it has | |
2673 | self.execution_count += 1 |
|
2673 | self.execution_count += 1 | |
2674 |
|
2674 | |||
2675 | def transform_ast(self, node): |
|
2675 | def transform_ast(self, node): | |
2676 | """Apply the AST transformations from self.ast_transformers |
|
2676 | """Apply the AST transformations from self.ast_transformers | |
2677 |
|
2677 | |||
2678 | Parameters |
|
2678 | Parameters | |
2679 | ---------- |
|
2679 | ---------- | |
2680 | node : ast.Node |
|
2680 | node : ast.Node | |
2681 | The root node to be transformed. Typically called with the ast.Module |
|
2681 | The root node to be transformed. Typically called with the ast.Module | |
2682 | produced by parsing user input. |
|
2682 | produced by parsing user input. | |
2683 |
|
2683 | |||
2684 | Returns |
|
2684 | Returns | |
2685 | ------- |
|
2685 | ------- | |
2686 | An ast.Node corresponding to the node it was called with. Note that it |
|
2686 | An ast.Node corresponding to the node it was called with. Note that it | |
2687 | may also modify the passed object, so don't rely on references to the |
|
2687 | may also modify the passed object, so don't rely on references to the | |
2688 | original AST. |
|
2688 | original AST. | |
2689 | """ |
|
2689 | """ | |
2690 | for transformer in self.ast_transformers: |
|
2690 | for transformer in self.ast_transformers: | |
2691 | try: |
|
2691 | try: | |
2692 | node = transformer.visit(node) |
|
2692 | node = transformer.visit(node) | |
2693 | except Exception: |
|
2693 | except Exception: | |
2694 | warn("AST transformer %r threw an error. It will be unregistered." % transformer) |
|
2694 | warn("AST transformer %r threw an error. It will be unregistered." % transformer) | |
2695 | self.ast_transformers.remove(transformer) |
|
2695 | self.ast_transformers.remove(transformer) | |
2696 |
|
2696 | |||
2697 | return node |
|
2697 | return node | |
2698 |
|
2698 | |||
2699 |
|
2699 | |||
2700 | def run_ast_nodes(self, nodelist, cell_name, interactivity='last_expr'): |
|
2700 | def run_ast_nodes(self, nodelist, cell_name, interactivity='last_expr'): | |
2701 | """Run a sequence of AST nodes. The execution mode depends on the |
|
2701 | """Run a sequence of AST nodes. The execution mode depends on the | |
2702 | interactivity parameter. |
|
2702 | interactivity parameter. | |
2703 |
|
2703 | |||
2704 | Parameters |
|
2704 | Parameters | |
2705 | ---------- |
|
2705 | ---------- | |
2706 | nodelist : list |
|
2706 | nodelist : list | |
2707 | A sequence of AST nodes to run. |
|
2707 | A sequence of AST nodes to run. | |
2708 | cell_name : str |
|
2708 | cell_name : str | |
2709 | Will be passed to the compiler as the filename of the cell. Typically |
|
2709 | Will be passed to the compiler as the filename of the cell. Typically | |
2710 | the value returned by ip.compile.cache(cell). |
|
2710 | the value returned by ip.compile.cache(cell). | |
2711 | interactivity : str |
|
2711 | interactivity : str | |
2712 | 'all', 'last', 'last_expr' or 'none', specifying which nodes should be |
|
2712 | 'all', 'last', 'last_expr' or 'none', specifying which nodes should be | |
2713 | run interactively (displaying output from expressions). 'last_expr' |
|
2713 | run interactively (displaying output from expressions). 'last_expr' | |
2714 | will run the last node interactively only if it is an expression (i.e. |
|
2714 | will run the last node interactively only if it is an expression (i.e. | |
2715 | expressions in loops or other blocks are not displayed. Other values |
|
2715 | expressions in loops or other blocks are not displayed. Other values | |
2716 | for this parameter will raise a ValueError. |
|
2716 | for this parameter will raise a ValueError. | |
2717 | """ |
|
2717 | """ | |
2718 | if not nodelist: |
|
2718 | if not nodelist: | |
2719 | return |
|
2719 | return | |
2720 |
|
2720 | |||
2721 | if interactivity == 'last_expr': |
|
2721 | if interactivity == 'last_expr': | |
2722 | if isinstance(nodelist[-1], ast.Expr): |
|
2722 | if isinstance(nodelist[-1], ast.Expr): | |
2723 | interactivity = "last" |
|
2723 | interactivity = "last" | |
2724 | else: |
|
2724 | else: | |
2725 | interactivity = "none" |
|
2725 | interactivity = "none" | |
2726 |
|
2726 | |||
2727 | if interactivity == 'none': |
|
2727 | if interactivity == 'none': | |
2728 | to_run_exec, to_run_interactive = nodelist, [] |
|
2728 | to_run_exec, to_run_interactive = nodelist, [] | |
2729 | elif interactivity == 'last': |
|
2729 | elif interactivity == 'last': | |
2730 | to_run_exec, to_run_interactive = nodelist[:-1], nodelist[-1:] |
|
2730 | to_run_exec, to_run_interactive = nodelist[:-1], nodelist[-1:] | |
2731 | elif interactivity == 'all': |
|
2731 | elif interactivity == 'all': | |
2732 | to_run_exec, to_run_interactive = [], nodelist |
|
2732 | to_run_exec, to_run_interactive = [], nodelist | |
2733 | else: |
|
2733 | else: | |
2734 | raise ValueError("Interactivity was %r" % interactivity) |
|
2734 | raise ValueError("Interactivity was %r" % interactivity) | |
2735 |
|
2735 | |||
2736 | exec_count = self.execution_count |
|
2736 | exec_count = self.execution_count | |
2737 |
|
2737 | |||
2738 | try: |
|
2738 | try: | |
2739 | for i, node in enumerate(to_run_exec): |
|
2739 | for i, node in enumerate(to_run_exec): | |
2740 | mod = ast.Module([node]) |
|
2740 | mod = ast.Module([node]) | |
2741 | code = self.compile(mod, cell_name, "exec") |
|
2741 | code = self.compile(mod, cell_name, "exec") | |
2742 | if self.run_code(code): |
|
2742 | if self.run_code(code): | |
2743 | return True |
|
2743 | return True | |
2744 |
|
2744 | |||
2745 | for i, node in enumerate(to_run_interactive): |
|
2745 | for i, node in enumerate(to_run_interactive): | |
2746 | mod = ast.Interactive([node]) |
|
2746 | mod = ast.Interactive([node]) | |
2747 | code = self.compile(mod, cell_name, "single") |
|
2747 | code = self.compile(mod, cell_name, "single") | |
2748 | if self.run_code(code): |
|
2748 | if self.run_code(code): | |
2749 | return True |
|
2749 | return True | |
2750 |
|
2750 | |||
2751 | # Flush softspace |
|
2751 | # Flush softspace | |
2752 | if softspace(sys.stdout, 0): |
|
2752 | if softspace(sys.stdout, 0): | |
2753 | print() |
|
2753 | print() | |
2754 |
|
2754 | |||
2755 | except: |
|
2755 | except: | |
2756 | # It's possible to have exceptions raised here, typically by |
|
2756 | # It's possible to have exceptions raised here, typically by | |
2757 | # compilation of odd code (such as a naked 'return' outside a |
|
2757 | # compilation of odd code (such as a naked 'return' outside a | |
2758 | # function) that did parse but isn't valid. Typically the exception |
|
2758 | # function) that did parse but isn't valid. Typically the exception | |
2759 | # is a SyntaxError, but it's safest just to catch anything and show |
|
2759 | # is a SyntaxError, but it's safest just to catch anything and show | |
2760 | # the user a traceback. |
|
2760 | # the user a traceback. | |
2761 |
|
2761 | |||
2762 | # We do only one try/except outside the loop to minimize the impact |
|
2762 | # We do only one try/except outside the loop to minimize the impact | |
2763 | # on runtime, and also because if any node in the node list is |
|
2763 | # on runtime, and also because if any node in the node list is | |
2764 | # broken, we should stop execution completely. |
|
2764 | # broken, we should stop execution completely. | |
2765 | self.showtraceback() |
|
2765 | self.showtraceback() | |
2766 |
|
2766 | |||
2767 | return False |
|
2767 | return False | |
2768 |
|
2768 | |||
2769 | def run_code(self, code_obj): |
|
2769 | def run_code(self, code_obj): | |
2770 | """Execute a code object. |
|
2770 | """Execute a code object. | |
2771 |
|
2771 | |||
2772 | When an exception occurs, self.showtraceback() is called to display a |
|
2772 | When an exception occurs, self.showtraceback() is called to display a | |
2773 | traceback. |
|
2773 | traceback. | |
2774 |
|
2774 | |||
2775 | Parameters |
|
2775 | Parameters | |
2776 | ---------- |
|
2776 | ---------- | |
2777 | code_obj : code object |
|
2777 | code_obj : code object | |
2778 | A compiled code object, to be executed |
|
2778 | A compiled code object, to be executed | |
2779 |
|
2779 | |||
2780 | Returns |
|
2780 | Returns | |
2781 | ------- |
|
2781 | ------- | |
2782 | False : successful execution. |
|
2782 | False : successful execution. | |
2783 | True : an error occurred. |
|
2783 | True : an error occurred. | |
2784 | """ |
|
2784 | """ | |
2785 |
|
2785 | |||
2786 | # Set our own excepthook in case the user code tries to call it |
|
2786 | # Set our own excepthook in case the user code tries to call it | |
2787 | # directly, so that the IPython crash handler doesn't get triggered |
|
2787 | # directly, so that the IPython crash handler doesn't get triggered | |
2788 | old_excepthook,sys.excepthook = sys.excepthook, self.excepthook |
|
2788 | old_excepthook,sys.excepthook = sys.excepthook, self.excepthook | |
2789 |
|
2789 | |||
2790 | # we save the original sys.excepthook in the instance, in case config |
|
2790 | # we save the original sys.excepthook in the instance, in case config | |
2791 | # code (such as magics) needs access to it. |
|
2791 | # code (such as magics) needs access to it. | |
2792 | self.sys_excepthook = old_excepthook |
|
2792 | self.sys_excepthook = old_excepthook | |
2793 | outflag = 1 # happens in more places, so it's easier as default |
|
2793 | outflag = 1 # happens in more places, so it's easier as default | |
2794 | try: |
|
2794 | try: | |
2795 | try: |
|
2795 | try: | |
2796 | self.hooks.pre_run_code_hook() |
|
2796 | self.hooks.pre_run_code_hook() | |
2797 | #rprint('Running code', repr(code_obj)) # dbg |
|
2797 | #rprint('Running code', repr(code_obj)) # dbg | |
2798 | exec code_obj in self.user_global_ns, self.user_ns |
|
2798 | exec code_obj in self.user_global_ns, self.user_ns | |
2799 | finally: |
|
2799 | finally: | |
2800 | # Reset our crash handler in place |
|
2800 | # Reset our crash handler in place | |
2801 | sys.excepthook = old_excepthook |
|
2801 | sys.excepthook = old_excepthook | |
2802 | except SystemExit: |
|
2802 | except SystemExit: | |
2803 | self.showtraceback(exception_only=True) |
|
2803 | self.showtraceback(exception_only=True) | |
2804 | warn("To exit: use 'exit', 'quit', or Ctrl-D.", level=1) |
|
2804 | warn("To exit: use 'exit', 'quit', or Ctrl-D.", level=1) | |
2805 | except self.custom_exceptions: |
|
2805 | except self.custom_exceptions: | |
2806 | etype,value,tb = sys.exc_info() |
|
2806 | etype,value,tb = sys.exc_info() | |
2807 | self.CustomTB(etype,value,tb) |
|
2807 | self.CustomTB(etype,value,tb) | |
2808 | except: |
|
2808 | except: | |
2809 | self.showtraceback() |
|
2809 | self.showtraceback() | |
2810 | else: |
|
2810 | else: | |
2811 | outflag = 0 |
|
2811 | outflag = 0 | |
2812 | return outflag |
|
2812 | return outflag | |
2813 |
|
2813 | |||
2814 | # For backwards compatibility |
|
2814 | # For backwards compatibility | |
2815 | runcode = run_code |
|
2815 | runcode = run_code | |
2816 |
|
2816 | |||
2817 | #------------------------------------------------------------------------- |
|
2817 | #------------------------------------------------------------------------- | |
2818 | # Things related to GUI support and pylab |
|
2818 | # Things related to GUI support and pylab | |
2819 | #------------------------------------------------------------------------- |
|
2819 | #------------------------------------------------------------------------- | |
2820 |
|
2820 | |||
2821 | def enable_gui(self, gui=None): |
|
2821 | def enable_gui(self, gui=None): | |
2822 | raise NotImplementedError('Implement enable_gui in a subclass') |
|
2822 | raise NotImplementedError('Implement enable_gui in a subclass') | |
2823 |
|
2823 | |||
2824 | def enable_pylab(self, gui=None, import_all=True): |
|
2824 | def enable_pylab(self, gui=None, import_all=True): | |
2825 | """Activate pylab support at runtime. |
|
2825 | """Activate pylab support at runtime. | |
2826 |
|
2826 | |||
2827 | This turns on support for matplotlib, preloads into the interactive |
|
2827 | This turns on support for matplotlib, preloads into the interactive | |
2828 | namespace all of numpy and pylab, and configures IPython to correctly |
|
2828 | namespace all of numpy and pylab, and configures IPython to correctly | |
2829 | interact with the GUI event loop. The GUI backend to be used can be |
|
2829 | interact with the GUI event loop. The GUI backend to be used can be | |
2830 | optionally selected with the optional :param:`gui` argument. |
|
2830 | optionally selected with the optional :param:`gui` argument. | |
2831 |
|
2831 | |||
2832 | Parameters |
|
2832 | Parameters | |
2833 | ---------- |
|
2833 | ---------- | |
2834 | gui : optional, string |
|
2834 | gui : optional, string | |
2835 |
|
2835 | |||
2836 | If given, dictates the choice of matplotlib GUI backend to use |
|
2836 | If given, dictates the choice of matplotlib GUI backend to use | |
2837 | (should be one of IPython's supported backends, 'qt', 'osx', 'tk', |
|
2837 | (should be one of IPython's supported backends, 'qt', 'osx', 'tk', | |
2838 | 'gtk', 'wx' or 'inline'), otherwise we use the default chosen by |
|
2838 | 'gtk', 'wx' or 'inline'), otherwise we use the default chosen by | |
2839 | matplotlib (as dictated by the matplotlib build-time options plus the |
|
2839 | matplotlib (as dictated by the matplotlib build-time options plus the | |
2840 | user's matplotlibrc configuration file). Note that not all backends |
|
2840 | user's matplotlibrc configuration file). Note that not all backends | |
2841 | make sense in all contexts, for example a terminal ipython can't |
|
2841 | make sense in all contexts, for example a terminal ipython can't | |
2842 | display figures inline. |
|
2842 | display figures inline. | |
2843 | """ |
|
2843 | """ | |
2844 | from IPython.core.pylabtools import mpl_runner |
|
2844 | from IPython.core.pylabtools import mpl_runner | |
2845 | # We want to prevent the loading of pylab to pollute the user's |
|
2845 | # We want to prevent the loading of pylab to pollute the user's | |
2846 | # namespace as shown by the %who* magics, so we execute the activation |
|
2846 | # namespace as shown by the %who* magics, so we execute the activation | |
2847 | # code in an empty namespace, and we update *both* user_ns and |
|
2847 | # code in an empty namespace, and we update *both* user_ns and | |
2848 | # user_ns_hidden with this information. |
|
2848 | # user_ns_hidden with this information. | |
2849 | ns = {} |
|
2849 | ns = {} | |
2850 | try: |
|
2850 | try: | |
2851 | gui = pylab_activate(ns, gui, import_all, self) |
|
2851 | gui = pylab_activate(ns, gui, import_all, self) | |
2852 | except KeyError: |
|
2852 | except KeyError: | |
2853 | error("Backend %r not supported" % gui) |
|
2853 | error("Backend %r not supported" % gui) | |
2854 | return |
|
2854 | return | |
2855 | self.user_ns.update(ns) |
|
2855 | self.user_ns.update(ns) | |
2856 | self.user_ns_hidden.update(ns) |
|
2856 | self.user_ns_hidden.update(ns) | |
2857 | # Now we must activate the gui pylab wants to use, and fix %run to take |
|
2857 | # Now we must activate the gui pylab wants to use, and fix %run to take | |
2858 | # plot updates into account |
|
2858 | # plot updates into account | |
2859 | self.enable_gui(gui) |
|
2859 | self.enable_gui(gui) | |
2860 | self.magics_manager.registry['ExecutionMagics'].default_runner = \ |
|
2860 | self.magics_manager.registry['ExecutionMagics'].default_runner = \ | |
2861 | mpl_runner(self.safe_execfile) |
|
2861 | mpl_runner(self.safe_execfile) | |
2862 |
|
2862 | |||
2863 | #------------------------------------------------------------------------- |
|
2863 | #------------------------------------------------------------------------- | |
2864 | # Utilities |
|
2864 | # Utilities | |
2865 | #------------------------------------------------------------------------- |
|
2865 | #------------------------------------------------------------------------- | |
2866 |
|
2866 | |||
2867 | def var_expand(self, cmd, depth=0, formatter=DollarFormatter()): |
|
2867 | def var_expand(self, cmd, depth=0, formatter=DollarFormatter()): | |
2868 | """Expand python variables in a string. |
|
2868 | """Expand python variables in a string. | |
2869 |
|
2869 | |||
2870 | The depth argument indicates how many frames above the caller should |
|
2870 | The depth argument indicates how many frames above the caller should | |
2871 | be walked to look for the local namespace where to expand variables. |
|
2871 | be walked to look for the local namespace where to expand variables. | |
2872 |
|
2872 | |||
2873 | The global namespace for expansion is always the user's interactive |
|
2873 | The global namespace for expansion is always the user's interactive | |
2874 | namespace. |
|
2874 | namespace. | |
2875 | """ |
|
2875 | """ | |
2876 | ns = self.user_ns.copy() |
|
2876 | ns = self.user_ns.copy() | |
2877 | ns.update(sys._getframe(depth+1).f_locals) |
|
2877 | ns.update(sys._getframe(depth+1).f_locals) | |
2878 | ns.pop('self', None) |
|
2878 | ns.pop('self', None) | |
2879 | try: |
|
2879 | try: | |
2880 | cmd = formatter.format(cmd, **ns) |
|
2880 | cmd = formatter.format(cmd, **ns) | |
2881 | except Exception: |
|
2881 | except Exception: | |
2882 | # if formatter couldn't format, just let it go untransformed |
|
2882 | # if formatter couldn't format, just let it go untransformed | |
2883 | pass |
|
2883 | pass | |
2884 | return cmd |
|
2884 | return cmd | |
2885 |
|
2885 | |||
2886 | def mktempfile(self, data=None, prefix='ipython_edit_'): |
|
2886 | def mktempfile(self, data=None, prefix='ipython_edit_'): | |
2887 | """Make a new tempfile and return its filename. |
|
2887 | """Make a new tempfile and return its filename. | |
2888 |
|
2888 | |||
2889 | This makes a call to tempfile.mktemp, but it registers the created |
|
2889 | This makes a call to tempfile.mktemp, but it registers the created | |
2890 | filename internally so ipython cleans it up at exit time. |
|
2890 | filename internally so ipython cleans it up at exit time. | |
2891 |
|
2891 | |||
2892 | Optional inputs: |
|
2892 | Optional inputs: | |
2893 |
|
2893 | |||
2894 | - data(None): if data is given, it gets written out to the temp file |
|
2894 | - data(None): if data is given, it gets written out to the temp file | |
2895 | immediately, and the file is closed again.""" |
|
2895 | immediately, and the file is closed again.""" | |
2896 |
|
2896 | |||
2897 | filename = tempfile.mktemp('.py', prefix) |
|
2897 | filename = tempfile.mktemp('.py', prefix) | |
2898 | self.tempfiles.append(filename) |
|
2898 | self.tempfiles.append(filename) | |
2899 |
|
2899 | |||
2900 | if data: |
|
2900 | if data: | |
2901 | tmp_file = open(filename,'w') |
|
2901 | tmp_file = open(filename,'w') | |
2902 | tmp_file.write(data) |
|
2902 | tmp_file.write(data) | |
2903 | tmp_file.close() |
|
2903 | tmp_file.close() | |
2904 | return filename |
|
2904 | return filename | |
2905 |
|
2905 | |||
2906 | # TODO: This should be removed when Term is refactored. |
|
2906 | # TODO: This should be removed when Term is refactored. | |
2907 | def write(self,data): |
|
2907 | def write(self,data): | |
2908 | """Write a string to the default output""" |
|
2908 | """Write a string to the default output""" | |
2909 | io.stdout.write(data) |
|
2909 | io.stdout.write(data) | |
2910 |
|
2910 | |||
2911 | # TODO: This should be removed when Term is refactored. |
|
2911 | # TODO: This should be removed when Term is refactored. | |
2912 | def write_err(self,data): |
|
2912 | def write_err(self,data): | |
2913 | """Write a string to the default error output""" |
|
2913 | """Write a string to the default error output""" | |
2914 | io.stderr.write(data) |
|
2914 | io.stderr.write(data) | |
2915 |
|
2915 | |||
2916 | def ask_yes_no(self, prompt, default=None): |
|
2916 | def ask_yes_no(self, prompt, default=None): | |
2917 | if self.quiet: |
|
2917 | if self.quiet: | |
2918 | return True |
|
2918 | return True | |
2919 | return ask_yes_no(prompt,default) |
|
2919 | return ask_yes_no(prompt,default) | |
2920 |
|
2920 | |||
2921 | def show_usage(self): |
|
2921 | def show_usage(self): | |
2922 | """Show a usage message""" |
|
2922 | """Show a usage message""" | |
2923 | page.page(IPython.core.usage.interactive_usage) |
|
2923 | page.page(IPython.core.usage.interactive_usage) | |
2924 |
|
2924 | |||
2925 | def extract_input_lines(self, range_str, raw=False): |
|
2925 | def extract_input_lines(self, range_str, raw=False): | |
2926 | """Return as a string a set of input history slices. |
|
2926 | """Return as a string a set of input history slices. | |
2927 |
|
2927 | |||
2928 | Parameters |
|
2928 | Parameters | |
2929 | ---------- |
|
2929 | ---------- | |
2930 | range_str : string |
|
2930 | range_str : string | |
2931 | The set of slices is given as a string, like "~5/6-~4/2 4:8 9", |
|
2931 | The set of slices is given as a string, like "~5/6-~4/2 4:8 9", | |
2932 | since this function is for use by magic functions which get their |
|
2932 | since this function is for use by magic functions which get their | |
2933 | arguments as strings. The number before the / is the session |
|
2933 | arguments as strings. The number before the / is the session | |
2934 | number: ~n goes n back from the current session. |
|
2934 | number: ~n goes n back from the current session. | |
2935 |
|
2935 | |||
2936 | Optional Parameters: |
|
2936 | Optional Parameters: | |
2937 | - raw(False): by default, the processed input is used. If this is |
|
2937 | - raw(False): by default, the processed input is used. If this is | |
2938 | true, the raw input history is used instead. |
|
2938 | true, the raw input history is used instead. | |
2939 |
|
2939 | |||
2940 | Note that slices can be called with two notations: |
|
2940 | Note that slices can be called with two notations: | |
2941 |
|
2941 | |||
2942 | N:M -> standard python form, means including items N...(M-1). |
|
2942 | N:M -> standard python form, means including items N...(M-1). | |
2943 |
|
2943 | |||
2944 | N-M -> include items N..M (closed endpoint).""" |
|
2944 | N-M -> include items N..M (closed endpoint).""" | |
2945 | lines = self.history_manager.get_range_by_str(range_str, raw=raw) |
|
2945 | lines = self.history_manager.get_range_by_str(range_str, raw=raw) | |
2946 | return "\n".join(x for _, _, x in lines) |
|
2946 | return "\n".join(x for _, _, x in lines) | |
2947 |
|
2947 | |||
2948 | def find_user_code(self, target, raw=True, py_only=False): |
|
2948 | def find_user_code(self, target, raw=True, py_only=False): | |
2949 | """Get a code string from history, file, url, or a string or macro. |
|
2949 | """Get a code string from history, file, url, or a string or macro. | |
2950 |
|
2950 | |||
2951 | This is mainly used by magic functions. |
|
2951 | This is mainly used by magic functions. | |
2952 |
|
2952 | |||
2953 | Parameters |
|
2953 | Parameters | |
2954 | ---------- |
|
2954 | ---------- | |
2955 |
|
2955 | |||
2956 | target : str |
|
2956 | target : str | |
2957 |
|
2957 | |||
2958 | A string specifying code to retrieve. This will be tried respectively |
|
2958 | A string specifying code to retrieve. This will be tried respectively | |
2959 | as: ranges of input history (see %history for syntax), url, |
|
2959 | as: ranges of input history (see %history for syntax), url, | |
2960 | correspnding .py file, filename, or an expression evaluating to a |
|
2960 | correspnding .py file, filename, or an expression evaluating to a | |
2961 | string or Macro in the user namespace. |
|
2961 | string or Macro in the user namespace. | |
2962 |
|
2962 | |||
2963 | raw : bool |
|
2963 | raw : bool | |
2964 | If true (default), retrieve raw history. Has no effect on the other |
|
2964 | If true (default), retrieve raw history. Has no effect on the other | |
2965 | retrieval mechanisms. |
|
2965 | retrieval mechanisms. | |
2966 |
|
2966 | |||
2967 | py_only : bool (default False) |
|
2967 | py_only : bool (default False) | |
2968 | Only try to fetch python code, do not try alternative methods to decode file |
|
2968 | Only try to fetch python code, do not try alternative methods to decode file | |
2969 | if unicode fails. |
|
2969 | if unicode fails. | |
2970 |
|
2970 | |||
2971 | Returns |
|
2971 | Returns | |
2972 | ------- |
|
2972 | ------- | |
2973 | A string of code. |
|
2973 | A string of code. | |
2974 |
|
2974 | |||
2975 | ValueError is raised if nothing is found, and TypeError if it evaluates |
|
2975 | ValueError is raised if nothing is found, and TypeError if it evaluates | |
2976 | to an object of another type. In each case, .args[0] is a printable |
|
2976 | to an object of another type. In each case, .args[0] is a printable | |
2977 | message. |
|
2977 | message. | |
2978 | """ |
|
2978 | """ | |
2979 | code = self.extract_input_lines(target, raw=raw) # Grab history |
|
2979 | code = self.extract_input_lines(target, raw=raw) # Grab history | |
2980 | if code: |
|
2980 | if code: | |
2981 | return code |
|
2981 | return code | |
2982 | utarget = unquote_filename(target) |
|
2982 | utarget = unquote_filename(target) | |
2983 | try: |
|
2983 | try: | |
2984 | if utarget.startswith(('http://', 'https://')): |
|
2984 | if utarget.startswith(('http://', 'https://')): | |
2985 | return openpy.read_py_url(utarget, skip_encoding_cookie=True) |
|
2985 | return openpy.read_py_url(utarget, skip_encoding_cookie=True) | |
2986 | except UnicodeDecodeError: |
|
2986 | except UnicodeDecodeError: | |
2987 | if not py_only : |
|
2987 | if not py_only : | |
2988 | response = urllib.urlopen(target) |
|
2988 | response = urllib.urlopen(target) | |
2989 | return response.read().decode('latin1') |
|
2989 | return response.read().decode('latin1') | |
2990 | raise ValueError(("'%s' seem to be unreadable.") % utarget) |
|
2990 | raise ValueError(("'%s' seem to be unreadable.") % utarget) | |
2991 |
|
2991 | |||
2992 | potential_target = [target] |
|
2992 | potential_target = [target] | |
2993 | try : |
|
2993 | try : | |
2994 | potential_target.insert(0,get_py_filename(target)) |
|
2994 | potential_target.insert(0,get_py_filename(target)) | |
2995 | except IOError: |
|
2995 | except IOError: | |
2996 | pass |
|
2996 | pass | |
2997 |
|
2997 | |||
2998 | for tgt in potential_target : |
|
2998 | for tgt in potential_target : | |
2999 | if os.path.isfile(tgt): # Read file |
|
2999 | if os.path.isfile(tgt): # Read file | |
3000 | try : |
|
3000 | try : | |
3001 | return openpy.read_py_file(tgt, skip_encoding_cookie=True) |
|
3001 | return openpy.read_py_file(tgt, skip_encoding_cookie=True) | |
3002 | except UnicodeDecodeError : |
|
3002 | except UnicodeDecodeError : | |
3003 | if not py_only : |
|
3003 | if not py_only : | |
3004 | with io_open(tgt,'r', encoding='latin1') as f : |
|
3004 | with io_open(tgt,'r', encoding='latin1') as f : | |
3005 | return f.read() |
|
3005 | return f.read() | |
3006 | raise ValueError(("'%s' seem to be unreadable.") % target) |
|
3006 | raise ValueError(("'%s' seem to be unreadable.") % target) | |
3007 |
|
3007 | |||
3008 | try: # User namespace |
|
3008 | try: # User namespace | |
3009 | codeobj = eval(target, self.user_ns) |
|
3009 | codeobj = eval(target, self.user_ns) | |
3010 | except Exception: |
|
3010 | except Exception: | |
3011 | raise ValueError(("'%s' was not found in history, as a file, url, " |
|
3011 | raise ValueError(("'%s' was not found in history, as a file, url, " | |
3012 | "nor in the user namespace.") % target) |
|
3012 | "nor in the user namespace.") % target) | |
3013 | if isinstance(codeobj, basestring): |
|
3013 | if isinstance(codeobj, basestring): | |
3014 | return codeobj |
|
3014 | return codeobj | |
3015 | elif isinstance(codeobj, Macro): |
|
3015 | elif isinstance(codeobj, Macro): | |
3016 | return codeobj.value |
|
3016 | return codeobj.value | |
3017 |
|
3017 | |||
3018 | raise TypeError("%s is neither a string nor a macro." % target, |
|
3018 | raise TypeError("%s is neither a string nor a macro." % target, | |
3019 | codeobj) |
|
3019 | codeobj) | |
3020 |
|
3020 | |||
3021 | #------------------------------------------------------------------------- |
|
3021 | #------------------------------------------------------------------------- | |
3022 | # Things related to IPython exiting |
|
3022 | # Things related to IPython exiting | |
3023 | #------------------------------------------------------------------------- |
|
3023 | #------------------------------------------------------------------------- | |
3024 | def atexit_operations(self): |
|
3024 | def atexit_operations(self): | |
3025 | """This will be executed at the time of exit. |
|
3025 | """This will be executed at the time of exit. | |
3026 |
|
3026 | |||
3027 | Cleanup operations and saving of persistent data that is done |
|
3027 | Cleanup operations and saving of persistent data that is done | |
3028 | unconditionally by IPython should be performed here. |
|
3028 | unconditionally by IPython should be performed here. | |
3029 |
|
3029 | |||
3030 | For things that may depend on startup flags or platform specifics (such |
|
3030 | For things that may depend on startup flags or platform specifics (such | |
3031 | as having readline or not), register a separate atexit function in the |
|
3031 | as having readline or not), register a separate atexit function in the | |
3032 | code that has the appropriate information, rather than trying to |
|
3032 | code that has the appropriate information, rather than trying to | |
3033 | clutter |
|
3033 | clutter | |
3034 | """ |
|
3034 | """ | |
3035 | # Close the history session (this stores the end time and line count) |
|
3035 | # Close the history session (this stores the end time and line count) | |
3036 | # this must be *before* the tempfile cleanup, in case of temporary |
|
3036 | # this must be *before* the tempfile cleanup, in case of temporary | |
3037 | # history db |
|
3037 | # history db | |
3038 | self.history_manager.end_session() |
|
3038 | self.history_manager.end_session() | |
3039 |
|
3039 | |||
3040 | # Cleanup all tempfiles left around |
|
3040 | # Cleanup all tempfiles left around | |
3041 | for tfile in self.tempfiles: |
|
3041 | for tfile in self.tempfiles: | |
3042 | try: |
|
3042 | try: | |
3043 | os.unlink(tfile) |
|
3043 | os.unlink(tfile) | |
3044 | except OSError: |
|
3044 | except OSError: | |
3045 | pass |
|
3045 | pass | |
3046 |
|
3046 | |||
3047 | # Clear all user namespaces to release all references cleanly. |
|
3047 | # Clear all user namespaces to release all references cleanly. | |
3048 | self.reset(new_session=False) |
|
3048 | self.reset(new_session=False) | |
3049 |
|
3049 | |||
3050 | # Run user hooks |
|
3050 | # Run user hooks | |
3051 | self.hooks.shutdown_hook() |
|
3051 | self.hooks.shutdown_hook() | |
3052 |
|
3052 | |||
3053 | def cleanup(self): |
|
3053 | def cleanup(self): | |
3054 | self.restore_sys_module_state() |
|
3054 | self.restore_sys_module_state() | |
3055 |
|
3055 | |||
3056 |
|
3056 | |||
3057 | class InteractiveShellABC(object): |
|
3057 | class InteractiveShellABC(object): | |
3058 | """An abstract base class for InteractiveShell.""" |
|
3058 | """An abstract base class for InteractiveShell.""" | |
3059 | __metaclass__ = abc.ABCMeta |
|
3059 | __metaclass__ = abc.ABCMeta | |
3060 |
|
3060 | |||
3061 | InteractiveShellABC.register(InteractiveShell) |
|
3061 | InteractiveShellABC.register(InteractiveShell) |
@@ -1,393 +1,393 b'' | |||||
1 | #!/usr/bin/env python |
|
1 | #!/usr/bin/env python | |
2 | # encoding: utf-8 |
|
2 | # encoding: utf-8 | |
3 | """ |
|
3 | """ | |
4 | The :class:`~IPython.core.application.Application` object for the command |
|
4 | The :class:`~IPython.core.application.Application` object for the command | |
5 | line :command:`ipython` program. |
|
5 | line :command:`ipython` program. | |
6 |
|
6 | |||
7 | Authors |
|
7 | Authors | |
8 | ------- |
|
8 | ------- | |
9 |
|
9 | |||
10 | * Brian Granger |
|
10 | * Brian Granger | |
11 | * Fernando Perez |
|
11 | * Fernando Perez | |
12 | * Min Ragan-Kelley |
|
12 | * Min Ragan-Kelley | |
13 | """ |
|
13 | """ | |
14 |
|
14 | |||
15 | #----------------------------------------------------------------------------- |
|
15 | #----------------------------------------------------------------------------- | |
16 | # Copyright (C) 2008-2011 The IPython Development Team |
|
16 | # Copyright (C) 2008-2011 The IPython Development Team | |
17 | # |
|
17 | # | |
18 | # Distributed under the terms of the BSD License. The full license is in |
|
18 | # Distributed under the terms of the BSD License. The full license is in | |
19 | # the file COPYING, distributed as part of this software. |
|
19 | # the file COPYING, distributed as part of this software. | |
20 | #----------------------------------------------------------------------------- |
|
20 | #----------------------------------------------------------------------------- | |
21 |
|
21 | |||
22 | #----------------------------------------------------------------------------- |
|
22 | #----------------------------------------------------------------------------- | |
23 | # Imports |
|
23 | # Imports | |
24 | #----------------------------------------------------------------------------- |
|
24 | #----------------------------------------------------------------------------- | |
25 |
|
25 | |||
26 | from __future__ import absolute_import |
|
26 | from __future__ import absolute_import | |
27 |
|
27 | |||
28 | import logging |
|
28 | import logging | |
29 | import os |
|
29 | import os | |
30 | import sys |
|
30 | import sys | |
31 |
|
31 | |||
32 | from IPython.config.loader import ( |
|
32 | from IPython.config.loader import ( | |
33 | Config, PyFileConfigLoader, ConfigFileNotFound |
|
33 | Config, PyFileConfigLoader, ConfigFileNotFound | |
34 | ) |
|
34 | ) | |
35 | from IPython.config.application import boolean_flag, catch_config_error |
|
35 | from IPython.config.application import boolean_flag, catch_config_error | |
36 | from IPython.core import release |
|
36 | from IPython.core import release | |
37 | from IPython.core import usage |
|
37 | from IPython.core import usage | |
38 | from IPython.core.completer import IPCompleter |
|
38 | from IPython.core.completer import IPCompleter | |
39 | from IPython.core.crashhandler import CrashHandler |
|
39 | from IPython.core.crashhandler import CrashHandler | |
40 | from IPython.core.formatters import PlainTextFormatter |
|
40 | from IPython.core.formatters import PlainTextFormatter | |
41 | from IPython.core.history import HistoryManager |
|
41 | from IPython.core.history import HistoryManager | |
42 | from IPython.core.prompts import PromptManager |
|
42 | from IPython.core.prompts import PromptManager | |
43 | from IPython.core.application import ( |
|
43 | from IPython.core.application import ( | |
44 | ProfileDir, BaseIPythonApplication, base_flags, base_aliases |
|
44 | ProfileDir, BaseIPythonApplication, base_flags, base_aliases | |
45 | ) |
|
45 | ) | |
46 | from IPython.core.magics import ScriptMagics |
|
46 | from IPython.core.magics import ScriptMagics | |
47 | from IPython.core.shellapp import ( |
|
47 | from IPython.core.shellapp import ( | |
48 | InteractiveShellApp, shell_flags, shell_aliases |
|
48 | InteractiveShellApp, shell_flags, shell_aliases | |
49 | ) |
|
49 | ) | |
50 | from IPython.frontend.terminal.interactiveshell import TerminalInteractiveShell |
|
50 | from IPython.frontend.terminal.interactiveshell import TerminalInteractiveShell | |
51 | from IPython.lib import inputhook |
|
51 | from IPython.lib import inputhook | |
52 | from IPython.utils import warn |
|
52 | from IPython.utils import warn | |
53 | from IPython.utils.path import get_ipython_dir, check_for_old_config |
|
53 | from IPython.utils.path import get_ipython_dir, check_for_old_config | |
54 | from IPython.utils.traitlets import ( |
|
54 | from IPython.utils.traitlets import ( | |
55 | Bool, List, Dict, CaselessStrEnum |
|
55 | Bool, List, Dict, CaselessStrEnum | |
56 | ) |
|
56 | ) | |
57 |
|
57 | |||
58 | #----------------------------------------------------------------------------- |
|
58 | #----------------------------------------------------------------------------- | |
59 | # Globals, utilities and helpers |
|
59 | # Globals, utilities and helpers | |
60 | #----------------------------------------------------------------------------- |
|
60 | #----------------------------------------------------------------------------- | |
61 |
|
61 | |||
62 | #: The default config file name for this application. |
|
62 | #: The default config file name for this application. | |
63 | default_config_file_name = u'ipython_config.py' |
|
63 | default_config_file_name = u'ipython_config.py' | |
64 |
|
64 | |||
65 | _examples = """ |
|
65 | _examples = """ | |
66 | ipython --pylab # start in pylab mode |
|
66 | ipython --pylab # start in pylab mode | |
67 | ipython --pylab=qt # start in pylab mode with the qt4 backend |
|
67 | ipython --pylab=qt # start in pylab mode with the qt4 backend | |
68 | ipython --log-level=DEBUG # set logging to DEBUG |
|
68 | ipython --log-level=DEBUG # set logging to DEBUG | |
69 | ipython --profile=foo # start with profile foo |
|
69 | ipython --profile=foo # start with profile foo | |
70 |
|
70 | |||
71 | ipython qtconsole # start the qtconsole GUI application |
|
71 | ipython qtconsole # start the qtconsole GUI application | |
72 | ipython help qtconsole # show the help for the qtconsole subcmd |
|
72 | ipython help qtconsole # show the help for the qtconsole subcmd | |
73 |
|
73 | |||
74 | ipython console # start the terminal-based console application |
|
74 | ipython console # start the terminal-based console application | |
75 | ipython help console # show the help for the console subcmd |
|
75 | ipython help console # show the help for the console subcmd | |
76 |
|
76 | |||
77 | ipython notebook # start the IPython notebook |
|
77 | ipython notebook # start the IPython notebook | |
78 | ipython help notebook # show the help for the notebook subcmd |
|
78 | ipython help notebook # show the help for the notebook subcmd | |
79 |
|
79 | |||
80 | ipython profile create foo # create profile foo w/ default config files |
|
80 | ipython profile create foo # create profile foo w/ default config files | |
81 | ipython help profile # show the help for the profile subcmd |
|
81 | ipython help profile # show the help for the profile subcmd | |
82 |
|
82 | |||
83 | ipython locate # print the path to the IPython directory |
|
83 | ipython locate # print the path to the IPython directory | |
84 | ipython locate profile foo # print the path to the directory for profile `foo` |
|
84 | ipython locate profile foo # print the path to the directory for profile `foo` | |
85 | """ |
|
85 | """ | |
86 |
|
86 | |||
87 | #----------------------------------------------------------------------------- |
|
87 | #----------------------------------------------------------------------------- | |
88 | # Crash handler for this application |
|
88 | # Crash handler for this application | |
89 | #----------------------------------------------------------------------------- |
|
89 | #----------------------------------------------------------------------------- | |
90 |
|
90 | |||
91 | class IPAppCrashHandler(CrashHandler): |
|
91 | class IPAppCrashHandler(CrashHandler): | |
92 | """sys.excepthook for IPython itself, leaves a detailed report on disk.""" |
|
92 | """sys.excepthook for IPython itself, leaves a detailed report on disk.""" | |
93 |
|
93 | |||
94 | def __init__(self, app): |
|
94 | def __init__(self, app): | |
95 | contact_name = release.authors['Fernando'][0] |
|
95 | contact_name = release.authors['Fernando'][0] | |
96 | contact_email = release.author_email |
|
96 | contact_email = release.author_email | |
97 | bug_tracker = 'https://github.com/ipython/ipython/issues' |
|
97 | bug_tracker = 'https://github.com/ipython/ipython/issues' | |
98 | super(IPAppCrashHandler,self).__init__( |
|
98 | super(IPAppCrashHandler,self).__init__( | |
99 | app, contact_name, contact_email, bug_tracker |
|
99 | app, contact_name, contact_email, bug_tracker | |
100 | ) |
|
100 | ) | |
101 |
|
101 | |||
102 | def make_report(self,traceback): |
|
102 | def make_report(self,traceback): | |
103 | """Return a string containing a crash report.""" |
|
103 | """Return a string containing a crash report.""" | |
104 |
|
104 | |||
105 | sec_sep = self.section_sep |
|
105 | sec_sep = self.section_sep | |
106 | # Start with parent report |
|
106 | # Start with parent report | |
107 | report = [super(IPAppCrashHandler, self).make_report(traceback)] |
|
107 | report = [super(IPAppCrashHandler, self).make_report(traceback)] | |
108 | # Add interactive-specific info we may have |
|
108 | # Add interactive-specific info we may have | |
109 | rpt_add = report.append |
|
109 | rpt_add = report.append | |
110 | try: |
|
110 | try: | |
111 | rpt_add(sec_sep+"History of session input:") |
|
111 | rpt_add(sec_sep+"History of session input:") | |
112 | for line in self.app.shell.user_ns['_ih']: |
|
112 | for line in self.app.shell.user_ns['_ih']: | |
113 | rpt_add(line) |
|
113 | rpt_add(line) | |
114 | rpt_add('\n*** Last line of input (may not be in above history):\n') |
|
114 | rpt_add('\n*** Last line of input (may not be in above history):\n') | |
115 | rpt_add(self.app.shell._last_input_line+'\n') |
|
115 | rpt_add(self.app.shell._last_input_line+'\n') | |
116 | except: |
|
116 | except: | |
117 | pass |
|
117 | pass | |
118 |
|
118 | |||
119 | return ''.join(report) |
|
119 | return ''.join(report) | |
120 |
|
120 | |||
121 | #----------------------------------------------------------------------------- |
|
121 | #----------------------------------------------------------------------------- | |
122 | # Aliases and Flags |
|
122 | # Aliases and Flags | |
123 | #----------------------------------------------------------------------------- |
|
123 | #----------------------------------------------------------------------------- | |
124 | flags = dict(base_flags) |
|
124 | flags = dict(base_flags) | |
125 | flags.update(shell_flags) |
|
125 | flags.update(shell_flags) | |
126 | frontend_flags = {} |
|
126 | frontend_flags = {} | |
127 | addflag = lambda *args: frontend_flags.update(boolean_flag(*args)) |
|
127 | addflag = lambda *args: frontend_flags.update(boolean_flag(*args)) | |
128 | addflag('autoedit-syntax', 'TerminalInteractiveShell.autoedit_syntax', |
|
128 | addflag('autoedit-syntax', 'TerminalInteractiveShell.autoedit_syntax', | |
129 | 'Turn on auto editing of files with syntax errors.', |
|
129 | 'Turn on auto editing of files with syntax errors.', | |
130 | 'Turn off auto editing of files with syntax errors.' |
|
130 | 'Turn off auto editing of files with syntax errors.' | |
131 | ) |
|
131 | ) | |
132 | addflag('banner', 'TerminalIPythonApp.display_banner', |
|
132 | addflag('banner', 'TerminalIPythonApp.display_banner', | |
133 | "Display a banner upon starting IPython.", |
|
133 | "Display a banner upon starting IPython.", | |
134 | "Don't display a banner upon starting IPython." |
|
134 | "Don't display a banner upon starting IPython." | |
135 | ) |
|
135 | ) | |
136 | addflag('confirm-exit', 'TerminalInteractiveShell.confirm_exit', |
|
136 | addflag('confirm-exit', 'TerminalInteractiveShell.confirm_exit', | |
137 | """Set to confirm when you try to exit IPython with an EOF (Control-D |
|
137 | """Set to confirm when you try to exit IPython with an EOF (Control-D | |
138 | in Unix, Control-Z/Enter in Windows). By typing 'exit' or 'quit', |
|
138 | in Unix, Control-Z/Enter in Windows). By typing 'exit' or 'quit', | |
139 | you can force a direct exit without any confirmation.""", |
|
139 | you can force a direct exit without any confirmation.""", | |
140 | "Don't prompt the user when exiting." |
|
140 | "Don't prompt the user when exiting." | |
141 | ) |
|
141 | ) | |
142 | addflag('term-title', 'TerminalInteractiveShell.term_title', |
|
142 | addflag('term-title', 'TerminalInteractiveShell.term_title', | |
143 | "Enable auto setting the terminal title.", |
|
143 | "Enable auto setting the terminal title.", | |
144 | "Disable auto setting the terminal title." |
|
144 | "Disable auto setting the terminal title." | |
145 | ) |
|
145 | ) | |
146 | classic_config = Config() |
|
146 | classic_config = Config() | |
147 | classic_config.InteractiveShell.cache_size = 0 |
|
147 | classic_config.InteractiveShell.cache_size = 0 | |
148 | classic_config.PlainTextFormatter.pprint = False |
|
148 | classic_config.PlainTextFormatter.pprint = False | |
149 | classic_config.PromptManager.in_template = '>>> ' |
|
149 | classic_config.PromptManager.in_template = '>>> ' | |
150 | classic_config.PromptManager.in2_template = '... ' |
|
150 | classic_config.PromptManager.in2_template = '... ' | |
151 | classic_config.PromptManager.out_template = '' |
|
151 | classic_config.PromptManager.out_template = '' | |
152 | classic_config.InteractiveShell.separate_in = '' |
|
152 | classic_config.InteractiveShell.separate_in = '' | |
153 | classic_config.InteractiveShell.separate_out = '' |
|
153 | classic_config.InteractiveShell.separate_out = '' | |
154 | classic_config.InteractiveShell.separate_out2 = '' |
|
154 | classic_config.InteractiveShell.separate_out2 = '' | |
155 | classic_config.InteractiveShell.colors = 'NoColor' |
|
155 | classic_config.InteractiveShell.colors = 'NoColor' | |
156 | classic_config.InteractiveShell.xmode = 'Plain' |
|
156 | classic_config.InteractiveShell.xmode = 'Plain' | |
157 |
|
157 | |||
158 | frontend_flags['classic']=( |
|
158 | frontend_flags['classic']=( | |
159 | classic_config, |
|
159 | classic_config, | |
160 | "Gives IPython a similar feel to the classic Python prompt." |
|
160 | "Gives IPython a similar feel to the classic Python prompt." | |
161 | ) |
|
161 | ) | |
162 | # # log doesn't make so much sense this way anymore |
|
162 | # # log doesn't make so much sense this way anymore | |
163 | # paa('--log','-l', |
|
163 | # paa('--log','-l', | |
164 | # action='store_true', dest='InteractiveShell.logstart', |
|
164 | # action='store_true', dest='InteractiveShell.logstart', | |
165 | # help="Start logging to the default log file (./ipython_log.py).") |
|
165 | # help="Start logging to the default log file (./ipython_log.py).") | |
166 | # |
|
166 | # | |
167 | # # quick is harder to implement |
|
167 | # # quick is harder to implement | |
168 | frontend_flags['quick']=( |
|
168 | frontend_flags['quick']=( | |
169 | {'TerminalIPythonApp' : {'quick' : True}}, |
|
169 | {'TerminalIPythonApp' : {'quick' : True}}, | |
170 | "Enable quick startup with no config files." |
|
170 | "Enable quick startup with no config files." | |
171 | ) |
|
171 | ) | |
172 |
|
172 | |||
173 | frontend_flags['i'] = ( |
|
173 | frontend_flags['i'] = ( | |
174 | {'TerminalIPythonApp' : {'force_interact' : True}}, |
|
174 | {'TerminalIPythonApp' : {'force_interact' : True}}, | |
175 | """If running code from the command line, become interactive afterwards. |
|
175 | """If running code from the command line, become interactive afterwards. | |
176 | Note: can also be given simply as '-i.'""" |
|
176 | Note: can also be given simply as '-i.'""" | |
177 | ) |
|
177 | ) | |
178 | flags.update(frontend_flags) |
|
178 | flags.update(frontend_flags) | |
179 |
|
179 | |||
180 | aliases = dict(base_aliases) |
|
180 | aliases = dict(base_aliases) | |
181 | aliases.update(shell_aliases) |
|
181 | aliases.update(shell_aliases) | |
182 |
|
182 | |||
183 | #----------------------------------------------------------------------------- |
|
183 | #----------------------------------------------------------------------------- | |
184 | # Main classes and functions |
|
184 | # Main classes and functions | |
185 | #----------------------------------------------------------------------------- |
|
185 | #----------------------------------------------------------------------------- | |
186 |
|
186 | |||
187 |
|
187 | |||
188 | class LocateIPythonApp(BaseIPythonApplication): |
|
188 | class LocateIPythonApp(BaseIPythonApplication): | |
189 | description = """print the path to the IPython dir""" |
|
189 | description = """print the path to the IPython dir""" | |
190 | subcommands = Dict(dict( |
|
190 | subcommands = Dict(dict( | |
191 | profile=('IPython.core.profileapp.ProfileLocate', |
|
191 | profile=('IPython.core.profileapp.ProfileLocate', | |
192 | "print the path to an IPython profile directory", |
|
192 | "print the path to an IPython profile directory", | |
193 | ), |
|
193 | ), | |
194 | )) |
|
194 | )) | |
195 | def start(self): |
|
195 | def start(self): | |
196 | if self.subapp is not None: |
|
196 | if self.subapp is not None: | |
197 | return self.subapp.start() |
|
197 | return self.subapp.start() | |
198 | else: |
|
198 | else: | |
199 | print self.ipython_dir |
|
199 | print self.ipython_dir | |
200 |
|
200 | |||
201 |
|
201 | |||
202 | class TerminalIPythonApp(BaseIPythonApplication, InteractiveShellApp): |
|
202 | class TerminalIPythonApp(BaseIPythonApplication, InteractiveShellApp): | |
203 | name = u'ipython' |
|
203 | name = u'ipython' | |
204 | description = usage.cl_usage |
|
204 | description = usage.cl_usage | |
205 | default_config_file_name = default_config_file_name |
|
205 | default_config_file_name = default_config_file_name | |
206 | crash_handler_class = IPAppCrashHandler |
|
206 | crash_handler_class = IPAppCrashHandler | |
207 | examples = _examples |
|
207 | examples = _examples | |
208 |
|
208 | |||
209 | flags = Dict(flags) |
|
209 | flags = Dict(flags) | |
210 | aliases = Dict(aliases) |
|
210 | aliases = Dict(aliases) | |
211 | classes = List() |
|
211 | classes = List() | |
212 | def _classes_default(self): |
|
212 | def _classes_default(self): | |
213 | """This has to be in a method, for TerminalIPythonApp to be available.""" |
|
213 | """This has to be in a method, for TerminalIPythonApp to be available.""" | |
214 | return [ |
|
214 | return [ | |
215 | InteractiveShellApp, # ShellApp comes before TerminalApp, because |
|
215 | InteractiveShellApp, # ShellApp comes before TerminalApp, because | |
216 | self.__class__, # it will also affect subclasses (e.g. QtConsole) |
|
216 | self.__class__, # it will also affect subclasses (e.g. QtConsole) | |
217 | TerminalInteractiveShell, |
|
217 | TerminalInteractiveShell, | |
218 | PromptManager, |
|
218 | PromptManager, | |
219 | HistoryManager, |
|
219 | HistoryManager, | |
220 | ProfileDir, |
|
220 | ProfileDir, | |
221 | PlainTextFormatter, |
|
221 | PlainTextFormatter, | |
222 | IPCompleter, |
|
222 | IPCompleter, | |
223 | ScriptMagics, |
|
223 | ScriptMagics, | |
224 | ] |
|
224 | ] | |
225 |
|
225 | |||
226 | subcommands = Dict(dict( |
|
226 | subcommands = Dict(dict( | |
227 | qtconsole=('IPython.frontend.qt.console.qtconsoleapp.IPythonQtConsoleApp', |
|
227 | qtconsole=('IPython.frontend.qt.console.qtconsoleapp.IPythonQtConsoleApp', | |
228 | """Launch the IPython Qt Console.""" |
|
228 | """Launch the IPython Qt Console.""" | |
229 | ), |
|
229 | ), | |
230 | notebook=('IPython.frontend.html.notebook.notebookapp.NotebookApp', |
|
230 | notebook=('IPython.frontend.html.notebook.notebookapp.NotebookApp', | |
231 | """Launch the IPython HTML Notebook Server.""" |
|
231 | """Launch the IPython HTML Notebook Server.""" | |
232 | ), |
|
232 | ), | |
233 | profile = ("IPython.core.profileapp.ProfileApp", |
|
233 | profile = ("IPython.core.profileapp.ProfileApp", | |
234 | "Create and manage IPython profiles." |
|
234 | "Create and manage IPython profiles." | |
235 | ), |
|
235 | ), | |
236 | kernel = ("IPython.zmq.ipkernel.IPKernelApp", |
|
236 | kernel = ("IPython.zmq.ipkernel.IPKernelApp", | |
237 | "Start a kernel without an attached frontend." |
|
237 | "Start a kernel without an attached frontend." | |
238 | ), |
|
238 | ), | |
239 | console=('IPython.frontend.terminal.console.app.ZMQTerminalIPythonApp', |
|
239 | console=('IPython.frontend.terminal.console.app.ZMQTerminalIPythonApp', | |
240 | """Launch the IPython terminal-based Console.""" |
|
240 | """Launch the IPython terminal-based Console.""" | |
241 | ), |
|
241 | ), | |
242 | locate=('IPython.frontend.terminal.ipapp.LocateIPythonApp', |
|
242 | locate=('IPython.frontend.terminal.ipapp.LocateIPythonApp', | |
243 | LocateIPythonApp.description |
|
243 | LocateIPythonApp.description | |
244 | ), |
|
244 | ), | |
245 | )) |
|
245 | )) | |
246 |
|
246 | |||
247 | # *do* autocreate requested profile, but don't create the config file. |
|
247 | # *do* autocreate requested profile, but don't create the config file. | |
248 | auto_create=Bool(True) |
|
248 | auto_create=Bool(True) | |
249 | # configurables |
|
249 | # configurables | |
250 | ignore_old_config=Bool(False, config=True, |
|
250 | ignore_old_config=Bool(False, config=True, | |
251 | help="Suppress warning messages about legacy config files" |
|
251 | help="Suppress warning messages about legacy config files" | |
252 | ) |
|
252 | ) | |
253 | quick = Bool(False, config=True, |
|
253 | quick = Bool(False, config=True, | |
254 | help="""Start IPython quickly by skipping the loading of config files.""" |
|
254 | help="""Start IPython quickly by skipping the loading of config files.""" | |
255 | ) |
|
255 | ) | |
256 | def _quick_changed(self, name, old, new): |
|
256 | def _quick_changed(self, name, old, new): | |
257 | if new: |
|
257 | if new: | |
258 | self.load_config_file = lambda *a, **kw: None |
|
258 | self.load_config_file = lambda *a, **kw: None | |
259 | self.ignore_old_config=True |
|
259 | self.ignore_old_config=True | |
260 |
|
260 | |||
261 | display_banner = Bool(True, config=True, |
|
261 | display_banner = Bool(True, config=True, | |
262 | help="Whether to display a banner upon starting IPython." |
|
262 | help="Whether to display a banner upon starting IPython." | |
263 | ) |
|
263 | ) | |
264 |
|
264 | |||
265 | # if there is code of files to run from the cmd line, don't interact |
|
265 | # if there is code of files to run from the cmd line, don't interact | |
266 | # unless the --i flag (App.force_interact) is true. |
|
266 | # unless the --i flag (App.force_interact) is true. | |
267 | force_interact = Bool(False, config=True, |
|
267 | force_interact = Bool(False, config=True, | |
268 | help="""If a command or file is given via the command-line, |
|
268 | help="""If a command or file is given via the command-line, | |
269 | e.g. 'ipython foo.py""" |
|
269 | e.g. 'ipython foo.py""" | |
270 | ) |
|
270 | ) | |
271 | def _force_interact_changed(self, name, old, new): |
|
271 | def _force_interact_changed(self, name, old, new): | |
272 | if new: |
|
272 | if new: | |
273 | self.interact = True |
|
273 | self.interact = True | |
274 |
|
274 | |||
275 | def _file_to_run_changed(self, name, old, new): |
|
275 | def _file_to_run_changed(self, name, old, new): | |
276 | if new: |
|
276 | if new: | |
277 | self.something_to_run = True |
|
277 | self.something_to_run = True | |
278 | if new and not self.force_interact: |
|
278 | if new and not self.force_interact: | |
279 | self.interact = False |
|
279 | self.interact = False | |
280 | _code_to_run_changed = _file_to_run_changed |
|
280 | _code_to_run_changed = _file_to_run_changed | |
281 | _module_to_run_changed = _file_to_run_changed |
|
281 | _module_to_run_changed = _file_to_run_changed | |
282 |
|
282 | |||
283 | # internal, not-configurable |
|
283 | # internal, not-configurable | |
284 | interact=Bool(True) |
|
284 | interact=Bool(True) | |
285 | something_to_run=Bool(False) |
|
285 | something_to_run=Bool(False) | |
286 |
|
286 | |||
287 | def parse_command_line(self, argv=None): |
|
287 | def parse_command_line(self, argv=None): | |
288 | """override to allow old '-pylab' flag with deprecation warning""" |
|
288 | """override to allow old '-pylab' flag with deprecation warning""" | |
289 |
|
289 | |||
290 | argv = sys.argv[1:] if argv is None else argv |
|
290 | argv = sys.argv[1:] if argv is None else argv | |
291 |
|
291 | |||
292 | if '-pylab' in argv: |
|
292 | if '-pylab' in argv: | |
293 | # deprecated `-pylab` given, |
|
293 | # deprecated `-pylab` given, | |
294 | # warn and transform into current syntax |
|
294 | # warn and transform into current syntax | |
295 | argv = argv[:] # copy, don't clobber |
|
295 | argv = argv[:] # copy, don't clobber | |
296 | idx = argv.index('-pylab') |
|
296 | idx = argv.index('-pylab') | |
297 | warn.warn("`-pylab` flag has been deprecated.\n" |
|
297 | warn.warn("`-pylab` flag has been deprecated.\n" | |
298 | " Use `--pylab` instead, or `--pylab=foo` to specify a backend.") |
|
298 | " Use `--pylab` instead, or `--pylab=foo` to specify a backend.") | |
299 | sub = '--pylab' |
|
299 | sub = '--pylab' | |
300 | if len(argv) > idx+1: |
|
300 | if len(argv) > idx+1: | |
301 | # check for gui arg, as in '-pylab qt' |
|
301 | # check for gui arg, as in '-pylab qt' | |
302 | gui = argv[idx+1] |
|
302 | gui = argv[idx+1] | |
303 | if gui in ('wx', 'qt', 'qt4', 'gtk', 'auto'): |
|
303 | if gui in ('wx', 'qt', 'qt4', 'gtk', 'auto'): | |
304 | sub = '--pylab='+gui |
|
304 | sub = '--pylab='+gui | |
305 | argv.pop(idx+1) |
|
305 | argv.pop(idx+1) | |
306 | argv[idx] = sub |
|
306 | argv[idx] = sub | |
307 |
|
307 | |||
308 | return super(TerminalIPythonApp, self).parse_command_line(argv) |
|
308 | return super(TerminalIPythonApp, self).parse_command_line(argv) | |
309 |
|
309 | |||
310 | @catch_config_error |
|
310 | @catch_config_error | |
311 | def initialize(self, argv=None): |
|
311 | def initialize(self, argv=None): | |
312 | """Do actions after construct, but before starting the app.""" |
|
312 | """Do actions after construct, but before starting the app.""" | |
313 | super(TerminalIPythonApp, self).initialize(argv) |
|
313 | super(TerminalIPythonApp, self).initialize(argv) | |
314 | if self.subapp is not None: |
|
314 | if self.subapp is not None: | |
315 | # don't bother initializing further, starting subapp |
|
315 | # don't bother initializing further, starting subapp | |
316 | return |
|
316 | return | |
317 | if not self.ignore_old_config: |
|
317 | if not self.ignore_old_config: | |
318 | check_for_old_config(self.ipython_dir) |
|
318 | check_for_old_config(self.ipython_dir) | |
319 | # print self.extra_args |
|
319 | # print self.extra_args | |
320 | if self.extra_args and not self.something_to_run: |
|
320 | if self.extra_args and not self.something_to_run: | |
321 | self.file_to_run = self.extra_args[0] |
|
321 | self.file_to_run = self.extra_args[0] | |
322 | self.init_path() |
|
322 | self.init_path() | |
323 | # create the shell |
|
323 | # create the shell | |
324 | self.init_shell() |
|
324 | self.init_shell() | |
325 | # and draw the banner |
|
325 | # and draw the banner | |
326 | self.init_banner() |
|
326 | self.init_banner() | |
327 | # Now a variety of things that happen after the banner is printed. |
|
327 | # Now a variety of things that happen after the banner is printed. | |
328 | self.init_gui_pylab() |
|
328 | self.init_gui_pylab() | |
329 | self.init_extensions() |
|
329 | self.init_extensions() | |
330 | self.init_code() |
|
330 | self.init_code() | |
331 |
|
331 | |||
332 | def init_shell(self): |
|
332 | def init_shell(self): | |
333 | """initialize the InteractiveShell instance""" |
|
333 | """initialize the InteractiveShell instance""" | |
334 | # Create an InteractiveShell instance. |
|
334 | # Create an InteractiveShell instance. | |
335 | # shell.display_banner should always be False for the terminal |
|
335 | # shell.display_banner should always be False for the terminal | |
336 | # based app, because we call shell.show_banner() by hand below |
|
336 | # based app, because we call shell.show_banner() by hand below | |
337 | # so the banner shows *before* all extension loading stuff. |
|
337 | # so the banner shows *before* all extension loading stuff. | |
338 | self.shell = TerminalInteractiveShell.instance(config=self.config, |
|
338 | self.shell = TerminalInteractiveShell.instance(config=self.config, | |
339 | display_banner=False, profile_dir=self.profile_dir, |
|
339 | display_banner=False, profile_dir=self.profile_dir, | |
340 | ipython_dir=self.ipython_dir) |
|
340 | ipython_dir=self.ipython_dir) | |
341 | self.shell.configurables.append(self) |
|
341 | self.shell.configurables.append(self) | |
342 |
|
342 | |||
343 | def init_banner(self): |
|
343 | def init_banner(self): | |
344 | """optionally display the banner""" |
|
344 | """optionally display the banner""" | |
345 | if self.display_banner and self.interact: |
|
345 | if self.display_banner and self.interact: | |
346 | self.shell.show_banner() |
|
346 | self.shell.show_banner() | |
347 | # Make sure there is a space below the banner. |
|
347 | # Make sure there is a space below the banner. | |
348 | if self.log_level <= logging.INFO: print |
|
348 | if self.log_level <= logging.INFO: print | |
349 |
|
349 | |||
350 | def _pylab_changed(self, name, old, new): |
|
350 | def _pylab_changed(self, name, old, new): | |
351 | """Replace --pylab='inline' with --pylab='auto'""" |
|
351 | """Replace --pylab='inline' with --pylab='auto'""" | |
352 | if new == 'inline': |
|
352 | if new == 'inline': | |
353 | warn.warn("'inline' not available as pylab backend, " |
|
353 | warn.warn("'inline' not available as pylab backend, " | |
354 |
"using 'auto' instead. |
|
354 | "using 'auto' instead.") | |
355 | self.pylab = 'auto' |
|
355 | self.pylab = 'auto' | |
356 |
|
356 | |||
357 | def start(self): |
|
357 | def start(self): | |
358 | if self.subapp is not None: |
|
358 | if self.subapp is not None: | |
359 | return self.subapp.start() |
|
359 | return self.subapp.start() | |
360 | # perform any prexec steps: |
|
360 | # perform any prexec steps: | |
361 | if self.interact: |
|
361 | if self.interact: | |
362 | self.log.debug("Starting IPython's mainloop...") |
|
362 | self.log.debug("Starting IPython's mainloop...") | |
363 | self.shell.mainloop() |
|
363 | self.shell.mainloop() | |
364 | else: |
|
364 | else: | |
365 | self.log.debug("IPython not interactive...") |
|
365 | self.log.debug("IPython not interactive...") | |
366 |
|
366 | |||
367 |
|
367 | |||
368 | def load_default_config(ipython_dir=None): |
|
368 | def load_default_config(ipython_dir=None): | |
369 | """Load the default config file from the default ipython_dir. |
|
369 | """Load the default config file from the default ipython_dir. | |
370 |
|
370 | |||
371 | This is useful for embedded shells. |
|
371 | This is useful for embedded shells. | |
372 | """ |
|
372 | """ | |
373 | if ipython_dir is None: |
|
373 | if ipython_dir is None: | |
374 | ipython_dir = get_ipython_dir() |
|
374 | ipython_dir = get_ipython_dir() | |
375 | profile_dir = os.path.join(ipython_dir, 'profile_default') |
|
375 | profile_dir = os.path.join(ipython_dir, 'profile_default') | |
376 | cl = PyFileConfigLoader(default_config_file_name, profile_dir) |
|
376 | cl = PyFileConfigLoader(default_config_file_name, profile_dir) | |
377 | try: |
|
377 | try: | |
378 | config = cl.load_config() |
|
378 | config = cl.load_config() | |
379 | except ConfigFileNotFound: |
|
379 | except ConfigFileNotFound: | |
380 | # no config found |
|
380 | # no config found | |
381 | config = Config() |
|
381 | config = Config() | |
382 | return config |
|
382 | return config | |
383 |
|
383 | |||
384 |
|
384 | |||
385 | def launch_new_instance(): |
|
385 | def launch_new_instance(): | |
386 | """Create and run a full blown IPython instance""" |
|
386 | """Create and run a full blown IPython instance""" | |
387 | app = TerminalIPythonApp.instance() |
|
387 | app = TerminalIPythonApp.instance() | |
388 | app.initialize() |
|
388 | app.initialize() | |
389 | app.start() |
|
389 | app.start() | |
390 |
|
390 | |||
391 |
|
391 | |||
392 | if __name__ == '__main__': |
|
392 | if __name__ == '__main__': | |
393 | launch_new_instance() |
|
393 | launch_new_instance() |
@@ -1,529 +1,529 b'' | |||||
1 | # coding: utf-8 |
|
1 | # coding: utf-8 | |
2 | """ |
|
2 | """ | |
3 | Inputhook management for GUI event loop integration. |
|
3 | Inputhook management for GUI event loop integration. | |
4 | """ |
|
4 | """ | |
5 |
|
5 | |||
6 | #----------------------------------------------------------------------------- |
|
6 | #----------------------------------------------------------------------------- | |
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 | try: |
|
17 | try: | |
18 | import ctypes |
|
18 | import ctypes | |
19 | except ImportError: |
|
19 | except ImportError: | |
20 | ctypes = None |
|
20 | ctypes = None | |
21 | import os |
|
21 | import os | |
22 | import sys |
|
22 | import sys | |
23 | from distutils.version import LooseVersion as V |
|
23 | from distutils.version import LooseVersion as V | |
24 |
|
24 | |||
25 | from IPython.utils.warn import warn |
|
25 | from IPython.utils.warn import warn | |
26 |
|
26 | |||
27 | #----------------------------------------------------------------------------- |
|
27 | #----------------------------------------------------------------------------- | |
28 | # Constants |
|
28 | # Constants | |
29 | #----------------------------------------------------------------------------- |
|
29 | #----------------------------------------------------------------------------- | |
30 |
|
30 | |||
31 | # Constants for identifying the GUI toolkits. |
|
31 | # Constants for identifying the GUI toolkits. | |
32 | GUI_WX = 'wx' |
|
32 | GUI_WX = 'wx' | |
33 | GUI_QT = 'qt' |
|
33 | GUI_QT = 'qt' | |
34 | GUI_QT4 = 'qt4' |
|
34 | GUI_QT4 = 'qt4' | |
35 | GUI_GTK = 'gtk' |
|
35 | GUI_GTK = 'gtk' | |
36 | GUI_TK = 'tk' |
|
36 | GUI_TK = 'tk' | |
37 | GUI_OSX = 'osx' |
|
37 | GUI_OSX = 'osx' | |
38 | GUI_GLUT = 'glut' |
|
38 | GUI_GLUT = 'glut' | |
39 | GUI_PYGLET = 'pyglet' |
|
39 | GUI_PYGLET = 'pyglet' | |
40 | GUI_GTK3 = 'gtk3' |
|
40 | GUI_GTK3 = 'gtk3' | |
41 | GUI_NONE = 'none' # i.e. disable |
|
41 | GUI_NONE = 'none' # i.e. disable | |
42 |
|
42 | |||
43 | #----------------------------------------------------------------------------- |
|
43 | #----------------------------------------------------------------------------- | |
44 | # Utilities |
|
44 | # Utilities | |
45 | #----------------------------------------------------------------------------- |
|
45 | #----------------------------------------------------------------------------- | |
46 |
|
46 | |||
47 | def _stdin_ready_posix(): |
|
47 | def _stdin_ready_posix(): | |
48 | """Return True if there's something to read on stdin (posix version).""" |
|
48 | """Return True if there's something to read on stdin (posix version).""" | |
49 | infds, outfds, erfds = select.select([sys.stdin],[],[],0) |
|
49 | infds, outfds, erfds = select.select([sys.stdin],[],[],0) | |
50 | return bool(infds) |
|
50 | return bool(infds) | |
51 |
|
51 | |||
52 | def _stdin_ready_nt(): |
|
52 | def _stdin_ready_nt(): | |
53 | """Return True if there's something to read on stdin (nt version).""" |
|
53 | """Return True if there's something to read on stdin (nt version).""" | |
54 | return msvcrt.kbhit() |
|
54 | return msvcrt.kbhit() | |
55 |
|
55 | |||
56 | def _stdin_ready_other(): |
|
56 | def _stdin_ready_other(): | |
57 | """Return True, assuming there's something to read on stdin.""" |
|
57 | """Return True, assuming there's something to read on stdin.""" | |
58 | return True # |
|
58 | return True # | |
59 |
|
59 | |||
60 |
|
60 | |||
61 | def _ignore_CTRL_C_posix(): |
|
61 | def _ignore_CTRL_C_posix(): | |
62 | """Ignore CTRL+C (SIGINT).""" |
|
62 | """Ignore CTRL+C (SIGINT).""" | |
63 | signal.signal(signal.SIGINT, signal.SIG_IGN) |
|
63 | signal.signal(signal.SIGINT, signal.SIG_IGN) | |
64 |
|
64 | |||
65 | def _allow_CTRL_C_posix(): |
|
65 | def _allow_CTRL_C_posix(): | |
66 | """Take CTRL+C into account (SIGINT).""" |
|
66 | """Take CTRL+C into account (SIGINT).""" | |
67 | signal.signal(signal.SIGINT, signal.default_int_handler) |
|
67 | signal.signal(signal.SIGINT, signal.default_int_handler) | |
68 |
|
68 | |||
69 | def _ignore_CTRL_C_other(): |
|
69 | def _ignore_CTRL_C_other(): | |
70 | """Ignore CTRL+C (not implemented).""" |
|
70 | """Ignore CTRL+C (not implemented).""" | |
71 | pass |
|
71 | pass | |
72 |
|
72 | |||
73 | def _allow_CTRL_C_other(): |
|
73 | def _allow_CTRL_C_other(): | |
74 | """Take CTRL+C into account (not implemented).""" |
|
74 | """Take CTRL+C into account (not implemented).""" | |
75 | pass |
|
75 | pass | |
76 |
|
76 | |||
77 | if os.name == 'posix': |
|
77 | if os.name == 'posix': | |
78 | import select |
|
78 | import select | |
79 | import signal |
|
79 | import signal | |
80 | stdin_ready = _stdin_ready_posix |
|
80 | stdin_ready = _stdin_ready_posix | |
81 | ignore_CTRL_C = _ignore_CTRL_C_posix |
|
81 | ignore_CTRL_C = _ignore_CTRL_C_posix | |
82 | allow_CTRL_C = _allow_CTRL_C_posix |
|
82 | allow_CTRL_C = _allow_CTRL_C_posix | |
83 | elif os.name == 'nt': |
|
83 | elif os.name == 'nt': | |
84 | import msvcrt |
|
84 | import msvcrt | |
85 | stdin_ready = _stdin_ready_nt |
|
85 | stdin_ready = _stdin_ready_nt | |
86 | ignore_CTRL_C = _ignore_CTRL_C_other |
|
86 | ignore_CTRL_C = _ignore_CTRL_C_other | |
87 | allow_CTRL_C = _allow_CTRL_C_other |
|
87 | allow_CTRL_C = _allow_CTRL_C_other | |
88 | else: |
|
88 | else: | |
89 | stdin_ready = _stdin_ready_other |
|
89 | stdin_ready = _stdin_ready_other | |
90 | ignore_CTRL_C = _ignore_CTRL_C_other |
|
90 | ignore_CTRL_C = _ignore_CTRL_C_other | |
91 | allow_CTRL_C = _allow_CTRL_C_other |
|
91 | allow_CTRL_C = _allow_CTRL_C_other | |
92 |
|
92 | |||
93 |
|
93 | |||
94 | #----------------------------------------------------------------------------- |
|
94 | #----------------------------------------------------------------------------- | |
95 | # Main InputHookManager class |
|
95 | # Main InputHookManager class | |
96 | #----------------------------------------------------------------------------- |
|
96 | #----------------------------------------------------------------------------- | |
97 |
|
97 | |||
98 |
|
98 | |||
99 | class InputHookManager(object): |
|
99 | class InputHookManager(object): | |
100 | """Manage PyOS_InputHook for different GUI toolkits. |
|
100 | """Manage PyOS_InputHook for different GUI toolkits. | |
101 |
|
101 | |||
102 | This class installs various hooks under ``PyOSInputHook`` to handle |
|
102 | This class installs various hooks under ``PyOSInputHook`` to handle | |
103 | GUI event loop integration. |
|
103 | GUI event loop integration. | |
104 | """ |
|
104 | """ | |
105 |
|
105 | |||
106 | def __init__(self): |
|
106 | def __init__(self): | |
107 | if ctypes is None: |
|
107 | if ctypes is None: | |
108 |
warn("IPython GUI event loop requires ctypes, %gui will not be available |
|
108 | warn("IPython GUI event loop requires ctypes, %gui will not be available") | |
109 | return |
|
109 | return | |
110 | self.PYFUNC = ctypes.PYFUNCTYPE(ctypes.c_int) |
|
110 | self.PYFUNC = ctypes.PYFUNCTYPE(ctypes.c_int) | |
111 | self._apps = {} |
|
111 | self._apps = {} | |
112 | self._reset() |
|
112 | self._reset() | |
113 |
|
113 | |||
114 | def _reset(self): |
|
114 | def _reset(self): | |
115 | self._callback_pyfunctype = None |
|
115 | self._callback_pyfunctype = None | |
116 | self._callback = None |
|
116 | self._callback = None | |
117 | self._installed = False |
|
117 | self._installed = False | |
118 | self._current_gui = None |
|
118 | self._current_gui = None | |
119 |
|
119 | |||
120 | def get_pyos_inputhook(self): |
|
120 | def get_pyos_inputhook(self): | |
121 | """Return the current PyOS_InputHook as a ctypes.c_void_p.""" |
|
121 | """Return the current PyOS_InputHook as a ctypes.c_void_p.""" | |
122 | return ctypes.c_void_p.in_dll(ctypes.pythonapi,"PyOS_InputHook") |
|
122 | return ctypes.c_void_p.in_dll(ctypes.pythonapi,"PyOS_InputHook") | |
123 |
|
123 | |||
124 | def get_pyos_inputhook_as_func(self): |
|
124 | def get_pyos_inputhook_as_func(self): | |
125 | """Return the current PyOS_InputHook as a ctypes.PYFUNCYPE.""" |
|
125 | """Return the current PyOS_InputHook as a ctypes.PYFUNCYPE.""" | |
126 | return self.PYFUNC.in_dll(ctypes.pythonapi,"PyOS_InputHook") |
|
126 | return self.PYFUNC.in_dll(ctypes.pythonapi,"PyOS_InputHook") | |
127 |
|
127 | |||
128 | def set_inputhook(self, callback): |
|
128 | def set_inputhook(self, callback): | |
129 | """Set PyOS_InputHook to callback and return the previous one.""" |
|
129 | """Set PyOS_InputHook to callback and return the previous one.""" | |
130 | # On platforms with 'readline' support, it's all too likely to |
|
130 | # On platforms with 'readline' support, it's all too likely to | |
131 | # have a KeyboardInterrupt signal delivered *even before* an |
|
131 | # have a KeyboardInterrupt signal delivered *even before* an | |
132 | # initial ``try:`` clause in the callback can be executed, so |
|
132 | # initial ``try:`` clause in the callback can be executed, so | |
133 | # we need to disable CTRL+C in this situation. |
|
133 | # we need to disable CTRL+C in this situation. | |
134 | ignore_CTRL_C() |
|
134 | ignore_CTRL_C() | |
135 | self._callback = callback |
|
135 | self._callback = callback | |
136 | self._callback_pyfunctype = self.PYFUNC(callback) |
|
136 | self._callback_pyfunctype = self.PYFUNC(callback) | |
137 | pyos_inputhook_ptr = self.get_pyos_inputhook() |
|
137 | pyos_inputhook_ptr = self.get_pyos_inputhook() | |
138 | original = self.get_pyos_inputhook_as_func() |
|
138 | original = self.get_pyos_inputhook_as_func() | |
139 | pyos_inputhook_ptr.value = \ |
|
139 | pyos_inputhook_ptr.value = \ | |
140 | ctypes.cast(self._callback_pyfunctype, ctypes.c_void_p).value |
|
140 | ctypes.cast(self._callback_pyfunctype, ctypes.c_void_p).value | |
141 | self._installed = True |
|
141 | self._installed = True | |
142 | return original |
|
142 | return original | |
143 |
|
143 | |||
144 | def clear_inputhook(self, app=None): |
|
144 | def clear_inputhook(self, app=None): | |
145 | """Set PyOS_InputHook to NULL and return the previous one. |
|
145 | """Set PyOS_InputHook to NULL and return the previous one. | |
146 |
|
146 | |||
147 | Parameters |
|
147 | Parameters | |
148 | ---------- |
|
148 | ---------- | |
149 | app : optional, ignored |
|
149 | app : optional, ignored | |
150 | This parameter is allowed only so that clear_inputhook() can be |
|
150 | This parameter is allowed only so that clear_inputhook() can be | |
151 | called with a similar interface as all the ``enable_*`` methods. But |
|
151 | called with a similar interface as all the ``enable_*`` methods. But | |
152 | the actual value of the parameter is ignored. This uniform interface |
|
152 | the actual value of the parameter is ignored. This uniform interface | |
153 | makes it easier to have user-level entry points in the main IPython |
|
153 | makes it easier to have user-level entry points in the main IPython | |
154 | app like :meth:`enable_gui`.""" |
|
154 | app like :meth:`enable_gui`.""" | |
155 | pyos_inputhook_ptr = self.get_pyos_inputhook() |
|
155 | pyos_inputhook_ptr = self.get_pyos_inputhook() | |
156 | original = self.get_pyos_inputhook_as_func() |
|
156 | original = self.get_pyos_inputhook_as_func() | |
157 | pyos_inputhook_ptr.value = ctypes.c_void_p(None).value |
|
157 | pyos_inputhook_ptr.value = ctypes.c_void_p(None).value | |
158 | allow_CTRL_C() |
|
158 | allow_CTRL_C() | |
159 | self._reset() |
|
159 | self._reset() | |
160 | return original |
|
160 | return original | |
161 |
|
161 | |||
162 | def clear_app_refs(self, gui=None): |
|
162 | def clear_app_refs(self, gui=None): | |
163 | """Clear IPython's internal reference to an application instance. |
|
163 | """Clear IPython's internal reference to an application instance. | |
164 |
|
164 | |||
165 | Whenever we create an app for a user on qt4 or wx, we hold a |
|
165 | Whenever we create an app for a user on qt4 or wx, we hold a | |
166 | reference to the app. This is needed because in some cases bad things |
|
166 | reference to the app. This is needed because in some cases bad things | |
167 | can happen if a user doesn't hold a reference themselves. This |
|
167 | can happen if a user doesn't hold a reference themselves. This | |
168 | method is provided to clear the references we are holding. |
|
168 | method is provided to clear the references we are holding. | |
169 |
|
169 | |||
170 | Parameters |
|
170 | Parameters | |
171 | ---------- |
|
171 | ---------- | |
172 | gui : None or str |
|
172 | gui : None or str | |
173 | If None, clear all app references. If ('wx', 'qt4') clear |
|
173 | If None, clear all app references. If ('wx', 'qt4') clear | |
174 | the app for that toolkit. References are not held for gtk or tk |
|
174 | the app for that toolkit. References are not held for gtk or tk | |
175 | as those toolkits don't have the notion of an app. |
|
175 | as those toolkits don't have the notion of an app. | |
176 | """ |
|
176 | """ | |
177 | if gui is None: |
|
177 | if gui is None: | |
178 | self._apps = {} |
|
178 | self._apps = {} | |
179 | elif gui in self._apps: |
|
179 | elif gui in self._apps: | |
180 | del self._apps[gui] |
|
180 | del self._apps[gui] | |
181 |
|
181 | |||
182 | def enable_wx(self, app=None): |
|
182 | def enable_wx(self, app=None): | |
183 | """Enable event loop integration with wxPython. |
|
183 | """Enable event loop integration with wxPython. | |
184 |
|
184 | |||
185 | Parameters |
|
185 | Parameters | |
186 | ---------- |
|
186 | ---------- | |
187 | app : WX Application, optional. |
|
187 | app : WX Application, optional. | |
188 | Running application to use. If not given, we probe WX for an |
|
188 | Running application to use. If not given, we probe WX for an | |
189 | existing application object, and create a new one if none is found. |
|
189 | existing application object, and create a new one if none is found. | |
190 |
|
190 | |||
191 | Notes |
|
191 | Notes | |
192 | ----- |
|
192 | ----- | |
193 | This methods sets the ``PyOS_InputHook`` for wxPython, which allows |
|
193 | This methods sets the ``PyOS_InputHook`` for wxPython, which allows | |
194 | the wxPython to integrate with terminal based applications like |
|
194 | the wxPython to integrate with terminal based applications like | |
195 | IPython. |
|
195 | IPython. | |
196 |
|
196 | |||
197 | If ``app`` is not given we probe for an existing one, and return it if |
|
197 | If ``app`` is not given we probe for an existing one, and return it if | |
198 | found. If no existing app is found, we create an :class:`wx.App` as |
|
198 | found. If no existing app is found, we create an :class:`wx.App` as | |
199 | follows:: |
|
199 | follows:: | |
200 |
|
200 | |||
201 | import wx |
|
201 | import wx | |
202 | app = wx.App(redirect=False, clearSigInt=False) |
|
202 | app = wx.App(redirect=False, clearSigInt=False) | |
203 | """ |
|
203 | """ | |
204 | import wx |
|
204 | import wx | |
205 |
|
205 | |||
206 | wx_version = V(wx.__version__).version |
|
206 | wx_version = V(wx.__version__).version | |
207 |
|
207 | |||
208 | if wx_version < [2, 8]: |
|
208 | if wx_version < [2, 8]: | |
209 | raise ValueError("requires wxPython >= 2.8, but you have %s" % wx.__version__) |
|
209 | raise ValueError("requires wxPython >= 2.8, but you have %s" % wx.__version__) | |
210 |
|
210 | |||
211 | from IPython.lib.inputhookwx import inputhook_wx |
|
211 | from IPython.lib.inputhookwx import inputhook_wx | |
212 | self.set_inputhook(inputhook_wx) |
|
212 | self.set_inputhook(inputhook_wx) | |
213 | self._current_gui = GUI_WX |
|
213 | self._current_gui = GUI_WX | |
214 | import wx |
|
214 | import wx | |
215 | if app is None: |
|
215 | if app is None: | |
216 | app = wx.GetApp() |
|
216 | app = wx.GetApp() | |
217 | if app is None: |
|
217 | if app is None: | |
218 | app = wx.App(redirect=False, clearSigInt=False) |
|
218 | app = wx.App(redirect=False, clearSigInt=False) | |
219 | app._in_event_loop = True |
|
219 | app._in_event_loop = True | |
220 | self._apps[GUI_WX] = app |
|
220 | self._apps[GUI_WX] = app | |
221 | return app |
|
221 | return app | |
222 |
|
222 | |||
223 | def disable_wx(self): |
|
223 | def disable_wx(self): | |
224 | """Disable event loop integration with wxPython. |
|
224 | """Disable event loop integration with wxPython. | |
225 |
|
225 | |||
226 | This merely sets PyOS_InputHook to NULL. |
|
226 | This merely sets PyOS_InputHook to NULL. | |
227 | """ |
|
227 | """ | |
228 | if GUI_WX in self._apps: |
|
228 | if GUI_WX in self._apps: | |
229 | self._apps[GUI_WX]._in_event_loop = False |
|
229 | self._apps[GUI_WX]._in_event_loop = False | |
230 | self.clear_inputhook() |
|
230 | self.clear_inputhook() | |
231 |
|
231 | |||
232 | def enable_qt4(self, app=None): |
|
232 | def enable_qt4(self, app=None): | |
233 | """Enable event loop integration with PyQt4. |
|
233 | """Enable event loop integration with PyQt4. | |
234 |
|
234 | |||
235 | Parameters |
|
235 | Parameters | |
236 | ---------- |
|
236 | ---------- | |
237 | app : Qt Application, optional. |
|
237 | app : Qt Application, optional. | |
238 | Running application to use. If not given, we probe Qt for an |
|
238 | Running application to use. If not given, we probe Qt for an | |
239 | existing application object, and create a new one if none is found. |
|
239 | existing application object, and create a new one if none is found. | |
240 |
|
240 | |||
241 | Notes |
|
241 | Notes | |
242 | ----- |
|
242 | ----- | |
243 | This methods sets the PyOS_InputHook for PyQt4, which allows |
|
243 | This methods sets the PyOS_InputHook for PyQt4, which allows | |
244 | the PyQt4 to integrate with terminal based applications like |
|
244 | the PyQt4 to integrate with terminal based applications like | |
245 | IPython. |
|
245 | IPython. | |
246 |
|
246 | |||
247 | If ``app`` is not given we probe for an existing one, and return it if |
|
247 | If ``app`` is not given we probe for an existing one, and return it if | |
248 | found. If no existing app is found, we create an :class:`QApplication` |
|
248 | found. If no existing app is found, we create an :class:`QApplication` | |
249 | as follows:: |
|
249 | as follows:: | |
250 |
|
250 | |||
251 | from PyQt4 import QtCore |
|
251 | from PyQt4 import QtCore | |
252 | app = QtGui.QApplication(sys.argv) |
|
252 | app = QtGui.QApplication(sys.argv) | |
253 | """ |
|
253 | """ | |
254 | from IPython.lib.inputhookqt4 import create_inputhook_qt4 |
|
254 | from IPython.lib.inputhookqt4 import create_inputhook_qt4 | |
255 | app, inputhook_qt4 = create_inputhook_qt4(self, app) |
|
255 | app, inputhook_qt4 = create_inputhook_qt4(self, app) | |
256 | self.set_inputhook(inputhook_qt4) |
|
256 | self.set_inputhook(inputhook_qt4) | |
257 |
|
257 | |||
258 | self._current_gui = GUI_QT4 |
|
258 | self._current_gui = GUI_QT4 | |
259 | app._in_event_loop = True |
|
259 | app._in_event_loop = True | |
260 | self._apps[GUI_QT4] = app |
|
260 | self._apps[GUI_QT4] = app | |
261 | return app |
|
261 | return app | |
262 |
|
262 | |||
263 | def disable_qt4(self): |
|
263 | def disable_qt4(self): | |
264 | """Disable event loop integration with PyQt4. |
|
264 | """Disable event loop integration with PyQt4. | |
265 |
|
265 | |||
266 | This merely sets PyOS_InputHook to NULL. |
|
266 | This merely sets PyOS_InputHook to NULL. | |
267 | """ |
|
267 | """ | |
268 | if GUI_QT4 in self._apps: |
|
268 | if GUI_QT4 in self._apps: | |
269 | self._apps[GUI_QT4]._in_event_loop = False |
|
269 | self._apps[GUI_QT4]._in_event_loop = False | |
270 | self.clear_inputhook() |
|
270 | self.clear_inputhook() | |
271 |
|
271 | |||
272 | def enable_gtk(self, app=None): |
|
272 | def enable_gtk(self, app=None): | |
273 | """Enable event loop integration with PyGTK. |
|
273 | """Enable event loop integration with PyGTK. | |
274 |
|
274 | |||
275 | Parameters |
|
275 | Parameters | |
276 | ---------- |
|
276 | ---------- | |
277 | app : ignored |
|
277 | app : ignored | |
278 | Ignored, it's only a placeholder to keep the call signature of all |
|
278 | Ignored, it's only a placeholder to keep the call signature of all | |
279 | gui activation methods consistent, which simplifies the logic of |
|
279 | gui activation methods consistent, which simplifies the logic of | |
280 | supporting magics. |
|
280 | supporting magics. | |
281 |
|
281 | |||
282 | Notes |
|
282 | Notes | |
283 | ----- |
|
283 | ----- | |
284 | This methods sets the PyOS_InputHook for PyGTK, which allows |
|
284 | This methods sets the PyOS_InputHook for PyGTK, which allows | |
285 | the PyGTK to integrate with terminal based applications like |
|
285 | the PyGTK to integrate with terminal based applications like | |
286 | IPython. |
|
286 | IPython. | |
287 | """ |
|
287 | """ | |
288 | import gtk |
|
288 | import gtk | |
289 | try: |
|
289 | try: | |
290 | gtk.set_interactive(True) |
|
290 | gtk.set_interactive(True) | |
291 | self._current_gui = GUI_GTK |
|
291 | self._current_gui = GUI_GTK | |
292 | except AttributeError: |
|
292 | except AttributeError: | |
293 | # For older versions of gtk, use our own ctypes version |
|
293 | # For older versions of gtk, use our own ctypes version | |
294 | from IPython.lib.inputhookgtk import inputhook_gtk |
|
294 | from IPython.lib.inputhookgtk import inputhook_gtk | |
295 | self.set_inputhook(inputhook_gtk) |
|
295 | self.set_inputhook(inputhook_gtk) | |
296 | self._current_gui = GUI_GTK |
|
296 | self._current_gui = GUI_GTK | |
297 |
|
297 | |||
298 | def disable_gtk(self): |
|
298 | def disable_gtk(self): | |
299 | """Disable event loop integration with PyGTK. |
|
299 | """Disable event loop integration with PyGTK. | |
300 |
|
300 | |||
301 | This merely sets PyOS_InputHook to NULL. |
|
301 | This merely sets PyOS_InputHook to NULL. | |
302 | """ |
|
302 | """ | |
303 | self.clear_inputhook() |
|
303 | self.clear_inputhook() | |
304 |
|
304 | |||
305 | def enable_tk(self, app=None): |
|
305 | def enable_tk(self, app=None): | |
306 | """Enable event loop integration with Tk. |
|
306 | """Enable event loop integration with Tk. | |
307 |
|
307 | |||
308 | Parameters |
|
308 | Parameters | |
309 | ---------- |
|
309 | ---------- | |
310 | app : toplevel :class:`Tkinter.Tk` widget, optional. |
|
310 | app : toplevel :class:`Tkinter.Tk` widget, optional. | |
311 | Running toplevel widget to use. If not given, we probe Tk for an |
|
311 | Running toplevel widget to use. If not given, we probe Tk for an | |
312 | existing one, and create a new one if none is found. |
|
312 | existing one, and create a new one if none is found. | |
313 |
|
313 | |||
314 | Notes |
|
314 | Notes | |
315 | ----- |
|
315 | ----- | |
316 | If you have already created a :class:`Tkinter.Tk` object, the only |
|
316 | If you have already created a :class:`Tkinter.Tk` object, the only | |
317 | thing done by this method is to register with the |
|
317 | thing done by this method is to register with the | |
318 | :class:`InputHookManager`, since creating that object automatically |
|
318 | :class:`InputHookManager`, since creating that object automatically | |
319 | sets ``PyOS_InputHook``. |
|
319 | sets ``PyOS_InputHook``. | |
320 | """ |
|
320 | """ | |
321 | self._current_gui = GUI_TK |
|
321 | self._current_gui = GUI_TK | |
322 | if app is None: |
|
322 | if app is None: | |
323 | import Tkinter |
|
323 | import Tkinter | |
324 | app = Tkinter.Tk() |
|
324 | app = Tkinter.Tk() | |
325 | app.withdraw() |
|
325 | app.withdraw() | |
326 | self._apps[GUI_TK] = app |
|
326 | self._apps[GUI_TK] = app | |
327 | return app |
|
327 | return app | |
328 |
|
328 | |||
329 | def disable_tk(self): |
|
329 | def disable_tk(self): | |
330 | """Disable event loop integration with Tkinter. |
|
330 | """Disable event loop integration with Tkinter. | |
331 |
|
331 | |||
332 | This merely sets PyOS_InputHook to NULL. |
|
332 | This merely sets PyOS_InputHook to NULL. | |
333 | """ |
|
333 | """ | |
334 | self.clear_inputhook() |
|
334 | self.clear_inputhook() | |
335 |
|
335 | |||
336 |
|
336 | |||
337 | def enable_glut(self, app=None): |
|
337 | def enable_glut(self, app=None): | |
338 | """ Enable event loop integration with GLUT. |
|
338 | """ Enable event loop integration with GLUT. | |
339 |
|
339 | |||
340 | Parameters |
|
340 | Parameters | |
341 | ---------- |
|
341 | ---------- | |
342 |
|
342 | |||
343 | app : ignored |
|
343 | app : ignored | |
344 | Ignored, it's only a placeholder to keep the call signature of all |
|
344 | Ignored, it's only a placeholder to keep the call signature of all | |
345 | gui activation methods consistent, which simplifies the logic of |
|
345 | gui activation methods consistent, which simplifies the logic of | |
346 | supporting magics. |
|
346 | supporting magics. | |
347 |
|
347 | |||
348 | Notes |
|
348 | Notes | |
349 | ----- |
|
349 | ----- | |
350 |
|
350 | |||
351 | This methods sets the PyOS_InputHook for GLUT, which allows the GLUT to |
|
351 | This methods sets the PyOS_InputHook for GLUT, which allows the GLUT to | |
352 | integrate with terminal based applications like IPython. Due to GLUT |
|
352 | integrate with terminal based applications like IPython. Due to GLUT | |
353 | limitations, it is currently not possible to start the event loop |
|
353 | limitations, it is currently not possible to start the event loop | |
354 | without first creating a window. You should thus not create another |
|
354 | without first creating a window. You should thus not create another | |
355 | window but use instead the created one. See 'gui-glut.py' in the |
|
355 | window but use instead the created one. See 'gui-glut.py' in the | |
356 | docs/examples/lib directory. |
|
356 | docs/examples/lib directory. | |
357 |
|
357 | |||
358 | The default screen mode is set to: |
|
358 | The default screen mode is set to: | |
359 | glut.GLUT_DOUBLE | glut.GLUT_RGBA | glut.GLUT_DEPTH |
|
359 | glut.GLUT_DOUBLE | glut.GLUT_RGBA | glut.GLUT_DEPTH | |
360 | """ |
|
360 | """ | |
361 |
|
361 | |||
362 | import OpenGL.GLUT as glut |
|
362 | import OpenGL.GLUT as glut | |
363 | from IPython.lib.inputhookglut import glut_display_mode, \ |
|
363 | from IPython.lib.inputhookglut import glut_display_mode, \ | |
364 | glut_close, glut_display, \ |
|
364 | glut_close, glut_display, \ | |
365 | glut_idle, inputhook_glut |
|
365 | glut_idle, inputhook_glut | |
366 |
|
366 | |||
367 | if GUI_GLUT not in self._apps: |
|
367 | if GUI_GLUT not in self._apps: | |
368 | glut.glutInit( sys.argv ) |
|
368 | glut.glutInit( sys.argv ) | |
369 | glut.glutInitDisplayMode( glut_display_mode ) |
|
369 | glut.glutInitDisplayMode( glut_display_mode ) | |
370 | # This is specific to freeglut |
|
370 | # This is specific to freeglut | |
371 | if bool(glut.glutSetOption): |
|
371 | if bool(glut.glutSetOption): | |
372 | glut.glutSetOption( glut.GLUT_ACTION_ON_WINDOW_CLOSE, |
|
372 | glut.glutSetOption( glut.GLUT_ACTION_ON_WINDOW_CLOSE, | |
373 | glut.GLUT_ACTION_GLUTMAINLOOP_RETURNS ) |
|
373 | glut.GLUT_ACTION_GLUTMAINLOOP_RETURNS ) | |
374 | glut.glutCreateWindow( sys.argv[0] ) |
|
374 | glut.glutCreateWindow( sys.argv[0] ) | |
375 | glut.glutReshapeWindow( 1, 1 ) |
|
375 | glut.glutReshapeWindow( 1, 1 ) | |
376 | glut.glutHideWindow( ) |
|
376 | glut.glutHideWindow( ) | |
377 | glut.glutWMCloseFunc( glut_close ) |
|
377 | glut.glutWMCloseFunc( glut_close ) | |
378 | glut.glutDisplayFunc( glut_display ) |
|
378 | glut.glutDisplayFunc( glut_display ) | |
379 | glut.glutIdleFunc( glut_idle ) |
|
379 | glut.glutIdleFunc( glut_idle ) | |
380 | else: |
|
380 | else: | |
381 | glut.glutWMCloseFunc( glut_close ) |
|
381 | glut.glutWMCloseFunc( glut_close ) | |
382 | glut.glutDisplayFunc( glut_display ) |
|
382 | glut.glutDisplayFunc( glut_display ) | |
383 | glut.glutIdleFunc( glut_idle) |
|
383 | glut.glutIdleFunc( glut_idle) | |
384 | self.set_inputhook( inputhook_glut ) |
|
384 | self.set_inputhook( inputhook_glut ) | |
385 | self._current_gui = GUI_GLUT |
|
385 | self._current_gui = GUI_GLUT | |
386 | self._apps[GUI_GLUT] = True |
|
386 | self._apps[GUI_GLUT] = True | |
387 |
|
387 | |||
388 |
|
388 | |||
389 | def disable_glut(self): |
|
389 | def disable_glut(self): | |
390 | """Disable event loop integration with glut. |
|
390 | """Disable event loop integration with glut. | |
391 |
|
391 | |||
392 | This sets PyOS_InputHook to NULL and set the display function to a |
|
392 | This sets PyOS_InputHook to NULL and set the display function to a | |
393 | dummy one and set the timer to a dummy timer that will be triggered |
|
393 | dummy one and set the timer to a dummy timer that will be triggered | |
394 | very far in the future. |
|
394 | very far in the future. | |
395 | """ |
|
395 | """ | |
396 | import OpenGL.GLUT as glut |
|
396 | import OpenGL.GLUT as glut | |
397 | from glut_support import glutMainLoopEvent |
|
397 | from glut_support import glutMainLoopEvent | |
398 |
|
398 | |||
399 | glut.glutHideWindow() # This is an event to be processed below |
|
399 | glut.glutHideWindow() # This is an event to be processed below | |
400 | glutMainLoopEvent() |
|
400 | glutMainLoopEvent() | |
401 | self.clear_inputhook() |
|
401 | self.clear_inputhook() | |
402 |
|
402 | |||
403 | def enable_pyglet(self, app=None): |
|
403 | def enable_pyglet(self, app=None): | |
404 | """Enable event loop integration with pyglet. |
|
404 | """Enable event loop integration with pyglet. | |
405 |
|
405 | |||
406 | Parameters |
|
406 | Parameters | |
407 | ---------- |
|
407 | ---------- | |
408 | app : ignored |
|
408 | app : ignored | |
409 | Ignored, it's only a placeholder to keep the call signature of all |
|
409 | Ignored, it's only a placeholder to keep the call signature of all | |
410 | gui activation methods consistent, which simplifies the logic of |
|
410 | gui activation methods consistent, which simplifies the logic of | |
411 | supporting magics. |
|
411 | supporting magics. | |
412 |
|
412 | |||
413 | Notes |
|
413 | Notes | |
414 | ----- |
|
414 | ----- | |
415 | This methods sets the ``PyOS_InputHook`` for pyglet, which allows |
|
415 | This methods sets the ``PyOS_InputHook`` for pyglet, which allows | |
416 | pyglet to integrate with terminal based applications like |
|
416 | pyglet to integrate with terminal based applications like | |
417 | IPython. |
|
417 | IPython. | |
418 |
|
418 | |||
419 | """ |
|
419 | """ | |
420 | import pyglet |
|
420 | import pyglet | |
421 | from IPython.lib.inputhookpyglet import inputhook_pyglet |
|
421 | from IPython.lib.inputhookpyglet import inputhook_pyglet | |
422 | self.set_inputhook(inputhook_pyglet) |
|
422 | self.set_inputhook(inputhook_pyglet) | |
423 | self._current_gui = GUI_PYGLET |
|
423 | self._current_gui = GUI_PYGLET | |
424 | return app |
|
424 | return app | |
425 |
|
425 | |||
426 | def disable_pyglet(self): |
|
426 | def disable_pyglet(self): | |
427 | """Disable event loop integration with pyglet. |
|
427 | """Disable event loop integration with pyglet. | |
428 |
|
428 | |||
429 | This merely sets PyOS_InputHook to NULL. |
|
429 | This merely sets PyOS_InputHook to NULL. | |
430 | """ |
|
430 | """ | |
431 | self.clear_inputhook() |
|
431 | self.clear_inputhook() | |
432 |
|
432 | |||
433 | def enable_gtk3(self, app=None): |
|
433 | def enable_gtk3(self, app=None): | |
434 | """Enable event loop integration with Gtk3 (gir bindings). |
|
434 | """Enable event loop integration with Gtk3 (gir bindings). | |
435 |
|
435 | |||
436 | Parameters |
|
436 | Parameters | |
437 | ---------- |
|
437 | ---------- | |
438 | app : ignored |
|
438 | app : ignored | |
439 | Ignored, it's only a placeholder to keep the call signature of all |
|
439 | Ignored, it's only a placeholder to keep the call signature of all | |
440 | gui activation methods consistent, which simplifies the logic of |
|
440 | gui activation methods consistent, which simplifies the logic of | |
441 | supporting magics. |
|
441 | supporting magics. | |
442 |
|
442 | |||
443 | Notes |
|
443 | Notes | |
444 | ----- |
|
444 | ----- | |
445 | This methods sets the PyOS_InputHook for Gtk3, which allows |
|
445 | This methods sets the PyOS_InputHook for Gtk3, which allows | |
446 | the Gtk3 to integrate with terminal based applications like |
|
446 | the Gtk3 to integrate with terminal based applications like | |
447 | IPython. |
|
447 | IPython. | |
448 | """ |
|
448 | """ | |
449 | from IPython.lib.inputhookgtk3 import inputhook_gtk3 |
|
449 | from IPython.lib.inputhookgtk3 import inputhook_gtk3 | |
450 | self.set_inputhook(inputhook_gtk3) |
|
450 | self.set_inputhook(inputhook_gtk3) | |
451 | self._current_gui = GUI_GTK |
|
451 | self._current_gui = GUI_GTK | |
452 |
|
452 | |||
453 | def disable_gtk3(self): |
|
453 | def disable_gtk3(self): | |
454 | """Disable event loop integration with PyGTK. |
|
454 | """Disable event loop integration with PyGTK. | |
455 |
|
455 | |||
456 | This merely sets PyOS_InputHook to NULL. |
|
456 | This merely sets PyOS_InputHook to NULL. | |
457 | """ |
|
457 | """ | |
458 | self.clear_inputhook() |
|
458 | self.clear_inputhook() | |
459 |
|
459 | |||
460 | def current_gui(self): |
|
460 | def current_gui(self): | |
461 | """Return a string indicating the currently active GUI or None.""" |
|
461 | """Return a string indicating the currently active GUI or None.""" | |
462 | return self._current_gui |
|
462 | return self._current_gui | |
463 |
|
463 | |||
464 | inputhook_manager = InputHookManager() |
|
464 | inputhook_manager = InputHookManager() | |
465 |
|
465 | |||
466 | enable_wx = inputhook_manager.enable_wx |
|
466 | enable_wx = inputhook_manager.enable_wx | |
467 | disable_wx = inputhook_manager.disable_wx |
|
467 | disable_wx = inputhook_manager.disable_wx | |
468 | enable_qt4 = inputhook_manager.enable_qt4 |
|
468 | enable_qt4 = inputhook_manager.enable_qt4 | |
469 | disable_qt4 = inputhook_manager.disable_qt4 |
|
469 | disable_qt4 = inputhook_manager.disable_qt4 | |
470 | enable_gtk = inputhook_manager.enable_gtk |
|
470 | enable_gtk = inputhook_manager.enable_gtk | |
471 | disable_gtk = inputhook_manager.disable_gtk |
|
471 | disable_gtk = inputhook_manager.disable_gtk | |
472 | enable_tk = inputhook_manager.enable_tk |
|
472 | enable_tk = inputhook_manager.enable_tk | |
473 | disable_tk = inputhook_manager.disable_tk |
|
473 | disable_tk = inputhook_manager.disable_tk | |
474 | enable_glut = inputhook_manager.enable_glut |
|
474 | enable_glut = inputhook_manager.enable_glut | |
475 | disable_glut = inputhook_manager.disable_glut |
|
475 | disable_glut = inputhook_manager.disable_glut | |
476 | enable_pyglet = inputhook_manager.enable_pyglet |
|
476 | enable_pyglet = inputhook_manager.enable_pyglet | |
477 | disable_pyglet = inputhook_manager.disable_pyglet |
|
477 | disable_pyglet = inputhook_manager.disable_pyglet | |
478 | enable_gtk3 = inputhook_manager.enable_gtk3 |
|
478 | enable_gtk3 = inputhook_manager.enable_gtk3 | |
479 | disable_gtk3 = inputhook_manager.disable_gtk3 |
|
479 | disable_gtk3 = inputhook_manager.disable_gtk3 | |
480 | clear_inputhook = inputhook_manager.clear_inputhook |
|
480 | clear_inputhook = inputhook_manager.clear_inputhook | |
481 | set_inputhook = inputhook_manager.set_inputhook |
|
481 | set_inputhook = inputhook_manager.set_inputhook | |
482 | current_gui = inputhook_manager.current_gui |
|
482 | current_gui = inputhook_manager.current_gui | |
483 | clear_app_refs = inputhook_manager.clear_app_refs |
|
483 | clear_app_refs = inputhook_manager.clear_app_refs | |
484 |
|
484 | |||
485 |
|
485 | |||
486 | # Convenience function to switch amongst them |
|
486 | # Convenience function to switch amongst them | |
487 | def enable_gui(gui=None, app=None): |
|
487 | def enable_gui(gui=None, app=None): | |
488 | """Switch amongst GUI input hooks by name. |
|
488 | """Switch amongst GUI input hooks by name. | |
489 |
|
489 | |||
490 | This is just a utility wrapper around the methods of the InputHookManager |
|
490 | This is just a utility wrapper around the methods of the InputHookManager | |
491 | object. |
|
491 | object. | |
492 |
|
492 | |||
493 | Parameters |
|
493 | Parameters | |
494 | ---------- |
|
494 | ---------- | |
495 | gui : optional, string or None |
|
495 | gui : optional, string or None | |
496 | If None (or 'none'), clears input hook, otherwise it must be one |
|
496 | If None (or 'none'), clears input hook, otherwise it must be one | |
497 | of the recognized GUI names (see ``GUI_*`` constants in module). |
|
497 | of the recognized GUI names (see ``GUI_*`` constants in module). | |
498 |
|
498 | |||
499 | app : optional, existing application object. |
|
499 | app : optional, existing application object. | |
500 | For toolkits that have the concept of a global app, you can supply an |
|
500 | For toolkits that have the concept of a global app, you can supply an | |
501 | existing one. If not given, the toolkit will be probed for one, and if |
|
501 | existing one. If not given, the toolkit will be probed for one, and if | |
502 | none is found, a new one will be created. Note that GTK does not have |
|
502 | none is found, a new one will be created. Note that GTK does not have | |
503 | this concept, and passing an app if `gui`=="GTK" will raise an error. |
|
503 | this concept, and passing an app if `gui`=="GTK" will raise an error. | |
504 |
|
504 | |||
505 | Returns |
|
505 | Returns | |
506 | ------- |
|
506 | ------- | |
507 | The output of the underlying gui switch routine, typically the actual |
|
507 | The output of the underlying gui switch routine, typically the actual | |
508 | PyOS_InputHook wrapper object or the GUI toolkit app created, if there was |
|
508 | PyOS_InputHook wrapper object or the GUI toolkit app created, if there was | |
509 | one. |
|
509 | one. | |
510 | """ |
|
510 | """ | |
511 | guis = {None: clear_inputhook, |
|
511 | guis = {None: clear_inputhook, | |
512 | GUI_NONE: clear_inputhook, |
|
512 | GUI_NONE: clear_inputhook, | |
513 | GUI_OSX: lambda app=False: None, |
|
513 | GUI_OSX: lambda app=False: None, | |
514 | GUI_TK: enable_tk, |
|
514 | GUI_TK: enable_tk, | |
515 | GUI_GTK: enable_gtk, |
|
515 | GUI_GTK: enable_gtk, | |
516 | GUI_WX: enable_wx, |
|
516 | GUI_WX: enable_wx, | |
517 | GUI_QT: enable_qt4, # qt3 not supported |
|
517 | GUI_QT: enable_qt4, # qt3 not supported | |
518 | GUI_QT4: enable_qt4, |
|
518 | GUI_QT4: enable_qt4, | |
519 | GUI_GLUT: enable_glut, |
|
519 | GUI_GLUT: enable_glut, | |
520 | GUI_PYGLET: enable_pyglet, |
|
520 | GUI_PYGLET: enable_pyglet, | |
521 | GUI_GTK3: enable_gtk3, |
|
521 | GUI_GTK3: enable_gtk3, | |
522 | } |
|
522 | } | |
523 | try: |
|
523 | try: | |
524 | gui_hook = guis[gui] |
|
524 | gui_hook = guis[gui] | |
525 | except KeyError: |
|
525 | except KeyError: | |
526 | e = "Invalid GUI request %r, valid ones are:%s" % (gui, guis.keys()) |
|
526 | e = "Invalid GUI request %r, valid ones are:%s" % (gui, guis.keys()) | |
527 | raise ValueError(e) |
|
527 | raise ValueError(e) | |
528 | return gui_hook(app) |
|
528 | return gui_hook(app) | |
529 |
|
529 |
@@ -1,583 +1,583 b'' | |||||
1 | # -*- coding: utf-8 -*- |
|
1 | # -*- coding: utf-8 -*- | |
2 | """IPython Test Suite Runner. |
|
2 | """IPython Test Suite Runner. | |
3 |
|
3 | |||
4 | This module provides a main entry point to a user script to test IPython |
|
4 | This module provides a main entry point to a user script to test IPython | |
5 | itself from the command line. There are two ways of running this script: |
|
5 | itself from the command line. There are two ways of running this script: | |
6 |
|
6 | |||
7 | 1. With the syntax `iptest all`. This runs our entire test suite by |
|
7 | 1. With the syntax `iptest all`. This runs our entire test suite by | |
8 | calling this script (with different arguments) recursively. This |
|
8 | calling this script (with different arguments) recursively. This | |
9 | causes modules and package to be tested in different processes, using nose |
|
9 | causes modules and package to be tested in different processes, using nose | |
10 | or trial where appropriate. |
|
10 | or trial where appropriate. | |
11 | 2. With the regular nose syntax, like `iptest -vvs IPython`. In this form |
|
11 | 2. With the regular nose syntax, like `iptest -vvs IPython`. In this form | |
12 | the script simply calls nose, but with special command line flags and |
|
12 | the script simply calls nose, but with special command line flags and | |
13 | plugins loaded. |
|
13 | plugins loaded. | |
14 |
|
14 | |||
15 | """ |
|
15 | """ | |
16 |
|
16 | |||
17 | #----------------------------------------------------------------------------- |
|
17 | #----------------------------------------------------------------------------- | |
18 | # Copyright (C) 2009-2011 The IPython Development Team |
|
18 | # Copyright (C) 2009-2011 The IPython Development Team | |
19 | # |
|
19 | # | |
20 | # Distributed under the terms of the BSD License. The full license is in |
|
20 | # Distributed under the terms of the BSD License. The full license is in | |
21 | # the file COPYING, distributed as part of this software. |
|
21 | # the file COPYING, distributed as part of this software. | |
22 | #----------------------------------------------------------------------------- |
|
22 | #----------------------------------------------------------------------------- | |
23 |
|
23 | |||
24 | #----------------------------------------------------------------------------- |
|
24 | #----------------------------------------------------------------------------- | |
25 | # Imports |
|
25 | # Imports | |
26 | #----------------------------------------------------------------------------- |
|
26 | #----------------------------------------------------------------------------- | |
27 | from __future__ import print_function |
|
27 | from __future__ import print_function | |
28 |
|
28 | |||
29 | # Stdlib |
|
29 | # Stdlib | |
30 | import glob |
|
30 | import glob | |
31 | import os |
|
31 | import os | |
32 | import os.path as path |
|
32 | import os.path as path | |
33 | import signal |
|
33 | import signal | |
34 | import sys |
|
34 | import sys | |
35 | import subprocess |
|
35 | import subprocess | |
36 | import tempfile |
|
36 | import tempfile | |
37 | import time |
|
37 | import time | |
38 | import warnings |
|
38 | import warnings | |
39 |
|
39 | |||
40 | # Note: monkeypatch! |
|
40 | # Note: monkeypatch! | |
41 | # We need to monkeypatch a small problem in nose itself first, before importing |
|
41 | # We need to monkeypatch a small problem in nose itself first, before importing | |
42 | # it for actual use. This should get into nose upstream, but its release cycle |
|
42 | # it for actual use. This should get into nose upstream, but its release cycle | |
43 | # is slow and we need it for our parametric tests to work correctly. |
|
43 | # is slow and we need it for our parametric tests to work correctly. | |
44 | from IPython.testing import nosepatch |
|
44 | from IPython.testing import nosepatch | |
45 |
|
45 | |||
46 | # Monkeypatch extra assert methods into nose.tools if they're not already there. |
|
46 | # Monkeypatch extra assert methods into nose.tools if they're not already there. | |
47 | # This can be dropped once we no longer test on Python 2.6 |
|
47 | # This can be dropped once we no longer test on Python 2.6 | |
48 | from IPython.testing import nose_assert_methods |
|
48 | from IPython.testing import nose_assert_methods | |
49 |
|
49 | |||
50 | # Now, proceed to import nose itself |
|
50 | # Now, proceed to import nose itself | |
51 | import nose.plugins.builtin |
|
51 | import nose.plugins.builtin | |
52 | from nose.plugins.xunit import Xunit |
|
52 | from nose.plugins.xunit import Xunit | |
53 | from nose import SkipTest |
|
53 | from nose import SkipTest | |
54 | from nose.core import TestProgram |
|
54 | from nose.core import TestProgram | |
55 |
|
55 | |||
56 | # Our own imports |
|
56 | # Our own imports | |
57 | from IPython.utils import py3compat |
|
57 | from IPython.utils import py3compat | |
58 | from IPython.utils.importstring import import_item |
|
58 | from IPython.utils.importstring import import_item | |
59 | from IPython.utils.path import get_ipython_module_path, get_ipython_package_dir |
|
59 | from IPython.utils.path import get_ipython_module_path, get_ipython_package_dir | |
60 | from IPython.utils.process import find_cmd, pycmd2argv |
|
60 | from IPython.utils.process import find_cmd, pycmd2argv | |
61 | from IPython.utils.sysinfo import sys_info |
|
61 | from IPython.utils.sysinfo import sys_info | |
62 | from IPython.utils.tempdir import TemporaryDirectory |
|
62 | from IPython.utils.tempdir import TemporaryDirectory | |
63 | from IPython.utils.warn import warn |
|
63 | from IPython.utils.warn import warn | |
64 |
|
64 | |||
65 | from IPython.testing import globalipapp |
|
65 | from IPython.testing import globalipapp | |
66 | from IPython.testing.plugin.ipdoctest import IPythonDoctest |
|
66 | from IPython.testing.plugin.ipdoctest import IPythonDoctest | |
67 | from IPython.external.decorators import KnownFailure, knownfailureif |
|
67 | from IPython.external.decorators import KnownFailure, knownfailureif | |
68 |
|
68 | |||
69 | pjoin = path.join |
|
69 | pjoin = path.join | |
70 |
|
70 | |||
71 |
|
71 | |||
72 | #----------------------------------------------------------------------------- |
|
72 | #----------------------------------------------------------------------------- | |
73 | # Globals |
|
73 | # Globals | |
74 | #----------------------------------------------------------------------------- |
|
74 | #----------------------------------------------------------------------------- | |
75 |
|
75 | |||
76 |
|
76 | |||
77 | #----------------------------------------------------------------------------- |
|
77 | #----------------------------------------------------------------------------- | |
78 | # Warnings control |
|
78 | # Warnings control | |
79 | #----------------------------------------------------------------------------- |
|
79 | #----------------------------------------------------------------------------- | |
80 |
|
80 | |||
81 | # Twisted generates annoying warnings with Python 2.6, as will do other code |
|
81 | # Twisted generates annoying warnings with Python 2.6, as will do other code | |
82 | # that imports 'sets' as of today |
|
82 | # that imports 'sets' as of today | |
83 | warnings.filterwarnings('ignore', 'the sets module is deprecated', |
|
83 | warnings.filterwarnings('ignore', 'the sets module is deprecated', | |
84 | DeprecationWarning ) |
|
84 | DeprecationWarning ) | |
85 |
|
85 | |||
86 | # This one also comes from Twisted |
|
86 | # This one also comes from Twisted | |
87 | warnings.filterwarnings('ignore', 'the sha module is deprecated', |
|
87 | warnings.filterwarnings('ignore', 'the sha module is deprecated', | |
88 | DeprecationWarning) |
|
88 | DeprecationWarning) | |
89 |
|
89 | |||
90 | # Wx on Fedora11 spits these out |
|
90 | # Wx on Fedora11 spits these out | |
91 | warnings.filterwarnings('ignore', 'wxPython/wxWidgets release number mismatch', |
|
91 | warnings.filterwarnings('ignore', 'wxPython/wxWidgets release number mismatch', | |
92 | UserWarning) |
|
92 | UserWarning) | |
93 |
|
93 | |||
94 | # ------------------------------------------------------------------------------ |
|
94 | # ------------------------------------------------------------------------------ | |
95 | # Monkeypatch Xunit to count known failures as skipped. |
|
95 | # Monkeypatch Xunit to count known failures as skipped. | |
96 | # ------------------------------------------------------------------------------ |
|
96 | # ------------------------------------------------------------------------------ | |
97 | def monkeypatch_xunit(): |
|
97 | def monkeypatch_xunit(): | |
98 | try: |
|
98 | try: | |
99 | knownfailureif(True)(lambda: None)() |
|
99 | knownfailureif(True)(lambda: None)() | |
100 | except Exception as e: |
|
100 | except Exception as e: | |
101 | KnownFailureTest = type(e) |
|
101 | KnownFailureTest = type(e) | |
102 |
|
102 | |||
103 | def addError(self, test, err, capt=None): |
|
103 | def addError(self, test, err, capt=None): | |
104 | if issubclass(err[0], KnownFailureTest): |
|
104 | if issubclass(err[0], KnownFailureTest): | |
105 | err = (SkipTest,) + err[1:] |
|
105 | err = (SkipTest,) + err[1:] | |
106 | return self.orig_addError(test, err, capt) |
|
106 | return self.orig_addError(test, err, capt) | |
107 |
|
107 | |||
108 | Xunit.orig_addError = Xunit.addError |
|
108 | Xunit.orig_addError = Xunit.addError | |
109 | Xunit.addError = addError |
|
109 | Xunit.addError = addError | |
110 |
|
110 | |||
111 | #----------------------------------------------------------------------------- |
|
111 | #----------------------------------------------------------------------------- | |
112 | # Logic for skipping doctests |
|
112 | # Logic for skipping doctests | |
113 | #----------------------------------------------------------------------------- |
|
113 | #----------------------------------------------------------------------------- | |
114 | def extract_version(mod): |
|
114 | def extract_version(mod): | |
115 | return mod.__version__ |
|
115 | return mod.__version__ | |
116 |
|
116 | |||
117 | def test_for(item, min_version=None, callback=extract_version): |
|
117 | def test_for(item, min_version=None, callback=extract_version): | |
118 | """Test to see if item is importable, and optionally check against a minimum |
|
118 | """Test to see if item is importable, and optionally check against a minimum | |
119 | version. |
|
119 | version. | |
120 |
|
120 | |||
121 | If min_version is given, the default behavior is to check against the |
|
121 | If min_version is given, the default behavior is to check against the | |
122 | `__version__` attribute of the item, but specifying `callback` allows you to |
|
122 | `__version__` attribute of the item, but specifying `callback` allows you to | |
123 | extract the value you are interested in. e.g:: |
|
123 | extract the value you are interested in. e.g:: | |
124 |
|
124 | |||
125 | In [1]: import sys |
|
125 | In [1]: import sys | |
126 |
|
126 | |||
127 | In [2]: from IPython.testing.iptest import test_for |
|
127 | In [2]: from IPython.testing.iptest import test_for | |
128 |
|
128 | |||
129 | In [3]: test_for('sys', (2,6), callback=lambda sys: sys.version_info) |
|
129 | In [3]: test_for('sys', (2,6), callback=lambda sys: sys.version_info) | |
130 | Out[3]: True |
|
130 | Out[3]: True | |
131 |
|
131 | |||
132 | """ |
|
132 | """ | |
133 | try: |
|
133 | try: | |
134 | check = import_item(item) |
|
134 | check = import_item(item) | |
135 | except (ImportError, RuntimeError): |
|
135 | except (ImportError, RuntimeError): | |
136 | # GTK reports Runtime error if it can't be initialized even if it's |
|
136 | # GTK reports Runtime error if it can't be initialized even if it's | |
137 | # importable. |
|
137 | # importable. | |
138 | return False |
|
138 | return False | |
139 | else: |
|
139 | else: | |
140 | if min_version: |
|
140 | if min_version: | |
141 | if callback: |
|
141 | if callback: | |
142 | # extra processing step to get version to compare |
|
142 | # extra processing step to get version to compare | |
143 | check = callback(check) |
|
143 | check = callback(check) | |
144 |
|
144 | |||
145 | return check >= min_version |
|
145 | return check >= min_version | |
146 | else: |
|
146 | else: | |
147 | return True |
|
147 | return True | |
148 |
|
148 | |||
149 | # Global dict where we can store information on what we have and what we don't |
|
149 | # Global dict where we can store information on what we have and what we don't | |
150 | # have available at test run time |
|
150 | # have available at test run time | |
151 | have = {} |
|
151 | have = {} | |
152 |
|
152 | |||
153 | have['curses'] = test_for('_curses') |
|
153 | have['curses'] = test_for('_curses') | |
154 | have['matplotlib'] = test_for('matplotlib') |
|
154 | have['matplotlib'] = test_for('matplotlib') | |
155 | have['numpy'] = test_for('numpy') |
|
155 | have['numpy'] = test_for('numpy') | |
156 | have['pexpect'] = test_for('IPython.external.pexpect') |
|
156 | have['pexpect'] = test_for('IPython.external.pexpect') | |
157 | have['pymongo'] = test_for('pymongo') |
|
157 | have['pymongo'] = test_for('pymongo') | |
158 | have['pygments'] = test_for('pygments') |
|
158 | have['pygments'] = test_for('pygments') | |
159 | have['qt'] = test_for('IPython.external.qt') |
|
159 | have['qt'] = test_for('IPython.external.qt') | |
160 | have['rpy2'] = test_for('rpy2') |
|
160 | have['rpy2'] = test_for('rpy2') | |
161 | have['sqlite3'] = test_for('sqlite3') |
|
161 | have['sqlite3'] = test_for('sqlite3') | |
162 | have['cython'] = test_for('Cython') |
|
162 | have['cython'] = test_for('Cython') | |
163 | have['oct2py'] = test_for('oct2py') |
|
163 | have['oct2py'] = test_for('oct2py') | |
164 | have['tornado'] = test_for('tornado.version_info', (2,1,0), callback=None) |
|
164 | have['tornado'] = test_for('tornado.version_info', (2,1,0), callback=None) | |
165 | have['wx'] = test_for('wx') |
|
165 | have['wx'] = test_for('wx') | |
166 | have['wx.aui'] = test_for('wx.aui') |
|
166 | have['wx.aui'] = test_for('wx.aui') | |
167 | have['azure'] = test_for('azure') |
|
167 | have['azure'] = test_for('azure') | |
168 |
|
168 | |||
169 | if os.name == 'nt': |
|
169 | if os.name == 'nt': | |
170 | min_zmq = (2,1,7) |
|
170 | min_zmq = (2,1,7) | |
171 | else: |
|
171 | else: | |
172 | min_zmq = (2,1,4) |
|
172 | min_zmq = (2,1,4) | |
173 |
|
173 | |||
174 | def version_tuple(mod): |
|
174 | def version_tuple(mod): | |
175 | "turn '2.1.9' into (2,1,9), and '2.1dev' into (2,1,999)" |
|
175 | "turn '2.1.9' into (2,1,9), and '2.1dev' into (2,1,999)" | |
176 | # turn 'dev' into 999, because Python3 rejects str-int comparisons |
|
176 | # turn 'dev' into 999, because Python3 rejects str-int comparisons | |
177 | vs = mod.__version__.replace('dev', '.999') |
|
177 | vs = mod.__version__.replace('dev', '.999') | |
178 | tup = tuple([int(v) for v in vs.split('.') ]) |
|
178 | tup = tuple([int(v) for v in vs.split('.') ]) | |
179 | return tup |
|
179 | return tup | |
180 |
|
180 | |||
181 | have['zmq'] = test_for('zmq', min_zmq, version_tuple) |
|
181 | have['zmq'] = test_for('zmq', min_zmq, version_tuple) | |
182 |
|
182 | |||
183 | #----------------------------------------------------------------------------- |
|
183 | #----------------------------------------------------------------------------- | |
184 | # Functions and classes |
|
184 | # Functions and classes | |
185 | #----------------------------------------------------------------------------- |
|
185 | #----------------------------------------------------------------------------- | |
186 |
|
186 | |||
187 | def report(): |
|
187 | def report(): | |
188 | """Return a string with a summary report of test-related variables.""" |
|
188 | """Return a string with a summary report of test-related variables.""" | |
189 |
|
189 | |||
190 | out = [ sys_info(), '\n'] |
|
190 | out = [ sys_info(), '\n'] | |
191 |
|
191 | |||
192 | avail = [] |
|
192 | avail = [] | |
193 | not_avail = [] |
|
193 | not_avail = [] | |
194 |
|
194 | |||
195 | for k, is_avail in have.items(): |
|
195 | for k, is_avail in have.items(): | |
196 | if is_avail: |
|
196 | if is_avail: | |
197 | avail.append(k) |
|
197 | avail.append(k) | |
198 | else: |
|
198 | else: | |
199 | not_avail.append(k) |
|
199 | not_avail.append(k) | |
200 |
|
200 | |||
201 | if avail: |
|
201 | if avail: | |
202 | out.append('\nTools and libraries available at test time:\n') |
|
202 | out.append('\nTools and libraries available at test time:\n') | |
203 | avail.sort() |
|
203 | avail.sort() | |
204 | out.append(' ' + ' '.join(avail)+'\n') |
|
204 | out.append(' ' + ' '.join(avail)+'\n') | |
205 |
|
205 | |||
206 | if not_avail: |
|
206 | if not_avail: | |
207 | out.append('\nTools and libraries NOT available at test time:\n') |
|
207 | out.append('\nTools and libraries NOT available at test time:\n') | |
208 | not_avail.sort() |
|
208 | not_avail.sort() | |
209 | out.append(' ' + ' '.join(not_avail)+'\n') |
|
209 | out.append(' ' + ' '.join(not_avail)+'\n') | |
210 |
|
210 | |||
211 | return ''.join(out) |
|
211 | return ''.join(out) | |
212 |
|
212 | |||
213 |
|
213 | |||
214 | def make_exclude(): |
|
214 | def make_exclude(): | |
215 | """Make patterns of modules and packages to exclude from testing. |
|
215 | """Make patterns of modules and packages to exclude from testing. | |
216 |
|
216 | |||
217 | For the IPythonDoctest plugin, we need to exclude certain patterns that |
|
217 | For the IPythonDoctest plugin, we need to exclude certain patterns that | |
218 | cause testing problems. We should strive to minimize the number of |
|
218 | cause testing problems. We should strive to minimize the number of | |
219 | skipped modules, since this means untested code. |
|
219 | skipped modules, since this means untested code. | |
220 |
|
220 | |||
221 | These modules and packages will NOT get scanned by nose at all for tests. |
|
221 | These modules and packages will NOT get scanned by nose at all for tests. | |
222 | """ |
|
222 | """ | |
223 | # Simple utility to make IPython paths more readably, we need a lot of |
|
223 | # Simple utility to make IPython paths more readably, we need a lot of | |
224 | # these below |
|
224 | # these below | |
225 | ipjoin = lambda *paths: pjoin('IPython', *paths) |
|
225 | ipjoin = lambda *paths: pjoin('IPython', *paths) | |
226 |
|
226 | |||
227 | exclusions = [ipjoin('external'), |
|
227 | exclusions = [ipjoin('external'), | |
228 | ipjoin('quarantine'), |
|
228 | ipjoin('quarantine'), | |
229 | ipjoin('deathrow'), |
|
229 | ipjoin('deathrow'), | |
230 | # This guy is probably attic material |
|
230 | # This guy is probably attic material | |
231 | ipjoin('testing', 'mkdoctests'), |
|
231 | ipjoin('testing', 'mkdoctests'), | |
232 | # Testing inputhook will need a lot of thought, to figure out |
|
232 | # Testing inputhook will need a lot of thought, to figure out | |
233 | # how to have tests that don't lock up with the gui event |
|
233 | # how to have tests that don't lock up with the gui event | |
234 | # loops in the picture |
|
234 | # loops in the picture | |
235 | ipjoin('lib', 'inputhook'), |
|
235 | ipjoin('lib', 'inputhook'), | |
236 | # Config files aren't really importable stand-alone |
|
236 | # Config files aren't really importable stand-alone | |
237 | ipjoin('config', 'profile'), |
|
237 | ipjoin('config', 'profile'), | |
238 | # The notebook 'static' directory contains JS, css and other |
|
238 | # The notebook 'static' directory contains JS, css and other | |
239 | # files for web serving. Occasionally projects may put a .py |
|
239 | # files for web serving. Occasionally projects may put a .py | |
240 | # file in there (MathJax ships a conf.py), so we might as |
|
240 | # file in there (MathJax ships a conf.py), so we might as | |
241 | # well play it safe and skip the whole thing. |
|
241 | # well play it safe and skip the whole thing. | |
242 | ipjoin('frontend', 'html', 'notebook', 'static') |
|
242 | ipjoin('frontend', 'html', 'notebook', 'static') | |
243 | ] |
|
243 | ] | |
244 | if not have['sqlite3']: |
|
244 | if not have['sqlite3']: | |
245 | exclusions.append(ipjoin('core', 'tests', 'test_history')) |
|
245 | exclusions.append(ipjoin('core', 'tests', 'test_history')) | |
246 | exclusions.append(ipjoin('core', 'history')) |
|
246 | exclusions.append(ipjoin('core', 'history')) | |
247 | if not have['wx']: |
|
247 | if not have['wx']: | |
248 | exclusions.append(ipjoin('lib', 'inputhookwx')) |
|
248 | exclusions.append(ipjoin('lib', 'inputhookwx')) | |
249 |
|
249 | |||
250 | # FIXME: temporarily disable autoreload tests, as they can produce |
|
250 | # FIXME: temporarily disable autoreload tests, as they can produce | |
251 | # spurious failures in subsequent tests (cythonmagic). |
|
251 | # spurious failures in subsequent tests (cythonmagic). | |
252 | exclusions.append(ipjoin('extensions', 'autoreload')) |
|
252 | exclusions.append(ipjoin('extensions', 'autoreload')) | |
253 | exclusions.append(ipjoin('extensions', 'tests', 'test_autoreload')) |
|
253 | exclusions.append(ipjoin('extensions', 'tests', 'test_autoreload')) | |
254 |
|
254 | |||
255 | # We do this unconditionally, so that the test suite doesn't import |
|
255 | # We do this unconditionally, so that the test suite doesn't import | |
256 | # gtk, changing the default encoding and masking some unicode bugs. |
|
256 | # gtk, changing the default encoding and masking some unicode bugs. | |
257 | exclusions.append(ipjoin('lib', 'inputhookgtk')) |
|
257 | exclusions.append(ipjoin('lib', 'inputhookgtk')) | |
258 | exclusions.append(ipjoin('zmq', 'gui', 'gtkembed')) |
|
258 | exclusions.append(ipjoin('zmq', 'gui', 'gtkembed')) | |
259 |
|
259 | |||
260 | # These have to be skipped on win32 because the use echo, rm, cd, etc. |
|
260 | # These have to be skipped on win32 because the use echo, rm, cd, etc. | |
261 | # See ticket https://github.com/ipython/ipython/issues/87 |
|
261 | # See ticket https://github.com/ipython/ipython/issues/87 | |
262 | if sys.platform == 'win32': |
|
262 | if sys.platform == 'win32': | |
263 | exclusions.append(ipjoin('testing', 'plugin', 'test_exampleip')) |
|
263 | exclusions.append(ipjoin('testing', 'plugin', 'test_exampleip')) | |
264 | exclusions.append(ipjoin('testing', 'plugin', 'dtexample')) |
|
264 | exclusions.append(ipjoin('testing', 'plugin', 'dtexample')) | |
265 |
|
265 | |||
266 | if not have['pexpect']: |
|
266 | if not have['pexpect']: | |
267 | exclusions.extend([ipjoin('lib', 'irunner'), |
|
267 | exclusions.extend([ipjoin('lib', 'irunner'), | |
268 | ipjoin('lib', 'tests', 'test_irunner'), |
|
268 | ipjoin('lib', 'tests', 'test_irunner'), | |
269 | ipjoin('frontend', 'terminal', 'console'), |
|
269 | ipjoin('frontend', 'terminal', 'console'), | |
270 | ]) |
|
270 | ]) | |
271 |
|
271 | |||
272 | if not have['zmq']: |
|
272 | if not have['zmq']: | |
273 | exclusions.append(ipjoin('zmq')) |
|
273 | exclusions.append(ipjoin('zmq')) | |
274 | exclusions.append(ipjoin('frontend', 'qt')) |
|
274 | exclusions.append(ipjoin('frontend', 'qt')) | |
275 | exclusions.append(ipjoin('frontend', 'html')) |
|
275 | exclusions.append(ipjoin('frontend', 'html')) | |
276 | exclusions.append(ipjoin('frontend', 'consoleapp.py')) |
|
276 | exclusions.append(ipjoin('frontend', 'consoleapp.py')) | |
277 | exclusions.append(ipjoin('frontend', 'terminal', 'console')) |
|
277 | exclusions.append(ipjoin('frontend', 'terminal', 'console')) | |
278 | exclusions.append(ipjoin('parallel')) |
|
278 | exclusions.append(ipjoin('parallel')) | |
279 | elif not have['qt'] or not have['pygments']: |
|
279 | elif not have['qt'] or not have['pygments']: | |
280 | exclusions.append(ipjoin('frontend', 'qt')) |
|
280 | exclusions.append(ipjoin('frontend', 'qt')) | |
281 |
|
281 | |||
282 | if not have['pymongo']: |
|
282 | if not have['pymongo']: | |
283 | exclusions.append(ipjoin('parallel', 'controller', 'mongodb')) |
|
283 | exclusions.append(ipjoin('parallel', 'controller', 'mongodb')) | |
284 | exclusions.append(ipjoin('parallel', 'tests', 'test_mongodb')) |
|
284 | exclusions.append(ipjoin('parallel', 'tests', 'test_mongodb')) | |
285 |
|
285 | |||
286 | if not have['matplotlib']: |
|
286 | if not have['matplotlib']: | |
287 | exclusions.extend([ipjoin('core', 'pylabtools'), |
|
287 | exclusions.extend([ipjoin('core', 'pylabtools'), | |
288 | ipjoin('core', 'tests', 'test_pylabtools'), |
|
288 | ipjoin('core', 'tests', 'test_pylabtools'), | |
289 | ipjoin('zmq', 'pylab'), |
|
289 | ipjoin('zmq', 'pylab'), | |
290 | ]) |
|
290 | ]) | |
291 |
|
291 | |||
292 | if not have['cython']: |
|
292 | if not have['cython']: | |
293 | exclusions.extend([ipjoin('extensions', 'cythonmagic')]) |
|
293 | exclusions.extend([ipjoin('extensions', 'cythonmagic')]) | |
294 | exclusions.extend([ipjoin('extensions', 'tests', 'test_cythonmagic')]) |
|
294 | exclusions.extend([ipjoin('extensions', 'tests', 'test_cythonmagic')]) | |
295 |
|
295 | |||
296 | if not have['oct2py']: |
|
296 | if not have['oct2py']: | |
297 | exclusions.extend([ipjoin('extensions', 'octavemagic')]) |
|
297 | exclusions.extend([ipjoin('extensions', 'octavemagic')]) | |
298 | exclusions.extend([ipjoin('extensions', 'tests', 'test_octavemagic')]) |
|
298 | exclusions.extend([ipjoin('extensions', 'tests', 'test_octavemagic')]) | |
299 |
|
299 | |||
300 | if not have['tornado']: |
|
300 | if not have['tornado']: | |
301 | exclusions.append(ipjoin('frontend', 'html')) |
|
301 | exclusions.append(ipjoin('frontend', 'html')) | |
302 |
|
302 | |||
303 | if not have['rpy2'] or not have['numpy']: |
|
303 | if not have['rpy2'] or not have['numpy']: | |
304 | exclusions.append(ipjoin('extensions', 'rmagic')) |
|
304 | exclusions.append(ipjoin('extensions', 'rmagic')) | |
305 | exclusions.append(ipjoin('extensions', 'tests', 'test_rmagic')) |
|
305 | exclusions.append(ipjoin('extensions', 'tests', 'test_rmagic')) | |
306 |
|
306 | |||
307 | if not have['azure']: |
|
307 | if not have['azure']: | |
308 | exclusions.append(ipjoin('frontend', 'html', 'notebook', 'azurenbmanager')) |
|
308 | exclusions.append(ipjoin('frontend', 'html', 'notebook', 'azurenbmanager')) | |
309 |
|
309 | |||
310 | # This is needed for the reg-exp to match on win32 in the ipdoctest plugin. |
|
310 | # This is needed for the reg-exp to match on win32 in the ipdoctest plugin. | |
311 | if sys.platform == 'win32': |
|
311 | if sys.platform == 'win32': | |
312 | exclusions = [s.replace('\\','\\\\') for s in exclusions] |
|
312 | exclusions = [s.replace('\\','\\\\') for s in exclusions] | |
313 |
|
313 | |||
314 | # check for any exclusions that don't seem to exist: |
|
314 | # check for any exclusions that don't seem to exist: | |
315 | parent, _ = os.path.split(get_ipython_package_dir()) |
|
315 | parent, _ = os.path.split(get_ipython_package_dir()) | |
316 | for exclusion in exclusions: |
|
316 | for exclusion in exclusions: | |
317 | if exclusion.endswith(('deathrow', 'quarantine')): |
|
317 | if exclusion.endswith(('deathrow', 'quarantine')): | |
318 | # ignore deathrow/quarantine, which exist in dev, but not install |
|
318 | # ignore deathrow/quarantine, which exist in dev, but not install | |
319 | continue |
|
319 | continue | |
320 | fullpath = pjoin(parent, exclusion) |
|
320 | fullpath = pjoin(parent, exclusion) | |
321 | if not os.path.exists(fullpath) and not glob.glob(fullpath + '.*'): |
|
321 | if not os.path.exists(fullpath) and not glob.glob(fullpath + '.*'): | |
322 |
warn("Excluding nonexistent file: %r |
|
322 | warn("Excluding nonexistent file: %r" % exclusion) | |
323 |
|
323 | |||
324 | return exclusions |
|
324 | return exclusions | |
325 |
|
325 | |||
326 |
|
326 | |||
327 | class IPTester(object): |
|
327 | class IPTester(object): | |
328 | """Call that calls iptest or trial in a subprocess. |
|
328 | """Call that calls iptest or trial in a subprocess. | |
329 | """ |
|
329 | """ | |
330 | #: string, name of test runner that will be called |
|
330 | #: string, name of test runner that will be called | |
331 | runner = None |
|
331 | runner = None | |
332 | #: list, parameters for test runner |
|
332 | #: list, parameters for test runner | |
333 | params = None |
|
333 | params = None | |
334 | #: list, arguments of system call to be made to call test runner |
|
334 | #: list, arguments of system call to be made to call test runner | |
335 | call_args = None |
|
335 | call_args = None | |
336 | #: list, subprocesses we start (for cleanup) |
|
336 | #: list, subprocesses we start (for cleanup) | |
337 | processes = None |
|
337 | processes = None | |
338 | #: str, coverage xml output file |
|
338 | #: str, coverage xml output file | |
339 | coverage_xml = None |
|
339 | coverage_xml = None | |
340 |
|
340 | |||
341 | def __init__(self, runner='iptest', params=None): |
|
341 | def __init__(self, runner='iptest', params=None): | |
342 | """Create new test runner.""" |
|
342 | """Create new test runner.""" | |
343 | p = os.path |
|
343 | p = os.path | |
344 | if runner == 'iptest': |
|
344 | if runner == 'iptest': | |
345 | iptest_app = get_ipython_module_path('IPython.testing.iptest') |
|
345 | iptest_app = get_ipython_module_path('IPython.testing.iptest') | |
346 | self.runner = pycmd2argv(iptest_app) + sys.argv[1:] |
|
346 | self.runner = pycmd2argv(iptest_app) + sys.argv[1:] | |
347 | else: |
|
347 | else: | |
348 | raise Exception('Not a valid test runner: %s' % repr(runner)) |
|
348 | raise Exception('Not a valid test runner: %s' % repr(runner)) | |
349 | if params is None: |
|
349 | if params is None: | |
350 | params = [] |
|
350 | params = [] | |
351 | if isinstance(params, str): |
|
351 | if isinstance(params, str): | |
352 | params = [params] |
|
352 | params = [params] | |
353 | self.params = params |
|
353 | self.params = params | |
354 |
|
354 | |||
355 | # Assemble call |
|
355 | # Assemble call | |
356 | self.call_args = self.runner+self.params |
|
356 | self.call_args = self.runner+self.params | |
357 |
|
357 | |||
358 | # Find the section we're testing (IPython.foo) |
|
358 | # Find the section we're testing (IPython.foo) | |
359 | for sect in self.params: |
|
359 | for sect in self.params: | |
360 | if sect.startswith('IPython'): break |
|
360 | if sect.startswith('IPython'): break | |
361 | else: |
|
361 | else: | |
362 | raise ValueError("Section not found", self.params) |
|
362 | raise ValueError("Section not found", self.params) | |
363 |
|
363 | |||
364 | if '--with-xunit' in self.call_args: |
|
364 | if '--with-xunit' in self.call_args: | |
365 |
|
365 | |||
366 | self.call_args.append('--xunit-file') |
|
366 | self.call_args.append('--xunit-file') | |
367 | # FIXME: when Windows uses subprocess.call, these extra quotes are unnecessary: |
|
367 | # FIXME: when Windows uses subprocess.call, these extra quotes are unnecessary: | |
368 | xunit_file = path.abspath(sect+'.xunit.xml') |
|
368 | xunit_file = path.abspath(sect+'.xunit.xml') | |
369 | if sys.platform == 'win32': |
|
369 | if sys.platform == 'win32': | |
370 | xunit_file = '"%s"' % xunit_file |
|
370 | xunit_file = '"%s"' % xunit_file | |
371 | self.call_args.append(xunit_file) |
|
371 | self.call_args.append(xunit_file) | |
372 |
|
372 | |||
373 | if '--with-xml-coverage' in self.call_args: |
|
373 | if '--with-xml-coverage' in self.call_args: | |
374 | self.coverage_xml = path.abspath(sect+".coverage.xml") |
|
374 | self.coverage_xml = path.abspath(sect+".coverage.xml") | |
375 | self.call_args.remove('--with-xml-coverage') |
|
375 | self.call_args.remove('--with-xml-coverage') | |
376 | self.call_args = ["coverage", "run", "--source="+sect] + self.call_args[1:] |
|
376 | self.call_args = ["coverage", "run", "--source="+sect] + self.call_args[1:] | |
377 |
|
377 | |||
378 | # Store anything we start to clean up on deletion |
|
378 | # Store anything we start to clean up on deletion | |
379 | self.processes = [] |
|
379 | self.processes = [] | |
380 |
|
380 | |||
381 | def _run_cmd(self): |
|
381 | def _run_cmd(self): | |
382 | with TemporaryDirectory() as IPYTHONDIR: |
|
382 | with TemporaryDirectory() as IPYTHONDIR: | |
383 | env = os.environ.copy() |
|
383 | env = os.environ.copy() | |
384 | env['IPYTHONDIR'] = IPYTHONDIR |
|
384 | env['IPYTHONDIR'] = IPYTHONDIR | |
385 | # print >> sys.stderr, '*** CMD:', ' '.join(self.call_args) # dbg |
|
385 | # print >> sys.stderr, '*** CMD:', ' '.join(self.call_args) # dbg | |
386 | subp = subprocess.Popen(self.call_args, env=env) |
|
386 | subp = subprocess.Popen(self.call_args, env=env) | |
387 | self.processes.append(subp) |
|
387 | self.processes.append(subp) | |
388 | # If this fails, the process will be left in self.processes and |
|
388 | # If this fails, the process will be left in self.processes and | |
389 | # cleaned up later, but if the wait call succeeds, then we can |
|
389 | # cleaned up later, but if the wait call succeeds, then we can | |
390 | # clear the stored process. |
|
390 | # clear the stored process. | |
391 | retcode = subp.wait() |
|
391 | retcode = subp.wait() | |
392 | self.processes.pop() |
|
392 | self.processes.pop() | |
393 | return retcode |
|
393 | return retcode | |
394 |
|
394 | |||
395 | def run(self): |
|
395 | def run(self): | |
396 | """Run the stored commands""" |
|
396 | """Run the stored commands""" | |
397 | try: |
|
397 | try: | |
398 | retcode = self._run_cmd() |
|
398 | retcode = self._run_cmd() | |
399 | except: |
|
399 | except: | |
400 | import traceback |
|
400 | import traceback | |
401 | traceback.print_exc() |
|
401 | traceback.print_exc() | |
402 | return 1 # signal failure |
|
402 | return 1 # signal failure | |
403 |
|
403 | |||
404 | if self.coverage_xml: |
|
404 | if self.coverage_xml: | |
405 | subprocess.call(["coverage", "xml", "-o", self.coverage_xml]) |
|
405 | subprocess.call(["coverage", "xml", "-o", self.coverage_xml]) | |
406 | return retcode |
|
406 | return retcode | |
407 |
|
407 | |||
408 | def __del__(self): |
|
408 | def __del__(self): | |
409 | """Cleanup on exit by killing any leftover processes.""" |
|
409 | """Cleanup on exit by killing any leftover processes.""" | |
410 | for subp in self.processes: |
|
410 | for subp in self.processes: | |
411 | if subp.poll() is not None: |
|
411 | if subp.poll() is not None: | |
412 | continue # process is already dead |
|
412 | continue # process is already dead | |
413 |
|
413 | |||
414 | try: |
|
414 | try: | |
415 | print('Cleaning stale PID: %d' % subp.pid) |
|
415 | print('Cleaning stale PID: %d' % subp.pid) | |
416 | subp.kill() |
|
416 | subp.kill() | |
417 | except: # (OSError, WindowsError) ? |
|
417 | except: # (OSError, WindowsError) ? | |
418 | # This is just a best effort, if we fail or the process was |
|
418 | # This is just a best effort, if we fail or the process was | |
419 | # really gone, ignore it. |
|
419 | # really gone, ignore it. | |
420 | pass |
|
420 | pass | |
421 |
|
421 | |||
422 | if subp.poll() is None: |
|
422 | if subp.poll() is None: | |
423 | # The process did not die... |
|
423 | # The process did not die... | |
424 | print('... failed. Manual cleanup may be required.' |
|
424 | print('... failed. Manual cleanup may be required.' | |
425 | % subp.pid) |
|
425 | % subp.pid) | |
426 |
|
426 | |||
427 | def make_runners(inc_slow=False): |
|
427 | def make_runners(inc_slow=False): | |
428 | """Define the top-level packages that need to be tested. |
|
428 | """Define the top-level packages that need to be tested. | |
429 | """ |
|
429 | """ | |
430 |
|
430 | |||
431 | # Packages to be tested via nose, that only depend on the stdlib |
|
431 | # Packages to be tested via nose, that only depend on the stdlib | |
432 | nose_pkg_names = ['config', 'core', 'extensions', 'frontend', 'lib', |
|
432 | nose_pkg_names = ['config', 'core', 'extensions', 'frontend', 'lib', | |
433 | 'testing', 'utils', 'nbformat' ] |
|
433 | 'testing', 'utils', 'nbformat' ] | |
434 |
|
434 | |||
435 | if have['zmq']: |
|
435 | if have['zmq']: | |
436 | nose_pkg_names.append('zmq') |
|
436 | nose_pkg_names.append('zmq') | |
437 | if inc_slow: |
|
437 | if inc_slow: | |
438 | nose_pkg_names.append('parallel') |
|
438 | nose_pkg_names.append('parallel') | |
439 |
|
439 | |||
440 | # For debugging this code, only load quick stuff |
|
440 | # For debugging this code, only load quick stuff | |
441 | #nose_pkg_names = ['core', 'extensions'] # dbg |
|
441 | #nose_pkg_names = ['core', 'extensions'] # dbg | |
442 |
|
442 | |||
443 | # Make fully qualified package names prepending 'IPython.' to our name lists |
|
443 | # Make fully qualified package names prepending 'IPython.' to our name lists | |
444 | nose_packages = ['IPython.%s' % m for m in nose_pkg_names ] |
|
444 | nose_packages = ['IPython.%s' % m for m in nose_pkg_names ] | |
445 |
|
445 | |||
446 | # Make runners |
|
446 | # Make runners | |
447 | runners = [ (v, IPTester('iptest', params=v)) for v in nose_packages ] |
|
447 | runners = [ (v, IPTester('iptest', params=v)) for v in nose_packages ] | |
448 |
|
448 | |||
449 | return runners |
|
449 | return runners | |
450 |
|
450 | |||
451 |
|
451 | |||
452 | def run_iptest(): |
|
452 | def run_iptest(): | |
453 | """Run the IPython test suite using nose. |
|
453 | """Run the IPython test suite using nose. | |
454 |
|
454 | |||
455 | This function is called when this script is **not** called with the form |
|
455 | This function is called when this script is **not** called with the form | |
456 | `iptest all`. It simply calls nose with appropriate command line flags |
|
456 | `iptest all`. It simply calls nose with appropriate command line flags | |
457 | and accepts all of the standard nose arguments. |
|
457 | and accepts all of the standard nose arguments. | |
458 | """ |
|
458 | """ | |
459 | # Apply our monkeypatch to Xunit |
|
459 | # Apply our monkeypatch to Xunit | |
460 | if '--with-xunit' in sys.argv and not hasattr(Xunit, 'orig_addError'): |
|
460 | if '--with-xunit' in sys.argv and not hasattr(Xunit, 'orig_addError'): | |
461 | monkeypatch_xunit() |
|
461 | monkeypatch_xunit() | |
462 |
|
462 | |||
463 | warnings.filterwarnings('ignore', |
|
463 | warnings.filterwarnings('ignore', | |
464 | 'This will be removed soon. Use IPython.testing.util instead') |
|
464 | 'This will be removed soon. Use IPython.testing.util instead') | |
465 |
|
465 | |||
466 | argv = sys.argv + [ '--detailed-errors', # extra info in tracebacks |
|
466 | argv = sys.argv + [ '--detailed-errors', # extra info in tracebacks | |
467 |
|
467 | |||
468 | '--with-ipdoctest', |
|
468 | '--with-ipdoctest', | |
469 | '--ipdoctest-tests','--ipdoctest-extension=txt', |
|
469 | '--ipdoctest-tests','--ipdoctest-extension=txt', | |
470 |
|
470 | |||
471 | # We add --exe because of setuptools' imbecility (it |
|
471 | # We add --exe because of setuptools' imbecility (it | |
472 | # blindly does chmod +x on ALL files). Nose does the |
|
472 | # blindly does chmod +x on ALL files). Nose does the | |
473 | # right thing and it tries to avoid executables, |
|
473 | # right thing and it tries to avoid executables, | |
474 | # setuptools unfortunately forces our hand here. This |
|
474 | # setuptools unfortunately forces our hand here. This | |
475 | # has been discussed on the distutils list and the |
|
475 | # has been discussed on the distutils list and the | |
476 | # setuptools devs refuse to fix this problem! |
|
476 | # setuptools devs refuse to fix this problem! | |
477 | '--exe', |
|
477 | '--exe', | |
478 | ] |
|
478 | ] | |
479 |
|
479 | |||
480 | if nose.__version__ >= '0.11': |
|
480 | if nose.__version__ >= '0.11': | |
481 | # I don't fully understand why we need this one, but depending on what |
|
481 | # I don't fully understand why we need this one, but depending on what | |
482 | # directory the test suite is run from, if we don't give it, 0 tests |
|
482 | # directory the test suite is run from, if we don't give it, 0 tests | |
483 | # get run. Specifically, if the test suite is run from the source dir |
|
483 | # get run. Specifically, if the test suite is run from the source dir | |
484 | # with an argument (like 'iptest.py IPython.core', 0 tests are run, |
|
484 | # with an argument (like 'iptest.py IPython.core', 0 tests are run, | |
485 | # even if the same call done in this directory works fine). It appears |
|
485 | # even if the same call done in this directory works fine). It appears | |
486 | # that if the requested package is in the current dir, nose bails early |
|
486 | # that if the requested package is in the current dir, nose bails early | |
487 | # by default. Since it's otherwise harmless, leave it in by default |
|
487 | # by default. Since it's otherwise harmless, leave it in by default | |
488 | # for nose >= 0.11, though unfortunately nose 0.10 doesn't support it. |
|
488 | # for nose >= 0.11, though unfortunately nose 0.10 doesn't support it. | |
489 | argv.append('--traverse-namespace') |
|
489 | argv.append('--traverse-namespace') | |
490 |
|
490 | |||
491 | # use our plugin for doctesting. It will remove the standard doctest plugin |
|
491 | # use our plugin for doctesting. It will remove the standard doctest plugin | |
492 | # if it finds it enabled |
|
492 | # if it finds it enabled | |
493 | plugins = [IPythonDoctest(make_exclude()), KnownFailure()] |
|
493 | plugins = [IPythonDoctest(make_exclude()), KnownFailure()] | |
494 | # We need a global ipython running in this process |
|
494 | # We need a global ipython running in this process | |
495 | globalipapp.start_ipython() |
|
495 | globalipapp.start_ipython() | |
496 | # Now nose can run |
|
496 | # Now nose can run | |
497 | TestProgram(argv=argv, addplugins=plugins) |
|
497 | TestProgram(argv=argv, addplugins=plugins) | |
498 |
|
498 | |||
499 |
|
499 | |||
500 | def run_iptestall(inc_slow=False): |
|
500 | def run_iptestall(inc_slow=False): | |
501 | """Run the entire IPython test suite by calling nose and trial. |
|
501 | """Run the entire IPython test suite by calling nose and trial. | |
502 |
|
502 | |||
503 | This function constructs :class:`IPTester` instances for all IPython |
|
503 | This function constructs :class:`IPTester` instances for all IPython | |
504 | modules and package and then runs each of them. This causes the modules |
|
504 | modules and package and then runs each of them. This causes the modules | |
505 | and packages of IPython to be tested each in their own subprocess using |
|
505 | and packages of IPython to be tested each in their own subprocess using | |
506 | nose. |
|
506 | nose. | |
507 |
|
507 | |||
508 | Parameters |
|
508 | Parameters | |
509 | ---------- |
|
509 | ---------- | |
510 |
|
510 | |||
511 | inc_slow : bool, optional |
|
511 | inc_slow : bool, optional | |
512 | Include slow tests, like IPython.parallel. By default, these tests aren't |
|
512 | Include slow tests, like IPython.parallel. By default, these tests aren't | |
513 | run. |
|
513 | run. | |
514 | """ |
|
514 | """ | |
515 |
|
515 | |||
516 | runners = make_runners(inc_slow=inc_slow) |
|
516 | runners = make_runners(inc_slow=inc_slow) | |
517 |
|
517 | |||
518 | # Run the test runners in a temporary dir so we can nuke it when finished |
|
518 | # Run the test runners in a temporary dir so we can nuke it when finished | |
519 | # to clean up any junk files left over by accident. This also makes it |
|
519 | # to clean up any junk files left over by accident. This also makes it | |
520 | # robust against being run in non-writeable directories by mistake, as the |
|
520 | # robust against being run in non-writeable directories by mistake, as the | |
521 | # temp dir will always be user-writeable. |
|
521 | # temp dir will always be user-writeable. | |
522 | curdir = os.getcwdu() |
|
522 | curdir = os.getcwdu() | |
523 | testdir = tempfile.gettempdir() |
|
523 | testdir = tempfile.gettempdir() | |
524 | os.chdir(testdir) |
|
524 | os.chdir(testdir) | |
525 |
|
525 | |||
526 | # Run all test runners, tracking execution time |
|
526 | # Run all test runners, tracking execution time | |
527 | failed = [] |
|
527 | failed = [] | |
528 | t_start = time.time() |
|
528 | t_start = time.time() | |
529 | try: |
|
529 | try: | |
530 | for (name, runner) in runners: |
|
530 | for (name, runner) in runners: | |
531 | print('*'*70) |
|
531 | print('*'*70) | |
532 | print('IPython test group:',name) |
|
532 | print('IPython test group:',name) | |
533 | res = runner.run() |
|
533 | res = runner.run() | |
534 | if res: |
|
534 | if res: | |
535 | failed.append( (name, runner) ) |
|
535 | failed.append( (name, runner) ) | |
536 | finally: |
|
536 | finally: | |
537 | os.chdir(curdir) |
|
537 | os.chdir(curdir) | |
538 | t_end = time.time() |
|
538 | t_end = time.time() | |
539 | t_tests = t_end - t_start |
|
539 | t_tests = t_end - t_start | |
540 | nrunners = len(runners) |
|
540 | nrunners = len(runners) | |
541 | nfail = len(failed) |
|
541 | nfail = len(failed) | |
542 | # summarize results |
|
542 | # summarize results | |
543 | print() |
|
543 | print() | |
544 | print('*'*70) |
|
544 | print('*'*70) | |
545 | print('Test suite completed for system with the following information:') |
|
545 | print('Test suite completed for system with the following information:') | |
546 | print(report()) |
|
546 | print(report()) | |
547 | print('Ran %s test groups in %.3fs' % (nrunners, t_tests)) |
|
547 | print('Ran %s test groups in %.3fs' % (nrunners, t_tests)) | |
548 | print() |
|
548 | print() | |
549 | print('Status:') |
|
549 | print('Status:') | |
550 | if not failed: |
|
550 | if not failed: | |
551 | print('OK') |
|
551 | print('OK') | |
552 | else: |
|
552 | else: | |
553 | # If anything went wrong, point out what command to rerun manually to |
|
553 | # If anything went wrong, point out what command to rerun manually to | |
554 | # see the actual errors and individual summary |
|
554 | # see the actual errors and individual summary | |
555 | print('ERROR - %s out of %s test groups failed.' % (nfail, nrunners)) |
|
555 | print('ERROR - %s out of %s test groups failed.' % (nfail, nrunners)) | |
556 | for name, failed_runner in failed: |
|
556 | for name, failed_runner in failed: | |
557 | print('-'*40) |
|
557 | print('-'*40) | |
558 | print('Runner failed:',name) |
|
558 | print('Runner failed:',name) | |
559 | print('You may wish to rerun this one individually, with:') |
|
559 | print('You may wish to rerun this one individually, with:') | |
560 | failed_call_args = [py3compat.cast_unicode(x) for x in failed_runner.call_args] |
|
560 | failed_call_args = [py3compat.cast_unicode(x) for x in failed_runner.call_args] | |
561 | print(u' '.join(failed_call_args)) |
|
561 | print(u' '.join(failed_call_args)) | |
562 | print() |
|
562 | print() | |
563 | # Ensure that our exit code indicates failure |
|
563 | # Ensure that our exit code indicates failure | |
564 | sys.exit(1) |
|
564 | sys.exit(1) | |
565 |
|
565 | |||
566 |
|
566 | |||
567 | def main(): |
|
567 | def main(): | |
568 | for arg in sys.argv[1:]: |
|
568 | for arg in sys.argv[1:]: | |
569 | if arg.startswith('IPython'): |
|
569 | if arg.startswith('IPython'): | |
570 | # This is in-process |
|
570 | # This is in-process | |
571 | run_iptest() |
|
571 | run_iptest() | |
572 | else: |
|
572 | else: | |
573 | if "--all" in sys.argv: |
|
573 | if "--all" in sys.argv: | |
574 | sys.argv.remove("--all") |
|
574 | sys.argv.remove("--all") | |
575 | inc_slow = True |
|
575 | inc_slow = True | |
576 | else: |
|
576 | else: | |
577 | inc_slow = False |
|
577 | inc_slow = False | |
578 | # This starts subprocesses |
|
578 | # This starts subprocesses | |
579 | run_iptestall(inc_slow=inc_slow) |
|
579 | run_iptestall(inc_slow=inc_slow) | |
580 |
|
580 | |||
581 |
|
581 | |||
582 | if __name__ == '__main__': |
|
582 | if __name__ == '__main__': | |
583 | main() |
|
583 | main() |
@@ -1,167 +1,167 b'' | |||||
1 | # encoding: utf-8 |
|
1 | # encoding: utf-8 | |
2 | """ |
|
2 | """ | |
3 | Older utilities that are not being used. |
|
3 | Older utilities that are not being used. | |
4 |
|
4 | |||
5 | WARNING: IF YOU NEED TO USE ONE OF THESE FUNCTIONS, PLEASE FIRST MOVE IT |
|
5 | WARNING: IF YOU NEED TO USE ONE OF THESE FUNCTIONS, PLEASE FIRST MOVE IT | |
6 | TO ANOTHER APPROPRIATE MODULE IN IPython.utils. |
|
6 | TO ANOTHER APPROPRIATE MODULE IN IPython.utils. | |
7 | """ |
|
7 | """ | |
8 |
|
8 | |||
9 | #----------------------------------------------------------------------------- |
|
9 | #----------------------------------------------------------------------------- | |
10 | # Copyright (C) 2008-2011 The IPython Development Team |
|
10 | # Copyright (C) 2008-2011 The IPython Development Team | |
11 | # |
|
11 | # | |
12 | # Distributed under the terms of the BSD License. The full license is in |
|
12 | # Distributed under the terms of the BSD License. The full license is in | |
13 | # the file COPYING, distributed as part of this software. |
|
13 | # the file COPYING, distributed as part of this software. | |
14 | #----------------------------------------------------------------------------- |
|
14 | #----------------------------------------------------------------------------- | |
15 |
|
15 | |||
16 | #----------------------------------------------------------------------------- |
|
16 | #----------------------------------------------------------------------------- | |
17 | # Imports |
|
17 | # Imports | |
18 | #----------------------------------------------------------------------------- |
|
18 | #----------------------------------------------------------------------------- | |
19 |
|
19 | |||
20 | import sys |
|
20 | import sys | |
21 | import warnings |
|
21 | import warnings | |
22 |
|
22 | |||
23 | from IPython.utils.warn import warn |
|
23 | from IPython.utils.warn import warn | |
24 |
|
24 | |||
25 | #----------------------------------------------------------------------------- |
|
25 | #----------------------------------------------------------------------------- | |
26 | # Code |
|
26 | # Code | |
27 | #----------------------------------------------------------------------------- |
|
27 | #----------------------------------------------------------------------------- | |
28 |
|
28 | |||
29 |
|
29 | |||
30 | def mutex_opts(dict,ex_op): |
|
30 | def mutex_opts(dict,ex_op): | |
31 | """Check for presence of mutually exclusive keys in a dict. |
|
31 | """Check for presence of mutually exclusive keys in a dict. | |
32 |
|
32 | |||
33 | Call: mutex_opts(dict,[[op1a,op1b],[op2a,op2b]...]""" |
|
33 | Call: mutex_opts(dict,[[op1a,op1b],[op2a,op2b]...]""" | |
34 | for op1,op2 in ex_op: |
|
34 | for op1,op2 in ex_op: | |
35 | if op1 in dict and op2 in dict: |
|
35 | if op1 in dict and op2 in dict: | |
36 | raise ValueError('\n*** ERROR in Arguments *** '\ |
|
36 | raise ValueError('\n*** ERROR in Arguments *** '\ | |
37 | 'Options '+op1+' and '+op2+' are mutually exclusive.') |
|
37 | 'Options '+op1+' and '+op2+' are mutually exclusive.') | |
38 |
|
38 | |||
39 |
|
39 | |||
40 | class EvalDict: |
|
40 | class EvalDict: | |
41 | """ |
|
41 | """ | |
42 | Emulate a dict which evaluates its contents in the caller's frame. |
|
42 | Emulate a dict which evaluates its contents in the caller's frame. | |
43 |
|
43 | |||
44 | Usage: |
|
44 | Usage: | |
45 | >>> number = 19 |
|
45 | >>> number = 19 | |
46 |
|
46 | |||
47 | >>> text = "python" |
|
47 | >>> text = "python" | |
48 |
|
48 | |||
49 | >>> print "%(text.capitalize())s %(number/9.0).1f rules!" % EvalDict() |
|
49 | >>> print "%(text.capitalize())s %(number/9.0).1f rules!" % EvalDict() | |
50 | Python 2.1 rules! |
|
50 | Python 2.1 rules! | |
51 | """ |
|
51 | """ | |
52 |
|
52 | |||
53 | # This version is due to sismex01@hebmex.com on c.l.py, and is basically a |
|
53 | # This version is due to sismex01@hebmex.com on c.l.py, and is basically a | |
54 | # modified (shorter) version of: |
|
54 | # modified (shorter) version of: | |
55 | # http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/66018 by |
|
55 | # http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/66018 by | |
56 | # Skip Montanaro (skip@pobox.com). |
|
56 | # Skip Montanaro (skip@pobox.com). | |
57 |
|
57 | |||
58 | def __getitem__(self, name): |
|
58 | def __getitem__(self, name): | |
59 | frame = sys._getframe(1) |
|
59 | frame = sys._getframe(1) | |
60 | return eval(name, frame.f_globals, frame.f_locals) |
|
60 | return eval(name, frame.f_globals, frame.f_locals) | |
61 |
|
61 | |||
62 | EvalString = EvalDict # for backwards compatibility |
|
62 | EvalString = EvalDict # for backwards compatibility | |
63 |
|
63 | |||
64 |
|
64 | |||
65 | def all_belong(candidates,checklist): |
|
65 | def all_belong(candidates,checklist): | |
66 | """Check whether a list of items ALL appear in a given list of options. |
|
66 | """Check whether a list of items ALL appear in a given list of options. | |
67 |
|
67 | |||
68 | Returns a single 1 or 0 value.""" |
|
68 | Returns a single 1 or 0 value.""" | |
69 |
|
69 | |||
70 | return 1-(0 in [x in checklist for x in candidates]) |
|
70 | return 1-(0 in [x in checklist for x in candidates]) | |
71 |
|
71 | |||
72 |
|
72 | |||
73 | def belong(candidates,checklist): |
|
73 | def belong(candidates,checklist): | |
74 | """Check whether a list of items appear in a given list of options. |
|
74 | """Check whether a list of items appear in a given list of options. | |
75 |
|
75 | |||
76 | Returns a list of 1 and 0, one for each candidate given.""" |
|
76 | Returns a list of 1 and 0, one for each candidate given.""" | |
77 |
|
77 | |||
78 | return [x in checklist for x in candidates] |
|
78 | return [x in checklist for x in candidates] | |
79 |
|
79 | |||
80 |
|
80 | |||
81 | def with_obj(object, **args): |
|
81 | def with_obj(object, **args): | |
82 | """Set multiple attributes for an object, similar to Pascal's with. |
|
82 | """Set multiple attributes for an object, similar to Pascal's with. | |
83 |
|
83 | |||
84 | Example: |
|
84 | Example: | |
85 | with_obj(jim, |
|
85 | with_obj(jim, | |
86 | born = 1960, |
|
86 | born = 1960, | |
87 | haircolour = 'Brown', |
|
87 | haircolour = 'Brown', | |
88 | eyecolour = 'Green') |
|
88 | eyecolour = 'Green') | |
89 |
|
89 | |||
90 | Credit: Greg Ewing, in |
|
90 | Credit: Greg Ewing, in | |
91 | http://mail.python.org/pipermail/python-list/2001-May/040703.html. |
|
91 | http://mail.python.org/pipermail/python-list/2001-May/040703.html. | |
92 |
|
92 | |||
93 | NOTE: up until IPython 0.7.2, this was called simply 'with', but 'with' |
|
93 | NOTE: up until IPython 0.7.2, this was called simply 'with', but 'with' | |
94 | has become a keyword for Python 2.5, so we had to rename it.""" |
|
94 | has become a keyword for Python 2.5, so we had to rename it.""" | |
95 |
|
95 | |||
96 | object.__dict__.update(args) |
|
96 | object.__dict__.update(args) | |
97 |
|
97 | |||
98 |
|
98 | |||
99 | def map_method(method,object_list,*argseq,**kw): |
|
99 | def map_method(method,object_list,*argseq,**kw): | |
100 | """map_method(method,object_list,*args,**kw) -> list |
|
100 | """map_method(method,object_list,*args,**kw) -> list | |
101 |
|
101 | |||
102 | Return a list of the results of applying the methods to the items of the |
|
102 | Return a list of the results of applying the methods to the items of the | |
103 | argument sequence(s). If more than one sequence is given, the method is |
|
103 | argument sequence(s). If more than one sequence is given, the method is | |
104 | called with an argument list consisting of the corresponding item of each |
|
104 | called with an argument list consisting of the corresponding item of each | |
105 | sequence. All sequences must be of the same length. |
|
105 | sequence. All sequences must be of the same length. | |
106 |
|
106 | |||
107 | Keyword arguments are passed verbatim to all objects called. |
|
107 | Keyword arguments are passed verbatim to all objects called. | |
108 |
|
108 | |||
109 | This is Python code, so it's not nearly as fast as the builtin map().""" |
|
109 | This is Python code, so it's not nearly as fast as the builtin map().""" | |
110 |
|
110 | |||
111 | out_list = [] |
|
111 | out_list = [] | |
112 | idx = 0 |
|
112 | idx = 0 | |
113 | for object in object_list: |
|
113 | for object in object_list: | |
114 | try: |
|
114 | try: | |
115 | handler = getattr(object, method) |
|
115 | handler = getattr(object, method) | |
116 | except AttributeError: |
|
116 | except AttributeError: | |
117 | out_list.append(None) |
|
117 | out_list.append(None) | |
118 | else: |
|
118 | else: | |
119 | if argseq: |
|
119 | if argseq: | |
120 | args = map(lambda lst:lst[idx],argseq) |
|
120 | args = map(lambda lst:lst[idx],argseq) | |
121 | #print 'ob',object,'hand',handler,'ar',args # dbg |
|
121 | #print 'ob',object,'hand',handler,'ar',args # dbg | |
122 | out_list.append(handler(args,**kw)) |
|
122 | out_list.append(handler(args,**kw)) | |
123 | else: |
|
123 | else: | |
124 | out_list.append(handler(**kw)) |
|
124 | out_list.append(handler(**kw)) | |
125 | idx += 1 |
|
125 | idx += 1 | |
126 | return out_list |
|
126 | return out_list | |
127 |
|
127 | |||
128 |
|
128 | |||
129 | def import_fail_info(mod_name,fns=None): |
|
129 | def import_fail_info(mod_name,fns=None): | |
130 | """Inform load failure for a module.""" |
|
130 | """Inform load failure for a module.""" | |
131 |
|
131 | |||
132 | if fns == None: |
|
132 | if fns == None: | |
133 |
warn("Loading of %s failed. |
|
133 | warn("Loading of %s failed." % (mod_name,)) | |
134 | else: |
|
134 | else: | |
135 |
warn("Loading of %s from %s failed. |
|
135 | warn("Loading of %s from %s failed." % (fns,mod_name)) | |
136 |
|
136 | |||
137 |
|
137 | |||
138 | class NotGiven: pass |
|
138 | class NotGiven: pass | |
139 |
|
139 | |||
140 | def popkey(dct,key,default=NotGiven): |
|
140 | def popkey(dct,key,default=NotGiven): | |
141 | """Return dct[key] and delete dct[key]. |
|
141 | """Return dct[key] and delete dct[key]. | |
142 |
|
142 | |||
143 | If default is given, return it if dct[key] doesn't exist, otherwise raise |
|
143 | If default is given, return it if dct[key] doesn't exist, otherwise raise | |
144 | KeyError. """ |
|
144 | KeyError. """ | |
145 |
|
145 | |||
146 | try: |
|
146 | try: | |
147 | val = dct[key] |
|
147 | val = dct[key] | |
148 | except KeyError: |
|
148 | except KeyError: | |
149 | if default is NotGiven: |
|
149 | if default is NotGiven: | |
150 | raise |
|
150 | raise | |
151 | else: |
|
151 | else: | |
152 | return default |
|
152 | return default | |
153 | else: |
|
153 | else: | |
154 | del dct[key] |
|
154 | del dct[key] | |
155 | return val |
|
155 | return val | |
156 |
|
156 | |||
157 |
|
157 | |||
158 | def wrap_deprecated(func, suggest = '<nothing>'): |
|
158 | def wrap_deprecated(func, suggest = '<nothing>'): | |
159 | def newFunc(*args, **kwargs): |
|
159 | def newFunc(*args, **kwargs): | |
160 | warnings.warn("Call to deprecated function %s, use %s instead" % |
|
160 | warnings.warn("Call to deprecated function %s, use %s instead" % | |
161 | ( func.__name__, suggest), |
|
161 | ( func.__name__, suggest), | |
162 | category=DeprecationWarning, |
|
162 | category=DeprecationWarning, | |
163 | stacklevel = 2) |
|
163 | stacklevel = 2) | |
164 | return func(*args, **kwargs) |
|
164 | return func(*args, **kwargs) | |
165 | return newFunc |
|
165 | return newFunc | |
166 |
|
166 | |||
167 |
|
167 |
@@ -1,67 +1,67 b'' | |||||
1 | # encoding: utf-8 |
|
1 | # encoding: utf-8 | |
2 | """ |
|
2 | """ | |
3 | Utilities for warnings. Shoudn't we just use the built in warnings module. |
|
3 | Utilities for warnings. Shoudn't we just use the built in warnings module. | |
4 | """ |
|
4 | """ | |
5 |
|
5 | |||
6 | #----------------------------------------------------------------------------- |
|
6 | #----------------------------------------------------------------------------- | |
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 | from __future__ import print_function |
|
16 | from __future__ import print_function | |
17 |
|
17 | |||
18 | import sys |
|
18 | import sys | |
19 |
|
19 | |||
20 | from IPython.utils import io |
|
20 | from IPython.utils import io | |
21 |
|
21 | |||
22 | #----------------------------------------------------------------------------- |
|
22 | #----------------------------------------------------------------------------- | |
23 | # Code |
|
23 | # Code | |
24 | #----------------------------------------------------------------------------- |
|
24 | #----------------------------------------------------------------------------- | |
25 |
|
25 | |||
26 | def warn(msg,level=2,exit_val=1): |
|
26 | def warn(msg,level=2,exit_val=1): | |
27 | """Standard warning printer. Gives formatting consistency. |
|
27 | """Standard warning printer. Gives formatting consistency. | |
28 |
|
28 | |||
29 | Output is sent to io.stderr (sys.stderr by default). |
|
29 | Output is sent to io.stderr (sys.stderr by default). | |
30 |
|
30 | |||
31 | Options: |
|
31 | Options: | |
32 |
|
32 | |||
33 | -level(2): allows finer control: |
|
33 | -level(2): allows finer control: | |
34 | 0 -> Do nothing, dummy function. |
|
34 | 0 -> Do nothing, dummy function. | |
35 | 1 -> Print message. |
|
35 | 1 -> Print message. | |
36 | 2 -> Print 'WARNING:' + message. (Default level). |
|
36 | 2 -> Print 'WARNING:' + message. (Default level). | |
37 | 3 -> Print 'ERROR:' + message. |
|
37 | 3 -> Print 'ERROR:' + message. | |
38 | 4 -> Print 'FATAL ERROR:' + message and trigger a sys.exit(exit_val). |
|
38 | 4 -> Print 'FATAL ERROR:' + message and trigger a sys.exit(exit_val). | |
39 |
|
39 | |||
40 | -exit_val (1): exit value returned by sys.exit() for a level 4 |
|
40 | -exit_val (1): exit value returned by sys.exit() for a level 4 | |
41 | warning. Ignored for all other levels.""" |
|
41 | warning. Ignored for all other levels.""" | |
42 |
|
42 | |||
43 | if level>0: |
|
43 | if level>0: | |
44 | header = ['','','WARNING: ','ERROR: ','FATAL ERROR: '] |
|
44 | header = ['','','WARNING: ','ERROR: ','FATAL ERROR: '] | |
45 | io.stderr.write('%s%s' % (header[level],msg)) |
|
45 | print(header[level], msg, sep='', file=io.stderr) | |
46 | if level == 4: |
|
46 | if level == 4: | |
47 | print('Exiting.\n', file=io.stderr) |
|
47 | print('Exiting.\n', file=io.stderr) | |
48 | sys.exit(exit_val) |
|
48 | sys.exit(exit_val) | |
49 |
|
49 | |||
50 |
|
50 | |||
51 | def info(msg): |
|
51 | def info(msg): | |
52 | """Equivalent to warn(msg,level=1).""" |
|
52 | """Equivalent to warn(msg,level=1).""" | |
53 |
|
53 | |||
54 | warn(msg,level=1) |
|
54 | warn(msg,level=1) | |
55 |
|
55 | |||
56 |
|
56 | |||
57 | def error(msg): |
|
57 | def error(msg): | |
58 | """Equivalent to warn(msg,level=3).""" |
|
58 | """Equivalent to warn(msg,level=3).""" | |
59 |
|
59 | |||
60 | warn(msg,level=3) |
|
60 | warn(msg,level=3) | |
61 |
|
61 | |||
62 |
|
62 | |||
63 | def fatal(msg,exit_val=1): |
|
63 | def fatal(msg,exit_val=1): | |
64 | """Equivalent to warn(msg,exit_val=exit_val,level=4).""" |
|
64 | """Equivalent to warn(msg,exit_val=exit_val,level=4).""" | |
65 |
|
65 | |||
66 | warn(msg,exit_val=exit_val,level=4) |
|
66 | warn(msg,exit_val=exit_val,level=4) | |
67 |
|
67 |
General Comments 0
You need to be logged in to leave comments.
Login now