Show More
The requested changes are too big and content was truncated. Show full diff
@@ -1,2970 +1,2970 b'' | |||||
1 | # -*- coding: utf-8 -*- |
|
1 | # -*- coding: utf-8 -*- | |
2 | """Magic functions for InteractiveShell. |
|
2 | """Magic functions for InteractiveShell. | |
3 |
|
3 | |||
4 |
$Id: Magic.py 135 |
|
4 | $Id: Magic.py 1355 2006-06-07 16:56:50Z vivainio $""" | |
5 |
|
5 | |||
6 | #***************************************************************************** |
|
6 | #***************************************************************************** | |
7 | # Copyright (C) 2001 Janko Hauser <jhauser@zscout.de> and |
|
7 | # Copyright (C) 2001 Janko Hauser <jhauser@zscout.de> and | |
8 | # Copyright (C) 2001-2006 Fernando Perez <fperez@colorado.edu> |
|
8 | # Copyright (C) 2001-2006 Fernando Perez <fperez@colorado.edu> | |
9 | # |
|
9 | # | |
10 | # Distributed under the terms of the BSD License. The full license is in |
|
10 | # Distributed under the terms of the BSD License. The full license is in | |
11 | # the file COPYING, distributed as part of this software. |
|
11 | # the file COPYING, distributed as part of this software. | |
12 | #***************************************************************************** |
|
12 | #***************************************************************************** | |
13 |
|
13 | |||
14 | #**************************************************************************** |
|
14 | #**************************************************************************** | |
15 | # Modules and globals |
|
15 | # Modules and globals | |
16 |
|
16 | |||
17 | from IPython import Release |
|
17 | from IPython import Release | |
18 | __author__ = '%s <%s>\n%s <%s>' % \ |
|
18 | __author__ = '%s <%s>\n%s <%s>' % \ | |
19 | ( Release.authors['Janko'] + Release.authors['Fernando'] ) |
|
19 | ( Release.authors['Janko'] + Release.authors['Fernando'] ) | |
20 | __license__ = Release.license |
|
20 | __license__ = Release.license | |
21 |
|
21 | |||
22 | # Python standard modules |
|
22 | # Python standard modules | |
23 | import __builtin__ |
|
23 | import __builtin__ | |
24 | import bdb |
|
24 | import bdb | |
25 | import inspect |
|
25 | import inspect | |
26 | import os |
|
26 | import os | |
27 | import pdb |
|
27 | import pdb | |
28 | import pydoc |
|
28 | import pydoc | |
29 | import shlex |
|
29 | import shlex | |
30 | import sys |
|
30 | import sys | |
31 | import re |
|
31 | import re | |
32 | import tempfile |
|
32 | import tempfile | |
33 | import time |
|
33 | import time | |
34 | import cPickle as pickle |
|
34 | import cPickle as pickle | |
35 | import textwrap |
|
35 | import textwrap | |
36 | from cStringIO import StringIO |
|
36 | from cStringIO import StringIO | |
37 | from getopt import getopt,GetoptError |
|
37 | from getopt import getopt,GetoptError | |
38 | from pprint import pprint, pformat |
|
38 | from pprint import pprint, pformat | |
39 |
|
39 | |||
40 | # profile isn't bundled by default in Debian for license reasons |
|
40 | # profile isn't bundled by default in Debian for license reasons | |
41 | try: |
|
41 | try: | |
42 | import profile,pstats |
|
42 | import profile,pstats | |
43 | except ImportError: |
|
43 | except ImportError: | |
44 | profile = pstats = None |
|
44 | profile = pstats = None | |
45 |
|
45 | |||
46 | # Homebrewed |
|
46 | # Homebrewed | |
47 | import IPython |
|
47 | import IPython | |
48 | from IPython import Debugger, OInspect, wildcard |
|
48 | from IPython import Debugger, OInspect, wildcard | |
49 | from IPython.FakeModule import FakeModule |
|
49 | from IPython.FakeModule import FakeModule | |
50 | from IPython.Itpl import Itpl, itpl, printpl,itplns |
|
50 | from IPython.Itpl import Itpl, itpl, printpl,itplns | |
51 | from IPython.PyColorize import Parser |
|
51 | from IPython.PyColorize import Parser | |
52 | from IPython.ipstruct import Struct |
|
52 | from IPython.ipstruct import Struct | |
53 | from IPython.macro import Macro |
|
53 | from IPython.macro import Macro | |
54 | from IPython.genutils import * |
|
54 | from IPython.genutils import * | |
55 | from IPython import platutils |
|
55 | from IPython import platutils | |
56 |
|
56 | |||
57 | #*************************************************************************** |
|
57 | #*************************************************************************** | |
58 | # Utility functions |
|
58 | # Utility functions | |
59 | def on_off(tag): |
|
59 | def on_off(tag): | |
60 | """Return an ON/OFF string for a 1/0 input. Simple utility function.""" |
|
60 | """Return an ON/OFF string for a 1/0 input. Simple utility function.""" | |
61 | return ['OFF','ON'][tag] |
|
61 | return ['OFF','ON'][tag] | |
62 |
|
62 | |||
63 | class Bunch: pass |
|
63 | class Bunch: pass | |
64 |
|
64 | |||
65 | #*************************************************************************** |
|
65 | #*************************************************************************** | |
66 | # Main class implementing Magic functionality |
|
66 | # Main class implementing Magic functionality | |
67 | class Magic: |
|
67 | class Magic: | |
68 | """Magic functions for InteractiveShell. |
|
68 | """Magic functions for InteractiveShell. | |
69 |
|
69 | |||
70 | Shell functions which can be reached as %function_name. All magic |
|
70 | Shell functions which can be reached as %function_name. All magic | |
71 | functions should accept a string, which they can parse for their own |
|
71 | functions should accept a string, which they can parse for their own | |
72 | needs. This can make some functions easier to type, eg `%cd ../` |
|
72 | needs. This can make some functions easier to type, eg `%cd ../` | |
73 | vs. `%cd("../")` |
|
73 | vs. `%cd("../")` | |
74 |
|
74 | |||
75 | ALL definitions MUST begin with the prefix magic_. The user won't need it |
|
75 | ALL definitions MUST begin with the prefix magic_. The user won't need it | |
76 | at the command line, but it is is needed in the definition. """ |
|
76 | at the command line, but it is is needed in the definition. """ | |
77 |
|
77 | |||
78 | # class globals |
|
78 | # class globals | |
79 | auto_status = ['Automagic is OFF, % prefix IS needed for magic functions.', |
|
79 | auto_status = ['Automagic is OFF, % prefix IS needed for magic functions.', | |
80 | 'Automagic is ON, % prefix NOT needed for magic functions.'] |
|
80 | 'Automagic is ON, % prefix NOT needed for magic functions.'] | |
81 |
|
81 | |||
82 | #...................................................................... |
|
82 | #...................................................................... | |
83 | # some utility functions |
|
83 | # some utility functions | |
84 |
|
84 | |||
85 | def __init__(self,shell): |
|
85 | def __init__(self,shell): | |
86 |
|
86 | |||
87 | self.options_table = {} |
|
87 | self.options_table = {} | |
88 | if profile is None: |
|
88 | if profile is None: | |
89 | self.magic_prun = self.profile_missing_notice |
|
89 | self.magic_prun = self.profile_missing_notice | |
90 | self.shell = shell |
|
90 | self.shell = shell | |
91 |
|
91 | |||
92 | # namespace for holding state we may need |
|
92 | # namespace for holding state we may need | |
93 | self._magic_state = Bunch() |
|
93 | self._magic_state = Bunch() | |
94 |
|
94 | |||
95 | def profile_missing_notice(self, *args, **kwargs): |
|
95 | def profile_missing_notice(self, *args, **kwargs): | |
96 | error("""\ |
|
96 | error("""\ | |
97 | The profile module could not be found. If you are a Debian user, |
|
97 | The profile module could not be found. If you are a Debian user, | |
98 | it has been removed from the standard Debian package because of its non-free |
|
98 | it has been removed from the standard Debian package because of its non-free | |
99 | license. To use profiling, please install"python2.3-profiler" from non-free.""") |
|
99 | license. To use profiling, please install"python2.3-profiler" from non-free.""") | |
100 |
|
100 | |||
101 | def default_option(self,fn,optstr): |
|
101 | def default_option(self,fn,optstr): | |
102 | """Make an entry in the options_table for fn, with value optstr""" |
|
102 | """Make an entry in the options_table for fn, with value optstr""" | |
103 |
|
103 | |||
104 | if fn not in self.lsmagic(): |
|
104 | if fn not in self.lsmagic(): | |
105 | error("%s is not a magic function" % fn) |
|
105 | error("%s is not a magic function" % fn) | |
106 | self.options_table[fn] = optstr |
|
106 | self.options_table[fn] = optstr | |
107 |
|
107 | |||
108 | def lsmagic(self): |
|
108 | def lsmagic(self): | |
109 | """Return a list of currently available magic functions. |
|
109 | """Return a list of currently available magic functions. | |
110 |
|
110 | |||
111 | Gives a list of the bare names after mangling (['ls','cd', ...], not |
|
111 | Gives a list of the bare names after mangling (['ls','cd', ...], not | |
112 | ['magic_ls','magic_cd',...]""" |
|
112 | ['magic_ls','magic_cd',...]""" | |
113 |
|
113 | |||
114 | # FIXME. This needs a cleanup, in the way the magics list is built. |
|
114 | # FIXME. This needs a cleanup, in the way the magics list is built. | |
115 |
|
115 | |||
116 | # magics in class definition |
|
116 | # magics in class definition | |
117 | class_magic = lambda fn: fn.startswith('magic_') and \ |
|
117 | class_magic = lambda fn: fn.startswith('magic_') and \ | |
118 | callable(Magic.__dict__[fn]) |
|
118 | callable(Magic.__dict__[fn]) | |
119 | # in instance namespace (run-time user additions) |
|
119 | # in instance namespace (run-time user additions) | |
120 | inst_magic = lambda fn: fn.startswith('magic_') and \ |
|
120 | inst_magic = lambda fn: fn.startswith('magic_') and \ | |
121 | callable(self.__dict__[fn]) |
|
121 | callable(self.__dict__[fn]) | |
122 | # and bound magics by user (so they can access self): |
|
122 | # and bound magics by user (so they can access self): | |
123 | inst_bound_magic = lambda fn: fn.startswith('magic_') and \ |
|
123 | inst_bound_magic = lambda fn: fn.startswith('magic_') and \ | |
124 | callable(self.__class__.__dict__[fn]) |
|
124 | callable(self.__class__.__dict__[fn]) | |
125 | magics = filter(class_magic,Magic.__dict__.keys()) + \ |
|
125 | magics = filter(class_magic,Magic.__dict__.keys()) + \ | |
126 | filter(inst_magic,self.__dict__.keys()) + \ |
|
126 | filter(inst_magic,self.__dict__.keys()) + \ | |
127 | filter(inst_bound_magic,self.__class__.__dict__.keys()) |
|
127 | filter(inst_bound_magic,self.__class__.__dict__.keys()) | |
128 | out = [] |
|
128 | out = [] | |
129 | for fn in magics: |
|
129 | for fn in magics: | |
130 | out.append(fn.replace('magic_','',1)) |
|
130 | out.append(fn.replace('magic_','',1)) | |
131 | out.sort() |
|
131 | out.sort() | |
132 | return out |
|
132 | return out | |
133 |
|
133 | |||
134 | def extract_input_slices(self,slices,raw=False): |
|
134 | def extract_input_slices(self,slices,raw=False): | |
135 | """Return as a string a set of input history slices. |
|
135 | """Return as a string a set of input history slices. | |
136 |
|
136 | |||
137 | Inputs: |
|
137 | Inputs: | |
138 |
|
138 | |||
139 | - slices: the set of slices is given as a list of strings (like |
|
139 | - slices: the set of slices is given as a list of strings (like | |
140 | ['1','4:8','9'], since this function is for use by magic functions |
|
140 | ['1','4:8','9'], since this function is for use by magic functions | |
141 | which get their arguments as strings. |
|
141 | which get their arguments as strings. | |
142 |
|
142 | |||
143 | Optional inputs: |
|
143 | Optional inputs: | |
144 |
|
144 | |||
145 | - raw(False): by default, the processed input is used. If this is |
|
145 | - raw(False): by default, the processed input is used. If this is | |
146 | true, the raw input history is used instead. |
|
146 | true, the raw input history is used instead. | |
147 |
|
147 | |||
148 | Note that slices can be called with two notations: |
|
148 | Note that slices can be called with two notations: | |
149 |
|
149 | |||
150 | N:M -> standard python form, means including items N...(M-1). |
|
150 | N:M -> standard python form, means including items N...(M-1). | |
151 |
|
151 | |||
152 | N-M -> include items N..M (closed endpoint).""" |
|
152 | N-M -> include items N..M (closed endpoint).""" | |
153 |
|
153 | |||
154 | if raw: |
|
154 | if raw: | |
155 | hist = self.shell.input_hist_raw |
|
155 | hist = self.shell.input_hist_raw | |
156 | else: |
|
156 | else: | |
157 | hist = self.shell.input_hist |
|
157 | hist = self.shell.input_hist | |
158 |
|
158 | |||
159 | cmds = [] |
|
159 | cmds = [] | |
160 | for chunk in slices: |
|
160 | for chunk in slices: | |
161 | if ':' in chunk: |
|
161 | if ':' in chunk: | |
162 | ini,fin = map(int,chunk.split(':')) |
|
162 | ini,fin = map(int,chunk.split(':')) | |
163 | elif '-' in chunk: |
|
163 | elif '-' in chunk: | |
164 | ini,fin = map(int,chunk.split('-')) |
|
164 | ini,fin = map(int,chunk.split('-')) | |
165 | fin += 1 |
|
165 | fin += 1 | |
166 | else: |
|
166 | else: | |
167 | ini = int(chunk) |
|
167 | ini = int(chunk) | |
168 | fin = ini+1 |
|
168 | fin = ini+1 | |
169 | cmds.append(hist[ini:fin]) |
|
169 | cmds.append(hist[ini:fin]) | |
170 | return cmds |
|
170 | return cmds | |
171 |
|
171 | |||
172 | def _ofind(self,oname): |
|
172 | def _ofind(self,oname): | |
173 | """Find an object in the available namespaces. |
|
173 | """Find an object in the available namespaces. | |
174 |
|
174 | |||
175 | self._ofind(oname) -> dict with keys: found,obj,ospace,ismagic |
|
175 | self._ofind(oname) -> dict with keys: found,obj,ospace,ismagic | |
176 |
|
176 | |||
177 | Has special code to detect magic functions. |
|
177 | Has special code to detect magic functions. | |
178 | """ |
|
178 | """ | |
179 |
|
179 | |||
180 | oname = oname.strip() |
|
180 | oname = oname.strip() | |
181 |
|
181 | |||
182 | # Namespaces to search in: |
|
182 | # Namespaces to search in: | |
183 | user_ns = self.shell.user_ns |
|
183 | user_ns = self.shell.user_ns | |
184 | internal_ns = self.shell.internal_ns |
|
184 | internal_ns = self.shell.internal_ns | |
185 | builtin_ns = __builtin__.__dict__ |
|
185 | builtin_ns = __builtin__.__dict__ | |
186 | alias_ns = self.shell.alias_table |
|
186 | alias_ns = self.shell.alias_table | |
187 |
|
187 | |||
188 | # Put them in a list. The order is important so that we find things in |
|
188 | # Put them in a list. The order is important so that we find things in | |
189 | # the same order that Python finds them. |
|
189 | # the same order that Python finds them. | |
190 | namespaces = [ ('Interactive',user_ns), |
|
190 | namespaces = [ ('Interactive',user_ns), | |
191 | ('IPython internal',internal_ns), |
|
191 | ('IPython internal',internal_ns), | |
192 | ('Python builtin',builtin_ns), |
|
192 | ('Python builtin',builtin_ns), | |
193 | ('Alias',alias_ns), |
|
193 | ('Alias',alias_ns), | |
194 | ] |
|
194 | ] | |
195 |
|
195 | |||
196 | # initialize results to 'null' |
|
196 | # initialize results to 'null' | |
197 | found = 0; obj = None; ospace = None; ds = None; |
|
197 | found = 0; obj = None; ospace = None; ds = None; | |
198 | ismagic = 0; isalias = 0 |
|
198 | ismagic = 0; isalias = 0 | |
199 |
|
199 | |||
200 | # Look for the given name by splitting it in parts. If the head is |
|
200 | # Look for the given name by splitting it in parts. If the head is | |
201 | # found, then we look for all the remaining parts as members, and only |
|
201 | # found, then we look for all the remaining parts as members, and only | |
202 | # declare success if we can find them all. |
|
202 | # declare success if we can find them all. | |
203 | oname_parts = oname.split('.') |
|
203 | oname_parts = oname.split('.') | |
204 | oname_head, oname_rest = oname_parts[0],oname_parts[1:] |
|
204 | oname_head, oname_rest = oname_parts[0],oname_parts[1:] | |
205 | for nsname,ns in namespaces: |
|
205 | for nsname,ns in namespaces: | |
206 | try: |
|
206 | try: | |
207 | obj = ns[oname_head] |
|
207 | obj = ns[oname_head] | |
208 | except KeyError: |
|
208 | except KeyError: | |
209 | continue |
|
209 | continue | |
210 | else: |
|
210 | else: | |
211 | for part in oname_rest: |
|
211 | for part in oname_rest: | |
212 | try: |
|
212 | try: | |
213 | obj = getattr(obj,part) |
|
213 | obj = getattr(obj,part) | |
214 | except: |
|
214 | except: | |
215 | # Blanket except b/c some badly implemented objects |
|
215 | # Blanket except b/c some badly implemented objects | |
216 | # allow __getattr__ to raise exceptions other than |
|
216 | # allow __getattr__ to raise exceptions other than | |
217 | # AttributeError, which then crashes IPython. |
|
217 | # AttributeError, which then crashes IPython. | |
218 | break |
|
218 | break | |
219 | else: |
|
219 | else: | |
220 | # If we finish the for loop (no break), we got all members |
|
220 | # If we finish the for loop (no break), we got all members | |
221 | found = 1 |
|
221 | found = 1 | |
222 | ospace = nsname |
|
222 | ospace = nsname | |
223 | if ns == alias_ns: |
|
223 | if ns == alias_ns: | |
224 | isalias = 1 |
|
224 | isalias = 1 | |
225 | break # namespace loop |
|
225 | break # namespace loop | |
226 |
|
226 | |||
227 | # Try to see if it's magic |
|
227 | # Try to see if it's magic | |
228 | if not found: |
|
228 | if not found: | |
229 | if oname.startswith(self.shell.ESC_MAGIC): |
|
229 | if oname.startswith(self.shell.ESC_MAGIC): | |
230 | oname = oname[1:] |
|
230 | oname = oname[1:] | |
231 | obj = getattr(self,'magic_'+oname,None) |
|
231 | obj = getattr(self,'magic_'+oname,None) | |
232 | if obj is not None: |
|
232 | if obj is not None: | |
233 | found = 1 |
|
233 | found = 1 | |
234 | ospace = 'IPython internal' |
|
234 | ospace = 'IPython internal' | |
235 | ismagic = 1 |
|
235 | ismagic = 1 | |
236 |
|
236 | |||
237 | # Last try: special-case some literals like '', [], {}, etc: |
|
237 | # Last try: special-case some literals like '', [], {}, etc: | |
238 | if not found and oname_head in ["''",'""','[]','{}','()']: |
|
238 | if not found and oname_head in ["''",'""','[]','{}','()']: | |
239 | obj = eval(oname_head) |
|
239 | obj = eval(oname_head) | |
240 | found = 1 |
|
240 | found = 1 | |
241 | ospace = 'Interactive' |
|
241 | ospace = 'Interactive' | |
242 |
|
242 | |||
243 | return {'found':found, 'obj':obj, 'namespace':ospace, |
|
243 | return {'found':found, 'obj':obj, 'namespace':ospace, | |
244 | 'ismagic':ismagic, 'isalias':isalias} |
|
244 | 'ismagic':ismagic, 'isalias':isalias} | |
245 |
|
245 | |||
246 | def arg_err(self,func): |
|
246 | def arg_err(self,func): | |
247 | """Print docstring if incorrect arguments were passed""" |
|
247 | """Print docstring if incorrect arguments were passed""" | |
248 | print 'Error in arguments:' |
|
248 | print 'Error in arguments:' | |
249 | print OInspect.getdoc(func) |
|
249 | print OInspect.getdoc(func) | |
250 |
|
250 | |||
251 | def format_latex(self,strng): |
|
251 | def format_latex(self,strng): | |
252 | """Format a string for latex inclusion.""" |
|
252 | """Format a string for latex inclusion.""" | |
253 |
|
253 | |||
254 | # Characters that need to be escaped for latex: |
|
254 | # Characters that need to be escaped for latex: | |
255 | escape_re = re.compile(r'(%|_|\$|#|&)',re.MULTILINE) |
|
255 | escape_re = re.compile(r'(%|_|\$|#|&)',re.MULTILINE) | |
256 | # Magic command names as headers: |
|
256 | # Magic command names as headers: | |
257 | cmd_name_re = re.compile(r'^(%s.*?):' % self.shell.ESC_MAGIC, |
|
257 | cmd_name_re = re.compile(r'^(%s.*?):' % self.shell.ESC_MAGIC, | |
258 | re.MULTILINE) |
|
258 | re.MULTILINE) | |
259 | # Magic commands |
|
259 | # Magic commands | |
260 | cmd_re = re.compile(r'(?P<cmd>%s.+?\b)(?!\}\}:)' % self.shell.ESC_MAGIC, |
|
260 | cmd_re = re.compile(r'(?P<cmd>%s.+?\b)(?!\}\}:)' % self.shell.ESC_MAGIC, | |
261 | re.MULTILINE) |
|
261 | re.MULTILINE) | |
262 | # Paragraph continue |
|
262 | # Paragraph continue | |
263 | par_re = re.compile(r'\\$',re.MULTILINE) |
|
263 | par_re = re.compile(r'\\$',re.MULTILINE) | |
264 |
|
264 | |||
265 | # The "\n" symbol |
|
265 | # The "\n" symbol | |
266 | newline_re = re.compile(r'\\n') |
|
266 | newline_re = re.compile(r'\\n') | |
267 |
|
267 | |||
268 | # Now build the string for output: |
|
268 | # Now build the string for output: | |
269 | #strng = cmd_name_re.sub(r'\n\\texttt{\\textsl{\\large \1}}:',strng) |
|
269 | #strng = cmd_name_re.sub(r'\n\\texttt{\\textsl{\\large \1}}:',strng) | |
270 | strng = cmd_name_re.sub(r'\n\\bigskip\n\\texttt{\\textbf{ \1}}:', |
|
270 | strng = cmd_name_re.sub(r'\n\\bigskip\n\\texttt{\\textbf{ \1}}:', | |
271 | strng) |
|
271 | strng) | |
272 | strng = cmd_re.sub(r'\\texttt{\g<cmd>}',strng) |
|
272 | strng = cmd_re.sub(r'\\texttt{\g<cmd>}',strng) | |
273 | strng = par_re.sub(r'\\\\',strng) |
|
273 | strng = par_re.sub(r'\\\\',strng) | |
274 | strng = escape_re.sub(r'\\\1',strng) |
|
274 | strng = escape_re.sub(r'\\\1',strng) | |
275 | strng = newline_re.sub(r'\\textbackslash{}n',strng) |
|
275 | strng = newline_re.sub(r'\\textbackslash{}n',strng) | |
276 | return strng |
|
276 | return strng | |
277 |
|
277 | |||
278 | def format_screen(self,strng): |
|
278 | def format_screen(self,strng): | |
279 | """Format a string for screen printing. |
|
279 | """Format a string for screen printing. | |
280 |
|
280 | |||
281 | This removes some latex-type format codes.""" |
|
281 | This removes some latex-type format codes.""" | |
282 | # Paragraph continue |
|
282 | # Paragraph continue | |
283 | par_re = re.compile(r'\\$',re.MULTILINE) |
|
283 | par_re = re.compile(r'\\$',re.MULTILINE) | |
284 | strng = par_re.sub('',strng) |
|
284 | strng = par_re.sub('',strng) | |
285 | return strng |
|
285 | return strng | |
286 |
|
286 | |||
287 | def parse_options(self,arg_str,opt_str,*long_opts,**kw): |
|
287 | def parse_options(self,arg_str,opt_str,*long_opts,**kw): | |
288 | """Parse options passed to an argument string. |
|
288 | """Parse options passed to an argument string. | |
289 |
|
289 | |||
290 | The interface is similar to that of getopt(), but it returns back a |
|
290 | The interface is similar to that of getopt(), but it returns back a | |
291 | Struct with the options as keys and the stripped argument string still |
|
291 | Struct with the options as keys and the stripped argument string still | |
292 | as a string. |
|
292 | as a string. | |
293 |
|
293 | |||
294 | arg_str is quoted as a true sys.argv vector by using shlex.split. |
|
294 | arg_str is quoted as a true sys.argv vector by using shlex.split. | |
295 | This allows us to easily expand variables, glob files, quote |
|
295 | This allows us to easily expand variables, glob files, quote | |
296 | arguments, etc. |
|
296 | arguments, etc. | |
297 |
|
297 | |||
298 | Options: |
|
298 | Options: | |
299 | -mode: default 'string'. If given as 'list', the argument string is |
|
299 | -mode: default 'string'. If given as 'list', the argument string is | |
300 | returned as a list (split on whitespace) instead of a string. |
|
300 | returned as a list (split on whitespace) instead of a string. | |
301 |
|
301 | |||
302 | -list_all: put all option values in lists. Normally only options |
|
302 | -list_all: put all option values in lists. Normally only options | |
303 | appearing more than once are put in a list.""" |
|
303 | appearing more than once are put in a list.""" | |
304 |
|
304 | |||
305 | # inject default options at the beginning of the input line |
|
305 | # inject default options at the beginning of the input line | |
306 | caller = sys._getframe(1).f_code.co_name.replace('magic_','') |
|
306 | caller = sys._getframe(1).f_code.co_name.replace('magic_','') | |
307 | arg_str = '%s %s' % (self.options_table.get(caller,''),arg_str) |
|
307 | arg_str = '%s %s' % (self.options_table.get(caller,''),arg_str) | |
308 |
|
308 | |||
309 | mode = kw.get('mode','string') |
|
309 | mode = kw.get('mode','string') | |
310 | if mode not in ['string','list']: |
|
310 | if mode not in ['string','list']: | |
311 | raise ValueError,'incorrect mode given: %s' % mode |
|
311 | raise ValueError,'incorrect mode given: %s' % mode | |
312 | # Get options |
|
312 | # Get options | |
313 | list_all = kw.get('list_all',0) |
|
313 | list_all = kw.get('list_all',0) | |
314 |
|
314 | |||
315 | # Check if we have more than one argument to warrant extra processing: |
|
315 | # Check if we have more than one argument to warrant extra processing: | |
316 | odict = {} # Dictionary with options |
|
316 | odict = {} # Dictionary with options | |
317 | args = arg_str.split() |
|
317 | args = arg_str.split() | |
318 | if len(args) >= 1: |
|
318 | if len(args) >= 1: | |
319 | # If the list of inputs only has 0 or 1 thing in it, there's no |
|
319 | # If the list of inputs only has 0 or 1 thing in it, there's no | |
320 | # need to look for options |
|
320 | # need to look for options | |
321 | argv = shlex.split(arg_str) |
|
321 | argv = shlex.split(arg_str) | |
322 | # Do regular option processing |
|
322 | # Do regular option processing | |
323 | try: |
|
323 | try: | |
324 | opts,args = getopt(argv,opt_str,*long_opts) |
|
324 | opts,args = getopt(argv,opt_str,*long_opts) | |
325 | except GetoptError,e: |
|
325 | except GetoptError,e: | |
326 | raise GetoptError('%s ( allowed: "%s" %s)' % (e.msg,opt_str, |
|
326 | raise GetoptError('%s ( allowed: "%s" %s)' % (e.msg,opt_str, | |
327 | " ".join(long_opts))) |
|
327 | " ".join(long_opts))) | |
328 | for o,a in opts: |
|
328 | for o,a in opts: | |
329 | if o.startswith('--'): |
|
329 | if o.startswith('--'): | |
330 | o = o[2:] |
|
330 | o = o[2:] | |
331 | else: |
|
331 | else: | |
332 | o = o[1:] |
|
332 | o = o[1:] | |
333 | try: |
|
333 | try: | |
334 | odict[o].append(a) |
|
334 | odict[o].append(a) | |
335 | except AttributeError: |
|
335 | except AttributeError: | |
336 | odict[o] = [odict[o],a] |
|
336 | odict[o] = [odict[o],a] | |
337 | except KeyError: |
|
337 | except KeyError: | |
338 | if list_all: |
|
338 | if list_all: | |
339 | odict[o] = [a] |
|
339 | odict[o] = [a] | |
340 | else: |
|
340 | else: | |
341 | odict[o] = a |
|
341 | odict[o] = a | |
342 |
|
342 | |||
343 | # Prepare opts,args for return |
|
343 | # Prepare opts,args for return | |
344 | opts = Struct(odict) |
|
344 | opts = Struct(odict) | |
345 | if mode == 'string': |
|
345 | if mode == 'string': | |
346 | args = ' '.join(args) |
|
346 | args = ' '.join(args) | |
347 |
|
347 | |||
348 | return opts,args |
|
348 | return opts,args | |
349 |
|
349 | |||
350 | #...................................................................... |
|
350 | #...................................................................... | |
351 | # And now the actual magic functions |
|
351 | # And now the actual magic functions | |
352 |
|
352 | |||
353 | # Functions for IPython shell work (vars,funcs, config, etc) |
|
353 | # Functions for IPython shell work (vars,funcs, config, etc) | |
354 | def magic_lsmagic(self, parameter_s = ''): |
|
354 | def magic_lsmagic(self, parameter_s = ''): | |
355 | """List currently available magic functions.""" |
|
355 | """List currently available magic functions.""" | |
356 | mesc = self.shell.ESC_MAGIC |
|
356 | mesc = self.shell.ESC_MAGIC | |
357 | print 'Available magic functions:\n'+mesc+\ |
|
357 | print 'Available magic functions:\n'+mesc+\ | |
358 | (' '+mesc).join(self.lsmagic()) |
|
358 | (' '+mesc).join(self.lsmagic()) | |
359 | print '\n' + Magic.auto_status[self.shell.rc.automagic] |
|
359 | print '\n' + Magic.auto_status[self.shell.rc.automagic] | |
360 | return None |
|
360 | return None | |
361 |
|
361 | |||
362 | def magic_magic(self, parameter_s = ''): |
|
362 | def magic_magic(self, parameter_s = ''): | |
363 | """Print information about the magic function system.""" |
|
363 | """Print information about the magic function system.""" | |
364 |
|
364 | |||
365 | mode = '' |
|
365 | mode = '' | |
366 | try: |
|
366 | try: | |
367 | if parameter_s.split()[0] == '-latex': |
|
367 | if parameter_s.split()[0] == '-latex': | |
368 | mode = 'latex' |
|
368 | mode = 'latex' | |
369 | if parameter_s.split()[0] == '-brief': |
|
369 | if parameter_s.split()[0] == '-brief': | |
370 | mode = 'brief' |
|
370 | mode = 'brief' | |
371 | except: |
|
371 | except: | |
372 | pass |
|
372 | pass | |
373 |
|
373 | |||
374 | magic_docs = [] |
|
374 | magic_docs = [] | |
375 | for fname in self.lsmagic(): |
|
375 | for fname in self.lsmagic(): | |
376 | mname = 'magic_' + fname |
|
376 | mname = 'magic_' + fname | |
377 | for space in (Magic,self,self.__class__): |
|
377 | for space in (Magic,self,self.__class__): | |
378 | try: |
|
378 | try: | |
379 | fn = space.__dict__[mname] |
|
379 | fn = space.__dict__[mname] | |
380 | except KeyError: |
|
380 | except KeyError: | |
381 | pass |
|
381 | pass | |
382 | else: |
|
382 | else: | |
383 | break |
|
383 | break | |
384 | if mode == 'brief': |
|
384 | if mode == 'brief': | |
385 | # only first line |
|
385 | # only first line | |
386 | fndoc = fn.__doc__.split('\n',1)[0] |
|
386 | fndoc = fn.__doc__.split('\n',1)[0] | |
387 | else: |
|
387 | else: | |
388 | fndoc = fn.__doc__ |
|
388 | fndoc = fn.__doc__ | |
389 |
|
389 | |||
390 | magic_docs.append('%s%s:\n\t%s\n' %(self.shell.ESC_MAGIC, |
|
390 | magic_docs.append('%s%s:\n\t%s\n' %(self.shell.ESC_MAGIC, | |
391 | fname,fndoc)) |
|
391 | fname,fndoc)) | |
392 | magic_docs = ''.join(magic_docs) |
|
392 | magic_docs = ''.join(magic_docs) | |
393 |
|
393 | |||
394 | if mode == 'latex': |
|
394 | if mode == 'latex': | |
395 | print self.format_latex(magic_docs) |
|
395 | print self.format_latex(magic_docs) | |
396 | return |
|
396 | return | |
397 | else: |
|
397 | else: | |
398 | magic_docs = self.format_screen(magic_docs) |
|
398 | magic_docs = self.format_screen(magic_docs) | |
399 | if mode == 'brief': |
|
399 | if mode == 'brief': | |
400 | return magic_docs |
|
400 | return magic_docs | |
401 |
|
401 | |||
402 | outmsg = """ |
|
402 | outmsg = """ | |
403 | IPython's 'magic' functions |
|
403 | IPython's 'magic' functions | |
404 | =========================== |
|
404 | =========================== | |
405 |
|
405 | |||
406 | The magic function system provides a series of functions which allow you to |
|
406 | The magic function system provides a series of functions which allow you to | |
407 | control the behavior of IPython itself, plus a lot of system-type |
|
407 | control the behavior of IPython itself, plus a lot of system-type | |
408 | features. All these functions are prefixed with a % character, but parameters |
|
408 | features. All these functions are prefixed with a % character, but parameters | |
409 | are given without parentheses or quotes. |
|
409 | are given without parentheses or quotes. | |
410 |
|
410 | |||
411 | NOTE: If you have 'automagic' enabled (via the command line option or with the |
|
411 | NOTE: If you have 'automagic' enabled (via the command line option or with the | |
412 | %automagic function), you don't need to type in the % explicitly. By default, |
|
412 | %automagic function), you don't need to type in the % explicitly. By default, | |
413 | IPython ships with automagic on, so you should only rarely need the % escape. |
|
413 | IPython ships with automagic on, so you should only rarely need the % escape. | |
414 |
|
414 | |||
415 | Example: typing '%cd mydir' (without the quotes) changes you working directory |
|
415 | Example: typing '%cd mydir' (without the quotes) changes you working directory | |
416 | to 'mydir', if it exists. |
|
416 | to 'mydir', if it exists. | |
417 |
|
417 | |||
418 | You can define your own magic functions to extend the system. See the supplied |
|
418 | You can define your own magic functions to extend the system. See the supplied | |
419 | ipythonrc and example-magic.py files for details (in your ipython |
|
419 | ipythonrc and example-magic.py files for details (in your ipython | |
420 | configuration directory, typically $HOME/.ipython/). |
|
420 | configuration directory, typically $HOME/.ipython/). | |
421 |
|
421 | |||
422 | You can also define your own aliased names for magic functions. In your |
|
422 | You can also define your own aliased names for magic functions. In your | |
423 | ipythonrc file, placing a line like: |
|
423 | ipythonrc file, placing a line like: | |
424 |
|
424 | |||
425 | execute __IPYTHON__.magic_pf = __IPYTHON__.magic_profile |
|
425 | execute __IPYTHON__.magic_pf = __IPYTHON__.magic_profile | |
426 |
|
426 | |||
427 | will define %pf as a new name for %profile. |
|
427 | will define %pf as a new name for %profile. | |
428 |
|
428 | |||
429 | You can also call magics in code using the ipmagic() function, which IPython |
|
429 | You can also call magics in code using the ipmagic() function, which IPython | |
430 | automatically adds to the builtin namespace. Type 'ipmagic?' for details. |
|
430 | automatically adds to the builtin namespace. Type 'ipmagic?' for details. | |
431 |
|
431 | |||
432 | For a list of the available magic functions, use %lsmagic. For a description |
|
432 | For a list of the available magic functions, use %lsmagic. For a description | |
433 | of any of them, type %magic_name?, e.g. '%cd?'. |
|
433 | of any of them, type %magic_name?, e.g. '%cd?'. | |
434 |
|
434 | |||
435 | Currently the magic system has the following functions:\n""" |
|
435 | Currently the magic system has the following functions:\n""" | |
436 |
|
436 | |||
437 | mesc = self.shell.ESC_MAGIC |
|
437 | mesc = self.shell.ESC_MAGIC | |
438 | outmsg = ("%s\n%s\n\nSummary of magic functions (from %slsmagic):" |
|
438 | outmsg = ("%s\n%s\n\nSummary of magic functions (from %slsmagic):" | |
439 | "\n\n%s%s\n\n%s" % (outmsg, |
|
439 | "\n\n%s%s\n\n%s" % (outmsg, | |
440 | magic_docs,mesc,mesc, |
|
440 | magic_docs,mesc,mesc, | |
441 | (' '+mesc).join(self.lsmagic()), |
|
441 | (' '+mesc).join(self.lsmagic()), | |
442 | Magic.auto_status[self.shell.rc.automagic] ) ) |
|
442 | Magic.auto_status[self.shell.rc.automagic] ) ) | |
443 |
|
443 | |||
444 | page(outmsg,screen_lines=self.shell.rc.screen_length) |
|
444 | page(outmsg,screen_lines=self.shell.rc.screen_length) | |
445 |
|
445 | |||
446 | def magic_automagic(self, parameter_s = ''): |
|
446 | def magic_automagic(self, parameter_s = ''): | |
447 | """Make magic functions callable without having to type the initial %. |
|
447 | """Make magic functions callable without having to type the initial %. | |
448 |
|
448 | |||
449 | Toggles on/off (when off, you must call it as %automagic, of |
|
449 | Toggles on/off (when off, you must call it as %automagic, of | |
450 | course). Note that magic functions have lowest priority, so if there's |
|
450 | course). Note that magic functions have lowest priority, so if there's | |
451 | a variable whose name collides with that of a magic fn, automagic |
|
451 | a variable whose name collides with that of a magic fn, automagic | |
452 | won't work for that function (you get the variable instead). However, |
|
452 | won't work for that function (you get the variable instead). However, | |
453 | if you delete the variable (del var), the previously shadowed magic |
|
453 | if you delete the variable (del var), the previously shadowed magic | |
454 | function becomes visible to automagic again.""" |
|
454 | function becomes visible to automagic again.""" | |
455 |
|
455 | |||
456 | rc = self.shell.rc |
|
456 | rc = self.shell.rc | |
457 | rc.automagic = not rc.automagic |
|
457 | rc.automagic = not rc.automagic | |
458 | print '\n' + Magic.auto_status[rc.automagic] |
|
458 | print '\n' + Magic.auto_status[rc.automagic] | |
459 |
|
459 | |||
460 | def magic_autocall(self, parameter_s = ''): |
|
460 | def magic_autocall(self, parameter_s = ''): | |
461 | """Make functions callable without having to type parentheses. |
|
461 | """Make functions callable without having to type parentheses. | |
462 |
|
462 | |||
463 | Usage: |
|
463 | Usage: | |
464 |
|
464 | |||
465 | %autocall [mode] |
|
465 | %autocall [mode] | |
466 |
|
466 | |||
467 | The mode can be one of: 0->Off, 1->Smart, 2->Full. If not given, the |
|
467 | The mode can be one of: 0->Off, 1->Smart, 2->Full. If not given, the | |
468 | value is toggled on and off (remembering the previous state).""" |
|
468 | value is toggled on and off (remembering the previous state).""" | |
469 |
|
469 | |||
470 | rc = self.shell.rc |
|
470 | rc = self.shell.rc | |
471 |
|
471 | |||
472 | if parameter_s: |
|
472 | if parameter_s: | |
473 | arg = int(parameter_s) |
|
473 | arg = int(parameter_s) | |
474 | else: |
|
474 | else: | |
475 | arg = 'toggle' |
|
475 | arg = 'toggle' | |
476 |
|
476 | |||
477 | if not arg in (0,1,2,'toggle'): |
|
477 | if not arg in (0,1,2,'toggle'): | |
478 | error('Valid modes: (0->Off, 1->Smart, 2->Full') |
|
478 | error('Valid modes: (0->Off, 1->Smart, 2->Full') | |
479 | return |
|
479 | return | |
480 |
|
480 | |||
481 | if arg in (0,1,2): |
|
481 | if arg in (0,1,2): | |
482 | rc.autocall = arg |
|
482 | rc.autocall = arg | |
483 | else: # toggle |
|
483 | else: # toggle | |
484 | if rc.autocall: |
|
484 | if rc.autocall: | |
485 | self._magic_state.autocall_save = rc.autocall |
|
485 | self._magic_state.autocall_save = rc.autocall | |
486 | rc.autocall = 0 |
|
486 | rc.autocall = 0 | |
487 | else: |
|
487 | else: | |
488 | try: |
|
488 | try: | |
489 | rc.autocall = self._magic_state.autocall_save |
|
489 | rc.autocall = self._magic_state.autocall_save | |
490 | except AttributeError: |
|
490 | except AttributeError: | |
491 | rc.autocall = self._magic_state.autocall_save = 1 |
|
491 | rc.autocall = self._magic_state.autocall_save = 1 | |
492 |
|
492 | |||
493 | print "Automatic calling is:",['OFF','Smart','Full'][rc.autocall] |
|
493 | print "Automatic calling is:",['OFF','Smart','Full'][rc.autocall] | |
494 |
|
494 | |||
495 | def magic_autoindent(self, parameter_s = ''): |
|
495 | def magic_autoindent(self, parameter_s = ''): | |
496 | """Toggle autoindent on/off (if available).""" |
|
496 | """Toggle autoindent on/off (if available).""" | |
497 |
|
497 | |||
498 | self.shell.set_autoindent() |
|
498 | self.shell.set_autoindent() | |
499 | print "Automatic indentation is:",['OFF','ON'][self.shell.autoindent] |
|
499 | print "Automatic indentation is:",['OFF','ON'][self.shell.autoindent] | |
500 |
|
500 | |||
501 | def magic_system_verbose(self, parameter_s = ''): |
|
501 | def magic_system_verbose(self, parameter_s = ''): | |
502 | """Toggle verbose printing of system calls on/off.""" |
|
502 | """Toggle verbose printing of system calls on/off.""" | |
503 |
|
503 | |||
504 | self.shell.rc_set_toggle('system_verbose') |
|
504 | self.shell.rc_set_toggle('system_verbose') | |
505 | print "System verbose printing is:",\ |
|
505 | print "System verbose printing is:",\ | |
506 | ['OFF','ON'][self.shell.rc.system_verbose] |
|
506 | ['OFF','ON'][self.shell.rc.system_verbose] | |
507 |
|
507 | |||
508 | def magic_history(self, parameter_s = ''): |
|
508 | def magic_history(self, parameter_s = ''): | |
509 | """Print input history (_i<n> variables), with most recent last. |
|
509 | """Print input history (_i<n> variables), with most recent last. | |
510 |
|
510 | |||
511 | %history -> print at most 40 inputs (some may be multi-line)\\ |
|
511 | %history -> print at most 40 inputs (some may be multi-line)\\ | |
512 | %history n -> print at most n inputs\\ |
|
512 | %history n -> print at most n inputs\\ | |
513 | %history n1 n2 -> print inputs between n1 and n2 (n2 not included)\\ |
|
513 | %history n1 n2 -> print inputs between n1 and n2 (n2 not included)\\ | |
514 |
|
514 | |||
515 | Each input's number <n> is shown, and is accessible as the |
|
515 | Each input's number <n> is shown, and is accessible as the | |
516 | automatically generated variable _i<n>. Multi-line statements are |
|
516 | automatically generated variable _i<n>. Multi-line statements are | |
517 | printed starting at a new line for easy copy/paste. |
|
517 | printed starting at a new line for easy copy/paste. | |
518 |
|
518 | |||
519 |
|
519 | |||
520 | Options: |
|
520 | Options: | |
521 |
|
521 | |||
522 | -n: do NOT print line numbers. This is useful if you want to get a |
|
522 | -n: do NOT print line numbers. This is useful if you want to get a | |
523 | printout of many lines which can be directly pasted into a text |
|
523 | printout of many lines which can be directly pasted into a text | |
524 | editor. |
|
524 | editor. | |
525 |
|
525 | |||
526 | This feature is only available if numbered prompts are in use. |
|
526 | This feature is only available if numbered prompts are in use. | |
527 |
|
527 | |||
528 | -r: print the 'raw' history. IPython filters your input and |
|
528 | -r: print the 'raw' history. IPython filters your input and | |
529 | converts it all into valid Python source before executing it (things |
|
529 | converts it all into valid Python source before executing it (things | |
530 | like magics or aliases are turned into function calls, for |
|
530 | like magics or aliases are turned into function calls, for | |
531 | example). With this option, you'll see the unfiltered history |
|
531 | example). With this option, you'll see the unfiltered history | |
532 | instead of the filtered version: '%cd /' will be seen as '%cd /' |
|
532 | instead of the filtered version: '%cd /' will be seen as '%cd /' | |
533 | instead of '_ip.magic("%cd /")'. |
|
533 | instead of '_ip.magic("%cd /")'. | |
534 | """ |
|
534 | """ | |
535 |
|
535 | |||
536 | shell = self.shell |
|
536 | shell = self.shell | |
537 | if not shell.outputcache.do_full_cache: |
|
537 | if not shell.outputcache.do_full_cache: | |
538 | print 'This feature is only available if numbered prompts are in use.' |
|
538 | print 'This feature is only available if numbered prompts are in use.' | |
539 | return |
|
539 | return | |
540 | opts,args = self.parse_options(parameter_s,'nr',mode='list') |
|
540 | opts,args = self.parse_options(parameter_s,'nr',mode='list') | |
541 |
|
541 | |||
542 | if opts.has_key('r'): |
|
542 | if opts.has_key('r'): | |
543 | input_hist = shell.input_hist_raw |
|
543 | input_hist = shell.input_hist_raw | |
544 | else: |
|
544 | else: | |
545 | input_hist = shell.input_hist |
|
545 | input_hist = shell.input_hist | |
546 |
|
546 | |||
547 | default_length = 40 |
|
547 | default_length = 40 | |
548 | if len(args) == 0: |
|
548 | if len(args) == 0: | |
549 | final = len(input_hist) |
|
549 | final = len(input_hist) | |
550 | init = max(1,final-default_length) |
|
550 | init = max(1,final-default_length) | |
551 | elif len(args) == 1: |
|
551 | elif len(args) == 1: | |
552 | final = len(input_hist) |
|
552 | final = len(input_hist) | |
553 | init = max(1,final-int(args[0])) |
|
553 | init = max(1,final-int(args[0])) | |
554 | elif len(args) == 2: |
|
554 | elif len(args) == 2: | |
555 | init,final = map(int,args) |
|
555 | init,final = map(int,args) | |
556 | else: |
|
556 | else: | |
557 | warn('%hist takes 0, 1 or 2 arguments separated by spaces.') |
|
557 | warn('%hist takes 0, 1 or 2 arguments separated by spaces.') | |
558 | print self.magic_hist.__doc__ |
|
558 | print self.magic_hist.__doc__ | |
559 | return |
|
559 | return | |
560 | width = len(str(final)) |
|
560 | width = len(str(final)) | |
561 | line_sep = ['','\n'] |
|
561 | line_sep = ['','\n'] | |
562 | print_nums = not opts.has_key('n') |
|
562 | print_nums = not opts.has_key('n') | |
563 | for in_num in range(init,final): |
|
563 | for in_num in range(init,final): | |
564 | inline = input_hist[in_num] |
|
564 | inline = input_hist[in_num] | |
565 | multiline = int(inline.count('\n') > 1) |
|
565 | multiline = int(inline.count('\n') > 1) | |
566 | if print_nums: |
|
566 | if print_nums: | |
567 | print '%s:%s' % (str(in_num).ljust(width),line_sep[multiline]), |
|
567 | print '%s:%s' % (str(in_num).ljust(width),line_sep[multiline]), | |
568 | print inline, |
|
568 | print inline, | |
569 |
|
569 | |||
570 | def magic_hist(self, parameter_s=''): |
|
570 | def magic_hist(self, parameter_s=''): | |
571 | """Alternate name for %history.""" |
|
571 | """Alternate name for %history.""" | |
572 | return self.magic_history(parameter_s) |
|
572 | return self.magic_history(parameter_s) | |
573 |
|
573 | |||
574 | def magic_p(self, parameter_s=''): |
|
574 | def magic_p(self, parameter_s=''): | |
575 | """Just a short alias for Python's 'print'.""" |
|
575 | """Just a short alias for Python's 'print'.""" | |
576 | exec 'print ' + parameter_s in self.shell.user_ns |
|
576 | exec 'print ' + parameter_s in self.shell.user_ns | |
577 |
|
577 | |||
578 | def magic_r(self, parameter_s=''): |
|
578 | def magic_r(self, parameter_s=''): | |
579 | """Repeat previous input. |
|
579 | """Repeat previous input. | |
580 |
|
580 | |||
581 | If given an argument, repeats the previous command which starts with |
|
581 | If given an argument, repeats the previous command which starts with | |
582 | the same string, otherwise it just repeats the previous input. |
|
582 | the same string, otherwise it just repeats the previous input. | |
583 |
|
583 | |||
584 | Shell escaped commands (with ! as first character) are not recognized |
|
584 | Shell escaped commands (with ! as first character) are not recognized | |
585 | by this system, only pure python code and magic commands. |
|
585 | by this system, only pure python code and magic commands. | |
586 | """ |
|
586 | """ | |
587 |
|
587 | |||
588 | start = parameter_s.strip() |
|
588 | start = parameter_s.strip() | |
589 | esc_magic = self.shell.ESC_MAGIC |
|
589 | esc_magic = self.shell.ESC_MAGIC | |
590 | # Identify magic commands even if automagic is on (which means |
|
590 | # Identify magic commands even if automagic is on (which means | |
591 | # the in-memory version is different from that typed by the user). |
|
591 | # the in-memory version is different from that typed by the user). | |
592 | if self.shell.rc.automagic: |
|
592 | if self.shell.rc.automagic: | |
593 | start_magic = esc_magic+start |
|
593 | start_magic = esc_magic+start | |
594 | else: |
|
594 | else: | |
595 | start_magic = start |
|
595 | start_magic = start | |
596 | # Look through the input history in reverse |
|
596 | # Look through the input history in reverse | |
597 | for n in range(len(self.shell.input_hist)-2,0,-1): |
|
597 | for n in range(len(self.shell.input_hist)-2,0,-1): | |
598 | input = self.shell.input_hist[n] |
|
598 | input = self.shell.input_hist[n] | |
599 | # skip plain 'r' lines so we don't recurse to infinity |
|
599 | # skip plain 'r' lines so we don't recurse to infinity | |
600 | if input != '_ip.magic("r")\n' and \ |
|
600 | if input != '_ip.magic("r")\n' and \ | |
601 | (input.startswith(start) or input.startswith(start_magic)): |
|
601 | (input.startswith(start) or input.startswith(start_magic)): | |
602 | #print 'match',`input` # dbg |
|
602 | #print 'match',`input` # dbg | |
603 | print 'Executing:',input, |
|
603 | print 'Executing:',input, | |
604 | self.shell.runlines(input) |
|
604 | self.shell.runlines(input) | |
605 | return |
|
605 | return | |
606 | print 'No previous input matching `%s` found.' % start |
|
606 | print 'No previous input matching `%s` found.' % start | |
607 |
|
607 | |||
608 | def magic_page(self, parameter_s=''): |
|
608 | def magic_page(self, parameter_s=''): | |
609 | """Pretty print the object and display it through a pager. |
|
609 | """Pretty print the object and display it through a pager. | |
610 |
|
610 | |||
611 | If no parameter is given, use _ (last output).""" |
|
611 | If no parameter is given, use _ (last output).""" | |
612 | # After a function contributed by Olivier Aubert, slightly modified. |
|
612 | # After a function contributed by Olivier Aubert, slightly modified. | |
613 |
|
613 | |||
614 | oname = parameter_s and parameter_s or '_' |
|
614 | oname = parameter_s and parameter_s or '_' | |
615 | info = self._ofind(oname) |
|
615 | info = self._ofind(oname) | |
616 | if info['found']: |
|
616 | if info['found']: | |
617 | page(pformat(info['obj'])) |
|
617 | page(pformat(info['obj'])) | |
618 | else: |
|
618 | else: | |
619 | print 'Object `%s` not found' % oname |
|
619 | print 'Object `%s` not found' % oname | |
620 |
|
620 | |||
621 | def magic_profile(self, parameter_s=''): |
|
621 | def magic_profile(self, parameter_s=''): | |
622 | """Print your currently active IPyhton profile.""" |
|
622 | """Print your currently active IPyhton profile.""" | |
623 | if self.shell.rc.profile: |
|
623 | if self.shell.rc.profile: | |
624 | printpl('Current IPython profile: $self.shell.rc.profile.') |
|
624 | printpl('Current IPython profile: $self.shell.rc.profile.') | |
625 | else: |
|
625 | else: | |
626 | print 'No profile active.' |
|
626 | print 'No profile active.' | |
627 |
|
627 | |||
628 | def _inspect(self,meth,oname,**kw): |
|
628 | def _inspect(self,meth,oname,**kw): | |
629 | """Generic interface to the inspector system. |
|
629 | """Generic interface to the inspector system. | |
630 |
|
630 | |||
631 | This function is meant to be called by pdef, pdoc & friends.""" |
|
631 | This function is meant to be called by pdef, pdoc & friends.""" | |
632 |
|
632 | |||
633 | oname = oname.strip() |
|
633 | oname = oname.strip() | |
634 | info = Struct(self._ofind(oname)) |
|
634 | info = Struct(self._ofind(oname)) | |
635 | if info.found: |
|
635 | if info.found: | |
636 | pmethod = getattr(self.shell.inspector,meth) |
|
636 | pmethod = getattr(self.shell.inspector,meth) | |
637 | formatter = info.ismagic and self.format_screen or None |
|
637 | formatter = info.ismagic and self.format_screen or None | |
638 | if meth == 'pdoc': |
|
638 | if meth == 'pdoc': | |
639 | pmethod(info.obj,oname,formatter) |
|
639 | pmethod(info.obj,oname,formatter) | |
640 | elif meth == 'pinfo': |
|
640 | elif meth == 'pinfo': | |
641 | pmethod(info.obj,oname,formatter,info,**kw) |
|
641 | pmethod(info.obj,oname,formatter,info,**kw) | |
642 | else: |
|
642 | else: | |
643 | pmethod(info.obj,oname) |
|
643 | pmethod(info.obj,oname) | |
644 | else: |
|
644 | else: | |
645 | print 'Object `%s` not found.' % oname |
|
645 | print 'Object `%s` not found.' % oname | |
646 | return 'not found' # so callers can take other action |
|
646 | return 'not found' # so callers can take other action | |
647 |
|
647 | |||
648 | def magic_pdef(self, parameter_s=''): |
|
648 | def magic_pdef(self, parameter_s=''): | |
649 | """Print the definition header for any callable object. |
|
649 | """Print the definition header for any callable object. | |
650 |
|
650 | |||
651 | If the object is a class, print the constructor information.""" |
|
651 | If the object is a class, print the constructor information.""" | |
652 | self._inspect('pdef',parameter_s) |
|
652 | self._inspect('pdef',parameter_s) | |
653 |
|
653 | |||
654 | def magic_pdoc(self, parameter_s=''): |
|
654 | def magic_pdoc(self, parameter_s=''): | |
655 | """Print the docstring for an object. |
|
655 | """Print the docstring for an object. | |
656 |
|
656 | |||
657 | If the given object is a class, it will print both the class and the |
|
657 | If the given object is a class, it will print both the class and the | |
658 | constructor docstrings.""" |
|
658 | constructor docstrings.""" | |
659 | self._inspect('pdoc',parameter_s) |
|
659 | self._inspect('pdoc',parameter_s) | |
660 |
|
660 | |||
661 | def magic_psource(self, parameter_s=''): |
|
661 | def magic_psource(self, parameter_s=''): | |
662 | """Print (or run through pager) the source code for an object.""" |
|
662 | """Print (or run through pager) the source code for an object.""" | |
663 | self._inspect('psource',parameter_s) |
|
663 | self._inspect('psource',parameter_s) | |
664 |
|
664 | |||
665 | def magic_pfile(self, parameter_s=''): |
|
665 | def magic_pfile(self, parameter_s=''): | |
666 | """Print (or run through pager) the file where an object is defined. |
|
666 | """Print (or run through pager) the file where an object is defined. | |
667 |
|
667 | |||
668 | The file opens at the line where the object definition begins. IPython |
|
668 | The file opens at the line where the object definition begins. IPython | |
669 | will honor the environment variable PAGER if set, and otherwise will |
|
669 | will honor the environment variable PAGER if set, and otherwise will | |
670 | do its best to print the file in a convenient form. |
|
670 | do its best to print the file in a convenient form. | |
671 |
|
671 | |||
672 | If the given argument is not an object currently defined, IPython will |
|
672 | If the given argument is not an object currently defined, IPython will | |
673 | try to interpret it as a filename (automatically adding a .py extension |
|
673 | try to interpret it as a filename (automatically adding a .py extension | |
674 | if needed). You can thus use %pfile as a syntax highlighting code |
|
674 | if needed). You can thus use %pfile as a syntax highlighting code | |
675 | viewer.""" |
|
675 | viewer.""" | |
676 |
|
676 | |||
677 | # first interpret argument as an object name |
|
677 | # first interpret argument as an object name | |
678 | out = self._inspect('pfile',parameter_s) |
|
678 | out = self._inspect('pfile',parameter_s) | |
679 | # if not, try the input as a filename |
|
679 | # if not, try the input as a filename | |
680 | if out == 'not found': |
|
680 | if out == 'not found': | |
681 | try: |
|
681 | try: | |
682 | filename = get_py_filename(parameter_s) |
|
682 | filename = get_py_filename(parameter_s) | |
683 | except IOError,msg: |
|
683 | except IOError,msg: | |
684 | print msg |
|
684 | print msg | |
685 | return |
|
685 | return | |
686 | page(self.shell.inspector.format(file(filename).read())) |
|
686 | page(self.shell.inspector.format(file(filename).read())) | |
687 |
|
687 | |||
688 | def magic_pinfo(self, parameter_s=''): |
|
688 | def magic_pinfo(self, parameter_s=''): | |
689 | """Provide detailed information about an object. |
|
689 | """Provide detailed information about an object. | |
690 |
|
690 | |||
691 | '%pinfo object' is just a synonym for object? or ?object.""" |
|
691 | '%pinfo object' is just a synonym for object? or ?object.""" | |
692 |
|
692 | |||
693 | #print 'pinfo par: <%s>' % parameter_s # dbg |
|
693 | #print 'pinfo par: <%s>' % parameter_s # dbg | |
694 |
|
694 | |||
695 | # detail_level: 0 -> obj? , 1 -> obj?? |
|
695 | # detail_level: 0 -> obj? , 1 -> obj?? | |
696 | detail_level = 0 |
|
696 | detail_level = 0 | |
697 | # We need to detect if we got called as 'pinfo pinfo foo', which can |
|
697 | # We need to detect if we got called as 'pinfo pinfo foo', which can | |
698 | # happen if the user types 'pinfo foo?' at the cmd line. |
|
698 | # happen if the user types 'pinfo foo?' at the cmd line. | |
699 | pinfo,qmark1,oname,qmark2 = \ |
|
699 | pinfo,qmark1,oname,qmark2 = \ | |
700 | re.match('(pinfo )?(\?*)(.*?)(\??$)',parameter_s).groups() |
|
700 | re.match('(pinfo )?(\?*)(.*?)(\??$)',parameter_s).groups() | |
701 | if pinfo or qmark1 or qmark2: |
|
701 | if pinfo or qmark1 or qmark2: | |
702 | detail_level = 1 |
|
702 | detail_level = 1 | |
703 | if "*" in oname: |
|
703 | if "*" in oname: | |
704 | self.magic_psearch(oname) |
|
704 | self.magic_psearch(oname) | |
705 | else: |
|
705 | else: | |
706 | self._inspect('pinfo',oname,detail_level=detail_level) |
|
706 | self._inspect('pinfo',oname,detail_level=detail_level) | |
707 |
|
707 | |||
708 | def magic_psearch(self, parameter_s=''): |
|
708 | def magic_psearch(self, parameter_s=''): | |
709 | """Search for object in namespaces by wildcard. |
|
709 | """Search for object in namespaces by wildcard. | |
710 |
|
710 | |||
711 | %psearch [options] PATTERN [OBJECT TYPE] |
|
711 | %psearch [options] PATTERN [OBJECT TYPE] | |
712 |
|
712 | |||
713 | Note: ? can be used as a synonym for %psearch, at the beginning or at |
|
713 | Note: ? can be used as a synonym for %psearch, at the beginning or at | |
714 | the end: both a*? and ?a* are equivalent to '%psearch a*'. Still, the |
|
714 | the end: both a*? and ?a* are equivalent to '%psearch a*'. Still, the | |
715 | rest of the command line must be unchanged (options come first), so |
|
715 | rest of the command line must be unchanged (options come first), so | |
716 | for example the following forms are equivalent |
|
716 | for example the following forms are equivalent | |
717 |
|
717 | |||
718 | %psearch -i a* function |
|
718 | %psearch -i a* function | |
719 | -i a* function? |
|
719 | -i a* function? | |
720 | ?-i a* function |
|
720 | ?-i a* function | |
721 |
|
721 | |||
722 | Arguments: |
|
722 | Arguments: | |
723 |
|
723 | |||
724 | PATTERN |
|
724 | PATTERN | |
725 |
|
725 | |||
726 | where PATTERN is a string containing * as a wildcard similar to its |
|
726 | where PATTERN is a string containing * as a wildcard similar to its | |
727 | use in a shell. The pattern is matched in all namespaces on the |
|
727 | use in a shell. The pattern is matched in all namespaces on the | |
728 | search path. By default objects starting with a single _ are not |
|
728 | search path. By default objects starting with a single _ are not | |
729 | matched, many IPython generated objects have a single |
|
729 | matched, many IPython generated objects have a single | |
730 | underscore. The default is case insensitive matching. Matching is |
|
730 | underscore. The default is case insensitive matching. Matching is | |
731 | also done on the attributes of objects and not only on the objects |
|
731 | also done on the attributes of objects and not only on the objects | |
732 | in a module. |
|
732 | in a module. | |
733 |
|
733 | |||
734 | [OBJECT TYPE] |
|
734 | [OBJECT TYPE] | |
735 |
|
735 | |||
736 | Is the name of a python type from the types module. The name is |
|
736 | Is the name of a python type from the types module. The name is | |
737 | given in lowercase without the ending type, ex. StringType is |
|
737 | given in lowercase without the ending type, ex. StringType is | |
738 | written string. By adding a type here only objects matching the |
|
738 | written string. By adding a type here only objects matching the | |
739 | given type are matched. Using all here makes the pattern match all |
|
739 | given type are matched. Using all here makes the pattern match all | |
740 | types (this is the default). |
|
740 | types (this is the default). | |
741 |
|
741 | |||
742 | Options: |
|
742 | Options: | |
743 |
|
743 | |||
744 | -a: makes the pattern match even objects whose names start with a |
|
744 | -a: makes the pattern match even objects whose names start with a | |
745 | single underscore. These names are normally ommitted from the |
|
745 | single underscore. These names are normally ommitted from the | |
746 | search. |
|
746 | search. | |
747 |
|
747 | |||
748 | -i/-c: make the pattern case insensitive/sensitive. If neither of |
|
748 | -i/-c: make the pattern case insensitive/sensitive. If neither of | |
749 | these options is given, the default is read from your ipythonrc |
|
749 | these options is given, the default is read from your ipythonrc | |
750 | file. The option name which sets this value is |
|
750 | file. The option name which sets this value is | |
751 | 'wildcards_case_sensitive'. If this option is not specified in your |
|
751 | 'wildcards_case_sensitive'. If this option is not specified in your | |
752 | ipythonrc file, IPython's internal default is to do a case sensitive |
|
752 | ipythonrc file, IPython's internal default is to do a case sensitive | |
753 | search. |
|
753 | search. | |
754 |
|
754 | |||
755 | -e/-s NAMESPACE: exclude/search a given namespace. The pattern you |
|
755 | -e/-s NAMESPACE: exclude/search a given namespace. The pattern you | |
756 | specifiy can be searched in any of the following namespaces: |
|
756 | specifiy can be searched in any of the following namespaces: | |
757 | 'builtin', 'user', 'user_global','internal', 'alias', where |
|
757 | 'builtin', 'user', 'user_global','internal', 'alias', where | |
758 | 'builtin' and 'user' are the search defaults. Note that you should |
|
758 | 'builtin' and 'user' are the search defaults. Note that you should | |
759 | not use quotes when specifying namespaces. |
|
759 | not use quotes when specifying namespaces. | |
760 |
|
760 | |||
761 | 'Builtin' contains the python module builtin, 'user' contains all |
|
761 | 'Builtin' contains the python module builtin, 'user' contains all | |
762 | user data, 'alias' only contain the shell aliases and no python |
|
762 | user data, 'alias' only contain the shell aliases and no python | |
763 | objects, 'internal' contains objects used by IPython. The |
|
763 | objects, 'internal' contains objects used by IPython. The | |
764 | 'user_global' namespace is only used by embedded IPython instances, |
|
764 | 'user_global' namespace is only used by embedded IPython instances, | |
765 | and it contains module-level globals. You can add namespaces to the |
|
765 | and it contains module-level globals. You can add namespaces to the | |
766 | search with -s or exclude them with -e (these options can be given |
|
766 | search with -s or exclude them with -e (these options can be given | |
767 | more than once). |
|
767 | more than once). | |
768 |
|
768 | |||
769 | Examples: |
|
769 | Examples: | |
770 |
|
770 | |||
771 | %psearch a* -> objects beginning with an a |
|
771 | %psearch a* -> objects beginning with an a | |
772 | %psearch -e builtin a* -> objects NOT in the builtin space starting in a |
|
772 | %psearch -e builtin a* -> objects NOT in the builtin space starting in a | |
773 | %psearch a* function -> all functions beginning with an a |
|
773 | %psearch a* function -> all functions beginning with an a | |
774 | %psearch re.e* -> objects beginning with an e in module re |
|
774 | %psearch re.e* -> objects beginning with an e in module re | |
775 | %psearch r*.e* -> objects that start with e in modules starting in r |
|
775 | %psearch r*.e* -> objects that start with e in modules starting in r | |
776 | %psearch r*.* string -> all strings in modules beginning with r |
|
776 | %psearch r*.* string -> all strings in modules beginning with r | |
777 |
|
777 | |||
778 | Case sensitve search: |
|
778 | Case sensitve search: | |
779 |
|
779 | |||
780 | %psearch -c a* list all object beginning with lower case a |
|
780 | %psearch -c a* list all object beginning with lower case a | |
781 |
|
781 | |||
782 | Show objects beginning with a single _: |
|
782 | Show objects beginning with a single _: | |
783 |
|
783 | |||
784 | %psearch -a _* list objects beginning with a single underscore""" |
|
784 | %psearch -a _* list objects beginning with a single underscore""" | |
785 |
|
785 | |||
786 | # default namespaces to be searched |
|
786 | # default namespaces to be searched | |
787 | def_search = ['user','builtin'] |
|
787 | def_search = ['user','builtin'] | |
788 |
|
788 | |||
789 | # Process options/args |
|
789 | # Process options/args | |
790 | opts,args = self.parse_options(parameter_s,'cias:e:',list_all=True) |
|
790 | opts,args = self.parse_options(parameter_s,'cias:e:',list_all=True) | |
791 | opt = opts.get |
|
791 | opt = opts.get | |
792 | shell = self.shell |
|
792 | shell = self.shell | |
793 | psearch = shell.inspector.psearch |
|
793 | psearch = shell.inspector.psearch | |
794 |
|
794 | |||
795 | # select case options |
|
795 | # select case options | |
796 | if opts.has_key('i'): |
|
796 | if opts.has_key('i'): | |
797 | ignore_case = True |
|
797 | ignore_case = True | |
798 | elif opts.has_key('c'): |
|
798 | elif opts.has_key('c'): | |
799 | ignore_case = False |
|
799 | ignore_case = False | |
800 | else: |
|
800 | else: | |
801 | ignore_case = not shell.rc.wildcards_case_sensitive |
|
801 | ignore_case = not shell.rc.wildcards_case_sensitive | |
802 |
|
802 | |||
803 | # Build list of namespaces to search from user options |
|
803 | # Build list of namespaces to search from user options | |
804 | def_search.extend(opt('s',[])) |
|
804 | def_search.extend(opt('s',[])) | |
805 | ns_exclude = ns_exclude=opt('e',[]) |
|
805 | ns_exclude = ns_exclude=opt('e',[]) | |
806 | ns_search = [nm for nm in def_search if nm not in ns_exclude] |
|
806 | ns_search = [nm for nm in def_search if nm not in ns_exclude] | |
807 |
|
807 | |||
808 | # Call the actual search |
|
808 | # Call the actual search | |
809 | try: |
|
809 | try: | |
810 | psearch(args,shell.ns_table,ns_search, |
|
810 | psearch(args,shell.ns_table,ns_search, | |
811 | show_all=opt('a'),ignore_case=ignore_case) |
|
811 | show_all=opt('a'),ignore_case=ignore_case) | |
812 | except: |
|
812 | except: | |
813 | shell.showtraceback() |
|
813 | shell.showtraceback() | |
814 |
|
814 | |||
815 | def magic_who_ls(self, parameter_s=''): |
|
815 | def magic_who_ls(self, parameter_s=''): | |
816 | """Return a sorted list of all interactive variables. |
|
816 | """Return a sorted list of all interactive variables. | |
817 |
|
817 | |||
818 | If arguments are given, only variables of types matching these |
|
818 | If arguments are given, only variables of types matching these | |
819 | arguments are returned.""" |
|
819 | arguments are returned.""" | |
820 |
|
820 | |||
821 | user_ns = self.shell.user_ns |
|
821 | user_ns = self.shell.user_ns | |
822 | internal_ns = self.shell.internal_ns |
|
822 | internal_ns = self.shell.internal_ns | |
823 | user_config_ns = self.shell.user_config_ns |
|
823 | user_config_ns = self.shell.user_config_ns | |
824 | out = [] |
|
824 | out = [] | |
825 | typelist = parameter_s.split() |
|
825 | typelist = parameter_s.split() | |
826 |
|
826 | |||
827 | for i in user_ns: |
|
827 | for i in user_ns: | |
828 | if not (i.startswith('_') or i.startswith('_i')) \ |
|
828 | if not (i.startswith('_') or i.startswith('_i')) \ | |
829 | and not (i in internal_ns or i in user_config_ns): |
|
829 | and not (i in internal_ns or i in user_config_ns): | |
830 | if typelist: |
|
830 | if typelist: | |
831 | if type(user_ns[i]).__name__ in typelist: |
|
831 | if type(user_ns[i]).__name__ in typelist: | |
832 | out.append(i) |
|
832 | out.append(i) | |
833 | else: |
|
833 | else: | |
834 | out.append(i) |
|
834 | out.append(i) | |
835 | out.sort() |
|
835 | out.sort() | |
836 | return out |
|
836 | return out | |
837 |
|
837 | |||
838 | def magic_who(self, parameter_s=''): |
|
838 | def magic_who(self, parameter_s=''): | |
839 | """Print all interactive variables, with some minimal formatting. |
|
839 | """Print all interactive variables, with some minimal formatting. | |
840 |
|
840 | |||
841 | If any arguments are given, only variables whose type matches one of |
|
841 | If any arguments are given, only variables whose type matches one of | |
842 | these are printed. For example: |
|
842 | these are printed. For example: | |
843 |
|
843 | |||
844 | %who function str |
|
844 | %who function str | |
845 |
|
845 | |||
846 | will only list functions and strings, excluding all other types of |
|
846 | will only list functions and strings, excluding all other types of | |
847 | variables. To find the proper type names, simply use type(var) at a |
|
847 | variables. To find the proper type names, simply use type(var) at a | |
848 | command line to see how python prints type names. For example: |
|
848 | command line to see how python prints type names. For example: | |
849 |
|
849 | |||
850 | In [1]: type('hello')\\ |
|
850 | In [1]: type('hello')\\ | |
851 | Out[1]: <type 'str'> |
|
851 | Out[1]: <type 'str'> | |
852 |
|
852 | |||
853 | indicates that the type name for strings is 'str'. |
|
853 | indicates that the type name for strings is 'str'. | |
854 |
|
854 | |||
855 | %who always excludes executed names loaded through your configuration |
|
855 | %who always excludes executed names loaded through your configuration | |
856 | file and things which are internal to IPython. |
|
856 | file and things which are internal to IPython. | |
857 |
|
857 | |||
858 | This is deliberate, as typically you may load many modules and the |
|
858 | This is deliberate, as typically you may load many modules and the | |
859 | purpose of %who is to show you only what you've manually defined.""" |
|
859 | purpose of %who is to show you only what you've manually defined.""" | |
860 |
|
860 | |||
861 | varlist = self.magic_who_ls(parameter_s) |
|
861 | varlist = self.magic_who_ls(parameter_s) | |
862 | if not varlist: |
|
862 | if not varlist: | |
863 | print 'Interactive namespace is empty.' |
|
863 | print 'Interactive namespace is empty.' | |
864 | return |
|
864 | return | |
865 |
|
865 | |||
866 | # if we have variables, move on... |
|
866 | # if we have variables, move on... | |
867 |
|
867 | |||
868 | # stupid flushing problem: when prompts have no separators, stdout is |
|
868 | # stupid flushing problem: when prompts have no separators, stdout is | |
869 | # getting lost. I'm starting to think this is a python bug. I'm having |
|
869 | # getting lost. I'm starting to think this is a python bug. I'm having | |
870 | # to force a flush with a print because even a sys.stdout.flush |
|
870 | # to force a flush with a print because even a sys.stdout.flush | |
871 | # doesn't seem to do anything! |
|
871 | # doesn't seem to do anything! | |
872 |
|
872 | |||
873 | count = 0 |
|
873 | count = 0 | |
874 | for i in varlist: |
|
874 | for i in varlist: | |
875 | print i+'\t', |
|
875 | print i+'\t', | |
876 | count += 1 |
|
876 | count += 1 | |
877 | if count > 8: |
|
877 | if count > 8: | |
878 | count = 0 |
|
878 | count = 0 | |
879 |
|
879 | |||
880 | sys.stdout.flush() # FIXME. Why the hell isn't this flushing??? |
|
880 | sys.stdout.flush() # FIXME. Why the hell isn't this flushing??? | |
881 |
|
881 | |||
882 | print # well, this does force a flush at the expense of an extra \n |
|
882 | print # well, this does force a flush at the expense of an extra \n | |
883 |
|
883 | |||
884 | def magic_whos(self, parameter_s=''): |
|
884 | def magic_whos(self, parameter_s=''): | |
885 | """Like %who, but gives some extra information about each variable. |
|
885 | """Like %who, but gives some extra information about each variable. | |
886 |
|
886 | |||
887 | The same type filtering of %who can be applied here. |
|
887 | The same type filtering of %who can be applied here. | |
888 |
|
888 | |||
889 | For all variables, the type is printed. Additionally it prints: |
|
889 | For all variables, the type is printed. Additionally it prints: | |
890 |
|
890 | |||
891 | - For {},[],(): their length. |
|
891 | - For {},[],(): their length. | |
892 |
|
892 | |||
893 | - For Numeric arrays, a summary with shape, number of elements, |
|
893 | - For Numeric arrays, a summary with shape, number of elements, | |
894 | typecode and size in memory. |
|
894 | typecode and size in memory. | |
895 |
|
895 | |||
896 | - Everything else: a string representation, snipping their middle if |
|
896 | - Everything else: a string representation, snipping their middle if | |
897 | too long.""" |
|
897 | too long.""" | |
898 |
|
898 | |||
899 | varnames = self.magic_who_ls(parameter_s) |
|
899 | varnames = self.magic_who_ls(parameter_s) | |
900 | if not varnames: |
|
900 | if not varnames: | |
901 | print 'Interactive namespace is empty.' |
|
901 | print 'Interactive namespace is empty.' | |
902 | return |
|
902 | return | |
903 |
|
903 | |||
904 | # if we have variables, move on... |
|
904 | # if we have variables, move on... | |
905 |
|
905 | |||
906 | # for these types, show len() instead of data: |
|
906 | # for these types, show len() instead of data: | |
907 | seq_types = [types.DictType,types.ListType,types.TupleType] |
|
907 | seq_types = [types.DictType,types.ListType,types.TupleType] | |
908 |
|
908 | |||
909 | # for Numeric arrays, display summary info |
|
909 | # for Numeric arrays, display summary info | |
910 | try: |
|
910 | try: | |
911 | import Numeric |
|
911 | import Numeric | |
912 | except ImportError: |
|
912 | except ImportError: | |
913 | array_type = None |
|
913 | array_type = None | |
914 | else: |
|
914 | else: | |
915 | array_type = Numeric.ArrayType.__name__ |
|
915 | array_type = Numeric.ArrayType.__name__ | |
916 |
|
916 | |||
917 | # Find all variable names and types so we can figure out column sizes |
|
917 | # Find all variable names and types so we can figure out column sizes | |
918 | get_vars = lambda i: self.shell.user_ns[i] |
|
918 | get_vars = lambda i: self.shell.user_ns[i] | |
919 | type_name = lambda v: type(v).__name__ |
|
919 | type_name = lambda v: type(v).__name__ | |
920 | varlist = map(get_vars,varnames) |
|
920 | varlist = map(get_vars,varnames) | |
921 |
|
921 | |||
922 | typelist = [] |
|
922 | typelist = [] | |
923 | for vv in varlist: |
|
923 | for vv in varlist: | |
924 | tt = type_name(vv) |
|
924 | tt = type_name(vv) | |
925 | if tt=='instance': |
|
925 | if tt=='instance': | |
926 | typelist.append(str(vv.__class__)) |
|
926 | typelist.append(str(vv.__class__)) | |
927 | else: |
|
927 | else: | |
928 | typelist.append(tt) |
|
928 | typelist.append(tt) | |
929 |
|
929 | |||
930 | # column labels and # of spaces as separator |
|
930 | # column labels and # of spaces as separator | |
931 | varlabel = 'Variable' |
|
931 | varlabel = 'Variable' | |
932 | typelabel = 'Type' |
|
932 | typelabel = 'Type' | |
933 | datalabel = 'Data/Info' |
|
933 | datalabel = 'Data/Info' | |
934 | colsep = 3 |
|
934 | colsep = 3 | |
935 | # variable format strings |
|
935 | # variable format strings | |
936 | vformat = "$vname.ljust(varwidth)$vtype.ljust(typewidth)" |
|
936 | vformat = "$vname.ljust(varwidth)$vtype.ljust(typewidth)" | |
937 | vfmt_short = '$vstr[:25]<...>$vstr[-25:]' |
|
937 | vfmt_short = '$vstr[:25]<...>$vstr[-25:]' | |
938 | aformat = "%s: %s elems, type `%s`, %s bytes" |
|
938 | aformat = "%s: %s elems, type `%s`, %s bytes" | |
939 | # find the size of the columns to format the output nicely |
|
939 | # find the size of the columns to format the output nicely | |
940 | varwidth = max(max(map(len,varnames)), len(varlabel)) + colsep |
|
940 | varwidth = max(max(map(len,varnames)), len(varlabel)) + colsep | |
941 | typewidth = max(max(map(len,typelist)), len(typelabel)) + colsep |
|
941 | typewidth = max(max(map(len,typelist)), len(typelabel)) + colsep | |
942 | # table header |
|
942 | # table header | |
943 | print varlabel.ljust(varwidth) + typelabel.ljust(typewidth) + \ |
|
943 | print varlabel.ljust(varwidth) + typelabel.ljust(typewidth) + \ | |
944 | ' '+datalabel+'\n' + '-'*(varwidth+typewidth+len(datalabel)+1) |
|
944 | ' '+datalabel+'\n' + '-'*(varwidth+typewidth+len(datalabel)+1) | |
945 | # and the table itself |
|
945 | # and the table itself | |
946 | kb = 1024 |
|
946 | kb = 1024 | |
947 | Mb = 1048576 # kb**2 |
|
947 | Mb = 1048576 # kb**2 | |
948 | for vname,var,vtype in zip(varnames,varlist,typelist): |
|
948 | for vname,var,vtype in zip(varnames,varlist,typelist): | |
949 | print itpl(vformat), |
|
949 | print itpl(vformat), | |
950 | if vtype in seq_types: |
|
950 | if vtype in seq_types: | |
951 | print len(var) |
|
951 | print len(var) | |
952 | elif vtype==array_type: |
|
952 | elif vtype==array_type: | |
953 | vshape = str(var.shape).replace(',','').replace(' ','x')[1:-1] |
|
953 | vshape = str(var.shape).replace(',','').replace(' ','x')[1:-1] | |
954 | vsize = Numeric.size(var) |
|
954 | vsize = Numeric.size(var) | |
955 | vbytes = vsize*var.itemsize() |
|
955 | vbytes = vsize*var.itemsize() | |
956 | if vbytes < 100000: |
|
956 | if vbytes < 100000: | |
957 | print aformat % (vshape,vsize,var.typecode(),vbytes) |
|
957 | print aformat % (vshape,vsize,var.typecode(),vbytes) | |
958 | else: |
|
958 | else: | |
959 | print aformat % (vshape,vsize,var.typecode(),vbytes), |
|
959 | print aformat % (vshape,vsize,var.typecode(),vbytes), | |
960 | if vbytes < Mb: |
|
960 | if vbytes < Mb: | |
961 | print '(%s kb)' % (vbytes/kb,) |
|
961 | print '(%s kb)' % (vbytes/kb,) | |
962 | else: |
|
962 | else: | |
963 | print '(%s Mb)' % (vbytes/Mb,) |
|
963 | print '(%s Mb)' % (vbytes/Mb,) | |
964 | else: |
|
964 | else: | |
965 | vstr = str(var).replace('\n','\\n') |
|
965 | vstr = str(var).replace('\n','\\n') | |
966 | if len(vstr) < 50: |
|
966 | if len(vstr) < 50: | |
967 | print vstr |
|
967 | print vstr | |
968 | else: |
|
968 | else: | |
969 | printpl(vfmt_short) |
|
969 | printpl(vfmt_short) | |
970 |
|
970 | |||
971 | def magic_reset(self, parameter_s=''): |
|
971 | def magic_reset(self, parameter_s=''): | |
972 | """Resets the namespace by removing all names defined by the user. |
|
972 | """Resets the namespace by removing all names defined by the user. | |
973 |
|
973 | |||
974 | Input/Output history are left around in case you need them.""" |
|
974 | Input/Output history are left around in case you need them.""" | |
975 |
|
975 | |||
976 |
ans = |
|
976 | ans = self.shell.ask_yes_no( | |
977 | "Once deleted, variables cannot be recovered. Proceed (y/n)? ") |
|
977 | "Once deleted, variables cannot be recovered. Proceed (y/[n])? ") | |
978 |
if not ans |
|
978 | if not ans: | |
979 | print 'Nothing done.' |
|
979 | print 'Nothing done.' | |
980 | return |
|
980 | return | |
981 | user_ns = self.shell.user_ns |
|
981 | user_ns = self.shell.user_ns | |
982 | for i in self.magic_who_ls(): |
|
982 | for i in self.magic_who_ls(): | |
983 | del(user_ns[i]) |
|
983 | del(user_ns[i]) | |
984 |
|
984 | |||
985 | def magic_config(self,parameter_s=''): |
|
985 | def magic_config(self,parameter_s=''): | |
986 | """Show IPython's internal configuration.""" |
|
986 | """Show IPython's internal configuration.""" | |
987 |
|
987 | |||
988 | page('Current configuration structure:\n'+ |
|
988 | page('Current configuration structure:\n'+ | |
989 | pformat(self.shell.rc.dict())) |
|
989 | pformat(self.shell.rc.dict())) | |
990 |
|
990 | |||
991 | def magic_logstart(self,parameter_s=''): |
|
991 | def magic_logstart(self,parameter_s=''): | |
992 | """Start logging anywhere in a session. |
|
992 | """Start logging anywhere in a session. | |
993 |
|
993 | |||
994 | %logstart [-o|-r|-t] [log_name [log_mode]] |
|
994 | %logstart [-o|-r|-t] [log_name [log_mode]] | |
995 |
|
995 | |||
996 | If no name is given, it defaults to a file named 'ipython_log.py' in your |
|
996 | If no name is given, it defaults to a file named 'ipython_log.py' in your | |
997 | current directory, in 'rotate' mode (see below). |
|
997 | current directory, in 'rotate' mode (see below). | |
998 |
|
998 | |||
999 | '%logstart name' saves to file 'name' in 'backup' mode. It saves your |
|
999 | '%logstart name' saves to file 'name' in 'backup' mode. It saves your | |
1000 | history up to that point and then continues logging. |
|
1000 | history up to that point and then continues logging. | |
1001 |
|
1001 | |||
1002 | %logstart takes a second optional parameter: logging mode. This can be one |
|
1002 | %logstart takes a second optional parameter: logging mode. This can be one | |
1003 | of (note that the modes are given unquoted):\\ |
|
1003 | of (note that the modes are given unquoted):\\ | |
1004 | append: well, that says it.\\ |
|
1004 | append: well, that says it.\\ | |
1005 | backup: rename (if exists) to name~ and start name.\\ |
|
1005 | backup: rename (if exists) to name~ and start name.\\ | |
1006 | global: single logfile in your home dir, appended to.\\ |
|
1006 | global: single logfile in your home dir, appended to.\\ | |
1007 | over : overwrite existing log.\\ |
|
1007 | over : overwrite existing log.\\ | |
1008 | rotate: create rotating logs name.1~, name.2~, etc. |
|
1008 | rotate: create rotating logs name.1~, name.2~, etc. | |
1009 |
|
1009 | |||
1010 | Options: |
|
1010 | Options: | |
1011 |
|
1011 | |||
1012 | -o: log also IPython's output. In this mode, all commands which |
|
1012 | -o: log also IPython's output. In this mode, all commands which | |
1013 | generate an Out[NN] prompt are recorded to the logfile, right after |
|
1013 | generate an Out[NN] prompt are recorded to the logfile, right after | |
1014 | their corresponding input line. The output lines are always |
|
1014 | their corresponding input line. The output lines are always | |
1015 | prepended with a '#[Out]# ' marker, so that the log remains valid |
|
1015 | prepended with a '#[Out]# ' marker, so that the log remains valid | |
1016 | Python code. |
|
1016 | Python code. | |
1017 |
|
1017 | |||
1018 | Since this marker is always the same, filtering only the output from |
|
1018 | Since this marker is always the same, filtering only the output from | |
1019 | a log is very easy, using for example a simple awk call: |
|
1019 | a log is very easy, using for example a simple awk call: | |
1020 |
|
1020 | |||
1021 | awk -F'#\\[Out\\]# ' '{if($2) {print $2}}' ipython_log.py |
|
1021 | awk -F'#\\[Out\\]# ' '{if($2) {print $2}}' ipython_log.py | |
1022 |
|
1022 | |||
1023 | -r: log 'raw' input. Normally, IPython's logs contain the processed |
|
1023 | -r: log 'raw' input. Normally, IPython's logs contain the processed | |
1024 | input, so that user lines are logged in their final form, converted |
|
1024 | input, so that user lines are logged in their final form, converted | |
1025 | into valid Python. For example, %Exit is logged as |
|
1025 | into valid Python. For example, %Exit is logged as | |
1026 | '_ip.magic("Exit"). If the -r flag is given, all input is logged |
|
1026 | '_ip.magic("Exit"). If the -r flag is given, all input is logged | |
1027 | exactly as typed, with no transformations applied. |
|
1027 | exactly as typed, with no transformations applied. | |
1028 |
|
1028 | |||
1029 | -t: put timestamps before each input line logged (these are put in |
|
1029 | -t: put timestamps before each input line logged (these are put in | |
1030 | comments).""" |
|
1030 | comments).""" | |
1031 |
|
1031 | |||
1032 | opts,par = self.parse_options(parameter_s,'ort') |
|
1032 | opts,par = self.parse_options(parameter_s,'ort') | |
1033 | log_output = 'o' in opts |
|
1033 | log_output = 'o' in opts | |
1034 | log_raw_input = 'r' in opts |
|
1034 | log_raw_input = 'r' in opts | |
1035 | timestamp = 't' in opts |
|
1035 | timestamp = 't' in opts | |
1036 |
|
1036 | |||
1037 | rc = self.shell.rc |
|
1037 | rc = self.shell.rc | |
1038 | logger = self.shell.logger |
|
1038 | logger = self.shell.logger | |
1039 |
|
1039 | |||
1040 | # if no args are given, the defaults set in the logger constructor by |
|
1040 | # if no args are given, the defaults set in the logger constructor by | |
1041 | # ipytohn remain valid |
|
1041 | # ipytohn remain valid | |
1042 | if par: |
|
1042 | if par: | |
1043 | try: |
|
1043 | try: | |
1044 | logfname,logmode = par.split() |
|
1044 | logfname,logmode = par.split() | |
1045 | except: |
|
1045 | except: | |
1046 | logfname = par |
|
1046 | logfname = par | |
1047 | logmode = 'backup' |
|
1047 | logmode = 'backup' | |
1048 | else: |
|
1048 | else: | |
1049 | logfname = logger.logfname |
|
1049 | logfname = logger.logfname | |
1050 | logmode = logger.logmode |
|
1050 | logmode = logger.logmode | |
1051 | # put logfname into rc struct as if it had been called on the command |
|
1051 | # put logfname into rc struct as if it had been called on the command | |
1052 | # line, so it ends up saved in the log header Save it in case we need |
|
1052 | # line, so it ends up saved in the log header Save it in case we need | |
1053 | # to restore it... |
|
1053 | # to restore it... | |
1054 | old_logfile = rc.opts.get('logfile','') |
|
1054 | old_logfile = rc.opts.get('logfile','') | |
1055 | if logfname: |
|
1055 | if logfname: | |
1056 | logfname = os.path.expanduser(logfname) |
|
1056 | logfname = os.path.expanduser(logfname) | |
1057 | rc.opts.logfile = logfname |
|
1057 | rc.opts.logfile = logfname | |
1058 | loghead = self.shell.loghead_tpl % (rc.opts,rc.args) |
|
1058 | loghead = self.shell.loghead_tpl % (rc.opts,rc.args) | |
1059 | try: |
|
1059 | try: | |
1060 | started = logger.logstart(logfname,loghead,logmode, |
|
1060 | started = logger.logstart(logfname,loghead,logmode, | |
1061 | log_output,timestamp,log_raw_input) |
|
1061 | log_output,timestamp,log_raw_input) | |
1062 | except: |
|
1062 | except: | |
1063 | rc.opts.logfile = old_logfile |
|
1063 | rc.opts.logfile = old_logfile | |
1064 | warn("Couldn't start log: %s" % sys.exc_info()[1]) |
|
1064 | warn("Couldn't start log: %s" % sys.exc_info()[1]) | |
1065 | else: |
|
1065 | else: | |
1066 | # log input history up to this point, optionally interleaving |
|
1066 | # log input history up to this point, optionally interleaving | |
1067 | # output if requested |
|
1067 | # output if requested | |
1068 |
|
1068 | |||
1069 | if timestamp: |
|
1069 | if timestamp: | |
1070 | # disable timestamping for the previous history, since we've |
|
1070 | # disable timestamping for the previous history, since we've | |
1071 | # lost those already (no time machine here). |
|
1071 | # lost those already (no time machine here). | |
1072 | logger.timestamp = False |
|
1072 | logger.timestamp = False | |
1073 |
|
1073 | |||
1074 | if log_raw_input: |
|
1074 | if log_raw_input: | |
1075 | input_hist = self.shell.input_hist_raw |
|
1075 | input_hist = self.shell.input_hist_raw | |
1076 | else: |
|
1076 | else: | |
1077 | input_hist = self.shell.input_hist |
|
1077 | input_hist = self.shell.input_hist | |
1078 |
|
1078 | |||
1079 | if log_output: |
|
1079 | if log_output: | |
1080 | log_write = logger.log_write |
|
1080 | log_write = logger.log_write | |
1081 | output_hist = self.shell.output_hist |
|
1081 | output_hist = self.shell.output_hist | |
1082 | for n in range(1,len(input_hist)-1): |
|
1082 | for n in range(1,len(input_hist)-1): | |
1083 | log_write(input_hist[n].rstrip()) |
|
1083 | log_write(input_hist[n].rstrip()) | |
1084 | if n in output_hist: |
|
1084 | if n in output_hist: | |
1085 | log_write(repr(output_hist[n]),'output') |
|
1085 | log_write(repr(output_hist[n]),'output') | |
1086 | else: |
|
1086 | else: | |
1087 | logger.log_write(input_hist[1:]) |
|
1087 | logger.log_write(input_hist[1:]) | |
1088 | if timestamp: |
|
1088 | if timestamp: | |
1089 | # re-enable timestamping |
|
1089 | # re-enable timestamping | |
1090 | logger.timestamp = True |
|
1090 | logger.timestamp = True | |
1091 |
|
1091 | |||
1092 | print ('Activating auto-logging. ' |
|
1092 | print ('Activating auto-logging. ' | |
1093 | 'Current session state plus future input saved.') |
|
1093 | 'Current session state plus future input saved.') | |
1094 | logger.logstate() |
|
1094 | logger.logstate() | |
1095 |
|
1095 | |||
1096 | def magic_logoff(self,parameter_s=''): |
|
1096 | def magic_logoff(self,parameter_s=''): | |
1097 | """Temporarily stop logging. |
|
1097 | """Temporarily stop logging. | |
1098 |
|
1098 | |||
1099 | You must have previously started logging.""" |
|
1099 | You must have previously started logging.""" | |
1100 | self.shell.logger.switch_log(0) |
|
1100 | self.shell.logger.switch_log(0) | |
1101 |
|
1101 | |||
1102 | def magic_logon(self,parameter_s=''): |
|
1102 | def magic_logon(self,parameter_s=''): | |
1103 | """Restart logging. |
|
1103 | """Restart logging. | |
1104 |
|
1104 | |||
1105 | This function is for restarting logging which you've temporarily |
|
1105 | This function is for restarting logging which you've temporarily | |
1106 | stopped with %logoff. For starting logging for the first time, you |
|
1106 | stopped with %logoff. For starting logging for the first time, you | |
1107 | must use the %logstart function, which allows you to specify an |
|
1107 | must use the %logstart function, which allows you to specify an | |
1108 | optional log filename.""" |
|
1108 | optional log filename.""" | |
1109 |
|
1109 | |||
1110 | self.shell.logger.switch_log(1) |
|
1110 | self.shell.logger.switch_log(1) | |
1111 |
|
1111 | |||
1112 | def magic_logstate(self,parameter_s=''): |
|
1112 | def magic_logstate(self,parameter_s=''): | |
1113 | """Print the status of the logging system.""" |
|
1113 | """Print the status of the logging system.""" | |
1114 |
|
1114 | |||
1115 | self.shell.logger.logstate() |
|
1115 | self.shell.logger.logstate() | |
1116 |
|
1116 | |||
1117 | def magic_pdb(self, parameter_s=''): |
|
1117 | def magic_pdb(self, parameter_s=''): | |
1118 | """Control the calling of the pdb interactive debugger. |
|
1118 | """Control the calling of the pdb interactive debugger. | |
1119 |
|
1119 | |||
1120 | Call as '%pdb on', '%pdb 1', '%pdb off' or '%pdb 0'. If called without |
|
1120 | Call as '%pdb on', '%pdb 1', '%pdb off' or '%pdb 0'. If called without | |
1121 | argument it works as a toggle. |
|
1121 | argument it works as a toggle. | |
1122 |
|
1122 | |||
1123 | When an exception is triggered, IPython can optionally call the |
|
1123 | When an exception is triggered, IPython can optionally call the | |
1124 | interactive pdb debugger after the traceback printout. %pdb toggles |
|
1124 | interactive pdb debugger after the traceback printout. %pdb toggles | |
1125 | this feature on and off.""" |
|
1125 | this feature on and off.""" | |
1126 |
|
1126 | |||
1127 | par = parameter_s.strip().lower() |
|
1127 | par = parameter_s.strip().lower() | |
1128 |
|
1128 | |||
1129 | if par: |
|
1129 | if par: | |
1130 | try: |
|
1130 | try: | |
1131 | new_pdb = {'off':0,'0':0,'on':1,'1':1}[par] |
|
1131 | new_pdb = {'off':0,'0':0,'on':1,'1':1}[par] | |
1132 | except KeyError: |
|
1132 | except KeyError: | |
1133 | print ('Incorrect argument. Use on/1, off/0, ' |
|
1133 | print ('Incorrect argument. Use on/1, off/0, ' | |
1134 | 'or nothing for a toggle.') |
|
1134 | 'or nothing for a toggle.') | |
1135 | return |
|
1135 | return | |
1136 | else: |
|
1136 | else: | |
1137 | # toggle |
|
1137 | # toggle | |
1138 | new_pdb = not self.shell.InteractiveTB.call_pdb |
|
1138 | new_pdb = not self.shell.InteractiveTB.call_pdb | |
1139 |
|
1139 | |||
1140 | # set on the shell |
|
1140 | # set on the shell | |
1141 | self.shell.call_pdb = new_pdb |
|
1141 | self.shell.call_pdb = new_pdb | |
1142 | print 'Automatic pdb calling has been turned',on_off(new_pdb) |
|
1142 | print 'Automatic pdb calling has been turned',on_off(new_pdb) | |
1143 |
|
1143 | |||
1144 | def magic_prun(self, parameter_s ='',user_mode=1, |
|
1144 | def magic_prun(self, parameter_s ='',user_mode=1, | |
1145 | opts=None,arg_lst=None,prog_ns=None): |
|
1145 | opts=None,arg_lst=None,prog_ns=None): | |
1146 |
|
1146 | |||
1147 | """Run a statement through the python code profiler. |
|
1147 | """Run a statement through the python code profiler. | |
1148 |
|
1148 | |||
1149 | Usage:\\ |
|
1149 | Usage:\\ | |
1150 | %prun [options] statement |
|
1150 | %prun [options] statement | |
1151 |
|
1151 | |||
1152 | The given statement (which doesn't require quote marks) is run via the |
|
1152 | The given statement (which doesn't require quote marks) is run via the | |
1153 | python profiler in a manner similar to the profile.run() function. |
|
1153 | python profiler in a manner similar to the profile.run() function. | |
1154 | Namespaces are internally managed to work correctly; profile.run |
|
1154 | Namespaces are internally managed to work correctly; profile.run | |
1155 | cannot be used in IPython because it makes certain assumptions about |
|
1155 | cannot be used in IPython because it makes certain assumptions about | |
1156 | namespaces which do not hold under IPython. |
|
1156 | namespaces which do not hold under IPython. | |
1157 |
|
1157 | |||
1158 | Options: |
|
1158 | Options: | |
1159 |
|
1159 | |||
1160 | -l <limit>: you can place restrictions on what or how much of the |
|
1160 | -l <limit>: you can place restrictions on what or how much of the | |
1161 | profile gets printed. The limit value can be: |
|
1161 | profile gets printed. The limit value can be: | |
1162 |
|
1162 | |||
1163 | * A string: only information for function names containing this string |
|
1163 | * A string: only information for function names containing this string | |
1164 | is printed. |
|
1164 | is printed. | |
1165 |
|
1165 | |||
1166 | * An integer: only these many lines are printed. |
|
1166 | * An integer: only these many lines are printed. | |
1167 |
|
1167 | |||
1168 | * A float (between 0 and 1): this fraction of the report is printed |
|
1168 | * A float (between 0 and 1): this fraction of the report is printed | |
1169 | (for example, use a limit of 0.4 to see the topmost 40% only). |
|
1169 | (for example, use a limit of 0.4 to see the topmost 40% only). | |
1170 |
|
1170 | |||
1171 | You can combine several limits with repeated use of the option. For |
|
1171 | You can combine several limits with repeated use of the option. For | |
1172 | example, '-l __init__ -l 5' will print only the topmost 5 lines of |
|
1172 | example, '-l __init__ -l 5' will print only the topmost 5 lines of | |
1173 | information about class constructors. |
|
1173 | information about class constructors. | |
1174 |
|
1174 | |||
1175 | -r: return the pstats.Stats object generated by the profiling. This |
|
1175 | -r: return the pstats.Stats object generated by the profiling. This | |
1176 | object has all the information about the profile in it, and you can |
|
1176 | object has all the information about the profile in it, and you can | |
1177 | later use it for further analysis or in other functions. |
|
1177 | later use it for further analysis or in other functions. | |
1178 |
|
1178 | |||
1179 | Since magic functions have a particular form of calling which prevents |
|
1179 | Since magic functions have a particular form of calling which prevents | |
1180 | you from writing something like:\\ |
|
1180 | you from writing something like:\\ | |
1181 | In [1]: p = %prun -r print 4 # invalid!\\ |
|
1181 | In [1]: p = %prun -r print 4 # invalid!\\ | |
1182 | you must instead use IPython's automatic variables to assign this:\\ |
|
1182 | you must instead use IPython's automatic variables to assign this:\\ | |
1183 | In [1]: %prun -r print 4 \\ |
|
1183 | In [1]: %prun -r print 4 \\ | |
1184 | Out[1]: <pstats.Stats instance at 0x8222cec>\\ |
|
1184 | Out[1]: <pstats.Stats instance at 0x8222cec>\\ | |
1185 | In [2]: stats = _ |
|
1185 | In [2]: stats = _ | |
1186 |
|
1186 | |||
1187 | If you really need to assign this value via an explicit function call, |
|
1187 | If you really need to assign this value via an explicit function call, | |
1188 | you can always tap directly into the true name of the magic function |
|
1188 | you can always tap directly into the true name of the magic function | |
1189 | by using the _ip.magic function:\\ |
|
1189 | by using the _ip.magic function:\\ | |
1190 | In [3]: stats = _ip.magic('prun','-r print 4') |
|
1190 | In [3]: stats = _ip.magic('prun','-r print 4') | |
1191 |
|
1191 | |||
1192 | You can type _ip.magic? for more details. |
|
1192 | You can type _ip.magic? for more details. | |
1193 |
|
1193 | |||
1194 | -s <key>: sort profile by given key. You can provide more than one key |
|
1194 | -s <key>: sort profile by given key. You can provide more than one key | |
1195 | by using the option several times: '-s key1 -s key2 -s key3...'. The |
|
1195 | by using the option several times: '-s key1 -s key2 -s key3...'. The | |
1196 | default sorting key is 'time'. |
|
1196 | default sorting key is 'time'. | |
1197 |
|
1197 | |||
1198 | The following is copied verbatim from the profile documentation |
|
1198 | The following is copied verbatim from the profile documentation | |
1199 | referenced below: |
|
1199 | referenced below: | |
1200 |
|
1200 | |||
1201 | When more than one key is provided, additional keys are used as |
|
1201 | When more than one key is provided, additional keys are used as | |
1202 | secondary criteria when the there is equality in all keys selected |
|
1202 | secondary criteria when the there is equality in all keys selected | |
1203 | before them. |
|
1203 | before them. | |
1204 |
|
1204 | |||
1205 | Abbreviations can be used for any key names, as long as the |
|
1205 | Abbreviations can be used for any key names, as long as the | |
1206 | abbreviation is unambiguous. The following are the keys currently |
|
1206 | abbreviation is unambiguous. The following are the keys currently | |
1207 | defined: |
|
1207 | defined: | |
1208 |
|
1208 | |||
1209 | Valid Arg Meaning\\ |
|
1209 | Valid Arg Meaning\\ | |
1210 | "calls" call count\\ |
|
1210 | "calls" call count\\ | |
1211 | "cumulative" cumulative time\\ |
|
1211 | "cumulative" cumulative time\\ | |
1212 | "file" file name\\ |
|
1212 | "file" file name\\ | |
1213 | "module" file name\\ |
|
1213 | "module" file name\\ | |
1214 | "pcalls" primitive call count\\ |
|
1214 | "pcalls" primitive call count\\ | |
1215 | "line" line number\\ |
|
1215 | "line" line number\\ | |
1216 | "name" function name\\ |
|
1216 | "name" function name\\ | |
1217 | "nfl" name/file/line\\ |
|
1217 | "nfl" name/file/line\\ | |
1218 | "stdname" standard name\\ |
|
1218 | "stdname" standard name\\ | |
1219 | "time" internal time |
|
1219 | "time" internal time | |
1220 |
|
1220 | |||
1221 | Note that all sorts on statistics are in descending order (placing |
|
1221 | Note that all sorts on statistics are in descending order (placing | |
1222 | most time consuming items first), where as name, file, and line number |
|
1222 | most time consuming items first), where as name, file, and line number | |
1223 | searches are in ascending order (i.e., alphabetical). The subtle |
|
1223 | searches are in ascending order (i.e., alphabetical). The subtle | |
1224 | distinction between "nfl" and "stdname" is that the standard name is a |
|
1224 | distinction between "nfl" and "stdname" is that the standard name is a | |
1225 | sort of the name as printed, which means that the embedded line |
|
1225 | sort of the name as printed, which means that the embedded line | |
1226 | numbers get compared in an odd way. For example, lines 3, 20, and 40 |
|
1226 | numbers get compared in an odd way. For example, lines 3, 20, and 40 | |
1227 | would (if the file names were the same) appear in the string order |
|
1227 | would (if the file names were the same) appear in the string order | |
1228 | "20" "3" and "40". In contrast, "nfl" does a numeric compare of the |
|
1228 | "20" "3" and "40". In contrast, "nfl" does a numeric compare of the | |
1229 | line numbers. In fact, sort_stats("nfl") is the same as |
|
1229 | line numbers. In fact, sort_stats("nfl") is the same as | |
1230 | sort_stats("name", "file", "line"). |
|
1230 | sort_stats("name", "file", "line"). | |
1231 |
|
1231 | |||
1232 | -T <filename>: save profile results as shown on screen to a text |
|
1232 | -T <filename>: save profile results as shown on screen to a text | |
1233 | file. The profile is still shown on screen. |
|
1233 | file. The profile is still shown on screen. | |
1234 |
|
1234 | |||
1235 | -D <filename>: save (via dump_stats) profile statistics to given |
|
1235 | -D <filename>: save (via dump_stats) profile statistics to given | |
1236 | filename. This data is in a format understod by the pstats module, and |
|
1236 | filename. This data is in a format understod by the pstats module, and | |
1237 | is generated by a call to the dump_stats() method of profile |
|
1237 | is generated by a call to the dump_stats() method of profile | |
1238 | objects. The profile is still shown on screen. |
|
1238 | objects. The profile is still shown on screen. | |
1239 |
|
1239 | |||
1240 | If you want to run complete programs under the profiler's control, use |
|
1240 | If you want to run complete programs under the profiler's control, use | |
1241 | '%run -p [prof_opts] filename.py [args to program]' where prof_opts |
|
1241 | '%run -p [prof_opts] filename.py [args to program]' where prof_opts | |
1242 | contains profiler specific options as described here. |
|
1242 | contains profiler specific options as described here. | |
1243 |
|
1243 | |||
1244 | You can read the complete documentation for the profile module with:\\ |
|
1244 | You can read the complete documentation for the profile module with:\\ | |
1245 | In [1]: import profile; profile.help() """ |
|
1245 | In [1]: import profile; profile.help() """ | |
1246 |
|
1246 | |||
1247 | opts_def = Struct(D=[''],l=[],s=['time'],T=['']) |
|
1247 | opts_def = Struct(D=[''],l=[],s=['time'],T=['']) | |
1248 | # protect user quote marks |
|
1248 | # protect user quote marks | |
1249 | parameter_s = parameter_s.replace('"',r'\"').replace("'",r"\'") |
|
1249 | parameter_s = parameter_s.replace('"',r'\"').replace("'",r"\'") | |
1250 |
|
1250 | |||
1251 | if user_mode: # regular user call |
|
1251 | if user_mode: # regular user call | |
1252 | opts,arg_str = self.parse_options(parameter_s,'D:l:rs:T:', |
|
1252 | opts,arg_str = self.parse_options(parameter_s,'D:l:rs:T:', | |
1253 | list_all=1) |
|
1253 | list_all=1) | |
1254 | namespace = self.shell.user_ns |
|
1254 | namespace = self.shell.user_ns | |
1255 | else: # called to run a program by %run -p |
|
1255 | else: # called to run a program by %run -p | |
1256 | try: |
|
1256 | try: | |
1257 | filename = get_py_filename(arg_lst[0]) |
|
1257 | filename = get_py_filename(arg_lst[0]) | |
1258 | except IOError,msg: |
|
1258 | except IOError,msg: | |
1259 | error(msg) |
|
1259 | error(msg) | |
1260 | return |
|
1260 | return | |
1261 |
|
1261 | |||
1262 | arg_str = 'execfile(filename,prog_ns)' |
|
1262 | arg_str = 'execfile(filename,prog_ns)' | |
1263 | namespace = locals() |
|
1263 | namespace = locals() | |
1264 |
|
1264 | |||
1265 | opts.merge(opts_def) |
|
1265 | opts.merge(opts_def) | |
1266 |
|
1266 | |||
1267 | prof = profile.Profile() |
|
1267 | prof = profile.Profile() | |
1268 | try: |
|
1268 | try: | |
1269 | prof = prof.runctx(arg_str,namespace,namespace) |
|
1269 | prof = prof.runctx(arg_str,namespace,namespace) | |
1270 | sys_exit = '' |
|
1270 | sys_exit = '' | |
1271 | except SystemExit: |
|
1271 | except SystemExit: | |
1272 | sys_exit = """*** SystemExit exception caught in code being profiled.""" |
|
1272 | sys_exit = """*** SystemExit exception caught in code being profiled.""" | |
1273 |
|
1273 | |||
1274 | stats = pstats.Stats(prof).strip_dirs().sort_stats(*opts.s) |
|
1274 | stats = pstats.Stats(prof).strip_dirs().sort_stats(*opts.s) | |
1275 |
|
1275 | |||
1276 | lims = opts.l |
|
1276 | lims = opts.l | |
1277 | if lims: |
|
1277 | if lims: | |
1278 | lims = [] # rebuild lims with ints/floats/strings |
|
1278 | lims = [] # rebuild lims with ints/floats/strings | |
1279 | for lim in opts.l: |
|
1279 | for lim in opts.l: | |
1280 | try: |
|
1280 | try: | |
1281 | lims.append(int(lim)) |
|
1281 | lims.append(int(lim)) | |
1282 | except ValueError: |
|
1282 | except ValueError: | |
1283 | try: |
|
1283 | try: | |
1284 | lims.append(float(lim)) |
|
1284 | lims.append(float(lim)) | |
1285 | except ValueError: |
|
1285 | except ValueError: | |
1286 | lims.append(lim) |
|
1286 | lims.append(lim) | |
1287 |
|
1287 | |||
1288 | # trap output |
|
1288 | # trap output | |
1289 | sys_stdout = sys.stdout |
|
1289 | sys_stdout = sys.stdout | |
1290 | stdout_trap = StringIO() |
|
1290 | stdout_trap = StringIO() | |
1291 | try: |
|
1291 | try: | |
1292 | sys.stdout = stdout_trap |
|
1292 | sys.stdout = stdout_trap | |
1293 | stats.print_stats(*lims) |
|
1293 | stats.print_stats(*lims) | |
1294 | finally: |
|
1294 | finally: | |
1295 | sys.stdout = sys_stdout |
|
1295 | sys.stdout = sys_stdout | |
1296 | output = stdout_trap.getvalue() |
|
1296 | output = stdout_trap.getvalue() | |
1297 | output = output.rstrip() |
|
1297 | output = output.rstrip() | |
1298 |
|
1298 | |||
1299 | page(output,screen_lines=self.shell.rc.screen_length) |
|
1299 | page(output,screen_lines=self.shell.rc.screen_length) | |
1300 | print sys_exit, |
|
1300 | print sys_exit, | |
1301 |
|
1301 | |||
1302 | dump_file = opts.D[0] |
|
1302 | dump_file = opts.D[0] | |
1303 | text_file = opts.T[0] |
|
1303 | text_file = opts.T[0] | |
1304 | if dump_file: |
|
1304 | if dump_file: | |
1305 | prof.dump_stats(dump_file) |
|
1305 | prof.dump_stats(dump_file) | |
1306 | print '\n*** Profile stats marshalled to file',\ |
|
1306 | print '\n*** Profile stats marshalled to file',\ | |
1307 | `dump_file`+'.',sys_exit |
|
1307 | `dump_file`+'.',sys_exit | |
1308 | if text_file: |
|
1308 | if text_file: | |
1309 | file(text_file,'w').write(output) |
|
1309 | file(text_file,'w').write(output) | |
1310 | print '\n*** Profile printout saved to text file',\ |
|
1310 | print '\n*** Profile printout saved to text file',\ | |
1311 | `text_file`+'.',sys_exit |
|
1311 | `text_file`+'.',sys_exit | |
1312 |
|
1312 | |||
1313 | if opts.has_key('r'): |
|
1313 | if opts.has_key('r'): | |
1314 | return stats |
|
1314 | return stats | |
1315 | else: |
|
1315 | else: | |
1316 | return None |
|
1316 | return None | |
1317 |
|
1317 | |||
1318 | def magic_run(self, parameter_s ='',runner=None): |
|
1318 | def magic_run(self, parameter_s ='',runner=None): | |
1319 | """Run the named file inside IPython as a program. |
|
1319 | """Run the named file inside IPython as a program. | |
1320 |
|
1320 | |||
1321 | Usage:\\ |
|
1321 | Usage:\\ | |
1322 | %run [-n -i -t [-N<N>] -d [-b<N>] -p [profile options]] file [args] |
|
1322 | %run [-n -i -t [-N<N>] -d [-b<N>] -p [profile options]] file [args] | |
1323 |
|
1323 | |||
1324 | Parameters after the filename are passed as command-line arguments to |
|
1324 | Parameters after the filename are passed as command-line arguments to | |
1325 | the program (put in sys.argv). Then, control returns to IPython's |
|
1325 | the program (put in sys.argv). Then, control returns to IPython's | |
1326 | prompt. |
|
1326 | prompt. | |
1327 |
|
1327 | |||
1328 | This is similar to running at a system prompt:\\ |
|
1328 | This is similar to running at a system prompt:\\ | |
1329 | $ python file args\\ |
|
1329 | $ python file args\\ | |
1330 | but with the advantage of giving you IPython's tracebacks, and of |
|
1330 | but with the advantage of giving you IPython's tracebacks, and of | |
1331 | loading all variables into your interactive namespace for further use |
|
1331 | loading all variables into your interactive namespace for further use | |
1332 | (unless -p is used, see below). |
|
1332 | (unless -p is used, see below). | |
1333 |
|
1333 | |||
1334 | The file is executed in a namespace initially consisting only of |
|
1334 | The file is executed in a namespace initially consisting only of | |
1335 | __name__=='__main__' and sys.argv constructed as indicated. It thus |
|
1335 | __name__=='__main__' and sys.argv constructed as indicated. It thus | |
1336 | sees its environment as if it were being run as a stand-alone |
|
1336 | sees its environment as if it were being run as a stand-alone | |
1337 | program. But after execution, the IPython interactive namespace gets |
|
1337 | program. But after execution, the IPython interactive namespace gets | |
1338 | updated with all variables defined in the program (except for __name__ |
|
1338 | updated with all variables defined in the program (except for __name__ | |
1339 | and sys.argv). This allows for very convenient loading of code for |
|
1339 | and sys.argv). This allows for very convenient loading of code for | |
1340 | interactive work, while giving each program a 'clean sheet' to run in. |
|
1340 | interactive work, while giving each program a 'clean sheet' to run in. | |
1341 |
|
1341 | |||
1342 | Options: |
|
1342 | Options: | |
1343 |
|
1343 | |||
1344 | -n: __name__ is NOT set to '__main__', but to the running file's name |
|
1344 | -n: __name__ is NOT set to '__main__', but to the running file's name | |
1345 | without extension (as python does under import). This allows running |
|
1345 | without extension (as python does under import). This allows running | |
1346 | scripts and reloading the definitions in them without calling code |
|
1346 | scripts and reloading the definitions in them without calling code | |
1347 | protected by an ' if __name__ == "__main__" ' clause. |
|
1347 | protected by an ' if __name__ == "__main__" ' clause. | |
1348 |
|
1348 | |||
1349 | -i: run the file in IPython's namespace instead of an empty one. This |
|
1349 | -i: run the file in IPython's namespace instead of an empty one. This | |
1350 | is useful if you are experimenting with code written in a text editor |
|
1350 | is useful if you are experimenting with code written in a text editor | |
1351 | which depends on variables defined interactively. |
|
1351 | which depends on variables defined interactively. | |
1352 |
|
1352 | |||
1353 | -e: ignore sys.exit() calls or SystemExit exceptions in the script |
|
1353 | -e: ignore sys.exit() calls or SystemExit exceptions in the script | |
1354 | being run. This is particularly useful if IPython is being used to |
|
1354 | being run. This is particularly useful if IPython is being used to | |
1355 | run unittests, which always exit with a sys.exit() call. In such |
|
1355 | run unittests, which always exit with a sys.exit() call. In such | |
1356 | cases you are interested in the output of the test results, not in |
|
1356 | cases you are interested in the output of the test results, not in | |
1357 | seeing a traceback of the unittest module. |
|
1357 | seeing a traceback of the unittest module. | |
1358 |
|
1358 | |||
1359 | -t: print timing information at the end of the run. IPython will give |
|
1359 | -t: print timing information at the end of the run. IPython will give | |
1360 | you an estimated CPU time consumption for your script, which under |
|
1360 | you an estimated CPU time consumption for your script, which under | |
1361 | Unix uses the resource module to avoid the wraparound problems of |
|
1361 | Unix uses the resource module to avoid the wraparound problems of | |
1362 | time.clock(). Under Unix, an estimate of time spent on system tasks |
|
1362 | time.clock(). Under Unix, an estimate of time spent on system tasks | |
1363 | is also given (for Windows platforms this is reported as 0.0). |
|
1363 | is also given (for Windows platforms this is reported as 0.0). | |
1364 |
|
1364 | |||
1365 | If -t is given, an additional -N<N> option can be given, where <N> |
|
1365 | If -t is given, an additional -N<N> option can be given, where <N> | |
1366 | must be an integer indicating how many times you want the script to |
|
1366 | must be an integer indicating how many times you want the script to | |
1367 | run. The final timing report will include total and per run results. |
|
1367 | run. The final timing report will include total and per run results. | |
1368 |
|
1368 | |||
1369 | For example (testing the script uniq_stable.py): |
|
1369 | For example (testing the script uniq_stable.py): | |
1370 |
|
1370 | |||
1371 | In [1]: run -t uniq_stable |
|
1371 | In [1]: run -t uniq_stable | |
1372 |
|
1372 | |||
1373 | IPython CPU timings (estimated):\\ |
|
1373 | IPython CPU timings (estimated):\\ | |
1374 | User : 0.19597 s.\\ |
|
1374 | User : 0.19597 s.\\ | |
1375 | System: 0.0 s.\\ |
|
1375 | System: 0.0 s.\\ | |
1376 |
|
1376 | |||
1377 | In [2]: run -t -N5 uniq_stable |
|
1377 | In [2]: run -t -N5 uniq_stable | |
1378 |
|
1378 | |||
1379 | IPython CPU timings (estimated):\\ |
|
1379 | IPython CPU timings (estimated):\\ | |
1380 | Total runs performed: 5\\ |
|
1380 | Total runs performed: 5\\ | |
1381 | Times : Total Per run\\ |
|
1381 | Times : Total Per run\\ | |
1382 | User : 0.910862 s, 0.1821724 s.\\ |
|
1382 | User : 0.910862 s, 0.1821724 s.\\ | |
1383 | System: 0.0 s, 0.0 s. |
|
1383 | System: 0.0 s, 0.0 s. | |
1384 |
|
1384 | |||
1385 | -d: run your program under the control of pdb, the Python debugger. |
|
1385 | -d: run your program under the control of pdb, the Python debugger. | |
1386 | This allows you to execute your program step by step, watch variables, |
|
1386 | This allows you to execute your program step by step, watch variables, | |
1387 | etc. Internally, what IPython does is similar to calling: |
|
1387 | etc. Internally, what IPython does is similar to calling: | |
1388 |
|
1388 | |||
1389 | pdb.run('execfile("YOURFILENAME")') |
|
1389 | pdb.run('execfile("YOURFILENAME")') | |
1390 |
|
1390 | |||
1391 | with a breakpoint set on line 1 of your file. You can change the line |
|
1391 | with a breakpoint set on line 1 of your file. You can change the line | |
1392 | number for this automatic breakpoint to be <N> by using the -bN option |
|
1392 | number for this automatic breakpoint to be <N> by using the -bN option | |
1393 | (where N must be an integer). For example: |
|
1393 | (where N must be an integer). For example: | |
1394 |
|
1394 | |||
1395 | %run -d -b40 myscript |
|
1395 | %run -d -b40 myscript | |
1396 |
|
1396 | |||
1397 | will set the first breakpoint at line 40 in myscript.py. Note that |
|
1397 | will set the first breakpoint at line 40 in myscript.py. Note that | |
1398 | the first breakpoint must be set on a line which actually does |
|
1398 | the first breakpoint must be set on a line which actually does | |
1399 | something (not a comment or docstring) for it to stop execution. |
|
1399 | something (not a comment or docstring) for it to stop execution. | |
1400 |
|
1400 | |||
1401 | When the pdb debugger starts, you will see a (Pdb) prompt. You must |
|
1401 | When the pdb debugger starts, you will see a (Pdb) prompt. You must | |
1402 | first enter 'c' (without qoutes) to start execution up to the first |
|
1402 | first enter 'c' (without qoutes) to start execution up to the first | |
1403 | breakpoint. |
|
1403 | breakpoint. | |
1404 |
|
1404 | |||
1405 | Entering 'help' gives information about the use of the debugger. You |
|
1405 | Entering 'help' gives information about the use of the debugger. You | |
1406 | can easily see pdb's full documentation with "import pdb;pdb.help()" |
|
1406 | can easily see pdb's full documentation with "import pdb;pdb.help()" | |
1407 | at a prompt. |
|
1407 | at a prompt. | |
1408 |
|
1408 | |||
1409 | -p: run program under the control of the Python profiler module (which |
|
1409 | -p: run program under the control of the Python profiler module (which | |
1410 | prints a detailed report of execution times, function calls, etc). |
|
1410 | prints a detailed report of execution times, function calls, etc). | |
1411 |
|
1411 | |||
1412 | You can pass other options after -p which affect the behavior of the |
|
1412 | You can pass other options after -p which affect the behavior of the | |
1413 | profiler itself. See the docs for %prun for details. |
|
1413 | profiler itself. See the docs for %prun for details. | |
1414 |
|
1414 | |||
1415 | In this mode, the program's variables do NOT propagate back to the |
|
1415 | In this mode, the program's variables do NOT propagate back to the | |
1416 | IPython interactive namespace (because they remain in the namespace |
|
1416 | IPython interactive namespace (because they remain in the namespace | |
1417 | where the profiler executes them). |
|
1417 | where the profiler executes them). | |
1418 |
|
1418 | |||
1419 | Internally this triggers a call to %prun, see its documentation for |
|
1419 | Internally this triggers a call to %prun, see its documentation for | |
1420 | details on the options available specifically for profiling.""" |
|
1420 | details on the options available specifically for profiling.""" | |
1421 |
|
1421 | |||
1422 | # get arguments and set sys.argv for program to be run. |
|
1422 | # get arguments and set sys.argv for program to be run. | |
1423 | opts,arg_lst = self.parse_options(parameter_s,'nidtN:b:pD:l:rs:T:e', |
|
1423 | opts,arg_lst = self.parse_options(parameter_s,'nidtN:b:pD:l:rs:T:e', | |
1424 | mode='list',list_all=1) |
|
1424 | mode='list',list_all=1) | |
1425 |
|
1425 | |||
1426 | try: |
|
1426 | try: | |
1427 | filename = get_py_filename(arg_lst[0]) |
|
1427 | filename = get_py_filename(arg_lst[0]) | |
1428 | except IndexError: |
|
1428 | except IndexError: | |
1429 | warn('you must provide at least a filename.') |
|
1429 | warn('you must provide at least a filename.') | |
1430 | print '\n%run:\n',OInspect.getdoc(self.magic_run) |
|
1430 | print '\n%run:\n',OInspect.getdoc(self.magic_run) | |
1431 | return |
|
1431 | return | |
1432 | except IOError,msg: |
|
1432 | except IOError,msg: | |
1433 | error(msg) |
|
1433 | error(msg) | |
1434 | return |
|
1434 | return | |
1435 |
|
1435 | |||
1436 | # Control the response to exit() calls made by the script being run |
|
1436 | # Control the response to exit() calls made by the script being run | |
1437 | exit_ignore = opts.has_key('e') |
|
1437 | exit_ignore = opts.has_key('e') | |
1438 |
|
1438 | |||
1439 | # Make sure that the running script gets a proper sys.argv as if it |
|
1439 | # Make sure that the running script gets a proper sys.argv as if it | |
1440 | # were run from a system shell. |
|
1440 | # were run from a system shell. | |
1441 | save_argv = sys.argv # save it for later restoring |
|
1441 | save_argv = sys.argv # save it for later restoring | |
1442 | sys.argv = [filename]+ arg_lst[1:] # put in the proper filename |
|
1442 | sys.argv = [filename]+ arg_lst[1:] # put in the proper filename | |
1443 |
|
1443 | |||
1444 | if opts.has_key('i'): |
|
1444 | if opts.has_key('i'): | |
1445 | prog_ns = self.shell.user_ns |
|
1445 | prog_ns = self.shell.user_ns | |
1446 | __name__save = self.shell.user_ns['__name__'] |
|
1446 | __name__save = self.shell.user_ns['__name__'] | |
1447 | prog_ns['__name__'] = '__main__' |
|
1447 | prog_ns['__name__'] = '__main__' | |
1448 | else: |
|
1448 | else: | |
1449 | if opts.has_key('n'): |
|
1449 | if opts.has_key('n'): | |
1450 | name = os.path.splitext(os.path.basename(filename))[0] |
|
1450 | name = os.path.splitext(os.path.basename(filename))[0] | |
1451 | else: |
|
1451 | else: | |
1452 | name = '__main__' |
|
1452 | name = '__main__' | |
1453 | prog_ns = {'__name__':name} |
|
1453 | prog_ns = {'__name__':name} | |
1454 |
|
1454 | |||
1455 | # Since '%run foo' emulates 'python foo.py' at the cmd line, we must |
|
1455 | # Since '%run foo' emulates 'python foo.py' at the cmd line, we must | |
1456 | # set the __file__ global in the script's namespace |
|
1456 | # set the __file__ global in the script's namespace | |
1457 | prog_ns['__file__'] = filename |
|
1457 | prog_ns['__file__'] = filename | |
1458 |
|
1458 | |||
1459 | # pickle fix. See iplib for an explanation. But we need to make sure |
|
1459 | # pickle fix. See iplib for an explanation. But we need to make sure | |
1460 | # that, if we overwrite __main__, we replace it at the end |
|
1460 | # that, if we overwrite __main__, we replace it at the end | |
1461 | if prog_ns['__name__'] == '__main__': |
|
1461 | if prog_ns['__name__'] == '__main__': | |
1462 | restore_main = sys.modules['__main__'] |
|
1462 | restore_main = sys.modules['__main__'] | |
1463 | else: |
|
1463 | else: | |
1464 | restore_main = False |
|
1464 | restore_main = False | |
1465 |
|
1465 | |||
1466 | sys.modules[prog_ns['__name__']] = FakeModule(prog_ns) |
|
1466 | sys.modules[prog_ns['__name__']] = FakeModule(prog_ns) | |
1467 |
|
1467 | |||
1468 | stats = None |
|
1468 | stats = None | |
1469 | try: |
|
1469 | try: | |
1470 | if opts.has_key('p'): |
|
1470 | if opts.has_key('p'): | |
1471 | stats = self.magic_prun('',0,opts,arg_lst,prog_ns) |
|
1471 | stats = self.magic_prun('',0,opts,arg_lst,prog_ns) | |
1472 | else: |
|
1472 | else: | |
1473 | if opts.has_key('d'): |
|
1473 | if opts.has_key('d'): | |
1474 | deb = Debugger.Pdb(self.shell.rc.colors) |
|
1474 | deb = Debugger.Pdb(self.shell.rc.colors) | |
1475 | # reset Breakpoint state, which is moronically kept |
|
1475 | # reset Breakpoint state, which is moronically kept | |
1476 | # in a class |
|
1476 | # in a class | |
1477 | bdb.Breakpoint.next = 1 |
|
1477 | bdb.Breakpoint.next = 1 | |
1478 | bdb.Breakpoint.bplist = {} |
|
1478 | bdb.Breakpoint.bplist = {} | |
1479 | bdb.Breakpoint.bpbynumber = [None] |
|
1479 | bdb.Breakpoint.bpbynumber = [None] | |
1480 | # Set an initial breakpoint to stop execution |
|
1480 | # Set an initial breakpoint to stop execution | |
1481 | maxtries = 10 |
|
1481 | maxtries = 10 | |
1482 | bp = int(opts.get('b',[1])[0]) |
|
1482 | bp = int(opts.get('b',[1])[0]) | |
1483 | checkline = deb.checkline(filename,bp) |
|
1483 | checkline = deb.checkline(filename,bp) | |
1484 | if not checkline: |
|
1484 | if not checkline: | |
1485 | for bp in range(bp+1,bp+maxtries+1): |
|
1485 | for bp in range(bp+1,bp+maxtries+1): | |
1486 | if deb.checkline(filename,bp): |
|
1486 | if deb.checkline(filename,bp): | |
1487 | break |
|
1487 | break | |
1488 | else: |
|
1488 | else: | |
1489 | msg = ("\nI failed to find a valid line to set " |
|
1489 | msg = ("\nI failed to find a valid line to set " | |
1490 | "a breakpoint\n" |
|
1490 | "a breakpoint\n" | |
1491 | "after trying up to line: %s.\n" |
|
1491 | "after trying up to line: %s.\n" | |
1492 | "Please set a valid breakpoint manually " |
|
1492 | "Please set a valid breakpoint manually " | |
1493 | "with the -b option." % bp) |
|
1493 | "with the -b option." % bp) | |
1494 | error(msg) |
|
1494 | error(msg) | |
1495 | return |
|
1495 | return | |
1496 | # if we find a good linenumber, set the breakpoint |
|
1496 | # if we find a good linenumber, set the breakpoint | |
1497 | deb.do_break('%s:%s' % (filename,bp)) |
|
1497 | deb.do_break('%s:%s' % (filename,bp)) | |
1498 | # Start file run |
|
1498 | # Start file run | |
1499 | print "NOTE: Enter 'c' at the", |
|
1499 | print "NOTE: Enter 'c' at the", | |
1500 | print "ipdb> prompt to start your script." |
|
1500 | print "ipdb> prompt to start your script." | |
1501 | try: |
|
1501 | try: | |
1502 | deb.run('execfile("%s")' % filename,prog_ns) |
|
1502 | deb.run('execfile("%s")' % filename,prog_ns) | |
1503 | except: |
|
1503 | except: | |
1504 | etype, value, tb = sys.exc_info() |
|
1504 | etype, value, tb = sys.exc_info() | |
1505 | # Skip three frames in the traceback: the %run one, |
|
1505 | # Skip three frames in the traceback: the %run one, | |
1506 | # one inside bdb.py, and the command-line typed by the |
|
1506 | # one inside bdb.py, and the command-line typed by the | |
1507 | # user (run by exec in pdb itself). |
|
1507 | # user (run by exec in pdb itself). | |
1508 | self.shell.InteractiveTB(etype,value,tb,tb_offset=3) |
|
1508 | self.shell.InteractiveTB(etype,value,tb,tb_offset=3) | |
1509 | else: |
|
1509 | else: | |
1510 | if runner is None: |
|
1510 | if runner is None: | |
1511 | runner = self.shell.safe_execfile |
|
1511 | runner = self.shell.safe_execfile | |
1512 | if opts.has_key('t'): |
|
1512 | if opts.has_key('t'): | |
1513 | try: |
|
1513 | try: | |
1514 | nruns = int(opts['N'][0]) |
|
1514 | nruns = int(opts['N'][0]) | |
1515 | if nruns < 1: |
|
1515 | if nruns < 1: | |
1516 | error('Number of runs must be >=1') |
|
1516 | error('Number of runs must be >=1') | |
1517 | return |
|
1517 | return | |
1518 | except (KeyError): |
|
1518 | except (KeyError): | |
1519 | nruns = 1 |
|
1519 | nruns = 1 | |
1520 | if nruns == 1: |
|
1520 | if nruns == 1: | |
1521 | t0 = clock2() |
|
1521 | t0 = clock2() | |
1522 | runner(filename,prog_ns,prog_ns,exit_ignore=exit_ignore) |
|
1522 | runner(filename,prog_ns,prog_ns,exit_ignore=exit_ignore) | |
1523 | t1 = clock2() |
|
1523 | t1 = clock2() | |
1524 | t_usr = t1[0]-t0[0] |
|
1524 | t_usr = t1[0]-t0[0] | |
1525 | t_sys = t1[1]-t1[1] |
|
1525 | t_sys = t1[1]-t1[1] | |
1526 | print "\nIPython CPU timings (estimated):" |
|
1526 | print "\nIPython CPU timings (estimated):" | |
1527 | print " User : %10s s." % t_usr |
|
1527 | print " User : %10s s." % t_usr | |
1528 | print " System: %10s s." % t_sys |
|
1528 | print " System: %10s s." % t_sys | |
1529 | else: |
|
1529 | else: | |
1530 | runs = range(nruns) |
|
1530 | runs = range(nruns) | |
1531 | t0 = clock2() |
|
1531 | t0 = clock2() | |
1532 | for nr in runs: |
|
1532 | for nr in runs: | |
1533 | runner(filename,prog_ns,prog_ns,exit_ignore=exit_ignore) |
|
1533 | runner(filename,prog_ns,prog_ns,exit_ignore=exit_ignore) | |
1534 | t1 = clock2() |
|
1534 | t1 = clock2() | |
1535 | t_usr = t1[0]-t0[0] |
|
1535 | t_usr = t1[0]-t0[0] | |
1536 | t_sys = t1[1]-t1[1] |
|
1536 | t_sys = t1[1]-t1[1] | |
1537 | print "\nIPython CPU timings (estimated):" |
|
1537 | print "\nIPython CPU timings (estimated):" | |
1538 | print "Total runs performed:",nruns |
|
1538 | print "Total runs performed:",nruns | |
1539 | print " Times : %10s %10s" % ('Total','Per run') |
|
1539 | print " Times : %10s %10s" % ('Total','Per run') | |
1540 | print " User : %10s s, %10s s." % (t_usr,t_usr/nruns) |
|
1540 | print " User : %10s s, %10s s." % (t_usr,t_usr/nruns) | |
1541 | print " System: %10s s, %10s s." % (t_sys,t_sys/nruns) |
|
1541 | print " System: %10s s, %10s s." % (t_sys,t_sys/nruns) | |
1542 |
|
1542 | |||
1543 | else: |
|
1543 | else: | |
1544 | runner(filename,prog_ns,prog_ns,exit_ignore=exit_ignore) |
|
1544 | runner(filename,prog_ns,prog_ns,exit_ignore=exit_ignore) | |
1545 | if opts.has_key('i'): |
|
1545 | if opts.has_key('i'): | |
1546 | self.shell.user_ns['__name__'] = __name__save |
|
1546 | self.shell.user_ns['__name__'] = __name__save | |
1547 | else: |
|
1547 | else: | |
1548 | # update IPython interactive namespace |
|
1548 | # update IPython interactive namespace | |
1549 | del prog_ns['__name__'] |
|
1549 | del prog_ns['__name__'] | |
1550 | self.shell.user_ns.update(prog_ns) |
|
1550 | self.shell.user_ns.update(prog_ns) | |
1551 | finally: |
|
1551 | finally: | |
1552 | sys.argv = save_argv |
|
1552 | sys.argv = save_argv | |
1553 | if restore_main: |
|
1553 | if restore_main: | |
1554 | sys.modules['__main__'] = restore_main |
|
1554 | sys.modules['__main__'] = restore_main | |
1555 | return stats |
|
1555 | return stats | |
1556 |
|
1556 | |||
1557 | def magic_runlog(self, parameter_s =''): |
|
1557 | def magic_runlog(self, parameter_s =''): | |
1558 | """Run files as logs. |
|
1558 | """Run files as logs. | |
1559 |
|
1559 | |||
1560 | Usage:\\ |
|
1560 | Usage:\\ | |
1561 | %runlog file1 file2 ... |
|
1561 | %runlog file1 file2 ... | |
1562 |
|
1562 | |||
1563 | Run the named files (treating them as log files) in sequence inside |
|
1563 | Run the named files (treating them as log files) in sequence inside | |
1564 | the interpreter, and return to the prompt. This is much slower than |
|
1564 | the interpreter, and return to the prompt. This is much slower than | |
1565 | %run because each line is executed in a try/except block, but it |
|
1565 | %run because each line is executed in a try/except block, but it | |
1566 | allows running files with syntax errors in them. |
|
1566 | allows running files with syntax errors in them. | |
1567 |
|
1567 | |||
1568 | Normally IPython will guess when a file is one of its own logfiles, so |
|
1568 | Normally IPython will guess when a file is one of its own logfiles, so | |
1569 | you can typically use %run even for logs. This shorthand allows you to |
|
1569 | you can typically use %run even for logs. This shorthand allows you to | |
1570 | force any file to be treated as a log file.""" |
|
1570 | force any file to be treated as a log file.""" | |
1571 |
|
1571 | |||
1572 | for f in parameter_s.split(): |
|
1572 | for f in parameter_s.split(): | |
1573 | self.shell.safe_execfile(f,self.shell.user_ns, |
|
1573 | self.shell.safe_execfile(f,self.shell.user_ns, | |
1574 | self.shell.user_ns,islog=1) |
|
1574 | self.shell.user_ns,islog=1) | |
1575 |
|
1575 | |||
1576 | def magic_timeit(self, parameter_s =''): |
|
1576 | def magic_timeit(self, parameter_s =''): | |
1577 | """Time execution of a Python statement or expression |
|
1577 | """Time execution of a Python statement or expression | |
1578 |
|
1578 | |||
1579 | Usage:\\ |
|
1579 | Usage:\\ | |
1580 | %timeit [-n<N> -r<R> [-t|-c]] statement |
|
1580 | %timeit [-n<N> -r<R> [-t|-c]] statement | |
1581 |
|
1581 | |||
1582 | Time execution of a Python statement or expression using the timeit |
|
1582 | Time execution of a Python statement or expression using the timeit | |
1583 | module. |
|
1583 | module. | |
1584 |
|
1584 | |||
1585 | Options: |
|
1585 | Options: | |
1586 | -n<N>: execute the given statement <N> times in a loop. If this value |
|
1586 | -n<N>: execute the given statement <N> times in a loop. If this value | |
1587 | is not given, a fitting value is chosen. |
|
1587 | is not given, a fitting value is chosen. | |
1588 |
|
1588 | |||
1589 | -r<R>: repeat the loop iteration <R> times and take the best result. |
|
1589 | -r<R>: repeat the loop iteration <R> times and take the best result. | |
1590 | Default: 3 |
|
1590 | Default: 3 | |
1591 |
|
1591 | |||
1592 | -t: use time.time to measure the time, which is the default on Unix. |
|
1592 | -t: use time.time to measure the time, which is the default on Unix. | |
1593 | This function measures wall time. |
|
1593 | This function measures wall time. | |
1594 |
|
1594 | |||
1595 | -c: use time.clock to measure the time, which is the default on |
|
1595 | -c: use time.clock to measure the time, which is the default on | |
1596 | Windows and measures wall time. On Unix, resource.getrusage is used |
|
1596 | Windows and measures wall time. On Unix, resource.getrusage is used | |
1597 | instead and returns the CPU user time. |
|
1597 | instead and returns the CPU user time. | |
1598 |
|
1598 | |||
1599 | -p<P>: use a precision of <P> digits to display the timing result. |
|
1599 | -p<P>: use a precision of <P> digits to display the timing result. | |
1600 | Default: 3 |
|
1600 | Default: 3 | |
1601 |
|
1601 | |||
1602 |
|
1602 | |||
1603 | Examples:\\ |
|
1603 | Examples:\\ | |
1604 | In [1]: %timeit pass |
|
1604 | In [1]: %timeit pass | |
1605 | 10000000 loops, best of 3: 53.3 ns per loop |
|
1605 | 10000000 loops, best of 3: 53.3 ns per loop | |
1606 |
|
1606 | |||
1607 | In [2]: u = None |
|
1607 | In [2]: u = None | |
1608 |
|
1608 | |||
1609 | In [3]: %timeit u is None |
|
1609 | In [3]: %timeit u is None | |
1610 | 10000000 loops, best of 3: 184 ns per loop |
|
1610 | 10000000 loops, best of 3: 184 ns per loop | |
1611 |
|
1611 | |||
1612 | In [4]: %timeit -r 4 u == None |
|
1612 | In [4]: %timeit -r 4 u == None | |
1613 | 1000000 loops, best of 4: 242 ns per loop |
|
1613 | 1000000 loops, best of 4: 242 ns per loop | |
1614 |
|
1614 | |||
1615 | In [5]: import time |
|
1615 | In [5]: import time | |
1616 |
|
1616 | |||
1617 | In [6]: %timeit -n1 time.sleep(2) |
|
1617 | In [6]: %timeit -n1 time.sleep(2) | |
1618 | 1 loops, best of 3: 2 s per loop |
|
1618 | 1 loops, best of 3: 2 s per loop | |
1619 |
|
1619 | |||
1620 |
|
1620 | |||
1621 | The times reported by %timeit will be slightly higher than those reported |
|
1621 | The times reported by %timeit will be slightly higher than those reported | |
1622 | by the timeit.py script when variables are accessed. This is due to the |
|
1622 | by the timeit.py script when variables are accessed. This is due to the | |
1623 | fact that %timeit executes the statement in the namespace of the shell, |
|
1623 | fact that %timeit executes the statement in the namespace of the shell, | |
1624 | compared with timeit.py, which uses a single setup statement to import |
|
1624 | compared with timeit.py, which uses a single setup statement to import | |
1625 | function or create variables. Generally, the bias does not matter as long |
|
1625 | function or create variables. Generally, the bias does not matter as long | |
1626 | as results from timeit.py are not mixed with those from %timeit.""" |
|
1626 | as results from timeit.py are not mixed with those from %timeit.""" | |
1627 | import timeit |
|
1627 | import timeit | |
1628 | import math |
|
1628 | import math | |
1629 |
|
1629 | |||
1630 | units = ["s", "ms", "\xc2\xb5s", "ns"] |
|
1630 | units = ["s", "ms", "\xc2\xb5s", "ns"] | |
1631 | scaling = [1, 1e3, 1e6, 1e9] |
|
1631 | scaling = [1, 1e3, 1e6, 1e9] | |
1632 |
|
1632 | |||
1633 | opts, stmt = self.parse_options(parameter_s,'n:r:tcp:') |
|
1633 | opts, stmt = self.parse_options(parameter_s,'n:r:tcp:') | |
1634 | if stmt == "": |
|
1634 | if stmt == "": | |
1635 | return |
|
1635 | return | |
1636 | timefunc = timeit.default_timer |
|
1636 | timefunc = timeit.default_timer | |
1637 | number = int(getattr(opts, "n", 0)) |
|
1637 | number = int(getattr(opts, "n", 0)) | |
1638 | repeat = int(getattr(opts, "r", timeit.default_repeat)) |
|
1638 | repeat = int(getattr(opts, "r", timeit.default_repeat)) | |
1639 | precision = int(getattr(opts, "p", 3)) |
|
1639 | precision = int(getattr(opts, "p", 3)) | |
1640 | if hasattr(opts, "t"): |
|
1640 | if hasattr(opts, "t"): | |
1641 | timefunc = time.time |
|
1641 | timefunc = time.time | |
1642 | if hasattr(opts, "c"): |
|
1642 | if hasattr(opts, "c"): | |
1643 | timefunc = clock |
|
1643 | timefunc = clock | |
1644 |
|
1644 | |||
1645 | timer = timeit.Timer(timer=timefunc) |
|
1645 | timer = timeit.Timer(timer=timefunc) | |
1646 | # this code has tight coupling to the inner workings of timeit.Timer, |
|
1646 | # this code has tight coupling to the inner workings of timeit.Timer, | |
1647 | # but is there a better way to achieve that the code stmt has access |
|
1647 | # but is there a better way to achieve that the code stmt has access | |
1648 | # to the shell namespace? |
|
1648 | # to the shell namespace? | |
1649 |
|
1649 | |||
1650 | src = timeit.template % {'stmt': timeit.reindent(stmt, 8), 'setup': "pass"} |
|
1650 | src = timeit.template % {'stmt': timeit.reindent(stmt, 8), 'setup': "pass"} | |
1651 | code = compile(src, "<magic-timeit>", "exec") |
|
1651 | code = compile(src, "<magic-timeit>", "exec") | |
1652 | ns = {} |
|
1652 | ns = {} | |
1653 | exec code in self.shell.user_ns, ns |
|
1653 | exec code in self.shell.user_ns, ns | |
1654 | timer.inner = ns["inner"] |
|
1654 | timer.inner = ns["inner"] | |
1655 |
|
1655 | |||
1656 | if number == 0: |
|
1656 | if number == 0: | |
1657 | # determine number so that 0.2 <= total time < 2.0 |
|
1657 | # determine number so that 0.2 <= total time < 2.0 | |
1658 | number = 1 |
|
1658 | number = 1 | |
1659 | for i in range(1, 10): |
|
1659 | for i in range(1, 10): | |
1660 | number *= 10 |
|
1660 | number *= 10 | |
1661 | if timer.timeit(number) >= 0.2: |
|
1661 | if timer.timeit(number) >= 0.2: | |
1662 | break |
|
1662 | break | |
1663 |
|
1663 | |||
1664 | best = min(timer.repeat(repeat, number)) / number |
|
1664 | best = min(timer.repeat(repeat, number)) / number | |
1665 |
|
1665 | |||
1666 | if best > 0.0: |
|
1666 | if best > 0.0: | |
1667 | order = min(-int(math.floor(math.log10(best)) // 3), 3) |
|
1667 | order = min(-int(math.floor(math.log10(best)) // 3), 3) | |
1668 | else: |
|
1668 | else: | |
1669 | order = 3 |
|
1669 | order = 3 | |
1670 | print "%d loops, best of %d: %.*g %s per loop" % (number, repeat, |
|
1670 | print "%d loops, best of %d: %.*g %s per loop" % (number, repeat, | |
1671 | precision, |
|
1671 | precision, | |
1672 | best * scaling[order], |
|
1672 | best * scaling[order], | |
1673 | units[order]) |
|
1673 | units[order]) | |
1674 |
|
1674 | |||
1675 | def magic_time(self,parameter_s = ''): |
|
1675 | def magic_time(self,parameter_s = ''): | |
1676 | """Time execution of a Python statement or expression. |
|
1676 | """Time execution of a Python statement or expression. | |
1677 |
|
1677 | |||
1678 | The CPU and wall clock times are printed, and the value of the |
|
1678 | The CPU and wall clock times are printed, and the value of the | |
1679 | expression (if any) is returned. Note that under Win32, system time |
|
1679 | expression (if any) is returned. Note that under Win32, system time | |
1680 | is always reported as 0, since it can not be measured. |
|
1680 | is always reported as 0, since it can not be measured. | |
1681 |
|
1681 | |||
1682 | This function provides very basic timing functionality. In Python |
|
1682 | This function provides very basic timing functionality. In Python | |
1683 | 2.3, the timeit module offers more control and sophistication, so this |
|
1683 | 2.3, the timeit module offers more control and sophistication, so this | |
1684 | could be rewritten to use it (patches welcome). |
|
1684 | could be rewritten to use it (patches welcome). | |
1685 |
|
1685 | |||
1686 | Some examples: |
|
1686 | Some examples: | |
1687 |
|
1687 | |||
1688 | In [1]: time 2**128 |
|
1688 | In [1]: time 2**128 | |
1689 | CPU times: user 0.00 s, sys: 0.00 s, total: 0.00 s |
|
1689 | CPU times: user 0.00 s, sys: 0.00 s, total: 0.00 s | |
1690 | Wall time: 0.00 |
|
1690 | Wall time: 0.00 | |
1691 | Out[1]: 340282366920938463463374607431768211456L |
|
1691 | Out[1]: 340282366920938463463374607431768211456L | |
1692 |
|
1692 | |||
1693 | In [2]: n = 1000000 |
|
1693 | In [2]: n = 1000000 | |
1694 |
|
1694 | |||
1695 | In [3]: time sum(range(n)) |
|
1695 | In [3]: time sum(range(n)) | |
1696 | CPU times: user 1.20 s, sys: 0.05 s, total: 1.25 s |
|
1696 | CPU times: user 1.20 s, sys: 0.05 s, total: 1.25 s | |
1697 | Wall time: 1.37 |
|
1697 | Wall time: 1.37 | |
1698 | Out[3]: 499999500000L |
|
1698 | Out[3]: 499999500000L | |
1699 |
|
1699 | |||
1700 | In [4]: time print 'hello world' |
|
1700 | In [4]: time print 'hello world' | |
1701 | hello world |
|
1701 | hello world | |
1702 | CPU times: user 0.00 s, sys: 0.00 s, total: 0.00 s |
|
1702 | CPU times: user 0.00 s, sys: 0.00 s, total: 0.00 s | |
1703 | Wall time: 0.00 |
|
1703 | Wall time: 0.00 | |
1704 | """ |
|
1704 | """ | |
1705 |
|
1705 | |||
1706 | # fail immediately if the given expression can't be compiled |
|
1706 | # fail immediately if the given expression can't be compiled | |
1707 | try: |
|
1707 | try: | |
1708 | mode = 'eval' |
|
1708 | mode = 'eval' | |
1709 | code = compile(parameter_s,'<timed eval>',mode) |
|
1709 | code = compile(parameter_s,'<timed eval>',mode) | |
1710 | except SyntaxError: |
|
1710 | except SyntaxError: | |
1711 | mode = 'exec' |
|
1711 | mode = 'exec' | |
1712 | code = compile(parameter_s,'<timed exec>',mode) |
|
1712 | code = compile(parameter_s,'<timed exec>',mode) | |
1713 | # skew measurement as little as possible |
|
1713 | # skew measurement as little as possible | |
1714 | glob = self.shell.user_ns |
|
1714 | glob = self.shell.user_ns | |
1715 | clk = clock2 |
|
1715 | clk = clock2 | |
1716 | wtime = time.time |
|
1716 | wtime = time.time | |
1717 | # time execution |
|
1717 | # time execution | |
1718 | wall_st = wtime() |
|
1718 | wall_st = wtime() | |
1719 | if mode=='eval': |
|
1719 | if mode=='eval': | |
1720 | st = clk() |
|
1720 | st = clk() | |
1721 | out = eval(code,glob) |
|
1721 | out = eval(code,glob) | |
1722 | end = clk() |
|
1722 | end = clk() | |
1723 | else: |
|
1723 | else: | |
1724 | st = clk() |
|
1724 | st = clk() | |
1725 | exec code in glob |
|
1725 | exec code in glob | |
1726 | end = clk() |
|
1726 | end = clk() | |
1727 | out = None |
|
1727 | out = None | |
1728 | wall_end = wtime() |
|
1728 | wall_end = wtime() | |
1729 | # Compute actual times and report |
|
1729 | # Compute actual times and report | |
1730 | wall_time = wall_end-wall_st |
|
1730 | wall_time = wall_end-wall_st | |
1731 | cpu_user = end[0]-st[0] |
|
1731 | cpu_user = end[0]-st[0] | |
1732 | cpu_sys = end[1]-st[1] |
|
1732 | cpu_sys = end[1]-st[1] | |
1733 | cpu_tot = cpu_user+cpu_sys |
|
1733 | cpu_tot = cpu_user+cpu_sys | |
1734 | print "CPU times: user %.2f s, sys: %.2f s, total: %.2f s" % \ |
|
1734 | print "CPU times: user %.2f s, sys: %.2f s, total: %.2f s" % \ | |
1735 | (cpu_user,cpu_sys,cpu_tot) |
|
1735 | (cpu_user,cpu_sys,cpu_tot) | |
1736 | print "Wall time: %.2f" % wall_time |
|
1736 | print "Wall time: %.2f" % wall_time | |
1737 | return out |
|
1737 | return out | |
1738 |
|
1738 | |||
1739 | def magic_macro(self,parameter_s = ''): |
|
1739 | def magic_macro(self,parameter_s = ''): | |
1740 | """Define a set of input lines as a macro for future re-execution. |
|
1740 | """Define a set of input lines as a macro for future re-execution. | |
1741 |
|
1741 | |||
1742 | Usage:\\ |
|
1742 | Usage:\\ | |
1743 | %macro [options] name n1-n2 n3-n4 ... n5 .. n6 ... |
|
1743 | %macro [options] name n1-n2 n3-n4 ... n5 .. n6 ... | |
1744 |
|
1744 | |||
1745 | Options: |
|
1745 | Options: | |
1746 |
|
1746 | |||
1747 | -r: use 'raw' input. By default, the 'processed' history is used, |
|
1747 | -r: use 'raw' input. By default, the 'processed' history is used, | |
1748 | so that magics are loaded in their transformed version to valid |
|
1748 | so that magics are loaded in their transformed version to valid | |
1749 | Python. If this option is given, the raw input as typed as the |
|
1749 | Python. If this option is given, the raw input as typed as the | |
1750 | command line is used instead. |
|
1750 | command line is used instead. | |
1751 |
|
1751 | |||
1752 | This will define a global variable called `name` which is a string |
|
1752 | This will define a global variable called `name` which is a string | |
1753 | made of joining the slices and lines you specify (n1,n2,... numbers |
|
1753 | made of joining the slices and lines you specify (n1,n2,... numbers | |
1754 | above) from your input history into a single string. This variable |
|
1754 | above) from your input history into a single string. This variable | |
1755 | acts like an automatic function which re-executes those lines as if |
|
1755 | acts like an automatic function which re-executes those lines as if | |
1756 | you had typed them. You just type 'name' at the prompt and the code |
|
1756 | you had typed them. You just type 'name' at the prompt and the code | |
1757 | executes. |
|
1757 | executes. | |
1758 |
|
1758 | |||
1759 | The notation for indicating number ranges is: n1-n2 means 'use line |
|
1759 | The notation for indicating number ranges is: n1-n2 means 'use line | |
1760 | numbers n1,...n2' (the endpoint is included). That is, '5-7' means |
|
1760 | numbers n1,...n2' (the endpoint is included). That is, '5-7' means | |
1761 | using the lines numbered 5,6 and 7. |
|
1761 | using the lines numbered 5,6 and 7. | |
1762 |
|
1762 | |||
1763 | Note: as a 'hidden' feature, you can also use traditional python slice |
|
1763 | Note: as a 'hidden' feature, you can also use traditional python slice | |
1764 | notation, where N:M means numbers N through M-1. |
|
1764 | notation, where N:M means numbers N through M-1. | |
1765 |
|
1765 | |||
1766 | For example, if your history contains (%hist prints it): |
|
1766 | For example, if your history contains (%hist prints it): | |
1767 |
|
1767 | |||
1768 | 44: x=1\\ |
|
1768 | 44: x=1\\ | |
1769 | 45: y=3\\ |
|
1769 | 45: y=3\\ | |
1770 | 46: z=x+y\\ |
|
1770 | 46: z=x+y\\ | |
1771 | 47: print x\\ |
|
1771 | 47: print x\\ | |
1772 | 48: a=5\\ |
|
1772 | 48: a=5\\ | |
1773 | 49: print 'x',x,'y',y\\ |
|
1773 | 49: print 'x',x,'y',y\\ | |
1774 |
|
1774 | |||
1775 | you can create a macro with lines 44 through 47 (included) and line 49 |
|
1775 | you can create a macro with lines 44 through 47 (included) and line 49 | |
1776 | called my_macro with: |
|
1776 | called my_macro with: | |
1777 |
|
1777 | |||
1778 | In [51]: %macro my_macro 44-47 49 |
|
1778 | In [51]: %macro my_macro 44-47 49 | |
1779 |
|
1779 | |||
1780 | Now, typing `my_macro` (without quotes) will re-execute all this code |
|
1780 | Now, typing `my_macro` (without quotes) will re-execute all this code | |
1781 | in one pass. |
|
1781 | in one pass. | |
1782 |
|
1782 | |||
1783 | You don't need to give the line-numbers in order, and any given line |
|
1783 | You don't need to give the line-numbers in order, and any given line | |
1784 | number can appear multiple times. You can assemble macros with any |
|
1784 | number can appear multiple times. You can assemble macros with any | |
1785 | lines from your input history in any order. |
|
1785 | lines from your input history in any order. | |
1786 |
|
1786 | |||
1787 | The macro is a simple object which holds its value in an attribute, |
|
1787 | The macro is a simple object which holds its value in an attribute, | |
1788 | but IPython's display system checks for macros and executes them as |
|
1788 | but IPython's display system checks for macros and executes them as | |
1789 | code instead of printing them when you type their name. |
|
1789 | code instead of printing them when you type their name. | |
1790 |
|
1790 | |||
1791 | You can view a macro's contents by explicitly printing it with: |
|
1791 | You can view a macro's contents by explicitly printing it with: | |
1792 |
|
1792 | |||
1793 | 'print macro_name'. |
|
1793 | 'print macro_name'. | |
1794 |
|
1794 | |||
1795 | For one-off cases which DON'T contain magic function calls in them you |
|
1795 | For one-off cases which DON'T contain magic function calls in them you | |
1796 | can obtain similar results by explicitly executing slices from your |
|
1796 | can obtain similar results by explicitly executing slices from your | |
1797 | input history with: |
|
1797 | input history with: | |
1798 |
|
1798 | |||
1799 | In [60]: exec In[44:48]+In[49]""" |
|
1799 | In [60]: exec In[44:48]+In[49]""" | |
1800 |
|
1800 | |||
1801 | opts,args = self.parse_options(parameter_s,'r',mode='list') |
|
1801 | opts,args = self.parse_options(parameter_s,'r',mode='list') | |
1802 | name,ranges = args[0], args[1:] |
|
1802 | name,ranges = args[0], args[1:] | |
1803 | #print 'rng',ranges # dbg |
|
1803 | #print 'rng',ranges # dbg | |
1804 | lines = self.extract_input_slices(ranges,opts.has_key('r')) |
|
1804 | lines = self.extract_input_slices(ranges,opts.has_key('r')) | |
1805 | macro = Macro(lines) |
|
1805 | macro = Macro(lines) | |
1806 | self.shell.user_ns.update({name:macro}) |
|
1806 | self.shell.user_ns.update({name:macro}) | |
1807 | print 'Macro `%s` created. To execute, type its name (without quotes).' % name |
|
1807 | print 'Macro `%s` created. To execute, type its name (without quotes).' % name | |
1808 | print 'Macro contents:' |
|
1808 | print 'Macro contents:' | |
1809 | print macro, |
|
1809 | print macro, | |
1810 |
|
1810 | |||
1811 | def magic_save(self,parameter_s = ''): |
|
1811 | def magic_save(self,parameter_s = ''): | |
1812 | """Save a set of lines to a given filename. |
|
1812 | """Save a set of lines to a given filename. | |
1813 |
|
1813 | |||
1814 | Usage:\\ |
|
1814 | Usage:\\ | |
1815 | %save [options] filename n1-n2 n3-n4 ... n5 .. n6 ... |
|
1815 | %save [options] filename n1-n2 n3-n4 ... n5 .. n6 ... | |
1816 |
|
1816 | |||
1817 | Options: |
|
1817 | Options: | |
1818 |
|
1818 | |||
1819 | -r: use 'raw' input. By default, the 'processed' history is used, |
|
1819 | -r: use 'raw' input. By default, the 'processed' history is used, | |
1820 | so that magics are loaded in their transformed version to valid |
|
1820 | so that magics are loaded in their transformed version to valid | |
1821 | Python. If this option is given, the raw input as typed as the |
|
1821 | Python. If this option is given, the raw input as typed as the | |
1822 | command line is used instead. |
|
1822 | command line is used instead. | |
1823 |
|
1823 | |||
1824 | This function uses the same syntax as %macro for line extraction, but |
|
1824 | This function uses the same syntax as %macro for line extraction, but | |
1825 | instead of creating a macro it saves the resulting string to the |
|
1825 | instead of creating a macro it saves the resulting string to the | |
1826 | filename you specify. |
|
1826 | filename you specify. | |
1827 |
|
1827 | |||
1828 | It adds a '.py' extension to the file if you don't do so yourself, and |
|
1828 | It adds a '.py' extension to the file if you don't do so yourself, and | |
1829 | it asks for confirmation before overwriting existing files.""" |
|
1829 | it asks for confirmation before overwriting existing files.""" | |
1830 |
|
1830 | |||
1831 | opts,args = self.parse_options(parameter_s,'r',mode='list') |
|
1831 | opts,args = self.parse_options(parameter_s,'r',mode='list') | |
1832 | fname,ranges = args[0], args[1:] |
|
1832 | fname,ranges = args[0], args[1:] | |
1833 | if not fname.endswith('.py'): |
|
1833 | if not fname.endswith('.py'): | |
1834 | fname += '.py' |
|
1834 | fname += '.py' | |
1835 | if os.path.isfile(fname): |
|
1835 | if os.path.isfile(fname): | |
1836 | ans = raw_input('File `%s` exists. Overwrite (y/[N])? ' % fname) |
|
1836 | ans = raw_input('File `%s` exists. Overwrite (y/[N])? ' % fname) | |
1837 | if ans.lower() not in ['y','yes']: |
|
1837 | if ans.lower() not in ['y','yes']: | |
1838 | print 'Operation cancelled.' |
|
1838 | print 'Operation cancelled.' | |
1839 | return |
|
1839 | return | |
1840 | cmds = ''.join(self.extract_input_slices(ranges,opts.has_key('r'))) |
|
1840 | cmds = ''.join(self.extract_input_slices(ranges,opts.has_key('r'))) | |
1841 | f = file(fname,'w') |
|
1841 | f = file(fname,'w') | |
1842 | f.write(cmds) |
|
1842 | f.write(cmds) | |
1843 | f.close() |
|
1843 | f.close() | |
1844 | print 'The following commands were written to file `%s`:' % fname |
|
1844 | print 'The following commands were written to file `%s`:' % fname | |
1845 | print cmds |
|
1845 | print cmds | |
1846 |
|
1846 | |||
1847 | def _edit_macro(self,mname,macro): |
|
1847 | def _edit_macro(self,mname,macro): | |
1848 | """open an editor with the macro data in a file""" |
|
1848 | """open an editor with the macro data in a file""" | |
1849 | filename = self.shell.mktempfile(macro.value) |
|
1849 | filename = self.shell.mktempfile(macro.value) | |
1850 | self.shell.hooks.editor(filename) |
|
1850 | self.shell.hooks.editor(filename) | |
1851 |
|
1851 | |||
1852 | # and make a new macro object, to replace the old one |
|
1852 | # and make a new macro object, to replace the old one | |
1853 | mfile = open(filename) |
|
1853 | mfile = open(filename) | |
1854 | mvalue = mfile.read() |
|
1854 | mvalue = mfile.read() | |
1855 | mfile.close() |
|
1855 | mfile.close() | |
1856 | self.shell.user_ns[mname] = Macro(mvalue) |
|
1856 | self.shell.user_ns[mname] = Macro(mvalue) | |
1857 |
|
1857 | |||
1858 | def magic_ed(self,parameter_s=''): |
|
1858 | def magic_ed(self,parameter_s=''): | |
1859 | """Alias to %edit.""" |
|
1859 | """Alias to %edit.""" | |
1860 | return self.magic_edit(parameter_s) |
|
1860 | return self.magic_edit(parameter_s) | |
1861 |
|
1861 | |||
1862 | def magic_edit(self,parameter_s='',last_call=['','']): |
|
1862 | def magic_edit(self,parameter_s='',last_call=['','']): | |
1863 | """Bring up an editor and execute the resulting code. |
|
1863 | """Bring up an editor and execute the resulting code. | |
1864 |
|
1864 | |||
1865 | Usage: |
|
1865 | Usage: | |
1866 | %edit [options] [args] |
|
1866 | %edit [options] [args] | |
1867 |
|
1867 | |||
1868 | %edit runs IPython's editor hook. The default version of this hook is |
|
1868 | %edit runs IPython's editor hook. The default version of this hook is | |
1869 | set to call the __IPYTHON__.rc.editor command. This is read from your |
|
1869 | set to call the __IPYTHON__.rc.editor command. This is read from your | |
1870 | environment variable $EDITOR. If this isn't found, it will default to |
|
1870 | environment variable $EDITOR. If this isn't found, it will default to | |
1871 | vi under Linux/Unix and to notepad under Windows. See the end of this |
|
1871 | vi under Linux/Unix and to notepad under Windows. See the end of this | |
1872 | docstring for how to change the editor hook. |
|
1872 | docstring for how to change the editor hook. | |
1873 |
|
1873 | |||
1874 | You can also set the value of this editor via the command line option |
|
1874 | You can also set the value of this editor via the command line option | |
1875 | '-editor' or in your ipythonrc file. This is useful if you wish to use |
|
1875 | '-editor' or in your ipythonrc file. This is useful if you wish to use | |
1876 | specifically for IPython an editor different from your typical default |
|
1876 | specifically for IPython an editor different from your typical default | |
1877 | (and for Windows users who typically don't set environment variables). |
|
1877 | (and for Windows users who typically don't set environment variables). | |
1878 |
|
1878 | |||
1879 | This command allows you to conveniently edit multi-line code right in |
|
1879 | This command allows you to conveniently edit multi-line code right in | |
1880 | your IPython session. |
|
1880 | your IPython session. | |
1881 |
|
1881 | |||
1882 | If called without arguments, %edit opens up an empty editor with a |
|
1882 | If called without arguments, %edit opens up an empty editor with a | |
1883 | temporary file and will execute the contents of this file when you |
|
1883 | temporary file and will execute the contents of this file when you | |
1884 | close it (don't forget to save it!). |
|
1884 | close it (don't forget to save it!). | |
1885 |
|
1885 | |||
1886 |
|
1886 | |||
1887 | Options: |
|
1887 | Options: | |
1888 |
|
1888 | |||
1889 | -n <number>: open the editor at a specified line number. By default, |
|
1889 | -n <number>: open the editor at a specified line number. By default, | |
1890 | the IPython editor hook uses the unix syntax 'editor +N filename', but |
|
1890 | the IPython editor hook uses the unix syntax 'editor +N filename', but | |
1891 | you can configure this by providing your own modified hook if your |
|
1891 | you can configure this by providing your own modified hook if your | |
1892 | favorite editor supports line-number specifications with a different |
|
1892 | favorite editor supports line-number specifications with a different | |
1893 | syntax. |
|
1893 | syntax. | |
1894 |
|
1894 | |||
1895 | -p: this will call the editor with the same data as the previous time |
|
1895 | -p: this will call the editor with the same data as the previous time | |
1896 | it was used, regardless of how long ago (in your current session) it |
|
1896 | it was used, regardless of how long ago (in your current session) it | |
1897 | was. |
|
1897 | was. | |
1898 |
|
1898 | |||
1899 | -r: use 'raw' input. This option only applies to input taken from the |
|
1899 | -r: use 'raw' input. This option only applies to input taken from the | |
1900 | user's history. By default, the 'processed' history is used, so that |
|
1900 | user's history. By default, the 'processed' history is used, so that | |
1901 | magics are loaded in their transformed version to valid Python. If |
|
1901 | magics are loaded in their transformed version to valid Python. If | |
1902 | this option is given, the raw input as typed as the command line is |
|
1902 | this option is given, the raw input as typed as the command line is | |
1903 | used instead. When you exit the editor, it will be executed by |
|
1903 | used instead. When you exit the editor, it will be executed by | |
1904 | IPython's own processor. |
|
1904 | IPython's own processor. | |
1905 |
|
1905 | |||
1906 | -x: do not execute the edited code immediately upon exit. This is |
|
1906 | -x: do not execute the edited code immediately upon exit. This is | |
1907 | mainly useful if you are editing programs which need to be called with |
|
1907 | mainly useful if you are editing programs which need to be called with | |
1908 | command line arguments, which you can then do using %run. |
|
1908 | command line arguments, which you can then do using %run. | |
1909 |
|
1909 | |||
1910 |
|
1910 | |||
1911 | Arguments: |
|
1911 | Arguments: | |
1912 |
|
1912 | |||
1913 | If arguments are given, the following possibilites exist: |
|
1913 | If arguments are given, the following possibilites exist: | |
1914 |
|
1914 | |||
1915 | - The arguments are numbers or pairs of colon-separated numbers (like |
|
1915 | - The arguments are numbers or pairs of colon-separated numbers (like | |
1916 | 1 4:8 9). These are interpreted as lines of previous input to be |
|
1916 | 1 4:8 9). These are interpreted as lines of previous input to be | |
1917 | loaded into the editor. The syntax is the same of the %macro command. |
|
1917 | loaded into the editor. The syntax is the same of the %macro command. | |
1918 |
|
1918 | |||
1919 | - If the argument doesn't start with a number, it is evaluated as a |
|
1919 | - If the argument doesn't start with a number, it is evaluated as a | |
1920 | variable and its contents loaded into the editor. You can thus edit |
|
1920 | variable and its contents loaded into the editor. You can thus edit | |
1921 | any string which contains python code (including the result of |
|
1921 | any string which contains python code (including the result of | |
1922 | previous edits). |
|
1922 | previous edits). | |
1923 |
|
1923 | |||
1924 | - If the argument is the name of an object (other than a string), |
|
1924 | - If the argument is the name of an object (other than a string), | |
1925 | IPython will try to locate the file where it was defined and open the |
|
1925 | IPython will try to locate the file where it was defined and open the | |
1926 | editor at the point where it is defined. You can use `%edit function` |
|
1926 | editor at the point where it is defined. You can use `%edit function` | |
1927 | to load an editor exactly at the point where 'function' is defined, |
|
1927 | to load an editor exactly at the point where 'function' is defined, | |
1928 | edit it and have the file be executed automatically. |
|
1928 | edit it and have the file be executed automatically. | |
1929 |
|
1929 | |||
1930 | If the object is a macro (see %macro for details), this opens up your |
|
1930 | If the object is a macro (see %macro for details), this opens up your | |
1931 | specified editor with a temporary file containing the macro's data. |
|
1931 | specified editor with a temporary file containing the macro's data. | |
1932 | Upon exit, the macro is reloaded with the contents of the file. |
|
1932 | Upon exit, the macro is reloaded with the contents of the file. | |
1933 |
|
1933 | |||
1934 | Note: opening at an exact line is only supported under Unix, and some |
|
1934 | Note: opening at an exact line is only supported under Unix, and some | |
1935 | editors (like kedit and gedit up to Gnome 2.8) do not understand the |
|
1935 | editors (like kedit and gedit up to Gnome 2.8) do not understand the | |
1936 | '+NUMBER' parameter necessary for this feature. Good editors like |
|
1936 | '+NUMBER' parameter necessary for this feature. Good editors like | |
1937 | (X)Emacs, vi, jed, pico and joe all do. |
|
1937 | (X)Emacs, vi, jed, pico and joe all do. | |
1938 |
|
1938 | |||
1939 | - If the argument is not found as a variable, IPython will look for a |
|
1939 | - If the argument is not found as a variable, IPython will look for a | |
1940 | file with that name (adding .py if necessary) and load it into the |
|
1940 | file with that name (adding .py if necessary) and load it into the | |
1941 | editor. It will execute its contents with execfile() when you exit, |
|
1941 | editor. It will execute its contents with execfile() when you exit, | |
1942 | loading any code in the file into your interactive namespace. |
|
1942 | loading any code in the file into your interactive namespace. | |
1943 |
|
1943 | |||
1944 | After executing your code, %edit will return as output the code you |
|
1944 | After executing your code, %edit will return as output the code you | |
1945 | typed in the editor (except when it was an existing file). This way |
|
1945 | typed in the editor (except when it was an existing file). This way | |
1946 | you can reload the code in further invocations of %edit as a variable, |
|
1946 | you can reload the code in further invocations of %edit as a variable, | |
1947 | via _<NUMBER> or Out[<NUMBER>], where <NUMBER> is the prompt number of |
|
1947 | via _<NUMBER> or Out[<NUMBER>], where <NUMBER> is the prompt number of | |
1948 | the output. |
|
1948 | the output. | |
1949 |
|
1949 | |||
1950 | Note that %edit is also available through the alias %ed. |
|
1950 | Note that %edit is also available through the alias %ed. | |
1951 |
|
1951 | |||
1952 | This is an example of creating a simple function inside the editor and |
|
1952 | This is an example of creating a simple function inside the editor and | |
1953 | then modifying it. First, start up the editor: |
|
1953 | then modifying it. First, start up the editor: | |
1954 |
|
1954 | |||
1955 | In [1]: ed\\ |
|
1955 | In [1]: ed\\ | |
1956 | Editing... done. Executing edited code...\\ |
|
1956 | Editing... done. Executing edited code...\\ | |
1957 | Out[1]: 'def foo():\\n print "foo() was defined in an editing session"\\n' |
|
1957 | Out[1]: 'def foo():\\n print "foo() was defined in an editing session"\\n' | |
1958 |
|
1958 | |||
1959 | We can then call the function foo(): |
|
1959 | We can then call the function foo(): | |
1960 |
|
1960 | |||
1961 | In [2]: foo()\\ |
|
1961 | In [2]: foo()\\ | |
1962 | foo() was defined in an editing session |
|
1962 | foo() was defined in an editing session | |
1963 |
|
1963 | |||
1964 | Now we edit foo. IPython automatically loads the editor with the |
|
1964 | Now we edit foo. IPython automatically loads the editor with the | |
1965 | (temporary) file where foo() was previously defined: |
|
1965 | (temporary) file where foo() was previously defined: | |
1966 |
|
1966 | |||
1967 | In [3]: ed foo\\ |
|
1967 | In [3]: ed foo\\ | |
1968 | Editing... done. Executing edited code... |
|
1968 | Editing... done. Executing edited code... | |
1969 |
|
1969 | |||
1970 | And if we call foo() again we get the modified version: |
|
1970 | And if we call foo() again we get the modified version: | |
1971 |
|
1971 | |||
1972 | In [4]: foo()\\ |
|
1972 | In [4]: foo()\\ | |
1973 | foo() has now been changed! |
|
1973 | foo() has now been changed! | |
1974 |
|
1974 | |||
1975 | Here is an example of how to edit a code snippet successive |
|
1975 | Here is an example of how to edit a code snippet successive | |
1976 | times. First we call the editor: |
|
1976 | times. First we call the editor: | |
1977 |
|
1977 | |||
1978 | In [8]: ed\\ |
|
1978 | In [8]: ed\\ | |
1979 | Editing... done. Executing edited code...\\ |
|
1979 | Editing... done. Executing edited code...\\ | |
1980 | hello\\ |
|
1980 | hello\\ | |
1981 | Out[8]: "print 'hello'\\n" |
|
1981 | Out[8]: "print 'hello'\\n" | |
1982 |
|
1982 | |||
1983 | Now we call it again with the previous output (stored in _): |
|
1983 | Now we call it again with the previous output (stored in _): | |
1984 |
|
1984 | |||
1985 | In [9]: ed _\\ |
|
1985 | In [9]: ed _\\ | |
1986 | Editing... done. Executing edited code...\\ |
|
1986 | Editing... done. Executing edited code...\\ | |
1987 | hello world\\ |
|
1987 | hello world\\ | |
1988 | Out[9]: "print 'hello world'\\n" |
|
1988 | Out[9]: "print 'hello world'\\n" | |
1989 |
|
1989 | |||
1990 | Now we call it with the output #8 (stored in _8, also as Out[8]): |
|
1990 | Now we call it with the output #8 (stored in _8, also as Out[8]): | |
1991 |
|
1991 | |||
1992 | In [10]: ed _8\\ |
|
1992 | In [10]: ed _8\\ | |
1993 | Editing... done. Executing edited code...\\ |
|
1993 | Editing... done. Executing edited code...\\ | |
1994 | hello again\\ |
|
1994 | hello again\\ | |
1995 | Out[10]: "print 'hello again'\\n" |
|
1995 | Out[10]: "print 'hello again'\\n" | |
1996 |
|
1996 | |||
1997 |
|
1997 | |||
1998 | Changing the default editor hook: |
|
1998 | Changing the default editor hook: | |
1999 |
|
1999 | |||
2000 | If you wish to write your own editor hook, you can put it in a |
|
2000 | If you wish to write your own editor hook, you can put it in a | |
2001 | configuration file which you load at startup time. The default hook |
|
2001 | configuration file which you load at startup time. The default hook | |
2002 | is defined in the IPython.hooks module, and you can use that as a |
|
2002 | is defined in the IPython.hooks module, and you can use that as a | |
2003 | starting example for further modifications. That file also has |
|
2003 | starting example for further modifications. That file also has | |
2004 | general instructions on how to set a new hook for use once you've |
|
2004 | general instructions on how to set a new hook for use once you've | |
2005 | defined it.""" |
|
2005 | defined it.""" | |
2006 |
|
2006 | |||
2007 | # FIXME: This function has become a convoluted mess. It needs a |
|
2007 | # FIXME: This function has become a convoluted mess. It needs a | |
2008 | # ground-up rewrite with clean, simple logic. |
|
2008 | # ground-up rewrite with clean, simple logic. | |
2009 |
|
2009 | |||
2010 | def make_filename(arg): |
|
2010 | def make_filename(arg): | |
2011 | "Make a filename from the given args" |
|
2011 | "Make a filename from the given args" | |
2012 | try: |
|
2012 | try: | |
2013 | filename = get_py_filename(arg) |
|
2013 | filename = get_py_filename(arg) | |
2014 | except IOError: |
|
2014 | except IOError: | |
2015 | if args.endswith('.py'): |
|
2015 | if args.endswith('.py'): | |
2016 | filename = arg |
|
2016 | filename = arg | |
2017 | else: |
|
2017 | else: | |
2018 | filename = None |
|
2018 | filename = None | |
2019 | return filename |
|
2019 | return filename | |
2020 |
|
2020 | |||
2021 | # custom exceptions |
|
2021 | # custom exceptions | |
2022 | class DataIsObject(Exception): pass |
|
2022 | class DataIsObject(Exception): pass | |
2023 |
|
2023 | |||
2024 | opts,args = self.parse_options(parameter_s,'prxn:') |
|
2024 | opts,args = self.parse_options(parameter_s,'prxn:') | |
2025 | # Set a few locals from the options for convenience: |
|
2025 | # Set a few locals from the options for convenience: | |
2026 | opts_p = opts.has_key('p') |
|
2026 | opts_p = opts.has_key('p') | |
2027 | opts_r = opts.has_key('r') |
|
2027 | opts_r = opts.has_key('r') | |
2028 |
|
2028 | |||
2029 | # Default line number value |
|
2029 | # Default line number value | |
2030 | lineno = opts.get('n',None) |
|
2030 | lineno = opts.get('n',None) | |
2031 |
|
2031 | |||
2032 | if opts_p: |
|
2032 | if opts_p: | |
2033 | args = '_%s' % last_call[0] |
|
2033 | args = '_%s' % last_call[0] | |
2034 | if not self.shell.user_ns.has_key(args): |
|
2034 | if not self.shell.user_ns.has_key(args): | |
2035 | args = last_call[1] |
|
2035 | args = last_call[1] | |
2036 |
|
2036 | |||
2037 | # use last_call to remember the state of the previous call, but don't |
|
2037 | # use last_call to remember the state of the previous call, but don't | |
2038 | # let it be clobbered by successive '-p' calls. |
|
2038 | # let it be clobbered by successive '-p' calls. | |
2039 | try: |
|
2039 | try: | |
2040 | last_call[0] = self.shell.outputcache.prompt_count |
|
2040 | last_call[0] = self.shell.outputcache.prompt_count | |
2041 | if not opts_p: |
|
2041 | if not opts_p: | |
2042 | last_call[1] = parameter_s |
|
2042 | last_call[1] = parameter_s | |
2043 | except: |
|
2043 | except: | |
2044 | pass |
|
2044 | pass | |
2045 |
|
2045 | |||
2046 | # by default this is done with temp files, except when the given |
|
2046 | # by default this is done with temp files, except when the given | |
2047 | # arg is a filename |
|
2047 | # arg is a filename | |
2048 | use_temp = 1 |
|
2048 | use_temp = 1 | |
2049 |
|
2049 | |||
2050 | if re.match(r'\d',args): |
|
2050 | if re.match(r'\d',args): | |
2051 | # Mode where user specifies ranges of lines, like in %macro. |
|
2051 | # Mode where user specifies ranges of lines, like in %macro. | |
2052 | # This means that you can't edit files whose names begin with |
|
2052 | # This means that you can't edit files whose names begin with | |
2053 | # numbers this way. Tough. |
|
2053 | # numbers this way. Tough. | |
2054 | ranges = args.split() |
|
2054 | ranges = args.split() | |
2055 | data = ''.join(self.extract_input_slices(ranges,opts_r)) |
|
2055 | data = ''.join(self.extract_input_slices(ranges,opts_r)) | |
2056 | elif args.endswith('.py'): |
|
2056 | elif args.endswith('.py'): | |
2057 | filename = make_filename(args) |
|
2057 | filename = make_filename(args) | |
2058 | data = '' |
|
2058 | data = '' | |
2059 | use_temp = 0 |
|
2059 | use_temp = 0 | |
2060 | elif args: |
|
2060 | elif args: | |
2061 | try: |
|
2061 | try: | |
2062 | # Load the parameter given as a variable. If not a string, |
|
2062 | # Load the parameter given as a variable. If not a string, | |
2063 | # process it as an object instead (below) |
|
2063 | # process it as an object instead (below) | |
2064 |
|
2064 | |||
2065 | #print '*** args',args,'type',type(args) # dbg |
|
2065 | #print '*** args',args,'type',type(args) # dbg | |
2066 | data = eval(args,self.shell.user_ns) |
|
2066 | data = eval(args,self.shell.user_ns) | |
2067 | if not type(data) in StringTypes: |
|
2067 | if not type(data) in StringTypes: | |
2068 | raise DataIsObject |
|
2068 | raise DataIsObject | |
2069 |
|
2069 | |||
2070 | except (NameError,SyntaxError): |
|
2070 | except (NameError,SyntaxError): | |
2071 | # given argument is not a variable, try as a filename |
|
2071 | # given argument is not a variable, try as a filename | |
2072 | filename = make_filename(args) |
|
2072 | filename = make_filename(args) | |
2073 | if filename is None: |
|
2073 | if filename is None: | |
2074 | warn("Argument given (%s) can't be found as a variable " |
|
2074 | warn("Argument given (%s) can't be found as a variable " | |
2075 | "or as a filename." % args) |
|
2075 | "or as a filename." % args) | |
2076 | return |
|
2076 | return | |
2077 |
|
2077 | |||
2078 | data = '' |
|
2078 | data = '' | |
2079 | use_temp = 0 |
|
2079 | use_temp = 0 | |
2080 | except DataIsObject: |
|
2080 | except DataIsObject: | |
2081 |
|
2081 | |||
2082 | # macros have a special edit function |
|
2082 | # macros have a special edit function | |
2083 | if isinstance(data,Macro): |
|
2083 | if isinstance(data,Macro): | |
2084 | self._edit_macro(args,data) |
|
2084 | self._edit_macro(args,data) | |
2085 | return |
|
2085 | return | |
2086 |
|
2086 | |||
2087 | # For objects, try to edit the file where they are defined |
|
2087 | # For objects, try to edit the file where they are defined | |
2088 | try: |
|
2088 | try: | |
2089 | filename = inspect.getabsfile(data) |
|
2089 | filename = inspect.getabsfile(data) | |
2090 | datafile = 1 |
|
2090 | datafile = 1 | |
2091 | except TypeError: |
|
2091 | except TypeError: | |
2092 | filename = make_filename(args) |
|
2092 | filename = make_filename(args) | |
2093 | datafile = 1 |
|
2093 | datafile = 1 | |
2094 | warn('Could not find file where `%s` is defined.\n' |
|
2094 | warn('Could not find file where `%s` is defined.\n' | |
2095 | 'Opening a file named `%s`' % (args,filename)) |
|
2095 | 'Opening a file named `%s`' % (args,filename)) | |
2096 | # Now, make sure we can actually read the source (if it was in |
|
2096 | # Now, make sure we can actually read the source (if it was in | |
2097 | # a temp file it's gone by now). |
|
2097 | # a temp file it's gone by now). | |
2098 | if datafile: |
|
2098 | if datafile: | |
2099 | try: |
|
2099 | try: | |
2100 | if lineno is None: |
|
2100 | if lineno is None: | |
2101 | lineno = inspect.getsourcelines(data)[1] |
|
2101 | lineno = inspect.getsourcelines(data)[1] | |
2102 | except IOError: |
|
2102 | except IOError: | |
2103 | filename = make_filename(args) |
|
2103 | filename = make_filename(args) | |
2104 | if filename is None: |
|
2104 | if filename is None: | |
2105 | warn('The file `%s` where `%s` was defined cannot ' |
|
2105 | warn('The file `%s` where `%s` was defined cannot ' | |
2106 | 'be read.' % (filename,data)) |
|
2106 | 'be read.' % (filename,data)) | |
2107 | return |
|
2107 | return | |
2108 | use_temp = 0 |
|
2108 | use_temp = 0 | |
2109 | else: |
|
2109 | else: | |
2110 | data = '' |
|
2110 | data = '' | |
2111 |
|
2111 | |||
2112 | if use_temp: |
|
2112 | if use_temp: | |
2113 | filename = self.shell.mktempfile(data) |
|
2113 | filename = self.shell.mktempfile(data) | |
2114 | print 'IPython will make a temporary file named:',filename |
|
2114 | print 'IPython will make a temporary file named:',filename | |
2115 |
|
2115 | |||
2116 | # do actual editing here |
|
2116 | # do actual editing here | |
2117 | print 'Editing...', |
|
2117 | print 'Editing...', | |
2118 | sys.stdout.flush() |
|
2118 | sys.stdout.flush() | |
2119 | self.shell.hooks.editor(filename,lineno) |
|
2119 | self.shell.hooks.editor(filename,lineno) | |
2120 | if opts.has_key('x'): # -x prevents actual execution |
|
2120 | if opts.has_key('x'): # -x prevents actual execution | |
2121 |
|
2121 | |||
2122 | else: |
|
2122 | else: | |
2123 | print 'done. Executing edited code...' |
|
2123 | print 'done. Executing edited code...' | |
2124 | if opts_r: |
|
2124 | if opts_r: | |
2125 | self.shell.runlines(file_read(filename)) |
|
2125 | self.shell.runlines(file_read(filename)) | |
2126 | else: |
|
2126 | else: | |
2127 | self.shell.safe_execfile(filename,self.shell.user_ns) |
|
2127 | self.shell.safe_execfile(filename,self.shell.user_ns) | |
2128 | if use_temp: |
|
2128 | if use_temp: | |
2129 | try: |
|
2129 | try: | |
2130 | return open(filename).read() |
|
2130 | return open(filename).read() | |
2131 | except IOError,msg: |
|
2131 | except IOError,msg: | |
2132 | if msg.filename == filename: |
|
2132 | if msg.filename == filename: | |
2133 | warn('File not found. Did you forget to save?') |
|
2133 | warn('File not found. Did you forget to save?') | |
2134 | return |
|
2134 | return | |
2135 | else: |
|
2135 | else: | |
2136 | self.shell.showtraceback() |
|
2136 | self.shell.showtraceback() | |
2137 |
|
2137 | |||
2138 | def magic_xmode(self,parameter_s = ''): |
|
2138 | def magic_xmode(self,parameter_s = ''): | |
2139 | """Switch modes for the exception handlers. |
|
2139 | """Switch modes for the exception handlers. | |
2140 |
|
2140 | |||
2141 | Valid modes: Plain, Context and Verbose. |
|
2141 | Valid modes: Plain, Context and Verbose. | |
2142 |
|
2142 | |||
2143 | If called without arguments, acts as a toggle.""" |
|
2143 | If called without arguments, acts as a toggle.""" | |
2144 |
|
2144 | |||
2145 | def xmode_switch_err(name): |
|
2145 | def xmode_switch_err(name): | |
2146 | warn('Error changing %s exception modes.\n%s' % |
|
2146 | warn('Error changing %s exception modes.\n%s' % | |
2147 | (name,sys.exc_info()[1])) |
|
2147 | (name,sys.exc_info()[1])) | |
2148 |
|
2148 | |||
2149 | shell = self.shell |
|
2149 | shell = self.shell | |
2150 | new_mode = parameter_s.strip().capitalize() |
|
2150 | new_mode = parameter_s.strip().capitalize() | |
2151 | try: |
|
2151 | try: | |
2152 | shell.InteractiveTB.set_mode(mode=new_mode) |
|
2152 | shell.InteractiveTB.set_mode(mode=new_mode) | |
2153 | print 'Exception reporting mode:',shell.InteractiveTB.mode |
|
2153 | print 'Exception reporting mode:',shell.InteractiveTB.mode | |
2154 | except: |
|
2154 | except: | |
2155 | xmode_switch_err('user') |
|
2155 | xmode_switch_err('user') | |
2156 |
|
2156 | |||
2157 | # threaded shells use a special handler in sys.excepthook |
|
2157 | # threaded shells use a special handler in sys.excepthook | |
2158 | if shell.isthreaded: |
|
2158 | if shell.isthreaded: | |
2159 | try: |
|
2159 | try: | |
2160 | shell.sys_excepthook.set_mode(mode=new_mode) |
|
2160 | shell.sys_excepthook.set_mode(mode=new_mode) | |
2161 | except: |
|
2161 | except: | |
2162 | xmode_switch_err('threaded') |
|
2162 | xmode_switch_err('threaded') | |
2163 |
|
2163 | |||
2164 | def magic_colors(self,parameter_s = ''): |
|
2164 | def magic_colors(self,parameter_s = ''): | |
2165 | """Switch color scheme for prompts, info system and exception handlers. |
|
2165 | """Switch color scheme for prompts, info system and exception handlers. | |
2166 |
|
2166 | |||
2167 | Currently implemented schemes: NoColor, Linux, LightBG. |
|
2167 | Currently implemented schemes: NoColor, Linux, LightBG. | |
2168 |
|
2168 | |||
2169 | Color scheme names are not case-sensitive.""" |
|
2169 | Color scheme names are not case-sensitive.""" | |
2170 |
|
2170 | |||
2171 | def color_switch_err(name): |
|
2171 | def color_switch_err(name): | |
2172 | warn('Error changing %s color schemes.\n%s' % |
|
2172 | warn('Error changing %s color schemes.\n%s' % | |
2173 | (name,sys.exc_info()[1])) |
|
2173 | (name,sys.exc_info()[1])) | |
2174 |
|
2174 | |||
2175 |
|
2175 | |||
2176 | new_scheme = parameter_s.strip() |
|
2176 | new_scheme = parameter_s.strip() | |
2177 | if not new_scheme: |
|
2177 | if not new_scheme: | |
2178 | print 'You must specify a color scheme.' |
|
2178 | print 'You must specify a color scheme.' | |
2179 | return |
|
2179 | return | |
2180 | import IPython.rlineimpl as readline |
|
2180 | import IPython.rlineimpl as readline | |
2181 | if not readline.have_readline: |
|
2181 | if not readline.have_readline: | |
2182 | msg = """\ |
|
2182 | msg = """\ | |
2183 | Proper color support under MS Windows requires Gary Bishop's readline library. |
|
2183 | Proper color support under MS Windows requires Gary Bishop's readline library. | |
2184 | You can find it at: |
|
2184 | You can find it at: | |
2185 | http://sourceforge.net/projects/uncpythontools |
|
2185 | http://sourceforge.net/projects/uncpythontools | |
2186 | Gary's readline needs the ctypes module, from: |
|
2186 | Gary's readline needs the ctypes module, from: | |
2187 | http://starship.python.net/crew/theller/ctypes |
|
2187 | http://starship.python.net/crew/theller/ctypes | |
2188 |
|
2188 | |||
2189 | Defaulting color scheme to 'NoColor'""" |
|
2189 | Defaulting color scheme to 'NoColor'""" | |
2190 | new_scheme = 'NoColor' |
|
2190 | new_scheme = 'NoColor' | |
2191 | warn(msg) |
|
2191 | warn(msg) | |
2192 | # local shortcut |
|
2192 | # local shortcut | |
2193 | shell = self.shell |
|
2193 | shell = self.shell | |
2194 |
|
2194 | |||
2195 | # Set prompt colors |
|
2195 | # Set prompt colors | |
2196 | try: |
|
2196 | try: | |
2197 | shell.outputcache.set_colors(new_scheme) |
|
2197 | shell.outputcache.set_colors(new_scheme) | |
2198 | except: |
|
2198 | except: | |
2199 | color_switch_err('prompt') |
|
2199 | color_switch_err('prompt') | |
2200 | else: |
|
2200 | else: | |
2201 | shell.rc.colors = \ |
|
2201 | shell.rc.colors = \ | |
2202 | shell.outputcache.color_table.active_scheme_name |
|
2202 | shell.outputcache.color_table.active_scheme_name | |
2203 | # Set exception colors |
|
2203 | # Set exception colors | |
2204 | try: |
|
2204 | try: | |
2205 | shell.InteractiveTB.set_colors(scheme = new_scheme) |
|
2205 | shell.InteractiveTB.set_colors(scheme = new_scheme) | |
2206 | shell.SyntaxTB.set_colors(scheme = new_scheme) |
|
2206 | shell.SyntaxTB.set_colors(scheme = new_scheme) | |
2207 | except: |
|
2207 | except: | |
2208 | color_switch_err('exception') |
|
2208 | color_switch_err('exception') | |
2209 |
|
2209 | |||
2210 | # threaded shells use a verbose traceback in sys.excepthook |
|
2210 | # threaded shells use a verbose traceback in sys.excepthook | |
2211 | if shell.isthreaded: |
|
2211 | if shell.isthreaded: | |
2212 | try: |
|
2212 | try: | |
2213 | shell.sys_excepthook.set_colors(scheme=new_scheme) |
|
2213 | shell.sys_excepthook.set_colors(scheme=new_scheme) | |
2214 | except: |
|
2214 | except: | |
2215 | color_switch_err('system exception handler') |
|
2215 | color_switch_err('system exception handler') | |
2216 |
|
2216 | |||
2217 | # Set info (for 'object?') colors |
|
2217 | # Set info (for 'object?') colors | |
2218 | if shell.rc.color_info: |
|
2218 | if shell.rc.color_info: | |
2219 | try: |
|
2219 | try: | |
2220 | shell.inspector.set_active_scheme(new_scheme) |
|
2220 | shell.inspector.set_active_scheme(new_scheme) | |
2221 | except: |
|
2221 | except: | |
2222 | color_switch_err('object inspector') |
|
2222 | color_switch_err('object inspector') | |
2223 | else: |
|
2223 | else: | |
2224 | shell.inspector.set_active_scheme('NoColor') |
|
2224 | shell.inspector.set_active_scheme('NoColor') | |
2225 |
|
2225 | |||
2226 | def magic_color_info(self,parameter_s = ''): |
|
2226 | def magic_color_info(self,parameter_s = ''): | |
2227 | """Toggle color_info. |
|
2227 | """Toggle color_info. | |
2228 |
|
2228 | |||
2229 | The color_info configuration parameter controls whether colors are |
|
2229 | The color_info configuration parameter controls whether colors are | |
2230 | used for displaying object details (by things like %psource, %pfile or |
|
2230 | used for displaying object details (by things like %psource, %pfile or | |
2231 | the '?' system). This function toggles this value with each call. |
|
2231 | the '?' system). This function toggles this value with each call. | |
2232 |
|
2232 | |||
2233 | Note that unless you have a fairly recent pager (less works better |
|
2233 | Note that unless you have a fairly recent pager (less works better | |
2234 | than more) in your system, using colored object information displays |
|
2234 | than more) in your system, using colored object information displays | |
2235 | will not work properly. Test it and see.""" |
|
2235 | will not work properly. Test it and see.""" | |
2236 |
|
2236 | |||
2237 | self.shell.rc.color_info = 1 - self.shell.rc.color_info |
|
2237 | self.shell.rc.color_info = 1 - self.shell.rc.color_info | |
2238 | self.magic_colors(self.shell.rc.colors) |
|
2238 | self.magic_colors(self.shell.rc.colors) | |
2239 | print 'Object introspection functions have now coloring:', |
|
2239 | print 'Object introspection functions have now coloring:', | |
2240 | print ['OFF','ON'][self.shell.rc.color_info] |
|
2240 | print ['OFF','ON'][self.shell.rc.color_info] | |
2241 |
|
2241 | |||
2242 | def magic_Pprint(self, parameter_s=''): |
|
2242 | def magic_Pprint(self, parameter_s=''): | |
2243 | """Toggle pretty printing on/off.""" |
|
2243 | """Toggle pretty printing on/off.""" | |
2244 |
|
2244 | |||
2245 | self.shell.rc.pprint = 1 - self.shell.rc.pprint |
|
2245 | self.shell.rc.pprint = 1 - self.shell.rc.pprint | |
2246 | print 'Pretty printing has been turned', \ |
|
2246 | print 'Pretty printing has been turned', \ | |
2247 | ['OFF','ON'][self.shell.rc.pprint] |
|
2247 | ['OFF','ON'][self.shell.rc.pprint] | |
2248 |
|
2248 | |||
2249 | def magic_exit(self, parameter_s=''): |
|
2249 | def magic_exit(self, parameter_s=''): | |
2250 | """Exit IPython, confirming if configured to do so. |
|
2250 | """Exit IPython, confirming if configured to do so. | |
2251 |
|
2251 | |||
2252 | You can configure whether IPython asks for confirmation upon exit by |
|
2252 | You can configure whether IPython asks for confirmation upon exit by | |
2253 | setting the confirm_exit flag in the ipythonrc file.""" |
|
2253 | setting the confirm_exit flag in the ipythonrc file.""" | |
2254 |
|
2254 | |||
2255 | self.shell.exit() |
|
2255 | self.shell.exit() | |
2256 |
|
2256 | |||
2257 | def magic_quit(self, parameter_s=''): |
|
2257 | def magic_quit(self, parameter_s=''): | |
2258 | """Exit IPython, confirming if configured to do so (like %exit)""" |
|
2258 | """Exit IPython, confirming if configured to do so (like %exit)""" | |
2259 |
|
2259 | |||
2260 | self.shell.exit() |
|
2260 | self.shell.exit() | |
2261 |
|
2261 | |||
2262 | def magic_Exit(self, parameter_s=''): |
|
2262 | def magic_Exit(self, parameter_s=''): | |
2263 | """Exit IPython without confirmation.""" |
|
2263 | """Exit IPython without confirmation.""" | |
2264 |
|
2264 | |||
2265 | self.shell.exit_now = True |
|
2265 | self.shell.exit_now = True | |
2266 |
|
2266 | |||
2267 | def magic_Quit(self, parameter_s=''): |
|
2267 | def magic_Quit(self, parameter_s=''): | |
2268 | """Exit IPython without confirmation (like %Exit).""" |
|
2268 | """Exit IPython without confirmation (like %Exit).""" | |
2269 |
|
2269 | |||
2270 | self.shell.exit_now = True |
|
2270 | self.shell.exit_now = True | |
2271 |
|
2271 | |||
2272 | #...................................................................... |
|
2272 | #...................................................................... | |
2273 | # Functions to implement unix shell-type things |
|
2273 | # Functions to implement unix shell-type things | |
2274 |
|
2274 | |||
2275 | def magic_alias(self, parameter_s = ''): |
|
2275 | def magic_alias(self, parameter_s = ''): | |
2276 | """Define an alias for a system command. |
|
2276 | """Define an alias for a system command. | |
2277 |
|
2277 | |||
2278 | '%alias alias_name cmd' defines 'alias_name' as an alias for 'cmd' |
|
2278 | '%alias alias_name cmd' defines 'alias_name' as an alias for 'cmd' | |
2279 |
|
2279 | |||
2280 | Then, typing 'alias_name params' will execute the system command 'cmd |
|
2280 | Then, typing 'alias_name params' will execute the system command 'cmd | |
2281 | params' (from your underlying operating system). |
|
2281 | params' (from your underlying operating system). | |
2282 |
|
2282 | |||
2283 | Aliases have lower precedence than magic functions and Python normal |
|
2283 | Aliases have lower precedence than magic functions and Python normal | |
2284 | variables, so if 'foo' is both a Python variable and an alias, the |
|
2284 | variables, so if 'foo' is both a Python variable and an alias, the | |
2285 | alias can not be executed until 'del foo' removes the Python variable. |
|
2285 | alias can not be executed until 'del foo' removes the Python variable. | |
2286 |
|
2286 | |||
2287 | You can use the %l specifier in an alias definition to represent the |
|
2287 | You can use the %l specifier in an alias definition to represent the | |
2288 | whole line when the alias is called. For example: |
|
2288 | whole line when the alias is called. For example: | |
2289 |
|
2289 | |||
2290 | In [2]: alias all echo "Input in brackets: <%l>"\\ |
|
2290 | In [2]: alias all echo "Input in brackets: <%l>"\\ | |
2291 | In [3]: all hello world\\ |
|
2291 | In [3]: all hello world\\ | |
2292 | Input in brackets: <hello world> |
|
2292 | Input in brackets: <hello world> | |
2293 |
|
2293 | |||
2294 | You can also define aliases with parameters using %s specifiers (one |
|
2294 | You can also define aliases with parameters using %s specifiers (one | |
2295 | per parameter): |
|
2295 | per parameter): | |
2296 |
|
2296 | |||
2297 | In [1]: alias parts echo first %s second %s\\ |
|
2297 | In [1]: alias parts echo first %s second %s\\ | |
2298 | In [2]: %parts A B\\ |
|
2298 | In [2]: %parts A B\\ | |
2299 | first A second B\\ |
|
2299 | first A second B\\ | |
2300 | In [3]: %parts A\\ |
|
2300 | In [3]: %parts A\\ | |
2301 | Incorrect number of arguments: 2 expected.\\ |
|
2301 | Incorrect number of arguments: 2 expected.\\ | |
2302 | parts is an alias to: 'echo first %s second %s' |
|
2302 | parts is an alias to: 'echo first %s second %s' | |
2303 |
|
2303 | |||
2304 | Note that %l and %s are mutually exclusive. You can only use one or |
|
2304 | Note that %l and %s are mutually exclusive. You can only use one or | |
2305 | the other in your aliases. |
|
2305 | the other in your aliases. | |
2306 |
|
2306 | |||
2307 | Aliases expand Python variables just like system calls using ! or !! |
|
2307 | Aliases expand Python variables just like system calls using ! or !! | |
2308 | do: all expressions prefixed with '$' get expanded. For details of |
|
2308 | do: all expressions prefixed with '$' get expanded. For details of | |
2309 | the semantic rules, see PEP-215: |
|
2309 | the semantic rules, see PEP-215: | |
2310 | http://www.python.org/peps/pep-0215.html. This is the library used by |
|
2310 | http://www.python.org/peps/pep-0215.html. This is the library used by | |
2311 | IPython for variable expansion. If you want to access a true shell |
|
2311 | IPython for variable expansion. If you want to access a true shell | |
2312 | variable, an extra $ is necessary to prevent its expansion by IPython: |
|
2312 | variable, an extra $ is necessary to prevent its expansion by IPython: | |
2313 |
|
2313 | |||
2314 | In [6]: alias show echo\\ |
|
2314 | In [6]: alias show echo\\ | |
2315 | In [7]: PATH='A Python string'\\ |
|
2315 | In [7]: PATH='A Python string'\\ | |
2316 | In [8]: show $PATH\\ |
|
2316 | In [8]: show $PATH\\ | |
2317 | A Python string\\ |
|
2317 | A Python string\\ | |
2318 | In [9]: show $$PATH\\ |
|
2318 | In [9]: show $$PATH\\ | |
2319 | /usr/local/lf9560/bin:/usr/local/intel/compiler70/ia32/bin:... |
|
2319 | /usr/local/lf9560/bin:/usr/local/intel/compiler70/ia32/bin:... | |
2320 |
|
2320 | |||
2321 | You can use the alias facility to acess all of $PATH. See the %rehash |
|
2321 | You can use the alias facility to acess all of $PATH. See the %rehash | |
2322 | and %rehashx functions, which automatically create aliases for the |
|
2322 | and %rehashx functions, which automatically create aliases for the | |
2323 | contents of your $PATH. |
|
2323 | contents of your $PATH. | |
2324 |
|
2324 | |||
2325 | If called with no parameters, %alias prints the current alias table.""" |
|
2325 | If called with no parameters, %alias prints the current alias table.""" | |
2326 |
|
2326 | |||
2327 | par = parameter_s.strip() |
|
2327 | par = parameter_s.strip() | |
2328 | if not par: |
|
2328 | if not par: | |
2329 | if self.shell.rc.automagic: |
|
2329 | if self.shell.rc.automagic: | |
2330 | prechar = '' |
|
2330 | prechar = '' | |
2331 | else: |
|
2331 | else: | |
2332 | prechar = self.shell.ESC_MAGIC |
|
2332 | prechar = self.shell.ESC_MAGIC | |
2333 | #print 'Alias\t\tSystem Command\n'+'-'*30 |
|
2333 | #print 'Alias\t\tSystem Command\n'+'-'*30 | |
2334 | atab = self.shell.alias_table |
|
2334 | atab = self.shell.alias_table | |
2335 | aliases = atab.keys() |
|
2335 | aliases = atab.keys() | |
2336 | aliases.sort() |
|
2336 | aliases.sort() | |
2337 | res = [] |
|
2337 | res = [] | |
2338 | for alias in aliases: |
|
2338 | for alias in aliases: | |
2339 | res.append((alias, atab[alias][1])) |
|
2339 | res.append((alias, atab[alias][1])) | |
2340 | print "Total number of aliases:",len(aliases) |
|
2340 | print "Total number of aliases:",len(aliases) | |
2341 | return res |
|
2341 | return res | |
2342 | try: |
|
2342 | try: | |
2343 | alias,cmd = par.split(None,1) |
|
2343 | alias,cmd = par.split(None,1) | |
2344 | except: |
|
2344 | except: | |
2345 | print OInspect.getdoc(self.magic_alias) |
|
2345 | print OInspect.getdoc(self.magic_alias) | |
2346 | else: |
|
2346 | else: | |
2347 | nargs = cmd.count('%s') |
|
2347 | nargs = cmd.count('%s') | |
2348 | if nargs>0 and cmd.find('%l')>=0: |
|
2348 | if nargs>0 and cmd.find('%l')>=0: | |
2349 | error('The %s and %l specifiers are mutually exclusive ' |
|
2349 | error('The %s and %l specifiers are mutually exclusive ' | |
2350 | 'in alias definitions.') |
|
2350 | 'in alias definitions.') | |
2351 | else: # all looks OK |
|
2351 | else: # all looks OK | |
2352 | self.shell.alias_table[alias] = (nargs,cmd) |
|
2352 | self.shell.alias_table[alias] = (nargs,cmd) | |
2353 | self.shell.alias_table_validate(verbose=0) |
|
2353 | self.shell.alias_table_validate(verbose=0) | |
2354 | # end magic_alias |
|
2354 | # end magic_alias | |
2355 |
|
2355 | |||
2356 | def magic_unalias(self, parameter_s = ''): |
|
2356 | def magic_unalias(self, parameter_s = ''): | |
2357 | """Remove an alias""" |
|
2357 | """Remove an alias""" | |
2358 |
|
2358 | |||
2359 | aname = parameter_s.strip() |
|
2359 | aname = parameter_s.strip() | |
2360 | if aname in self.shell.alias_table: |
|
2360 | if aname in self.shell.alias_table: | |
2361 | del self.shell.alias_table[aname] |
|
2361 | del self.shell.alias_table[aname] | |
2362 |
|
2362 | |||
2363 | def magic_rehash(self, parameter_s = ''): |
|
2363 | def magic_rehash(self, parameter_s = ''): | |
2364 | """Update the alias table with all entries in $PATH. |
|
2364 | """Update the alias table with all entries in $PATH. | |
2365 |
|
2365 | |||
2366 | This version does no checks on execute permissions or whether the |
|
2366 | This version does no checks on execute permissions or whether the | |
2367 | contents of $PATH are truly files (instead of directories or something |
|
2367 | contents of $PATH are truly files (instead of directories or something | |
2368 | else). For such a safer (but slower) version, use %rehashx.""" |
|
2368 | else). For such a safer (but slower) version, use %rehashx.""" | |
2369 |
|
2369 | |||
2370 | # This function (and rehashx) manipulate the alias_table directly |
|
2370 | # This function (and rehashx) manipulate the alias_table directly | |
2371 | # rather than calling magic_alias, for speed reasons. A rehash on a |
|
2371 | # rather than calling magic_alias, for speed reasons. A rehash on a | |
2372 | # typical Linux box involves several thousand entries, so efficiency |
|
2372 | # typical Linux box involves several thousand entries, so efficiency | |
2373 | # here is a top concern. |
|
2373 | # here is a top concern. | |
2374 |
|
2374 | |||
2375 | path = filter(os.path.isdir,os.environ['PATH'].split(os.pathsep)) |
|
2375 | path = filter(os.path.isdir,os.environ['PATH'].split(os.pathsep)) | |
2376 | alias_table = self.shell.alias_table |
|
2376 | alias_table = self.shell.alias_table | |
2377 | for pdir in path: |
|
2377 | for pdir in path: | |
2378 | for ff in os.listdir(pdir): |
|
2378 | for ff in os.listdir(pdir): | |
2379 | # each entry in the alias table must be (N,name), where |
|
2379 | # each entry in the alias table must be (N,name), where | |
2380 | # N is the number of positional arguments of the alias. |
|
2380 | # N is the number of positional arguments of the alias. | |
2381 | alias_table[ff] = (0,ff) |
|
2381 | alias_table[ff] = (0,ff) | |
2382 | # Make sure the alias table doesn't contain keywords or builtins |
|
2382 | # Make sure the alias table doesn't contain keywords or builtins | |
2383 | self.shell.alias_table_validate() |
|
2383 | self.shell.alias_table_validate() | |
2384 | # Call again init_auto_alias() so we get 'rm -i' and other modified |
|
2384 | # Call again init_auto_alias() so we get 'rm -i' and other modified | |
2385 | # aliases since %rehash will probably clobber them |
|
2385 | # aliases since %rehash will probably clobber them | |
2386 | self.shell.init_auto_alias() |
|
2386 | self.shell.init_auto_alias() | |
2387 |
|
2387 | |||
2388 | def magic_rehashx(self, parameter_s = ''): |
|
2388 | def magic_rehashx(self, parameter_s = ''): | |
2389 | """Update the alias table with all executable files in $PATH. |
|
2389 | """Update the alias table with all executable files in $PATH. | |
2390 |
|
2390 | |||
2391 | This version explicitly checks that every entry in $PATH is a file |
|
2391 | This version explicitly checks that every entry in $PATH is a file | |
2392 | with execute access (os.X_OK), so it is much slower than %rehash. |
|
2392 | with execute access (os.X_OK), so it is much slower than %rehash. | |
2393 |
|
2393 | |||
2394 | Under Windows, it checks executability as a match agains a |
|
2394 | Under Windows, it checks executability as a match agains a | |
2395 | '|'-separated string of extensions, stored in the IPython config |
|
2395 | '|'-separated string of extensions, stored in the IPython config | |
2396 | variable win_exec_ext. This defaults to 'exe|com|bat'. """ |
|
2396 | variable win_exec_ext. This defaults to 'exe|com|bat'. """ | |
2397 |
|
2397 | |||
2398 | path = [os.path.abspath(os.path.expanduser(p)) for p in |
|
2398 | path = [os.path.abspath(os.path.expanduser(p)) for p in | |
2399 | os.environ['PATH'].split(os.pathsep)] |
|
2399 | os.environ['PATH'].split(os.pathsep)] | |
2400 | path = filter(os.path.isdir,path) |
|
2400 | path = filter(os.path.isdir,path) | |
2401 |
|
2401 | |||
2402 | alias_table = self.shell.alias_table |
|
2402 | alias_table = self.shell.alias_table | |
2403 | syscmdlist = [] |
|
2403 | syscmdlist = [] | |
2404 | if os.name == 'posix': |
|
2404 | if os.name == 'posix': | |
2405 | isexec = lambda fname:os.path.isfile(fname) and \ |
|
2405 | isexec = lambda fname:os.path.isfile(fname) and \ | |
2406 | os.access(fname,os.X_OK) |
|
2406 | os.access(fname,os.X_OK) | |
2407 | else: |
|
2407 | else: | |
2408 |
|
2408 | |||
2409 | try: |
|
2409 | try: | |
2410 | winext = os.environ['pathext'].replace(';','|').replace('.','') |
|
2410 | winext = os.environ['pathext'].replace(';','|').replace('.','') | |
2411 | except KeyError: |
|
2411 | except KeyError: | |
2412 | winext = 'exe|com|bat' |
|
2412 | winext = 'exe|com|bat' | |
2413 |
|
2413 | |||
2414 | execre = re.compile(r'(.*)\.(%s)$' % winext,re.IGNORECASE) |
|
2414 | execre = re.compile(r'(.*)\.(%s)$' % winext,re.IGNORECASE) | |
2415 | isexec = lambda fname:os.path.isfile(fname) and execre.match(fname) |
|
2415 | isexec = lambda fname:os.path.isfile(fname) and execre.match(fname) | |
2416 | savedir = os.getcwd() |
|
2416 | savedir = os.getcwd() | |
2417 | try: |
|
2417 | try: | |
2418 | # write the whole loop for posix/Windows so we don't have an if in |
|
2418 | # write the whole loop for posix/Windows so we don't have an if in | |
2419 | # the innermost part |
|
2419 | # the innermost part | |
2420 | if os.name == 'posix': |
|
2420 | if os.name == 'posix': | |
2421 | for pdir in path: |
|
2421 | for pdir in path: | |
2422 | os.chdir(pdir) |
|
2422 | os.chdir(pdir) | |
2423 | for ff in os.listdir(pdir): |
|
2423 | for ff in os.listdir(pdir): | |
2424 | if isexec(ff) and ff not in self.shell.no_alias: |
|
2424 | if isexec(ff) and ff not in self.shell.no_alias: | |
2425 | # each entry in the alias table must be (N,name), |
|
2425 | # each entry in the alias table must be (N,name), | |
2426 | # where N is the number of positional arguments of the |
|
2426 | # where N is the number of positional arguments of the | |
2427 | # alias. |
|
2427 | # alias. | |
2428 | alias_table[ff] = (0,ff) |
|
2428 | alias_table[ff] = (0,ff) | |
2429 | syscmdlist.append(ff) |
|
2429 | syscmdlist.append(ff) | |
2430 | else: |
|
2430 | else: | |
2431 | for pdir in path: |
|
2431 | for pdir in path: | |
2432 | os.chdir(pdir) |
|
2432 | os.chdir(pdir) | |
2433 | for ff in os.listdir(pdir): |
|
2433 | for ff in os.listdir(pdir): | |
2434 | if isexec(ff) and os.path.splitext(ff)[0] not in self.shell.no_alias: |
|
2434 | if isexec(ff) and os.path.splitext(ff)[0] not in self.shell.no_alias: | |
2435 | alias_table[execre.sub(r'\1',ff)] = (0,ff) |
|
2435 | alias_table[execre.sub(r'\1',ff)] = (0,ff) | |
2436 | syscmdlist.append(ff) |
|
2436 | syscmdlist.append(ff) | |
2437 | # Make sure the alias table doesn't contain keywords or builtins |
|
2437 | # Make sure the alias table doesn't contain keywords or builtins | |
2438 | self.shell.alias_table_validate() |
|
2438 | self.shell.alias_table_validate() | |
2439 | # Call again init_auto_alias() so we get 'rm -i' and other |
|
2439 | # Call again init_auto_alias() so we get 'rm -i' and other | |
2440 | # modified aliases since %rehashx will probably clobber them |
|
2440 | # modified aliases since %rehashx will probably clobber them | |
2441 | self.shell.init_auto_alias() |
|
2441 | self.shell.init_auto_alias() | |
2442 | db = self.getapi().db |
|
2442 | db = self.getapi().db | |
2443 | db['syscmdlist'] = syscmdlist |
|
2443 | db['syscmdlist'] = syscmdlist | |
2444 | finally: |
|
2444 | finally: | |
2445 | os.chdir(savedir) |
|
2445 | os.chdir(savedir) | |
2446 |
|
2446 | |||
2447 | def magic_pwd(self, parameter_s = ''): |
|
2447 | def magic_pwd(self, parameter_s = ''): | |
2448 | """Return the current working directory path.""" |
|
2448 | """Return the current working directory path.""" | |
2449 | return os.getcwd() |
|
2449 | return os.getcwd() | |
2450 |
|
2450 | |||
2451 | def magic_cd(self, parameter_s=''): |
|
2451 | def magic_cd(self, parameter_s=''): | |
2452 | """Change the current working directory. |
|
2452 | """Change the current working directory. | |
2453 |
|
2453 | |||
2454 | This command automatically maintains an internal list of directories |
|
2454 | This command automatically maintains an internal list of directories | |
2455 | you visit during your IPython session, in the variable _dh. The |
|
2455 | you visit during your IPython session, in the variable _dh. The | |
2456 | command %dhist shows this history nicely formatted. |
|
2456 | command %dhist shows this history nicely formatted. | |
2457 |
|
2457 | |||
2458 | Usage: |
|
2458 | Usage: | |
2459 |
|
2459 | |||
2460 | cd 'dir': changes to directory 'dir'. |
|
2460 | cd 'dir': changes to directory 'dir'. | |
2461 |
|
2461 | |||
2462 | cd -: changes to the last visited directory. |
|
2462 | cd -: changes to the last visited directory. | |
2463 |
|
2463 | |||
2464 | cd -<n>: changes to the n-th directory in the directory history. |
|
2464 | cd -<n>: changes to the n-th directory in the directory history. | |
2465 |
|
2465 | |||
2466 | cd -b <bookmark_name>: jump to a bookmark set by %bookmark |
|
2466 | cd -b <bookmark_name>: jump to a bookmark set by %bookmark | |
2467 | (note: cd <bookmark_name> is enough if there is no |
|
2467 | (note: cd <bookmark_name> is enough if there is no | |
2468 | directory <bookmark_name>, but a bookmark with the name exists.) |
|
2468 | directory <bookmark_name>, but a bookmark with the name exists.) | |
2469 |
|
2469 | |||
2470 | Options: |
|
2470 | Options: | |
2471 |
|
2471 | |||
2472 | -q: quiet. Do not print the working directory after the cd command is |
|
2472 | -q: quiet. Do not print the working directory after the cd command is | |
2473 | executed. By default IPython's cd command does print this directory, |
|
2473 | executed. By default IPython's cd command does print this directory, | |
2474 | since the default prompts do not display path information. |
|
2474 | since the default prompts do not display path information. | |
2475 |
|
2475 | |||
2476 | Note that !cd doesn't work for this purpose because the shell where |
|
2476 | Note that !cd doesn't work for this purpose because the shell where | |
2477 | !command runs is immediately discarded after executing 'command'.""" |
|
2477 | !command runs is immediately discarded after executing 'command'.""" | |
2478 |
|
2478 | |||
2479 | parameter_s = parameter_s.strip() |
|
2479 | parameter_s = parameter_s.strip() | |
2480 | #bkms = self.shell.persist.get("bookmarks",{}) |
|
2480 | #bkms = self.shell.persist.get("bookmarks",{}) | |
2481 |
|
2481 | |||
2482 | numcd = re.match(r'(-)(\d+)$',parameter_s) |
|
2482 | numcd = re.match(r'(-)(\d+)$',parameter_s) | |
2483 | # jump in directory history by number |
|
2483 | # jump in directory history by number | |
2484 | if numcd: |
|
2484 | if numcd: | |
2485 | nn = int(numcd.group(2)) |
|
2485 | nn = int(numcd.group(2)) | |
2486 | try: |
|
2486 | try: | |
2487 | ps = self.shell.user_ns['_dh'][nn] |
|
2487 | ps = self.shell.user_ns['_dh'][nn] | |
2488 | except IndexError: |
|
2488 | except IndexError: | |
2489 | print 'The requested directory does not exist in history.' |
|
2489 | print 'The requested directory does not exist in history.' | |
2490 | return |
|
2490 | return | |
2491 | else: |
|
2491 | else: | |
2492 | opts = {} |
|
2492 | opts = {} | |
2493 | else: |
|
2493 | else: | |
2494 | #turn all non-space-escaping backslashes to slashes, |
|
2494 | #turn all non-space-escaping backslashes to slashes, | |
2495 | # for c:\windows\directory\names\ |
|
2495 | # for c:\windows\directory\names\ | |
2496 | parameter_s = re.sub(r'\\(?! )','/', parameter_s) |
|
2496 | parameter_s = re.sub(r'\\(?! )','/', parameter_s) | |
2497 | opts,ps = self.parse_options(parameter_s,'qb',mode='string') |
|
2497 | opts,ps = self.parse_options(parameter_s,'qb',mode='string') | |
2498 | # jump to previous |
|
2498 | # jump to previous | |
2499 | if ps == '-': |
|
2499 | if ps == '-': | |
2500 | try: |
|
2500 | try: | |
2501 | ps = self.shell.user_ns['_dh'][-2] |
|
2501 | ps = self.shell.user_ns['_dh'][-2] | |
2502 | except IndexError: |
|
2502 | except IndexError: | |
2503 | print 'No previous directory to change to.' |
|
2503 | print 'No previous directory to change to.' | |
2504 | return |
|
2504 | return | |
2505 | # jump to bookmark if needed |
|
2505 | # jump to bookmark if needed | |
2506 | else: |
|
2506 | else: | |
2507 | if not os.path.isdir(ps) or opts.has_key('b'): |
|
2507 | if not os.path.isdir(ps) or opts.has_key('b'): | |
2508 | bkms = self.db.get('bookmarks', {}) |
|
2508 | bkms = self.db.get('bookmarks', {}) | |
2509 |
|
2509 | |||
2510 | if bkms.has_key(ps): |
|
2510 | if bkms.has_key(ps): | |
2511 | target = bkms[ps] |
|
2511 | target = bkms[ps] | |
2512 | print '(bookmark:%s) -> %s' % (ps,target) |
|
2512 | print '(bookmark:%s) -> %s' % (ps,target) | |
2513 | ps = target |
|
2513 | ps = target | |
2514 | else: |
|
2514 | else: | |
2515 | if opts.has_key('b'): |
|
2515 | if opts.has_key('b'): | |
2516 | error("Bookmark '%s' not found. " |
|
2516 | error("Bookmark '%s' not found. " | |
2517 | "Use '%%bookmark -l' to see your bookmarks." % ps) |
|
2517 | "Use '%%bookmark -l' to see your bookmarks." % ps) | |
2518 | return |
|
2518 | return | |
2519 |
|
2519 | |||
2520 | # at this point ps should point to the target dir |
|
2520 | # at this point ps should point to the target dir | |
2521 | if ps: |
|
2521 | if ps: | |
2522 | try: |
|
2522 | try: | |
2523 | os.chdir(os.path.expanduser(ps)) |
|
2523 | os.chdir(os.path.expanduser(ps)) | |
2524 | ttitle = ("IPy:" + ( |
|
2524 | ttitle = ("IPy:" + ( | |
2525 | os.getcwd() == '/' and '/' or os.path.basename(os.getcwd()))) |
|
2525 | os.getcwd() == '/' and '/' or os.path.basename(os.getcwd()))) | |
2526 | platutils.set_term_title(ttitle) |
|
2526 | platutils.set_term_title(ttitle) | |
2527 | except OSError: |
|
2527 | except OSError: | |
2528 | print sys.exc_info()[1] |
|
2528 | print sys.exc_info()[1] | |
2529 | else: |
|
2529 | else: | |
2530 | self.shell.user_ns['_dh'].append(os.getcwd()) |
|
2530 | self.shell.user_ns['_dh'].append(os.getcwd()) | |
2531 | else: |
|
2531 | else: | |
2532 | os.chdir(self.shell.home_dir) |
|
2532 | os.chdir(self.shell.home_dir) | |
2533 | platutils.set_term_title("IPy:~") |
|
2533 | platutils.set_term_title("IPy:~") | |
2534 | self.shell.user_ns['_dh'].append(os.getcwd()) |
|
2534 | self.shell.user_ns['_dh'].append(os.getcwd()) | |
2535 | if not 'q' in opts: |
|
2535 | if not 'q' in opts: | |
2536 | print self.shell.user_ns['_dh'][-1] |
|
2536 | print self.shell.user_ns['_dh'][-1] | |
2537 |
|
2537 | |||
2538 | def magic_dhist(self, parameter_s=''): |
|
2538 | def magic_dhist(self, parameter_s=''): | |
2539 | """Print your history of visited directories. |
|
2539 | """Print your history of visited directories. | |
2540 |
|
2540 | |||
2541 | %dhist -> print full history\\ |
|
2541 | %dhist -> print full history\\ | |
2542 | %dhist n -> print last n entries only\\ |
|
2542 | %dhist n -> print last n entries only\\ | |
2543 | %dhist n1 n2 -> print entries between n1 and n2 (n1 not included)\\ |
|
2543 | %dhist n1 n2 -> print entries between n1 and n2 (n1 not included)\\ | |
2544 |
|
2544 | |||
2545 | This history is automatically maintained by the %cd command, and |
|
2545 | This history is automatically maintained by the %cd command, and | |
2546 | always available as the global list variable _dh. You can use %cd -<n> |
|
2546 | always available as the global list variable _dh. You can use %cd -<n> | |
2547 | to go to directory number <n>.""" |
|
2547 | to go to directory number <n>.""" | |
2548 |
|
2548 | |||
2549 | dh = self.shell.user_ns['_dh'] |
|
2549 | dh = self.shell.user_ns['_dh'] | |
2550 | if parameter_s: |
|
2550 | if parameter_s: | |
2551 | try: |
|
2551 | try: | |
2552 | args = map(int,parameter_s.split()) |
|
2552 | args = map(int,parameter_s.split()) | |
2553 | except: |
|
2553 | except: | |
2554 | self.arg_err(Magic.magic_dhist) |
|
2554 | self.arg_err(Magic.magic_dhist) | |
2555 | return |
|
2555 | return | |
2556 | if len(args) == 1: |
|
2556 | if len(args) == 1: | |
2557 | ini,fin = max(len(dh)-(args[0]),0),len(dh) |
|
2557 | ini,fin = max(len(dh)-(args[0]),0),len(dh) | |
2558 | elif len(args) == 2: |
|
2558 | elif len(args) == 2: | |
2559 | ini,fin = args |
|
2559 | ini,fin = args | |
2560 | else: |
|
2560 | else: | |
2561 | self.arg_err(Magic.magic_dhist) |
|
2561 | self.arg_err(Magic.magic_dhist) | |
2562 | return |
|
2562 | return | |
2563 | else: |
|
2563 | else: | |
2564 | ini,fin = 0,len(dh) |
|
2564 | ini,fin = 0,len(dh) | |
2565 | nlprint(dh, |
|
2565 | nlprint(dh, | |
2566 | header = 'Directory history (kept in _dh)', |
|
2566 | header = 'Directory history (kept in _dh)', | |
2567 | start=ini,stop=fin) |
|
2567 | start=ini,stop=fin) | |
2568 |
|
2568 | |||
2569 | def magic_env(self, parameter_s=''): |
|
2569 | def magic_env(self, parameter_s=''): | |
2570 | """List environment variables.""" |
|
2570 | """List environment variables.""" | |
2571 |
|
2571 | |||
2572 | return os.environ.data |
|
2572 | return os.environ.data | |
2573 |
|
2573 | |||
2574 | def magic_pushd(self, parameter_s=''): |
|
2574 | def magic_pushd(self, parameter_s=''): | |
2575 | """Place the current dir on stack and change directory. |
|
2575 | """Place the current dir on stack and change directory. | |
2576 |
|
2576 | |||
2577 | Usage:\\ |
|
2577 | Usage:\\ | |
2578 | %pushd ['dirname'] |
|
2578 | %pushd ['dirname'] | |
2579 |
|
2579 | |||
2580 | %pushd with no arguments does a %pushd to your home directory. |
|
2580 | %pushd with no arguments does a %pushd to your home directory. | |
2581 | """ |
|
2581 | """ | |
2582 | if parameter_s == '': parameter_s = '~' |
|
2582 | if parameter_s == '': parameter_s = '~' | |
2583 | dir_s = self.shell.dir_stack |
|
2583 | dir_s = self.shell.dir_stack | |
2584 | if len(dir_s)>0 and os.path.expanduser(parameter_s) != \ |
|
2584 | if len(dir_s)>0 and os.path.expanduser(parameter_s) != \ | |
2585 | os.path.expanduser(self.shell.dir_stack[0]): |
|
2585 | os.path.expanduser(self.shell.dir_stack[0]): | |
2586 | try: |
|
2586 | try: | |
2587 | self.magic_cd(parameter_s) |
|
2587 | self.magic_cd(parameter_s) | |
2588 | dir_s.insert(0,os.getcwd().replace(self.home_dir,'~')) |
|
2588 | dir_s.insert(0,os.getcwd().replace(self.home_dir,'~')) | |
2589 | self.magic_dirs() |
|
2589 | self.magic_dirs() | |
2590 | except: |
|
2590 | except: | |
2591 | print 'Invalid directory' |
|
2591 | print 'Invalid directory' | |
2592 | else: |
|
2592 | else: | |
2593 | print 'You are already there!' |
|
2593 | print 'You are already there!' | |
2594 |
|
2594 | |||
2595 | def magic_popd(self, parameter_s=''): |
|
2595 | def magic_popd(self, parameter_s=''): | |
2596 | """Change to directory popped off the top of the stack. |
|
2596 | """Change to directory popped off the top of the stack. | |
2597 | """ |
|
2597 | """ | |
2598 | if len (self.shell.dir_stack) > 1: |
|
2598 | if len (self.shell.dir_stack) > 1: | |
2599 | self.shell.dir_stack.pop(0) |
|
2599 | self.shell.dir_stack.pop(0) | |
2600 | self.magic_cd(self.shell.dir_stack[0]) |
|
2600 | self.magic_cd(self.shell.dir_stack[0]) | |
2601 | print self.shell.dir_stack[0] |
|
2601 | print self.shell.dir_stack[0] | |
2602 | else: |
|
2602 | else: | |
2603 | print "You can't remove the starting directory from the stack:",\ |
|
2603 | print "You can't remove the starting directory from the stack:",\ | |
2604 | self.shell.dir_stack |
|
2604 | self.shell.dir_stack | |
2605 |
|
2605 | |||
2606 | def magic_dirs(self, parameter_s=''): |
|
2606 | def magic_dirs(self, parameter_s=''): | |
2607 | """Return the current directory stack.""" |
|
2607 | """Return the current directory stack.""" | |
2608 |
|
2608 | |||
2609 | return self.shell.dir_stack[:] |
|
2609 | return self.shell.dir_stack[:] | |
2610 |
|
2610 | |||
2611 | def magic_sc(self, parameter_s=''): |
|
2611 | def magic_sc(self, parameter_s=''): | |
2612 | """Shell capture - execute a shell command and capture its output. |
|
2612 | """Shell capture - execute a shell command and capture its output. | |
2613 |
|
2613 | |||
2614 | DEPRECATED. Suboptimal, retained for backwards compatibility. |
|
2614 | DEPRECATED. Suboptimal, retained for backwards compatibility. | |
2615 |
|
2615 | |||
2616 | You should use the form 'var = !command' instead. Example: |
|
2616 | You should use the form 'var = !command' instead. Example: | |
2617 |
|
2617 | |||
2618 | "%sc -l myfiles = ls ~" should now be written as |
|
2618 | "%sc -l myfiles = ls ~" should now be written as | |
2619 |
|
2619 | |||
2620 | "myfiles = !ls ~" |
|
2620 | "myfiles = !ls ~" | |
2621 |
|
2621 | |||
2622 | myfiles.s, myfiles.l and myfiles.n still apply as documented |
|
2622 | myfiles.s, myfiles.l and myfiles.n still apply as documented | |
2623 | below. |
|
2623 | below. | |
2624 |
|
2624 | |||
2625 | -- |
|
2625 | -- | |
2626 | %sc [options] varname=command |
|
2626 | %sc [options] varname=command | |
2627 |
|
2627 | |||
2628 | IPython will run the given command using commands.getoutput(), and |
|
2628 | IPython will run the given command using commands.getoutput(), and | |
2629 | will then update the user's interactive namespace with a variable |
|
2629 | will then update the user's interactive namespace with a variable | |
2630 | called varname, containing the value of the call. Your command can |
|
2630 | called varname, containing the value of the call. Your command can | |
2631 | contain shell wildcards, pipes, etc. |
|
2631 | contain shell wildcards, pipes, etc. | |
2632 |
|
2632 | |||
2633 | The '=' sign in the syntax is mandatory, and the variable name you |
|
2633 | The '=' sign in the syntax is mandatory, and the variable name you | |
2634 | supply must follow Python's standard conventions for valid names. |
|
2634 | supply must follow Python's standard conventions for valid names. | |
2635 |
|
2635 | |||
2636 | (A special format without variable name exists for internal use) |
|
2636 | (A special format without variable name exists for internal use) | |
2637 |
|
2637 | |||
2638 | Options: |
|
2638 | Options: | |
2639 |
|
2639 | |||
2640 | -l: list output. Split the output on newlines into a list before |
|
2640 | -l: list output. Split the output on newlines into a list before | |
2641 | assigning it to the given variable. By default the output is stored |
|
2641 | assigning it to the given variable. By default the output is stored | |
2642 | as a single string. |
|
2642 | as a single string. | |
2643 |
|
2643 | |||
2644 | -v: verbose. Print the contents of the variable. |
|
2644 | -v: verbose. Print the contents of the variable. | |
2645 |
|
2645 | |||
2646 | In most cases you should not need to split as a list, because the |
|
2646 | In most cases you should not need to split as a list, because the | |
2647 | returned value is a special type of string which can automatically |
|
2647 | returned value is a special type of string which can automatically | |
2648 | provide its contents either as a list (split on newlines) or as a |
|
2648 | provide its contents either as a list (split on newlines) or as a | |
2649 | space-separated string. These are convenient, respectively, either |
|
2649 | space-separated string. These are convenient, respectively, either | |
2650 | for sequential processing or to be passed to a shell command. |
|
2650 | for sequential processing or to be passed to a shell command. | |
2651 |
|
2651 | |||
2652 | For example: |
|
2652 | For example: | |
2653 |
|
2653 | |||
2654 | # Capture into variable a |
|
2654 | # Capture into variable a | |
2655 | In [9]: sc a=ls *py |
|
2655 | In [9]: sc a=ls *py | |
2656 |
|
2656 | |||
2657 | # a is a string with embedded newlines |
|
2657 | # a is a string with embedded newlines | |
2658 | In [10]: a |
|
2658 | In [10]: a | |
2659 | Out[10]: 'setup.py\nwin32_manual_post_install.py' |
|
2659 | Out[10]: 'setup.py\nwin32_manual_post_install.py' | |
2660 |
|
2660 | |||
2661 | # which can be seen as a list: |
|
2661 | # which can be seen as a list: | |
2662 | In [11]: a.l |
|
2662 | In [11]: a.l | |
2663 | Out[11]: ['setup.py', 'win32_manual_post_install.py'] |
|
2663 | Out[11]: ['setup.py', 'win32_manual_post_install.py'] | |
2664 |
|
2664 | |||
2665 | # or as a whitespace-separated string: |
|
2665 | # or as a whitespace-separated string: | |
2666 | In [12]: a.s |
|
2666 | In [12]: a.s | |
2667 | Out[12]: 'setup.py win32_manual_post_install.py' |
|
2667 | Out[12]: 'setup.py win32_manual_post_install.py' | |
2668 |
|
2668 | |||
2669 | # a.s is useful to pass as a single command line: |
|
2669 | # a.s is useful to pass as a single command line: | |
2670 | In [13]: !wc -l $a.s |
|
2670 | In [13]: !wc -l $a.s | |
2671 | 146 setup.py |
|
2671 | 146 setup.py | |
2672 | 130 win32_manual_post_install.py |
|
2672 | 130 win32_manual_post_install.py | |
2673 | 276 total |
|
2673 | 276 total | |
2674 |
|
2674 | |||
2675 | # while the list form is useful to loop over: |
|
2675 | # while the list form is useful to loop over: | |
2676 | In [14]: for f in a.l: |
|
2676 | In [14]: for f in a.l: | |
2677 | ....: !wc -l $f |
|
2677 | ....: !wc -l $f | |
2678 | ....: |
|
2678 | ....: | |
2679 | 146 setup.py |
|
2679 | 146 setup.py | |
2680 | 130 win32_manual_post_install.py |
|
2680 | 130 win32_manual_post_install.py | |
2681 |
|
2681 | |||
2682 | Similiarly, the lists returned by the -l option are also special, in |
|
2682 | Similiarly, the lists returned by the -l option are also special, in | |
2683 | the sense that you can equally invoke the .s attribute on them to |
|
2683 | the sense that you can equally invoke the .s attribute on them to | |
2684 | automatically get a whitespace-separated string from their contents: |
|
2684 | automatically get a whitespace-separated string from their contents: | |
2685 |
|
2685 | |||
2686 | In [1]: sc -l b=ls *py |
|
2686 | In [1]: sc -l b=ls *py | |
2687 |
|
2687 | |||
2688 | In [2]: b |
|
2688 | In [2]: b | |
2689 | Out[2]: ['setup.py', 'win32_manual_post_install.py'] |
|
2689 | Out[2]: ['setup.py', 'win32_manual_post_install.py'] | |
2690 |
|
2690 | |||
2691 | In [3]: b.s |
|
2691 | In [3]: b.s | |
2692 | Out[3]: 'setup.py win32_manual_post_install.py' |
|
2692 | Out[3]: 'setup.py win32_manual_post_install.py' | |
2693 |
|
2693 | |||
2694 | In summary, both the lists and strings used for ouptut capture have |
|
2694 | In summary, both the lists and strings used for ouptut capture have | |
2695 | the following special attributes: |
|
2695 | the following special attributes: | |
2696 |
|
2696 | |||
2697 | .l (or .list) : value as list. |
|
2697 | .l (or .list) : value as list. | |
2698 | .n (or .nlstr): value as newline-separated string. |
|
2698 | .n (or .nlstr): value as newline-separated string. | |
2699 | .s (or .spstr): value as space-separated string. |
|
2699 | .s (or .spstr): value as space-separated string. | |
2700 | """ |
|
2700 | """ | |
2701 |
|
2701 | |||
2702 | opts,args = self.parse_options(parameter_s,'lv') |
|
2702 | opts,args = self.parse_options(parameter_s,'lv') | |
2703 | # Try to get a variable name and command to run |
|
2703 | # Try to get a variable name and command to run | |
2704 | try: |
|
2704 | try: | |
2705 | # the variable name must be obtained from the parse_options |
|
2705 | # the variable name must be obtained from the parse_options | |
2706 | # output, which uses shlex.split to strip options out. |
|
2706 | # output, which uses shlex.split to strip options out. | |
2707 | var,_ = args.split('=',1) |
|
2707 | var,_ = args.split('=',1) | |
2708 | var = var.strip() |
|
2708 | var = var.strip() | |
2709 | # But the the command has to be extracted from the original input |
|
2709 | # But the the command has to be extracted from the original input | |
2710 | # parameter_s, not on what parse_options returns, to avoid the |
|
2710 | # parameter_s, not on what parse_options returns, to avoid the | |
2711 | # quote stripping which shlex.split performs on it. |
|
2711 | # quote stripping which shlex.split performs on it. | |
2712 | _,cmd = parameter_s.split('=',1) |
|
2712 | _,cmd = parameter_s.split('=',1) | |
2713 | except ValueError: |
|
2713 | except ValueError: | |
2714 | var,cmd = '','' |
|
2714 | var,cmd = '','' | |
2715 | # If all looks ok, proceed |
|
2715 | # If all looks ok, proceed | |
2716 | out,err = self.shell.getoutputerror(cmd) |
|
2716 | out,err = self.shell.getoutputerror(cmd) | |
2717 | if err: |
|
2717 | if err: | |
2718 | print >> Term.cerr,err |
|
2718 | print >> Term.cerr,err | |
2719 | if opts.has_key('l'): |
|
2719 | if opts.has_key('l'): | |
2720 | out = SList(out.split('\n')) |
|
2720 | out = SList(out.split('\n')) | |
2721 | else: |
|
2721 | else: | |
2722 | out = LSString(out) |
|
2722 | out = LSString(out) | |
2723 | if opts.has_key('v'): |
|
2723 | if opts.has_key('v'): | |
2724 | print '%s ==\n%s' % (var,pformat(out)) |
|
2724 | print '%s ==\n%s' % (var,pformat(out)) | |
2725 | if var: |
|
2725 | if var: | |
2726 | self.shell.user_ns.update({var:out}) |
|
2726 | self.shell.user_ns.update({var:out}) | |
2727 | else: |
|
2727 | else: | |
2728 | return out |
|
2728 | return out | |
2729 |
|
2729 | |||
2730 | def magic_sx(self, parameter_s=''): |
|
2730 | def magic_sx(self, parameter_s=''): | |
2731 | """Shell execute - run a shell command and capture its output. |
|
2731 | """Shell execute - run a shell command and capture its output. | |
2732 |
|
2732 | |||
2733 | %sx command |
|
2733 | %sx command | |
2734 |
|
2734 | |||
2735 | IPython will run the given command using commands.getoutput(), and |
|
2735 | IPython will run the given command using commands.getoutput(), and | |
2736 | return the result formatted as a list (split on '\\n'). Since the |
|
2736 | return the result formatted as a list (split on '\\n'). Since the | |
2737 | output is _returned_, it will be stored in ipython's regular output |
|
2737 | output is _returned_, it will be stored in ipython's regular output | |
2738 | cache Out[N] and in the '_N' automatic variables. |
|
2738 | cache Out[N] and in the '_N' automatic variables. | |
2739 |
|
2739 | |||
2740 | Notes: |
|
2740 | Notes: | |
2741 |
|
2741 | |||
2742 | 1) If an input line begins with '!!', then %sx is automatically |
|
2742 | 1) If an input line begins with '!!', then %sx is automatically | |
2743 | invoked. That is, while: |
|
2743 | invoked. That is, while: | |
2744 | !ls |
|
2744 | !ls | |
2745 | causes ipython to simply issue system('ls'), typing |
|
2745 | causes ipython to simply issue system('ls'), typing | |
2746 | !!ls |
|
2746 | !!ls | |
2747 | is a shorthand equivalent to: |
|
2747 | is a shorthand equivalent to: | |
2748 | %sx ls |
|
2748 | %sx ls | |
2749 |
|
2749 | |||
2750 | 2) %sx differs from %sc in that %sx automatically splits into a list, |
|
2750 | 2) %sx differs from %sc in that %sx automatically splits into a list, | |
2751 | like '%sc -l'. The reason for this is to make it as easy as possible |
|
2751 | like '%sc -l'. The reason for this is to make it as easy as possible | |
2752 | to process line-oriented shell output via further python commands. |
|
2752 | to process line-oriented shell output via further python commands. | |
2753 | %sc is meant to provide much finer control, but requires more |
|
2753 | %sc is meant to provide much finer control, but requires more | |
2754 | typing. |
|
2754 | typing. | |
2755 |
|
2755 | |||
2756 | 3) Just like %sc -l, this is a list with special attributes: |
|
2756 | 3) Just like %sc -l, this is a list with special attributes: | |
2757 |
|
2757 | |||
2758 | .l (or .list) : value as list. |
|
2758 | .l (or .list) : value as list. | |
2759 | .n (or .nlstr): value as newline-separated string. |
|
2759 | .n (or .nlstr): value as newline-separated string. | |
2760 | .s (or .spstr): value as whitespace-separated string. |
|
2760 | .s (or .spstr): value as whitespace-separated string. | |
2761 |
|
2761 | |||
2762 | This is very useful when trying to use such lists as arguments to |
|
2762 | This is very useful when trying to use such lists as arguments to | |
2763 | system commands.""" |
|
2763 | system commands.""" | |
2764 |
|
2764 | |||
2765 | if parameter_s: |
|
2765 | if parameter_s: | |
2766 | out,err = self.shell.getoutputerror(parameter_s) |
|
2766 | out,err = self.shell.getoutputerror(parameter_s) | |
2767 | if err: |
|
2767 | if err: | |
2768 | print >> Term.cerr,err |
|
2768 | print >> Term.cerr,err | |
2769 | return SList(out.split('\n')) |
|
2769 | return SList(out.split('\n')) | |
2770 |
|
2770 | |||
2771 | def magic_bg(self, parameter_s=''): |
|
2771 | def magic_bg(self, parameter_s=''): | |
2772 | """Run a job in the background, in a separate thread. |
|
2772 | """Run a job in the background, in a separate thread. | |
2773 |
|
2773 | |||
2774 | For example, |
|
2774 | For example, | |
2775 |
|
2775 | |||
2776 | %bg myfunc(x,y,z=1) |
|
2776 | %bg myfunc(x,y,z=1) | |
2777 |
|
2777 | |||
2778 | will execute 'myfunc(x,y,z=1)' in a background thread. As soon as the |
|
2778 | will execute 'myfunc(x,y,z=1)' in a background thread. As soon as the | |
2779 | execution starts, a message will be printed indicating the job |
|
2779 | execution starts, a message will be printed indicating the job | |
2780 | number. If your job number is 5, you can use |
|
2780 | number. If your job number is 5, you can use | |
2781 |
|
2781 | |||
2782 | myvar = jobs.result(5) or myvar = jobs[5].result |
|
2782 | myvar = jobs.result(5) or myvar = jobs[5].result | |
2783 |
|
2783 | |||
2784 | to assign this result to variable 'myvar'. |
|
2784 | to assign this result to variable 'myvar'. | |
2785 |
|
2785 | |||
2786 | IPython has a job manager, accessible via the 'jobs' object. You can |
|
2786 | IPython has a job manager, accessible via the 'jobs' object. You can | |
2787 | type jobs? to get more information about it, and use jobs.<TAB> to see |
|
2787 | type jobs? to get more information about it, and use jobs.<TAB> to see | |
2788 | its attributes. All attributes not starting with an underscore are |
|
2788 | its attributes. All attributes not starting with an underscore are | |
2789 | meant for public use. |
|
2789 | meant for public use. | |
2790 |
|
2790 | |||
2791 | In particular, look at the jobs.new() method, which is used to create |
|
2791 | In particular, look at the jobs.new() method, which is used to create | |
2792 | new jobs. This magic %bg function is just a convenience wrapper |
|
2792 | new jobs. This magic %bg function is just a convenience wrapper | |
2793 | around jobs.new(), for expression-based jobs. If you want to create a |
|
2793 | around jobs.new(), for expression-based jobs. If you want to create a | |
2794 | new job with an explicit function object and arguments, you must call |
|
2794 | new job with an explicit function object and arguments, you must call | |
2795 | jobs.new() directly. |
|
2795 | jobs.new() directly. | |
2796 |
|
2796 | |||
2797 | The jobs.new docstring also describes in detail several important |
|
2797 | The jobs.new docstring also describes in detail several important | |
2798 | caveats associated with a thread-based model for background job |
|
2798 | caveats associated with a thread-based model for background job | |
2799 | execution. Type jobs.new? for details. |
|
2799 | execution. Type jobs.new? for details. | |
2800 |
|
2800 | |||
2801 | You can check the status of all jobs with jobs.status(). |
|
2801 | You can check the status of all jobs with jobs.status(). | |
2802 |
|
2802 | |||
2803 | The jobs variable is set by IPython into the Python builtin namespace. |
|
2803 | The jobs variable is set by IPython into the Python builtin namespace. | |
2804 | If you ever declare a variable named 'jobs', you will shadow this |
|
2804 | If you ever declare a variable named 'jobs', you will shadow this | |
2805 | name. You can either delete your global jobs variable to regain |
|
2805 | name. You can either delete your global jobs variable to regain | |
2806 | access to the job manager, or make a new name and assign it manually |
|
2806 | access to the job manager, or make a new name and assign it manually | |
2807 | to the manager (stored in IPython's namespace). For example, to |
|
2807 | to the manager (stored in IPython's namespace). For example, to | |
2808 | assign the job manager to the Jobs name, use: |
|
2808 | assign the job manager to the Jobs name, use: | |
2809 |
|
2809 | |||
2810 | Jobs = __builtins__.jobs""" |
|
2810 | Jobs = __builtins__.jobs""" | |
2811 |
|
2811 | |||
2812 | self.shell.jobs.new(parameter_s,self.shell.user_ns) |
|
2812 | self.shell.jobs.new(parameter_s,self.shell.user_ns) | |
2813 |
|
2813 | |||
2814 |
|
2814 | |||
2815 | def magic_bookmark(self, parameter_s=''): |
|
2815 | def magic_bookmark(self, parameter_s=''): | |
2816 | """Manage IPython's bookmark system. |
|
2816 | """Manage IPython's bookmark system. | |
2817 |
|
2817 | |||
2818 | %bookmark <name> - set bookmark to current dir |
|
2818 | %bookmark <name> - set bookmark to current dir | |
2819 | %bookmark <name> <dir> - set bookmark to <dir> |
|
2819 | %bookmark <name> <dir> - set bookmark to <dir> | |
2820 | %bookmark -l - list all bookmarks |
|
2820 | %bookmark -l - list all bookmarks | |
2821 | %bookmark -d <name> - remove bookmark |
|
2821 | %bookmark -d <name> - remove bookmark | |
2822 | %bookmark -r - remove all bookmarks |
|
2822 | %bookmark -r - remove all bookmarks | |
2823 |
|
2823 | |||
2824 | You can later on access a bookmarked folder with: |
|
2824 | You can later on access a bookmarked folder with: | |
2825 | %cd -b <name> |
|
2825 | %cd -b <name> | |
2826 | or simply '%cd <name>' if there is no directory called <name> AND |
|
2826 | or simply '%cd <name>' if there is no directory called <name> AND | |
2827 | there is such a bookmark defined. |
|
2827 | there is such a bookmark defined. | |
2828 |
|
2828 | |||
2829 | Your bookmarks persist through IPython sessions, but they are |
|
2829 | Your bookmarks persist through IPython sessions, but they are | |
2830 | associated with each profile.""" |
|
2830 | associated with each profile.""" | |
2831 |
|
2831 | |||
2832 | opts,args = self.parse_options(parameter_s,'drl',mode='list') |
|
2832 | opts,args = self.parse_options(parameter_s,'drl',mode='list') | |
2833 | if len(args) > 2: |
|
2833 | if len(args) > 2: | |
2834 | error('You can only give at most two arguments') |
|
2834 | error('You can only give at most two arguments') | |
2835 | return |
|
2835 | return | |
2836 |
|
2836 | |||
2837 | bkms = self.db.get('bookmarks',{}) |
|
2837 | bkms = self.db.get('bookmarks',{}) | |
2838 |
|
2838 | |||
2839 | if opts.has_key('d'): |
|
2839 | if opts.has_key('d'): | |
2840 | try: |
|
2840 | try: | |
2841 | todel = args[0] |
|
2841 | todel = args[0] | |
2842 | except IndexError: |
|
2842 | except IndexError: | |
2843 | error('You must provide a bookmark to delete') |
|
2843 | error('You must provide a bookmark to delete') | |
2844 | else: |
|
2844 | else: | |
2845 | try: |
|
2845 | try: | |
2846 | del bkms[todel] |
|
2846 | del bkms[todel] | |
2847 | except: |
|
2847 | except: | |
2848 | error("Can't delete bookmark '%s'" % todel) |
|
2848 | error("Can't delete bookmark '%s'" % todel) | |
2849 | elif opts.has_key('r'): |
|
2849 | elif opts.has_key('r'): | |
2850 | bkms = {} |
|
2850 | bkms = {} | |
2851 | elif opts.has_key('l'): |
|
2851 | elif opts.has_key('l'): | |
2852 | bks = bkms.keys() |
|
2852 | bks = bkms.keys() | |
2853 | bks.sort() |
|
2853 | bks.sort() | |
2854 | if bks: |
|
2854 | if bks: | |
2855 | size = max(map(len,bks)) |
|
2855 | size = max(map(len,bks)) | |
2856 | else: |
|
2856 | else: | |
2857 | size = 0 |
|
2857 | size = 0 | |
2858 | fmt = '%-'+str(size)+'s -> %s' |
|
2858 | fmt = '%-'+str(size)+'s -> %s' | |
2859 | print 'Current bookmarks:' |
|
2859 | print 'Current bookmarks:' | |
2860 | for bk in bks: |
|
2860 | for bk in bks: | |
2861 | print fmt % (bk,bkms[bk]) |
|
2861 | print fmt % (bk,bkms[bk]) | |
2862 | else: |
|
2862 | else: | |
2863 | if not args: |
|
2863 | if not args: | |
2864 | error("You must specify the bookmark name") |
|
2864 | error("You must specify the bookmark name") | |
2865 | elif len(args)==1: |
|
2865 | elif len(args)==1: | |
2866 | bkms[args[0]] = os.getcwd() |
|
2866 | bkms[args[0]] = os.getcwd() | |
2867 | elif len(args)==2: |
|
2867 | elif len(args)==2: | |
2868 | bkms[args[0]] = args[1] |
|
2868 | bkms[args[0]] = args[1] | |
2869 | self.db['bookmarks'] = bkms |
|
2869 | self.db['bookmarks'] = bkms | |
2870 |
|
2870 | |||
2871 | def magic_pycat(self, parameter_s=''): |
|
2871 | def magic_pycat(self, parameter_s=''): | |
2872 | """Show a syntax-highlighted file through a pager. |
|
2872 | """Show a syntax-highlighted file through a pager. | |
2873 |
|
2873 | |||
2874 | This magic is similar to the cat utility, but it will assume the file |
|
2874 | This magic is similar to the cat utility, but it will assume the file | |
2875 | to be Python source and will show it with syntax highlighting. """ |
|
2875 | to be Python source and will show it with syntax highlighting. """ | |
2876 |
|
2876 | |||
2877 | try: |
|
2877 | try: | |
2878 | filename = get_py_filename(parameter_s) |
|
2878 | filename = get_py_filename(parameter_s) | |
2879 | cont = file_read(filename) |
|
2879 | cont = file_read(filename) | |
2880 | except IOError: |
|
2880 | except IOError: | |
2881 | try: |
|
2881 | try: | |
2882 | cont = eval(parameter_s,self.user_ns) |
|
2882 | cont = eval(parameter_s,self.user_ns) | |
2883 | except NameError: |
|
2883 | except NameError: | |
2884 | cont = None |
|
2884 | cont = None | |
2885 | if cont is None: |
|
2885 | if cont is None: | |
2886 | print "Error: no such file or variable" |
|
2886 | print "Error: no such file or variable" | |
2887 | return |
|
2887 | return | |
2888 |
|
2888 | |||
2889 | page(self.shell.pycolorize(cont), |
|
2889 | page(self.shell.pycolorize(cont), | |
2890 | screen_lines=self.shell.rc.screen_length) |
|
2890 | screen_lines=self.shell.rc.screen_length) | |
2891 |
|
2891 | |||
2892 | def magic_cpaste(self, parameter_s=''): |
|
2892 | def magic_cpaste(self, parameter_s=''): | |
2893 | """Allows you to paste & execute a pre-formatted code block from clipboard |
|
2893 | """Allows you to paste & execute a pre-formatted code block from clipboard | |
2894 |
|
2894 | |||
2895 | You must terminate the block with '--' (two minus-signs) alone on the |
|
2895 | You must terminate the block with '--' (two minus-signs) alone on the | |
2896 | line. You can also provide your own sentinel with '%paste -s %%' ('%%' |
|
2896 | line. You can also provide your own sentinel with '%paste -s %%' ('%%' | |
2897 | is the new sentinel for this operation) |
|
2897 | is the new sentinel for this operation) | |
2898 |
|
2898 | |||
2899 | The block is dedented prior to execution to enable execution of |
|
2899 | The block is dedented prior to execution to enable execution of | |
2900 | method definitions. The executed block is also assigned to variable |
|
2900 | method definitions. The executed block is also assigned to variable | |
2901 | named 'pasted_block' for later editing with '%edit pasted_block'. |
|
2901 | named 'pasted_block' for later editing with '%edit pasted_block'. | |
2902 |
|
2902 | |||
2903 | You can also pass a variable name as an argument, e.g. '%cpaste foo'. |
|
2903 | You can also pass a variable name as an argument, e.g. '%cpaste foo'. | |
2904 | This assigns the pasted block to variable 'foo' as string, without |
|
2904 | This assigns the pasted block to variable 'foo' as string, without | |
2905 | dedenting or executing it. |
|
2905 | dedenting or executing it. | |
2906 |
|
2906 | |||
2907 | Do not be alarmed by garbled output on Windows (it's a readline bug). |
|
2907 | Do not be alarmed by garbled output on Windows (it's a readline bug). | |
2908 | Just press enter and type -- (and press enter again) and the block |
|
2908 | Just press enter and type -- (and press enter again) and the block | |
2909 | will be what was just pasted. |
|
2909 | will be what was just pasted. | |
2910 |
|
2910 | |||
2911 | IPython statements (magics, shell escapes) are not supported (yet). |
|
2911 | IPython statements (magics, shell escapes) are not supported (yet). | |
2912 | """ |
|
2912 | """ | |
2913 | opts,args = self.parse_options(parameter_s,'s:',mode='string') |
|
2913 | opts,args = self.parse_options(parameter_s,'s:',mode='string') | |
2914 | par = args.strip() |
|
2914 | par = args.strip() | |
2915 | sentinel = opts.get('s','--') |
|
2915 | sentinel = opts.get('s','--') | |
2916 |
|
2916 | |||
2917 | from IPython import iplib |
|
2917 | from IPython import iplib | |
2918 | lines = [] |
|
2918 | lines = [] | |
2919 | print "Pasting code; enter '%s' alone on the line to stop." % sentinel |
|
2919 | print "Pasting code; enter '%s' alone on the line to stop." % sentinel | |
2920 | while 1: |
|
2920 | while 1: | |
2921 | l = iplib.raw_input_original(':') |
|
2921 | l = iplib.raw_input_original(':') | |
2922 | if l ==sentinel: |
|
2922 | if l ==sentinel: | |
2923 | break |
|
2923 | break | |
2924 | lines.append(l) |
|
2924 | lines.append(l) | |
2925 | block = "\n".join(lines) + '\n' |
|
2925 | block = "\n".join(lines) + '\n' | |
2926 | #print "block:\n",block |
|
2926 | #print "block:\n",block | |
2927 | if not par: |
|
2927 | if not par: | |
2928 | b = textwrap.dedent(block) |
|
2928 | b = textwrap.dedent(block) | |
2929 | exec b in self.user_ns |
|
2929 | exec b in self.user_ns | |
2930 | self.user_ns['pasted_block'] = b |
|
2930 | self.user_ns['pasted_block'] = b | |
2931 | else: |
|
2931 | else: | |
2932 | self.user_ns[par] = block |
|
2932 | self.user_ns[par] = block | |
2933 | print "Block assigned to '%s'" % par |
|
2933 | print "Block assigned to '%s'" % par | |
2934 |
|
2934 | |||
2935 | def magic_quickref(self,arg): |
|
2935 | def magic_quickref(self,arg): | |
2936 | """ Show a quick reference sheet """ |
|
2936 | """ Show a quick reference sheet """ | |
2937 | import IPython.usage |
|
2937 | import IPython.usage | |
2938 | qr = IPython.usage.quick_reference + self.magic_magic('-brief') |
|
2938 | qr = IPython.usage.quick_reference + self.magic_magic('-brief') | |
2939 |
|
2939 | |||
2940 | page(qr) |
|
2940 | page(qr) | |
2941 |
|
2941 | |||
2942 | def magic_upgrade(self,arg): |
|
2942 | def magic_upgrade(self,arg): | |
2943 | """ Upgrade your IPython installation |
|
2943 | """ Upgrade your IPython installation | |
2944 |
|
2944 | |||
2945 | This will copy the config files that don't yet exist in your |
|
2945 | This will copy the config files that don't yet exist in your | |
2946 | ipython dir from the system config dir. Use this after upgrading |
|
2946 | ipython dir from the system config dir. Use this after upgrading | |
2947 | IPython if you don't wish to delete your .ipython dir. |
|
2947 | IPython if you don't wish to delete your .ipython dir. | |
2948 |
|
2948 | |||
2949 | Call with -nolegacy to get rid of ipythonrc* files (recommended for |
|
2949 | Call with -nolegacy to get rid of ipythonrc* files (recommended for | |
2950 | new users) |
|
2950 | new users) | |
2951 |
|
2951 | |||
2952 | """ |
|
2952 | """ | |
2953 | ip = self.getapi() |
|
2953 | ip = self.getapi() | |
2954 | ipinstallation = path(IPython.__file__).dirname() |
|
2954 | ipinstallation = path(IPython.__file__).dirname() | |
2955 | upgrade_script = '%s "%s"' % (sys.executable,ipinstallation / 'upgrade_dir.py') |
|
2955 | upgrade_script = '%s "%s"' % (sys.executable,ipinstallation / 'upgrade_dir.py') | |
2956 | src_config = ipinstallation / 'UserConfig' |
|
2956 | src_config = ipinstallation / 'UserConfig' | |
2957 | userdir = path(ip.options.ipythondir) |
|
2957 | userdir = path(ip.options.ipythondir) | |
2958 | cmd = '%s "%s" "%s"' % (upgrade_script, src_config, userdir) |
|
2958 | cmd = '%s "%s" "%s"' % (upgrade_script, src_config, userdir) | |
2959 | print ">",cmd |
|
2959 | print ">",cmd | |
2960 | shell(cmd) |
|
2960 | shell(cmd) | |
2961 | if arg == '-nolegacy': |
|
2961 | if arg == '-nolegacy': | |
2962 | legacy = userdir.files('ipythonrc*') |
|
2962 | legacy = userdir.files('ipythonrc*') | |
2963 | print "Nuking legacy files:",legacy |
|
2963 | print "Nuking legacy files:",legacy | |
2964 |
|
2964 | |||
2965 | [p.remove() for p in legacy] |
|
2965 | [p.remove() for p in legacy] | |
2966 | suffix = (sys.platform == 'win32' and '.ini' or '') |
|
2966 | suffix = (sys.platform == 'win32' and '.ini' or '') | |
2967 | (userdir / ('ipythonrc' + suffix)).write_text('# Empty, see ipy_user_conf.py\n') |
|
2967 | (userdir / ('ipythonrc' + suffix)).write_text('# Empty, see ipy_user_conf.py\n') | |
2968 |
|
2968 | |||
2969 |
|
2969 | |||
2970 | # end Magic |
|
2970 | # end Magic |
@@ -1,2315 +1,2320 b'' | |||||
1 | # -*- coding: utf-8 -*- |
|
1 | # -*- coding: utf-8 -*- | |
2 | """ |
|
2 | """ | |
3 | IPython -- An enhanced Interactive Python |
|
3 | IPython -- An enhanced Interactive Python | |
4 |
|
4 | |||
5 | Requires Python 2.3 or newer. |
|
5 | Requires Python 2.3 or newer. | |
6 |
|
6 | |||
7 | This file contains all the classes and helper functions specific to IPython. |
|
7 | This file contains all the classes and helper functions specific to IPython. | |
8 |
|
8 | |||
9 |
$Id: iplib.py 135 |
|
9 | $Id: iplib.py 1355 2006-06-07 16:56:50Z vivainio $ | |
10 | """ |
|
10 | """ | |
11 |
|
11 | |||
12 | #***************************************************************************** |
|
12 | #***************************************************************************** | |
13 | # Copyright (C) 2001 Janko Hauser <jhauser@zscout.de> and |
|
13 | # Copyright (C) 2001 Janko Hauser <jhauser@zscout.de> and | |
14 | # Copyright (C) 2001-2006 Fernando Perez. <fperez@colorado.edu> |
|
14 | # Copyright (C) 2001-2006 Fernando Perez. <fperez@colorado.edu> | |
15 | # |
|
15 | # | |
16 | # Distributed under the terms of the BSD License. The full license is in |
|
16 | # Distributed under the terms of the BSD License. The full license is in | |
17 | # the file COPYING, distributed as part of this software. |
|
17 | # the file COPYING, distributed as part of this software. | |
18 | # |
|
18 | # | |
19 | # Note: this code originally subclassed code.InteractiveConsole from the |
|
19 | # Note: this code originally subclassed code.InteractiveConsole from the | |
20 | # Python standard library. Over time, all of that class has been copied |
|
20 | # Python standard library. Over time, all of that class has been copied | |
21 | # verbatim here for modifications which could not be accomplished by |
|
21 | # verbatim here for modifications which could not be accomplished by | |
22 | # subclassing. At this point, there are no dependencies at all on the code |
|
22 | # subclassing. At this point, there are no dependencies at all on the code | |
23 | # module anymore (it is not even imported). The Python License (sec. 2) |
|
23 | # module anymore (it is not even imported). The Python License (sec. 2) | |
24 | # allows for this, but it's always nice to acknowledge credit where credit is |
|
24 | # allows for this, but it's always nice to acknowledge credit where credit is | |
25 | # due. |
|
25 | # due. | |
26 | #***************************************************************************** |
|
26 | #***************************************************************************** | |
27 |
|
27 | |||
28 | #**************************************************************************** |
|
28 | #**************************************************************************** | |
29 | # Modules and globals |
|
29 | # Modules and globals | |
30 |
|
30 | |||
31 | from IPython import Release |
|
31 | from IPython import Release | |
32 | __author__ = '%s <%s>\n%s <%s>' % \ |
|
32 | __author__ = '%s <%s>\n%s <%s>' % \ | |
33 | ( Release.authors['Janko'] + Release.authors['Fernando'] ) |
|
33 | ( Release.authors['Janko'] + Release.authors['Fernando'] ) | |
34 | __license__ = Release.license |
|
34 | __license__ = Release.license | |
35 | __version__ = Release.version |
|
35 | __version__ = Release.version | |
36 |
|
36 | |||
37 | # Python standard modules |
|
37 | # Python standard modules | |
38 | import __main__ |
|
38 | import __main__ | |
39 | import __builtin__ |
|
39 | import __builtin__ | |
40 | import StringIO |
|
40 | import StringIO | |
41 | import bdb |
|
41 | import bdb | |
42 | import cPickle as pickle |
|
42 | import cPickle as pickle | |
43 | import codeop |
|
43 | import codeop | |
44 | import exceptions |
|
44 | import exceptions | |
45 | import glob |
|
45 | import glob | |
46 | import inspect |
|
46 | import inspect | |
47 | import keyword |
|
47 | import keyword | |
48 | import new |
|
48 | import new | |
49 | import os |
|
49 | import os | |
50 | import pdb |
|
50 | import pdb | |
51 | import pydoc |
|
51 | import pydoc | |
52 | import re |
|
52 | import re | |
53 | import shutil |
|
53 | import shutil | |
54 | import string |
|
54 | import string | |
55 | import sys |
|
55 | import sys | |
56 | import tempfile |
|
56 | import tempfile | |
57 | import traceback |
|
57 | import traceback | |
58 | import types |
|
58 | import types | |
59 | import pickleshare |
|
59 | import pickleshare | |
60 |
|
60 | |||
61 | from pprint import pprint, pformat |
|
61 | from pprint import pprint, pformat | |
62 |
|
62 | |||
63 | # IPython's own modules |
|
63 | # IPython's own modules | |
64 | import IPython |
|
64 | import IPython | |
65 | from IPython import OInspect,PyColorize,ultraTB |
|
65 | from IPython import OInspect,PyColorize,ultraTB | |
66 | from IPython.ColorANSI import ColorScheme,ColorSchemeTable # too long names |
|
66 | from IPython.ColorANSI import ColorScheme,ColorSchemeTable # too long names | |
67 | from IPython.FakeModule import FakeModule |
|
67 | from IPython.FakeModule import FakeModule | |
68 | from IPython.Itpl import Itpl,itpl,printpl,ItplNS,itplns |
|
68 | from IPython.Itpl import Itpl,itpl,printpl,ItplNS,itplns | |
69 | from IPython.Logger import Logger |
|
69 | from IPython.Logger import Logger | |
70 | from IPython.Magic import Magic |
|
70 | from IPython.Magic import Magic | |
71 | from IPython.Prompts import CachedOutput |
|
71 | from IPython.Prompts import CachedOutput | |
72 | from IPython.ipstruct import Struct |
|
72 | from IPython.ipstruct import Struct | |
73 | from IPython.background_jobs import BackgroundJobManager |
|
73 | from IPython.background_jobs import BackgroundJobManager | |
74 | from IPython.usage import cmd_line_usage,interactive_usage |
|
74 | from IPython.usage import cmd_line_usage,interactive_usage | |
75 | from IPython.genutils import * |
|
75 | from IPython.genutils import * | |
76 | import IPython.ipapi |
|
76 | import IPython.ipapi | |
77 |
|
77 | |||
78 | # Globals |
|
78 | # Globals | |
79 |
|
79 | |||
80 | # store the builtin raw_input globally, and use this always, in case user code |
|
80 | # store the builtin raw_input globally, and use this always, in case user code | |
81 | # overwrites it (like wx.py.PyShell does) |
|
81 | # overwrites it (like wx.py.PyShell does) | |
82 | raw_input_original = raw_input |
|
82 | raw_input_original = raw_input | |
83 |
|
83 | |||
84 | # compiled regexps for autoindent management |
|
84 | # compiled regexps for autoindent management | |
85 | dedent_re = re.compile(r'^\s+raise|^\s+return|^\s+pass') |
|
85 | dedent_re = re.compile(r'^\s+raise|^\s+return|^\s+pass') | |
86 |
|
86 | |||
87 |
|
87 | |||
88 | #**************************************************************************** |
|
88 | #**************************************************************************** | |
89 | # Some utility function definitions |
|
89 | # Some utility function definitions | |
90 |
|
90 | |||
91 | ini_spaces_re = re.compile(r'^(\s+)') |
|
91 | ini_spaces_re = re.compile(r'^(\s+)') | |
92 |
|
92 | |||
93 | def num_ini_spaces(strng): |
|
93 | def num_ini_spaces(strng): | |
94 | """Return the number of initial spaces in a string""" |
|
94 | """Return the number of initial spaces in a string""" | |
95 |
|
95 | |||
96 | ini_spaces = ini_spaces_re.match(strng) |
|
96 | ini_spaces = ini_spaces_re.match(strng) | |
97 | if ini_spaces: |
|
97 | if ini_spaces: | |
98 | return ini_spaces.end() |
|
98 | return ini_spaces.end() | |
99 | else: |
|
99 | else: | |
100 | return 0 |
|
100 | return 0 | |
101 |
|
101 | |||
102 | def softspace(file, newvalue): |
|
102 | def softspace(file, newvalue): | |
103 | """Copied from code.py, to remove the dependency""" |
|
103 | """Copied from code.py, to remove the dependency""" | |
104 |
|
104 | |||
105 | oldvalue = 0 |
|
105 | oldvalue = 0 | |
106 | try: |
|
106 | try: | |
107 | oldvalue = file.softspace |
|
107 | oldvalue = file.softspace | |
108 | except AttributeError: |
|
108 | except AttributeError: | |
109 | pass |
|
109 | pass | |
110 | try: |
|
110 | try: | |
111 | file.softspace = newvalue |
|
111 | file.softspace = newvalue | |
112 | except (AttributeError, TypeError): |
|
112 | except (AttributeError, TypeError): | |
113 | # "attribute-less object" or "read-only attributes" |
|
113 | # "attribute-less object" or "read-only attributes" | |
114 | pass |
|
114 | pass | |
115 | return oldvalue |
|
115 | return oldvalue | |
116 |
|
116 | |||
117 |
|
117 | |||
118 | #**************************************************************************** |
|
118 | #**************************************************************************** | |
119 | # Local use exceptions |
|
119 | # Local use exceptions | |
120 | class SpaceInInput(exceptions.Exception): pass |
|
120 | class SpaceInInput(exceptions.Exception): pass | |
121 |
|
121 | |||
122 |
|
122 | |||
123 | #**************************************************************************** |
|
123 | #**************************************************************************** | |
124 | # Local use classes |
|
124 | # Local use classes | |
125 | class Bunch: pass |
|
125 | class Bunch: pass | |
126 |
|
126 | |||
127 | class Undefined: pass |
|
127 | class Undefined: pass | |
128 |
|
128 | |||
129 | class InputList(list): |
|
129 | class InputList(list): | |
130 | """Class to store user input. |
|
130 | """Class to store user input. | |
131 |
|
131 | |||
132 | It's basically a list, but slices return a string instead of a list, thus |
|
132 | It's basically a list, but slices return a string instead of a list, thus | |
133 | allowing things like (assuming 'In' is an instance): |
|
133 | allowing things like (assuming 'In' is an instance): | |
134 |
|
134 | |||
135 | exec In[4:7] |
|
135 | exec In[4:7] | |
136 |
|
136 | |||
137 | or |
|
137 | or | |
138 |
|
138 | |||
139 | exec In[5:9] + In[14] + In[21:25]""" |
|
139 | exec In[5:9] + In[14] + In[21:25]""" | |
140 |
|
140 | |||
141 | def __getslice__(self,i,j): |
|
141 | def __getslice__(self,i,j): | |
142 | return ''.join(list.__getslice__(self,i,j)) |
|
142 | return ''.join(list.__getslice__(self,i,j)) | |
143 |
|
143 | |||
144 | class SyntaxTB(ultraTB.ListTB): |
|
144 | class SyntaxTB(ultraTB.ListTB): | |
145 | """Extension which holds some state: the last exception value""" |
|
145 | """Extension which holds some state: the last exception value""" | |
146 |
|
146 | |||
147 | def __init__(self,color_scheme = 'NoColor'): |
|
147 | def __init__(self,color_scheme = 'NoColor'): | |
148 | ultraTB.ListTB.__init__(self,color_scheme) |
|
148 | ultraTB.ListTB.__init__(self,color_scheme) | |
149 | self.last_syntax_error = None |
|
149 | self.last_syntax_error = None | |
150 |
|
150 | |||
151 | def __call__(self, etype, value, elist): |
|
151 | def __call__(self, etype, value, elist): | |
152 | self.last_syntax_error = value |
|
152 | self.last_syntax_error = value | |
153 | ultraTB.ListTB.__call__(self,etype,value,elist) |
|
153 | ultraTB.ListTB.__call__(self,etype,value,elist) | |
154 |
|
154 | |||
155 | def clear_err_state(self): |
|
155 | def clear_err_state(self): | |
156 | """Return the current error state and clear it""" |
|
156 | """Return the current error state and clear it""" | |
157 | e = self.last_syntax_error |
|
157 | e = self.last_syntax_error | |
158 | self.last_syntax_error = None |
|
158 | self.last_syntax_error = None | |
159 | return e |
|
159 | return e | |
160 |
|
160 | |||
161 | #**************************************************************************** |
|
161 | #**************************************************************************** | |
162 | # Main IPython class |
|
162 | # Main IPython class | |
163 |
|
163 | |||
164 | # FIXME: the Magic class is a mixin for now, and will unfortunately remain so |
|
164 | # FIXME: the Magic class is a mixin for now, and will unfortunately remain so | |
165 | # until a full rewrite is made. I've cleaned all cross-class uses of |
|
165 | # until a full rewrite is made. I've cleaned all cross-class uses of | |
166 | # attributes and methods, but too much user code out there relies on the |
|
166 | # attributes and methods, but too much user code out there relies on the | |
167 | # equlity %foo == __IP.magic_foo, so I can't actually remove the mixin usage. |
|
167 | # equlity %foo == __IP.magic_foo, so I can't actually remove the mixin usage. | |
168 | # |
|
168 | # | |
169 | # But at least now, all the pieces have been separated and we could, in |
|
169 | # But at least now, all the pieces have been separated and we could, in | |
170 | # principle, stop using the mixin. This will ease the transition to the |
|
170 | # principle, stop using the mixin. This will ease the transition to the | |
171 | # chainsaw branch. |
|
171 | # chainsaw branch. | |
172 |
|
172 | |||
173 | # For reference, the following is the list of 'self.foo' uses in the Magic |
|
173 | # For reference, the following is the list of 'self.foo' uses in the Magic | |
174 | # class as of 2005-12-28. These are names we CAN'T use in the main ipython |
|
174 | # class as of 2005-12-28. These are names we CAN'T use in the main ipython | |
175 | # class, to prevent clashes. |
|
175 | # class, to prevent clashes. | |
176 |
|
176 | |||
177 | # ['self.__class__', 'self.__dict__', 'self._inspect', 'self._ofind', |
|
177 | # ['self.__class__', 'self.__dict__', 'self._inspect', 'self._ofind', | |
178 | # 'self.arg_err', 'self.extract_input', 'self.format_', 'self.lsmagic', |
|
178 | # 'self.arg_err', 'self.extract_input', 'self.format_', 'self.lsmagic', | |
179 | # 'self.magic_', 'self.options_table', 'self.parse', 'self.shell', |
|
179 | # 'self.magic_', 'self.options_table', 'self.parse', 'self.shell', | |
180 | # 'self.value'] |
|
180 | # 'self.value'] | |
181 |
|
181 | |||
182 | class InteractiveShell(object,Magic): |
|
182 | class InteractiveShell(object,Magic): | |
183 | """An enhanced console for Python.""" |
|
183 | """An enhanced console for Python.""" | |
184 |
|
184 | |||
185 | # class attribute to indicate whether the class supports threads or not. |
|
185 | # class attribute to indicate whether the class supports threads or not. | |
186 | # Subclasses with thread support should override this as needed. |
|
186 | # Subclasses with thread support should override this as needed. | |
187 | isthreaded = False |
|
187 | isthreaded = False | |
188 |
|
188 | |||
189 | def __init__(self,name,usage=None,rc=Struct(opts=None,args=None), |
|
189 | def __init__(self,name,usage=None,rc=Struct(opts=None,args=None), | |
190 | user_ns = None,user_global_ns=None,banner2='', |
|
190 | user_ns = None,user_global_ns=None,banner2='', | |
191 | custom_exceptions=((),None),embedded=False): |
|
191 | custom_exceptions=((),None),embedded=False): | |
192 |
|
192 | |||
193 | # log system |
|
193 | # log system | |
194 | self.logger = Logger(self,logfname='ipython_log.py',logmode='rotate') |
|
194 | self.logger = Logger(self,logfname='ipython_log.py',logmode='rotate') | |
195 |
|
195 | |||
196 | # some minimal strict typechecks. For some core data structures, I |
|
196 | # some minimal strict typechecks. For some core data structures, I | |
197 | # want actual basic python types, not just anything that looks like |
|
197 | # want actual basic python types, not just anything that looks like | |
198 | # one. This is especially true for namespaces. |
|
198 | # one. This is especially true for namespaces. | |
199 | for ns in (user_ns,user_global_ns): |
|
199 | for ns in (user_ns,user_global_ns): | |
200 | if ns is not None and type(ns) != types.DictType: |
|
200 | if ns is not None and type(ns) != types.DictType: | |
201 | raise TypeError,'namespace must be a dictionary' |
|
201 | raise TypeError,'namespace must be a dictionary' | |
202 |
|
202 | |||
203 | # Job manager (for jobs run as background threads) |
|
203 | # Job manager (for jobs run as background threads) | |
204 | self.jobs = BackgroundJobManager() |
|
204 | self.jobs = BackgroundJobManager() | |
205 |
|
205 | |||
206 | # Store the actual shell's name |
|
206 | # Store the actual shell's name | |
207 | self.name = name |
|
207 | self.name = name | |
208 |
|
208 | |||
209 | # We need to know whether the instance is meant for embedding, since |
|
209 | # We need to know whether the instance is meant for embedding, since | |
210 | # global/local namespaces need to be handled differently in that case |
|
210 | # global/local namespaces need to be handled differently in that case | |
211 | self.embedded = embedded |
|
211 | self.embedded = embedded | |
212 |
|
212 | |||
213 | # command compiler |
|
213 | # command compiler | |
214 | self.compile = codeop.CommandCompiler() |
|
214 | self.compile = codeop.CommandCompiler() | |
215 |
|
215 | |||
216 | # User input buffer |
|
216 | # User input buffer | |
217 | self.buffer = [] |
|
217 | self.buffer = [] | |
218 |
|
218 | |||
219 | # Default name given in compilation of code |
|
219 | # Default name given in compilation of code | |
220 | self.filename = '<ipython console>' |
|
220 | self.filename = '<ipython console>' | |
221 |
|
221 | |||
222 | # Make an empty namespace, which extension writers can rely on both |
|
222 | # Make an empty namespace, which extension writers can rely on both | |
223 | # existing and NEVER being used by ipython itself. This gives them a |
|
223 | # existing and NEVER being used by ipython itself. This gives them a | |
224 | # convenient location for storing additional information and state |
|
224 | # convenient location for storing additional information and state | |
225 | # their extensions may require, without fear of collisions with other |
|
225 | # their extensions may require, without fear of collisions with other | |
226 | # ipython names that may develop later. |
|
226 | # ipython names that may develop later. | |
227 | self.meta = Struct() |
|
227 | self.meta = Struct() | |
228 |
|
228 | |||
229 | # Create the namespace where the user will operate. user_ns is |
|
229 | # Create the namespace where the user will operate. user_ns is | |
230 | # normally the only one used, and it is passed to the exec calls as |
|
230 | # normally the only one used, and it is passed to the exec calls as | |
231 | # the locals argument. But we do carry a user_global_ns namespace |
|
231 | # the locals argument. But we do carry a user_global_ns namespace | |
232 | # given as the exec 'globals' argument, This is useful in embedding |
|
232 | # given as the exec 'globals' argument, This is useful in embedding | |
233 | # situations where the ipython shell opens in a context where the |
|
233 | # situations where the ipython shell opens in a context where the | |
234 | # distinction between locals and globals is meaningful. |
|
234 | # distinction between locals and globals is meaningful. | |
235 |
|
235 | |||
236 | # FIXME. For some strange reason, __builtins__ is showing up at user |
|
236 | # FIXME. For some strange reason, __builtins__ is showing up at user | |
237 | # level as a dict instead of a module. This is a manual fix, but I |
|
237 | # level as a dict instead of a module. This is a manual fix, but I | |
238 | # should really track down where the problem is coming from. Alex |
|
238 | # should really track down where the problem is coming from. Alex | |
239 | # Schmolck reported this problem first. |
|
239 | # Schmolck reported this problem first. | |
240 |
|
240 | |||
241 | # A useful post by Alex Martelli on this topic: |
|
241 | # A useful post by Alex Martelli on this topic: | |
242 | # Re: inconsistent value from __builtins__ |
|
242 | # Re: inconsistent value from __builtins__ | |
243 | # Von: Alex Martelli <aleaxit@yahoo.com> |
|
243 | # Von: Alex Martelli <aleaxit@yahoo.com> | |
244 | # Datum: Freitag 01 Oktober 2004 04:45:34 nachmittags/abends |
|
244 | # Datum: Freitag 01 Oktober 2004 04:45:34 nachmittags/abends | |
245 | # Gruppen: comp.lang.python |
|
245 | # Gruppen: comp.lang.python | |
246 |
|
246 | |||
247 | # Michael Hohn <hohn@hooknose.lbl.gov> wrote: |
|
247 | # Michael Hohn <hohn@hooknose.lbl.gov> wrote: | |
248 | # > >>> print type(builtin_check.get_global_binding('__builtins__')) |
|
248 | # > >>> print type(builtin_check.get_global_binding('__builtins__')) | |
249 | # > <type 'dict'> |
|
249 | # > <type 'dict'> | |
250 | # > >>> print type(__builtins__) |
|
250 | # > >>> print type(__builtins__) | |
251 | # > <type 'module'> |
|
251 | # > <type 'module'> | |
252 | # > Is this difference in return value intentional? |
|
252 | # > Is this difference in return value intentional? | |
253 |
|
253 | |||
254 | # Well, it's documented that '__builtins__' can be either a dictionary |
|
254 | # Well, it's documented that '__builtins__' can be either a dictionary | |
255 | # or a module, and it's been that way for a long time. Whether it's |
|
255 | # or a module, and it's been that way for a long time. Whether it's | |
256 | # intentional (or sensible), I don't know. In any case, the idea is |
|
256 | # intentional (or sensible), I don't know. In any case, the idea is | |
257 | # that if you need to access the built-in namespace directly, you |
|
257 | # that if you need to access the built-in namespace directly, you | |
258 | # should start with "import __builtin__" (note, no 's') which will |
|
258 | # should start with "import __builtin__" (note, no 's') which will | |
259 | # definitely give you a module. Yeah, it's somewhat confusing:-(. |
|
259 | # definitely give you a module. Yeah, it's somewhat confusing:-(. | |
260 |
|
260 | |||
261 | # These routines return properly built dicts as needed by the rest of |
|
261 | # These routines return properly built dicts as needed by the rest of | |
262 | # the code, and can also be used by extension writers to generate |
|
262 | # the code, and can also be used by extension writers to generate | |
263 | # properly initialized namespaces. |
|
263 | # properly initialized namespaces. | |
264 | user_ns = IPython.ipapi.make_user_ns(user_ns) |
|
264 | user_ns = IPython.ipapi.make_user_ns(user_ns) | |
265 | user_global_ns = IPython.ipapi.make_user_global_ns(user_global_ns) |
|
265 | user_global_ns = IPython.ipapi.make_user_global_ns(user_global_ns) | |
266 |
|
266 | |||
267 | # Assign namespaces |
|
267 | # Assign namespaces | |
268 | # This is the namespace where all normal user variables live |
|
268 | # This is the namespace where all normal user variables live | |
269 | self.user_ns = user_ns |
|
269 | self.user_ns = user_ns | |
270 | # Embedded instances require a separate namespace for globals. |
|
270 | # Embedded instances require a separate namespace for globals. | |
271 | # Normally this one is unused by non-embedded instances. |
|
271 | # Normally this one is unused by non-embedded instances. | |
272 | self.user_global_ns = user_global_ns |
|
272 | self.user_global_ns = user_global_ns | |
273 | # A namespace to keep track of internal data structures to prevent |
|
273 | # A namespace to keep track of internal data structures to prevent | |
274 | # them from cluttering user-visible stuff. Will be updated later |
|
274 | # them from cluttering user-visible stuff. Will be updated later | |
275 | self.internal_ns = {} |
|
275 | self.internal_ns = {} | |
276 |
|
276 | |||
277 | # Namespace of system aliases. Each entry in the alias |
|
277 | # Namespace of system aliases. Each entry in the alias | |
278 | # table must be a 2-tuple of the form (N,name), where N is the number |
|
278 | # table must be a 2-tuple of the form (N,name), where N is the number | |
279 | # of positional arguments of the alias. |
|
279 | # of positional arguments of the alias. | |
280 | self.alias_table = {} |
|
280 | self.alias_table = {} | |
281 |
|
281 | |||
282 | # A table holding all the namespaces IPython deals with, so that |
|
282 | # A table holding all the namespaces IPython deals with, so that | |
283 | # introspection facilities can search easily. |
|
283 | # introspection facilities can search easily. | |
284 | self.ns_table = {'user':user_ns, |
|
284 | self.ns_table = {'user':user_ns, | |
285 | 'user_global':user_global_ns, |
|
285 | 'user_global':user_global_ns, | |
286 | 'alias':self.alias_table, |
|
286 | 'alias':self.alias_table, | |
287 | 'internal':self.internal_ns, |
|
287 | 'internal':self.internal_ns, | |
288 | 'builtin':__builtin__.__dict__ |
|
288 | 'builtin':__builtin__.__dict__ | |
289 | } |
|
289 | } | |
290 |
|
290 | |||
291 | # The user namespace MUST have a pointer to the shell itself. |
|
291 | # The user namespace MUST have a pointer to the shell itself. | |
292 | self.user_ns[name] = self |
|
292 | self.user_ns[name] = self | |
293 |
|
293 | |||
294 | # We need to insert into sys.modules something that looks like a |
|
294 | # We need to insert into sys.modules something that looks like a | |
295 | # module but which accesses the IPython namespace, for shelve and |
|
295 | # module but which accesses the IPython namespace, for shelve and | |
296 | # pickle to work interactively. Normally they rely on getting |
|
296 | # pickle to work interactively. Normally they rely on getting | |
297 | # everything out of __main__, but for embedding purposes each IPython |
|
297 | # everything out of __main__, but for embedding purposes each IPython | |
298 | # instance has its own private namespace, so we can't go shoving |
|
298 | # instance has its own private namespace, so we can't go shoving | |
299 | # everything into __main__. |
|
299 | # everything into __main__. | |
300 |
|
300 | |||
301 | # note, however, that we should only do this for non-embedded |
|
301 | # note, however, that we should only do this for non-embedded | |
302 | # ipythons, which really mimic the __main__.__dict__ with their own |
|
302 | # ipythons, which really mimic the __main__.__dict__ with their own | |
303 | # namespace. Embedded instances, on the other hand, should not do |
|
303 | # namespace. Embedded instances, on the other hand, should not do | |
304 | # this because they need to manage the user local/global namespaces |
|
304 | # this because they need to manage the user local/global namespaces | |
305 | # only, but they live within a 'normal' __main__ (meaning, they |
|
305 | # only, but they live within a 'normal' __main__ (meaning, they | |
306 | # shouldn't overtake the execution environment of the script they're |
|
306 | # shouldn't overtake the execution environment of the script they're | |
307 | # embedded in). |
|
307 | # embedded in). | |
308 |
|
308 | |||
309 | if not embedded: |
|
309 | if not embedded: | |
310 | try: |
|
310 | try: | |
311 | main_name = self.user_ns['__name__'] |
|
311 | main_name = self.user_ns['__name__'] | |
312 | except KeyError: |
|
312 | except KeyError: | |
313 | raise KeyError,'user_ns dictionary MUST have a "__name__" key' |
|
313 | raise KeyError,'user_ns dictionary MUST have a "__name__" key' | |
314 | else: |
|
314 | else: | |
315 | #print "pickle hack in place" # dbg |
|
315 | #print "pickle hack in place" # dbg | |
316 | #print 'main_name:',main_name # dbg |
|
316 | #print 'main_name:',main_name # dbg | |
317 | sys.modules[main_name] = FakeModule(self.user_ns) |
|
317 | sys.modules[main_name] = FakeModule(self.user_ns) | |
318 |
|
318 | |||
319 | # List of input with multi-line handling. |
|
319 | # List of input with multi-line handling. | |
320 | # Fill its zero entry, user counter starts at 1 |
|
320 | # Fill its zero entry, user counter starts at 1 | |
321 | self.input_hist = InputList(['\n']) |
|
321 | self.input_hist = InputList(['\n']) | |
322 | # This one will hold the 'raw' input history, without any |
|
322 | # This one will hold the 'raw' input history, without any | |
323 | # pre-processing. This will allow users to retrieve the input just as |
|
323 | # pre-processing. This will allow users to retrieve the input just as | |
324 | # it was exactly typed in by the user, with %hist -r. |
|
324 | # it was exactly typed in by the user, with %hist -r. | |
325 | self.input_hist_raw = InputList(['\n']) |
|
325 | self.input_hist_raw = InputList(['\n']) | |
326 |
|
326 | |||
327 | # list of visited directories |
|
327 | # list of visited directories | |
328 | try: |
|
328 | try: | |
329 | self.dir_hist = [os.getcwd()] |
|
329 | self.dir_hist = [os.getcwd()] | |
330 | except IOError, e: |
|
330 | except IOError, e: | |
331 | self.dir_hist = [] |
|
331 | self.dir_hist = [] | |
332 |
|
332 | |||
333 | # dict of output history |
|
333 | # dict of output history | |
334 | self.output_hist = {} |
|
334 | self.output_hist = {} | |
335 |
|
335 | |||
336 | # dict of things NOT to alias (keywords, builtins and some magics) |
|
336 | # dict of things NOT to alias (keywords, builtins and some magics) | |
337 | no_alias = {} |
|
337 | no_alias = {} | |
338 | no_alias_magics = ['cd','popd','pushd','dhist','alias','unalias'] |
|
338 | no_alias_magics = ['cd','popd','pushd','dhist','alias','unalias'] | |
339 | for key in keyword.kwlist + no_alias_magics: |
|
339 | for key in keyword.kwlist + no_alias_magics: | |
340 | no_alias[key] = 1 |
|
340 | no_alias[key] = 1 | |
341 | no_alias.update(__builtin__.__dict__) |
|
341 | no_alias.update(__builtin__.__dict__) | |
342 | self.no_alias = no_alias |
|
342 | self.no_alias = no_alias | |
343 |
|
343 | |||
344 | # make global variables for user access to these |
|
344 | # make global variables for user access to these | |
345 | self.user_ns['_ih'] = self.input_hist |
|
345 | self.user_ns['_ih'] = self.input_hist | |
346 | self.user_ns['_oh'] = self.output_hist |
|
346 | self.user_ns['_oh'] = self.output_hist | |
347 | self.user_ns['_dh'] = self.dir_hist |
|
347 | self.user_ns['_dh'] = self.dir_hist | |
348 |
|
348 | |||
349 | # user aliases to input and output histories |
|
349 | # user aliases to input and output histories | |
350 | self.user_ns['In'] = self.input_hist |
|
350 | self.user_ns['In'] = self.input_hist | |
351 | self.user_ns['Out'] = self.output_hist |
|
351 | self.user_ns['Out'] = self.output_hist | |
352 |
|
352 | |||
353 | # Object variable to store code object waiting execution. This is |
|
353 | # Object variable to store code object waiting execution. This is | |
354 | # used mainly by the multithreaded shells, but it can come in handy in |
|
354 | # used mainly by the multithreaded shells, but it can come in handy in | |
355 | # other situations. No need to use a Queue here, since it's a single |
|
355 | # other situations. No need to use a Queue here, since it's a single | |
356 | # item which gets cleared once run. |
|
356 | # item which gets cleared once run. | |
357 | self.code_to_run = None |
|
357 | self.code_to_run = None | |
358 |
|
358 | |||
359 | # escapes for automatic behavior on the command line |
|
359 | # escapes for automatic behavior on the command line | |
360 | self.ESC_SHELL = '!' |
|
360 | self.ESC_SHELL = '!' | |
361 | self.ESC_HELP = '?' |
|
361 | self.ESC_HELP = '?' | |
362 | self.ESC_MAGIC = '%' |
|
362 | self.ESC_MAGIC = '%' | |
363 | self.ESC_QUOTE = ',' |
|
363 | self.ESC_QUOTE = ',' | |
364 | self.ESC_QUOTE2 = ';' |
|
364 | self.ESC_QUOTE2 = ';' | |
365 | self.ESC_PAREN = '/' |
|
365 | self.ESC_PAREN = '/' | |
366 |
|
366 | |||
367 | # And their associated handlers |
|
367 | # And their associated handlers | |
368 | self.esc_handlers = {self.ESC_PAREN : self.handle_auto, |
|
368 | self.esc_handlers = {self.ESC_PAREN : self.handle_auto, | |
369 | self.ESC_QUOTE : self.handle_auto, |
|
369 | self.ESC_QUOTE : self.handle_auto, | |
370 | self.ESC_QUOTE2 : self.handle_auto, |
|
370 | self.ESC_QUOTE2 : self.handle_auto, | |
371 | self.ESC_MAGIC : self.handle_magic, |
|
371 | self.ESC_MAGIC : self.handle_magic, | |
372 | self.ESC_HELP : self.handle_help, |
|
372 | self.ESC_HELP : self.handle_help, | |
373 | self.ESC_SHELL : self.handle_shell_escape, |
|
373 | self.ESC_SHELL : self.handle_shell_escape, | |
374 | } |
|
374 | } | |
375 |
|
375 | |||
376 | # class initializations |
|
376 | # class initializations | |
377 | Magic.__init__(self,self) |
|
377 | Magic.__init__(self,self) | |
378 |
|
378 | |||
379 | # Python source parser/formatter for syntax highlighting |
|
379 | # Python source parser/formatter for syntax highlighting | |
380 | pyformat = PyColorize.Parser().format |
|
380 | pyformat = PyColorize.Parser().format | |
381 | self.pycolorize = lambda src: pyformat(src,'str',self.rc['colors']) |
|
381 | self.pycolorize = lambda src: pyformat(src,'str',self.rc['colors']) | |
382 |
|
382 | |||
383 | # hooks holds pointers used for user-side customizations |
|
383 | # hooks holds pointers used for user-side customizations | |
384 | self.hooks = Struct() |
|
384 | self.hooks = Struct() | |
385 |
|
385 | |||
386 | # Set all default hooks, defined in the IPython.hooks module. |
|
386 | # Set all default hooks, defined in the IPython.hooks module. | |
387 | hooks = IPython.hooks |
|
387 | hooks = IPython.hooks | |
388 | for hook_name in hooks.__all__: |
|
388 | for hook_name in hooks.__all__: | |
389 | # default hooks have priority 100, i.e. low; user hooks should have 0-100 priority |
|
389 | # default hooks have priority 100, i.e. low; user hooks should have 0-100 priority | |
390 | self.set_hook(hook_name,getattr(hooks,hook_name), 100) |
|
390 | self.set_hook(hook_name,getattr(hooks,hook_name), 100) | |
391 | #print "bound hook",hook_name |
|
391 | #print "bound hook",hook_name | |
392 |
|
392 | |||
393 | # Flag to mark unconditional exit |
|
393 | # Flag to mark unconditional exit | |
394 | self.exit_now = False |
|
394 | self.exit_now = False | |
395 |
|
395 | |||
396 | self.usage_min = """\ |
|
396 | self.usage_min = """\ | |
397 | An enhanced console for Python. |
|
397 | An enhanced console for Python. | |
398 | Some of its features are: |
|
398 | Some of its features are: | |
399 | - Readline support if the readline library is present. |
|
399 | - Readline support if the readline library is present. | |
400 | - Tab completion in the local namespace. |
|
400 | - Tab completion in the local namespace. | |
401 | - Logging of input, see command-line options. |
|
401 | - Logging of input, see command-line options. | |
402 | - System shell escape via ! , eg !ls. |
|
402 | - System shell escape via ! , eg !ls. | |
403 | - Magic commands, starting with a % (like %ls, %pwd, %cd, etc.) |
|
403 | - Magic commands, starting with a % (like %ls, %pwd, %cd, etc.) | |
404 | - Keeps track of locally defined variables via %who, %whos. |
|
404 | - Keeps track of locally defined variables via %who, %whos. | |
405 | - Show object information with a ? eg ?x or x? (use ?? for more info). |
|
405 | - Show object information with a ? eg ?x or x? (use ?? for more info). | |
406 | """ |
|
406 | """ | |
407 | if usage: self.usage = usage |
|
407 | if usage: self.usage = usage | |
408 | else: self.usage = self.usage_min |
|
408 | else: self.usage = self.usage_min | |
409 |
|
409 | |||
410 | # Storage |
|
410 | # Storage | |
411 | self.rc = rc # This will hold all configuration information |
|
411 | self.rc = rc # This will hold all configuration information | |
412 | self.pager = 'less' |
|
412 | self.pager = 'less' | |
413 | # temporary files used for various purposes. Deleted at exit. |
|
413 | # temporary files used for various purposes. Deleted at exit. | |
414 | self.tempfiles = [] |
|
414 | self.tempfiles = [] | |
415 |
|
415 | |||
416 | # Keep track of readline usage (later set by init_readline) |
|
416 | # Keep track of readline usage (later set by init_readline) | |
417 | self.has_readline = False |
|
417 | self.has_readline = False | |
418 |
|
418 | |||
419 | # template for logfile headers. It gets resolved at runtime by the |
|
419 | # template for logfile headers. It gets resolved at runtime by the | |
420 | # logstart method. |
|
420 | # logstart method. | |
421 | self.loghead_tpl = \ |
|
421 | self.loghead_tpl = \ | |
422 | """#log# Automatic Logger file. *** THIS MUST BE THE FIRST LINE *** |
|
422 | """#log# Automatic Logger file. *** THIS MUST BE THE FIRST LINE *** | |
423 | #log# DO NOT CHANGE THIS LINE OR THE TWO BELOW |
|
423 | #log# DO NOT CHANGE THIS LINE OR THE TWO BELOW | |
424 | #log# opts = %s |
|
424 | #log# opts = %s | |
425 | #log# args = %s |
|
425 | #log# args = %s | |
426 | #log# It is safe to make manual edits below here. |
|
426 | #log# It is safe to make manual edits below here. | |
427 | #log#----------------------------------------------------------------------- |
|
427 | #log#----------------------------------------------------------------------- | |
428 | """ |
|
428 | """ | |
429 | # for pushd/popd management |
|
429 | # for pushd/popd management | |
430 | try: |
|
430 | try: | |
431 | self.home_dir = get_home_dir() |
|
431 | self.home_dir = get_home_dir() | |
432 | except HomeDirError,msg: |
|
432 | except HomeDirError,msg: | |
433 | fatal(msg) |
|
433 | fatal(msg) | |
434 |
|
434 | |||
435 | self.dir_stack = [os.getcwd().replace(self.home_dir,'~')] |
|
435 | self.dir_stack = [os.getcwd().replace(self.home_dir,'~')] | |
436 |
|
436 | |||
437 | # Functions to call the underlying shell. |
|
437 | # Functions to call the underlying shell. | |
438 |
|
438 | |||
439 | # utility to expand user variables via Itpl |
|
439 | # utility to expand user variables via Itpl | |
440 | self.var_expand = lambda cmd: str(ItplNS(cmd.replace('#','\#'), |
|
440 | self.var_expand = lambda cmd: str(ItplNS(cmd.replace('#','\#'), | |
441 | self.user_ns)) |
|
441 | self.user_ns)) | |
442 | # The first is similar to os.system, but it doesn't return a value, |
|
442 | # The first is similar to os.system, but it doesn't return a value, | |
443 | # and it allows interpolation of variables in the user's namespace. |
|
443 | # and it allows interpolation of variables in the user's namespace. | |
444 | self.system = lambda cmd: shell(self.var_expand(cmd), |
|
444 | self.system = lambda cmd: shell(self.var_expand(cmd), | |
445 | header='IPython system call: ', |
|
445 | header='IPython system call: ', | |
446 | verbose=self.rc.system_verbose) |
|
446 | verbose=self.rc.system_verbose) | |
447 | # These are for getoutput and getoutputerror: |
|
447 | # These are for getoutput and getoutputerror: | |
448 | self.getoutput = lambda cmd: \ |
|
448 | self.getoutput = lambda cmd: \ | |
449 | getoutput(self.var_expand(cmd), |
|
449 | getoutput(self.var_expand(cmd), | |
450 | header='IPython system call: ', |
|
450 | header='IPython system call: ', | |
451 | verbose=self.rc.system_verbose) |
|
451 | verbose=self.rc.system_verbose) | |
452 | self.getoutputerror = lambda cmd: \ |
|
452 | self.getoutputerror = lambda cmd: \ | |
453 | getoutputerror(self.var_expand(cmd), |
|
453 | getoutputerror(self.var_expand(cmd), | |
454 | header='IPython system call: ', |
|
454 | header='IPython system call: ', | |
455 | verbose=self.rc.system_verbose) |
|
455 | verbose=self.rc.system_verbose) | |
456 |
|
456 | |||
457 | # RegExp for splitting line contents into pre-char//first |
|
457 | # RegExp for splitting line contents into pre-char//first | |
458 | # word-method//rest. For clarity, each group in on one line. |
|
458 | # word-method//rest. For clarity, each group in on one line. | |
459 |
|
459 | |||
460 | # WARNING: update the regexp if the above escapes are changed, as they |
|
460 | # WARNING: update the regexp if the above escapes are changed, as they | |
461 | # are hardwired in. |
|
461 | # are hardwired in. | |
462 |
|
462 | |||
463 | # Don't get carried away with trying to make the autocalling catch too |
|
463 | # Don't get carried away with trying to make the autocalling catch too | |
464 | # much: it's better to be conservative rather than to trigger hidden |
|
464 | # much: it's better to be conservative rather than to trigger hidden | |
465 | # evals() somewhere and end up causing side effects. |
|
465 | # evals() somewhere and end up causing side effects. | |
466 |
|
466 | |||
467 | self.line_split = re.compile(r'^([\s*,;/])' |
|
467 | self.line_split = re.compile(r'^([\s*,;/])' | |
468 | r'([\?\w\.]+\w*\s*)' |
|
468 | r'([\?\w\.]+\w*\s*)' | |
469 | r'(\(?.*$)') |
|
469 | r'(\(?.*$)') | |
470 |
|
470 | |||
471 | # Original re, keep around for a while in case changes break something |
|
471 | # Original re, keep around for a while in case changes break something | |
472 | #self.line_split = re.compile(r'(^[\s*!\?%,/]?)' |
|
472 | #self.line_split = re.compile(r'(^[\s*!\?%,/]?)' | |
473 | # r'(\s*[\?\w\.]+\w*\s*)' |
|
473 | # r'(\s*[\?\w\.]+\w*\s*)' | |
474 | # r'(\(?.*$)') |
|
474 | # r'(\(?.*$)') | |
475 |
|
475 | |||
476 | # RegExp to identify potential function names |
|
476 | # RegExp to identify potential function names | |
477 | self.re_fun_name = re.compile(r'[a-zA-Z_]([a-zA-Z0-9_.]*) *$') |
|
477 | self.re_fun_name = re.compile(r'[a-zA-Z_]([a-zA-Z0-9_.]*) *$') | |
478 |
|
478 | |||
479 | # RegExp to exclude strings with this start from autocalling. In |
|
479 | # RegExp to exclude strings with this start from autocalling. In | |
480 | # particular, all binary operators should be excluded, so that if foo |
|
480 | # particular, all binary operators should be excluded, so that if foo | |
481 | # is callable, foo OP bar doesn't become foo(OP bar), which is |
|
481 | # is callable, foo OP bar doesn't become foo(OP bar), which is | |
482 | # invalid. The characters '!=()' don't need to be checked for, as the |
|
482 | # invalid. The characters '!=()' don't need to be checked for, as the | |
483 | # _prefilter routine explicitely does so, to catch direct calls and |
|
483 | # _prefilter routine explicitely does so, to catch direct calls and | |
484 | # rebindings of existing names. |
|
484 | # rebindings of existing names. | |
485 |
|
485 | |||
486 | # Warning: the '-' HAS TO BE AT THE END of the first group, otherwise |
|
486 | # Warning: the '-' HAS TO BE AT THE END of the first group, otherwise | |
487 | # it affects the rest of the group in square brackets. |
|
487 | # it affects the rest of the group in square brackets. | |
488 | self.re_exclude_auto = re.compile(r'^[<>,&^\|\*/\+-]' |
|
488 | self.re_exclude_auto = re.compile(r'^[<>,&^\|\*/\+-]' | |
489 | '|^is |^not |^in |^and |^or ') |
|
489 | '|^is |^not |^in |^and |^or ') | |
490 |
|
490 | |||
491 | # try to catch also methods for stuff in lists/tuples/dicts: off |
|
491 | # try to catch also methods for stuff in lists/tuples/dicts: off | |
492 | # (experimental). For this to work, the line_split regexp would need |
|
492 | # (experimental). For this to work, the line_split regexp would need | |
493 | # to be modified so it wouldn't break things at '['. That line is |
|
493 | # to be modified so it wouldn't break things at '['. That line is | |
494 | # nasty enough that I shouldn't change it until I can test it _well_. |
|
494 | # nasty enough that I shouldn't change it until I can test it _well_. | |
495 | #self.re_fun_name = re.compile (r'[a-zA-Z_]([a-zA-Z0-9_.\[\]]*) ?$') |
|
495 | #self.re_fun_name = re.compile (r'[a-zA-Z_]([a-zA-Z0-9_.\[\]]*) ?$') | |
496 |
|
496 | |||
497 | # keep track of where we started running (mainly for crash post-mortem) |
|
497 | # keep track of where we started running (mainly for crash post-mortem) | |
498 | self.starting_dir = os.getcwd() |
|
498 | self.starting_dir = os.getcwd() | |
499 |
|
499 | |||
500 | # Various switches which can be set |
|
500 | # Various switches which can be set | |
501 | self.CACHELENGTH = 5000 # this is cheap, it's just text |
|
501 | self.CACHELENGTH = 5000 # this is cheap, it's just text | |
502 | self.BANNER = "Python %(version)s on %(platform)s\n" % sys.__dict__ |
|
502 | self.BANNER = "Python %(version)s on %(platform)s\n" % sys.__dict__ | |
503 | self.banner2 = banner2 |
|
503 | self.banner2 = banner2 | |
504 |
|
504 | |||
505 | # TraceBack handlers: |
|
505 | # TraceBack handlers: | |
506 |
|
506 | |||
507 | # Syntax error handler. |
|
507 | # Syntax error handler. | |
508 | self.SyntaxTB = SyntaxTB(color_scheme='NoColor') |
|
508 | self.SyntaxTB = SyntaxTB(color_scheme='NoColor') | |
509 |
|
509 | |||
510 | # The interactive one is initialized with an offset, meaning we always |
|
510 | # The interactive one is initialized with an offset, meaning we always | |
511 | # want to remove the topmost item in the traceback, which is our own |
|
511 | # want to remove the topmost item in the traceback, which is our own | |
512 | # internal code. Valid modes: ['Plain','Context','Verbose'] |
|
512 | # internal code. Valid modes: ['Plain','Context','Verbose'] | |
513 | self.InteractiveTB = ultraTB.AutoFormattedTB(mode = 'Plain', |
|
513 | self.InteractiveTB = ultraTB.AutoFormattedTB(mode = 'Plain', | |
514 | color_scheme='NoColor', |
|
514 | color_scheme='NoColor', | |
515 | tb_offset = 1) |
|
515 | tb_offset = 1) | |
516 |
|
516 | |||
517 | # IPython itself shouldn't crash. This will produce a detailed |
|
517 | # IPython itself shouldn't crash. This will produce a detailed | |
518 | # post-mortem if it does. But we only install the crash handler for |
|
518 | # post-mortem if it does. But we only install the crash handler for | |
519 | # non-threaded shells, the threaded ones use a normal verbose reporter |
|
519 | # non-threaded shells, the threaded ones use a normal verbose reporter | |
520 | # and lose the crash handler. This is because exceptions in the main |
|
520 | # and lose the crash handler. This is because exceptions in the main | |
521 | # thread (such as in GUI code) propagate directly to sys.excepthook, |
|
521 | # thread (such as in GUI code) propagate directly to sys.excepthook, | |
522 | # and there's no point in printing crash dumps for every user exception. |
|
522 | # and there's no point in printing crash dumps for every user exception. | |
523 | if self.isthreaded: |
|
523 | if self.isthreaded: | |
524 | sys.excepthook = ultraTB.FormattedTB() |
|
524 | sys.excepthook = ultraTB.FormattedTB() | |
525 | else: |
|
525 | else: | |
526 | from IPython import CrashHandler |
|
526 | from IPython import CrashHandler | |
527 | sys.excepthook = CrashHandler.CrashHandler(self) |
|
527 | sys.excepthook = CrashHandler.CrashHandler(self) | |
528 |
|
528 | |||
529 | # The instance will store a pointer to this, so that runtime code |
|
529 | # The instance will store a pointer to this, so that runtime code | |
530 | # (such as magics) can access it. This is because during the |
|
530 | # (such as magics) can access it. This is because during the | |
531 | # read-eval loop, it gets temporarily overwritten (to deal with GUI |
|
531 | # read-eval loop, it gets temporarily overwritten (to deal with GUI | |
532 | # frameworks). |
|
532 | # frameworks). | |
533 | self.sys_excepthook = sys.excepthook |
|
533 | self.sys_excepthook = sys.excepthook | |
534 |
|
534 | |||
535 | # and add any custom exception handlers the user may have specified |
|
535 | # and add any custom exception handlers the user may have specified | |
536 | self.set_custom_exc(*custom_exceptions) |
|
536 | self.set_custom_exc(*custom_exceptions) | |
537 |
|
537 | |||
538 | # indentation management |
|
538 | # indentation management | |
539 | self.autoindent = False |
|
539 | self.autoindent = False | |
540 | self.indent_current_nsp = 0 |
|
540 | self.indent_current_nsp = 0 | |
541 |
|
541 | |||
542 | # Make some aliases automatically |
|
542 | # Make some aliases automatically | |
543 | # Prepare list of shell aliases to auto-define |
|
543 | # Prepare list of shell aliases to auto-define | |
544 | if os.name == 'posix': |
|
544 | if os.name == 'posix': | |
545 | auto_alias = ('mkdir mkdir', 'rmdir rmdir', |
|
545 | auto_alias = ('mkdir mkdir', 'rmdir rmdir', | |
546 | 'mv mv -i','rm rm -i','cp cp -i', |
|
546 | 'mv mv -i','rm rm -i','cp cp -i', | |
547 | 'cat cat','less less','clear clear', |
|
547 | 'cat cat','less less','clear clear', | |
548 | # a better ls |
|
548 | # a better ls | |
549 | 'ls ls -F', |
|
549 | 'ls ls -F', | |
550 | # long ls |
|
550 | # long ls | |
551 | 'll ls -lF') |
|
551 | 'll ls -lF') | |
552 | # Extra ls aliases with color, which need special treatment on BSD |
|
552 | # Extra ls aliases with color, which need special treatment on BSD | |
553 | # variants |
|
553 | # variants | |
554 | ls_extra = ( # color ls |
|
554 | ls_extra = ( # color ls | |
555 | 'lc ls -F -o --color', |
|
555 | 'lc ls -F -o --color', | |
556 | # ls normal files only |
|
556 | # ls normal files only | |
557 | 'lf ls -F -o --color %l | grep ^-', |
|
557 | 'lf ls -F -o --color %l | grep ^-', | |
558 | # ls symbolic links |
|
558 | # ls symbolic links | |
559 | 'lk ls -F -o --color %l | grep ^l', |
|
559 | 'lk ls -F -o --color %l | grep ^l', | |
560 | # directories or links to directories, |
|
560 | # directories or links to directories, | |
561 | 'ldir ls -F -o --color %l | grep /$', |
|
561 | 'ldir ls -F -o --color %l | grep /$', | |
562 | # things which are executable |
|
562 | # things which are executable | |
563 | 'lx ls -F -o --color %l | grep ^-..x', |
|
563 | 'lx ls -F -o --color %l | grep ^-..x', | |
564 | ) |
|
564 | ) | |
565 | # The BSDs don't ship GNU ls, so they don't understand the |
|
565 | # The BSDs don't ship GNU ls, so they don't understand the | |
566 | # --color switch out of the box |
|
566 | # --color switch out of the box | |
567 | if 'bsd' in sys.platform: |
|
567 | if 'bsd' in sys.platform: | |
568 | ls_extra = ( # ls normal files only |
|
568 | ls_extra = ( # ls normal files only | |
569 | 'lf ls -F -o %l | grep ^-', |
|
569 | 'lf ls -F -o %l | grep ^-', | |
570 | # ls symbolic links |
|
570 | # ls symbolic links | |
571 | 'lk ls -F -o %l | grep ^l', |
|
571 | 'lk ls -F -o %l | grep ^l', | |
572 | # directories or links to directories, |
|
572 | # directories or links to directories, | |
573 | 'ldir ls -F -o %l | grep /$', |
|
573 | 'ldir ls -F -o %l | grep /$', | |
574 | # things which are executable |
|
574 | # things which are executable | |
575 | 'lx ls -F -o %l | grep ^-..x', |
|
575 | 'lx ls -F -o %l | grep ^-..x', | |
576 | ) |
|
576 | ) | |
577 | auto_alias = auto_alias + ls_extra |
|
577 | auto_alias = auto_alias + ls_extra | |
578 | elif os.name in ['nt','dos']: |
|
578 | elif os.name in ['nt','dos']: | |
579 | auto_alias = ('dir dir /on', 'ls dir /on', |
|
579 | auto_alias = ('dir dir /on', 'ls dir /on', | |
580 | 'ddir dir /ad /on', 'ldir dir /ad /on', |
|
580 | 'ddir dir /ad /on', 'ldir dir /ad /on', | |
581 | 'mkdir mkdir','rmdir rmdir','echo echo', |
|
581 | 'mkdir mkdir','rmdir rmdir','echo echo', | |
582 | 'ren ren','cls cls','copy copy') |
|
582 | 'ren ren','cls cls','copy copy') | |
583 | else: |
|
583 | else: | |
584 | auto_alias = () |
|
584 | auto_alias = () | |
585 | self.auto_alias = [s.split(None,1) for s in auto_alias] |
|
585 | self.auto_alias = [s.split(None,1) for s in auto_alias] | |
586 | # Call the actual (public) initializer |
|
586 | # Call the actual (public) initializer | |
587 | self.init_auto_alias() |
|
587 | self.init_auto_alias() | |
588 |
|
588 | |||
589 | # Produce a public API instance |
|
589 | # Produce a public API instance | |
590 | self.api = IPython.ipapi.IPApi(self) |
|
590 | self.api = IPython.ipapi.IPApi(self) | |
591 |
|
591 | |||
592 | # track which builtins we add, so we can clean up later |
|
592 | # track which builtins we add, so we can clean up later | |
593 | self.builtins_added = {} |
|
593 | self.builtins_added = {} | |
594 | # This method will add the necessary builtins for operation, but |
|
594 | # This method will add the necessary builtins for operation, but | |
595 | # tracking what it did via the builtins_added dict. |
|
595 | # tracking what it did via the builtins_added dict. | |
596 | self.add_builtins() |
|
596 | self.add_builtins() | |
597 |
|
597 | |||
598 | # end __init__ |
|
598 | # end __init__ | |
599 |
|
599 | |||
600 | def pre_config_initialization(self): |
|
600 | def pre_config_initialization(self): | |
601 | """Pre-configuration init method |
|
601 | """Pre-configuration init method | |
602 |
|
602 | |||
603 | This is called before the configuration files are processed to |
|
603 | This is called before the configuration files are processed to | |
604 | prepare the services the config files might need. |
|
604 | prepare the services the config files might need. | |
605 |
|
605 | |||
606 | self.rc already has reasonable default values at this point. |
|
606 | self.rc already has reasonable default values at this point. | |
607 | """ |
|
607 | """ | |
608 | rc = self.rc |
|
608 | rc = self.rc | |
609 |
|
609 | |||
610 | self.db = pickleshare.PickleShareDB(rc.ipythondir + "/db") |
|
610 | self.db = pickleshare.PickleShareDB(rc.ipythondir + "/db") | |
611 |
|
611 | |||
612 | def post_config_initialization(self): |
|
612 | def post_config_initialization(self): | |
613 | """Post configuration init method |
|
613 | """Post configuration init method | |
614 |
|
614 | |||
615 | This is called after the configuration files have been processed to |
|
615 | This is called after the configuration files have been processed to | |
616 | 'finalize' the initialization.""" |
|
616 | 'finalize' the initialization.""" | |
617 |
|
617 | |||
618 | rc = self.rc |
|
618 | rc = self.rc | |
619 |
|
619 | |||
620 | # Object inspector |
|
620 | # Object inspector | |
621 | self.inspector = OInspect.Inspector(OInspect.InspectColors, |
|
621 | self.inspector = OInspect.Inspector(OInspect.InspectColors, | |
622 | PyColorize.ANSICodeColors, |
|
622 | PyColorize.ANSICodeColors, | |
623 | 'NoColor', |
|
623 | 'NoColor', | |
624 | rc.object_info_string_level) |
|
624 | rc.object_info_string_level) | |
625 |
|
625 | |||
626 | # Load readline proper |
|
626 | # Load readline proper | |
627 | if rc.readline: |
|
627 | if rc.readline: | |
628 | self.init_readline() |
|
628 | self.init_readline() | |
629 |
|
629 | |||
630 | # local shortcut, this is used a LOT |
|
630 | # local shortcut, this is used a LOT | |
631 | self.log = self.logger.log |
|
631 | self.log = self.logger.log | |
632 |
|
632 | |||
633 | # Initialize cache, set in/out prompts and printing system |
|
633 | # Initialize cache, set in/out prompts and printing system | |
634 | self.outputcache = CachedOutput(self, |
|
634 | self.outputcache = CachedOutput(self, | |
635 | rc.cache_size, |
|
635 | rc.cache_size, | |
636 | rc.pprint, |
|
636 | rc.pprint, | |
637 | input_sep = rc.separate_in, |
|
637 | input_sep = rc.separate_in, | |
638 | output_sep = rc.separate_out, |
|
638 | output_sep = rc.separate_out, | |
639 | output_sep2 = rc.separate_out2, |
|
639 | output_sep2 = rc.separate_out2, | |
640 | ps1 = rc.prompt_in1, |
|
640 | ps1 = rc.prompt_in1, | |
641 | ps2 = rc.prompt_in2, |
|
641 | ps2 = rc.prompt_in2, | |
642 | ps_out = rc.prompt_out, |
|
642 | ps_out = rc.prompt_out, | |
643 | pad_left = rc.prompts_pad_left) |
|
643 | pad_left = rc.prompts_pad_left) | |
644 |
|
644 | |||
645 | # user may have over-ridden the default print hook: |
|
645 | # user may have over-ridden the default print hook: | |
646 | try: |
|
646 | try: | |
647 | self.outputcache.__class__.display = self.hooks.display |
|
647 | self.outputcache.__class__.display = self.hooks.display | |
648 | except AttributeError: |
|
648 | except AttributeError: | |
649 | pass |
|
649 | pass | |
650 |
|
650 | |||
651 | # I don't like assigning globally to sys, because it means when embedding |
|
651 | # I don't like assigning globally to sys, because it means when embedding | |
652 | # instances, each embedded instance overrides the previous choice. But |
|
652 | # instances, each embedded instance overrides the previous choice. But | |
653 | # sys.displayhook seems to be called internally by exec, so I don't see a |
|
653 | # sys.displayhook seems to be called internally by exec, so I don't see a | |
654 | # way around it. |
|
654 | # way around it. | |
655 | sys.displayhook = self.outputcache |
|
655 | sys.displayhook = self.outputcache | |
656 |
|
656 | |||
657 | # Set user colors (don't do it in the constructor above so that it |
|
657 | # Set user colors (don't do it in the constructor above so that it | |
658 | # doesn't crash if colors option is invalid) |
|
658 | # doesn't crash if colors option is invalid) | |
659 | self.magic_colors(rc.colors) |
|
659 | self.magic_colors(rc.colors) | |
660 |
|
660 | |||
661 | # Set calling of pdb on exceptions |
|
661 | # Set calling of pdb on exceptions | |
662 | self.call_pdb = rc.pdb |
|
662 | self.call_pdb = rc.pdb | |
663 |
|
663 | |||
664 | # Load user aliases |
|
664 | # Load user aliases | |
665 | for alias in rc.alias: |
|
665 | for alias in rc.alias: | |
666 | self.magic_alias(alias) |
|
666 | self.magic_alias(alias) | |
667 | self.hooks.late_startup_hook() |
|
667 | self.hooks.late_startup_hook() | |
668 |
|
668 | |||
669 | for batchfile in [path(arg) for arg in self.rc.args |
|
669 | for batchfile in [path(arg) for arg in self.rc.args | |
670 | if arg.lower().endswith('.ipy')]: |
|
670 | if arg.lower().endswith('.ipy')]: | |
671 | if not batchfile.isfile(): |
|
671 | if not batchfile.isfile(): | |
672 | print "No such batch file:", batchfile |
|
672 | print "No such batch file:", batchfile | |
673 | continue |
|
673 | continue | |
674 | self.api.runlines(batchfile.text()) |
|
674 | self.api.runlines(batchfile.text()) | |
675 |
|
675 | |||
676 | def add_builtins(self): |
|
676 | def add_builtins(self): | |
677 | """Store ipython references into the builtin namespace. |
|
677 | """Store ipython references into the builtin namespace. | |
678 |
|
678 | |||
679 | Some parts of ipython operate via builtins injected here, which hold a |
|
679 | Some parts of ipython operate via builtins injected here, which hold a | |
680 | reference to IPython itself.""" |
|
680 | reference to IPython itself.""" | |
681 |
|
681 | |||
682 | # TODO: deprecate all except _ip; 'jobs' should be installed |
|
682 | # TODO: deprecate all except _ip; 'jobs' should be installed | |
683 | # by an extension and the rest are under _ip, ipalias is redundant |
|
683 | # by an extension and the rest are under _ip, ipalias is redundant | |
684 | builtins_new = dict(__IPYTHON__ = self, |
|
684 | builtins_new = dict(__IPYTHON__ = self, | |
685 | ip_set_hook = self.set_hook, |
|
685 | ip_set_hook = self.set_hook, | |
686 | jobs = self.jobs, |
|
686 | jobs = self.jobs, | |
687 | ipmagic = self.ipmagic, |
|
687 | ipmagic = self.ipmagic, | |
688 | ipalias = self.ipalias, |
|
688 | ipalias = self.ipalias, | |
689 | ipsystem = self.ipsystem, |
|
689 | ipsystem = self.ipsystem, | |
690 | _ip = self.api |
|
690 | _ip = self.api | |
691 | ) |
|
691 | ) | |
692 | for biname,bival in builtins_new.items(): |
|
692 | for biname,bival in builtins_new.items(): | |
693 | try: |
|
693 | try: | |
694 | # store the orignal value so we can restore it |
|
694 | # store the orignal value so we can restore it | |
695 | self.builtins_added[biname] = __builtin__.__dict__[biname] |
|
695 | self.builtins_added[biname] = __builtin__.__dict__[biname] | |
696 | except KeyError: |
|
696 | except KeyError: | |
697 | # or mark that it wasn't defined, and we'll just delete it at |
|
697 | # or mark that it wasn't defined, and we'll just delete it at | |
698 | # cleanup |
|
698 | # cleanup | |
699 | self.builtins_added[biname] = Undefined |
|
699 | self.builtins_added[biname] = Undefined | |
700 | __builtin__.__dict__[biname] = bival |
|
700 | __builtin__.__dict__[biname] = bival | |
701 |
|
701 | |||
702 | # Keep in the builtins a flag for when IPython is active. We set it |
|
702 | # Keep in the builtins a flag for when IPython is active. We set it | |
703 | # with setdefault so that multiple nested IPythons don't clobber one |
|
703 | # with setdefault so that multiple nested IPythons don't clobber one | |
704 | # another. Each will increase its value by one upon being activated, |
|
704 | # another. Each will increase its value by one upon being activated, | |
705 | # which also gives us a way to determine the nesting level. |
|
705 | # which also gives us a way to determine the nesting level. | |
706 | __builtin__.__dict__.setdefault('__IPYTHON__active',0) |
|
706 | __builtin__.__dict__.setdefault('__IPYTHON__active',0) | |
707 |
|
707 | |||
708 | def clean_builtins(self): |
|
708 | def clean_builtins(self): | |
709 | """Remove any builtins which might have been added by add_builtins, or |
|
709 | """Remove any builtins which might have been added by add_builtins, or | |
710 | restore overwritten ones to their previous values.""" |
|
710 | restore overwritten ones to their previous values.""" | |
711 | for biname,bival in self.builtins_added.items(): |
|
711 | for biname,bival in self.builtins_added.items(): | |
712 | if bival is Undefined: |
|
712 | if bival is Undefined: | |
713 | del __builtin__.__dict__[biname] |
|
713 | del __builtin__.__dict__[biname] | |
714 | else: |
|
714 | else: | |
715 | __builtin__.__dict__[biname] = bival |
|
715 | __builtin__.__dict__[biname] = bival | |
716 | self.builtins_added.clear() |
|
716 | self.builtins_added.clear() | |
717 |
|
717 | |||
718 | def set_hook(self,name,hook, priority = 50): |
|
718 | def set_hook(self,name,hook, priority = 50): | |
719 | """set_hook(name,hook) -> sets an internal IPython hook. |
|
719 | """set_hook(name,hook) -> sets an internal IPython hook. | |
720 |
|
720 | |||
721 | IPython exposes some of its internal API as user-modifiable hooks. By |
|
721 | IPython exposes some of its internal API as user-modifiable hooks. By | |
722 | adding your function to one of these hooks, you can modify IPython's |
|
722 | adding your function to one of these hooks, you can modify IPython's | |
723 | behavior to call at runtime your own routines.""" |
|
723 | behavior to call at runtime your own routines.""" | |
724 |
|
724 | |||
725 | # At some point in the future, this should validate the hook before it |
|
725 | # At some point in the future, this should validate the hook before it | |
726 | # accepts it. Probably at least check that the hook takes the number |
|
726 | # accepts it. Probably at least check that the hook takes the number | |
727 | # of args it's supposed to. |
|
727 | # of args it's supposed to. | |
728 | dp = getattr(self.hooks, name, None) |
|
728 | dp = getattr(self.hooks, name, None) | |
729 | if name not in IPython.hooks.__all__: |
|
729 | if name not in IPython.hooks.__all__: | |
730 | print "Warning! Hook '%s' is not one of %s" % (name, IPython.hooks.__all__ ) |
|
730 | print "Warning! Hook '%s' is not one of %s" % (name, IPython.hooks.__all__ ) | |
731 | if not dp: |
|
731 | if not dp: | |
732 | dp = IPython.hooks.CommandChainDispatcher() |
|
732 | dp = IPython.hooks.CommandChainDispatcher() | |
733 |
|
733 | |||
734 | f = new.instancemethod(hook,self,self.__class__) |
|
734 | f = new.instancemethod(hook,self,self.__class__) | |
735 | try: |
|
735 | try: | |
736 | dp.add(f,priority) |
|
736 | dp.add(f,priority) | |
737 | except AttributeError: |
|
737 | except AttributeError: | |
738 | # it was not commandchain, plain old func - replace |
|
738 | # it was not commandchain, plain old func - replace | |
739 | dp = f |
|
739 | dp = f | |
740 |
|
740 | |||
741 | setattr(self.hooks,name, dp) |
|
741 | setattr(self.hooks,name, dp) | |
742 |
|
742 | |||
743 |
|
743 | |||
744 | #setattr(self.hooks,name,new.instancemethod(hook,self,self.__class__)) |
|
744 | #setattr(self.hooks,name,new.instancemethod(hook,self,self.__class__)) | |
745 |
|
745 | |||
746 | def set_custom_exc(self,exc_tuple,handler): |
|
746 | def set_custom_exc(self,exc_tuple,handler): | |
747 | """set_custom_exc(exc_tuple,handler) |
|
747 | """set_custom_exc(exc_tuple,handler) | |
748 |
|
748 | |||
749 | Set a custom exception handler, which will be called if any of the |
|
749 | Set a custom exception handler, which will be called if any of the | |
750 | exceptions in exc_tuple occur in the mainloop (specifically, in the |
|
750 | exceptions in exc_tuple occur in the mainloop (specifically, in the | |
751 | runcode() method. |
|
751 | runcode() method. | |
752 |
|
752 | |||
753 | Inputs: |
|
753 | Inputs: | |
754 |
|
754 | |||
755 | - exc_tuple: a *tuple* of valid exceptions to call the defined |
|
755 | - exc_tuple: a *tuple* of valid exceptions to call the defined | |
756 | handler for. It is very important that you use a tuple, and NOT A |
|
756 | handler for. It is very important that you use a tuple, and NOT A | |
757 | LIST here, because of the way Python's except statement works. If |
|
757 | LIST here, because of the way Python's except statement works. If | |
758 | you only want to trap a single exception, use a singleton tuple: |
|
758 | you only want to trap a single exception, use a singleton tuple: | |
759 |
|
759 | |||
760 | exc_tuple == (MyCustomException,) |
|
760 | exc_tuple == (MyCustomException,) | |
761 |
|
761 | |||
762 | - handler: this must be defined as a function with the following |
|
762 | - handler: this must be defined as a function with the following | |
763 | basic interface: def my_handler(self,etype,value,tb). |
|
763 | basic interface: def my_handler(self,etype,value,tb). | |
764 |
|
764 | |||
765 | This will be made into an instance method (via new.instancemethod) |
|
765 | This will be made into an instance method (via new.instancemethod) | |
766 | of IPython itself, and it will be called if any of the exceptions |
|
766 | of IPython itself, and it will be called if any of the exceptions | |
767 | listed in the exc_tuple are caught. If the handler is None, an |
|
767 | listed in the exc_tuple are caught. If the handler is None, an | |
768 | internal basic one is used, which just prints basic info. |
|
768 | internal basic one is used, which just prints basic info. | |
769 |
|
769 | |||
770 | WARNING: by putting in your own exception handler into IPython's main |
|
770 | WARNING: by putting in your own exception handler into IPython's main | |
771 | execution loop, you run a very good chance of nasty crashes. This |
|
771 | execution loop, you run a very good chance of nasty crashes. This | |
772 | facility should only be used if you really know what you are doing.""" |
|
772 | facility should only be used if you really know what you are doing.""" | |
773 |
|
773 | |||
774 | assert type(exc_tuple)==type(()) , \ |
|
774 | assert type(exc_tuple)==type(()) , \ | |
775 | "The custom exceptions must be given AS A TUPLE." |
|
775 | "The custom exceptions must be given AS A TUPLE." | |
776 |
|
776 | |||
777 | def dummy_handler(self,etype,value,tb): |
|
777 | def dummy_handler(self,etype,value,tb): | |
778 | print '*** Simple custom exception handler ***' |
|
778 | print '*** Simple custom exception handler ***' | |
779 | print 'Exception type :',etype |
|
779 | print 'Exception type :',etype | |
780 | print 'Exception value:',value |
|
780 | print 'Exception value:',value | |
781 | print 'Traceback :',tb |
|
781 | print 'Traceback :',tb | |
782 | print 'Source code :','\n'.join(self.buffer) |
|
782 | print 'Source code :','\n'.join(self.buffer) | |
783 |
|
783 | |||
784 | if handler is None: handler = dummy_handler |
|
784 | if handler is None: handler = dummy_handler | |
785 |
|
785 | |||
786 | self.CustomTB = new.instancemethod(handler,self,self.__class__) |
|
786 | self.CustomTB = new.instancemethod(handler,self,self.__class__) | |
787 | self.custom_exceptions = exc_tuple |
|
787 | self.custom_exceptions = exc_tuple | |
788 |
|
788 | |||
789 | def set_custom_completer(self,completer,pos=0): |
|
789 | def set_custom_completer(self,completer,pos=0): | |
790 | """set_custom_completer(completer,pos=0) |
|
790 | """set_custom_completer(completer,pos=0) | |
791 |
|
791 | |||
792 | Adds a new custom completer function. |
|
792 | Adds a new custom completer function. | |
793 |
|
793 | |||
794 | The position argument (defaults to 0) is the index in the completers |
|
794 | The position argument (defaults to 0) is the index in the completers | |
795 | list where you want the completer to be inserted.""" |
|
795 | list where you want the completer to be inserted.""" | |
796 |
|
796 | |||
797 | newcomp = new.instancemethod(completer,self.Completer, |
|
797 | newcomp = new.instancemethod(completer,self.Completer, | |
798 | self.Completer.__class__) |
|
798 | self.Completer.__class__) | |
799 | self.Completer.matchers.insert(pos,newcomp) |
|
799 | self.Completer.matchers.insert(pos,newcomp) | |
800 |
|
800 | |||
801 | def _get_call_pdb(self): |
|
801 | def _get_call_pdb(self): | |
802 | return self._call_pdb |
|
802 | return self._call_pdb | |
803 |
|
803 | |||
804 | def _set_call_pdb(self,val): |
|
804 | def _set_call_pdb(self,val): | |
805 |
|
805 | |||
806 | if val not in (0,1,False,True): |
|
806 | if val not in (0,1,False,True): | |
807 | raise ValueError,'new call_pdb value must be boolean' |
|
807 | raise ValueError,'new call_pdb value must be boolean' | |
808 |
|
808 | |||
809 | # store value in instance |
|
809 | # store value in instance | |
810 | self._call_pdb = val |
|
810 | self._call_pdb = val | |
811 |
|
811 | |||
812 | # notify the actual exception handlers |
|
812 | # notify the actual exception handlers | |
813 | self.InteractiveTB.call_pdb = val |
|
813 | self.InteractiveTB.call_pdb = val | |
814 | if self.isthreaded: |
|
814 | if self.isthreaded: | |
815 | try: |
|
815 | try: | |
816 | self.sys_excepthook.call_pdb = val |
|
816 | self.sys_excepthook.call_pdb = val | |
817 | except: |
|
817 | except: | |
818 | warn('Failed to activate pdb for threaded exception handler') |
|
818 | warn('Failed to activate pdb for threaded exception handler') | |
819 |
|
819 | |||
820 | call_pdb = property(_get_call_pdb,_set_call_pdb,None, |
|
820 | call_pdb = property(_get_call_pdb,_set_call_pdb,None, | |
821 | 'Control auto-activation of pdb at exceptions') |
|
821 | 'Control auto-activation of pdb at exceptions') | |
822 |
|
822 | |||
823 |
|
823 | |||
824 | # These special functions get installed in the builtin namespace, to |
|
824 | # These special functions get installed in the builtin namespace, to | |
825 | # provide programmatic (pure python) access to magics, aliases and system |
|
825 | # provide programmatic (pure python) access to magics, aliases and system | |
826 | # calls. This is important for logging, user scripting, and more. |
|
826 | # calls. This is important for logging, user scripting, and more. | |
827 |
|
827 | |||
828 | # We are basically exposing, via normal python functions, the three |
|
828 | # We are basically exposing, via normal python functions, the three | |
829 | # mechanisms in which ipython offers special call modes (magics for |
|
829 | # mechanisms in which ipython offers special call modes (magics for | |
830 | # internal control, aliases for direct system access via pre-selected |
|
830 | # internal control, aliases for direct system access via pre-selected | |
831 | # names, and !cmd for calling arbitrary system commands). |
|
831 | # names, and !cmd for calling arbitrary system commands). | |
832 |
|
832 | |||
833 | def ipmagic(self,arg_s): |
|
833 | def ipmagic(self,arg_s): | |
834 | """Call a magic function by name. |
|
834 | """Call a magic function by name. | |
835 |
|
835 | |||
836 | Input: a string containing the name of the magic function to call and any |
|
836 | Input: a string containing the name of the magic function to call and any | |
837 | additional arguments to be passed to the magic. |
|
837 | additional arguments to be passed to the magic. | |
838 |
|
838 | |||
839 | ipmagic('name -opt foo bar') is equivalent to typing at the ipython |
|
839 | ipmagic('name -opt foo bar') is equivalent to typing at the ipython | |
840 | prompt: |
|
840 | prompt: | |
841 |
|
841 | |||
842 | In[1]: %name -opt foo bar |
|
842 | In[1]: %name -opt foo bar | |
843 |
|
843 | |||
844 | To call a magic without arguments, simply use ipmagic('name'). |
|
844 | To call a magic without arguments, simply use ipmagic('name'). | |
845 |
|
845 | |||
846 | This provides a proper Python function to call IPython's magics in any |
|
846 | This provides a proper Python function to call IPython's magics in any | |
847 | valid Python code you can type at the interpreter, including loops and |
|
847 | valid Python code you can type at the interpreter, including loops and | |
848 | compound statements. It is added by IPython to the Python builtin |
|
848 | compound statements. It is added by IPython to the Python builtin | |
849 | namespace upon initialization.""" |
|
849 | namespace upon initialization.""" | |
850 |
|
850 | |||
851 | args = arg_s.split(' ',1) |
|
851 | args = arg_s.split(' ',1) | |
852 | magic_name = args[0] |
|
852 | magic_name = args[0] | |
853 | magic_name = magic_name.lstrip(self.ESC_MAGIC) |
|
853 | magic_name = magic_name.lstrip(self.ESC_MAGIC) | |
854 |
|
854 | |||
855 | try: |
|
855 | try: | |
856 | magic_args = args[1] |
|
856 | magic_args = args[1] | |
857 | except IndexError: |
|
857 | except IndexError: | |
858 | magic_args = '' |
|
858 | magic_args = '' | |
859 | fn = getattr(self,'magic_'+magic_name,None) |
|
859 | fn = getattr(self,'magic_'+magic_name,None) | |
860 | if fn is None: |
|
860 | if fn is None: | |
861 | error("Magic function `%s` not found." % magic_name) |
|
861 | error("Magic function `%s` not found." % magic_name) | |
862 | else: |
|
862 | else: | |
863 | magic_args = self.var_expand(magic_args) |
|
863 | magic_args = self.var_expand(magic_args) | |
864 | return fn(magic_args) |
|
864 | return fn(magic_args) | |
865 |
|
865 | |||
866 | def ipalias(self,arg_s): |
|
866 | def ipalias(self,arg_s): | |
867 | """Call an alias by name. |
|
867 | """Call an alias by name. | |
868 |
|
868 | |||
869 | Input: a string containing the name of the alias to call and any |
|
869 | Input: a string containing the name of the alias to call and any | |
870 | additional arguments to be passed to the magic. |
|
870 | additional arguments to be passed to the magic. | |
871 |
|
871 | |||
872 | ipalias('name -opt foo bar') is equivalent to typing at the ipython |
|
872 | ipalias('name -opt foo bar') is equivalent to typing at the ipython | |
873 | prompt: |
|
873 | prompt: | |
874 |
|
874 | |||
875 | In[1]: name -opt foo bar |
|
875 | In[1]: name -opt foo bar | |
876 |
|
876 | |||
877 | To call an alias without arguments, simply use ipalias('name'). |
|
877 | To call an alias without arguments, simply use ipalias('name'). | |
878 |
|
878 | |||
879 | This provides a proper Python function to call IPython's aliases in any |
|
879 | This provides a proper Python function to call IPython's aliases in any | |
880 | valid Python code you can type at the interpreter, including loops and |
|
880 | valid Python code you can type at the interpreter, including loops and | |
881 | compound statements. It is added by IPython to the Python builtin |
|
881 | compound statements. It is added by IPython to the Python builtin | |
882 | namespace upon initialization.""" |
|
882 | namespace upon initialization.""" | |
883 |
|
883 | |||
884 | args = arg_s.split(' ',1) |
|
884 | args = arg_s.split(' ',1) | |
885 | alias_name = args[0] |
|
885 | alias_name = args[0] | |
886 | try: |
|
886 | try: | |
887 | alias_args = args[1] |
|
887 | alias_args = args[1] | |
888 | except IndexError: |
|
888 | except IndexError: | |
889 | alias_args = '' |
|
889 | alias_args = '' | |
890 | if alias_name in self.alias_table: |
|
890 | if alias_name in self.alias_table: | |
891 | self.call_alias(alias_name,alias_args) |
|
891 | self.call_alias(alias_name,alias_args) | |
892 | else: |
|
892 | else: | |
893 | error("Alias `%s` not found." % alias_name) |
|
893 | error("Alias `%s` not found." % alias_name) | |
894 |
|
894 | |||
895 | def ipsystem(self,arg_s): |
|
895 | def ipsystem(self,arg_s): | |
896 | """Make a system call, using IPython.""" |
|
896 | """Make a system call, using IPython.""" | |
897 |
|
897 | |||
898 | self.system(arg_s) |
|
898 | self.system(arg_s) | |
899 |
|
899 | |||
900 | def complete(self,text): |
|
900 | def complete(self,text): | |
901 | """Return a sorted list of all possible completions on text. |
|
901 | """Return a sorted list of all possible completions on text. | |
902 |
|
902 | |||
903 | Inputs: |
|
903 | Inputs: | |
904 |
|
904 | |||
905 | - text: a string of text to be completed on. |
|
905 | - text: a string of text to be completed on. | |
906 |
|
906 | |||
907 | This is a wrapper around the completion mechanism, similar to what |
|
907 | This is a wrapper around the completion mechanism, similar to what | |
908 | readline does at the command line when the TAB key is hit. By |
|
908 | readline does at the command line when the TAB key is hit. By | |
909 | exposing it as a method, it can be used by other non-readline |
|
909 | exposing it as a method, it can be used by other non-readline | |
910 | environments (such as GUIs) for text completion. |
|
910 | environments (such as GUIs) for text completion. | |
911 |
|
911 | |||
912 | Simple usage example: |
|
912 | Simple usage example: | |
913 |
|
913 | |||
914 | In [1]: x = 'hello' |
|
914 | In [1]: x = 'hello' | |
915 |
|
915 | |||
916 | In [2]: __IP.complete('x.l') |
|
916 | In [2]: __IP.complete('x.l') | |
917 | Out[2]: ['x.ljust', 'x.lower', 'x.lstrip']""" |
|
917 | Out[2]: ['x.ljust', 'x.lower', 'x.lstrip']""" | |
918 |
|
918 | |||
919 | complete = self.Completer.complete |
|
919 | complete = self.Completer.complete | |
920 | state = 0 |
|
920 | state = 0 | |
921 | # use a dict so we get unique keys, since ipyhton's multiple |
|
921 | # use a dict so we get unique keys, since ipyhton's multiple | |
922 | # completers can return duplicates. |
|
922 | # completers can return duplicates. | |
923 | comps = {} |
|
923 | comps = {} | |
924 | while True: |
|
924 | while True: | |
925 | newcomp = complete(text,state) |
|
925 | newcomp = complete(text,state) | |
926 | if newcomp is None: |
|
926 | if newcomp is None: | |
927 | break |
|
927 | break | |
928 | comps[newcomp] = 1 |
|
928 | comps[newcomp] = 1 | |
929 | state += 1 |
|
929 | state += 1 | |
930 | outcomps = comps.keys() |
|
930 | outcomps = comps.keys() | |
931 | outcomps.sort() |
|
931 | outcomps.sort() | |
932 | return outcomps |
|
932 | return outcomps | |
933 |
|
933 | |||
934 | def set_completer_frame(self, frame=None): |
|
934 | def set_completer_frame(self, frame=None): | |
935 | if frame: |
|
935 | if frame: | |
936 | self.Completer.namespace = frame.f_locals |
|
936 | self.Completer.namespace = frame.f_locals | |
937 | self.Completer.global_namespace = frame.f_globals |
|
937 | self.Completer.global_namespace = frame.f_globals | |
938 | else: |
|
938 | else: | |
939 | self.Completer.namespace = self.user_ns |
|
939 | self.Completer.namespace = self.user_ns | |
940 | self.Completer.global_namespace = self.user_global_ns |
|
940 | self.Completer.global_namespace = self.user_global_ns | |
941 |
|
941 | |||
942 | def init_auto_alias(self): |
|
942 | def init_auto_alias(self): | |
943 | """Define some aliases automatically. |
|
943 | """Define some aliases automatically. | |
944 |
|
944 | |||
945 | These are ALL parameter-less aliases""" |
|
945 | These are ALL parameter-less aliases""" | |
946 |
|
946 | |||
947 | for alias,cmd in self.auto_alias: |
|
947 | for alias,cmd in self.auto_alias: | |
948 | self.alias_table[alias] = (0,cmd) |
|
948 | self.alias_table[alias] = (0,cmd) | |
949 |
|
949 | |||
950 | def alias_table_validate(self,verbose=0): |
|
950 | def alias_table_validate(self,verbose=0): | |
951 | """Update information about the alias table. |
|
951 | """Update information about the alias table. | |
952 |
|
952 | |||
953 | In particular, make sure no Python keywords/builtins are in it.""" |
|
953 | In particular, make sure no Python keywords/builtins are in it.""" | |
954 |
|
954 | |||
955 | no_alias = self.no_alias |
|
955 | no_alias = self.no_alias | |
956 | for k in self.alias_table.keys(): |
|
956 | for k in self.alias_table.keys(): | |
957 | if k in no_alias: |
|
957 | if k in no_alias: | |
958 | del self.alias_table[k] |
|
958 | del self.alias_table[k] | |
959 | if verbose: |
|
959 | if verbose: | |
960 | print ("Deleting alias <%s>, it's a Python " |
|
960 | print ("Deleting alias <%s>, it's a Python " | |
961 | "keyword or builtin." % k) |
|
961 | "keyword or builtin." % k) | |
962 |
|
962 | |||
963 | def set_autoindent(self,value=None): |
|
963 | def set_autoindent(self,value=None): | |
964 | """Set the autoindent flag, checking for readline support. |
|
964 | """Set the autoindent flag, checking for readline support. | |
965 |
|
965 | |||
966 | If called with no arguments, it acts as a toggle.""" |
|
966 | If called with no arguments, it acts as a toggle.""" | |
967 |
|
967 | |||
968 | if not self.has_readline: |
|
968 | if not self.has_readline: | |
969 | if os.name == 'posix': |
|
969 | if os.name == 'posix': | |
970 | warn("The auto-indent feature requires the readline library") |
|
970 | warn("The auto-indent feature requires the readline library") | |
971 | self.autoindent = 0 |
|
971 | self.autoindent = 0 | |
972 | return |
|
972 | return | |
973 | if value is None: |
|
973 | if value is None: | |
974 | self.autoindent = not self.autoindent |
|
974 | self.autoindent = not self.autoindent | |
975 | else: |
|
975 | else: | |
976 | self.autoindent = value |
|
976 | self.autoindent = value | |
977 |
|
977 | |||
978 | def rc_set_toggle(self,rc_field,value=None): |
|
978 | def rc_set_toggle(self,rc_field,value=None): | |
979 | """Set or toggle a field in IPython's rc config. structure. |
|
979 | """Set or toggle a field in IPython's rc config. structure. | |
980 |
|
980 | |||
981 | If called with no arguments, it acts as a toggle. |
|
981 | If called with no arguments, it acts as a toggle. | |
982 |
|
982 | |||
983 | If called with a non-existent field, the resulting AttributeError |
|
983 | If called with a non-existent field, the resulting AttributeError | |
984 | exception will propagate out.""" |
|
984 | exception will propagate out.""" | |
985 |
|
985 | |||
986 | rc_val = getattr(self.rc,rc_field) |
|
986 | rc_val = getattr(self.rc,rc_field) | |
987 | if value is None: |
|
987 | if value is None: | |
988 | value = not rc_val |
|
988 | value = not rc_val | |
989 | setattr(self.rc,rc_field,value) |
|
989 | setattr(self.rc,rc_field,value) | |
990 |
|
990 | |||
991 | def user_setup(self,ipythondir,rc_suffix,mode='install'): |
|
991 | def user_setup(self,ipythondir,rc_suffix,mode='install'): | |
992 | """Install the user configuration directory. |
|
992 | """Install the user configuration directory. | |
993 |
|
993 | |||
994 | Can be called when running for the first time or to upgrade the user's |
|
994 | Can be called when running for the first time or to upgrade the user's | |
995 | .ipython/ directory with the mode parameter. Valid modes are 'install' |
|
995 | .ipython/ directory with the mode parameter. Valid modes are 'install' | |
996 | and 'upgrade'.""" |
|
996 | and 'upgrade'.""" | |
997 |
|
997 | |||
998 | def wait(): |
|
998 | def wait(): | |
999 | try: |
|
999 | try: | |
1000 | raw_input("Please press <RETURN> to start IPython.") |
|
1000 | raw_input("Please press <RETURN> to start IPython.") | |
1001 | except EOFError: |
|
1001 | except EOFError: | |
1002 | print >> Term.cout |
|
1002 | print >> Term.cout | |
1003 | print '*'*70 |
|
1003 | print '*'*70 | |
1004 |
|
1004 | |||
1005 | cwd = os.getcwd() # remember where we started |
|
1005 | cwd = os.getcwd() # remember where we started | |
1006 | glb = glob.glob |
|
1006 | glb = glob.glob | |
1007 | print '*'*70 |
|
1007 | print '*'*70 | |
1008 | if mode == 'install': |
|
1008 | if mode == 'install': | |
1009 | print \ |
|
1009 | print \ | |
1010 | """Welcome to IPython. I will try to create a personal configuration directory |
|
1010 | """Welcome to IPython. I will try to create a personal configuration directory | |
1011 | where you can customize many aspects of IPython's functionality in:\n""" |
|
1011 | where you can customize many aspects of IPython's functionality in:\n""" | |
1012 | else: |
|
1012 | else: | |
1013 | print 'I am going to upgrade your configuration in:' |
|
1013 | print 'I am going to upgrade your configuration in:' | |
1014 |
|
1014 | |||
1015 | print ipythondir |
|
1015 | print ipythondir | |
1016 |
|
1016 | |||
1017 | rcdirend = os.path.join('IPython','UserConfig') |
|
1017 | rcdirend = os.path.join('IPython','UserConfig') | |
1018 | cfg = lambda d: os.path.join(d,rcdirend) |
|
1018 | cfg = lambda d: os.path.join(d,rcdirend) | |
1019 | try: |
|
1019 | try: | |
1020 | rcdir = filter(os.path.isdir,map(cfg,sys.path))[0] |
|
1020 | rcdir = filter(os.path.isdir,map(cfg,sys.path))[0] | |
1021 | except IOError: |
|
1021 | except IOError: | |
1022 | warning = """ |
|
1022 | warning = """ | |
1023 | Installation error. IPython's directory was not found. |
|
1023 | Installation error. IPython's directory was not found. | |
1024 |
|
1024 | |||
1025 | Check the following: |
|
1025 | Check the following: | |
1026 |
|
1026 | |||
1027 | The ipython/IPython directory should be in a directory belonging to your |
|
1027 | The ipython/IPython directory should be in a directory belonging to your | |
1028 | PYTHONPATH environment variable (that is, it should be in a directory |
|
1028 | PYTHONPATH environment variable (that is, it should be in a directory | |
1029 | belonging to sys.path). You can copy it explicitly there or just link to it. |
|
1029 | belonging to sys.path). You can copy it explicitly there or just link to it. | |
1030 |
|
1030 | |||
1031 | IPython will proceed with builtin defaults. |
|
1031 | IPython will proceed with builtin defaults. | |
1032 | """ |
|
1032 | """ | |
1033 | warn(warning) |
|
1033 | warn(warning) | |
1034 | wait() |
|
1034 | wait() | |
1035 | return |
|
1035 | return | |
1036 |
|
1036 | |||
1037 | if mode == 'install': |
|
1037 | if mode == 'install': | |
1038 | try: |
|
1038 | try: | |
1039 | shutil.copytree(rcdir,ipythondir) |
|
1039 | shutil.copytree(rcdir,ipythondir) | |
1040 | os.chdir(ipythondir) |
|
1040 | os.chdir(ipythondir) | |
1041 | rc_files = glb("ipythonrc*") |
|
1041 | rc_files = glb("ipythonrc*") | |
1042 | for rc_file in rc_files: |
|
1042 | for rc_file in rc_files: | |
1043 | os.rename(rc_file,rc_file+rc_suffix) |
|
1043 | os.rename(rc_file,rc_file+rc_suffix) | |
1044 | except: |
|
1044 | except: | |
1045 | warning = """ |
|
1045 | warning = """ | |
1046 |
|
1046 | |||
1047 | There was a problem with the installation: |
|
1047 | There was a problem with the installation: | |
1048 | %s |
|
1048 | %s | |
1049 | Try to correct it or contact the developers if you think it's a bug. |
|
1049 | Try to correct it or contact the developers if you think it's a bug. | |
1050 | IPython will proceed with builtin defaults.""" % sys.exc_info()[1] |
|
1050 | IPython will proceed with builtin defaults.""" % sys.exc_info()[1] | |
1051 | warn(warning) |
|
1051 | warn(warning) | |
1052 | wait() |
|
1052 | wait() | |
1053 | return |
|
1053 | return | |
1054 |
|
1054 | |||
1055 | elif mode == 'upgrade': |
|
1055 | elif mode == 'upgrade': | |
1056 | try: |
|
1056 | try: | |
1057 | os.chdir(ipythondir) |
|
1057 | os.chdir(ipythondir) | |
1058 | except: |
|
1058 | except: | |
1059 | print """ |
|
1059 | print """ | |
1060 | Can not upgrade: changing to directory %s failed. Details: |
|
1060 | Can not upgrade: changing to directory %s failed. Details: | |
1061 | %s |
|
1061 | %s | |
1062 | """ % (ipythondir,sys.exc_info()[1]) |
|
1062 | """ % (ipythondir,sys.exc_info()[1]) | |
1063 | wait() |
|
1063 | wait() | |
1064 | return |
|
1064 | return | |
1065 | else: |
|
1065 | else: | |
1066 | sources = glb(os.path.join(rcdir,'[A-Za-z]*')) |
|
1066 | sources = glb(os.path.join(rcdir,'[A-Za-z]*')) | |
1067 | for new_full_path in sources: |
|
1067 | for new_full_path in sources: | |
1068 | new_filename = os.path.basename(new_full_path) |
|
1068 | new_filename = os.path.basename(new_full_path) | |
1069 | if new_filename.startswith('ipythonrc'): |
|
1069 | if new_filename.startswith('ipythonrc'): | |
1070 | new_filename = new_filename + rc_suffix |
|
1070 | new_filename = new_filename + rc_suffix | |
1071 | # The config directory should only contain files, skip any |
|
1071 | # The config directory should only contain files, skip any | |
1072 | # directories which may be there (like CVS) |
|
1072 | # directories which may be there (like CVS) | |
1073 | if os.path.isdir(new_full_path): |
|
1073 | if os.path.isdir(new_full_path): | |
1074 | continue |
|
1074 | continue | |
1075 | if os.path.exists(new_filename): |
|
1075 | if os.path.exists(new_filename): | |
1076 | old_file = new_filename+'.old' |
|
1076 | old_file = new_filename+'.old' | |
1077 | if os.path.exists(old_file): |
|
1077 | if os.path.exists(old_file): | |
1078 | os.remove(old_file) |
|
1078 | os.remove(old_file) | |
1079 | os.rename(new_filename,old_file) |
|
1079 | os.rename(new_filename,old_file) | |
1080 | shutil.copy(new_full_path,new_filename) |
|
1080 | shutil.copy(new_full_path,new_filename) | |
1081 | else: |
|
1081 | else: | |
1082 | raise ValueError,'unrecognized mode for install:',`mode` |
|
1082 | raise ValueError,'unrecognized mode for install:',`mode` | |
1083 |
|
1083 | |||
1084 | # Fix line-endings to those native to each platform in the config |
|
1084 | # Fix line-endings to those native to each platform in the config | |
1085 | # directory. |
|
1085 | # directory. | |
1086 | try: |
|
1086 | try: | |
1087 | os.chdir(ipythondir) |
|
1087 | os.chdir(ipythondir) | |
1088 | except: |
|
1088 | except: | |
1089 | print """ |
|
1089 | print """ | |
1090 | Problem: changing to directory %s failed. |
|
1090 | Problem: changing to directory %s failed. | |
1091 | Details: |
|
1091 | Details: | |
1092 | %s |
|
1092 | %s | |
1093 |
|
1093 | |||
1094 | Some configuration files may have incorrect line endings. This should not |
|
1094 | Some configuration files may have incorrect line endings. This should not | |
1095 | cause any problems during execution. """ % (ipythondir,sys.exc_info()[1]) |
|
1095 | cause any problems during execution. """ % (ipythondir,sys.exc_info()[1]) | |
1096 | wait() |
|
1096 | wait() | |
1097 | else: |
|
1097 | else: | |
1098 | for fname in glb('ipythonrc*'): |
|
1098 | for fname in glb('ipythonrc*'): | |
1099 | try: |
|
1099 | try: | |
1100 | native_line_ends(fname,backup=0) |
|
1100 | native_line_ends(fname,backup=0) | |
1101 | except IOError: |
|
1101 | except IOError: | |
1102 | pass |
|
1102 | pass | |
1103 |
|
1103 | |||
1104 | if mode == 'install': |
|
1104 | if mode == 'install': | |
1105 | print """ |
|
1105 | print """ | |
1106 | Successful installation! |
|
1106 | Successful installation! | |
1107 |
|
1107 | |||
1108 | Please read the sections 'Initial Configuration' and 'Quick Tips' in the |
|
1108 | Please read the sections 'Initial Configuration' and 'Quick Tips' in the | |
1109 | IPython manual (there are both HTML and PDF versions supplied with the |
|
1109 | IPython manual (there are both HTML and PDF versions supplied with the | |
1110 | distribution) to make sure that your system environment is properly configured |
|
1110 | distribution) to make sure that your system environment is properly configured | |
1111 | to take advantage of IPython's features. |
|
1111 | to take advantage of IPython's features. | |
1112 |
|
1112 | |||
1113 | Important note: the configuration system has changed! The old system is |
|
1113 | Important note: the configuration system has changed! The old system is | |
1114 | still in place, but its setting may be partly overridden by the settings in |
|
1114 | still in place, but its setting may be partly overridden by the settings in | |
1115 | "~/.ipython/ipy_user_conf.py" config file. Please take a look at the file |
|
1115 | "~/.ipython/ipy_user_conf.py" config file. Please take a look at the file | |
1116 | if some of the new settings bother you. |
|
1116 | if some of the new settings bother you. | |
1117 |
|
1117 | |||
1118 | """ |
|
1118 | """ | |
1119 | else: |
|
1119 | else: | |
1120 | print """ |
|
1120 | print """ | |
1121 | Successful upgrade! |
|
1121 | Successful upgrade! | |
1122 |
|
1122 | |||
1123 | All files in your directory: |
|
1123 | All files in your directory: | |
1124 | %(ipythondir)s |
|
1124 | %(ipythondir)s | |
1125 | which would have been overwritten by the upgrade were backed up with a .old |
|
1125 | which would have been overwritten by the upgrade were backed up with a .old | |
1126 | extension. If you had made particular customizations in those files you may |
|
1126 | extension. If you had made particular customizations in those files you may | |
1127 | want to merge them back into the new files.""" % locals() |
|
1127 | want to merge them back into the new files.""" % locals() | |
1128 | wait() |
|
1128 | wait() | |
1129 | os.chdir(cwd) |
|
1129 | os.chdir(cwd) | |
1130 | # end user_setup() |
|
1130 | # end user_setup() | |
1131 |
|
1131 | |||
1132 | def atexit_operations(self): |
|
1132 | def atexit_operations(self): | |
1133 | """This will be executed at the time of exit. |
|
1133 | """This will be executed at the time of exit. | |
1134 |
|
1134 | |||
1135 | Saving of persistent data should be performed here. """ |
|
1135 | Saving of persistent data should be performed here. """ | |
1136 |
|
1136 | |||
1137 | #print '*** IPython exit cleanup ***' # dbg |
|
1137 | #print '*** IPython exit cleanup ***' # dbg | |
1138 | # input history |
|
1138 | # input history | |
1139 | self.savehist() |
|
1139 | self.savehist() | |
1140 |
|
1140 | |||
1141 | # Cleanup all tempfiles left around |
|
1141 | # Cleanup all tempfiles left around | |
1142 | for tfile in self.tempfiles: |
|
1142 | for tfile in self.tempfiles: | |
1143 | try: |
|
1143 | try: | |
1144 | os.unlink(tfile) |
|
1144 | os.unlink(tfile) | |
1145 | except OSError: |
|
1145 | except OSError: | |
1146 | pass |
|
1146 | pass | |
1147 |
|
1147 | |||
1148 | # save the "persistent data" catch-all dictionary |
|
1148 | # save the "persistent data" catch-all dictionary | |
1149 | self.hooks.shutdown_hook() |
|
1149 | self.hooks.shutdown_hook() | |
1150 |
|
1150 | |||
1151 | def savehist(self): |
|
1151 | def savehist(self): | |
1152 | """Save input history to a file (via readline library).""" |
|
1152 | """Save input history to a file (via readline library).""" | |
1153 | try: |
|
1153 | try: | |
1154 | self.readline.write_history_file(self.histfile) |
|
1154 | self.readline.write_history_file(self.histfile) | |
1155 | except: |
|
1155 | except: | |
1156 | print 'Unable to save IPython command history to file: ' + \ |
|
1156 | print 'Unable to save IPython command history to file: ' + \ | |
1157 | `self.histfile` |
|
1157 | `self.histfile` | |
1158 |
|
1158 | |||
1159 | def pre_readline(self): |
|
1159 | def pre_readline(self): | |
1160 | """readline hook to be used at the start of each line. |
|
1160 | """readline hook to be used at the start of each line. | |
1161 |
|
1161 | |||
1162 | Currently it handles auto-indent only.""" |
|
1162 | Currently it handles auto-indent only.""" | |
1163 |
|
1163 | |||
1164 | #debugx('self.indent_current_nsp','pre_readline:') |
|
1164 | #debugx('self.indent_current_nsp','pre_readline:') | |
1165 | self.readline.insert_text(self.indent_current_str()) |
|
1165 | self.readline.insert_text(self.indent_current_str()) | |
1166 |
|
1166 | |||
1167 | def init_readline(self): |
|
1167 | def init_readline(self): | |
1168 | """Command history completion/saving/reloading.""" |
|
1168 | """Command history completion/saving/reloading.""" | |
1169 |
|
1169 | |||
1170 | import IPython.rlineimpl as readline |
|
1170 | import IPython.rlineimpl as readline | |
1171 | if not readline.have_readline: |
|
1171 | if not readline.have_readline: | |
1172 | self.has_readline = 0 |
|
1172 | self.has_readline = 0 | |
1173 | self.readline = None |
|
1173 | self.readline = None | |
1174 | # no point in bugging windows users with this every time: |
|
1174 | # no point in bugging windows users with this every time: | |
1175 | warn('Readline services not available on this platform.') |
|
1175 | warn('Readline services not available on this platform.') | |
1176 | else: |
|
1176 | else: | |
1177 | sys.modules['readline'] = readline |
|
1177 | sys.modules['readline'] = readline | |
1178 | import atexit |
|
1178 | import atexit | |
1179 | from IPython.completer import IPCompleter |
|
1179 | from IPython.completer import IPCompleter | |
1180 | self.Completer = IPCompleter(self, |
|
1180 | self.Completer = IPCompleter(self, | |
1181 | self.user_ns, |
|
1181 | self.user_ns, | |
1182 | self.user_global_ns, |
|
1182 | self.user_global_ns, | |
1183 | self.rc.readline_omit__names, |
|
1183 | self.rc.readline_omit__names, | |
1184 | self.alias_table) |
|
1184 | self.alias_table) | |
1185 |
|
1185 | |||
1186 | # Platform-specific configuration |
|
1186 | # Platform-specific configuration | |
1187 | if os.name == 'nt': |
|
1187 | if os.name == 'nt': | |
1188 | self.readline_startup_hook = readline.set_pre_input_hook |
|
1188 | self.readline_startup_hook = readline.set_pre_input_hook | |
1189 | else: |
|
1189 | else: | |
1190 | self.readline_startup_hook = readline.set_startup_hook |
|
1190 | self.readline_startup_hook = readline.set_startup_hook | |
1191 |
|
1191 | |||
1192 | # Load user's initrc file (readline config) |
|
1192 | # Load user's initrc file (readline config) | |
1193 | inputrc_name = os.environ.get('INPUTRC') |
|
1193 | inputrc_name = os.environ.get('INPUTRC') | |
1194 | if inputrc_name is None: |
|
1194 | if inputrc_name is None: | |
1195 | home_dir = get_home_dir() |
|
1195 | home_dir = get_home_dir() | |
1196 | if home_dir is not None: |
|
1196 | if home_dir is not None: | |
1197 | inputrc_name = os.path.join(home_dir,'.inputrc') |
|
1197 | inputrc_name = os.path.join(home_dir,'.inputrc') | |
1198 | if os.path.isfile(inputrc_name): |
|
1198 | if os.path.isfile(inputrc_name): | |
1199 | try: |
|
1199 | try: | |
1200 | readline.read_init_file(inputrc_name) |
|
1200 | readline.read_init_file(inputrc_name) | |
1201 | except: |
|
1201 | except: | |
1202 | warn('Problems reading readline initialization file <%s>' |
|
1202 | warn('Problems reading readline initialization file <%s>' | |
1203 | % inputrc_name) |
|
1203 | % inputrc_name) | |
1204 |
|
1204 | |||
1205 | self.has_readline = 1 |
|
1205 | self.has_readline = 1 | |
1206 | self.readline = readline |
|
1206 | self.readline = readline | |
1207 | # save this in sys so embedded copies can restore it properly |
|
1207 | # save this in sys so embedded copies can restore it properly | |
1208 | sys.ipcompleter = self.Completer.complete |
|
1208 | sys.ipcompleter = self.Completer.complete | |
1209 | readline.set_completer(self.Completer.complete) |
|
1209 | readline.set_completer(self.Completer.complete) | |
1210 |
|
1210 | |||
1211 | # Configure readline according to user's prefs |
|
1211 | # Configure readline according to user's prefs | |
1212 | for rlcommand in self.rc.readline_parse_and_bind: |
|
1212 | for rlcommand in self.rc.readline_parse_and_bind: | |
1213 | readline.parse_and_bind(rlcommand) |
|
1213 | readline.parse_and_bind(rlcommand) | |
1214 |
|
1214 | |||
1215 | # remove some chars from the delimiters list |
|
1215 | # remove some chars from the delimiters list | |
1216 | delims = readline.get_completer_delims() |
|
1216 | delims = readline.get_completer_delims() | |
1217 | delims = delims.translate(string._idmap, |
|
1217 | delims = delims.translate(string._idmap, | |
1218 | self.rc.readline_remove_delims) |
|
1218 | self.rc.readline_remove_delims) | |
1219 | readline.set_completer_delims(delims) |
|
1219 | readline.set_completer_delims(delims) | |
1220 | # otherwise we end up with a monster history after a while: |
|
1220 | # otherwise we end up with a monster history after a while: | |
1221 | readline.set_history_length(1000) |
|
1221 | readline.set_history_length(1000) | |
1222 | try: |
|
1222 | try: | |
1223 | #print '*** Reading readline history' # dbg |
|
1223 | #print '*** Reading readline history' # dbg | |
1224 | readline.read_history_file(self.histfile) |
|
1224 | readline.read_history_file(self.histfile) | |
1225 | except IOError: |
|
1225 | except IOError: | |
1226 | pass # It doesn't exist yet. |
|
1226 | pass # It doesn't exist yet. | |
1227 |
|
1227 | |||
1228 | atexit.register(self.atexit_operations) |
|
1228 | atexit.register(self.atexit_operations) | |
1229 | del atexit |
|
1229 | del atexit | |
1230 |
|
1230 | |||
1231 | # Configure auto-indent for all platforms |
|
1231 | # Configure auto-indent for all platforms | |
1232 | self.set_autoindent(self.rc.autoindent) |
|
1232 | self.set_autoindent(self.rc.autoindent) | |
1233 |
|
1233 | |||
|
1234 | def ask_yes_no(self,prompt,default=True): | |||
|
1235 | if self.rc.quiet: | |||
|
1236 | return True | |||
|
1237 | return ask_yes_no(prompt,default) | |||
|
1238 | ||||
1234 | def _should_recompile(self,e): |
|
1239 | def _should_recompile(self,e): | |
1235 | """Utility routine for edit_syntax_error""" |
|
1240 | """Utility routine for edit_syntax_error""" | |
1236 |
|
1241 | |||
1237 | if e.filename in ('<ipython console>','<input>','<string>', |
|
1242 | if e.filename in ('<ipython console>','<input>','<string>', | |
1238 | '<console>','<BackgroundJob compilation>', |
|
1243 | '<console>','<BackgroundJob compilation>', | |
1239 | None): |
|
1244 | None): | |
1240 |
|
1245 | |||
1241 | return False |
|
1246 | return False | |
1242 | try: |
|
1247 | try: | |
1243 | if (self.rc.autoedit_syntax and |
|
1248 | if (self.rc.autoedit_syntax and | |
1244 | not ask_yes_no('Return to editor to correct syntax error? ' |
|
1249 | not self.ask_yes_no('Return to editor to correct syntax error? ' | |
1245 | '[Y/n] ','y')): |
|
1250 | '[Y/n] ','y')): | |
1246 | return False |
|
1251 | return False | |
1247 | except EOFError: |
|
1252 | except EOFError: | |
1248 | return False |
|
1253 | return False | |
1249 |
|
1254 | |||
1250 | def int0(x): |
|
1255 | def int0(x): | |
1251 | try: |
|
1256 | try: | |
1252 | return int(x) |
|
1257 | return int(x) | |
1253 | except TypeError: |
|
1258 | except TypeError: | |
1254 | return 0 |
|
1259 | return 0 | |
1255 | # always pass integer line and offset values to editor hook |
|
1260 | # always pass integer line and offset values to editor hook | |
1256 | self.hooks.fix_error_editor(e.filename, |
|
1261 | self.hooks.fix_error_editor(e.filename, | |
1257 | int0(e.lineno),int0(e.offset),e.msg) |
|
1262 | int0(e.lineno),int0(e.offset),e.msg) | |
1258 | return True |
|
1263 | return True | |
1259 |
|
1264 | |||
1260 | def edit_syntax_error(self): |
|
1265 | def edit_syntax_error(self): | |
1261 | """The bottom half of the syntax error handler called in the main loop. |
|
1266 | """The bottom half of the syntax error handler called in the main loop. | |
1262 |
|
1267 | |||
1263 | Loop until syntax error is fixed or user cancels. |
|
1268 | Loop until syntax error is fixed or user cancels. | |
1264 | """ |
|
1269 | """ | |
1265 |
|
1270 | |||
1266 | while self.SyntaxTB.last_syntax_error: |
|
1271 | while self.SyntaxTB.last_syntax_error: | |
1267 | # copy and clear last_syntax_error |
|
1272 | # copy and clear last_syntax_error | |
1268 | err = self.SyntaxTB.clear_err_state() |
|
1273 | err = self.SyntaxTB.clear_err_state() | |
1269 | if not self._should_recompile(err): |
|
1274 | if not self._should_recompile(err): | |
1270 | return |
|
1275 | return | |
1271 | try: |
|
1276 | try: | |
1272 | # may set last_syntax_error again if a SyntaxError is raised |
|
1277 | # may set last_syntax_error again if a SyntaxError is raised | |
1273 | self.safe_execfile(err.filename,self.user_ns) |
|
1278 | self.safe_execfile(err.filename,self.user_ns) | |
1274 | except: |
|
1279 | except: | |
1275 | self.showtraceback() |
|
1280 | self.showtraceback() | |
1276 | else: |
|
1281 | else: | |
1277 | try: |
|
1282 | try: | |
1278 | f = file(err.filename) |
|
1283 | f = file(err.filename) | |
1279 | try: |
|
1284 | try: | |
1280 | sys.displayhook(f.read()) |
|
1285 | sys.displayhook(f.read()) | |
1281 | finally: |
|
1286 | finally: | |
1282 | f.close() |
|
1287 | f.close() | |
1283 | except: |
|
1288 | except: | |
1284 | self.showtraceback() |
|
1289 | self.showtraceback() | |
1285 |
|
1290 | |||
1286 | def showsyntaxerror(self, filename=None): |
|
1291 | def showsyntaxerror(self, filename=None): | |
1287 | """Display the syntax error that just occurred. |
|
1292 | """Display the syntax error that just occurred. | |
1288 |
|
1293 | |||
1289 | This doesn't display a stack trace because there isn't one. |
|
1294 | This doesn't display a stack trace because there isn't one. | |
1290 |
|
1295 | |||
1291 | If a filename is given, it is stuffed in the exception instead |
|
1296 | If a filename is given, it is stuffed in the exception instead | |
1292 | of what was there before (because Python's parser always uses |
|
1297 | of what was there before (because Python's parser always uses | |
1293 | "<string>" when reading from a string). |
|
1298 | "<string>" when reading from a string). | |
1294 | """ |
|
1299 | """ | |
1295 | etype, value, last_traceback = sys.exc_info() |
|
1300 | etype, value, last_traceback = sys.exc_info() | |
1296 |
|
1301 | |||
1297 | # See note about these variables in showtraceback() below |
|
1302 | # See note about these variables in showtraceback() below | |
1298 | sys.last_type = etype |
|
1303 | sys.last_type = etype | |
1299 | sys.last_value = value |
|
1304 | sys.last_value = value | |
1300 | sys.last_traceback = last_traceback |
|
1305 | sys.last_traceback = last_traceback | |
1301 |
|
1306 | |||
1302 | if filename and etype is SyntaxError: |
|
1307 | if filename and etype is SyntaxError: | |
1303 | # Work hard to stuff the correct filename in the exception |
|
1308 | # Work hard to stuff the correct filename in the exception | |
1304 | try: |
|
1309 | try: | |
1305 | msg, (dummy_filename, lineno, offset, line) = value |
|
1310 | msg, (dummy_filename, lineno, offset, line) = value | |
1306 | except: |
|
1311 | except: | |
1307 | # Not the format we expect; leave it alone |
|
1312 | # Not the format we expect; leave it alone | |
1308 | pass |
|
1313 | pass | |
1309 | else: |
|
1314 | else: | |
1310 | # Stuff in the right filename |
|
1315 | # Stuff in the right filename | |
1311 | try: |
|
1316 | try: | |
1312 | # Assume SyntaxError is a class exception |
|
1317 | # Assume SyntaxError is a class exception | |
1313 | value = SyntaxError(msg, (filename, lineno, offset, line)) |
|
1318 | value = SyntaxError(msg, (filename, lineno, offset, line)) | |
1314 | except: |
|
1319 | except: | |
1315 | # If that failed, assume SyntaxError is a string |
|
1320 | # If that failed, assume SyntaxError is a string | |
1316 | value = msg, (filename, lineno, offset, line) |
|
1321 | value = msg, (filename, lineno, offset, line) | |
1317 | self.SyntaxTB(etype,value,[]) |
|
1322 | self.SyntaxTB(etype,value,[]) | |
1318 |
|
1323 | |||
1319 | def debugger(self): |
|
1324 | def debugger(self): | |
1320 | """Call the pdb debugger.""" |
|
1325 | """Call the pdb debugger.""" | |
1321 |
|
1326 | |||
1322 | if not self.rc.pdb: |
|
1327 | if not self.rc.pdb: | |
1323 | return |
|
1328 | return | |
1324 | pdb.pm() |
|
1329 | pdb.pm() | |
1325 |
|
1330 | |||
1326 | def showtraceback(self,exc_tuple = None,filename=None,tb_offset=None): |
|
1331 | def showtraceback(self,exc_tuple = None,filename=None,tb_offset=None): | |
1327 | """Display the exception that just occurred. |
|
1332 | """Display the exception that just occurred. | |
1328 |
|
1333 | |||
1329 | If nothing is known about the exception, this is the method which |
|
1334 | If nothing is known about the exception, this is the method which | |
1330 | should be used throughout the code for presenting user tracebacks, |
|
1335 | should be used throughout the code for presenting user tracebacks, | |
1331 | rather than directly invoking the InteractiveTB object. |
|
1336 | rather than directly invoking the InteractiveTB object. | |
1332 |
|
1337 | |||
1333 | A specific showsyntaxerror() also exists, but this method can take |
|
1338 | A specific showsyntaxerror() also exists, but this method can take | |
1334 | care of calling it if needed, so unless you are explicitly catching a |
|
1339 | care of calling it if needed, so unless you are explicitly catching a | |
1335 | SyntaxError exception, don't try to analyze the stack manually and |
|
1340 | SyntaxError exception, don't try to analyze the stack manually and | |
1336 | simply call this method.""" |
|
1341 | simply call this method.""" | |
1337 |
|
1342 | |||
1338 | # Though this won't be called by syntax errors in the input line, |
|
1343 | # Though this won't be called by syntax errors in the input line, | |
1339 | # there may be SyntaxError cases whith imported code. |
|
1344 | # there may be SyntaxError cases whith imported code. | |
1340 | if exc_tuple is None: |
|
1345 | if exc_tuple is None: | |
1341 | etype, value, tb = sys.exc_info() |
|
1346 | etype, value, tb = sys.exc_info() | |
1342 | else: |
|
1347 | else: | |
1343 | etype, value, tb = exc_tuple |
|
1348 | etype, value, tb = exc_tuple | |
1344 | if etype is SyntaxError: |
|
1349 | if etype is SyntaxError: | |
1345 | self.showsyntaxerror(filename) |
|
1350 | self.showsyntaxerror(filename) | |
1346 | else: |
|
1351 | else: | |
1347 | # WARNING: these variables are somewhat deprecated and not |
|
1352 | # WARNING: these variables are somewhat deprecated and not | |
1348 | # necessarily safe to use in a threaded environment, but tools |
|
1353 | # necessarily safe to use in a threaded environment, but tools | |
1349 | # like pdb depend on their existence, so let's set them. If we |
|
1354 | # like pdb depend on their existence, so let's set them. If we | |
1350 | # find problems in the field, we'll need to revisit their use. |
|
1355 | # find problems in the field, we'll need to revisit their use. | |
1351 | sys.last_type = etype |
|
1356 | sys.last_type = etype | |
1352 | sys.last_value = value |
|
1357 | sys.last_value = value | |
1353 | sys.last_traceback = tb |
|
1358 | sys.last_traceback = tb | |
1354 |
|
1359 | |||
1355 | self.InteractiveTB(etype,value,tb,tb_offset=tb_offset) |
|
1360 | self.InteractiveTB(etype,value,tb,tb_offset=tb_offset) | |
1356 | if self.InteractiveTB.call_pdb and self.has_readline: |
|
1361 | if self.InteractiveTB.call_pdb and self.has_readline: | |
1357 | # pdb mucks up readline, fix it back |
|
1362 | # pdb mucks up readline, fix it back | |
1358 | self.readline.set_completer(self.Completer.complete) |
|
1363 | self.readline.set_completer(self.Completer.complete) | |
1359 |
|
1364 | |||
1360 | def mainloop(self,banner=None): |
|
1365 | def mainloop(self,banner=None): | |
1361 | """Creates the local namespace and starts the mainloop. |
|
1366 | """Creates the local namespace and starts the mainloop. | |
1362 |
|
1367 | |||
1363 | If an optional banner argument is given, it will override the |
|
1368 | If an optional banner argument is given, it will override the | |
1364 | internally created default banner.""" |
|
1369 | internally created default banner.""" | |
1365 |
|
1370 | |||
1366 | if self.rc.c: # Emulate Python's -c option |
|
1371 | if self.rc.c: # Emulate Python's -c option | |
1367 | self.exec_init_cmd() |
|
1372 | self.exec_init_cmd() | |
1368 | if banner is None: |
|
1373 | if banner is None: | |
1369 | if not self.rc.banner: |
|
1374 | if not self.rc.banner: | |
1370 | banner = '' |
|
1375 | banner = '' | |
1371 | # banner is string? Use it directly! |
|
1376 | # banner is string? Use it directly! | |
1372 | elif isinstance(self.rc.banner,basestring): |
|
1377 | elif isinstance(self.rc.banner,basestring): | |
1373 | banner = self.rc.banner |
|
1378 | banner = self.rc.banner | |
1374 | else: |
|
1379 | else: | |
1375 | banner = self.BANNER+self.banner2 |
|
1380 | banner = self.BANNER+self.banner2 | |
1376 |
|
1381 | |||
1377 | self.interact(banner) |
|
1382 | self.interact(banner) | |
1378 |
|
1383 | |||
1379 | def exec_init_cmd(self): |
|
1384 | def exec_init_cmd(self): | |
1380 | """Execute a command given at the command line. |
|
1385 | """Execute a command given at the command line. | |
1381 |
|
1386 | |||
1382 | This emulates Python's -c option.""" |
|
1387 | This emulates Python's -c option.""" | |
1383 |
|
1388 | |||
1384 | #sys.argv = ['-c'] |
|
1389 | #sys.argv = ['-c'] | |
1385 | self.push(self.rc.c) |
|
1390 | self.push(self.rc.c) | |
1386 |
|
1391 | |||
1387 | def embed_mainloop(self,header='',local_ns=None,global_ns=None,stack_depth=0): |
|
1392 | def embed_mainloop(self,header='',local_ns=None,global_ns=None,stack_depth=0): | |
1388 | """Embeds IPython into a running python program. |
|
1393 | """Embeds IPython into a running python program. | |
1389 |
|
1394 | |||
1390 | Input: |
|
1395 | Input: | |
1391 |
|
1396 | |||
1392 | - header: An optional header message can be specified. |
|
1397 | - header: An optional header message can be specified. | |
1393 |
|
1398 | |||
1394 | - local_ns, global_ns: working namespaces. If given as None, the |
|
1399 | - local_ns, global_ns: working namespaces. If given as None, the | |
1395 | IPython-initialized one is updated with __main__.__dict__, so that |
|
1400 | IPython-initialized one is updated with __main__.__dict__, so that | |
1396 | program variables become visible but user-specific configuration |
|
1401 | program variables become visible but user-specific configuration | |
1397 | remains possible. |
|
1402 | remains possible. | |
1398 |
|
1403 | |||
1399 | - stack_depth: specifies how many levels in the stack to go to |
|
1404 | - stack_depth: specifies how many levels in the stack to go to | |
1400 | looking for namespaces (when local_ns and global_ns are None). This |
|
1405 | looking for namespaces (when local_ns and global_ns are None). This | |
1401 | allows an intermediate caller to make sure that this function gets |
|
1406 | allows an intermediate caller to make sure that this function gets | |
1402 | the namespace from the intended level in the stack. By default (0) |
|
1407 | the namespace from the intended level in the stack. By default (0) | |
1403 | it will get its locals and globals from the immediate caller. |
|
1408 | it will get its locals and globals from the immediate caller. | |
1404 |
|
1409 | |||
1405 | Warning: it's possible to use this in a program which is being run by |
|
1410 | Warning: it's possible to use this in a program which is being run by | |
1406 | IPython itself (via %run), but some funny things will happen (a few |
|
1411 | IPython itself (via %run), but some funny things will happen (a few | |
1407 | globals get overwritten). In the future this will be cleaned up, as |
|
1412 | globals get overwritten). In the future this will be cleaned up, as | |
1408 | there is no fundamental reason why it can't work perfectly.""" |
|
1413 | there is no fundamental reason why it can't work perfectly.""" | |
1409 |
|
1414 | |||
1410 | # Get locals and globals from caller |
|
1415 | # Get locals and globals from caller | |
1411 | if local_ns is None or global_ns is None: |
|
1416 | if local_ns is None or global_ns is None: | |
1412 | call_frame = sys._getframe(stack_depth).f_back |
|
1417 | call_frame = sys._getframe(stack_depth).f_back | |
1413 |
|
1418 | |||
1414 | if local_ns is None: |
|
1419 | if local_ns is None: | |
1415 | local_ns = call_frame.f_locals |
|
1420 | local_ns = call_frame.f_locals | |
1416 | if global_ns is None: |
|
1421 | if global_ns is None: | |
1417 | global_ns = call_frame.f_globals |
|
1422 | global_ns = call_frame.f_globals | |
1418 |
|
1423 | |||
1419 | # Update namespaces and fire up interpreter |
|
1424 | # Update namespaces and fire up interpreter | |
1420 |
|
1425 | |||
1421 | # The global one is easy, we can just throw it in |
|
1426 | # The global one is easy, we can just throw it in | |
1422 | self.user_global_ns = global_ns |
|
1427 | self.user_global_ns = global_ns | |
1423 |
|
1428 | |||
1424 | # but the user/local one is tricky: ipython needs it to store internal |
|
1429 | # but the user/local one is tricky: ipython needs it to store internal | |
1425 | # data, but we also need the locals. We'll copy locals in the user |
|
1430 | # data, but we also need the locals. We'll copy locals in the user | |
1426 | # one, but will track what got copied so we can delete them at exit. |
|
1431 | # one, but will track what got copied so we can delete them at exit. | |
1427 | # This is so that a later embedded call doesn't see locals from a |
|
1432 | # This is so that a later embedded call doesn't see locals from a | |
1428 | # previous call (which most likely existed in a separate scope). |
|
1433 | # previous call (which most likely existed in a separate scope). | |
1429 | local_varnames = local_ns.keys() |
|
1434 | local_varnames = local_ns.keys() | |
1430 | self.user_ns.update(local_ns) |
|
1435 | self.user_ns.update(local_ns) | |
1431 |
|
1436 | |||
1432 | # Patch for global embedding to make sure that things don't overwrite |
|
1437 | # Patch for global embedding to make sure that things don't overwrite | |
1433 | # user globals accidentally. Thanks to Richard <rxe@renre-europe.com> |
|
1438 | # user globals accidentally. Thanks to Richard <rxe@renre-europe.com> | |
1434 | # FIXME. Test this a bit more carefully (the if.. is new) |
|
1439 | # FIXME. Test this a bit more carefully (the if.. is new) | |
1435 | if local_ns is None and global_ns is None: |
|
1440 | if local_ns is None and global_ns is None: | |
1436 | self.user_global_ns.update(__main__.__dict__) |
|
1441 | self.user_global_ns.update(__main__.__dict__) | |
1437 |
|
1442 | |||
1438 | # make sure the tab-completer has the correct frame information, so it |
|
1443 | # make sure the tab-completer has the correct frame information, so it | |
1439 | # actually completes using the frame's locals/globals |
|
1444 | # actually completes using the frame's locals/globals | |
1440 | self.set_completer_frame() |
|
1445 | self.set_completer_frame() | |
1441 |
|
1446 | |||
1442 | # before activating the interactive mode, we need to make sure that |
|
1447 | # before activating the interactive mode, we need to make sure that | |
1443 | # all names in the builtin namespace needed by ipython point to |
|
1448 | # all names in the builtin namespace needed by ipython point to | |
1444 | # ourselves, and not to other instances. |
|
1449 | # ourselves, and not to other instances. | |
1445 | self.add_builtins() |
|
1450 | self.add_builtins() | |
1446 |
|
1451 | |||
1447 | self.interact(header) |
|
1452 | self.interact(header) | |
1448 |
|
1453 | |||
1449 | # now, purge out the user namespace from anything we might have added |
|
1454 | # now, purge out the user namespace from anything we might have added | |
1450 | # from the caller's local namespace |
|
1455 | # from the caller's local namespace | |
1451 | delvar = self.user_ns.pop |
|
1456 | delvar = self.user_ns.pop | |
1452 | for var in local_varnames: |
|
1457 | for var in local_varnames: | |
1453 | delvar(var,None) |
|
1458 | delvar(var,None) | |
1454 | # and clean builtins we may have overridden |
|
1459 | # and clean builtins we may have overridden | |
1455 | self.clean_builtins() |
|
1460 | self.clean_builtins() | |
1456 |
|
1461 | |||
1457 | def interact(self, banner=None): |
|
1462 | def interact(self, banner=None): | |
1458 | """Closely emulate the interactive Python console. |
|
1463 | """Closely emulate the interactive Python console. | |
1459 |
|
1464 | |||
1460 | The optional banner argument specify the banner to print |
|
1465 | The optional banner argument specify the banner to print | |
1461 | before the first interaction; by default it prints a banner |
|
1466 | before the first interaction; by default it prints a banner | |
1462 | similar to the one printed by the real Python interpreter, |
|
1467 | similar to the one printed by the real Python interpreter, | |
1463 | followed by the current class name in parentheses (so as not |
|
1468 | followed by the current class name in parentheses (so as not | |
1464 | to confuse this with the real interpreter -- since it's so |
|
1469 | to confuse this with the real interpreter -- since it's so | |
1465 | close!). |
|
1470 | close!). | |
1466 |
|
1471 | |||
1467 | """ |
|
1472 | """ | |
1468 | cprt = 'Type "copyright", "credits" or "license" for more information.' |
|
1473 | cprt = 'Type "copyright", "credits" or "license" for more information.' | |
1469 | if banner is None: |
|
1474 | if banner is None: | |
1470 | self.write("Python %s on %s\n%s\n(%s)\n" % |
|
1475 | self.write("Python %s on %s\n%s\n(%s)\n" % | |
1471 | (sys.version, sys.platform, cprt, |
|
1476 | (sys.version, sys.platform, cprt, | |
1472 | self.__class__.__name__)) |
|
1477 | self.__class__.__name__)) | |
1473 | else: |
|
1478 | else: | |
1474 | self.write(banner) |
|
1479 | self.write(banner) | |
1475 |
|
1480 | |||
1476 | more = 0 |
|
1481 | more = 0 | |
1477 |
|
1482 | |||
1478 | # Mark activity in the builtins |
|
1483 | # Mark activity in the builtins | |
1479 | __builtin__.__dict__['__IPYTHON__active'] += 1 |
|
1484 | __builtin__.__dict__['__IPYTHON__active'] += 1 | |
1480 |
|
1485 | |||
1481 | # exit_now is set by a call to %Exit or %Quit |
|
1486 | # exit_now is set by a call to %Exit or %Quit | |
1482 | self.exit_now = False |
|
1487 | self.exit_now = False | |
1483 | while not self.exit_now: |
|
1488 | while not self.exit_now: | |
1484 | if more: |
|
1489 | if more: | |
1485 | prompt = self.outputcache.prompt2 |
|
1490 | prompt = self.outputcache.prompt2 | |
1486 | if self.autoindent: |
|
1491 | if self.autoindent: | |
1487 | self.readline_startup_hook(self.pre_readline) |
|
1492 | self.readline_startup_hook(self.pre_readline) | |
1488 | else: |
|
1493 | else: | |
1489 | prompt = self.outputcache.prompt1 |
|
1494 | prompt = self.outputcache.prompt1 | |
1490 | try: |
|
1495 | try: | |
1491 | line = self.raw_input(prompt,more) |
|
1496 | line = self.raw_input(prompt,more) | |
1492 | if self.autoindent: |
|
1497 | if self.autoindent: | |
1493 | self.readline_startup_hook(None) |
|
1498 | self.readline_startup_hook(None) | |
1494 | except KeyboardInterrupt: |
|
1499 | except KeyboardInterrupt: | |
1495 | self.write('\nKeyboardInterrupt\n') |
|
1500 | self.write('\nKeyboardInterrupt\n') | |
1496 | self.resetbuffer() |
|
1501 | self.resetbuffer() | |
1497 | # keep cache in sync with the prompt counter: |
|
1502 | # keep cache in sync with the prompt counter: | |
1498 | self.outputcache.prompt_count -= 1 |
|
1503 | self.outputcache.prompt_count -= 1 | |
1499 |
|
1504 | |||
1500 | if self.autoindent: |
|
1505 | if self.autoindent: | |
1501 | self.indent_current_nsp = 0 |
|
1506 | self.indent_current_nsp = 0 | |
1502 | more = 0 |
|
1507 | more = 0 | |
1503 | except EOFError: |
|
1508 | except EOFError: | |
1504 | if self.autoindent: |
|
1509 | if self.autoindent: | |
1505 | self.readline_startup_hook(None) |
|
1510 | self.readline_startup_hook(None) | |
1506 | self.write('\n') |
|
1511 | self.write('\n') | |
1507 | self.exit() |
|
1512 | self.exit() | |
1508 | except bdb.BdbQuit: |
|
1513 | except bdb.BdbQuit: | |
1509 | warn('The Python debugger has exited with a BdbQuit exception.\n' |
|
1514 | warn('The Python debugger has exited with a BdbQuit exception.\n' | |
1510 | 'Because of how pdb handles the stack, it is impossible\n' |
|
1515 | 'Because of how pdb handles the stack, it is impossible\n' | |
1511 | 'for IPython to properly format this particular exception.\n' |
|
1516 | 'for IPython to properly format this particular exception.\n' | |
1512 | 'IPython will resume normal operation.') |
|
1517 | 'IPython will resume normal operation.') | |
1513 | except: |
|
1518 | except: | |
1514 | # exceptions here are VERY RARE, but they can be triggered |
|
1519 | # exceptions here are VERY RARE, but they can be triggered | |
1515 | # asynchronously by signal handlers, for example. |
|
1520 | # asynchronously by signal handlers, for example. | |
1516 | self.showtraceback() |
|
1521 | self.showtraceback() | |
1517 | else: |
|
1522 | else: | |
1518 | more = self.push(line) |
|
1523 | more = self.push(line) | |
1519 | if (self.SyntaxTB.last_syntax_error and |
|
1524 | if (self.SyntaxTB.last_syntax_error and | |
1520 | self.rc.autoedit_syntax): |
|
1525 | self.rc.autoedit_syntax): | |
1521 | self.edit_syntax_error() |
|
1526 | self.edit_syntax_error() | |
1522 |
|
1527 | |||
1523 | # We are off again... |
|
1528 | # We are off again... | |
1524 | __builtin__.__dict__['__IPYTHON__active'] -= 1 |
|
1529 | __builtin__.__dict__['__IPYTHON__active'] -= 1 | |
1525 |
|
1530 | |||
1526 | def excepthook(self, etype, value, tb): |
|
1531 | def excepthook(self, etype, value, tb): | |
1527 | """One more defense for GUI apps that call sys.excepthook. |
|
1532 | """One more defense for GUI apps that call sys.excepthook. | |
1528 |
|
1533 | |||
1529 | GUI frameworks like wxPython trap exceptions and call |
|
1534 | GUI frameworks like wxPython trap exceptions and call | |
1530 | sys.excepthook themselves. I guess this is a feature that |
|
1535 | sys.excepthook themselves. I guess this is a feature that | |
1531 | enables them to keep running after exceptions that would |
|
1536 | enables them to keep running after exceptions that would | |
1532 | otherwise kill their mainloop. This is a bother for IPython |
|
1537 | otherwise kill their mainloop. This is a bother for IPython | |
1533 | which excepts to catch all of the program exceptions with a try: |
|
1538 | which excepts to catch all of the program exceptions with a try: | |
1534 | except: statement. |
|
1539 | except: statement. | |
1535 |
|
1540 | |||
1536 | Normally, IPython sets sys.excepthook to a CrashHandler instance, so if |
|
1541 | Normally, IPython sets sys.excepthook to a CrashHandler instance, so if | |
1537 | any app directly invokes sys.excepthook, it will look to the user like |
|
1542 | any app directly invokes sys.excepthook, it will look to the user like | |
1538 | IPython crashed. In order to work around this, we can disable the |
|
1543 | IPython crashed. In order to work around this, we can disable the | |
1539 | CrashHandler and replace it with this excepthook instead, which prints a |
|
1544 | CrashHandler and replace it with this excepthook instead, which prints a | |
1540 | regular traceback using our InteractiveTB. In this fashion, apps which |
|
1545 | regular traceback using our InteractiveTB. In this fashion, apps which | |
1541 | call sys.excepthook will generate a regular-looking exception from |
|
1546 | call sys.excepthook will generate a regular-looking exception from | |
1542 | IPython, and the CrashHandler will only be triggered by real IPython |
|
1547 | IPython, and the CrashHandler will only be triggered by real IPython | |
1543 | crashes. |
|
1548 | crashes. | |
1544 |
|
1549 | |||
1545 | This hook should be used sparingly, only in places which are not likely |
|
1550 | This hook should be used sparingly, only in places which are not likely | |
1546 | to be true IPython errors. |
|
1551 | to be true IPython errors. | |
1547 | """ |
|
1552 | """ | |
1548 | self.showtraceback((etype,value,tb),tb_offset=0) |
|
1553 | self.showtraceback((etype,value,tb),tb_offset=0) | |
1549 |
|
1554 | |||
1550 | def transform_alias(self, alias,rest=''): |
|
1555 | def transform_alias(self, alias,rest=''): | |
1551 | """ Transform alias to system command string. |
|
1556 | """ Transform alias to system command string. | |
1552 | """ |
|
1557 | """ | |
1553 | nargs,cmd = self.alias_table[alias] |
|
1558 | nargs,cmd = self.alias_table[alias] | |
1554 | if ' ' in cmd and os.path.isfile(cmd): |
|
1559 | if ' ' in cmd and os.path.isfile(cmd): | |
1555 | cmd = '"%s"' % cmd |
|
1560 | cmd = '"%s"' % cmd | |
1556 |
|
1561 | |||
1557 | # Expand the %l special to be the user's input line |
|
1562 | # Expand the %l special to be the user's input line | |
1558 | if cmd.find('%l') >= 0: |
|
1563 | if cmd.find('%l') >= 0: | |
1559 | cmd = cmd.replace('%l',rest) |
|
1564 | cmd = cmd.replace('%l',rest) | |
1560 | rest = '' |
|
1565 | rest = '' | |
1561 | if nargs==0: |
|
1566 | if nargs==0: | |
1562 | # Simple, argument-less aliases |
|
1567 | # Simple, argument-less aliases | |
1563 | cmd = '%s %s' % (cmd,rest) |
|
1568 | cmd = '%s %s' % (cmd,rest) | |
1564 | else: |
|
1569 | else: | |
1565 | # Handle aliases with positional arguments |
|
1570 | # Handle aliases with positional arguments | |
1566 | args = rest.split(None,nargs) |
|
1571 | args = rest.split(None,nargs) | |
1567 | if len(args)< nargs: |
|
1572 | if len(args)< nargs: | |
1568 | error('Alias <%s> requires %s arguments, %s given.' % |
|
1573 | error('Alias <%s> requires %s arguments, %s given.' % | |
1569 | (alias,nargs,len(args))) |
|
1574 | (alias,nargs,len(args))) | |
1570 | return None |
|
1575 | return None | |
1571 | cmd = '%s %s' % (cmd % tuple(args[:nargs]),' '.join(args[nargs:])) |
|
1576 | cmd = '%s %s' % (cmd % tuple(args[:nargs]),' '.join(args[nargs:])) | |
1572 | # Now call the macro, evaluating in the user's namespace |
|
1577 | # Now call the macro, evaluating in the user's namespace | |
1573 | #print 'new command: <%r>' % cmd # dbg |
|
1578 | #print 'new command: <%r>' % cmd # dbg | |
1574 | return cmd |
|
1579 | return cmd | |
1575 |
|
1580 | |||
1576 | def call_alias(self,alias,rest=''): |
|
1581 | def call_alias(self,alias,rest=''): | |
1577 | """Call an alias given its name and the rest of the line. |
|
1582 | """Call an alias given its name and the rest of the line. | |
1578 |
|
1583 | |||
1579 | This is only used to provide backwards compatibility for users of |
|
1584 | This is only used to provide backwards compatibility for users of | |
1580 | ipalias(), use of which is not recommended for anymore.""" |
|
1585 | ipalias(), use of which is not recommended for anymore.""" | |
1581 |
|
1586 | |||
1582 | # Now call the macro, evaluating in the user's namespace |
|
1587 | # Now call the macro, evaluating in the user's namespace | |
1583 | cmd = self.transform_alias(alias, rest) |
|
1588 | cmd = self.transform_alias(alias, rest) | |
1584 | try: |
|
1589 | try: | |
1585 | self.system(cmd) |
|
1590 | self.system(cmd) | |
1586 | except: |
|
1591 | except: | |
1587 | self.showtraceback() |
|
1592 | self.showtraceback() | |
1588 |
|
1593 | |||
1589 | def indent_current_str(self): |
|
1594 | def indent_current_str(self): | |
1590 | """return the current level of indentation as a string""" |
|
1595 | """return the current level of indentation as a string""" | |
1591 | return self.indent_current_nsp * ' ' |
|
1596 | return self.indent_current_nsp * ' ' | |
1592 |
|
1597 | |||
1593 | def autoindent_update(self,line): |
|
1598 | def autoindent_update(self,line): | |
1594 | """Keep track of the indent level.""" |
|
1599 | """Keep track of the indent level.""" | |
1595 |
|
1600 | |||
1596 | #debugx('line') |
|
1601 | #debugx('line') | |
1597 | #debugx('self.indent_current_nsp') |
|
1602 | #debugx('self.indent_current_nsp') | |
1598 | if self.autoindent: |
|
1603 | if self.autoindent: | |
1599 | if line: |
|
1604 | if line: | |
1600 | inisp = num_ini_spaces(line) |
|
1605 | inisp = num_ini_spaces(line) | |
1601 | if inisp < self.indent_current_nsp: |
|
1606 | if inisp < self.indent_current_nsp: | |
1602 | self.indent_current_nsp = inisp |
|
1607 | self.indent_current_nsp = inisp | |
1603 |
|
1608 | |||
1604 | if line[-1] == ':': |
|
1609 | if line[-1] == ':': | |
1605 | self.indent_current_nsp += 4 |
|
1610 | self.indent_current_nsp += 4 | |
1606 | elif dedent_re.match(line): |
|
1611 | elif dedent_re.match(line): | |
1607 | self.indent_current_nsp -= 4 |
|
1612 | self.indent_current_nsp -= 4 | |
1608 | else: |
|
1613 | else: | |
1609 | self.indent_current_nsp = 0 |
|
1614 | self.indent_current_nsp = 0 | |
1610 |
|
1615 | |||
1611 | def runlines(self,lines): |
|
1616 | def runlines(self,lines): | |
1612 | """Run a string of one or more lines of source. |
|
1617 | """Run a string of one or more lines of source. | |
1613 |
|
1618 | |||
1614 | This method is capable of running a string containing multiple source |
|
1619 | This method is capable of running a string containing multiple source | |
1615 | lines, as if they had been entered at the IPython prompt. Since it |
|
1620 | lines, as if they had been entered at the IPython prompt. Since it | |
1616 | exposes IPython's processing machinery, the given strings can contain |
|
1621 | exposes IPython's processing machinery, the given strings can contain | |
1617 | magic calls (%magic), special shell access (!cmd), etc.""" |
|
1622 | magic calls (%magic), special shell access (!cmd), etc.""" | |
1618 |
|
1623 | |||
1619 | # We must start with a clean buffer, in case this is run from an |
|
1624 | # We must start with a clean buffer, in case this is run from an | |
1620 | # interactive IPython session (via a magic, for example). |
|
1625 | # interactive IPython session (via a magic, for example). | |
1621 | self.resetbuffer() |
|
1626 | self.resetbuffer() | |
1622 | lines = lines.split('\n') |
|
1627 | lines = lines.split('\n') | |
1623 | more = 0 |
|
1628 | more = 0 | |
1624 | for line in lines: |
|
1629 | for line in lines: | |
1625 | # skip blank lines so we don't mess up the prompt counter, but do |
|
1630 | # skip blank lines so we don't mess up the prompt counter, but do | |
1626 | # NOT skip even a blank line if we are in a code block (more is |
|
1631 | # NOT skip even a blank line if we are in a code block (more is | |
1627 | # true) |
|
1632 | # true) | |
1628 | if line or more: |
|
1633 | if line or more: | |
1629 | more = self.push(self.prefilter(line,more)) |
|
1634 | more = self.push(self.prefilter(line,more)) | |
1630 | # IPython's runsource returns None if there was an error |
|
1635 | # IPython's runsource returns None if there was an error | |
1631 | # compiling the code. This allows us to stop processing right |
|
1636 | # compiling the code. This allows us to stop processing right | |
1632 | # away, so the user gets the error message at the right place. |
|
1637 | # away, so the user gets the error message at the right place. | |
1633 | if more is None: |
|
1638 | if more is None: | |
1634 | break |
|
1639 | break | |
1635 | # final newline in case the input didn't have it, so that the code |
|
1640 | # final newline in case the input didn't have it, so that the code | |
1636 | # actually does get executed |
|
1641 | # actually does get executed | |
1637 | if more: |
|
1642 | if more: | |
1638 | self.push('\n') |
|
1643 | self.push('\n') | |
1639 |
|
1644 | |||
1640 | def runsource(self, source, filename='<input>', symbol='single'): |
|
1645 | def runsource(self, source, filename='<input>', symbol='single'): | |
1641 | """Compile and run some source in the interpreter. |
|
1646 | """Compile and run some source in the interpreter. | |
1642 |
|
1647 | |||
1643 | Arguments are as for compile_command(). |
|
1648 | Arguments are as for compile_command(). | |
1644 |
|
1649 | |||
1645 | One several things can happen: |
|
1650 | One several things can happen: | |
1646 |
|
1651 | |||
1647 | 1) The input is incorrect; compile_command() raised an |
|
1652 | 1) The input is incorrect; compile_command() raised an | |
1648 | exception (SyntaxError or OverflowError). A syntax traceback |
|
1653 | exception (SyntaxError or OverflowError). A syntax traceback | |
1649 | will be printed by calling the showsyntaxerror() method. |
|
1654 | will be printed by calling the showsyntaxerror() method. | |
1650 |
|
1655 | |||
1651 | 2) The input is incomplete, and more input is required; |
|
1656 | 2) The input is incomplete, and more input is required; | |
1652 | compile_command() returned None. Nothing happens. |
|
1657 | compile_command() returned None. Nothing happens. | |
1653 |
|
1658 | |||
1654 | 3) The input is complete; compile_command() returned a code |
|
1659 | 3) The input is complete; compile_command() returned a code | |
1655 | object. The code is executed by calling self.runcode() (which |
|
1660 | object. The code is executed by calling self.runcode() (which | |
1656 | also handles run-time exceptions, except for SystemExit). |
|
1661 | also handles run-time exceptions, except for SystemExit). | |
1657 |
|
1662 | |||
1658 | The return value is: |
|
1663 | The return value is: | |
1659 |
|
1664 | |||
1660 | - True in case 2 |
|
1665 | - True in case 2 | |
1661 |
|
1666 | |||
1662 | - False in the other cases, unless an exception is raised, where |
|
1667 | - False in the other cases, unless an exception is raised, where | |
1663 | None is returned instead. This can be used by external callers to |
|
1668 | None is returned instead. This can be used by external callers to | |
1664 | know whether to continue feeding input or not. |
|
1669 | know whether to continue feeding input or not. | |
1665 |
|
1670 | |||
1666 | The return value can be used to decide whether to use sys.ps1 or |
|
1671 | The return value can be used to decide whether to use sys.ps1 or | |
1667 | sys.ps2 to prompt the next line.""" |
|
1672 | sys.ps2 to prompt the next line.""" | |
1668 |
|
1673 | |||
1669 | try: |
|
1674 | try: | |
1670 | code = self.compile(source,filename,symbol) |
|
1675 | code = self.compile(source,filename,symbol) | |
1671 | except (OverflowError, SyntaxError, ValueError): |
|
1676 | except (OverflowError, SyntaxError, ValueError): | |
1672 | # Case 1 |
|
1677 | # Case 1 | |
1673 | self.showsyntaxerror(filename) |
|
1678 | self.showsyntaxerror(filename) | |
1674 | return None |
|
1679 | return None | |
1675 |
|
1680 | |||
1676 | if code is None: |
|
1681 | if code is None: | |
1677 | # Case 2 |
|
1682 | # Case 2 | |
1678 | return True |
|
1683 | return True | |
1679 |
|
1684 | |||
1680 | # Case 3 |
|
1685 | # Case 3 | |
1681 | # We store the code object so that threaded shells and |
|
1686 | # We store the code object so that threaded shells and | |
1682 | # custom exception handlers can access all this info if needed. |
|
1687 | # custom exception handlers can access all this info if needed. | |
1683 | # The source corresponding to this can be obtained from the |
|
1688 | # The source corresponding to this can be obtained from the | |
1684 | # buffer attribute as '\n'.join(self.buffer). |
|
1689 | # buffer attribute as '\n'.join(self.buffer). | |
1685 | self.code_to_run = code |
|
1690 | self.code_to_run = code | |
1686 | # now actually execute the code object |
|
1691 | # now actually execute the code object | |
1687 | if self.runcode(code) == 0: |
|
1692 | if self.runcode(code) == 0: | |
1688 | return False |
|
1693 | return False | |
1689 | else: |
|
1694 | else: | |
1690 | return None |
|
1695 | return None | |
1691 |
|
1696 | |||
1692 | def runcode(self,code_obj): |
|
1697 | def runcode(self,code_obj): | |
1693 | """Execute a code object. |
|
1698 | """Execute a code object. | |
1694 |
|
1699 | |||
1695 | When an exception occurs, self.showtraceback() is called to display a |
|
1700 | When an exception occurs, self.showtraceback() is called to display a | |
1696 | traceback. |
|
1701 | traceback. | |
1697 |
|
1702 | |||
1698 | Return value: a flag indicating whether the code to be run completed |
|
1703 | Return value: a flag indicating whether the code to be run completed | |
1699 | successfully: |
|
1704 | successfully: | |
1700 |
|
1705 | |||
1701 | - 0: successful execution. |
|
1706 | - 0: successful execution. | |
1702 | - 1: an error occurred. |
|
1707 | - 1: an error occurred. | |
1703 | """ |
|
1708 | """ | |
1704 |
|
1709 | |||
1705 | # Set our own excepthook in case the user code tries to call it |
|
1710 | # Set our own excepthook in case the user code tries to call it | |
1706 | # directly, so that the IPython crash handler doesn't get triggered |
|
1711 | # directly, so that the IPython crash handler doesn't get triggered | |
1707 | old_excepthook,sys.excepthook = sys.excepthook, self.excepthook |
|
1712 | old_excepthook,sys.excepthook = sys.excepthook, self.excepthook | |
1708 |
|
1713 | |||
1709 | # we save the original sys.excepthook in the instance, in case config |
|
1714 | # we save the original sys.excepthook in the instance, in case config | |
1710 | # code (such as magics) needs access to it. |
|
1715 | # code (such as magics) needs access to it. | |
1711 | self.sys_excepthook = old_excepthook |
|
1716 | self.sys_excepthook = old_excepthook | |
1712 | outflag = 1 # happens in more places, so it's easier as default |
|
1717 | outflag = 1 # happens in more places, so it's easier as default | |
1713 | try: |
|
1718 | try: | |
1714 | try: |
|
1719 | try: | |
1715 | # Embedded instances require separate global/local namespaces |
|
1720 | # Embedded instances require separate global/local namespaces | |
1716 | # so they can see both the surrounding (local) namespace and |
|
1721 | # so they can see both the surrounding (local) namespace and | |
1717 | # the module-level globals when called inside another function. |
|
1722 | # the module-level globals when called inside another function. | |
1718 | if self.embedded: |
|
1723 | if self.embedded: | |
1719 | exec code_obj in self.user_global_ns, self.user_ns |
|
1724 | exec code_obj in self.user_global_ns, self.user_ns | |
1720 | # Normal (non-embedded) instances should only have a single |
|
1725 | # Normal (non-embedded) instances should only have a single | |
1721 | # namespace for user code execution, otherwise functions won't |
|
1726 | # namespace for user code execution, otherwise functions won't | |
1722 | # see interactive top-level globals. |
|
1727 | # see interactive top-level globals. | |
1723 | else: |
|
1728 | else: | |
1724 | exec code_obj in self.user_ns |
|
1729 | exec code_obj in self.user_ns | |
1725 | finally: |
|
1730 | finally: | |
1726 | # Reset our crash handler in place |
|
1731 | # Reset our crash handler in place | |
1727 | sys.excepthook = old_excepthook |
|
1732 | sys.excepthook = old_excepthook | |
1728 | except SystemExit: |
|
1733 | except SystemExit: | |
1729 | self.resetbuffer() |
|
1734 | self.resetbuffer() | |
1730 | self.showtraceback() |
|
1735 | self.showtraceback() | |
1731 | warn("Type exit or quit to exit IPython " |
|
1736 | warn("Type exit or quit to exit IPython " | |
1732 | "(%Exit or %Quit do so unconditionally).",level=1) |
|
1737 | "(%Exit or %Quit do so unconditionally).",level=1) | |
1733 | except self.custom_exceptions: |
|
1738 | except self.custom_exceptions: | |
1734 | etype,value,tb = sys.exc_info() |
|
1739 | etype,value,tb = sys.exc_info() | |
1735 | self.CustomTB(etype,value,tb) |
|
1740 | self.CustomTB(etype,value,tb) | |
1736 | except: |
|
1741 | except: | |
1737 | self.showtraceback() |
|
1742 | self.showtraceback() | |
1738 | else: |
|
1743 | else: | |
1739 | outflag = 0 |
|
1744 | outflag = 0 | |
1740 | if softspace(sys.stdout, 0): |
|
1745 | if softspace(sys.stdout, 0): | |
1741 |
|
1746 | |||
1742 | # Flush out code object which has been run (and source) |
|
1747 | # Flush out code object which has been run (and source) | |
1743 | self.code_to_run = None |
|
1748 | self.code_to_run = None | |
1744 | return outflag |
|
1749 | return outflag | |
1745 |
|
1750 | |||
1746 | def push(self, line): |
|
1751 | def push(self, line): | |
1747 | """Push a line to the interpreter. |
|
1752 | """Push a line to the interpreter. | |
1748 |
|
1753 | |||
1749 | The line should not have a trailing newline; it may have |
|
1754 | The line should not have a trailing newline; it may have | |
1750 | internal newlines. The line is appended to a buffer and the |
|
1755 | internal newlines. The line is appended to a buffer and the | |
1751 | interpreter's runsource() method is called with the |
|
1756 | interpreter's runsource() method is called with the | |
1752 | concatenated contents of the buffer as source. If this |
|
1757 | concatenated contents of the buffer as source. If this | |
1753 | indicates that the command was executed or invalid, the buffer |
|
1758 | indicates that the command was executed or invalid, the buffer | |
1754 | is reset; otherwise, the command is incomplete, and the buffer |
|
1759 | is reset; otherwise, the command is incomplete, and the buffer | |
1755 | is left as it was after the line was appended. The return |
|
1760 | is left as it was after the line was appended. The return | |
1756 | value is 1 if more input is required, 0 if the line was dealt |
|
1761 | value is 1 if more input is required, 0 if the line was dealt | |
1757 | with in some way (this is the same as runsource()). |
|
1762 | with in some way (this is the same as runsource()). | |
1758 | """ |
|
1763 | """ | |
1759 |
|
1764 | |||
1760 | # autoindent management should be done here, and not in the |
|
1765 | # autoindent management should be done here, and not in the | |
1761 | # interactive loop, since that one is only seen by keyboard input. We |
|
1766 | # interactive loop, since that one is only seen by keyboard input. We | |
1762 | # need this done correctly even for code run via runlines (which uses |
|
1767 | # need this done correctly even for code run via runlines (which uses | |
1763 | # push). |
|
1768 | # push). | |
1764 |
|
1769 | |||
1765 | #print 'push line: <%s>' % line # dbg |
|
1770 | #print 'push line: <%s>' % line # dbg | |
1766 | self.autoindent_update(line) |
|
1771 | self.autoindent_update(line) | |
1767 |
|
1772 | |||
1768 | self.buffer.append(line) |
|
1773 | self.buffer.append(line) | |
1769 | more = self.runsource('\n'.join(self.buffer), self.filename) |
|
1774 | more = self.runsource('\n'.join(self.buffer), self.filename) | |
1770 | if not more: |
|
1775 | if not more: | |
1771 | self.resetbuffer() |
|
1776 | self.resetbuffer() | |
1772 | return more |
|
1777 | return more | |
1773 |
|
1778 | |||
1774 | def resetbuffer(self): |
|
1779 | def resetbuffer(self): | |
1775 | """Reset the input buffer.""" |
|
1780 | """Reset the input buffer.""" | |
1776 | self.buffer[:] = [] |
|
1781 | self.buffer[:] = [] | |
1777 |
|
1782 | |||
1778 | def raw_input(self,prompt='',continue_prompt=False): |
|
1783 | def raw_input(self,prompt='',continue_prompt=False): | |
1779 | """Write a prompt and read a line. |
|
1784 | """Write a prompt and read a line. | |
1780 |
|
1785 | |||
1781 | The returned line does not include the trailing newline. |
|
1786 | The returned line does not include the trailing newline. | |
1782 | When the user enters the EOF key sequence, EOFError is raised. |
|
1787 | When the user enters the EOF key sequence, EOFError is raised. | |
1783 |
|
1788 | |||
1784 | Optional inputs: |
|
1789 | Optional inputs: | |
1785 |
|
1790 | |||
1786 | - prompt(''): a string to be printed to prompt the user. |
|
1791 | - prompt(''): a string to be printed to prompt the user. | |
1787 |
|
1792 | |||
1788 | - continue_prompt(False): whether this line is the first one or a |
|
1793 | - continue_prompt(False): whether this line is the first one or a | |
1789 | continuation in a sequence of inputs. |
|
1794 | continuation in a sequence of inputs. | |
1790 | """ |
|
1795 | """ | |
1791 |
|
1796 | |||
1792 | line = raw_input_original(prompt) |
|
1797 | line = raw_input_original(prompt) | |
1793 |
|
1798 | |||
1794 | # Try to be reasonably smart about not re-indenting pasted input more |
|
1799 | # Try to be reasonably smart about not re-indenting pasted input more | |
1795 | # than necessary. We do this by trimming out the auto-indent initial |
|
1800 | # than necessary. We do this by trimming out the auto-indent initial | |
1796 | # spaces, if the user's actual input started itself with whitespace. |
|
1801 | # spaces, if the user's actual input started itself with whitespace. | |
1797 | #debugx('self.buffer[-1]') |
|
1802 | #debugx('self.buffer[-1]') | |
1798 |
|
1803 | |||
1799 | if self.autoindent: |
|
1804 | if self.autoindent: | |
1800 | if num_ini_spaces(line) > self.indent_current_nsp: |
|
1805 | if num_ini_spaces(line) > self.indent_current_nsp: | |
1801 | line = line[self.indent_current_nsp:] |
|
1806 | line = line[self.indent_current_nsp:] | |
1802 | self.indent_current_nsp = 0 |
|
1807 | self.indent_current_nsp = 0 | |
1803 |
|
1808 | |||
1804 | # store the unfiltered input before the user has any chance to modify |
|
1809 | # store the unfiltered input before the user has any chance to modify | |
1805 | # it. |
|
1810 | # it. | |
1806 | if line.strip(): |
|
1811 | if line.strip(): | |
1807 | if continue_prompt: |
|
1812 | if continue_prompt: | |
1808 | self.input_hist_raw[-1] += '%s\n' % line |
|
1813 | self.input_hist_raw[-1] += '%s\n' % line | |
1809 | else: |
|
1814 | else: | |
1810 | self.input_hist_raw.append('%s\n' % line) |
|
1815 | self.input_hist_raw.append('%s\n' % line) | |
1811 |
|
1816 | |||
1812 | try: |
|
1817 | try: | |
1813 | lineout = self.prefilter(line,continue_prompt) |
|
1818 | lineout = self.prefilter(line,continue_prompt) | |
1814 | except: |
|
1819 | except: | |
1815 | # blanket except, in case a user-defined prefilter crashes, so it |
|
1820 | # blanket except, in case a user-defined prefilter crashes, so it | |
1816 | # can't take all of ipython with it. |
|
1821 | # can't take all of ipython with it. | |
1817 | self.showtraceback() |
|
1822 | self.showtraceback() | |
1818 | return '' |
|
1823 | return '' | |
1819 | else: |
|
1824 | else: | |
1820 | return lineout |
|
1825 | return lineout | |
1821 |
|
1826 | |||
1822 | def split_user_input(self,line): |
|
1827 | def split_user_input(self,line): | |
1823 | """Split user input into pre-char, function part and rest.""" |
|
1828 | """Split user input into pre-char, function part and rest.""" | |
1824 |
|
1829 | |||
1825 | lsplit = self.line_split.match(line) |
|
1830 | lsplit = self.line_split.match(line) | |
1826 | if lsplit is None: # no regexp match returns None |
|
1831 | if lsplit is None: # no regexp match returns None | |
1827 | try: |
|
1832 | try: | |
1828 | iFun,theRest = line.split(None,1) |
|
1833 | iFun,theRest = line.split(None,1) | |
1829 | except ValueError: |
|
1834 | except ValueError: | |
1830 | iFun,theRest = line,'' |
|
1835 | iFun,theRest = line,'' | |
1831 | pre = re.match('^(\s*)(.*)',line).groups()[0] |
|
1836 | pre = re.match('^(\s*)(.*)',line).groups()[0] | |
1832 | else: |
|
1837 | else: | |
1833 | pre,iFun,theRest = lsplit.groups() |
|
1838 | pre,iFun,theRest = lsplit.groups() | |
1834 |
|
1839 | |||
1835 | #print 'line:<%s>' % line # dbg |
|
1840 | #print 'line:<%s>' % line # dbg | |
1836 | #print 'pre <%s> iFun <%s> rest <%s>' % (pre,iFun.strip(),theRest) # dbg |
|
1841 | #print 'pre <%s> iFun <%s> rest <%s>' % (pre,iFun.strip(),theRest) # dbg | |
1837 | return pre,iFun.strip(),theRest |
|
1842 | return pre,iFun.strip(),theRest | |
1838 |
|
1843 | |||
1839 | def _prefilter(self, line, continue_prompt): |
|
1844 | def _prefilter(self, line, continue_prompt): | |
1840 | """Calls different preprocessors, depending on the form of line.""" |
|
1845 | """Calls different preprocessors, depending on the form of line.""" | |
1841 |
|
1846 | |||
1842 | # All handlers *must* return a value, even if it's blank (''). |
|
1847 | # All handlers *must* return a value, even if it's blank (''). | |
1843 |
|
1848 | |||
1844 | # Lines are NOT logged here. Handlers should process the line as |
|
1849 | # Lines are NOT logged here. Handlers should process the line as | |
1845 | # needed, update the cache AND log it (so that the input cache array |
|
1850 | # needed, update the cache AND log it (so that the input cache array | |
1846 | # stays synced). |
|
1851 | # stays synced). | |
1847 |
|
1852 | |||
1848 | # This function is _very_ delicate, and since it's also the one which |
|
1853 | # This function is _very_ delicate, and since it's also the one which | |
1849 | # determines IPython's response to user input, it must be as efficient |
|
1854 | # determines IPython's response to user input, it must be as efficient | |
1850 | # as possible. For this reason it has _many_ returns in it, trying |
|
1855 | # as possible. For this reason it has _many_ returns in it, trying | |
1851 | # always to exit as quickly as it can figure out what it needs to do. |
|
1856 | # always to exit as quickly as it can figure out what it needs to do. | |
1852 |
|
1857 | |||
1853 | # This function is the main responsible for maintaining IPython's |
|
1858 | # This function is the main responsible for maintaining IPython's | |
1854 | # behavior respectful of Python's semantics. So be _very_ careful if |
|
1859 | # behavior respectful of Python's semantics. So be _very_ careful if | |
1855 | # making changes to anything here. |
|
1860 | # making changes to anything here. | |
1856 |
|
1861 | |||
1857 | #..................................................................... |
|
1862 | #..................................................................... | |
1858 | # Code begins |
|
1863 | # Code begins | |
1859 |
|
1864 | |||
1860 | #if line.startswith('%crash'): raise RuntimeError,'Crash now!' # dbg |
|
1865 | #if line.startswith('%crash'): raise RuntimeError,'Crash now!' # dbg | |
1861 |
|
1866 | |||
1862 | # save the line away in case we crash, so the post-mortem handler can |
|
1867 | # save the line away in case we crash, so the post-mortem handler can | |
1863 | # record it |
|
1868 | # record it | |
1864 | self._last_input_line = line |
|
1869 | self._last_input_line = line | |
1865 |
|
1870 | |||
1866 | #print '***line: <%s>' % line # dbg |
|
1871 | #print '***line: <%s>' % line # dbg | |
1867 |
|
1872 | |||
1868 | # the input history needs to track even empty lines |
|
1873 | # the input history needs to track even empty lines | |
1869 | stripped = line.strip() |
|
1874 | stripped = line.strip() | |
1870 |
|
1875 | |||
1871 | if not stripped: |
|
1876 | if not stripped: | |
1872 | if not continue_prompt: |
|
1877 | if not continue_prompt: | |
1873 | self.outputcache.prompt_count -= 1 |
|
1878 | self.outputcache.prompt_count -= 1 | |
1874 | return self.handle_normal(line,continue_prompt) |
|
1879 | return self.handle_normal(line,continue_prompt) | |
1875 | #return self.handle_normal('',continue_prompt) |
|
1880 | #return self.handle_normal('',continue_prompt) | |
1876 |
|
1881 | |||
1877 | # print '***cont',continue_prompt # dbg |
|
1882 | # print '***cont',continue_prompt # dbg | |
1878 | # special handlers are only allowed for single line statements |
|
1883 | # special handlers are only allowed for single line statements | |
1879 | if continue_prompt and not self.rc.multi_line_specials: |
|
1884 | if continue_prompt and not self.rc.multi_line_specials: | |
1880 | return self.handle_normal(line,continue_prompt) |
|
1885 | return self.handle_normal(line,continue_prompt) | |
1881 |
|
1886 | |||
1882 |
|
1887 | |||
1883 | # For the rest, we need the structure of the input |
|
1888 | # For the rest, we need the structure of the input | |
1884 | pre,iFun,theRest = self.split_user_input(line) |
|
1889 | pre,iFun,theRest = self.split_user_input(line) | |
1885 |
|
1890 | |||
1886 | # See whether any pre-existing handler can take care of it |
|
1891 | # See whether any pre-existing handler can take care of it | |
1887 |
|
1892 | |||
1888 | rewritten = self.hooks.input_prefilter(stripped) |
|
1893 | rewritten = self.hooks.input_prefilter(stripped) | |
1889 | if rewritten != stripped: # ok, some prefilter did something |
|
1894 | if rewritten != stripped: # ok, some prefilter did something | |
1890 | rewritten = pre + rewritten # add indentation |
|
1895 | rewritten = pre + rewritten # add indentation | |
1891 | return self.handle_normal(rewritten) |
|
1896 | return self.handle_normal(rewritten) | |
1892 |
|
1897 | |||
1893 | #print 'pre <%s> iFun <%s> rest <%s>' % (pre,iFun,theRest) # dbg |
|
1898 | #print 'pre <%s> iFun <%s> rest <%s>' % (pre,iFun,theRest) # dbg | |
1894 |
|
1899 | |||
1895 | # First check for explicit escapes in the last/first character |
|
1900 | # First check for explicit escapes in the last/first character | |
1896 | handler = None |
|
1901 | handler = None | |
1897 | if line[-1] == self.ESC_HELP: |
|
1902 | if line[-1] == self.ESC_HELP: | |
1898 | handler = self.esc_handlers.get(line[-1]) # the ? can be at the end |
|
1903 | handler = self.esc_handlers.get(line[-1]) # the ? can be at the end | |
1899 | if handler is None: |
|
1904 | if handler is None: | |
1900 | # look at the first character of iFun, NOT of line, so we skip |
|
1905 | # look at the first character of iFun, NOT of line, so we skip | |
1901 | # leading whitespace in multiline input |
|
1906 | # leading whitespace in multiline input | |
1902 | handler = self.esc_handlers.get(iFun[0:1]) |
|
1907 | handler = self.esc_handlers.get(iFun[0:1]) | |
1903 | if handler is not None: |
|
1908 | if handler is not None: | |
1904 | return handler(line,continue_prompt,pre,iFun,theRest) |
|
1909 | return handler(line,continue_prompt,pre,iFun,theRest) | |
1905 | # Emacs ipython-mode tags certain input lines |
|
1910 | # Emacs ipython-mode tags certain input lines | |
1906 | if line.endswith('# PYTHON-MODE'): |
|
1911 | if line.endswith('# PYTHON-MODE'): | |
1907 | return self.handle_emacs(line,continue_prompt) |
|
1912 | return self.handle_emacs(line,continue_prompt) | |
1908 |
|
1913 | |||
1909 | # Next, check if we can automatically execute this thing |
|
1914 | # Next, check if we can automatically execute this thing | |
1910 |
|
1915 | |||
1911 | # Allow ! in multi-line statements if multi_line_specials is on: |
|
1916 | # Allow ! in multi-line statements if multi_line_specials is on: | |
1912 | if continue_prompt and self.rc.multi_line_specials and \ |
|
1917 | if continue_prompt and self.rc.multi_line_specials and \ | |
1913 | iFun.startswith(self.ESC_SHELL): |
|
1918 | iFun.startswith(self.ESC_SHELL): | |
1914 | return self.handle_shell_escape(line,continue_prompt, |
|
1919 | return self.handle_shell_escape(line,continue_prompt, | |
1915 | pre=pre,iFun=iFun, |
|
1920 | pre=pre,iFun=iFun, | |
1916 | theRest=theRest) |
|
1921 | theRest=theRest) | |
1917 |
|
1922 | |||
1918 | # Let's try to find if the input line is a magic fn |
|
1923 | # Let's try to find if the input line is a magic fn | |
1919 | oinfo = None |
|
1924 | oinfo = None | |
1920 | if hasattr(self,'magic_'+iFun): |
|
1925 | if hasattr(self,'magic_'+iFun): | |
1921 | # WARNING: _ofind uses getattr(), so it can consume generators and |
|
1926 | # WARNING: _ofind uses getattr(), so it can consume generators and | |
1922 | # cause other side effects. |
|
1927 | # cause other side effects. | |
1923 | oinfo = self._ofind(iFun) # FIXME - _ofind is part of Magic |
|
1928 | oinfo = self._ofind(iFun) # FIXME - _ofind is part of Magic | |
1924 | if oinfo['ismagic']: |
|
1929 | if oinfo['ismagic']: | |
1925 | # Be careful not to call magics when a variable assignment is |
|
1930 | # Be careful not to call magics when a variable assignment is | |
1926 | # being made (ls='hi', for example) |
|
1931 | # being made (ls='hi', for example) | |
1927 | if self.rc.automagic and \ |
|
1932 | if self.rc.automagic and \ | |
1928 | (len(theRest)==0 or theRest[0] not in '!=()<>,') and \ |
|
1933 | (len(theRest)==0 or theRest[0] not in '!=()<>,') and \ | |
1929 | (self.rc.multi_line_specials or not continue_prompt): |
|
1934 | (self.rc.multi_line_specials or not continue_prompt): | |
1930 | return self.handle_magic(line,continue_prompt, |
|
1935 | return self.handle_magic(line,continue_prompt, | |
1931 | pre,iFun,theRest) |
|
1936 | pre,iFun,theRest) | |
1932 | else: |
|
1937 | else: | |
1933 | return self.handle_normal(line,continue_prompt) |
|
1938 | return self.handle_normal(line,continue_prompt) | |
1934 |
|
1939 | |||
1935 | # If the rest of the line begins with an (in)equality, assginment or |
|
1940 | # If the rest of the line begins with an (in)equality, assginment or | |
1936 | # function call, we should not call _ofind but simply execute it. |
|
1941 | # function call, we should not call _ofind but simply execute it. | |
1937 | # This avoids spurious geattr() accesses on objects upon assignment. |
|
1942 | # This avoids spurious geattr() accesses on objects upon assignment. | |
1938 | # |
|
1943 | # | |
1939 | # It also allows users to assign to either alias or magic names true |
|
1944 | # It also allows users to assign to either alias or magic names true | |
1940 | # python variables (the magic/alias systems always take second seat to |
|
1945 | # python variables (the magic/alias systems always take second seat to | |
1941 | # true python code). |
|
1946 | # true python code). | |
1942 | if theRest and theRest[0] in '!=()': |
|
1947 | if theRest and theRest[0] in '!=()': | |
1943 | return self.handle_normal(line,continue_prompt) |
|
1948 | return self.handle_normal(line,continue_prompt) | |
1944 |
|
1949 | |||
1945 | if oinfo is None: |
|
1950 | if oinfo is None: | |
1946 | # let's try to ensure that _oinfo is ONLY called when autocall is |
|
1951 | # let's try to ensure that _oinfo is ONLY called when autocall is | |
1947 | # on. Since it has inevitable potential side effects, at least |
|
1952 | # on. Since it has inevitable potential side effects, at least | |
1948 | # having autocall off should be a guarantee to the user that no |
|
1953 | # having autocall off should be a guarantee to the user that no | |
1949 | # weird things will happen. |
|
1954 | # weird things will happen. | |
1950 |
|
1955 | |||
1951 | if self.rc.autocall: |
|
1956 | if self.rc.autocall: | |
1952 | oinfo = self._ofind(iFun) # FIXME - _ofind is part of Magic |
|
1957 | oinfo = self._ofind(iFun) # FIXME - _ofind is part of Magic | |
1953 | else: |
|
1958 | else: | |
1954 | # in this case, all that's left is either an alias or |
|
1959 | # in this case, all that's left is either an alias or | |
1955 | # processing the line normally. |
|
1960 | # processing the line normally. | |
1956 | if iFun in self.alias_table: |
|
1961 | if iFun in self.alias_table: | |
1957 | # if autocall is off, by not running _ofind we won't know |
|
1962 | # if autocall is off, by not running _ofind we won't know | |
1958 | # whether the given name may also exist in one of the |
|
1963 | # whether the given name may also exist in one of the | |
1959 | # user's namespace. At this point, it's best to do a |
|
1964 | # user's namespace. At this point, it's best to do a | |
1960 | # quick check just to be sure that we don't let aliases |
|
1965 | # quick check just to be sure that we don't let aliases | |
1961 | # shadow variables. |
|
1966 | # shadow variables. | |
1962 | head = iFun.split('.',1)[0] |
|
1967 | head = iFun.split('.',1)[0] | |
1963 | if head in self.user_ns or head in self.internal_ns \ |
|
1968 | if head in self.user_ns or head in self.internal_ns \ | |
1964 | or head in __builtin__.__dict__: |
|
1969 | or head in __builtin__.__dict__: | |
1965 | return self.handle_normal(line,continue_prompt) |
|
1970 | return self.handle_normal(line,continue_prompt) | |
1966 | else: |
|
1971 | else: | |
1967 | return self.handle_alias(line,continue_prompt, |
|
1972 | return self.handle_alias(line,continue_prompt, | |
1968 | pre,iFun,theRest) |
|
1973 | pre,iFun,theRest) | |
1969 |
|
1974 | |||
1970 | else: |
|
1975 | else: | |
1971 | return self.handle_normal(line,continue_prompt) |
|
1976 | return self.handle_normal(line,continue_prompt) | |
1972 |
|
1977 | |||
1973 | if not oinfo['found']: |
|
1978 | if not oinfo['found']: | |
1974 | return self.handle_normal(line,continue_prompt) |
|
1979 | return self.handle_normal(line,continue_prompt) | |
1975 | else: |
|
1980 | else: | |
1976 | #print 'pre<%s> iFun <%s> rest <%s>' % (pre,iFun,theRest) # dbg |
|
1981 | #print 'pre<%s> iFun <%s> rest <%s>' % (pre,iFun,theRest) # dbg | |
1977 | if oinfo['isalias']: |
|
1982 | if oinfo['isalias']: | |
1978 | return self.handle_alias(line,continue_prompt, |
|
1983 | return self.handle_alias(line,continue_prompt, | |
1979 | pre,iFun,theRest) |
|
1984 | pre,iFun,theRest) | |
1980 |
|
1985 | |||
1981 | if (self.rc.autocall |
|
1986 | if (self.rc.autocall | |
1982 | and |
|
1987 | and | |
1983 | ( |
|
1988 | ( | |
1984 | #only consider exclusion re if not "," or ";" autoquoting |
|
1989 | #only consider exclusion re if not "," or ";" autoquoting | |
1985 | (pre == self.ESC_QUOTE or pre == self.ESC_QUOTE2 |
|
1990 | (pre == self.ESC_QUOTE or pre == self.ESC_QUOTE2 | |
1986 | or pre == self.ESC_PAREN) or |
|
1991 | or pre == self.ESC_PAREN) or | |
1987 | (not self.re_exclude_auto.match(theRest))) |
|
1992 | (not self.re_exclude_auto.match(theRest))) | |
1988 | and |
|
1993 | and | |
1989 | self.re_fun_name.match(iFun) and |
|
1994 | self.re_fun_name.match(iFun) and | |
1990 | callable(oinfo['obj'])) : |
|
1995 | callable(oinfo['obj'])) : | |
1991 | #print 'going auto' # dbg |
|
1996 | #print 'going auto' # dbg | |
1992 | return self.handle_auto(line,continue_prompt, |
|
1997 | return self.handle_auto(line,continue_prompt, | |
1993 | pre,iFun,theRest,oinfo['obj']) |
|
1998 | pre,iFun,theRest,oinfo['obj']) | |
1994 | else: |
|
1999 | else: | |
1995 | #print 'was callable?', callable(oinfo['obj']) # dbg |
|
2000 | #print 'was callable?', callable(oinfo['obj']) # dbg | |
1996 | return self.handle_normal(line,continue_prompt) |
|
2001 | return self.handle_normal(line,continue_prompt) | |
1997 |
|
2002 | |||
1998 | # If we get here, we have a normal Python line. Log and return. |
|
2003 | # If we get here, we have a normal Python line. Log and return. | |
1999 | return self.handle_normal(line,continue_prompt) |
|
2004 | return self.handle_normal(line,continue_prompt) | |
2000 |
|
2005 | |||
2001 | def _prefilter_dumb(self, line, continue_prompt): |
|
2006 | def _prefilter_dumb(self, line, continue_prompt): | |
2002 | """simple prefilter function, for debugging""" |
|
2007 | """simple prefilter function, for debugging""" | |
2003 | return self.handle_normal(line,continue_prompt) |
|
2008 | return self.handle_normal(line,continue_prompt) | |
2004 |
|
2009 | |||
2005 | # Set the default prefilter() function (this can be user-overridden) |
|
2010 | # Set the default prefilter() function (this can be user-overridden) | |
2006 | prefilter = _prefilter |
|
2011 | prefilter = _prefilter | |
2007 |
|
2012 | |||
2008 | def handle_normal(self,line,continue_prompt=None, |
|
2013 | def handle_normal(self,line,continue_prompt=None, | |
2009 | pre=None,iFun=None,theRest=None): |
|
2014 | pre=None,iFun=None,theRest=None): | |
2010 | """Handle normal input lines. Use as a template for handlers.""" |
|
2015 | """Handle normal input lines. Use as a template for handlers.""" | |
2011 |
|
2016 | |||
2012 | # With autoindent on, we need some way to exit the input loop, and I |
|
2017 | # With autoindent on, we need some way to exit the input loop, and I | |
2013 | # don't want to force the user to have to backspace all the way to |
|
2018 | # don't want to force the user to have to backspace all the way to | |
2014 | # clear the line. The rule will be in this case, that either two |
|
2019 | # clear the line. The rule will be in this case, that either two | |
2015 | # lines of pure whitespace in a row, or a line of pure whitespace but |
|
2020 | # lines of pure whitespace in a row, or a line of pure whitespace but | |
2016 | # of a size different to the indent level, will exit the input loop. |
|
2021 | # of a size different to the indent level, will exit the input loop. | |
2017 |
|
2022 | |||
2018 | if (continue_prompt and self.autoindent and line.isspace() and |
|
2023 | if (continue_prompt and self.autoindent and line.isspace() and | |
2019 | (0 < abs(len(line) - self.indent_current_nsp) <= 2 or |
|
2024 | (0 < abs(len(line) - self.indent_current_nsp) <= 2 or | |
2020 | (self.buffer[-1]).isspace() )): |
|
2025 | (self.buffer[-1]).isspace() )): | |
2021 | line = '' |
|
2026 | line = '' | |
2022 |
|
2027 | |||
2023 | self.log(line,line,continue_prompt) |
|
2028 | self.log(line,line,continue_prompt) | |
2024 | return line |
|
2029 | return line | |
2025 |
|
2030 | |||
2026 | def handle_alias(self,line,continue_prompt=None, |
|
2031 | def handle_alias(self,line,continue_prompt=None, | |
2027 | pre=None,iFun=None,theRest=None): |
|
2032 | pre=None,iFun=None,theRest=None): | |
2028 | """Handle alias input lines. """ |
|
2033 | """Handle alias input lines. """ | |
2029 |
|
2034 | |||
2030 | # pre is needed, because it carries the leading whitespace. Otherwise |
|
2035 | # pre is needed, because it carries the leading whitespace. Otherwise | |
2031 | # aliases won't work in indented sections. |
|
2036 | # aliases won't work in indented sections. | |
2032 | transformed = self.transform_alias(iFun, theRest) |
|
2037 | transformed = self.transform_alias(iFun, theRest) | |
2033 | line_out = '%s_ip.system(%s)' % (pre, make_quoted_expr( transformed )) |
|
2038 | line_out = '%s_ip.system(%s)' % (pre, make_quoted_expr( transformed )) | |
2034 | self.log(line,line_out,continue_prompt) |
|
2039 | self.log(line,line_out,continue_prompt) | |
2035 | #print 'line out:',line_out # dbg |
|
2040 | #print 'line out:',line_out # dbg | |
2036 | return line_out |
|
2041 | return line_out | |
2037 |
|
2042 | |||
2038 | def handle_shell_escape(self, line, continue_prompt=None, |
|
2043 | def handle_shell_escape(self, line, continue_prompt=None, | |
2039 | pre=None,iFun=None,theRest=None): |
|
2044 | pre=None,iFun=None,theRest=None): | |
2040 | """Execute the line in a shell, empty return value""" |
|
2045 | """Execute the line in a shell, empty return value""" | |
2041 |
|
2046 | |||
2042 | #print 'line in :', `line` # dbg |
|
2047 | #print 'line in :', `line` # dbg | |
2043 | # Example of a special handler. Others follow a similar pattern. |
|
2048 | # Example of a special handler. Others follow a similar pattern. | |
2044 | if line.lstrip().startswith('!!'): |
|
2049 | if line.lstrip().startswith('!!'): | |
2045 | # rewrite iFun/theRest to properly hold the call to %sx and |
|
2050 | # rewrite iFun/theRest to properly hold the call to %sx and | |
2046 | # the actual command to be executed, so handle_magic can work |
|
2051 | # the actual command to be executed, so handle_magic can work | |
2047 | # correctly |
|
2052 | # correctly | |
2048 | theRest = '%s %s' % (iFun[2:],theRest) |
|
2053 | theRest = '%s %s' % (iFun[2:],theRest) | |
2049 | iFun = 'sx' |
|
2054 | iFun = 'sx' | |
2050 | return self.handle_magic('%ssx %s' % (self.ESC_MAGIC, |
|
2055 | return self.handle_magic('%ssx %s' % (self.ESC_MAGIC, | |
2051 | line.lstrip()[2:]), |
|
2056 | line.lstrip()[2:]), | |
2052 | continue_prompt,pre,iFun,theRest) |
|
2057 | continue_prompt,pre,iFun,theRest) | |
2053 | else: |
|
2058 | else: | |
2054 | cmd=line.lstrip().lstrip('!') |
|
2059 | cmd=line.lstrip().lstrip('!') | |
2055 | line_out = '%s_ip.system(%s)' % (pre,make_quoted_expr(cmd)) |
|
2060 | line_out = '%s_ip.system(%s)' % (pre,make_quoted_expr(cmd)) | |
2056 | # update cache/log and return |
|
2061 | # update cache/log and return | |
2057 | self.log(line,line_out,continue_prompt) |
|
2062 | self.log(line,line_out,continue_prompt) | |
2058 | return line_out |
|
2063 | return line_out | |
2059 |
|
2064 | |||
2060 | def handle_magic(self, line, continue_prompt=None, |
|
2065 | def handle_magic(self, line, continue_prompt=None, | |
2061 | pre=None,iFun=None,theRest=None): |
|
2066 | pre=None,iFun=None,theRest=None): | |
2062 | """Execute magic functions.""" |
|
2067 | """Execute magic functions.""" | |
2063 |
|
2068 | |||
2064 |
|
2069 | |||
2065 | cmd = '%s_ip.magic(%s)' % (pre,make_quoted_expr(iFun + " " + theRest)) |
|
2070 | cmd = '%s_ip.magic(%s)' % (pre,make_quoted_expr(iFun + " " + theRest)) | |
2066 | self.log(line,cmd,continue_prompt) |
|
2071 | self.log(line,cmd,continue_prompt) | |
2067 | #print 'in handle_magic, cmd=<%s>' % cmd # dbg |
|
2072 | #print 'in handle_magic, cmd=<%s>' % cmd # dbg | |
2068 | return cmd |
|
2073 | return cmd | |
2069 |
|
2074 | |||
2070 | def handle_auto(self, line, continue_prompt=None, |
|
2075 | def handle_auto(self, line, continue_prompt=None, | |
2071 | pre=None,iFun=None,theRest=None,obj=None): |
|
2076 | pre=None,iFun=None,theRest=None,obj=None): | |
2072 | """Hande lines which can be auto-executed, quoting if requested.""" |
|
2077 | """Hande lines which can be auto-executed, quoting if requested.""" | |
2073 |
|
2078 | |||
2074 | #print 'pre <%s> iFun <%s> rest <%s>' % (pre,iFun,theRest) # dbg |
|
2079 | #print 'pre <%s> iFun <%s> rest <%s>' % (pre,iFun,theRest) # dbg | |
2075 |
|
2080 | |||
2076 | # This should only be active for single-line input! |
|
2081 | # This should only be active for single-line input! | |
2077 | if continue_prompt: |
|
2082 | if continue_prompt: | |
2078 | self.log(line,line,continue_prompt) |
|
2083 | self.log(line,line,continue_prompt) | |
2079 | return line |
|
2084 | return line | |
2080 |
|
2085 | |||
2081 | auto_rewrite = True |
|
2086 | auto_rewrite = True | |
2082 |
|
2087 | |||
2083 | if pre == self.ESC_QUOTE: |
|
2088 | if pre == self.ESC_QUOTE: | |
2084 | # Auto-quote splitting on whitespace |
|
2089 | # Auto-quote splitting on whitespace | |
2085 | newcmd = '%s("%s")' % (iFun,'", "'.join(theRest.split()) ) |
|
2090 | newcmd = '%s("%s")' % (iFun,'", "'.join(theRest.split()) ) | |
2086 | elif pre == self.ESC_QUOTE2: |
|
2091 | elif pre == self.ESC_QUOTE2: | |
2087 | # Auto-quote whole string |
|
2092 | # Auto-quote whole string | |
2088 | newcmd = '%s("%s")' % (iFun,theRest) |
|
2093 | newcmd = '%s("%s")' % (iFun,theRest) | |
2089 | elif pre == self.ESC_PAREN: |
|
2094 | elif pre == self.ESC_PAREN: | |
2090 | newcmd = '%s(%s)' % (iFun,",".join(theRest.split())) |
|
2095 | newcmd = '%s(%s)' % (iFun,",".join(theRest.split())) | |
2091 | else: |
|
2096 | else: | |
2092 | # Auto-paren. |
|
2097 | # Auto-paren. | |
2093 | # We only apply it to argument-less calls if the autocall |
|
2098 | # We only apply it to argument-less calls if the autocall | |
2094 | # parameter is set to 2. We only need to check that autocall is < |
|
2099 | # parameter is set to 2. We only need to check that autocall is < | |
2095 | # 2, since this function isn't called unless it's at least 1. |
|
2100 | # 2, since this function isn't called unless it's at least 1. | |
2096 | if not theRest and (self.rc.autocall < 2): |
|
2101 | if not theRest and (self.rc.autocall < 2): | |
2097 | newcmd = '%s %s' % (iFun,theRest) |
|
2102 | newcmd = '%s %s' % (iFun,theRest) | |
2098 | auto_rewrite = False |
|
2103 | auto_rewrite = False | |
2099 | else: |
|
2104 | else: | |
2100 | if theRest.startswith('['): |
|
2105 | if theRest.startswith('['): | |
2101 | if hasattr(obj,'__getitem__'): |
|
2106 | if hasattr(obj,'__getitem__'): | |
2102 | # Don't autocall in this case: item access for an object |
|
2107 | # Don't autocall in this case: item access for an object | |
2103 | # which is BOTH callable and implements __getitem__. |
|
2108 | # which is BOTH callable and implements __getitem__. | |
2104 | newcmd = '%s %s' % (iFun,theRest) |
|
2109 | newcmd = '%s %s' % (iFun,theRest) | |
2105 | auto_rewrite = False |
|
2110 | auto_rewrite = False | |
2106 | else: |
|
2111 | else: | |
2107 | # if the object doesn't support [] access, go ahead and |
|
2112 | # if the object doesn't support [] access, go ahead and | |
2108 | # autocall |
|
2113 | # autocall | |
2109 | newcmd = '%s(%s)' % (iFun.rstrip(),theRest) |
|
2114 | newcmd = '%s(%s)' % (iFun.rstrip(),theRest) | |
2110 | elif theRest.endswith(';'): |
|
2115 | elif theRest.endswith(';'): | |
2111 | newcmd = '%s(%s);' % (iFun.rstrip(),theRest[:-1]) |
|
2116 | newcmd = '%s(%s);' % (iFun.rstrip(),theRest[:-1]) | |
2112 | else: |
|
2117 | else: | |
2113 | newcmd = '%s(%s)' % (iFun.rstrip(), theRest) |
|
2118 | newcmd = '%s(%s)' % (iFun.rstrip(), theRest) | |
2114 |
|
2119 | |||
2115 | if auto_rewrite: |
|
2120 | if auto_rewrite: | |
2116 | print >>Term.cout, self.outputcache.prompt1.auto_rewrite() + newcmd |
|
2121 | print >>Term.cout, self.outputcache.prompt1.auto_rewrite() + newcmd | |
2117 | # log what is now valid Python, not the actual user input (without the |
|
2122 | # log what is now valid Python, not the actual user input (without the | |
2118 | # final newline) |
|
2123 | # final newline) | |
2119 | self.log(line,newcmd,continue_prompt) |
|
2124 | self.log(line,newcmd,continue_prompt) | |
2120 | return newcmd |
|
2125 | return newcmd | |
2121 |
|
2126 | |||
2122 | def handle_help(self, line, continue_prompt=None, |
|
2127 | def handle_help(self, line, continue_prompt=None, | |
2123 | pre=None,iFun=None,theRest=None): |
|
2128 | pre=None,iFun=None,theRest=None): | |
2124 | """Try to get some help for the object. |
|
2129 | """Try to get some help for the object. | |
2125 |
|
2130 | |||
2126 | obj? or ?obj -> basic information. |
|
2131 | obj? or ?obj -> basic information. | |
2127 | obj?? or ??obj -> more details. |
|
2132 | obj?? or ??obj -> more details. | |
2128 | """ |
|
2133 | """ | |
2129 |
|
2134 | |||
2130 | # We need to make sure that we don't process lines which would be |
|
2135 | # We need to make sure that we don't process lines which would be | |
2131 | # otherwise valid python, such as "x=1 # what?" |
|
2136 | # otherwise valid python, such as "x=1 # what?" | |
2132 | try: |
|
2137 | try: | |
2133 | codeop.compile_command(line) |
|
2138 | codeop.compile_command(line) | |
2134 | except SyntaxError: |
|
2139 | except SyntaxError: | |
2135 | # We should only handle as help stuff which is NOT valid syntax |
|
2140 | # We should only handle as help stuff which is NOT valid syntax | |
2136 | if line[0]==self.ESC_HELP: |
|
2141 | if line[0]==self.ESC_HELP: | |
2137 | line = line[1:] |
|
2142 | line = line[1:] | |
2138 | elif line[-1]==self.ESC_HELP: |
|
2143 | elif line[-1]==self.ESC_HELP: | |
2139 | line = line[:-1] |
|
2144 | line = line[:-1] | |
2140 | self.log(line,'#?'+line,continue_prompt) |
|
2145 | self.log(line,'#?'+line,continue_prompt) | |
2141 | if line: |
|
2146 | if line: | |
2142 | self.magic_pinfo(line) |
|
2147 | self.magic_pinfo(line) | |
2143 | else: |
|
2148 | else: | |
2144 | page(self.usage,screen_lines=self.rc.screen_length) |
|
2149 | page(self.usage,screen_lines=self.rc.screen_length) | |
2145 | return '' # Empty string is needed here! |
|
2150 | return '' # Empty string is needed here! | |
2146 | except: |
|
2151 | except: | |
2147 | # Pass any other exceptions through to the normal handler |
|
2152 | # Pass any other exceptions through to the normal handler | |
2148 | return self.handle_normal(line,continue_prompt) |
|
2153 | return self.handle_normal(line,continue_prompt) | |
2149 | else: |
|
2154 | else: | |
2150 | # If the code compiles ok, we should handle it normally |
|
2155 | # If the code compiles ok, we should handle it normally | |
2151 | return self.handle_normal(line,continue_prompt) |
|
2156 | return self.handle_normal(line,continue_prompt) | |
2152 |
|
2157 | |||
2153 | def getapi(self): |
|
2158 | def getapi(self): | |
2154 | """ Get an IPApi object for this shell instance |
|
2159 | """ Get an IPApi object for this shell instance | |
2155 |
|
2160 | |||
2156 | Getting an IPApi object is always preferable to accessing the shell |
|
2161 | Getting an IPApi object is always preferable to accessing the shell | |
2157 | directly, but this holds true especially for extensions. |
|
2162 | directly, but this holds true especially for extensions. | |
2158 |
|
2163 | |||
2159 | It should always be possible to implement an extension with IPApi |
|
2164 | It should always be possible to implement an extension with IPApi | |
2160 | alone. If not, contact maintainer to request an addition. |
|
2165 | alone. If not, contact maintainer to request an addition. | |
2161 |
|
2166 | |||
2162 | """ |
|
2167 | """ | |
2163 | return self.api |
|
2168 | return self.api | |
2164 |
|
2169 | |||
2165 | def handle_emacs(self,line,continue_prompt=None, |
|
2170 | def handle_emacs(self,line,continue_prompt=None, | |
2166 | pre=None,iFun=None,theRest=None): |
|
2171 | pre=None,iFun=None,theRest=None): | |
2167 | """Handle input lines marked by python-mode.""" |
|
2172 | """Handle input lines marked by python-mode.""" | |
2168 |
|
2173 | |||
2169 | # Currently, nothing is done. Later more functionality can be added |
|
2174 | # Currently, nothing is done. Later more functionality can be added | |
2170 | # here if needed. |
|
2175 | # here if needed. | |
2171 |
|
2176 | |||
2172 | # The input cache shouldn't be updated |
|
2177 | # The input cache shouldn't be updated | |
2173 |
|
2178 | |||
2174 | return line |
|
2179 | return line | |
2175 |
|
2180 | |||
2176 | def mktempfile(self,data=None): |
|
2181 | def mktempfile(self,data=None): | |
2177 | """Make a new tempfile and return its filename. |
|
2182 | """Make a new tempfile and return its filename. | |
2178 |
|
2183 | |||
2179 | This makes a call to tempfile.mktemp, but it registers the created |
|
2184 | This makes a call to tempfile.mktemp, but it registers the created | |
2180 | filename internally so ipython cleans it up at exit time. |
|
2185 | filename internally so ipython cleans it up at exit time. | |
2181 |
|
2186 | |||
2182 | Optional inputs: |
|
2187 | Optional inputs: | |
2183 |
|
2188 | |||
2184 | - data(None): if data is given, it gets written out to the temp file |
|
2189 | - data(None): if data is given, it gets written out to the temp file | |
2185 | immediately, and the file is closed again.""" |
|
2190 | immediately, and the file is closed again.""" | |
2186 |
|
2191 | |||
2187 | filename = tempfile.mktemp('.py','ipython_edit_') |
|
2192 | filename = tempfile.mktemp('.py','ipython_edit_') | |
2188 | self.tempfiles.append(filename) |
|
2193 | self.tempfiles.append(filename) | |
2189 |
|
2194 | |||
2190 | if data: |
|
2195 | if data: | |
2191 | tmp_file = open(filename,'w') |
|
2196 | tmp_file = open(filename,'w') | |
2192 | tmp_file.write(data) |
|
2197 | tmp_file.write(data) | |
2193 | tmp_file.close() |
|
2198 | tmp_file.close() | |
2194 | return filename |
|
2199 | return filename | |
2195 |
|
2200 | |||
2196 | def write(self,data): |
|
2201 | def write(self,data): | |
2197 | """Write a string to the default output""" |
|
2202 | """Write a string to the default output""" | |
2198 | Term.cout.write(data) |
|
2203 | Term.cout.write(data) | |
2199 |
|
2204 | |||
2200 | def write_err(self,data): |
|
2205 | def write_err(self,data): | |
2201 | """Write a string to the default error output""" |
|
2206 | """Write a string to the default error output""" | |
2202 | Term.cerr.write(data) |
|
2207 | Term.cerr.write(data) | |
2203 |
|
2208 | |||
2204 | def exit(self): |
|
2209 | def exit(self): | |
2205 | """Handle interactive exit. |
|
2210 | """Handle interactive exit. | |
2206 |
|
2211 | |||
2207 | This method sets the exit_now attribute.""" |
|
2212 | This method sets the exit_now attribute.""" | |
2208 |
|
2213 | |||
2209 | if self.rc.confirm_exit: |
|
2214 | if self.rc.confirm_exit: | |
2210 | if ask_yes_no('Do you really want to exit ([y]/n)?','y'): |
|
2215 | if self.ask_yes_no('Do you really want to exit ([y]/n)?','y'): | |
2211 | self.exit_now = True |
|
2216 | self.exit_now = True | |
2212 | else: |
|
2217 | else: | |
2213 | self.exit_now = True |
|
2218 | self.exit_now = True | |
2214 | return self.exit_now |
|
2219 | return self.exit_now | |
2215 |
|
2220 | |||
2216 | def safe_execfile(self,fname,*where,**kw): |
|
2221 | def safe_execfile(self,fname,*where,**kw): | |
2217 | fname = os.path.expanduser(fname) |
|
2222 | fname = os.path.expanduser(fname) | |
2218 |
|
2223 | |||
2219 | # find things also in current directory |
|
2224 | # find things also in current directory | |
2220 | dname = os.path.dirname(fname) |
|
2225 | dname = os.path.dirname(fname) | |
2221 | if not sys.path.count(dname): |
|
2226 | if not sys.path.count(dname): | |
2222 | sys.path.append(dname) |
|
2227 | sys.path.append(dname) | |
2223 |
|
2228 | |||
2224 | try: |
|
2229 | try: | |
2225 | xfile = open(fname) |
|
2230 | xfile = open(fname) | |
2226 | except: |
|
2231 | except: | |
2227 | print >> Term.cerr, \ |
|
2232 | print >> Term.cerr, \ | |
2228 | 'Could not open file <%s> for safe execution.' % fname |
|
2233 | 'Could not open file <%s> for safe execution.' % fname | |
2229 | return None |
|
2234 | return None | |
2230 |
|
2235 | |||
2231 | kw.setdefault('islog',0) |
|
2236 | kw.setdefault('islog',0) | |
2232 | kw.setdefault('quiet',1) |
|
2237 | kw.setdefault('quiet',1) | |
2233 | kw.setdefault('exit_ignore',0) |
|
2238 | kw.setdefault('exit_ignore',0) | |
2234 | first = xfile.readline() |
|
2239 | first = xfile.readline() | |
2235 | loghead = str(self.loghead_tpl).split('\n',1)[0].strip() |
|
2240 | loghead = str(self.loghead_tpl).split('\n',1)[0].strip() | |
2236 | xfile.close() |
|
2241 | xfile.close() | |
2237 | # line by line execution |
|
2242 | # line by line execution | |
2238 | if first.startswith(loghead) or kw['islog']: |
|
2243 | if first.startswith(loghead) or kw['islog']: | |
2239 | print 'Loading log file <%s> one line at a time...' % fname |
|
2244 | print 'Loading log file <%s> one line at a time...' % fname | |
2240 | if kw['quiet']: |
|
2245 | if kw['quiet']: | |
2241 | stdout_save = sys.stdout |
|
2246 | stdout_save = sys.stdout | |
2242 | sys.stdout = StringIO.StringIO() |
|
2247 | sys.stdout = StringIO.StringIO() | |
2243 | try: |
|
2248 | try: | |
2244 | globs,locs = where[0:2] |
|
2249 | globs,locs = where[0:2] | |
2245 | except: |
|
2250 | except: | |
2246 | try: |
|
2251 | try: | |
2247 | globs = locs = where[0] |
|
2252 | globs = locs = where[0] | |
2248 | except: |
|
2253 | except: | |
2249 | globs = locs = globals() |
|
2254 | globs = locs = globals() | |
2250 | badblocks = [] |
|
2255 | badblocks = [] | |
2251 |
|
2256 | |||
2252 | # we also need to identify indented blocks of code when replaying |
|
2257 | # we also need to identify indented blocks of code when replaying | |
2253 | # logs and put them together before passing them to an exec |
|
2258 | # logs and put them together before passing them to an exec | |
2254 | # statement. This takes a bit of regexp and look-ahead work in the |
|
2259 | # statement. This takes a bit of regexp and look-ahead work in the | |
2255 | # file. It's easiest if we swallow the whole thing in memory |
|
2260 | # file. It's easiest if we swallow the whole thing in memory | |
2256 | # first, and manually walk through the lines list moving the |
|
2261 | # first, and manually walk through the lines list moving the | |
2257 | # counter ourselves. |
|
2262 | # counter ourselves. | |
2258 | indent_re = re.compile('\s+\S') |
|
2263 | indent_re = re.compile('\s+\S') | |
2259 | xfile = open(fname) |
|
2264 | xfile = open(fname) | |
2260 | filelines = xfile.readlines() |
|
2265 | filelines = xfile.readlines() | |
2261 | xfile.close() |
|
2266 | xfile.close() | |
2262 | nlines = len(filelines) |
|
2267 | nlines = len(filelines) | |
2263 | lnum = 0 |
|
2268 | lnum = 0 | |
2264 | while lnum < nlines: |
|
2269 | while lnum < nlines: | |
2265 | line = filelines[lnum] |
|
2270 | line = filelines[lnum] | |
2266 | lnum += 1 |
|
2271 | lnum += 1 | |
2267 | # don't re-insert logger status info into cache |
|
2272 | # don't re-insert logger status info into cache | |
2268 | if line.startswith('#log#'): |
|
2273 | if line.startswith('#log#'): | |
2269 | continue |
|
2274 | continue | |
2270 | else: |
|
2275 | else: | |
2271 | # build a block of code (maybe a single line) for execution |
|
2276 | # build a block of code (maybe a single line) for execution | |
2272 | block = line |
|
2277 | block = line | |
2273 | try: |
|
2278 | try: | |
2274 | next = filelines[lnum] # lnum has already incremented |
|
2279 | next = filelines[lnum] # lnum has already incremented | |
2275 | except: |
|
2280 | except: | |
2276 | next = None |
|
2281 | next = None | |
2277 | while next and indent_re.match(next): |
|
2282 | while next and indent_re.match(next): | |
2278 | block += next |
|
2283 | block += next | |
2279 | lnum += 1 |
|
2284 | lnum += 1 | |
2280 | try: |
|
2285 | try: | |
2281 | next = filelines[lnum] |
|
2286 | next = filelines[lnum] | |
2282 | except: |
|
2287 | except: | |
2283 | next = None |
|
2288 | next = None | |
2284 | # now execute the block of one or more lines |
|
2289 | # now execute the block of one or more lines | |
2285 | try: |
|
2290 | try: | |
2286 | exec block in globs,locs |
|
2291 | exec block in globs,locs | |
2287 | except SystemExit: |
|
2292 | except SystemExit: | |
2288 | pass |
|
2293 | pass | |
2289 | except: |
|
2294 | except: | |
2290 | badblocks.append(block.rstrip()) |
|
2295 | badblocks.append(block.rstrip()) | |
2291 | if kw['quiet']: # restore stdout |
|
2296 | if kw['quiet']: # restore stdout | |
2292 | sys.stdout.close() |
|
2297 | sys.stdout.close() | |
2293 | sys.stdout = stdout_save |
|
2298 | sys.stdout = stdout_save | |
2294 | print 'Finished replaying log file <%s>' % fname |
|
2299 | print 'Finished replaying log file <%s>' % fname | |
2295 | if badblocks: |
|
2300 | if badblocks: | |
2296 | print >> sys.stderr, ('\nThe following lines/blocks in file ' |
|
2301 | print >> sys.stderr, ('\nThe following lines/blocks in file ' | |
2297 | '<%s> reported errors:' % fname) |
|
2302 | '<%s> reported errors:' % fname) | |
2298 |
|
2303 | |||
2299 | for badline in badblocks: |
|
2304 | for badline in badblocks: | |
2300 | print >> sys.stderr, badline |
|
2305 | print >> sys.stderr, badline | |
2301 | else: # regular file execution |
|
2306 | else: # regular file execution | |
2302 | try: |
|
2307 | try: | |
2303 | execfile(fname,*where) |
|
2308 | execfile(fname,*where) | |
2304 | except SyntaxError: |
|
2309 | except SyntaxError: | |
2305 | self.showsyntaxerror() |
|
2310 | self.showsyntaxerror() | |
2306 | warn('Failure executing file: <%s>' % fname) |
|
2311 | warn('Failure executing file: <%s>' % fname) | |
2307 | except SystemExit,status: |
|
2312 | except SystemExit,status: | |
2308 | if not kw['exit_ignore']: |
|
2313 | if not kw['exit_ignore']: | |
2309 | self.showtraceback() |
|
2314 | self.showtraceback() | |
2310 | warn('Failure executing file: <%s>' % fname) |
|
2315 | warn('Failure executing file: <%s>' % fname) | |
2311 | except: |
|
2316 | except: | |
2312 | self.showtraceback() |
|
2317 | self.showtraceback() | |
2313 | warn('Failure executing file: <%s>' % fname) |
|
2318 | warn('Failure executing file: <%s>' % fname) | |
2314 |
|
2319 | |||
2315 | #************************* end of file <iplib.py> ***************************** |
|
2320 | #************************* end of file <iplib.py> ***************************** |
@@ -1,752 +1,753 b'' | |||||
1 | # -*- coding: utf-8 -*- |
|
1 | # -*- coding: utf-8 -*- | |
2 | """ |
|
2 | """ | |
3 | IPython -- An enhanced Interactive Python |
|
3 | IPython -- An enhanced Interactive Python | |
4 |
|
4 | |||
5 | Requires Python 2.1 or better. |
|
5 | Requires Python 2.1 or better. | |
6 |
|
6 | |||
7 | This file contains the main make_IPython() starter function. |
|
7 | This file contains the main make_IPython() starter function. | |
8 |
|
8 | |||
9 |
$Id: ipmaker.py 13 |
|
9 | $Id: ipmaker.py 1355 2006-06-07 16:56:50Z vivainio $""" | |
10 |
|
10 | |||
11 | #***************************************************************************** |
|
11 | #***************************************************************************** | |
12 | # Copyright (C) 2001-2006 Fernando Perez. <fperez@colorado.edu> |
|
12 | # Copyright (C) 2001-2006 Fernando Perez. <fperez@colorado.edu> | |
13 | # |
|
13 | # | |
14 | # Distributed under the terms of the BSD License. The full license is in |
|
14 | # Distributed under the terms of the BSD License. The full license is in | |
15 | # the file COPYING, distributed as part of this software. |
|
15 | # the file COPYING, distributed as part of this software. | |
16 | #***************************************************************************** |
|
16 | #***************************************************************************** | |
17 |
|
17 | |||
18 | from IPython import Release |
|
18 | from IPython import Release | |
19 | __author__ = '%s <%s>' % Release.authors['Fernando'] |
|
19 | __author__ = '%s <%s>' % Release.authors['Fernando'] | |
20 | __license__ = Release.license |
|
20 | __license__ = Release.license | |
21 | __version__ = Release.version |
|
21 | __version__ = Release.version | |
22 |
|
22 | |||
23 | credits._Printer__data = """ |
|
23 | credits._Printer__data = """ | |
24 | Python: %s |
|
24 | Python: %s | |
25 |
|
25 | |||
26 | IPython: Fernando Perez, Janko Hauser, Nathan Gray, and many users. |
|
26 | IPython: Fernando Perez, Janko Hauser, Nathan Gray, and many users. | |
27 | See http://ipython.scipy.org for more information.""" \ |
|
27 | See http://ipython.scipy.org for more information.""" \ | |
28 | % credits._Printer__data |
|
28 | % credits._Printer__data | |
29 |
|
29 | |||
30 | copyright._Printer__data += """ |
|
30 | copyright._Printer__data += """ | |
31 |
|
31 | |||
32 | Copyright (c) 2001-2004 Fernando Perez, Janko Hauser, Nathan Gray. |
|
32 | Copyright (c) 2001-2004 Fernando Perez, Janko Hauser, Nathan Gray. | |
33 | All Rights Reserved.""" |
|
33 | All Rights Reserved.""" | |
34 |
|
34 | |||
35 | #**************************************************************************** |
|
35 | #**************************************************************************** | |
36 | # Required modules |
|
36 | # Required modules | |
37 |
|
37 | |||
38 | # From the standard library |
|
38 | # From the standard library | |
39 | import __main__ |
|
39 | import __main__ | |
40 | import __builtin__ |
|
40 | import __builtin__ | |
41 | import os |
|
41 | import os | |
42 | import re |
|
42 | import re | |
43 | import sys |
|
43 | import sys | |
44 | import types |
|
44 | import types | |
45 | from pprint import pprint,pformat |
|
45 | from pprint import pprint,pformat | |
46 |
|
46 | |||
47 | # Our own |
|
47 | # Our own | |
48 | from IPython import DPyGetOpt |
|
48 | from IPython import DPyGetOpt | |
49 | from IPython.ipstruct import Struct |
|
49 | from IPython.ipstruct import Struct | |
50 | from IPython.OutputTrap import OutputTrap |
|
50 | from IPython.OutputTrap import OutputTrap | |
51 | from IPython.ConfigLoader import ConfigLoader |
|
51 | from IPython.ConfigLoader import ConfigLoader | |
52 | from IPython.iplib import InteractiveShell |
|
52 | from IPython.iplib import InteractiveShell | |
53 | from IPython.usage import cmd_line_usage,interactive_usage |
|
53 | from IPython.usage import cmd_line_usage,interactive_usage | |
54 | from IPython.genutils import * |
|
54 | from IPython.genutils import * | |
55 |
|
55 | |||
56 | #----------------------------------------------------------------------------- |
|
56 | #----------------------------------------------------------------------------- | |
57 | def make_IPython(argv=None,user_ns=None,user_global_ns=None,debug=1, |
|
57 | def make_IPython(argv=None,user_ns=None,user_global_ns=None,debug=1, | |
58 | rc_override=None,shell_class=InteractiveShell, |
|
58 | rc_override=None,shell_class=InteractiveShell, | |
59 | embedded=False,**kw): |
|
59 | embedded=False,**kw): | |
60 | """This is a dump of IPython into a single function. |
|
60 | """This is a dump of IPython into a single function. | |
61 |
|
61 | |||
62 | Later it will have to be broken up in a sensible manner. |
|
62 | Later it will have to be broken up in a sensible manner. | |
63 |
|
63 | |||
64 | Arguments: |
|
64 | Arguments: | |
65 |
|
65 | |||
66 | - argv: a list similar to sys.argv[1:]. It should NOT contain the desired |
|
66 | - argv: a list similar to sys.argv[1:]. It should NOT contain the desired | |
67 | script name, b/c DPyGetOpt strips the first argument only for the real |
|
67 | script name, b/c DPyGetOpt strips the first argument only for the real | |
68 | sys.argv. |
|
68 | sys.argv. | |
69 |
|
69 | |||
70 | - user_ns: a dict to be used as the user's namespace.""" |
|
70 | - user_ns: a dict to be used as the user's namespace.""" | |
71 |
|
71 | |||
72 | #---------------------------------------------------------------------- |
|
72 | #---------------------------------------------------------------------- | |
73 | # Defaults and initialization |
|
73 | # Defaults and initialization | |
74 |
|
74 | |||
75 | # For developer debugging, deactivates crash handler and uses pdb. |
|
75 | # For developer debugging, deactivates crash handler and uses pdb. | |
76 | DEVDEBUG = False |
|
76 | DEVDEBUG = False | |
77 |
|
77 | |||
78 | if argv is None: |
|
78 | if argv is None: | |
79 | argv = sys.argv |
|
79 | argv = sys.argv | |
80 |
|
80 | |||
81 | # __IP is the main global that lives throughout and represents the whole |
|
81 | # __IP is the main global that lives throughout and represents the whole | |
82 | # application. If the user redefines it, all bets are off as to what |
|
82 | # application. If the user redefines it, all bets are off as to what | |
83 | # happens. |
|
83 | # happens. | |
84 |
|
84 | |||
85 | # __IP is the name of he global which the caller will have accessible as |
|
85 | # __IP is the name of he global which the caller will have accessible as | |
86 | # __IP.name. We set its name via the first parameter passed to |
|
86 | # __IP.name. We set its name via the first parameter passed to | |
87 | # InteractiveShell: |
|
87 | # InteractiveShell: | |
88 |
|
88 | |||
89 | IP = shell_class('__IP',user_ns=user_ns,user_global_ns=user_global_ns, |
|
89 | IP = shell_class('__IP',user_ns=user_ns,user_global_ns=user_global_ns, | |
90 | embedded=embedded,**kw) |
|
90 | embedded=embedded,**kw) | |
91 |
|
91 | |||
92 | # Put 'help' in the user namespace |
|
92 | # Put 'help' in the user namespace | |
93 | from site import _Helper |
|
93 | from site import _Helper | |
94 | IP.user_ns['help'] = _Helper() |
|
94 | IP.user_ns['help'] = _Helper() | |
95 |
|
95 | |||
96 |
|
96 | |||
97 | if DEVDEBUG: |
|
97 | if DEVDEBUG: | |
98 | # For developer debugging only (global flag) |
|
98 | # For developer debugging only (global flag) | |
99 | from IPython import ultraTB |
|
99 | from IPython import ultraTB | |
100 | sys.excepthook = ultraTB.VerboseTB(call_pdb=1) |
|
100 | sys.excepthook = ultraTB.VerboseTB(call_pdb=1) | |
101 |
|
101 | |||
102 | IP.BANNER_PARTS = ['Python %s\n' |
|
102 | IP.BANNER_PARTS = ['Python %s\n' | |
103 | 'Type "copyright", "credits" or "license" ' |
|
103 | 'Type "copyright", "credits" or "license" ' | |
104 | 'for more information.\n' |
|
104 | 'for more information.\n' | |
105 | % (sys.version.split('\n')[0],), |
|
105 | % (sys.version.split('\n')[0],), | |
106 | "IPython %s -- An enhanced Interactive Python." |
|
106 | "IPython %s -- An enhanced Interactive Python." | |
107 | % (__version__,), |
|
107 | % (__version__,), | |
108 | """? -> Introduction to IPython's features. |
|
108 | """? -> Introduction to IPython's features. | |
109 | %magic -> Information about IPython's 'magic' % functions. |
|
109 | %magic -> Information about IPython's 'magic' % functions. | |
110 | help -> Python's own help system. |
|
110 | help -> Python's own help system. | |
111 | object? -> Details about 'object'. ?object also works, ?? prints more. |
|
111 | object? -> Details about 'object'. ?object also works, ?? prints more. | |
112 | """ ] |
|
112 | """ ] | |
113 |
|
113 | |||
114 | IP.usage = interactive_usage |
|
114 | IP.usage = interactive_usage | |
115 |
|
115 | |||
116 | # Platform-dependent suffix and directory names. We use _ipython instead |
|
116 | # Platform-dependent suffix and directory names. We use _ipython instead | |
117 | # of .ipython under win32 b/c there's software that breaks with .named |
|
117 | # of .ipython under win32 b/c there's software that breaks with .named | |
118 | # directories on that platform. |
|
118 | # directories on that platform. | |
119 | if os.name == 'posix': |
|
119 | if os.name == 'posix': | |
120 | rc_suffix = '' |
|
120 | rc_suffix = '' | |
121 | ipdir_def = '.ipython' |
|
121 | ipdir_def = '.ipython' | |
122 | else: |
|
122 | else: | |
123 | rc_suffix = '.ini' |
|
123 | rc_suffix = '.ini' | |
124 | ipdir_def = '_ipython' |
|
124 | ipdir_def = '_ipython' | |
125 |
|
125 | |||
126 | # default directory for configuration |
|
126 | # default directory for configuration | |
127 | ipythondir_def = os.path.abspath(os.environ.get('IPYTHONDIR', |
|
127 | ipythondir_def = os.path.abspath(os.environ.get('IPYTHONDIR', | |
128 | os.path.join(IP.home_dir,ipdir_def))) |
|
128 | os.path.join(IP.home_dir,ipdir_def))) | |
129 |
|
129 | |||
130 | sys.path.insert(0, '') # add . to sys.path. Fix from Prabhu Ramachandran |
|
130 | sys.path.insert(0, '') # add . to sys.path. Fix from Prabhu Ramachandran | |
131 |
|
131 | |||
132 | # we need the directory where IPython itself is installed |
|
132 | # we need the directory where IPython itself is installed | |
133 | import IPython |
|
133 | import IPython | |
134 | IPython_dir = os.path.dirname(IPython.__file__) |
|
134 | IPython_dir = os.path.dirname(IPython.__file__) | |
135 | del IPython |
|
135 | del IPython | |
136 |
|
136 | |||
137 | #------------------------------------------------------------------------- |
|
137 | #------------------------------------------------------------------------- | |
138 | # Command line handling |
|
138 | # Command line handling | |
139 |
|
139 | |||
140 | # Valid command line options (uses DPyGetOpt syntax, like Perl's |
|
140 | # Valid command line options (uses DPyGetOpt syntax, like Perl's | |
141 | # GetOpt::Long) |
|
141 | # GetOpt::Long) | |
142 |
|
142 | |||
143 | # Any key not listed here gets deleted even if in the file (like session |
|
143 | # Any key not listed here gets deleted even if in the file (like session | |
144 | # or profile). That's deliberate, to maintain the rc namespace clean. |
|
144 | # or profile). That's deliberate, to maintain the rc namespace clean. | |
145 |
|
145 | |||
146 | # Each set of options appears twice: under _conv only the names are |
|
146 | # Each set of options appears twice: under _conv only the names are | |
147 | # listed, indicating which type they must be converted to when reading the |
|
147 | # listed, indicating which type they must be converted to when reading the | |
148 | # ipythonrc file. And under DPyGetOpt they are listed with the regular |
|
148 | # ipythonrc file. And under DPyGetOpt they are listed with the regular | |
149 | # DPyGetOpt syntax (=s,=i,:f,etc). |
|
149 | # DPyGetOpt syntax (=s,=i,:f,etc). | |
150 |
|
150 | |||
151 | # Make sure there's a space before each end of line (they get auto-joined!) |
|
151 | # Make sure there's a space before each end of line (they get auto-joined!) | |
152 | cmdline_opts = ('autocall=i autoindent! automagic! banner! cache_size|cs=i ' |
|
152 | cmdline_opts = ('autocall=i autoindent! automagic! banner! cache_size|cs=i ' | |
153 | 'c=s classic|cl color_info! colors=s confirm_exit! ' |
|
153 | 'c=s classic|cl color_info! colors=s confirm_exit! ' | |
154 | 'debug! deep_reload! editor=s log|l messages! nosep ' |
|
154 | 'debug! deep_reload! editor=s log|l messages! nosep ' | |
155 | 'object_info_string_level=i pdb! ' |
|
155 | 'object_info_string_level=i pdb! ' | |
156 | 'pprint! prompt_in1|pi1=s prompt_in2|pi2=s prompt_out|po=s ' |
|
156 | 'pprint! prompt_in1|pi1=s prompt_in2|pi2=s prompt_out|po=s ' | |
157 | 'quick screen_length|sl=i prompts_pad_left=i ' |
|
157 | 'quick screen_length|sl=i prompts_pad_left=i ' | |
158 | 'logfile|lf=s logplay|lp=s profile|p=s ' |
|
158 | 'logfile|lf=s logplay|lp=s profile|p=s ' | |
159 | 'readline! readline_merge_completions! ' |
|
159 | 'readline! readline_merge_completions! ' | |
160 | 'readline_omit__names! ' |
|
160 | 'readline_omit__names! ' | |
161 | 'rcfile=s separate_in|si=s separate_out|so=s ' |
|
161 | 'rcfile=s separate_in|si=s separate_out|so=s ' | |
162 | 'separate_out2|so2=s xmode=s wildcards_case_sensitive! ' |
|
162 | 'separate_out2|so2=s xmode=s wildcards_case_sensitive! ' | |
163 | 'magic_docstrings system_verbose! ' |
|
163 | 'magic_docstrings system_verbose! ' | |
164 | 'multi_line_specials! ' |
|
164 | 'multi_line_specials! ' | |
165 | 'wxversion=s ' |
|
165 | 'wxversion=s ' | |
166 | 'autoedit_syntax!') |
|
166 | 'autoedit_syntax!') | |
167 |
|
167 | |||
168 | # Options that can *only* appear at the cmd line (not in rcfiles). |
|
168 | # Options that can *only* appear at the cmd line (not in rcfiles). | |
169 |
|
169 | |||
170 | # The "ignore" option is a kludge so that Emacs buffers don't crash, since |
|
170 | # The "ignore" option is a kludge so that Emacs buffers don't crash, since | |
171 | # the 'C-c !' command in emacs automatically appends a -i option at the end. |
|
171 | # the 'C-c !' command in emacs automatically appends a -i option at the end. | |
172 | cmdline_only = ('help ignore|i ipythondir=s Version upgrade ' |
|
172 | cmdline_only = ('help ignore|i ipythondir=s Version upgrade ' | |
173 | 'gthread! qthread! wthread! pylab! tk!') |
|
173 | 'gthread! qthread! wthread! pylab! tk!') | |
174 |
|
174 | |||
175 | # Build the actual name list to be used by DPyGetOpt |
|
175 | # Build the actual name list to be used by DPyGetOpt | |
176 | opts_names = qw(cmdline_opts) + qw(cmdline_only) |
|
176 | opts_names = qw(cmdline_opts) + qw(cmdline_only) | |
177 |
|
177 | |||
178 | # Set sensible command line defaults. |
|
178 | # Set sensible command line defaults. | |
179 | # This should have everything from cmdline_opts and cmdline_only |
|
179 | # This should have everything from cmdline_opts and cmdline_only | |
180 | opts_def = Struct(autocall = 1, |
|
180 | opts_def = Struct(autocall = 1, | |
181 | autoedit_syntax = 0, |
|
181 | autoedit_syntax = 0, | |
182 | autoindent = 0, |
|
182 | autoindent = 0, | |
183 | automagic = 1, |
|
183 | automagic = 1, | |
184 | banner = 1, |
|
184 | banner = 1, | |
185 | cache_size = 1000, |
|
185 | cache_size = 1000, | |
186 | c = '', |
|
186 | c = '', | |
187 | classic = 0, |
|
187 | classic = 0, | |
188 | colors = 'NoColor', |
|
188 | colors = 'NoColor', | |
189 | color_info = 0, |
|
189 | color_info = 0, | |
190 | confirm_exit = 1, |
|
190 | confirm_exit = 1, | |
191 | debug = 0, |
|
191 | debug = 0, | |
192 | deep_reload = 0, |
|
192 | deep_reload = 0, | |
193 | editor = '0', |
|
193 | editor = '0', | |
194 | help = 0, |
|
194 | help = 0, | |
195 | ignore = 0, |
|
195 | ignore = 0, | |
196 | ipythondir = ipythondir_def, |
|
196 | ipythondir = ipythondir_def, | |
197 | log = 0, |
|
197 | log = 0, | |
198 | logfile = '', |
|
198 | logfile = '', | |
199 | logplay = '', |
|
199 | logplay = '', | |
200 | multi_line_specials = 1, |
|
200 | multi_line_specials = 1, | |
201 | messages = 1, |
|
201 | messages = 1, | |
202 | object_info_string_level = 0, |
|
202 | object_info_string_level = 0, | |
203 | nosep = 0, |
|
203 | nosep = 0, | |
204 | pdb = 0, |
|
204 | pdb = 0, | |
205 | pprint = 0, |
|
205 | pprint = 0, | |
206 | profile = '', |
|
206 | profile = '', | |
207 | prompt_in1 = 'In [\\#]: ', |
|
207 | prompt_in1 = 'In [\\#]: ', | |
208 | prompt_in2 = ' .\\D.: ', |
|
208 | prompt_in2 = ' .\\D.: ', | |
209 | prompt_out = 'Out[\\#]: ', |
|
209 | prompt_out = 'Out[\\#]: ', | |
210 | prompts_pad_left = 1, |
|
210 | prompts_pad_left = 1, | |
|
211 | quiet = 0, | |||
211 | quick = 0, |
|
212 | quick = 0, | |
212 | readline = 1, |
|
213 | readline = 1, | |
213 | readline_merge_completions = 1, |
|
214 | readline_merge_completions = 1, | |
214 | readline_omit__names = 0, |
|
215 | readline_omit__names = 0, | |
215 | rcfile = 'ipythonrc' + rc_suffix, |
|
216 | rcfile = 'ipythonrc' + rc_suffix, | |
216 | screen_length = 0, |
|
217 | screen_length = 0, | |
217 | separate_in = '\n', |
|
218 | separate_in = '\n', | |
218 | separate_out = '\n', |
|
219 | separate_out = '\n', | |
219 | separate_out2 = '', |
|
220 | separate_out2 = '', | |
220 | system_verbose = 0, |
|
221 | system_verbose = 0, | |
221 | gthread = 0, |
|
222 | gthread = 0, | |
222 | qthread = 0, |
|
223 | qthread = 0, | |
223 | wthread = 0, |
|
224 | wthread = 0, | |
224 | pylab = 0, |
|
225 | pylab = 0, | |
225 | tk = 0, |
|
226 | tk = 0, | |
226 | upgrade = 0, |
|
227 | upgrade = 0, | |
227 | Version = 0, |
|
228 | Version = 0, | |
228 | xmode = 'Verbose', |
|
229 | xmode = 'Verbose', | |
229 | wildcards_case_sensitive = 1, |
|
230 | wildcards_case_sensitive = 1, | |
230 | wxversion = '0', |
|
231 | wxversion = '0', | |
231 | magic_docstrings = 0, # undocumented, for doc generation |
|
232 | magic_docstrings = 0, # undocumented, for doc generation | |
232 | ) |
|
233 | ) | |
233 |
|
234 | |||
234 | # Things that will *only* appear in rcfiles (not at the command line). |
|
235 | # Things that will *only* appear in rcfiles (not at the command line). | |
235 | # Make sure there's a space before each end of line (they get auto-joined!) |
|
236 | # Make sure there's a space before each end of line (they get auto-joined!) | |
236 | rcfile_opts = { qwflat: 'include import_mod import_all execfile ', |
|
237 | rcfile_opts = { qwflat: 'include import_mod import_all execfile ', | |
237 | qw_lol: 'import_some ', |
|
238 | qw_lol: 'import_some ', | |
238 | # for things with embedded whitespace: |
|
239 | # for things with embedded whitespace: | |
239 | list_strings:'execute alias readline_parse_and_bind ', |
|
240 | list_strings:'execute alias readline_parse_and_bind ', | |
240 | # Regular strings need no conversion: |
|
241 | # Regular strings need no conversion: | |
241 | None:'readline_remove_delims ', |
|
242 | None:'readline_remove_delims ', | |
242 | } |
|
243 | } | |
243 | # Default values for these |
|
244 | # Default values for these | |
244 | rc_def = Struct(include = [], |
|
245 | rc_def = Struct(include = [], | |
245 | import_mod = [], |
|
246 | import_mod = [], | |
246 | import_all = [], |
|
247 | import_all = [], | |
247 | import_some = [[]], |
|
248 | import_some = [[]], | |
248 | execute = [], |
|
249 | execute = [], | |
249 | execfile = [], |
|
250 | execfile = [], | |
250 | alias = [], |
|
251 | alias = [], | |
251 | readline_parse_and_bind = [], |
|
252 | readline_parse_and_bind = [], | |
252 | readline_remove_delims = '', |
|
253 | readline_remove_delims = '', | |
253 | ) |
|
254 | ) | |
254 |
|
255 | |||
255 | # Build the type conversion dictionary from the above tables: |
|
256 | # Build the type conversion dictionary from the above tables: | |
256 | typeconv = rcfile_opts.copy() |
|
257 | typeconv = rcfile_opts.copy() | |
257 | typeconv.update(optstr2types(cmdline_opts)) |
|
258 | typeconv.update(optstr2types(cmdline_opts)) | |
258 |
|
259 | |||
259 | # FIXME: the None key appears in both, put that back together by hand. Ugly! |
|
260 | # FIXME: the None key appears in both, put that back together by hand. Ugly! | |
260 | typeconv[None] += ' ' + rcfile_opts[None] |
|
261 | typeconv[None] += ' ' + rcfile_opts[None] | |
261 |
|
262 | |||
262 | # Remove quotes at ends of all strings (used to protect spaces) |
|
263 | # Remove quotes at ends of all strings (used to protect spaces) | |
263 | typeconv[unquote_ends] = typeconv[None] |
|
264 | typeconv[unquote_ends] = typeconv[None] | |
264 | del typeconv[None] |
|
265 | del typeconv[None] | |
265 |
|
266 | |||
266 | # Build the list we'll use to make all config decisions with defaults: |
|
267 | # Build the list we'll use to make all config decisions with defaults: | |
267 | opts_all = opts_def.copy() |
|
268 | opts_all = opts_def.copy() | |
268 | opts_all.update(rc_def) |
|
269 | opts_all.update(rc_def) | |
269 |
|
270 | |||
270 | # Build conflict resolver for recursive loading of config files: |
|
271 | # Build conflict resolver for recursive loading of config files: | |
271 | # - preserve means the outermost file maintains the value, it is not |
|
272 | # - preserve means the outermost file maintains the value, it is not | |
272 | # overwritten if an included file has the same key. |
|
273 | # overwritten if an included file has the same key. | |
273 | # - add_flip applies + to the two values, so it better make sense to add |
|
274 | # - add_flip applies + to the two values, so it better make sense to add | |
274 | # those types of keys. But it flips them first so that things loaded |
|
275 | # those types of keys. But it flips them first so that things loaded | |
275 | # deeper in the inclusion chain have lower precedence. |
|
276 | # deeper in the inclusion chain have lower precedence. | |
276 | conflict = {'preserve': ' '.join([ typeconv[int], |
|
277 | conflict = {'preserve': ' '.join([ typeconv[int], | |
277 | typeconv[unquote_ends] ]), |
|
278 | typeconv[unquote_ends] ]), | |
278 | 'add_flip': ' '.join([ typeconv[qwflat], |
|
279 | 'add_flip': ' '.join([ typeconv[qwflat], | |
279 | typeconv[qw_lol], |
|
280 | typeconv[qw_lol], | |
280 | typeconv[list_strings] ]) |
|
281 | typeconv[list_strings] ]) | |
281 | } |
|
282 | } | |
282 |
|
283 | |||
283 | # Now actually process the command line |
|
284 | # Now actually process the command line | |
284 | getopt = DPyGetOpt.DPyGetOpt() |
|
285 | getopt = DPyGetOpt.DPyGetOpt() | |
285 | getopt.setIgnoreCase(0) |
|
286 | getopt.setIgnoreCase(0) | |
286 |
|
287 | |||
287 | getopt.parseConfiguration(opts_names) |
|
288 | getopt.parseConfiguration(opts_names) | |
288 |
|
289 | |||
289 | try: |
|
290 | try: | |
290 | getopt.processArguments(argv) |
|
291 | getopt.processArguments(argv) | |
291 | except: |
|
292 | except: | |
292 | print cmd_line_usage |
|
293 | print cmd_line_usage | |
293 | warn('\nError in Arguments: ' + `sys.exc_value`) |
|
294 | warn('\nError in Arguments: ' + `sys.exc_value`) | |
294 | sys.exit(1) |
|
295 | sys.exit(1) | |
295 |
|
296 | |||
296 | # convert the options dict to a struct for much lighter syntax later |
|
297 | # convert the options dict to a struct for much lighter syntax later | |
297 | opts = Struct(getopt.optionValues) |
|
298 | opts = Struct(getopt.optionValues) | |
298 | args = getopt.freeValues |
|
299 | args = getopt.freeValues | |
299 |
|
300 | |||
300 | # this is the struct (which has default values at this point) with which |
|
301 | # this is the struct (which has default values at this point) with which | |
301 | # we make all decisions: |
|
302 | # we make all decisions: | |
302 | opts_all.update(opts) |
|
303 | opts_all.update(opts) | |
303 |
|
304 | |||
304 | # Options that force an immediate exit |
|
305 | # Options that force an immediate exit | |
305 | if opts_all.help: |
|
306 | if opts_all.help: | |
306 | page(cmd_line_usage) |
|
307 | page(cmd_line_usage) | |
307 | sys.exit() |
|
308 | sys.exit() | |
308 |
|
309 | |||
309 | if opts_all.Version: |
|
310 | if opts_all.Version: | |
310 | print __version__ |
|
311 | print __version__ | |
311 | sys.exit() |
|
312 | sys.exit() | |
312 |
|
313 | |||
313 | if opts_all.magic_docstrings: |
|
314 | if opts_all.magic_docstrings: | |
314 | IP.magic_magic('-latex') |
|
315 | IP.magic_magic('-latex') | |
315 | sys.exit() |
|
316 | sys.exit() | |
316 |
|
317 | |||
317 | # add personal ipythondir to sys.path so that users can put things in |
|
318 | # add personal ipythondir to sys.path so that users can put things in | |
318 | # there for customization |
|
319 | # there for customization | |
319 | sys.path.append(os.path.abspath(opts_all.ipythondir)) |
|
320 | sys.path.append(os.path.abspath(opts_all.ipythondir)) | |
320 |
|
321 | |||
321 | # Create user config directory if it doesn't exist. This must be done |
|
322 | # Create user config directory if it doesn't exist. This must be done | |
322 | # *after* getting the cmd line options. |
|
323 | # *after* getting the cmd line options. | |
323 | if not os.path.isdir(opts_all.ipythondir): |
|
324 | if not os.path.isdir(opts_all.ipythondir): | |
324 | IP.user_setup(opts_all.ipythondir,rc_suffix,'install') |
|
325 | IP.user_setup(opts_all.ipythondir,rc_suffix,'install') | |
325 |
|
326 | |||
326 | # upgrade user config files while preserving a copy of the originals |
|
327 | # upgrade user config files while preserving a copy of the originals | |
327 | if opts_all.upgrade: |
|
328 | if opts_all.upgrade: | |
328 | IP.user_setup(opts_all.ipythondir,rc_suffix,'upgrade') |
|
329 | IP.user_setup(opts_all.ipythondir,rc_suffix,'upgrade') | |
329 |
|
330 | |||
330 | # check mutually exclusive options in the *original* command line |
|
331 | # check mutually exclusive options in the *original* command line | |
331 | mutex_opts(opts,[qw('log logfile'),qw('rcfile profile'), |
|
332 | mutex_opts(opts,[qw('log logfile'),qw('rcfile profile'), | |
332 | qw('classic profile'),qw('classic rcfile')]) |
|
333 | qw('classic profile'),qw('classic rcfile')]) | |
333 |
|
334 | |||
334 | #--------------------------------------------------------------------------- |
|
335 | #--------------------------------------------------------------------------- | |
335 | # Log replay |
|
336 | # Log replay | |
336 |
|
337 | |||
337 | # if -logplay, we need to 'become' the other session. That basically means |
|
338 | # if -logplay, we need to 'become' the other session. That basically means | |
338 | # replacing the current command line environment with that of the old |
|
339 | # replacing the current command line environment with that of the old | |
339 | # session and moving on. |
|
340 | # session and moving on. | |
340 |
|
341 | |||
341 | # this is needed so that later we know we're in session reload mode, as |
|
342 | # this is needed so that later we know we're in session reload mode, as | |
342 | # opts_all will get overwritten: |
|
343 | # opts_all will get overwritten: | |
343 | load_logplay = 0 |
|
344 | load_logplay = 0 | |
344 |
|
345 | |||
345 | if opts_all.logplay: |
|
346 | if opts_all.logplay: | |
346 | load_logplay = opts_all.logplay |
|
347 | load_logplay = opts_all.logplay | |
347 | opts_debug_save = opts_all.debug |
|
348 | opts_debug_save = opts_all.debug | |
348 | try: |
|
349 | try: | |
349 | logplay = open(opts_all.logplay) |
|
350 | logplay = open(opts_all.logplay) | |
350 | except IOError: |
|
351 | except IOError: | |
351 | if opts_all.debug: IP.InteractiveTB() |
|
352 | if opts_all.debug: IP.InteractiveTB() | |
352 | warn('Could not open logplay file '+`opts_all.logplay`) |
|
353 | warn('Could not open logplay file '+`opts_all.logplay`) | |
353 | # restore state as if nothing had happened and move on, but make |
|
354 | # restore state as if nothing had happened and move on, but make | |
354 | # sure that later we don't try to actually load the session file |
|
355 | # sure that later we don't try to actually load the session file | |
355 | logplay = None |
|
356 | logplay = None | |
356 | load_logplay = 0 |
|
357 | load_logplay = 0 | |
357 | del opts_all.logplay |
|
358 | del opts_all.logplay | |
358 | else: |
|
359 | else: | |
359 | try: |
|
360 | try: | |
360 | logplay.readline() |
|
361 | logplay.readline() | |
361 | logplay.readline(); |
|
362 | logplay.readline(); | |
362 | # this reloads that session's command line |
|
363 | # this reloads that session's command line | |
363 | cmd = logplay.readline()[6:] |
|
364 | cmd = logplay.readline()[6:] | |
364 | exec cmd |
|
365 | exec cmd | |
365 | # restore the true debug flag given so that the process of |
|
366 | # restore the true debug flag given so that the process of | |
366 | # session loading itself can be monitored. |
|
367 | # session loading itself can be monitored. | |
367 | opts.debug = opts_debug_save |
|
368 | opts.debug = opts_debug_save | |
368 | # save the logplay flag so later we don't overwrite the log |
|
369 | # save the logplay flag so later we don't overwrite the log | |
369 | opts.logplay = load_logplay |
|
370 | opts.logplay = load_logplay | |
370 | # now we must update our own structure with defaults |
|
371 | # now we must update our own structure with defaults | |
371 | opts_all.update(opts) |
|
372 | opts_all.update(opts) | |
372 | # now load args |
|
373 | # now load args | |
373 | cmd = logplay.readline()[6:] |
|
374 | cmd = logplay.readline()[6:] | |
374 | exec cmd |
|
375 | exec cmd | |
375 | logplay.close() |
|
376 | logplay.close() | |
376 | except: |
|
377 | except: | |
377 | logplay.close() |
|
378 | logplay.close() | |
378 | if opts_all.debug: IP.InteractiveTB() |
|
379 | if opts_all.debug: IP.InteractiveTB() | |
379 | warn("Logplay file lacking full configuration information.\n" |
|
380 | warn("Logplay file lacking full configuration information.\n" | |
380 | "I'll try to read it, but some things may not work.") |
|
381 | "I'll try to read it, but some things may not work.") | |
381 |
|
382 | |||
382 | #------------------------------------------------------------------------- |
|
383 | #------------------------------------------------------------------------- | |
383 | # set up output traps: catch all output from files, being run, modules |
|
384 | # set up output traps: catch all output from files, being run, modules | |
384 | # loaded, etc. Then give it to the user in a clean form at the end. |
|
385 | # loaded, etc. Then give it to the user in a clean form at the end. | |
385 |
|
386 | |||
386 | msg_out = 'Output messages. ' |
|
387 | msg_out = 'Output messages. ' | |
387 | msg_err = 'Error messages. ' |
|
388 | msg_err = 'Error messages. ' | |
388 | msg_sep = '\n' |
|
389 | msg_sep = '\n' | |
389 | msg = Struct(config = OutputTrap('Configuration Loader',msg_out, |
|
390 | msg = Struct(config = OutputTrap('Configuration Loader',msg_out, | |
390 | msg_err,msg_sep,debug, |
|
391 | msg_err,msg_sep,debug, | |
391 | quiet_out=1), |
|
392 | quiet_out=1), | |
392 | user_exec = OutputTrap('User File Execution',msg_out, |
|
393 | user_exec = OutputTrap('User File Execution',msg_out, | |
393 | msg_err,msg_sep,debug), |
|
394 | msg_err,msg_sep,debug), | |
394 | logplay = OutputTrap('Log Loader',msg_out, |
|
395 | logplay = OutputTrap('Log Loader',msg_out, | |
395 | msg_err,msg_sep,debug), |
|
396 | msg_err,msg_sep,debug), | |
396 | summary = '' |
|
397 | summary = '' | |
397 | ) |
|
398 | ) | |
398 |
|
399 | |||
399 | #------------------------------------------------------------------------- |
|
400 | #------------------------------------------------------------------------- | |
400 | # Process user ipythonrc-type configuration files |
|
401 | # Process user ipythonrc-type configuration files | |
401 |
|
402 | |||
402 | # turn on output trapping and log to msg.config |
|
403 | # turn on output trapping and log to msg.config | |
403 | # remember that with debug on, trapping is actually disabled |
|
404 | # remember that with debug on, trapping is actually disabled | |
404 | msg.config.trap_all() |
|
405 | msg.config.trap_all() | |
405 |
|
406 | |||
406 | # look for rcfile in current or default directory |
|
407 | # look for rcfile in current or default directory | |
407 | try: |
|
408 | try: | |
408 | opts_all.rcfile = filefind(opts_all.rcfile,opts_all.ipythondir) |
|
409 | opts_all.rcfile = filefind(opts_all.rcfile,opts_all.ipythondir) | |
409 | except IOError: |
|
410 | except IOError: | |
410 | if opts_all.debug: IP.InteractiveTB() |
|
411 | if opts_all.debug: IP.InteractiveTB() | |
411 | warn('Configuration file %s not found. Ignoring request.' |
|
412 | warn('Configuration file %s not found. Ignoring request.' | |
412 | % (opts_all.rcfile) ) |
|
413 | % (opts_all.rcfile) ) | |
413 |
|
414 | |||
414 | # 'profiles' are a shorthand notation for config filenames |
|
415 | # 'profiles' are a shorthand notation for config filenames | |
415 | if opts_all.profile: |
|
416 | if opts_all.profile: | |
416 |
|
417 | |||
417 | try: |
|
418 | try: | |
418 | opts_all.rcfile = filefind('ipythonrc-' + opts_all.profile |
|
419 | opts_all.rcfile = filefind('ipythonrc-' + opts_all.profile | |
419 | + rc_suffix, |
|
420 | + rc_suffix, | |
420 | opts_all.ipythondir) |
|
421 | opts_all.ipythondir) | |
421 | except IOError: |
|
422 | except IOError: | |
422 | if opts_all.debug: IP.InteractiveTB() |
|
423 | if opts_all.debug: IP.InteractiveTB() | |
423 | opts.profile = '' # remove profile from options if invalid |
|
424 | opts.profile = '' # remove profile from options if invalid | |
424 | # We won't warn anymore, primary method is ipy_profile_PROFNAME |
|
425 | # We won't warn anymore, primary method is ipy_profile_PROFNAME | |
425 | # which does trigger a warning. |
|
426 | # which does trigger a warning. | |
426 |
|
427 | |||
427 | # load the config file |
|
428 | # load the config file | |
428 | rcfiledata = None |
|
429 | rcfiledata = None | |
429 | if opts_all.quick: |
|
430 | if opts_all.quick: | |
430 | print 'Launching IPython in quick mode. No config file read.' |
|
431 | print 'Launching IPython in quick mode. No config file read.' | |
431 | elif opts_all.classic: |
|
432 | elif opts_all.classic: | |
432 | print 'Launching IPython in classic mode. No config file read.' |
|
433 | print 'Launching IPython in classic mode. No config file read.' | |
433 | elif opts_all.rcfile: |
|
434 | elif opts_all.rcfile: | |
434 | try: |
|
435 | try: | |
435 | cfg_loader = ConfigLoader(conflict) |
|
436 | cfg_loader = ConfigLoader(conflict) | |
436 | rcfiledata = cfg_loader.load(opts_all.rcfile,typeconv, |
|
437 | rcfiledata = cfg_loader.load(opts_all.rcfile,typeconv, | |
437 | 'include',opts_all.ipythondir, |
|
438 | 'include',opts_all.ipythondir, | |
438 | purge = 1, |
|
439 | purge = 1, | |
439 | unique = conflict['preserve']) |
|
440 | unique = conflict['preserve']) | |
440 | except: |
|
441 | except: | |
441 | IP.InteractiveTB() |
|
442 | IP.InteractiveTB() | |
442 | warn('Problems loading configuration file '+ |
|
443 | warn('Problems loading configuration file '+ | |
443 | `opts_all.rcfile`+ |
|
444 | `opts_all.rcfile`+ | |
444 | '\nStarting with default -bare bones- configuration.') |
|
445 | '\nStarting with default -bare bones- configuration.') | |
445 | else: |
|
446 | else: | |
446 | warn('No valid configuration file found in either currrent directory\n'+ |
|
447 | warn('No valid configuration file found in either currrent directory\n'+ | |
447 | 'or in the IPython config. directory: '+`opts_all.ipythondir`+ |
|
448 | 'or in the IPython config. directory: '+`opts_all.ipythondir`+ | |
448 | '\nProceeding with internal defaults.') |
|
449 | '\nProceeding with internal defaults.') | |
449 |
|
450 | |||
450 | #------------------------------------------------------------------------ |
|
451 | #------------------------------------------------------------------------ | |
451 | # Set exception handlers in mode requested by user. |
|
452 | # Set exception handlers in mode requested by user. | |
452 | otrap = OutputTrap(trap_out=1) # trap messages from magic_xmode |
|
453 | otrap = OutputTrap(trap_out=1) # trap messages from magic_xmode | |
453 | IP.magic_xmode(opts_all.xmode) |
|
454 | IP.magic_xmode(opts_all.xmode) | |
454 | otrap.release_out() |
|
455 | otrap.release_out() | |
455 |
|
456 | |||
456 | #------------------------------------------------------------------------ |
|
457 | #------------------------------------------------------------------------ | |
457 | # Execute user config |
|
458 | # Execute user config | |
458 |
|
459 | |||
459 | # Create a valid config structure with the right precedence order: |
|
460 | # Create a valid config structure with the right precedence order: | |
460 | # defaults < rcfile < command line. This needs to be in the instance, so |
|
461 | # defaults < rcfile < command line. This needs to be in the instance, so | |
461 | # that method calls below that rely on it find it. |
|
462 | # that method calls below that rely on it find it. | |
462 | IP.rc = rc_def.copy() |
|
463 | IP.rc = rc_def.copy() | |
463 |
|
464 | |||
464 | # Work with a local alias inside this routine to avoid unnecessary |
|
465 | # Work with a local alias inside this routine to avoid unnecessary | |
465 | # attribute lookups. |
|
466 | # attribute lookups. | |
466 | IP_rc = IP.rc |
|
467 | IP_rc = IP.rc | |
467 |
|
468 | |||
468 | IP_rc.update(opts_def) |
|
469 | IP_rc.update(opts_def) | |
469 | if rcfiledata: |
|
470 | if rcfiledata: | |
470 | # now we can update |
|
471 | # now we can update | |
471 | IP_rc.update(rcfiledata) |
|
472 | IP_rc.update(rcfiledata) | |
472 | IP_rc.update(opts) |
|
473 | IP_rc.update(opts) | |
473 | IP_rc.update(rc_override) |
|
474 | IP_rc.update(rc_override) | |
474 |
|
475 | |||
475 | # Store the original cmd line for reference: |
|
476 | # Store the original cmd line for reference: | |
476 | IP_rc.opts = opts |
|
477 | IP_rc.opts = opts | |
477 | IP_rc.args = args |
|
478 | IP_rc.args = args | |
478 |
|
479 | |||
479 | # create a *runtime* Struct like rc for holding parameters which may be |
|
480 | # create a *runtime* Struct like rc for holding parameters which may be | |
480 | # created and/or modified by runtime user extensions. |
|
481 | # created and/or modified by runtime user extensions. | |
481 | IP.runtime_rc = Struct() |
|
482 | IP.runtime_rc = Struct() | |
482 |
|
483 | |||
483 | # from this point on, all config should be handled through IP_rc, |
|
484 | # from this point on, all config should be handled through IP_rc, | |
484 | # opts* shouldn't be used anymore. |
|
485 | # opts* shouldn't be used anymore. | |
485 |
|
486 | |||
486 |
|
487 | |||
487 | # update IP_rc with some special things that need manual |
|
488 | # update IP_rc with some special things that need manual | |
488 | # tweaks. Basically options which affect other options. I guess this |
|
489 | # tweaks. Basically options which affect other options. I guess this | |
489 | # should just be written so that options are fully orthogonal and we |
|
490 | # should just be written so that options are fully orthogonal and we | |
490 | # wouldn't worry about this stuff! |
|
491 | # wouldn't worry about this stuff! | |
491 |
|
492 | |||
492 | if IP_rc.classic: |
|
493 | if IP_rc.classic: | |
493 | IP_rc.quick = 1 |
|
494 | IP_rc.quick = 1 | |
494 | IP_rc.cache_size = 0 |
|
495 | IP_rc.cache_size = 0 | |
495 | IP_rc.pprint = 0 |
|
496 | IP_rc.pprint = 0 | |
496 | IP_rc.prompt_in1 = '>>> ' |
|
497 | IP_rc.prompt_in1 = '>>> ' | |
497 | IP_rc.prompt_in2 = '... ' |
|
498 | IP_rc.prompt_in2 = '... ' | |
498 | IP_rc.prompt_out = '' |
|
499 | IP_rc.prompt_out = '' | |
499 | IP_rc.separate_in = IP_rc.separate_out = IP_rc.separate_out2 = '0' |
|
500 | IP_rc.separate_in = IP_rc.separate_out = IP_rc.separate_out2 = '0' | |
500 | IP_rc.colors = 'NoColor' |
|
501 | IP_rc.colors = 'NoColor' | |
501 | IP_rc.xmode = 'Plain' |
|
502 | IP_rc.xmode = 'Plain' | |
502 |
|
503 | |||
503 | IP.pre_config_initialization() |
|
504 | IP.pre_config_initialization() | |
504 | # configure readline |
|
505 | # configure readline | |
505 | # Define the history file for saving commands in between sessions |
|
506 | # Define the history file for saving commands in between sessions | |
506 | if IP_rc.profile: |
|
507 | if IP_rc.profile: | |
507 | histfname = 'history-%s' % IP_rc.profile |
|
508 | histfname = 'history-%s' % IP_rc.profile | |
508 | else: |
|
509 | else: | |
509 | histfname = 'history' |
|
510 | histfname = 'history' | |
510 | IP.histfile = os.path.join(opts_all.ipythondir,histfname) |
|
511 | IP.histfile = os.path.join(opts_all.ipythondir,histfname) | |
511 |
|
512 | |||
512 | # update exception handlers with rc file status |
|
513 | # update exception handlers with rc file status | |
513 | otrap.trap_out() # I don't want these messages ever. |
|
514 | otrap.trap_out() # I don't want these messages ever. | |
514 | IP.magic_xmode(IP_rc.xmode) |
|
515 | IP.magic_xmode(IP_rc.xmode) | |
515 | otrap.release_out() |
|
516 | otrap.release_out() | |
516 |
|
517 | |||
517 | # activate logging if requested and not reloading a log |
|
518 | # activate logging if requested and not reloading a log | |
518 | if IP_rc.logplay: |
|
519 | if IP_rc.logplay: | |
519 | IP.magic_logstart(IP_rc.logplay + ' append') |
|
520 | IP.magic_logstart(IP_rc.logplay + ' append') | |
520 | elif IP_rc.logfile: |
|
521 | elif IP_rc.logfile: | |
521 | IP.magic_logstart(IP_rc.logfile) |
|
522 | IP.magic_logstart(IP_rc.logfile) | |
522 | elif IP_rc.log: |
|
523 | elif IP_rc.log: | |
523 | IP.magic_logstart() |
|
524 | IP.magic_logstart() | |
524 |
|
525 | |||
525 | # find user editor so that it we don't have to look it up constantly |
|
526 | # find user editor so that it we don't have to look it up constantly | |
526 | if IP_rc.editor.strip()=='0': |
|
527 | if IP_rc.editor.strip()=='0': | |
527 | try: |
|
528 | try: | |
528 | ed = os.environ['EDITOR'] |
|
529 | ed = os.environ['EDITOR'] | |
529 | except KeyError: |
|
530 | except KeyError: | |
530 | if os.name == 'posix': |
|
531 | if os.name == 'posix': | |
531 | ed = 'vi' # the only one guaranteed to be there! |
|
532 | ed = 'vi' # the only one guaranteed to be there! | |
532 | else: |
|
533 | else: | |
533 | ed = 'notepad' # same in Windows! |
|
534 | ed = 'notepad' # same in Windows! | |
534 | IP_rc.editor = ed |
|
535 | IP_rc.editor = ed | |
535 |
|
536 | |||
536 | # Keep track of whether this is an embedded instance or not (useful for |
|
537 | # Keep track of whether this is an embedded instance or not (useful for | |
537 | # post-mortems). |
|
538 | # post-mortems). | |
538 | IP_rc.embedded = IP.embedded |
|
539 | IP_rc.embedded = IP.embedded | |
539 |
|
540 | |||
540 | # Recursive reload |
|
541 | # Recursive reload | |
541 | try: |
|
542 | try: | |
542 | from IPython import deep_reload |
|
543 | from IPython import deep_reload | |
543 | if IP_rc.deep_reload: |
|
544 | if IP_rc.deep_reload: | |
544 | __builtin__.reload = deep_reload.reload |
|
545 | __builtin__.reload = deep_reload.reload | |
545 | else: |
|
546 | else: | |
546 | __builtin__.dreload = deep_reload.reload |
|
547 | __builtin__.dreload = deep_reload.reload | |
547 | del deep_reload |
|
548 | del deep_reload | |
548 | except ImportError: |
|
549 | except ImportError: | |
549 | pass |
|
550 | pass | |
550 |
|
551 | |||
551 | # Save the current state of our namespace so that the interactive shell |
|
552 | # Save the current state of our namespace so that the interactive shell | |
552 | # can later know which variables have been created by us from config files |
|
553 | # can later know which variables have been created by us from config files | |
553 | # and loading. This way, loading a file (in any way) is treated just like |
|
554 | # and loading. This way, loading a file (in any way) is treated just like | |
554 | # defining things on the command line, and %who works as expected. |
|
555 | # defining things on the command line, and %who works as expected. | |
555 |
|
556 | |||
556 | # DON'T do anything that affects the namespace beyond this point! |
|
557 | # DON'T do anything that affects the namespace beyond this point! | |
557 | IP.internal_ns.update(__main__.__dict__) |
|
558 | IP.internal_ns.update(__main__.__dict__) | |
558 |
|
559 | |||
559 | #IP.internal_ns.update(locals()) # so our stuff doesn't show up in %who |
|
560 | #IP.internal_ns.update(locals()) # so our stuff doesn't show up in %who | |
560 |
|
561 | |||
561 | # Now run through the different sections of the users's config |
|
562 | # Now run through the different sections of the users's config | |
562 | if IP_rc.debug: |
|
563 | if IP_rc.debug: | |
563 | print 'Trying to execute the following configuration structure:' |
|
564 | print 'Trying to execute the following configuration structure:' | |
564 | print '(Things listed first are deeper in the inclusion tree and get' |
|
565 | print '(Things listed first are deeper in the inclusion tree and get' | |
565 | print 'loaded first).\n' |
|
566 | print 'loaded first).\n' | |
566 | pprint(IP_rc.__dict__) |
|
567 | pprint(IP_rc.__dict__) | |
567 |
|
568 | |||
568 | for mod in IP_rc.import_mod: |
|
569 | for mod in IP_rc.import_mod: | |
569 | try: |
|
570 | try: | |
570 | exec 'import '+mod in IP.user_ns |
|
571 | exec 'import '+mod in IP.user_ns | |
571 | except : |
|
572 | except : | |
572 | IP.InteractiveTB() |
|
573 | IP.InteractiveTB() | |
573 | import_fail_info(mod) |
|
574 | import_fail_info(mod) | |
574 |
|
575 | |||
575 | for mod_fn in IP_rc.import_some: |
|
576 | for mod_fn in IP_rc.import_some: | |
576 | if mod_fn == []: break |
|
577 | if mod_fn == []: break | |
577 | mod,fn = mod_fn[0],','.join(mod_fn[1:]) |
|
578 | mod,fn = mod_fn[0],','.join(mod_fn[1:]) | |
578 | try: |
|
579 | try: | |
579 | exec 'from '+mod+' import '+fn in IP.user_ns |
|
580 | exec 'from '+mod+' import '+fn in IP.user_ns | |
580 | except : |
|
581 | except : | |
581 | IP.InteractiveTB() |
|
582 | IP.InteractiveTB() | |
582 | import_fail_info(mod,fn) |
|
583 | import_fail_info(mod,fn) | |
583 |
|
584 | |||
584 | for mod in IP_rc.import_all: |
|
585 | for mod in IP_rc.import_all: | |
585 | try: |
|
586 | try: | |
586 | exec 'from '+mod+' import *' in IP.user_ns |
|
587 | exec 'from '+mod+' import *' in IP.user_ns | |
587 | except : |
|
588 | except : | |
588 | IP.InteractiveTB() |
|
589 | IP.InteractiveTB() | |
589 | import_fail_info(mod) |
|
590 | import_fail_info(mod) | |
590 |
|
591 | |||
591 | for code in IP_rc.execute: |
|
592 | for code in IP_rc.execute: | |
592 | try: |
|
593 | try: | |
593 | exec code in IP.user_ns |
|
594 | exec code in IP.user_ns | |
594 | except: |
|
595 | except: | |
595 | IP.InteractiveTB() |
|
596 | IP.InteractiveTB() | |
596 | warn('Failure executing code: ' + `code`) |
|
597 | warn('Failure executing code: ' + `code`) | |
597 |
|
598 | |||
598 | # Execute the files the user wants in ipythonrc |
|
599 | # Execute the files the user wants in ipythonrc | |
599 | for file in IP_rc.execfile: |
|
600 | for file in IP_rc.execfile: | |
600 | try: |
|
601 | try: | |
601 | file = filefind(file,sys.path+[IPython_dir]) |
|
602 | file = filefind(file,sys.path+[IPython_dir]) | |
602 | except IOError: |
|
603 | except IOError: | |
603 | warn(itpl('File $file not found. Skipping it.')) |
|
604 | warn(itpl('File $file not found. Skipping it.')) | |
604 | else: |
|
605 | else: | |
605 | IP.safe_execfile(os.path.expanduser(file),IP.user_ns) |
|
606 | IP.safe_execfile(os.path.expanduser(file),IP.user_ns) | |
606 |
|
607 | |||
607 | # finally, try importing ipy_*_conf for final configuration |
|
608 | # finally, try importing ipy_*_conf for final configuration | |
608 | try: |
|
609 | try: | |
609 | import ipy_system_conf |
|
610 | import ipy_system_conf | |
610 | except ImportError: |
|
611 | except ImportError: | |
611 | if opts_all.debug: IP.InteractiveTB() |
|
612 | if opts_all.debug: IP.InteractiveTB() | |
612 | warn("Could not import 'ipy_system_conf'") |
|
613 | warn("Could not import 'ipy_system_conf'") | |
613 | except: |
|
614 | except: | |
614 | IP.InteractiveTB() |
|
615 | IP.InteractiveTB() | |
615 | import_fail_info('ipy_system_conf') |
|
616 | import_fail_info('ipy_system_conf') | |
616 |
|
617 | |||
617 | if opts_all.profile: |
|
618 | if opts_all.profile: | |
618 | profmodname = 'ipy_profile_' + opts_all.profile |
|
619 | profmodname = 'ipy_profile_' + opts_all.profile | |
619 | try: |
|
620 | try: | |
620 | __import__(profmodname) |
|
621 | __import__(profmodname) | |
621 | except ImportError: |
|
622 | except ImportError: | |
622 | # only warn if ipythonrc-PROFNAME didn't exist |
|
623 | # only warn if ipythonrc-PROFNAME didn't exist | |
623 | if opts.profile =='': |
|
624 | if opts.profile =='': | |
624 | warn("Could not start with profile '%s'!\n" |
|
625 | warn("Could not start with profile '%s'!\n" | |
625 | "('%s/%s.py' does not exist? run '%%upgrade')" % |
|
626 | "('%s/%s.py' does not exist? run '%%upgrade')" % | |
626 | (opts_all.profile, opts_all.ipythondir, profmodname) ) |
|
627 | (opts_all.profile, opts_all.ipythondir, profmodname) ) | |
627 | except: |
|
628 | except: | |
628 | print "Error importing",profmodname |
|
629 | print "Error importing",profmodname | |
629 | IP.InteractiveTB() |
|
630 | IP.InteractiveTB() | |
630 | import_fail_info(profmodname) |
|
631 | import_fail_info(profmodname) | |
631 |
|
632 | |||
632 | try: |
|
633 | try: | |
633 | import ipy_user_conf |
|
634 | import ipy_user_conf | |
634 | except ImportError: |
|
635 | except ImportError: | |
635 | if opts_all.debug: IP.InteractiveTB() |
|
636 | if opts_all.debug: IP.InteractiveTB() | |
636 | warn("Could not import user config!\n " |
|
637 | warn("Could not import user config!\n " | |
637 | "('%s/ipy_user_conf.py' does not exist? Please run '%%upgrade')\n" |
|
638 | "('%s/ipy_user_conf.py' does not exist? Please run '%%upgrade')\n" | |
638 | % opts_all.ipythondir) |
|
639 | % opts_all.ipythondir) | |
639 | except: |
|
640 | except: | |
640 | print "Error importing ipy_user_conf" |
|
641 | print "Error importing ipy_user_conf" | |
641 | IP.InteractiveTB() |
|
642 | IP.InteractiveTB() | |
642 | import_fail_info("ipy_user_conf") |
|
643 | import_fail_info("ipy_user_conf") | |
643 |
|
644 | |||
644 | # release stdout and stderr and save config log into a global summary |
|
645 | # release stdout and stderr and save config log into a global summary | |
645 | msg.config.release_all() |
|
646 | msg.config.release_all() | |
646 | if IP_rc.messages: |
|
647 | if IP_rc.messages: | |
647 | msg.summary += msg.config.summary_all() |
|
648 | msg.summary += msg.config.summary_all() | |
648 |
|
649 | |||
649 | #------------------------------------------------------------------------ |
|
650 | #------------------------------------------------------------------------ | |
650 | # Setup interactive session |
|
651 | # Setup interactive session | |
651 |
|
652 | |||
652 | # Now we should be fully configured. We can then execute files or load |
|
653 | # Now we should be fully configured. We can then execute files or load | |
653 | # things only needed for interactive use. Then we'll open the shell. |
|
654 | # things only needed for interactive use. Then we'll open the shell. | |
654 |
|
655 | |||
655 | # Take a snapshot of the user namespace before opening the shell. That way |
|
656 | # Take a snapshot of the user namespace before opening the shell. That way | |
656 | # we'll be able to identify which things were interactively defined and |
|
657 | # we'll be able to identify which things were interactively defined and | |
657 | # which were defined through config files. |
|
658 | # which were defined through config files. | |
658 | IP.user_config_ns = IP.user_ns.copy() |
|
659 | IP.user_config_ns = IP.user_ns.copy() | |
659 |
|
660 | |||
660 | # Force reading a file as if it were a session log. Slower but safer. |
|
661 | # Force reading a file as if it were a session log. Slower but safer. | |
661 | if load_logplay: |
|
662 | if load_logplay: | |
662 | print 'Replaying log...' |
|
663 | print 'Replaying log...' | |
663 | try: |
|
664 | try: | |
664 | if IP_rc.debug: |
|
665 | if IP_rc.debug: | |
665 | logplay_quiet = 0 |
|
666 | logplay_quiet = 0 | |
666 | else: |
|
667 | else: | |
667 | logplay_quiet = 1 |
|
668 | logplay_quiet = 1 | |
668 |
|
669 | |||
669 | msg.logplay.trap_all() |
|
670 | msg.logplay.trap_all() | |
670 | IP.safe_execfile(load_logplay,IP.user_ns, |
|
671 | IP.safe_execfile(load_logplay,IP.user_ns, | |
671 | islog = 1, quiet = logplay_quiet) |
|
672 | islog = 1, quiet = logplay_quiet) | |
672 | msg.logplay.release_all() |
|
673 | msg.logplay.release_all() | |
673 | if IP_rc.messages: |
|
674 | if IP_rc.messages: | |
674 | msg.summary += msg.logplay.summary_all() |
|
675 | msg.summary += msg.logplay.summary_all() | |
675 | except: |
|
676 | except: | |
676 | warn('Problems replaying logfile %s.' % load_logplay) |
|
677 | warn('Problems replaying logfile %s.' % load_logplay) | |
677 | IP.InteractiveTB() |
|
678 | IP.InteractiveTB() | |
678 |
|
679 | |||
679 | # Load remaining files in command line |
|
680 | # Load remaining files in command line | |
680 | msg.user_exec.trap_all() |
|
681 | msg.user_exec.trap_all() | |
681 |
|
682 | |||
682 | # Do NOT execute files named in the command line as scripts to be loaded |
|
683 | # Do NOT execute files named in the command line as scripts to be loaded | |
683 | # by embedded instances. Doing so has the potential for an infinite |
|
684 | # by embedded instances. Doing so has the potential for an infinite | |
684 | # recursion if there are exceptions thrown in the process. |
|
685 | # recursion if there are exceptions thrown in the process. | |
685 |
|
686 | |||
686 | # XXX FIXME: the execution of user files should be moved out to after |
|
687 | # XXX FIXME: the execution of user files should be moved out to after | |
687 | # ipython is fully initialized, just as if they were run via %run at the |
|
688 | # ipython is fully initialized, just as if they were run via %run at the | |
688 | # ipython prompt. This would also give them the benefit of ipython's |
|
689 | # ipython prompt. This would also give them the benefit of ipython's | |
689 | # nice tracebacks. |
|
690 | # nice tracebacks. | |
690 |
|
691 | |||
691 | if (not embedded and IP_rc.args and |
|
692 | if (not embedded and IP_rc.args and | |
692 | not IP_rc.args[0].lower().endswith('.ipy')): |
|
693 | not IP_rc.args[0].lower().endswith('.ipy')): | |
693 | name_save = IP.user_ns['__name__'] |
|
694 | name_save = IP.user_ns['__name__'] | |
694 | IP.user_ns['__name__'] = '__main__' |
|
695 | IP.user_ns['__name__'] = '__main__' | |
695 | # Set our own excepthook in case the user code tries to call it |
|
696 | # Set our own excepthook in case the user code tries to call it | |
696 | # directly. This prevents triggering the IPython crash handler. |
|
697 | # directly. This prevents triggering the IPython crash handler. | |
697 | old_excepthook,sys.excepthook = sys.excepthook, IP.excepthook |
|
698 | old_excepthook,sys.excepthook = sys.excepthook, IP.excepthook | |
698 |
|
699 | |||
699 | save_argv = sys.argv[1:] # save it for later restoring |
|
700 | save_argv = sys.argv[1:] # save it for later restoring | |
700 |
|
701 | |||
701 | sys.argv = args |
|
702 | sys.argv = args | |
702 |
|
703 | |||
703 | try: |
|
704 | try: | |
704 | IP.safe_execfile(args[0], IP.user_ns) |
|
705 | IP.safe_execfile(args[0], IP.user_ns) | |
705 | finally: |
|
706 | finally: | |
706 | # Reset our crash handler in place |
|
707 | # Reset our crash handler in place | |
707 | sys.excepthook = old_excepthook |
|
708 | sys.excepthook = old_excepthook | |
708 | sys.argv[:] = save_argv |
|
709 | sys.argv[:] = save_argv | |
709 | IP.user_ns['__name__'] = name_save |
|
710 | IP.user_ns['__name__'] = name_save | |
710 |
|
711 | |||
711 | msg.user_exec.release_all() |
|
712 | msg.user_exec.release_all() | |
712 |
|
713 | |||
713 | if IP_rc.messages: |
|
714 | if IP_rc.messages: | |
714 | msg.summary += msg.user_exec.summary_all() |
|
715 | msg.summary += msg.user_exec.summary_all() | |
715 |
|
716 | |||
716 | # since we can't specify a null string on the cmd line, 0 is the equivalent: |
|
717 | # since we can't specify a null string on the cmd line, 0 is the equivalent: | |
717 | if IP_rc.nosep: |
|
718 | if IP_rc.nosep: | |
718 | IP_rc.separate_in = IP_rc.separate_out = IP_rc.separate_out2 = '0' |
|
719 | IP_rc.separate_in = IP_rc.separate_out = IP_rc.separate_out2 = '0' | |
719 | if IP_rc.separate_in == '0': IP_rc.separate_in = '' |
|
720 | if IP_rc.separate_in == '0': IP_rc.separate_in = '' | |
720 | if IP_rc.separate_out == '0': IP_rc.separate_out = '' |
|
721 | if IP_rc.separate_out == '0': IP_rc.separate_out = '' | |
721 | if IP_rc.separate_out2 == '0': IP_rc.separate_out2 = '' |
|
722 | if IP_rc.separate_out2 == '0': IP_rc.separate_out2 = '' | |
722 | IP_rc.separate_in = IP_rc.separate_in.replace('\\n','\n') |
|
723 | IP_rc.separate_in = IP_rc.separate_in.replace('\\n','\n') | |
723 | IP_rc.separate_out = IP_rc.separate_out.replace('\\n','\n') |
|
724 | IP_rc.separate_out = IP_rc.separate_out.replace('\\n','\n') | |
724 | IP_rc.separate_out2 = IP_rc.separate_out2.replace('\\n','\n') |
|
725 | IP_rc.separate_out2 = IP_rc.separate_out2.replace('\\n','\n') | |
725 |
|
726 | |||
726 | # Determine how many lines at the bottom of the screen are needed for |
|
727 | # Determine how many lines at the bottom of the screen are needed for | |
727 | # showing prompts, so we can know wheter long strings are to be printed or |
|
728 | # showing prompts, so we can know wheter long strings are to be printed or | |
728 | # paged: |
|
729 | # paged: | |
729 | num_lines_bot = IP_rc.separate_in.count('\n')+1 |
|
730 | num_lines_bot = IP_rc.separate_in.count('\n')+1 | |
730 | IP_rc.screen_length = IP_rc.screen_length - num_lines_bot |
|
731 | IP_rc.screen_length = IP_rc.screen_length - num_lines_bot | |
731 |
|
732 | |||
732 | # configure startup banner |
|
733 | # configure startup banner | |
733 | if IP_rc.c: # regular python doesn't print the banner with -c |
|
734 | if IP_rc.c: # regular python doesn't print the banner with -c | |
734 | IP_rc.banner = 0 |
|
735 | IP_rc.banner = 0 | |
735 | if IP_rc.banner: |
|
736 | if IP_rc.banner: | |
736 | BANN_P = IP.BANNER_PARTS |
|
737 | BANN_P = IP.BANNER_PARTS | |
737 | else: |
|
738 | else: | |
738 | BANN_P = [] |
|
739 | BANN_P = [] | |
739 |
|
740 | |||
740 | if IP_rc.profile: BANN_P.append('IPython profile: %s\n' % IP_rc.profile) |
|
741 | if IP_rc.profile: BANN_P.append('IPython profile: %s\n' % IP_rc.profile) | |
741 |
|
742 | |||
742 | # add message log (possibly empty) |
|
743 | # add message log (possibly empty) | |
743 | if msg.summary: BANN_P.append(msg.summary) |
|
744 | if msg.summary: BANN_P.append(msg.summary) | |
744 | # Final banner is a string |
|
745 | # Final banner is a string | |
745 | IP.BANNER = '\n'.join(BANN_P) |
|
746 | IP.BANNER = '\n'.join(BANN_P) | |
746 |
|
747 | |||
747 | # Finalize the IPython instance. This assumes the rc structure is fully |
|
748 | # Finalize the IPython instance. This assumes the rc structure is fully | |
748 | # in place. |
|
749 | # in place. | |
749 | IP.post_config_initialization() |
|
750 | IP.post_config_initialization() | |
750 |
|
751 | |||
751 | return IP |
|
752 | return IP | |
752 | #************************ end of file <ipmaker.py> ************************** |
|
753 | #************************ end of file <ipmaker.py> ************************** |
1 | NO CONTENT: modified file |
|
NO CONTENT: modified file | ||
The requested commit or file is too big and content was truncated. Show full diff |
General Comments 0
You need to be logged in to leave comments.
Login now