##// END OF EJS Templates
fix cd -b crash (patch by Ville)
fperez -
Show More
@@ -1,2707 +1,2707 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 990 2006-01-04 06:59:02Z fperez $"""
4 $Id: Magic.py 991 2006-01-04 18:15:34Z fperez $"""
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-2004 Fernando Perez <fperez@colorado.edu>
8 # Copyright (C) 2001-2004 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 sys
29 import sys
30 import re
30 import re
31 import tempfile
31 import tempfile
32 import time
32 import time
33 import cPickle as pickle
33 import cPickle as pickle
34 from cStringIO import StringIO
34 from cStringIO import StringIO
35 from getopt import getopt
35 from getopt import getopt
36 from pprint import pprint, pformat
36 from pprint import pprint, pformat
37
37
38 # profile isn't bundled by default in Debian for license reasons
38 # profile isn't bundled by default in Debian for license reasons
39 try:
39 try:
40 import profile,pstats
40 import profile,pstats
41 except ImportError:
41 except ImportError:
42 profile = pstats = None
42 profile = pstats = None
43
43
44 # Homebrewed
44 # Homebrewed
45 from IPython import Debugger, OInspect, wildcard
45 from IPython import Debugger, OInspect, wildcard
46 from IPython.FakeModule import FakeModule
46 from IPython.FakeModule import FakeModule
47 from IPython.Itpl import Itpl, itpl, printpl,itplns
47 from IPython.Itpl import Itpl, itpl, printpl,itplns
48 from IPython.PyColorize import Parser
48 from IPython.PyColorize import Parser
49 from IPython.Struct import Struct
49 from IPython.Struct import Struct
50 from IPython.macro import Macro
50 from IPython.macro import Macro
51 from IPython.genutils import *
51 from IPython.genutils import *
52
52
53 #***************************************************************************
53 #***************************************************************************
54 # Utility functions
54 # Utility functions
55 def on_off(tag):
55 def on_off(tag):
56 """Return an ON/OFF string for a 1/0 input. Simple utility function."""
56 """Return an ON/OFF string for a 1/0 input. Simple utility function."""
57 return ['OFF','ON'][tag]
57 return ['OFF','ON'][tag]
58
58
59
59
60 #***************************************************************************
60 #***************************************************************************
61 # Main class implementing Magic functionality
61 # Main class implementing Magic functionality
62 class Magic:
62 class Magic:
63 """Magic functions for InteractiveShell.
63 """Magic functions for InteractiveShell.
64
64
65 Shell functions which can be reached as %function_name. All magic
65 Shell functions which can be reached as %function_name. All magic
66 functions should accept a string, which they can parse for their own
66 functions should accept a string, which they can parse for their own
67 needs. This can make some functions easier to type, eg `%cd ../`
67 needs. This can make some functions easier to type, eg `%cd ../`
68 vs. `%cd("../")`
68 vs. `%cd("../")`
69
69
70 ALL definitions MUST begin with the prefix magic_. The user won't need it
70 ALL definitions MUST begin with the prefix magic_. The user won't need it
71 at the command line, but it is is needed in the definition. """
71 at the command line, but it is is needed in the definition. """
72
72
73 # class globals
73 # class globals
74 auto_status = ['Automagic is OFF, % prefix IS needed for magic functions.',
74 auto_status = ['Automagic is OFF, % prefix IS needed for magic functions.',
75 'Automagic is ON, % prefix NOT needed for magic functions.']
75 'Automagic is ON, % prefix NOT needed for magic functions.']
76
76
77 #......................................................................
77 #......................................................................
78 # some utility functions
78 # some utility functions
79
79
80 def __init__(self,shell):
80 def __init__(self,shell):
81
81
82 self.options_table = {}
82 self.options_table = {}
83 if profile is None:
83 if profile is None:
84 self.magic_prun = self.profile_missing_notice
84 self.magic_prun = self.profile_missing_notice
85 self.shell = shell
85 self.shell = shell
86
86
87 def profile_missing_notice(self, *args, **kwargs):
87 def profile_missing_notice(self, *args, **kwargs):
88 error("""\
88 error("""\
89 The profile module could not be found. If you are a Debian user,
89 The profile module could not be found. If you are a Debian user,
90 it has been removed from the standard Debian package because of its non-free
90 it has been removed from the standard Debian package because of its non-free
91 license. To use profiling, please install"python2.3-profiler" from non-free.""")
91 license. To use profiling, please install"python2.3-profiler" from non-free.""")
92
92
93 def default_option(self,fn,optstr):
93 def default_option(self,fn,optstr):
94 """Make an entry in the options_table for fn, with value optstr"""
94 """Make an entry in the options_table for fn, with value optstr"""
95
95
96 if fn not in self.lsmagic():
96 if fn not in self.lsmagic():
97 error("%s is not a magic function" % fn)
97 error("%s is not a magic function" % fn)
98 self.options_table[fn] = optstr
98 self.options_table[fn] = optstr
99
99
100 def lsmagic(self):
100 def lsmagic(self):
101 """Return a list of currently available magic functions.
101 """Return a list of currently available magic functions.
102
102
103 Gives a list of the bare names after mangling (['ls','cd', ...], not
103 Gives a list of the bare names after mangling (['ls','cd', ...], not
104 ['magic_ls','magic_cd',...]"""
104 ['magic_ls','magic_cd',...]"""
105
105
106 # FIXME. This needs a cleanup, in the way the magics list is built.
106 # FIXME. This needs a cleanup, in the way the magics list is built.
107
107
108 # magics in class definition
108 # magics in class definition
109 class_magic = lambda fn: fn.startswith('magic_') and \
109 class_magic = lambda fn: fn.startswith('magic_') and \
110 callable(Magic.__dict__[fn])
110 callable(Magic.__dict__[fn])
111 # in instance namespace (run-time user additions)
111 # in instance namespace (run-time user additions)
112 inst_magic = lambda fn: fn.startswith('magic_') and \
112 inst_magic = lambda fn: fn.startswith('magic_') and \
113 callable(self.__dict__[fn])
113 callable(self.__dict__[fn])
114 # and bound magics by user (so they can access self):
114 # and bound magics by user (so they can access self):
115 inst_bound_magic = lambda fn: fn.startswith('magic_') and \
115 inst_bound_magic = lambda fn: fn.startswith('magic_') and \
116 callable(self.__class__.__dict__[fn])
116 callable(self.__class__.__dict__[fn])
117 magics = filter(class_magic,Magic.__dict__.keys()) + \
117 magics = filter(class_magic,Magic.__dict__.keys()) + \
118 filter(inst_magic,self.__dict__.keys()) + \
118 filter(inst_magic,self.__dict__.keys()) + \
119 filter(inst_bound_magic,self.__class__.__dict__.keys())
119 filter(inst_bound_magic,self.__class__.__dict__.keys())
120 out = []
120 out = []
121 for fn in magics:
121 for fn in magics:
122 out.append(fn.replace('magic_','',1))
122 out.append(fn.replace('magic_','',1))
123 out.sort()
123 out.sort()
124 return out
124 return out
125
125
126 def extract_input_slices(self,slices):
126 def extract_input_slices(self,slices):
127 """Return as a string a set of input history slices.
127 """Return as a string a set of input history slices.
128
128
129 The set of slices is given as a list of strings (like ['1','4:8','9'],
129 The set of slices is given as a list of strings (like ['1','4:8','9'],
130 since this function is for use by magic functions which get their
130 since this function is for use by magic functions which get their
131 arguments as strings.
131 arguments as strings.
132
132
133 Note that slices can be called with two notations:
133 Note that slices can be called with two notations:
134
134
135 N:M -> standard python form, means including items N...(M-1).
135 N:M -> standard python form, means including items N...(M-1).
136
136
137 N-M -> include items N..M (closed endpoint)."""
137 N-M -> include items N..M (closed endpoint)."""
138
138
139 cmds = []
139 cmds = []
140 for chunk in slices:
140 for chunk in slices:
141 if ':' in chunk:
141 if ':' in chunk:
142 ini,fin = map(int,chunk.split(':'))
142 ini,fin = map(int,chunk.split(':'))
143 elif '-' in chunk:
143 elif '-' in chunk:
144 ini,fin = map(int,chunk.split('-'))
144 ini,fin = map(int,chunk.split('-'))
145 fin += 1
145 fin += 1
146 else:
146 else:
147 ini = int(chunk)
147 ini = int(chunk)
148 fin = ini+1
148 fin = ini+1
149 cmds.append(self.shell.input_hist[ini:fin])
149 cmds.append(self.shell.input_hist[ini:fin])
150 return cmds
150 return cmds
151
151
152 def _ofind(self,oname):
152 def _ofind(self,oname):
153 """Find an object in the available namespaces.
153 """Find an object in the available namespaces.
154
154
155 self._ofind(oname) -> dict with keys: found,obj,ospace,ismagic
155 self._ofind(oname) -> dict with keys: found,obj,ospace,ismagic
156
156
157 Has special code to detect magic functions.
157 Has special code to detect magic functions.
158 """
158 """
159
159
160 oname = oname.strip()
160 oname = oname.strip()
161
161
162 # Namespaces to search in:
162 # Namespaces to search in:
163 user_ns = self.shell.user_ns
163 user_ns = self.shell.user_ns
164 internal_ns = self.shell.internal_ns
164 internal_ns = self.shell.internal_ns
165 builtin_ns = __builtin__.__dict__
165 builtin_ns = __builtin__.__dict__
166 alias_ns = self.shell.alias_table
166 alias_ns = self.shell.alias_table
167
167
168 # Put them in a list. The order is important so that we find things in
168 # Put them in a list. The order is important so that we find things in
169 # the same order that Python finds them.
169 # the same order that Python finds them.
170 namespaces = [ ('Interactive',user_ns),
170 namespaces = [ ('Interactive',user_ns),
171 ('IPython internal',internal_ns),
171 ('IPython internal',internal_ns),
172 ('Python builtin',builtin_ns),
172 ('Python builtin',builtin_ns),
173 ('Alias',alias_ns),
173 ('Alias',alias_ns),
174 ]
174 ]
175
175
176 # initialize results to 'null'
176 # initialize results to 'null'
177 found = 0; obj = None; ospace = None; ds = None;
177 found = 0; obj = None; ospace = None; ds = None;
178 ismagic = 0; isalias = 0
178 ismagic = 0; isalias = 0
179
179
180 # Look for the given name by splitting it in parts. If the head is
180 # Look for the given name by splitting it in parts. If the head is
181 # found, then we look for all the remaining parts as members, and only
181 # found, then we look for all the remaining parts as members, and only
182 # declare success if we can find them all.
182 # declare success if we can find them all.
183 oname_parts = oname.split('.')
183 oname_parts = oname.split('.')
184 oname_head, oname_rest = oname_parts[0],oname_parts[1:]
184 oname_head, oname_rest = oname_parts[0],oname_parts[1:]
185 for nsname,ns in namespaces:
185 for nsname,ns in namespaces:
186 try:
186 try:
187 obj = ns[oname_head]
187 obj = ns[oname_head]
188 except KeyError:
188 except KeyError:
189 continue
189 continue
190 else:
190 else:
191 for part in oname_rest:
191 for part in oname_rest:
192 try:
192 try:
193 obj = getattr(obj,part)
193 obj = getattr(obj,part)
194 except:
194 except:
195 # Blanket except b/c some badly implemented objects
195 # Blanket except b/c some badly implemented objects
196 # allow __getattr__ to raise exceptions other than
196 # allow __getattr__ to raise exceptions other than
197 # AttributeError, which then crashes IPython.
197 # AttributeError, which then crashes IPython.
198 break
198 break
199 else:
199 else:
200 # If we finish the for loop (no break), we got all members
200 # If we finish the for loop (no break), we got all members
201 found = 1
201 found = 1
202 ospace = nsname
202 ospace = nsname
203 if ns == alias_ns:
203 if ns == alias_ns:
204 isalias = 1
204 isalias = 1
205 break # namespace loop
205 break # namespace loop
206
206
207 # Try to see if it's magic
207 # Try to see if it's magic
208 if not found:
208 if not found:
209 if oname.startswith(self.shell.ESC_MAGIC):
209 if oname.startswith(self.shell.ESC_MAGIC):
210 oname = oname[1:]
210 oname = oname[1:]
211 obj = getattr(self,'magic_'+oname,None)
211 obj = getattr(self,'magic_'+oname,None)
212 if obj is not None:
212 if obj is not None:
213 found = 1
213 found = 1
214 ospace = 'IPython internal'
214 ospace = 'IPython internal'
215 ismagic = 1
215 ismagic = 1
216
216
217 # Last try: special-case some literals like '', [], {}, etc:
217 # Last try: special-case some literals like '', [], {}, etc:
218 if not found and oname_head in ["''",'""','[]','{}','()']:
218 if not found and oname_head in ["''",'""','[]','{}','()']:
219 obj = eval(oname_head)
219 obj = eval(oname_head)
220 found = 1
220 found = 1
221 ospace = 'Interactive'
221 ospace = 'Interactive'
222
222
223 return {'found':found, 'obj':obj, 'namespace':ospace,
223 return {'found':found, 'obj':obj, 'namespace':ospace,
224 'ismagic':ismagic, 'isalias':isalias}
224 'ismagic':ismagic, 'isalias':isalias}
225
225
226 def arg_err(self,func):
226 def arg_err(self,func):
227 """Print docstring if incorrect arguments were passed"""
227 """Print docstring if incorrect arguments were passed"""
228 print 'Error in arguments:'
228 print 'Error in arguments:'
229 print OInspect.getdoc(func)
229 print OInspect.getdoc(func)
230
230
231 def format_latex(self,strng):
231 def format_latex(self,strng):
232 """Format a string for latex inclusion."""
232 """Format a string for latex inclusion."""
233
233
234 # Characters that need to be escaped for latex:
234 # Characters that need to be escaped for latex:
235 escape_re = re.compile(r'(%|_|\$|#)',re.MULTILINE)
235 escape_re = re.compile(r'(%|_|\$|#)',re.MULTILINE)
236 # Magic command names as headers:
236 # Magic command names as headers:
237 cmd_name_re = re.compile(r'^(%s.*?):' % self.shell.ESC_MAGIC,
237 cmd_name_re = re.compile(r'^(%s.*?):' % self.shell.ESC_MAGIC,
238 re.MULTILINE)
238 re.MULTILINE)
239 # Magic commands
239 # Magic commands
240 cmd_re = re.compile(r'(?P<cmd>%s.+?\b)(?!\}\}:)' % self.shell.ESC_MAGIC,
240 cmd_re = re.compile(r'(?P<cmd>%s.+?\b)(?!\}\}:)' % self.shell.ESC_MAGIC,
241 re.MULTILINE)
241 re.MULTILINE)
242 # Paragraph continue
242 # Paragraph continue
243 par_re = re.compile(r'\\$',re.MULTILINE)
243 par_re = re.compile(r'\\$',re.MULTILINE)
244
244
245 # The "\n" symbol
245 # The "\n" symbol
246 newline_re = re.compile(r'\\n')
246 newline_re = re.compile(r'\\n')
247
247
248 # Now build the string for output:
248 # Now build the string for output:
249 strng = cmd_name_re.sub(r'\n\\texttt{\\textsl{\\large \1}}:',strng)
249 strng = cmd_name_re.sub(r'\n\\texttt{\\textsl{\\large \1}}:',strng)
250 strng = cmd_re.sub(r'\\texttt{\g<cmd>}',strng)
250 strng = cmd_re.sub(r'\\texttt{\g<cmd>}',strng)
251 strng = par_re.sub(r'\\\\',strng)
251 strng = par_re.sub(r'\\\\',strng)
252 strng = escape_re.sub(r'\\\1',strng)
252 strng = escape_re.sub(r'\\\1',strng)
253 strng = newline_re.sub(r'\\textbackslash{}n',strng)
253 strng = newline_re.sub(r'\\textbackslash{}n',strng)
254 return strng
254 return strng
255
255
256 def format_screen(self,strng):
256 def format_screen(self,strng):
257 """Format a string for screen printing.
257 """Format a string for screen printing.
258
258
259 This removes some latex-type format codes."""
259 This removes some latex-type format codes."""
260 # Paragraph continue
260 # Paragraph continue
261 par_re = re.compile(r'\\$',re.MULTILINE)
261 par_re = re.compile(r'\\$',re.MULTILINE)
262 strng = par_re.sub('',strng)
262 strng = par_re.sub('',strng)
263 return strng
263 return strng
264
264
265 def parse_options(self,arg_str,opt_str,*long_opts,**kw):
265 def parse_options(self,arg_str,opt_str,*long_opts,**kw):
266 """Parse options passed to an argument string.
266 """Parse options passed to an argument string.
267
267
268 The interface is similar to that of getopt(), but it returns back a
268 The interface is similar to that of getopt(), but it returns back a
269 Struct with the options as keys and the stripped argument string still
269 Struct with the options as keys and the stripped argument string still
270 as a string.
270 as a string.
271
271
272 arg_str is quoted as a true sys.argv vector by using shlex.split.
272 arg_str is quoted as a true sys.argv vector by using shlex.split.
273 This allows us to easily expand variables, glob files, quote
273 This allows us to easily expand variables, glob files, quote
274 arguments, etc.
274 arguments, etc.
275
275
276 Options:
276 Options:
277 -mode: default 'string'. If given as 'list', the argument string is
277 -mode: default 'string'. If given as 'list', the argument string is
278 returned as a list (split on whitespace) instead of a string.
278 returned as a list (split on whitespace) instead of a string.
279
279
280 -list_all: put all option values in lists. Normally only options
280 -list_all: put all option values in lists. Normally only options
281 appearing more than once are put in a list."""
281 appearing more than once are put in a list."""
282
282
283 # inject default options at the beginning of the input line
283 # inject default options at the beginning of the input line
284 caller = sys._getframe(1).f_code.co_name.replace('magic_','')
284 caller = sys._getframe(1).f_code.co_name.replace('magic_','')
285 arg_str = '%s %s' % (self.options_table.get(caller,''),arg_str)
285 arg_str = '%s %s' % (self.options_table.get(caller,''),arg_str)
286
286
287 mode = kw.get('mode','string')
287 mode = kw.get('mode','string')
288 if mode not in ['string','list']:
288 if mode not in ['string','list']:
289 raise ValueError,'incorrect mode given: %s' % mode
289 raise ValueError,'incorrect mode given: %s' % mode
290 # Get options
290 # Get options
291 list_all = kw.get('list_all',0)
291 list_all = kw.get('list_all',0)
292
292
293 # Check if we have more than one argument to warrant extra processing:
293 # Check if we have more than one argument to warrant extra processing:
294 odict = {} # Dictionary with options
294 odict = {} # Dictionary with options
295 args = arg_str.split()
295 args = arg_str.split()
296 if len(args) >= 1:
296 if len(args) >= 1:
297 # If the list of inputs only has 0 or 1 thing in it, there's no
297 # If the list of inputs only has 0 or 1 thing in it, there's no
298 # need to look for options
298 # need to look for options
299 argv = shlex_split(arg_str)
299 argv = shlex_split(arg_str)
300 # Do regular option processing
300 # Do regular option processing
301 opts,args = getopt(argv,opt_str,*long_opts)
301 opts,args = getopt(argv,opt_str,*long_opts)
302 for o,a in opts:
302 for o,a in opts:
303 if o.startswith('--'):
303 if o.startswith('--'):
304 o = o[2:]
304 o = o[2:]
305 else:
305 else:
306 o = o[1:]
306 o = o[1:]
307 try:
307 try:
308 odict[o].append(a)
308 odict[o].append(a)
309 except AttributeError:
309 except AttributeError:
310 odict[o] = [odict[o],a]
310 odict[o] = [odict[o],a]
311 except KeyError:
311 except KeyError:
312 if list_all:
312 if list_all:
313 odict[o] = [a]
313 odict[o] = [a]
314 else:
314 else:
315 odict[o] = a
315 odict[o] = a
316
316
317 # Prepare opts,args for return
317 # Prepare opts,args for return
318 opts = Struct(odict)
318 opts = Struct(odict)
319 if mode == 'string':
319 if mode == 'string':
320 args = ' '.join(args)
320 args = ' '.join(args)
321
321
322 return opts,args
322 return opts,args
323
323
324 #......................................................................
324 #......................................................................
325 # And now the actual magic functions
325 # And now the actual magic functions
326
326
327 # Functions for IPython shell work (vars,funcs, config, etc)
327 # Functions for IPython shell work (vars,funcs, config, etc)
328 def magic_lsmagic(self, parameter_s = ''):
328 def magic_lsmagic(self, parameter_s = ''):
329 """List currently available magic functions."""
329 """List currently available magic functions."""
330 mesc = self.shell.ESC_MAGIC
330 mesc = self.shell.ESC_MAGIC
331 print 'Available magic functions:\n'+mesc+\
331 print 'Available magic functions:\n'+mesc+\
332 (' '+mesc).join(self.lsmagic())
332 (' '+mesc).join(self.lsmagic())
333 print '\n' + Magic.auto_status[self.shell.rc.automagic]
333 print '\n' + Magic.auto_status[self.shell.rc.automagic]
334 return None
334 return None
335
335
336 def magic_magic(self, parameter_s = ''):
336 def magic_magic(self, parameter_s = ''):
337 """Print information about the magic function system."""
337 """Print information about the magic function system."""
338
338
339 mode = ''
339 mode = ''
340 try:
340 try:
341 if parameter_s.split()[0] == '-latex':
341 if parameter_s.split()[0] == '-latex':
342 mode = 'latex'
342 mode = 'latex'
343 except:
343 except:
344 pass
344 pass
345
345
346 magic_docs = []
346 magic_docs = []
347 for fname in self.lsmagic():
347 for fname in self.lsmagic():
348 mname = 'magic_' + fname
348 mname = 'magic_' + fname
349 for space in (Magic,self,self.__class__):
349 for space in (Magic,self,self.__class__):
350 try:
350 try:
351 fn = space.__dict__[mname]
351 fn = space.__dict__[mname]
352 except KeyError:
352 except KeyError:
353 pass
353 pass
354 else:
354 else:
355 break
355 break
356 magic_docs.append('%s%s:\n\t%s\n' %(self.shell.ESC_MAGIC,
356 magic_docs.append('%s%s:\n\t%s\n' %(self.shell.ESC_MAGIC,
357 fname,fn.__doc__))
357 fname,fn.__doc__))
358 magic_docs = ''.join(magic_docs)
358 magic_docs = ''.join(magic_docs)
359
359
360 if mode == 'latex':
360 if mode == 'latex':
361 print self.format_latex(magic_docs)
361 print self.format_latex(magic_docs)
362 return
362 return
363 else:
363 else:
364 magic_docs = self.format_screen(magic_docs)
364 magic_docs = self.format_screen(magic_docs)
365
365
366 outmsg = """
366 outmsg = """
367 IPython's 'magic' functions
367 IPython's 'magic' functions
368 ===========================
368 ===========================
369
369
370 The magic function system provides a series of functions which allow you to
370 The magic function system provides a series of functions which allow you to
371 control the behavior of IPython itself, plus a lot of system-type
371 control the behavior of IPython itself, plus a lot of system-type
372 features. All these functions are prefixed with a % character, but parameters
372 features. All these functions are prefixed with a % character, but parameters
373 are given without parentheses or quotes.
373 are given without parentheses or quotes.
374
374
375 NOTE: If you have 'automagic' enabled (via the command line option or with the
375 NOTE: If you have 'automagic' enabled (via the command line option or with the
376 %automagic function), you don't need to type in the % explicitly. By default,
376 %automagic function), you don't need to type in the % explicitly. By default,
377 IPython ships with automagic on, so you should only rarely need the % escape.
377 IPython ships with automagic on, so you should only rarely need the % escape.
378
378
379 Example: typing '%cd mydir' (without the quotes) changes you working directory
379 Example: typing '%cd mydir' (without the quotes) changes you working directory
380 to 'mydir', if it exists.
380 to 'mydir', if it exists.
381
381
382 You can define your own magic functions to extend the system. See the supplied
382 You can define your own magic functions to extend the system. See the supplied
383 ipythonrc and example-magic.py files for details (in your ipython
383 ipythonrc and example-magic.py files for details (in your ipython
384 configuration directory, typically $HOME/.ipython/).
384 configuration directory, typically $HOME/.ipython/).
385
385
386 You can also define your own aliased names for magic functions. In your
386 You can also define your own aliased names for magic functions. In your
387 ipythonrc file, placing a line like:
387 ipythonrc file, placing a line like:
388
388
389 execute __IPYTHON__.magic_pf = __IPYTHON__.magic_profile
389 execute __IPYTHON__.magic_pf = __IPYTHON__.magic_profile
390
390
391 will define %pf as a new name for %profile.
391 will define %pf as a new name for %profile.
392
392
393 You can also call magics in code using the ipmagic() function, which IPython
393 You can also call magics in code using the ipmagic() function, which IPython
394 automatically adds to the builtin namespace. Type 'ipmagic?' for details.
394 automatically adds to the builtin namespace. Type 'ipmagic?' for details.
395
395
396 For a list of the available magic functions, use %lsmagic. For a description
396 For a list of the available magic functions, use %lsmagic. For a description
397 of any of them, type %magic_name?, e.g. '%cd?'.
397 of any of them, type %magic_name?, e.g. '%cd?'.
398
398
399 Currently the magic system has the following functions:\n"""
399 Currently the magic system has the following functions:\n"""
400
400
401 mesc = self.shell.ESC_MAGIC
401 mesc = self.shell.ESC_MAGIC
402 outmsg = ("%s\n%s\n\nSummary of magic functions (from %slsmagic):"
402 outmsg = ("%s\n%s\n\nSummary of magic functions (from %slsmagic):"
403 "\n\n%s%s\n\n%s" % (outmsg,
403 "\n\n%s%s\n\n%s" % (outmsg,
404 magic_docs,mesc,mesc,
404 magic_docs,mesc,mesc,
405 (' '+mesc).join(self.lsmagic()),
405 (' '+mesc).join(self.lsmagic()),
406 Magic.auto_status[self.shell.rc.automagic] ) )
406 Magic.auto_status[self.shell.rc.automagic] ) )
407
407
408 page(outmsg,screen_lines=self.shell.rc.screen_length)
408 page(outmsg,screen_lines=self.shell.rc.screen_length)
409
409
410 def magic_automagic(self, parameter_s = ''):
410 def magic_automagic(self, parameter_s = ''):
411 """Make magic functions callable without having to type the initial %.
411 """Make magic functions callable without having to type the initial %.
412
412
413 Toggles on/off (when off, you must call it as %automagic, of
413 Toggles on/off (when off, you must call it as %automagic, of
414 course). Note that magic functions have lowest priority, so if there's
414 course). Note that magic functions have lowest priority, so if there's
415 a variable whose name collides with that of a magic fn, automagic
415 a variable whose name collides with that of a magic fn, automagic
416 won't work for that function (you get the variable instead). However,
416 won't work for that function (you get the variable instead). However,
417 if you delete the variable (del var), the previously shadowed magic
417 if you delete the variable (del var), the previously shadowed magic
418 function becomes visible to automagic again."""
418 function becomes visible to automagic again."""
419
419
420 rc = self.shell.rc
420 rc = self.shell.rc
421 rc.automagic = not rc.automagic
421 rc.automagic = not rc.automagic
422 print '\n' + Magic.auto_status[rc.automagic]
422 print '\n' + Magic.auto_status[rc.automagic]
423
423
424 def magic_autocall(self, parameter_s = ''):
424 def magic_autocall(self, parameter_s = ''):
425 """Make functions callable without having to type parentheses.
425 """Make functions callable without having to type parentheses.
426
426
427 This cycles the autocall command line through its three valid values
427 This cycles the autocall command line through its three valid values
428 (0->Off, 1->Smart, 2->Full)"""
428 (0->Off, 1->Smart, 2->Full)"""
429
429
430 rc = self.shell.rc
430 rc = self.shell.rc
431 rc.autocall = not rc.autocall
431 rc.autocall = not rc.autocall
432 print "Automatic calling is:",['OFF','Smart','Full'][rc.autocall]
432 print "Automatic calling is:",['OFF','Smart','Full'][rc.autocall]
433
433
434 def magic_autoindent(self, parameter_s = ''):
434 def magic_autoindent(self, parameter_s = ''):
435 """Toggle autoindent on/off (if available)."""
435 """Toggle autoindent on/off (if available)."""
436
436
437 self.shell.set_autoindent()
437 self.shell.set_autoindent()
438 print "Automatic indentation is:",['OFF','ON'][self.shell.autoindent]
438 print "Automatic indentation is:",['OFF','ON'][self.shell.autoindent]
439
439
440 def magic_system_verbose(self, parameter_s = ''):
440 def magic_system_verbose(self, parameter_s = ''):
441 """Toggle verbose printing of system calls on/off."""
441 """Toggle verbose printing of system calls on/off."""
442
442
443 self.shell.rc_set_toggle('system_verbose')
443 self.shell.rc_set_toggle('system_verbose')
444 print "System verbose printing is:",\
444 print "System verbose printing is:",\
445 ['OFF','ON'][self.shell.rc.system_verbose]
445 ['OFF','ON'][self.shell.rc.system_verbose]
446
446
447 def magic_history(self, parameter_s = ''):
447 def magic_history(self, parameter_s = ''):
448 """Print input history (_i<n> variables), with most recent last.
448 """Print input history (_i<n> variables), with most recent last.
449
449
450 %history [-n] -> print at most 40 inputs (some may be multi-line)\\
450 %history [-n] -> print at most 40 inputs (some may be multi-line)\\
451 %history [-n] n -> print at most n inputs\\
451 %history [-n] n -> print at most n inputs\\
452 %history [-n] n1 n2 -> print inputs between n1 and n2 (n2 not included)\\
452 %history [-n] n1 n2 -> print inputs between n1 and n2 (n2 not included)\\
453
453
454 Each input's number <n> is shown, and is accessible as the
454 Each input's number <n> is shown, and is accessible as the
455 automatically generated variable _i<n>. Multi-line statements are
455 automatically generated variable _i<n>. Multi-line statements are
456 printed starting at a new line for easy copy/paste.
456 printed starting at a new line for easy copy/paste.
457
457
458 If option -n is used, input numbers are not printed. This is useful if
458 If option -n is used, input numbers are not printed. This is useful if
459 you want to get a printout of many lines which can be directly pasted
459 you want to get a printout of many lines which can be directly pasted
460 into a text editor.
460 into a text editor.
461
461
462 This feature is only available if numbered prompts are in use."""
462 This feature is only available if numbered prompts are in use."""
463
463
464 shell = self.shell
464 shell = self.shell
465 if not shell.outputcache.do_full_cache:
465 if not shell.outputcache.do_full_cache:
466 print 'This feature is only available if numbered prompts are in use.'
466 print 'This feature is only available if numbered prompts are in use.'
467 return
467 return
468 opts,args = self.parse_options(parameter_s,'n',mode='list')
468 opts,args = self.parse_options(parameter_s,'n',mode='list')
469
469
470 input_hist = shell.input_hist
470 input_hist = shell.input_hist
471 default_length = 40
471 default_length = 40
472 if len(args) == 0:
472 if len(args) == 0:
473 final = len(input_hist)
473 final = len(input_hist)
474 init = max(1,final-default_length)
474 init = max(1,final-default_length)
475 elif len(args) == 1:
475 elif len(args) == 1:
476 final = len(input_hist)
476 final = len(input_hist)
477 init = max(1,final-int(args[0]))
477 init = max(1,final-int(args[0]))
478 elif len(args) == 2:
478 elif len(args) == 2:
479 init,final = map(int,args)
479 init,final = map(int,args)
480 else:
480 else:
481 warn('%hist takes 0, 1 or 2 arguments separated by spaces.')
481 warn('%hist takes 0, 1 or 2 arguments separated by spaces.')
482 print self.magic_hist.__doc__
482 print self.magic_hist.__doc__
483 return
483 return
484 width = len(str(final))
484 width = len(str(final))
485 line_sep = ['','\n']
485 line_sep = ['','\n']
486 print_nums = not opts.has_key('n')
486 print_nums = not opts.has_key('n')
487 for in_num in range(init,final):
487 for in_num in range(init,final):
488 inline = input_hist[in_num]
488 inline = input_hist[in_num]
489 multiline = int(inline.count('\n') > 1)
489 multiline = int(inline.count('\n') > 1)
490 if print_nums:
490 if print_nums:
491 print '%s:%s' % (str(in_num).ljust(width),line_sep[multiline]),
491 print '%s:%s' % (str(in_num).ljust(width),line_sep[multiline]),
492 print inline,
492 print inline,
493
493
494 def magic_hist(self, parameter_s=''):
494 def magic_hist(self, parameter_s=''):
495 """Alternate name for %history."""
495 """Alternate name for %history."""
496 return self.magic_history(parameter_s)
496 return self.magic_history(parameter_s)
497
497
498 def magic_p(self, parameter_s=''):
498 def magic_p(self, parameter_s=''):
499 """Just a short alias for Python's 'print'."""
499 """Just a short alias for Python's 'print'."""
500 exec 'print ' + parameter_s in self.shell.user_ns
500 exec 'print ' + parameter_s in self.shell.user_ns
501
501
502 def magic_r(self, parameter_s=''):
502 def magic_r(self, parameter_s=''):
503 """Repeat previous input.
503 """Repeat previous input.
504
504
505 If given an argument, repeats the previous command which starts with
505 If given an argument, repeats the previous command which starts with
506 the same string, otherwise it just repeats the previous input.
506 the same string, otherwise it just repeats the previous input.
507
507
508 Shell escaped commands (with ! as first character) are not recognized
508 Shell escaped commands (with ! as first character) are not recognized
509 by this system, only pure python code and magic commands.
509 by this system, only pure python code and magic commands.
510 """
510 """
511
511
512 start = parameter_s.strip()
512 start = parameter_s.strip()
513 esc_magic = self.shell.ESC_MAGIC
513 esc_magic = self.shell.ESC_MAGIC
514 # Identify magic commands even if automagic is on (which means
514 # Identify magic commands even if automagic is on (which means
515 # the in-memory version is different from that typed by the user).
515 # the in-memory version is different from that typed by the user).
516 if self.shell.rc.automagic:
516 if self.shell.rc.automagic:
517 start_magic = esc_magic+start
517 start_magic = esc_magic+start
518 else:
518 else:
519 start_magic = start
519 start_magic = start
520 # Look through the input history in reverse
520 # Look through the input history in reverse
521 for n in range(len(self.shell.input_hist)-2,0,-1):
521 for n in range(len(self.shell.input_hist)-2,0,-1):
522 input = self.shell.input_hist[n]
522 input = self.shell.input_hist[n]
523 # skip plain 'r' lines so we don't recurse to infinity
523 # skip plain 'r' lines so we don't recurse to infinity
524 if input != 'ipmagic("r")\n' and \
524 if input != 'ipmagic("r")\n' and \
525 (input.startswith(start) or input.startswith(start_magic)):
525 (input.startswith(start) or input.startswith(start_magic)):
526 #print 'match',`input` # dbg
526 #print 'match',`input` # dbg
527 print 'Executing:',input,
527 print 'Executing:',input,
528 self.shell.runlines(input)
528 self.shell.runlines(input)
529 return
529 return
530 print 'No previous input matching `%s` found.' % start
530 print 'No previous input matching `%s` found.' % start
531
531
532 def magic_page(self, parameter_s=''):
532 def magic_page(self, parameter_s=''):
533 """Pretty print the object and display it through a pager.
533 """Pretty print the object and display it through a pager.
534
534
535 If no parameter is given, use _ (last output)."""
535 If no parameter is given, use _ (last output)."""
536 # After a function contributed by Olivier Aubert, slightly modified.
536 # After a function contributed by Olivier Aubert, slightly modified.
537
537
538 oname = parameter_s and parameter_s or '_'
538 oname = parameter_s and parameter_s or '_'
539 info = self._ofind(oname)
539 info = self._ofind(oname)
540 if info['found']:
540 if info['found']:
541 page(pformat(info['obj']))
541 page(pformat(info['obj']))
542 else:
542 else:
543 print 'Object `%s` not found' % oname
543 print 'Object `%s` not found' % oname
544
544
545 def magic_profile(self, parameter_s=''):
545 def magic_profile(self, parameter_s=''):
546 """Print your currently active IPyhton profile."""
546 """Print your currently active IPyhton profile."""
547 if self.shell.rc.profile:
547 if self.shell.rc.profile:
548 printpl('Current IPython profile: $self.shell.rc.profile.')
548 printpl('Current IPython profile: $self.shell.rc.profile.')
549 else:
549 else:
550 print 'No profile active.'
550 print 'No profile active.'
551
551
552 def _inspect(self,meth,oname,**kw):
552 def _inspect(self,meth,oname,**kw):
553 """Generic interface to the inspector system.
553 """Generic interface to the inspector system.
554
554
555 This function is meant to be called by pdef, pdoc & friends."""
555 This function is meant to be called by pdef, pdoc & friends."""
556
556
557 oname = oname.strip()
557 oname = oname.strip()
558 info = Struct(self._ofind(oname))
558 info = Struct(self._ofind(oname))
559 if info.found:
559 if info.found:
560 pmethod = getattr(self.shell.inspector,meth)
560 pmethod = getattr(self.shell.inspector,meth)
561 formatter = info.ismagic and self.format_screen or None
561 formatter = info.ismagic and self.format_screen or None
562 if meth == 'pdoc':
562 if meth == 'pdoc':
563 pmethod(info.obj,oname,formatter)
563 pmethod(info.obj,oname,formatter)
564 elif meth == 'pinfo':
564 elif meth == 'pinfo':
565 pmethod(info.obj,oname,formatter,info,**kw)
565 pmethod(info.obj,oname,formatter,info,**kw)
566 else:
566 else:
567 pmethod(info.obj,oname)
567 pmethod(info.obj,oname)
568 else:
568 else:
569 print 'Object `%s` not found.' % oname
569 print 'Object `%s` not found.' % oname
570 return 'not found' # so callers can take other action
570 return 'not found' # so callers can take other action
571
571
572 def magic_pdef(self, parameter_s=''):
572 def magic_pdef(self, parameter_s=''):
573 """Print the definition header for any callable object.
573 """Print the definition header for any callable object.
574
574
575 If the object is a class, print the constructor information."""
575 If the object is a class, print the constructor information."""
576 self._inspect('pdef',parameter_s)
576 self._inspect('pdef',parameter_s)
577
577
578 def magic_pdoc(self, parameter_s=''):
578 def magic_pdoc(self, parameter_s=''):
579 """Print the docstring for an object.
579 """Print the docstring for an object.
580
580
581 If the given object is a class, it will print both the class and the
581 If the given object is a class, it will print both the class and the
582 constructor docstrings."""
582 constructor docstrings."""
583 self._inspect('pdoc',parameter_s)
583 self._inspect('pdoc',parameter_s)
584
584
585 def magic_psource(self, parameter_s=''):
585 def magic_psource(self, parameter_s=''):
586 """Print (or run through pager) the source code for an object."""
586 """Print (or run through pager) the source code for an object."""
587 self._inspect('psource',parameter_s)
587 self._inspect('psource',parameter_s)
588
588
589 def magic_pfile(self, parameter_s=''):
589 def magic_pfile(self, parameter_s=''):
590 """Print (or run through pager) the file where an object is defined.
590 """Print (or run through pager) the file where an object is defined.
591
591
592 The file opens at the line where the object definition begins. IPython
592 The file opens at the line where the object definition begins. IPython
593 will honor the environment variable PAGER if set, and otherwise will
593 will honor the environment variable PAGER if set, and otherwise will
594 do its best to print the file in a convenient form.
594 do its best to print the file in a convenient form.
595
595
596 If the given argument is not an object currently defined, IPython will
596 If the given argument is not an object currently defined, IPython will
597 try to interpret it as a filename (automatically adding a .py extension
597 try to interpret it as a filename (automatically adding a .py extension
598 if needed). You can thus use %pfile as a syntax highlighting code
598 if needed). You can thus use %pfile as a syntax highlighting code
599 viewer."""
599 viewer."""
600
600
601 # first interpret argument as an object name
601 # first interpret argument as an object name
602 out = self._inspect('pfile',parameter_s)
602 out = self._inspect('pfile',parameter_s)
603 # if not, try the input as a filename
603 # if not, try the input as a filename
604 if out == 'not found':
604 if out == 'not found':
605 try:
605 try:
606 filename = get_py_filename(parameter_s)
606 filename = get_py_filename(parameter_s)
607 except IOError,msg:
607 except IOError,msg:
608 print msg
608 print msg
609 return
609 return
610 page(self.shell.inspector.format(file(filename).read()))
610 page(self.shell.inspector.format(file(filename).read()))
611
611
612 def magic_pinfo(self, parameter_s=''):
612 def magic_pinfo(self, parameter_s=''):
613 """Provide detailed information about an object.
613 """Provide detailed information about an object.
614
614
615 '%pinfo object' is just a synonym for object? or ?object."""
615 '%pinfo object' is just a synonym for object? or ?object."""
616
616
617 #print 'pinfo par: <%s>' % parameter_s # dbg
617 #print 'pinfo par: <%s>' % parameter_s # dbg
618
618
619 # detail_level: 0 -> obj? , 1 -> obj??
619 # detail_level: 0 -> obj? , 1 -> obj??
620 detail_level = 0
620 detail_level = 0
621 # We need to detect if we got called as 'pinfo pinfo foo', which can
621 # We need to detect if we got called as 'pinfo pinfo foo', which can
622 # happen if the user types 'pinfo foo?' at the cmd line.
622 # happen if the user types 'pinfo foo?' at the cmd line.
623 pinfo,qmark1,oname,qmark2 = \
623 pinfo,qmark1,oname,qmark2 = \
624 re.match('(pinfo )?(\?*)(.*?)(\??$)',parameter_s).groups()
624 re.match('(pinfo )?(\?*)(.*?)(\??$)',parameter_s).groups()
625 if pinfo or qmark1 or qmark2:
625 if pinfo or qmark1 or qmark2:
626 detail_level = 1
626 detail_level = 1
627 if "*" in oname:
627 if "*" in oname:
628 self.magic_psearch(oname)
628 self.magic_psearch(oname)
629 else:
629 else:
630 self._inspect('pinfo',oname,detail_level=detail_level)
630 self._inspect('pinfo',oname,detail_level=detail_level)
631
631
632 def magic_psearch(self, parameter_s=''):
632 def magic_psearch(self, parameter_s=''):
633 """Search for object in namespaces by wildcard.
633 """Search for object in namespaces by wildcard.
634
634
635 %psearch [options] PATTERN [OBJECT TYPE]
635 %psearch [options] PATTERN [OBJECT TYPE]
636
636
637 Note: ? can be used as a synonym for %psearch, at the beginning or at
637 Note: ? can be used as a synonym for %psearch, at the beginning or at
638 the end: both a*? and ?a* are equivalent to '%psearch a*'. Still, the
638 the end: both a*? and ?a* are equivalent to '%psearch a*'. Still, the
639 rest of the command line must be unchanged (options come first), so
639 rest of the command line must be unchanged (options come first), so
640 for example the following forms are equivalent
640 for example the following forms are equivalent
641
641
642 %psearch -i a* function
642 %psearch -i a* function
643 -i a* function?
643 -i a* function?
644 ?-i a* function
644 ?-i a* function
645
645
646 Arguments:
646 Arguments:
647
647
648 PATTERN
648 PATTERN
649
649
650 where PATTERN is a string containing * as a wildcard similar to its
650 where PATTERN is a string containing * as a wildcard similar to its
651 use in a shell. The pattern is matched in all namespaces on the
651 use in a shell. The pattern is matched in all namespaces on the
652 search path. By default objects starting with a single _ are not
652 search path. By default objects starting with a single _ are not
653 matched, many IPython generated objects have a single
653 matched, many IPython generated objects have a single
654 underscore. The default is case insensitive matching. Matching is
654 underscore. The default is case insensitive matching. Matching is
655 also done on the attributes of objects and not only on the objects
655 also done on the attributes of objects and not only on the objects
656 in a module.
656 in a module.
657
657
658 [OBJECT TYPE]
658 [OBJECT TYPE]
659
659
660 Is the name of a python type from the types module. The name is
660 Is the name of a python type from the types module. The name is
661 given in lowercase without the ending type, ex. StringType is
661 given in lowercase without the ending type, ex. StringType is
662 written string. By adding a type here only objects matching the
662 written string. By adding a type here only objects matching the
663 given type are matched. Using all here makes the pattern match all
663 given type are matched. Using all here makes the pattern match all
664 types (this is the default).
664 types (this is the default).
665
665
666 Options:
666 Options:
667
667
668 -a: makes the pattern match even objects whose names start with a
668 -a: makes the pattern match even objects whose names start with a
669 single underscore. These names are normally ommitted from the
669 single underscore. These names are normally ommitted from the
670 search.
670 search.
671
671
672 -i/-c: make the pattern case insensitive/sensitive. If neither of
672 -i/-c: make the pattern case insensitive/sensitive. If neither of
673 these options is given, the default is read from your ipythonrc
673 these options is given, the default is read from your ipythonrc
674 file. The option name which sets this value is
674 file. The option name which sets this value is
675 'wildcards_case_sensitive'. If this option is not specified in your
675 'wildcards_case_sensitive'. If this option is not specified in your
676 ipythonrc file, IPython's internal default is to do a case sensitive
676 ipythonrc file, IPython's internal default is to do a case sensitive
677 search.
677 search.
678
678
679 -e/-s NAMESPACE: exclude/search a given namespace. The pattern you
679 -e/-s NAMESPACE: exclude/search a given namespace. The pattern you
680 specifiy can be searched in any of the following namespaces:
680 specifiy can be searched in any of the following namespaces:
681 'builtin', 'user', 'user_global','internal', 'alias', where
681 'builtin', 'user', 'user_global','internal', 'alias', where
682 'builtin' and 'user' are the search defaults. Note that you should
682 'builtin' and 'user' are the search defaults. Note that you should
683 not use quotes when specifying namespaces.
683 not use quotes when specifying namespaces.
684
684
685 'Builtin' contains the python module builtin, 'user' contains all
685 'Builtin' contains the python module builtin, 'user' contains all
686 user data, 'alias' only contain the shell aliases and no python
686 user data, 'alias' only contain the shell aliases and no python
687 objects, 'internal' contains objects used by IPython. The
687 objects, 'internal' contains objects used by IPython. The
688 'user_global' namespace is only used by embedded IPython instances,
688 'user_global' namespace is only used by embedded IPython instances,
689 and it contains module-level globals. You can add namespaces to the
689 and it contains module-level globals. You can add namespaces to the
690 search with -s or exclude them with -e (these options can be given
690 search with -s or exclude them with -e (these options can be given
691 more than once).
691 more than once).
692
692
693 Examples:
693 Examples:
694
694
695 %psearch a* -> objects beginning with an a
695 %psearch a* -> objects beginning with an a
696 %psearch -e builtin a* -> objects NOT in the builtin space starting in a
696 %psearch -e builtin a* -> objects NOT in the builtin space starting in a
697 %psearch a* function -> all functions beginning with an a
697 %psearch a* function -> all functions beginning with an a
698 %psearch re.e* -> objects beginning with an e in module re
698 %psearch re.e* -> objects beginning with an e in module re
699 %psearch r*.e* -> objects that start with e in modules starting in r
699 %psearch r*.e* -> objects that start with e in modules starting in r
700 %psearch r*.* string -> all strings in modules beginning with r
700 %psearch r*.* string -> all strings in modules beginning with r
701
701
702 Case sensitve search:
702 Case sensitve search:
703
703
704 %psearch -c a* list all object beginning with lower case a
704 %psearch -c a* list all object beginning with lower case a
705
705
706 Show objects beginning with a single _:
706 Show objects beginning with a single _:
707
707
708 %psearch -a _* list objects beginning with a single underscore"""
708 %psearch -a _* list objects beginning with a single underscore"""
709
709
710 # default namespaces to be searched
710 # default namespaces to be searched
711 def_search = ['user','builtin']
711 def_search = ['user','builtin']
712
712
713 # Process options/args
713 # Process options/args
714 opts,args = self.parse_options(parameter_s,'cias:e:',list_all=True)
714 opts,args = self.parse_options(parameter_s,'cias:e:',list_all=True)
715 opt = opts.get
715 opt = opts.get
716 shell = self.shell
716 shell = self.shell
717 psearch = shell.inspector.psearch
717 psearch = shell.inspector.psearch
718
718
719 # select case options
719 # select case options
720 if opts.has_key('i'):
720 if opts.has_key('i'):
721 ignore_case = True
721 ignore_case = True
722 elif opts.has_key('c'):
722 elif opts.has_key('c'):
723 ignore_case = False
723 ignore_case = False
724 else:
724 else:
725 ignore_case = not shell.rc.wildcards_case_sensitive
725 ignore_case = not shell.rc.wildcards_case_sensitive
726
726
727 # Build list of namespaces to search from user options
727 # Build list of namespaces to search from user options
728 def_search.extend(opt('s',[]))
728 def_search.extend(opt('s',[]))
729 ns_exclude = ns_exclude=opt('e',[])
729 ns_exclude = ns_exclude=opt('e',[])
730 ns_search = [nm for nm in def_search if nm not in ns_exclude]
730 ns_search = [nm for nm in def_search if nm not in ns_exclude]
731
731
732 # Call the actual search
732 # Call the actual search
733 try:
733 try:
734 psearch(args,shell.ns_table,ns_search,
734 psearch(args,shell.ns_table,ns_search,
735 show_all=opt('a'),ignore_case=ignore_case)
735 show_all=opt('a'),ignore_case=ignore_case)
736 except:
736 except:
737 shell.showtraceback()
737 shell.showtraceback()
738
738
739 def magic_who_ls(self, parameter_s=''):
739 def magic_who_ls(self, parameter_s=''):
740 """Return a sorted list of all interactive variables.
740 """Return a sorted list of all interactive variables.
741
741
742 If arguments are given, only variables of types matching these
742 If arguments are given, only variables of types matching these
743 arguments are returned."""
743 arguments are returned."""
744
744
745 user_ns = self.shell.user_ns
745 user_ns = self.shell.user_ns
746 internal_ns = self.shell.internal_ns
746 internal_ns = self.shell.internal_ns
747 user_config_ns = self.shell.user_config_ns
747 user_config_ns = self.shell.user_config_ns
748 out = []
748 out = []
749 typelist = parameter_s.split()
749 typelist = parameter_s.split()
750
750
751 for i in user_ns:
751 for i in user_ns:
752 if not (i.startswith('_') or i.startswith('_i')) \
752 if not (i.startswith('_') or i.startswith('_i')) \
753 and not (i in internal_ns or i in user_config_ns):
753 and not (i in internal_ns or i in user_config_ns):
754 if typelist:
754 if typelist:
755 if type(user_ns[i]).__name__ in typelist:
755 if type(user_ns[i]).__name__ in typelist:
756 out.append(i)
756 out.append(i)
757 else:
757 else:
758 out.append(i)
758 out.append(i)
759 out.sort()
759 out.sort()
760 return out
760 return out
761
761
762 def magic_who(self, parameter_s=''):
762 def magic_who(self, parameter_s=''):
763 """Print all interactive variables, with some minimal formatting.
763 """Print all interactive variables, with some minimal formatting.
764
764
765 If any arguments are given, only variables whose type matches one of
765 If any arguments are given, only variables whose type matches one of
766 these are printed. For example:
766 these are printed. For example:
767
767
768 %who function str
768 %who function str
769
769
770 will only list functions and strings, excluding all other types of
770 will only list functions and strings, excluding all other types of
771 variables. To find the proper type names, simply use type(var) at a
771 variables. To find the proper type names, simply use type(var) at a
772 command line to see how python prints type names. For example:
772 command line to see how python prints type names. For example:
773
773
774 In [1]: type('hello')\\
774 In [1]: type('hello')\\
775 Out[1]: <type 'str'>
775 Out[1]: <type 'str'>
776
776
777 indicates that the type name for strings is 'str'.
777 indicates that the type name for strings is 'str'.
778
778
779 %who always excludes executed names loaded through your configuration
779 %who always excludes executed names loaded through your configuration
780 file and things which are internal to IPython.
780 file and things which are internal to IPython.
781
781
782 This is deliberate, as typically you may load many modules and the
782 This is deliberate, as typically you may load many modules and the
783 purpose of %who is to show you only what you've manually defined."""
783 purpose of %who is to show you only what you've manually defined."""
784
784
785 varlist = self.magic_who_ls(parameter_s)
785 varlist = self.magic_who_ls(parameter_s)
786 if not varlist:
786 if not varlist:
787 print 'Interactive namespace is empty.'
787 print 'Interactive namespace is empty.'
788 return
788 return
789
789
790 # if we have variables, move on...
790 # if we have variables, move on...
791
791
792 # stupid flushing problem: when prompts have no separators, stdout is
792 # stupid flushing problem: when prompts have no separators, stdout is
793 # getting lost. I'm starting to think this is a python bug. I'm having
793 # getting lost. I'm starting to think this is a python bug. I'm having
794 # to force a flush with a print because even a sys.stdout.flush
794 # to force a flush with a print because even a sys.stdout.flush
795 # doesn't seem to do anything!
795 # doesn't seem to do anything!
796
796
797 count = 0
797 count = 0
798 for i in varlist:
798 for i in varlist:
799 print i+'\t',
799 print i+'\t',
800 count += 1
800 count += 1
801 if count > 8:
801 if count > 8:
802 count = 0
802 count = 0
803 print
803 print
804 sys.stdout.flush() # FIXME. Why the hell isn't this flushing???
804 sys.stdout.flush() # FIXME. Why the hell isn't this flushing???
805
805
806 print # well, this does force a flush at the expense of an extra \n
806 print # well, this does force a flush at the expense of an extra \n
807
807
808 def magic_whos(self, parameter_s=''):
808 def magic_whos(self, parameter_s=''):
809 """Like %who, but gives some extra information about each variable.
809 """Like %who, but gives some extra information about each variable.
810
810
811 The same type filtering of %who can be applied here.
811 The same type filtering of %who can be applied here.
812
812
813 For all variables, the type is printed. Additionally it prints:
813 For all variables, the type is printed. Additionally it prints:
814
814
815 - For {},[],(): their length.
815 - For {},[],(): their length.
816
816
817 - For Numeric arrays, a summary with shape, number of elements,
817 - For Numeric arrays, a summary with shape, number of elements,
818 typecode and size in memory.
818 typecode and size in memory.
819
819
820 - Everything else: a string representation, snipping their middle if
820 - Everything else: a string representation, snipping their middle if
821 too long."""
821 too long."""
822
822
823 varnames = self.magic_who_ls(parameter_s)
823 varnames = self.magic_who_ls(parameter_s)
824 if not varnames:
824 if not varnames:
825 print 'Interactive namespace is empty.'
825 print 'Interactive namespace is empty.'
826 return
826 return
827
827
828 # if we have variables, move on...
828 # if we have variables, move on...
829
829
830 # for these types, show len() instead of data:
830 # for these types, show len() instead of data:
831 seq_types = [types.DictType,types.ListType,types.TupleType]
831 seq_types = [types.DictType,types.ListType,types.TupleType]
832
832
833 # for Numeric arrays, display summary info
833 # for Numeric arrays, display summary info
834 try:
834 try:
835 import Numeric
835 import Numeric
836 except ImportError:
836 except ImportError:
837 array_type = None
837 array_type = None
838 else:
838 else:
839 array_type = Numeric.ArrayType.__name__
839 array_type = Numeric.ArrayType.__name__
840
840
841 # Find all variable names and types so we can figure out column sizes
841 # Find all variable names and types so we can figure out column sizes
842 get_vars = lambda i: self.shell.user_ns[i]
842 get_vars = lambda i: self.shell.user_ns[i]
843 type_name = lambda v: type(v).__name__
843 type_name = lambda v: type(v).__name__
844 varlist = map(get_vars,varnames)
844 varlist = map(get_vars,varnames)
845
845
846 typelist = []
846 typelist = []
847 for vv in varlist:
847 for vv in varlist:
848 tt = type_name(vv)
848 tt = type_name(vv)
849 if tt=='instance':
849 if tt=='instance':
850 typelist.append(str(vv.__class__))
850 typelist.append(str(vv.__class__))
851 else:
851 else:
852 typelist.append(tt)
852 typelist.append(tt)
853
853
854 # column labels and # of spaces as separator
854 # column labels and # of spaces as separator
855 varlabel = 'Variable'
855 varlabel = 'Variable'
856 typelabel = 'Type'
856 typelabel = 'Type'
857 datalabel = 'Data/Info'
857 datalabel = 'Data/Info'
858 colsep = 3
858 colsep = 3
859 # variable format strings
859 # variable format strings
860 vformat = "$vname.ljust(varwidth)$vtype.ljust(typewidth)"
860 vformat = "$vname.ljust(varwidth)$vtype.ljust(typewidth)"
861 vfmt_short = '$vstr[:25]<...>$vstr[-25:]'
861 vfmt_short = '$vstr[:25]<...>$vstr[-25:]'
862 aformat = "%s: %s elems, type `%s`, %s bytes"
862 aformat = "%s: %s elems, type `%s`, %s bytes"
863 # find the size of the columns to format the output nicely
863 # find the size of the columns to format the output nicely
864 varwidth = max(max(map(len,varnames)), len(varlabel)) + colsep
864 varwidth = max(max(map(len,varnames)), len(varlabel)) + colsep
865 typewidth = max(max(map(len,typelist)), len(typelabel)) + colsep
865 typewidth = max(max(map(len,typelist)), len(typelabel)) + colsep
866 # table header
866 # table header
867 print varlabel.ljust(varwidth) + typelabel.ljust(typewidth) + \
867 print varlabel.ljust(varwidth) + typelabel.ljust(typewidth) + \
868 ' '+datalabel+'\n' + '-'*(varwidth+typewidth+len(datalabel)+1)
868 ' '+datalabel+'\n' + '-'*(varwidth+typewidth+len(datalabel)+1)
869 # and the table itself
869 # and the table itself
870 kb = 1024
870 kb = 1024
871 Mb = 1048576 # kb**2
871 Mb = 1048576 # kb**2
872 for vname,var,vtype in zip(varnames,varlist,typelist):
872 for vname,var,vtype in zip(varnames,varlist,typelist):
873 print itpl(vformat),
873 print itpl(vformat),
874 if vtype in seq_types:
874 if vtype in seq_types:
875 print len(var)
875 print len(var)
876 elif vtype==array_type:
876 elif vtype==array_type:
877 vshape = str(var.shape).replace(',','').replace(' ','x')[1:-1]
877 vshape = str(var.shape).replace(',','').replace(' ','x')[1:-1]
878 vsize = Numeric.size(var)
878 vsize = Numeric.size(var)
879 vbytes = vsize*var.itemsize()
879 vbytes = vsize*var.itemsize()
880 if vbytes < 100000:
880 if vbytes < 100000:
881 print aformat % (vshape,vsize,var.typecode(),vbytes)
881 print aformat % (vshape,vsize,var.typecode(),vbytes)
882 else:
882 else:
883 print aformat % (vshape,vsize,var.typecode(),vbytes),
883 print aformat % (vshape,vsize,var.typecode(),vbytes),
884 if vbytes < Mb:
884 if vbytes < Mb:
885 print '(%s kb)' % (vbytes/kb,)
885 print '(%s kb)' % (vbytes/kb,)
886 else:
886 else:
887 print '(%s Mb)' % (vbytes/Mb,)
887 print '(%s Mb)' % (vbytes/Mb,)
888 else:
888 else:
889 vstr = str(var).replace('\n','\\n')
889 vstr = str(var).replace('\n','\\n')
890 if len(vstr) < 50:
890 if len(vstr) < 50:
891 print vstr
891 print vstr
892 else:
892 else:
893 printpl(vfmt_short)
893 printpl(vfmt_short)
894
894
895 def magic_reset(self, parameter_s=''):
895 def magic_reset(self, parameter_s=''):
896 """Resets the namespace by removing all names defined by the user.
896 """Resets the namespace by removing all names defined by the user.
897
897
898 Input/Output history are left around in case you need them."""
898 Input/Output history are left around in case you need them."""
899
899
900 ans = raw_input(
900 ans = raw_input(
901 "Once deleted, variables cannot be recovered. Proceed (y/n)? ")
901 "Once deleted, variables cannot be recovered. Proceed (y/n)? ")
902 if not ans.lower() == 'y':
902 if not ans.lower() == 'y':
903 print 'Nothing done.'
903 print 'Nothing done.'
904 return
904 return
905 user_ns = self.shell.user_ns
905 user_ns = self.shell.user_ns
906 for i in self.magic_who_ls():
906 for i in self.magic_who_ls():
907 del(user_ns[i])
907 del(user_ns[i])
908
908
909 def magic_config(self,parameter_s=''):
909 def magic_config(self,parameter_s=''):
910 """Show IPython's internal configuration."""
910 """Show IPython's internal configuration."""
911
911
912 page('Current configuration structure:\n'+
912 page('Current configuration structure:\n'+
913 pformat(self.shell.rc.dict()))
913 pformat(self.shell.rc.dict()))
914
914
915 def magic_logstart(self,parameter_s=''):
915 def magic_logstart(self,parameter_s=''):
916 """Start logging anywhere in a session.
916 """Start logging anywhere in a session.
917
917
918 %logstart [-o|-t] [log_name [log_mode]]
918 %logstart [-o|-t] [log_name [log_mode]]
919
919
920 If no name is given, it defaults to a file named 'ipython_log.py' in your
920 If no name is given, it defaults to a file named 'ipython_log.py' in your
921 current directory, in 'rotate' mode (see below).
921 current directory, in 'rotate' mode (see below).
922
922
923 '%logstart name' saves to file 'name' in 'backup' mode. It saves your
923 '%logstart name' saves to file 'name' in 'backup' mode. It saves your
924 history up to that point and then continues logging.
924 history up to that point and then continues logging.
925
925
926 %logstart takes a second optional parameter: logging mode. This can be one
926 %logstart takes a second optional parameter: logging mode. This can be one
927 of (note that the modes are given unquoted):\\
927 of (note that the modes are given unquoted):\\
928 append: well, that says it.\\
928 append: well, that says it.\\
929 backup: rename (if exists) to name~ and start name.\\
929 backup: rename (if exists) to name~ and start name.\\
930 global: single logfile in your home dir, appended to.\\
930 global: single logfile in your home dir, appended to.\\
931 over : overwrite existing log.\\
931 over : overwrite existing log.\\
932 rotate: create rotating logs name.1~, name.2~, etc.
932 rotate: create rotating logs name.1~, name.2~, etc.
933
933
934 Options:
934 Options:
935
935
936 -o: log also IPython's output. In this mode, all commands which
936 -o: log also IPython's output. In this mode, all commands which
937 generate an Out[NN] prompt are recorded to the logfile, right after
937 generate an Out[NN] prompt are recorded to the logfile, right after
938 their corresponding input line. The output lines are always
938 their corresponding input line. The output lines are always
939 prepended with a '#[Out]# ' marker, so that the log remains valid
939 prepended with a '#[Out]# ' marker, so that the log remains valid
940 Python code.
940 Python code.
941
941
942 Since this marker is always the same, filtering only the output from
942 Since this marker is always the same, filtering only the output from
943 a log is very easy, using for example a simple awk call:
943 a log is very easy, using for example a simple awk call:
944
944
945 awk -F'#\\[Out\\]# ' '{if($2) {print $2}}' ipython_log.py
945 awk -F'#\\[Out\\]# ' '{if($2) {print $2}}' ipython_log.py
946
946
947 -t: put timestamps before each input line logged (these are put in
947 -t: put timestamps before each input line logged (these are put in
948 comments)."""
948 comments)."""
949
949
950 opts,par = self.parse_options(parameter_s,'ot')
950 opts,par = self.parse_options(parameter_s,'ot')
951 log_output = 'o' in opts
951 log_output = 'o' in opts
952 timestamp = 't' in opts
952 timestamp = 't' in opts
953
953
954 rc = self.shell.rc
954 rc = self.shell.rc
955 logger = self.shell.logger
955 logger = self.shell.logger
956
956
957 # if no args are given, the defaults set in the logger constructor by
957 # if no args are given, the defaults set in the logger constructor by
958 # ipytohn remain valid
958 # ipytohn remain valid
959 if par:
959 if par:
960 try:
960 try:
961 logfname,logmode = par.split()
961 logfname,logmode = par.split()
962 except:
962 except:
963 logfname = par
963 logfname = par
964 logmode = 'backup'
964 logmode = 'backup'
965 else:
965 else:
966 logfname = logger.logfname
966 logfname = logger.logfname
967 logmode = logger.logmode
967 logmode = logger.logmode
968 # put logfname into rc struct as if it had been called on the command
968 # put logfname into rc struct as if it had been called on the command
969 # line, so it ends up saved in the log header Save it in case we need
969 # line, so it ends up saved in the log header Save it in case we need
970 # to restore it...
970 # to restore it...
971 old_logfile = rc.opts.get('logfile','')
971 old_logfile = rc.opts.get('logfile','')
972 if logfname:
972 if logfname:
973 logfname = os.path.expanduser(logfname)
973 logfname = os.path.expanduser(logfname)
974 rc.opts.logfile = logfname
974 rc.opts.logfile = logfname
975 loghead = self.shell.loghead_tpl % (rc.opts,rc.args)
975 loghead = self.shell.loghead_tpl % (rc.opts,rc.args)
976 try:
976 try:
977 started = logger.logstart(logfname,loghead,logmode,
977 started = logger.logstart(logfname,loghead,logmode,
978 log_output,timestamp)
978 log_output,timestamp)
979 except:
979 except:
980 rc.opts.logfile = old_logfile
980 rc.opts.logfile = old_logfile
981 warn("Couldn't start log: %s" % sys.exc_info()[1])
981 warn("Couldn't start log: %s" % sys.exc_info()[1])
982 else:
982 else:
983 # log input history up to this point, optionally interleaving
983 # log input history up to this point, optionally interleaving
984 # output if requested
984 # output if requested
985
985
986 if timestamp:
986 if timestamp:
987 # disable timestamping for the previous history, since we've
987 # disable timestamping for the previous history, since we've
988 # lost those already (no time machine here).
988 # lost those already (no time machine here).
989 logger.timestamp = False
989 logger.timestamp = False
990 if log_output:
990 if log_output:
991 log_write = logger.log_write
991 log_write = logger.log_write
992 input_hist = self.shell.input_hist
992 input_hist = self.shell.input_hist
993 output_hist = self.shell.output_hist
993 output_hist = self.shell.output_hist
994 for n in range(1,len(input_hist)-1):
994 for n in range(1,len(input_hist)-1):
995 log_write(input_hist[n].rstrip())
995 log_write(input_hist[n].rstrip())
996 if n in output_hist:
996 if n in output_hist:
997 log_write(repr(output_hist[n]),'output')
997 log_write(repr(output_hist[n]),'output')
998 else:
998 else:
999 logger.log_write(self.shell.input_hist[1:])
999 logger.log_write(self.shell.input_hist[1:])
1000 if timestamp:
1000 if timestamp:
1001 # re-enable timestamping
1001 # re-enable timestamping
1002 logger.timestamp = True
1002 logger.timestamp = True
1003
1003
1004 print ('Activating auto-logging. '
1004 print ('Activating auto-logging. '
1005 'Current session state plus future input saved.')
1005 'Current session state plus future input saved.')
1006 logger.logstate()
1006 logger.logstate()
1007
1007
1008 def magic_logoff(self,parameter_s=''):
1008 def magic_logoff(self,parameter_s=''):
1009 """Temporarily stop logging.
1009 """Temporarily stop logging.
1010
1010
1011 You must have previously started logging."""
1011 You must have previously started logging."""
1012 self.shell.logger.switch_log(0)
1012 self.shell.logger.switch_log(0)
1013
1013
1014 def magic_logon(self,parameter_s=''):
1014 def magic_logon(self,parameter_s=''):
1015 """Restart logging.
1015 """Restart logging.
1016
1016
1017 This function is for restarting logging which you've temporarily
1017 This function is for restarting logging which you've temporarily
1018 stopped with %logoff. For starting logging for the first time, you
1018 stopped with %logoff. For starting logging for the first time, you
1019 must use the %logstart function, which allows you to specify an
1019 must use the %logstart function, which allows you to specify an
1020 optional log filename."""
1020 optional log filename."""
1021
1021
1022 self.shell.logger.switch_log(1)
1022 self.shell.logger.switch_log(1)
1023
1023
1024 def magic_logstate(self,parameter_s=''):
1024 def magic_logstate(self,parameter_s=''):
1025 """Print the status of the logging system."""
1025 """Print the status of the logging system."""
1026
1026
1027 self.shell.logger.logstate()
1027 self.shell.logger.logstate()
1028
1028
1029 def magic_pdb(self, parameter_s=''):
1029 def magic_pdb(self, parameter_s=''):
1030 """Control the calling of the pdb interactive debugger.
1030 """Control the calling of the pdb interactive debugger.
1031
1031
1032 Call as '%pdb on', '%pdb 1', '%pdb off' or '%pdb 0'. If called without
1032 Call as '%pdb on', '%pdb 1', '%pdb off' or '%pdb 0'. If called without
1033 argument it works as a toggle.
1033 argument it works as a toggle.
1034
1034
1035 When an exception is triggered, IPython can optionally call the
1035 When an exception is triggered, IPython can optionally call the
1036 interactive pdb debugger after the traceback printout. %pdb toggles
1036 interactive pdb debugger after the traceback printout. %pdb toggles
1037 this feature on and off."""
1037 this feature on and off."""
1038
1038
1039 par = parameter_s.strip().lower()
1039 par = parameter_s.strip().lower()
1040
1040
1041 if par:
1041 if par:
1042 try:
1042 try:
1043 new_pdb = {'off':0,'0':0,'on':1,'1':1}[par]
1043 new_pdb = {'off':0,'0':0,'on':1,'1':1}[par]
1044 except KeyError:
1044 except KeyError:
1045 print ('Incorrect argument. Use on/1, off/0, '
1045 print ('Incorrect argument. Use on/1, off/0, '
1046 'or nothing for a toggle.')
1046 'or nothing for a toggle.')
1047 return
1047 return
1048 else:
1048 else:
1049 # toggle
1049 # toggle
1050 new_pdb = not self.shell.InteractiveTB.call_pdb
1050 new_pdb = not self.shell.InteractiveTB.call_pdb
1051
1051
1052 # set on the shell
1052 # set on the shell
1053 self.shell.call_pdb = new_pdb
1053 self.shell.call_pdb = new_pdb
1054 print 'Automatic pdb calling has been turned',on_off(new_pdb)
1054 print 'Automatic pdb calling has been turned',on_off(new_pdb)
1055
1055
1056 def magic_prun(self, parameter_s ='',user_mode=1,
1056 def magic_prun(self, parameter_s ='',user_mode=1,
1057 opts=None,arg_lst=None,prog_ns=None):
1057 opts=None,arg_lst=None,prog_ns=None):
1058
1058
1059 """Run a statement through the python code profiler.
1059 """Run a statement through the python code profiler.
1060
1060
1061 Usage:\\
1061 Usage:\\
1062 %prun [options] statement
1062 %prun [options] statement
1063
1063
1064 The given statement (which doesn't require quote marks) is run via the
1064 The given statement (which doesn't require quote marks) is run via the
1065 python profiler in a manner similar to the profile.run() function.
1065 python profiler in a manner similar to the profile.run() function.
1066 Namespaces are internally managed to work correctly; profile.run
1066 Namespaces are internally managed to work correctly; profile.run
1067 cannot be used in IPython because it makes certain assumptions about
1067 cannot be used in IPython because it makes certain assumptions about
1068 namespaces which do not hold under IPython.
1068 namespaces which do not hold under IPython.
1069
1069
1070 Options:
1070 Options:
1071
1071
1072 -l <limit>: you can place restrictions on what or how much of the
1072 -l <limit>: you can place restrictions on what or how much of the
1073 profile gets printed. The limit value can be:
1073 profile gets printed. The limit value can be:
1074
1074
1075 * A string: only information for function names containing this string
1075 * A string: only information for function names containing this string
1076 is printed.
1076 is printed.
1077
1077
1078 * An integer: only these many lines are printed.
1078 * An integer: only these many lines are printed.
1079
1079
1080 * A float (between 0 and 1): this fraction of the report is printed
1080 * A float (between 0 and 1): this fraction of the report is printed
1081 (for example, use a limit of 0.4 to see the topmost 40% only).
1081 (for example, use a limit of 0.4 to see the topmost 40% only).
1082
1082
1083 You can combine several limits with repeated use of the option. For
1083 You can combine several limits with repeated use of the option. For
1084 example, '-l __init__ -l 5' will print only the topmost 5 lines of
1084 example, '-l __init__ -l 5' will print only the topmost 5 lines of
1085 information about class constructors.
1085 information about class constructors.
1086
1086
1087 -r: return the pstats.Stats object generated by the profiling. This
1087 -r: return the pstats.Stats object generated by the profiling. This
1088 object has all the information about the profile in it, and you can
1088 object has all the information about the profile in it, and you can
1089 later use it for further analysis or in other functions.
1089 later use it for further analysis or in other functions.
1090
1090
1091 Since magic functions have a particular form of calling which prevents
1091 Since magic functions have a particular form of calling which prevents
1092 you from writing something like:\\
1092 you from writing something like:\\
1093 In [1]: p = %prun -r print 4 # invalid!\\
1093 In [1]: p = %prun -r print 4 # invalid!\\
1094 you must instead use IPython's automatic variables to assign this:\\
1094 you must instead use IPython's automatic variables to assign this:\\
1095 In [1]: %prun -r print 4 \\
1095 In [1]: %prun -r print 4 \\
1096 Out[1]: <pstats.Stats instance at 0x8222cec>\\
1096 Out[1]: <pstats.Stats instance at 0x8222cec>\\
1097 In [2]: stats = _
1097 In [2]: stats = _
1098
1098
1099 If you really need to assign this value via an explicit function call,
1099 If you really need to assign this value via an explicit function call,
1100 you can always tap directly into the true name of the magic function
1100 you can always tap directly into the true name of the magic function
1101 by using the ipmagic function (which IPython automatically adds to the
1101 by using the ipmagic function (which IPython automatically adds to the
1102 builtins):\\
1102 builtins):\\
1103 In [3]: stats = ipmagic('prun','-r print 4')
1103 In [3]: stats = ipmagic('prun','-r print 4')
1104
1104
1105 You can type ipmagic? for more details on ipmagic.
1105 You can type ipmagic? for more details on ipmagic.
1106
1106
1107 -s <key>: sort profile by given key. You can provide more than one key
1107 -s <key>: sort profile by given key. You can provide more than one key
1108 by using the option several times: '-s key1 -s key2 -s key3...'. The
1108 by using the option several times: '-s key1 -s key2 -s key3...'. The
1109 default sorting key is 'time'.
1109 default sorting key is 'time'.
1110
1110
1111 The following is copied verbatim from the profile documentation
1111 The following is copied verbatim from the profile documentation
1112 referenced below:
1112 referenced below:
1113
1113
1114 When more than one key is provided, additional keys are used as
1114 When more than one key is provided, additional keys are used as
1115 secondary criteria when the there is equality in all keys selected
1115 secondary criteria when the there is equality in all keys selected
1116 before them.
1116 before them.
1117
1117
1118 Abbreviations can be used for any key names, as long as the
1118 Abbreviations can be used for any key names, as long as the
1119 abbreviation is unambiguous. The following are the keys currently
1119 abbreviation is unambiguous. The following are the keys currently
1120 defined:
1120 defined:
1121
1121
1122 Valid Arg Meaning\\
1122 Valid Arg Meaning\\
1123 "calls" call count\\
1123 "calls" call count\\
1124 "cumulative" cumulative time\\
1124 "cumulative" cumulative time\\
1125 "file" file name\\
1125 "file" file name\\
1126 "module" file name\\
1126 "module" file name\\
1127 "pcalls" primitive call count\\
1127 "pcalls" primitive call count\\
1128 "line" line number\\
1128 "line" line number\\
1129 "name" function name\\
1129 "name" function name\\
1130 "nfl" name/file/line\\
1130 "nfl" name/file/line\\
1131 "stdname" standard name\\
1131 "stdname" standard name\\
1132 "time" internal time
1132 "time" internal time
1133
1133
1134 Note that all sorts on statistics are in descending order (placing
1134 Note that all sorts on statistics are in descending order (placing
1135 most time consuming items first), where as name, file, and line number
1135 most time consuming items first), where as name, file, and line number
1136 searches are in ascending order (i.e., alphabetical). The subtle
1136 searches are in ascending order (i.e., alphabetical). The subtle
1137 distinction between "nfl" and "stdname" is that the standard name is a
1137 distinction between "nfl" and "stdname" is that the standard name is a
1138 sort of the name as printed, which means that the embedded line
1138 sort of the name as printed, which means that the embedded line
1139 numbers get compared in an odd way. For example, lines 3, 20, and 40
1139 numbers get compared in an odd way. For example, lines 3, 20, and 40
1140 would (if the file names were the same) appear in the string order
1140 would (if the file names were the same) appear in the string order
1141 "20" "3" and "40". In contrast, "nfl" does a numeric compare of the
1141 "20" "3" and "40". In contrast, "nfl" does a numeric compare of the
1142 line numbers. In fact, sort_stats("nfl") is the same as
1142 line numbers. In fact, sort_stats("nfl") is the same as
1143 sort_stats("name", "file", "line").
1143 sort_stats("name", "file", "line").
1144
1144
1145 -T <filename>: save profile results as shown on screen to a text
1145 -T <filename>: save profile results as shown on screen to a text
1146 file. The profile is still shown on screen.
1146 file. The profile is still shown on screen.
1147
1147
1148 -D <filename>: save (via dump_stats) profile statistics to given
1148 -D <filename>: save (via dump_stats) profile statistics to given
1149 filename. This data is in a format understod by the pstats module, and
1149 filename. This data is in a format understod by the pstats module, and
1150 is generated by a call to the dump_stats() method of profile
1150 is generated by a call to the dump_stats() method of profile
1151 objects. The profile is still shown on screen.
1151 objects. The profile is still shown on screen.
1152
1152
1153 If you want to run complete programs under the profiler's control, use
1153 If you want to run complete programs under the profiler's control, use
1154 '%run -p [prof_opts] filename.py [args to program]' where prof_opts
1154 '%run -p [prof_opts] filename.py [args to program]' where prof_opts
1155 contains profiler specific options as described here.
1155 contains profiler specific options as described here.
1156
1156
1157 You can read the complete documentation for the profile module with:\\
1157 You can read the complete documentation for the profile module with:\\
1158 In [1]: import profile; profile.help() """
1158 In [1]: import profile; profile.help() """
1159
1159
1160 opts_def = Struct(D=[''],l=[],s=['time'],T=[''])
1160 opts_def = Struct(D=[''],l=[],s=['time'],T=[''])
1161 # protect user quote marks
1161 # protect user quote marks
1162 parameter_s = parameter_s.replace('"',r'\"').replace("'",r"\'")
1162 parameter_s = parameter_s.replace('"',r'\"').replace("'",r"\'")
1163
1163
1164 if user_mode: # regular user call
1164 if user_mode: # regular user call
1165 opts,arg_str = self.parse_options(parameter_s,'D:l:rs:T:',
1165 opts,arg_str = self.parse_options(parameter_s,'D:l:rs:T:',
1166 list_all=1)
1166 list_all=1)
1167 namespace = self.shell.user_ns
1167 namespace = self.shell.user_ns
1168 else: # called to run a program by %run -p
1168 else: # called to run a program by %run -p
1169 try:
1169 try:
1170 filename = get_py_filename(arg_lst[0])
1170 filename = get_py_filename(arg_lst[0])
1171 except IOError,msg:
1171 except IOError,msg:
1172 error(msg)
1172 error(msg)
1173 return
1173 return
1174
1174
1175 arg_str = 'execfile(filename,prog_ns)'
1175 arg_str = 'execfile(filename,prog_ns)'
1176 namespace = locals()
1176 namespace = locals()
1177
1177
1178 opts.merge(opts_def)
1178 opts.merge(opts_def)
1179
1179
1180 prof = profile.Profile()
1180 prof = profile.Profile()
1181 try:
1181 try:
1182 prof = prof.runctx(arg_str,namespace,namespace)
1182 prof = prof.runctx(arg_str,namespace,namespace)
1183 sys_exit = ''
1183 sys_exit = ''
1184 except SystemExit:
1184 except SystemExit:
1185 sys_exit = """*** SystemExit exception caught in code being profiled."""
1185 sys_exit = """*** SystemExit exception caught in code being profiled."""
1186
1186
1187 stats = pstats.Stats(prof).strip_dirs().sort_stats(*opts.s)
1187 stats = pstats.Stats(prof).strip_dirs().sort_stats(*opts.s)
1188
1188
1189 lims = opts.l
1189 lims = opts.l
1190 if lims:
1190 if lims:
1191 lims = [] # rebuild lims with ints/floats/strings
1191 lims = [] # rebuild lims with ints/floats/strings
1192 for lim in opts.l:
1192 for lim in opts.l:
1193 try:
1193 try:
1194 lims.append(int(lim))
1194 lims.append(int(lim))
1195 except ValueError:
1195 except ValueError:
1196 try:
1196 try:
1197 lims.append(float(lim))
1197 lims.append(float(lim))
1198 except ValueError:
1198 except ValueError:
1199 lims.append(lim)
1199 lims.append(lim)
1200
1200
1201 # trap output
1201 # trap output
1202 sys_stdout = sys.stdout
1202 sys_stdout = sys.stdout
1203 stdout_trap = StringIO()
1203 stdout_trap = StringIO()
1204 try:
1204 try:
1205 sys.stdout = stdout_trap
1205 sys.stdout = stdout_trap
1206 stats.print_stats(*lims)
1206 stats.print_stats(*lims)
1207 finally:
1207 finally:
1208 sys.stdout = sys_stdout
1208 sys.stdout = sys_stdout
1209 output = stdout_trap.getvalue()
1209 output = stdout_trap.getvalue()
1210 output = output.rstrip()
1210 output = output.rstrip()
1211
1211
1212 page(output,screen_lines=self.shell.rc.screen_length)
1212 page(output,screen_lines=self.shell.rc.screen_length)
1213 print sys_exit,
1213 print sys_exit,
1214
1214
1215 dump_file = opts.D[0]
1215 dump_file = opts.D[0]
1216 text_file = opts.T[0]
1216 text_file = opts.T[0]
1217 if dump_file:
1217 if dump_file:
1218 prof.dump_stats(dump_file)
1218 prof.dump_stats(dump_file)
1219 print '\n*** Profile stats marshalled to file',\
1219 print '\n*** Profile stats marshalled to file',\
1220 `dump_file`+'.',sys_exit
1220 `dump_file`+'.',sys_exit
1221 if text_file:
1221 if text_file:
1222 file(text_file,'w').write(output)
1222 file(text_file,'w').write(output)
1223 print '\n*** Profile printout saved to text file',\
1223 print '\n*** Profile printout saved to text file',\
1224 `text_file`+'.',sys_exit
1224 `text_file`+'.',sys_exit
1225
1225
1226 if opts.has_key('r'):
1226 if opts.has_key('r'):
1227 return stats
1227 return stats
1228 else:
1228 else:
1229 return None
1229 return None
1230
1230
1231 def magic_run(self, parameter_s ='',runner=None):
1231 def magic_run(self, parameter_s ='',runner=None):
1232 """Run the named file inside IPython as a program.
1232 """Run the named file inside IPython as a program.
1233
1233
1234 Usage:\\
1234 Usage:\\
1235 %run [-n -i -t [-N<N>] -d [-b<N>] -p [profile options]] file [args]
1235 %run [-n -i -t [-N<N>] -d [-b<N>] -p [profile options]] file [args]
1236
1236
1237 Parameters after the filename are passed as command-line arguments to
1237 Parameters after the filename are passed as command-line arguments to
1238 the program (put in sys.argv). Then, control returns to IPython's
1238 the program (put in sys.argv). Then, control returns to IPython's
1239 prompt.
1239 prompt.
1240
1240
1241 This is similar to running at a system prompt:\\
1241 This is similar to running at a system prompt:\\
1242 $ python file args\\
1242 $ python file args\\
1243 but with the advantage of giving you IPython's tracebacks, and of
1243 but with the advantage of giving you IPython's tracebacks, and of
1244 loading all variables into your interactive namespace for further use
1244 loading all variables into your interactive namespace for further use
1245 (unless -p is used, see below).
1245 (unless -p is used, see below).
1246
1246
1247 The file is executed in a namespace initially consisting only of
1247 The file is executed in a namespace initially consisting only of
1248 __name__=='__main__' and sys.argv constructed as indicated. It thus
1248 __name__=='__main__' and sys.argv constructed as indicated. It thus
1249 sees its environment as if it were being run as a stand-alone
1249 sees its environment as if it were being run as a stand-alone
1250 program. But after execution, the IPython interactive namespace gets
1250 program. But after execution, the IPython interactive namespace gets
1251 updated with all variables defined in the program (except for __name__
1251 updated with all variables defined in the program (except for __name__
1252 and sys.argv). This allows for very convenient loading of code for
1252 and sys.argv). This allows for very convenient loading of code for
1253 interactive work, while giving each program a 'clean sheet' to run in.
1253 interactive work, while giving each program a 'clean sheet' to run in.
1254
1254
1255 Options:
1255 Options:
1256
1256
1257 -n: __name__ is NOT set to '__main__', but to the running file's name
1257 -n: __name__ is NOT set to '__main__', but to the running file's name
1258 without extension (as python does under import). This allows running
1258 without extension (as python does under import). This allows running
1259 scripts and reloading the definitions in them without calling code
1259 scripts and reloading the definitions in them without calling code
1260 protected by an ' if __name__ == "__main__" ' clause.
1260 protected by an ' if __name__ == "__main__" ' clause.
1261
1261
1262 -i: run the file in IPython's namespace instead of an empty one. This
1262 -i: run the file in IPython's namespace instead of an empty one. This
1263 is useful if you are experimenting with code written in a text editor
1263 is useful if you are experimenting with code written in a text editor
1264 which depends on variables defined interactively.
1264 which depends on variables defined interactively.
1265
1265
1266 -e: ignore sys.exit() calls or SystemExit exceptions in the script
1266 -e: ignore sys.exit() calls or SystemExit exceptions in the script
1267 being run. This is particularly useful if IPython is being used to
1267 being run. This is particularly useful if IPython is being used to
1268 run unittests, which always exit with a sys.exit() call. In such
1268 run unittests, which always exit with a sys.exit() call. In such
1269 cases you are interested in the output of the test results, not in
1269 cases you are interested in the output of the test results, not in
1270 seeing a traceback of the unittest module.
1270 seeing a traceback of the unittest module.
1271
1271
1272 -t: print timing information at the end of the run. IPython will give
1272 -t: print timing information at the end of the run. IPython will give
1273 you an estimated CPU time consumption for your script, which under
1273 you an estimated CPU time consumption for your script, which under
1274 Unix uses the resource module to avoid the wraparound problems of
1274 Unix uses the resource module to avoid the wraparound problems of
1275 time.clock(). Under Unix, an estimate of time spent on system tasks
1275 time.clock(). Under Unix, an estimate of time spent on system tasks
1276 is also given (for Windows platforms this is reported as 0.0).
1276 is also given (for Windows platforms this is reported as 0.0).
1277
1277
1278 If -t is given, an additional -N<N> option can be given, where <N>
1278 If -t is given, an additional -N<N> option can be given, where <N>
1279 must be an integer indicating how many times you want the script to
1279 must be an integer indicating how many times you want the script to
1280 run. The final timing report will include total and per run results.
1280 run. The final timing report will include total and per run results.
1281
1281
1282 For example (testing the script uniq_stable.py):
1282 For example (testing the script uniq_stable.py):
1283
1283
1284 In [1]: run -t uniq_stable
1284 In [1]: run -t uniq_stable
1285
1285
1286 IPython CPU timings (estimated):\\
1286 IPython CPU timings (estimated):\\
1287 User : 0.19597 s.\\
1287 User : 0.19597 s.\\
1288 System: 0.0 s.\\
1288 System: 0.0 s.\\
1289
1289
1290 In [2]: run -t -N5 uniq_stable
1290 In [2]: run -t -N5 uniq_stable
1291
1291
1292 IPython CPU timings (estimated):\\
1292 IPython CPU timings (estimated):\\
1293 Total runs performed: 5\\
1293 Total runs performed: 5\\
1294 Times : Total Per run\\
1294 Times : Total Per run\\
1295 User : 0.910862 s, 0.1821724 s.\\
1295 User : 0.910862 s, 0.1821724 s.\\
1296 System: 0.0 s, 0.0 s.
1296 System: 0.0 s, 0.0 s.
1297
1297
1298 -d: run your program under the control of pdb, the Python debugger.
1298 -d: run your program under the control of pdb, the Python debugger.
1299 This allows you to execute your program step by step, watch variables,
1299 This allows you to execute your program step by step, watch variables,
1300 etc. Internally, what IPython does is similar to calling:
1300 etc. Internally, what IPython does is similar to calling:
1301
1301
1302 pdb.run('execfile("YOURFILENAME")')
1302 pdb.run('execfile("YOURFILENAME")')
1303
1303
1304 with a breakpoint set on line 1 of your file. You can change the line
1304 with a breakpoint set on line 1 of your file. You can change the line
1305 number for this automatic breakpoint to be <N> by using the -bN option
1305 number for this automatic breakpoint to be <N> by using the -bN option
1306 (where N must be an integer). For example:
1306 (where N must be an integer). For example:
1307
1307
1308 %run -d -b40 myscript
1308 %run -d -b40 myscript
1309
1309
1310 will set the first breakpoint at line 40 in myscript.py. Note that
1310 will set the first breakpoint at line 40 in myscript.py. Note that
1311 the first breakpoint must be set on a line which actually does
1311 the first breakpoint must be set on a line which actually does
1312 something (not a comment or docstring) for it to stop execution.
1312 something (not a comment or docstring) for it to stop execution.
1313
1313
1314 When the pdb debugger starts, you will see a (Pdb) prompt. You must
1314 When the pdb debugger starts, you will see a (Pdb) prompt. You must
1315 first enter 'c' (without qoutes) to start execution up to the first
1315 first enter 'c' (without qoutes) to start execution up to the first
1316 breakpoint.
1316 breakpoint.
1317
1317
1318 Entering 'help' gives information about the use of the debugger. You
1318 Entering 'help' gives information about the use of the debugger. You
1319 can easily see pdb's full documentation with "import pdb;pdb.help()"
1319 can easily see pdb's full documentation with "import pdb;pdb.help()"
1320 at a prompt.
1320 at a prompt.
1321
1321
1322 -p: run program under the control of the Python profiler module (which
1322 -p: run program under the control of the Python profiler module (which
1323 prints a detailed report of execution times, function calls, etc).
1323 prints a detailed report of execution times, function calls, etc).
1324
1324
1325 You can pass other options after -p which affect the behavior of the
1325 You can pass other options after -p which affect the behavior of the
1326 profiler itself. See the docs for %prun for details.
1326 profiler itself. See the docs for %prun for details.
1327
1327
1328 In this mode, the program's variables do NOT propagate back to the
1328 In this mode, the program's variables do NOT propagate back to the
1329 IPython interactive namespace (because they remain in the namespace
1329 IPython interactive namespace (because they remain in the namespace
1330 where the profiler executes them).
1330 where the profiler executes them).
1331
1331
1332 Internally this triggers a call to %prun, see its documentation for
1332 Internally this triggers a call to %prun, see its documentation for
1333 details on the options available specifically for profiling."""
1333 details on the options available specifically for profiling."""
1334
1334
1335 # get arguments and set sys.argv for program to be run.
1335 # get arguments and set sys.argv for program to be run.
1336 opts,arg_lst = self.parse_options(parameter_s,'nidtN:b:pD:l:rs:T:e',
1336 opts,arg_lst = self.parse_options(parameter_s,'nidtN:b:pD:l:rs:T:e',
1337 mode='list',list_all=1)
1337 mode='list',list_all=1)
1338
1338
1339 try:
1339 try:
1340 filename = get_py_filename(arg_lst[0])
1340 filename = get_py_filename(arg_lst[0])
1341 except IndexError:
1341 except IndexError:
1342 warn('you must provide at least a filename.')
1342 warn('you must provide at least a filename.')
1343 print '\n%run:\n',OInspect.getdoc(self.magic_run)
1343 print '\n%run:\n',OInspect.getdoc(self.magic_run)
1344 return
1344 return
1345 except IOError,msg:
1345 except IOError,msg:
1346 error(msg)
1346 error(msg)
1347 return
1347 return
1348
1348
1349 # Control the response to exit() calls made by the script being run
1349 # Control the response to exit() calls made by the script being run
1350 exit_ignore = opts.has_key('e')
1350 exit_ignore = opts.has_key('e')
1351
1351
1352 # Make sure that the running script gets a proper sys.argv as if it
1352 # Make sure that the running script gets a proper sys.argv as if it
1353 # were run from a system shell.
1353 # were run from a system shell.
1354 save_argv = sys.argv # save it for later restoring
1354 save_argv = sys.argv # save it for later restoring
1355 sys.argv = [filename]+ arg_lst[1:] # put in the proper filename
1355 sys.argv = [filename]+ arg_lst[1:] # put in the proper filename
1356
1356
1357 if opts.has_key('i'):
1357 if opts.has_key('i'):
1358 prog_ns = self.shell.user_ns
1358 prog_ns = self.shell.user_ns
1359 __name__save = self.shell.user_ns['__name__']
1359 __name__save = self.shell.user_ns['__name__']
1360 prog_ns['__name__'] = '__main__'
1360 prog_ns['__name__'] = '__main__'
1361 else:
1361 else:
1362 if opts.has_key('n'):
1362 if opts.has_key('n'):
1363 name = os.path.splitext(os.path.basename(filename))[0]
1363 name = os.path.splitext(os.path.basename(filename))[0]
1364 else:
1364 else:
1365 name = '__main__'
1365 name = '__main__'
1366 prog_ns = {'__name__':name}
1366 prog_ns = {'__name__':name}
1367
1367
1368 # pickle fix. See iplib for an explanation. But we need to make sure
1368 # pickle fix. See iplib for an explanation. But we need to make sure
1369 # that, if we overwrite __main__, we replace it at the end
1369 # that, if we overwrite __main__, we replace it at the end
1370 if prog_ns['__name__'] == '__main__':
1370 if prog_ns['__name__'] == '__main__':
1371 restore_main = sys.modules['__main__']
1371 restore_main = sys.modules['__main__']
1372 else:
1372 else:
1373 restore_main = False
1373 restore_main = False
1374
1374
1375 sys.modules[prog_ns['__name__']] = FakeModule(prog_ns)
1375 sys.modules[prog_ns['__name__']] = FakeModule(prog_ns)
1376
1376
1377 stats = None
1377 stats = None
1378 try:
1378 try:
1379 if opts.has_key('p'):
1379 if opts.has_key('p'):
1380 stats = self.magic_prun('',0,opts,arg_lst,prog_ns)
1380 stats = self.magic_prun('',0,opts,arg_lst,prog_ns)
1381 else:
1381 else:
1382 if opts.has_key('d'):
1382 if opts.has_key('d'):
1383 deb = Debugger.Pdb(self.shell.rc.colors)
1383 deb = Debugger.Pdb(self.shell.rc.colors)
1384 # reset Breakpoint state, which is moronically kept
1384 # reset Breakpoint state, which is moronically kept
1385 # in a class
1385 # in a class
1386 bdb.Breakpoint.next = 1
1386 bdb.Breakpoint.next = 1
1387 bdb.Breakpoint.bplist = {}
1387 bdb.Breakpoint.bplist = {}
1388 bdb.Breakpoint.bpbynumber = [None]
1388 bdb.Breakpoint.bpbynumber = [None]
1389 # Set an initial breakpoint to stop execution
1389 # Set an initial breakpoint to stop execution
1390 maxtries = 10
1390 maxtries = 10
1391 bp = int(opts.get('b',[1])[0])
1391 bp = int(opts.get('b',[1])[0])
1392 checkline = deb.checkline(filename,bp)
1392 checkline = deb.checkline(filename,bp)
1393 if not checkline:
1393 if not checkline:
1394 for bp in range(bp+1,bp+maxtries+1):
1394 for bp in range(bp+1,bp+maxtries+1):
1395 if deb.checkline(filename,bp):
1395 if deb.checkline(filename,bp):
1396 break
1396 break
1397 else:
1397 else:
1398 msg = ("\nI failed to find a valid line to set "
1398 msg = ("\nI failed to find a valid line to set "
1399 "a breakpoint\n"
1399 "a breakpoint\n"
1400 "after trying up to line: %s.\n"
1400 "after trying up to line: %s.\n"
1401 "Please set a valid breakpoint manually "
1401 "Please set a valid breakpoint manually "
1402 "with the -b option." % bp)
1402 "with the -b option." % bp)
1403 error(msg)
1403 error(msg)
1404 return
1404 return
1405 # if we find a good linenumber, set the breakpoint
1405 # if we find a good linenumber, set the breakpoint
1406 deb.do_break('%s:%s' % (filename,bp))
1406 deb.do_break('%s:%s' % (filename,bp))
1407 # Start file run
1407 # Start file run
1408 print "NOTE: Enter 'c' at the",
1408 print "NOTE: Enter 'c' at the",
1409 print "ipdb> prompt to start your script."
1409 print "ipdb> prompt to start your script."
1410 try:
1410 try:
1411 deb.run('execfile("%s")' % filename,prog_ns)
1411 deb.run('execfile("%s")' % filename,prog_ns)
1412 except:
1412 except:
1413 etype, value, tb = sys.exc_info()
1413 etype, value, tb = sys.exc_info()
1414 # Skip three frames in the traceback: the %run one,
1414 # Skip three frames in the traceback: the %run one,
1415 # one inside bdb.py, and the command-line typed by the
1415 # one inside bdb.py, and the command-line typed by the
1416 # user (run by exec in pdb itself).
1416 # user (run by exec in pdb itself).
1417 self.shell.InteractiveTB(etype,value,tb,tb_offset=3)
1417 self.shell.InteractiveTB(etype,value,tb,tb_offset=3)
1418 else:
1418 else:
1419 if runner is None:
1419 if runner is None:
1420 runner = self.shell.safe_execfile
1420 runner = self.shell.safe_execfile
1421 if opts.has_key('t'):
1421 if opts.has_key('t'):
1422 try:
1422 try:
1423 nruns = int(opts['N'][0])
1423 nruns = int(opts['N'][0])
1424 if nruns < 1:
1424 if nruns < 1:
1425 error('Number of runs must be >=1')
1425 error('Number of runs must be >=1')
1426 return
1426 return
1427 except (KeyError):
1427 except (KeyError):
1428 nruns = 1
1428 nruns = 1
1429 if nruns == 1:
1429 if nruns == 1:
1430 t0 = clock2()
1430 t0 = clock2()
1431 runner(filename,prog_ns,prog_ns,exit_ignore=exit_ignore)
1431 runner(filename,prog_ns,prog_ns,exit_ignore=exit_ignore)
1432 t1 = clock2()
1432 t1 = clock2()
1433 t_usr = t1[0]-t0[0]
1433 t_usr = t1[0]-t0[0]
1434 t_sys = t1[1]-t1[1]
1434 t_sys = t1[1]-t1[1]
1435 print "\nIPython CPU timings (estimated):"
1435 print "\nIPython CPU timings (estimated):"
1436 print " User : %10s s." % t_usr
1436 print " User : %10s s." % t_usr
1437 print " System: %10s s." % t_sys
1437 print " System: %10s s." % t_sys
1438 else:
1438 else:
1439 runs = range(nruns)
1439 runs = range(nruns)
1440 t0 = clock2()
1440 t0 = clock2()
1441 for nr in runs:
1441 for nr in runs:
1442 runner(filename,prog_ns,prog_ns,exit_ignore=exit_ignore)
1442 runner(filename,prog_ns,prog_ns,exit_ignore=exit_ignore)
1443 t1 = clock2()
1443 t1 = clock2()
1444 t_usr = t1[0]-t0[0]
1444 t_usr = t1[0]-t0[0]
1445 t_sys = t1[1]-t1[1]
1445 t_sys = t1[1]-t1[1]
1446 print "\nIPython CPU timings (estimated):"
1446 print "\nIPython CPU timings (estimated):"
1447 print "Total runs performed:",nruns
1447 print "Total runs performed:",nruns
1448 print " Times : %10s %10s" % ('Total','Per run')
1448 print " Times : %10s %10s" % ('Total','Per run')
1449 print " User : %10s s, %10s s." % (t_usr,t_usr/nruns)
1449 print " User : %10s s, %10s s." % (t_usr,t_usr/nruns)
1450 print " System: %10s s, %10s s." % (t_sys,t_sys/nruns)
1450 print " System: %10s s, %10s s." % (t_sys,t_sys/nruns)
1451
1451
1452 else:
1452 else:
1453 runner(filename,prog_ns,prog_ns,exit_ignore=exit_ignore)
1453 runner(filename,prog_ns,prog_ns,exit_ignore=exit_ignore)
1454 if opts.has_key('i'):
1454 if opts.has_key('i'):
1455 self.shell.user_ns['__name__'] = __name__save
1455 self.shell.user_ns['__name__'] = __name__save
1456 else:
1456 else:
1457 # update IPython interactive namespace
1457 # update IPython interactive namespace
1458 del prog_ns['__name__']
1458 del prog_ns['__name__']
1459 self.shell.user_ns.update(prog_ns)
1459 self.shell.user_ns.update(prog_ns)
1460 finally:
1460 finally:
1461 sys.argv = save_argv
1461 sys.argv = save_argv
1462 if restore_main:
1462 if restore_main:
1463 sys.modules['__main__'] = restore_main
1463 sys.modules['__main__'] = restore_main
1464 return stats
1464 return stats
1465
1465
1466 def magic_runlog(self, parameter_s =''):
1466 def magic_runlog(self, parameter_s =''):
1467 """Run files as logs.
1467 """Run files as logs.
1468
1468
1469 Usage:\\
1469 Usage:\\
1470 %runlog file1 file2 ...
1470 %runlog file1 file2 ...
1471
1471
1472 Run the named files (treating them as log files) in sequence inside
1472 Run the named files (treating them as log files) in sequence inside
1473 the interpreter, and return to the prompt. This is much slower than
1473 the interpreter, and return to the prompt. This is much slower than
1474 %run because each line is executed in a try/except block, but it
1474 %run because each line is executed in a try/except block, but it
1475 allows running files with syntax errors in them.
1475 allows running files with syntax errors in them.
1476
1476
1477 Normally IPython will guess when a file is one of its own logfiles, so
1477 Normally IPython will guess when a file is one of its own logfiles, so
1478 you can typically use %run even for logs. This shorthand allows you to
1478 you can typically use %run even for logs. This shorthand allows you to
1479 force any file to be treated as a log file."""
1479 force any file to be treated as a log file."""
1480
1480
1481 for f in parameter_s.split():
1481 for f in parameter_s.split():
1482 self.shell.safe_execfile(f,self.shell.user_ns,
1482 self.shell.safe_execfile(f,self.shell.user_ns,
1483 self.shell.user_ns,islog=1)
1483 self.shell.user_ns,islog=1)
1484
1484
1485 def magic_time(self,parameter_s = ''):
1485 def magic_time(self,parameter_s = ''):
1486 """Time execution of a Python statement or expression.
1486 """Time execution of a Python statement or expression.
1487
1487
1488 The CPU and wall clock times are printed, and the value of the
1488 The CPU and wall clock times are printed, and the value of the
1489 expression (if any) is returned. Note that under Win32, system time
1489 expression (if any) is returned. Note that under Win32, system time
1490 is always reported as 0, since it can not be measured.
1490 is always reported as 0, since it can not be measured.
1491
1491
1492 This function provides very basic timing functionality. In Python
1492 This function provides very basic timing functionality. In Python
1493 2.3, the timeit module offers more control and sophistication, but for
1493 2.3, the timeit module offers more control and sophistication, but for
1494 now IPython supports Python 2.2, so we can not rely on timeit being
1494 now IPython supports Python 2.2, so we can not rely on timeit being
1495 present.
1495 present.
1496
1496
1497 Some examples:
1497 Some examples:
1498
1498
1499 In [1]: time 2**128
1499 In [1]: time 2**128
1500 CPU times: user 0.00 s, sys: 0.00 s, total: 0.00 s
1500 CPU times: user 0.00 s, sys: 0.00 s, total: 0.00 s
1501 Wall time: 0.00
1501 Wall time: 0.00
1502 Out[1]: 340282366920938463463374607431768211456L
1502 Out[1]: 340282366920938463463374607431768211456L
1503
1503
1504 In [2]: n = 1000000
1504 In [2]: n = 1000000
1505
1505
1506 In [3]: time sum(range(n))
1506 In [3]: time sum(range(n))
1507 CPU times: user 1.20 s, sys: 0.05 s, total: 1.25 s
1507 CPU times: user 1.20 s, sys: 0.05 s, total: 1.25 s
1508 Wall time: 1.37
1508 Wall time: 1.37
1509 Out[3]: 499999500000L
1509 Out[3]: 499999500000L
1510
1510
1511 In [4]: time print 'hello world'
1511 In [4]: time print 'hello world'
1512 hello world
1512 hello world
1513 CPU times: user 0.00 s, sys: 0.00 s, total: 0.00 s
1513 CPU times: user 0.00 s, sys: 0.00 s, total: 0.00 s
1514 Wall time: 0.00
1514 Wall time: 0.00
1515 """
1515 """
1516
1516
1517 # fail immediately if the given expression can't be compiled
1517 # fail immediately if the given expression can't be compiled
1518 try:
1518 try:
1519 mode = 'eval'
1519 mode = 'eval'
1520 code = compile(parameter_s,'<timed eval>',mode)
1520 code = compile(parameter_s,'<timed eval>',mode)
1521 except SyntaxError:
1521 except SyntaxError:
1522 mode = 'exec'
1522 mode = 'exec'
1523 code = compile(parameter_s,'<timed exec>',mode)
1523 code = compile(parameter_s,'<timed exec>',mode)
1524 # skew measurement as little as possible
1524 # skew measurement as little as possible
1525 glob = self.shell.user_ns
1525 glob = self.shell.user_ns
1526 clk = clock2
1526 clk = clock2
1527 wtime = time.time
1527 wtime = time.time
1528 # time execution
1528 # time execution
1529 wall_st = wtime()
1529 wall_st = wtime()
1530 if mode=='eval':
1530 if mode=='eval':
1531 st = clk()
1531 st = clk()
1532 out = eval(code,glob)
1532 out = eval(code,glob)
1533 end = clk()
1533 end = clk()
1534 else:
1534 else:
1535 st = clk()
1535 st = clk()
1536 exec code in glob
1536 exec code in glob
1537 end = clk()
1537 end = clk()
1538 out = None
1538 out = None
1539 wall_end = wtime()
1539 wall_end = wtime()
1540 # Compute actual times and report
1540 # Compute actual times and report
1541 wall_time = wall_end-wall_st
1541 wall_time = wall_end-wall_st
1542 cpu_user = end[0]-st[0]
1542 cpu_user = end[0]-st[0]
1543 cpu_sys = end[1]-st[1]
1543 cpu_sys = end[1]-st[1]
1544 cpu_tot = cpu_user+cpu_sys
1544 cpu_tot = cpu_user+cpu_sys
1545 print "CPU times: user %.2f s, sys: %.2f s, total: %.2f s" % \
1545 print "CPU times: user %.2f s, sys: %.2f s, total: %.2f s" % \
1546 (cpu_user,cpu_sys,cpu_tot)
1546 (cpu_user,cpu_sys,cpu_tot)
1547 print "Wall time: %.2f" % wall_time
1547 print "Wall time: %.2f" % wall_time
1548 return out
1548 return out
1549
1549
1550 def magic_macro(self,parameter_s = ''):
1550 def magic_macro(self,parameter_s = ''):
1551 """Define a set of input lines as a macro for future re-execution.
1551 """Define a set of input lines as a macro for future re-execution.
1552
1552
1553 Usage:\\
1553 Usage:\\
1554 %macro name n1-n2 n3-n4 ... n5 .. n6 ...
1554 %macro name n1-n2 n3-n4 ... n5 .. n6 ...
1555
1555
1556 This will define a global variable called `name` which is a string
1556 This will define a global variable called `name` which is a string
1557 made of joining the slices and lines you specify (n1,n2,... numbers
1557 made of joining the slices and lines you specify (n1,n2,... numbers
1558 above) from your input history into a single string. This variable
1558 above) from your input history into a single string. This variable
1559 acts like an automatic function which re-executes those lines as if
1559 acts like an automatic function which re-executes those lines as if
1560 you had typed them. You just type 'name' at the prompt and the code
1560 you had typed them. You just type 'name' at the prompt and the code
1561 executes.
1561 executes.
1562
1562
1563 The notation for indicating number ranges is: n1-n2 means 'use line
1563 The notation for indicating number ranges is: n1-n2 means 'use line
1564 numbers n1,...n2' (the endpoint is included). That is, '5-7' means
1564 numbers n1,...n2' (the endpoint is included). That is, '5-7' means
1565 using the lines numbered 5,6 and 7.
1565 using the lines numbered 5,6 and 7.
1566
1566
1567 Note: as a 'hidden' feature, you can also use traditional python slice
1567 Note: as a 'hidden' feature, you can also use traditional python slice
1568 notation, where N:M means numbers N through M-1.
1568 notation, where N:M means numbers N through M-1.
1569
1569
1570 For example, if your history contains (%hist prints it):
1570 For example, if your history contains (%hist prints it):
1571
1571
1572 44: x=1\\
1572 44: x=1\\
1573 45: y=3\\
1573 45: y=3\\
1574 46: z=x+y\\
1574 46: z=x+y\\
1575 47: print x\\
1575 47: print x\\
1576 48: a=5\\
1576 48: a=5\\
1577 49: print 'x',x,'y',y\\
1577 49: print 'x',x,'y',y\\
1578
1578
1579 you can create a macro with lines 44 through 47 (included) and line 49
1579 you can create a macro with lines 44 through 47 (included) and line 49
1580 called my_macro with:
1580 called my_macro with:
1581
1581
1582 In [51]: %macro my_macro 44-47 49
1582 In [51]: %macro my_macro 44-47 49
1583
1583
1584 Now, typing `my_macro` (without quotes) will re-execute all this code
1584 Now, typing `my_macro` (without quotes) will re-execute all this code
1585 in one pass.
1585 in one pass.
1586
1586
1587 You don't need to give the line-numbers in order, and any given line
1587 You don't need to give the line-numbers in order, and any given line
1588 number can appear multiple times. You can assemble macros with any
1588 number can appear multiple times. You can assemble macros with any
1589 lines from your input history in any order.
1589 lines from your input history in any order.
1590
1590
1591 The macro is a simple object which holds its value in an attribute,
1591 The macro is a simple object which holds its value in an attribute,
1592 but IPython's display system checks for macros and executes them as
1592 but IPython's display system checks for macros and executes them as
1593 code instead of printing them when you type their name.
1593 code instead of printing them when you type their name.
1594
1594
1595 You can view a macro's contents by explicitly printing it with:
1595 You can view a macro's contents by explicitly printing it with:
1596
1596
1597 'print macro_name'.
1597 'print macro_name'.
1598
1598
1599 For one-off cases which DON'T contain magic function calls in them you
1599 For one-off cases which DON'T contain magic function calls in them you
1600 can obtain similar results by explicitly executing slices from your
1600 can obtain similar results by explicitly executing slices from your
1601 input history with:
1601 input history with:
1602
1602
1603 In [60]: exec In[44:48]+In[49]"""
1603 In [60]: exec In[44:48]+In[49]"""
1604
1604
1605 args = parameter_s.split()
1605 args = parameter_s.split()
1606 name,ranges = args[0], args[1:]
1606 name,ranges = args[0], args[1:]
1607 #print 'rng',ranges # dbg
1607 #print 'rng',ranges # dbg
1608 lines = self.extract_input_slices(ranges)
1608 lines = self.extract_input_slices(ranges)
1609 macro = Macro(lines)
1609 macro = Macro(lines)
1610 self.shell.user_ns.update({name:macro})
1610 self.shell.user_ns.update({name:macro})
1611 print 'Macro `%s` created. To execute, type its name (without quotes).' % name
1611 print 'Macro `%s` created. To execute, type its name (without quotes).' % name
1612 print 'Macro contents:'
1612 print 'Macro contents:'
1613 print macro,
1613 print macro,
1614
1614
1615 def magic_save(self,parameter_s = ''):
1615 def magic_save(self,parameter_s = ''):
1616 """Save a set of lines to a given filename.
1616 """Save a set of lines to a given filename.
1617
1617
1618 Usage:\\
1618 Usage:\\
1619 %save filename n1-n2 n3-n4 ... n5 .. n6 ...
1619 %save filename n1-n2 n3-n4 ... n5 .. n6 ...
1620
1620
1621 This function uses the same syntax as %macro for line extraction, but
1621 This function uses the same syntax as %macro for line extraction, but
1622 instead of creating a macro it saves the resulting string to the
1622 instead of creating a macro it saves the resulting string to the
1623 filename you specify.
1623 filename you specify.
1624
1624
1625 It adds a '.py' extension to the file if you don't do so yourself, and
1625 It adds a '.py' extension to the file if you don't do so yourself, and
1626 it asks for confirmation before overwriting existing files."""
1626 it asks for confirmation before overwriting existing files."""
1627
1627
1628 args = parameter_s.split()
1628 args = parameter_s.split()
1629 fname,ranges = args[0], args[1:]
1629 fname,ranges = args[0], args[1:]
1630 if not fname.endswith('.py'):
1630 if not fname.endswith('.py'):
1631 fname += '.py'
1631 fname += '.py'
1632 if os.path.isfile(fname):
1632 if os.path.isfile(fname):
1633 ans = raw_input('File `%s` exists. Overwrite (y/[N])? ' % fname)
1633 ans = raw_input('File `%s` exists. Overwrite (y/[N])? ' % fname)
1634 if ans.lower() not in ['y','yes']:
1634 if ans.lower() not in ['y','yes']:
1635 print 'Operation cancelled.'
1635 print 'Operation cancelled.'
1636 return
1636 return
1637 cmds = ''.join(self.extract_input_slices(ranges))
1637 cmds = ''.join(self.extract_input_slices(ranges))
1638 f = file(fname,'w')
1638 f = file(fname,'w')
1639 f.write(cmds)
1639 f.write(cmds)
1640 f.close()
1640 f.close()
1641 print 'The following commands were written to file `%s`:' % fname
1641 print 'The following commands were written to file `%s`:' % fname
1642 print cmds
1642 print cmds
1643
1643
1644 def _edit_macro(self,mname,macro):
1644 def _edit_macro(self,mname,macro):
1645 """open an editor with the macro data in a file"""
1645 """open an editor with the macro data in a file"""
1646 filename = self.shell.mktempfile(macro.value)
1646 filename = self.shell.mktempfile(macro.value)
1647 self.shell.hooks.editor(filename)
1647 self.shell.hooks.editor(filename)
1648
1648
1649 # and make a new macro object, to replace the old one
1649 # and make a new macro object, to replace the old one
1650 mfile = open(filename)
1650 mfile = open(filename)
1651 mvalue = mfile.read()
1651 mvalue = mfile.read()
1652 mfile.close()
1652 mfile.close()
1653 self.shell.user_ns[mname] = Macro(mvalue)
1653 self.shell.user_ns[mname] = Macro(mvalue)
1654
1654
1655 def magic_ed(self,parameter_s=''):
1655 def magic_ed(self,parameter_s=''):
1656 """Alias to %edit."""
1656 """Alias to %edit."""
1657 return self.magic_edit(parameter_s)
1657 return self.magic_edit(parameter_s)
1658
1658
1659 def magic_edit(self,parameter_s='',last_call=['','']):
1659 def magic_edit(self,parameter_s='',last_call=['','']):
1660 """Bring up an editor and execute the resulting code.
1660 """Bring up an editor and execute the resulting code.
1661
1661
1662 Usage:
1662 Usage:
1663 %edit [options] [args]
1663 %edit [options] [args]
1664
1664
1665 %edit runs IPython's editor hook. The default version of this hook is
1665 %edit runs IPython's editor hook. The default version of this hook is
1666 set to call the __IPYTHON__.rc.editor command. This is read from your
1666 set to call the __IPYTHON__.rc.editor command. This is read from your
1667 environment variable $EDITOR. If this isn't found, it will default to
1667 environment variable $EDITOR. If this isn't found, it will default to
1668 vi under Linux/Unix and to notepad under Windows. See the end of this
1668 vi under Linux/Unix and to notepad under Windows. See the end of this
1669 docstring for how to change the editor hook.
1669 docstring for how to change the editor hook.
1670
1670
1671 You can also set the value of this editor via the command line option
1671 You can also set the value of this editor via the command line option
1672 '-editor' or in your ipythonrc file. This is useful if you wish to use
1672 '-editor' or in your ipythonrc file. This is useful if you wish to use
1673 specifically for IPython an editor different from your typical default
1673 specifically for IPython an editor different from your typical default
1674 (and for Windows users who typically don't set environment variables).
1674 (and for Windows users who typically don't set environment variables).
1675
1675
1676 This command allows you to conveniently edit multi-line code right in
1676 This command allows you to conveniently edit multi-line code right in
1677 your IPython session.
1677 your IPython session.
1678
1678
1679 If called without arguments, %edit opens up an empty editor with a
1679 If called without arguments, %edit opens up an empty editor with a
1680 temporary file and will execute the contents of this file when you
1680 temporary file and will execute the contents of this file when you
1681 close it (don't forget to save it!).
1681 close it (don't forget to save it!).
1682
1682
1683 Options:
1683 Options:
1684
1684
1685 -p: this will call the editor with the same data as the previous time
1685 -p: this will call the editor with the same data as the previous time
1686 it was used, regardless of how long ago (in your current session) it
1686 it was used, regardless of how long ago (in your current session) it
1687 was.
1687 was.
1688
1688
1689 -x: do not execute the edited code immediately upon exit. This is
1689 -x: do not execute the edited code immediately upon exit. This is
1690 mainly useful if you are editing programs which need to be called with
1690 mainly useful if you are editing programs which need to be called with
1691 command line arguments, which you can then do using %run.
1691 command line arguments, which you can then do using %run.
1692
1692
1693 Arguments:
1693 Arguments:
1694
1694
1695 If arguments are given, the following possibilites exist:
1695 If arguments are given, the following possibilites exist:
1696
1696
1697 - The arguments are numbers or pairs of colon-separated numbers (like
1697 - The arguments are numbers or pairs of colon-separated numbers (like
1698 1 4:8 9). These are interpreted as lines of previous input to be
1698 1 4:8 9). These are interpreted as lines of previous input to be
1699 loaded into the editor. The syntax is the same of the %macro command.
1699 loaded into the editor. The syntax is the same of the %macro command.
1700
1700
1701 - If the argument doesn't start with a number, it is evaluated as a
1701 - If the argument doesn't start with a number, it is evaluated as a
1702 variable and its contents loaded into the editor. You can thus edit
1702 variable and its contents loaded into the editor. You can thus edit
1703 any string which contains python code (including the result of
1703 any string which contains python code (including the result of
1704 previous edits).
1704 previous edits).
1705
1705
1706 - If the argument is the name of an object (other than a string),
1706 - If the argument is the name of an object (other than a string),
1707 IPython will try to locate the file where it was defined and open the
1707 IPython will try to locate the file where it was defined and open the
1708 editor at the point where it is defined. You can use `%edit function`
1708 editor at the point where it is defined. You can use `%edit function`
1709 to load an editor exactly at the point where 'function' is defined,
1709 to load an editor exactly at the point where 'function' is defined,
1710 edit it and have the file be executed automatically.
1710 edit it and have the file be executed automatically.
1711
1711
1712 If the object is a macro (see %macro for details), this opens up your
1712 If the object is a macro (see %macro for details), this opens up your
1713 specified editor with a temporary file containing the macro's data.
1713 specified editor with a temporary file containing the macro's data.
1714 Upon exit, the macro is reloaded with the contents of the file.
1714 Upon exit, the macro is reloaded with the contents of the file.
1715
1715
1716 Note: opening at an exact line is only supported under Unix, and some
1716 Note: opening at an exact line is only supported under Unix, and some
1717 editors (like kedit and gedit up to Gnome 2.8) do not understand the
1717 editors (like kedit and gedit up to Gnome 2.8) do not understand the
1718 '+NUMBER' parameter necessary for this feature. Good editors like
1718 '+NUMBER' parameter necessary for this feature. Good editors like
1719 (X)Emacs, vi, jed, pico and joe all do.
1719 (X)Emacs, vi, jed, pico and joe all do.
1720
1720
1721 - If the argument is not found as a variable, IPython will look for a
1721 - If the argument is not found as a variable, IPython will look for a
1722 file with that name (adding .py if necessary) and load it into the
1722 file with that name (adding .py if necessary) and load it into the
1723 editor. It will execute its contents with execfile() when you exit,
1723 editor. It will execute its contents with execfile() when you exit,
1724 loading any code in the file into your interactive namespace.
1724 loading any code in the file into your interactive namespace.
1725
1725
1726 After executing your code, %edit will return as output the code you
1726 After executing your code, %edit will return as output the code you
1727 typed in the editor (except when it was an existing file). This way
1727 typed in the editor (except when it was an existing file). This way
1728 you can reload the code in further invocations of %edit as a variable,
1728 you can reload the code in further invocations of %edit as a variable,
1729 via _<NUMBER> or Out[<NUMBER>], where <NUMBER> is the prompt number of
1729 via _<NUMBER> or Out[<NUMBER>], where <NUMBER> is the prompt number of
1730 the output.
1730 the output.
1731
1731
1732 Note that %edit is also available through the alias %ed.
1732 Note that %edit is also available through the alias %ed.
1733
1733
1734 This is an example of creating a simple function inside the editor and
1734 This is an example of creating a simple function inside the editor and
1735 then modifying it. First, start up the editor:
1735 then modifying it. First, start up the editor:
1736
1736
1737 In [1]: ed\\
1737 In [1]: ed\\
1738 Editing... done. Executing edited code...\\
1738 Editing... done. Executing edited code...\\
1739 Out[1]: 'def foo():\\n print "foo() was defined in an editing session"\\n'
1739 Out[1]: 'def foo():\\n print "foo() was defined in an editing session"\\n'
1740
1740
1741 We can then call the function foo():
1741 We can then call the function foo():
1742
1742
1743 In [2]: foo()\\
1743 In [2]: foo()\\
1744 foo() was defined in an editing session
1744 foo() was defined in an editing session
1745
1745
1746 Now we edit foo. IPython automatically loads the editor with the
1746 Now we edit foo. IPython automatically loads the editor with the
1747 (temporary) file where foo() was previously defined:
1747 (temporary) file where foo() was previously defined:
1748
1748
1749 In [3]: ed foo\\
1749 In [3]: ed foo\\
1750 Editing... done. Executing edited code...
1750 Editing... done. Executing edited code...
1751
1751
1752 And if we call foo() again we get the modified version:
1752 And if we call foo() again we get the modified version:
1753
1753
1754 In [4]: foo()\\
1754 In [4]: foo()\\
1755 foo() has now been changed!
1755 foo() has now been changed!
1756
1756
1757 Here is an example of how to edit a code snippet successive
1757 Here is an example of how to edit a code snippet successive
1758 times. First we call the editor:
1758 times. First we call the editor:
1759
1759
1760 In [8]: ed\\
1760 In [8]: ed\\
1761 Editing... done. Executing edited code...\\
1761 Editing... done. Executing edited code...\\
1762 hello\\
1762 hello\\
1763 Out[8]: "print 'hello'\\n"
1763 Out[8]: "print 'hello'\\n"
1764
1764
1765 Now we call it again with the previous output (stored in _):
1765 Now we call it again with the previous output (stored in _):
1766
1766
1767 In [9]: ed _\\
1767 In [9]: ed _\\
1768 Editing... done. Executing edited code...\\
1768 Editing... done. Executing edited code...\\
1769 hello world\\
1769 hello world\\
1770 Out[9]: "print 'hello world'\\n"
1770 Out[9]: "print 'hello world'\\n"
1771
1771
1772 Now we call it with the output #8 (stored in _8, also as Out[8]):
1772 Now we call it with the output #8 (stored in _8, also as Out[8]):
1773
1773
1774 In [10]: ed _8\\
1774 In [10]: ed _8\\
1775 Editing... done. Executing edited code...\\
1775 Editing... done. Executing edited code...\\
1776 hello again\\
1776 hello again\\
1777 Out[10]: "print 'hello again'\\n"
1777 Out[10]: "print 'hello again'\\n"
1778
1778
1779
1779
1780 Changing the default editor hook:
1780 Changing the default editor hook:
1781
1781
1782 If you wish to write your own editor hook, you can put it in a
1782 If you wish to write your own editor hook, you can put it in a
1783 configuration file which you load at startup time. The default hook
1783 configuration file which you load at startup time. The default hook
1784 is defined in the IPython.hooks module, and you can use that as a
1784 is defined in the IPython.hooks module, and you can use that as a
1785 starting example for further modifications. That file also has
1785 starting example for further modifications. That file also has
1786 general instructions on how to set a new hook for use once you've
1786 general instructions on how to set a new hook for use once you've
1787 defined it."""
1787 defined it."""
1788
1788
1789 # FIXME: This function has become a convoluted mess. It needs a
1789 # FIXME: This function has become a convoluted mess. It needs a
1790 # ground-up rewrite with clean, simple logic.
1790 # ground-up rewrite with clean, simple logic.
1791
1791
1792 def make_filename(arg):
1792 def make_filename(arg):
1793 "Make a filename from the given args"
1793 "Make a filename from the given args"
1794 try:
1794 try:
1795 filename = get_py_filename(arg)
1795 filename = get_py_filename(arg)
1796 except IOError:
1796 except IOError:
1797 if args.endswith('.py'):
1797 if args.endswith('.py'):
1798 filename = arg
1798 filename = arg
1799 else:
1799 else:
1800 filename = None
1800 filename = None
1801 return filename
1801 return filename
1802
1802
1803 # custom exceptions
1803 # custom exceptions
1804 class DataIsObject(Exception): pass
1804 class DataIsObject(Exception): pass
1805
1805
1806 opts,args = self.parse_options(parameter_s,'px')
1806 opts,args = self.parse_options(parameter_s,'px')
1807
1807
1808 # Default line number value
1808 # Default line number value
1809 lineno = None
1809 lineno = None
1810 if opts.has_key('p'):
1810 if opts.has_key('p'):
1811 args = '_%s' % last_call[0]
1811 args = '_%s' % last_call[0]
1812 if not self.shell.user_ns.has_key(args):
1812 if not self.shell.user_ns.has_key(args):
1813 args = last_call[1]
1813 args = last_call[1]
1814
1814
1815 # use last_call to remember the state of the previous call, but don't
1815 # use last_call to remember the state of the previous call, but don't
1816 # let it be clobbered by successive '-p' calls.
1816 # let it be clobbered by successive '-p' calls.
1817 try:
1817 try:
1818 last_call[0] = self.shell.outputcache.prompt_count
1818 last_call[0] = self.shell.outputcache.prompt_count
1819 if not opts.has_key('p'):
1819 if not opts.has_key('p'):
1820 last_call[1] = parameter_s
1820 last_call[1] = parameter_s
1821 except:
1821 except:
1822 pass
1822 pass
1823
1823
1824 # by default this is done with temp files, except when the given
1824 # by default this is done with temp files, except when the given
1825 # arg is a filename
1825 # arg is a filename
1826 use_temp = 1
1826 use_temp = 1
1827
1827
1828 if re.match(r'\d',args):
1828 if re.match(r'\d',args):
1829 # Mode where user specifies ranges of lines, like in %macro.
1829 # Mode where user specifies ranges of lines, like in %macro.
1830 # This means that you can't edit files whose names begin with
1830 # This means that you can't edit files whose names begin with
1831 # numbers this way. Tough.
1831 # numbers this way. Tough.
1832 ranges = args.split()
1832 ranges = args.split()
1833 data = ''.join(self.extract_input_slices(ranges))
1833 data = ''.join(self.extract_input_slices(ranges))
1834 elif args.endswith('.py'):
1834 elif args.endswith('.py'):
1835 filename = make_filename(args)
1835 filename = make_filename(args)
1836 data = ''
1836 data = ''
1837 use_temp = 0
1837 use_temp = 0
1838 elif args:
1838 elif args:
1839 try:
1839 try:
1840 # Load the parameter given as a variable. If not a string,
1840 # Load the parameter given as a variable. If not a string,
1841 # process it as an object instead (below)
1841 # process it as an object instead (below)
1842
1842
1843 #print '*** args',args,'type',type(args) # dbg
1843 #print '*** args',args,'type',type(args) # dbg
1844 data = eval(args,self.shell.user_ns)
1844 data = eval(args,self.shell.user_ns)
1845 if not type(data) in StringTypes:
1845 if not type(data) in StringTypes:
1846 raise DataIsObject
1846 raise DataIsObject
1847
1847
1848 except (NameError,SyntaxError):
1848 except (NameError,SyntaxError):
1849 # given argument is not a variable, try as a filename
1849 # given argument is not a variable, try as a filename
1850 filename = make_filename(args)
1850 filename = make_filename(args)
1851 if filename is None:
1851 if filename is None:
1852 warn("Argument given (%s) can't be found as a variable "
1852 warn("Argument given (%s) can't be found as a variable "
1853 "or as a filename." % args)
1853 "or as a filename." % args)
1854 return
1854 return
1855
1855
1856 data = ''
1856 data = ''
1857 use_temp = 0
1857 use_temp = 0
1858 except DataIsObject:
1858 except DataIsObject:
1859
1859
1860 # macros have a special edit function
1860 # macros have a special edit function
1861 if isinstance(data,Macro):
1861 if isinstance(data,Macro):
1862 self._edit_macro(args,data)
1862 self._edit_macro(args,data)
1863 return
1863 return
1864
1864
1865 # For objects, try to edit the file where they are defined
1865 # For objects, try to edit the file where they are defined
1866 try:
1866 try:
1867 filename = inspect.getabsfile(data)
1867 filename = inspect.getabsfile(data)
1868 datafile = 1
1868 datafile = 1
1869 except TypeError:
1869 except TypeError:
1870 filename = make_filename(args)
1870 filename = make_filename(args)
1871 datafile = 1
1871 datafile = 1
1872 warn('Could not find file where `%s` is defined.\n'
1872 warn('Could not find file where `%s` is defined.\n'
1873 'Opening a file named `%s`' % (args,filename))
1873 'Opening a file named `%s`' % (args,filename))
1874 # Now, make sure we can actually read the source (if it was in
1874 # Now, make sure we can actually read the source (if it was in
1875 # a temp file it's gone by now).
1875 # a temp file it's gone by now).
1876 if datafile:
1876 if datafile:
1877 try:
1877 try:
1878 lineno = inspect.getsourcelines(data)[1]
1878 lineno = inspect.getsourcelines(data)[1]
1879 except IOError:
1879 except IOError:
1880 filename = make_filename(args)
1880 filename = make_filename(args)
1881 if filename is None:
1881 if filename is None:
1882 warn('The file `%s` where `%s` was defined cannot '
1882 warn('The file `%s` where `%s` was defined cannot '
1883 'be read.' % (filename,data))
1883 'be read.' % (filename,data))
1884 return
1884 return
1885 use_temp = 0
1885 use_temp = 0
1886 else:
1886 else:
1887 data = ''
1887 data = ''
1888
1888
1889 if use_temp:
1889 if use_temp:
1890 filename = self.shell.mktempfile(data)
1890 filename = self.shell.mktempfile(data)
1891
1891
1892 # do actual editing here
1892 # do actual editing here
1893 print 'Editing...',
1893 print 'Editing...',
1894 sys.stdout.flush()
1894 sys.stdout.flush()
1895 self.shell.hooks.editor(filename,lineno)
1895 self.shell.hooks.editor(filename,lineno)
1896 if opts.has_key('x'): # -x prevents actual execution
1896 if opts.has_key('x'): # -x prevents actual execution
1897 print
1897 print
1898 else:
1898 else:
1899 print 'done. Executing edited code...'
1899 print 'done. Executing edited code...'
1900 try:
1900 try:
1901 self.shell.safe_execfile(filename,self.shell.user_ns)
1901 self.shell.safe_execfile(filename,self.shell.user_ns)
1902 except IOError,msg:
1902 except IOError,msg:
1903 if msg.filename == filename:
1903 if msg.filename == filename:
1904 warn('File not found. Did you forget to save?')
1904 warn('File not found. Did you forget to save?')
1905 return
1905 return
1906 else:
1906 else:
1907 self.shell.showtraceback()
1907 self.shell.showtraceback()
1908 except:
1908 except:
1909 self.shell.showtraceback()
1909 self.shell.showtraceback()
1910
1910
1911 def magic_xmode(self,parameter_s = ''):
1911 def magic_xmode(self,parameter_s = ''):
1912 """Switch modes for the exception handlers.
1912 """Switch modes for the exception handlers.
1913
1913
1914 Valid modes: Plain, Context and Verbose.
1914 Valid modes: Plain, Context and Verbose.
1915
1915
1916 If called without arguments, acts as a toggle."""
1916 If called without arguments, acts as a toggle."""
1917
1917
1918 def xmode_switch_err(name):
1918 def xmode_switch_err(name):
1919 warn('Error changing %s exception modes.\n%s' %
1919 warn('Error changing %s exception modes.\n%s' %
1920 (name,sys.exc_info()[1]))
1920 (name,sys.exc_info()[1]))
1921
1921
1922 shell = self.shell
1922 shell = self.shell
1923 new_mode = parameter_s.strip().capitalize()
1923 new_mode = parameter_s.strip().capitalize()
1924 try:
1924 try:
1925 shell.InteractiveTB.set_mode(mode=new_mode)
1925 shell.InteractiveTB.set_mode(mode=new_mode)
1926 print 'Exception reporting mode:',shell.InteractiveTB.mode
1926 print 'Exception reporting mode:',shell.InteractiveTB.mode
1927 except:
1927 except:
1928 xmode_switch_err('user')
1928 xmode_switch_err('user')
1929
1929
1930 # threaded shells use a special handler in sys.excepthook
1930 # threaded shells use a special handler in sys.excepthook
1931 if shell.isthreaded:
1931 if shell.isthreaded:
1932 try:
1932 try:
1933 shell.sys_excepthook.set_mode(mode=new_mode)
1933 shell.sys_excepthook.set_mode(mode=new_mode)
1934 except:
1934 except:
1935 xmode_switch_err('threaded')
1935 xmode_switch_err('threaded')
1936
1936
1937 def magic_colors(self,parameter_s = ''):
1937 def magic_colors(self,parameter_s = ''):
1938 """Switch color scheme for prompts, info system and exception handlers.
1938 """Switch color scheme for prompts, info system and exception handlers.
1939
1939
1940 Currently implemented schemes: NoColor, Linux, LightBG.
1940 Currently implemented schemes: NoColor, Linux, LightBG.
1941
1941
1942 Color scheme names are not case-sensitive."""
1942 Color scheme names are not case-sensitive."""
1943
1943
1944 def color_switch_err(name):
1944 def color_switch_err(name):
1945 warn('Error changing %s color schemes.\n%s' %
1945 warn('Error changing %s color schemes.\n%s' %
1946 (name,sys.exc_info()[1]))
1946 (name,sys.exc_info()[1]))
1947
1947
1948
1948
1949 new_scheme = parameter_s.strip()
1949 new_scheme = parameter_s.strip()
1950 if not new_scheme:
1950 if not new_scheme:
1951 print 'You must specify a color scheme.'
1951 print 'You must specify a color scheme.'
1952 return
1952 return
1953 # Under Windows, check for Gary Bishop's readline, which is necessary
1953 # Under Windows, check for Gary Bishop's readline, which is necessary
1954 # for ANSI coloring
1954 # for ANSI coloring
1955 if os.name in ['nt','dos']:
1955 if os.name in ['nt','dos']:
1956 try:
1956 try:
1957 import readline
1957 import readline
1958 except ImportError:
1958 except ImportError:
1959 has_readline = 0
1959 has_readline = 0
1960 else:
1960 else:
1961 try:
1961 try:
1962 readline.GetOutputFile()
1962 readline.GetOutputFile()
1963 except AttributeError:
1963 except AttributeError:
1964 has_readline = 0
1964 has_readline = 0
1965 else:
1965 else:
1966 has_readline = 1
1966 has_readline = 1
1967 if not has_readline:
1967 if not has_readline:
1968 msg = """\
1968 msg = """\
1969 Proper color support under MS Windows requires Gary Bishop's readline library.
1969 Proper color support under MS Windows requires Gary Bishop's readline library.
1970 You can find it at:
1970 You can find it at:
1971 http://sourceforge.net/projects/uncpythontools
1971 http://sourceforge.net/projects/uncpythontools
1972 Gary's readline needs the ctypes module, from:
1972 Gary's readline needs the ctypes module, from:
1973 http://starship.python.net/crew/theller/ctypes
1973 http://starship.python.net/crew/theller/ctypes
1974
1974
1975 Defaulting color scheme to 'NoColor'"""
1975 Defaulting color scheme to 'NoColor'"""
1976 new_scheme = 'NoColor'
1976 new_scheme = 'NoColor'
1977 warn(msg)
1977 warn(msg)
1978 # local shortcut
1978 # local shortcut
1979 shell = self.shell
1979 shell = self.shell
1980
1980
1981 # Set prompt colors
1981 # Set prompt colors
1982 try:
1982 try:
1983 shell.outputcache.set_colors(new_scheme)
1983 shell.outputcache.set_colors(new_scheme)
1984 except:
1984 except:
1985 color_switch_err('prompt')
1985 color_switch_err('prompt')
1986 else:
1986 else:
1987 shell.rc.colors = \
1987 shell.rc.colors = \
1988 shell.outputcache.color_table.active_scheme_name
1988 shell.outputcache.color_table.active_scheme_name
1989 # Set exception colors
1989 # Set exception colors
1990 try:
1990 try:
1991 shell.InteractiveTB.set_colors(scheme = new_scheme)
1991 shell.InteractiveTB.set_colors(scheme = new_scheme)
1992 shell.SyntaxTB.set_colors(scheme = new_scheme)
1992 shell.SyntaxTB.set_colors(scheme = new_scheme)
1993 except:
1993 except:
1994 color_switch_err('exception')
1994 color_switch_err('exception')
1995
1995
1996 # threaded shells use a verbose traceback in sys.excepthook
1996 # threaded shells use a verbose traceback in sys.excepthook
1997 if shell.isthreaded:
1997 if shell.isthreaded:
1998 try:
1998 try:
1999 shell.sys_excepthook.set_colors(scheme=new_scheme)
1999 shell.sys_excepthook.set_colors(scheme=new_scheme)
2000 except:
2000 except:
2001 color_switch_err('system exception handler')
2001 color_switch_err('system exception handler')
2002
2002
2003 # Set info (for 'object?') colors
2003 # Set info (for 'object?') colors
2004 if shell.rc.color_info:
2004 if shell.rc.color_info:
2005 try:
2005 try:
2006 shell.inspector.set_active_scheme(new_scheme)
2006 shell.inspector.set_active_scheme(new_scheme)
2007 except:
2007 except:
2008 color_switch_err('object inspector')
2008 color_switch_err('object inspector')
2009 else:
2009 else:
2010 shell.inspector.set_active_scheme('NoColor')
2010 shell.inspector.set_active_scheme('NoColor')
2011
2011
2012 def magic_color_info(self,parameter_s = ''):
2012 def magic_color_info(self,parameter_s = ''):
2013 """Toggle color_info.
2013 """Toggle color_info.
2014
2014
2015 The color_info configuration parameter controls whether colors are
2015 The color_info configuration parameter controls whether colors are
2016 used for displaying object details (by things like %psource, %pfile or
2016 used for displaying object details (by things like %psource, %pfile or
2017 the '?' system). This function toggles this value with each call.
2017 the '?' system). This function toggles this value with each call.
2018
2018
2019 Note that unless you have a fairly recent pager (less works better
2019 Note that unless you have a fairly recent pager (less works better
2020 than more) in your system, using colored object information displays
2020 than more) in your system, using colored object information displays
2021 will not work properly. Test it and see."""
2021 will not work properly. Test it and see."""
2022
2022
2023 self.shell.rc.color_info = 1 - self.shell.rc.color_info
2023 self.shell.rc.color_info = 1 - self.shell.rc.color_info
2024 self.magic_colors(self.shell.rc.colors)
2024 self.magic_colors(self.shell.rc.colors)
2025 print 'Object introspection functions have now coloring:',
2025 print 'Object introspection functions have now coloring:',
2026 print ['OFF','ON'][self.shell.rc.color_info]
2026 print ['OFF','ON'][self.shell.rc.color_info]
2027
2027
2028 def magic_Pprint(self, parameter_s=''):
2028 def magic_Pprint(self, parameter_s=''):
2029 """Toggle pretty printing on/off."""
2029 """Toggle pretty printing on/off."""
2030
2030
2031 self.shell.outputcache.Pprint = 1 - self.shell.outputcache.Pprint
2031 self.shell.outputcache.Pprint = 1 - self.shell.outputcache.Pprint
2032 print 'Pretty printing has been turned', \
2032 print 'Pretty printing has been turned', \
2033 ['OFF','ON'][self.shell.outputcache.Pprint]
2033 ['OFF','ON'][self.shell.outputcache.Pprint]
2034
2034
2035 def magic_exit(self, parameter_s=''):
2035 def magic_exit(self, parameter_s=''):
2036 """Exit IPython, confirming if configured to do so.
2036 """Exit IPython, confirming if configured to do so.
2037
2037
2038 You can configure whether IPython asks for confirmation upon exit by
2038 You can configure whether IPython asks for confirmation upon exit by
2039 setting the confirm_exit flag in the ipythonrc file."""
2039 setting the confirm_exit flag in the ipythonrc file."""
2040
2040
2041 self.shell.exit()
2041 self.shell.exit()
2042
2042
2043 def magic_quit(self, parameter_s=''):
2043 def magic_quit(self, parameter_s=''):
2044 """Exit IPython, confirming if configured to do so (like %exit)"""
2044 """Exit IPython, confirming if configured to do so (like %exit)"""
2045
2045
2046 self.shell.exit()
2046 self.shell.exit()
2047
2047
2048 def magic_Exit(self, parameter_s=''):
2048 def magic_Exit(self, parameter_s=''):
2049 """Exit IPython without confirmation."""
2049 """Exit IPython without confirmation."""
2050
2050
2051 self.shell.exit_now = True
2051 self.shell.exit_now = True
2052
2052
2053 def magic_Quit(self, parameter_s=''):
2053 def magic_Quit(self, parameter_s=''):
2054 """Exit IPython without confirmation (like %Exit)."""
2054 """Exit IPython without confirmation (like %Exit)."""
2055
2055
2056 self.shell.exit_now = True
2056 self.shell.exit_now = True
2057
2057
2058 #......................................................................
2058 #......................................................................
2059 # Functions to implement unix shell-type things
2059 # Functions to implement unix shell-type things
2060
2060
2061 def magic_alias(self, parameter_s = ''):
2061 def magic_alias(self, parameter_s = ''):
2062 """Define an alias for a system command.
2062 """Define an alias for a system command.
2063
2063
2064 '%alias alias_name cmd' defines 'alias_name' as an alias for 'cmd'
2064 '%alias alias_name cmd' defines 'alias_name' as an alias for 'cmd'
2065
2065
2066 Then, typing 'alias_name params' will execute the system command 'cmd
2066 Then, typing 'alias_name params' will execute the system command 'cmd
2067 params' (from your underlying operating system).
2067 params' (from your underlying operating system).
2068
2068
2069 Aliases have lower precedence than magic functions and Python normal
2069 Aliases have lower precedence than magic functions and Python normal
2070 variables, so if 'foo' is both a Python variable and an alias, the
2070 variables, so if 'foo' is both a Python variable and an alias, the
2071 alias can not be executed until 'del foo' removes the Python variable.
2071 alias can not be executed until 'del foo' removes the Python variable.
2072
2072
2073 You can use the %l specifier in an alias definition to represent the
2073 You can use the %l specifier in an alias definition to represent the
2074 whole line when the alias is called. For example:
2074 whole line when the alias is called. For example:
2075
2075
2076 In [2]: alias all echo "Input in brackets: <%l>"\\
2076 In [2]: alias all echo "Input in brackets: <%l>"\\
2077 In [3]: all hello world\\
2077 In [3]: all hello world\\
2078 Input in brackets: <hello world>
2078 Input in brackets: <hello world>
2079
2079
2080 You can also define aliases with parameters using %s specifiers (one
2080 You can also define aliases with parameters using %s specifiers (one
2081 per parameter):
2081 per parameter):
2082
2082
2083 In [1]: alias parts echo first %s second %s\\
2083 In [1]: alias parts echo first %s second %s\\
2084 In [2]: %parts A B\\
2084 In [2]: %parts A B\\
2085 first A second B\\
2085 first A second B\\
2086 In [3]: %parts A\\
2086 In [3]: %parts A\\
2087 Incorrect number of arguments: 2 expected.\\
2087 Incorrect number of arguments: 2 expected.\\
2088 parts is an alias to: 'echo first %s second %s'
2088 parts is an alias to: 'echo first %s second %s'
2089
2089
2090 Note that %l and %s are mutually exclusive. You can only use one or
2090 Note that %l and %s are mutually exclusive. You can only use one or
2091 the other in your aliases.
2091 the other in your aliases.
2092
2092
2093 Aliases expand Python variables just like system calls using ! or !!
2093 Aliases expand Python variables just like system calls using ! or !!
2094 do: all expressions prefixed with '$' get expanded. For details of
2094 do: all expressions prefixed with '$' get expanded. For details of
2095 the semantic rules, see PEP-215:
2095 the semantic rules, see PEP-215:
2096 http://www.python.org/peps/pep-0215.html. This is the library used by
2096 http://www.python.org/peps/pep-0215.html. This is the library used by
2097 IPython for variable expansion. If you want to access a true shell
2097 IPython for variable expansion. If you want to access a true shell
2098 variable, an extra $ is necessary to prevent its expansion by IPython:
2098 variable, an extra $ is necessary to prevent its expansion by IPython:
2099
2099
2100 In [6]: alias show echo\\
2100 In [6]: alias show echo\\
2101 In [7]: PATH='A Python string'\\
2101 In [7]: PATH='A Python string'\\
2102 In [8]: show $PATH\\
2102 In [8]: show $PATH\\
2103 A Python string\\
2103 A Python string\\
2104 In [9]: show $$PATH\\
2104 In [9]: show $$PATH\\
2105 /usr/local/lf9560/bin:/usr/local/intel/compiler70/ia32/bin:...
2105 /usr/local/lf9560/bin:/usr/local/intel/compiler70/ia32/bin:...
2106
2106
2107 You can use the alias facility to acess all of $PATH. See the %rehash
2107 You can use the alias facility to acess all of $PATH. See the %rehash
2108 and %rehashx functions, which automatically create aliases for the
2108 and %rehashx functions, which automatically create aliases for the
2109 contents of your $PATH.
2109 contents of your $PATH.
2110
2110
2111 If called with no parameters, %alias prints the current alias table."""
2111 If called with no parameters, %alias prints the current alias table."""
2112
2112
2113 par = parameter_s.strip()
2113 par = parameter_s.strip()
2114 if not par:
2114 if not par:
2115 if self.shell.rc.automagic:
2115 if self.shell.rc.automagic:
2116 prechar = ''
2116 prechar = ''
2117 else:
2117 else:
2118 prechar = self.shell.ESC_MAGIC
2118 prechar = self.shell.ESC_MAGIC
2119 print 'Alias\t\tSystem Command\n'+'-'*30
2119 print 'Alias\t\tSystem Command\n'+'-'*30
2120 atab = self.shell.alias_table
2120 atab = self.shell.alias_table
2121 aliases = atab.keys()
2121 aliases = atab.keys()
2122 aliases.sort()
2122 aliases.sort()
2123 for alias in aliases:
2123 for alias in aliases:
2124 print prechar+alias+'\t\t'+atab[alias][1]
2124 print prechar+alias+'\t\t'+atab[alias][1]
2125 print '-'*30+'\nTotal number of aliases:',len(aliases)
2125 print '-'*30+'\nTotal number of aliases:',len(aliases)
2126 return
2126 return
2127 try:
2127 try:
2128 alias,cmd = par.split(None,1)
2128 alias,cmd = par.split(None,1)
2129 except:
2129 except:
2130 print OInspect.getdoc(self.magic_alias)
2130 print OInspect.getdoc(self.magic_alias)
2131 else:
2131 else:
2132 nargs = cmd.count('%s')
2132 nargs = cmd.count('%s')
2133 if nargs>0 and cmd.find('%l')>=0:
2133 if nargs>0 and cmd.find('%l')>=0:
2134 error('The %s and %l specifiers are mutually exclusive '
2134 error('The %s and %l specifiers are mutually exclusive '
2135 'in alias definitions.')
2135 'in alias definitions.')
2136 else: # all looks OK
2136 else: # all looks OK
2137 self.shell.alias_table[alias] = (nargs,cmd)
2137 self.shell.alias_table[alias] = (nargs,cmd)
2138 self.shell.alias_table_validate(verbose=1)
2138 self.shell.alias_table_validate(verbose=1)
2139 # end magic_alias
2139 # end magic_alias
2140
2140
2141 def magic_unalias(self, parameter_s = ''):
2141 def magic_unalias(self, parameter_s = ''):
2142 """Remove an alias"""
2142 """Remove an alias"""
2143
2143
2144 aname = parameter_s.strip()
2144 aname = parameter_s.strip()
2145 if aname in self.shell.alias_table:
2145 if aname in self.shell.alias_table:
2146 del self.shell.alias_table[aname]
2146 del self.shell.alias_table[aname]
2147
2147
2148 def magic_rehash(self, parameter_s = ''):
2148 def magic_rehash(self, parameter_s = ''):
2149 """Update the alias table with all entries in $PATH.
2149 """Update the alias table with all entries in $PATH.
2150
2150
2151 This version does no checks on execute permissions or whether the
2151 This version does no checks on execute permissions or whether the
2152 contents of $PATH are truly files (instead of directories or something
2152 contents of $PATH are truly files (instead of directories or something
2153 else). For such a safer (but slower) version, use %rehashx."""
2153 else). For such a safer (but slower) version, use %rehashx."""
2154
2154
2155 # This function (and rehashx) manipulate the alias_table directly
2155 # This function (and rehashx) manipulate the alias_table directly
2156 # rather than calling magic_alias, for speed reasons. A rehash on a
2156 # rather than calling magic_alias, for speed reasons. A rehash on a
2157 # typical Linux box involves several thousand entries, so efficiency
2157 # typical Linux box involves several thousand entries, so efficiency
2158 # here is a top concern.
2158 # here is a top concern.
2159
2159
2160 path = filter(os.path.isdir,os.environ['PATH'].split(os.pathsep))
2160 path = filter(os.path.isdir,os.environ['PATH'].split(os.pathsep))
2161 alias_table = self.shell.alias_table
2161 alias_table = self.shell.alias_table
2162 for pdir in path:
2162 for pdir in path:
2163 for ff in os.listdir(pdir):
2163 for ff in os.listdir(pdir):
2164 # each entry in the alias table must be (N,name), where
2164 # each entry in the alias table must be (N,name), where
2165 # N is the number of positional arguments of the alias.
2165 # N is the number of positional arguments of the alias.
2166 alias_table[ff] = (0,ff)
2166 alias_table[ff] = (0,ff)
2167 # Make sure the alias table doesn't contain keywords or builtins
2167 # Make sure the alias table doesn't contain keywords or builtins
2168 self.shell.alias_table_validate()
2168 self.shell.alias_table_validate()
2169 # Call again init_auto_alias() so we get 'rm -i' and other modified
2169 # Call again init_auto_alias() so we get 'rm -i' and other modified
2170 # aliases since %rehash will probably clobber them
2170 # aliases since %rehash will probably clobber them
2171 self.shell.init_auto_alias()
2171 self.shell.init_auto_alias()
2172
2172
2173 def magic_rehashx(self, parameter_s = ''):
2173 def magic_rehashx(self, parameter_s = ''):
2174 """Update the alias table with all executable files in $PATH.
2174 """Update the alias table with all executable files in $PATH.
2175
2175
2176 This version explicitly checks that every entry in $PATH is a file
2176 This version explicitly checks that every entry in $PATH is a file
2177 with execute access (os.X_OK), so it is much slower than %rehash.
2177 with execute access (os.X_OK), so it is much slower than %rehash.
2178
2178
2179 Under Windows, it checks executability as a match agains a
2179 Under Windows, it checks executability as a match agains a
2180 '|'-separated string of extensions, stored in the IPython config
2180 '|'-separated string of extensions, stored in the IPython config
2181 variable win_exec_ext. This defaults to 'exe|com|bat'. """
2181 variable win_exec_ext. This defaults to 'exe|com|bat'. """
2182
2182
2183 path = filter(os.path.isdir,os.environ['PATH'].split(os.pathsep))
2183 path = filter(os.path.isdir,os.environ['PATH'].split(os.pathsep))
2184 alias_table = self.shell.alias_table
2184 alias_table = self.shell.alias_table
2185
2185
2186 if os.name == 'posix':
2186 if os.name == 'posix':
2187 isexec = lambda fname:os.path.isfile(fname) and \
2187 isexec = lambda fname:os.path.isfile(fname) and \
2188 os.access(fname,os.X_OK)
2188 os.access(fname,os.X_OK)
2189 else:
2189 else:
2190
2190
2191 try:
2191 try:
2192 winext = os.environ['pathext'].replace(';','|').replace('.','')
2192 winext = os.environ['pathext'].replace(';','|').replace('.','')
2193 except KeyError:
2193 except KeyError:
2194 winext = 'exe|com|bat'
2194 winext = 'exe|com|bat'
2195
2195
2196 execre = re.compile(r'(.*)\.(%s)$' % winext,re.IGNORECASE)
2196 execre = re.compile(r'(.*)\.(%s)$' % winext,re.IGNORECASE)
2197 isexec = lambda fname:os.path.isfile(fname) and execre.match(fname)
2197 isexec = lambda fname:os.path.isfile(fname) and execre.match(fname)
2198 savedir = os.getcwd()
2198 savedir = os.getcwd()
2199 try:
2199 try:
2200 # write the whole loop for posix/Windows so we don't have an if in
2200 # write the whole loop for posix/Windows so we don't have an if in
2201 # the innermost part
2201 # the innermost part
2202 if os.name == 'posix':
2202 if os.name == 'posix':
2203 for pdir in path:
2203 for pdir in path:
2204 os.chdir(pdir)
2204 os.chdir(pdir)
2205 for ff in os.listdir(pdir):
2205 for ff in os.listdir(pdir):
2206 if isexec(ff):
2206 if isexec(ff):
2207 # each entry in the alias table must be (N,name),
2207 # each entry in the alias table must be (N,name),
2208 # where N is the number of positional arguments of the
2208 # where N is the number of positional arguments of the
2209 # alias.
2209 # alias.
2210 alias_table[ff] = (0,ff)
2210 alias_table[ff] = (0,ff)
2211 else:
2211 else:
2212 for pdir in path:
2212 for pdir in path:
2213 os.chdir(pdir)
2213 os.chdir(pdir)
2214 for ff in os.listdir(pdir):
2214 for ff in os.listdir(pdir):
2215 if isexec(ff):
2215 if isexec(ff):
2216 alias_table[execre.sub(r'\1',ff)] = (0,ff)
2216 alias_table[execre.sub(r'\1',ff)] = (0,ff)
2217 # Make sure the alias table doesn't contain keywords or builtins
2217 # Make sure the alias table doesn't contain keywords or builtins
2218 self.shell.alias_table_validate()
2218 self.shell.alias_table_validate()
2219 # Call again init_auto_alias() so we get 'rm -i' and other
2219 # Call again init_auto_alias() so we get 'rm -i' and other
2220 # modified aliases since %rehashx will probably clobber them
2220 # modified aliases since %rehashx will probably clobber them
2221 self.shell.init_auto_alias()
2221 self.shell.init_auto_alias()
2222 finally:
2222 finally:
2223 os.chdir(savedir)
2223 os.chdir(savedir)
2224
2224
2225 def magic_pwd(self, parameter_s = ''):
2225 def magic_pwd(self, parameter_s = ''):
2226 """Return the current working directory path."""
2226 """Return the current working directory path."""
2227 return os.getcwd()
2227 return os.getcwd()
2228
2228
2229 def magic_cd(self, parameter_s=''):
2229 def magic_cd(self, parameter_s=''):
2230 """Change the current working directory.
2230 """Change the current working directory.
2231
2231
2232 This command automatically maintains an internal list of directories
2232 This command automatically maintains an internal list of directories
2233 you visit during your IPython session, in the variable _dh. The
2233 you visit during your IPython session, in the variable _dh. The
2234 command %dhist shows this history nicely formatted.
2234 command %dhist shows this history nicely formatted.
2235
2235
2236 Usage:
2236 Usage:
2237
2237
2238 cd 'dir': changes to directory 'dir'.
2238 cd 'dir': changes to directory 'dir'.
2239
2239
2240 cd -: changes to the last visited directory.
2240 cd -: changes to the last visited directory.
2241
2241
2242 cd -<n>: changes to the n-th directory in the directory history.
2242 cd -<n>: changes to the n-th directory in the directory history.
2243
2243
2244 cd -b <bookmark_name>: jump to a bookmark set by %bookmark
2244 cd -b <bookmark_name>: jump to a bookmark set by %bookmark
2245 (note: cd <bookmark_name> is enough if there is no
2245 (note: cd <bookmark_name> is enough if there is no
2246 directory <bookmark_name>, but a bookmark with the name exists.)
2246 directory <bookmark_name>, but a bookmark with the name exists.)
2247
2247
2248 Options:
2248 Options:
2249
2249
2250 -q: quiet. Do not print the working directory after the cd command is
2250 -q: quiet. Do not print the working directory after the cd command is
2251 executed. By default IPython's cd command does print this directory,
2251 executed. By default IPython's cd command does print this directory,
2252 since the default prompts do not display path information.
2252 since the default prompts do not display path information.
2253
2253
2254 Note that !cd doesn't work for this purpose because the shell where
2254 Note that !cd doesn't work for this purpose because the shell where
2255 !command runs is immediately discarded after executing 'command'."""
2255 !command runs is immediately discarded after executing 'command'."""
2256
2256
2257 parameter_s = parameter_s.strip()
2257 parameter_s = parameter_s.strip()
2258 bkms = self.shell.persist.get("bookmarks",{})
2258 bkms = self.shell.persist.get("bookmarks",{})
2259
2259
2260 numcd = re.match(r'(-)(\d+)$',parameter_s)
2260 numcd = re.match(r'(-)(\d+)$',parameter_s)
2261 # jump in directory history by number
2261 # jump in directory history by number
2262 if numcd:
2262 if numcd:
2263 nn = int(numcd.group(2))
2263 nn = int(numcd.group(2))
2264 try:
2264 try:
2265 ps = self.shell.user_ns['_dh'][nn]
2265 ps = self.shell.user_ns['_dh'][nn]
2266 except IndexError:
2266 except IndexError:
2267 print 'The requested directory does not exist in history.'
2267 print 'The requested directory does not exist in history.'
2268 return
2268 return
2269 else:
2269 else:
2270 opts = {}
2270 opts = {}
2271 else:
2271 else:
2272 opts,ps = self.parse_options(parameter_s,'qb',mode='string')
2272 opts,ps = self.parse_options(parameter_s,'qb',mode='string')
2273 # jump to previous
2273 # jump to previous
2274 if ps == '-':
2274 if ps == '-':
2275 try:
2275 try:
2276 ps = self.shell.user_ns['_dh'][-2]
2276 ps = self.shell.user_ns['_dh'][-2]
2277 except IndexError:
2277 except IndexError:
2278 print 'No previous directory to change to.'
2278 print 'No previous directory to change to.'
2279 return
2279 return
2280 # jump to bookmark
2280 # jump to bookmark
2281 elif opts.has_key('b') or (bkms.has_key(ps) and not os.path.isdir(ps)):
2281 elif opts.has_key('b') or (bkms.has_key(ps) and not os.path.isdir(ps)):
2282 if bkms.has_key(ps):
2282 if bkms.has_key(ps):
2283 target = bkms[ps]
2283 target = bkms[ps]
2284 print '(bookmark:%s) -> %s' % (ps,target)
2284 print '(bookmark:%s) -> %s' % (ps,target)
2285 ps = target
2285 ps = target
2286 else:
2286 else:
2287 if bkms:
2287 if bkms:
2288 error("Bookmark '%s' not found. "
2288 error("Bookmark '%s' not found. "
2289 "Use '%bookmark -l' to see your bookmarks." % ps)
2289 "Use '%%bookmark -l' to see your bookmarks." % ps)
2290 else:
2290 else:
2291 print "Bookmarks not set - use %bookmark <bookmarkname>"
2291 print "Bookmarks not set - use %bookmark <bookmarkname>"
2292 return
2292 return
2293
2293
2294 # at this point ps should point to the target dir
2294 # at this point ps should point to the target dir
2295 if ps:
2295 if ps:
2296 try:
2296 try:
2297 os.chdir(os.path.expanduser(ps))
2297 os.chdir(os.path.expanduser(ps))
2298 except OSError:
2298 except OSError:
2299 print sys.exc_info()[1]
2299 print sys.exc_info()[1]
2300 else:
2300 else:
2301 self.shell.user_ns['_dh'].append(os.getcwd())
2301 self.shell.user_ns['_dh'].append(os.getcwd())
2302 else:
2302 else:
2303 os.chdir(self.shell.home_dir)
2303 os.chdir(self.shell.home_dir)
2304 self.shell.user_ns['_dh'].append(os.getcwd())
2304 self.shell.user_ns['_dh'].append(os.getcwd())
2305 if not 'q' in opts:
2305 if not 'q' in opts:
2306 print self.shell.user_ns['_dh'][-1]
2306 print self.shell.user_ns['_dh'][-1]
2307
2307
2308 def magic_dhist(self, parameter_s=''):
2308 def magic_dhist(self, parameter_s=''):
2309 """Print your history of visited directories.
2309 """Print your history of visited directories.
2310
2310
2311 %dhist -> print full history\\
2311 %dhist -> print full history\\
2312 %dhist n -> print last n entries only\\
2312 %dhist n -> print last n entries only\\
2313 %dhist n1 n2 -> print entries between n1 and n2 (n1 not included)\\
2313 %dhist n1 n2 -> print entries between n1 and n2 (n1 not included)\\
2314
2314
2315 This history is automatically maintained by the %cd command, and
2315 This history is automatically maintained by the %cd command, and
2316 always available as the global list variable _dh. You can use %cd -<n>
2316 always available as the global list variable _dh. You can use %cd -<n>
2317 to go to directory number <n>."""
2317 to go to directory number <n>."""
2318
2318
2319 dh = self.shell.user_ns['_dh']
2319 dh = self.shell.user_ns['_dh']
2320 if parameter_s:
2320 if parameter_s:
2321 try:
2321 try:
2322 args = map(int,parameter_s.split())
2322 args = map(int,parameter_s.split())
2323 except:
2323 except:
2324 self.arg_err(Magic.magic_dhist)
2324 self.arg_err(Magic.magic_dhist)
2325 return
2325 return
2326 if len(args) == 1:
2326 if len(args) == 1:
2327 ini,fin = max(len(dh)-(args[0]),0),len(dh)
2327 ini,fin = max(len(dh)-(args[0]),0),len(dh)
2328 elif len(args) == 2:
2328 elif len(args) == 2:
2329 ini,fin = args
2329 ini,fin = args
2330 else:
2330 else:
2331 self.arg_err(Magic.magic_dhist)
2331 self.arg_err(Magic.magic_dhist)
2332 return
2332 return
2333 else:
2333 else:
2334 ini,fin = 0,len(dh)
2334 ini,fin = 0,len(dh)
2335 nlprint(dh,
2335 nlprint(dh,
2336 header = 'Directory history (kept in _dh)',
2336 header = 'Directory history (kept in _dh)',
2337 start=ini,stop=fin)
2337 start=ini,stop=fin)
2338
2338
2339 def magic_env(self, parameter_s=''):
2339 def magic_env(self, parameter_s=''):
2340 """List environment variables."""
2340 """List environment variables."""
2341
2341
2342 return os.environ.data
2342 return os.environ.data
2343
2343
2344 def magic_pushd(self, parameter_s=''):
2344 def magic_pushd(self, parameter_s=''):
2345 """Place the current dir on stack and change directory.
2345 """Place the current dir on stack and change directory.
2346
2346
2347 Usage:\\
2347 Usage:\\
2348 %pushd ['dirname']
2348 %pushd ['dirname']
2349
2349
2350 %pushd with no arguments does a %pushd to your home directory.
2350 %pushd with no arguments does a %pushd to your home directory.
2351 """
2351 """
2352 if parameter_s == '': parameter_s = '~'
2352 if parameter_s == '': parameter_s = '~'
2353 dir_s = self.shell.dir_stack
2353 dir_s = self.shell.dir_stack
2354 if len(dir_s)>0 and os.path.expanduser(parameter_s) != \
2354 if len(dir_s)>0 and os.path.expanduser(parameter_s) != \
2355 os.path.expanduser(self.shell.dir_stack[0]):
2355 os.path.expanduser(self.shell.dir_stack[0]):
2356 try:
2356 try:
2357 self.magic_cd(parameter_s)
2357 self.magic_cd(parameter_s)
2358 dir_s.insert(0,os.getcwd().replace(self.home_dir,'~'))
2358 dir_s.insert(0,os.getcwd().replace(self.home_dir,'~'))
2359 self.magic_dirs()
2359 self.magic_dirs()
2360 except:
2360 except:
2361 print 'Invalid directory'
2361 print 'Invalid directory'
2362 else:
2362 else:
2363 print 'You are already there!'
2363 print 'You are already there!'
2364
2364
2365 def magic_popd(self, parameter_s=''):
2365 def magic_popd(self, parameter_s=''):
2366 """Change to directory popped off the top of the stack.
2366 """Change to directory popped off the top of the stack.
2367 """
2367 """
2368 if len (self.shell.dir_stack) > 1:
2368 if len (self.shell.dir_stack) > 1:
2369 self.shell.dir_stack.pop(0)
2369 self.shell.dir_stack.pop(0)
2370 self.magic_cd(self.shell.dir_stack[0])
2370 self.magic_cd(self.shell.dir_stack[0])
2371 print self.shell.dir_stack[0]
2371 print self.shell.dir_stack[0]
2372 else:
2372 else:
2373 print "You can't remove the starting directory from the stack:",\
2373 print "You can't remove the starting directory from the stack:",\
2374 self.shell.dir_stack
2374 self.shell.dir_stack
2375
2375
2376 def magic_dirs(self, parameter_s=''):
2376 def magic_dirs(self, parameter_s=''):
2377 """Return the current directory stack."""
2377 """Return the current directory stack."""
2378
2378
2379 return self.shell.dir_stack[:]
2379 return self.shell.dir_stack[:]
2380
2380
2381 def magic_sc(self, parameter_s=''):
2381 def magic_sc(self, parameter_s=''):
2382 """Shell capture - execute a shell command and capture its output.
2382 """Shell capture - execute a shell command and capture its output.
2383
2383
2384 %sc [options] varname=command
2384 %sc [options] varname=command
2385
2385
2386 IPython will run the given command using commands.getoutput(), and
2386 IPython will run the given command using commands.getoutput(), and
2387 will then update the user's interactive namespace with a variable
2387 will then update the user's interactive namespace with a variable
2388 called varname, containing the value of the call. Your command can
2388 called varname, containing the value of the call. Your command can
2389 contain shell wildcards, pipes, etc.
2389 contain shell wildcards, pipes, etc.
2390
2390
2391 The '=' sign in the syntax is mandatory, and the variable name you
2391 The '=' sign in the syntax is mandatory, and the variable name you
2392 supply must follow Python's standard conventions for valid names.
2392 supply must follow Python's standard conventions for valid names.
2393
2393
2394 Options:
2394 Options:
2395
2395
2396 -l: list output. Split the output on newlines into a list before
2396 -l: list output. Split the output on newlines into a list before
2397 assigning it to the given variable. By default the output is stored
2397 assigning it to the given variable. By default the output is stored
2398 as a single string.
2398 as a single string.
2399
2399
2400 -v: verbose. Print the contents of the variable.
2400 -v: verbose. Print the contents of the variable.
2401
2401
2402 In most cases you should not need to split as a list, because the
2402 In most cases you should not need to split as a list, because the
2403 returned value is a special type of string which can automatically
2403 returned value is a special type of string which can automatically
2404 provide its contents either as a list (split on newlines) or as a
2404 provide its contents either as a list (split on newlines) or as a
2405 space-separated string. These are convenient, respectively, either
2405 space-separated string. These are convenient, respectively, either
2406 for sequential processing or to be passed to a shell command.
2406 for sequential processing or to be passed to a shell command.
2407
2407
2408 For example:
2408 For example:
2409
2409
2410 # Capture into variable a
2410 # Capture into variable a
2411 In [9]: sc a=ls *py
2411 In [9]: sc a=ls *py
2412
2412
2413 # a is a string with embedded newlines
2413 # a is a string with embedded newlines
2414 In [10]: a
2414 In [10]: a
2415 Out[10]: 'setup.py\nwin32_manual_post_install.py'
2415 Out[10]: 'setup.py\nwin32_manual_post_install.py'
2416
2416
2417 # which can be seen as a list:
2417 # which can be seen as a list:
2418 In [11]: a.l
2418 In [11]: a.l
2419 Out[11]: ['setup.py', 'win32_manual_post_install.py']
2419 Out[11]: ['setup.py', 'win32_manual_post_install.py']
2420
2420
2421 # or as a whitespace-separated string:
2421 # or as a whitespace-separated string:
2422 In [12]: a.s
2422 In [12]: a.s
2423 Out[12]: 'setup.py win32_manual_post_install.py'
2423 Out[12]: 'setup.py win32_manual_post_install.py'
2424
2424
2425 # a.s is useful to pass as a single command line:
2425 # a.s is useful to pass as a single command line:
2426 In [13]: !wc -l $a.s
2426 In [13]: !wc -l $a.s
2427 146 setup.py
2427 146 setup.py
2428 130 win32_manual_post_install.py
2428 130 win32_manual_post_install.py
2429 276 total
2429 276 total
2430
2430
2431 # while the list form is useful to loop over:
2431 # while the list form is useful to loop over:
2432 In [14]: for f in a.l:
2432 In [14]: for f in a.l:
2433 ....: !wc -l $f
2433 ....: !wc -l $f
2434 ....:
2434 ....:
2435 146 setup.py
2435 146 setup.py
2436 130 win32_manual_post_install.py
2436 130 win32_manual_post_install.py
2437
2437
2438 Similiarly, the lists returned by the -l option are also special, in
2438 Similiarly, the lists returned by the -l option are also special, in
2439 the sense that you can equally invoke the .s attribute on them to
2439 the sense that you can equally invoke the .s attribute on them to
2440 automatically get a whitespace-separated string from their contents:
2440 automatically get a whitespace-separated string from their contents:
2441
2441
2442 In [1]: sc -l b=ls *py
2442 In [1]: sc -l b=ls *py
2443
2443
2444 In [2]: b
2444 In [2]: b
2445 Out[2]: ['setup.py', 'win32_manual_post_install.py']
2445 Out[2]: ['setup.py', 'win32_manual_post_install.py']
2446
2446
2447 In [3]: b.s
2447 In [3]: b.s
2448 Out[3]: 'setup.py win32_manual_post_install.py'
2448 Out[3]: 'setup.py win32_manual_post_install.py'
2449
2449
2450 In summary, both the lists and strings used for ouptut capture have
2450 In summary, both the lists and strings used for ouptut capture have
2451 the following special attributes:
2451 the following special attributes:
2452
2452
2453 .l (or .list) : value as list.
2453 .l (or .list) : value as list.
2454 .n (or .nlstr): value as newline-separated string.
2454 .n (or .nlstr): value as newline-separated string.
2455 .s (or .spstr): value as space-separated string.
2455 .s (or .spstr): value as space-separated string.
2456 """
2456 """
2457
2457
2458 opts,args = self.parse_options(parameter_s,'lv')
2458 opts,args = self.parse_options(parameter_s,'lv')
2459 # Try to get a variable name and command to run
2459 # Try to get a variable name and command to run
2460 try:
2460 try:
2461 # the variable name must be obtained from the parse_options
2461 # the variable name must be obtained from the parse_options
2462 # output, which uses shlex.split to strip options out.
2462 # output, which uses shlex.split to strip options out.
2463 var,_ = args.split('=',1)
2463 var,_ = args.split('=',1)
2464 var = var.strip()
2464 var = var.strip()
2465 # But the the command has to be extracted from the original input
2465 # But the the command has to be extracted from the original input
2466 # parameter_s, not on what parse_options returns, to avoid the
2466 # parameter_s, not on what parse_options returns, to avoid the
2467 # quote stripping which shlex.split performs on it.
2467 # quote stripping which shlex.split performs on it.
2468 _,cmd = parameter_s.split('=',1)
2468 _,cmd = parameter_s.split('=',1)
2469 except ValueError:
2469 except ValueError:
2470 var,cmd = '',''
2470 var,cmd = '',''
2471 if not var:
2471 if not var:
2472 error('you must specify a variable to assign the command to.')
2472 error('you must specify a variable to assign the command to.')
2473 return
2473 return
2474 # If all looks ok, proceed
2474 # If all looks ok, proceed
2475 out,err = self.shell.getoutputerror(cmd)
2475 out,err = self.shell.getoutputerror(cmd)
2476 if err:
2476 if err:
2477 print >> Term.cerr,err
2477 print >> Term.cerr,err
2478 if opts.has_key('l'):
2478 if opts.has_key('l'):
2479 out = SList(out.split('\n'))
2479 out = SList(out.split('\n'))
2480 else:
2480 else:
2481 out = LSString(out)
2481 out = LSString(out)
2482 if opts.has_key('v'):
2482 if opts.has_key('v'):
2483 print '%s ==\n%s' % (var,pformat(out))
2483 print '%s ==\n%s' % (var,pformat(out))
2484 self.shell.user_ns.update({var:out})
2484 self.shell.user_ns.update({var:out})
2485
2485
2486 def magic_sx(self, parameter_s=''):
2486 def magic_sx(self, parameter_s=''):
2487 """Shell execute - run a shell command and capture its output.
2487 """Shell execute - run a shell command and capture its output.
2488
2488
2489 %sx command
2489 %sx command
2490
2490
2491 IPython will run the given command using commands.getoutput(), and
2491 IPython will run the given command using commands.getoutput(), and
2492 return the result formatted as a list (split on '\\n'). Since the
2492 return the result formatted as a list (split on '\\n'). Since the
2493 output is _returned_, it will be stored in ipython's regular output
2493 output is _returned_, it will be stored in ipython's regular output
2494 cache Out[N] and in the '_N' automatic variables.
2494 cache Out[N] and in the '_N' automatic variables.
2495
2495
2496 Notes:
2496 Notes:
2497
2497
2498 1) If an input line begins with '!!', then %sx is automatically
2498 1) If an input line begins with '!!', then %sx is automatically
2499 invoked. That is, while:
2499 invoked. That is, while:
2500 !ls
2500 !ls
2501 causes ipython to simply issue system('ls'), typing
2501 causes ipython to simply issue system('ls'), typing
2502 !!ls
2502 !!ls
2503 is a shorthand equivalent to:
2503 is a shorthand equivalent to:
2504 %sx ls
2504 %sx ls
2505
2505
2506 2) %sx differs from %sc in that %sx automatically splits into a list,
2506 2) %sx differs from %sc in that %sx automatically splits into a list,
2507 like '%sc -l'. The reason for this is to make it as easy as possible
2507 like '%sc -l'. The reason for this is to make it as easy as possible
2508 to process line-oriented shell output via further python commands.
2508 to process line-oriented shell output via further python commands.
2509 %sc is meant to provide much finer control, but requires more
2509 %sc is meant to provide much finer control, but requires more
2510 typing.
2510 typing.
2511
2511
2512 3) Just like %sc -l, this is a list with special attributes:
2512 3) Just like %sc -l, this is a list with special attributes:
2513
2513
2514 .l (or .list) : value as list.
2514 .l (or .list) : value as list.
2515 .n (or .nlstr): value as newline-separated string.
2515 .n (or .nlstr): value as newline-separated string.
2516 .s (or .spstr): value as whitespace-separated string.
2516 .s (or .spstr): value as whitespace-separated string.
2517
2517
2518 This is very useful when trying to use such lists as arguments to
2518 This is very useful when trying to use such lists as arguments to
2519 system commands."""
2519 system commands."""
2520
2520
2521 if parameter_s:
2521 if parameter_s:
2522 out,err = self.shell.getoutputerror(parameter_s)
2522 out,err = self.shell.getoutputerror(parameter_s)
2523 if err:
2523 if err:
2524 print >> Term.cerr,err
2524 print >> Term.cerr,err
2525 return SList(out.split('\n'))
2525 return SList(out.split('\n'))
2526
2526
2527 def magic_bg(self, parameter_s=''):
2527 def magic_bg(self, parameter_s=''):
2528 """Run a job in the background, in a separate thread.
2528 """Run a job in the background, in a separate thread.
2529
2529
2530 For example,
2530 For example,
2531
2531
2532 %bg myfunc(x,y,z=1)
2532 %bg myfunc(x,y,z=1)
2533
2533
2534 will execute 'myfunc(x,y,z=1)' in a background thread. As soon as the
2534 will execute 'myfunc(x,y,z=1)' in a background thread. As soon as the
2535 execution starts, a message will be printed indicating the job
2535 execution starts, a message will be printed indicating the job
2536 number. If your job number is 5, you can use
2536 number. If your job number is 5, you can use
2537
2537
2538 myvar = jobs.result(5) or myvar = jobs[5].result
2538 myvar = jobs.result(5) or myvar = jobs[5].result
2539
2539
2540 to assign this result to variable 'myvar'.
2540 to assign this result to variable 'myvar'.
2541
2541
2542 IPython has a job manager, accessible via the 'jobs' object. You can
2542 IPython has a job manager, accessible via the 'jobs' object. You can
2543 type jobs? to get more information about it, and use jobs.<TAB> to see
2543 type jobs? to get more information about it, and use jobs.<TAB> to see
2544 its attributes. All attributes not starting with an underscore are
2544 its attributes. All attributes not starting with an underscore are
2545 meant for public use.
2545 meant for public use.
2546
2546
2547 In particular, look at the jobs.new() method, which is used to create
2547 In particular, look at the jobs.new() method, which is used to create
2548 new jobs. This magic %bg function is just a convenience wrapper
2548 new jobs. This magic %bg function is just a convenience wrapper
2549 around jobs.new(), for expression-based jobs. If you want to create a
2549 around jobs.new(), for expression-based jobs. If you want to create a
2550 new job with an explicit function object and arguments, you must call
2550 new job with an explicit function object and arguments, you must call
2551 jobs.new() directly.
2551 jobs.new() directly.
2552
2552
2553 The jobs.new docstring also describes in detail several important
2553 The jobs.new docstring also describes in detail several important
2554 caveats associated with a thread-based model for background job
2554 caveats associated with a thread-based model for background job
2555 execution. Type jobs.new? for details.
2555 execution. Type jobs.new? for details.
2556
2556
2557 You can check the status of all jobs with jobs.status().
2557 You can check the status of all jobs with jobs.status().
2558
2558
2559 The jobs variable is set by IPython into the Python builtin namespace.
2559 The jobs variable is set by IPython into the Python builtin namespace.
2560 If you ever declare a variable named 'jobs', you will shadow this
2560 If you ever declare a variable named 'jobs', you will shadow this
2561 name. You can either delete your global jobs variable to regain
2561 name. You can either delete your global jobs variable to regain
2562 access to the job manager, or make a new name and assign it manually
2562 access to the job manager, or make a new name and assign it manually
2563 to the manager (stored in IPython's namespace). For example, to
2563 to the manager (stored in IPython's namespace). For example, to
2564 assign the job manager to the Jobs name, use:
2564 assign the job manager to the Jobs name, use:
2565
2565
2566 Jobs = __builtins__.jobs"""
2566 Jobs = __builtins__.jobs"""
2567
2567
2568 self.shell.jobs.new(parameter_s,self.shell.user_ns)
2568 self.shell.jobs.new(parameter_s,self.shell.user_ns)
2569
2569
2570 def magic_store(self, parameter_s=''):
2570 def magic_store(self, parameter_s=''):
2571 """Lightweight persistence for python variables.
2571 """Lightweight persistence for python variables.
2572
2572
2573 Example:
2573 Example:
2574
2574
2575 ville@badger[~]|1> A = ['hello',10,'world']\\
2575 ville@badger[~]|1> A = ['hello',10,'world']\\
2576 ville@badger[~]|2> %store A\\
2576 ville@badger[~]|2> %store A\\
2577 ville@badger[~]|3> Exit
2577 ville@badger[~]|3> Exit
2578
2578
2579 (IPython session is closed and started again...)
2579 (IPython session is closed and started again...)
2580
2580
2581 ville@badger:~$ ipython -p pysh\\
2581 ville@badger:~$ ipython -p pysh\\
2582 ville@badger[~]|1> print A
2582 ville@badger[~]|1> print A
2583
2583
2584 ['hello', 10, 'world']
2584 ['hello', 10, 'world']
2585
2585
2586 Usage:
2586 Usage:
2587
2587
2588 %store - Show list of all variables and their current values\\
2588 %store - Show list of all variables and their current values\\
2589 %store <var> - Store the *current* value of the variable to disk\\
2589 %store <var> - Store the *current* value of the variable to disk\\
2590 %store -d <var> - Remove the variable and its value from storage\\
2590 %store -d <var> - Remove the variable and its value from storage\\
2591 %store -r - Remove all variables from storage
2591 %store -r - Remove all variables from storage
2592
2592
2593 It should be noted that if you change the value of a variable, you
2593 It should be noted that if you change the value of a variable, you
2594 need to %store it again if you want to persist the new value.
2594 need to %store it again if you want to persist the new value.
2595
2595
2596 Note also that the variables will need to be pickleable; most basic
2596 Note also that the variables will need to be pickleable; most basic
2597 python types can be safely %stored.
2597 python types can be safely %stored.
2598 """
2598 """
2599
2599
2600 opts,args = self.parse_options(parameter_s,'dr',mode='list')
2600 opts,args = self.parse_options(parameter_s,'dr',mode='list')
2601 # delete
2601 # delete
2602 if opts.has_key('d'):
2602 if opts.has_key('d'):
2603 try:
2603 try:
2604 todel = args[0]
2604 todel = args[0]
2605 except IndexError:
2605 except IndexError:
2606 error('You must provide the variable to forget')
2606 error('You must provide the variable to forget')
2607 else:
2607 else:
2608 try:
2608 try:
2609 del self.shell.persist['S:' + todel]
2609 del self.shell.persist['S:' + todel]
2610 except:
2610 except:
2611 error("Can't delete variable '%s'" % todel)
2611 error("Can't delete variable '%s'" % todel)
2612 # reset
2612 # reset
2613 elif opts.has_key('r'):
2613 elif opts.has_key('r'):
2614 for k in self.shell.persist.keys():
2614 for k in self.shell.persist.keys():
2615 if k.startswith('S:'):
2615 if k.startswith('S:'):
2616 del self.shell.persist[k]
2616 del self.shell.persist[k]
2617
2617
2618 # run without arguments -> list variables & values
2618 # run without arguments -> list variables & values
2619 elif not args:
2619 elif not args:
2620 vars = [v[2:] for v in self.shell.persist.keys()
2620 vars = [v[2:] for v in self.shell.persist.keys()
2621 if v.startswith('S:')]
2621 if v.startswith('S:')]
2622 vars.sort()
2622 vars.sort()
2623 if vars:
2623 if vars:
2624 size = max(map(len,vars))
2624 size = max(map(len,vars))
2625 else:
2625 else:
2626 size = 0
2626 size = 0
2627
2627
2628 print 'Stored variables and their in-memory values:'
2628 print 'Stored variables and their in-memory values:'
2629 fmt = '%-'+str(size)+'s -> %s'
2629 fmt = '%-'+str(size)+'s -> %s'
2630 get = self.shell.user_ns.get
2630 get = self.shell.user_ns.get
2631 for var in vars:
2631 for var in vars:
2632 # print 30 first characters from every var
2632 # print 30 first characters from every var
2633 print fmt % (var,repr(get(var,'<unavailable>'))[:50])
2633 print fmt % (var,repr(get(var,'<unavailable>'))[:50])
2634
2634
2635 # default action - store the variable
2635 # default action - store the variable
2636 else:
2636 else:
2637 pickled = pickle.dumps(self.shell.user_ns[args[0] ])
2637 pickled = pickle.dumps(self.shell.user_ns[args[0] ])
2638 self.shell.persist[ 'S:' + args[0] ] = pickled
2638 self.shell.persist[ 'S:' + args[0] ] = pickled
2639 print "Stored '%s' (%d bytes)" % (args[0], len(pickled))
2639 print "Stored '%s' (%d bytes)" % (args[0], len(pickled))
2640
2640
2641 def magic_bookmark(self, parameter_s=''):
2641 def magic_bookmark(self, parameter_s=''):
2642 """Manage IPython's bookmark system.
2642 """Manage IPython's bookmark system.
2643
2643
2644 %bookmark <name> - set bookmark to current dir
2644 %bookmark <name> - set bookmark to current dir
2645 %bookmark <name> <dir> - set bookmark to <dir>
2645 %bookmark <name> <dir> - set bookmark to <dir>
2646 %bookmark -l - list all bookmarks
2646 %bookmark -l - list all bookmarks
2647 %bookmark -d <name> - remove bookmark
2647 %bookmark -d <name> - remove bookmark
2648 %bookmark -r - remove all bookmarks
2648 %bookmark -r - remove all bookmarks
2649
2649
2650 You can later on access a bookmarked folder with:
2650 You can later on access a bookmarked folder with:
2651 %cd -b <name>
2651 %cd -b <name>
2652 or simply '%cd <name>' if there is no directory called <name> AND
2652 or simply '%cd <name>' if there is no directory called <name> AND
2653 there is such a bookmark defined.
2653 there is such a bookmark defined.
2654
2654
2655 Your bookmarks persist through IPython sessions, but they are
2655 Your bookmarks persist through IPython sessions, but they are
2656 associated with each profile."""
2656 associated with each profile."""
2657
2657
2658 opts,args = self.parse_options(parameter_s,'drl',mode='list')
2658 opts,args = self.parse_options(parameter_s,'drl',mode='list')
2659 if len(args) > 2:
2659 if len(args) > 2:
2660 error('You can only give at most two arguments')
2660 error('You can only give at most two arguments')
2661 return
2661 return
2662
2662
2663 bkms = self.shell.persist.get('bookmarks',{})
2663 bkms = self.shell.persist.get('bookmarks',{})
2664
2664
2665 if opts.has_key('d'):
2665 if opts.has_key('d'):
2666 try:
2666 try:
2667 todel = args[0]
2667 todel = args[0]
2668 except IndexError:
2668 except IndexError:
2669 error('You must provide a bookmark to delete')
2669 error('You must provide a bookmark to delete')
2670 else:
2670 else:
2671 try:
2671 try:
2672 del bkms[todel]
2672 del bkms[todel]
2673 except:
2673 except:
2674 error("Can't delete bookmark '%s'" % todel)
2674 error("Can't delete bookmark '%s'" % todel)
2675 elif opts.has_key('r'):
2675 elif opts.has_key('r'):
2676 bkms = {}
2676 bkms = {}
2677 elif opts.has_key('l'):
2677 elif opts.has_key('l'):
2678 bks = bkms.keys()
2678 bks = bkms.keys()
2679 bks.sort()
2679 bks.sort()
2680 if bks:
2680 if bks:
2681 size = max(map(len,bks))
2681 size = max(map(len,bks))
2682 else:
2682 else:
2683 size = 0
2683 size = 0
2684 fmt = '%-'+str(size)+'s -> %s'
2684 fmt = '%-'+str(size)+'s -> %s'
2685 print 'Current bookmarks:'
2685 print 'Current bookmarks:'
2686 for bk in bks:
2686 for bk in bks:
2687 print fmt % (bk,bkms[bk])
2687 print fmt % (bk,bkms[bk])
2688 else:
2688 else:
2689 if not args:
2689 if not args:
2690 error("You must specify the bookmark name")
2690 error("You must specify the bookmark name")
2691 elif len(args)==1:
2691 elif len(args)==1:
2692 bkms[args[0]] = os.getcwd()
2692 bkms[args[0]] = os.getcwd()
2693 elif len(args)==2:
2693 elif len(args)==2:
2694 bkms[args[0]] = args[1]
2694 bkms[args[0]] = args[1]
2695 self.shell.persist['bookmarks'] = bkms
2695 self.shell.persist['bookmarks'] = bkms
2696
2696
2697 def magic_pycat(self, parameter_s=''):
2697 def magic_pycat(self, parameter_s=''):
2698 """Show a syntax-highlighted file through a pager.
2698 """Show a syntax-highlighted file through a pager.
2699
2699
2700 This magic is similar to the cat utility, but it will assume the file
2700 This magic is similar to the cat utility, but it will assume the file
2701 to be Python source and will show it with syntax highlighting. """
2701 to be Python source and will show it with syntax highlighting. """
2702
2702
2703 filename = get_py_filename(parameter_s)
2703 filename = get_py_filename(parameter_s)
2704 page(self.shell.colorize(file_read(filename)),
2704 page(self.shell.colorize(file_read(filename)),
2705 screen_lines=self.shell.rc.screen_length)
2705 screen_lines=self.shell.rc.screen_length)
2706
2706
2707 # end Magic
2707 # end Magic
@@ -1,4763 +1,4768 b''
1 2006-01-04 Fernando Perez <Fernando.Perez@colorado.edu>
2
3 * IPython/Magic.py (magic_cd): fix crash when cd -b was used.
4 Ville's patch.
5
1 2006-01-03 Fernando Perez <Fernando.Perez@colorado.edu>
6 2006-01-03 Fernando Perez <Fernando.Perez@colorado.edu>
2
7
3 * IPython/iplib.py (handle_auto): changed autocall semantics to
8 * IPython/iplib.py (handle_auto): changed autocall semantics to
4 include 'smart' mode, where the autocall transformation is NOT
9 include 'smart' mode, where the autocall transformation is NOT
5 applied if there are no arguments on the line. This allows you to
10 applied if there are no arguments on the line. This allows you to
6 just type 'foo' if foo is a callable to see its internal form,
11 just type 'foo' if foo is a callable to see its internal form,
7 instead of having it called with no arguments (typically a
12 instead of having it called with no arguments (typically a
8 mistake). The old 'full' autocall still exists: for that, you
13 mistake). The old 'full' autocall still exists: for that, you
9 need to set the 'autocall' parameter to 2 in your ipythonrc file.
14 need to set the 'autocall' parameter to 2 in your ipythonrc file.
10
15
11 * IPython/completer.py (Completer.attr_matches): add
16 * IPython/completer.py (Completer.attr_matches): add
12 tab-completion support for Enthoughts' traits. After a report by
17 tab-completion support for Enthoughts' traits. After a report by
13 Arnd and a patch by Prabhu.
18 Arnd and a patch by Prabhu.
14
19
15 2006-01-02 Fernando Perez <Fernando.Perez@colorado.edu>
20 2006-01-02 Fernando Perez <Fernando.Perez@colorado.edu>
16
21
17 * IPython/ultraTB.py (_fixed_getinnerframes): added Alex
22 * IPython/ultraTB.py (_fixed_getinnerframes): added Alex
18 Schmolck's patch to fix inspect.getinnerframes().
23 Schmolck's patch to fix inspect.getinnerframes().
19
24
20 * IPython/iplib.py (InteractiveShell.__init__): significant fixes
25 * IPython/iplib.py (InteractiveShell.__init__): significant fixes
21 for embedded instances, regarding handling of namespaces and items
26 for embedded instances, regarding handling of namespaces and items
22 added to the __builtin__ one. Multiple embedded instances and
27 added to the __builtin__ one. Multiple embedded instances and
23 recursive embeddings should work better now (though I'm not sure
28 recursive embeddings should work better now (though I'm not sure
24 I've got all the corner cases fixed, that code is a bit of a brain
29 I've got all the corner cases fixed, that code is a bit of a brain
25 twister).
30 twister).
26
31
27 * IPython/Magic.py (magic_edit): added support to edit in-memory
32 * IPython/Magic.py (magic_edit): added support to edit in-memory
28 macros (automatically creates the necessary temp files). %edit
33 macros (automatically creates the necessary temp files). %edit
29 also doesn't return the file contents anymore, it's just noise.
34 also doesn't return the file contents anymore, it's just noise.
30
35
31 * IPython/completer.py (Completer.attr_matches): revert change to
36 * IPython/completer.py (Completer.attr_matches): revert change to
32 complete only on attributes listed in __all__. I realized it
37 complete only on attributes listed in __all__. I realized it
33 cripples the tab-completion system as a tool for exploring the
38 cripples the tab-completion system as a tool for exploring the
34 internals of unknown libraries (it renders any non-__all__
39 internals of unknown libraries (it renders any non-__all__
35 attribute off-limits). I got bit by this when trying to see
40 attribute off-limits). I got bit by this when trying to see
36 something inside the dis module.
41 something inside the dis module.
37
42
38 2005-12-31 Fernando Perez <Fernando.Perez@colorado.edu>
43 2005-12-31 Fernando Perez <Fernando.Perez@colorado.edu>
39
44
40 * IPython/iplib.py (InteractiveShell.__init__): add .meta
45 * IPython/iplib.py (InteractiveShell.__init__): add .meta
41 namespace for users and extension writers to hold data in. This
46 namespace for users and extension writers to hold data in. This
42 follows the discussion in
47 follows the discussion in
43 http://projects.scipy.org/ipython/ipython/wiki/RefactoringIPython.
48 http://projects.scipy.org/ipython/ipython/wiki/RefactoringIPython.
44
49
45 * IPython/completer.py (IPCompleter.complete): small patch to help
50 * IPython/completer.py (IPCompleter.complete): small patch to help
46 tab-completion under Emacs, after a suggestion by John Barnard
51 tab-completion under Emacs, after a suggestion by John Barnard
47 <barnarj-AT-ccf.org>.
52 <barnarj-AT-ccf.org>.
48
53
49 * IPython/Magic.py (Magic.extract_input_slices): added support for
54 * IPython/Magic.py (Magic.extract_input_slices): added support for
50 the slice notation in magics to use N-M to represent numbers N...M
55 the slice notation in magics to use N-M to represent numbers N...M
51 (closed endpoints). This is used by %macro and %save.
56 (closed endpoints). This is used by %macro and %save.
52
57
53 * IPython/completer.py (Completer.attr_matches): for modules which
58 * IPython/completer.py (Completer.attr_matches): for modules which
54 define __all__, complete only on those. After a patch by Jeffrey
59 define __all__, complete only on those. After a patch by Jeffrey
55 Collins <jcollins_boulder-AT-earthlink.net>. Also, clean up and
60 Collins <jcollins_boulder-AT-earthlink.net>. Also, clean up and
56 speed up this routine.
61 speed up this routine.
57
62
58 * IPython/Logger.py (Logger.log): fix a history handling bug. I
63 * IPython/Logger.py (Logger.log): fix a history handling bug. I
59 don't know if this is the end of it, but the behavior now is
64 don't know if this is the end of it, but the behavior now is
60 certainly much more correct. Note that coupled with macros,
65 certainly much more correct. Note that coupled with macros,
61 slightly surprising (at first) behavior may occur: a macro will in
66 slightly surprising (at first) behavior may occur: a macro will in
62 general expand to multiple lines of input, so upon exiting, the
67 general expand to multiple lines of input, so upon exiting, the
63 in/out counters will both be bumped by the corresponding amount
68 in/out counters will both be bumped by the corresponding amount
64 (as if the macro's contents had been typed interactively). Typing
69 (as if the macro's contents had been typed interactively). Typing
65 %hist will reveal the intermediate (silently processed) lines.
70 %hist will reveal the intermediate (silently processed) lines.
66
71
67 * IPython/Magic.py (magic_run): fix a subtle bug which could cause
72 * IPython/Magic.py (magic_run): fix a subtle bug which could cause
68 pickle to fail (%run was overwriting __main__ and not restoring
73 pickle to fail (%run was overwriting __main__ and not restoring
69 it, but pickle relies on __main__ to operate).
74 it, but pickle relies on __main__ to operate).
70
75
71 * IPython/iplib.py (InteractiveShell): fix pdb calling: I'm now
76 * IPython/iplib.py (InteractiveShell): fix pdb calling: I'm now
72 using properties, but forgot to make the main InteractiveShell
77 using properties, but forgot to make the main InteractiveShell
73 class a new-style class. Properties fail silently, and
78 class a new-style class. Properties fail silently, and
74 misteriously, with old-style class (getters work, but
79 misteriously, with old-style class (getters work, but
75 setters don't do anything).
80 setters don't do anything).
76
81
77 2005-12-30 Fernando Perez <Fernando.Perez@colorado.edu>
82 2005-12-30 Fernando Perez <Fernando.Perez@colorado.edu>
78
83
79 * IPython/Magic.py (magic_history): fix history reporting bug (I
84 * IPython/Magic.py (magic_history): fix history reporting bug (I
80 know some nasties are still there, I just can't seem to find a
85 know some nasties are still there, I just can't seem to find a
81 reproducible test case to track them down; the input history is
86 reproducible test case to track them down; the input history is
82 falling out of sync...)
87 falling out of sync...)
83
88
84 * IPython/iplib.py (handle_shell_escape): fix bug where both
89 * IPython/iplib.py (handle_shell_escape): fix bug where both
85 aliases and system accesses where broken for indented code (such
90 aliases and system accesses where broken for indented code (such
86 as loops).
91 as loops).
87
92
88 * IPython/genutils.py (shell): fix small but critical bug for
93 * IPython/genutils.py (shell): fix small but critical bug for
89 win32 system access.
94 win32 system access.
90
95
91 2005-12-29 Fernando Perez <Fernando.Perez@colorado.edu>
96 2005-12-29 Fernando Perez <Fernando.Perez@colorado.edu>
92
97
93 * IPython/iplib.py (showtraceback): remove use of the
98 * IPython/iplib.py (showtraceback): remove use of the
94 sys.last_{type/value/traceback} structures, which are non
99 sys.last_{type/value/traceback} structures, which are non
95 thread-safe.
100 thread-safe.
96 (_prefilter): change control flow to ensure that we NEVER
101 (_prefilter): change control flow to ensure that we NEVER
97 introspect objects when autocall is off. This will guarantee that
102 introspect objects when autocall is off. This will guarantee that
98 having an input line of the form 'x.y', where access to attribute
103 having an input line of the form 'x.y', where access to attribute
99 'y' has side effects, doesn't trigger the side effect TWICE. It
104 'y' has side effects, doesn't trigger the side effect TWICE. It
100 is important to note that, with autocall on, these side effects
105 is important to note that, with autocall on, these side effects
101 can still happen.
106 can still happen.
102 (ipsystem): new builtin, to complete the ip{magic/alias/system}
107 (ipsystem): new builtin, to complete the ip{magic/alias/system}
103 trio. IPython offers these three kinds of special calls which are
108 trio. IPython offers these three kinds of special calls which are
104 not python code, and it's a good thing to have their call method
109 not python code, and it's a good thing to have their call method
105 be accessible as pure python functions (not just special syntax at
110 be accessible as pure python functions (not just special syntax at
106 the command line). It gives us a better internal implementation
111 the command line). It gives us a better internal implementation
107 structure, as well as exposing these for user scripting more
112 structure, as well as exposing these for user scripting more
108 cleanly.
113 cleanly.
109
114
110 * IPython/macro.py (Macro.__init__): moved macros to a standalone
115 * IPython/macro.py (Macro.__init__): moved macros to a standalone
111 file. Now that they'll be more likely to be used with the
116 file. Now that they'll be more likely to be used with the
112 persistance system (%store), I want to make sure their module path
117 persistance system (%store), I want to make sure their module path
113 doesn't change in the future, so that we don't break things for
118 doesn't change in the future, so that we don't break things for
114 users' persisted data.
119 users' persisted data.
115
120
116 * IPython/iplib.py (autoindent_update): move indentation
121 * IPython/iplib.py (autoindent_update): move indentation
117 management into the _text_ processing loop, not the keyboard
122 management into the _text_ processing loop, not the keyboard
118 interactive one. This is necessary to correctly process non-typed
123 interactive one. This is necessary to correctly process non-typed
119 multiline input (such as macros).
124 multiline input (such as macros).
120
125
121 * IPython/Magic.py (Magic.format_latex): patch by Stefan van der
126 * IPython/Magic.py (Magic.format_latex): patch by Stefan van der
122 Walt <stefan-AT-sun.ac.za> to fix latex formatting of docstrings,
127 Walt <stefan-AT-sun.ac.za> to fix latex formatting of docstrings,
123 which was producing problems in the resulting manual.
128 which was producing problems in the resulting manual.
124 (magic_whos): improve reporting of instances (show their class,
129 (magic_whos): improve reporting of instances (show their class,
125 instead of simply printing 'instance' which isn't terribly
130 instead of simply printing 'instance' which isn't terribly
126 informative).
131 informative).
127
132
128 * IPython/genutils.py (shell): commit Jorgen Stenarson's patch
133 * IPython/genutils.py (shell): commit Jorgen Stenarson's patch
129 (minor mods) to support network shares under win32.
134 (minor mods) to support network shares under win32.
130
135
131 * IPython/winconsole.py (get_console_size): add new winconsole
136 * IPython/winconsole.py (get_console_size): add new winconsole
132 module and fixes to page_dumb() to improve its behavior under
137 module and fixes to page_dumb() to improve its behavior under
133 win32. Contributed by Alexander Belchenko <bialix-AT-ukr.net>.
138 win32. Contributed by Alexander Belchenko <bialix-AT-ukr.net>.
134
139
135 * IPython/Magic.py (Macro): simplified Macro class to just
140 * IPython/Magic.py (Macro): simplified Macro class to just
136 subclass list. We've had only 2.2 compatibility for a very long
141 subclass list. We've had only 2.2 compatibility for a very long
137 time, yet I was still avoiding subclassing the builtin types. No
142 time, yet I was still avoiding subclassing the builtin types. No
138 more (I'm also starting to use properties, though I won't shift to
143 more (I'm also starting to use properties, though I won't shift to
139 2.3-specific features quite yet).
144 2.3-specific features quite yet).
140 (magic_store): added Ville's patch for lightweight variable
145 (magic_store): added Ville's patch for lightweight variable
141 persistence, after a request on the user list by Matt Wilkie
146 persistence, after a request on the user list by Matt Wilkie
142 <maphew-AT-gmail.com>. The new %store magic's docstring has full
147 <maphew-AT-gmail.com>. The new %store magic's docstring has full
143 details.
148 details.
144
149
145 * IPython/iplib.py (InteractiveShell.post_config_initialization):
150 * IPython/iplib.py (InteractiveShell.post_config_initialization):
146 changed the default logfile name from 'ipython.log' to
151 changed the default logfile name from 'ipython.log' to
147 'ipython_log.py'. These logs are real python files, and now that
152 'ipython_log.py'. These logs are real python files, and now that
148 we have much better multiline support, people are more likely to
153 we have much better multiline support, people are more likely to
149 want to use them as such. Might as well name them correctly.
154 want to use them as such. Might as well name them correctly.
150
155
151 * IPython/Magic.py: substantial cleanup. While we can't stop
156 * IPython/Magic.py: substantial cleanup. While we can't stop
152 using magics as mixins, due to the existing customizations 'out
157 using magics as mixins, due to the existing customizations 'out
153 there' which rely on the mixin naming conventions, at least I
158 there' which rely on the mixin naming conventions, at least I
154 cleaned out all cross-class name usage. So once we are OK with
159 cleaned out all cross-class name usage. So once we are OK with
155 breaking compatibility, the two systems can be separated.
160 breaking compatibility, the two systems can be separated.
156
161
157 * IPython/Logger.py: major cleanup. This one is NOT a mixin
162 * IPython/Logger.py: major cleanup. This one is NOT a mixin
158 anymore, and the class is a fair bit less hideous as well. New
163 anymore, and the class is a fair bit less hideous as well. New
159 features were also introduced: timestamping of input, and logging
164 features were also introduced: timestamping of input, and logging
160 of output results. These are user-visible with the -t and -o
165 of output results. These are user-visible with the -t and -o
161 options to %logstart. Closes
166 options to %logstart. Closes
162 http://www.scipy.net/roundup/ipython/issue11 and a request by
167 http://www.scipy.net/roundup/ipython/issue11 and a request by
163 William Stein (SAGE developer - http://modular.ucsd.edu/sage).
168 William Stein (SAGE developer - http://modular.ucsd.edu/sage).
164
169
165 2005-12-28 Fernando Perez <Fernando.Perez@colorado.edu>
170 2005-12-28 Fernando Perez <Fernando.Perez@colorado.edu>
166
171
167 * IPython/iplib.py (handle_shell_escape): add Ville's patch to
172 * IPython/iplib.py (handle_shell_escape): add Ville's patch to
168 better hadnle backslashes in paths. See the thread 'More Windows
173 better hadnle backslashes in paths. See the thread 'More Windows
169 questions part 2 - \/ characters revisited' on the iypthon user
174 questions part 2 - \/ characters revisited' on the iypthon user
170 list:
175 list:
171 http://scipy.net/pipermail/ipython-user/2005-June/000907.html
176 http://scipy.net/pipermail/ipython-user/2005-June/000907.html
172
177
173 (InteractiveShell.__init__): fix tab-completion bug in threaded shells.
178 (InteractiveShell.__init__): fix tab-completion bug in threaded shells.
174
179
175 (InteractiveShell.__init__): change threaded shells to not use the
180 (InteractiveShell.__init__): change threaded shells to not use the
176 ipython crash handler. This was causing more problems than not,
181 ipython crash handler. This was causing more problems than not,
177 as exceptions in the main thread (GUI code, typically) would
182 as exceptions in the main thread (GUI code, typically) would
178 always show up as a 'crash', when they really weren't.
183 always show up as a 'crash', when they really weren't.
179
184
180 The colors and exception mode commands (%colors/%xmode) have been
185 The colors and exception mode commands (%colors/%xmode) have been
181 synchronized to also take this into account, so users can get
186 synchronized to also take this into account, so users can get
182 verbose exceptions for their threaded code as well. I also added
187 verbose exceptions for their threaded code as well. I also added
183 support for activating pdb inside this exception handler as well,
188 support for activating pdb inside this exception handler as well,
184 so now GUI authors can use IPython's enhanced pdb at runtime.
189 so now GUI authors can use IPython's enhanced pdb at runtime.
185
190
186 * IPython/ipmaker.py (make_IPython): make the autoedit_syntax flag
191 * IPython/ipmaker.py (make_IPython): make the autoedit_syntax flag
187 true by default, and add it to the shipped ipythonrc file. Since
192 true by default, and add it to the shipped ipythonrc file. Since
188 this asks the user before proceeding, I think it's OK to make it
193 this asks the user before proceeding, I think it's OK to make it
189 true by default.
194 true by default.
190
195
191 * IPython/Magic.py (magic_exit): make new exit/quit magics instead
196 * IPython/Magic.py (magic_exit): make new exit/quit magics instead
192 of the previous special-casing of input in the eval loop. I think
197 of the previous special-casing of input in the eval loop. I think
193 this is cleaner, as they really are commands and shouldn't have
198 this is cleaner, as they really are commands and shouldn't have
194 a special role in the middle of the core code.
199 a special role in the middle of the core code.
195
200
196 2005-12-27 Fernando Perez <Fernando.Perez@colorado.edu>
201 2005-12-27 Fernando Perez <Fernando.Perez@colorado.edu>
197
202
198 * IPython/iplib.py (edit_syntax_error): added support for
203 * IPython/iplib.py (edit_syntax_error): added support for
199 automatically reopening the editor if the file had a syntax error
204 automatically reopening the editor if the file had a syntax error
200 in it. Thanks to scottt who provided the patch at:
205 in it. Thanks to scottt who provided the patch at:
201 http://www.scipy.net/roundup/ipython/issue36 (slightly modified
206 http://www.scipy.net/roundup/ipython/issue36 (slightly modified
202 version committed).
207 version committed).
203
208
204 * IPython/iplib.py (handle_normal): add suport for multi-line
209 * IPython/iplib.py (handle_normal): add suport for multi-line
205 input with emtpy lines. This fixes
210 input with emtpy lines. This fixes
206 http://www.scipy.net/roundup/ipython/issue43 and a similar
211 http://www.scipy.net/roundup/ipython/issue43 and a similar
207 discussion on the user list.
212 discussion on the user list.
208
213
209 WARNING: a behavior change is necessarily introduced to support
214 WARNING: a behavior change is necessarily introduced to support
210 blank lines: now a single blank line with whitespace does NOT
215 blank lines: now a single blank line with whitespace does NOT
211 break the input loop, which means that when autoindent is on, by
216 break the input loop, which means that when autoindent is on, by
212 default hitting return on the next (indented) line does NOT exit.
217 default hitting return on the next (indented) line does NOT exit.
213
218
214 Instead, to exit a multiline input you can either have:
219 Instead, to exit a multiline input you can either have:
215
220
216 - TWO whitespace lines (just hit return again), or
221 - TWO whitespace lines (just hit return again), or
217 - a single whitespace line of a different length than provided
222 - a single whitespace line of a different length than provided
218 by the autoindent (add or remove a space).
223 by the autoindent (add or remove a space).
219
224
220 * IPython/completer.py (MagicCompleter.__init__): new 'completer'
225 * IPython/completer.py (MagicCompleter.__init__): new 'completer'
221 module to better organize all readline-related functionality.
226 module to better organize all readline-related functionality.
222 I've deleted FlexCompleter and put all completion clases here.
227 I've deleted FlexCompleter and put all completion clases here.
223
228
224 * IPython/iplib.py (raw_input): improve indentation management.
229 * IPython/iplib.py (raw_input): improve indentation management.
225 It is now possible to paste indented code with autoindent on, and
230 It is now possible to paste indented code with autoindent on, and
226 the code is interpreted correctly (though it still looks bad on
231 the code is interpreted correctly (though it still looks bad on
227 screen, due to the line-oriented nature of ipython).
232 screen, due to the line-oriented nature of ipython).
228 (MagicCompleter.complete): change behavior so that a TAB key on an
233 (MagicCompleter.complete): change behavior so that a TAB key on an
229 otherwise empty line actually inserts a tab, instead of completing
234 otherwise empty line actually inserts a tab, instead of completing
230 on the entire global namespace. This makes it easier to use the
235 on the entire global namespace. This makes it easier to use the
231 TAB key for indentation. After a request by Hans Meine
236 TAB key for indentation. After a request by Hans Meine
232 <hans_meine-AT-gmx.net>
237 <hans_meine-AT-gmx.net>
233 (_prefilter): add support so that typing plain 'exit' or 'quit'
238 (_prefilter): add support so that typing plain 'exit' or 'quit'
234 does a sensible thing. Originally I tried to deviate as little as
239 does a sensible thing. Originally I tried to deviate as little as
235 possible from the default python behavior, but even that one may
240 possible from the default python behavior, but even that one may
236 change in this direction (thread on python-dev to that effect).
241 change in this direction (thread on python-dev to that effect).
237 Regardless, ipython should do the right thing even if CPython's
242 Regardless, ipython should do the right thing even if CPython's
238 '>>>' prompt doesn't.
243 '>>>' prompt doesn't.
239 (InteractiveShell): removed subclassing code.InteractiveConsole
244 (InteractiveShell): removed subclassing code.InteractiveConsole
240 class. By now we'd overridden just about all of its methods: I've
245 class. By now we'd overridden just about all of its methods: I've
241 copied the remaining two over, and now ipython is a standalone
246 copied the remaining two over, and now ipython is a standalone
242 class. This will provide a clearer picture for the chainsaw
247 class. This will provide a clearer picture for the chainsaw
243 branch refactoring.
248 branch refactoring.
244
249
245 2005-12-26 Fernando Perez <Fernando.Perez@colorado.edu>
250 2005-12-26 Fernando Perez <Fernando.Perez@colorado.edu>
246
251
247 * IPython/ultraTB.py (VerboseTB.text): harden reporting against
252 * IPython/ultraTB.py (VerboseTB.text): harden reporting against
248 failures for objects which break when dir() is called on them.
253 failures for objects which break when dir() is called on them.
249
254
250 * IPython/FlexCompleter.py (Completer.__init__): Added support for
255 * IPython/FlexCompleter.py (Completer.__init__): Added support for
251 distinct local and global namespaces in the completer API. This
256 distinct local and global namespaces in the completer API. This
252 change allows us top properly handle completion with distinct
257 change allows us top properly handle completion with distinct
253 scopes, including in embedded instances (this had never really
258 scopes, including in embedded instances (this had never really
254 worked correctly).
259 worked correctly).
255
260
256 Note: this introduces a change in the constructor for
261 Note: this introduces a change in the constructor for
257 MagicCompleter, as a new global_namespace parameter is now the
262 MagicCompleter, as a new global_namespace parameter is now the
258 second argument (the others were bumped one position).
263 second argument (the others were bumped one position).
259
264
260 2005-12-25 Fernando Perez <Fernando.Perez@colorado.edu>
265 2005-12-25 Fernando Perez <Fernando.Perez@colorado.edu>
261
266
262 * IPython/iplib.py (embed_mainloop): fix tab-completion in
267 * IPython/iplib.py (embed_mainloop): fix tab-completion in
263 embedded instances (which can be done now thanks to Vivian's
268 embedded instances (which can be done now thanks to Vivian's
264 frame-handling fixes for pdb).
269 frame-handling fixes for pdb).
265 (InteractiveShell.__init__): Fix namespace handling problem in
270 (InteractiveShell.__init__): Fix namespace handling problem in
266 embedded instances. We were overwriting __main__ unconditionally,
271 embedded instances. We were overwriting __main__ unconditionally,
267 and this should only be done for 'full' (non-embedded) IPython;
272 and this should only be done for 'full' (non-embedded) IPython;
268 embedded instances must respect the caller's __main__. Thanks to
273 embedded instances must respect the caller's __main__. Thanks to
269 a bug report by Yaroslav Bulatov <yaroslavvb-AT-gmail.com>
274 a bug report by Yaroslav Bulatov <yaroslavvb-AT-gmail.com>
270
275
271 2005-12-24 Fernando Perez <Fernando.Perez@colorado.edu>
276 2005-12-24 Fernando Perez <Fernando.Perez@colorado.edu>
272
277
273 * setup.py: added download_url to setup(). This registers the
278 * setup.py: added download_url to setup(). This registers the
274 download address at PyPI, which is not only useful to humans
279 download address at PyPI, which is not only useful to humans
275 browsing the site, but is also picked up by setuptools (the Eggs
280 browsing the site, but is also picked up by setuptools (the Eggs
276 machinery). Thanks to Ville and R. Kern for the info/discussion
281 machinery). Thanks to Ville and R. Kern for the info/discussion
277 on this.
282 on this.
278
283
279 2005-12-23 Fernando Perez <Fernando.Perez@colorado.edu>
284 2005-12-23 Fernando Perez <Fernando.Perez@colorado.edu>
280
285
281 * IPython/Debugger.py (Pdb.__init__): Major pdb mode enhancements.
286 * IPython/Debugger.py (Pdb.__init__): Major pdb mode enhancements.
282 This brings a lot of nice functionality to the pdb mode, which now
287 This brings a lot of nice functionality to the pdb mode, which now
283 has tab-completion, syntax highlighting, and better stack handling
288 has tab-completion, syntax highlighting, and better stack handling
284 than before. Many thanks to Vivian De Smedt
289 than before. Many thanks to Vivian De Smedt
285 <vivian-AT-vdesmedt.com> for the original patches.
290 <vivian-AT-vdesmedt.com> for the original patches.
286
291
287 2005-12-08 Fernando Perez <Fernando.Perez@colorado.edu>
292 2005-12-08 Fernando Perez <Fernando.Perez@colorado.edu>
288
293
289 * IPython/Shell.py (IPShellGTK.mainloop): fix mainloop() calling
294 * IPython/Shell.py (IPShellGTK.mainloop): fix mainloop() calling
290 sequence to consistently accept the banner argument. The
295 sequence to consistently accept the banner argument. The
291 inconsistency was tripping SAGE, thanks to Gary Zablackis
296 inconsistency was tripping SAGE, thanks to Gary Zablackis
292 <gzabl-AT-yahoo.com> for the report.
297 <gzabl-AT-yahoo.com> for the report.
293
298
294 2005-11-15 Fernando Perez <Fernando.Perez@colorado.edu>
299 2005-11-15 Fernando Perez <Fernando.Perez@colorado.edu>
295
300
296 * IPython/iplib.py (InteractiveShell.post_config_initialization):
301 * IPython/iplib.py (InteractiveShell.post_config_initialization):
297 Fix bug where a naked 'alias' call in the ipythonrc file would
302 Fix bug where a naked 'alias' call in the ipythonrc file would
298 cause a crash. Bug reported by Jorgen Stenarson.
303 cause a crash. Bug reported by Jorgen Stenarson.
299
304
300 2005-11-15 Fernando Perez <Fernando.Perez@colorado.edu>
305 2005-11-15 Fernando Perez <Fernando.Perez@colorado.edu>
301
306
302 * IPython/ipmaker.py (make_IPython): cleanups which should improve
307 * IPython/ipmaker.py (make_IPython): cleanups which should improve
303 startup time.
308 startup time.
304
309
305 * IPython/iplib.py (runcode): my globals 'fix' for embedded
310 * IPython/iplib.py (runcode): my globals 'fix' for embedded
306 instances had introduced a bug with globals in normal code. Now
311 instances had introduced a bug with globals in normal code. Now
307 it's working in all cases.
312 it's working in all cases.
308
313
309 * IPython/Magic.py (magic_psearch): Finish wildcard cleanup and
314 * IPython/Magic.py (magic_psearch): Finish wildcard cleanup and
310 API changes. A new ipytonrc option, 'wildcards_case_sensitive'
315 API changes. A new ipytonrc option, 'wildcards_case_sensitive'
311 has been introduced to set the default case sensitivity of the
316 has been introduced to set the default case sensitivity of the
312 searches. Users can still select either mode at runtime on a
317 searches. Users can still select either mode at runtime on a
313 per-search basis.
318 per-search basis.
314
319
315 2005-11-13 Fernando Perez <Fernando.Perez@colorado.edu>
320 2005-11-13 Fernando Perez <Fernando.Perez@colorado.edu>
316
321
317 * IPython/wildcard.py (NameSpace.__init__): fix resolution of
322 * IPython/wildcard.py (NameSpace.__init__): fix resolution of
318 attributes in wildcard searches for subclasses. Modified version
323 attributes in wildcard searches for subclasses. Modified version
319 of a patch by Jorgen.
324 of a patch by Jorgen.
320
325
321 2005-11-12 Fernando Perez <Fernando.Perez@colorado.edu>
326 2005-11-12 Fernando Perez <Fernando.Perez@colorado.edu>
322
327
323 * IPython/iplib.py (embed_mainloop): Fix handling of globals for
328 * IPython/iplib.py (embed_mainloop): Fix handling of globals for
324 embedded instances. I added a user_global_ns attribute to the
329 embedded instances. I added a user_global_ns attribute to the
325 InteractiveShell class to handle this.
330 InteractiveShell class to handle this.
326
331
327 2005-10-31 Fernando Perez <Fernando.Perez@colorado.edu>
332 2005-10-31 Fernando Perez <Fernando.Perez@colorado.edu>
328
333
329 * IPython/Shell.py (IPShellGTK.mainloop): Change timeout_add to
334 * IPython/Shell.py (IPShellGTK.mainloop): Change timeout_add to
330 idle_add, which fixes horrible keyboard lag problems under gtk 2.6
335 idle_add, which fixes horrible keyboard lag problems under gtk 2.6
331 (reported under win32, but may happen also in other platforms).
336 (reported under win32, but may happen also in other platforms).
332 Bug report and fix courtesy of Sean Moore <smm-AT-logic.bm>
337 Bug report and fix courtesy of Sean Moore <smm-AT-logic.bm>
333
338
334 2005-10-15 Fernando Perez <Fernando.Perez@colorado.edu>
339 2005-10-15 Fernando Perez <Fernando.Perez@colorado.edu>
335
340
336 * IPython/Magic.py (magic_psearch): new support for wildcard
341 * IPython/Magic.py (magic_psearch): new support for wildcard
337 patterns. Now, typing ?a*b will list all names which begin with a
342 patterns. Now, typing ?a*b will list all names which begin with a
338 and end in b, for example. The %psearch magic has full
343 and end in b, for example. The %psearch magic has full
339 docstrings. Many thanks to JΓΆrgen Stenarson
344 docstrings. Many thanks to JΓΆrgen Stenarson
340 <jorgen.stenarson-AT-bostream.nu>, author of the patches
345 <jorgen.stenarson-AT-bostream.nu>, author of the patches
341 implementing this functionality.
346 implementing this functionality.
342
347
343 2005-09-27 Fernando Perez <Fernando.Perez@colorado.edu>
348 2005-09-27 Fernando Perez <Fernando.Perez@colorado.edu>
344
349
345 * Manual: fixed long-standing annoyance of double-dashes (as in
350 * Manual: fixed long-standing annoyance of double-dashes (as in
346 --prefix=~, for example) being stripped in the HTML version. This
351 --prefix=~, for example) being stripped in the HTML version. This
347 is a latex2html bug, but a workaround was provided. Many thanks
352 is a latex2html bug, but a workaround was provided. Many thanks
348 to George K. Thiruvathukal <gthiruv-AT-luc.edu> for the detailed
353 to George K. Thiruvathukal <gthiruv-AT-luc.edu> for the detailed
349 help, and Michael Tobis <mtobis-AT-gmail.com> for getting the ball
354 help, and Michael Tobis <mtobis-AT-gmail.com> for getting the ball
350 rolling. This seemingly small issue had tripped a number of users
355 rolling. This seemingly small issue had tripped a number of users
351 when first installing, so I'm glad to see it gone.
356 when first installing, so I'm glad to see it gone.
352
357
353 2005-09-27 Fernando Perez <Fernando.Perez@colorado.edu>
358 2005-09-27 Fernando Perez <Fernando.Perez@colorado.edu>
354
359
355 * IPython/Extensions/numeric_formats.py: fix missing import,
360 * IPython/Extensions/numeric_formats.py: fix missing import,
356 reported by Stephen Walton.
361 reported by Stephen Walton.
357
362
358 2005-09-24 Fernando Perez <Fernando.Perez@colorado.edu>
363 2005-09-24 Fernando Perez <Fernando.Perez@colorado.edu>
359
364
360 * IPython/demo.py: finish demo module, fully documented now.
365 * IPython/demo.py: finish demo module, fully documented now.
361
366
362 * IPython/genutils.py (file_read): simple little utility to read a
367 * IPython/genutils.py (file_read): simple little utility to read a
363 file and ensure it's closed afterwards.
368 file and ensure it's closed afterwards.
364
369
365 2005-09-23 Fernando Perez <Fernando.Perez@colorado.edu>
370 2005-09-23 Fernando Perez <Fernando.Perez@colorado.edu>
366
371
367 * IPython/demo.py (Demo.__init__): added support for individually
372 * IPython/demo.py (Demo.__init__): added support for individually
368 tagging blocks for automatic execution.
373 tagging blocks for automatic execution.
369
374
370 * IPython/Magic.py (magic_pycat): new %pycat magic for showing
375 * IPython/Magic.py (magic_pycat): new %pycat magic for showing
371 syntax-highlighted python sources, requested by John.
376 syntax-highlighted python sources, requested by John.
372
377
373 2005-09-22 Fernando Perez <Fernando.Perez@colorado.edu>
378 2005-09-22 Fernando Perez <Fernando.Perez@colorado.edu>
374
379
375 * IPython/demo.py (Demo.again): fix bug where again() blocks after
380 * IPython/demo.py (Demo.again): fix bug where again() blocks after
376 finishing.
381 finishing.
377
382
378 * IPython/genutils.py (shlex_split): moved from Magic to here,
383 * IPython/genutils.py (shlex_split): moved from Magic to here,
379 where all 2.2 compatibility stuff lives. I needed it for demo.py.
384 where all 2.2 compatibility stuff lives. I needed it for demo.py.
380
385
381 * IPython/demo.py (Demo.__init__): added support for silent
386 * IPython/demo.py (Demo.__init__): added support for silent
382 blocks, improved marks as regexps, docstrings written.
387 blocks, improved marks as regexps, docstrings written.
383 (Demo.__init__): better docstring, added support for sys.argv.
388 (Demo.__init__): better docstring, added support for sys.argv.
384
389
385 * IPython/genutils.py (marquee): little utility used by the demo
390 * IPython/genutils.py (marquee): little utility used by the demo
386 code, handy in general.
391 code, handy in general.
387
392
388 * IPython/demo.py (Demo.__init__): new class for interactive
393 * IPython/demo.py (Demo.__init__): new class for interactive
389 demos. Not documented yet, I just wrote it in a hurry for
394 demos. Not documented yet, I just wrote it in a hurry for
390 scipy'05. Will docstring later.
395 scipy'05. Will docstring later.
391
396
392 2005-09-20 Fernando Perez <Fernando.Perez@colorado.edu>
397 2005-09-20 Fernando Perez <Fernando.Perez@colorado.edu>
393
398
394 * IPython/Shell.py (sigint_handler): Drastic simplification which
399 * IPython/Shell.py (sigint_handler): Drastic simplification which
395 also seems to make Ctrl-C work correctly across threads! This is
400 also seems to make Ctrl-C work correctly across threads! This is
396 so simple, that I can't beleive I'd missed it before. Needs more
401 so simple, that I can't beleive I'd missed it before. Needs more
397 testing, though.
402 testing, though.
398 (KBINT): Never mind, revert changes. I'm sure I'd tried something
403 (KBINT): Never mind, revert changes. I'm sure I'd tried something
399 like this before...
404 like this before...
400
405
401 * IPython/genutils.py (get_home_dir): add protection against
406 * IPython/genutils.py (get_home_dir): add protection against
402 non-dirs in win32 registry.
407 non-dirs in win32 registry.
403
408
404 * IPython/iplib.py (InteractiveShell.alias_table_validate): fix
409 * IPython/iplib.py (InteractiveShell.alias_table_validate): fix
405 bug where dict was mutated while iterating (pysh crash).
410 bug where dict was mutated while iterating (pysh crash).
406
411
407 2005-09-06 Fernando Perez <Fernando.Perez@colorado.edu>
412 2005-09-06 Fernando Perez <Fernando.Perez@colorado.edu>
408
413
409 * IPython/iplib.py (handle_auto): Fix inconsistency arising from
414 * IPython/iplib.py (handle_auto): Fix inconsistency arising from
410 spurious newlines added by this routine. After a report by
415 spurious newlines added by this routine. After a report by
411 F. Mantegazza.
416 F. Mantegazza.
412
417
413 2005-09-05 Fernando Perez <Fernando.Perez@colorado.edu>
418 2005-09-05 Fernando Perez <Fernando.Perez@colorado.edu>
414
419
415 * IPython/Shell.py (hijack_gtk): remove pygtk.require("2.0")
420 * IPython/Shell.py (hijack_gtk): remove pygtk.require("2.0")
416 calls. These were a leftover from the GTK 1.x days, and can cause
421 calls. These were a leftover from the GTK 1.x days, and can cause
417 problems in certain cases (after a report by John Hunter).
422 problems in certain cases (after a report by John Hunter).
418
423
419 * IPython/iplib.py (InteractiveShell.__init__): Trap exception if
424 * IPython/iplib.py (InteractiveShell.__init__): Trap exception if
420 os.getcwd() fails at init time. Thanks to patch from David Remahl
425 os.getcwd() fails at init time. Thanks to patch from David Remahl
421 <chmod007-AT-mac.com>.
426 <chmod007-AT-mac.com>.
422 (InteractiveShell.__init__): prevent certain special magics from
427 (InteractiveShell.__init__): prevent certain special magics from
423 being shadowed by aliases. Closes
428 being shadowed by aliases. Closes
424 http://www.scipy.net/roundup/ipython/issue41.
429 http://www.scipy.net/roundup/ipython/issue41.
425
430
426 2005-08-31 Fernando Perez <Fernando.Perez@colorado.edu>
431 2005-08-31 Fernando Perez <Fernando.Perez@colorado.edu>
427
432
428 * IPython/iplib.py (InteractiveShell.complete): Added new
433 * IPython/iplib.py (InteractiveShell.complete): Added new
429 top-level completion method to expose the completion mechanism
434 top-level completion method to expose the completion mechanism
430 beyond readline-based environments.
435 beyond readline-based environments.
431
436
432 2005-08-19 Fernando Perez <Fernando.Perez@colorado.edu>
437 2005-08-19 Fernando Perez <Fernando.Perez@colorado.edu>
433
438
434 * tools/ipsvnc (svnversion): fix svnversion capture.
439 * tools/ipsvnc (svnversion): fix svnversion capture.
435
440
436 * IPython/iplib.py (InteractiveShell.__init__): Add has_readline
441 * IPython/iplib.py (InteractiveShell.__init__): Add has_readline
437 attribute to self, which was missing. Before, it was set by a
442 attribute to self, which was missing. Before, it was set by a
438 routine which in certain cases wasn't being called, so the
443 routine which in certain cases wasn't being called, so the
439 instance could end up missing the attribute. This caused a crash.
444 instance could end up missing the attribute. This caused a crash.
440 Closes http://www.scipy.net/roundup/ipython/issue40.
445 Closes http://www.scipy.net/roundup/ipython/issue40.
441
446
442 2005-08-16 Fernando Perez <fperez@colorado.edu>
447 2005-08-16 Fernando Perez <fperez@colorado.edu>
443
448
444 * IPython/ultraTB.py (VerboseTB.text): don't crash if object
449 * IPython/ultraTB.py (VerboseTB.text): don't crash if object
445 contains non-string attribute. Closes
450 contains non-string attribute. Closes
446 http://www.scipy.net/roundup/ipython/issue38.
451 http://www.scipy.net/roundup/ipython/issue38.
447
452
448 2005-08-14 Fernando Perez <fperez@colorado.edu>
453 2005-08-14 Fernando Perez <fperez@colorado.edu>
449
454
450 * tools/ipsvnc: Minor improvements, to add changeset info.
455 * tools/ipsvnc: Minor improvements, to add changeset info.
451
456
452 2005-08-12 Fernando Perez <fperez@colorado.edu>
457 2005-08-12 Fernando Perez <fperez@colorado.edu>
453
458
454 * IPython/iplib.py (runsource): remove self.code_to_run_src
459 * IPython/iplib.py (runsource): remove self.code_to_run_src
455 attribute. I realized this is nothing more than
460 attribute. I realized this is nothing more than
456 '\n'.join(self.buffer), and having the same data in two different
461 '\n'.join(self.buffer), and having the same data in two different
457 places is just asking for synchronization bugs. This may impact
462 places is just asking for synchronization bugs. This may impact
458 people who have custom exception handlers, so I need to warn
463 people who have custom exception handlers, so I need to warn
459 ipython-dev about it (F. Mantegazza may use them).
464 ipython-dev about it (F. Mantegazza may use them).
460
465
461 2005-07-29 Fernando Perez <Fernando.Perez@colorado.edu>
466 2005-07-29 Fernando Perez <Fernando.Perez@colorado.edu>
462
467
463 * IPython/genutils.py: fix 2.2 compatibility (generators)
468 * IPython/genutils.py: fix 2.2 compatibility (generators)
464
469
465 2005-07-18 Fernando Perez <fperez@colorado.edu>
470 2005-07-18 Fernando Perez <fperez@colorado.edu>
466
471
467 * IPython/genutils.py (get_home_dir): fix to help users with
472 * IPython/genutils.py (get_home_dir): fix to help users with
468 invalid $HOME under win32.
473 invalid $HOME under win32.
469
474
470 2005-07-17 Fernando Perez <fperez@colorado.edu>
475 2005-07-17 Fernando Perez <fperez@colorado.edu>
471
476
472 * IPython/Prompts.py (str_safe): Make unicode-safe. Also remove
477 * IPython/Prompts.py (str_safe): Make unicode-safe. Also remove
473 some old hacks and clean up a bit other routines; code should be
478 some old hacks and clean up a bit other routines; code should be
474 simpler and a bit faster.
479 simpler and a bit faster.
475
480
476 * IPython/iplib.py (interact): removed some last-resort attempts
481 * IPython/iplib.py (interact): removed some last-resort attempts
477 to survive broken stdout/stderr. That code was only making it
482 to survive broken stdout/stderr. That code was only making it
478 harder to abstract out the i/o (necessary for gui integration),
483 harder to abstract out the i/o (necessary for gui integration),
479 and the crashes it could prevent were extremely rare in practice
484 and the crashes it could prevent were extremely rare in practice
480 (besides being fully user-induced in a pretty violent manner).
485 (besides being fully user-induced in a pretty violent manner).
481
486
482 * IPython/genutils.py (IOStream.__init__): Simplify the i/o stuff.
487 * IPython/genutils.py (IOStream.__init__): Simplify the i/o stuff.
483 Nothing major yet, but the code is simpler to read; this should
488 Nothing major yet, but the code is simpler to read; this should
484 make it easier to do more serious modifications in the future.
489 make it easier to do more serious modifications in the future.
485
490
486 * IPython/Extensions/InterpreterExec.py: Fix auto-quoting in pysh,
491 * IPython/Extensions/InterpreterExec.py: Fix auto-quoting in pysh,
487 which broke in .15 (thanks to a report by Ville).
492 which broke in .15 (thanks to a report by Ville).
488
493
489 * IPython/Itpl.py (Itpl.__init__): add unicode support (it may not
494 * IPython/Itpl.py (Itpl.__init__): add unicode support (it may not
490 be quite correct, I know next to nothing about unicode). This
495 be quite correct, I know next to nothing about unicode). This
491 will allow unicode strings to be used in prompts, amongst other
496 will allow unicode strings to be used in prompts, amongst other
492 cases. It also will prevent ipython from crashing when unicode
497 cases. It also will prevent ipython from crashing when unicode
493 shows up unexpectedly in many places. If ascii encoding fails, we
498 shows up unexpectedly in many places. If ascii encoding fails, we
494 assume utf_8. Currently the encoding is not a user-visible
499 assume utf_8. Currently the encoding is not a user-visible
495 setting, though it could be made so if there is demand for it.
500 setting, though it could be made so if there is demand for it.
496
501
497 * IPython/ipmaker.py (make_IPython): remove old 2.1-specific hack.
502 * IPython/ipmaker.py (make_IPython): remove old 2.1-specific hack.
498
503
499 * IPython/Struct.py (Struct.merge): switch keys() to iterator.
504 * IPython/Struct.py (Struct.merge): switch keys() to iterator.
500
505
501 * IPython/background_jobs.py: moved 2.2 compatibility to genutils.
506 * IPython/background_jobs.py: moved 2.2 compatibility to genutils.
502
507
503 * IPython/genutils.py: Add 2.2 compatibility here, so all other
508 * IPython/genutils.py: Add 2.2 compatibility here, so all other
504 code can work transparently for 2.2/2.3.
509 code can work transparently for 2.2/2.3.
505
510
506 2005-07-16 Fernando Perez <fperez@colorado.edu>
511 2005-07-16 Fernando Perez <fperez@colorado.edu>
507
512
508 * IPython/ultraTB.py (ExceptionColors): Make a global variable
513 * IPython/ultraTB.py (ExceptionColors): Make a global variable
509 out of the color scheme table used for coloring exception
514 out of the color scheme table used for coloring exception
510 tracebacks. This allows user code to add new schemes at runtime.
515 tracebacks. This allows user code to add new schemes at runtime.
511 This is a minimally modified version of the patch at
516 This is a minimally modified version of the patch at
512 http://www.scipy.net/roundup/ipython/issue35, many thanks to pabw
517 http://www.scipy.net/roundup/ipython/issue35, many thanks to pabw
513 for the contribution.
518 for the contribution.
514
519
515 * IPython/FlexCompleter.py (Completer.attr_matches): Add a
520 * IPython/FlexCompleter.py (Completer.attr_matches): Add a
516 slightly modified version of the patch in
521 slightly modified version of the patch in
517 http://www.scipy.net/roundup/ipython/issue34, which also allows me
522 http://www.scipy.net/roundup/ipython/issue34, which also allows me
518 to remove the previous try/except solution (which was costlier).
523 to remove the previous try/except solution (which was costlier).
519 Thanks to Gaetan Lehmann <gaetan.lehmann-AT-jouy.inra.fr> for the fix.
524 Thanks to Gaetan Lehmann <gaetan.lehmann-AT-jouy.inra.fr> for the fix.
520
525
521 2005-06-08 Fernando Perez <fperez@colorado.edu>
526 2005-06-08 Fernando Perez <fperez@colorado.edu>
522
527
523 * IPython/iplib.py (write/write_err): Add methods to abstract all
528 * IPython/iplib.py (write/write_err): Add methods to abstract all
524 I/O a bit more.
529 I/O a bit more.
525
530
526 * IPython/Shell.py (IPShellGTK.mainloop): Fix GTK deprecation
531 * IPython/Shell.py (IPShellGTK.mainloop): Fix GTK deprecation
527 warning, reported by Aric Hagberg, fix by JD Hunter.
532 warning, reported by Aric Hagberg, fix by JD Hunter.
528
533
529 2005-06-02 *** Released version 0.6.15
534 2005-06-02 *** Released version 0.6.15
530
535
531 2005-06-01 Fernando Perez <fperez@colorado.edu>
536 2005-06-01 Fernando Perez <fperez@colorado.edu>
532
537
533 * IPython/iplib.py (MagicCompleter.file_matches): Fix
538 * IPython/iplib.py (MagicCompleter.file_matches): Fix
534 tab-completion of filenames within open-quoted strings. Note that
539 tab-completion of filenames within open-quoted strings. Note that
535 this requires that in ~/.ipython/ipythonrc, users change the
540 this requires that in ~/.ipython/ipythonrc, users change the
536 readline delimiters configuration to read:
541 readline delimiters configuration to read:
537
542
538 readline_remove_delims -/~
543 readline_remove_delims -/~
539
544
540
545
541 2005-05-31 *** Released version 0.6.14
546 2005-05-31 *** Released version 0.6.14
542
547
543 2005-05-29 Fernando Perez <fperez@colorado.edu>
548 2005-05-29 Fernando Perez <fperez@colorado.edu>
544
549
545 * IPython/ultraTB.py (VerboseTB.text): Fix crash for tracebacks
550 * IPython/ultraTB.py (VerboseTB.text): Fix crash for tracebacks
546 with files not on the filesystem. Reported by Eliyahu Sandler
551 with files not on the filesystem. Reported by Eliyahu Sandler
547 <eli@gondolin.net>
552 <eli@gondolin.net>
548
553
549 2005-05-22 Fernando Perez <fperez@colorado.edu>
554 2005-05-22 Fernando Perez <fperez@colorado.edu>
550
555
551 * IPython/iplib.py: Fix a few crashes in the --upgrade option.
556 * IPython/iplib.py: Fix a few crashes in the --upgrade option.
552 After an initial report by LUK ShunTim <shuntim.luk@polyu.edu.hk>.
557 After an initial report by LUK ShunTim <shuntim.luk@polyu.edu.hk>.
553
558
554 2005-05-19 Fernando Perez <fperez@colorado.edu>
559 2005-05-19 Fernando Perez <fperez@colorado.edu>
555
560
556 * IPython/iplib.py (safe_execfile): close a file which could be
561 * IPython/iplib.py (safe_execfile): close a file which could be
557 left open (causing problems in win32, which locks open files).
562 left open (causing problems in win32, which locks open files).
558 Thanks to a bug report by D Brown <dbrown2@yahoo.com>.
563 Thanks to a bug report by D Brown <dbrown2@yahoo.com>.
559
564
560 2005-05-18 Fernando Perez <fperez@colorado.edu>
565 2005-05-18 Fernando Perez <fperez@colorado.edu>
561
566
562 * IPython/Shell.py (MatplotlibShellBase.mplot_exec): pass all
567 * IPython/Shell.py (MatplotlibShellBase.mplot_exec): pass all
563 keyword arguments correctly to safe_execfile().
568 keyword arguments correctly to safe_execfile().
564
569
565 2005-05-13 Fernando Perez <fperez@colorado.edu>
570 2005-05-13 Fernando Perez <fperez@colorado.edu>
566
571
567 * ipython.1: Added info about Qt to manpage, and threads warning
572 * ipython.1: Added info about Qt to manpage, and threads warning
568 to usage page (invoked with --help).
573 to usage page (invoked with --help).
569
574
570 * IPython/iplib.py (MagicCompleter.python_func_kw_matches): Added
575 * IPython/iplib.py (MagicCompleter.python_func_kw_matches): Added
571 new matcher (it goes at the end of the priority list) to do
576 new matcher (it goes at the end of the priority list) to do
572 tab-completion on named function arguments. Submitted by George
577 tab-completion on named function arguments. Submitted by George
573 Sakkis <gsakkis-AT-eden.rutgers.edu>. See the thread at
578 Sakkis <gsakkis-AT-eden.rutgers.edu>. See the thread at
574 http://www.scipy.net/pipermail/ipython-dev/2005-April/000436.html
579 http://www.scipy.net/pipermail/ipython-dev/2005-April/000436.html
575 for more details.
580 for more details.
576
581
577 * IPython/Magic.py (magic_run): Added new -e flag to ignore
582 * IPython/Magic.py (magic_run): Added new -e flag to ignore
578 SystemExit exceptions in the script being run. Thanks to a report
583 SystemExit exceptions in the script being run. Thanks to a report
579 by danny shevitz <danny_shevitz-AT-yahoo.com>, about this
584 by danny shevitz <danny_shevitz-AT-yahoo.com>, about this
580 producing very annoying behavior when running unit tests.
585 producing very annoying behavior when running unit tests.
581
586
582 2005-05-12 Fernando Perez <fperez@colorado.edu>
587 2005-05-12 Fernando Perez <fperez@colorado.edu>
583
588
584 * IPython/iplib.py (handle_auto): fixed auto-quoting and parens,
589 * IPython/iplib.py (handle_auto): fixed auto-quoting and parens,
585 which I'd broken (again) due to a changed regexp. In the process,
590 which I'd broken (again) due to a changed regexp. In the process,
586 added ';' as an escape to auto-quote the whole line without
591 added ';' as an escape to auto-quote the whole line without
587 splitting its arguments. Thanks to a report by Jerry McRae
592 splitting its arguments. Thanks to a report by Jerry McRae
588 <qrs0xyc02-AT-sneakemail.com>.
593 <qrs0xyc02-AT-sneakemail.com>.
589
594
590 * IPython/ultraTB.py (VerboseTB.text): protect against rare but
595 * IPython/ultraTB.py (VerboseTB.text): protect against rare but
591 possible crashes caused by a TokenError. Reported by Ed Schofield
596 possible crashes caused by a TokenError. Reported by Ed Schofield
592 <schofield-AT-ftw.at>.
597 <schofield-AT-ftw.at>.
593
598
594 2005-05-06 Fernando Perez <fperez@colorado.edu>
599 2005-05-06 Fernando Perez <fperez@colorado.edu>
595
600
596 * IPython/Shell.py (hijack_wx): Fix to work with WX v.2.6.
601 * IPython/Shell.py (hijack_wx): Fix to work with WX v.2.6.
597
602
598 2005-04-29 Fernando Perez <fperez@colorado.edu>
603 2005-04-29 Fernando Perez <fperez@colorado.edu>
599
604
600 * IPython/Shell.py (IPShellQt): Thanks to Denis Rivière
605 * IPython/Shell.py (IPShellQt): Thanks to Denis Rivière
601 <nudz-AT-free.fr>, Yann Cointepas <yann-AT-sapetnioc.org> and Benjamin
606 <nudz-AT-free.fr>, Yann Cointepas <yann-AT-sapetnioc.org> and Benjamin
602 Thyreau <Benji2-AT-decideur.info>, we now have a -qthread option
607 Thyreau <Benji2-AT-decideur.info>, we now have a -qthread option
603 which provides support for Qt interactive usage (similar to the
608 which provides support for Qt interactive usage (similar to the
604 existing one for WX and GTK). This had been often requested.
609 existing one for WX and GTK). This had been often requested.
605
610
606 2005-04-14 *** Released version 0.6.13
611 2005-04-14 *** Released version 0.6.13
607
612
608 2005-04-08 Fernando Perez <fperez@colorado.edu>
613 2005-04-08 Fernando Perez <fperez@colorado.edu>
609
614
610 * IPython/Magic.py (Magic._ofind): remove docstring evaluation
615 * IPython/Magic.py (Magic._ofind): remove docstring evaluation
611 from _ofind, which gets called on almost every input line. Now,
616 from _ofind, which gets called on almost every input line. Now,
612 we only try to get docstrings if they are actually going to be
617 we only try to get docstrings if they are actually going to be
613 used (the overhead of fetching unnecessary docstrings can be
618 used (the overhead of fetching unnecessary docstrings can be
614 noticeable for certain objects, such as Pyro proxies).
619 noticeable for certain objects, such as Pyro proxies).
615
620
616 * IPython/iplib.py (MagicCompleter.python_matches): Change the API
621 * IPython/iplib.py (MagicCompleter.python_matches): Change the API
617 for completers. For some reason I had been passing them the state
622 for completers. For some reason I had been passing them the state
618 variable, which completers never actually need, and was in
623 variable, which completers never actually need, and was in
619 conflict with the rlcompleter API. Custom completers ONLY need to
624 conflict with the rlcompleter API. Custom completers ONLY need to
620 take the text parameter.
625 take the text parameter.
621
626
622 * IPython/Extensions/InterpreterExec.py: Fix regexp so that magics
627 * IPython/Extensions/InterpreterExec.py: Fix regexp so that magics
623 work correctly in pysh. I've also moved all the logic which used
628 work correctly in pysh. I've also moved all the logic which used
624 to be in pysh.py here, which will prevent problems with future
629 to be in pysh.py here, which will prevent problems with future
625 upgrades. However, this time I must warn users to update their
630 upgrades. However, this time I must warn users to update their
626 pysh profile to include the line
631 pysh profile to include the line
627
632
628 import_all IPython.Extensions.InterpreterExec
633 import_all IPython.Extensions.InterpreterExec
629
634
630 because otherwise things won't work for them. They MUST also
635 because otherwise things won't work for them. They MUST also
631 delete pysh.py and the line
636 delete pysh.py and the line
632
637
633 execfile pysh.py
638 execfile pysh.py
634
639
635 from their ipythonrc-pysh.
640 from their ipythonrc-pysh.
636
641
637 * IPython/FlexCompleter.py (Completer.attr_matches): Make more
642 * IPython/FlexCompleter.py (Completer.attr_matches): Make more
638 robust in the face of objects whose dir() returns non-strings
643 robust in the face of objects whose dir() returns non-strings
639 (which it shouldn't, but some broken libs like ITK do). Thanks to
644 (which it shouldn't, but some broken libs like ITK do). Thanks to
640 a patch by John Hunter (implemented differently, though). Also
645 a patch by John Hunter (implemented differently, though). Also
641 minor improvements by using .extend instead of + on lists.
646 minor improvements by using .extend instead of + on lists.
642
647
643 * pysh.py:
648 * pysh.py:
644
649
645 2005-04-06 Fernando Perez <fperez@colorado.edu>
650 2005-04-06 Fernando Perez <fperez@colorado.edu>
646
651
647 * IPython/ipmaker.py (make_IPython): Make multi_line_specials on
652 * IPython/ipmaker.py (make_IPython): Make multi_line_specials on
648 by default, so that all users benefit from it. Those who don't
653 by default, so that all users benefit from it. Those who don't
649 want it can still turn it off.
654 want it can still turn it off.
650
655
651 * IPython/UserConfig/ipythonrc: Add multi_line_specials to the
656 * IPython/UserConfig/ipythonrc: Add multi_line_specials to the
652 config file, I'd forgotten about this, so users were getting it
657 config file, I'd forgotten about this, so users were getting it
653 off by default.
658 off by default.
654
659
655 * IPython/iplib.py (ipmagic): big overhaul of the magic system for
660 * IPython/iplib.py (ipmagic): big overhaul of the magic system for
656 consistency. Now magics can be called in multiline statements,
661 consistency. Now magics can be called in multiline statements,
657 and python variables can be expanded in magic calls via $var.
662 and python variables can be expanded in magic calls via $var.
658 This makes the magic system behave just like aliases or !system
663 This makes the magic system behave just like aliases or !system
659 calls.
664 calls.
660
665
661 2005-03-28 Fernando Perez <fperez@colorado.edu>
666 2005-03-28 Fernando Perez <fperez@colorado.edu>
662
667
663 * IPython/iplib.py (handle_auto): cleanup to use %s instead of
668 * IPython/iplib.py (handle_auto): cleanup to use %s instead of
664 expensive string additions for building command. Add support for
669 expensive string additions for building command. Add support for
665 trailing ';' when autocall is used.
670 trailing ';' when autocall is used.
666
671
667 2005-03-26 Fernando Perez <fperez@colorado.edu>
672 2005-03-26 Fernando Perez <fperez@colorado.edu>
668
673
669 * ipython.el: Fix http://www.scipy.net/roundup/ipython/issue31.
674 * ipython.el: Fix http://www.scipy.net/roundup/ipython/issue31.
670 Bugfix by A. Schmolck, the ipython.el maintainer. Also make
675 Bugfix by A. Schmolck, the ipython.el maintainer. Also make
671 ipython.el robust against prompts with any number of spaces
676 ipython.el robust against prompts with any number of spaces
672 (including 0) after the ':' character.
677 (including 0) after the ':' character.
673
678
674 * IPython/Prompts.py (Prompt2.set_p_str): Fix spurious space in
679 * IPython/Prompts.py (Prompt2.set_p_str): Fix spurious space in
675 continuation prompt, which misled users to think the line was
680 continuation prompt, which misled users to think the line was
676 already indented. Closes debian Bug#300847, reported to me by
681 already indented. Closes debian Bug#300847, reported to me by
677 Norbert Tretkowski <tretkowski-AT-inittab.de>.
682 Norbert Tretkowski <tretkowski-AT-inittab.de>.
678
683
679 2005-03-23 Fernando Perez <fperez@colorado.edu>
684 2005-03-23 Fernando Perez <fperez@colorado.edu>
680
685
681 * IPython/Prompts.py (Prompt1.__str__): Make sure that prompts are
686 * IPython/Prompts.py (Prompt1.__str__): Make sure that prompts are
682 properly aligned if they have embedded newlines.
687 properly aligned if they have embedded newlines.
683
688
684 * IPython/iplib.py (runlines): Add a public method to expose
689 * IPython/iplib.py (runlines): Add a public method to expose
685 IPython's code execution machinery, so that users can run strings
690 IPython's code execution machinery, so that users can run strings
686 as if they had been typed at the prompt interactively.
691 as if they had been typed at the prompt interactively.
687 (InteractiveShell.__init__): Added getoutput() to the __IPYTHON__
692 (InteractiveShell.__init__): Added getoutput() to the __IPYTHON__
688 methods which can call the system shell, but with python variable
693 methods which can call the system shell, but with python variable
689 expansion. The three such methods are: __IPYTHON__.system,
694 expansion. The three such methods are: __IPYTHON__.system,
690 .getoutput and .getoutputerror. These need to be documented in a
695 .getoutput and .getoutputerror. These need to be documented in a
691 'public API' section (to be written) of the manual.
696 'public API' section (to be written) of the manual.
692
697
693 2005-03-20 Fernando Perez <fperez@colorado.edu>
698 2005-03-20 Fernando Perez <fperez@colorado.edu>
694
699
695 * IPython/iplib.py (InteractiveShell.set_custom_exc): new system
700 * IPython/iplib.py (InteractiveShell.set_custom_exc): new system
696 for custom exception handling. This is quite powerful, and it
701 for custom exception handling. This is quite powerful, and it
697 allows for user-installable exception handlers which can trap
702 allows for user-installable exception handlers which can trap
698 custom exceptions at runtime and treat them separately from
703 custom exceptions at runtime and treat them separately from
699 IPython's default mechanisms. At the request of FrΓ©dΓ©ric
704 IPython's default mechanisms. At the request of FrΓ©dΓ©ric
700 Mantegazza <mantegazza-AT-ill.fr>.
705 Mantegazza <mantegazza-AT-ill.fr>.
701 (InteractiveShell.set_custom_completer): public API function to
706 (InteractiveShell.set_custom_completer): public API function to
702 add new completers at runtime.
707 add new completers at runtime.
703
708
704 2005-03-19 Fernando Perez <fperez@colorado.edu>
709 2005-03-19 Fernando Perez <fperez@colorado.edu>
705
710
706 * IPython/OInspect.py (getdoc): Add a call to obj.getdoc(), to
711 * IPython/OInspect.py (getdoc): Add a call to obj.getdoc(), to
707 allow objects which provide their docstrings via non-standard
712 allow objects which provide their docstrings via non-standard
708 mechanisms (like Pyro proxies) to still be inspected by ipython's
713 mechanisms (like Pyro proxies) to still be inspected by ipython's
709 ? system.
714 ? system.
710
715
711 * IPython/iplib.py (InteractiveShell.__init__): back off the _o/_e
716 * IPython/iplib.py (InteractiveShell.__init__): back off the _o/_e
712 automatic capture system. I tried quite hard to make it work
717 automatic capture system. I tried quite hard to make it work
713 reliably, and simply failed. I tried many combinations with the
718 reliably, and simply failed. I tried many combinations with the
714 subprocess module, but eventually nothing worked in all needed
719 subprocess module, but eventually nothing worked in all needed
715 cases (not blocking stdin for the child, duplicating stdout
720 cases (not blocking stdin for the child, duplicating stdout
716 without blocking, etc). The new %sc/%sx still do capture to these
721 without blocking, etc). The new %sc/%sx still do capture to these
717 magical list/string objects which make shell use much more
722 magical list/string objects which make shell use much more
718 conveninent, so not all is lost.
723 conveninent, so not all is lost.
719
724
720 XXX - FIX MANUAL for the change above!
725 XXX - FIX MANUAL for the change above!
721
726
722 (runsource): I copied code.py's runsource() into ipython to modify
727 (runsource): I copied code.py's runsource() into ipython to modify
723 it a bit. Now the code object and source to be executed are
728 it a bit. Now the code object and source to be executed are
724 stored in ipython. This makes this info accessible to third-party
729 stored in ipython. This makes this info accessible to third-party
725 tools, like custom exception handlers. After a request by FrΓ©dΓ©ric
730 tools, like custom exception handlers. After a request by FrΓ©dΓ©ric
726 Mantegazza <mantegazza-AT-ill.fr>.
731 Mantegazza <mantegazza-AT-ill.fr>.
727
732
728 * IPython/UserConfig/ipythonrc: Add up/down arrow keys to
733 * IPython/UserConfig/ipythonrc: Add up/down arrow keys to
729 history-search via readline (like C-p/C-n). I'd wanted this for a
734 history-search via readline (like C-p/C-n). I'd wanted this for a
730 long time, but only recently found out how to do it. For users
735 long time, but only recently found out how to do it. For users
731 who already have their ipythonrc files made and want this, just
736 who already have their ipythonrc files made and want this, just
732 add:
737 add:
733
738
734 readline_parse_and_bind "\e[A": history-search-backward
739 readline_parse_and_bind "\e[A": history-search-backward
735 readline_parse_and_bind "\e[B": history-search-forward
740 readline_parse_and_bind "\e[B": history-search-forward
736
741
737 2005-03-18 Fernando Perez <fperez@colorado.edu>
742 2005-03-18 Fernando Perez <fperez@colorado.edu>
738
743
739 * IPython/Magic.py (magic_sc): %sc and %sx now use the fancy
744 * IPython/Magic.py (magic_sc): %sc and %sx now use the fancy
740 LSString and SList classes which allow transparent conversions
745 LSString and SList classes which allow transparent conversions
741 between list mode and whitespace-separated string.
746 between list mode and whitespace-separated string.
742 (magic_r): Fix recursion problem in %r.
747 (magic_r): Fix recursion problem in %r.
743
748
744 * IPython/genutils.py (LSString): New class to be used for
749 * IPython/genutils.py (LSString): New class to be used for
745 automatic storage of the results of all alias/system calls in _o
750 automatic storage of the results of all alias/system calls in _o
746 and _e (stdout/err). These provide a .l/.list attribute which
751 and _e (stdout/err). These provide a .l/.list attribute which
747 does automatic splitting on newlines. This means that for most
752 does automatic splitting on newlines. This means that for most
748 uses, you'll never need to do capturing of output with %sc/%sx
753 uses, you'll never need to do capturing of output with %sc/%sx
749 anymore, since ipython keeps this always done for you. Note that
754 anymore, since ipython keeps this always done for you. Note that
750 only the LAST results are stored, the _o/e variables are
755 only the LAST results are stored, the _o/e variables are
751 overwritten on each call. If you need to save their contents
756 overwritten on each call. If you need to save their contents
752 further, simply bind them to any other name.
757 further, simply bind them to any other name.
753
758
754 2005-03-17 Fernando Perez <fperez@colorado.edu>
759 2005-03-17 Fernando Perez <fperez@colorado.edu>
755
760
756 * IPython/Prompts.py (BasePrompt.cwd_filt): a few more fixes for
761 * IPython/Prompts.py (BasePrompt.cwd_filt): a few more fixes for
757 prompt namespace handling.
762 prompt namespace handling.
758
763
759 2005-03-16 Fernando Perez <fperez@colorado.edu>
764 2005-03-16 Fernando Perez <fperez@colorado.edu>
760
765
761 * IPython/Prompts.py (CachedOutput.__init__): Fix default and
766 * IPython/Prompts.py (CachedOutput.__init__): Fix default and
762 classic prompts to be '>>> ' (final space was missing, and it
767 classic prompts to be '>>> ' (final space was missing, and it
763 trips the emacs python mode).
768 trips the emacs python mode).
764 (BasePrompt.__str__): Added safe support for dynamic prompt
769 (BasePrompt.__str__): Added safe support for dynamic prompt
765 strings. Now you can set your prompt string to be '$x', and the
770 strings. Now you can set your prompt string to be '$x', and the
766 value of x will be printed from your interactive namespace. The
771 value of x will be printed from your interactive namespace. The
767 interpolation syntax includes the full Itpl support, so
772 interpolation syntax includes the full Itpl support, so
768 ${foo()+x+bar()} is a valid prompt string now, and the function
773 ${foo()+x+bar()} is a valid prompt string now, and the function
769 calls will be made at runtime.
774 calls will be made at runtime.
770
775
771 2005-03-15 Fernando Perez <fperez@colorado.edu>
776 2005-03-15 Fernando Perez <fperez@colorado.edu>
772
777
773 * IPython/Magic.py (magic_history): renamed %hist to %history, to
778 * IPython/Magic.py (magic_history): renamed %hist to %history, to
774 avoid name clashes in pylab. %hist still works, it just forwards
779 avoid name clashes in pylab. %hist still works, it just forwards
775 the call to %history.
780 the call to %history.
776
781
777 2005-03-02 *** Released version 0.6.12
782 2005-03-02 *** Released version 0.6.12
778
783
779 2005-03-02 Fernando Perez <fperez@colorado.edu>
784 2005-03-02 Fernando Perez <fperez@colorado.edu>
780
785
781 * IPython/iplib.py (handle_magic): log magic calls properly as
786 * IPython/iplib.py (handle_magic): log magic calls properly as
782 ipmagic() function calls.
787 ipmagic() function calls.
783
788
784 * IPython/Magic.py (magic_time): Improved %time to support
789 * IPython/Magic.py (magic_time): Improved %time to support
785 statements and provide wall-clock as well as CPU time.
790 statements and provide wall-clock as well as CPU time.
786
791
787 2005-02-27 Fernando Perez <fperez@colorado.edu>
792 2005-02-27 Fernando Perez <fperez@colorado.edu>
788
793
789 * IPython/hooks.py: New hooks module, to expose user-modifiable
794 * IPython/hooks.py: New hooks module, to expose user-modifiable
790 IPython functionality in a clean manner. For now only the editor
795 IPython functionality in a clean manner. For now only the editor
791 hook is actually written, and other thigns which I intend to turn
796 hook is actually written, and other thigns which I intend to turn
792 into proper hooks aren't yet there. The display and prefilter
797 into proper hooks aren't yet there. The display and prefilter
793 stuff, for example, should be hooks. But at least now the
798 stuff, for example, should be hooks. But at least now the
794 framework is in place, and the rest can be moved here with more
799 framework is in place, and the rest can be moved here with more
795 time later. IPython had had a .hooks variable for a long time for
800 time later. IPython had had a .hooks variable for a long time for
796 this purpose, but I'd never actually used it for anything.
801 this purpose, but I'd never actually used it for anything.
797
802
798 2005-02-26 Fernando Perez <fperez@colorado.edu>
803 2005-02-26 Fernando Perez <fperez@colorado.edu>
799
804
800 * IPython/ipmaker.py (make_IPython): make the default ipython
805 * IPython/ipmaker.py (make_IPython): make the default ipython
801 directory be called _ipython under win32, to follow more the
806 directory be called _ipython under win32, to follow more the
802 naming peculiarities of that platform (where buggy software like
807 naming peculiarities of that platform (where buggy software like
803 Visual Sourcesafe breaks with .named directories). Reported by
808 Visual Sourcesafe breaks with .named directories). Reported by
804 Ville Vainio.
809 Ville Vainio.
805
810
806 2005-02-23 Fernando Perez <fperez@colorado.edu>
811 2005-02-23 Fernando Perez <fperez@colorado.edu>
807
812
808 * IPython/iplib.py (InteractiveShell.__init__): removed a few
813 * IPython/iplib.py (InteractiveShell.__init__): removed a few
809 auto_aliases for win32 which were causing problems. Users can
814 auto_aliases for win32 which were causing problems. Users can
810 define the ones they personally like.
815 define the ones they personally like.
811
816
812 2005-02-21 Fernando Perez <fperez@colorado.edu>
817 2005-02-21 Fernando Perez <fperez@colorado.edu>
813
818
814 * IPython/Magic.py (magic_time): new magic to time execution of
819 * IPython/Magic.py (magic_time): new magic to time execution of
815 expressions. After a request by Charles Moad <cmoad-AT-indiana.edu>.
820 expressions. After a request by Charles Moad <cmoad-AT-indiana.edu>.
816
821
817 2005-02-19 Fernando Perez <fperez@colorado.edu>
822 2005-02-19 Fernando Perez <fperez@colorado.edu>
818
823
819 * IPython/ConfigLoader.py (ConfigLoader.load): Allow empty strings
824 * IPython/ConfigLoader.py (ConfigLoader.load): Allow empty strings
820 into keys (for prompts, for example).
825 into keys (for prompts, for example).
821
826
822 * IPython/Prompts.py (BasePrompt.set_p_str): Fix to allow empty
827 * IPython/Prompts.py (BasePrompt.set_p_str): Fix to allow empty
823 prompts in case users want them. This introduces a small behavior
828 prompts in case users want them. This introduces a small behavior
824 change: ipython does not automatically add a space to all prompts
829 change: ipython does not automatically add a space to all prompts
825 anymore. To get the old prompts with a space, users should add it
830 anymore. To get the old prompts with a space, users should add it
826 manually to their ipythonrc file, so for example prompt_in1 should
831 manually to their ipythonrc file, so for example prompt_in1 should
827 now read 'In [\#]: ' instead of 'In [\#]:'.
832 now read 'In [\#]: ' instead of 'In [\#]:'.
828 (BasePrompt.__init__): New option prompts_pad_left (only in rc
833 (BasePrompt.__init__): New option prompts_pad_left (only in rc
829 file) to control left-padding of secondary prompts.
834 file) to control left-padding of secondary prompts.
830
835
831 * IPython/Magic.py (Magic.profile_missing_notice): Don't crash if
836 * IPython/Magic.py (Magic.profile_missing_notice): Don't crash if
832 the profiler can't be imported. Fix for Debian, which removed
837 the profiler can't be imported. Fix for Debian, which removed
833 profile.py because of License issues. I applied a slightly
838 profile.py because of License issues. I applied a slightly
834 modified version of the original Debian patch at
839 modified version of the original Debian patch at
835 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=294500.
840 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=294500.
836
841
837 2005-02-17 Fernando Perez <fperez@colorado.edu>
842 2005-02-17 Fernando Perez <fperez@colorado.edu>
838
843
839 * IPython/genutils.py (native_line_ends): Fix bug which would
844 * IPython/genutils.py (native_line_ends): Fix bug which would
840 cause improper line-ends under win32 b/c I was not opening files
845 cause improper line-ends under win32 b/c I was not opening files
841 in binary mode. Bug report and fix thanks to Ville.
846 in binary mode. Bug report and fix thanks to Ville.
842
847
843 * IPython/iplib.py (handle_auto): Fix bug which I introduced when
848 * IPython/iplib.py (handle_auto): Fix bug which I introduced when
844 trying to catch spurious foo[1] autocalls. My fix actually broke
849 trying to catch spurious foo[1] autocalls. My fix actually broke
845 ',/' autoquote/call with explicit escape (bad regexp).
850 ',/' autoquote/call with explicit escape (bad regexp).
846
851
847 2005-02-15 *** Released version 0.6.11
852 2005-02-15 *** Released version 0.6.11
848
853
849 2005-02-14 Fernando Perez <fperez@colorado.edu>
854 2005-02-14 Fernando Perez <fperez@colorado.edu>
850
855
851 * IPython/background_jobs.py: New background job management
856 * IPython/background_jobs.py: New background job management
852 subsystem. This is implemented via a new set of classes, and
857 subsystem. This is implemented via a new set of classes, and
853 IPython now provides a builtin 'jobs' object for background job
858 IPython now provides a builtin 'jobs' object for background job
854 execution. A convenience %bg magic serves as a lightweight
859 execution. A convenience %bg magic serves as a lightweight
855 frontend for starting the more common type of calls. This was
860 frontend for starting the more common type of calls. This was
856 inspired by discussions with B. Granger and the BackgroundCommand
861 inspired by discussions with B. Granger and the BackgroundCommand
857 class described in the book Python Scripting for Computational
862 class described in the book Python Scripting for Computational
858 Science, by H. P. Langtangen: http://folk.uio.no/hpl/scripting
863 Science, by H. P. Langtangen: http://folk.uio.no/hpl/scripting
859 (although ultimately no code from this text was used, as IPython's
864 (although ultimately no code from this text was used, as IPython's
860 system is a separate implementation).
865 system is a separate implementation).
861
866
862 * IPython/iplib.py (MagicCompleter.python_matches): add new option
867 * IPython/iplib.py (MagicCompleter.python_matches): add new option
863 to control the completion of single/double underscore names
868 to control the completion of single/double underscore names
864 separately. As documented in the example ipytonrc file, the
869 separately. As documented in the example ipytonrc file, the
865 readline_omit__names variable can now be set to 2, to omit even
870 readline_omit__names variable can now be set to 2, to omit even
866 single underscore names. Thanks to a patch by Brian Wong
871 single underscore names. Thanks to a patch by Brian Wong
867 <BrianWong-AT-AirgoNetworks.Com>.
872 <BrianWong-AT-AirgoNetworks.Com>.
868 (InteractiveShell.__init__): Fix bug which would cause foo[1] to
873 (InteractiveShell.__init__): Fix bug which would cause foo[1] to
869 be autocalled as foo([1]) if foo were callable. A problem for
874 be autocalled as foo([1]) if foo were callable. A problem for
870 things which are both callable and implement __getitem__.
875 things which are both callable and implement __getitem__.
871 (init_readline): Fix autoindentation for win32. Thanks to a patch
876 (init_readline): Fix autoindentation for win32. Thanks to a patch
872 by Vivian De Smedt <vivian-AT-vdesmedt.com>.
877 by Vivian De Smedt <vivian-AT-vdesmedt.com>.
873
878
874 2005-02-12 Fernando Perez <fperez@colorado.edu>
879 2005-02-12 Fernando Perez <fperez@colorado.edu>
875
880
876 * IPython/ipmaker.py (make_IPython): Disabled the stout traps
881 * IPython/ipmaker.py (make_IPython): Disabled the stout traps
877 which I had written long ago to sort out user error messages which
882 which I had written long ago to sort out user error messages which
878 may occur during startup. This seemed like a good idea initially,
883 may occur during startup. This seemed like a good idea initially,
879 but it has proven a disaster in retrospect. I don't want to
884 but it has proven a disaster in retrospect. I don't want to
880 change much code for now, so my fix is to set the internal 'debug'
885 change much code for now, so my fix is to set the internal 'debug'
881 flag to true everywhere, whose only job was precisely to control
886 flag to true everywhere, whose only job was precisely to control
882 this subsystem. This closes issue 28 (as well as avoiding all
887 this subsystem. This closes issue 28 (as well as avoiding all
883 sorts of strange hangups which occur from time to time).
888 sorts of strange hangups which occur from time to time).
884
889
885 2005-02-07 Fernando Perez <fperez@colorado.edu>
890 2005-02-07 Fernando Perez <fperez@colorado.edu>
886
891
887 * IPython/Magic.py (magic_edit): Fix 'ed -p' not working when the
892 * IPython/Magic.py (magic_edit): Fix 'ed -p' not working when the
888 previous call produced a syntax error.
893 previous call produced a syntax error.
889
894
890 * IPython/OInspect.py (Inspector.pinfo): Fix crash when inspecting
895 * IPython/OInspect.py (Inspector.pinfo): Fix crash when inspecting
891 classes without constructor.
896 classes without constructor.
892
897
893 2005-02-06 Fernando Perez <fperez@colorado.edu>
898 2005-02-06 Fernando Perez <fperez@colorado.edu>
894
899
895 * IPython/iplib.py (MagicCompleter.complete): Extend the list of
900 * IPython/iplib.py (MagicCompleter.complete): Extend the list of
896 completions with the results of each matcher, so we return results
901 completions with the results of each matcher, so we return results
897 to the user from all namespaces. This breaks with ipython
902 to the user from all namespaces. This breaks with ipython
898 tradition, but I think it's a nicer behavior. Now you get all
903 tradition, but I think it's a nicer behavior. Now you get all
899 possible completions listed, from all possible namespaces (python,
904 possible completions listed, from all possible namespaces (python,
900 filesystem, magics...) After a request by John Hunter
905 filesystem, magics...) After a request by John Hunter
901 <jdhunter-AT-nitace.bsd.uchicago.edu>.
906 <jdhunter-AT-nitace.bsd.uchicago.edu>.
902
907
903 2005-02-05 Fernando Perez <fperez@colorado.edu>
908 2005-02-05 Fernando Perez <fperez@colorado.edu>
904
909
905 * IPython/Magic.py (magic_prun): Fix bug where prun would fail if
910 * IPython/Magic.py (magic_prun): Fix bug where prun would fail if
906 the call had quote characters in it (the quotes were stripped).
911 the call had quote characters in it (the quotes were stripped).
907
912
908 2005-01-31 Fernando Perez <fperez@colorado.edu>
913 2005-01-31 Fernando Perez <fperez@colorado.edu>
909
914
910 * IPython/iplib.py (InteractiveShell.__init__): reduce reliance on
915 * IPython/iplib.py (InteractiveShell.__init__): reduce reliance on
911 Itpl.itpl() to make the code more robust against psyco
916 Itpl.itpl() to make the code more robust against psyco
912 optimizations.
917 optimizations.
913
918
914 * IPython/Itpl.py (Itpl.__str__): Use a _getframe() call instead
919 * IPython/Itpl.py (Itpl.__str__): Use a _getframe() call instead
915 of causing an exception. Quicker, cleaner.
920 of causing an exception. Quicker, cleaner.
916
921
917 2005-01-28 Fernando Perez <fperez@colorado.edu>
922 2005-01-28 Fernando Perez <fperez@colorado.edu>
918
923
919 * scripts/ipython_win_post_install.py (install): hardcode
924 * scripts/ipython_win_post_install.py (install): hardcode
920 sys.prefix+'python.exe' as the executable path. It turns out that
925 sys.prefix+'python.exe' as the executable path. It turns out that
921 during the post-installation run, sys.executable resolves to the
926 during the post-installation run, sys.executable resolves to the
922 name of the binary installer! I should report this as a distutils
927 name of the binary installer! I should report this as a distutils
923 bug, I think. I updated the .10 release with this tiny fix, to
928 bug, I think. I updated the .10 release with this tiny fix, to
924 avoid annoying the lists further.
929 avoid annoying the lists further.
925
930
926 2005-01-27 *** Released version 0.6.10
931 2005-01-27 *** Released version 0.6.10
927
932
928 2005-01-27 Fernando Perez <fperez@colorado.edu>
933 2005-01-27 Fernando Perez <fperez@colorado.edu>
929
934
930 * IPython/numutils.py (norm): Added 'inf' as optional name for
935 * IPython/numutils.py (norm): Added 'inf' as optional name for
931 L-infinity norm, included references to mathworld.com for vector
936 L-infinity norm, included references to mathworld.com for vector
932 norm definitions.
937 norm definitions.
933 (amin/amax): added amin/amax for array min/max. Similar to what
938 (amin/amax): added amin/amax for array min/max. Similar to what
934 pylab ships with after the recent reorganization of names.
939 pylab ships with after the recent reorganization of names.
935 (spike/spike_odd): removed deprecated spike/spike_odd functions.
940 (spike/spike_odd): removed deprecated spike/spike_odd functions.
936
941
937 * ipython.el: committed Alex's recent fixes and improvements.
942 * ipython.el: committed Alex's recent fixes and improvements.
938 Tested with python-mode from CVS, and it looks excellent. Since
943 Tested with python-mode from CVS, and it looks excellent. Since
939 python-mode hasn't released anything in a while, I'm temporarily
944 python-mode hasn't released anything in a while, I'm temporarily
940 putting a copy of today's CVS (v 4.70) of python-mode in:
945 putting a copy of today's CVS (v 4.70) of python-mode in:
941 http://ipython.scipy.org/tmp/python-mode.el
946 http://ipython.scipy.org/tmp/python-mode.el
942
947
943 * scripts/ipython_win_post_install.py (install): Win32 fix to use
948 * scripts/ipython_win_post_install.py (install): Win32 fix to use
944 sys.executable for the executable name, instead of assuming it's
949 sys.executable for the executable name, instead of assuming it's
945 called 'python.exe' (the post-installer would have produced broken
950 called 'python.exe' (the post-installer would have produced broken
946 setups on systems with a differently named python binary).
951 setups on systems with a differently named python binary).
947
952
948 * IPython/PyColorize.py (Parser.__call__): change explicit '\n'
953 * IPython/PyColorize.py (Parser.__call__): change explicit '\n'
949 references to os.linesep, to make the code more
954 references to os.linesep, to make the code more
950 platform-independent. This is also part of the win32 coloring
955 platform-independent. This is also part of the win32 coloring
951 fixes.
956 fixes.
952
957
953 * IPython/genutils.py (page_dumb): Remove attempts to chop long
958 * IPython/genutils.py (page_dumb): Remove attempts to chop long
954 lines, which actually cause coloring bugs because the length of
959 lines, which actually cause coloring bugs because the length of
955 the line is very difficult to correctly compute with embedded
960 the line is very difficult to correctly compute with embedded
956 escapes. This was the source of all the coloring problems under
961 escapes. This was the source of all the coloring problems under
957 Win32. I think that _finally_, Win32 users have a properly
962 Win32. I think that _finally_, Win32 users have a properly
958 working ipython in all respects. This would never have happened
963 working ipython in all respects. This would never have happened
959 if not for Gary Bishop and Viktor Ransmayr's great help and work.
964 if not for Gary Bishop and Viktor Ransmayr's great help and work.
960
965
961 2005-01-26 *** Released version 0.6.9
966 2005-01-26 *** Released version 0.6.9
962
967
963 2005-01-25 Fernando Perez <fperez@colorado.edu>
968 2005-01-25 Fernando Perez <fperez@colorado.edu>
964
969
965 * setup.py: finally, we have a true Windows installer, thanks to
970 * setup.py: finally, we have a true Windows installer, thanks to
966 the excellent work of Viktor Ransmayr
971 the excellent work of Viktor Ransmayr
967 <viktor.ransmayr-AT-t-online.de>. The docs have been updated for
972 <viktor.ransmayr-AT-t-online.de>. The docs have been updated for
968 Windows users. The setup routine is quite a bit cleaner thanks to
973 Windows users. The setup routine is quite a bit cleaner thanks to
969 this, and the post-install script uses the proper functions to
974 this, and the post-install script uses the proper functions to
970 allow a clean de-installation using the standard Windows Control
975 allow a clean de-installation using the standard Windows Control
971 Panel.
976 Panel.
972
977
973 * IPython/genutils.py (get_home_dir): changed to use the $HOME
978 * IPython/genutils.py (get_home_dir): changed to use the $HOME
974 environment variable under all OSes (including win32) if
979 environment variable under all OSes (including win32) if
975 available. This will give consistency to win32 users who have set
980 available. This will give consistency to win32 users who have set
976 this variable for any reason. If os.environ['HOME'] fails, the
981 this variable for any reason. If os.environ['HOME'] fails, the
977 previous policy of using HOMEDRIVE\HOMEPATH kicks in.
982 previous policy of using HOMEDRIVE\HOMEPATH kicks in.
978
983
979 2005-01-24 Fernando Perez <fperez@colorado.edu>
984 2005-01-24 Fernando Perez <fperez@colorado.edu>
980
985
981 * IPython/numutils.py (empty_like): add empty_like(), similar to
986 * IPython/numutils.py (empty_like): add empty_like(), similar to
982 zeros_like() but taking advantage of the new empty() Numeric routine.
987 zeros_like() but taking advantage of the new empty() Numeric routine.
983
988
984 2005-01-23 *** Released version 0.6.8
989 2005-01-23 *** Released version 0.6.8
985
990
986 2005-01-22 Fernando Perez <fperez@colorado.edu>
991 2005-01-22 Fernando Perez <fperez@colorado.edu>
987
992
988 * IPython/Shell.py (MatplotlibShellBase.mplot_exec): I removed the
993 * IPython/Shell.py (MatplotlibShellBase.mplot_exec): I removed the
989 automatic show() calls. After discussing things with JDH, it
994 automatic show() calls. After discussing things with JDH, it
990 turns out there are too many corner cases where this can go wrong.
995 turns out there are too many corner cases where this can go wrong.
991 It's best not to try to be 'too smart', and simply have ipython
996 It's best not to try to be 'too smart', and simply have ipython
992 reproduce as much as possible the default behavior of a normal
997 reproduce as much as possible the default behavior of a normal
993 python shell.
998 python shell.
994
999
995 * IPython/iplib.py (InteractiveShell.__init__): Modified the
1000 * IPython/iplib.py (InteractiveShell.__init__): Modified the
996 line-splitting regexp and _prefilter() to avoid calling getattr()
1001 line-splitting regexp and _prefilter() to avoid calling getattr()
997 on assignments. This closes
1002 on assignments. This closes
998 http://www.scipy.net/roundup/ipython/issue24. Note that Python's
1003 http://www.scipy.net/roundup/ipython/issue24. Note that Python's
999 readline uses getattr(), so a simple <TAB> keypress is still
1004 readline uses getattr(), so a simple <TAB> keypress is still
1000 enough to trigger getattr() calls on an object.
1005 enough to trigger getattr() calls on an object.
1001
1006
1002 2005-01-21 Fernando Perez <fperez@colorado.edu>
1007 2005-01-21 Fernando Perez <fperez@colorado.edu>
1003
1008
1004 * IPython/Shell.py (MatplotlibShellBase.magic_run): Fix the %run
1009 * IPython/Shell.py (MatplotlibShellBase.magic_run): Fix the %run
1005 docstring under pylab so it doesn't mask the original.
1010 docstring under pylab so it doesn't mask the original.
1006
1011
1007 2005-01-21 *** Released version 0.6.7
1012 2005-01-21 *** Released version 0.6.7
1008
1013
1009 2005-01-21 Fernando Perez <fperez@colorado.edu>
1014 2005-01-21 Fernando Perez <fperez@colorado.edu>
1010
1015
1011 * IPython/Shell.py (MTInteractiveShell.runcode): Trap a crash with
1016 * IPython/Shell.py (MTInteractiveShell.runcode): Trap a crash with
1012 signal handling for win32 users in multithreaded mode.
1017 signal handling for win32 users in multithreaded mode.
1013
1018
1014 2005-01-17 Fernando Perez <fperez@colorado.edu>
1019 2005-01-17 Fernando Perez <fperez@colorado.edu>
1015
1020
1016 * IPython/OInspect.py (Inspector.pinfo): Fix crash when inspecting
1021 * IPython/OInspect.py (Inspector.pinfo): Fix crash when inspecting
1017 instances with no __init__. After a crash report by Norbert Nemec
1022 instances with no __init__. After a crash report by Norbert Nemec
1018 <Norbert-AT-nemec-online.de>.
1023 <Norbert-AT-nemec-online.de>.
1019
1024
1020 2005-01-14 Fernando Perez <fperez@colorado.edu>
1025 2005-01-14 Fernando Perez <fperez@colorado.edu>
1021
1026
1022 * IPython/ultraTB.py (VerboseTB.text): Fix bug in reporting of
1027 * IPython/ultraTB.py (VerboseTB.text): Fix bug in reporting of
1023 names for verbose exceptions, when multiple dotted names and the
1028 names for verbose exceptions, when multiple dotted names and the
1024 'parent' object were present on the same line.
1029 'parent' object were present on the same line.
1025
1030
1026 2005-01-11 Fernando Perez <fperez@colorado.edu>
1031 2005-01-11 Fernando Perez <fperez@colorado.edu>
1027
1032
1028 * IPython/genutils.py (flag_calls): new utility to trap and flag
1033 * IPython/genutils.py (flag_calls): new utility to trap and flag
1029 calls in functions. I need it to clean up matplotlib support.
1034 calls in functions. I need it to clean up matplotlib support.
1030 Also removed some deprecated code in genutils.
1035 Also removed some deprecated code in genutils.
1031
1036
1032 * IPython/Shell.py (MatplotlibShellBase.mplot_exec): small fix so
1037 * IPython/Shell.py (MatplotlibShellBase.mplot_exec): small fix so
1033 that matplotlib scripts called with %run, which don't call show()
1038 that matplotlib scripts called with %run, which don't call show()
1034 themselves, still have their plotting windows open.
1039 themselves, still have their plotting windows open.
1035
1040
1036 2005-01-05 Fernando Perez <fperez@colorado.edu>
1041 2005-01-05 Fernando Perez <fperez@colorado.edu>
1037
1042
1038 * IPython/Shell.py (IPShellGTK.__init__): Patch by Andrew Straw
1043 * IPython/Shell.py (IPShellGTK.__init__): Patch by Andrew Straw
1039 <astraw-AT-caltech.edu>, to fix gtk deprecation warnings.
1044 <astraw-AT-caltech.edu>, to fix gtk deprecation warnings.
1040
1045
1041 2004-12-19 Fernando Perez <fperez@colorado.edu>
1046 2004-12-19 Fernando Perez <fperez@colorado.edu>
1042
1047
1043 * IPython/Shell.py (MTInteractiveShell.runcode): Get rid of
1048 * IPython/Shell.py (MTInteractiveShell.runcode): Get rid of
1044 parent_runcode, which was an eyesore. The same result can be
1049 parent_runcode, which was an eyesore. The same result can be
1045 obtained with Python's regular superclass mechanisms.
1050 obtained with Python's regular superclass mechanisms.
1046
1051
1047 2004-12-17 Fernando Perez <fperez@colorado.edu>
1052 2004-12-17 Fernando Perez <fperez@colorado.edu>
1048
1053
1049 * IPython/Magic.py (Magic.magic_sc): Fix quote stripping problem
1054 * IPython/Magic.py (Magic.magic_sc): Fix quote stripping problem
1050 reported by Prabhu.
1055 reported by Prabhu.
1051 (Magic.magic_sx): direct all errors to Term.cerr (defaults to
1056 (Magic.magic_sx): direct all errors to Term.cerr (defaults to
1052 sys.stderr) instead of explicitly calling sys.stderr. This helps
1057 sys.stderr) instead of explicitly calling sys.stderr. This helps
1053 maintain our I/O abstractions clean, for future GUI embeddings.
1058 maintain our I/O abstractions clean, for future GUI embeddings.
1054
1059
1055 * IPython/genutils.py (info): added new utility for sys.stderr
1060 * IPython/genutils.py (info): added new utility for sys.stderr
1056 unified info message handling (thin wrapper around warn()).
1061 unified info message handling (thin wrapper around warn()).
1057
1062
1058 * IPython/ultraTB.py (VerboseTB.text): Fix misreported global
1063 * IPython/ultraTB.py (VerboseTB.text): Fix misreported global
1059 composite (dotted) names on verbose exceptions.
1064 composite (dotted) names on verbose exceptions.
1060 (VerboseTB.nullrepr): harden against another kind of errors which
1065 (VerboseTB.nullrepr): harden against another kind of errors which
1061 Python's inspect module can trigger, and which were crashing
1066 Python's inspect module can trigger, and which were crashing
1062 IPython. Thanks to a report by Marco Lombardi
1067 IPython. Thanks to a report by Marco Lombardi
1063 <mlombard-AT-ma010192.hq.eso.org>.
1068 <mlombard-AT-ma010192.hq.eso.org>.
1064
1069
1065 2004-12-13 *** Released version 0.6.6
1070 2004-12-13 *** Released version 0.6.6
1066
1071
1067 2004-12-12 Fernando Perez <fperez@colorado.edu>
1072 2004-12-12 Fernando Perez <fperez@colorado.edu>
1068
1073
1069 * IPython/Shell.py (IPShellGTK.mainloop): catch RuntimeErrors
1074 * IPython/Shell.py (IPShellGTK.mainloop): catch RuntimeErrors
1070 generated by pygtk upon initialization if it was built without
1075 generated by pygtk upon initialization if it was built without
1071 threads (for matplotlib users). After a crash reported by
1076 threads (for matplotlib users). After a crash reported by
1072 Leguijt, Jaap J SIEP-EPT-RES <Jaap.Leguijt-AT-shell.com>.
1077 Leguijt, Jaap J SIEP-EPT-RES <Jaap.Leguijt-AT-shell.com>.
1073
1078
1074 * IPython/ipmaker.py (make_IPython): fix small bug in the
1079 * IPython/ipmaker.py (make_IPython): fix small bug in the
1075 import_some parameter for multiple imports.
1080 import_some parameter for multiple imports.
1076
1081
1077 * IPython/iplib.py (ipmagic): simplified the interface of
1082 * IPython/iplib.py (ipmagic): simplified the interface of
1078 ipmagic() to take a single string argument, just as it would be
1083 ipmagic() to take a single string argument, just as it would be
1079 typed at the IPython cmd line.
1084 typed at the IPython cmd line.
1080 (ipalias): Added new ipalias() with an interface identical to
1085 (ipalias): Added new ipalias() with an interface identical to
1081 ipmagic(). This completes exposing a pure python interface to the
1086 ipmagic(). This completes exposing a pure python interface to the
1082 alias and magic system, which can be used in loops or more complex
1087 alias and magic system, which can be used in loops or more complex
1083 code where IPython's automatic line mangling is not active.
1088 code where IPython's automatic line mangling is not active.
1084
1089
1085 * IPython/genutils.py (timing): changed interface of timing to
1090 * IPython/genutils.py (timing): changed interface of timing to
1086 simply run code once, which is the most common case. timings()
1091 simply run code once, which is the most common case. timings()
1087 remains unchanged, for the cases where you want multiple runs.
1092 remains unchanged, for the cases where you want multiple runs.
1088
1093
1089 * IPython/Shell.py (MatplotlibShellBase._matplotlib_config): Fix a
1094 * IPython/Shell.py (MatplotlibShellBase._matplotlib_config): Fix a
1090 bug where Python2.2 crashes with exec'ing code which does not end
1095 bug where Python2.2 crashes with exec'ing code which does not end
1091 in a single newline. Python 2.3 is OK, so I hadn't noticed this
1096 in a single newline. Python 2.3 is OK, so I hadn't noticed this
1092 before.
1097 before.
1093
1098
1094 2004-12-10 Fernando Perez <fperez@colorado.edu>
1099 2004-12-10 Fernando Perez <fperez@colorado.edu>
1095
1100
1096 * IPython/Magic.py (Magic.magic_prun): changed name of option from
1101 * IPython/Magic.py (Magic.magic_prun): changed name of option from
1097 -t to -T, to accomodate the new -t flag in %run (the %run and
1102 -t to -T, to accomodate the new -t flag in %run (the %run and
1098 %prun options are kind of intermixed, and it's not easy to change
1103 %prun options are kind of intermixed, and it's not easy to change
1099 this with the limitations of python's getopt).
1104 this with the limitations of python's getopt).
1100
1105
1101 * IPython/Magic.py (Magic.magic_run): Added new -t option to time
1106 * IPython/Magic.py (Magic.magic_run): Added new -t option to time
1102 the execution of scripts. It's not as fine-tuned as timeit.py,
1107 the execution of scripts. It's not as fine-tuned as timeit.py,
1103 but it works from inside ipython (and under 2.2, which lacks
1108 but it works from inside ipython (and under 2.2, which lacks
1104 timeit.py). Optionally a number of runs > 1 can be given for
1109 timeit.py). Optionally a number of runs > 1 can be given for
1105 timing very short-running code.
1110 timing very short-running code.
1106
1111
1107 * IPython/genutils.py (uniq_stable): new routine which returns a
1112 * IPython/genutils.py (uniq_stable): new routine which returns a
1108 list of unique elements in any iterable, but in stable order of
1113 list of unique elements in any iterable, but in stable order of
1109 appearance. I needed this for the ultraTB fixes, and it's a handy
1114 appearance. I needed this for the ultraTB fixes, and it's a handy
1110 utility.
1115 utility.
1111
1116
1112 * IPython/ultraTB.py (VerboseTB.text): Fix proper reporting of
1117 * IPython/ultraTB.py (VerboseTB.text): Fix proper reporting of
1113 dotted names in Verbose exceptions. This had been broken since
1118 dotted names in Verbose exceptions. This had been broken since
1114 the very start, now x.y will properly be printed in a Verbose
1119 the very start, now x.y will properly be printed in a Verbose
1115 traceback, instead of x being shown and y appearing always as an
1120 traceback, instead of x being shown and y appearing always as an
1116 'undefined global'. Getting this to work was a bit tricky,
1121 'undefined global'. Getting this to work was a bit tricky,
1117 because by default python tokenizers are stateless. Saved by
1122 because by default python tokenizers are stateless. Saved by
1118 python's ability to easily add a bit of state to an arbitrary
1123 python's ability to easily add a bit of state to an arbitrary
1119 function (without needing to build a full-blown callable object).
1124 function (without needing to build a full-blown callable object).
1120
1125
1121 Also big cleanup of this code, which had horrendous runtime
1126 Also big cleanup of this code, which had horrendous runtime
1122 lookups of zillions of attributes for colorization. Moved all
1127 lookups of zillions of attributes for colorization. Moved all
1123 this code into a few templates, which make it cleaner and quicker.
1128 this code into a few templates, which make it cleaner and quicker.
1124
1129
1125 Printout quality was also improved for Verbose exceptions: one
1130 Printout quality was also improved for Verbose exceptions: one
1126 variable per line, and memory addresses are printed (this can be
1131 variable per line, and memory addresses are printed (this can be
1127 quite handy in nasty debugging situations, which is what Verbose
1132 quite handy in nasty debugging situations, which is what Verbose
1128 is for).
1133 is for).
1129
1134
1130 * IPython/ipmaker.py (make_IPython): Do NOT execute files named in
1135 * IPython/ipmaker.py (make_IPython): Do NOT execute files named in
1131 the command line as scripts to be loaded by embedded instances.
1136 the command line as scripts to be loaded by embedded instances.
1132 Doing so has the potential for an infinite recursion if there are
1137 Doing so has the potential for an infinite recursion if there are
1133 exceptions thrown in the process. This fixes a strange crash
1138 exceptions thrown in the process. This fixes a strange crash
1134 reported by Philippe MULLER <muller-AT-irit.fr>.
1139 reported by Philippe MULLER <muller-AT-irit.fr>.
1135
1140
1136 2004-12-09 Fernando Perez <fperez@colorado.edu>
1141 2004-12-09 Fernando Perez <fperez@colorado.edu>
1137
1142
1138 * IPython/Shell.py (MatplotlibShellBase.use): Change pylab support
1143 * IPython/Shell.py (MatplotlibShellBase.use): Change pylab support
1139 to reflect new names in matplotlib, which now expose the
1144 to reflect new names in matplotlib, which now expose the
1140 matlab-compatible interface via a pylab module instead of the
1145 matlab-compatible interface via a pylab module instead of the
1141 'matlab' name. The new code is backwards compatible, so users of
1146 'matlab' name. The new code is backwards compatible, so users of
1142 all matplotlib versions are OK. Patch by J. Hunter.
1147 all matplotlib versions are OK. Patch by J. Hunter.
1143
1148
1144 * IPython/OInspect.py (Inspector.pinfo): Add to object? printing
1149 * IPython/OInspect.py (Inspector.pinfo): Add to object? printing
1145 of __init__ docstrings for instances (class docstrings are already
1150 of __init__ docstrings for instances (class docstrings are already
1146 automatically printed). Instances with customized docstrings
1151 automatically printed). Instances with customized docstrings
1147 (indep. of the class) are also recognized and all 3 separate
1152 (indep. of the class) are also recognized and all 3 separate
1148 docstrings are printed (instance, class, constructor). After some
1153 docstrings are printed (instance, class, constructor). After some
1149 comments/suggestions by J. Hunter.
1154 comments/suggestions by J. Hunter.
1150
1155
1151 2004-12-05 Fernando Perez <fperez@colorado.edu>
1156 2004-12-05 Fernando Perez <fperez@colorado.edu>
1152
1157
1153 * IPython/iplib.py (MagicCompleter.complete): Remove annoying
1158 * IPython/iplib.py (MagicCompleter.complete): Remove annoying
1154 warnings when tab-completion fails and triggers an exception.
1159 warnings when tab-completion fails and triggers an exception.
1155
1160
1156 2004-12-03 Fernando Perez <fperez@colorado.edu>
1161 2004-12-03 Fernando Perez <fperez@colorado.edu>
1157
1162
1158 * IPython/Magic.py (magic_prun): Fix bug where an exception would
1163 * IPython/Magic.py (magic_prun): Fix bug where an exception would
1159 be triggered when using 'run -p'. An incorrect option flag was
1164 be triggered when using 'run -p'. An incorrect option flag was
1160 being set ('d' instead of 'D').
1165 being set ('d' instead of 'D').
1161 (manpage): fix missing escaped \- sign.
1166 (manpage): fix missing escaped \- sign.
1162
1167
1163 2004-11-30 *** Released version 0.6.5
1168 2004-11-30 *** Released version 0.6.5
1164
1169
1165 2004-11-30 Fernando Perez <fperez@colorado.edu>
1170 2004-11-30 Fernando Perez <fperez@colorado.edu>
1166
1171
1167 * IPython/Magic.py (Magic.magic_run): Fix bug in breakpoint
1172 * IPython/Magic.py (Magic.magic_run): Fix bug in breakpoint
1168 setting with -d option.
1173 setting with -d option.
1169
1174
1170 * setup.py (docfiles): Fix problem where the doc glob I was using
1175 * setup.py (docfiles): Fix problem where the doc glob I was using
1171 was COMPLETELY BROKEN. It was giving the right files by pure
1176 was COMPLETELY BROKEN. It was giving the right files by pure
1172 accident, but failed once I tried to include ipython.el. Note:
1177 accident, but failed once I tried to include ipython.el. Note:
1173 glob() does NOT allow you to do exclusion on multiple endings!
1178 glob() does NOT allow you to do exclusion on multiple endings!
1174
1179
1175 2004-11-29 Fernando Perez <fperez@colorado.edu>
1180 2004-11-29 Fernando Perez <fperez@colorado.edu>
1176
1181
1177 * IPython/usage.py (__doc__): cleaned up usage docstring, by using
1182 * IPython/usage.py (__doc__): cleaned up usage docstring, by using
1178 the manpage as the source. Better formatting & consistency.
1183 the manpage as the source. Better formatting & consistency.
1179
1184
1180 * IPython/Magic.py (magic_run): Added new -d option, to run
1185 * IPython/Magic.py (magic_run): Added new -d option, to run
1181 scripts under the control of the python pdb debugger. Note that
1186 scripts under the control of the python pdb debugger. Note that
1182 this required changing the %prun option -d to -D, to avoid a clash
1187 this required changing the %prun option -d to -D, to avoid a clash
1183 (since %run must pass options to %prun, and getopt is too dumb to
1188 (since %run must pass options to %prun, and getopt is too dumb to
1184 handle options with string values with embedded spaces). Thanks
1189 handle options with string values with embedded spaces). Thanks
1185 to a suggestion by Matthew Arnison <maffew-AT-cat.org.au>.
1190 to a suggestion by Matthew Arnison <maffew-AT-cat.org.au>.
1186 (magic_who_ls): added type matching to %who and %whos, so that one
1191 (magic_who_ls): added type matching to %who and %whos, so that one
1187 can filter their output to only include variables of certain
1192 can filter their output to only include variables of certain
1188 types. Another suggestion by Matthew.
1193 types. Another suggestion by Matthew.
1189 (magic_whos): Added memory summaries in kb and Mb for arrays.
1194 (magic_whos): Added memory summaries in kb and Mb for arrays.
1190 (magic_who): Improve formatting (break lines every 9 vars).
1195 (magic_who): Improve formatting (break lines every 9 vars).
1191
1196
1192 2004-11-28 Fernando Perez <fperez@colorado.edu>
1197 2004-11-28 Fernando Perez <fperez@colorado.edu>
1193
1198
1194 * IPython/Logger.py (Logger.log): Fix bug in syncing the input
1199 * IPython/Logger.py (Logger.log): Fix bug in syncing the input
1195 cache when empty lines were present.
1200 cache when empty lines were present.
1196
1201
1197 2004-11-24 Fernando Perez <fperez@colorado.edu>
1202 2004-11-24 Fernando Perez <fperez@colorado.edu>
1198
1203
1199 * IPython/usage.py (__doc__): document the re-activated threading
1204 * IPython/usage.py (__doc__): document the re-activated threading
1200 options for WX and GTK.
1205 options for WX and GTK.
1201
1206
1202 2004-11-23 Fernando Perez <fperez@colorado.edu>
1207 2004-11-23 Fernando Perez <fperez@colorado.edu>
1203
1208
1204 * IPython/Shell.py (start): Added Prabhu's big patch to reactivate
1209 * IPython/Shell.py (start): Added Prabhu's big patch to reactivate
1205 the -wthread and -gthread options, along with a new -tk one to try
1210 the -wthread and -gthread options, along with a new -tk one to try
1206 and coordinate Tk threading with wx/gtk. The tk support is very
1211 and coordinate Tk threading with wx/gtk. The tk support is very
1207 platform dependent, since it seems to require Tcl and Tk to be
1212 platform dependent, since it seems to require Tcl and Tk to be
1208 built with threads (Fedora1/2 appears NOT to have it, but in
1213 built with threads (Fedora1/2 appears NOT to have it, but in
1209 Prabhu's Debian boxes it works OK). But even with some Tk
1214 Prabhu's Debian boxes it works OK). But even with some Tk
1210 limitations, this is a great improvement.
1215 limitations, this is a great improvement.
1211
1216
1212 * IPython/Prompts.py (prompt_specials_color): Added \t for time
1217 * IPython/Prompts.py (prompt_specials_color): Added \t for time
1213 info in user prompts. Patch by Prabhu.
1218 info in user prompts. Patch by Prabhu.
1214
1219
1215 2004-11-18 Fernando Perez <fperez@colorado.edu>
1220 2004-11-18 Fernando Perez <fperez@colorado.edu>
1216
1221
1217 * IPython/genutils.py (ask_yes_no): Add check for a max of 20
1222 * IPython/genutils.py (ask_yes_no): Add check for a max of 20
1218 EOFErrors and bail, to avoid infinite loops if a non-terminating
1223 EOFErrors and bail, to avoid infinite loops if a non-terminating
1219 file is fed into ipython. Patch submitted in issue 19 by user,
1224 file is fed into ipython. Patch submitted in issue 19 by user,
1220 many thanks.
1225 many thanks.
1221
1226
1222 * IPython/iplib.py (InteractiveShell.handle_auto): do NOT trigger
1227 * IPython/iplib.py (InteractiveShell.handle_auto): do NOT trigger
1223 autoquote/parens in continuation prompts, which can cause lots of
1228 autoquote/parens in continuation prompts, which can cause lots of
1224 problems. Closes roundup issue 20.
1229 problems. Closes roundup issue 20.
1225
1230
1226 2004-11-17 Fernando Perez <fperez@colorado.edu>
1231 2004-11-17 Fernando Perez <fperez@colorado.edu>
1227
1232
1228 * debian/control (Build-Depends-Indep): Fix dpatch dependency,
1233 * debian/control (Build-Depends-Indep): Fix dpatch dependency,
1229 reported as debian bug #280505. I'm not sure my local changelog
1234 reported as debian bug #280505. I'm not sure my local changelog
1230 entry has the proper debian format (Jack?).
1235 entry has the proper debian format (Jack?).
1231
1236
1232 2004-11-08 *** Released version 0.6.4
1237 2004-11-08 *** Released version 0.6.4
1233
1238
1234 2004-11-08 Fernando Perez <fperez@colorado.edu>
1239 2004-11-08 Fernando Perez <fperez@colorado.edu>
1235
1240
1236 * IPython/iplib.py (init_readline): Fix exit message for Windows
1241 * IPython/iplib.py (init_readline): Fix exit message for Windows
1237 when readline is active. Thanks to a report by Eric Jones
1242 when readline is active. Thanks to a report by Eric Jones
1238 <eric-AT-enthought.com>.
1243 <eric-AT-enthought.com>.
1239
1244
1240 2004-11-07 Fernando Perez <fperez@colorado.edu>
1245 2004-11-07 Fernando Perez <fperez@colorado.edu>
1241
1246
1242 * IPython/genutils.py (page): Add a trap for OSError exceptions,
1247 * IPython/genutils.py (page): Add a trap for OSError exceptions,
1243 sometimes seen by win2k/cygwin users.
1248 sometimes seen by win2k/cygwin users.
1244
1249
1245 2004-11-06 Fernando Perez <fperez@colorado.edu>
1250 2004-11-06 Fernando Perez <fperez@colorado.edu>
1246
1251
1247 * IPython/iplib.py (interact): Change the handling of %Exit from
1252 * IPython/iplib.py (interact): Change the handling of %Exit from
1248 trying to propagate a SystemExit to an internal ipython flag.
1253 trying to propagate a SystemExit to an internal ipython flag.
1249 This is less elegant than using Python's exception mechanism, but
1254 This is less elegant than using Python's exception mechanism, but
1250 I can't get that to work reliably with threads, so under -pylab
1255 I can't get that to work reliably with threads, so under -pylab
1251 %Exit was hanging IPython. Cross-thread exception handling is
1256 %Exit was hanging IPython. Cross-thread exception handling is
1252 really a bitch. Thaks to a bug report by Stephen Walton
1257 really a bitch. Thaks to a bug report by Stephen Walton
1253 <stephen.walton-AT-csun.edu>.
1258 <stephen.walton-AT-csun.edu>.
1254
1259
1255 2004-11-04 Fernando Perez <fperez@colorado.edu>
1260 2004-11-04 Fernando Perez <fperez@colorado.edu>
1256
1261
1257 * IPython/iplib.py (raw_input_original): store a pointer to the
1262 * IPython/iplib.py (raw_input_original): store a pointer to the
1258 true raw_input to harden against code which can modify it
1263 true raw_input to harden against code which can modify it
1259 (wx.py.PyShell does this and would otherwise crash ipython).
1264 (wx.py.PyShell does this and would otherwise crash ipython).
1260 Thanks to a bug report by Jim Flowers <james.flowers-AT-lgx.com>.
1265 Thanks to a bug report by Jim Flowers <james.flowers-AT-lgx.com>.
1261
1266
1262 * IPython/Shell.py (MTInteractiveShell.runsource): Cleaner fix for
1267 * IPython/Shell.py (MTInteractiveShell.runsource): Cleaner fix for
1263 Ctrl-C problem, which does not mess up the input line.
1268 Ctrl-C problem, which does not mess up the input line.
1264
1269
1265 2004-11-03 Fernando Perez <fperez@colorado.edu>
1270 2004-11-03 Fernando Perez <fperez@colorado.edu>
1266
1271
1267 * IPython/Release.py: Changed licensing to BSD, in all files.
1272 * IPython/Release.py: Changed licensing to BSD, in all files.
1268 (name): lowercase name for tarball/RPM release.
1273 (name): lowercase name for tarball/RPM release.
1269
1274
1270 * IPython/OInspect.py (getdoc): wrap inspect.getdoc() safely for
1275 * IPython/OInspect.py (getdoc): wrap inspect.getdoc() safely for
1271 use throughout ipython.
1276 use throughout ipython.
1272
1277
1273 * IPython/Magic.py (Magic._ofind): Switch to using the new
1278 * IPython/Magic.py (Magic._ofind): Switch to using the new
1274 OInspect.getdoc() function.
1279 OInspect.getdoc() function.
1275
1280
1276 * IPython/Shell.py (sigint_handler): Hack to ignore the execution
1281 * IPython/Shell.py (sigint_handler): Hack to ignore the execution
1277 of the line currently being canceled via Ctrl-C. It's extremely
1282 of the line currently being canceled via Ctrl-C. It's extremely
1278 ugly, but I don't know how to do it better (the problem is one of
1283 ugly, but I don't know how to do it better (the problem is one of
1279 handling cross-thread exceptions).
1284 handling cross-thread exceptions).
1280
1285
1281 2004-10-28 Fernando Perez <fperez@colorado.edu>
1286 2004-10-28 Fernando Perez <fperez@colorado.edu>
1282
1287
1283 * IPython/Shell.py (signal_handler): add signal handlers to trap
1288 * IPython/Shell.py (signal_handler): add signal handlers to trap
1284 SIGINT and SIGSEGV in threaded code properly. Thanks to a bug
1289 SIGINT and SIGSEGV in threaded code properly. Thanks to a bug
1285 report by Francesc Alted.
1290 report by Francesc Alted.
1286
1291
1287 2004-10-21 Fernando Perez <fperez@colorado.edu>
1292 2004-10-21 Fernando Perez <fperez@colorado.edu>
1288
1293
1289 * IPython/Extensions/InterpreterExec.py (prefilter_shell): Fix @
1294 * IPython/Extensions/InterpreterExec.py (prefilter_shell): Fix @
1290 to % for pysh syntax extensions.
1295 to % for pysh syntax extensions.
1291
1296
1292 2004-10-09 Fernando Perez <fperez@colorado.edu>
1297 2004-10-09 Fernando Perez <fperez@colorado.edu>
1293
1298
1294 * IPython/Magic.py (Magic.magic_whos): modify output of Numeric
1299 * IPython/Magic.py (Magic.magic_whos): modify output of Numeric
1295 arrays to print a more useful summary, without calling str(arr).
1300 arrays to print a more useful summary, without calling str(arr).
1296 This avoids the problem of extremely lengthy computations which
1301 This avoids the problem of extremely lengthy computations which
1297 occur if arr is large, and appear to the user as a system lockup
1302 occur if arr is large, and appear to the user as a system lockup
1298 with 100% cpu activity. After a suggestion by Kristian Sandberg
1303 with 100% cpu activity. After a suggestion by Kristian Sandberg
1299 <Kristian.Sandberg@colorado.edu>.
1304 <Kristian.Sandberg@colorado.edu>.
1300 (Magic.__init__): fix bug in global magic escapes not being
1305 (Magic.__init__): fix bug in global magic escapes not being
1301 correctly set.
1306 correctly set.
1302
1307
1303 2004-10-08 Fernando Perez <fperez@colorado.edu>
1308 2004-10-08 Fernando Perez <fperez@colorado.edu>
1304
1309
1305 * IPython/Magic.py (__license__): change to absolute imports of
1310 * IPython/Magic.py (__license__): change to absolute imports of
1306 ipython's own internal packages, to start adapting to the absolute
1311 ipython's own internal packages, to start adapting to the absolute
1307 import requirement of PEP-328.
1312 import requirement of PEP-328.
1308
1313
1309 * IPython/genutils.py (__author__): Fix coding to utf-8 on all
1314 * IPython/genutils.py (__author__): Fix coding to utf-8 on all
1310 files, and standardize author/license marks through the Release
1315 files, and standardize author/license marks through the Release
1311 module instead of having per/file stuff (except for files with
1316 module instead of having per/file stuff (except for files with
1312 particular licenses, like the MIT/PSF-licensed codes).
1317 particular licenses, like the MIT/PSF-licensed codes).
1313
1318
1314 * IPython/Debugger.py: remove dead code for python 2.1
1319 * IPython/Debugger.py: remove dead code for python 2.1
1315
1320
1316 2004-10-04 Fernando Perez <fperez@colorado.edu>
1321 2004-10-04 Fernando Perez <fperez@colorado.edu>
1317
1322
1318 * IPython/iplib.py (ipmagic): New function for accessing magics
1323 * IPython/iplib.py (ipmagic): New function for accessing magics
1319 via a normal python function call.
1324 via a normal python function call.
1320
1325
1321 * IPython/Magic.py (Magic.magic_magic): Change the magic escape
1326 * IPython/Magic.py (Magic.magic_magic): Change the magic escape
1322 from '@' to '%', to accomodate the new @decorator syntax of python
1327 from '@' to '%', to accomodate the new @decorator syntax of python
1323 2.4.
1328 2.4.
1324
1329
1325 2004-09-29 Fernando Perez <fperez@colorado.edu>
1330 2004-09-29 Fernando Perez <fperez@colorado.edu>
1326
1331
1327 * IPython/Shell.py (MatplotlibShellBase.use): Added a wrapper to
1332 * IPython/Shell.py (MatplotlibShellBase.use): Added a wrapper to
1328 matplotlib.use to prevent running scripts which try to switch
1333 matplotlib.use to prevent running scripts which try to switch
1329 interactive backends from within ipython. This will just crash
1334 interactive backends from within ipython. This will just crash
1330 the python interpreter, so we can't allow it (but a detailed error
1335 the python interpreter, so we can't allow it (but a detailed error
1331 is given to the user).
1336 is given to the user).
1332
1337
1333 2004-09-28 Fernando Perez <fperez@colorado.edu>
1338 2004-09-28 Fernando Perez <fperez@colorado.edu>
1334
1339
1335 * IPython/Shell.py (MatplotlibShellBase.mplot_exec):
1340 * IPython/Shell.py (MatplotlibShellBase.mplot_exec):
1336 matplotlib-related fixes so that using @run with non-matplotlib
1341 matplotlib-related fixes so that using @run with non-matplotlib
1337 scripts doesn't pop up spurious plot windows. This requires
1342 scripts doesn't pop up spurious plot windows. This requires
1338 matplotlib >= 0.63, where I had to make some changes as well.
1343 matplotlib >= 0.63, where I had to make some changes as well.
1339
1344
1340 * IPython/ipmaker.py (make_IPython): update version requirement to
1345 * IPython/ipmaker.py (make_IPython): update version requirement to
1341 python 2.2.
1346 python 2.2.
1342
1347
1343 * IPython/iplib.py (InteractiveShell.mainloop): Add an optional
1348 * IPython/iplib.py (InteractiveShell.mainloop): Add an optional
1344 banner arg for embedded customization.
1349 banner arg for embedded customization.
1345
1350
1346 * IPython/Magic.py (Magic.__init__): big cleanup to remove all
1351 * IPython/Magic.py (Magic.__init__): big cleanup to remove all
1347 explicit uses of __IP as the IPython's instance name. Now things
1352 explicit uses of __IP as the IPython's instance name. Now things
1348 are properly handled via the shell.name value. The actual code
1353 are properly handled via the shell.name value. The actual code
1349 is a bit ugly b/c I'm doing it via a global in Magic.py, but this
1354 is a bit ugly b/c I'm doing it via a global in Magic.py, but this
1350 is much better than before. I'll clean things completely when the
1355 is much better than before. I'll clean things completely when the
1351 magic stuff gets a real overhaul.
1356 magic stuff gets a real overhaul.
1352
1357
1353 * ipython.1: small fixes, sent in by Jack Moffit. He also sent in
1358 * ipython.1: small fixes, sent in by Jack Moffit. He also sent in
1354 minor changes to debian dir.
1359 minor changes to debian dir.
1355
1360
1356 * IPython/iplib.py (InteractiveShell.__init__): Fix adding a
1361 * IPython/iplib.py (InteractiveShell.__init__): Fix adding a
1357 pointer to the shell itself in the interactive namespace even when
1362 pointer to the shell itself in the interactive namespace even when
1358 a user-supplied dict is provided. This is needed for embedding
1363 a user-supplied dict is provided. This is needed for embedding
1359 purposes (found by tests with Michel Sanner).
1364 purposes (found by tests with Michel Sanner).
1360
1365
1361 2004-09-27 Fernando Perez <fperez@colorado.edu>
1366 2004-09-27 Fernando Perez <fperez@colorado.edu>
1362
1367
1363 * IPython/UserConfig/ipythonrc: remove []{} from
1368 * IPython/UserConfig/ipythonrc: remove []{} from
1364 readline_remove_delims, so that things like [modname.<TAB> do
1369 readline_remove_delims, so that things like [modname.<TAB> do
1365 proper completion. This disables [].TAB, but that's a less common
1370 proper completion. This disables [].TAB, but that's a less common
1366 case than module names in list comprehensions, for example.
1371 case than module names in list comprehensions, for example.
1367 Thanks to a report by Andrea Riciputi.
1372 Thanks to a report by Andrea Riciputi.
1368
1373
1369 2004-09-09 Fernando Perez <fperez@colorado.edu>
1374 2004-09-09 Fernando Perez <fperez@colorado.edu>
1370
1375
1371 * IPython/Shell.py (IPShellGTK.mainloop): reorder to avoid
1376 * IPython/Shell.py (IPShellGTK.mainloop): reorder to avoid
1372 blocking problems in win32 and osx. Fix by John.
1377 blocking problems in win32 and osx. Fix by John.
1373
1378
1374 2004-09-08 Fernando Perez <fperez@colorado.edu>
1379 2004-09-08 Fernando Perez <fperez@colorado.edu>
1375
1380
1376 * IPython/Shell.py (IPShellWX.OnInit): Fix output redirection bug
1381 * IPython/Shell.py (IPShellWX.OnInit): Fix output redirection bug
1377 for Win32 and OSX. Fix by John Hunter.
1382 for Win32 and OSX. Fix by John Hunter.
1378
1383
1379 2004-08-30 *** Released version 0.6.3
1384 2004-08-30 *** Released version 0.6.3
1380
1385
1381 2004-08-30 Fernando Perez <fperez@colorado.edu>
1386 2004-08-30 Fernando Perez <fperez@colorado.edu>
1382
1387
1383 * setup.py (isfile): Add manpages to list of dependent files to be
1388 * setup.py (isfile): Add manpages to list of dependent files to be
1384 updated.
1389 updated.
1385
1390
1386 2004-08-27 Fernando Perez <fperez@colorado.edu>
1391 2004-08-27 Fernando Perez <fperez@colorado.edu>
1387
1392
1388 * IPython/Shell.py (start): I've disabled -wthread and -gthread
1393 * IPython/Shell.py (start): I've disabled -wthread and -gthread
1389 for now. They don't really work with standalone WX/GTK code
1394 for now. They don't really work with standalone WX/GTK code
1390 (though matplotlib IS working fine with both of those backends).
1395 (though matplotlib IS working fine with both of those backends).
1391 This will neeed much more testing. I disabled most things with
1396 This will neeed much more testing. I disabled most things with
1392 comments, so turning it back on later should be pretty easy.
1397 comments, so turning it back on later should be pretty easy.
1393
1398
1394 * IPython/iplib.py (InteractiveShell.__init__): Fix accidental
1399 * IPython/iplib.py (InteractiveShell.__init__): Fix accidental
1395 autocalling of expressions like r'foo', by modifying the line
1400 autocalling of expressions like r'foo', by modifying the line
1396 split regexp. Closes
1401 split regexp. Closes
1397 http://www.scipy.net/roundup/ipython/issue18, reported by Nicholas
1402 http://www.scipy.net/roundup/ipython/issue18, reported by Nicholas
1398 Riley <ipythonbugs-AT-sabi.net>.
1403 Riley <ipythonbugs-AT-sabi.net>.
1399 (InteractiveShell.mainloop): honor --nobanner with banner
1404 (InteractiveShell.mainloop): honor --nobanner with banner
1400 extensions.
1405 extensions.
1401
1406
1402 * IPython/Shell.py: Significant refactoring of all classes, so
1407 * IPython/Shell.py: Significant refactoring of all classes, so
1403 that we can really support ALL matplotlib backends and threading
1408 that we can really support ALL matplotlib backends and threading
1404 models (John spotted a bug with Tk which required this). Now we
1409 models (John spotted a bug with Tk which required this). Now we
1405 should support single-threaded, WX-threads and GTK-threads, both
1410 should support single-threaded, WX-threads and GTK-threads, both
1406 for generic code and for matplotlib.
1411 for generic code and for matplotlib.
1407
1412
1408 * IPython/ipmaker.py (__call__): Changed -mpthread option to
1413 * IPython/ipmaker.py (__call__): Changed -mpthread option to
1409 -pylab, to simplify things for users. Will also remove the pylab
1414 -pylab, to simplify things for users. Will also remove the pylab
1410 profile, since now all of matplotlib configuration is directly
1415 profile, since now all of matplotlib configuration is directly
1411 handled here. This also reduces startup time.
1416 handled here. This also reduces startup time.
1412
1417
1413 * IPython/Shell.py (IPShellGTK.run): Fixed bug where mainloop() of
1418 * IPython/Shell.py (IPShellGTK.run): Fixed bug where mainloop() of
1414 shell wasn't being correctly called. Also in IPShellWX.
1419 shell wasn't being correctly called. Also in IPShellWX.
1415
1420
1416 * IPython/iplib.py (InteractiveShell.__init__): Added option to
1421 * IPython/iplib.py (InteractiveShell.__init__): Added option to
1417 fine-tune banner.
1422 fine-tune banner.
1418
1423
1419 * IPython/numutils.py (spike): Deprecate these spike functions,
1424 * IPython/numutils.py (spike): Deprecate these spike functions,
1420 delete (long deprecated) gnuplot_exec handler.
1425 delete (long deprecated) gnuplot_exec handler.
1421
1426
1422 2004-08-26 Fernando Perez <fperez@colorado.edu>
1427 2004-08-26 Fernando Perez <fperez@colorado.edu>
1423
1428
1424 * ipython.1: Update for threading options, plus some others which
1429 * ipython.1: Update for threading options, plus some others which
1425 were missing.
1430 were missing.
1426
1431
1427 * IPython/ipmaker.py (__call__): Added -wthread option for
1432 * IPython/ipmaker.py (__call__): Added -wthread option for
1428 wxpython thread handling. Make sure threading options are only
1433 wxpython thread handling. Make sure threading options are only
1429 valid at the command line.
1434 valid at the command line.
1430
1435
1431 * scripts/ipython: moved shell selection into a factory function
1436 * scripts/ipython: moved shell selection into a factory function
1432 in Shell.py, to keep the starter script to a minimum.
1437 in Shell.py, to keep the starter script to a minimum.
1433
1438
1434 2004-08-25 Fernando Perez <fperez@colorado.edu>
1439 2004-08-25 Fernando Perez <fperez@colorado.edu>
1435
1440
1436 * IPython/Shell.py (IPShellWX.wxexit): fixes to WX threading, by
1441 * IPython/Shell.py (IPShellWX.wxexit): fixes to WX threading, by
1437 John. Along with some recent changes he made to matplotlib, the
1442 John. Along with some recent changes he made to matplotlib, the
1438 next versions of both systems should work very well together.
1443 next versions of both systems should work very well together.
1439
1444
1440 2004-08-24 Fernando Perez <fperez@colorado.edu>
1445 2004-08-24 Fernando Perez <fperez@colorado.edu>
1441
1446
1442 * IPython/Magic.py (Magic.magic_prun): cleanup some dead code. I
1447 * IPython/Magic.py (Magic.magic_prun): cleanup some dead code. I
1443 tried to switch the profiling to using hotshot, but I'm getting
1448 tried to switch the profiling to using hotshot, but I'm getting
1444 strange errors from prof.runctx() there. I may be misreading the
1449 strange errors from prof.runctx() there. I may be misreading the
1445 docs, but it looks weird. For now the profiling code will
1450 docs, but it looks weird. For now the profiling code will
1446 continue to use the standard profiler.
1451 continue to use the standard profiler.
1447
1452
1448 2004-08-23 Fernando Perez <fperez@colorado.edu>
1453 2004-08-23 Fernando Perez <fperez@colorado.edu>
1449
1454
1450 * IPython/Shell.py (IPShellWX.__init__): Improvements to the WX
1455 * IPython/Shell.py (IPShellWX.__init__): Improvements to the WX
1451 threaded shell, by John Hunter. It's not quite ready yet, but
1456 threaded shell, by John Hunter. It's not quite ready yet, but
1452 close.
1457 close.
1453
1458
1454 2004-08-22 Fernando Perez <fperez@colorado.edu>
1459 2004-08-22 Fernando Perez <fperez@colorado.edu>
1455
1460
1456 * IPython/iplib.py (InteractiveShell.interact): tab cleanups, also
1461 * IPython/iplib.py (InteractiveShell.interact): tab cleanups, also
1457 in Magic and ultraTB.
1462 in Magic and ultraTB.
1458
1463
1459 * ipython.1: document threading options in manpage.
1464 * ipython.1: document threading options in manpage.
1460
1465
1461 * scripts/ipython: Changed name of -thread option to -gthread,
1466 * scripts/ipython: Changed name of -thread option to -gthread,
1462 since this is GTK specific. I want to leave the door open for a
1467 since this is GTK specific. I want to leave the door open for a
1463 -wthread option for WX, which will most likely be necessary. This
1468 -wthread option for WX, which will most likely be necessary. This
1464 change affects usage and ipmaker as well.
1469 change affects usage and ipmaker as well.
1465
1470
1466 * IPython/Shell.py (matplotlib_shell): Add a factory function to
1471 * IPython/Shell.py (matplotlib_shell): Add a factory function to
1467 handle the matplotlib shell issues. Code by John Hunter
1472 handle the matplotlib shell issues. Code by John Hunter
1468 <jdhunter-AT-nitace.bsd.uchicago.edu>.
1473 <jdhunter-AT-nitace.bsd.uchicago.edu>.
1469 (IPShellMatplotlibWX.__init__): Rudimentary WX support. It's
1474 (IPShellMatplotlibWX.__init__): Rudimentary WX support. It's
1470 broken (and disabled for end users) for now, but it puts the
1475 broken (and disabled for end users) for now, but it puts the
1471 infrastructure in place.
1476 infrastructure in place.
1472
1477
1473 2004-08-21 Fernando Perez <fperez@colorado.edu>
1478 2004-08-21 Fernando Perez <fperez@colorado.edu>
1474
1479
1475 * ipythonrc-pylab: Add matplotlib support.
1480 * ipythonrc-pylab: Add matplotlib support.
1476
1481
1477 * matplotlib_config.py: new files for matplotlib support, part of
1482 * matplotlib_config.py: new files for matplotlib support, part of
1478 the pylab profile.
1483 the pylab profile.
1479
1484
1480 * IPython/usage.py (__doc__): documented the threading options.
1485 * IPython/usage.py (__doc__): documented the threading options.
1481
1486
1482 2004-08-20 Fernando Perez <fperez@colorado.edu>
1487 2004-08-20 Fernando Perez <fperez@colorado.edu>
1483
1488
1484 * ipython: Modified the main calling routine to handle the -thread
1489 * ipython: Modified the main calling routine to handle the -thread
1485 and -mpthread options. This needs to be done as a top-level hack,
1490 and -mpthread options. This needs to be done as a top-level hack,
1486 because it determines which class to instantiate for IPython
1491 because it determines which class to instantiate for IPython
1487 itself.
1492 itself.
1488
1493
1489 * IPython/Shell.py (MTInteractiveShell.__init__): New set of
1494 * IPython/Shell.py (MTInteractiveShell.__init__): New set of
1490 classes to support multithreaded GTK operation without blocking,
1495 classes to support multithreaded GTK operation without blocking,
1491 and matplotlib with all backends. This is a lot of still very
1496 and matplotlib with all backends. This is a lot of still very
1492 experimental code, and threads are tricky. So it may still have a
1497 experimental code, and threads are tricky. So it may still have a
1493 few rough edges... This code owes a lot to
1498 few rough edges... This code owes a lot to
1494 http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/65109, by
1499 http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/65109, by
1495 Brian # McErlean and John Finlay, to Antoon Pardon for fixes, and
1500 Brian # McErlean and John Finlay, to Antoon Pardon for fixes, and
1496 to John Hunter for all the matplotlib work.
1501 to John Hunter for all the matplotlib work.
1497
1502
1498 * IPython/ipmaker.py (__call__): Added -thread and -mpthread
1503 * IPython/ipmaker.py (__call__): Added -thread and -mpthread
1499 options for gtk thread and matplotlib support.
1504 options for gtk thread and matplotlib support.
1500
1505
1501 2004-08-16 Fernando Perez <fperez@colorado.edu>
1506 2004-08-16 Fernando Perez <fperez@colorado.edu>
1502
1507
1503 * IPython/iplib.py (InteractiveShell.__init__): don't trigger
1508 * IPython/iplib.py (InteractiveShell.__init__): don't trigger
1504 autocall for things like p*q,p/q,p+q,p-q, when p is callable. Bug
1509 autocall for things like p*q,p/q,p+q,p-q, when p is callable. Bug
1505 reported by Stephen Walton <stephen.walton-AT-csun.edu>.
1510 reported by Stephen Walton <stephen.walton-AT-csun.edu>.
1506
1511
1507 2004-08-11 Fernando Perez <fperez@colorado.edu>
1512 2004-08-11 Fernando Perez <fperez@colorado.edu>
1508
1513
1509 * setup.py (isfile): Fix build so documentation gets updated for
1514 * setup.py (isfile): Fix build so documentation gets updated for
1510 rpms (it was only done for .tgz builds).
1515 rpms (it was only done for .tgz builds).
1511
1516
1512 2004-08-10 Fernando Perez <fperez@colorado.edu>
1517 2004-08-10 Fernando Perez <fperez@colorado.edu>
1513
1518
1514 * genutils.py (Term): Fix misspell of stdin stream (sin->cin).
1519 * genutils.py (Term): Fix misspell of stdin stream (sin->cin).
1515
1520
1516 * iplib.py : Silence syntax error exceptions in tab-completion.
1521 * iplib.py : Silence syntax error exceptions in tab-completion.
1517
1522
1518 2004-08-05 Fernando Perez <fperez@colorado.edu>
1523 2004-08-05 Fernando Perez <fperez@colorado.edu>
1519
1524
1520 * IPython/Prompts.py (Prompt2.set_colors): Fix incorrectly set
1525 * IPython/Prompts.py (Prompt2.set_colors): Fix incorrectly set
1521 'color off' mark for continuation prompts. This was causing long
1526 'color off' mark for continuation prompts. This was causing long
1522 continuation lines to mis-wrap.
1527 continuation lines to mis-wrap.
1523
1528
1524 2004-08-01 Fernando Perez <fperez@colorado.edu>
1529 2004-08-01 Fernando Perez <fperez@colorado.edu>
1525
1530
1526 * IPython/ipmaker.py (make_IPython): Allow the shell class used
1531 * IPython/ipmaker.py (make_IPython): Allow the shell class used
1527 for building ipython to be a parameter. All this is necessary
1532 for building ipython to be a parameter. All this is necessary
1528 right now to have a multithreaded version, but this insane
1533 right now to have a multithreaded version, but this insane
1529 non-design will be cleaned up soon. For now, it's a hack that
1534 non-design will be cleaned up soon. For now, it's a hack that
1530 works.
1535 works.
1531
1536
1532 * IPython/Shell.py (IPShell.__init__): Stop using mutable default
1537 * IPython/Shell.py (IPShell.__init__): Stop using mutable default
1533 args in various places. No bugs so far, but it's a dangerous
1538 args in various places. No bugs so far, but it's a dangerous
1534 practice.
1539 practice.
1535
1540
1536 2004-07-31 Fernando Perez <fperez@colorado.edu>
1541 2004-07-31 Fernando Perez <fperez@colorado.edu>
1537
1542
1538 * IPython/iplib.py (complete): ignore SyntaxError exceptions to
1543 * IPython/iplib.py (complete): ignore SyntaxError exceptions to
1539 fix completion of files with dots in their names under most
1544 fix completion of files with dots in their names under most
1540 profiles (pysh was OK because the completion order is different).
1545 profiles (pysh was OK because the completion order is different).
1541
1546
1542 2004-07-27 Fernando Perez <fperez@colorado.edu>
1547 2004-07-27 Fernando Perez <fperez@colorado.edu>
1543
1548
1544 * IPython/iplib.py (InteractiveShell.__init__): build dict of
1549 * IPython/iplib.py (InteractiveShell.__init__): build dict of
1545 keywords manually, b/c the one in keyword.py was removed in python
1550 keywords manually, b/c the one in keyword.py was removed in python
1546 2.4. Patch by Anakim Border <aborder-AT-users.sourceforge.net>.
1551 2.4. Patch by Anakim Border <aborder-AT-users.sourceforge.net>.
1547 This is NOT a bug under python 2.3 and earlier.
1552 This is NOT a bug under python 2.3 and earlier.
1548
1553
1549 2004-07-26 Fernando Perez <fperez@colorado.edu>
1554 2004-07-26 Fernando Perez <fperez@colorado.edu>
1550
1555
1551 * IPython/ultraTB.py (VerboseTB.text): Add another
1556 * IPython/ultraTB.py (VerboseTB.text): Add another
1552 linecache.checkcache() call to try to prevent inspect.py from
1557 linecache.checkcache() call to try to prevent inspect.py from
1553 crashing under python 2.3. I think this fixes
1558 crashing under python 2.3. I think this fixes
1554 http://www.scipy.net/roundup/ipython/issue17.
1559 http://www.scipy.net/roundup/ipython/issue17.
1555
1560
1556 2004-07-26 *** Released version 0.6.2
1561 2004-07-26 *** Released version 0.6.2
1557
1562
1558 2004-07-26 Fernando Perez <fperez@colorado.edu>
1563 2004-07-26 Fernando Perez <fperez@colorado.edu>
1559
1564
1560 * IPython/Magic.py (Magic.magic_cd): Fix bug where 'cd -N' would
1565 * IPython/Magic.py (Magic.magic_cd): Fix bug where 'cd -N' would
1561 fail for any number.
1566 fail for any number.
1562 (Magic.magic_bookmark): Fix bug where 'bookmark -l' would fail for
1567 (Magic.magic_bookmark): Fix bug where 'bookmark -l' would fail for
1563 empty bookmarks.
1568 empty bookmarks.
1564
1569
1565 2004-07-26 *** Released version 0.6.1
1570 2004-07-26 *** Released version 0.6.1
1566
1571
1567 2004-07-26 Fernando Perez <fperez@colorado.edu>
1572 2004-07-26 Fernando Perez <fperez@colorado.edu>
1568
1573
1569 * ipython_win_post_install.py (run): Added pysh shortcut for Windows.
1574 * ipython_win_post_install.py (run): Added pysh shortcut for Windows.
1570
1575
1571 * IPython/iplib.py (protect_filename): Applied Ville's patch for
1576 * IPython/iplib.py (protect_filename): Applied Ville's patch for
1572 escaping '()[]{}' in filenames.
1577 escaping '()[]{}' in filenames.
1573
1578
1574 * IPython/Magic.py (shlex_split): Fix handling of '*' and '?' for
1579 * IPython/Magic.py (shlex_split): Fix handling of '*' and '?' for
1575 Python 2.2 users who lack a proper shlex.split.
1580 Python 2.2 users who lack a proper shlex.split.
1576
1581
1577 2004-07-19 Fernando Perez <fperez@colorado.edu>
1582 2004-07-19 Fernando Perez <fperez@colorado.edu>
1578
1583
1579 * IPython/iplib.py (InteractiveShell.init_readline): Add support
1584 * IPython/iplib.py (InteractiveShell.init_readline): Add support
1580 for reading readline's init file. I follow the normal chain:
1585 for reading readline's init file. I follow the normal chain:
1581 $INPUTRC is honored, otherwise ~/.inputrc is used. Thanks to a
1586 $INPUTRC is honored, otherwise ~/.inputrc is used. Thanks to a
1582 report by Mike Heeter. This closes
1587 report by Mike Heeter. This closes
1583 http://www.scipy.net/roundup/ipython/issue16.
1588 http://www.scipy.net/roundup/ipython/issue16.
1584
1589
1585 2004-07-18 Fernando Perez <fperez@colorado.edu>
1590 2004-07-18 Fernando Perez <fperez@colorado.edu>
1586
1591
1587 * IPython/iplib.py (__init__): Add better handling of '\' under
1592 * IPython/iplib.py (__init__): Add better handling of '\' under
1588 Win32 for filenames. After a patch by Ville.
1593 Win32 for filenames. After a patch by Ville.
1589
1594
1590 2004-07-17 Fernando Perez <fperez@colorado.edu>
1595 2004-07-17 Fernando Perez <fperez@colorado.edu>
1591
1596
1592 * IPython/iplib.py (InteractiveShell._prefilter): fix bug where
1597 * IPython/iplib.py (InteractiveShell._prefilter): fix bug where
1593 autocalling would be triggered for 'foo is bar' if foo is
1598 autocalling would be triggered for 'foo is bar' if foo is
1594 callable. I also cleaned up the autocall detection code to use a
1599 callable. I also cleaned up the autocall detection code to use a
1595 regexp, which is faster. Bug reported by Alexander Schmolck.
1600 regexp, which is faster. Bug reported by Alexander Schmolck.
1596
1601
1597 * IPython/Magic.py (Magic.magic_pinfo): Fix bug where strings with
1602 * IPython/Magic.py (Magic.magic_pinfo): Fix bug where strings with
1598 '?' in them would confuse the help system. Reported by Alex
1603 '?' in them would confuse the help system. Reported by Alex
1599 Schmolck.
1604 Schmolck.
1600
1605
1601 2004-07-16 Fernando Perez <fperez@colorado.edu>
1606 2004-07-16 Fernando Perez <fperez@colorado.edu>
1602
1607
1603 * IPython/GnuplotInteractive.py (__all__): added plot2.
1608 * IPython/GnuplotInteractive.py (__all__): added plot2.
1604
1609
1605 * IPython/Gnuplot2.py (Gnuplot.plot2): added new function for
1610 * IPython/Gnuplot2.py (Gnuplot.plot2): added new function for
1606 plotting dictionaries, lists or tuples of 1d arrays.
1611 plotting dictionaries, lists or tuples of 1d arrays.
1607
1612
1608 * IPython/Magic.py (Magic.magic_hist): small clenaups and
1613 * IPython/Magic.py (Magic.magic_hist): small clenaups and
1609 optimizations.
1614 optimizations.
1610
1615
1611 * IPython/iplib.py:Remove old Changelog info for cleanup. This is
1616 * IPython/iplib.py:Remove old Changelog info for cleanup. This is
1612 the information which was there from Janko's original IPP code:
1617 the information which was there from Janko's original IPP code:
1613
1618
1614 03.05.99 20:53 porto.ifm.uni-kiel.de
1619 03.05.99 20:53 porto.ifm.uni-kiel.de
1615 --Started changelog.
1620 --Started changelog.
1616 --make clear do what it say it does
1621 --make clear do what it say it does
1617 --added pretty output of lines from inputcache
1622 --added pretty output of lines from inputcache
1618 --Made Logger a mixin class, simplifies handling of switches
1623 --Made Logger a mixin class, simplifies handling of switches
1619 --Added own completer class. .string<TAB> expands to last history
1624 --Added own completer class. .string<TAB> expands to last history
1620 line which starts with string. The new expansion is also present
1625 line which starts with string. The new expansion is also present
1621 with Ctrl-r from the readline library. But this shows, who this
1626 with Ctrl-r from the readline library. But this shows, who this
1622 can be done for other cases.
1627 can be done for other cases.
1623 --Added convention that all shell functions should accept a
1628 --Added convention that all shell functions should accept a
1624 parameter_string This opens the door for different behaviour for
1629 parameter_string This opens the door for different behaviour for
1625 each function. @cd is a good example of this.
1630 each function. @cd is a good example of this.
1626
1631
1627 04.05.99 12:12 porto.ifm.uni-kiel.de
1632 04.05.99 12:12 porto.ifm.uni-kiel.de
1628 --added logfile rotation
1633 --added logfile rotation
1629 --added new mainloop method which freezes first the namespace
1634 --added new mainloop method which freezes first the namespace
1630
1635
1631 07.05.99 21:24 porto.ifm.uni-kiel.de
1636 07.05.99 21:24 porto.ifm.uni-kiel.de
1632 --added the docreader classes. Now there is a help system.
1637 --added the docreader classes. Now there is a help system.
1633 -This is only a first try. Currently it's not easy to put new
1638 -This is only a first try. Currently it's not easy to put new
1634 stuff in the indices. But this is the way to go. Info would be
1639 stuff in the indices. But this is the way to go. Info would be
1635 better, but HTML is every where and not everybody has an info
1640 better, but HTML is every where and not everybody has an info
1636 system installed and it's not so easy to change html-docs to info.
1641 system installed and it's not so easy to change html-docs to info.
1637 --added global logfile option
1642 --added global logfile option
1638 --there is now a hook for object inspection method pinfo needs to
1643 --there is now a hook for object inspection method pinfo needs to
1639 be provided for this. Can be reached by two '??'.
1644 be provided for this. Can be reached by two '??'.
1640
1645
1641 08.05.99 20:51 porto.ifm.uni-kiel.de
1646 08.05.99 20:51 porto.ifm.uni-kiel.de
1642 --added a README
1647 --added a README
1643 --bug in rc file. Something has changed so functions in the rc
1648 --bug in rc file. Something has changed so functions in the rc
1644 file need to reference the shell and not self. Not clear if it's a
1649 file need to reference the shell and not self. Not clear if it's a
1645 bug or feature.
1650 bug or feature.
1646 --changed rc file for new behavior
1651 --changed rc file for new behavior
1647
1652
1648 2004-07-15 Fernando Perez <fperez@colorado.edu>
1653 2004-07-15 Fernando Perez <fperez@colorado.edu>
1649
1654
1650 * IPython/Logger.py (Logger.log): fixed recent bug where the input
1655 * IPython/Logger.py (Logger.log): fixed recent bug where the input
1651 cache was falling out of sync in bizarre manners when multi-line
1656 cache was falling out of sync in bizarre manners when multi-line
1652 input was present. Minor optimizations and cleanup.
1657 input was present. Minor optimizations and cleanup.
1653
1658
1654 (Logger): Remove old Changelog info for cleanup. This is the
1659 (Logger): Remove old Changelog info for cleanup. This is the
1655 information which was there from Janko's original code:
1660 information which was there from Janko's original code:
1656
1661
1657 Changes to Logger: - made the default log filename a parameter
1662 Changes to Logger: - made the default log filename a parameter
1658
1663
1659 - put a check for lines beginning with !@? in log(). Needed
1664 - put a check for lines beginning with !@? in log(). Needed
1660 (even if the handlers properly log their lines) for mid-session
1665 (even if the handlers properly log their lines) for mid-session
1661 logging activation to work properly. Without this, lines logged
1666 logging activation to work properly. Without this, lines logged
1662 in mid session, which get read from the cache, would end up
1667 in mid session, which get read from the cache, would end up
1663 'bare' (with !@? in the open) in the log. Now they are caught
1668 'bare' (with !@? in the open) in the log. Now they are caught
1664 and prepended with a #.
1669 and prepended with a #.
1665
1670
1666 * IPython/iplib.py (InteractiveShell.init_readline): added check
1671 * IPython/iplib.py (InteractiveShell.init_readline): added check
1667 in case MagicCompleter fails to be defined, so we don't crash.
1672 in case MagicCompleter fails to be defined, so we don't crash.
1668
1673
1669 2004-07-13 Fernando Perez <fperez@colorado.edu>
1674 2004-07-13 Fernando Perez <fperez@colorado.edu>
1670
1675
1671 * IPython/Gnuplot2.py (Gnuplot.hardcopy): add automatic generation
1676 * IPython/Gnuplot2.py (Gnuplot.hardcopy): add automatic generation
1672 of EPS if the requested filename ends in '.eps'.
1677 of EPS if the requested filename ends in '.eps'.
1673
1678
1674 2004-07-04 Fernando Perez <fperez@colorado.edu>
1679 2004-07-04 Fernando Perez <fperez@colorado.edu>
1675
1680
1676 * IPython/iplib.py (InteractiveShell.handle_shell_escape): Fix
1681 * IPython/iplib.py (InteractiveShell.handle_shell_escape): Fix
1677 escaping of quotes when calling the shell.
1682 escaping of quotes when calling the shell.
1678
1683
1679 2004-07-02 Fernando Perez <fperez@colorado.edu>
1684 2004-07-02 Fernando Perez <fperez@colorado.edu>
1680
1685
1681 * IPython/Prompts.py (CachedOutput.update): Fix problem with
1686 * IPython/Prompts.py (CachedOutput.update): Fix problem with
1682 gettext not working because we were clobbering '_'. Fixes
1687 gettext not working because we were clobbering '_'. Fixes
1683 http://www.scipy.net/roundup/ipython/issue6.
1688 http://www.scipy.net/roundup/ipython/issue6.
1684
1689
1685 2004-07-01 Fernando Perez <fperez@colorado.edu>
1690 2004-07-01 Fernando Perez <fperez@colorado.edu>
1686
1691
1687 * IPython/Magic.py (Magic.magic_cd): integrated bookmark handling
1692 * IPython/Magic.py (Magic.magic_cd): integrated bookmark handling
1688 into @cd. Patch by Ville.
1693 into @cd. Patch by Ville.
1689
1694
1690 * IPython/iplib.py (InteractiveShell.post_config_initialization):
1695 * IPython/iplib.py (InteractiveShell.post_config_initialization):
1691 new function to store things after ipmaker runs. Patch by Ville.
1696 new function to store things after ipmaker runs. Patch by Ville.
1692 Eventually this will go away once ipmaker is removed and the class
1697 Eventually this will go away once ipmaker is removed and the class
1693 gets cleaned up, but for now it's ok. Key functionality here is
1698 gets cleaned up, but for now it's ok. Key functionality here is
1694 the addition of the persistent storage mechanism, a dict for
1699 the addition of the persistent storage mechanism, a dict for
1695 keeping data across sessions (for now just bookmarks, but more can
1700 keeping data across sessions (for now just bookmarks, but more can
1696 be implemented later).
1701 be implemented later).
1697
1702
1698 * IPython/Magic.py (Magic.magic_bookmark): New bookmark system,
1703 * IPython/Magic.py (Magic.magic_bookmark): New bookmark system,
1699 persistent across sections. Patch by Ville, I modified it
1704 persistent across sections. Patch by Ville, I modified it
1700 soemwhat to allow bookmarking arbitrary dirs other than CWD. Also
1705 soemwhat to allow bookmarking arbitrary dirs other than CWD. Also
1701 added a '-l' option to list all bookmarks.
1706 added a '-l' option to list all bookmarks.
1702
1707
1703 * IPython/iplib.py (InteractiveShell.atexit_operations): new
1708 * IPython/iplib.py (InteractiveShell.atexit_operations): new
1704 center for cleanup. Registered with atexit.register(). I moved
1709 center for cleanup. Registered with atexit.register(). I moved
1705 here the old exit_cleanup(). After a patch by Ville.
1710 here the old exit_cleanup(). After a patch by Ville.
1706
1711
1707 * IPython/Magic.py (get_py_filename): added '~' to the accepted
1712 * IPython/Magic.py (get_py_filename): added '~' to the accepted
1708 characters in the hacked shlex_split for python 2.2.
1713 characters in the hacked shlex_split for python 2.2.
1709
1714
1710 * IPython/iplib.py (file_matches): more fixes to filenames with
1715 * IPython/iplib.py (file_matches): more fixes to filenames with
1711 whitespace in them. It's not perfect, but limitations in python's
1716 whitespace in them. It's not perfect, but limitations in python's
1712 readline make it impossible to go further.
1717 readline make it impossible to go further.
1713
1718
1714 2004-06-29 Fernando Perez <fperez@colorado.edu>
1719 2004-06-29 Fernando Perez <fperez@colorado.edu>
1715
1720
1716 * IPython/iplib.py (file_matches): escape whitespace correctly in
1721 * IPython/iplib.py (file_matches): escape whitespace correctly in
1717 filename completions. Bug reported by Ville.
1722 filename completions. Bug reported by Ville.
1718
1723
1719 2004-06-28 Fernando Perez <fperez@colorado.edu>
1724 2004-06-28 Fernando Perez <fperez@colorado.edu>
1720
1725
1721 * IPython/ipmaker.py (__call__): Added per-profile histories. Now
1726 * IPython/ipmaker.py (__call__): Added per-profile histories. Now
1722 the history file will be called 'history-PROFNAME' (or just
1727 the history file will be called 'history-PROFNAME' (or just
1723 'history' if no profile is loaded). I was getting annoyed at
1728 'history' if no profile is loaded). I was getting annoyed at
1724 getting my Numerical work history clobbered by pysh sessions.
1729 getting my Numerical work history clobbered by pysh sessions.
1725
1730
1726 * IPython/iplib.py (InteractiveShell.__init__): Internal
1731 * IPython/iplib.py (InteractiveShell.__init__): Internal
1727 getoutputerror() function so that we can honor the system_verbose
1732 getoutputerror() function so that we can honor the system_verbose
1728 flag for _all_ system calls. I also added escaping of #
1733 flag for _all_ system calls. I also added escaping of #
1729 characters here to avoid confusing Itpl.
1734 characters here to avoid confusing Itpl.
1730
1735
1731 * IPython/Magic.py (shlex_split): removed call to shell in
1736 * IPython/Magic.py (shlex_split): removed call to shell in
1732 parse_options and replaced it with shlex.split(). The annoying
1737 parse_options and replaced it with shlex.split(). The annoying
1733 part was that in Python 2.2, shlex.split() doesn't exist, so I had
1738 part was that in Python 2.2, shlex.split() doesn't exist, so I had
1734 to backport it from 2.3, with several frail hacks (the shlex
1739 to backport it from 2.3, with several frail hacks (the shlex
1735 module is rather limited in 2.2). Thanks to a suggestion by Ville
1740 module is rather limited in 2.2). Thanks to a suggestion by Ville
1736 Vainio <vivainio@kolumbus.fi>. For Python 2.3 there should be no
1741 Vainio <vivainio@kolumbus.fi>. For Python 2.3 there should be no
1737 problem.
1742 problem.
1738
1743
1739 (Magic.magic_system_verbose): new toggle to print the actual
1744 (Magic.magic_system_verbose): new toggle to print the actual
1740 system calls made by ipython. Mainly for debugging purposes.
1745 system calls made by ipython. Mainly for debugging purposes.
1741
1746
1742 * IPython/GnuplotRuntime.py (gnu_out): fix bug for cygwin, which
1747 * IPython/GnuplotRuntime.py (gnu_out): fix bug for cygwin, which
1743 doesn't support persistence. Reported (and fix suggested) by
1748 doesn't support persistence. Reported (and fix suggested) by
1744 Travis Caldwell <travis_caldwell2000@yahoo.com>.
1749 Travis Caldwell <travis_caldwell2000@yahoo.com>.
1745
1750
1746 2004-06-26 Fernando Perez <fperez@colorado.edu>
1751 2004-06-26 Fernando Perez <fperez@colorado.edu>
1747
1752
1748 * IPython/Logger.py (Logger.log): fix to handle correctly empty
1753 * IPython/Logger.py (Logger.log): fix to handle correctly empty
1749 continue prompts.
1754 continue prompts.
1750
1755
1751 * IPython/Extensions/InterpreterExec.py (pysh): moved the pysh()
1756 * IPython/Extensions/InterpreterExec.py (pysh): moved the pysh()
1752 function (basically a big docstring) and a few more things here to
1757 function (basically a big docstring) and a few more things here to
1753 speedup startup. pysh.py is now very lightweight. We want because
1758 speedup startup. pysh.py is now very lightweight. We want because
1754 it gets execfile'd, while InterpreterExec gets imported, so
1759 it gets execfile'd, while InterpreterExec gets imported, so
1755 byte-compilation saves time.
1760 byte-compilation saves time.
1756
1761
1757 2004-06-25 Fernando Perez <fperez@colorado.edu>
1762 2004-06-25 Fernando Perez <fperez@colorado.edu>
1758
1763
1759 * IPython/Magic.py (Magic.magic_cd): Fixed to restore usage of 'cd
1764 * IPython/Magic.py (Magic.magic_cd): Fixed to restore usage of 'cd
1760 -NUM', which was recently broken.
1765 -NUM', which was recently broken.
1761
1766
1762 * IPython/iplib.py (InteractiveShell.handle_shell_escape): allow !
1767 * IPython/iplib.py (InteractiveShell.handle_shell_escape): allow !
1763 in multi-line input (but not !!, which doesn't make sense there).
1768 in multi-line input (but not !!, which doesn't make sense there).
1764
1769
1765 * IPython/UserConfig/ipythonrc: made autoindent on by default.
1770 * IPython/UserConfig/ipythonrc: made autoindent on by default.
1766 It's just too useful, and people can turn it off in the less
1771 It's just too useful, and people can turn it off in the less
1767 common cases where it's a problem.
1772 common cases where it's a problem.
1768
1773
1769 2004-06-24 Fernando Perez <fperez@colorado.edu>
1774 2004-06-24 Fernando Perez <fperez@colorado.edu>
1770
1775
1771 * IPython/iplib.py (InteractiveShell._prefilter): big change -
1776 * IPython/iplib.py (InteractiveShell._prefilter): big change -
1772 special syntaxes (like alias calling) is now allied in multi-line
1777 special syntaxes (like alias calling) is now allied in multi-line
1773 input. This is still _very_ experimental, but it's necessary for
1778 input. This is still _very_ experimental, but it's necessary for
1774 efficient shell usage combining python looping syntax with system
1779 efficient shell usage combining python looping syntax with system
1775 calls. For now it's restricted to aliases, I don't think it
1780 calls. For now it's restricted to aliases, I don't think it
1776 really even makes sense to have this for magics.
1781 really even makes sense to have this for magics.
1777
1782
1778 2004-06-23 Fernando Perez <fperez@colorado.edu>
1783 2004-06-23 Fernando Perez <fperez@colorado.edu>
1779
1784
1780 * IPython/Extensions/InterpreterExec.py (prefilter_shell): Added
1785 * IPython/Extensions/InterpreterExec.py (prefilter_shell): Added
1781 $var=cmd <=> @sc var=cmd and $$var=cmd <=> @sc -l var=cmd.
1786 $var=cmd <=> @sc var=cmd and $$var=cmd <=> @sc -l var=cmd.
1782
1787
1783 * IPython/Magic.py (Magic.magic_rehashx): modified to handle
1788 * IPython/Magic.py (Magic.magic_rehashx): modified to handle
1784 extensions under Windows (after code sent by Gary Bishop). The
1789 extensions under Windows (after code sent by Gary Bishop). The
1785 extensions considered 'executable' are stored in IPython's rc
1790 extensions considered 'executable' are stored in IPython's rc
1786 structure as win_exec_ext.
1791 structure as win_exec_ext.
1787
1792
1788 * IPython/genutils.py (shell): new function, like system() but
1793 * IPython/genutils.py (shell): new function, like system() but
1789 without return value. Very useful for interactive shell work.
1794 without return value. Very useful for interactive shell work.
1790
1795
1791 * IPython/Magic.py (Magic.magic_unalias): New @unalias function to
1796 * IPython/Magic.py (Magic.magic_unalias): New @unalias function to
1792 delete aliases.
1797 delete aliases.
1793
1798
1794 * IPython/iplib.py (InteractiveShell.alias_table_update): make
1799 * IPython/iplib.py (InteractiveShell.alias_table_update): make
1795 sure that the alias table doesn't contain python keywords.
1800 sure that the alias table doesn't contain python keywords.
1796
1801
1797 2004-06-21 Fernando Perez <fperez@colorado.edu>
1802 2004-06-21 Fernando Perez <fperez@colorado.edu>
1798
1803
1799 * IPython/Magic.py (Magic.magic_rehash): Fix crash when
1804 * IPython/Magic.py (Magic.magic_rehash): Fix crash when
1800 non-existent items are found in $PATH. Reported by Thorsten.
1805 non-existent items are found in $PATH. Reported by Thorsten.
1801
1806
1802 2004-06-20 Fernando Perez <fperez@colorado.edu>
1807 2004-06-20 Fernando Perez <fperez@colorado.edu>
1803
1808
1804 * IPython/iplib.py (complete): modified the completer so that the
1809 * IPython/iplib.py (complete): modified the completer so that the
1805 order of priorities can be easily changed at runtime.
1810 order of priorities can be easily changed at runtime.
1806
1811
1807 * IPython/Extensions/InterpreterExec.py (prefilter_shell):
1812 * IPython/Extensions/InterpreterExec.py (prefilter_shell):
1808 Modified to auto-execute all lines beginning with '~', '/' or '.'.
1813 Modified to auto-execute all lines beginning with '~', '/' or '.'.
1809
1814
1810 * IPython/Magic.py (Magic.magic_sx): modified @sc and @sx to
1815 * IPython/Magic.py (Magic.magic_sx): modified @sc and @sx to
1811 expand Python variables prepended with $ in all system calls. The
1816 expand Python variables prepended with $ in all system calls. The
1812 same was done to InteractiveShell.handle_shell_escape. Now all
1817 same was done to InteractiveShell.handle_shell_escape. Now all
1813 system access mechanisms (!, !!, @sc, @sx and aliases) allow the
1818 system access mechanisms (!, !!, @sc, @sx and aliases) allow the
1814 expansion of python variables and expressions according to the
1819 expansion of python variables and expressions according to the
1815 syntax of PEP-215 - http://www.python.org/peps/pep-0215.html.
1820 syntax of PEP-215 - http://www.python.org/peps/pep-0215.html.
1816
1821
1817 Though PEP-215 has been rejected, a similar (but simpler) one
1822 Though PEP-215 has been rejected, a similar (but simpler) one
1818 seems like it will go into Python 2.4, PEP-292 -
1823 seems like it will go into Python 2.4, PEP-292 -
1819 http://www.python.org/peps/pep-0292.html.
1824 http://www.python.org/peps/pep-0292.html.
1820
1825
1821 I'll keep the full syntax of PEP-215, since IPython has since the
1826 I'll keep the full syntax of PEP-215, since IPython has since the
1822 start used Ka-Ping Yee's reference implementation discussed there
1827 start used Ka-Ping Yee's reference implementation discussed there
1823 (Itpl), and I actually like the powerful semantics it offers.
1828 (Itpl), and I actually like the powerful semantics it offers.
1824
1829
1825 In order to access normal shell variables, the $ has to be escaped
1830 In order to access normal shell variables, the $ has to be escaped
1826 via an extra $. For example:
1831 via an extra $. For example:
1827
1832
1828 In [7]: PATH='a python variable'
1833 In [7]: PATH='a python variable'
1829
1834
1830 In [8]: !echo $PATH
1835 In [8]: !echo $PATH
1831 a python variable
1836 a python variable
1832
1837
1833 In [9]: !echo $$PATH
1838 In [9]: !echo $$PATH
1834 /usr/local/lf9560/bin:/usr/local/intel/compiler70/ia32/bin:...
1839 /usr/local/lf9560/bin:/usr/local/intel/compiler70/ia32/bin:...
1835
1840
1836 (Magic.parse_options): escape $ so the shell doesn't evaluate
1841 (Magic.parse_options): escape $ so the shell doesn't evaluate
1837 things prematurely.
1842 things prematurely.
1838
1843
1839 * IPython/iplib.py (InteractiveShell.call_alias): added the
1844 * IPython/iplib.py (InteractiveShell.call_alias): added the
1840 ability for aliases to expand python variables via $.
1845 ability for aliases to expand python variables via $.
1841
1846
1842 * IPython/Magic.py (Magic.magic_rehash): based on the new alias
1847 * IPython/Magic.py (Magic.magic_rehash): based on the new alias
1843 system, now there's a @rehash/@rehashx pair of magics. These work
1848 system, now there's a @rehash/@rehashx pair of magics. These work
1844 like the csh rehash command, and can be invoked at any time. They
1849 like the csh rehash command, and can be invoked at any time. They
1845 build a table of aliases to everything in the user's $PATH
1850 build a table of aliases to everything in the user's $PATH
1846 (@rehash uses everything, @rehashx is slower but only adds
1851 (@rehash uses everything, @rehashx is slower but only adds
1847 executable files). With this, the pysh.py-based shell profile can
1852 executable files). With this, the pysh.py-based shell profile can
1848 now simply call rehash upon startup, and full access to all
1853 now simply call rehash upon startup, and full access to all
1849 programs in the user's path is obtained.
1854 programs in the user's path is obtained.
1850
1855
1851 * IPython/iplib.py (InteractiveShell.call_alias): The new alias
1856 * IPython/iplib.py (InteractiveShell.call_alias): The new alias
1852 functionality is now fully in place. I removed the old dynamic
1857 functionality is now fully in place. I removed the old dynamic
1853 code generation based approach, in favor of a much lighter one
1858 code generation based approach, in favor of a much lighter one
1854 based on a simple dict. The advantage is that this allows me to
1859 based on a simple dict. The advantage is that this allows me to
1855 now have thousands of aliases with negligible cost (unthinkable
1860 now have thousands of aliases with negligible cost (unthinkable
1856 with the old system).
1861 with the old system).
1857
1862
1858 2004-06-19 Fernando Perez <fperez@colorado.edu>
1863 2004-06-19 Fernando Perez <fperez@colorado.edu>
1859
1864
1860 * IPython/iplib.py (__init__): extended MagicCompleter class to
1865 * IPython/iplib.py (__init__): extended MagicCompleter class to
1861 also complete (last in priority) on user aliases.
1866 also complete (last in priority) on user aliases.
1862
1867
1863 * IPython/Itpl.py (Itpl.__str__): fixed order of globals/locals in
1868 * IPython/Itpl.py (Itpl.__str__): fixed order of globals/locals in
1864 call to eval.
1869 call to eval.
1865 (ItplNS.__init__): Added a new class which functions like Itpl,
1870 (ItplNS.__init__): Added a new class which functions like Itpl,
1866 but allows configuring the namespace for the evaluation to occur
1871 but allows configuring the namespace for the evaluation to occur
1867 in.
1872 in.
1868
1873
1869 2004-06-18 Fernando Perez <fperez@colorado.edu>
1874 2004-06-18 Fernando Perez <fperez@colorado.edu>
1870
1875
1871 * IPython/iplib.py (InteractiveShell.runcode): modify to print a
1876 * IPython/iplib.py (InteractiveShell.runcode): modify to print a
1872 better message when 'exit' or 'quit' are typed (a common newbie
1877 better message when 'exit' or 'quit' are typed (a common newbie
1873 confusion).
1878 confusion).
1874
1879
1875 * IPython/Magic.py (Magic.magic_colors): Added the runtime color
1880 * IPython/Magic.py (Magic.magic_colors): Added the runtime color
1876 check for Windows users.
1881 check for Windows users.
1877
1882
1878 * IPython/iplib.py (InteractiveShell.user_setup): removed
1883 * IPython/iplib.py (InteractiveShell.user_setup): removed
1879 disabling of colors for Windows. I'll test at runtime and issue a
1884 disabling of colors for Windows. I'll test at runtime and issue a
1880 warning if Gary's readline isn't found, as to nudge users to
1885 warning if Gary's readline isn't found, as to nudge users to
1881 download it.
1886 download it.
1882
1887
1883 2004-06-16 Fernando Perez <fperez@colorado.edu>
1888 2004-06-16 Fernando Perez <fperez@colorado.edu>
1884
1889
1885 * IPython/genutils.py (Stream.__init__): changed to print errors
1890 * IPython/genutils.py (Stream.__init__): changed to print errors
1886 to sys.stderr. I had a circular dependency here. Now it's
1891 to sys.stderr. I had a circular dependency here. Now it's
1887 possible to run ipython as IDLE's shell (consider this pre-alpha,
1892 possible to run ipython as IDLE's shell (consider this pre-alpha,
1888 since true stdout things end up in the starting terminal instead
1893 since true stdout things end up in the starting terminal instead
1889 of IDLE's out).
1894 of IDLE's out).
1890
1895
1891 * IPython/Prompts.py (Prompt2.set_colors): prevent crashes for
1896 * IPython/Prompts.py (Prompt2.set_colors): prevent crashes for
1892 users who haven't # updated their prompt_in2 definitions. Remove
1897 users who haven't # updated their prompt_in2 definitions. Remove
1893 eventually.
1898 eventually.
1894 (multiple_replace): added credit to original ASPN recipe.
1899 (multiple_replace): added credit to original ASPN recipe.
1895
1900
1896 2004-06-15 Fernando Perez <fperez@colorado.edu>
1901 2004-06-15 Fernando Perez <fperez@colorado.edu>
1897
1902
1898 * IPython/iplib.py (InteractiveShell.__init__): add 'cp' to the
1903 * IPython/iplib.py (InteractiveShell.__init__): add 'cp' to the
1899 list of auto-defined aliases.
1904 list of auto-defined aliases.
1900
1905
1901 2004-06-13 Fernando Perez <fperez@colorado.edu>
1906 2004-06-13 Fernando Perez <fperez@colorado.edu>
1902
1907
1903 * setup.py (scriptfiles): Don't trigger win_post_install unless an
1908 * setup.py (scriptfiles): Don't trigger win_post_install unless an
1904 install was really requested (so setup.py can be used for other
1909 install was really requested (so setup.py can be used for other
1905 things under Windows).
1910 things under Windows).
1906
1911
1907 2004-06-10 Fernando Perez <fperez@colorado.edu>
1912 2004-06-10 Fernando Perez <fperez@colorado.edu>
1908
1913
1909 * IPython/Logger.py (Logger.create_log): Manually remove any old
1914 * IPython/Logger.py (Logger.create_log): Manually remove any old
1910 backup, since os.remove may fail under Windows. Fixes bug
1915 backup, since os.remove may fail under Windows. Fixes bug
1911 reported by Thorsten.
1916 reported by Thorsten.
1912
1917
1913 2004-06-09 Fernando Perez <fperez@colorado.edu>
1918 2004-06-09 Fernando Perez <fperez@colorado.edu>
1914
1919
1915 * examples/example-embed.py: fixed all references to %n (replaced
1920 * examples/example-embed.py: fixed all references to %n (replaced
1916 with \\# for ps1/out prompts and with \\D for ps2 prompts). Done
1921 with \\# for ps1/out prompts and with \\D for ps2 prompts). Done
1917 for all examples and the manual as well.
1922 for all examples and the manual as well.
1918
1923
1919 2004-06-08 Fernando Perez <fperez@colorado.edu>
1924 2004-06-08 Fernando Perez <fperez@colorado.edu>
1920
1925
1921 * IPython/Prompts.py (Prompt2.set_p_str): fixed all prompt
1926 * IPython/Prompts.py (Prompt2.set_p_str): fixed all prompt
1922 alignment and color management. All 3 prompt subsystems now
1927 alignment and color management. All 3 prompt subsystems now
1923 inherit from BasePrompt.
1928 inherit from BasePrompt.
1924
1929
1925 * tools/release: updates for windows installer build and tag rpms
1930 * tools/release: updates for windows installer build and tag rpms
1926 with python version (since paths are fixed).
1931 with python version (since paths are fixed).
1927
1932
1928 * IPython/UserConfig/ipythonrc: modified to use \# instead of %n,
1933 * IPython/UserConfig/ipythonrc: modified to use \# instead of %n,
1929 which will become eventually obsolete. Also fixed the default
1934 which will become eventually obsolete. Also fixed the default
1930 prompt_in2 to use \D, so at least new users start with the correct
1935 prompt_in2 to use \D, so at least new users start with the correct
1931 defaults.
1936 defaults.
1932 WARNING: Users with existing ipythonrc files will need to apply
1937 WARNING: Users with existing ipythonrc files will need to apply
1933 this fix manually!
1938 this fix manually!
1934
1939
1935 * setup.py: make windows installer (.exe). This is finally the
1940 * setup.py: make windows installer (.exe). This is finally the
1936 integration of an old patch by Cory Dodt <dodt-AT-fcoe.k12.ca.us>,
1941 integration of an old patch by Cory Dodt <dodt-AT-fcoe.k12.ca.us>,
1937 which I hadn't included because it required Python 2.3 (or recent
1942 which I hadn't included because it required Python 2.3 (or recent
1938 distutils).
1943 distutils).
1939
1944
1940 * IPython/usage.py (__doc__): update docs (and manpage) to reflect
1945 * IPython/usage.py (__doc__): update docs (and manpage) to reflect
1941 usage of new '\D' escape.
1946 usage of new '\D' escape.
1942
1947
1943 * IPython/Prompts.py (ROOT_SYMBOL): Small fix for Windows (which
1948 * IPython/Prompts.py (ROOT_SYMBOL): Small fix for Windows (which
1944 lacks os.getuid())
1949 lacks os.getuid())
1945 (CachedOutput.set_colors): Added the ability to turn coloring
1950 (CachedOutput.set_colors): Added the ability to turn coloring
1946 on/off with @colors even for manually defined prompt colors. It
1951 on/off with @colors even for manually defined prompt colors. It
1947 uses a nasty global, but it works safely and via the generic color
1952 uses a nasty global, but it works safely and via the generic color
1948 handling mechanism.
1953 handling mechanism.
1949 (Prompt2.__init__): Introduced new escape '\D' for continuation
1954 (Prompt2.__init__): Introduced new escape '\D' for continuation
1950 prompts. It represents the counter ('\#') as dots.
1955 prompts. It represents the counter ('\#') as dots.
1951 *** NOTE *** THIS IS A BACKWARDS-INCOMPATIBLE CHANGE. Users will
1956 *** NOTE *** THIS IS A BACKWARDS-INCOMPATIBLE CHANGE. Users will
1952 need to update their ipythonrc files and replace '%n' with '\D' in
1957 need to update their ipythonrc files and replace '%n' with '\D' in
1953 their prompt_in2 settings everywhere. Sorry, but there's
1958 their prompt_in2 settings everywhere. Sorry, but there's
1954 otherwise no clean way to get all prompts to properly align. The
1959 otherwise no clean way to get all prompts to properly align. The
1955 ipythonrc shipped with IPython has been updated.
1960 ipythonrc shipped with IPython has been updated.
1956
1961
1957 2004-06-07 Fernando Perez <fperez@colorado.edu>
1962 2004-06-07 Fernando Perez <fperez@colorado.edu>
1958
1963
1959 * setup.py (isfile): Pass local_icons option to latex2html, so the
1964 * setup.py (isfile): Pass local_icons option to latex2html, so the
1960 resulting HTML file is self-contained. Thanks to
1965 resulting HTML file is self-contained. Thanks to
1961 dryice-AT-liu.com.cn for the tip.
1966 dryice-AT-liu.com.cn for the tip.
1962
1967
1963 * pysh.py: I created a new profile 'shell', which implements a
1968 * pysh.py: I created a new profile 'shell', which implements a
1964 _rudimentary_ IPython-based shell. This is in NO WAY a realy
1969 _rudimentary_ IPython-based shell. This is in NO WAY a realy
1965 system shell, nor will it become one anytime soon. It's mainly
1970 system shell, nor will it become one anytime soon. It's mainly
1966 meant to illustrate the use of the new flexible bash-like prompts.
1971 meant to illustrate the use of the new flexible bash-like prompts.
1967 I guess it could be used by hardy souls for true shell management,
1972 I guess it could be used by hardy souls for true shell management,
1968 but it's no tcsh/bash... pysh.py is loaded by the 'shell'
1973 but it's no tcsh/bash... pysh.py is loaded by the 'shell'
1969 profile. This uses the InterpreterExec extension provided by
1974 profile. This uses the InterpreterExec extension provided by
1970 W.J. van der Laan <gnufnork-AT-hetdigitalegat.nl>
1975 W.J. van der Laan <gnufnork-AT-hetdigitalegat.nl>
1971
1976
1972 * IPython/Prompts.py (PromptOut.__str__): now it will correctly
1977 * IPython/Prompts.py (PromptOut.__str__): now it will correctly
1973 auto-align itself with the length of the previous input prompt
1978 auto-align itself with the length of the previous input prompt
1974 (taking into account the invisible color escapes).
1979 (taking into account the invisible color escapes).
1975 (CachedOutput.__init__): Large restructuring of this class. Now
1980 (CachedOutput.__init__): Large restructuring of this class. Now
1976 all three prompts (primary1, primary2, output) are proper objects,
1981 all three prompts (primary1, primary2, output) are proper objects,
1977 managed by the 'parent' CachedOutput class. The code is still a
1982 managed by the 'parent' CachedOutput class. The code is still a
1978 bit hackish (all prompts share state via a pointer to the cache),
1983 bit hackish (all prompts share state via a pointer to the cache),
1979 but it's overall far cleaner than before.
1984 but it's overall far cleaner than before.
1980
1985
1981 * IPython/genutils.py (getoutputerror): modified to add verbose,
1986 * IPython/genutils.py (getoutputerror): modified to add verbose,
1982 debug and header options. This makes the interface of all getout*
1987 debug and header options. This makes the interface of all getout*
1983 functions uniform.
1988 functions uniform.
1984 (SystemExec.getoutputerror): added getoutputerror to SystemExec.
1989 (SystemExec.getoutputerror): added getoutputerror to SystemExec.
1985
1990
1986 * IPython/Magic.py (Magic.default_option): added a function to
1991 * IPython/Magic.py (Magic.default_option): added a function to
1987 allow registering default options for any magic command. This
1992 allow registering default options for any magic command. This
1988 makes it easy to have profiles which customize the magics globally
1993 makes it easy to have profiles which customize the magics globally
1989 for a certain use. The values set through this function are
1994 for a certain use. The values set through this function are
1990 picked up by the parse_options() method, which all magics should
1995 picked up by the parse_options() method, which all magics should
1991 use to parse their options.
1996 use to parse their options.
1992
1997
1993 * IPython/genutils.py (warn): modified the warnings framework to
1998 * IPython/genutils.py (warn): modified the warnings framework to
1994 use the Term I/O class. I'm trying to slowly unify all of
1999 use the Term I/O class. I'm trying to slowly unify all of
1995 IPython's I/O operations to pass through Term.
2000 IPython's I/O operations to pass through Term.
1996
2001
1997 * IPython/Prompts.py (Prompt2._str_other): Added functionality in
2002 * IPython/Prompts.py (Prompt2._str_other): Added functionality in
1998 the secondary prompt to correctly match the length of the primary
2003 the secondary prompt to correctly match the length of the primary
1999 one for any prompt. Now multi-line code will properly line up
2004 one for any prompt. Now multi-line code will properly line up
2000 even for path dependent prompts, such as the new ones available
2005 even for path dependent prompts, such as the new ones available
2001 via the prompt_specials.
2006 via the prompt_specials.
2002
2007
2003 2004-06-06 Fernando Perez <fperez@colorado.edu>
2008 2004-06-06 Fernando Perez <fperez@colorado.edu>
2004
2009
2005 * IPython/Prompts.py (prompt_specials): Added the ability to have
2010 * IPython/Prompts.py (prompt_specials): Added the ability to have
2006 bash-like special sequences in the prompts, which get
2011 bash-like special sequences in the prompts, which get
2007 automatically expanded. Things like hostname, current working
2012 automatically expanded. Things like hostname, current working
2008 directory and username are implemented already, but it's easy to
2013 directory and username are implemented already, but it's easy to
2009 add more in the future. Thanks to a patch by W.J. van der Laan
2014 add more in the future. Thanks to a patch by W.J. van der Laan
2010 <gnufnork-AT-hetdigitalegat.nl>
2015 <gnufnork-AT-hetdigitalegat.nl>
2011 (prompt_specials): Added color support for prompt strings, so
2016 (prompt_specials): Added color support for prompt strings, so
2012 users can define arbitrary color setups for their prompts.
2017 users can define arbitrary color setups for their prompts.
2013
2018
2014 2004-06-05 Fernando Perez <fperez@colorado.edu>
2019 2004-06-05 Fernando Perez <fperez@colorado.edu>
2015
2020
2016 * IPython/genutils.py (Term.reopen_all): Added Windows-specific
2021 * IPython/genutils.py (Term.reopen_all): Added Windows-specific
2017 code to load Gary Bishop's readline and configure it
2022 code to load Gary Bishop's readline and configure it
2018 automatically. Thanks to Gary for help on this.
2023 automatically. Thanks to Gary for help on this.
2019
2024
2020 2004-06-01 Fernando Perez <fperez@colorado.edu>
2025 2004-06-01 Fernando Perez <fperez@colorado.edu>
2021
2026
2022 * IPython/Logger.py (Logger.create_log): fix bug for logging
2027 * IPython/Logger.py (Logger.create_log): fix bug for logging
2023 with no filename (previous fix was incomplete).
2028 with no filename (previous fix was incomplete).
2024
2029
2025 2004-05-25 Fernando Perez <fperez@colorado.edu>
2030 2004-05-25 Fernando Perez <fperez@colorado.edu>
2026
2031
2027 * IPython/Magic.py (Magic.parse_options): fix bug where naked
2032 * IPython/Magic.py (Magic.parse_options): fix bug where naked
2028 parens would get passed to the shell.
2033 parens would get passed to the shell.
2029
2034
2030 2004-05-20 Fernando Perez <fperez@colorado.edu>
2035 2004-05-20 Fernando Perez <fperez@colorado.edu>
2031
2036
2032 * IPython/Magic.py (Magic.magic_prun): changed default profile
2037 * IPython/Magic.py (Magic.magic_prun): changed default profile
2033 sort order to 'time' (the more common profiling need).
2038 sort order to 'time' (the more common profiling need).
2034
2039
2035 * IPython/OInspect.py (Inspector.pinfo): flush the inspect cache
2040 * IPython/OInspect.py (Inspector.pinfo): flush the inspect cache
2036 so that source code shown is guaranteed in sync with the file on
2041 so that source code shown is guaranteed in sync with the file on
2037 disk (also changed in psource). Similar fix to the one for
2042 disk (also changed in psource). Similar fix to the one for
2038 ultraTB on 2004-05-06. Thanks to a bug report by Yann Le Du
2043 ultraTB on 2004-05-06. Thanks to a bug report by Yann Le Du
2039 <yann.ledu-AT-noos.fr>.
2044 <yann.ledu-AT-noos.fr>.
2040
2045
2041 * IPython/Magic.py (Magic.parse_options): Fixed bug where commands
2046 * IPython/Magic.py (Magic.parse_options): Fixed bug where commands
2042 with a single option would not be correctly parsed. Closes
2047 with a single option would not be correctly parsed. Closes
2043 http://www.scipy.net/roundup/ipython/issue14. This bug had been
2048 http://www.scipy.net/roundup/ipython/issue14. This bug had been
2044 introduced in 0.6.0 (on 2004-05-06).
2049 introduced in 0.6.0 (on 2004-05-06).
2045
2050
2046 2004-05-13 *** Released version 0.6.0
2051 2004-05-13 *** Released version 0.6.0
2047
2052
2048 2004-05-13 Fernando Perez <fperez@colorado.edu>
2053 2004-05-13 Fernando Perez <fperez@colorado.edu>
2049
2054
2050 * debian/: Added debian/ directory to CVS, so that debian support
2055 * debian/: Added debian/ directory to CVS, so that debian support
2051 is publicly accessible. The debian package is maintained by Jack
2056 is publicly accessible. The debian package is maintained by Jack
2052 Moffit <jack-AT-xiph.org>.
2057 Moffit <jack-AT-xiph.org>.
2053
2058
2054 * Documentation: included the notes about an ipython-based system
2059 * Documentation: included the notes about an ipython-based system
2055 shell (the hypothetical 'pysh') into the new_design.pdf document,
2060 shell (the hypothetical 'pysh') into the new_design.pdf document,
2056 so that these ideas get distributed to users along with the
2061 so that these ideas get distributed to users along with the
2057 official documentation.
2062 official documentation.
2058
2063
2059 2004-05-10 Fernando Perez <fperez@colorado.edu>
2064 2004-05-10 Fernando Perez <fperez@colorado.edu>
2060
2065
2061 * IPython/Logger.py (Logger.create_log): fix recently introduced
2066 * IPython/Logger.py (Logger.create_log): fix recently introduced
2062 bug (misindented line) where logstart would fail when not given an
2067 bug (misindented line) where logstart would fail when not given an
2063 explicit filename.
2068 explicit filename.
2064
2069
2065 2004-05-09 Fernando Perez <fperez@colorado.edu>
2070 2004-05-09 Fernando Perez <fperez@colorado.edu>
2066
2071
2067 * IPython/Magic.py (Magic.parse_options): skip system call when
2072 * IPython/Magic.py (Magic.parse_options): skip system call when
2068 there are no options to look for. Faster, cleaner for the common
2073 there are no options to look for. Faster, cleaner for the common
2069 case.
2074 case.
2070
2075
2071 * Documentation: many updates to the manual: describing Windows
2076 * Documentation: many updates to the manual: describing Windows
2072 support better, Gnuplot updates, credits, misc small stuff. Also
2077 support better, Gnuplot updates, credits, misc small stuff. Also
2073 updated the new_design doc a bit.
2078 updated the new_design doc a bit.
2074
2079
2075 2004-05-06 *** Released version 0.6.0.rc1
2080 2004-05-06 *** Released version 0.6.0.rc1
2076
2081
2077 2004-05-06 Fernando Perez <fperez@colorado.edu>
2082 2004-05-06 Fernando Perez <fperez@colorado.edu>
2078
2083
2079 * IPython/ultraTB.py (ListTB.text): modified a ton of string +=
2084 * IPython/ultraTB.py (ListTB.text): modified a ton of string +=
2080 operations to use the vastly more efficient list/''.join() method.
2085 operations to use the vastly more efficient list/''.join() method.
2081 (FormattedTB.text): Fix
2086 (FormattedTB.text): Fix
2082 http://www.scipy.net/roundup/ipython/issue12 - exception source
2087 http://www.scipy.net/roundup/ipython/issue12 - exception source
2083 extract not updated after reload. Thanks to Mike Salib
2088 extract not updated after reload. Thanks to Mike Salib
2084 <msalib-AT-mit.edu> for pinning the source of the problem.
2089 <msalib-AT-mit.edu> for pinning the source of the problem.
2085 Fortunately, the solution works inside ipython and doesn't require
2090 Fortunately, the solution works inside ipython and doesn't require
2086 any changes to python proper.
2091 any changes to python proper.
2087
2092
2088 * IPython/Magic.py (Magic.parse_options): Improved to process the
2093 * IPython/Magic.py (Magic.parse_options): Improved to process the
2089 argument list as a true shell would (by actually using the
2094 argument list as a true shell would (by actually using the
2090 underlying system shell). This way, all @magics automatically get
2095 underlying system shell). This way, all @magics automatically get
2091 shell expansion for variables. Thanks to a comment by Alex
2096 shell expansion for variables. Thanks to a comment by Alex
2092 Schmolck.
2097 Schmolck.
2093
2098
2094 2004-04-04 Fernando Perez <fperez@colorado.edu>
2099 2004-04-04 Fernando Perez <fperez@colorado.edu>
2095
2100
2096 * IPython/iplib.py (InteractiveShell.interact): Added a special
2101 * IPython/iplib.py (InteractiveShell.interact): Added a special
2097 trap for a debugger quit exception, which is basically impossible
2102 trap for a debugger quit exception, which is basically impossible
2098 to handle by normal mechanisms, given what pdb does to the stack.
2103 to handle by normal mechanisms, given what pdb does to the stack.
2099 This fixes a crash reported by <fgibbons-AT-llama.med.harvard.edu>.
2104 This fixes a crash reported by <fgibbons-AT-llama.med.harvard.edu>.
2100
2105
2101 2004-04-03 Fernando Perez <fperez@colorado.edu>
2106 2004-04-03 Fernando Perez <fperez@colorado.edu>
2102
2107
2103 * IPython/genutils.py (Term): Standardized the names of the Term
2108 * IPython/genutils.py (Term): Standardized the names of the Term
2104 class streams to cin/cout/cerr, following C++ naming conventions
2109 class streams to cin/cout/cerr, following C++ naming conventions
2105 (I can't use in/out/err because 'in' is not a valid attribute
2110 (I can't use in/out/err because 'in' is not a valid attribute
2106 name).
2111 name).
2107
2112
2108 * IPython/iplib.py (InteractiveShell.interact): don't increment
2113 * IPython/iplib.py (InteractiveShell.interact): don't increment
2109 the prompt if there's no user input. By Daniel 'Dang' Griffith
2114 the prompt if there's no user input. By Daniel 'Dang' Griffith
2110 <pythondev-dang-AT-lazytwinacres.net>, after a suggestion from
2115 <pythondev-dang-AT-lazytwinacres.net>, after a suggestion from
2111 Francois Pinard.
2116 Francois Pinard.
2112
2117
2113 2004-04-02 Fernando Perez <fperez@colorado.edu>
2118 2004-04-02 Fernando Perez <fperez@colorado.edu>
2114
2119
2115 * IPython/genutils.py (Stream.__init__): Modified to survive at
2120 * IPython/genutils.py (Stream.__init__): Modified to survive at
2116 least importing in contexts where stdin/out/err aren't true file
2121 least importing in contexts where stdin/out/err aren't true file
2117 objects, such as PyCrust (they lack fileno() and mode). However,
2122 objects, such as PyCrust (they lack fileno() and mode). However,
2118 the recovery facilities which rely on these things existing will
2123 the recovery facilities which rely on these things existing will
2119 not work.
2124 not work.
2120
2125
2121 2004-04-01 Fernando Perez <fperez@colorado.edu>
2126 2004-04-01 Fernando Perez <fperez@colorado.edu>
2122
2127
2123 * IPython/Magic.py (Magic.magic_sx): modified (as well as @sc) to
2128 * IPython/Magic.py (Magic.magic_sx): modified (as well as @sc) to
2124 use the new getoutputerror() function, so it properly
2129 use the new getoutputerror() function, so it properly
2125 distinguishes stdout/err.
2130 distinguishes stdout/err.
2126
2131
2127 * IPython/genutils.py (getoutputerror): added a function to
2132 * IPython/genutils.py (getoutputerror): added a function to
2128 capture separately the standard output and error of a command.
2133 capture separately the standard output and error of a command.
2129 After a comment from dang on the mailing lists. This code is
2134 After a comment from dang on the mailing lists. This code is
2130 basically a modified version of commands.getstatusoutput(), from
2135 basically a modified version of commands.getstatusoutput(), from
2131 the standard library.
2136 the standard library.
2132
2137
2133 * IPython/iplib.py (InteractiveShell.handle_shell_escape): added
2138 * IPython/iplib.py (InteractiveShell.handle_shell_escape): added
2134 '!!' as a special syntax (shorthand) to access @sx.
2139 '!!' as a special syntax (shorthand) to access @sx.
2135
2140
2136 * IPython/Magic.py (Magic.magic_sx): new magic, to execute a shell
2141 * IPython/Magic.py (Magic.magic_sx): new magic, to execute a shell
2137 command and return its output as a list split on '\n'.
2142 command and return its output as a list split on '\n'.
2138
2143
2139 2004-03-31 Fernando Perez <fperez@colorado.edu>
2144 2004-03-31 Fernando Perez <fperez@colorado.edu>
2140
2145
2141 * IPython/FakeModule.py (FakeModule.__init__): added __nonzero__
2146 * IPython/FakeModule.py (FakeModule.__init__): added __nonzero__
2142 method to dictionaries used as FakeModule instances if they lack
2147 method to dictionaries used as FakeModule instances if they lack
2143 it. At least pydoc in python2.3 breaks for runtime-defined
2148 it. At least pydoc in python2.3 breaks for runtime-defined
2144 functions without this hack. At some point I need to _really_
2149 functions without this hack. At some point I need to _really_
2145 understand what FakeModule is doing, because it's a gross hack.
2150 understand what FakeModule is doing, because it's a gross hack.
2146 But it solves Arnd's problem for now...
2151 But it solves Arnd's problem for now...
2147
2152
2148 2004-02-27 Fernando Perez <fperez@colorado.edu>
2153 2004-02-27 Fernando Perez <fperez@colorado.edu>
2149
2154
2150 * IPython/Logger.py (Logger.create_log): Fix bug where 'rotate'
2155 * IPython/Logger.py (Logger.create_log): Fix bug where 'rotate'
2151 mode would behave erratically. Also increased the number of
2156 mode would behave erratically. Also increased the number of
2152 possible logs in rotate mod to 999. Thanks to Rod Holland
2157 possible logs in rotate mod to 999. Thanks to Rod Holland
2153 <rhh@StructureLABS.com> for the report and fixes.
2158 <rhh@StructureLABS.com> for the report and fixes.
2154
2159
2155 2004-02-26 Fernando Perez <fperez@colorado.edu>
2160 2004-02-26 Fernando Perez <fperez@colorado.edu>
2156
2161
2157 * IPython/genutils.py (page): Check that the curses module really
2162 * IPython/genutils.py (page): Check that the curses module really
2158 has the initscr attribute before trying to use it. For some
2163 has the initscr attribute before trying to use it. For some
2159 reason, the Solaris curses module is missing this. I think this
2164 reason, the Solaris curses module is missing this. I think this
2160 should be considered a Solaris python bug, but I'm not sure.
2165 should be considered a Solaris python bug, but I'm not sure.
2161
2166
2162 2004-01-17 Fernando Perez <fperez@colorado.edu>
2167 2004-01-17 Fernando Perez <fperez@colorado.edu>
2163
2168
2164 * IPython/genutils.py (Stream.__init__): Changes to try to make
2169 * IPython/genutils.py (Stream.__init__): Changes to try to make
2165 ipython robust against stdin/out/err being closed by the user.
2170 ipython robust against stdin/out/err being closed by the user.
2166 This is 'user error' (and blocks a normal python session, at least
2171 This is 'user error' (and blocks a normal python session, at least
2167 the stdout case). However, Ipython should be able to survive such
2172 the stdout case). However, Ipython should be able to survive such
2168 instances of abuse as gracefully as possible. To simplify the
2173 instances of abuse as gracefully as possible. To simplify the
2169 coding and maintain compatibility with Gary Bishop's Term
2174 coding and maintain compatibility with Gary Bishop's Term
2170 contributions, I've made use of classmethods for this. I think
2175 contributions, I've made use of classmethods for this. I think
2171 this introduces a dependency on python 2.2.
2176 this introduces a dependency on python 2.2.
2172
2177
2173 2004-01-13 Fernando Perez <fperez@colorado.edu>
2178 2004-01-13 Fernando Perez <fperez@colorado.edu>
2174
2179
2175 * IPython/numutils.py (exp_safe): simplified the code a bit and
2180 * IPython/numutils.py (exp_safe): simplified the code a bit and
2176 removed the need for importing the kinds module altogether.
2181 removed the need for importing the kinds module altogether.
2177
2182
2178 2004-01-06 Fernando Perez <fperez@colorado.edu>
2183 2004-01-06 Fernando Perez <fperez@colorado.edu>
2179
2184
2180 * IPython/Magic.py (Magic.magic_sc): Made the shell capture system
2185 * IPython/Magic.py (Magic.magic_sc): Made the shell capture system
2181 a magic function instead, after some community feedback. No
2186 a magic function instead, after some community feedback. No
2182 special syntax will exist for it, but its name is deliberately
2187 special syntax will exist for it, but its name is deliberately
2183 very short.
2188 very short.
2184
2189
2185 2003-12-20 Fernando Perez <fperez@colorado.edu>
2190 2003-12-20 Fernando Perez <fperez@colorado.edu>
2186
2191
2187 * IPython/iplib.py (InteractiveShell.handle_shell_assign): Added
2192 * IPython/iplib.py (InteractiveShell.handle_shell_assign): Added
2188 new functionality, to automagically assign the result of a shell
2193 new functionality, to automagically assign the result of a shell
2189 command to a variable. I'll solicit some community feedback on
2194 command to a variable. I'll solicit some community feedback on
2190 this before making it permanent.
2195 this before making it permanent.
2191
2196
2192 * IPython/OInspect.py (Inspector.pinfo): Fix crash when info was
2197 * IPython/OInspect.py (Inspector.pinfo): Fix crash when info was
2193 requested about callables for which inspect couldn't obtain a
2198 requested about callables for which inspect couldn't obtain a
2194 proper argspec. Thanks to a crash report sent by Etienne
2199 proper argspec. Thanks to a crash report sent by Etienne
2195 Posthumus <etienne-AT-apple01.cs.vu.nl>.
2200 Posthumus <etienne-AT-apple01.cs.vu.nl>.
2196
2201
2197 2003-12-09 Fernando Perez <fperez@colorado.edu>
2202 2003-12-09 Fernando Perez <fperez@colorado.edu>
2198
2203
2199 * IPython/genutils.py (page): patch for the pager to work across
2204 * IPython/genutils.py (page): patch for the pager to work across
2200 various versions of Windows. By Gary Bishop.
2205 various versions of Windows. By Gary Bishop.
2201
2206
2202 2003-12-04 Fernando Perez <fperez@colorado.edu>
2207 2003-12-04 Fernando Perez <fperez@colorado.edu>
2203
2208
2204 * IPython/Gnuplot2.py (PlotItems): Fixes for working with
2209 * IPython/Gnuplot2.py (PlotItems): Fixes for working with
2205 Gnuplot.py version 1.7, whose internal names changed quite a bit.
2210 Gnuplot.py version 1.7, whose internal names changed quite a bit.
2206 While I tested this and it looks ok, there may still be corner
2211 While I tested this and it looks ok, there may still be corner
2207 cases I've missed.
2212 cases I've missed.
2208
2213
2209 2003-12-01 Fernando Perez <fperez@colorado.edu>
2214 2003-12-01 Fernando Perez <fperez@colorado.edu>
2210
2215
2211 * IPython/iplib.py (InteractiveShell._prefilter): Fixed a bug
2216 * IPython/iplib.py (InteractiveShell._prefilter): Fixed a bug
2212 where a line like 'p,q=1,2' would fail because the automagic
2217 where a line like 'p,q=1,2' would fail because the automagic
2213 system would be triggered for @p.
2218 system would be triggered for @p.
2214
2219
2215 * IPython/DPyGetOpt.py (DPyGetOpt.processArguments): Tab-related
2220 * IPython/DPyGetOpt.py (DPyGetOpt.processArguments): Tab-related
2216 cleanups, code unmodified.
2221 cleanups, code unmodified.
2217
2222
2218 * IPython/genutils.py (Term): added a class for IPython to handle
2223 * IPython/genutils.py (Term): added a class for IPython to handle
2219 output. In most cases it will just be a proxy for stdout/err, but
2224 output. In most cases it will just be a proxy for stdout/err, but
2220 having this allows modifications to be made for some platforms,
2225 having this allows modifications to be made for some platforms,
2221 such as handling color escapes under Windows. All of this code
2226 such as handling color escapes under Windows. All of this code
2222 was contributed by Gary Bishop, with minor modifications by me.
2227 was contributed by Gary Bishop, with minor modifications by me.
2223 The actual changes affect many files.
2228 The actual changes affect many files.
2224
2229
2225 2003-11-30 Fernando Perez <fperez@colorado.edu>
2230 2003-11-30 Fernando Perez <fperez@colorado.edu>
2226
2231
2227 * IPython/iplib.py (file_matches): new completion code, courtesy
2232 * IPython/iplib.py (file_matches): new completion code, courtesy
2228 of Jeff Collins. This enables filename completion again under
2233 of Jeff Collins. This enables filename completion again under
2229 python 2.3, which disabled it at the C level.
2234 python 2.3, which disabled it at the C level.
2230
2235
2231 2003-11-11 Fernando Perez <fperez@colorado.edu>
2236 2003-11-11 Fernando Perez <fperez@colorado.edu>
2232
2237
2233 * IPython/numutils.py (amap): Added amap() fn. Simple shorthand
2238 * IPython/numutils.py (amap): Added amap() fn. Simple shorthand
2234 for Numeric.array(map(...)), but often convenient.
2239 for Numeric.array(map(...)), but often convenient.
2235
2240
2236 2003-11-05 Fernando Perez <fperez@colorado.edu>
2241 2003-11-05 Fernando Perez <fperez@colorado.edu>
2237
2242
2238 * IPython/numutils.py (frange): Changed a call from int() to
2243 * IPython/numutils.py (frange): Changed a call from int() to
2239 int(round()) to prevent a problem reported with arange() in the
2244 int(round()) to prevent a problem reported with arange() in the
2240 numpy list.
2245 numpy list.
2241
2246
2242 2003-10-06 Fernando Perez <fperez@colorado.edu>
2247 2003-10-06 Fernando Perez <fperez@colorado.edu>
2243
2248
2244 * IPython/DPyGetOpt.py (DPyGetOpt.processArguments): changed to
2249 * IPython/DPyGetOpt.py (DPyGetOpt.processArguments): changed to
2245 prevent crashes if sys lacks an argv attribute (it happens with
2250 prevent crashes if sys lacks an argv attribute (it happens with
2246 embedded interpreters which build a bare-bones sys module).
2251 embedded interpreters which build a bare-bones sys module).
2247 Thanks to a report/bugfix by Adam Hupp <hupp-AT-cs.wisc.edu>.
2252 Thanks to a report/bugfix by Adam Hupp <hupp-AT-cs.wisc.edu>.
2248
2253
2249 2003-09-24 Fernando Perez <fperez@colorado.edu>
2254 2003-09-24 Fernando Perez <fperez@colorado.edu>
2250
2255
2251 * IPython/Magic.py (Magic._ofind): blanket except around getattr()
2256 * IPython/Magic.py (Magic._ofind): blanket except around getattr()
2252 to protect against poorly written user objects where __getattr__
2257 to protect against poorly written user objects where __getattr__
2253 raises exceptions other than AttributeError. Thanks to a bug
2258 raises exceptions other than AttributeError. Thanks to a bug
2254 report by Oliver Sander <osander-AT-gmx.de>.
2259 report by Oliver Sander <osander-AT-gmx.de>.
2255
2260
2256 * IPython/FakeModule.py (FakeModule.__repr__): this method was
2261 * IPython/FakeModule.py (FakeModule.__repr__): this method was
2257 missing. Thanks to bug report by Ralf Schmitt <ralf-AT-brainbot.com>.
2262 missing. Thanks to bug report by Ralf Schmitt <ralf-AT-brainbot.com>.
2258
2263
2259 2003-09-09 Fernando Perez <fperez@colorado.edu>
2264 2003-09-09 Fernando Perez <fperez@colorado.edu>
2260
2265
2261 * IPython/iplib.py (InteractiveShell._prefilter): fix bug where
2266 * IPython/iplib.py (InteractiveShell._prefilter): fix bug where
2262 unpacking a list whith a callable as first element would
2267 unpacking a list whith a callable as first element would
2263 mistakenly trigger autocalling. Thanks to a bug report by Jeffery
2268 mistakenly trigger autocalling. Thanks to a bug report by Jeffery
2264 Collins.
2269 Collins.
2265
2270
2266 2003-08-25 *** Released version 0.5.0
2271 2003-08-25 *** Released version 0.5.0
2267
2272
2268 2003-08-22 Fernando Perez <fperez@colorado.edu>
2273 2003-08-22 Fernando Perez <fperez@colorado.edu>
2269
2274
2270 * IPython/ultraTB.py (VerboseTB.linereader): Improved handling of
2275 * IPython/ultraTB.py (VerboseTB.linereader): Improved handling of
2271 improperly defined user exceptions. Thanks to feedback from Mark
2276 improperly defined user exceptions. Thanks to feedback from Mark
2272 Russell <mrussell-AT-verio.net>.
2277 Russell <mrussell-AT-verio.net>.
2273
2278
2274 2003-08-20 Fernando Perez <fperez@colorado.edu>
2279 2003-08-20 Fernando Perez <fperez@colorado.edu>
2275
2280
2276 * IPython/OInspect.py (Inspector.pinfo): changed String Form
2281 * IPython/OInspect.py (Inspector.pinfo): changed String Form
2277 printing so that it would print multi-line string forms starting
2282 printing so that it would print multi-line string forms starting
2278 with a new line. This way the formatting is better respected for
2283 with a new line. This way the formatting is better respected for
2279 objects which work hard to make nice string forms.
2284 objects which work hard to make nice string forms.
2280
2285
2281 * IPython/iplib.py (InteractiveShell.handle_auto): Fix bug where
2286 * IPython/iplib.py (InteractiveShell.handle_auto): Fix bug where
2282 autocall would overtake data access for objects with both
2287 autocall would overtake data access for objects with both
2283 __getitem__ and __call__.
2288 __getitem__ and __call__.
2284
2289
2285 2003-08-19 *** Released version 0.5.0-rc1
2290 2003-08-19 *** Released version 0.5.0-rc1
2286
2291
2287 2003-08-19 Fernando Perez <fperez@colorado.edu>
2292 2003-08-19 Fernando Perez <fperez@colorado.edu>
2288
2293
2289 * IPython/deep_reload.py (load_tail): single tiny change here
2294 * IPython/deep_reload.py (load_tail): single tiny change here
2290 seems to fix the long-standing bug of dreload() failing to work
2295 seems to fix the long-standing bug of dreload() failing to work
2291 for dotted names. But this module is pretty tricky, so I may have
2296 for dotted names. But this module is pretty tricky, so I may have
2292 missed some subtlety. Needs more testing!.
2297 missed some subtlety. Needs more testing!.
2293
2298
2294 * IPython/ultraTB.py (VerboseTB.linereader): harden against user
2299 * IPython/ultraTB.py (VerboseTB.linereader): harden against user
2295 exceptions which have badly implemented __str__ methods.
2300 exceptions which have badly implemented __str__ methods.
2296 (VerboseTB.text): harden against inspect.getinnerframes crashing,
2301 (VerboseTB.text): harden against inspect.getinnerframes crashing,
2297 which I've been getting reports about from Python 2.3 users. I
2302 which I've been getting reports about from Python 2.3 users. I
2298 wish I had a simple test case to reproduce the problem, so I could
2303 wish I had a simple test case to reproduce the problem, so I could
2299 either write a cleaner workaround or file a bug report if
2304 either write a cleaner workaround or file a bug report if
2300 necessary.
2305 necessary.
2301
2306
2302 * IPython/Magic.py (Magic.magic_edit): fixed bug where after
2307 * IPython/Magic.py (Magic.magic_edit): fixed bug where after
2303 making a class 'foo', file 'foo.py' couldn't be edited. Thanks to
2308 making a class 'foo', file 'foo.py' couldn't be edited. Thanks to
2304 a bug report by Tjabo Kloppenburg.
2309 a bug report by Tjabo Kloppenburg.
2305
2310
2306 * IPython/ultraTB.py (VerboseTB.debugger): hardened against pdb
2311 * IPython/ultraTB.py (VerboseTB.debugger): hardened against pdb
2307 crashes. Wrapped the pdb call in a blanket try/except, since pdb
2312 crashes. Wrapped the pdb call in a blanket try/except, since pdb
2308 seems rather unstable. Thanks to a bug report by Tjabo
2313 seems rather unstable. Thanks to a bug report by Tjabo
2309 Kloppenburg <tjabo.kloppenburg-AT-unix-ag.uni-siegen.de>.
2314 Kloppenburg <tjabo.kloppenburg-AT-unix-ag.uni-siegen.de>.
2310
2315
2311 * IPython/Release.py (version): release 0.5.0-rc1. I want to put
2316 * IPython/Release.py (version): release 0.5.0-rc1. I want to put
2312 this out soon because of the critical fixes in the inner loop for
2317 this out soon because of the critical fixes in the inner loop for
2313 generators.
2318 generators.
2314
2319
2315 * IPython/Magic.py (Magic.getargspec): removed. This (and
2320 * IPython/Magic.py (Magic.getargspec): removed. This (and
2316 _get_def) have been obsoleted by OInspect for a long time, I
2321 _get_def) have been obsoleted by OInspect for a long time, I
2317 hadn't noticed that they were dead code.
2322 hadn't noticed that they were dead code.
2318 (Magic._ofind): restored _ofind functionality for a few literals
2323 (Magic._ofind): restored _ofind functionality for a few literals
2319 (those in ["''",'""','[]','{}','()']). But it won't work anymore
2324 (those in ["''",'""','[]','{}','()']). But it won't work anymore
2320 for things like "hello".capitalize?, since that would require a
2325 for things like "hello".capitalize?, since that would require a
2321 potentially dangerous eval() again.
2326 potentially dangerous eval() again.
2322
2327
2323 * IPython/iplib.py (InteractiveShell._prefilter): reorganized the
2328 * IPython/iplib.py (InteractiveShell._prefilter): reorganized the
2324 logic a bit more to clean up the escapes handling and minimize the
2329 logic a bit more to clean up the escapes handling and minimize the
2325 use of _ofind to only necessary cases. The interactive 'feel' of
2330 use of _ofind to only necessary cases. The interactive 'feel' of
2326 IPython should have improved quite a bit with the changes in
2331 IPython should have improved quite a bit with the changes in
2327 _prefilter and _ofind (besides being far safer than before).
2332 _prefilter and _ofind (besides being far safer than before).
2328
2333
2329 * IPython/Magic.py (Magic.magic_edit): Fixed old bug (but rather
2334 * IPython/Magic.py (Magic.magic_edit): Fixed old bug (but rather
2330 obscure, never reported). Edit would fail to find the object to
2335 obscure, never reported). Edit would fail to find the object to
2331 edit under some circumstances.
2336 edit under some circumstances.
2332 (Magic._ofind): CRITICAL FIX. Finally removed the eval() calls
2337 (Magic._ofind): CRITICAL FIX. Finally removed the eval() calls
2333 which were causing double-calling of generators. Those eval calls
2338 which were causing double-calling of generators. Those eval calls
2334 were _very_ dangerous, since code with side effects could be
2339 were _very_ dangerous, since code with side effects could be
2335 triggered. As they say, 'eval is evil'... These were the
2340 triggered. As they say, 'eval is evil'... These were the
2336 nastiest evals in IPython. Besides, _ofind is now far simpler,
2341 nastiest evals in IPython. Besides, _ofind is now far simpler,
2337 and it should also be quite a bit faster. Its use of inspect is
2342 and it should also be quite a bit faster. Its use of inspect is
2338 also safer, so perhaps some of the inspect-related crashes I've
2343 also safer, so perhaps some of the inspect-related crashes I've
2339 seen lately with Python 2.3 might be taken care of. That will
2344 seen lately with Python 2.3 might be taken care of. That will
2340 need more testing.
2345 need more testing.
2341
2346
2342 2003-08-17 Fernando Perez <fperez@colorado.edu>
2347 2003-08-17 Fernando Perez <fperez@colorado.edu>
2343
2348
2344 * IPython/iplib.py (InteractiveShell._prefilter): significant
2349 * IPython/iplib.py (InteractiveShell._prefilter): significant
2345 simplifications to the logic for handling user escapes. Faster
2350 simplifications to the logic for handling user escapes. Faster
2346 and simpler code.
2351 and simpler code.
2347
2352
2348 2003-08-14 Fernando Perez <fperez@colorado.edu>
2353 2003-08-14 Fernando Perez <fperez@colorado.edu>
2349
2354
2350 * IPython/numutils.py (sum_flat): rewrote to be non-recursive.
2355 * IPython/numutils.py (sum_flat): rewrote to be non-recursive.
2351 Now it requires O(N) storage (N=size(a)) for non-contiguous input,
2356 Now it requires O(N) storage (N=size(a)) for non-contiguous input,
2352 but it should be quite a bit faster. And the recursive version
2357 but it should be quite a bit faster. And the recursive version
2353 generated O(log N) intermediate storage for all rank>1 arrays,
2358 generated O(log N) intermediate storage for all rank>1 arrays,
2354 even if they were contiguous.
2359 even if they were contiguous.
2355 (l1norm): Added this function.
2360 (l1norm): Added this function.
2356 (norm): Added this function for arbitrary norms (including
2361 (norm): Added this function for arbitrary norms (including
2357 l-infinity). l1 and l2 are still special cases for convenience
2362 l-infinity). l1 and l2 are still special cases for convenience
2358 and speed.
2363 and speed.
2359
2364
2360 2003-08-03 Fernando Perez <fperez@colorado.edu>
2365 2003-08-03 Fernando Perez <fperez@colorado.edu>
2361
2366
2362 * IPython/Magic.py (Magic.magic_edit): Removed all remaining string
2367 * IPython/Magic.py (Magic.magic_edit): Removed all remaining string
2363 exceptions, which now raise PendingDeprecationWarnings in Python
2368 exceptions, which now raise PendingDeprecationWarnings in Python
2364 2.3. There were some in Magic and some in Gnuplot2.
2369 2.3. There were some in Magic and some in Gnuplot2.
2365
2370
2366 2003-06-30 Fernando Perez <fperez@colorado.edu>
2371 2003-06-30 Fernando Perez <fperez@colorado.edu>
2367
2372
2368 * IPython/genutils.py (page): modified to call curses only for
2373 * IPython/genutils.py (page): modified to call curses only for
2369 terminals where TERM=='xterm'. After problems under many other
2374 terminals where TERM=='xterm'. After problems under many other
2370 terminals were reported by Keith Beattie <KSBeattie-AT-lbl.gov>.
2375 terminals were reported by Keith Beattie <KSBeattie-AT-lbl.gov>.
2371
2376
2372 * IPython/iplib.py (complete): removed spurious 'print "IE"' which
2377 * IPython/iplib.py (complete): removed spurious 'print "IE"' which
2373 would be triggered when readline was absent. This was just an old
2378 would be triggered when readline was absent. This was just an old
2374 debugging statement I'd forgotten to take out.
2379 debugging statement I'd forgotten to take out.
2375
2380
2376 2003-06-20 Fernando Perez <fperez@colorado.edu>
2381 2003-06-20 Fernando Perez <fperez@colorado.edu>
2377
2382
2378 * IPython/genutils.py (clock): modified to return only user time
2383 * IPython/genutils.py (clock): modified to return only user time
2379 (not counting system time), after a discussion on scipy. While
2384 (not counting system time), after a discussion on scipy. While
2380 system time may be a useful quantity occasionally, it may much
2385 system time may be a useful quantity occasionally, it may much
2381 more easily be skewed by occasional swapping or other similar
2386 more easily be skewed by occasional swapping or other similar
2382 activity.
2387 activity.
2383
2388
2384 2003-06-05 Fernando Perez <fperez@colorado.edu>
2389 2003-06-05 Fernando Perez <fperez@colorado.edu>
2385
2390
2386 * IPython/numutils.py (identity): new function, for building
2391 * IPython/numutils.py (identity): new function, for building
2387 arbitrary rank Kronecker deltas (mostly backwards compatible with
2392 arbitrary rank Kronecker deltas (mostly backwards compatible with
2388 Numeric.identity)
2393 Numeric.identity)
2389
2394
2390 2003-06-03 Fernando Perez <fperez@colorado.edu>
2395 2003-06-03 Fernando Perez <fperez@colorado.edu>
2391
2396
2392 * IPython/iplib.py (InteractiveShell.handle_magic): protect
2397 * IPython/iplib.py (InteractiveShell.handle_magic): protect
2393 arguments passed to magics with spaces, to allow trailing '\' to
2398 arguments passed to magics with spaces, to allow trailing '\' to
2394 work normally (mainly for Windows users).
2399 work normally (mainly for Windows users).
2395
2400
2396 2003-05-29 Fernando Perez <fperez@colorado.edu>
2401 2003-05-29 Fernando Perez <fperez@colorado.edu>
2397
2402
2398 * IPython/ipmaker.py (make_IPython): Load site._Helper() as help
2403 * IPython/ipmaker.py (make_IPython): Load site._Helper() as help
2399 instead of pydoc.help. This fixes a bizarre behavior where
2404 instead of pydoc.help. This fixes a bizarre behavior where
2400 printing '%s' % locals() would trigger the help system. Now
2405 printing '%s' % locals() would trigger the help system. Now
2401 ipython behaves like normal python does.
2406 ipython behaves like normal python does.
2402
2407
2403 Note that if one does 'from pydoc import help', the bizarre
2408 Note that if one does 'from pydoc import help', the bizarre
2404 behavior returns, but this will also happen in normal python, so
2409 behavior returns, but this will also happen in normal python, so
2405 it's not an ipython bug anymore (it has to do with how pydoc.help
2410 it's not an ipython bug anymore (it has to do with how pydoc.help
2406 is implemented).
2411 is implemented).
2407
2412
2408 2003-05-22 Fernando Perez <fperez@colorado.edu>
2413 2003-05-22 Fernando Perez <fperez@colorado.edu>
2409
2414
2410 * IPython/FlexCompleter.py (Completer.attr_matches): fixed to
2415 * IPython/FlexCompleter.py (Completer.attr_matches): fixed to
2411 return [] instead of None when nothing matches, also match to end
2416 return [] instead of None when nothing matches, also match to end
2412 of line. Patch by Gary Bishop.
2417 of line. Patch by Gary Bishop.
2413
2418
2414 * IPython/ipmaker.py (make_IPython): Added same sys.excepthook
2419 * IPython/ipmaker.py (make_IPython): Added same sys.excepthook
2415 protection as before, for files passed on the command line. This
2420 protection as before, for files passed on the command line. This
2416 prevents the CrashHandler from kicking in if user files call into
2421 prevents the CrashHandler from kicking in if user files call into
2417 sys.excepthook (such as PyQt and WxWindows have a nasty habit of
2422 sys.excepthook (such as PyQt and WxWindows have a nasty habit of
2418 doing). After a report by Kasper Souren <Kasper.Souren-AT-ircam.fr>
2423 doing). After a report by Kasper Souren <Kasper.Souren-AT-ircam.fr>
2419
2424
2420 2003-05-20 *** Released version 0.4.0
2425 2003-05-20 *** Released version 0.4.0
2421
2426
2422 2003-05-20 Fernando Perez <fperez@colorado.edu>
2427 2003-05-20 Fernando Perez <fperez@colorado.edu>
2423
2428
2424 * setup.py: added support for manpages. It's a bit hackish b/c of
2429 * setup.py: added support for manpages. It's a bit hackish b/c of
2425 a bug in the way the bdist_rpm distutils target handles gzipped
2430 a bug in the way the bdist_rpm distutils target handles gzipped
2426 manpages, but it works. After a patch by Jack.
2431 manpages, but it works. After a patch by Jack.
2427
2432
2428 2003-05-19 Fernando Perez <fperez@colorado.edu>
2433 2003-05-19 Fernando Perez <fperez@colorado.edu>
2429
2434
2430 * IPython/numutils.py: added a mockup of the kinds module, since
2435 * IPython/numutils.py: added a mockup of the kinds module, since
2431 it was recently removed from Numeric. This way, numutils will
2436 it was recently removed from Numeric. This way, numutils will
2432 work for all users even if they are missing kinds.
2437 work for all users even if they are missing kinds.
2433
2438
2434 * IPython/Magic.py (Magic._ofind): Harden against an inspect
2439 * IPython/Magic.py (Magic._ofind): Harden against an inspect
2435 failure, which can occur with SWIG-wrapped extensions. After a
2440 failure, which can occur with SWIG-wrapped extensions. After a
2436 crash report from Prabhu.
2441 crash report from Prabhu.
2437
2442
2438 2003-05-16 Fernando Perez <fperez@colorado.edu>
2443 2003-05-16 Fernando Perez <fperez@colorado.edu>
2439
2444
2440 * IPython/iplib.py (InteractiveShell.excepthook): New method to
2445 * IPython/iplib.py (InteractiveShell.excepthook): New method to
2441 protect ipython from user code which may call directly
2446 protect ipython from user code which may call directly
2442 sys.excepthook (this looks like an ipython crash to the user, even
2447 sys.excepthook (this looks like an ipython crash to the user, even
2443 when it isn't). After a patch by Gary Bishop <gb-AT-cs.unc.edu>.
2448 when it isn't). After a patch by Gary Bishop <gb-AT-cs.unc.edu>.
2444 This is especially important to help users of WxWindows, but may
2449 This is especially important to help users of WxWindows, but may
2445 also be useful in other cases.
2450 also be useful in other cases.
2446
2451
2447 * IPython/ultraTB.py (AutoFormattedTB.__call__): Changed to allow
2452 * IPython/ultraTB.py (AutoFormattedTB.__call__): Changed to allow
2448 an optional tb_offset to be specified, and to preserve exception
2453 an optional tb_offset to be specified, and to preserve exception
2449 info if given. After a patch by Gary Bishop <gb-AT-cs.unc.edu>.
2454 info if given. After a patch by Gary Bishop <gb-AT-cs.unc.edu>.
2450
2455
2451 * ipython.1 (Default): Thanks to Jack's work, we now have manpages!
2456 * ipython.1 (Default): Thanks to Jack's work, we now have manpages!
2452
2457
2453 2003-05-15 Fernando Perez <fperez@colorado.edu>
2458 2003-05-15 Fernando Perez <fperez@colorado.edu>
2454
2459
2455 * IPython/iplib.py (InteractiveShell.user_setup): Fix crash when
2460 * IPython/iplib.py (InteractiveShell.user_setup): Fix crash when
2456 installing for a new user under Windows.
2461 installing for a new user under Windows.
2457
2462
2458 2003-05-12 Fernando Perez <fperez@colorado.edu>
2463 2003-05-12 Fernando Perez <fperez@colorado.edu>
2459
2464
2460 * IPython/iplib.py (InteractiveShell.handle_emacs): New line
2465 * IPython/iplib.py (InteractiveShell.handle_emacs): New line
2461 handler for Emacs comint-based lines. Currently it doesn't do
2466 handler for Emacs comint-based lines. Currently it doesn't do
2462 much (but importantly, it doesn't update the history cache). In
2467 much (but importantly, it doesn't update the history cache). In
2463 the future it may be expanded if Alex needs more functionality
2468 the future it may be expanded if Alex needs more functionality
2464 there.
2469 there.
2465
2470
2466 * IPython/CrashHandler.py (CrashHandler.__call__): Added platform
2471 * IPython/CrashHandler.py (CrashHandler.__call__): Added platform
2467 info to crash reports.
2472 info to crash reports.
2468
2473
2469 * IPython/iplib.py (InteractiveShell.mainloop): Added -c option,
2474 * IPython/iplib.py (InteractiveShell.mainloop): Added -c option,
2470 just like Python's -c. Also fixed crash with invalid -color
2475 just like Python's -c. Also fixed crash with invalid -color
2471 option value at startup. Thanks to Will French
2476 option value at startup. Thanks to Will French
2472 <wfrench-AT-bestweb.net> for the bug report.
2477 <wfrench-AT-bestweb.net> for the bug report.
2473
2478
2474 2003-05-09 Fernando Perez <fperez@colorado.edu>
2479 2003-05-09 Fernando Perez <fperez@colorado.edu>
2475
2480
2476 * IPython/genutils.py (EvalDict.__getitem__): Renamed EvalString
2481 * IPython/genutils.py (EvalDict.__getitem__): Renamed EvalString
2477 to EvalDict (it's a mapping, after all) and simplified its code
2482 to EvalDict (it's a mapping, after all) and simplified its code
2478 quite a bit, after a nice discussion on c.l.py where Gustavo
2483 quite a bit, after a nice discussion on c.l.py where Gustavo
2479 CΓ³rdova <gcordova-AT-sismex.com> suggested the new version.
2484 CΓ³rdova <gcordova-AT-sismex.com> suggested the new version.
2480
2485
2481 2003-04-30 Fernando Perez <fperez@colorado.edu>
2486 2003-04-30 Fernando Perez <fperez@colorado.edu>
2482
2487
2483 * IPython/genutils.py (timings_out): modified it to reduce its
2488 * IPython/genutils.py (timings_out): modified it to reduce its
2484 overhead in the common reps==1 case.
2489 overhead in the common reps==1 case.
2485
2490
2486 2003-04-29 Fernando Perez <fperez@colorado.edu>
2491 2003-04-29 Fernando Perez <fperez@colorado.edu>
2487
2492
2488 * IPython/genutils.py (timings_out): Modified to use the resource
2493 * IPython/genutils.py (timings_out): Modified to use the resource
2489 module, which avoids the wraparound problems of time.clock().
2494 module, which avoids the wraparound problems of time.clock().
2490
2495
2491 2003-04-17 *** Released version 0.2.15pre4
2496 2003-04-17 *** Released version 0.2.15pre4
2492
2497
2493 2003-04-17 Fernando Perez <fperez@colorado.edu>
2498 2003-04-17 Fernando Perez <fperez@colorado.edu>
2494
2499
2495 * setup.py (scriptfiles): Split windows-specific stuff over to a
2500 * setup.py (scriptfiles): Split windows-specific stuff over to a
2496 separate file, in an attempt to have a Windows GUI installer.
2501 separate file, in an attempt to have a Windows GUI installer.
2497 That didn't work, but part of the groundwork is done.
2502 That didn't work, but part of the groundwork is done.
2498
2503
2499 * IPython/UserConfig/ipythonrc: Added M-i, M-o and M-I for
2504 * IPython/UserConfig/ipythonrc: Added M-i, M-o and M-I for
2500 indent/unindent with 4 spaces. Particularly useful in combination
2505 indent/unindent with 4 spaces. Particularly useful in combination
2501 with the new auto-indent option.
2506 with the new auto-indent option.
2502
2507
2503 2003-04-16 Fernando Perez <fperez@colorado.edu>
2508 2003-04-16 Fernando Perez <fperez@colorado.edu>
2504
2509
2505 * IPython/Magic.py: various replacements of self.rc for
2510 * IPython/Magic.py: various replacements of self.rc for
2506 self.shell.rc. A lot more remains to be done to fully disentangle
2511 self.shell.rc. A lot more remains to be done to fully disentangle
2507 this class from the main Shell class.
2512 this class from the main Shell class.
2508
2513
2509 * IPython/GnuplotRuntime.py: added checks for mouse support so
2514 * IPython/GnuplotRuntime.py: added checks for mouse support so
2510 that we don't try to enable it if the current gnuplot doesn't
2515 that we don't try to enable it if the current gnuplot doesn't
2511 really support it. Also added checks so that we don't try to
2516 really support it. Also added checks so that we don't try to
2512 enable persist under Windows (where Gnuplot doesn't recognize the
2517 enable persist under Windows (where Gnuplot doesn't recognize the
2513 option).
2518 option).
2514
2519
2515 * IPython/iplib.py (InteractiveShell.interact): Added optional
2520 * IPython/iplib.py (InteractiveShell.interact): Added optional
2516 auto-indenting code, after a patch by King C. Shu
2521 auto-indenting code, after a patch by King C. Shu
2517 <kingshu-AT-myrealbox.com>. It's off by default because it doesn't
2522 <kingshu-AT-myrealbox.com>. It's off by default because it doesn't
2518 get along well with pasting indented code. If I ever figure out
2523 get along well with pasting indented code. If I ever figure out
2519 how to make that part go well, it will become on by default.
2524 how to make that part go well, it will become on by default.
2520
2525
2521 * IPython/Prompts.py (Prompt1.auto_rewrite): Fixed bug which would
2526 * IPython/Prompts.py (Prompt1.auto_rewrite): Fixed bug which would
2522 crash ipython if there was an unmatched '%' in the user's prompt
2527 crash ipython if there was an unmatched '%' in the user's prompt
2523 string. Reported by Thorsten Kampe <thorsten-AT-thorstenkampe.de>.
2528 string. Reported by Thorsten Kampe <thorsten-AT-thorstenkampe.de>.
2524
2529
2525 * IPython/iplib.py (InteractiveShell.interact): removed the
2530 * IPython/iplib.py (InteractiveShell.interact): removed the
2526 ability to ask the user whether he wants to crash or not at the
2531 ability to ask the user whether he wants to crash or not at the
2527 'last line' exception handler. Calling functions at that point
2532 'last line' exception handler. Calling functions at that point
2528 changes the stack, and the error reports would have incorrect
2533 changes the stack, and the error reports would have incorrect
2529 tracebacks.
2534 tracebacks.
2530
2535
2531 * IPython/Magic.py (Magic.magic_page): Added new @page magic, to
2536 * IPython/Magic.py (Magic.magic_page): Added new @page magic, to
2532 pass through a peger a pretty-printed form of any object. After a
2537 pass through a peger a pretty-printed form of any object. After a
2533 contribution by Olivier Aubert <oaubert-AT-bat710.univ-lyon1.fr>
2538 contribution by Olivier Aubert <oaubert-AT-bat710.univ-lyon1.fr>
2534
2539
2535 2003-04-14 Fernando Perez <fperez@colorado.edu>
2540 2003-04-14 Fernando Perez <fperez@colorado.edu>
2536
2541
2537 * IPython/iplib.py (InteractiveShell.user_setup): Fixed bug where
2542 * IPython/iplib.py (InteractiveShell.user_setup): Fixed bug where
2538 all files in ~ would be modified at first install (instead of
2543 all files in ~ would be modified at first install (instead of
2539 ~/.ipython). This could be potentially disastrous, as the
2544 ~/.ipython). This could be potentially disastrous, as the
2540 modification (make line-endings native) could damage binary files.
2545 modification (make line-endings native) could damage binary files.
2541
2546
2542 2003-04-10 Fernando Perez <fperez@colorado.edu>
2547 2003-04-10 Fernando Perez <fperez@colorado.edu>
2543
2548
2544 * IPython/iplib.py (InteractiveShell.handle_help): Modified to
2549 * IPython/iplib.py (InteractiveShell.handle_help): Modified to
2545 handle only lines which are invalid python. This now means that
2550 handle only lines which are invalid python. This now means that
2546 lines like 'x=1 #?' execute properly. Thanks to Jeffery Collins
2551 lines like 'x=1 #?' execute properly. Thanks to Jeffery Collins
2547 for the bug report.
2552 for the bug report.
2548
2553
2549 2003-04-01 Fernando Perez <fperez@colorado.edu>
2554 2003-04-01 Fernando Perez <fperez@colorado.edu>
2550
2555
2551 * IPython/iplib.py (InteractiveShell.showtraceback): Fixed bug
2556 * IPython/iplib.py (InteractiveShell.showtraceback): Fixed bug
2552 where failing to set sys.last_traceback would crash pdb.pm().
2557 where failing to set sys.last_traceback would crash pdb.pm().
2553 Thanks to Jeffery D. Collins <Jeff.Collins-AT-vexcel.com> for the bug
2558 Thanks to Jeffery D. Collins <Jeff.Collins-AT-vexcel.com> for the bug
2554 report.
2559 report.
2555
2560
2556 2003-03-25 Fernando Perez <fperez@colorado.edu>
2561 2003-03-25 Fernando Perez <fperez@colorado.edu>
2557
2562
2558 * IPython/Magic.py (Magic.magic_prun): rstrip() output of profiler
2563 * IPython/Magic.py (Magic.magic_prun): rstrip() output of profiler
2559 before printing it (it had a lot of spurious blank lines at the
2564 before printing it (it had a lot of spurious blank lines at the
2560 end).
2565 end).
2561
2566
2562 * IPython/Gnuplot2.py (Gnuplot.hardcopy): fixed bug where lpr
2567 * IPython/Gnuplot2.py (Gnuplot.hardcopy): fixed bug where lpr
2563 output would be sent 21 times! Obviously people don't use this
2568 output would be sent 21 times! Obviously people don't use this
2564 too often, or I would have heard about it.
2569 too often, or I would have heard about it.
2565
2570
2566 2003-03-24 Fernando Perez <fperez@colorado.edu>
2571 2003-03-24 Fernando Perez <fperez@colorado.edu>
2567
2572
2568 * setup.py (scriptfiles): renamed the data_files parameter from
2573 * setup.py (scriptfiles): renamed the data_files parameter from
2569 'base' to 'data' to fix rpm build issues. Thanks to Ralf Ahlbrink
2574 'base' to 'data' to fix rpm build issues. Thanks to Ralf Ahlbrink
2570 for the patch.
2575 for the patch.
2571
2576
2572 2003-03-20 Fernando Perez <fperez@colorado.edu>
2577 2003-03-20 Fernando Perez <fperez@colorado.edu>
2573
2578
2574 * IPython/genutils.py (error): added error() and fatal()
2579 * IPython/genutils.py (error): added error() and fatal()
2575 functions.
2580 functions.
2576
2581
2577 2003-03-18 *** Released version 0.2.15pre3
2582 2003-03-18 *** Released version 0.2.15pre3
2578
2583
2579 2003-03-18 Fernando Perez <fperez@colorado.edu>
2584 2003-03-18 Fernando Perez <fperez@colorado.edu>
2580
2585
2581 * setupext/install_data_ext.py
2586 * setupext/install_data_ext.py
2582 (install_data_ext.initialize_options): Class contributed by Jack
2587 (install_data_ext.initialize_options): Class contributed by Jack
2583 Moffit for fixing the old distutils hack. He is sending this to
2588 Moffit for fixing the old distutils hack. He is sending this to
2584 the distutils folks so in the future we may not need it as a
2589 the distutils folks so in the future we may not need it as a
2585 private fix.
2590 private fix.
2586
2591
2587 * MANIFEST.in: Extensive reorganization, based on Jack Moffit's
2592 * MANIFEST.in: Extensive reorganization, based on Jack Moffit's
2588 changes for Debian packaging. See his patch for full details.
2593 changes for Debian packaging. See his patch for full details.
2589 The old distutils hack of making the ipythonrc* files carry a
2594 The old distutils hack of making the ipythonrc* files carry a
2590 bogus .py extension is gone, at last. Examples were moved to a
2595 bogus .py extension is gone, at last. Examples were moved to a
2591 separate subdir under doc/, and the separate executable scripts
2596 separate subdir under doc/, and the separate executable scripts
2592 now live in their own directory. Overall a great cleanup. The
2597 now live in their own directory. Overall a great cleanup. The
2593 manual was updated to use the new files, and setup.py has been
2598 manual was updated to use the new files, and setup.py has been
2594 fixed for this setup.
2599 fixed for this setup.
2595
2600
2596 * IPython/PyColorize.py (Parser.usage): made non-executable and
2601 * IPython/PyColorize.py (Parser.usage): made non-executable and
2597 created a pycolor wrapper around it to be included as a script.
2602 created a pycolor wrapper around it to be included as a script.
2598
2603
2599 2003-03-12 *** Released version 0.2.15pre2
2604 2003-03-12 *** Released version 0.2.15pre2
2600
2605
2601 2003-03-12 Fernando Perez <fperez@colorado.edu>
2606 2003-03-12 Fernando Perez <fperez@colorado.edu>
2602
2607
2603 * IPython/ColorANSI.py (make_color_table): Finally fixed the
2608 * IPython/ColorANSI.py (make_color_table): Finally fixed the
2604 long-standing problem with garbage characters in some terminals.
2609 long-standing problem with garbage characters in some terminals.
2605 The issue was really that the \001 and \002 escapes must _only_ be
2610 The issue was really that the \001 and \002 escapes must _only_ be
2606 passed to input prompts (which call readline), but _never_ to
2611 passed to input prompts (which call readline), but _never_ to
2607 normal text to be printed on screen. I changed ColorANSI to have
2612 normal text to be printed on screen. I changed ColorANSI to have
2608 two classes: TermColors and InputTermColors, each with the
2613 two classes: TermColors and InputTermColors, each with the
2609 appropriate escapes for input prompts or normal text. The code in
2614 appropriate escapes for input prompts or normal text. The code in
2610 Prompts.py got slightly more complicated, but this very old and
2615 Prompts.py got slightly more complicated, but this very old and
2611 annoying bug is finally fixed.
2616 annoying bug is finally fixed.
2612
2617
2613 All the credit for nailing down the real origin of this problem
2618 All the credit for nailing down the real origin of this problem
2614 and the correct solution goes to Jack Moffit <jack-AT-xiph.org>.
2619 and the correct solution goes to Jack Moffit <jack-AT-xiph.org>.
2615 *Many* thanks to him for spending quite a bit of effort on this.
2620 *Many* thanks to him for spending quite a bit of effort on this.
2616
2621
2617 2003-03-05 *** Released version 0.2.15pre1
2622 2003-03-05 *** Released version 0.2.15pre1
2618
2623
2619 2003-03-03 Fernando Perez <fperez@colorado.edu>
2624 2003-03-03 Fernando Perez <fperez@colorado.edu>
2620
2625
2621 * IPython/FakeModule.py: Moved the former _FakeModule to a
2626 * IPython/FakeModule.py: Moved the former _FakeModule to a
2622 separate file, because it's also needed by Magic (to fix a similar
2627 separate file, because it's also needed by Magic (to fix a similar
2623 pickle-related issue in @run).
2628 pickle-related issue in @run).
2624
2629
2625 2003-03-02 Fernando Perez <fperez@colorado.edu>
2630 2003-03-02 Fernando Perez <fperez@colorado.edu>
2626
2631
2627 * IPython/Magic.py (Magic.magic_autocall): new magic to control
2632 * IPython/Magic.py (Magic.magic_autocall): new magic to control
2628 the autocall option at runtime.
2633 the autocall option at runtime.
2629 (Magic.magic_dhist): changed self.user_ns to self.shell.user_ns
2634 (Magic.magic_dhist): changed self.user_ns to self.shell.user_ns
2630 across Magic.py to start separating Magic from InteractiveShell.
2635 across Magic.py to start separating Magic from InteractiveShell.
2631 (Magic._ofind): Fixed to return proper namespace for dotted
2636 (Magic._ofind): Fixed to return proper namespace for dotted
2632 names. Before, a dotted name would always return 'not currently
2637 names. Before, a dotted name would always return 'not currently
2633 defined', because it would find the 'parent'. s.x would be found,
2638 defined', because it would find the 'parent'. s.x would be found,
2634 but since 'x' isn't defined by itself, it would get confused.
2639 but since 'x' isn't defined by itself, it would get confused.
2635 (Magic.magic_run): Fixed pickling problems reported by Ralf
2640 (Magic.magic_run): Fixed pickling problems reported by Ralf
2636 Ahlbrink <RAhlbrink-AT-RosenInspection.net>. The fix was similar to
2641 Ahlbrink <RAhlbrink-AT-RosenInspection.net>. The fix was similar to
2637 that I'd used when Mike Heeter reported similar issues at the
2642 that I'd used when Mike Heeter reported similar issues at the
2638 top-level, but now for @run. It boils down to injecting the
2643 top-level, but now for @run. It boils down to injecting the
2639 namespace where code is being executed with something that looks
2644 namespace where code is being executed with something that looks
2640 enough like a module to fool pickle.dump(). Since a pickle stores
2645 enough like a module to fool pickle.dump(). Since a pickle stores
2641 a named reference to the importing module, we need this for
2646 a named reference to the importing module, we need this for
2642 pickles to save something sensible.
2647 pickles to save something sensible.
2643
2648
2644 * IPython/ipmaker.py (make_IPython): added an autocall option.
2649 * IPython/ipmaker.py (make_IPython): added an autocall option.
2645
2650
2646 * IPython/iplib.py (InteractiveShell._prefilter): reordered all of
2651 * IPython/iplib.py (InteractiveShell._prefilter): reordered all of
2647 the auto-eval code. Now autocalling is an option, and the code is
2652 the auto-eval code. Now autocalling is an option, and the code is
2648 also vastly safer. There is no more eval() involved at all.
2653 also vastly safer. There is no more eval() involved at all.
2649
2654
2650 2003-03-01 Fernando Perez <fperez@colorado.edu>
2655 2003-03-01 Fernando Perez <fperez@colorado.edu>
2651
2656
2652 * IPython/Magic.py (Magic._ofind): Changed interface to return a
2657 * IPython/Magic.py (Magic._ofind): Changed interface to return a
2653 dict with named keys instead of a tuple.
2658 dict with named keys instead of a tuple.
2654
2659
2655 * IPython: Started using CVS for IPython as of 0.2.15pre1.
2660 * IPython: Started using CVS for IPython as of 0.2.15pre1.
2656
2661
2657 * setup.py (make_shortcut): Fixed message about directories
2662 * setup.py (make_shortcut): Fixed message about directories
2658 created during Windows installation (the directories were ok, just
2663 created during Windows installation (the directories were ok, just
2659 the printed message was misleading). Thanks to Chris Liechti
2664 the printed message was misleading). Thanks to Chris Liechti
2660 <cliechti-AT-gmx.net> for the heads up.
2665 <cliechti-AT-gmx.net> for the heads up.
2661
2666
2662 2003-02-21 Fernando Perez <fperez@colorado.edu>
2667 2003-02-21 Fernando Perez <fperez@colorado.edu>
2663
2668
2664 * IPython/iplib.py (InteractiveShell._prefilter): Fixed catching
2669 * IPython/iplib.py (InteractiveShell._prefilter): Fixed catching
2665 of ValueError exception when checking for auto-execution. This
2670 of ValueError exception when checking for auto-execution. This
2666 one is raised by things like Numeric arrays arr.flat when the
2671 one is raised by things like Numeric arrays arr.flat when the
2667 array is non-contiguous.
2672 array is non-contiguous.
2668
2673
2669 2003-01-31 Fernando Perez <fperez@colorado.edu>
2674 2003-01-31 Fernando Perez <fperez@colorado.edu>
2670
2675
2671 * IPython/genutils.py (SystemExec.bq): Fixed bug where bq would
2676 * IPython/genutils.py (SystemExec.bq): Fixed bug where bq would
2672 not return any value at all (even though the command would get
2677 not return any value at all (even though the command would get
2673 executed).
2678 executed).
2674 (xsys): Flush stdout right after printing the command to ensure
2679 (xsys): Flush stdout right after printing the command to ensure
2675 proper ordering of commands and command output in the total
2680 proper ordering of commands and command output in the total
2676 output.
2681 output.
2677 (SystemExec/xsys/bq): Switched the names of xsys/bq and
2682 (SystemExec/xsys/bq): Switched the names of xsys/bq and
2678 system/getoutput as defaults. The old ones are kept for
2683 system/getoutput as defaults. The old ones are kept for
2679 compatibility reasons, so no code which uses this library needs
2684 compatibility reasons, so no code which uses this library needs
2680 changing.
2685 changing.
2681
2686
2682 2003-01-27 *** Released version 0.2.14
2687 2003-01-27 *** Released version 0.2.14
2683
2688
2684 2003-01-25 Fernando Perez <fperez@colorado.edu>
2689 2003-01-25 Fernando Perez <fperez@colorado.edu>
2685
2690
2686 * IPython/Magic.py (Magic.magic_edit): Fixed problem where
2691 * IPython/Magic.py (Magic.magic_edit): Fixed problem where
2687 functions defined in previous edit sessions could not be re-edited
2692 functions defined in previous edit sessions could not be re-edited
2688 (because the temp files were immediately removed). Now temp files
2693 (because the temp files were immediately removed). Now temp files
2689 are removed only at IPython's exit.
2694 are removed only at IPython's exit.
2690 (Magic.magic_run): Improved @run to perform shell-like expansions
2695 (Magic.magic_run): Improved @run to perform shell-like expansions
2691 on its arguments (~users and $VARS). With this, @run becomes more
2696 on its arguments (~users and $VARS). With this, @run becomes more
2692 like a normal command-line.
2697 like a normal command-line.
2693
2698
2694 * IPython/Shell.py (IPShellEmbed.__call__): Fixed a bunch of small
2699 * IPython/Shell.py (IPShellEmbed.__call__): Fixed a bunch of small
2695 bugs related to embedding and cleaned up that code. A fairly
2700 bugs related to embedding and cleaned up that code. A fairly
2696 important one was the impossibility to access the global namespace
2701 important one was the impossibility to access the global namespace
2697 through the embedded IPython (only local variables were visible).
2702 through the embedded IPython (only local variables were visible).
2698
2703
2699 2003-01-14 Fernando Perez <fperez@colorado.edu>
2704 2003-01-14 Fernando Perez <fperez@colorado.edu>
2700
2705
2701 * IPython/iplib.py (InteractiveShell._prefilter): Fixed
2706 * IPython/iplib.py (InteractiveShell._prefilter): Fixed
2702 auto-calling to be a bit more conservative. Now it doesn't get
2707 auto-calling to be a bit more conservative. Now it doesn't get
2703 triggered if any of '!=()<>' are in the rest of the input line, to
2708 triggered if any of '!=()<>' are in the rest of the input line, to
2704 allow comparing callables. Thanks to Alex for the heads up.
2709 allow comparing callables. Thanks to Alex for the heads up.
2705
2710
2706 2003-01-07 Fernando Perez <fperez@colorado.edu>
2711 2003-01-07 Fernando Perez <fperez@colorado.edu>
2707
2712
2708 * IPython/genutils.py (page): fixed estimation of the number of
2713 * IPython/genutils.py (page): fixed estimation of the number of
2709 lines in a string to be paged to simply count newlines. This
2714 lines in a string to be paged to simply count newlines. This
2710 prevents over-guessing due to embedded escape sequences. A better
2715 prevents over-guessing due to embedded escape sequences. A better
2711 long-term solution would involve stripping out the control chars
2716 long-term solution would involve stripping out the control chars
2712 for the count, but it's potentially so expensive I just don't
2717 for the count, but it's potentially so expensive I just don't
2713 think it's worth doing.
2718 think it's worth doing.
2714
2719
2715 2002-12-19 *** Released version 0.2.14pre50
2720 2002-12-19 *** Released version 0.2.14pre50
2716
2721
2717 2002-12-19 Fernando Perez <fperez@colorado.edu>
2722 2002-12-19 Fernando Perez <fperez@colorado.edu>
2718
2723
2719 * tools/release (version): Changed release scripts to inform
2724 * tools/release (version): Changed release scripts to inform
2720 Andrea and build a NEWS file with a list of recent changes.
2725 Andrea and build a NEWS file with a list of recent changes.
2721
2726
2722 * IPython/ColorANSI.py (__all__): changed terminal detection
2727 * IPython/ColorANSI.py (__all__): changed terminal detection
2723 code. Seems to work better for xterms without breaking
2728 code. Seems to work better for xterms without breaking
2724 konsole. Will need more testing to determine if WinXP and Mac OSX
2729 konsole. Will need more testing to determine if WinXP and Mac OSX
2725 also work ok.
2730 also work ok.
2726
2731
2727 2002-12-18 *** Released version 0.2.14pre49
2732 2002-12-18 *** Released version 0.2.14pre49
2728
2733
2729 2002-12-18 Fernando Perez <fperez@colorado.edu>
2734 2002-12-18 Fernando Perez <fperez@colorado.edu>
2730
2735
2731 * Docs: added new info about Mac OSX, from Andrea.
2736 * Docs: added new info about Mac OSX, from Andrea.
2732
2737
2733 * IPython/Gnuplot2.py (String): Added a String PlotItem class to
2738 * IPython/Gnuplot2.py (String): Added a String PlotItem class to
2734 allow direct plotting of python strings whose format is the same
2739 allow direct plotting of python strings whose format is the same
2735 of gnuplot data files.
2740 of gnuplot data files.
2736
2741
2737 2002-12-16 Fernando Perez <fperez@colorado.edu>
2742 2002-12-16 Fernando Perez <fperez@colorado.edu>
2738
2743
2739 * IPython/iplib.py (InteractiveShell.interact): fixed default (y)
2744 * IPython/iplib.py (InteractiveShell.interact): fixed default (y)
2740 value of exit question to be acknowledged.
2745 value of exit question to be acknowledged.
2741
2746
2742 2002-12-03 Fernando Perez <fperez@colorado.edu>
2747 2002-12-03 Fernando Perez <fperez@colorado.edu>
2743
2748
2744 * IPython/ipmaker.py: removed generators, which had been added
2749 * IPython/ipmaker.py: removed generators, which had been added
2745 by mistake in an earlier debugging run. This was causing trouble
2750 by mistake in an earlier debugging run. This was causing trouble
2746 to users of python 2.1.x. Thanks to Abel Daniel <abli-AT-freemail.hu>
2751 to users of python 2.1.x. Thanks to Abel Daniel <abli-AT-freemail.hu>
2747 for pointing this out.
2752 for pointing this out.
2748
2753
2749 2002-11-17 Fernando Perez <fperez@colorado.edu>
2754 2002-11-17 Fernando Perez <fperez@colorado.edu>
2750
2755
2751 * Manual: updated the Gnuplot section.
2756 * Manual: updated the Gnuplot section.
2752
2757
2753 * IPython/GnuplotRuntime.py: refactored a lot all this code, with
2758 * IPython/GnuplotRuntime.py: refactored a lot all this code, with
2754 a much better split of what goes in Runtime and what goes in
2759 a much better split of what goes in Runtime and what goes in
2755 Interactive.
2760 Interactive.
2756
2761
2757 * IPython/ipmaker.py: fixed bug where import_fail_info wasn't
2762 * IPython/ipmaker.py: fixed bug where import_fail_info wasn't
2758 being imported from iplib.
2763 being imported from iplib.
2759
2764
2760 * IPython/GnuplotInteractive.py (magic_gpc): renamed @gp to @gpc
2765 * IPython/GnuplotInteractive.py (magic_gpc): renamed @gp to @gpc
2761 for command-passing. Now the global Gnuplot instance is called
2766 for command-passing. Now the global Gnuplot instance is called
2762 'gp' instead of 'g', which was really a far too fragile and
2767 'gp' instead of 'g', which was really a far too fragile and
2763 common name.
2768 common name.
2764
2769
2765 * IPython/Gnuplot2.py (eps_fix_bbox): added this to fix broken
2770 * IPython/Gnuplot2.py (eps_fix_bbox): added this to fix broken
2766 bounding boxes generated by Gnuplot for square plots.
2771 bounding boxes generated by Gnuplot for square plots.
2767
2772
2768 * IPython/genutils.py (popkey): new function added. I should
2773 * IPython/genutils.py (popkey): new function added. I should
2769 suggest this on c.l.py as a dict method, it seems useful.
2774 suggest this on c.l.py as a dict method, it seems useful.
2770
2775
2771 * IPython/Gnuplot2.py (Gnuplot.plot): Overhauled plot and replot
2776 * IPython/Gnuplot2.py (Gnuplot.plot): Overhauled plot and replot
2772 to transparently handle PostScript generation. MUCH better than
2777 to transparently handle PostScript generation. MUCH better than
2773 the previous plot_eps/replot_eps (which I removed now). The code
2778 the previous plot_eps/replot_eps (which I removed now). The code
2774 is also fairly clean and well documented now (including
2779 is also fairly clean and well documented now (including
2775 docstrings).
2780 docstrings).
2776
2781
2777 2002-11-13 Fernando Perez <fperez@colorado.edu>
2782 2002-11-13 Fernando Perez <fperez@colorado.edu>
2778
2783
2779 * IPython/Magic.py (Magic.magic_edit): fixed docstring
2784 * IPython/Magic.py (Magic.magic_edit): fixed docstring
2780 (inconsistent with options).
2785 (inconsistent with options).
2781
2786
2782 * IPython/Gnuplot2.py (Gnuplot.hardcopy): hardcopy had been
2787 * IPython/Gnuplot2.py (Gnuplot.hardcopy): hardcopy had been
2783 manually disabled, I don't know why. Fixed it.
2788 manually disabled, I don't know why. Fixed it.
2784 (Gnuplot._plot_eps): added new plot_eps/replot_eps to get directly
2789 (Gnuplot._plot_eps): added new plot_eps/replot_eps to get directly
2785 eps output.
2790 eps output.
2786
2791
2787 2002-11-12 Fernando Perez <fperez@colorado.edu>
2792 2002-11-12 Fernando Perez <fperez@colorado.edu>
2788
2793
2789 * IPython/genutils.py (ask_yes_no): trap EOF and ^C so that they
2794 * IPython/genutils.py (ask_yes_no): trap EOF and ^C so that they
2790 don't propagate up to caller. Fixes crash reported by François
2795 don't propagate up to caller. Fixes crash reported by François
2791 Pinard.
2796 Pinard.
2792
2797
2793 2002-11-09 Fernando Perez <fperez@colorado.edu>
2798 2002-11-09 Fernando Perez <fperez@colorado.edu>
2794
2799
2795 * IPython/ipmaker.py (make_IPython): fixed problem with writing
2800 * IPython/ipmaker.py (make_IPython): fixed problem with writing
2796 history file for new users.
2801 history file for new users.
2797 (make_IPython): fixed bug where initial install would leave the
2802 (make_IPython): fixed bug where initial install would leave the
2798 user running in the .ipython dir.
2803 user running in the .ipython dir.
2799 (make_IPython): fixed bug where config dir .ipython would be
2804 (make_IPython): fixed bug where config dir .ipython would be
2800 created regardless of the given -ipythondir option. Thanks to Cory
2805 created regardless of the given -ipythondir option. Thanks to Cory
2801 Dodt <cdodt-AT-fcoe.k12.ca.us> for the bug report.
2806 Dodt <cdodt-AT-fcoe.k12.ca.us> for the bug report.
2802
2807
2803 * IPython/genutils.py (ask_yes_no): new function for asking yes/no
2808 * IPython/genutils.py (ask_yes_no): new function for asking yes/no
2804 type confirmations. Will need to use it in all of IPython's code
2809 type confirmations. Will need to use it in all of IPython's code
2805 consistently.
2810 consistently.
2806
2811
2807 * IPython/CrashHandler.py (CrashHandler.__call__): changed the
2812 * IPython/CrashHandler.py (CrashHandler.__call__): changed the
2808 context to print 31 lines instead of the default 5. This will make
2813 context to print 31 lines instead of the default 5. This will make
2809 the crash reports extremely detailed in case the problem is in
2814 the crash reports extremely detailed in case the problem is in
2810 libraries I don't have access to.
2815 libraries I don't have access to.
2811
2816
2812 * IPython/iplib.py (InteractiveShell.interact): changed the 'last
2817 * IPython/iplib.py (InteractiveShell.interact): changed the 'last
2813 line of defense' code to still crash, but giving users fair
2818 line of defense' code to still crash, but giving users fair
2814 warning. I don't want internal errors to go unreported: if there's
2819 warning. I don't want internal errors to go unreported: if there's
2815 an internal problem, IPython should crash and generate a full
2820 an internal problem, IPython should crash and generate a full
2816 report.
2821 report.
2817
2822
2818 2002-11-08 Fernando Perez <fperez@colorado.edu>
2823 2002-11-08 Fernando Perez <fperez@colorado.edu>
2819
2824
2820 * IPython/iplib.py (InteractiveShell.interact): added code to trap
2825 * IPython/iplib.py (InteractiveShell.interact): added code to trap
2821 otherwise uncaught exceptions which can appear if people set
2826 otherwise uncaught exceptions which can appear if people set
2822 sys.stdout to something badly broken. Thanks to a crash report
2827 sys.stdout to something badly broken. Thanks to a crash report
2823 from henni-AT-mail.brainbot.com.
2828 from henni-AT-mail.brainbot.com.
2824
2829
2825 2002-11-04 Fernando Perez <fperez@colorado.edu>
2830 2002-11-04 Fernando Perez <fperez@colorado.edu>
2826
2831
2827 * IPython/iplib.py (InteractiveShell.interact): added
2832 * IPython/iplib.py (InteractiveShell.interact): added
2828 __IPYTHON__active to the builtins. It's a flag which goes on when
2833 __IPYTHON__active to the builtins. It's a flag which goes on when
2829 the interaction starts and goes off again when it stops. This
2834 the interaction starts and goes off again when it stops. This
2830 allows embedding code to detect being inside IPython. Before this
2835 allows embedding code to detect being inside IPython. Before this
2831 was done via __IPYTHON__, but that only shows that an IPython
2836 was done via __IPYTHON__, but that only shows that an IPython
2832 instance has been created.
2837 instance has been created.
2833
2838
2834 * IPython/Magic.py (Magic.magic_env): I realized that in a
2839 * IPython/Magic.py (Magic.magic_env): I realized that in a
2835 UserDict, instance.data holds the data as a normal dict. So I
2840 UserDict, instance.data holds the data as a normal dict. So I
2836 modified @env to return os.environ.data instead of rebuilding a
2841 modified @env to return os.environ.data instead of rebuilding a
2837 dict by hand.
2842 dict by hand.
2838
2843
2839 2002-11-02 Fernando Perez <fperez@colorado.edu>
2844 2002-11-02 Fernando Perez <fperez@colorado.edu>
2840
2845
2841 * IPython/genutils.py (warn): changed so that level 1 prints no
2846 * IPython/genutils.py (warn): changed so that level 1 prints no
2842 header. Level 2 is now the default (with 'WARNING' header, as
2847 header. Level 2 is now the default (with 'WARNING' header, as
2843 before). I think I tracked all places where changes were needed in
2848 before). I think I tracked all places where changes were needed in
2844 IPython, but outside code using the old level numbering may have
2849 IPython, but outside code using the old level numbering may have
2845 broken.
2850 broken.
2846
2851
2847 * IPython/iplib.py (InteractiveShell.runcode): added this to
2852 * IPython/iplib.py (InteractiveShell.runcode): added this to
2848 handle the tracebacks in SystemExit traps correctly. The previous
2853 handle the tracebacks in SystemExit traps correctly. The previous
2849 code (through interact) was printing more of the stack than
2854 code (through interact) was printing more of the stack than
2850 necessary, showing IPython internal code to the user.
2855 necessary, showing IPython internal code to the user.
2851
2856
2852 * IPython/UserConfig/ipythonrc.py: Made confirm_exit 1 by
2857 * IPython/UserConfig/ipythonrc.py: Made confirm_exit 1 by
2853 default. Now that the default at the confirmation prompt is yes,
2858 default. Now that the default at the confirmation prompt is yes,
2854 it's not so intrusive. François' argument that ipython sessions
2859 it's not so intrusive. François' argument that ipython sessions
2855 tend to be complex enough not to lose them from an accidental C-d,
2860 tend to be complex enough not to lose them from an accidental C-d,
2856 is a valid one.
2861 is a valid one.
2857
2862
2858 * IPython/iplib.py (InteractiveShell.interact): added a
2863 * IPython/iplib.py (InteractiveShell.interact): added a
2859 showtraceback() call to the SystemExit trap, and modified the exit
2864 showtraceback() call to the SystemExit trap, and modified the exit
2860 confirmation to have yes as the default.
2865 confirmation to have yes as the default.
2861
2866
2862 * IPython/UserConfig/ipythonrc.py: removed 'session' option from
2867 * IPython/UserConfig/ipythonrc.py: removed 'session' option from
2863 this file. It's been gone from the code for a long time, this was
2868 this file. It's been gone from the code for a long time, this was
2864 simply leftover junk.
2869 simply leftover junk.
2865
2870
2866 2002-11-01 Fernando Perez <fperez@colorado.edu>
2871 2002-11-01 Fernando Perez <fperez@colorado.edu>
2867
2872
2868 * IPython/UserConfig/ipythonrc.py: new confirm_exit option
2873 * IPython/UserConfig/ipythonrc.py: new confirm_exit option
2869 added. If set, IPython now traps EOF and asks for
2874 added. If set, IPython now traps EOF and asks for
2870 confirmation. After a request by François Pinard.
2875 confirmation. After a request by François Pinard.
2871
2876
2872 * IPython/Magic.py (Magic.magic_Exit): New @Exit and @Quit instead
2877 * IPython/Magic.py (Magic.magic_Exit): New @Exit and @Quit instead
2873 of @abort, and with a new (better) mechanism for handling the
2878 of @abort, and with a new (better) mechanism for handling the
2874 exceptions.
2879 exceptions.
2875
2880
2876 2002-10-27 Fernando Perez <fperez@colorado.edu>
2881 2002-10-27 Fernando Perez <fperez@colorado.edu>
2877
2882
2878 * IPython/usage.py (__doc__): updated the --help information and
2883 * IPython/usage.py (__doc__): updated the --help information and
2879 the ipythonrc file to indicate that -log generates
2884 the ipythonrc file to indicate that -log generates
2880 ./ipython.log. Also fixed the corresponding info in @logstart.
2885 ./ipython.log. Also fixed the corresponding info in @logstart.
2881 This and several other fixes in the manuals thanks to reports by
2886 This and several other fixes in the manuals thanks to reports by
2882 François Pinard <pinard-AT-iro.umontreal.ca>.
2887 François Pinard <pinard-AT-iro.umontreal.ca>.
2883
2888
2884 * IPython/Logger.py (Logger.switch_log): Fixed error message to
2889 * IPython/Logger.py (Logger.switch_log): Fixed error message to
2885 refer to @logstart (instead of @log, which doesn't exist).
2890 refer to @logstart (instead of @log, which doesn't exist).
2886
2891
2887 * IPython/iplib.py (InteractiveShell._prefilter): fixed
2892 * IPython/iplib.py (InteractiveShell._prefilter): fixed
2888 AttributeError crash. Thanks to Christopher Armstrong
2893 AttributeError crash. Thanks to Christopher Armstrong
2889 <radix-AT-twistedmatrix.com> for the report/fix. This bug had been
2894 <radix-AT-twistedmatrix.com> for the report/fix. This bug had been
2890 introduced recently (in 0.2.14pre37) with the fix to the eval
2895 introduced recently (in 0.2.14pre37) with the fix to the eval
2891 problem mentioned below.
2896 problem mentioned below.
2892
2897
2893 2002-10-17 Fernando Perez <fperez@colorado.edu>
2898 2002-10-17 Fernando Perez <fperez@colorado.edu>
2894
2899
2895 * IPython/ConfigLoader.py (ConfigLoader.load): Fixes for Windows
2900 * IPython/ConfigLoader.py (ConfigLoader.load): Fixes for Windows
2896 installation. Thanks to Leonardo Santagada <retype-AT-terra.com.br>.
2901 installation. Thanks to Leonardo Santagada <retype-AT-terra.com.br>.
2897
2902
2898 * IPython/iplib.py (InteractiveShell._prefilter): Many changes to
2903 * IPython/iplib.py (InteractiveShell._prefilter): Many changes to
2899 this function to fix a problem reported by Alex Schmolck. He saw
2904 this function to fix a problem reported by Alex Schmolck. He saw
2900 it with list comprehensions and generators, which were getting
2905 it with list comprehensions and generators, which were getting
2901 called twice. The real problem was an 'eval' call in testing for
2906 called twice. The real problem was an 'eval' call in testing for
2902 automagic which was evaluating the input line silently.
2907 automagic which was evaluating the input line silently.
2903
2908
2904 This is a potentially very nasty bug, if the input has side
2909 This is a potentially very nasty bug, if the input has side
2905 effects which must not be repeated. The code is much cleaner now,
2910 effects which must not be repeated. The code is much cleaner now,
2906 without any blanket 'except' left and with a regexp test for
2911 without any blanket 'except' left and with a regexp test for
2907 actual function names.
2912 actual function names.
2908
2913
2909 But an eval remains, which I'm not fully comfortable with. I just
2914 But an eval remains, which I'm not fully comfortable with. I just
2910 don't know how to find out if an expression could be a callable in
2915 don't know how to find out if an expression could be a callable in
2911 the user's namespace without doing an eval on the string. However
2916 the user's namespace without doing an eval on the string. However
2912 that string is now much more strictly checked so that no code
2917 that string is now much more strictly checked so that no code
2913 slips by, so the eval should only happen for things that can
2918 slips by, so the eval should only happen for things that can
2914 really be only function/method names.
2919 really be only function/method names.
2915
2920
2916 2002-10-15 Fernando Perez <fperez@colorado.edu>
2921 2002-10-15 Fernando Perez <fperez@colorado.edu>
2917
2922
2918 * Updated LyX to 1.2.1 so I can work on the docs again. Added Mac
2923 * Updated LyX to 1.2.1 so I can work on the docs again. Added Mac
2919 OSX information to main manual, removed README_Mac_OSX file from
2924 OSX information to main manual, removed README_Mac_OSX file from
2920 distribution. Also updated credits for recent additions.
2925 distribution. Also updated credits for recent additions.
2921
2926
2922 2002-10-10 Fernando Perez <fperez@colorado.edu>
2927 2002-10-10 Fernando Perez <fperez@colorado.edu>
2923
2928
2924 * README_Mac_OSX: Added a README for Mac OSX users for fixing
2929 * README_Mac_OSX: Added a README for Mac OSX users for fixing
2925 terminal-related issues. Many thanks to Andrea Riciputi
2930 terminal-related issues. Many thanks to Andrea Riciputi
2926 <andrea.riciputi-AT-libero.it> for writing it.
2931 <andrea.riciputi-AT-libero.it> for writing it.
2927
2932
2928 * IPython/UserConfig/ipythonrc.py: Fixes to various small issues,
2933 * IPython/UserConfig/ipythonrc.py: Fixes to various small issues,
2929 thanks to Thorsten Kampe <thorsten-AT-thorstenkampe.de>.
2934 thanks to Thorsten Kampe <thorsten-AT-thorstenkampe.de>.
2930
2935
2931 * setup.py (make_shortcut): Fixes for Windows installation. Thanks
2936 * setup.py (make_shortcut): Fixes for Windows installation. Thanks
2932 to Fredrik Kant <fredrik.kant-AT-front.com> and Syver Enstad
2937 to Fredrik Kant <fredrik.kant-AT-front.com> and Syver Enstad
2933 <syver-en-AT-online.no> who both submitted patches for this problem.
2938 <syver-en-AT-online.no> who both submitted patches for this problem.
2934
2939
2935 * IPython/iplib.py (InteractiveShell.embed_mainloop): Patch for
2940 * IPython/iplib.py (InteractiveShell.embed_mainloop): Patch for
2936 global embedding to make sure that things don't overwrite user
2941 global embedding to make sure that things don't overwrite user
2937 globals accidentally. Thanks to Richard <rxe-AT-renre-europe.com>
2942 globals accidentally. Thanks to Richard <rxe-AT-renre-europe.com>
2938
2943
2939 * IPython/Gnuplot2.py (gp): Patch for Gnuplot.py 1.6
2944 * IPython/Gnuplot2.py (gp): Patch for Gnuplot.py 1.6
2940 compatibility. Thanks to Hayden Callow
2945 compatibility. Thanks to Hayden Callow
2941 <h.callow-AT-elec.canterbury.ac.nz>
2946 <h.callow-AT-elec.canterbury.ac.nz>
2942
2947
2943 2002-10-04 Fernando Perez <fperez@colorado.edu>
2948 2002-10-04 Fernando Perez <fperez@colorado.edu>
2944
2949
2945 * IPython/Gnuplot2.py (PlotItem): Added 'index' option for
2950 * IPython/Gnuplot2.py (PlotItem): Added 'index' option for
2946 Gnuplot.File objects.
2951 Gnuplot.File objects.
2947
2952
2948 2002-07-23 Fernando Perez <fperez@colorado.edu>
2953 2002-07-23 Fernando Perez <fperez@colorado.edu>
2949
2954
2950 * IPython/genutils.py (timing): Added timings() and timing() for
2955 * IPython/genutils.py (timing): Added timings() and timing() for
2951 quick access to the most commonly needed data, the execution
2956 quick access to the most commonly needed data, the execution
2952 times. Old timing() renamed to timings_out().
2957 times. Old timing() renamed to timings_out().
2953
2958
2954 2002-07-18 Fernando Perez <fperez@colorado.edu>
2959 2002-07-18 Fernando Perez <fperez@colorado.edu>
2955
2960
2956 * IPython/Shell.py (IPShellEmbed.restore_system_completer): fixed
2961 * IPython/Shell.py (IPShellEmbed.restore_system_completer): fixed
2957 bug with nested instances disrupting the parent's tab completion.
2962 bug with nested instances disrupting the parent's tab completion.
2958
2963
2959 * IPython/iplib.py (all_completions): Added Alex Schmolck's
2964 * IPython/iplib.py (all_completions): Added Alex Schmolck's
2960 all_completions code to begin the emacs integration.
2965 all_completions code to begin the emacs integration.
2961
2966
2962 * IPython/Gnuplot2.py (zip_items): Added optional 'titles'
2967 * IPython/Gnuplot2.py (zip_items): Added optional 'titles'
2963 argument to allow titling individual arrays when plotting.
2968 argument to allow titling individual arrays when plotting.
2964
2969
2965 2002-07-15 Fernando Perez <fperez@colorado.edu>
2970 2002-07-15 Fernando Perez <fperez@colorado.edu>
2966
2971
2967 * setup.py (make_shortcut): changed to retrieve the value of
2972 * setup.py (make_shortcut): changed to retrieve the value of
2968 'Program Files' directory from the registry (this value changes in
2973 'Program Files' directory from the registry (this value changes in
2969 non-english versions of Windows). Thanks to Thomas Fanslau
2974 non-english versions of Windows). Thanks to Thomas Fanslau
2970 <tfanslau-AT-gmx.de> for the report.
2975 <tfanslau-AT-gmx.de> for the report.
2971
2976
2972 2002-07-10 Fernando Perez <fperez@colorado.edu>
2977 2002-07-10 Fernando Perez <fperez@colorado.edu>
2973
2978
2974 * IPython/ultraTB.py (VerboseTB.debugger): enabled workaround for
2979 * IPython/ultraTB.py (VerboseTB.debugger): enabled workaround for
2975 a bug in pdb, which crashes if a line with only whitespace is
2980 a bug in pdb, which crashes if a line with only whitespace is
2976 entered. Bug report submitted to sourceforge.
2981 entered. Bug report submitted to sourceforge.
2977
2982
2978 2002-07-09 Fernando Perez <fperez@colorado.edu>
2983 2002-07-09 Fernando Perez <fperez@colorado.edu>
2979
2984
2980 * IPython/ultraTB.py (VerboseTB.nullrepr): fixed rare crash when
2985 * IPython/ultraTB.py (VerboseTB.nullrepr): fixed rare crash when
2981 reporting exceptions (it's a bug in inspect.py, I just set a
2986 reporting exceptions (it's a bug in inspect.py, I just set a
2982 workaround).
2987 workaround).
2983
2988
2984 2002-07-08 Fernando Perez <fperez@colorado.edu>
2989 2002-07-08 Fernando Perez <fperez@colorado.edu>
2985
2990
2986 * IPython/iplib.py (InteractiveShell.__init__): fixed reference to
2991 * IPython/iplib.py (InteractiveShell.__init__): fixed reference to
2987 __IPYTHON__ in __builtins__ to show up in user_ns.
2992 __IPYTHON__ in __builtins__ to show up in user_ns.
2988
2993
2989 2002-07-03 Fernando Perez <fperez@colorado.edu>
2994 2002-07-03 Fernando Perez <fperez@colorado.edu>
2990
2995
2991 * IPython/GnuplotInteractive.py (magic_gp_set_default): changed
2996 * IPython/GnuplotInteractive.py (magic_gp_set_default): changed
2992 name from @gp_set_instance to @gp_set_default.
2997 name from @gp_set_instance to @gp_set_default.
2993
2998
2994 * IPython/ipmaker.py (make_IPython): default editor value set to
2999 * IPython/ipmaker.py (make_IPython): default editor value set to
2995 '0' (a string), to match the rc file. Otherwise will crash when
3000 '0' (a string), to match the rc file. Otherwise will crash when
2996 .strip() is called on it.
3001 .strip() is called on it.
2997
3002
2998
3003
2999 2002-06-28 Fernando Perez <fperez@colorado.edu>
3004 2002-06-28 Fernando Perez <fperez@colorado.edu>
3000
3005
3001 * IPython/iplib.py (InteractiveShell.safe_execfile): fix importing
3006 * IPython/iplib.py (InteractiveShell.safe_execfile): fix importing
3002 of files in current directory when a file is executed via
3007 of files in current directory when a file is executed via
3003 @run. Patch also by RA <ralf_ahlbrink-AT-web.de>.
3008 @run. Patch also by RA <ralf_ahlbrink-AT-web.de>.
3004
3009
3005 * setup.py (manfiles): fix for rpm builds, submitted by RA
3010 * setup.py (manfiles): fix for rpm builds, submitted by RA
3006 <ralf_ahlbrink-AT-web.de>. Now we have RPMs!
3011 <ralf_ahlbrink-AT-web.de>. Now we have RPMs!
3007
3012
3008 * IPython/ipmaker.py (make_IPython): fixed lookup of default
3013 * IPython/ipmaker.py (make_IPython): fixed lookup of default
3009 editor when set to '0'. Problem was, '0' evaluates to True (it's a
3014 editor when set to '0'. Problem was, '0' evaluates to True (it's a
3010 string!). A. Schmolck caught this one.
3015 string!). A. Schmolck caught this one.
3011
3016
3012 2002-06-27 Fernando Perez <fperez@colorado.edu>
3017 2002-06-27 Fernando Perez <fperez@colorado.edu>
3013
3018
3014 * IPython/ipmaker.py (make_IPython): fixed bug when running user
3019 * IPython/ipmaker.py (make_IPython): fixed bug when running user
3015 defined files at the cmd line. __name__ wasn't being set to
3020 defined files at the cmd line. __name__ wasn't being set to
3016 __main__.
3021 __main__.
3017
3022
3018 * IPython/Gnuplot2.py (zip_items): improved it so it can plot also
3023 * IPython/Gnuplot2.py (zip_items): improved it so it can plot also
3019 regular lists and tuples besides Numeric arrays.
3024 regular lists and tuples besides Numeric arrays.
3020
3025
3021 * IPython/Prompts.py (CachedOutput.__call__): Added output
3026 * IPython/Prompts.py (CachedOutput.__call__): Added output
3022 supression for input ending with ';'. Similar to Mathematica and
3027 supression for input ending with ';'. Similar to Mathematica and
3023 Matlab. The _* vars and Out[] list are still updated, just like
3028 Matlab. The _* vars and Out[] list are still updated, just like
3024 Mathematica behaves.
3029 Mathematica behaves.
3025
3030
3026 2002-06-25 Fernando Perez <fperez@colorado.edu>
3031 2002-06-25 Fernando Perez <fperez@colorado.edu>
3027
3032
3028 * IPython/ConfigLoader.py (ConfigLoader.load): fixed checking of
3033 * IPython/ConfigLoader.py (ConfigLoader.load): fixed checking of
3029 .ini extensions for profiels under Windows.
3034 .ini extensions for profiels under Windows.
3030
3035
3031 * IPython/OInspect.py (Inspector.pinfo): improved alignment of
3036 * IPython/OInspect.py (Inspector.pinfo): improved alignment of
3032 string form. Fix contributed by Alexander Schmolck
3037 string form. Fix contributed by Alexander Schmolck
3033 <a.schmolck-AT-gmx.net>
3038 <a.schmolck-AT-gmx.net>
3034
3039
3035 * IPython/GnuplotRuntime.py (gp_new): new function. Returns a
3040 * IPython/GnuplotRuntime.py (gp_new): new function. Returns a
3036 pre-configured Gnuplot instance.
3041 pre-configured Gnuplot instance.
3037
3042
3038 2002-06-21 Fernando Perez <fperez@colorado.edu>
3043 2002-06-21 Fernando Perez <fperez@colorado.edu>
3039
3044
3040 * IPython/numutils.py (exp_safe): new function, works around the
3045 * IPython/numutils.py (exp_safe): new function, works around the
3041 underflow problems in Numeric.
3046 underflow problems in Numeric.
3042 (log2): New fn. Safe log in base 2: returns exact integer answer
3047 (log2): New fn. Safe log in base 2: returns exact integer answer
3043 for exact integer powers of 2.
3048 for exact integer powers of 2.
3044
3049
3045 * IPython/Magic.py (get_py_filename): fixed it not expanding '~'
3050 * IPython/Magic.py (get_py_filename): fixed it not expanding '~'
3046 properly.
3051 properly.
3047
3052
3048 2002-06-20 Fernando Perez <fperez@colorado.edu>
3053 2002-06-20 Fernando Perez <fperez@colorado.edu>
3049
3054
3050 * IPython/genutils.py (timing): new function like
3055 * IPython/genutils.py (timing): new function like
3051 Mathematica's. Similar to time_test, but returns more info.
3056 Mathematica's. Similar to time_test, but returns more info.
3052
3057
3053 2002-06-18 Fernando Perez <fperez@colorado.edu>
3058 2002-06-18 Fernando Perez <fperez@colorado.edu>
3054
3059
3055 * IPython/Magic.py (Magic.magic_save): modified @save and @r
3060 * IPython/Magic.py (Magic.magic_save): modified @save and @r
3056 according to Mike Heeter's suggestions.
3061 according to Mike Heeter's suggestions.
3057
3062
3058 2002-06-16 Fernando Perez <fperez@colorado.edu>
3063 2002-06-16 Fernando Perez <fperez@colorado.edu>
3059
3064
3060 * IPython/GnuplotRuntime.py: Massive overhaul to the Gnuplot
3065 * IPython/GnuplotRuntime.py: Massive overhaul to the Gnuplot
3061 system. GnuplotMagic is gone as a user-directory option. New files
3066 system. GnuplotMagic is gone as a user-directory option. New files
3062 make it easier to use all the gnuplot stuff both from external
3067 make it easier to use all the gnuplot stuff both from external
3063 programs as well as from IPython. Had to rewrite part of
3068 programs as well as from IPython. Had to rewrite part of
3064 hardcopy() b/c of a strange bug: often the ps files simply don't
3069 hardcopy() b/c of a strange bug: often the ps files simply don't
3065 get created, and require a repeat of the command (often several
3070 get created, and require a repeat of the command (often several
3066 times).
3071 times).
3067
3072
3068 * IPython/ultraTB.py (AutoFormattedTB.__call__): changed to
3073 * IPython/ultraTB.py (AutoFormattedTB.__call__): changed to
3069 resolve output channel at call time, so that if sys.stderr has
3074 resolve output channel at call time, so that if sys.stderr has
3070 been redirected by user this gets honored.
3075 been redirected by user this gets honored.
3071
3076
3072 2002-06-13 Fernando Perez <fperez@colorado.edu>
3077 2002-06-13 Fernando Perez <fperez@colorado.edu>
3073
3078
3074 * IPython/Shell.py (IPShell.__init__): Changed IPythonShell to
3079 * IPython/Shell.py (IPShell.__init__): Changed IPythonShell to
3075 IPShell. Kept a copy with the old names to avoid breaking people's
3080 IPShell. Kept a copy with the old names to avoid breaking people's
3076 embedded code.
3081 embedded code.
3077
3082
3078 * IPython/ipython: simplified it to the bare minimum after
3083 * IPython/ipython: simplified it to the bare minimum after
3079 Holger's suggestions. Added info about how to use it in
3084 Holger's suggestions. Added info about how to use it in
3080 PYTHONSTARTUP.
3085 PYTHONSTARTUP.
3081
3086
3082 * IPython/Shell.py (IPythonShell): changed the options passing
3087 * IPython/Shell.py (IPythonShell): changed the options passing
3083 from a string with funky %s replacements to a straight list. Maybe
3088 from a string with funky %s replacements to a straight list. Maybe
3084 a bit more typing, but it follows sys.argv conventions, so there's
3089 a bit more typing, but it follows sys.argv conventions, so there's
3085 less special-casing to remember.
3090 less special-casing to remember.
3086
3091
3087 2002-06-12 Fernando Perez <fperez@colorado.edu>
3092 2002-06-12 Fernando Perez <fperez@colorado.edu>
3088
3093
3089 * IPython/Magic.py (Magic.magic_r): new magic auto-repeat
3094 * IPython/Magic.py (Magic.magic_r): new magic auto-repeat
3090 command. Thanks to a suggestion by Mike Heeter.
3095 command. Thanks to a suggestion by Mike Heeter.
3091 (Magic.magic_pfile): added behavior to look at filenames if given
3096 (Magic.magic_pfile): added behavior to look at filenames if given
3092 arg is not a defined object.
3097 arg is not a defined object.
3093 (Magic.magic_save): New @save function to save code snippets. Also
3098 (Magic.magic_save): New @save function to save code snippets. Also
3094 a Mike Heeter idea.
3099 a Mike Heeter idea.
3095
3100
3096 * IPython/UserConfig/GnuplotMagic.py (plot): Improvements to
3101 * IPython/UserConfig/GnuplotMagic.py (plot): Improvements to
3097 plot() and replot(). Much more convenient now, especially for
3102 plot() and replot(). Much more convenient now, especially for
3098 interactive use.
3103 interactive use.
3099
3104
3100 * IPython/Magic.py (Magic.magic_run): Added .py automatically to
3105 * IPython/Magic.py (Magic.magic_run): Added .py automatically to
3101 filenames.
3106 filenames.
3102
3107
3103 2002-06-02 Fernando Perez <fperez@colorado.edu>
3108 2002-06-02 Fernando Perez <fperez@colorado.edu>
3104
3109
3105 * IPython/Struct.py (Struct.__init__): modified to admit
3110 * IPython/Struct.py (Struct.__init__): modified to admit
3106 initialization via another struct.
3111 initialization via another struct.
3107
3112
3108 * IPython/genutils.py (SystemExec.__init__): New stateful
3113 * IPython/genutils.py (SystemExec.__init__): New stateful
3109 interface to xsys and bq. Useful for writing system scripts.
3114 interface to xsys and bq. Useful for writing system scripts.
3110
3115
3111 2002-05-30 Fernando Perez <fperez@colorado.edu>
3116 2002-05-30 Fernando Perez <fperez@colorado.edu>
3112
3117
3113 * MANIFEST.in: Changed docfile selection to exclude all the lyx
3118 * MANIFEST.in: Changed docfile selection to exclude all the lyx
3114 documents. This will make the user download smaller (it's getting
3119 documents. This will make the user download smaller (it's getting
3115 too big).
3120 too big).
3116
3121
3117 2002-05-29 Fernando Perez <fperez@colorado.edu>
3122 2002-05-29 Fernando Perez <fperez@colorado.edu>
3118
3123
3119 * IPython/iplib.py (_FakeModule.__init__): New class introduced to
3124 * IPython/iplib.py (_FakeModule.__init__): New class introduced to
3120 fix problems with shelve and pickle. Seems to work, but I don't
3125 fix problems with shelve and pickle. Seems to work, but I don't
3121 know if corner cases break it. Thanks to Mike Heeter
3126 know if corner cases break it. Thanks to Mike Heeter
3122 <korora-AT-SDF.LONESTAR.ORG> for the bug reports and test cases.
3127 <korora-AT-SDF.LONESTAR.ORG> for the bug reports and test cases.
3123
3128
3124 2002-05-24 Fernando Perez <fperez@colorado.edu>
3129 2002-05-24 Fernando Perez <fperez@colorado.edu>
3125
3130
3126 * IPython/Magic.py (Macro.__init__): fixed magics embedded in
3131 * IPython/Magic.py (Macro.__init__): fixed magics embedded in
3127 macros having broken.
3132 macros having broken.
3128
3133
3129 2002-05-21 Fernando Perez <fperez@colorado.edu>
3134 2002-05-21 Fernando Perez <fperez@colorado.edu>
3130
3135
3131 * IPython/Magic.py (Magic.magic_logstart): fixed recently
3136 * IPython/Magic.py (Magic.magic_logstart): fixed recently
3132 introduced logging bug: all history before logging started was
3137 introduced logging bug: all history before logging started was
3133 being written one character per line! This came from the redesign
3138 being written one character per line! This came from the redesign
3134 of the input history as a special list which slices to strings,
3139 of the input history as a special list which slices to strings,
3135 not to lists.
3140 not to lists.
3136
3141
3137 2002-05-20 Fernando Perez <fperez@colorado.edu>
3142 2002-05-20 Fernando Perez <fperez@colorado.edu>
3138
3143
3139 * IPython/Prompts.py (CachedOutput.__init__): made the color table
3144 * IPython/Prompts.py (CachedOutput.__init__): made the color table
3140 be an attribute of all classes in this module. The design of these
3145 be an attribute of all classes in this module. The design of these
3141 classes needs some serious overhauling.
3146 classes needs some serious overhauling.
3142
3147
3143 * IPython/DPyGetOpt.py (DPyGetOpt.setPosixCompliance): fixed bug
3148 * IPython/DPyGetOpt.py (DPyGetOpt.setPosixCompliance): fixed bug
3144 which was ignoring '_' in option names.
3149 which was ignoring '_' in option names.
3145
3150
3146 * IPython/ultraTB.py (FormattedTB.__init__): Changed
3151 * IPython/ultraTB.py (FormattedTB.__init__): Changed
3147 'Verbose_novars' to 'Context' and made it the new default. It's a
3152 'Verbose_novars' to 'Context' and made it the new default. It's a
3148 bit more readable and also safer than verbose.
3153 bit more readable and also safer than verbose.
3149
3154
3150 * IPython/PyColorize.py (Parser.__call__): Fixed coloring of
3155 * IPython/PyColorize.py (Parser.__call__): Fixed coloring of
3151 triple-quoted strings.
3156 triple-quoted strings.
3152
3157
3153 * IPython/OInspect.py (__all__): new module exposing the object
3158 * IPython/OInspect.py (__all__): new module exposing the object
3154 introspection facilities. Now the corresponding magics are dummy
3159 introspection facilities. Now the corresponding magics are dummy
3155 wrappers around this. Having this module will make it much easier
3160 wrappers around this. Having this module will make it much easier
3156 to put these functions into our modified pdb.
3161 to put these functions into our modified pdb.
3157 This new object inspector system uses the new colorizing module,
3162 This new object inspector system uses the new colorizing module,
3158 so source code and other things are nicely syntax highlighted.
3163 so source code and other things are nicely syntax highlighted.
3159
3164
3160 2002-05-18 Fernando Perez <fperez@colorado.edu>
3165 2002-05-18 Fernando Perez <fperez@colorado.edu>
3161
3166
3162 * IPython/ColorANSI.py: Split the coloring tools into a separate
3167 * IPython/ColorANSI.py: Split the coloring tools into a separate
3163 module so I can use them in other code easier (they were part of
3168 module so I can use them in other code easier (they were part of
3164 ultraTB).
3169 ultraTB).
3165
3170
3166 2002-05-17 Fernando Perez <fperez@colorado.edu>
3171 2002-05-17 Fernando Perez <fperez@colorado.edu>
3167
3172
3168 * IPython/UserConfig/GnuplotMagic.py (magic_gp_set_instance):
3173 * IPython/UserConfig/GnuplotMagic.py (magic_gp_set_instance):
3169 fixed it to set the global 'g' also to the called instance, as
3174 fixed it to set the global 'g' also to the called instance, as
3170 long as 'g' was still a gnuplot instance (so it doesn't overwrite
3175 long as 'g' was still a gnuplot instance (so it doesn't overwrite
3171 user's 'g' variables).
3176 user's 'g' variables).
3172
3177
3173 * IPython/iplib.py (InteractiveShell.__init__): Added In/Out
3178 * IPython/iplib.py (InteractiveShell.__init__): Added In/Out
3174 global variables (aliases to _ih,_oh) so that users which expect
3179 global variables (aliases to _ih,_oh) so that users which expect
3175 In[5] or Out[7] to work aren't unpleasantly surprised.
3180 In[5] or Out[7] to work aren't unpleasantly surprised.
3176 (InputList.__getslice__): new class to allow executing slices of
3181 (InputList.__getslice__): new class to allow executing slices of
3177 input history directly. Very simple class, complements the use of
3182 input history directly. Very simple class, complements the use of
3178 macros.
3183 macros.
3179
3184
3180 2002-05-16 Fernando Perez <fperez@colorado.edu>
3185 2002-05-16 Fernando Perez <fperez@colorado.edu>
3181
3186
3182 * setup.py (docdirbase): make doc directory be just doc/IPython
3187 * setup.py (docdirbase): make doc directory be just doc/IPython
3183 without version numbers, it will reduce clutter for users.
3188 without version numbers, it will reduce clutter for users.
3184
3189
3185 * IPython/Magic.py (Magic.magic_run): Add explicit local dict to
3190 * IPython/Magic.py (Magic.magic_run): Add explicit local dict to
3186 execfile call to prevent possible memory leak. See for details:
3191 execfile call to prevent possible memory leak. See for details:
3187 http://mail.python.org/pipermail/python-list/2002-February/088476.html
3192 http://mail.python.org/pipermail/python-list/2002-February/088476.html
3188
3193
3189 2002-05-15 Fernando Perez <fperez@colorado.edu>
3194 2002-05-15 Fernando Perez <fperez@colorado.edu>
3190
3195
3191 * IPython/Magic.py (Magic.magic_psource): made the object
3196 * IPython/Magic.py (Magic.magic_psource): made the object
3192 introspection names be more standard: pdoc, pdef, pfile and
3197 introspection names be more standard: pdoc, pdef, pfile and
3193 psource. They all print/page their output, and it makes
3198 psource. They all print/page their output, and it makes
3194 remembering them easier. Kept old names for compatibility as
3199 remembering them easier. Kept old names for compatibility as
3195 aliases.
3200 aliases.
3196
3201
3197 2002-05-14 Fernando Perez <fperez@colorado.edu>
3202 2002-05-14 Fernando Perez <fperez@colorado.edu>
3198
3203
3199 * IPython/UserConfig/GnuplotMagic.py: I think I finally understood
3204 * IPython/UserConfig/GnuplotMagic.py: I think I finally understood
3200 what the mouse problem was. The trick is to use gnuplot with temp
3205 what the mouse problem was. The trick is to use gnuplot with temp
3201 files and NOT with pipes (for data communication), because having
3206 files and NOT with pipes (for data communication), because having
3202 both pipes and the mouse on is bad news.
3207 both pipes and the mouse on is bad news.
3203
3208
3204 2002-05-13 Fernando Perez <fperez@colorado.edu>
3209 2002-05-13 Fernando Perez <fperez@colorado.edu>
3205
3210
3206 * IPython/Magic.py (Magic._ofind): fixed namespace order search
3211 * IPython/Magic.py (Magic._ofind): fixed namespace order search
3207 bug. Information would be reported about builtins even when
3212 bug. Information would be reported about builtins even when
3208 user-defined functions overrode them.
3213 user-defined functions overrode them.
3209
3214
3210 2002-05-11 Fernando Perez <fperez@colorado.edu>
3215 2002-05-11 Fernando Perez <fperez@colorado.edu>
3211
3216
3212 * IPython/__init__.py (__all__): removed FlexCompleter from
3217 * IPython/__init__.py (__all__): removed FlexCompleter from
3213 __all__ so that things don't fail in platforms without readline.
3218 __all__ so that things don't fail in platforms without readline.
3214
3219
3215 2002-05-10 Fernando Perez <fperez@colorado.edu>
3220 2002-05-10 Fernando Perez <fperez@colorado.edu>
3216
3221
3217 * IPython/__init__.py (__all__): removed numutils from __all__ b/c
3222 * IPython/__init__.py (__all__): removed numutils from __all__ b/c
3218 it requires Numeric, effectively making Numeric a dependency for
3223 it requires Numeric, effectively making Numeric a dependency for
3219 IPython.
3224 IPython.
3220
3225
3221 * Released 0.2.13
3226 * Released 0.2.13
3222
3227
3223 * IPython/Magic.py (Magic.magic_prun): big overhaul to the
3228 * IPython/Magic.py (Magic.magic_prun): big overhaul to the
3224 profiler interface. Now all the major options from the profiler
3229 profiler interface. Now all the major options from the profiler
3225 module are directly supported in IPython, both for single
3230 module are directly supported in IPython, both for single
3226 expressions (@prun) and for full programs (@run -p).
3231 expressions (@prun) and for full programs (@run -p).
3227
3232
3228 2002-05-09 Fernando Perez <fperez@colorado.edu>
3233 2002-05-09 Fernando Perez <fperez@colorado.edu>
3229
3234
3230 * IPython/Magic.py (Magic.magic_doc): fixed to show docstrings of
3235 * IPython/Magic.py (Magic.magic_doc): fixed to show docstrings of
3231 magic properly formatted for screen.
3236 magic properly formatted for screen.
3232
3237
3233 * setup.py (make_shortcut): Changed things to put pdf version in
3238 * setup.py (make_shortcut): Changed things to put pdf version in
3234 doc/ instead of doc/manual (had to change lyxport a bit).
3239 doc/ instead of doc/manual (had to change lyxport a bit).
3235
3240
3236 * IPython/Magic.py (Profile.string_stats): made profile runs go
3241 * IPython/Magic.py (Profile.string_stats): made profile runs go
3237 through pager (they are long and a pager allows searching, saving,
3242 through pager (they are long and a pager allows searching, saving,
3238 etc.)
3243 etc.)
3239
3244
3240 2002-05-08 Fernando Perez <fperez@colorado.edu>
3245 2002-05-08 Fernando Perez <fperez@colorado.edu>
3241
3246
3242 * Released 0.2.12
3247 * Released 0.2.12
3243
3248
3244 2002-05-06 Fernando Perez <fperez@colorado.edu>
3249 2002-05-06 Fernando Perez <fperez@colorado.edu>
3245
3250
3246 * IPython/Magic.py (Magic.magic_hist): small bug fixed (recently
3251 * IPython/Magic.py (Magic.magic_hist): small bug fixed (recently
3247 introduced); 'hist n1 n2' was broken.
3252 introduced); 'hist n1 n2' was broken.
3248 (Magic.magic_pdb): added optional on/off arguments to @pdb
3253 (Magic.magic_pdb): added optional on/off arguments to @pdb
3249 (Magic.magic_run): added option -i to @run, which executes code in
3254 (Magic.magic_run): added option -i to @run, which executes code in
3250 the IPython namespace instead of a clean one. Also added @irun as
3255 the IPython namespace instead of a clean one. Also added @irun as
3251 an alias to @run -i.
3256 an alias to @run -i.
3252
3257
3253 * IPython/UserConfig/GnuplotMagic.py (magic_gp_set_instance):
3258 * IPython/UserConfig/GnuplotMagic.py (magic_gp_set_instance):
3254 fixed (it didn't really do anything, the namespaces were wrong).
3259 fixed (it didn't really do anything, the namespaces were wrong).
3255
3260
3256 * IPython/Debugger.py (__init__): Added workaround for python 2.1
3261 * IPython/Debugger.py (__init__): Added workaround for python 2.1
3257
3262
3258 * IPython/__init__.py (__all__): Fixed package namespace, now
3263 * IPython/__init__.py (__all__): Fixed package namespace, now
3259 'import IPython' does give access to IPython.<all> as
3264 'import IPython' does give access to IPython.<all> as
3260 expected. Also renamed __release__ to Release.
3265 expected. Also renamed __release__ to Release.
3261
3266
3262 * IPython/Debugger.py (__license__): created new Pdb class which
3267 * IPython/Debugger.py (__license__): created new Pdb class which
3263 functions like a drop-in for the normal pdb.Pdb but does NOT
3268 functions like a drop-in for the normal pdb.Pdb but does NOT
3264 import readline by default. This way it doesn't muck up IPython's
3269 import readline by default. This way it doesn't muck up IPython's
3265 readline handling, and now tab-completion finally works in the
3270 readline handling, and now tab-completion finally works in the
3266 debugger -- sort of. It completes things globally visible, but the
3271 debugger -- sort of. It completes things globally visible, but the
3267 completer doesn't track the stack as pdb walks it. That's a bit
3272 completer doesn't track the stack as pdb walks it. That's a bit
3268 tricky, and I'll have to implement it later.
3273 tricky, and I'll have to implement it later.
3269
3274
3270 2002-05-05 Fernando Perez <fperez@colorado.edu>
3275 2002-05-05 Fernando Perez <fperez@colorado.edu>
3271
3276
3272 * IPython/Magic.py (Magic.magic_oinfo): fixed formatting bug for
3277 * IPython/Magic.py (Magic.magic_oinfo): fixed formatting bug for
3273 magic docstrings when printed via ? (explicit \'s were being
3278 magic docstrings when printed via ? (explicit \'s were being
3274 printed).
3279 printed).
3275
3280
3276 * IPython/ipmaker.py (make_IPython): fixed namespace
3281 * IPython/ipmaker.py (make_IPython): fixed namespace
3277 identification bug. Now variables loaded via logs or command-line
3282 identification bug. Now variables loaded via logs or command-line
3278 files are recognized in the interactive namespace by @who.
3283 files are recognized in the interactive namespace by @who.
3279
3284
3280 * IPython/iplib.py (InteractiveShell.safe_execfile): Fixed bug in
3285 * IPython/iplib.py (InteractiveShell.safe_execfile): Fixed bug in
3281 log replay system stemming from the string form of Structs.
3286 log replay system stemming from the string form of Structs.
3282
3287
3283 * IPython/Magic.py (Macro.__init__): improved macros to properly
3288 * IPython/Magic.py (Macro.__init__): improved macros to properly
3284 handle magic commands in them.
3289 handle magic commands in them.
3285 (Magic.magic_logstart): usernames are now expanded so 'logstart
3290 (Magic.magic_logstart): usernames are now expanded so 'logstart
3286 ~/mylog' now works.
3291 ~/mylog' now works.
3287
3292
3288 * IPython/iplib.py (complete): fixed bug where paths starting with
3293 * IPython/iplib.py (complete): fixed bug where paths starting with
3289 '/' would be completed as magic names.
3294 '/' would be completed as magic names.
3290
3295
3291 2002-05-04 Fernando Perez <fperez@colorado.edu>
3296 2002-05-04 Fernando Perez <fperez@colorado.edu>
3292
3297
3293 * IPython/Magic.py (Magic.magic_run): added options -p and -f to
3298 * IPython/Magic.py (Magic.magic_run): added options -p and -f to
3294 allow running full programs under the profiler's control.
3299 allow running full programs under the profiler's control.
3295
3300
3296 * IPython/ultraTB.py (FormattedTB.__init__): Added Verbose_novars
3301 * IPython/ultraTB.py (FormattedTB.__init__): Added Verbose_novars
3297 mode to report exceptions verbosely but without formatting
3302 mode to report exceptions verbosely but without formatting
3298 variables. This addresses the issue of ipython 'freezing' (it's
3303 variables. This addresses the issue of ipython 'freezing' (it's
3299 not frozen, but caught in an expensive formatting loop) when huge
3304 not frozen, but caught in an expensive formatting loop) when huge
3300 variables are in the context of an exception.
3305 variables are in the context of an exception.
3301 (VerboseTB.text): Added '--->' markers at line where exception was
3306 (VerboseTB.text): Added '--->' markers at line where exception was
3302 triggered. Much clearer to read, especially in NoColor modes.
3307 triggered. Much clearer to read, especially in NoColor modes.
3303
3308
3304 * IPython/Magic.py (Magic.magic_run): bugfix: -n option had been
3309 * IPython/Magic.py (Magic.magic_run): bugfix: -n option had been
3305 implemented in reverse when changing to the new parse_options().
3310 implemented in reverse when changing to the new parse_options().
3306
3311
3307 2002-05-03 Fernando Perez <fperez@colorado.edu>
3312 2002-05-03 Fernando Perez <fperez@colorado.edu>
3308
3313
3309 * IPython/Magic.py (Magic.parse_options): new function so that
3314 * IPython/Magic.py (Magic.parse_options): new function so that
3310 magics can parse options easier.
3315 magics can parse options easier.
3311 (Magic.magic_prun): new function similar to profile.run(),
3316 (Magic.magic_prun): new function similar to profile.run(),
3312 suggested by Chris Hart.
3317 suggested by Chris Hart.
3313 (Magic.magic_cd): fixed behavior so that it only changes if
3318 (Magic.magic_cd): fixed behavior so that it only changes if
3314 directory actually is in history.
3319 directory actually is in history.
3315
3320
3316 * IPython/usage.py (__doc__): added information about potential
3321 * IPython/usage.py (__doc__): added information about potential
3317 slowness of Verbose exception mode when there are huge data
3322 slowness of Verbose exception mode when there are huge data
3318 structures to be formatted (thanks to Archie Paulson).
3323 structures to be formatted (thanks to Archie Paulson).
3319
3324
3320 * IPython/ipmaker.py (make_IPython): Changed default logging
3325 * IPython/ipmaker.py (make_IPython): Changed default logging
3321 (when simply called with -log) to use curr_dir/ipython.log in
3326 (when simply called with -log) to use curr_dir/ipython.log in
3322 rotate mode. Fixed crash which was occuring with -log before
3327 rotate mode. Fixed crash which was occuring with -log before
3323 (thanks to Jim Boyle).
3328 (thanks to Jim Boyle).
3324
3329
3325 2002-05-01 Fernando Perez <fperez@colorado.edu>
3330 2002-05-01 Fernando Perez <fperez@colorado.edu>
3326
3331
3327 * Released 0.2.11 for these fixes (mainly the ultraTB one which
3332 * Released 0.2.11 for these fixes (mainly the ultraTB one which
3328 was nasty -- though somewhat of a corner case).
3333 was nasty -- though somewhat of a corner case).
3329
3334
3330 * IPython/ultraTB.py (AutoFormattedTB.text): renamed __text to
3335 * IPython/ultraTB.py (AutoFormattedTB.text): renamed __text to
3331 text (was a bug).
3336 text (was a bug).
3332
3337
3333 2002-04-30 Fernando Perez <fperez@colorado.edu>
3338 2002-04-30 Fernando Perez <fperez@colorado.edu>
3334
3339
3335 * IPython/UserConfig/GnuplotMagic.py (magic_gp): Minor fix to add
3340 * IPython/UserConfig/GnuplotMagic.py (magic_gp): Minor fix to add
3336 a print after ^D or ^C from the user so that the In[] prompt
3341 a print after ^D or ^C from the user so that the In[] prompt
3337 doesn't over-run the gnuplot one.
3342 doesn't over-run the gnuplot one.
3338
3343
3339 2002-04-29 Fernando Perez <fperez@colorado.edu>
3344 2002-04-29 Fernando Perez <fperez@colorado.edu>
3340
3345
3341 * Released 0.2.10
3346 * Released 0.2.10
3342
3347
3343 * IPython/__release__.py (version): get date dynamically.
3348 * IPython/__release__.py (version): get date dynamically.
3344
3349
3345 * Misc. documentation updates thanks to Arnd's comments. Also ran
3350 * Misc. documentation updates thanks to Arnd's comments. Also ran
3346 a full spellcheck on the manual (hadn't been done in a while).
3351 a full spellcheck on the manual (hadn't been done in a while).
3347
3352
3348 2002-04-27 Fernando Perez <fperez@colorado.edu>
3353 2002-04-27 Fernando Perez <fperez@colorado.edu>
3349
3354
3350 * IPython/Magic.py (Magic.magic_logstart): Fixed bug where
3355 * IPython/Magic.py (Magic.magic_logstart): Fixed bug where
3351 starting a log in mid-session would reset the input history list.
3356 starting a log in mid-session would reset the input history list.
3352
3357
3353 2002-04-26 Fernando Perez <fperez@colorado.edu>
3358 2002-04-26 Fernando Perez <fperez@colorado.edu>
3354
3359
3355 * IPython/iplib.py (InteractiveShell.wait): Fixed bug where not
3360 * IPython/iplib.py (InteractiveShell.wait): Fixed bug where not
3356 all files were being included in an update. Now anything in
3361 all files were being included in an update. Now anything in
3357 UserConfig that matches [A-Za-z]*.py will go (this excludes
3362 UserConfig that matches [A-Za-z]*.py will go (this excludes
3358 __init__.py)
3363 __init__.py)
3359
3364
3360 2002-04-25 Fernando Perez <fperez@colorado.edu>
3365 2002-04-25 Fernando Perez <fperez@colorado.edu>
3361
3366
3362 * IPython/iplib.py (InteractiveShell.__init__): Added __IPYTHON__
3367 * IPython/iplib.py (InteractiveShell.__init__): Added __IPYTHON__
3363 to __builtins__ so that any form of embedded or imported code can
3368 to __builtins__ so that any form of embedded or imported code can
3364 test for being inside IPython.
3369 test for being inside IPython.
3365
3370
3366 * IPython/UserConfig/GnuplotMagic.py: (magic_gp_set_instance):
3371 * IPython/UserConfig/GnuplotMagic.py: (magic_gp_set_instance):
3367 changed to GnuplotMagic because it's now an importable module,
3372 changed to GnuplotMagic because it's now an importable module,
3368 this makes the name follow that of the standard Gnuplot module.
3373 this makes the name follow that of the standard Gnuplot module.
3369 GnuplotMagic can now be loaded at any time in mid-session.
3374 GnuplotMagic can now be loaded at any time in mid-session.
3370
3375
3371 2002-04-24 Fernando Perez <fperez@colorado.edu>
3376 2002-04-24 Fernando Perez <fperez@colorado.edu>
3372
3377
3373 * IPython/numutils.py: removed SIUnits. It doesn't properly set
3378 * IPython/numutils.py: removed SIUnits. It doesn't properly set
3374 the globals (IPython has its own namespace) and the
3379 the globals (IPython has its own namespace) and the
3375 PhysicalQuantity stuff is much better anyway.
3380 PhysicalQuantity stuff is much better anyway.
3376
3381
3377 * IPython/UserConfig/example-gnuplot.py (g2): Added gnuplot
3382 * IPython/UserConfig/example-gnuplot.py (g2): Added gnuplot
3378 embedding example to standard user directory for
3383 embedding example to standard user directory for
3379 distribution. Also put it in the manual.
3384 distribution. Also put it in the manual.
3380
3385
3381 * IPython/numutils.py (gnuplot_exec): Changed to take a gnuplot
3386 * IPython/numutils.py (gnuplot_exec): Changed to take a gnuplot
3382 instance as first argument (so it doesn't rely on some obscure
3387 instance as first argument (so it doesn't rely on some obscure
3383 hidden global).
3388 hidden global).
3384
3389
3385 * IPython/UserConfig/ipythonrc.py: put () back in accepted
3390 * IPython/UserConfig/ipythonrc.py: put () back in accepted
3386 delimiters. While it prevents ().TAB from working, it allows
3391 delimiters. While it prevents ().TAB from working, it allows
3387 completions in open (... expressions. This is by far a more common
3392 completions in open (... expressions. This is by far a more common
3388 case.
3393 case.
3389
3394
3390 2002-04-23 Fernando Perez <fperez@colorado.edu>
3395 2002-04-23 Fernando Perez <fperez@colorado.edu>
3391
3396
3392 * IPython/Extensions/InterpreterPasteInput.py: new
3397 * IPython/Extensions/InterpreterPasteInput.py: new
3393 syntax-processing module for pasting lines with >>> or ... at the
3398 syntax-processing module for pasting lines with >>> or ... at the
3394 start.
3399 start.
3395
3400
3396 * IPython/Extensions/PhysicalQ_Interactive.py
3401 * IPython/Extensions/PhysicalQ_Interactive.py
3397 (PhysicalQuantityInteractive.__int__): fixed to work with either
3402 (PhysicalQuantityInteractive.__int__): fixed to work with either
3398 Numeric or math.
3403 Numeric or math.
3399
3404
3400 * IPython/UserConfig/ipythonrc-numeric.py: reorganized the
3405 * IPython/UserConfig/ipythonrc-numeric.py: reorganized the
3401 provided profiles. Now we have:
3406 provided profiles. Now we have:
3402 -math -> math module as * and cmath with its own namespace.
3407 -math -> math module as * and cmath with its own namespace.
3403 -numeric -> Numeric as *, plus gnuplot & grace
3408 -numeric -> Numeric as *, plus gnuplot & grace
3404 -physics -> same as before
3409 -physics -> same as before
3405
3410
3406 * IPython/Magic.py (Magic.magic_magic): Fixed bug where
3411 * IPython/Magic.py (Magic.magic_magic): Fixed bug where
3407 user-defined magics wouldn't be found by @magic if they were
3412 user-defined magics wouldn't be found by @magic if they were
3408 defined as class methods. Also cleaned up the namespace search
3413 defined as class methods. Also cleaned up the namespace search
3409 logic and the string building (to use %s instead of many repeated
3414 logic and the string building (to use %s instead of many repeated
3410 string adds).
3415 string adds).
3411
3416
3412 * IPython/UserConfig/example-magic.py (magic_foo): updated example
3417 * IPython/UserConfig/example-magic.py (magic_foo): updated example
3413 of user-defined magics to operate with class methods (cleaner, in
3418 of user-defined magics to operate with class methods (cleaner, in
3414 line with the gnuplot code).
3419 line with the gnuplot code).
3415
3420
3416 2002-04-22 Fernando Perez <fperez@colorado.edu>
3421 2002-04-22 Fernando Perez <fperez@colorado.edu>
3417
3422
3418 * setup.py: updated dependency list so that manual is updated when
3423 * setup.py: updated dependency list so that manual is updated when
3419 all included files change.
3424 all included files change.
3420
3425
3421 * IPython/ipmaker.py (make_IPython): Fixed bug which was ignoring
3426 * IPython/ipmaker.py (make_IPython): Fixed bug which was ignoring
3422 the delimiter removal option (the fix is ugly right now).
3427 the delimiter removal option (the fix is ugly right now).
3423
3428
3424 * IPython/UserConfig/ipythonrc-physics.py: simplified not to load
3429 * IPython/UserConfig/ipythonrc-physics.py: simplified not to load
3425 all of the math profile (quicker loading, no conflict between
3430 all of the math profile (quicker loading, no conflict between
3426 g-9.8 and g-gnuplot).
3431 g-9.8 and g-gnuplot).
3427
3432
3428 * IPython/CrashHandler.py (CrashHandler.__call__): changed default
3433 * IPython/CrashHandler.py (CrashHandler.__call__): changed default
3429 name of post-mortem files to IPython_crash_report.txt.
3434 name of post-mortem files to IPython_crash_report.txt.
3430
3435
3431 * Cleanup/update of the docs. Added all the new readline info and
3436 * Cleanup/update of the docs. Added all the new readline info and
3432 formatted all lists as 'real lists'.
3437 formatted all lists as 'real lists'.
3433
3438
3434 * IPython/ipmaker.py (make_IPython): removed now-obsolete
3439 * IPython/ipmaker.py (make_IPython): removed now-obsolete
3435 tab-completion options, since the full readline parse_and_bind is
3440 tab-completion options, since the full readline parse_and_bind is
3436 now accessible.
3441 now accessible.
3437
3442
3438 * IPython/iplib.py (InteractiveShell.init_readline): Changed
3443 * IPython/iplib.py (InteractiveShell.init_readline): Changed
3439 handling of readline options. Now users can specify any string to
3444 handling of readline options. Now users can specify any string to
3440 be passed to parse_and_bind(), as well as the delimiters to be
3445 be passed to parse_and_bind(), as well as the delimiters to be
3441 removed.
3446 removed.
3442 (InteractiveShell.__init__): Added __name__ to the global
3447 (InteractiveShell.__init__): Added __name__ to the global
3443 namespace so that things like Itpl which rely on its existence
3448 namespace so that things like Itpl which rely on its existence
3444 don't crash.
3449 don't crash.
3445 (InteractiveShell._prefilter): Defined the default with a _ so
3450 (InteractiveShell._prefilter): Defined the default with a _ so
3446 that prefilter() is easier to override, while the default one
3451 that prefilter() is easier to override, while the default one
3447 remains available.
3452 remains available.
3448
3453
3449 2002-04-18 Fernando Perez <fperez@colorado.edu>
3454 2002-04-18 Fernando Perez <fperez@colorado.edu>
3450
3455
3451 * Added information about pdb in the docs.
3456 * Added information about pdb in the docs.
3452
3457
3453 2002-04-17 Fernando Perez <fperez@colorado.edu>
3458 2002-04-17 Fernando Perez <fperez@colorado.edu>
3454
3459
3455 * IPython/ipmaker.py (make_IPython): added rc_override option to
3460 * IPython/ipmaker.py (make_IPython): added rc_override option to
3456 allow passing config options at creation time which may override
3461 allow passing config options at creation time which may override
3457 anything set in the config files or command line. This is
3462 anything set in the config files or command line. This is
3458 particularly useful for configuring embedded instances.
3463 particularly useful for configuring embedded instances.
3459
3464
3460 2002-04-15 Fernando Perez <fperez@colorado.edu>
3465 2002-04-15 Fernando Perez <fperez@colorado.edu>
3461
3466
3462 * IPython/Logger.py (Logger.log): Fixed a nasty bug which could
3467 * IPython/Logger.py (Logger.log): Fixed a nasty bug which could
3463 crash embedded instances because of the input cache falling out of
3468 crash embedded instances because of the input cache falling out of
3464 sync with the output counter.
3469 sync with the output counter.
3465
3470
3466 * IPython/Shell.py (IPythonShellEmbed.__init__): added a debug
3471 * IPython/Shell.py (IPythonShellEmbed.__init__): added a debug
3467 mode which calls pdb after an uncaught exception in IPython itself.
3472 mode which calls pdb after an uncaught exception in IPython itself.
3468
3473
3469 2002-04-14 Fernando Perez <fperez@colorado.edu>
3474 2002-04-14 Fernando Perez <fperez@colorado.edu>
3470
3475
3471 * IPython/iplib.py (InteractiveShell.showtraceback): pdb mucks up
3476 * IPython/iplib.py (InteractiveShell.showtraceback): pdb mucks up
3472 readline, fix it back after each call.
3477 readline, fix it back after each call.
3473
3478
3474 * IPython/ultraTB.py (AutoFormattedTB.__text): made text a private
3479 * IPython/ultraTB.py (AutoFormattedTB.__text): made text a private
3475 method to force all access via __call__(), which guarantees that
3480 method to force all access via __call__(), which guarantees that
3476 traceback references are properly deleted.
3481 traceback references are properly deleted.
3477
3482
3478 * IPython/Prompts.py (CachedOutput._display): minor fixes to
3483 * IPython/Prompts.py (CachedOutput._display): minor fixes to
3479 improve printing when pprint is in use.
3484 improve printing when pprint is in use.
3480
3485
3481 2002-04-13 Fernando Perez <fperez@colorado.edu>
3486 2002-04-13 Fernando Perez <fperez@colorado.edu>
3482
3487
3483 * IPython/Shell.py (IPythonShellEmbed.__call__): SystemExit
3488 * IPython/Shell.py (IPythonShellEmbed.__call__): SystemExit
3484 exceptions aren't caught anymore. If the user triggers one, he
3489 exceptions aren't caught anymore. If the user triggers one, he
3485 should know why he's doing it and it should go all the way up,
3490 should know why he's doing it and it should go all the way up,
3486 just like any other exception. So now @abort will fully kill the
3491 just like any other exception. So now @abort will fully kill the
3487 embedded interpreter and the embedding code (unless that happens
3492 embedded interpreter and the embedding code (unless that happens
3488 to catch SystemExit).
3493 to catch SystemExit).
3489
3494
3490 * IPython/ultraTB.py (VerboseTB.__init__): added a call_pdb flag
3495 * IPython/ultraTB.py (VerboseTB.__init__): added a call_pdb flag
3491 and a debugger() method to invoke the interactive pdb debugger
3496 and a debugger() method to invoke the interactive pdb debugger
3492 after printing exception information. Also added the corresponding
3497 after printing exception information. Also added the corresponding
3493 -pdb option and @pdb magic to control this feature, and updated
3498 -pdb option and @pdb magic to control this feature, and updated
3494 the docs. After a suggestion from Christopher Hart
3499 the docs. After a suggestion from Christopher Hart
3495 (hart-AT-caltech.edu).
3500 (hart-AT-caltech.edu).
3496
3501
3497 2002-04-12 Fernando Perez <fperez@colorado.edu>
3502 2002-04-12 Fernando Perez <fperez@colorado.edu>
3498
3503
3499 * IPython/Shell.py (IPythonShellEmbed.__init__): modified to use
3504 * IPython/Shell.py (IPythonShellEmbed.__init__): modified to use
3500 the exception handlers defined by the user (not the CrashHandler)
3505 the exception handlers defined by the user (not the CrashHandler)
3501 so that user exceptions don't trigger an ipython bug report.
3506 so that user exceptions don't trigger an ipython bug report.
3502
3507
3503 * IPython/ultraTB.py (ColorTB.__init__): made the color scheme
3508 * IPython/ultraTB.py (ColorTB.__init__): made the color scheme
3504 configurable (it should have always been so).
3509 configurable (it should have always been so).
3505
3510
3506 2002-03-26 Fernando Perez <fperez@colorado.edu>
3511 2002-03-26 Fernando Perez <fperez@colorado.edu>
3507
3512
3508 * IPython/Shell.py (IPythonShellEmbed.__call__): many changes here
3513 * IPython/Shell.py (IPythonShellEmbed.__call__): many changes here
3509 and there to fix embedding namespace issues. This should all be
3514 and there to fix embedding namespace issues. This should all be
3510 done in a more elegant way.
3515 done in a more elegant way.
3511
3516
3512 2002-03-25 Fernando Perez <fperez@colorado.edu>
3517 2002-03-25 Fernando Perez <fperez@colorado.edu>
3513
3518
3514 * IPython/genutils.py (get_home_dir): Try to make it work under
3519 * IPython/genutils.py (get_home_dir): Try to make it work under
3515 win9x also.
3520 win9x also.
3516
3521
3517 2002-03-20 Fernando Perez <fperez@colorado.edu>
3522 2002-03-20 Fernando Perez <fperez@colorado.edu>
3518
3523
3519 * IPython/Shell.py (IPythonShellEmbed.__init__): leave
3524 * IPython/Shell.py (IPythonShellEmbed.__init__): leave
3520 sys.displayhook untouched upon __init__.
3525 sys.displayhook untouched upon __init__.
3521
3526
3522 2002-03-19 Fernando Perez <fperez@colorado.edu>
3527 2002-03-19 Fernando Perez <fperez@colorado.edu>
3523
3528
3524 * Released 0.2.9 (for embedding bug, basically).
3529 * Released 0.2.9 (for embedding bug, basically).
3525
3530
3526 * IPython/Shell.py (IPythonShellEmbed.__call__): Trap SystemExit
3531 * IPython/Shell.py (IPythonShellEmbed.__call__): Trap SystemExit
3527 exceptions so that enclosing shell's state can be restored.
3532 exceptions so that enclosing shell's state can be restored.
3528
3533
3529 * Changed magic_gnuplot.py to magic-gnuplot.py to standardize
3534 * Changed magic_gnuplot.py to magic-gnuplot.py to standardize
3530 naming conventions in the .ipython/ dir.
3535 naming conventions in the .ipython/ dir.
3531
3536
3532 * IPython/iplib.py (InteractiveShell.init_readline): removed '-'
3537 * IPython/iplib.py (InteractiveShell.init_readline): removed '-'
3533 from delimiters list so filenames with - in them get expanded.
3538 from delimiters list so filenames with - in them get expanded.
3534
3539
3535 * IPython/Shell.py (IPythonShellEmbed.__call__): fixed bug with
3540 * IPython/Shell.py (IPythonShellEmbed.__call__): fixed bug with
3536 sys.displayhook not being properly restored after an embedded call.
3541 sys.displayhook not being properly restored after an embedded call.
3537
3542
3538 2002-03-18 Fernando Perez <fperez@colorado.edu>
3543 2002-03-18 Fernando Perez <fperez@colorado.edu>
3539
3544
3540 * Released 0.2.8
3545 * Released 0.2.8
3541
3546
3542 * IPython/iplib.py (InteractiveShell.user_setup): fixed bug where
3547 * IPython/iplib.py (InteractiveShell.user_setup): fixed bug where
3543 some files weren't being included in a -upgrade.
3548 some files weren't being included in a -upgrade.
3544 (InteractiveShell.init_readline): Added 'set show-all-if-ambiguous
3549 (InteractiveShell.init_readline): Added 'set show-all-if-ambiguous
3545 on' so that the first tab completes.
3550 on' so that the first tab completes.
3546 (InteractiveShell.handle_magic): fixed bug with spaces around
3551 (InteractiveShell.handle_magic): fixed bug with spaces around
3547 quotes breaking many magic commands.
3552 quotes breaking many magic commands.
3548
3553
3549 * setup.py: added note about ignoring the syntax error messages at
3554 * setup.py: added note about ignoring the syntax error messages at
3550 installation.
3555 installation.
3551
3556
3552 * IPython/UserConfig/magic_gnuplot.py (magic_gp): finished
3557 * IPython/UserConfig/magic_gnuplot.py (magic_gp): finished
3553 streamlining the gnuplot interface, now there's only one magic @gp.
3558 streamlining the gnuplot interface, now there's only one magic @gp.
3554
3559
3555 2002-03-17 Fernando Perez <fperez@colorado.edu>
3560 2002-03-17 Fernando Perez <fperez@colorado.edu>
3556
3561
3557 * IPython/UserConfig/magic_gnuplot.py: new name for the
3562 * IPython/UserConfig/magic_gnuplot.py: new name for the
3558 example-magic_pm.py file. Much enhanced system, now with a shell
3563 example-magic_pm.py file. Much enhanced system, now with a shell
3559 for communicating directly with gnuplot, one command at a time.
3564 for communicating directly with gnuplot, one command at a time.
3560
3565
3561 * IPython/Magic.py (Magic.magic_run): added option -n to prevent
3566 * IPython/Magic.py (Magic.magic_run): added option -n to prevent
3562 setting __name__=='__main__'.
3567 setting __name__=='__main__'.
3563
3568
3564 * IPython/UserConfig/example-magic_pm.py (magic_pm): Added
3569 * IPython/UserConfig/example-magic_pm.py (magic_pm): Added
3565 mini-shell for accessing gnuplot from inside ipython. Should
3570 mini-shell for accessing gnuplot from inside ipython. Should
3566 extend it later for grace access too. Inspired by Arnd's
3571 extend it later for grace access too. Inspired by Arnd's
3567 suggestion.
3572 suggestion.
3568
3573
3569 * IPython/iplib.py (InteractiveShell.handle_magic): fixed bug when
3574 * IPython/iplib.py (InteractiveShell.handle_magic): fixed bug when
3570 calling magic functions with () in their arguments. Thanks to Arnd
3575 calling magic functions with () in their arguments. Thanks to Arnd
3571 Baecker for pointing this to me.
3576 Baecker for pointing this to me.
3572
3577
3573 * IPython/numutils.py (sum_flat): fixed bug. Would recurse
3578 * IPython/numutils.py (sum_flat): fixed bug. Would recurse
3574 infinitely for integer or complex arrays (only worked with floats).
3579 infinitely for integer or complex arrays (only worked with floats).
3575
3580
3576 2002-03-16 Fernando Perez <fperez@colorado.edu>
3581 2002-03-16 Fernando Perez <fperez@colorado.edu>
3577
3582
3578 * setup.py: Merged setup and setup_windows into a single script
3583 * setup.py: Merged setup and setup_windows into a single script
3579 which properly handles things for windows users.
3584 which properly handles things for windows users.
3580
3585
3581 2002-03-15 Fernando Perez <fperez@colorado.edu>
3586 2002-03-15 Fernando Perez <fperez@colorado.edu>
3582
3587
3583 * Big change to the manual: now the magics are all automatically
3588 * Big change to the manual: now the magics are all automatically
3584 documented. This information is generated from their docstrings
3589 documented. This information is generated from their docstrings
3585 and put in a latex file included by the manual lyx file. This way
3590 and put in a latex file included by the manual lyx file. This way
3586 we get always up to date information for the magics. The manual
3591 we get always up to date information for the magics. The manual
3587 now also has proper version information, also auto-synced.
3592 now also has proper version information, also auto-synced.
3588
3593
3589 For this to work, an undocumented --magic_docstrings option was added.
3594 For this to work, an undocumented --magic_docstrings option was added.
3590
3595
3591 2002-03-13 Fernando Perez <fperez@colorado.edu>
3596 2002-03-13 Fernando Perez <fperez@colorado.edu>
3592
3597
3593 * IPython/ultraTB.py (TermColors): fixed problem with dark colors
3598 * IPython/ultraTB.py (TermColors): fixed problem with dark colors
3594 under CDE terminals. An explicit ;2 color reset is needed in the escapes.
3599 under CDE terminals. An explicit ;2 color reset is needed in the escapes.
3595
3600
3596 2002-03-12 Fernando Perez <fperez@colorado.edu>
3601 2002-03-12 Fernando Perez <fperez@colorado.edu>
3597
3602
3598 * IPython/ultraTB.py (TermColors): changed color escapes again to
3603 * IPython/ultraTB.py (TermColors): changed color escapes again to
3599 fix the (old, reintroduced) line-wrapping bug. Basically, if
3604 fix the (old, reintroduced) line-wrapping bug. Basically, if
3600 \001..\002 aren't given in the color escapes, lines get wrapped
3605 \001..\002 aren't given in the color escapes, lines get wrapped
3601 weirdly. But giving those screws up old xterms and emacs terms. So
3606 weirdly. But giving those screws up old xterms and emacs terms. So
3602 I added some logic for emacs terms to be ok, but I can't identify old
3607 I added some logic for emacs terms to be ok, but I can't identify old
3603 xterms separately ($TERM=='xterm' for many terminals, like konsole).
3608 xterms separately ($TERM=='xterm' for many terminals, like konsole).
3604
3609
3605 2002-03-10 Fernando Perez <fperez@colorado.edu>
3610 2002-03-10 Fernando Perez <fperez@colorado.edu>
3606
3611
3607 * IPython/usage.py (__doc__): Various documentation cleanups and
3612 * IPython/usage.py (__doc__): Various documentation cleanups and
3608 updates, both in usage docstrings and in the manual.
3613 updates, both in usage docstrings and in the manual.
3609
3614
3610 * IPython/Prompts.py (CachedOutput.set_colors): cleanups for
3615 * IPython/Prompts.py (CachedOutput.set_colors): cleanups for
3611 handling of caching. Set minimum acceptabe value for having a
3616 handling of caching. Set minimum acceptabe value for having a
3612 cache at 20 values.
3617 cache at 20 values.
3613
3618
3614 * IPython/iplib.py (InteractiveShell.user_setup): moved the
3619 * IPython/iplib.py (InteractiveShell.user_setup): moved the
3615 install_first_time function to a method, renamed it and added an
3620 install_first_time function to a method, renamed it and added an
3616 'upgrade' mode. Now people can update their config directory with
3621 'upgrade' mode. Now people can update their config directory with
3617 a simple command line switch (-upgrade, also new).
3622 a simple command line switch (-upgrade, also new).
3618
3623
3619 * IPython/Magic.py (Magic.magic_pfile): Made @pfile an alias to
3624 * IPython/Magic.py (Magic.magic_pfile): Made @pfile an alias to
3620 @file (convenient for automagic users under Python >= 2.2).
3625 @file (convenient for automagic users under Python >= 2.2).
3621 Removed @files (it seemed more like a plural than an abbrev. of
3626 Removed @files (it seemed more like a plural than an abbrev. of
3622 'file show').
3627 'file show').
3623
3628
3624 * IPython/iplib.py (install_first_time): Fixed crash if there were
3629 * IPython/iplib.py (install_first_time): Fixed crash if there were
3625 backup files ('~') in .ipython/ install directory.
3630 backup files ('~') in .ipython/ install directory.
3626
3631
3627 * IPython/ipmaker.py (make_IPython): fixes for new prompt
3632 * IPython/ipmaker.py (make_IPython): fixes for new prompt
3628 system. Things look fine, but these changes are fairly
3633 system. Things look fine, but these changes are fairly
3629 intrusive. Test them for a few days.
3634 intrusive. Test them for a few days.
3630
3635
3631 * IPython/Prompts.py (CachedOutput.__init__): Massive rewrite of
3636 * IPython/Prompts.py (CachedOutput.__init__): Massive rewrite of
3632 the prompts system. Now all in/out prompt strings are user
3637 the prompts system. Now all in/out prompt strings are user
3633 controllable. This is particularly useful for embedding, as one
3638 controllable. This is particularly useful for embedding, as one
3634 can tag embedded instances with particular prompts.
3639 can tag embedded instances with particular prompts.
3635
3640
3636 Also removed global use of sys.ps1/2, which now allows nested
3641 Also removed global use of sys.ps1/2, which now allows nested
3637 embeddings without any problems. Added command-line options for
3642 embeddings without any problems. Added command-line options for
3638 the prompt strings.
3643 the prompt strings.
3639
3644
3640 2002-03-08 Fernando Perez <fperez@colorado.edu>
3645 2002-03-08 Fernando Perez <fperez@colorado.edu>
3641
3646
3642 * IPython/UserConfig/example-embed-short.py (ipshell): added
3647 * IPython/UserConfig/example-embed-short.py (ipshell): added
3643 example file with the bare minimum code for embedding.
3648 example file with the bare minimum code for embedding.
3644
3649
3645 * IPython/Shell.py (IPythonShellEmbed.set_dummy_mode): added
3650 * IPython/Shell.py (IPythonShellEmbed.set_dummy_mode): added
3646 functionality for the embeddable shell to be activated/deactivated
3651 functionality for the embeddable shell to be activated/deactivated
3647 either globally or at each call.
3652 either globally or at each call.
3648
3653
3649 * IPython/Prompts.py (Prompt1.auto_rewrite): Fixes the problem of
3654 * IPython/Prompts.py (Prompt1.auto_rewrite): Fixes the problem of
3650 rewriting the prompt with '--->' for auto-inputs with proper
3655 rewriting the prompt with '--->' for auto-inputs with proper
3651 coloring. Now the previous UGLY hack in handle_auto() is gone, and
3656 coloring. Now the previous UGLY hack in handle_auto() is gone, and
3652 this is handled by the prompts class itself, as it should.
3657 this is handled by the prompts class itself, as it should.
3653
3658
3654 2002-03-05 Fernando Perez <fperez@colorado.edu>
3659 2002-03-05 Fernando Perez <fperez@colorado.edu>
3655
3660
3656 * IPython/Magic.py (Magic.magic_logstart): Changed @log to
3661 * IPython/Magic.py (Magic.magic_logstart): Changed @log to
3657 @logstart to avoid name clashes with the math log function.
3662 @logstart to avoid name clashes with the math log function.
3658
3663
3659 * Big updates to X/Emacs section of the manual.
3664 * Big updates to X/Emacs section of the manual.
3660
3665
3661 * Removed ipython_emacs. Milan explained to me how to pass
3666 * Removed ipython_emacs. Milan explained to me how to pass
3662 arguments to ipython through Emacs. Some day I'm going to end up
3667 arguments to ipython through Emacs. Some day I'm going to end up
3663 learning some lisp...
3668 learning some lisp...
3664
3669
3665 2002-03-04 Fernando Perez <fperez@colorado.edu>
3670 2002-03-04 Fernando Perez <fperez@colorado.edu>
3666
3671
3667 * IPython/ipython_emacs: Created script to be used as the
3672 * IPython/ipython_emacs: Created script to be used as the
3668 py-python-command Emacs variable so we can pass IPython
3673 py-python-command Emacs variable so we can pass IPython
3669 parameters. I can't figure out how to tell Emacs directly to pass
3674 parameters. I can't figure out how to tell Emacs directly to pass
3670 parameters to IPython, so a dummy shell script will do it.
3675 parameters to IPython, so a dummy shell script will do it.
3671
3676
3672 Other enhancements made for things to work better under Emacs'
3677 Other enhancements made for things to work better under Emacs'
3673 various types of terminals. Many thanks to Milan Zamazal
3678 various types of terminals. Many thanks to Milan Zamazal
3674 <pdm-AT-zamazal.org> for all the suggestions and pointers.
3679 <pdm-AT-zamazal.org> for all the suggestions and pointers.
3675
3680
3676 2002-03-01 Fernando Perez <fperez@colorado.edu>
3681 2002-03-01 Fernando Perez <fperez@colorado.edu>
3677
3682
3678 * IPython/ipmaker.py (make_IPython): added a --readline! option so
3683 * IPython/ipmaker.py (make_IPython): added a --readline! option so
3679 that loading of readline is now optional. This gives better
3684 that loading of readline is now optional. This gives better
3680 control to emacs users.
3685 control to emacs users.
3681
3686
3682 * IPython/ultraTB.py (__date__): Modified color escape sequences
3687 * IPython/ultraTB.py (__date__): Modified color escape sequences
3683 and now things work fine under xterm and in Emacs' term buffers
3688 and now things work fine under xterm and in Emacs' term buffers
3684 (though not shell ones). Well, in emacs you get colors, but all
3689 (though not shell ones). Well, in emacs you get colors, but all
3685 seem to be 'light' colors (no difference between dark and light
3690 seem to be 'light' colors (no difference between dark and light
3686 ones). But the garbage chars are gone, and also in xterms. It
3691 ones). But the garbage chars are gone, and also in xterms. It
3687 seems that now I'm using 'cleaner' ansi sequences.
3692 seems that now I'm using 'cleaner' ansi sequences.
3688
3693
3689 2002-02-21 Fernando Perez <fperez@colorado.edu>
3694 2002-02-21 Fernando Perez <fperez@colorado.edu>
3690
3695
3691 * Released 0.2.7 (mainly to publish the scoping fix).
3696 * Released 0.2.7 (mainly to publish the scoping fix).
3692
3697
3693 * IPython/Logger.py (Logger.logstate): added. A corresponding
3698 * IPython/Logger.py (Logger.logstate): added. A corresponding
3694 @logstate magic was created.
3699 @logstate magic was created.
3695
3700
3696 * IPython/Magic.py: fixed nested scoping problem under Python
3701 * IPython/Magic.py: fixed nested scoping problem under Python
3697 2.1.x (automagic wasn't working).
3702 2.1.x (automagic wasn't working).
3698
3703
3699 2002-02-20 Fernando Perez <fperez@colorado.edu>
3704 2002-02-20 Fernando Perez <fperez@colorado.edu>
3700
3705
3701 * Released 0.2.6.
3706 * Released 0.2.6.
3702
3707
3703 * IPython/OutputTrap.py (OutputTrap.__init__): added a 'quiet'
3708 * IPython/OutputTrap.py (OutputTrap.__init__): added a 'quiet'
3704 option so that logs can come out without any headers at all.
3709 option so that logs can come out without any headers at all.
3705
3710
3706 * IPython/UserConfig/ipythonrc-scipy.py: created a profile for
3711 * IPython/UserConfig/ipythonrc-scipy.py: created a profile for
3707 SciPy.
3712 SciPy.
3708
3713
3709 * IPython/iplib.py (InteractiveShell.embed_mainloop): Changed so
3714 * IPython/iplib.py (InteractiveShell.embed_mainloop): Changed so
3710 that embedded IPython calls don't require vars() to be explicitly
3715 that embedded IPython calls don't require vars() to be explicitly
3711 passed. Now they are extracted from the caller's frame (code
3716 passed. Now they are extracted from the caller's frame (code
3712 snatched from Eric Jones' weave). Added better documentation to
3717 snatched from Eric Jones' weave). Added better documentation to
3713 the section on embedding and the example file.
3718 the section on embedding and the example file.
3714
3719
3715 * IPython/genutils.py (page): Changed so that under emacs, it just
3720 * IPython/genutils.py (page): Changed so that under emacs, it just
3716 prints the string. You can then page up and down in the emacs
3721 prints the string. You can then page up and down in the emacs
3717 buffer itself. This is how the builtin help() works.
3722 buffer itself. This is how the builtin help() works.
3718
3723
3719 * IPython/Prompts.py (CachedOutput.__call__): Fixed issue with
3724 * IPython/Prompts.py (CachedOutput.__call__): Fixed issue with
3720 macro scoping: macros need to be executed in the user's namespace
3725 macro scoping: macros need to be executed in the user's namespace
3721 to work as if they had been typed by the user.
3726 to work as if they had been typed by the user.
3722
3727
3723 * IPython/Magic.py (Magic.magic_macro): Changed macros so they
3728 * IPython/Magic.py (Magic.magic_macro): Changed macros so they
3724 execute automatically (no need to type 'exec...'). They then
3729 execute automatically (no need to type 'exec...'). They then
3725 behave like 'true macros'. The printing system was also modified
3730 behave like 'true macros'. The printing system was also modified
3726 for this to work.
3731 for this to work.
3727
3732
3728 2002-02-19 Fernando Perez <fperez@colorado.edu>
3733 2002-02-19 Fernando Perez <fperez@colorado.edu>
3729
3734
3730 * IPython/genutils.py (page_file): new function for paging files
3735 * IPython/genutils.py (page_file): new function for paging files
3731 in an OS-independent way. Also necessary for file viewing to work
3736 in an OS-independent way. Also necessary for file viewing to work
3732 well inside Emacs buffers.
3737 well inside Emacs buffers.
3733 (page): Added checks for being in an emacs buffer.
3738 (page): Added checks for being in an emacs buffer.
3734 (page): fixed bug for Windows ($TERM isn't set in Windows). Fixed
3739 (page): fixed bug for Windows ($TERM isn't set in Windows). Fixed
3735 same bug in iplib.
3740 same bug in iplib.
3736
3741
3737 2002-02-18 Fernando Perez <fperez@colorado.edu>
3742 2002-02-18 Fernando Perez <fperez@colorado.edu>
3738
3743
3739 * IPython/iplib.py (InteractiveShell.init_readline): modified use
3744 * IPython/iplib.py (InteractiveShell.init_readline): modified use
3740 of readline so that IPython can work inside an Emacs buffer.
3745 of readline so that IPython can work inside an Emacs buffer.
3741
3746
3742 * IPython/ultraTB.py (AutoFormattedTB.__call__): some fixes to
3747 * IPython/ultraTB.py (AutoFormattedTB.__call__): some fixes to
3743 method signatures (they weren't really bugs, but it looks cleaner
3748 method signatures (they weren't really bugs, but it looks cleaner
3744 and keeps PyChecker happy).
3749 and keeps PyChecker happy).
3745
3750
3746 * IPython/ipmaker.py (make_IPython): added hooks Struct to __IP
3751 * IPython/ipmaker.py (make_IPython): added hooks Struct to __IP
3747 for implementing various user-defined hooks. Currently only
3752 for implementing various user-defined hooks. Currently only
3748 display is done.
3753 display is done.
3749
3754
3750 * IPython/Prompts.py (CachedOutput._display): changed display
3755 * IPython/Prompts.py (CachedOutput._display): changed display
3751 functions so that they can be dynamically changed by users easily.
3756 functions so that they can be dynamically changed by users easily.
3752
3757
3753 * IPython/Extensions/numeric_formats.py (num_display): added an
3758 * IPython/Extensions/numeric_formats.py (num_display): added an
3754 extension for printing NumPy arrays in flexible manners. It
3759 extension for printing NumPy arrays in flexible manners. It
3755 doesn't do anything yet, but all the structure is in
3760 doesn't do anything yet, but all the structure is in
3756 place. Ultimately the plan is to implement output format control
3761 place. Ultimately the plan is to implement output format control
3757 like in Octave.
3762 like in Octave.
3758
3763
3759 * IPython/Magic.py (Magic.lsmagic): changed so that bound magic
3764 * IPython/Magic.py (Magic.lsmagic): changed so that bound magic
3760 methods are found at run-time by all the automatic machinery.
3765 methods are found at run-time by all the automatic machinery.
3761
3766
3762 2002-02-17 Fernando Perez <fperez@colorado.edu>
3767 2002-02-17 Fernando Perez <fperez@colorado.edu>
3763
3768
3764 * setup_Windows.py (make_shortcut): documented. Cleaned up the
3769 * setup_Windows.py (make_shortcut): documented. Cleaned up the
3765 whole file a little.
3770 whole file a little.
3766
3771
3767 * ToDo: closed this document. Now there's a new_design.lyx
3772 * ToDo: closed this document. Now there's a new_design.lyx
3768 document for all new ideas. Added making a pdf of it for the
3773 document for all new ideas. Added making a pdf of it for the
3769 end-user distro.
3774 end-user distro.
3770
3775
3771 * IPython/Logger.py (Logger.switch_log): Created this to replace
3776 * IPython/Logger.py (Logger.switch_log): Created this to replace
3772 logon() and logoff(). It also fixes a nasty crash reported by
3777 logon() and logoff(). It also fixes a nasty crash reported by
3773 Philip Hisley <compsys-AT-starpower.net>. Many thanks to him.
3778 Philip Hisley <compsys-AT-starpower.net>. Many thanks to him.
3774
3779
3775 * IPython/iplib.py (complete): got auto-completion to work with
3780 * IPython/iplib.py (complete): got auto-completion to work with
3776 automagic (I had wanted this for a long time).
3781 automagic (I had wanted this for a long time).
3777
3782
3778 * IPython/Magic.py (Magic.magic_files): Added @files as an alias
3783 * IPython/Magic.py (Magic.magic_files): Added @files as an alias
3779 to @file, since file() is now a builtin and clashes with automagic
3784 to @file, since file() is now a builtin and clashes with automagic
3780 for @file.
3785 for @file.
3781
3786
3782 * Made some new files: Prompts, CrashHandler, Magic, Logger. All
3787 * Made some new files: Prompts, CrashHandler, Magic, Logger. All
3783 of this was previously in iplib, which had grown to more than 2000
3788 of this was previously in iplib, which had grown to more than 2000
3784 lines, way too long. No new functionality, but it makes managing
3789 lines, way too long. No new functionality, but it makes managing
3785 the code a bit easier.
3790 the code a bit easier.
3786
3791
3787 * IPython/iplib.py (IPythonCrashHandler.__call__): Added version
3792 * IPython/iplib.py (IPythonCrashHandler.__call__): Added version
3788 information to crash reports.
3793 information to crash reports.
3789
3794
3790 2002-02-12 Fernando Perez <fperez@colorado.edu>
3795 2002-02-12 Fernando Perez <fperez@colorado.edu>
3791
3796
3792 * Released 0.2.5.
3797 * Released 0.2.5.
3793
3798
3794 2002-02-11 Fernando Perez <fperez@colorado.edu>
3799 2002-02-11 Fernando Perez <fperez@colorado.edu>
3795
3800
3796 * Wrote a relatively complete Windows installer. It puts
3801 * Wrote a relatively complete Windows installer. It puts
3797 everything in place, creates Start Menu entries and fixes the
3802 everything in place, creates Start Menu entries and fixes the
3798 color issues. Nothing fancy, but it works.
3803 color issues. Nothing fancy, but it works.
3799
3804
3800 2002-02-10 Fernando Perez <fperez@colorado.edu>
3805 2002-02-10 Fernando Perez <fperez@colorado.edu>
3801
3806
3802 * IPython/iplib.py (InteractiveShell.safe_execfile): added an
3807 * IPython/iplib.py (InteractiveShell.safe_execfile): added an
3803 os.path.expanduser() call so that we can type @run ~/myfile.py and
3808 os.path.expanduser() call so that we can type @run ~/myfile.py and
3804 have thigs work as expected.
3809 have thigs work as expected.
3805
3810
3806 * IPython/genutils.py (page): fixed exception handling so things
3811 * IPython/genutils.py (page): fixed exception handling so things
3807 work both in Unix and Windows correctly. Quitting a pager triggers
3812 work both in Unix and Windows correctly. Quitting a pager triggers
3808 an IOError/broken pipe in Unix, and in windows not finding a pager
3813 an IOError/broken pipe in Unix, and in windows not finding a pager
3809 is also an IOError, so I had to actually look at the return value
3814 is also an IOError, so I had to actually look at the return value
3810 of the exception, not just the exception itself. Should be ok now.
3815 of the exception, not just the exception itself. Should be ok now.
3811
3816
3812 * IPython/ultraTB.py (ColorSchemeTable.set_active_scheme):
3817 * IPython/ultraTB.py (ColorSchemeTable.set_active_scheme):
3813 modified to allow case-insensitive color scheme changes.
3818 modified to allow case-insensitive color scheme changes.
3814
3819
3815 2002-02-09 Fernando Perez <fperez@colorado.edu>
3820 2002-02-09 Fernando Perez <fperez@colorado.edu>
3816
3821
3817 * IPython/genutils.py (native_line_ends): new function to leave
3822 * IPython/genutils.py (native_line_ends): new function to leave
3818 user config files with os-native line-endings.
3823 user config files with os-native line-endings.
3819
3824
3820 * README and manual updates.
3825 * README and manual updates.
3821
3826
3822 * IPython/genutils.py: fixed unicode bug: use types.StringTypes
3827 * IPython/genutils.py: fixed unicode bug: use types.StringTypes
3823 instead of StringType to catch Unicode strings.
3828 instead of StringType to catch Unicode strings.
3824
3829
3825 * IPython/genutils.py (filefind): fixed bug for paths with
3830 * IPython/genutils.py (filefind): fixed bug for paths with
3826 embedded spaces (very common in Windows).
3831 embedded spaces (very common in Windows).
3827
3832
3828 * IPython/ipmaker.py (make_IPython): added a '.ini' to the rc
3833 * IPython/ipmaker.py (make_IPython): added a '.ini' to the rc
3829 files under Windows, so that they get automatically associated
3834 files under Windows, so that they get automatically associated
3830 with a text editor. Windows makes it a pain to handle
3835 with a text editor. Windows makes it a pain to handle
3831 extension-less files.
3836 extension-less files.
3832
3837
3833 * IPython/iplib.py (InteractiveShell.init_readline): Made the
3838 * IPython/iplib.py (InteractiveShell.init_readline): Made the
3834 warning about readline only occur for Posix. In Windows there's no
3839 warning about readline only occur for Posix. In Windows there's no
3835 way to get readline, so why bother with the warning.
3840 way to get readline, so why bother with the warning.
3836
3841
3837 * IPython/Struct.py (Struct.__str__): fixed to use self.__dict__
3842 * IPython/Struct.py (Struct.__str__): fixed to use self.__dict__
3838 for __str__ instead of dir(self), since dir() changed in 2.2.
3843 for __str__ instead of dir(self), since dir() changed in 2.2.
3839
3844
3840 * Ported to Windows! Tested on XP, I suspect it should work fine
3845 * Ported to Windows! Tested on XP, I suspect it should work fine
3841 on NT/2000, but I don't think it will work on 98 et al. That
3846 on NT/2000, but I don't think it will work on 98 et al. That
3842 series of Windows is such a piece of junk anyway that I won't try
3847 series of Windows is such a piece of junk anyway that I won't try
3843 porting it there. The XP port was straightforward, showed a few
3848 porting it there. The XP port was straightforward, showed a few
3844 bugs here and there (fixed all), in particular some string
3849 bugs here and there (fixed all), in particular some string
3845 handling stuff which required considering Unicode strings (which
3850 handling stuff which required considering Unicode strings (which
3846 Windows uses). This is good, but hasn't been too tested :) No
3851 Windows uses). This is good, but hasn't been too tested :) No
3847 fancy installer yet, I'll put a note in the manual so people at
3852 fancy installer yet, I'll put a note in the manual so people at
3848 least make manually a shortcut.
3853 least make manually a shortcut.
3849
3854
3850 * IPython/iplib.py (Magic.magic_colors): Unified the color options
3855 * IPython/iplib.py (Magic.magic_colors): Unified the color options
3851 into a single one, "colors". This now controls both prompt and
3856 into a single one, "colors". This now controls both prompt and
3852 exception color schemes, and can be changed both at startup
3857 exception color schemes, and can be changed both at startup
3853 (either via command-line switches or via ipythonrc files) and at
3858 (either via command-line switches or via ipythonrc files) and at
3854 runtime, with @colors.
3859 runtime, with @colors.
3855 (Magic.magic_run): renamed @prun to @run and removed the old
3860 (Magic.magic_run): renamed @prun to @run and removed the old
3856 @run. The two were too similar to warrant keeping both.
3861 @run. The two were too similar to warrant keeping both.
3857
3862
3858 2002-02-03 Fernando Perez <fperez@colorado.edu>
3863 2002-02-03 Fernando Perez <fperez@colorado.edu>
3859
3864
3860 * IPython/iplib.py (install_first_time): Added comment on how to
3865 * IPython/iplib.py (install_first_time): Added comment on how to
3861 configure the color options for first-time users. Put a <return>
3866 configure the color options for first-time users. Put a <return>
3862 request at the end so that small-terminal users get a chance to
3867 request at the end so that small-terminal users get a chance to
3863 read the startup info.
3868 read the startup info.
3864
3869
3865 2002-01-23 Fernando Perez <fperez@colorado.edu>
3870 2002-01-23 Fernando Perez <fperez@colorado.edu>
3866
3871
3867 * IPython/iplib.py (CachedOutput.update): Changed output memory
3872 * IPython/iplib.py (CachedOutput.update): Changed output memory
3868 variable names from _o,_oo,_ooo,_o<n> to simply _,__,___,_<n>. For
3873 variable names from _o,_oo,_ooo,_o<n> to simply _,__,___,_<n>. For
3869 input history we still use _i. Did this b/c these variable are
3874 input history we still use _i. Did this b/c these variable are
3870 very commonly used in interactive work, so the less we need to
3875 very commonly used in interactive work, so the less we need to
3871 type the better off we are.
3876 type the better off we are.
3872 (Magic.magic_prun): updated @prun to better handle the namespaces
3877 (Magic.magic_prun): updated @prun to better handle the namespaces
3873 the file will run in, including a fix for __name__ not being set
3878 the file will run in, including a fix for __name__ not being set
3874 before.
3879 before.
3875
3880
3876 2002-01-20 Fernando Perez <fperez@colorado.edu>
3881 2002-01-20 Fernando Perez <fperez@colorado.edu>
3877
3882
3878 * IPython/ultraTB.py (VerboseTB.linereader): Fixed printing of
3883 * IPython/ultraTB.py (VerboseTB.linereader): Fixed printing of
3879 extra garbage for Python 2.2. Need to look more carefully into
3884 extra garbage for Python 2.2. Need to look more carefully into
3880 this later.
3885 this later.
3881
3886
3882 2002-01-19 Fernando Perez <fperez@colorado.edu>
3887 2002-01-19 Fernando Perez <fperez@colorado.edu>
3883
3888
3884 * IPython/iplib.py (InteractiveShell.showtraceback): fixed to
3889 * IPython/iplib.py (InteractiveShell.showtraceback): fixed to
3885 display SyntaxError exceptions properly formatted when they occur
3890 display SyntaxError exceptions properly formatted when they occur
3886 (they can be triggered by imported code).
3891 (they can be triggered by imported code).
3887
3892
3888 2002-01-18 Fernando Perez <fperez@colorado.edu>
3893 2002-01-18 Fernando Perez <fperez@colorado.edu>
3889
3894
3890 * IPython/iplib.py (InteractiveShell.safe_execfile): now
3895 * IPython/iplib.py (InteractiveShell.safe_execfile): now
3891 SyntaxError exceptions are reported nicely formatted, instead of
3896 SyntaxError exceptions are reported nicely formatted, instead of
3892 spitting out only offset information as before.
3897 spitting out only offset information as before.
3893 (Magic.magic_prun): Added the @prun function for executing
3898 (Magic.magic_prun): Added the @prun function for executing
3894 programs with command line args inside IPython.
3899 programs with command line args inside IPython.
3895
3900
3896 2002-01-16 Fernando Perez <fperez@colorado.edu>
3901 2002-01-16 Fernando Perez <fperez@colorado.edu>
3897
3902
3898 * IPython/iplib.py (Magic.magic_hist): Changed @hist and @dhist
3903 * IPython/iplib.py (Magic.magic_hist): Changed @hist and @dhist
3899 to *not* include the last item given in a range. This brings their
3904 to *not* include the last item given in a range. This brings their
3900 behavior in line with Python's slicing:
3905 behavior in line with Python's slicing:
3901 a[n1:n2] -> a[n1]...a[n2-1]
3906 a[n1:n2] -> a[n1]...a[n2-1]
3902 It may be a bit less convenient, but I prefer to stick to Python's
3907 It may be a bit less convenient, but I prefer to stick to Python's
3903 conventions *everywhere*, so users never have to wonder.
3908 conventions *everywhere*, so users never have to wonder.
3904 (Magic.magic_macro): Added @macro function to ease the creation of
3909 (Magic.magic_macro): Added @macro function to ease the creation of
3905 macros.
3910 macros.
3906
3911
3907 2002-01-05 Fernando Perez <fperez@colorado.edu>
3912 2002-01-05 Fernando Perez <fperez@colorado.edu>
3908
3913
3909 * Released 0.2.4.
3914 * Released 0.2.4.
3910
3915
3911 * IPython/iplib.py (Magic.magic_pdef):
3916 * IPython/iplib.py (Magic.magic_pdef):
3912 (InteractiveShell.safe_execfile): report magic lines and error
3917 (InteractiveShell.safe_execfile): report magic lines and error
3913 lines without line numbers so one can easily copy/paste them for
3918 lines without line numbers so one can easily copy/paste them for
3914 re-execution.
3919 re-execution.
3915
3920
3916 * Updated manual with recent changes.
3921 * Updated manual with recent changes.
3917
3922
3918 * IPython/iplib.py (Magic.magic_oinfo): added constructor
3923 * IPython/iplib.py (Magic.magic_oinfo): added constructor
3919 docstring printing when class? is called. Very handy for knowing
3924 docstring printing when class? is called. Very handy for knowing
3920 how to create class instances (as long as __init__ is well
3925 how to create class instances (as long as __init__ is well
3921 documented, of course :)
3926 documented, of course :)
3922 (Magic.magic_doc): print both class and constructor docstrings.
3927 (Magic.magic_doc): print both class and constructor docstrings.
3923 (Magic.magic_pdef): give constructor info if passed a class and
3928 (Magic.magic_pdef): give constructor info if passed a class and
3924 __call__ info for callable object instances.
3929 __call__ info for callable object instances.
3925
3930
3926 2002-01-04 Fernando Perez <fperez@colorado.edu>
3931 2002-01-04 Fernando Perez <fperez@colorado.edu>
3927
3932
3928 * Made deep_reload() off by default. It doesn't always work
3933 * Made deep_reload() off by default. It doesn't always work
3929 exactly as intended, so it's probably safer to have it off. It's
3934 exactly as intended, so it's probably safer to have it off. It's
3930 still available as dreload() anyway, so nothing is lost.
3935 still available as dreload() anyway, so nothing is lost.
3931
3936
3932 2002-01-02 Fernando Perez <fperez@colorado.edu>
3937 2002-01-02 Fernando Perez <fperez@colorado.edu>
3933
3938
3934 * Released 0.2.3 (contacted R.Singh at CU about biopython course,
3939 * Released 0.2.3 (contacted R.Singh at CU about biopython course,
3935 so I wanted an updated release).
3940 so I wanted an updated release).
3936
3941
3937 2001-12-27 Fernando Perez <fperez@colorado.edu>
3942 2001-12-27 Fernando Perez <fperez@colorado.edu>
3938
3943
3939 * IPython/iplib.py (InteractiveShell.interact): Added the original
3944 * IPython/iplib.py (InteractiveShell.interact): Added the original
3940 code from 'code.py' for this module in order to change the
3945 code from 'code.py' for this module in order to change the
3941 handling of a KeyboardInterrupt. This was necessary b/c otherwise
3946 handling of a KeyboardInterrupt. This was necessary b/c otherwise
3942 the history cache would break when the user hit Ctrl-C, and
3947 the history cache would break when the user hit Ctrl-C, and
3943 interact() offers no way to add any hooks to it.
3948 interact() offers no way to add any hooks to it.
3944
3949
3945 2001-12-23 Fernando Perez <fperez@colorado.edu>
3950 2001-12-23 Fernando Perez <fperez@colorado.edu>
3946
3951
3947 * setup.py: added check for 'MANIFEST' before trying to remove
3952 * setup.py: added check for 'MANIFEST' before trying to remove
3948 it. Thanks to Sean Reifschneider.
3953 it. Thanks to Sean Reifschneider.
3949
3954
3950 2001-12-22 Fernando Perez <fperez@colorado.edu>
3955 2001-12-22 Fernando Perez <fperez@colorado.edu>
3951
3956
3952 * Released 0.2.2.
3957 * Released 0.2.2.
3953
3958
3954 * Finished (reasonably) writing the manual. Later will add the
3959 * Finished (reasonably) writing the manual. Later will add the
3955 python-standard navigation stylesheets, but for the time being
3960 python-standard navigation stylesheets, but for the time being
3956 it's fairly complete. Distribution will include html and pdf
3961 it's fairly complete. Distribution will include html and pdf
3957 versions.
3962 versions.
3958
3963
3959 * Bugfix: '.' wasn't being added to sys.path. Thanks to Prabhu
3964 * Bugfix: '.' wasn't being added to sys.path. Thanks to Prabhu
3960 (MayaVi author).
3965 (MayaVi author).
3961
3966
3962 2001-12-21 Fernando Perez <fperez@colorado.edu>
3967 2001-12-21 Fernando Perez <fperez@colorado.edu>
3963
3968
3964 * Released 0.2.1. Barring any nasty bugs, this is it as far as a
3969 * Released 0.2.1. Barring any nasty bugs, this is it as far as a
3965 good public release, I think (with the manual and the distutils
3970 good public release, I think (with the manual and the distutils
3966 installer). The manual can use some work, but that can go
3971 installer). The manual can use some work, but that can go
3967 slowly. Otherwise I think it's quite nice for end users. Next
3972 slowly. Otherwise I think it's quite nice for end users. Next
3968 summer, rewrite the guts of it...
3973 summer, rewrite the guts of it...
3969
3974
3970 * Changed format of ipythonrc files to use whitespace as the
3975 * Changed format of ipythonrc files to use whitespace as the
3971 separator instead of an explicit '='. Cleaner.
3976 separator instead of an explicit '='. Cleaner.
3972
3977
3973 2001-12-20 Fernando Perez <fperez@colorado.edu>
3978 2001-12-20 Fernando Perez <fperez@colorado.edu>
3974
3979
3975 * Started a manual in LyX. For now it's just a quick merge of the
3980 * Started a manual in LyX. For now it's just a quick merge of the
3976 various internal docstrings and READMEs. Later it may grow into a
3981 various internal docstrings and READMEs. Later it may grow into a
3977 nice, full-blown manual.
3982 nice, full-blown manual.
3978
3983
3979 * Set up a distutils based installer. Installation should now be
3984 * Set up a distutils based installer. Installation should now be
3980 trivially simple for end-users.
3985 trivially simple for end-users.
3981
3986
3982 2001-12-11 Fernando Perez <fperez@colorado.edu>
3987 2001-12-11 Fernando Perez <fperez@colorado.edu>
3983
3988
3984 * Released 0.2.0. First public release, announced it at
3989 * Released 0.2.0. First public release, announced it at
3985 comp.lang.python. From now on, just bugfixes...
3990 comp.lang.python. From now on, just bugfixes...
3986
3991
3987 * Went through all the files, set copyright/license notices and
3992 * Went through all the files, set copyright/license notices and
3988 cleaned up things. Ready for release.
3993 cleaned up things. Ready for release.
3989
3994
3990 2001-12-10 Fernando Perez <fperez@colorado.edu>
3995 2001-12-10 Fernando Perez <fperez@colorado.edu>
3991
3996
3992 * Changed the first-time installer not to use tarfiles. It's more
3997 * Changed the first-time installer not to use tarfiles. It's more
3993 robust now and less unix-dependent. Also makes it easier for
3998 robust now and less unix-dependent. Also makes it easier for
3994 people to later upgrade versions.
3999 people to later upgrade versions.
3995
4000
3996 * Changed @exit to @abort to reflect the fact that it's pretty
4001 * Changed @exit to @abort to reflect the fact that it's pretty
3997 brutal (a sys.exit()). The difference between @abort and Ctrl-D
4002 brutal (a sys.exit()). The difference between @abort and Ctrl-D
3998 becomes significant only when IPyhton is embedded: in that case,
4003 becomes significant only when IPyhton is embedded: in that case,
3999 C-D closes IPython only, but @abort kills the enclosing program
4004 C-D closes IPython only, but @abort kills the enclosing program
4000 too (unless it had called IPython inside a try catching
4005 too (unless it had called IPython inside a try catching
4001 SystemExit).
4006 SystemExit).
4002
4007
4003 * Created Shell module which exposes the actuall IPython Shell
4008 * Created Shell module which exposes the actuall IPython Shell
4004 classes, currently the normal and the embeddable one. This at
4009 classes, currently the normal and the embeddable one. This at
4005 least offers a stable interface we won't need to change when
4010 least offers a stable interface we won't need to change when
4006 (later) the internals are rewritten. That rewrite will be confined
4011 (later) the internals are rewritten. That rewrite will be confined
4007 to iplib and ipmaker, but the Shell interface should remain as is.
4012 to iplib and ipmaker, but the Shell interface should remain as is.
4008
4013
4009 * Added embed module which offers an embeddable IPShell object,
4014 * Added embed module which offers an embeddable IPShell object,
4010 useful to fire up IPython *inside* a running program. Great for
4015 useful to fire up IPython *inside* a running program. Great for
4011 debugging or dynamical data analysis.
4016 debugging or dynamical data analysis.
4012
4017
4013 2001-12-08 Fernando Perez <fperez@colorado.edu>
4018 2001-12-08 Fernando Perez <fperez@colorado.edu>
4014
4019
4015 * Fixed small bug preventing seeing info from methods of defined
4020 * Fixed small bug preventing seeing info from methods of defined
4016 objects (incorrect namespace in _ofind()).
4021 objects (incorrect namespace in _ofind()).
4017
4022
4018 * Documentation cleanup. Moved the main usage docstrings to a
4023 * Documentation cleanup. Moved the main usage docstrings to a
4019 separate file, usage.py (cleaner to maintain, and hopefully in the
4024 separate file, usage.py (cleaner to maintain, and hopefully in the
4020 future some perlpod-like way of producing interactive, man and
4025 future some perlpod-like way of producing interactive, man and
4021 html docs out of it will be found).
4026 html docs out of it will be found).
4022
4027
4023 * Added @profile to see your profile at any time.
4028 * Added @profile to see your profile at any time.
4024
4029
4025 * Added @p as an alias for 'print'. It's especially convenient if
4030 * Added @p as an alias for 'print'. It's especially convenient if
4026 using automagic ('p x' prints x).
4031 using automagic ('p x' prints x).
4027
4032
4028 * Small cleanups and fixes after a pychecker run.
4033 * Small cleanups and fixes after a pychecker run.
4029
4034
4030 * Changed the @cd command to handle @cd - and @cd -<n> for
4035 * Changed the @cd command to handle @cd - and @cd -<n> for
4031 visiting any directory in _dh.
4036 visiting any directory in _dh.
4032
4037
4033 * Introduced _dh, a history of visited directories. @dhist prints
4038 * Introduced _dh, a history of visited directories. @dhist prints
4034 it out with numbers.
4039 it out with numbers.
4035
4040
4036 2001-12-07 Fernando Perez <fperez@colorado.edu>
4041 2001-12-07 Fernando Perez <fperez@colorado.edu>
4037
4042
4038 * Released 0.1.22
4043 * Released 0.1.22
4039
4044
4040 * Made initialization a bit more robust against invalid color
4045 * Made initialization a bit more robust against invalid color
4041 options in user input (exit, not traceback-crash).
4046 options in user input (exit, not traceback-crash).
4042
4047
4043 * Changed the bug crash reporter to write the report only in the
4048 * Changed the bug crash reporter to write the report only in the
4044 user's .ipython directory. That way IPython won't litter people's
4049 user's .ipython directory. That way IPython won't litter people's
4045 hard disks with crash files all over the place. Also print on
4050 hard disks with crash files all over the place. Also print on
4046 screen the necessary mail command.
4051 screen the necessary mail command.
4047
4052
4048 * With the new ultraTB, implemented LightBG color scheme for light
4053 * With the new ultraTB, implemented LightBG color scheme for light
4049 background terminals. A lot of people like white backgrounds, so I
4054 background terminals. A lot of people like white backgrounds, so I
4050 guess we should at least give them something readable.
4055 guess we should at least give them something readable.
4051
4056
4052 2001-12-06 Fernando Perez <fperez@colorado.edu>
4057 2001-12-06 Fernando Perez <fperez@colorado.edu>
4053
4058
4054 * Modified the structure of ultraTB. Now there's a proper class
4059 * Modified the structure of ultraTB. Now there's a proper class
4055 for tables of color schemes which allow adding schemes easily and
4060 for tables of color schemes which allow adding schemes easily and
4056 switching the active scheme without creating a new instance every
4061 switching the active scheme without creating a new instance every
4057 time (which was ridiculous). The syntax for creating new schemes
4062 time (which was ridiculous). The syntax for creating new schemes
4058 is also cleaner. I think ultraTB is finally done, with a clean
4063 is also cleaner. I think ultraTB is finally done, with a clean
4059 class structure. Names are also much cleaner (now there's proper
4064 class structure. Names are also much cleaner (now there's proper
4060 color tables, no need for every variable to also have 'color' in
4065 color tables, no need for every variable to also have 'color' in
4061 its name).
4066 its name).
4062
4067
4063 * Broke down genutils into separate files. Now genutils only
4068 * Broke down genutils into separate files. Now genutils only
4064 contains utility functions, and classes have been moved to their
4069 contains utility functions, and classes have been moved to their
4065 own files (they had enough independent functionality to warrant
4070 own files (they had enough independent functionality to warrant
4066 it): ConfigLoader, OutputTrap, Struct.
4071 it): ConfigLoader, OutputTrap, Struct.
4067
4072
4068 2001-12-05 Fernando Perez <fperez@colorado.edu>
4073 2001-12-05 Fernando Perez <fperez@colorado.edu>
4069
4074
4070 * IPython turns 21! Released version 0.1.21, as a candidate for
4075 * IPython turns 21! Released version 0.1.21, as a candidate for
4071 public consumption. If all goes well, release in a few days.
4076 public consumption. If all goes well, release in a few days.
4072
4077
4073 * Fixed path bug (files in Extensions/ directory wouldn't be found
4078 * Fixed path bug (files in Extensions/ directory wouldn't be found
4074 unless IPython/ was explicitly in sys.path).
4079 unless IPython/ was explicitly in sys.path).
4075
4080
4076 * Extended the FlexCompleter class as MagicCompleter to allow
4081 * Extended the FlexCompleter class as MagicCompleter to allow
4077 completion of @-starting lines.
4082 completion of @-starting lines.
4078
4083
4079 * Created __release__.py file as a central repository for release
4084 * Created __release__.py file as a central repository for release
4080 info that other files can read from.
4085 info that other files can read from.
4081
4086
4082 * Fixed small bug in logging: when logging was turned on in
4087 * Fixed small bug in logging: when logging was turned on in
4083 mid-session, old lines with special meanings (!@?) were being
4088 mid-session, old lines with special meanings (!@?) were being
4084 logged without the prepended comment, which is necessary since
4089 logged without the prepended comment, which is necessary since
4085 they are not truly valid python syntax. This should make session
4090 they are not truly valid python syntax. This should make session
4086 restores produce less errors.
4091 restores produce less errors.
4087
4092
4088 * The namespace cleanup forced me to make a FlexCompleter class
4093 * The namespace cleanup forced me to make a FlexCompleter class
4089 which is nothing but a ripoff of rlcompleter, but with selectable
4094 which is nothing but a ripoff of rlcompleter, but with selectable
4090 namespace (rlcompleter only works in __main__.__dict__). I'll try
4095 namespace (rlcompleter only works in __main__.__dict__). I'll try
4091 to submit a note to the authors to see if this change can be
4096 to submit a note to the authors to see if this change can be
4092 incorporated in future rlcompleter releases (Dec.6: done)
4097 incorporated in future rlcompleter releases (Dec.6: done)
4093
4098
4094 * More fixes to namespace handling. It was a mess! Now all
4099 * More fixes to namespace handling. It was a mess! Now all
4095 explicit references to __main__.__dict__ are gone (except when
4100 explicit references to __main__.__dict__ are gone (except when
4096 really needed) and everything is handled through the namespace
4101 really needed) and everything is handled through the namespace
4097 dicts in the IPython instance. We seem to be getting somewhere
4102 dicts in the IPython instance. We seem to be getting somewhere
4098 with this, finally...
4103 with this, finally...
4099
4104
4100 * Small documentation updates.
4105 * Small documentation updates.
4101
4106
4102 * Created the Extensions directory under IPython (with an
4107 * Created the Extensions directory under IPython (with an
4103 __init__.py). Put the PhysicalQ stuff there. This directory should
4108 __init__.py). Put the PhysicalQ stuff there. This directory should
4104 be used for all special-purpose extensions.
4109 be used for all special-purpose extensions.
4105
4110
4106 * File renaming:
4111 * File renaming:
4107 ipythonlib --> ipmaker
4112 ipythonlib --> ipmaker
4108 ipplib --> iplib
4113 ipplib --> iplib
4109 This makes a bit more sense in terms of what these files actually do.
4114 This makes a bit more sense in terms of what these files actually do.
4110
4115
4111 * Moved all the classes and functions in ipythonlib to ipplib, so
4116 * Moved all the classes and functions in ipythonlib to ipplib, so
4112 now ipythonlib only has make_IPython(). This will ease up its
4117 now ipythonlib only has make_IPython(). This will ease up its
4113 splitting in smaller functional chunks later.
4118 splitting in smaller functional chunks later.
4114
4119
4115 * Cleaned up (done, I think) output of @whos. Better column
4120 * Cleaned up (done, I think) output of @whos. Better column
4116 formatting, and now shows str(var) for as much as it can, which is
4121 formatting, and now shows str(var) for as much as it can, which is
4117 typically what one gets with a 'print var'.
4122 typically what one gets with a 'print var'.
4118
4123
4119 2001-12-04 Fernando Perez <fperez@colorado.edu>
4124 2001-12-04 Fernando Perez <fperez@colorado.edu>
4120
4125
4121 * Fixed namespace problems. Now builtin/IPyhton/user names get
4126 * Fixed namespace problems. Now builtin/IPyhton/user names get
4122 properly reported in their namespace. Internal namespace handling
4127 properly reported in their namespace. Internal namespace handling
4123 is finally getting decent (not perfect yet, but much better than
4128 is finally getting decent (not perfect yet, but much better than
4124 the ad-hoc mess we had).
4129 the ad-hoc mess we had).
4125
4130
4126 * Removed -exit option. If people just want to run a python
4131 * Removed -exit option. If people just want to run a python
4127 script, that's what the normal interpreter is for. Less
4132 script, that's what the normal interpreter is for. Less
4128 unnecessary options, less chances for bugs.
4133 unnecessary options, less chances for bugs.
4129
4134
4130 * Added a crash handler which generates a complete post-mortem if
4135 * Added a crash handler which generates a complete post-mortem if
4131 IPython crashes. This will help a lot in tracking bugs down the
4136 IPython crashes. This will help a lot in tracking bugs down the
4132 road.
4137 road.
4133
4138
4134 * Fixed nasty bug in auto-evaluation part of prefilter(). Names
4139 * Fixed nasty bug in auto-evaluation part of prefilter(). Names
4135 which were boud to functions being reassigned would bypass the
4140 which were boud to functions being reassigned would bypass the
4136 logger, breaking the sync of _il with the prompt counter. This
4141 logger, breaking the sync of _il with the prompt counter. This
4137 would then crash IPython later when a new line was logged.
4142 would then crash IPython later when a new line was logged.
4138
4143
4139 2001-12-02 Fernando Perez <fperez@colorado.edu>
4144 2001-12-02 Fernando Perez <fperez@colorado.edu>
4140
4145
4141 * Made IPython a package. This means people don't have to clutter
4146 * Made IPython a package. This means people don't have to clutter
4142 their sys.path with yet another directory. Changed the INSTALL
4147 their sys.path with yet another directory. Changed the INSTALL
4143 file accordingly.
4148 file accordingly.
4144
4149
4145 * Cleaned up the output of @who_ls, @who and @whos. @who_ls now
4150 * Cleaned up the output of @who_ls, @who and @whos. @who_ls now
4146 sorts its output (so @who shows it sorted) and @whos formats the
4151 sorts its output (so @who shows it sorted) and @whos formats the
4147 table according to the width of the first column. Nicer, easier to
4152 table according to the width of the first column. Nicer, easier to
4148 read. Todo: write a generic table_format() which takes a list of
4153 read. Todo: write a generic table_format() which takes a list of
4149 lists and prints it nicely formatted, with optional row/column
4154 lists and prints it nicely formatted, with optional row/column
4150 separators and proper padding and justification.
4155 separators and proper padding and justification.
4151
4156
4152 * Released 0.1.20
4157 * Released 0.1.20
4153
4158
4154 * Fixed bug in @log which would reverse the inputcache list (a
4159 * Fixed bug in @log which would reverse the inputcache list (a
4155 copy operation was missing).
4160 copy operation was missing).
4156
4161
4157 * Code cleanup. @config was changed to use page(). Better, since
4162 * Code cleanup. @config was changed to use page(). Better, since
4158 its output is always quite long.
4163 its output is always quite long.
4159
4164
4160 * Itpl is back as a dependency. I was having too many problems
4165 * Itpl is back as a dependency. I was having too many problems
4161 getting the parametric aliases to work reliably, and it's just
4166 getting the parametric aliases to work reliably, and it's just
4162 easier to code weird string operations with it than playing %()s
4167 easier to code weird string operations with it than playing %()s
4163 games. It's only ~6k, so I don't think it's too big a deal.
4168 games. It's only ~6k, so I don't think it's too big a deal.
4164
4169
4165 * Found (and fixed) a very nasty bug with history. !lines weren't
4170 * Found (and fixed) a very nasty bug with history. !lines weren't
4166 getting cached, and the out of sync caches would crash
4171 getting cached, and the out of sync caches would crash
4167 IPython. Fixed it by reorganizing the prefilter/handlers/logger
4172 IPython. Fixed it by reorganizing the prefilter/handlers/logger
4168 division of labor a bit better. Bug fixed, cleaner structure.
4173 division of labor a bit better. Bug fixed, cleaner structure.
4169
4174
4170 2001-12-01 Fernando Perez <fperez@colorado.edu>
4175 2001-12-01 Fernando Perez <fperez@colorado.edu>
4171
4176
4172 * Released 0.1.19
4177 * Released 0.1.19
4173
4178
4174 * Added option -n to @hist to prevent line number printing. Much
4179 * Added option -n to @hist to prevent line number printing. Much
4175 easier to copy/paste code this way.
4180 easier to copy/paste code this way.
4176
4181
4177 * Created global _il to hold the input list. Allows easy
4182 * Created global _il to hold the input list. Allows easy
4178 re-execution of blocks of code by slicing it (inspired by Janko's
4183 re-execution of blocks of code by slicing it (inspired by Janko's
4179 comment on 'macros').
4184 comment on 'macros').
4180
4185
4181 * Small fixes and doc updates.
4186 * Small fixes and doc updates.
4182
4187
4183 * Rewrote @history function (was @h). Renamed it to @hist, @h is
4188 * Rewrote @history function (was @h). Renamed it to @hist, @h is
4184 much too fragile with automagic. Handles properly multi-line
4189 much too fragile with automagic. Handles properly multi-line
4185 statements and takes parameters.
4190 statements and takes parameters.
4186
4191
4187 2001-11-30 Fernando Perez <fperez@colorado.edu>
4192 2001-11-30 Fernando Perez <fperez@colorado.edu>
4188
4193
4189 * Version 0.1.18 released.
4194 * Version 0.1.18 released.
4190
4195
4191 * Fixed nasty namespace bug in initial module imports.
4196 * Fixed nasty namespace bug in initial module imports.
4192
4197
4193 * Added copyright/license notes to all code files (except
4198 * Added copyright/license notes to all code files (except
4194 DPyGetOpt). For the time being, LGPL. That could change.
4199 DPyGetOpt). For the time being, LGPL. That could change.
4195
4200
4196 * Rewrote a much nicer README, updated INSTALL, cleaned up
4201 * Rewrote a much nicer README, updated INSTALL, cleaned up
4197 ipythonrc-* samples.
4202 ipythonrc-* samples.
4198
4203
4199 * Overall code/documentation cleanup. Basically ready for
4204 * Overall code/documentation cleanup. Basically ready for
4200 release. Only remaining thing: licence decision (LGPL?).
4205 release. Only remaining thing: licence decision (LGPL?).
4201
4206
4202 * Converted load_config to a class, ConfigLoader. Now recursion
4207 * Converted load_config to a class, ConfigLoader. Now recursion
4203 control is better organized. Doesn't include the same file twice.
4208 control is better organized. Doesn't include the same file twice.
4204
4209
4205 2001-11-29 Fernando Perez <fperez@colorado.edu>
4210 2001-11-29 Fernando Perez <fperez@colorado.edu>
4206
4211
4207 * Got input history working. Changed output history variables from
4212 * Got input history working. Changed output history variables from
4208 _p to _o so that _i is for input and _o for output. Just cleaner
4213 _p to _o so that _i is for input and _o for output. Just cleaner
4209 convention.
4214 convention.
4210
4215
4211 * Implemented parametric aliases. This pretty much allows the
4216 * Implemented parametric aliases. This pretty much allows the
4212 alias system to offer full-blown shell convenience, I think.
4217 alias system to offer full-blown shell convenience, I think.
4213
4218
4214 * Version 0.1.17 released, 0.1.18 opened.
4219 * Version 0.1.17 released, 0.1.18 opened.
4215
4220
4216 * dot_ipython/ipythonrc (alias): added documentation.
4221 * dot_ipython/ipythonrc (alias): added documentation.
4217 (xcolor): Fixed small bug (xcolors -> xcolor)
4222 (xcolor): Fixed small bug (xcolors -> xcolor)
4218
4223
4219 * Changed the alias system. Now alias is a magic command to define
4224 * Changed the alias system. Now alias is a magic command to define
4220 aliases just like the shell. Rationale: the builtin magics should
4225 aliases just like the shell. Rationale: the builtin magics should
4221 be there for things deeply connected to IPython's
4226 be there for things deeply connected to IPython's
4222 architecture. And this is a much lighter system for what I think
4227 architecture. And this is a much lighter system for what I think
4223 is the really important feature: allowing users to define quickly
4228 is the really important feature: allowing users to define quickly
4224 magics that will do shell things for them, so they can customize
4229 magics that will do shell things for them, so they can customize
4225 IPython easily to match their work habits. If someone is really
4230 IPython easily to match their work habits. If someone is really
4226 desperate to have another name for a builtin alias, they can
4231 desperate to have another name for a builtin alias, they can
4227 always use __IP.magic_newname = __IP.magic_oldname. Hackish but
4232 always use __IP.magic_newname = __IP.magic_oldname. Hackish but
4228 works.
4233 works.
4229
4234
4230 2001-11-28 Fernando Perez <fperez@colorado.edu>
4235 2001-11-28 Fernando Perez <fperez@colorado.edu>
4231
4236
4232 * Changed @file so that it opens the source file at the proper
4237 * Changed @file so that it opens the source file at the proper
4233 line. Since it uses less, if your EDITOR environment is
4238 line. Since it uses less, if your EDITOR environment is
4234 configured, typing v will immediately open your editor of choice
4239 configured, typing v will immediately open your editor of choice
4235 right at the line where the object is defined. Not as quick as
4240 right at the line where the object is defined. Not as quick as
4236 having a direct @edit command, but for all intents and purposes it
4241 having a direct @edit command, but for all intents and purposes it
4237 works. And I don't have to worry about writing @edit to deal with
4242 works. And I don't have to worry about writing @edit to deal with
4238 all the editors, less does that.
4243 all the editors, less does that.
4239
4244
4240 * Version 0.1.16 released, 0.1.17 opened.
4245 * Version 0.1.16 released, 0.1.17 opened.
4241
4246
4242 * Fixed some nasty bugs in the page/page_dumb combo that could
4247 * Fixed some nasty bugs in the page/page_dumb combo that could
4243 crash IPython.
4248 crash IPython.
4244
4249
4245 2001-11-27 Fernando Perez <fperez@colorado.edu>
4250 2001-11-27 Fernando Perez <fperez@colorado.edu>
4246
4251
4247 * Version 0.1.15 released, 0.1.16 opened.
4252 * Version 0.1.15 released, 0.1.16 opened.
4248
4253
4249 * Finally got ? and ?? to work for undefined things: now it's
4254 * Finally got ? and ?? to work for undefined things: now it's
4250 possible to type {}.get? and get information about the get method
4255 possible to type {}.get? and get information about the get method
4251 of dicts, or os.path? even if only os is defined (so technically
4256 of dicts, or os.path? even if only os is defined (so technically
4252 os.path isn't). Works at any level. For example, after import os,
4257 os.path isn't). Works at any level. For example, after import os,
4253 os?, os.path?, os.path.abspath? all work. This is great, took some
4258 os?, os.path?, os.path.abspath? all work. This is great, took some
4254 work in _ofind.
4259 work in _ofind.
4255
4260
4256 * Fixed more bugs with logging. The sanest way to do it was to add
4261 * Fixed more bugs with logging. The sanest way to do it was to add
4257 to @log a 'mode' parameter. Killed two in one shot (this mode
4262 to @log a 'mode' parameter. Killed two in one shot (this mode
4258 option was a request of Janko's). I think it's finally clean
4263 option was a request of Janko's). I think it's finally clean
4259 (famous last words).
4264 (famous last words).
4260
4265
4261 * Added a page_dumb() pager which does a decent job of paging on
4266 * Added a page_dumb() pager which does a decent job of paging on
4262 screen, if better things (like less) aren't available. One less
4267 screen, if better things (like less) aren't available. One less
4263 unix dependency (someday maybe somebody will port this to
4268 unix dependency (someday maybe somebody will port this to
4264 windows).
4269 windows).
4265
4270
4266 * Fixed problem in magic_log: would lock of logging out if log
4271 * Fixed problem in magic_log: would lock of logging out if log
4267 creation failed (because it would still think it had succeeded).
4272 creation failed (because it would still think it had succeeded).
4268
4273
4269 * Improved the page() function using curses to auto-detect screen
4274 * Improved the page() function using curses to auto-detect screen
4270 size. Now it can make a much better decision on whether to print
4275 size. Now it can make a much better decision on whether to print
4271 or page a string. Option screen_length was modified: a value 0
4276 or page a string. Option screen_length was modified: a value 0
4272 means auto-detect, and that's the default now.
4277 means auto-detect, and that's the default now.
4273
4278
4274 * Version 0.1.14 released, 0.1.15 opened. I think this is ready to
4279 * Version 0.1.14 released, 0.1.15 opened. I think this is ready to
4275 go out. I'll test it for a few days, then talk to Janko about
4280 go out. I'll test it for a few days, then talk to Janko about
4276 licences and announce it.
4281 licences and announce it.
4277
4282
4278 * Fixed the length of the auto-generated ---> prompt which appears
4283 * Fixed the length of the auto-generated ---> prompt which appears
4279 for auto-parens and auto-quotes. Getting this right isn't trivial,
4284 for auto-parens and auto-quotes. Getting this right isn't trivial,
4280 with all the color escapes, different prompt types and optional
4285 with all the color escapes, different prompt types and optional
4281 separators. But it seems to be working in all the combinations.
4286 separators. But it seems to be working in all the combinations.
4282
4287
4283 2001-11-26 Fernando Perez <fperez@colorado.edu>
4288 2001-11-26 Fernando Perez <fperez@colorado.edu>
4284
4289
4285 * Wrote a regexp filter to get option types from the option names
4290 * Wrote a regexp filter to get option types from the option names
4286 string. This eliminates the need to manually keep two duplicate
4291 string. This eliminates the need to manually keep two duplicate
4287 lists.
4292 lists.
4288
4293
4289 * Removed the unneeded check_option_names. Now options are handled
4294 * Removed the unneeded check_option_names. Now options are handled
4290 in a much saner manner and it's easy to visually check that things
4295 in a much saner manner and it's easy to visually check that things
4291 are ok.
4296 are ok.
4292
4297
4293 * Updated version numbers on all files I modified to carry a
4298 * Updated version numbers on all files I modified to carry a
4294 notice so Janko and Nathan have clear version markers.
4299 notice so Janko and Nathan have clear version markers.
4295
4300
4296 * Updated docstring for ultraTB with my changes. I should send
4301 * Updated docstring for ultraTB with my changes. I should send
4297 this to Nathan.
4302 this to Nathan.
4298
4303
4299 * Lots of small fixes. Ran everything through pychecker again.
4304 * Lots of small fixes. Ran everything through pychecker again.
4300
4305
4301 * Made loading of deep_reload an cmd line option. If it's not too
4306 * Made loading of deep_reload an cmd line option. If it's not too
4302 kosher, now people can just disable it. With -nodeep_reload it's
4307 kosher, now people can just disable it. With -nodeep_reload it's
4303 still available as dreload(), it just won't overwrite reload().
4308 still available as dreload(), it just won't overwrite reload().
4304
4309
4305 * Moved many options to the no| form (-opt and -noopt
4310 * Moved many options to the no| form (-opt and -noopt
4306 accepted). Cleaner.
4311 accepted). Cleaner.
4307
4312
4308 * Changed magic_log so that if called with no parameters, it uses
4313 * Changed magic_log so that if called with no parameters, it uses
4309 'rotate' mode. That way auto-generated logs aren't automatically
4314 'rotate' mode. That way auto-generated logs aren't automatically
4310 over-written. For normal logs, now a backup is made if it exists
4315 over-written. For normal logs, now a backup is made if it exists
4311 (only 1 level of backups). A new 'backup' mode was added to the
4316 (only 1 level of backups). A new 'backup' mode was added to the
4312 Logger class to support this. This was a request by Janko.
4317 Logger class to support this. This was a request by Janko.
4313
4318
4314 * Added @logoff/@logon to stop/restart an active log.
4319 * Added @logoff/@logon to stop/restart an active log.
4315
4320
4316 * Fixed a lot of bugs in log saving/replay. It was pretty
4321 * Fixed a lot of bugs in log saving/replay. It was pretty
4317 broken. Now special lines (!@,/) appear properly in the command
4322 broken. Now special lines (!@,/) appear properly in the command
4318 history after a log replay.
4323 history after a log replay.
4319
4324
4320 * Tried and failed to implement full session saving via pickle. My
4325 * Tried and failed to implement full session saving via pickle. My
4321 idea was to pickle __main__.__dict__, but modules can't be
4326 idea was to pickle __main__.__dict__, but modules can't be
4322 pickled. This would be a better alternative to replaying logs, but
4327 pickled. This would be a better alternative to replaying logs, but
4323 seems quite tricky to get to work. Changed -session to be called
4328 seems quite tricky to get to work. Changed -session to be called
4324 -logplay, which more accurately reflects what it does. And if we
4329 -logplay, which more accurately reflects what it does. And if we
4325 ever get real session saving working, -session is now available.
4330 ever get real session saving working, -session is now available.
4326
4331
4327 * Implemented color schemes for prompts also. As for tracebacks,
4332 * Implemented color schemes for prompts also. As for tracebacks,
4328 currently only NoColor and Linux are supported. But now the
4333 currently only NoColor and Linux are supported. But now the
4329 infrastructure is in place, based on a generic ColorScheme
4334 infrastructure is in place, based on a generic ColorScheme
4330 class. So writing and activating new schemes both for the prompts
4335 class. So writing and activating new schemes both for the prompts
4331 and the tracebacks should be straightforward.
4336 and the tracebacks should be straightforward.
4332
4337
4333 * Version 0.1.13 released, 0.1.14 opened.
4338 * Version 0.1.13 released, 0.1.14 opened.
4334
4339
4335 * Changed handling of options for output cache. Now counter is
4340 * Changed handling of options for output cache. Now counter is
4336 hardwired starting at 1 and one specifies the maximum number of
4341 hardwired starting at 1 and one specifies the maximum number of
4337 entries *in the outcache* (not the max prompt counter). This is
4342 entries *in the outcache* (not the max prompt counter). This is
4338 much better, since many statements won't increase the cache
4343 much better, since many statements won't increase the cache
4339 count. It also eliminated some confusing options, now there's only
4344 count. It also eliminated some confusing options, now there's only
4340 one: cache_size.
4345 one: cache_size.
4341
4346
4342 * Added 'alias' magic function and magic_alias option in the
4347 * Added 'alias' magic function and magic_alias option in the
4343 ipythonrc file. Now the user can easily define whatever names he
4348 ipythonrc file. Now the user can easily define whatever names he
4344 wants for the magic functions without having to play weird
4349 wants for the magic functions without having to play weird
4345 namespace games. This gives IPython a real shell-like feel.
4350 namespace games. This gives IPython a real shell-like feel.
4346
4351
4347 * Fixed doc/?/?? for magics. Now all work, in all forms (explicit
4352 * Fixed doc/?/?? for magics. Now all work, in all forms (explicit
4348 @ or not).
4353 @ or not).
4349
4354
4350 This was one of the last remaining 'visible' bugs (that I know
4355 This was one of the last remaining 'visible' bugs (that I know
4351 of). I think if I can clean up the session loading so it works
4356 of). I think if I can clean up the session loading so it works
4352 100% I'll release a 0.2.0 version on c.p.l (talk to Janko first
4357 100% I'll release a 0.2.0 version on c.p.l (talk to Janko first
4353 about licensing).
4358 about licensing).
4354
4359
4355 2001-11-25 Fernando Perez <fperez@colorado.edu>
4360 2001-11-25 Fernando Perez <fperez@colorado.edu>
4356
4361
4357 * Rewrote somewhat oinfo (?/??). Nicer, now uses page() and
4362 * Rewrote somewhat oinfo (?/??). Nicer, now uses page() and
4358 there's a cleaner distinction between what ? and ?? show.
4363 there's a cleaner distinction between what ? and ?? show.
4359
4364
4360 * Added screen_length option. Now the user can define his own
4365 * Added screen_length option. Now the user can define his own
4361 screen size for page() operations.
4366 screen size for page() operations.
4362
4367
4363 * Implemented magic shell-like functions with automatic code
4368 * Implemented magic shell-like functions with automatic code
4364 generation. Now adding another function is just a matter of adding
4369 generation. Now adding another function is just a matter of adding
4365 an entry to a dict, and the function is dynamically generated at
4370 an entry to a dict, and the function is dynamically generated at
4366 run-time. Python has some really cool features!
4371 run-time. Python has some really cool features!
4367
4372
4368 * Renamed many options to cleanup conventions a little. Now all
4373 * Renamed many options to cleanup conventions a little. Now all
4369 are lowercase, and only underscores where needed. Also in the code
4374 are lowercase, and only underscores where needed. Also in the code
4370 option name tables are clearer.
4375 option name tables are clearer.
4371
4376
4372 * Changed prompts a little. Now input is 'In [n]:' instead of
4377 * Changed prompts a little. Now input is 'In [n]:' instead of
4373 'In[n]:='. This allows it the numbers to be aligned with the
4378 'In[n]:='. This allows it the numbers to be aligned with the
4374 Out[n] numbers, and removes usage of ':=' which doesn't exist in
4379 Out[n] numbers, and removes usage of ':=' which doesn't exist in
4375 Python (it was a Mathematica thing). The '...' continuation prompt
4380 Python (it was a Mathematica thing). The '...' continuation prompt
4376 was also changed a little to align better.
4381 was also changed a little to align better.
4377
4382
4378 * Fixed bug when flushing output cache. Not all _p<n> variables
4383 * Fixed bug when flushing output cache. Not all _p<n> variables
4379 exist, so their deletion needs to be wrapped in a try:
4384 exist, so their deletion needs to be wrapped in a try:
4380
4385
4381 * Figured out how to properly use inspect.formatargspec() (it
4386 * Figured out how to properly use inspect.formatargspec() (it
4382 requires the args preceded by *). So I removed all the code from
4387 requires the args preceded by *). So I removed all the code from
4383 _get_pdef in Magic, which was just replicating that.
4388 _get_pdef in Magic, which was just replicating that.
4384
4389
4385 * Added test to prefilter to allow redefining magic function names
4390 * Added test to prefilter to allow redefining magic function names
4386 as variables. This is ok, since the @ form is always available,
4391 as variables. This is ok, since the @ form is always available,
4387 but whe should allow the user to define a variable called 'ls' if
4392 but whe should allow the user to define a variable called 'ls' if
4388 he needs it.
4393 he needs it.
4389
4394
4390 * Moved the ToDo information from README into a separate ToDo.
4395 * Moved the ToDo information from README into a separate ToDo.
4391
4396
4392 * General code cleanup and small bugfixes. I think it's close to a
4397 * General code cleanup and small bugfixes. I think it's close to a
4393 state where it can be released, obviously with a big 'beta'
4398 state where it can be released, obviously with a big 'beta'
4394 warning on it.
4399 warning on it.
4395
4400
4396 * Got the magic function split to work. Now all magics are defined
4401 * Got the magic function split to work. Now all magics are defined
4397 in a separate class. It just organizes things a bit, and now
4402 in a separate class. It just organizes things a bit, and now
4398 Xemacs behaves nicer (it was choking on InteractiveShell b/c it
4403 Xemacs behaves nicer (it was choking on InteractiveShell b/c it
4399 was too long).
4404 was too long).
4400
4405
4401 * Changed @clear to @reset to avoid potential confusions with
4406 * Changed @clear to @reset to avoid potential confusions with
4402 the shell command clear. Also renamed @cl to @clear, which does
4407 the shell command clear. Also renamed @cl to @clear, which does
4403 exactly what people expect it to from their shell experience.
4408 exactly what people expect it to from their shell experience.
4404
4409
4405 Added a check to the @reset command (since it's so
4410 Added a check to the @reset command (since it's so
4406 destructive, it's probably a good idea to ask for confirmation).
4411 destructive, it's probably a good idea to ask for confirmation).
4407 But now reset only works for full namespace resetting. Since the
4412 But now reset only works for full namespace resetting. Since the
4408 del keyword is already there for deleting a few specific
4413 del keyword is already there for deleting a few specific
4409 variables, I don't see the point of having a redundant magic
4414 variables, I don't see the point of having a redundant magic
4410 function for the same task.
4415 function for the same task.
4411
4416
4412 2001-11-24 Fernando Perez <fperez@colorado.edu>
4417 2001-11-24 Fernando Perez <fperez@colorado.edu>
4413
4418
4414 * Updated the builtin docs (esp. the ? ones).
4419 * Updated the builtin docs (esp. the ? ones).
4415
4420
4416 * Ran all the code through pychecker. Not terribly impressed with
4421 * Ran all the code through pychecker. Not terribly impressed with
4417 it: lots of spurious warnings and didn't really find anything of
4422 it: lots of spurious warnings and didn't really find anything of
4418 substance (just a few modules being imported and not used).
4423 substance (just a few modules being imported and not used).
4419
4424
4420 * Implemented the new ultraTB functionality into IPython. New
4425 * Implemented the new ultraTB functionality into IPython. New
4421 option: xcolors. This chooses color scheme. xmode now only selects
4426 option: xcolors. This chooses color scheme. xmode now only selects
4422 between Plain and Verbose. Better orthogonality.
4427 between Plain and Verbose. Better orthogonality.
4423
4428
4424 * Large rewrite of ultraTB. Much cleaner now, with a separation of
4429 * Large rewrite of ultraTB. Much cleaner now, with a separation of
4425 mode and color scheme for the exception handlers. Now it's
4430 mode and color scheme for the exception handlers. Now it's
4426 possible to have the verbose traceback with no coloring.
4431 possible to have the verbose traceback with no coloring.
4427
4432
4428 2001-11-23 Fernando Perez <fperez@colorado.edu>
4433 2001-11-23 Fernando Perez <fperez@colorado.edu>
4429
4434
4430 * Version 0.1.12 released, 0.1.13 opened.
4435 * Version 0.1.12 released, 0.1.13 opened.
4431
4436
4432 * Removed option to set auto-quote and auto-paren escapes by
4437 * Removed option to set auto-quote and auto-paren escapes by
4433 user. The chances of breaking valid syntax are just too high. If
4438 user. The chances of breaking valid syntax are just too high. If
4434 someone *really* wants, they can always dig into the code.
4439 someone *really* wants, they can always dig into the code.
4435
4440
4436 * Made prompt separators configurable.
4441 * Made prompt separators configurable.
4437
4442
4438 2001-11-22 Fernando Perez <fperez@colorado.edu>
4443 2001-11-22 Fernando Perez <fperez@colorado.edu>
4439
4444
4440 * Small bugfixes in many places.
4445 * Small bugfixes in many places.
4441
4446
4442 * Removed the MyCompleter class from ipplib. It seemed redundant
4447 * Removed the MyCompleter class from ipplib. It seemed redundant
4443 with the C-p,C-n history search functionality. Less code to
4448 with the C-p,C-n history search functionality. Less code to
4444 maintain.
4449 maintain.
4445
4450
4446 * Moved all the original ipython.py code into ipythonlib.py. Right
4451 * Moved all the original ipython.py code into ipythonlib.py. Right
4447 now it's just one big dump into a function called make_IPython, so
4452 now it's just one big dump into a function called make_IPython, so
4448 no real modularity has been gained. But at least it makes the
4453 no real modularity has been gained. But at least it makes the
4449 wrapper script tiny, and since ipythonlib is a module, it gets
4454 wrapper script tiny, and since ipythonlib is a module, it gets
4450 compiled and startup is much faster.
4455 compiled and startup is much faster.
4451
4456
4452 This is a reasobably 'deep' change, so we should test it for a
4457 This is a reasobably 'deep' change, so we should test it for a
4453 while without messing too much more with the code.
4458 while without messing too much more with the code.
4454
4459
4455 2001-11-21 Fernando Perez <fperez@colorado.edu>
4460 2001-11-21 Fernando Perez <fperez@colorado.edu>
4456
4461
4457 * Version 0.1.11 released, 0.1.12 opened for further work.
4462 * Version 0.1.11 released, 0.1.12 opened for further work.
4458
4463
4459 * Removed dependency on Itpl. It was only needed in one place. It
4464 * Removed dependency on Itpl. It was only needed in one place. It
4460 would be nice if this became part of python, though. It makes life
4465 would be nice if this became part of python, though. It makes life
4461 *a lot* easier in some cases.
4466 *a lot* easier in some cases.
4462
4467
4463 * Simplified the prefilter code a bit. Now all handlers are
4468 * Simplified the prefilter code a bit. Now all handlers are
4464 expected to explicitly return a value (at least a blank string).
4469 expected to explicitly return a value (at least a blank string).
4465
4470
4466 * Heavy edits in ipplib. Removed the help system altogether. Now
4471 * Heavy edits in ipplib. Removed the help system altogether. Now
4467 obj?/?? is used for inspecting objects, a magic @doc prints
4472 obj?/?? is used for inspecting objects, a magic @doc prints
4468 docstrings, and full-blown Python help is accessed via the 'help'
4473 docstrings, and full-blown Python help is accessed via the 'help'
4469 keyword. This cleans up a lot of code (less to maintain) and does
4474 keyword. This cleans up a lot of code (less to maintain) and does
4470 the job. Since 'help' is now a standard Python component, might as
4475 the job. Since 'help' is now a standard Python component, might as
4471 well use it and remove duplicate functionality.
4476 well use it and remove duplicate functionality.
4472
4477
4473 Also removed the option to use ipplib as a standalone program. By
4478 Also removed the option to use ipplib as a standalone program. By
4474 now it's too dependent on other parts of IPython to function alone.
4479 now it's too dependent on other parts of IPython to function alone.
4475
4480
4476 * Fixed bug in genutils.pager. It would crash if the pager was
4481 * Fixed bug in genutils.pager. It would crash if the pager was
4477 exited immediately after opening (broken pipe).
4482 exited immediately after opening (broken pipe).
4478
4483
4479 * Trimmed down the VerboseTB reporting a little. The header is
4484 * Trimmed down the VerboseTB reporting a little. The header is
4480 much shorter now and the repeated exception arguments at the end
4485 much shorter now and the repeated exception arguments at the end
4481 have been removed. For interactive use the old header seemed a bit
4486 have been removed. For interactive use the old header seemed a bit
4482 excessive.
4487 excessive.
4483
4488
4484 * Fixed small bug in output of @whos for variables with multi-word
4489 * Fixed small bug in output of @whos for variables with multi-word
4485 types (only first word was displayed).
4490 types (only first word was displayed).
4486
4491
4487 2001-11-17 Fernando Perez <fperez@colorado.edu>
4492 2001-11-17 Fernando Perez <fperez@colorado.edu>
4488
4493
4489 * Version 0.1.10 released, 0.1.11 opened for further work.
4494 * Version 0.1.10 released, 0.1.11 opened for further work.
4490
4495
4491 * Modified dirs and friends. dirs now *returns* the stack (not
4496 * Modified dirs and friends. dirs now *returns* the stack (not
4492 prints), so one can manipulate it as a variable. Convenient to
4497 prints), so one can manipulate it as a variable. Convenient to
4493 travel along many directories.
4498 travel along many directories.
4494
4499
4495 * Fixed bug in magic_pdef: would only work with functions with
4500 * Fixed bug in magic_pdef: would only work with functions with
4496 arguments with default values.
4501 arguments with default values.
4497
4502
4498 2001-11-14 Fernando Perez <fperez@colorado.edu>
4503 2001-11-14 Fernando Perez <fperez@colorado.edu>
4499
4504
4500 * Added the PhysicsInput stuff to dot_ipython so it ships as an
4505 * Added the PhysicsInput stuff to dot_ipython so it ships as an
4501 example with IPython. Various other minor fixes and cleanups.
4506 example with IPython. Various other minor fixes and cleanups.
4502
4507
4503 * Version 0.1.9 released, 0.1.10 opened for further work.
4508 * Version 0.1.9 released, 0.1.10 opened for further work.
4504
4509
4505 * Added sys.path to the list of directories searched in the
4510 * Added sys.path to the list of directories searched in the
4506 execfile= option. It used to be the current directory and the
4511 execfile= option. It used to be the current directory and the
4507 user's IPYTHONDIR only.
4512 user's IPYTHONDIR only.
4508
4513
4509 2001-11-13 Fernando Perez <fperez@colorado.edu>
4514 2001-11-13 Fernando Perez <fperez@colorado.edu>
4510
4515
4511 * Reinstated the raw_input/prefilter separation that Janko had
4516 * Reinstated the raw_input/prefilter separation that Janko had
4512 initially. This gives a more convenient setup for extending the
4517 initially. This gives a more convenient setup for extending the
4513 pre-processor from the outside: raw_input always gets a string,
4518 pre-processor from the outside: raw_input always gets a string,
4514 and prefilter has to process it. We can then redefine prefilter
4519 and prefilter has to process it. We can then redefine prefilter
4515 from the outside and implement extensions for special
4520 from the outside and implement extensions for special
4516 purposes.
4521 purposes.
4517
4522
4518 Today I got one for inputting PhysicalQuantity objects
4523 Today I got one for inputting PhysicalQuantity objects
4519 (from Scientific) without needing any function calls at
4524 (from Scientific) without needing any function calls at
4520 all. Extremely convenient, and it's all done as a user-level
4525 all. Extremely convenient, and it's all done as a user-level
4521 extension (no IPython code was touched). Now instead of:
4526 extension (no IPython code was touched). Now instead of:
4522 a = PhysicalQuantity(4.2,'m/s**2')
4527 a = PhysicalQuantity(4.2,'m/s**2')
4523 one can simply say
4528 one can simply say
4524 a = 4.2 m/s**2
4529 a = 4.2 m/s**2
4525 or even
4530 or even
4526 a = 4.2 m/s^2
4531 a = 4.2 m/s^2
4527
4532
4528 I use this, but it's also a proof of concept: IPython really is
4533 I use this, but it's also a proof of concept: IPython really is
4529 fully user-extensible, even at the level of the parsing of the
4534 fully user-extensible, even at the level of the parsing of the
4530 command line. It's not trivial, but it's perfectly doable.
4535 command line. It's not trivial, but it's perfectly doable.
4531
4536
4532 * Added 'add_flip' method to inclusion conflict resolver. Fixes
4537 * Added 'add_flip' method to inclusion conflict resolver. Fixes
4533 the problem of modules being loaded in the inverse order in which
4538 the problem of modules being loaded in the inverse order in which
4534 they were defined in
4539 they were defined in
4535
4540
4536 * Version 0.1.8 released, 0.1.9 opened for further work.
4541 * Version 0.1.8 released, 0.1.9 opened for further work.
4537
4542
4538 * Added magics pdef, source and file. They respectively show the
4543 * Added magics pdef, source and file. They respectively show the
4539 definition line ('prototype' in C), source code and full python
4544 definition line ('prototype' in C), source code and full python
4540 file for any callable object. The object inspector oinfo uses
4545 file for any callable object. The object inspector oinfo uses
4541 these to show the same information.
4546 these to show the same information.
4542
4547
4543 * Version 0.1.7 released, 0.1.8 opened for further work.
4548 * Version 0.1.7 released, 0.1.8 opened for further work.
4544
4549
4545 * Separated all the magic functions into a class called Magic. The
4550 * Separated all the magic functions into a class called Magic. The
4546 InteractiveShell class was becoming too big for Xemacs to handle
4551 InteractiveShell class was becoming too big for Xemacs to handle
4547 (de-indenting a line would lock it up for 10 seconds while it
4552 (de-indenting a line would lock it up for 10 seconds while it
4548 backtracked on the whole class!)
4553 backtracked on the whole class!)
4549
4554
4550 FIXME: didn't work. It can be done, but right now namespaces are
4555 FIXME: didn't work. It can be done, but right now namespaces are
4551 all messed up. Do it later (reverted it for now, so at least
4556 all messed up. Do it later (reverted it for now, so at least
4552 everything works as before).
4557 everything works as before).
4553
4558
4554 * Got the object introspection system (magic_oinfo) working! I
4559 * Got the object introspection system (magic_oinfo) working! I
4555 think this is pretty much ready for release to Janko, so he can
4560 think this is pretty much ready for release to Janko, so he can
4556 test it for a while and then announce it. Pretty much 100% of what
4561 test it for a while and then announce it. Pretty much 100% of what
4557 I wanted for the 'phase 1' release is ready. Happy, tired.
4562 I wanted for the 'phase 1' release is ready. Happy, tired.
4558
4563
4559 2001-11-12 Fernando Perez <fperez@colorado.edu>
4564 2001-11-12 Fernando Perez <fperez@colorado.edu>
4560
4565
4561 * Version 0.1.6 released, 0.1.7 opened for further work.
4566 * Version 0.1.6 released, 0.1.7 opened for further work.
4562
4567
4563 * Fixed bug in printing: it used to test for truth before
4568 * Fixed bug in printing: it used to test for truth before
4564 printing, so 0 wouldn't print. Now checks for None.
4569 printing, so 0 wouldn't print. Now checks for None.
4565
4570
4566 * Fixed bug where auto-execs increase the prompt counter by 2 (b/c
4571 * Fixed bug where auto-execs increase the prompt counter by 2 (b/c
4567 they have to call len(str(sys.ps1)) ). But the fix is ugly, it
4572 they have to call len(str(sys.ps1)) ). But the fix is ugly, it
4568 reaches by hand into the outputcache. Think of a better way to do
4573 reaches by hand into the outputcache. Think of a better way to do
4569 this later.
4574 this later.
4570
4575
4571 * Various small fixes thanks to Nathan's comments.
4576 * Various small fixes thanks to Nathan's comments.
4572
4577
4573 * Changed magic_pprint to magic_Pprint. This way it doesn't
4578 * Changed magic_pprint to magic_Pprint. This way it doesn't
4574 collide with pprint() and the name is consistent with the command
4579 collide with pprint() and the name is consistent with the command
4575 line option.
4580 line option.
4576
4581
4577 * Changed prompt counter behavior to be fully like
4582 * Changed prompt counter behavior to be fully like
4578 Mathematica's. That is, even input that doesn't return a result
4583 Mathematica's. That is, even input that doesn't return a result
4579 raises the prompt counter. The old behavior was kind of confusing
4584 raises the prompt counter. The old behavior was kind of confusing
4580 (getting the same prompt number several times if the operation
4585 (getting the same prompt number several times if the operation
4581 didn't return a result).
4586 didn't return a result).
4582
4587
4583 * Fixed Nathan's last name in a couple of places (Gray, not Graham).
4588 * Fixed Nathan's last name in a couple of places (Gray, not Graham).
4584
4589
4585 * Fixed -Classic mode (wasn't working anymore).
4590 * Fixed -Classic mode (wasn't working anymore).
4586
4591
4587 * Added colored prompts using Nathan's new code. Colors are
4592 * Added colored prompts using Nathan's new code. Colors are
4588 currently hardwired, they can be user-configurable. For
4593 currently hardwired, they can be user-configurable. For
4589 developers, they can be chosen in file ipythonlib.py, at the
4594 developers, they can be chosen in file ipythonlib.py, at the
4590 beginning of the CachedOutput class def.
4595 beginning of the CachedOutput class def.
4591
4596
4592 2001-11-11 Fernando Perez <fperez@colorado.edu>
4597 2001-11-11 Fernando Perez <fperez@colorado.edu>
4593
4598
4594 * Version 0.1.5 released, 0.1.6 opened for further work.
4599 * Version 0.1.5 released, 0.1.6 opened for further work.
4595
4600
4596 * Changed magic_env to *return* the environment as a dict (not to
4601 * Changed magic_env to *return* the environment as a dict (not to
4597 print it). This way it prints, but it can also be processed.
4602 print it). This way it prints, but it can also be processed.
4598
4603
4599 * Added Verbose exception reporting to interactive
4604 * Added Verbose exception reporting to interactive
4600 exceptions. Very nice, now even 1/0 at the prompt gives a verbose
4605 exceptions. Very nice, now even 1/0 at the prompt gives a verbose
4601 traceback. Had to make some changes to the ultraTB file. This is
4606 traceback. Had to make some changes to the ultraTB file. This is
4602 probably the last 'big' thing in my mental todo list. This ties
4607 probably the last 'big' thing in my mental todo list. This ties
4603 in with the next entry:
4608 in with the next entry:
4604
4609
4605 * Changed -Xi and -Xf to a single -xmode option. Now all the user
4610 * Changed -Xi and -Xf to a single -xmode option. Now all the user
4606 has to specify is Plain, Color or Verbose for all exception
4611 has to specify is Plain, Color or Verbose for all exception
4607 handling.
4612 handling.
4608
4613
4609 * Removed ShellServices option. All this can really be done via
4614 * Removed ShellServices option. All this can really be done via
4610 the magic system. It's easier to extend, cleaner and has automatic
4615 the magic system. It's easier to extend, cleaner and has automatic
4611 namespace protection and documentation.
4616 namespace protection and documentation.
4612
4617
4613 2001-11-09 Fernando Perez <fperez@colorado.edu>
4618 2001-11-09 Fernando Perez <fperez@colorado.edu>
4614
4619
4615 * Fixed bug in output cache flushing (missing parameter to
4620 * Fixed bug in output cache flushing (missing parameter to
4616 __init__). Other small bugs fixed (found using pychecker).
4621 __init__). Other small bugs fixed (found using pychecker).
4617
4622
4618 * Version 0.1.4 opened for bugfixing.
4623 * Version 0.1.4 opened for bugfixing.
4619
4624
4620 2001-11-07 Fernando Perez <fperez@colorado.edu>
4625 2001-11-07 Fernando Perez <fperez@colorado.edu>
4621
4626
4622 * Version 0.1.3 released, mainly because of the raw_input bug.
4627 * Version 0.1.3 released, mainly because of the raw_input bug.
4623
4628
4624 * Fixed NASTY bug in raw_input: input line wasn't properly parsed
4629 * Fixed NASTY bug in raw_input: input line wasn't properly parsed
4625 and when testing for whether things were callable, a call could
4630 and when testing for whether things were callable, a call could
4626 actually be made to certain functions. They would get called again
4631 actually be made to certain functions. They would get called again
4627 once 'really' executed, with a resulting double call. A disaster
4632 once 'really' executed, with a resulting double call. A disaster
4628 in many cases (list.reverse() would never work!).
4633 in many cases (list.reverse() would never work!).
4629
4634
4630 * Removed prefilter() function, moved its code to raw_input (which
4635 * Removed prefilter() function, moved its code to raw_input (which
4631 after all was just a near-empty caller for prefilter). This saves
4636 after all was just a near-empty caller for prefilter). This saves
4632 a function call on every prompt, and simplifies the class a tiny bit.
4637 a function call on every prompt, and simplifies the class a tiny bit.
4633
4638
4634 * Fix _ip to __ip name in magic example file.
4639 * Fix _ip to __ip name in magic example file.
4635
4640
4636 * Changed 'tar -x -f' to 'tar xvf' in auto-installer. This should
4641 * Changed 'tar -x -f' to 'tar xvf' in auto-installer. This should
4637 work with non-gnu versions of tar.
4642 work with non-gnu versions of tar.
4638
4643
4639 2001-11-06 Fernando Perez <fperez@colorado.edu>
4644 2001-11-06 Fernando Perez <fperez@colorado.edu>
4640
4645
4641 * Version 0.1.2. Just to keep track of the recent changes.
4646 * Version 0.1.2. Just to keep track of the recent changes.
4642
4647
4643 * Fixed nasty bug in output prompt routine. It used to check 'if
4648 * Fixed nasty bug in output prompt routine. It used to check 'if
4644 arg != None...'. Problem is, this fails if arg implements a
4649 arg != None...'. Problem is, this fails if arg implements a
4645 special comparison (__cmp__) which disallows comparing to
4650 special comparison (__cmp__) which disallows comparing to
4646 None. Found it when trying to use the PhysicalQuantity module from
4651 None. Found it when trying to use the PhysicalQuantity module from
4647 ScientificPython.
4652 ScientificPython.
4648
4653
4649 2001-11-05 Fernando Perez <fperez@colorado.edu>
4654 2001-11-05 Fernando Perez <fperez@colorado.edu>
4650
4655
4651 * Also added dirs. Now the pushd/popd/dirs family functions
4656 * Also added dirs. Now the pushd/popd/dirs family functions
4652 basically like the shell, with the added convenience of going home
4657 basically like the shell, with the added convenience of going home
4653 when called with no args.
4658 when called with no args.
4654
4659
4655 * pushd/popd slightly modified to mimic shell behavior more
4660 * pushd/popd slightly modified to mimic shell behavior more
4656 closely.
4661 closely.
4657
4662
4658 * Added env,pushd,popd from ShellServices as magic functions. I
4663 * Added env,pushd,popd from ShellServices as magic functions. I
4659 think the cleanest will be to port all desired functions from
4664 think the cleanest will be to port all desired functions from
4660 ShellServices as magics and remove ShellServices altogether. This
4665 ShellServices as magics and remove ShellServices altogether. This
4661 will provide a single, clean way of adding functionality
4666 will provide a single, clean way of adding functionality
4662 (shell-type or otherwise) to IP.
4667 (shell-type or otherwise) to IP.
4663
4668
4664 2001-11-04 Fernando Perez <fperez@colorado.edu>
4669 2001-11-04 Fernando Perez <fperez@colorado.edu>
4665
4670
4666 * Added .ipython/ directory to sys.path. This way users can keep
4671 * Added .ipython/ directory to sys.path. This way users can keep
4667 customizations there and access them via import.
4672 customizations there and access them via import.
4668
4673
4669 2001-11-03 Fernando Perez <fperez@colorado.edu>
4674 2001-11-03 Fernando Perez <fperez@colorado.edu>
4670
4675
4671 * Opened version 0.1.1 for new changes.
4676 * Opened version 0.1.1 for new changes.
4672
4677
4673 * Changed version number to 0.1.0: first 'public' release, sent to
4678 * Changed version number to 0.1.0: first 'public' release, sent to
4674 Nathan and Janko.
4679 Nathan and Janko.
4675
4680
4676 * Lots of small fixes and tweaks.
4681 * Lots of small fixes and tweaks.
4677
4682
4678 * Minor changes to whos format. Now strings are shown, snipped if
4683 * Minor changes to whos format. Now strings are shown, snipped if
4679 too long.
4684 too long.
4680
4685
4681 * Changed ShellServices to work on __main__ so they show up in @who
4686 * Changed ShellServices to work on __main__ so they show up in @who
4682
4687
4683 * Help also works with ? at the end of a line:
4688 * Help also works with ? at the end of a line:
4684 ?sin and sin?
4689 ?sin and sin?
4685 both produce the same effect. This is nice, as often I use the
4690 both produce the same effect. This is nice, as often I use the
4686 tab-complete to find the name of a method, but I used to then have
4691 tab-complete to find the name of a method, but I used to then have
4687 to go to the beginning of the line to put a ? if I wanted more
4692 to go to the beginning of the line to put a ? if I wanted more
4688 info. Now I can just add the ? and hit return. Convenient.
4693 info. Now I can just add the ? and hit return. Convenient.
4689
4694
4690 2001-11-02 Fernando Perez <fperez@colorado.edu>
4695 2001-11-02 Fernando Perez <fperez@colorado.edu>
4691
4696
4692 * Python version check (>=2.1) added.
4697 * Python version check (>=2.1) added.
4693
4698
4694 * Added LazyPython documentation. At this point the docs are quite
4699 * Added LazyPython documentation. At this point the docs are quite
4695 a mess. A cleanup is in order.
4700 a mess. A cleanup is in order.
4696
4701
4697 * Auto-installer created. For some bizarre reason, the zipfiles
4702 * Auto-installer created. For some bizarre reason, the zipfiles
4698 module isn't working on my system. So I made a tar version
4703 module isn't working on my system. So I made a tar version
4699 (hopefully the command line options in various systems won't kill
4704 (hopefully the command line options in various systems won't kill
4700 me).
4705 me).
4701
4706
4702 * Fixes to Struct in genutils. Now all dictionary-like methods are
4707 * Fixes to Struct in genutils. Now all dictionary-like methods are
4703 protected (reasonably).
4708 protected (reasonably).
4704
4709
4705 * Added pager function to genutils and changed ? to print usage
4710 * Added pager function to genutils and changed ? to print usage
4706 note through it (it was too long).
4711 note through it (it was too long).
4707
4712
4708 * Added the LazyPython functionality. Works great! I changed the
4713 * Added the LazyPython functionality. Works great! I changed the
4709 auto-quote escape to ';', it's on home row and next to '. But
4714 auto-quote escape to ';', it's on home row and next to '. But
4710 both auto-quote and auto-paren (still /) escapes are command-line
4715 both auto-quote and auto-paren (still /) escapes are command-line
4711 parameters.
4716 parameters.
4712
4717
4713
4718
4714 2001-11-01 Fernando Perez <fperez@colorado.edu>
4719 2001-11-01 Fernando Perez <fperez@colorado.edu>
4715
4720
4716 * Version changed to 0.0.7. Fairly large change: configuration now
4721 * Version changed to 0.0.7. Fairly large change: configuration now
4717 is all stored in a directory, by default .ipython. There, all
4722 is all stored in a directory, by default .ipython. There, all
4718 config files have normal looking names (not .names)
4723 config files have normal looking names (not .names)
4719
4724
4720 * Version 0.0.6 Released first to Lucas and Archie as a test
4725 * Version 0.0.6 Released first to Lucas and Archie as a test
4721 run. Since it's the first 'semi-public' release, change version to
4726 run. Since it's the first 'semi-public' release, change version to
4722 > 0.0.6 for any changes now.
4727 > 0.0.6 for any changes now.
4723
4728
4724 * Stuff I had put in the ipplib.py changelog:
4729 * Stuff I had put in the ipplib.py changelog:
4725
4730
4726 Changes to InteractiveShell:
4731 Changes to InteractiveShell:
4727
4732
4728 - Made the usage message a parameter.
4733 - Made the usage message a parameter.
4729
4734
4730 - Require the name of the shell variable to be given. It's a bit
4735 - Require the name of the shell variable to be given. It's a bit
4731 of a hack, but allows the name 'shell' not to be hardwire in the
4736 of a hack, but allows the name 'shell' not to be hardwire in the
4732 magic (@) handler, which is problematic b/c it requires
4737 magic (@) handler, which is problematic b/c it requires
4733 polluting the global namespace with 'shell'. This in turn is
4738 polluting the global namespace with 'shell'. This in turn is
4734 fragile: if a user redefines a variable called shell, things
4739 fragile: if a user redefines a variable called shell, things
4735 break.
4740 break.
4736
4741
4737 - magic @: all functions available through @ need to be defined
4742 - magic @: all functions available through @ need to be defined
4738 as magic_<name>, even though they can be called simply as
4743 as magic_<name>, even though they can be called simply as
4739 @<name>. This allows the special command @magic to gather
4744 @<name>. This allows the special command @magic to gather
4740 information automatically about all existing magic functions,
4745 information automatically about all existing magic functions,
4741 even if they are run-time user extensions, by parsing the shell
4746 even if they are run-time user extensions, by parsing the shell
4742 instance __dict__ looking for special magic_ names.
4747 instance __dict__ looking for special magic_ names.
4743
4748
4744 - mainloop: added *two* local namespace parameters. This allows
4749 - mainloop: added *two* local namespace parameters. This allows
4745 the class to differentiate between parameters which were there
4750 the class to differentiate between parameters which were there
4746 before and after command line initialization was processed. This
4751 before and after command line initialization was processed. This
4747 way, later @who can show things loaded at startup by the
4752 way, later @who can show things loaded at startup by the
4748 user. This trick was necessary to make session saving/reloading
4753 user. This trick was necessary to make session saving/reloading
4749 really work: ideally after saving/exiting/reloading a session,
4754 really work: ideally after saving/exiting/reloading a session,
4750 *everythin* should look the same, including the output of @who. I
4755 *everythin* should look the same, including the output of @who. I
4751 was only able to make this work with this double namespace
4756 was only able to make this work with this double namespace
4752 trick.
4757 trick.
4753
4758
4754 - added a header to the logfile which allows (almost) full
4759 - added a header to the logfile which allows (almost) full
4755 session restoring.
4760 session restoring.
4756
4761
4757 - prepend lines beginning with @ or !, with a and log
4762 - prepend lines beginning with @ or !, with a and log
4758 them. Why? !lines: may be useful to know what you did @lines:
4763 them. Why? !lines: may be useful to know what you did @lines:
4759 they may affect session state. So when restoring a session, at
4764 they may affect session state. So when restoring a session, at
4760 least inform the user of their presence. I couldn't quite get
4765 least inform the user of their presence. I couldn't quite get
4761 them to properly re-execute, but at least the user is warned.
4766 them to properly re-execute, but at least the user is warned.
4762
4767
4763 * Started ChangeLog.
4768 * Started ChangeLog.
General Comments 0
You need to be logged in to leave comments. Login now