##// END OF EJS Templates
- Close %timeit bug reported by Stefan.
fptest -
Show More
@@ -1,2991 +1,3011 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 1787 2006-09-27 06:56:29Z fperez $"""
4 $Id: Magic.py 1815 2006-10-10 04:46:24Z fptest $"""
5
5
6 #*****************************************************************************
6 #*****************************************************************************
7 # Copyright (C) 2001 Janko Hauser <jhauser@zscout.de> and
7 # Copyright (C) 2001 Janko Hauser <jhauser@zscout.de> and
8 # Copyright (C) 2001-2006 Fernando Perez <fperez@colorado.edu>
8 # Copyright (C) 2001-2006 Fernando Perez <fperez@colorado.edu>
9 #
9 #
10 # Distributed under the terms of the BSD License. The full license is in
10 # Distributed under the terms of the BSD License. The full license is in
11 # the file COPYING, distributed as part of this software.
11 # the file COPYING, distributed as part of this software.
12 #*****************************************************************************
12 #*****************************************************************************
13
13
14 #****************************************************************************
14 #****************************************************************************
15 # Modules and globals
15 # Modules and globals
16
16
17 from IPython import Release
17 from IPython import Release
18 __author__ = '%s <%s>\n%s <%s>' % \
18 __author__ = '%s <%s>\n%s <%s>' % \
19 ( Release.authors['Janko'] + Release.authors['Fernando'] )
19 ( Release.authors['Janko'] + Release.authors['Fernando'] )
20 __license__ = Release.license
20 __license__ = Release.license
21
21
22 # Python standard modules
22 # Python standard modules
23 import __builtin__
23 import __builtin__
24 import bdb
24 import bdb
25 import inspect
25 import inspect
26 import os
26 import os
27 import pdb
27 import pdb
28 import pydoc
28 import pydoc
29 import shlex
29 import shlex
30 import sys
30 import sys
31 import re
31 import re
32 import tempfile
32 import tempfile
33 import time
33 import time
34 import cPickle as pickle
34 import cPickle as pickle
35 import textwrap
35 import textwrap
36 from cStringIO import StringIO
36 from cStringIO import StringIO
37 from getopt import getopt,GetoptError
37 from getopt import getopt,GetoptError
38 from pprint import pprint, pformat
38 from pprint import pprint, pformat
39
39
40 # profile isn't bundled by default in Debian for license reasons
40 # profile isn't bundled by default in Debian for license reasons
41 try:
41 try:
42 import profile,pstats
42 import profile,pstats
43 except ImportError:
43 except ImportError:
44 profile = pstats = None
44 profile = pstats = None
45
45
46 # Homebrewed
46 # Homebrewed
47 import IPython
47 import IPython
48 from IPython import Debugger, OInspect, wildcard
48 from IPython import Debugger, OInspect, wildcard
49 from IPython.FakeModule import FakeModule
49 from IPython.FakeModule import FakeModule
50 from IPython.Itpl import Itpl, itpl, printpl,itplns
50 from IPython.Itpl import Itpl, itpl, printpl,itplns
51 from IPython.PyColorize import Parser
51 from IPython.PyColorize import Parser
52 from IPython.ipstruct import Struct
52 from IPython.ipstruct import Struct
53 from IPython.macro import Macro
53 from IPython.macro import Macro
54 from IPython.genutils import *
54 from IPython.genutils import *
55 from IPython import platutils
55 from IPython import platutils
56
56
57 #***************************************************************************
57 #***************************************************************************
58 # Utility functions
58 # Utility functions
59 def on_off(tag):
59 def on_off(tag):
60 """Return an ON/OFF string for a 1/0 input. Simple utility function."""
60 """Return an ON/OFF string for a 1/0 input. Simple utility function."""
61 return ['OFF','ON'][tag]
61 return ['OFF','ON'][tag]
62
62
63 class Bunch: pass
63 class Bunch: pass
64
64
65 def arg_split(s,posix=True):
66 """Split a command line's arguments in a shell-like manner.
67
68 This is a modified version of the standard library's shlex.split()
69 function, but with a default of posix=False for splitting, so that quotes
70 in inputs are respected."""
71
72 lex = shlex.shlex(s, posix=posix)
73 lex.whitespace_split = True
74 return list(lex)
75
65 #***************************************************************************
76 #***************************************************************************
66 # Main class implementing Magic functionality
77 # Main class implementing Magic functionality
67 class Magic:
78 class Magic:
68 """Magic functions for InteractiveShell.
79 """Magic functions for InteractiveShell.
69
80
70 Shell functions which can be reached as %function_name. All magic
81 Shell functions which can be reached as %function_name. All magic
71 functions should accept a string, which they can parse for their own
82 functions should accept a string, which they can parse for their own
72 needs. This can make some functions easier to type, eg `%cd ../`
83 needs. This can make some functions easier to type, eg `%cd ../`
73 vs. `%cd("../")`
84 vs. `%cd("../")`
74
85
75 ALL definitions MUST begin with the prefix magic_. The user won't need it
86 ALL definitions MUST begin with the prefix magic_. The user won't need it
76 at the command line, but it is is needed in the definition. """
87 at the command line, but it is is needed in the definition. """
77
88
78 # class globals
89 # class globals
79 auto_status = ['Automagic is OFF, % prefix IS needed for magic functions.',
90 auto_status = ['Automagic is OFF, % prefix IS needed for magic functions.',
80 'Automagic is ON, % prefix NOT needed for magic functions.']
91 'Automagic is ON, % prefix NOT needed for magic functions.']
81
92
82 #......................................................................
93 #......................................................................
83 # some utility functions
94 # some utility functions
84
95
85 def __init__(self,shell):
96 def __init__(self,shell):
86
97
87 self.options_table = {}
98 self.options_table = {}
88 if profile is None:
99 if profile is None:
89 self.magic_prun = self.profile_missing_notice
100 self.magic_prun = self.profile_missing_notice
90 self.shell = shell
101 self.shell = shell
91
102
92 # namespace for holding state we may need
103 # namespace for holding state we may need
93 self._magic_state = Bunch()
104 self._magic_state = Bunch()
94
105
95 def profile_missing_notice(self, *args, **kwargs):
106 def profile_missing_notice(self, *args, **kwargs):
96 error("""\
107 error("""\
97 The profile module could not be found. If you are a Debian user,
108 The profile module could not be found. If you are a Debian user,
98 it has been removed from the standard Debian package because of its non-free
109 it has been removed from the standard Debian package because of its non-free
99 license. To use profiling, please install"python2.3-profiler" from non-free.""")
110 license. To use profiling, please install"python2.3-profiler" from non-free.""")
100
111
101 def default_option(self,fn,optstr):
112 def default_option(self,fn,optstr):
102 """Make an entry in the options_table for fn, with value optstr"""
113 """Make an entry in the options_table for fn, with value optstr"""
103
114
104 if fn not in self.lsmagic():
115 if fn not in self.lsmagic():
105 error("%s is not a magic function" % fn)
116 error("%s is not a magic function" % fn)
106 self.options_table[fn] = optstr
117 self.options_table[fn] = optstr
107
118
108 def lsmagic(self):
119 def lsmagic(self):
109 """Return a list of currently available magic functions.
120 """Return a list of currently available magic functions.
110
121
111 Gives a list of the bare names after mangling (['ls','cd', ...], not
122 Gives a list of the bare names after mangling (['ls','cd', ...], not
112 ['magic_ls','magic_cd',...]"""
123 ['magic_ls','magic_cd',...]"""
113
124
114 # FIXME. This needs a cleanup, in the way the magics list is built.
125 # FIXME. This needs a cleanup, in the way the magics list is built.
115
126
116 # magics in class definition
127 # magics in class definition
117 class_magic = lambda fn: fn.startswith('magic_') and \
128 class_magic = lambda fn: fn.startswith('magic_') and \
118 callable(Magic.__dict__[fn])
129 callable(Magic.__dict__[fn])
119 # in instance namespace (run-time user additions)
130 # in instance namespace (run-time user additions)
120 inst_magic = lambda fn: fn.startswith('magic_') and \
131 inst_magic = lambda fn: fn.startswith('magic_') and \
121 callable(self.__dict__[fn])
132 callable(self.__dict__[fn])
122 # and bound magics by user (so they can access self):
133 # and bound magics by user (so they can access self):
123 inst_bound_magic = lambda fn: fn.startswith('magic_') and \
134 inst_bound_magic = lambda fn: fn.startswith('magic_') and \
124 callable(self.__class__.__dict__[fn])
135 callable(self.__class__.__dict__[fn])
125 magics = filter(class_magic,Magic.__dict__.keys()) + \
136 magics = filter(class_magic,Magic.__dict__.keys()) + \
126 filter(inst_magic,self.__dict__.keys()) + \
137 filter(inst_magic,self.__dict__.keys()) + \
127 filter(inst_bound_magic,self.__class__.__dict__.keys())
138 filter(inst_bound_magic,self.__class__.__dict__.keys())
128 out = []
139 out = []
129 for fn in magics:
140 for fn in magics:
130 out.append(fn.replace('magic_','',1))
141 out.append(fn.replace('magic_','',1))
131 out.sort()
142 out.sort()
132 return out
143 return out
133
144
134 def extract_input_slices(self,slices,raw=False):
145 def extract_input_slices(self,slices,raw=False):
135 """Return as a string a set of input history slices.
146 """Return as a string a set of input history slices.
136
147
137 Inputs:
148 Inputs:
138
149
139 - slices: the set of slices is given as a list of strings (like
150 - slices: the set of slices is given as a list of strings (like
140 ['1','4:8','9'], since this function is for use by magic functions
151 ['1','4:8','9'], since this function is for use by magic functions
141 which get their arguments as strings.
152 which get their arguments as strings.
142
153
143 Optional inputs:
154 Optional inputs:
144
155
145 - raw(False): by default, the processed input is used. If this is
156 - raw(False): by default, the processed input is used. If this is
146 true, the raw input history is used instead.
157 true, the raw input history is used instead.
147
158
148 Note that slices can be called with two notations:
159 Note that slices can be called with two notations:
149
160
150 N:M -> standard python form, means including items N...(M-1).
161 N:M -> standard python form, means including items N...(M-1).
151
162
152 N-M -> include items N..M (closed endpoint)."""
163 N-M -> include items N..M (closed endpoint)."""
153
164
154 if raw:
165 if raw:
155 hist = self.shell.input_hist_raw
166 hist = self.shell.input_hist_raw
156 else:
167 else:
157 hist = self.shell.input_hist
168 hist = self.shell.input_hist
158
169
159 cmds = []
170 cmds = []
160 for chunk in slices:
171 for chunk in slices:
161 if ':' in chunk:
172 if ':' in chunk:
162 ini,fin = map(int,chunk.split(':'))
173 ini,fin = map(int,chunk.split(':'))
163 elif '-' in chunk:
174 elif '-' in chunk:
164 ini,fin = map(int,chunk.split('-'))
175 ini,fin = map(int,chunk.split('-'))
165 fin += 1
176 fin += 1
166 else:
177 else:
167 ini = int(chunk)
178 ini = int(chunk)
168 fin = ini+1
179 fin = ini+1
169 cmds.append(hist[ini:fin])
180 cmds.append(hist[ini:fin])
170 return cmds
181 return cmds
171
182
172 def _ofind(self,oname):
183 def _ofind(self,oname):
173 """Find an object in the available namespaces.
184 """Find an object in the available namespaces.
174
185
175 self._ofind(oname) -> dict with keys: found,obj,ospace,ismagic
186 self._ofind(oname) -> dict with keys: found,obj,ospace,ismagic
176
187
177 Has special code to detect magic functions.
188 Has special code to detect magic functions.
178 """
189 """
179
190
180 oname = oname.strip()
191 oname = oname.strip()
181
192
182 # Namespaces to search in:
193 # Namespaces to search in:
183 user_ns = self.shell.user_ns
194 user_ns = self.shell.user_ns
184 internal_ns = self.shell.internal_ns
195 internal_ns = self.shell.internal_ns
185 builtin_ns = __builtin__.__dict__
196 builtin_ns = __builtin__.__dict__
186 alias_ns = self.shell.alias_table
197 alias_ns = self.shell.alias_table
187
198
188 # Put them in a list. The order is important so that we find things in
199 # Put them in a list. The order is important so that we find things in
189 # the same order that Python finds them.
200 # the same order that Python finds them.
190 namespaces = [ ('Interactive',user_ns),
201 namespaces = [ ('Interactive',user_ns),
191 ('IPython internal',internal_ns),
202 ('IPython internal',internal_ns),
192 ('Python builtin',builtin_ns),
203 ('Python builtin',builtin_ns),
193 ('Alias',alias_ns),
204 ('Alias',alias_ns),
194 ]
205 ]
195
206
196 # initialize results to 'null'
207 # initialize results to 'null'
197 found = 0; obj = None; ospace = None; ds = None;
208 found = 0; obj = None; ospace = None; ds = None;
198 ismagic = 0; isalias = 0; parent = None
209 ismagic = 0; isalias = 0; parent = None
199
210
200 # Look for the given name by splitting it in parts. If the head is
211 # Look for the given name by splitting it in parts. If the head is
201 # found, then we look for all the remaining parts as members, and only
212 # found, then we look for all the remaining parts as members, and only
202 # declare success if we can find them all.
213 # declare success if we can find them all.
203 oname_parts = oname.split('.')
214 oname_parts = oname.split('.')
204 oname_head, oname_rest = oname_parts[0],oname_parts[1:]
215 oname_head, oname_rest = oname_parts[0],oname_parts[1:]
205 for nsname,ns in namespaces:
216 for nsname,ns in namespaces:
206 try:
217 try:
207 obj = ns[oname_head]
218 obj = ns[oname_head]
208 except KeyError:
219 except KeyError:
209 continue
220 continue
210 else:
221 else:
211 for part in oname_rest:
222 for part in oname_rest:
212 try:
223 try:
213 parent = obj
224 parent = obj
214 obj = getattr(obj,part)
225 obj = getattr(obj,part)
215 except:
226 except:
216 # Blanket except b/c some badly implemented objects
227 # Blanket except b/c some badly implemented objects
217 # allow __getattr__ to raise exceptions other than
228 # allow __getattr__ to raise exceptions other than
218 # AttributeError, which then crashes IPython.
229 # AttributeError, which then crashes IPython.
219 break
230 break
220 else:
231 else:
221 # If we finish the for loop (no break), we got all members
232 # If we finish the for loop (no break), we got all members
222 found = 1
233 found = 1
223 ospace = nsname
234 ospace = nsname
224 if ns == alias_ns:
235 if ns == alias_ns:
225 isalias = 1
236 isalias = 1
226 break # namespace loop
237 break # namespace loop
227
238
228 # Try to see if it's magic
239 # Try to see if it's magic
229 if not found:
240 if not found:
230 if oname.startswith(self.shell.ESC_MAGIC):
241 if oname.startswith(self.shell.ESC_MAGIC):
231 oname = oname[1:]
242 oname = oname[1:]
232 obj = getattr(self,'magic_'+oname,None)
243 obj = getattr(self,'magic_'+oname,None)
233 if obj is not None:
244 if obj is not None:
234 found = 1
245 found = 1
235 ospace = 'IPython internal'
246 ospace = 'IPython internal'
236 ismagic = 1
247 ismagic = 1
237
248
238 # Last try: special-case some literals like '', [], {}, etc:
249 # Last try: special-case some literals like '', [], {}, etc:
239 if not found and oname_head in ["''",'""','[]','{}','()']:
250 if not found and oname_head in ["''",'""','[]','{}','()']:
240 obj = eval(oname_head)
251 obj = eval(oname_head)
241 found = 1
252 found = 1
242 ospace = 'Interactive'
253 ospace = 'Interactive'
243
254
244 return {'found':found, 'obj':obj, 'namespace':ospace,
255 return {'found':found, 'obj':obj, 'namespace':ospace,
245 'ismagic':ismagic, 'isalias':isalias, 'parent':parent}
256 'ismagic':ismagic, 'isalias':isalias, 'parent':parent}
246
257
247 def arg_err(self,func):
258 def arg_err(self,func):
248 """Print docstring if incorrect arguments were passed"""
259 """Print docstring if incorrect arguments were passed"""
249 print 'Error in arguments:'
260 print 'Error in arguments:'
250 print OInspect.getdoc(func)
261 print OInspect.getdoc(func)
251
262
252 def format_latex(self,strng):
263 def format_latex(self,strng):
253 """Format a string for latex inclusion."""
264 """Format a string for latex inclusion."""
254
265
255 # Characters that need to be escaped for latex:
266 # Characters that need to be escaped for latex:
256 escape_re = re.compile(r'(%|_|\$|#|&)',re.MULTILINE)
267 escape_re = re.compile(r'(%|_|\$|#|&)',re.MULTILINE)
257 # Magic command names as headers:
268 # Magic command names as headers:
258 cmd_name_re = re.compile(r'^(%s.*?):' % self.shell.ESC_MAGIC,
269 cmd_name_re = re.compile(r'^(%s.*?):' % self.shell.ESC_MAGIC,
259 re.MULTILINE)
270 re.MULTILINE)
260 # Magic commands
271 # Magic commands
261 cmd_re = re.compile(r'(?P<cmd>%s.+?\b)(?!\}\}:)' % self.shell.ESC_MAGIC,
272 cmd_re = re.compile(r'(?P<cmd>%s.+?\b)(?!\}\}:)' % self.shell.ESC_MAGIC,
262 re.MULTILINE)
273 re.MULTILINE)
263 # Paragraph continue
274 # Paragraph continue
264 par_re = re.compile(r'\\$',re.MULTILINE)
275 par_re = re.compile(r'\\$',re.MULTILINE)
265
276
266 # The "\n" symbol
277 # The "\n" symbol
267 newline_re = re.compile(r'\\n')
278 newline_re = re.compile(r'\\n')
268
279
269 # Now build the string for output:
280 # Now build the string for output:
270 #strng = cmd_name_re.sub(r'\n\\texttt{\\textsl{\\large \1}}:',strng)
281 #strng = cmd_name_re.sub(r'\n\\texttt{\\textsl{\\large \1}}:',strng)
271 strng = cmd_name_re.sub(r'\n\\bigskip\n\\texttt{\\textbf{ \1}}:',
282 strng = cmd_name_re.sub(r'\n\\bigskip\n\\texttt{\\textbf{ \1}}:',
272 strng)
283 strng)
273 strng = cmd_re.sub(r'\\texttt{\g<cmd>}',strng)
284 strng = cmd_re.sub(r'\\texttt{\g<cmd>}',strng)
274 strng = par_re.sub(r'\\\\',strng)
285 strng = par_re.sub(r'\\\\',strng)
275 strng = escape_re.sub(r'\\\1',strng)
286 strng = escape_re.sub(r'\\\1',strng)
276 strng = newline_re.sub(r'\\textbackslash{}n',strng)
287 strng = newline_re.sub(r'\\textbackslash{}n',strng)
277 return strng
288 return strng
278
289
279 def format_screen(self,strng):
290 def format_screen(self,strng):
280 """Format a string for screen printing.
291 """Format a string for screen printing.
281
292
282 This removes some latex-type format codes."""
293 This removes some latex-type format codes."""
283 # Paragraph continue
294 # Paragraph continue
284 par_re = re.compile(r'\\$',re.MULTILINE)
295 par_re = re.compile(r'\\$',re.MULTILINE)
285 strng = par_re.sub('',strng)
296 strng = par_re.sub('',strng)
286 return strng
297 return strng
287
298
288 def parse_options(self,arg_str,opt_str,*long_opts,**kw):
299 def parse_options(self,arg_str,opt_str,*long_opts,**kw):
289 """Parse options passed to an argument string.
300 """Parse options passed to an argument string.
290
301
291 The interface is similar to that of getopt(), but it returns back a
302 The interface is similar to that of getopt(), but it returns back a
292 Struct with the options as keys and the stripped argument string still
303 Struct with the options as keys and the stripped argument string still
293 as a string.
304 as a string.
294
305
295 arg_str is quoted as a true sys.argv vector by using shlex.split.
306 arg_str is quoted as a true sys.argv vector by using shlex.split.
296 This allows us to easily expand variables, glob files, quote
307 This allows us to easily expand variables, glob files, quote
297 arguments, etc.
308 arguments, etc.
298
309
299 Options:
310 Options:
300 -mode: default 'string'. If given as 'list', the argument string is
311 -mode: default 'string'. If given as 'list', the argument string is
301 returned as a list (split on whitespace) instead of a string.
312 returned as a list (split on whitespace) instead of a string.
302
313
303 -list_all: put all option values in lists. Normally only options
314 -list_all: put all option values in lists. Normally only options
304 appearing more than once are put in a list."""
315 appearing more than once are put in a list.
316
317 -posix (True): whether to split the input line in POSIX mode or not,
318 as per the conventions outlined in the shlex module from the
319 standard library."""
305
320
306 # inject default options at the beginning of the input line
321 # inject default options at the beginning of the input line
307 caller = sys._getframe(1).f_code.co_name.replace('magic_','')
322 caller = sys._getframe(1).f_code.co_name.replace('magic_','')
308 arg_str = '%s %s' % (self.options_table.get(caller,''),arg_str)
323 arg_str = '%s %s' % (self.options_table.get(caller,''),arg_str)
309
324
310 mode = kw.get('mode','string')
325 mode = kw.get('mode','string')
311 if mode not in ['string','list']:
326 if mode not in ['string','list']:
312 raise ValueError,'incorrect mode given: %s' % mode
327 raise ValueError,'incorrect mode given: %s' % mode
313 # Get options
328 # Get options
314 list_all = kw.get('list_all',0)
329 list_all = kw.get('list_all',0)
330 posix = kw.get('posix',True)
315
331
316 # Check if we have more than one argument to warrant extra processing:
332 # Check if we have more than one argument to warrant extra processing:
317 odict = {} # Dictionary with options
333 odict = {} # Dictionary with options
318 args = arg_str.split()
334 args = arg_str.split()
319 if len(args) >= 1:
335 if len(args) >= 1:
320 # If the list of inputs only has 0 or 1 thing in it, there's no
336 # If the list of inputs only has 0 or 1 thing in it, there's no
321 # need to look for options
337 # need to look for options
322 argv = shlex.split(arg_str)
338 argv = arg_split(arg_str,posix)
323 # Do regular option processing
339 # Do regular option processing
324 try:
340 try:
325 opts,args = getopt(argv,opt_str,*long_opts)
341 opts,args = getopt(argv,opt_str,*long_opts)
326 except GetoptError,e:
342 except GetoptError,e:
327 raise GetoptError('%s ( allowed: "%s" %s)' % (e.msg,opt_str,
343 raise GetoptError('%s ( allowed: "%s" %s)' % (e.msg,opt_str,
328 " ".join(long_opts)))
344 " ".join(long_opts)))
329 for o,a in opts:
345 for o,a in opts:
330 if o.startswith('--'):
346 if o.startswith('--'):
331 o = o[2:]
347 o = o[2:]
332 else:
348 else:
333 o = o[1:]
349 o = o[1:]
334 try:
350 try:
335 odict[o].append(a)
351 odict[o].append(a)
336 except AttributeError:
352 except AttributeError:
337 odict[o] = [odict[o],a]
353 odict[o] = [odict[o],a]
338 except KeyError:
354 except KeyError:
339 if list_all:
355 if list_all:
340 odict[o] = [a]
356 odict[o] = [a]
341 else:
357 else:
342 odict[o] = a
358 odict[o] = a
343
359
344 # Prepare opts,args for return
360 # Prepare opts,args for return
345 opts = Struct(odict)
361 opts = Struct(odict)
346 if mode == 'string':
362 if mode == 'string':
347 args = ' '.join(args)
363 args = ' '.join(args)
348
364
349 return opts,args
365 return opts,args
350
366
351 #......................................................................
367 #......................................................................
352 # And now the actual magic functions
368 # And now the actual magic functions
353
369
354 # Functions for IPython shell work (vars,funcs, config, etc)
370 # Functions for IPython shell work (vars,funcs, config, etc)
355 def magic_lsmagic(self, parameter_s = ''):
371 def magic_lsmagic(self, parameter_s = ''):
356 """List currently available magic functions."""
372 """List currently available magic functions."""
357 mesc = self.shell.ESC_MAGIC
373 mesc = self.shell.ESC_MAGIC
358 print 'Available magic functions:\n'+mesc+\
374 print 'Available magic functions:\n'+mesc+\
359 (' '+mesc).join(self.lsmagic())
375 (' '+mesc).join(self.lsmagic())
360 print '\n' + Magic.auto_status[self.shell.rc.automagic]
376 print '\n' + Magic.auto_status[self.shell.rc.automagic]
361 return None
377 return None
362
378
363 def magic_magic(self, parameter_s = ''):
379 def magic_magic(self, parameter_s = ''):
364 """Print information about the magic function system."""
380 """Print information about the magic function system."""
365
381
366 mode = ''
382 mode = ''
367 try:
383 try:
368 if parameter_s.split()[0] == '-latex':
384 if parameter_s.split()[0] == '-latex':
369 mode = 'latex'
385 mode = 'latex'
370 if parameter_s.split()[0] == '-brief':
386 if parameter_s.split()[0] == '-brief':
371 mode = 'brief'
387 mode = 'brief'
372 except:
388 except:
373 pass
389 pass
374
390
375 magic_docs = []
391 magic_docs = []
376 for fname in self.lsmagic():
392 for fname in self.lsmagic():
377 mname = 'magic_' + fname
393 mname = 'magic_' + fname
378 for space in (Magic,self,self.__class__):
394 for space in (Magic,self,self.__class__):
379 try:
395 try:
380 fn = space.__dict__[mname]
396 fn = space.__dict__[mname]
381 except KeyError:
397 except KeyError:
382 pass
398 pass
383 else:
399 else:
384 break
400 break
385 if mode == 'brief':
401 if mode == 'brief':
386 # only first line
402 # only first line
387 fndoc = fn.__doc__.split('\n',1)[0]
403 fndoc = fn.__doc__.split('\n',1)[0]
388 else:
404 else:
389 fndoc = fn.__doc__
405 fndoc = fn.__doc__
390
406
391 magic_docs.append('%s%s:\n\t%s\n' %(self.shell.ESC_MAGIC,
407 magic_docs.append('%s%s:\n\t%s\n' %(self.shell.ESC_MAGIC,
392 fname,fndoc))
408 fname,fndoc))
393 magic_docs = ''.join(magic_docs)
409 magic_docs = ''.join(magic_docs)
394
410
395 if mode == 'latex':
411 if mode == 'latex':
396 print self.format_latex(magic_docs)
412 print self.format_latex(magic_docs)
397 return
413 return
398 else:
414 else:
399 magic_docs = self.format_screen(magic_docs)
415 magic_docs = self.format_screen(magic_docs)
400 if mode == 'brief':
416 if mode == 'brief':
401 return magic_docs
417 return magic_docs
402
418
403 outmsg = """
419 outmsg = """
404 IPython's 'magic' functions
420 IPython's 'magic' functions
405 ===========================
421 ===========================
406
422
407 The magic function system provides a series of functions which allow you to
423 The magic function system provides a series of functions which allow you to
408 control the behavior of IPython itself, plus a lot of system-type
424 control the behavior of IPython itself, plus a lot of system-type
409 features. All these functions are prefixed with a % character, but parameters
425 features. All these functions are prefixed with a % character, but parameters
410 are given without parentheses or quotes.
426 are given without parentheses or quotes.
411
427
412 NOTE: If you have 'automagic' enabled (via the command line option or with the
428 NOTE: If you have 'automagic' enabled (via the command line option or with the
413 %automagic function), you don't need to type in the % explicitly. By default,
429 %automagic function), you don't need to type in the % explicitly. By default,
414 IPython ships with automagic on, so you should only rarely need the % escape.
430 IPython ships with automagic on, so you should only rarely need the % escape.
415
431
416 Example: typing '%cd mydir' (without the quotes) changes you working directory
432 Example: typing '%cd mydir' (without the quotes) changes you working directory
417 to 'mydir', if it exists.
433 to 'mydir', if it exists.
418
434
419 You can define your own magic functions to extend the system. See the supplied
435 You can define your own magic functions to extend the system. See the supplied
420 ipythonrc and example-magic.py files for details (in your ipython
436 ipythonrc and example-magic.py files for details (in your ipython
421 configuration directory, typically $HOME/.ipython/).
437 configuration directory, typically $HOME/.ipython/).
422
438
423 You can also define your own aliased names for magic functions. In your
439 You can also define your own aliased names for magic functions. In your
424 ipythonrc file, placing a line like:
440 ipythonrc file, placing a line like:
425
441
426 execute __IPYTHON__.magic_pf = __IPYTHON__.magic_profile
442 execute __IPYTHON__.magic_pf = __IPYTHON__.magic_profile
427
443
428 will define %pf as a new name for %profile.
444 will define %pf as a new name for %profile.
429
445
430 You can also call magics in code using the ipmagic() function, which IPython
446 You can also call magics in code using the ipmagic() function, which IPython
431 automatically adds to the builtin namespace. Type 'ipmagic?' for details.
447 automatically adds to the builtin namespace. Type 'ipmagic?' for details.
432
448
433 For a list of the available magic functions, use %lsmagic. For a description
449 For a list of the available magic functions, use %lsmagic. For a description
434 of any of them, type %magic_name?, e.g. '%cd?'.
450 of any of them, type %magic_name?, e.g. '%cd?'.
435
451
436 Currently the magic system has the following functions:\n"""
452 Currently the magic system has the following functions:\n"""
437
453
438 mesc = self.shell.ESC_MAGIC
454 mesc = self.shell.ESC_MAGIC
439 outmsg = ("%s\n%s\n\nSummary of magic functions (from %slsmagic):"
455 outmsg = ("%s\n%s\n\nSummary of magic functions (from %slsmagic):"
440 "\n\n%s%s\n\n%s" % (outmsg,
456 "\n\n%s%s\n\n%s" % (outmsg,
441 magic_docs,mesc,mesc,
457 magic_docs,mesc,mesc,
442 (' '+mesc).join(self.lsmagic()),
458 (' '+mesc).join(self.lsmagic()),
443 Magic.auto_status[self.shell.rc.automagic] ) )
459 Magic.auto_status[self.shell.rc.automagic] ) )
444
460
445 page(outmsg,screen_lines=self.shell.rc.screen_length)
461 page(outmsg,screen_lines=self.shell.rc.screen_length)
446
462
447 def magic_automagic(self, parameter_s = ''):
463 def magic_automagic(self, parameter_s = ''):
448 """Make magic functions callable without having to type the initial %.
464 """Make magic functions callable without having to type the initial %.
449
465
450 Toggles on/off (when off, you must call it as %automagic, of
466 Toggles on/off (when off, you must call it as %automagic, of
451 course). Note that magic functions have lowest priority, so if there's
467 course). Note that magic functions have lowest priority, so if there's
452 a variable whose name collides with that of a magic fn, automagic
468 a variable whose name collides with that of a magic fn, automagic
453 won't work for that function (you get the variable instead). However,
469 won't work for that function (you get the variable instead). However,
454 if you delete the variable (del var), the previously shadowed magic
470 if you delete the variable (del var), the previously shadowed magic
455 function becomes visible to automagic again."""
471 function becomes visible to automagic again."""
456
472
457 rc = self.shell.rc
473 rc = self.shell.rc
458 rc.automagic = not rc.automagic
474 rc.automagic = not rc.automagic
459 print '\n' + Magic.auto_status[rc.automagic]
475 print '\n' + Magic.auto_status[rc.automagic]
460
476
461 def magic_autocall(self, parameter_s = ''):
477 def magic_autocall(self, parameter_s = ''):
462 """Make functions callable without having to type parentheses.
478 """Make functions callable without having to type parentheses.
463
479
464 Usage:
480 Usage:
465
481
466 %autocall [mode]
482 %autocall [mode]
467
483
468 The mode can be one of: 0->Off, 1->Smart, 2->Full. If not given, the
484 The mode can be one of: 0->Off, 1->Smart, 2->Full. If not given, the
469 value is toggled on and off (remembering the previous state)."""
485 value is toggled on and off (remembering the previous state)."""
470
486
471 rc = self.shell.rc
487 rc = self.shell.rc
472
488
473 if parameter_s:
489 if parameter_s:
474 arg = int(parameter_s)
490 arg = int(parameter_s)
475 else:
491 else:
476 arg = 'toggle'
492 arg = 'toggle'
477
493
478 if not arg in (0,1,2,'toggle'):
494 if not arg in (0,1,2,'toggle'):
479 error('Valid modes: (0->Off, 1->Smart, 2->Full')
495 error('Valid modes: (0->Off, 1->Smart, 2->Full')
480 return
496 return
481
497
482 if arg in (0,1,2):
498 if arg in (0,1,2):
483 rc.autocall = arg
499 rc.autocall = arg
484 else: # toggle
500 else: # toggle
485 if rc.autocall:
501 if rc.autocall:
486 self._magic_state.autocall_save = rc.autocall
502 self._magic_state.autocall_save = rc.autocall
487 rc.autocall = 0
503 rc.autocall = 0
488 else:
504 else:
489 try:
505 try:
490 rc.autocall = self._magic_state.autocall_save
506 rc.autocall = self._magic_state.autocall_save
491 except AttributeError:
507 except AttributeError:
492 rc.autocall = self._magic_state.autocall_save = 1
508 rc.autocall = self._magic_state.autocall_save = 1
493
509
494 print "Automatic calling is:",['OFF','Smart','Full'][rc.autocall]
510 print "Automatic calling is:",['OFF','Smart','Full'][rc.autocall]
495
511
496 def magic_autoindent(self, parameter_s = ''):
512 def magic_autoindent(self, parameter_s = ''):
497 """Toggle autoindent on/off (if available)."""
513 """Toggle autoindent on/off (if available)."""
498
514
499 self.shell.set_autoindent()
515 self.shell.set_autoindent()
500 print "Automatic indentation is:",['OFF','ON'][self.shell.autoindent]
516 print "Automatic indentation is:",['OFF','ON'][self.shell.autoindent]
501
517
502 def magic_system_verbose(self, parameter_s = ''):
518 def magic_system_verbose(self, parameter_s = ''):
503 """Toggle verbose printing of system calls on/off."""
519 """Toggle verbose printing of system calls on/off."""
504
520
505 self.shell.rc_set_toggle('system_verbose')
521 self.shell.rc_set_toggle('system_verbose')
506 print "System verbose printing is:",\
522 print "System verbose printing is:",\
507 ['OFF','ON'][self.shell.rc.system_verbose]
523 ['OFF','ON'][self.shell.rc.system_verbose]
508
524
509 def magic_history(self, parameter_s = ''):
525 def magic_history(self, parameter_s = ''):
510 """Print input history (_i<n> variables), with most recent last.
526 """Print input history (_i<n> variables), with most recent last.
511
527
512 %history -> print at most 40 inputs (some may be multi-line)\\
528 %history -> print at most 40 inputs (some may be multi-line)\\
513 %history n -> print at most n inputs\\
529 %history n -> print at most n inputs\\
514 %history n1 n2 -> print inputs between n1 and n2 (n2 not included)\\
530 %history n1 n2 -> print inputs between n1 and n2 (n2 not included)\\
515
531
516 Each input's number <n> is shown, and is accessible as the
532 Each input's number <n> is shown, and is accessible as the
517 automatically generated variable _i<n>. Multi-line statements are
533 automatically generated variable _i<n>. Multi-line statements are
518 printed starting at a new line for easy copy/paste.
534 printed starting at a new line for easy copy/paste.
519
535
520
536
521 Options:
537 Options:
522
538
523 -n: do NOT print line numbers. This is useful if you want to get a
539 -n: do NOT print line numbers. This is useful if you want to get a
524 printout of many lines which can be directly pasted into a text
540 printout of many lines which can be directly pasted into a text
525 editor.
541 editor.
526
542
527 This feature is only available if numbered prompts are in use.
543 This feature is only available if numbered prompts are in use.
528
544
529 -r: print the 'raw' history. IPython filters your input and
545 -r: print the 'raw' history. IPython filters your input and
530 converts it all into valid Python source before executing it (things
546 converts it all into valid Python source before executing it (things
531 like magics or aliases are turned into function calls, for
547 like magics or aliases are turned into function calls, for
532 example). With this option, you'll see the unfiltered history
548 example). With this option, you'll see the unfiltered history
533 instead of the filtered version: '%cd /' will be seen as '%cd /'
549 instead of the filtered version: '%cd /' will be seen as '%cd /'
534 instead of '_ip.magic("%cd /")'.
550 instead of '_ip.magic("%cd /")'.
535 """
551 """
536
552
537 shell = self.shell
553 shell = self.shell
538 if not shell.outputcache.do_full_cache:
554 if not shell.outputcache.do_full_cache:
539 print 'This feature is only available if numbered prompts are in use.'
555 print 'This feature is only available if numbered prompts are in use.'
540 return
556 return
541 opts,args = self.parse_options(parameter_s,'nr',mode='list')
557 opts,args = self.parse_options(parameter_s,'nr',mode='list')
542
558
543 if opts.has_key('r'):
559 if opts.has_key('r'):
544 input_hist = shell.input_hist_raw
560 input_hist = shell.input_hist_raw
545 else:
561 else:
546 input_hist = shell.input_hist
562 input_hist = shell.input_hist
547
563
548 default_length = 40
564 default_length = 40
549 if len(args) == 0:
565 if len(args) == 0:
550 final = len(input_hist)
566 final = len(input_hist)
551 init = max(1,final-default_length)
567 init = max(1,final-default_length)
552 elif len(args) == 1:
568 elif len(args) == 1:
553 final = len(input_hist)
569 final = len(input_hist)
554 init = max(1,final-int(args[0]))
570 init = max(1,final-int(args[0]))
555 elif len(args) == 2:
571 elif len(args) == 2:
556 init,final = map(int,args)
572 init,final = map(int,args)
557 else:
573 else:
558 warn('%hist takes 0, 1 or 2 arguments separated by spaces.')
574 warn('%hist takes 0, 1 or 2 arguments separated by spaces.')
559 print self.magic_hist.__doc__
575 print self.magic_hist.__doc__
560 return
576 return
561 width = len(str(final))
577 width = len(str(final))
562 line_sep = ['','\n']
578 line_sep = ['','\n']
563 print_nums = not opts.has_key('n')
579 print_nums = not opts.has_key('n')
564 for in_num in range(init,final):
580 for in_num in range(init,final):
565 inline = input_hist[in_num]
581 inline = input_hist[in_num]
566 multiline = int(inline.count('\n') > 1)
582 multiline = int(inline.count('\n') > 1)
567 if print_nums:
583 if print_nums:
568 print '%s:%s' % (str(in_num).ljust(width),line_sep[multiline]),
584 print '%s:%s' % (str(in_num).ljust(width),line_sep[multiline]),
569 print inline,
585 print inline,
570
586
571 def magic_hist(self, parameter_s=''):
587 def magic_hist(self, parameter_s=''):
572 """Alternate name for %history."""
588 """Alternate name for %history."""
573 return self.magic_history(parameter_s)
589 return self.magic_history(parameter_s)
574
590
575 def magic_p(self, parameter_s=''):
591 def magic_p(self, parameter_s=''):
576 """Just a short alias for Python's 'print'."""
592 """Just a short alias for Python's 'print'."""
577 exec 'print ' + parameter_s in self.shell.user_ns
593 exec 'print ' + parameter_s in self.shell.user_ns
578
594
579 def magic_r(self, parameter_s=''):
595 def magic_r(self, parameter_s=''):
580 """Repeat previous input.
596 """Repeat previous input.
581
597
582 If given an argument, repeats the previous command which starts with
598 If given an argument, repeats the previous command which starts with
583 the same string, otherwise it just repeats the previous input.
599 the same string, otherwise it just repeats the previous input.
584
600
585 Shell escaped commands (with ! as first character) are not recognized
601 Shell escaped commands (with ! as first character) are not recognized
586 by this system, only pure python code and magic commands.
602 by this system, only pure python code and magic commands.
587 """
603 """
588
604
589 start = parameter_s.strip()
605 start = parameter_s.strip()
590 esc_magic = self.shell.ESC_MAGIC
606 esc_magic = self.shell.ESC_MAGIC
591 # Identify magic commands even if automagic is on (which means
607 # Identify magic commands even if automagic is on (which means
592 # the in-memory version is different from that typed by the user).
608 # the in-memory version is different from that typed by the user).
593 if self.shell.rc.automagic:
609 if self.shell.rc.automagic:
594 start_magic = esc_magic+start
610 start_magic = esc_magic+start
595 else:
611 else:
596 start_magic = start
612 start_magic = start
597 # Look through the input history in reverse
613 # Look through the input history in reverse
598 for n in range(len(self.shell.input_hist)-2,0,-1):
614 for n in range(len(self.shell.input_hist)-2,0,-1):
599 input = self.shell.input_hist[n]
615 input = self.shell.input_hist[n]
600 # skip plain 'r' lines so we don't recurse to infinity
616 # skip plain 'r' lines so we don't recurse to infinity
601 if input != '_ip.magic("r")\n' and \
617 if input != '_ip.magic("r")\n' and \
602 (input.startswith(start) or input.startswith(start_magic)):
618 (input.startswith(start) or input.startswith(start_magic)):
603 #print 'match',`input` # dbg
619 #print 'match',`input` # dbg
604 print 'Executing:',input,
620 print 'Executing:',input,
605 self.shell.runlines(input)
621 self.shell.runlines(input)
606 return
622 return
607 print 'No previous input matching `%s` found.' % start
623 print 'No previous input matching `%s` found.' % start
608
624
609 def magic_page(self, parameter_s=''):
625 def magic_page(self, parameter_s=''):
610 """Pretty print the object and display it through a pager.
626 """Pretty print the object and display it through a pager.
611
627
612 If no parameter is given, use _ (last output)."""
628 If no parameter is given, use _ (last output)."""
613 # After a function contributed by Olivier Aubert, slightly modified.
629 # After a function contributed by Olivier Aubert, slightly modified.
614
630
615 oname = parameter_s and parameter_s or '_'
631 oname = parameter_s and parameter_s or '_'
616 info = self._ofind(oname)
632 info = self._ofind(oname)
617 if info['found']:
633 if info['found']:
618 page(pformat(info['obj']))
634 page(pformat(info['obj']))
619 else:
635 else:
620 print 'Object `%s` not found' % oname
636 print 'Object `%s` not found' % oname
621
637
622 def magic_profile(self, parameter_s=''):
638 def magic_profile(self, parameter_s=''):
623 """Print your currently active IPyhton profile."""
639 """Print your currently active IPyhton profile."""
624 if self.shell.rc.profile:
640 if self.shell.rc.profile:
625 printpl('Current IPython profile: $self.shell.rc.profile.')
641 printpl('Current IPython profile: $self.shell.rc.profile.')
626 else:
642 else:
627 print 'No profile active.'
643 print 'No profile active.'
628
644
629 def _inspect(self,meth,oname,**kw):
645 def _inspect(self,meth,oname,**kw):
630 """Generic interface to the inspector system.
646 """Generic interface to the inspector system.
631
647
632 This function is meant to be called by pdef, pdoc & friends."""
648 This function is meant to be called by pdef, pdoc & friends."""
633
649
634 oname = oname.strip()
650 oname = oname.strip()
635 info = Struct(self._ofind(oname))
651 info = Struct(self._ofind(oname))
636
652
637 if info.found:
653 if info.found:
638 # Get the docstring of the class property if it exists.
654 # Get the docstring of the class property if it exists.
639 path = oname.split('.')
655 path = oname.split('.')
640 root = '.'.join(path[:-1])
656 root = '.'.join(path[:-1])
641 if info.parent is not None:
657 if info.parent is not None:
642 try:
658 try:
643 target = getattr(info.parent, '__class__')
659 target = getattr(info.parent, '__class__')
644 # The object belongs to a class instance.
660 # The object belongs to a class instance.
645 try:
661 try:
646 target = getattr(target, path[-1])
662 target = getattr(target, path[-1])
647 # The class defines the object.
663 # The class defines the object.
648 if isinstance(target, property):
664 if isinstance(target, property):
649 oname = root + '.__class__.' + path[-1]
665 oname = root + '.__class__.' + path[-1]
650 info = Struct(self._ofind(oname))
666 info = Struct(self._ofind(oname))
651 except AttributeError: pass
667 except AttributeError: pass
652 except AttributeError: pass
668 except AttributeError: pass
653
669
654 pmethod = getattr(self.shell.inspector,meth)
670 pmethod = getattr(self.shell.inspector,meth)
655 formatter = info.ismagic and self.format_screen or None
671 formatter = info.ismagic and self.format_screen or None
656 if meth == 'pdoc':
672 if meth == 'pdoc':
657 pmethod(info.obj,oname,formatter)
673 pmethod(info.obj,oname,formatter)
658 elif meth == 'pinfo':
674 elif meth == 'pinfo':
659 pmethod(info.obj,oname,formatter,info,**kw)
675 pmethod(info.obj,oname,formatter,info,**kw)
660 else:
676 else:
661 pmethod(info.obj,oname)
677 pmethod(info.obj,oname)
662 else:
678 else:
663 print 'Object `%s` not found.' % oname
679 print 'Object `%s` not found.' % oname
664 return 'not found' # so callers can take other action
680 return 'not found' # so callers can take other action
665
681
666 def magic_pdef(self, parameter_s=''):
682 def magic_pdef(self, parameter_s=''):
667 """Print the definition header for any callable object.
683 """Print the definition header for any callable object.
668
684
669 If the object is a class, print the constructor information."""
685 If the object is a class, print the constructor information."""
670 self._inspect('pdef',parameter_s)
686 self._inspect('pdef',parameter_s)
671
687
672 def magic_pdoc(self, parameter_s=''):
688 def magic_pdoc(self, parameter_s=''):
673 """Print the docstring for an object.
689 """Print the docstring for an object.
674
690
675 If the given object is a class, it will print both the class and the
691 If the given object is a class, it will print both the class and the
676 constructor docstrings."""
692 constructor docstrings."""
677 self._inspect('pdoc',parameter_s)
693 self._inspect('pdoc',parameter_s)
678
694
679 def magic_psource(self, parameter_s=''):
695 def magic_psource(self, parameter_s=''):
680 """Print (or run through pager) the source code for an object."""
696 """Print (or run through pager) the source code for an object."""
681 self._inspect('psource',parameter_s)
697 self._inspect('psource',parameter_s)
682
698
683 def magic_pfile(self, parameter_s=''):
699 def magic_pfile(self, parameter_s=''):
684 """Print (or run through pager) the file where an object is defined.
700 """Print (or run through pager) the file where an object is defined.
685
701
686 The file opens at the line where the object definition begins. IPython
702 The file opens at the line where the object definition begins. IPython
687 will honor the environment variable PAGER if set, and otherwise will
703 will honor the environment variable PAGER if set, and otherwise will
688 do its best to print the file in a convenient form.
704 do its best to print the file in a convenient form.
689
705
690 If the given argument is not an object currently defined, IPython will
706 If the given argument is not an object currently defined, IPython will
691 try to interpret it as a filename (automatically adding a .py extension
707 try to interpret it as a filename (automatically adding a .py extension
692 if needed). You can thus use %pfile as a syntax highlighting code
708 if needed). You can thus use %pfile as a syntax highlighting code
693 viewer."""
709 viewer."""
694
710
695 # first interpret argument as an object name
711 # first interpret argument as an object name
696 out = self._inspect('pfile',parameter_s)
712 out = self._inspect('pfile',parameter_s)
697 # if not, try the input as a filename
713 # if not, try the input as a filename
698 if out == 'not found':
714 if out == 'not found':
699 try:
715 try:
700 filename = get_py_filename(parameter_s)
716 filename = get_py_filename(parameter_s)
701 except IOError,msg:
717 except IOError,msg:
702 print msg
718 print msg
703 return
719 return
704 page(self.shell.inspector.format(file(filename).read()))
720 page(self.shell.inspector.format(file(filename).read()))
705
721
706 def magic_pinfo(self, parameter_s=''):
722 def magic_pinfo(self, parameter_s=''):
707 """Provide detailed information about an object.
723 """Provide detailed information about an object.
708
724
709 '%pinfo object' is just a synonym for object? or ?object."""
725 '%pinfo object' is just a synonym for object? or ?object."""
710
726
711 #print 'pinfo par: <%s>' % parameter_s # dbg
727 #print 'pinfo par: <%s>' % parameter_s # dbg
712
728
713 # detail_level: 0 -> obj? , 1 -> obj??
729 # detail_level: 0 -> obj? , 1 -> obj??
714 detail_level = 0
730 detail_level = 0
715 # We need to detect if we got called as 'pinfo pinfo foo', which can
731 # We need to detect if we got called as 'pinfo pinfo foo', which can
716 # happen if the user types 'pinfo foo?' at the cmd line.
732 # happen if the user types 'pinfo foo?' at the cmd line.
717 pinfo,qmark1,oname,qmark2 = \
733 pinfo,qmark1,oname,qmark2 = \
718 re.match('(pinfo )?(\?*)(.*?)(\??$)',parameter_s).groups()
734 re.match('(pinfo )?(\?*)(.*?)(\??$)',parameter_s).groups()
719 if pinfo or qmark1 or qmark2:
735 if pinfo or qmark1 or qmark2:
720 detail_level = 1
736 detail_level = 1
721 if "*" in oname:
737 if "*" in oname:
722 self.magic_psearch(oname)
738 self.magic_psearch(oname)
723 else:
739 else:
724 self._inspect('pinfo',oname,detail_level=detail_level)
740 self._inspect('pinfo',oname,detail_level=detail_level)
725
741
726 def magic_psearch(self, parameter_s=''):
742 def magic_psearch(self, parameter_s=''):
727 """Search for object in namespaces by wildcard.
743 """Search for object in namespaces by wildcard.
728
744
729 %psearch [options] PATTERN [OBJECT TYPE]
745 %psearch [options] PATTERN [OBJECT TYPE]
730
746
731 Note: ? can be used as a synonym for %psearch, at the beginning or at
747 Note: ? can be used as a synonym for %psearch, at the beginning or at
732 the end: both a*? and ?a* are equivalent to '%psearch a*'. Still, the
748 the end: both a*? and ?a* are equivalent to '%psearch a*'. Still, the
733 rest of the command line must be unchanged (options come first), so
749 rest of the command line must be unchanged (options come first), so
734 for example the following forms are equivalent
750 for example the following forms are equivalent
735
751
736 %psearch -i a* function
752 %psearch -i a* function
737 -i a* function?
753 -i a* function?
738 ?-i a* function
754 ?-i a* function
739
755
740 Arguments:
756 Arguments:
741
757
742 PATTERN
758 PATTERN
743
759
744 where PATTERN is a string containing * as a wildcard similar to its
760 where PATTERN is a string containing * as a wildcard similar to its
745 use in a shell. The pattern is matched in all namespaces on the
761 use in a shell. The pattern is matched in all namespaces on the
746 search path. By default objects starting with a single _ are not
762 search path. By default objects starting with a single _ are not
747 matched, many IPython generated objects have a single
763 matched, many IPython generated objects have a single
748 underscore. The default is case insensitive matching. Matching is
764 underscore. The default is case insensitive matching. Matching is
749 also done on the attributes of objects and not only on the objects
765 also done on the attributes of objects and not only on the objects
750 in a module.
766 in a module.
751
767
752 [OBJECT TYPE]
768 [OBJECT TYPE]
753
769
754 Is the name of a python type from the types module. The name is
770 Is the name of a python type from the types module. The name is
755 given in lowercase without the ending type, ex. StringType is
771 given in lowercase without the ending type, ex. StringType is
756 written string. By adding a type here only objects matching the
772 written string. By adding a type here only objects matching the
757 given type are matched. Using all here makes the pattern match all
773 given type are matched. Using all here makes the pattern match all
758 types (this is the default).
774 types (this is the default).
759
775
760 Options:
776 Options:
761
777
762 -a: makes the pattern match even objects whose names start with a
778 -a: makes the pattern match even objects whose names start with a
763 single underscore. These names are normally ommitted from the
779 single underscore. These names are normally ommitted from the
764 search.
780 search.
765
781
766 -i/-c: make the pattern case insensitive/sensitive. If neither of
782 -i/-c: make the pattern case insensitive/sensitive. If neither of
767 these options is given, the default is read from your ipythonrc
783 these options is given, the default is read from your ipythonrc
768 file. The option name which sets this value is
784 file. The option name which sets this value is
769 'wildcards_case_sensitive'. If this option is not specified in your
785 'wildcards_case_sensitive'. If this option is not specified in your
770 ipythonrc file, IPython's internal default is to do a case sensitive
786 ipythonrc file, IPython's internal default is to do a case sensitive
771 search.
787 search.
772
788
773 -e/-s NAMESPACE: exclude/search a given namespace. The pattern you
789 -e/-s NAMESPACE: exclude/search a given namespace. The pattern you
774 specifiy can be searched in any of the following namespaces:
790 specifiy can be searched in any of the following namespaces:
775 'builtin', 'user', 'user_global','internal', 'alias', where
791 'builtin', 'user', 'user_global','internal', 'alias', where
776 'builtin' and 'user' are the search defaults. Note that you should
792 'builtin' and 'user' are the search defaults. Note that you should
777 not use quotes when specifying namespaces.
793 not use quotes when specifying namespaces.
778
794
779 'Builtin' contains the python module builtin, 'user' contains all
795 'Builtin' contains the python module builtin, 'user' contains all
780 user data, 'alias' only contain the shell aliases and no python
796 user data, 'alias' only contain the shell aliases and no python
781 objects, 'internal' contains objects used by IPython. The
797 objects, 'internal' contains objects used by IPython. The
782 'user_global' namespace is only used by embedded IPython instances,
798 'user_global' namespace is only used by embedded IPython instances,
783 and it contains module-level globals. You can add namespaces to the
799 and it contains module-level globals. You can add namespaces to the
784 search with -s or exclude them with -e (these options can be given
800 search with -s or exclude them with -e (these options can be given
785 more than once).
801 more than once).
786
802
787 Examples:
803 Examples:
788
804
789 %psearch a* -> objects beginning with an a
805 %psearch a* -> objects beginning with an a
790 %psearch -e builtin a* -> objects NOT in the builtin space starting in a
806 %psearch -e builtin a* -> objects NOT in the builtin space starting in a
791 %psearch a* function -> all functions beginning with an a
807 %psearch a* function -> all functions beginning with an a
792 %psearch re.e* -> objects beginning with an e in module re
808 %psearch re.e* -> objects beginning with an e in module re
793 %psearch r*.e* -> objects that start with e in modules starting in r
809 %psearch r*.e* -> objects that start with e in modules starting in r
794 %psearch r*.* string -> all strings in modules beginning with r
810 %psearch r*.* string -> all strings in modules beginning with r
795
811
796 Case sensitve search:
812 Case sensitve search:
797
813
798 %psearch -c a* list all object beginning with lower case a
814 %psearch -c a* list all object beginning with lower case a
799
815
800 Show objects beginning with a single _:
816 Show objects beginning with a single _:
801
817
802 %psearch -a _* list objects beginning with a single underscore"""
818 %psearch -a _* list objects beginning with a single underscore"""
803
819
804 # default namespaces to be searched
820 # default namespaces to be searched
805 def_search = ['user','builtin']
821 def_search = ['user','builtin']
806
822
807 # Process options/args
823 # Process options/args
808 opts,args = self.parse_options(parameter_s,'cias:e:',list_all=True)
824 opts,args = self.parse_options(parameter_s,'cias:e:',list_all=True)
809 opt = opts.get
825 opt = opts.get
810 shell = self.shell
826 shell = self.shell
811 psearch = shell.inspector.psearch
827 psearch = shell.inspector.psearch
812
828
813 # select case options
829 # select case options
814 if opts.has_key('i'):
830 if opts.has_key('i'):
815 ignore_case = True
831 ignore_case = True
816 elif opts.has_key('c'):
832 elif opts.has_key('c'):
817 ignore_case = False
833 ignore_case = False
818 else:
834 else:
819 ignore_case = not shell.rc.wildcards_case_sensitive
835 ignore_case = not shell.rc.wildcards_case_sensitive
820
836
821 # Build list of namespaces to search from user options
837 # Build list of namespaces to search from user options
822 def_search.extend(opt('s',[]))
838 def_search.extend(opt('s',[]))
823 ns_exclude = ns_exclude=opt('e',[])
839 ns_exclude = ns_exclude=opt('e',[])
824 ns_search = [nm for nm in def_search if nm not in ns_exclude]
840 ns_search = [nm for nm in def_search if nm not in ns_exclude]
825
841
826 # Call the actual search
842 # Call the actual search
827 try:
843 try:
828 psearch(args,shell.ns_table,ns_search,
844 psearch(args,shell.ns_table,ns_search,
829 show_all=opt('a'),ignore_case=ignore_case)
845 show_all=opt('a'),ignore_case=ignore_case)
830 except:
846 except:
831 shell.showtraceback()
847 shell.showtraceback()
832
848
833 def magic_who_ls(self, parameter_s=''):
849 def magic_who_ls(self, parameter_s=''):
834 """Return a sorted list of all interactive variables.
850 """Return a sorted list of all interactive variables.
835
851
836 If arguments are given, only variables of types matching these
852 If arguments are given, only variables of types matching these
837 arguments are returned."""
853 arguments are returned."""
838
854
839 user_ns = self.shell.user_ns
855 user_ns = self.shell.user_ns
840 internal_ns = self.shell.internal_ns
856 internal_ns = self.shell.internal_ns
841 user_config_ns = self.shell.user_config_ns
857 user_config_ns = self.shell.user_config_ns
842 out = []
858 out = []
843 typelist = parameter_s.split()
859 typelist = parameter_s.split()
844
860
845 for i in user_ns:
861 for i in user_ns:
846 if not (i.startswith('_') or i.startswith('_i')) \
862 if not (i.startswith('_') or i.startswith('_i')) \
847 and not (i in internal_ns or i in user_config_ns):
863 and not (i in internal_ns or i in user_config_ns):
848 if typelist:
864 if typelist:
849 if type(user_ns[i]).__name__ in typelist:
865 if type(user_ns[i]).__name__ in typelist:
850 out.append(i)
866 out.append(i)
851 else:
867 else:
852 out.append(i)
868 out.append(i)
853 out.sort()
869 out.sort()
854 return out
870 return out
855
871
856 def magic_who(self, parameter_s=''):
872 def magic_who(self, parameter_s=''):
857 """Print all interactive variables, with some minimal formatting.
873 """Print all interactive variables, with some minimal formatting.
858
874
859 If any arguments are given, only variables whose type matches one of
875 If any arguments are given, only variables whose type matches one of
860 these are printed. For example:
876 these are printed. For example:
861
877
862 %who function str
878 %who function str
863
879
864 will only list functions and strings, excluding all other types of
880 will only list functions and strings, excluding all other types of
865 variables. To find the proper type names, simply use type(var) at a
881 variables. To find the proper type names, simply use type(var) at a
866 command line to see how python prints type names. For example:
882 command line to see how python prints type names. For example:
867
883
868 In [1]: type('hello')\\
884 In [1]: type('hello')\\
869 Out[1]: <type 'str'>
885 Out[1]: <type 'str'>
870
886
871 indicates that the type name for strings is 'str'.
887 indicates that the type name for strings is 'str'.
872
888
873 %who always excludes executed names loaded through your configuration
889 %who always excludes executed names loaded through your configuration
874 file and things which are internal to IPython.
890 file and things which are internal to IPython.
875
891
876 This is deliberate, as typically you may load many modules and the
892 This is deliberate, as typically you may load many modules and the
877 purpose of %who is to show you only what you've manually defined."""
893 purpose of %who is to show you only what you've manually defined."""
878
894
879 varlist = self.magic_who_ls(parameter_s)
895 varlist = self.magic_who_ls(parameter_s)
880 if not varlist:
896 if not varlist:
881 print 'Interactive namespace is empty.'
897 print 'Interactive namespace is empty.'
882 return
898 return
883
899
884 # if we have variables, move on...
900 # if we have variables, move on...
885
901
886 # stupid flushing problem: when prompts have no separators, stdout is
902 # stupid flushing problem: when prompts have no separators, stdout is
887 # getting lost. I'm starting to think this is a python bug. I'm having
903 # getting lost. I'm starting to think this is a python bug. I'm having
888 # to force a flush with a print because even a sys.stdout.flush
904 # to force a flush with a print because even a sys.stdout.flush
889 # doesn't seem to do anything!
905 # doesn't seem to do anything!
890
906
891 count = 0
907 count = 0
892 for i in varlist:
908 for i in varlist:
893 print i+'\t',
909 print i+'\t',
894 count += 1
910 count += 1
895 if count > 8:
911 if count > 8:
896 count = 0
912 count = 0
897 print
913 print
898 sys.stdout.flush() # FIXME. Why the hell isn't this flushing???
914 sys.stdout.flush() # FIXME. Why the hell isn't this flushing???
899
915
900 print # well, this does force a flush at the expense of an extra \n
916 print # well, this does force a flush at the expense of an extra \n
901
917
902 def magic_whos(self, parameter_s=''):
918 def magic_whos(self, parameter_s=''):
903 """Like %who, but gives some extra information about each variable.
919 """Like %who, but gives some extra information about each variable.
904
920
905 The same type filtering of %who can be applied here.
921 The same type filtering of %who can be applied here.
906
922
907 For all variables, the type is printed. Additionally it prints:
923 For all variables, the type is printed. Additionally it prints:
908
924
909 - For {},[],(): their length.
925 - For {},[],(): their length.
910
926
911 - For Numeric arrays, a summary with shape, number of elements,
927 - For Numeric arrays, a summary with shape, number of elements,
912 typecode and size in memory.
928 typecode and size in memory.
913
929
914 - Everything else: a string representation, snipping their middle if
930 - Everything else: a string representation, snipping their middle if
915 too long."""
931 too long."""
916
932
917 varnames = self.magic_who_ls(parameter_s)
933 varnames = self.magic_who_ls(parameter_s)
918 if not varnames:
934 if not varnames:
919 print 'Interactive namespace is empty.'
935 print 'Interactive namespace is empty.'
920 return
936 return
921
937
922 # if we have variables, move on...
938 # if we have variables, move on...
923
939
924 # for these types, show len() instead of data:
940 # for these types, show len() instead of data:
925 seq_types = [types.DictType,types.ListType,types.TupleType]
941 seq_types = [types.DictType,types.ListType,types.TupleType]
926
942
927 # for Numeric arrays, display summary info
943 # for Numeric arrays, display summary info
928 try:
944 try:
929 import Numeric
945 import Numeric
930 except ImportError:
946 except ImportError:
931 array_type = None
947 array_type = None
932 else:
948 else:
933 array_type = Numeric.ArrayType.__name__
949 array_type = Numeric.ArrayType.__name__
934
950
935 # Find all variable names and types so we can figure out column sizes
951 # Find all variable names and types so we can figure out column sizes
936 get_vars = lambda i: self.shell.user_ns[i]
952 get_vars = lambda i: self.shell.user_ns[i]
937 type_name = lambda v: type(v).__name__
953 type_name = lambda v: type(v).__name__
938 varlist = map(get_vars,varnames)
954 varlist = map(get_vars,varnames)
939
955
940 typelist = []
956 typelist = []
941 for vv in varlist:
957 for vv in varlist:
942 tt = type_name(vv)
958 tt = type_name(vv)
943 if tt=='instance':
959 if tt=='instance':
944 typelist.append(str(vv.__class__))
960 typelist.append(str(vv.__class__))
945 else:
961 else:
946 typelist.append(tt)
962 typelist.append(tt)
947
963
948 # column labels and # of spaces as separator
964 # column labels and # of spaces as separator
949 varlabel = 'Variable'
965 varlabel = 'Variable'
950 typelabel = 'Type'
966 typelabel = 'Type'
951 datalabel = 'Data/Info'
967 datalabel = 'Data/Info'
952 colsep = 3
968 colsep = 3
953 # variable format strings
969 # variable format strings
954 vformat = "$vname.ljust(varwidth)$vtype.ljust(typewidth)"
970 vformat = "$vname.ljust(varwidth)$vtype.ljust(typewidth)"
955 vfmt_short = '$vstr[:25]<...>$vstr[-25:]'
971 vfmt_short = '$vstr[:25]<...>$vstr[-25:]'
956 aformat = "%s: %s elems, type `%s`, %s bytes"
972 aformat = "%s: %s elems, type `%s`, %s bytes"
957 # find the size of the columns to format the output nicely
973 # find the size of the columns to format the output nicely
958 varwidth = max(max(map(len,varnames)), len(varlabel)) + colsep
974 varwidth = max(max(map(len,varnames)), len(varlabel)) + colsep
959 typewidth = max(max(map(len,typelist)), len(typelabel)) + colsep
975 typewidth = max(max(map(len,typelist)), len(typelabel)) + colsep
960 # table header
976 # table header
961 print varlabel.ljust(varwidth) + typelabel.ljust(typewidth) + \
977 print varlabel.ljust(varwidth) + typelabel.ljust(typewidth) + \
962 ' '+datalabel+'\n' + '-'*(varwidth+typewidth+len(datalabel)+1)
978 ' '+datalabel+'\n' + '-'*(varwidth+typewidth+len(datalabel)+1)
963 # and the table itself
979 # and the table itself
964 kb = 1024
980 kb = 1024
965 Mb = 1048576 # kb**2
981 Mb = 1048576 # kb**2
966 for vname,var,vtype in zip(varnames,varlist,typelist):
982 for vname,var,vtype in zip(varnames,varlist,typelist):
967 print itpl(vformat),
983 print itpl(vformat),
968 if vtype in seq_types:
984 if vtype in seq_types:
969 print len(var)
985 print len(var)
970 elif vtype==array_type:
986 elif vtype==array_type:
971 vshape = str(var.shape).replace(',','').replace(' ','x')[1:-1]
987 vshape = str(var.shape).replace(',','').replace(' ','x')[1:-1]
972 vsize = Numeric.size(var)
988 vsize = Numeric.size(var)
973 vbytes = vsize*var.itemsize()
989 vbytes = vsize*var.itemsize()
974 if vbytes < 100000:
990 if vbytes < 100000:
975 print aformat % (vshape,vsize,var.typecode(),vbytes)
991 print aformat % (vshape,vsize,var.typecode(),vbytes)
976 else:
992 else:
977 print aformat % (vshape,vsize,var.typecode(),vbytes),
993 print aformat % (vshape,vsize,var.typecode(),vbytes),
978 if vbytes < Mb:
994 if vbytes < Mb:
979 print '(%s kb)' % (vbytes/kb,)
995 print '(%s kb)' % (vbytes/kb,)
980 else:
996 else:
981 print '(%s Mb)' % (vbytes/Mb,)
997 print '(%s Mb)' % (vbytes/Mb,)
982 else:
998 else:
983 vstr = str(var).replace('\n','\\n')
999 vstr = str(var).replace('\n','\\n')
984 if len(vstr) < 50:
1000 if len(vstr) < 50:
985 print vstr
1001 print vstr
986 else:
1002 else:
987 printpl(vfmt_short)
1003 printpl(vfmt_short)
988
1004
989 def magic_reset(self, parameter_s=''):
1005 def magic_reset(self, parameter_s=''):
990 """Resets the namespace by removing all names defined by the user.
1006 """Resets the namespace by removing all names defined by the user.
991
1007
992 Input/Output history are left around in case you need them."""
1008 Input/Output history are left around in case you need them."""
993
1009
994 ans = self.shell.ask_yes_no(
1010 ans = self.shell.ask_yes_no(
995 "Once deleted, variables cannot be recovered. Proceed (y/[n])? ")
1011 "Once deleted, variables cannot be recovered. Proceed (y/[n])? ")
996 if not ans:
1012 if not ans:
997 print 'Nothing done.'
1013 print 'Nothing done.'
998 return
1014 return
999 user_ns = self.shell.user_ns
1015 user_ns = self.shell.user_ns
1000 for i in self.magic_who_ls():
1016 for i in self.magic_who_ls():
1001 del(user_ns[i])
1017 del(user_ns[i])
1002
1018
1003 def magic_config(self,parameter_s=''):
1019 def magic_config(self,parameter_s=''):
1004 """Show IPython's internal configuration."""
1020 """Show IPython's internal configuration."""
1005
1021
1006 page('Current configuration structure:\n'+
1022 page('Current configuration structure:\n'+
1007 pformat(self.shell.rc.dict()))
1023 pformat(self.shell.rc.dict()))
1008
1024
1009 def magic_logstart(self,parameter_s=''):
1025 def magic_logstart(self,parameter_s=''):
1010 """Start logging anywhere in a session.
1026 """Start logging anywhere in a session.
1011
1027
1012 %logstart [-o|-r|-t] [log_name [log_mode]]
1028 %logstart [-o|-r|-t] [log_name [log_mode]]
1013
1029
1014 If no name is given, it defaults to a file named 'ipython_log.py' in your
1030 If no name is given, it defaults to a file named 'ipython_log.py' in your
1015 current directory, in 'rotate' mode (see below).
1031 current directory, in 'rotate' mode (see below).
1016
1032
1017 '%logstart name' saves to file 'name' in 'backup' mode. It saves your
1033 '%logstart name' saves to file 'name' in 'backup' mode. It saves your
1018 history up to that point and then continues logging.
1034 history up to that point and then continues logging.
1019
1035
1020 %logstart takes a second optional parameter: logging mode. This can be one
1036 %logstart takes a second optional parameter: logging mode. This can be one
1021 of (note that the modes are given unquoted):\\
1037 of (note that the modes are given unquoted):\\
1022 append: well, that says it.\\
1038 append: well, that says it.\\
1023 backup: rename (if exists) to name~ and start name.\\
1039 backup: rename (if exists) to name~ and start name.\\
1024 global: single logfile in your home dir, appended to.\\
1040 global: single logfile in your home dir, appended to.\\
1025 over : overwrite existing log.\\
1041 over : overwrite existing log.\\
1026 rotate: create rotating logs name.1~, name.2~, etc.
1042 rotate: create rotating logs name.1~, name.2~, etc.
1027
1043
1028 Options:
1044 Options:
1029
1045
1030 -o: log also IPython's output. In this mode, all commands which
1046 -o: log also IPython's output. In this mode, all commands which
1031 generate an Out[NN] prompt are recorded to the logfile, right after
1047 generate an Out[NN] prompt are recorded to the logfile, right after
1032 their corresponding input line. The output lines are always
1048 their corresponding input line. The output lines are always
1033 prepended with a '#[Out]# ' marker, so that the log remains valid
1049 prepended with a '#[Out]# ' marker, so that the log remains valid
1034 Python code.
1050 Python code.
1035
1051
1036 Since this marker is always the same, filtering only the output from
1052 Since this marker is always the same, filtering only the output from
1037 a log is very easy, using for example a simple awk call:
1053 a log is very easy, using for example a simple awk call:
1038
1054
1039 awk -F'#\\[Out\\]# ' '{if($2) {print $2}}' ipython_log.py
1055 awk -F'#\\[Out\\]# ' '{if($2) {print $2}}' ipython_log.py
1040
1056
1041 -r: log 'raw' input. Normally, IPython's logs contain the processed
1057 -r: log 'raw' input. Normally, IPython's logs contain the processed
1042 input, so that user lines are logged in their final form, converted
1058 input, so that user lines are logged in their final form, converted
1043 into valid Python. For example, %Exit is logged as
1059 into valid Python. For example, %Exit is logged as
1044 '_ip.magic("Exit"). If the -r flag is given, all input is logged
1060 '_ip.magic("Exit"). If the -r flag is given, all input is logged
1045 exactly as typed, with no transformations applied.
1061 exactly as typed, with no transformations applied.
1046
1062
1047 -t: put timestamps before each input line logged (these are put in
1063 -t: put timestamps before each input line logged (these are put in
1048 comments)."""
1064 comments)."""
1049
1065
1050 opts,par = self.parse_options(parameter_s,'ort')
1066 opts,par = self.parse_options(parameter_s,'ort')
1051 log_output = 'o' in opts
1067 log_output = 'o' in opts
1052 log_raw_input = 'r' in opts
1068 log_raw_input = 'r' in opts
1053 timestamp = 't' in opts
1069 timestamp = 't' in opts
1054
1070
1055 rc = self.shell.rc
1071 rc = self.shell.rc
1056 logger = self.shell.logger
1072 logger = self.shell.logger
1057
1073
1058 # if no args are given, the defaults set in the logger constructor by
1074 # if no args are given, the defaults set in the logger constructor by
1059 # ipytohn remain valid
1075 # ipytohn remain valid
1060 if par:
1076 if par:
1061 try:
1077 try:
1062 logfname,logmode = par.split()
1078 logfname,logmode = par.split()
1063 except:
1079 except:
1064 logfname = par
1080 logfname = par
1065 logmode = 'backup'
1081 logmode = 'backup'
1066 else:
1082 else:
1067 logfname = logger.logfname
1083 logfname = logger.logfname
1068 logmode = logger.logmode
1084 logmode = logger.logmode
1069 # put logfname into rc struct as if it had been called on the command
1085 # put logfname into rc struct as if it had been called on the command
1070 # line, so it ends up saved in the log header Save it in case we need
1086 # line, so it ends up saved in the log header Save it in case we need
1071 # to restore it...
1087 # to restore it...
1072 old_logfile = rc.opts.get('logfile','')
1088 old_logfile = rc.opts.get('logfile','')
1073 if logfname:
1089 if logfname:
1074 logfname = os.path.expanduser(logfname)
1090 logfname = os.path.expanduser(logfname)
1075 rc.opts.logfile = logfname
1091 rc.opts.logfile = logfname
1076 loghead = self.shell.loghead_tpl % (rc.opts,rc.args)
1092 loghead = self.shell.loghead_tpl % (rc.opts,rc.args)
1077 try:
1093 try:
1078 started = logger.logstart(logfname,loghead,logmode,
1094 started = logger.logstart(logfname,loghead,logmode,
1079 log_output,timestamp,log_raw_input)
1095 log_output,timestamp,log_raw_input)
1080 except:
1096 except:
1081 rc.opts.logfile = old_logfile
1097 rc.opts.logfile = old_logfile
1082 warn("Couldn't start log: %s" % sys.exc_info()[1])
1098 warn("Couldn't start log: %s" % sys.exc_info()[1])
1083 else:
1099 else:
1084 # log input history up to this point, optionally interleaving
1100 # log input history up to this point, optionally interleaving
1085 # output if requested
1101 # output if requested
1086
1102
1087 if timestamp:
1103 if timestamp:
1088 # disable timestamping for the previous history, since we've
1104 # disable timestamping for the previous history, since we've
1089 # lost those already (no time machine here).
1105 # lost those already (no time machine here).
1090 logger.timestamp = False
1106 logger.timestamp = False
1091
1107
1092 if log_raw_input:
1108 if log_raw_input:
1093 input_hist = self.shell.input_hist_raw
1109 input_hist = self.shell.input_hist_raw
1094 else:
1110 else:
1095 input_hist = self.shell.input_hist
1111 input_hist = self.shell.input_hist
1096
1112
1097 if log_output:
1113 if log_output:
1098 log_write = logger.log_write
1114 log_write = logger.log_write
1099 output_hist = self.shell.output_hist
1115 output_hist = self.shell.output_hist
1100 for n in range(1,len(input_hist)-1):
1116 for n in range(1,len(input_hist)-1):
1101 log_write(input_hist[n].rstrip())
1117 log_write(input_hist[n].rstrip())
1102 if n in output_hist:
1118 if n in output_hist:
1103 log_write(repr(output_hist[n]),'output')
1119 log_write(repr(output_hist[n]),'output')
1104 else:
1120 else:
1105 logger.log_write(input_hist[1:])
1121 logger.log_write(input_hist[1:])
1106 if timestamp:
1122 if timestamp:
1107 # re-enable timestamping
1123 # re-enable timestamping
1108 logger.timestamp = True
1124 logger.timestamp = True
1109
1125
1110 print ('Activating auto-logging. '
1126 print ('Activating auto-logging. '
1111 'Current session state plus future input saved.')
1127 'Current session state plus future input saved.')
1112 logger.logstate()
1128 logger.logstate()
1113
1129
1114 def magic_logoff(self,parameter_s=''):
1130 def magic_logoff(self,parameter_s=''):
1115 """Temporarily stop logging.
1131 """Temporarily stop logging.
1116
1132
1117 You must have previously started logging."""
1133 You must have previously started logging."""
1118 self.shell.logger.switch_log(0)
1134 self.shell.logger.switch_log(0)
1119
1135
1120 def magic_logon(self,parameter_s=''):
1136 def magic_logon(self,parameter_s=''):
1121 """Restart logging.
1137 """Restart logging.
1122
1138
1123 This function is for restarting logging which you've temporarily
1139 This function is for restarting logging which you've temporarily
1124 stopped with %logoff. For starting logging for the first time, you
1140 stopped with %logoff. For starting logging for the first time, you
1125 must use the %logstart function, which allows you to specify an
1141 must use the %logstart function, which allows you to specify an
1126 optional log filename."""
1142 optional log filename."""
1127
1143
1128 self.shell.logger.switch_log(1)
1144 self.shell.logger.switch_log(1)
1129
1145
1130 def magic_logstate(self,parameter_s=''):
1146 def magic_logstate(self,parameter_s=''):
1131 """Print the status of the logging system."""
1147 """Print the status of the logging system."""
1132
1148
1133 self.shell.logger.logstate()
1149 self.shell.logger.logstate()
1134
1150
1135 def magic_pdb(self, parameter_s=''):
1151 def magic_pdb(self, parameter_s=''):
1136 """Control the calling of the pdb interactive debugger.
1152 """Control the calling of the pdb interactive debugger.
1137
1153
1138 Call as '%pdb on', '%pdb 1', '%pdb off' or '%pdb 0'. If called without
1154 Call as '%pdb on', '%pdb 1', '%pdb off' or '%pdb 0'. If called without
1139 argument it works as a toggle.
1155 argument it works as a toggle.
1140
1156
1141 When an exception is triggered, IPython can optionally call the
1157 When an exception is triggered, IPython can optionally call the
1142 interactive pdb debugger after the traceback printout. %pdb toggles
1158 interactive pdb debugger after the traceback printout. %pdb toggles
1143 this feature on and off."""
1159 this feature on and off."""
1144
1160
1145 par = parameter_s.strip().lower()
1161 par = parameter_s.strip().lower()
1146
1162
1147 if par:
1163 if par:
1148 try:
1164 try:
1149 new_pdb = {'off':0,'0':0,'on':1,'1':1}[par]
1165 new_pdb = {'off':0,'0':0,'on':1,'1':1}[par]
1150 except KeyError:
1166 except KeyError:
1151 print ('Incorrect argument. Use on/1, off/0, '
1167 print ('Incorrect argument. Use on/1, off/0, '
1152 'or nothing for a toggle.')
1168 'or nothing for a toggle.')
1153 return
1169 return
1154 else:
1170 else:
1155 # toggle
1171 # toggle
1156 new_pdb = not self.shell.InteractiveTB.call_pdb
1172 new_pdb = not self.shell.InteractiveTB.call_pdb
1157
1173
1158 # set on the shell
1174 # set on the shell
1159 self.shell.call_pdb = new_pdb
1175 self.shell.call_pdb = new_pdb
1160 print 'Automatic pdb calling has been turned',on_off(new_pdb)
1176 print 'Automatic pdb calling has been turned',on_off(new_pdb)
1161
1177
1162 def magic_prun(self, parameter_s ='',user_mode=1,
1178 def magic_prun(self, parameter_s ='',user_mode=1,
1163 opts=None,arg_lst=None,prog_ns=None):
1179 opts=None,arg_lst=None,prog_ns=None):
1164
1180
1165 """Run a statement through the python code profiler.
1181 """Run a statement through the python code profiler.
1166
1182
1167 Usage:\\
1183 Usage:\\
1168 %prun [options] statement
1184 %prun [options] statement
1169
1185
1170 The given statement (which doesn't require quote marks) is run via the
1186 The given statement (which doesn't require quote marks) is run via the
1171 python profiler in a manner similar to the profile.run() function.
1187 python profiler in a manner similar to the profile.run() function.
1172 Namespaces are internally managed to work correctly; profile.run
1188 Namespaces are internally managed to work correctly; profile.run
1173 cannot be used in IPython because it makes certain assumptions about
1189 cannot be used in IPython because it makes certain assumptions about
1174 namespaces which do not hold under IPython.
1190 namespaces which do not hold under IPython.
1175
1191
1176 Options:
1192 Options:
1177
1193
1178 -l <limit>: you can place restrictions on what or how much of the
1194 -l <limit>: you can place restrictions on what or how much of the
1179 profile gets printed. The limit value can be:
1195 profile gets printed. The limit value can be:
1180
1196
1181 * A string: only information for function names containing this string
1197 * A string: only information for function names containing this string
1182 is printed.
1198 is printed.
1183
1199
1184 * An integer: only these many lines are printed.
1200 * An integer: only these many lines are printed.
1185
1201
1186 * A float (between 0 and 1): this fraction of the report is printed
1202 * A float (between 0 and 1): this fraction of the report is printed
1187 (for example, use a limit of 0.4 to see the topmost 40% only).
1203 (for example, use a limit of 0.4 to see the topmost 40% only).
1188
1204
1189 You can combine several limits with repeated use of the option. For
1205 You can combine several limits with repeated use of the option. For
1190 example, '-l __init__ -l 5' will print only the topmost 5 lines of
1206 example, '-l __init__ -l 5' will print only the topmost 5 lines of
1191 information about class constructors.
1207 information about class constructors.
1192
1208
1193 -r: return the pstats.Stats object generated by the profiling. This
1209 -r: return the pstats.Stats object generated by the profiling. This
1194 object has all the information about the profile in it, and you can
1210 object has all the information about the profile in it, and you can
1195 later use it for further analysis or in other functions.
1211 later use it for further analysis or in other functions.
1196
1212
1197 Since magic functions have a particular form of calling which prevents
1213 Since magic functions have a particular form of calling which prevents
1198 you from writing something like:\\
1214 you from writing something like:\\
1199 In [1]: p = %prun -r print 4 # invalid!\\
1215 In [1]: p = %prun -r print 4 # invalid!\\
1200 you must instead use IPython's automatic variables to assign this:\\
1216 you must instead use IPython's automatic variables to assign this:\\
1201 In [1]: %prun -r print 4 \\
1217 In [1]: %prun -r print 4 \\
1202 Out[1]: <pstats.Stats instance at 0x8222cec>\\
1218 Out[1]: <pstats.Stats instance at 0x8222cec>\\
1203 In [2]: stats = _
1219 In [2]: stats = _
1204
1220
1205 If you really need to assign this value via an explicit function call,
1221 If you really need to assign this value via an explicit function call,
1206 you can always tap directly into the true name of the magic function
1222 you can always tap directly into the true name of the magic function
1207 by using the _ip.magic function:\\
1223 by using the _ip.magic function:\\
1208 In [3]: stats = _ip.magic('prun','-r print 4')
1224 In [3]: stats = _ip.magic('prun','-r print 4')
1209
1225
1210 You can type _ip.magic? for more details.
1226 You can type _ip.magic? for more details.
1211
1227
1212 -s <key>: sort profile by given key. You can provide more than one key
1228 -s <key>: sort profile by given key. You can provide more than one key
1213 by using the option several times: '-s key1 -s key2 -s key3...'. The
1229 by using the option several times: '-s key1 -s key2 -s key3...'. The
1214 default sorting key is 'time'.
1230 default sorting key is 'time'.
1215
1231
1216 The following is copied verbatim from the profile documentation
1232 The following is copied verbatim from the profile documentation
1217 referenced below:
1233 referenced below:
1218
1234
1219 When more than one key is provided, additional keys are used as
1235 When more than one key is provided, additional keys are used as
1220 secondary criteria when the there is equality in all keys selected
1236 secondary criteria when the there is equality in all keys selected
1221 before them.
1237 before them.
1222
1238
1223 Abbreviations can be used for any key names, as long as the
1239 Abbreviations can be used for any key names, as long as the
1224 abbreviation is unambiguous. The following are the keys currently
1240 abbreviation is unambiguous. The following are the keys currently
1225 defined:
1241 defined:
1226
1242
1227 Valid Arg Meaning\\
1243 Valid Arg Meaning\\
1228 "calls" call count\\
1244 "calls" call count\\
1229 "cumulative" cumulative time\\
1245 "cumulative" cumulative time\\
1230 "file" file name\\
1246 "file" file name\\
1231 "module" file name\\
1247 "module" file name\\
1232 "pcalls" primitive call count\\
1248 "pcalls" primitive call count\\
1233 "line" line number\\
1249 "line" line number\\
1234 "name" function name\\
1250 "name" function name\\
1235 "nfl" name/file/line\\
1251 "nfl" name/file/line\\
1236 "stdname" standard name\\
1252 "stdname" standard name\\
1237 "time" internal time
1253 "time" internal time
1238
1254
1239 Note that all sorts on statistics are in descending order (placing
1255 Note that all sorts on statistics are in descending order (placing
1240 most time consuming items first), where as name, file, and line number
1256 most time consuming items first), where as name, file, and line number
1241 searches are in ascending order (i.e., alphabetical). The subtle
1257 searches are in ascending order (i.e., alphabetical). The subtle
1242 distinction between "nfl" and "stdname" is that the standard name is a
1258 distinction between "nfl" and "stdname" is that the standard name is a
1243 sort of the name as printed, which means that the embedded line
1259 sort of the name as printed, which means that the embedded line
1244 numbers get compared in an odd way. For example, lines 3, 20, and 40
1260 numbers get compared in an odd way. For example, lines 3, 20, and 40
1245 would (if the file names were the same) appear in the string order
1261 would (if the file names were the same) appear in the string order
1246 "20" "3" and "40". In contrast, "nfl" does a numeric compare of the
1262 "20" "3" and "40". In contrast, "nfl" does a numeric compare of the
1247 line numbers. In fact, sort_stats("nfl") is the same as
1263 line numbers. In fact, sort_stats("nfl") is the same as
1248 sort_stats("name", "file", "line").
1264 sort_stats("name", "file", "line").
1249
1265
1250 -T <filename>: save profile results as shown on screen to a text
1266 -T <filename>: save profile results as shown on screen to a text
1251 file. The profile is still shown on screen.
1267 file. The profile is still shown on screen.
1252
1268
1253 -D <filename>: save (via dump_stats) profile statistics to given
1269 -D <filename>: save (via dump_stats) profile statistics to given
1254 filename. This data is in a format understod by the pstats module, and
1270 filename. This data is in a format understod by the pstats module, and
1255 is generated by a call to the dump_stats() method of profile
1271 is generated by a call to the dump_stats() method of profile
1256 objects. The profile is still shown on screen.
1272 objects. The profile is still shown on screen.
1257
1273
1258 If you want to run complete programs under the profiler's control, use
1274 If you want to run complete programs under the profiler's control, use
1259 '%run -p [prof_opts] filename.py [args to program]' where prof_opts
1275 '%run -p [prof_opts] filename.py [args to program]' where prof_opts
1260 contains profiler specific options as described here.
1276 contains profiler specific options as described here.
1261
1277
1262 You can read the complete documentation for the profile module with:\\
1278 You can read the complete documentation for the profile module with:\\
1263 In [1]: import profile; profile.help() """
1279 In [1]: import profile; profile.help() """
1264
1280
1265 opts_def = Struct(D=[''],l=[],s=['time'],T=[''])
1281 opts_def = Struct(D=[''],l=[],s=['time'],T=[''])
1266 # protect user quote marks
1282 # protect user quote marks
1267 parameter_s = parameter_s.replace('"',r'\"').replace("'",r"\'")
1283 parameter_s = parameter_s.replace('"',r'\"').replace("'",r"\'")
1268
1284
1269 if user_mode: # regular user call
1285 if user_mode: # regular user call
1270 opts,arg_str = self.parse_options(parameter_s,'D:l:rs:T:',
1286 opts,arg_str = self.parse_options(parameter_s,'D:l:rs:T:',
1271 list_all=1)
1287 list_all=1)
1272 namespace = self.shell.user_ns
1288 namespace = self.shell.user_ns
1273 else: # called to run a program by %run -p
1289 else: # called to run a program by %run -p
1274 try:
1290 try:
1275 filename = get_py_filename(arg_lst[0])
1291 filename = get_py_filename(arg_lst[0])
1276 except IOError,msg:
1292 except IOError,msg:
1277 error(msg)
1293 error(msg)
1278 return
1294 return
1279
1295
1280 arg_str = 'execfile(filename,prog_ns)'
1296 arg_str = 'execfile(filename,prog_ns)'
1281 namespace = locals()
1297 namespace = locals()
1282
1298
1283 opts.merge(opts_def)
1299 opts.merge(opts_def)
1284
1300
1285 prof = profile.Profile()
1301 prof = profile.Profile()
1286 try:
1302 try:
1287 prof = prof.runctx(arg_str,namespace,namespace)
1303 prof = prof.runctx(arg_str,namespace,namespace)
1288 sys_exit = ''
1304 sys_exit = ''
1289 except SystemExit:
1305 except SystemExit:
1290 sys_exit = """*** SystemExit exception caught in code being profiled."""
1306 sys_exit = """*** SystemExit exception caught in code being profiled."""
1291
1307
1292 stats = pstats.Stats(prof).strip_dirs().sort_stats(*opts.s)
1308 stats = pstats.Stats(prof).strip_dirs().sort_stats(*opts.s)
1293
1309
1294 lims = opts.l
1310 lims = opts.l
1295 if lims:
1311 if lims:
1296 lims = [] # rebuild lims with ints/floats/strings
1312 lims = [] # rebuild lims with ints/floats/strings
1297 for lim in opts.l:
1313 for lim in opts.l:
1298 try:
1314 try:
1299 lims.append(int(lim))
1315 lims.append(int(lim))
1300 except ValueError:
1316 except ValueError:
1301 try:
1317 try:
1302 lims.append(float(lim))
1318 lims.append(float(lim))
1303 except ValueError:
1319 except ValueError:
1304 lims.append(lim)
1320 lims.append(lim)
1305
1321
1306 # trap output
1322 # trap output
1307 sys_stdout = sys.stdout
1323 sys_stdout = sys.stdout
1308 stdout_trap = StringIO()
1324 stdout_trap = StringIO()
1309 try:
1325 try:
1310 sys.stdout = stdout_trap
1326 sys.stdout = stdout_trap
1311 stats.print_stats(*lims)
1327 stats.print_stats(*lims)
1312 finally:
1328 finally:
1313 sys.stdout = sys_stdout
1329 sys.stdout = sys_stdout
1314 output = stdout_trap.getvalue()
1330 output = stdout_trap.getvalue()
1315 output = output.rstrip()
1331 output = output.rstrip()
1316
1332
1317 page(output,screen_lines=self.shell.rc.screen_length)
1333 page(output,screen_lines=self.shell.rc.screen_length)
1318 print sys_exit,
1334 print sys_exit,
1319
1335
1320 dump_file = opts.D[0]
1336 dump_file = opts.D[0]
1321 text_file = opts.T[0]
1337 text_file = opts.T[0]
1322 if dump_file:
1338 if dump_file:
1323 prof.dump_stats(dump_file)
1339 prof.dump_stats(dump_file)
1324 print '\n*** Profile stats marshalled to file',\
1340 print '\n*** Profile stats marshalled to file',\
1325 `dump_file`+'.',sys_exit
1341 `dump_file`+'.',sys_exit
1326 if text_file:
1342 if text_file:
1327 file(text_file,'w').write(output)
1343 file(text_file,'w').write(output)
1328 print '\n*** Profile printout saved to text file',\
1344 print '\n*** Profile printout saved to text file',\
1329 `text_file`+'.',sys_exit
1345 `text_file`+'.',sys_exit
1330
1346
1331 if opts.has_key('r'):
1347 if opts.has_key('r'):
1332 return stats
1348 return stats
1333 else:
1349 else:
1334 return None
1350 return None
1335
1351
1336 def magic_run(self, parameter_s ='',runner=None):
1352 def magic_run(self, parameter_s ='',runner=None):
1337 """Run the named file inside IPython as a program.
1353 """Run the named file inside IPython as a program.
1338
1354
1339 Usage:\\
1355 Usage:\\
1340 %run [-n -i -t [-N<N>] -d [-b<N>] -p [profile options]] file [args]
1356 %run [-n -i -t [-N<N>] -d [-b<N>] -p [profile options]] file [args]
1341
1357
1342 Parameters after the filename are passed as command-line arguments to
1358 Parameters after the filename are passed as command-line arguments to
1343 the program (put in sys.argv). Then, control returns to IPython's
1359 the program (put in sys.argv). Then, control returns to IPython's
1344 prompt.
1360 prompt.
1345
1361
1346 This is similar to running at a system prompt:\\
1362 This is similar to running at a system prompt:\\
1347 $ python file args\\
1363 $ python file args\\
1348 but with the advantage of giving you IPython's tracebacks, and of
1364 but with the advantage of giving you IPython's tracebacks, and of
1349 loading all variables into your interactive namespace for further use
1365 loading all variables into your interactive namespace for further use
1350 (unless -p is used, see below).
1366 (unless -p is used, see below).
1351
1367
1352 The file is executed in a namespace initially consisting only of
1368 The file is executed in a namespace initially consisting only of
1353 __name__=='__main__' and sys.argv constructed as indicated. It thus
1369 __name__=='__main__' and sys.argv constructed as indicated. It thus
1354 sees its environment as if it were being run as a stand-alone
1370 sees its environment as if it were being run as a stand-alone
1355 program. But after execution, the IPython interactive namespace gets
1371 program. But after execution, the IPython interactive namespace gets
1356 updated with all variables defined in the program (except for __name__
1372 updated with all variables defined in the program (except for __name__
1357 and sys.argv). This allows for very convenient loading of code for
1373 and sys.argv). This allows for very convenient loading of code for
1358 interactive work, while giving each program a 'clean sheet' to run in.
1374 interactive work, while giving each program a 'clean sheet' to run in.
1359
1375
1360 Options:
1376 Options:
1361
1377
1362 -n: __name__ is NOT set to '__main__', but to the running file's name
1378 -n: __name__ is NOT set to '__main__', but to the running file's name
1363 without extension (as python does under import). This allows running
1379 without extension (as python does under import). This allows running
1364 scripts and reloading the definitions in them without calling code
1380 scripts and reloading the definitions in them without calling code
1365 protected by an ' if __name__ == "__main__" ' clause.
1381 protected by an ' if __name__ == "__main__" ' clause.
1366
1382
1367 -i: run the file in IPython's namespace instead of an empty one. This
1383 -i: run the file in IPython's namespace instead of an empty one. This
1368 is useful if you are experimenting with code written in a text editor
1384 is useful if you are experimenting with code written in a text editor
1369 which depends on variables defined interactively.
1385 which depends on variables defined interactively.
1370
1386
1371 -e: ignore sys.exit() calls or SystemExit exceptions in the script
1387 -e: ignore sys.exit() calls or SystemExit exceptions in the script
1372 being run. This is particularly useful if IPython is being used to
1388 being run. This is particularly useful if IPython is being used to
1373 run unittests, which always exit with a sys.exit() call. In such
1389 run unittests, which always exit with a sys.exit() call. In such
1374 cases you are interested in the output of the test results, not in
1390 cases you are interested in the output of the test results, not in
1375 seeing a traceback of the unittest module.
1391 seeing a traceback of the unittest module.
1376
1392
1377 -t: print timing information at the end of the run. IPython will give
1393 -t: print timing information at the end of the run. IPython will give
1378 you an estimated CPU time consumption for your script, which under
1394 you an estimated CPU time consumption for your script, which under
1379 Unix uses the resource module to avoid the wraparound problems of
1395 Unix uses the resource module to avoid the wraparound problems of
1380 time.clock(). Under Unix, an estimate of time spent on system tasks
1396 time.clock(). Under Unix, an estimate of time spent on system tasks
1381 is also given (for Windows platforms this is reported as 0.0).
1397 is also given (for Windows platforms this is reported as 0.0).
1382
1398
1383 If -t is given, an additional -N<N> option can be given, where <N>
1399 If -t is given, an additional -N<N> option can be given, where <N>
1384 must be an integer indicating how many times you want the script to
1400 must be an integer indicating how many times you want the script to
1385 run. The final timing report will include total and per run results.
1401 run. The final timing report will include total and per run results.
1386
1402
1387 For example (testing the script uniq_stable.py):
1403 For example (testing the script uniq_stable.py):
1388
1404
1389 In [1]: run -t uniq_stable
1405 In [1]: run -t uniq_stable
1390
1406
1391 IPython CPU timings (estimated):\\
1407 IPython CPU timings (estimated):\\
1392 User : 0.19597 s.\\
1408 User : 0.19597 s.\\
1393 System: 0.0 s.\\
1409 System: 0.0 s.\\
1394
1410
1395 In [2]: run -t -N5 uniq_stable
1411 In [2]: run -t -N5 uniq_stable
1396
1412
1397 IPython CPU timings (estimated):\\
1413 IPython CPU timings (estimated):\\
1398 Total runs performed: 5\\
1414 Total runs performed: 5\\
1399 Times : Total Per run\\
1415 Times : Total Per run\\
1400 User : 0.910862 s, 0.1821724 s.\\
1416 User : 0.910862 s, 0.1821724 s.\\
1401 System: 0.0 s, 0.0 s.
1417 System: 0.0 s, 0.0 s.
1402
1418
1403 -d: run your program under the control of pdb, the Python debugger.
1419 -d: run your program under the control of pdb, the Python debugger.
1404 This allows you to execute your program step by step, watch variables,
1420 This allows you to execute your program step by step, watch variables,
1405 etc. Internally, what IPython does is similar to calling:
1421 etc. Internally, what IPython does is similar to calling:
1406
1422
1407 pdb.run('execfile("YOURFILENAME")')
1423 pdb.run('execfile("YOURFILENAME")')
1408
1424
1409 with a breakpoint set on line 1 of your file. You can change the line
1425 with a breakpoint set on line 1 of your file. You can change the line
1410 number for this automatic breakpoint to be <N> by using the -bN option
1426 number for this automatic breakpoint to be <N> by using the -bN option
1411 (where N must be an integer). For example:
1427 (where N must be an integer). For example:
1412
1428
1413 %run -d -b40 myscript
1429 %run -d -b40 myscript
1414
1430
1415 will set the first breakpoint at line 40 in myscript.py. Note that
1431 will set the first breakpoint at line 40 in myscript.py. Note that
1416 the first breakpoint must be set on a line which actually does
1432 the first breakpoint must be set on a line which actually does
1417 something (not a comment or docstring) for it to stop execution.
1433 something (not a comment or docstring) for it to stop execution.
1418
1434
1419 When the pdb debugger starts, you will see a (Pdb) prompt. You must
1435 When the pdb debugger starts, you will see a (Pdb) prompt. You must
1420 first enter 'c' (without qoutes) to start execution up to the first
1436 first enter 'c' (without qoutes) to start execution up to the first
1421 breakpoint.
1437 breakpoint.
1422
1438
1423 Entering 'help' gives information about the use of the debugger. You
1439 Entering 'help' gives information about the use of the debugger. You
1424 can easily see pdb's full documentation with "import pdb;pdb.help()"
1440 can easily see pdb's full documentation with "import pdb;pdb.help()"
1425 at a prompt.
1441 at a prompt.
1426
1442
1427 -p: run program under the control of the Python profiler module (which
1443 -p: run program under the control of the Python profiler module (which
1428 prints a detailed report of execution times, function calls, etc).
1444 prints a detailed report of execution times, function calls, etc).
1429
1445
1430 You can pass other options after -p which affect the behavior of the
1446 You can pass other options after -p which affect the behavior of the
1431 profiler itself. See the docs for %prun for details.
1447 profiler itself. See the docs for %prun for details.
1432
1448
1433 In this mode, the program's variables do NOT propagate back to the
1449 In this mode, the program's variables do NOT propagate back to the
1434 IPython interactive namespace (because they remain in the namespace
1450 IPython interactive namespace (because they remain in the namespace
1435 where the profiler executes them).
1451 where the profiler executes them).
1436
1452
1437 Internally this triggers a call to %prun, see its documentation for
1453 Internally this triggers a call to %prun, see its documentation for
1438 details on the options available specifically for profiling."""
1454 details on the options available specifically for profiling."""
1439
1455
1440 # get arguments and set sys.argv for program to be run.
1456 # get arguments and set sys.argv for program to be run.
1441 opts,arg_lst = self.parse_options(parameter_s,'nidtN:b:pD:l:rs:T:e',
1457 opts,arg_lst = self.parse_options(parameter_s,'nidtN:b:pD:l:rs:T:e',
1442 mode='list',list_all=1)
1458 mode='list',list_all=1)
1443
1459
1444 try:
1460 try:
1445 filename = get_py_filename(arg_lst[0])
1461 filename = get_py_filename(arg_lst[0])
1446 except IndexError:
1462 except IndexError:
1447 warn('you must provide at least a filename.')
1463 warn('you must provide at least a filename.')
1448 print '\n%run:\n',OInspect.getdoc(self.magic_run)
1464 print '\n%run:\n',OInspect.getdoc(self.magic_run)
1449 return
1465 return
1450 except IOError,msg:
1466 except IOError,msg:
1451 error(msg)
1467 error(msg)
1452 return
1468 return
1453
1469
1454 # Control the response to exit() calls made by the script being run
1470 # Control the response to exit() calls made by the script being run
1455 exit_ignore = opts.has_key('e')
1471 exit_ignore = opts.has_key('e')
1456
1472
1457 # Make sure that the running script gets a proper sys.argv as if it
1473 # Make sure that the running script gets a proper sys.argv as if it
1458 # were run from a system shell.
1474 # were run from a system shell.
1459 save_argv = sys.argv # save it for later restoring
1475 save_argv = sys.argv # save it for later restoring
1460 sys.argv = [filename]+ arg_lst[1:] # put in the proper filename
1476 sys.argv = [filename]+ arg_lst[1:] # put in the proper filename
1461
1477
1462 if opts.has_key('i'):
1478 if opts.has_key('i'):
1463 prog_ns = self.shell.user_ns
1479 prog_ns = self.shell.user_ns
1464 __name__save = self.shell.user_ns['__name__']
1480 __name__save = self.shell.user_ns['__name__']
1465 prog_ns['__name__'] = '__main__'
1481 prog_ns['__name__'] = '__main__'
1466 else:
1482 else:
1467 if opts.has_key('n'):
1483 if opts.has_key('n'):
1468 name = os.path.splitext(os.path.basename(filename))[0]
1484 name = os.path.splitext(os.path.basename(filename))[0]
1469 else:
1485 else:
1470 name = '__main__'
1486 name = '__main__'
1471 prog_ns = {'__name__':name}
1487 prog_ns = {'__name__':name}
1472
1488
1473 # Since '%run foo' emulates 'python foo.py' at the cmd line, we must
1489 # Since '%run foo' emulates 'python foo.py' at the cmd line, we must
1474 # set the __file__ global in the script's namespace
1490 # set the __file__ global in the script's namespace
1475 prog_ns['__file__'] = filename
1491 prog_ns['__file__'] = filename
1476
1492
1477 # pickle fix. See iplib for an explanation. But we need to make sure
1493 # pickle fix. See iplib for an explanation. But we need to make sure
1478 # that, if we overwrite __main__, we replace it at the end
1494 # that, if we overwrite __main__, we replace it at the end
1479 if prog_ns['__name__'] == '__main__':
1495 if prog_ns['__name__'] == '__main__':
1480 restore_main = sys.modules['__main__']
1496 restore_main = sys.modules['__main__']
1481 else:
1497 else:
1482 restore_main = False
1498 restore_main = False
1483
1499
1484 sys.modules[prog_ns['__name__']] = FakeModule(prog_ns)
1500 sys.modules[prog_ns['__name__']] = FakeModule(prog_ns)
1485
1501
1486 stats = None
1502 stats = None
1487 try:
1503 try:
1488 if opts.has_key('p'):
1504 if opts.has_key('p'):
1489 stats = self.magic_prun('',0,opts,arg_lst,prog_ns)
1505 stats = self.magic_prun('',0,opts,arg_lst,prog_ns)
1490 else:
1506 else:
1491 if opts.has_key('d'):
1507 if opts.has_key('d'):
1492 deb = Debugger.Pdb(self.shell.rc.colors)
1508 deb = Debugger.Pdb(self.shell.rc.colors)
1493 # reset Breakpoint state, which is moronically kept
1509 # reset Breakpoint state, which is moronically kept
1494 # in a class
1510 # in a class
1495 bdb.Breakpoint.next = 1
1511 bdb.Breakpoint.next = 1
1496 bdb.Breakpoint.bplist = {}
1512 bdb.Breakpoint.bplist = {}
1497 bdb.Breakpoint.bpbynumber = [None]
1513 bdb.Breakpoint.bpbynumber = [None]
1498 # Set an initial breakpoint to stop execution
1514 # Set an initial breakpoint to stop execution
1499 maxtries = 10
1515 maxtries = 10
1500 bp = int(opts.get('b',[1])[0])
1516 bp = int(opts.get('b',[1])[0])
1501 checkline = deb.checkline(filename,bp)
1517 checkline = deb.checkline(filename,bp)
1502 if not checkline:
1518 if not checkline:
1503 for bp in range(bp+1,bp+maxtries+1):
1519 for bp in range(bp+1,bp+maxtries+1):
1504 if deb.checkline(filename,bp):
1520 if deb.checkline(filename,bp):
1505 break
1521 break
1506 else:
1522 else:
1507 msg = ("\nI failed to find a valid line to set "
1523 msg = ("\nI failed to find a valid line to set "
1508 "a breakpoint\n"
1524 "a breakpoint\n"
1509 "after trying up to line: %s.\n"
1525 "after trying up to line: %s.\n"
1510 "Please set a valid breakpoint manually "
1526 "Please set a valid breakpoint manually "
1511 "with the -b option." % bp)
1527 "with the -b option." % bp)
1512 error(msg)
1528 error(msg)
1513 return
1529 return
1514 # if we find a good linenumber, set the breakpoint
1530 # if we find a good linenumber, set the breakpoint
1515 deb.do_break('%s:%s' % (filename,bp))
1531 deb.do_break('%s:%s' % (filename,bp))
1516 # Start file run
1532 # Start file run
1517 print "NOTE: Enter 'c' at the",
1533 print "NOTE: Enter 'c' at the",
1518 print "ipdb> prompt to start your script."
1534 print "ipdb> prompt to start your script."
1519 try:
1535 try:
1520 deb.run('execfile("%s")' % filename,prog_ns)
1536 deb.run('execfile("%s")' % filename,prog_ns)
1521 except:
1537 except:
1522 etype, value, tb = sys.exc_info()
1538 etype, value, tb = sys.exc_info()
1523 # Skip three frames in the traceback: the %run one,
1539 # Skip three frames in the traceback: the %run one,
1524 # one inside bdb.py, and the command-line typed by the
1540 # one inside bdb.py, and the command-line typed by the
1525 # user (run by exec in pdb itself).
1541 # user (run by exec in pdb itself).
1526 self.shell.InteractiveTB(etype,value,tb,tb_offset=3)
1542 self.shell.InteractiveTB(etype,value,tb,tb_offset=3)
1527 else:
1543 else:
1528 if runner is None:
1544 if runner is None:
1529 runner = self.shell.safe_execfile
1545 runner = self.shell.safe_execfile
1530 if opts.has_key('t'):
1546 if opts.has_key('t'):
1531 try:
1547 try:
1532 nruns = int(opts['N'][0])
1548 nruns = int(opts['N'][0])
1533 if nruns < 1:
1549 if nruns < 1:
1534 error('Number of runs must be >=1')
1550 error('Number of runs must be >=1')
1535 return
1551 return
1536 except (KeyError):
1552 except (KeyError):
1537 nruns = 1
1553 nruns = 1
1538 if nruns == 1:
1554 if nruns == 1:
1539 t0 = clock2()
1555 t0 = clock2()
1540 runner(filename,prog_ns,prog_ns,exit_ignore=exit_ignore)
1556 runner(filename,prog_ns,prog_ns,exit_ignore=exit_ignore)
1541 t1 = clock2()
1557 t1 = clock2()
1542 t_usr = t1[0]-t0[0]
1558 t_usr = t1[0]-t0[0]
1543 t_sys = t1[1]-t1[1]
1559 t_sys = t1[1]-t1[1]
1544 print "\nIPython CPU timings (estimated):"
1560 print "\nIPython CPU timings (estimated):"
1545 print " User : %10s s." % t_usr
1561 print " User : %10s s." % t_usr
1546 print " System: %10s s." % t_sys
1562 print " System: %10s s." % t_sys
1547 else:
1563 else:
1548 runs = range(nruns)
1564 runs = range(nruns)
1549 t0 = clock2()
1565 t0 = clock2()
1550 for nr in runs:
1566 for nr in runs:
1551 runner(filename,prog_ns,prog_ns,exit_ignore=exit_ignore)
1567 runner(filename,prog_ns,prog_ns,exit_ignore=exit_ignore)
1552 t1 = clock2()
1568 t1 = clock2()
1553 t_usr = t1[0]-t0[0]
1569 t_usr = t1[0]-t0[0]
1554 t_sys = t1[1]-t1[1]
1570 t_sys = t1[1]-t1[1]
1555 print "\nIPython CPU timings (estimated):"
1571 print "\nIPython CPU timings (estimated):"
1556 print "Total runs performed:",nruns
1572 print "Total runs performed:",nruns
1557 print " Times : %10s %10s" % ('Total','Per run')
1573 print " Times : %10s %10s" % ('Total','Per run')
1558 print " User : %10s s, %10s s." % (t_usr,t_usr/nruns)
1574 print " User : %10s s, %10s s." % (t_usr,t_usr/nruns)
1559 print " System: %10s s, %10s s." % (t_sys,t_sys/nruns)
1575 print " System: %10s s, %10s s." % (t_sys,t_sys/nruns)
1560
1576
1561 else:
1577 else:
1562 runner(filename,prog_ns,prog_ns,exit_ignore=exit_ignore)
1578 runner(filename,prog_ns,prog_ns,exit_ignore=exit_ignore)
1563 if opts.has_key('i'):
1579 if opts.has_key('i'):
1564 self.shell.user_ns['__name__'] = __name__save
1580 self.shell.user_ns['__name__'] = __name__save
1565 else:
1581 else:
1566 # update IPython interactive namespace
1582 # update IPython interactive namespace
1567 del prog_ns['__name__']
1583 del prog_ns['__name__']
1568 self.shell.user_ns.update(prog_ns)
1584 self.shell.user_ns.update(prog_ns)
1569 finally:
1585 finally:
1570 sys.argv = save_argv
1586 sys.argv = save_argv
1571 if restore_main:
1587 if restore_main:
1572 sys.modules['__main__'] = restore_main
1588 sys.modules['__main__'] = restore_main
1573 return stats
1589 return stats
1574
1590
1575 def magic_runlog(self, parameter_s =''):
1591 def magic_runlog(self, parameter_s =''):
1576 """Run files as logs.
1592 """Run files as logs.
1577
1593
1578 Usage:\\
1594 Usage:\\
1579 %runlog file1 file2 ...
1595 %runlog file1 file2 ...
1580
1596
1581 Run the named files (treating them as log files) in sequence inside
1597 Run the named files (treating them as log files) in sequence inside
1582 the interpreter, and return to the prompt. This is much slower than
1598 the interpreter, and return to the prompt. This is much slower than
1583 %run because each line is executed in a try/except block, but it
1599 %run because each line is executed in a try/except block, but it
1584 allows running files with syntax errors in them.
1600 allows running files with syntax errors in them.
1585
1601
1586 Normally IPython will guess when a file is one of its own logfiles, so
1602 Normally IPython will guess when a file is one of its own logfiles, so
1587 you can typically use %run even for logs. This shorthand allows you to
1603 you can typically use %run even for logs. This shorthand allows you to
1588 force any file to be treated as a log file."""
1604 force any file to be treated as a log file."""
1589
1605
1590 for f in parameter_s.split():
1606 for f in parameter_s.split():
1591 self.shell.safe_execfile(f,self.shell.user_ns,
1607 self.shell.safe_execfile(f,self.shell.user_ns,
1592 self.shell.user_ns,islog=1)
1608 self.shell.user_ns,islog=1)
1593
1609
1594 def magic_timeit(self, parameter_s =''):
1610 def magic_timeit(self, parameter_s =''):
1595 """Time execution of a Python statement or expression
1611 """Time execution of a Python statement or expression
1596
1612
1597 Usage:\\
1613 Usage:\\
1598 %timeit [-n<N> -r<R> [-t|-c]] statement
1614 %timeit [-n<N> -r<R> [-t|-c]] statement
1599
1615
1600 Time execution of a Python statement or expression using the timeit
1616 Time execution of a Python statement or expression using the timeit
1601 module.
1617 module.
1602
1618
1603 Options:
1619 Options:
1604 -n<N>: execute the given statement <N> times in a loop. If this value
1620 -n<N>: execute the given statement <N> times in a loop. If this value
1605 is not given, a fitting value is chosen.
1621 is not given, a fitting value is chosen.
1606
1622
1607 -r<R>: repeat the loop iteration <R> times and take the best result.
1623 -r<R>: repeat the loop iteration <R> times and take the best result.
1608 Default: 3
1624 Default: 3
1609
1625
1610 -t: use time.time to measure the time, which is the default on Unix.
1626 -t: use time.time to measure the time, which is the default on Unix.
1611 This function measures wall time.
1627 This function measures wall time.
1612
1628
1613 -c: use time.clock to measure the time, which is the default on
1629 -c: use time.clock to measure the time, which is the default on
1614 Windows and measures wall time. On Unix, resource.getrusage is used
1630 Windows and measures wall time. On Unix, resource.getrusage is used
1615 instead and returns the CPU user time.
1631 instead and returns the CPU user time.
1616
1632
1617 -p<P>: use a precision of <P> digits to display the timing result.
1633 -p<P>: use a precision of <P> digits to display the timing result.
1618 Default: 3
1634 Default: 3
1619
1635
1620
1636
1621 Examples:\\
1637 Examples:\\
1622 In [1]: %timeit pass
1638 In [1]: %timeit pass
1623 10000000 loops, best of 3: 53.3 ns per loop
1639 10000000 loops, best of 3: 53.3 ns per loop
1624
1640
1625 In [2]: u = None
1641 In [2]: u = None
1626
1642
1627 In [3]: %timeit u is None
1643 In [3]: %timeit u is None
1628 10000000 loops, best of 3: 184 ns per loop
1644 10000000 loops, best of 3: 184 ns per loop
1629
1645
1630 In [4]: %timeit -r 4 u == None
1646 In [4]: %timeit -r 4 u == None
1631 1000000 loops, best of 4: 242 ns per loop
1647 1000000 loops, best of 4: 242 ns per loop
1632
1648
1633 In [5]: import time
1649 In [5]: import time
1634
1650
1635 In [6]: %timeit -n1 time.sleep(2)
1651 In [6]: %timeit -n1 time.sleep(2)
1636 1 loops, best of 3: 2 s per loop
1652 1 loops, best of 3: 2 s per loop
1637
1653
1638
1654
1639 The times reported by %timeit will be slightly higher than those reported
1655 The times reported by %timeit will be slightly higher than those
1640 by the timeit.py script when variables are accessed. This is due to the
1656 reported by the timeit.py script when variables are accessed. This is
1641 fact that %timeit executes the statement in the namespace of the shell,
1657 due to the fact that %timeit executes the statement in the namespace
1642 compared with timeit.py, which uses a single setup statement to import
1658 of the shell, compared with timeit.py, which uses a single setup
1643 function or create variables. Generally, the bias does not matter as long
1659 statement to import function or create variables. Generally, the bias
1644 as results from timeit.py are not mixed with those from %timeit."""
1660 does not matter as long as results from timeit.py are not mixed with
1661 those from %timeit."""
1662
1645 import timeit
1663 import timeit
1646 import math
1664 import math
1647
1665
1648 units = ["s", "ms", "\xc2\xb5s", "ns"]
1666 units = ["s", "ms", "\xc2\xb5s", "ns"]
1649 scaling = [1, 1e3, 1e6, 1e9]
1667 scaling = [1, 1e3, 1e6, 1e9]
1650
1668
1651 opts, stmt = self.parse_options(parameter_s,'n:r:tcp:')
1669 opts, stmt = self.parse_options(parameter_s,'n:r:tcp:',
1670 posix=False)
1652 if stmt == "":
1671 if stmt == "":
1653 return
1672 return
1654 timefunc = timeit.default_timer
1673 timefunc = timeit.default_timer
1655 number = int(getattr(opts, "n", 0))
1674 number = int(getattr(opts, "n", 0))
1656 repeat = int(getattr(opts, "r", timeit.default_repeat))
1675 repeat = int(getattr(opts, "r", timeit.default_repeat))
1657 precision = int(getattr(opts, "p", 3))
1676 precision = int(getattr(opts, "p", 3))
1658 if hasattr(opts, "t"):
1677 if hasattr(opts, "t"):
1659 timefunc = time.time
1678 timefunc = time.time
1660 if hasattr(opts, "c"):
1679 if hasattr(opts, "c"):
1661 timefunc = clock
1680 timefunc = clock
1662
1681
1663 timer = timeit.Timer(timer=timefunc)
1682 timer = timeit.Timer(timer=timefunc)
1664 # this code has tight coupling to the inner workings of timeit.Timer,
1683 # this code has tight coupling to the inner workings of timeit.Timer,
1665 # but is there a better way to achieve that the code stmt has access
1684 # but is there a better way to achieve that the code stmt has access
1666 # to the shell namespace?
1685 # to the shell namespace?
1667
1686
1668 src = timeit.template % {'stmt': timeit.reindent(stmt, 8), 'setup': "pass"}
1687 src = timeit.template % {'stmt': timeit.reindent(stmt, 8),
1688 'setup': "pass"}
1669 code = compile(src, "<magic-timeit>", "exec")
1689 code = compile(src, "<magic-timeit>", "exec")
1670 ns = {}
1690 ns = {}
1671 exec code in self.shell.user_ns, ns
1691 exec code in self.shell.user_ns, ns
1672 timer.inner = ns["inner"]
1692 timer.inner = ns["inner"]
1673
1693
1674 if number == 0:
1694 if number == 0:
1675 # determine number so that 0.2 <= total time < 2.0
1695 # determine number so that 0.2 <= total time < 2.0
1676 number = 1
1696 number = 1
1677 for i in range(1, 10):
1697 for i in range(1, 10):
1678 number *= 10
1698 number *= 10
1679 if timer.timeit(number) >= 0.2:
1699 if timer.timeit(number) >= 0.2:
1680 break
1700 break
1681
1701
1682 best = min(timer.repeat(repeat, number)) / number
1702 best = min(timer.repeat(repeat, number)) / number
1683
1703
1684 if best > 0.0:
1704 if best > 0.0:
1685 order = min(-int(math.floor(math.log10(best)) // 3), 3)
1705 order = min(-int(math.floor(math.log10(best)) // 3), 3)
1686 else:
1706 else:
1687 order = 3
1707 order = 3
1688 print "%d loops, best of %d: %.*g %s per loop" % (number, repeat,
1708 print "%d loops, best of %d: %.*g %s per loop" % (number, repeat,
1689 precision,
1709 precision,
1690 best * scaling[order],
1710 best * scaling[order],
1691 units[order])
1711 units[order])
1692
1712
1693 def magic_time(self,parameter_s = ''):
1713 def magic_time(self,parameter_s = ''):
1694 """Time execution of a Python statement or expression.
1714 """Time execution of a Python statement or expression.
1695
1715
1696 The CPU and wall clock times are printed, and the value of the
1716 The CPU and wall clock times are printed, and the value of the
1697 expression (if any) is returned. Note that under Win32, system time
1717 expression (if any) is returned. Note that under Win32, system time
1698 is always reported as 0, since it can not be measured.
1718 is always reported as 0, since it can not be measured.
1699
1719
1700 This function provides very basic timing functionality. In Python
1720 This function provides very basic timing functionality. In Python
1701 2.3, the timeit module offers more control and sophistication, so this
1721 2.3, the timeit module offers more control and sophistication, so this
1702 could be rewritten to use it (patches welcome).
1722 could be rewritten to use it (patches welcome).
1703
1723
1704 Some examples:
1724 Some examples:
1705
1725
1706 In [1]: time 2**128
1726 In [1]: time 2**128
1707 CPU times: user 0.00 s, sys: 0.00 s, total: 0.00 s
1727 CPU times: user 0.00 s, sys: 0.00 s, total: 0.00 s
1708 Wall time: 0.00
1728 Wall time: 0.00
1709 Out[1]: 340282366920938463463374607431768211456L
1729 Out[1]: 340282366920938463463374607431768211456L
1710
1730
1711 In [2]: n = 1000000
1731 In [2]: n = 1000000
1712
1732
1713 In [3]: time sum(range(n))
1733 In [3]: time sum(range(n))
1714 CPU times: user 1.20 s, sys: 0.05 s, total: 1.25 s
1734 CPU times: user 1.20 s, sys: 0.05 s, total: 1.25 s
1715 Wall time: 1.37
1735 Wall time: 1.37
1716 Out[3]: 499999500000L
1736 Out[3]: 499999500000L
1717
1737
1718 In [4]: time print 'hello world'
1738 In [4]: time print 'hello world'
1719 hello world
1739 hello world
1720 CPU times: user 0.00 s, sys: 0.00 s, total: 0.00 s
1740 CPU times: user 0.00 s, sys: 0.00 s, total: 0.00 s
1721 Wall time: 0.00
1741 Wall time: 0.00
1722 """
1742 """
1723
1743
1724 # fail immediately if the given expression can't be compiled
1744 # fail immediately if the given expression can't be compiled
1725 try:
1745 try:
1726 mode = 'eval'
1746 mode = 'eval'
1727 code = compile(parameter_s,'<timed eval>',mode)
1747 code = compile(parameter_s,'<timed eval>',mode)
1728 except SyntaxError:
1748 except SyntaxError:
1729 mode = 'exec'
1749 mode = 'exec'
1730 code = compile(parameter_s,'<timed exec>',mode)
1750 code = compile(parameter_s,'<timed exec>',mode)
1731 # skew measurement as little as possible
1751 # skew measurement as little as possible
1732 glob = self.shell.user_ns
1752 glob = self.shell.user_ns
1733 clk = clock2
1753 clk = clock2
1734 wtime = time.time
1754 wtime = time.time
1735 # time execution
1755 # time execution
1736 wall_st = wtime()
1756 wall_st = wtime()
1737 if mode=='eval':
1757 if mode=='eval':
1738 st = clk()
1758 st = clk()
1739 out = eval(code,glob)
1759 out = eval(code,glob)
1740 end = clk()
1760 end = clk()
1741 else:
1761 else:
1742 st = clk()
1762 st = clk()
1743 exec code in glob
1763 exec code in glob
1744 end = clk()
1764 end = clk()
1745 out = None
1765 out = None
1746 wall_end = wtime()
1766 wall_end = wtime()
1747 # Compute actual times and report
1767 # Compute actual times and report
1748 wall_time = wall_end-wall_st
1768 wall_time = wall_end-wall_st
1749 cpu_user = end[0]-st[0]
1769 cpu_user = end[0]-st[0]
1750 cpu_sys = end[1]-st[1]
1770 cpu_sys = end[1]-st[1]
1751 cpu_tot = cpu_user+cpu_sys
1771 cpu_tot = cpu_user+cpu_sys
1752 print "CPU times: user %.2f s, sys: %.2f s, total: %.2f s" % \
1772 print "CPU times: user %.2f s, sys: %.2f s, total: %.2f s" % \
1753 (cpu_user,cpu_sys,cpu_tot)
1773 (cpu_user,cpu_sys,cpu_tot)
1754 print "Wall time: %.2f" % wall_time
1774 print "Wall time: %.2f" % wall_time
1755 return out
1775 return out
1756
1776
1757 def magic_macro(self,parameter_s = ''):
1777 def magic_macro(self,parameter_s = ''):
1758 """Define a set of input lines as a macro for future re-execution.
1778 """Define a set of input lines as a macro for future re-execution.
1759
1779
1760 Usage:\\
1780 Usage:\\
1761 %macro [options] name n1-n2 n3-n4 ... n5 .. n6 ...
1781 %macro [options] name n1-n2 n3-n4 ... n5 .. n6 ...
1762
1782
1763 Options:
1783 Options:
1764
1784
1765 -r: use 'raw' input. By default, the 'processed' history is used,
1785 -r: use 'raw' input. By default, the 'processed' history is used,
1766 so that magics are loaded in their transformed version to valid
1786 so that magics are loaded in their transformed version to valid
1767 Python. If this option is given, the raw input as typed as the
1787 Python. If this option is given, the raw input as typed as the
1768 command line is used instead.
1788 command line is used instead.
1769
1789
1770 This will define a global variable called `name` which is a string
1790 This will define a global variable called `name` which is a string
1771 made of joining the slices and lines you specify (n1,n2,... numbers
1791 made of joining the slices and lines you specify (n1,n2,... numbers
1772 above) from your input history into a single string. This variable
1792 above) from your input history into a single string. This variable
1773 acts like an automatic function which re-executes those lines as if
1793 acts like an automatic function which re-executes those lines as if
1774 you had typed them. You just type 'name' at the prompt and the code
1794 you had typed them. You just type 'name' at the prompt and the code
1775 executes.
1795 executes.
1776
1796
1777 The notation for indicating number ranges is: n1-n2 means 'use line
1797 The notation for indicating number ranges is: n1-n2 means 'use line
1778 numbers n1,...n2' (the endpoint is included). That is, '5-7' means
1798 numbers n1,...n2' (the endpoint is included). That is, '5-7' means
1779 using the lines numbered 5,6 and 7.
1799 using the lines numbered 5,6 and 7.
1780
1800
1781 Note: as a 'hidden' feature, you can also use traditional python slice
1801 Note: as a 'hidden' feature, you can also use traditional python slice
1782 notation, where N:M means numbers N through M-1.
1802 notation, where N:M means numbers N through M-1.
1783
1803
1784 For example, if your history contains (%hist prints it):
1804 For example, if your history contains (%hist prints it):
1785
1805
1786 44: x=1\\
1806 44: x=1\\
1787 45: y=3\\
1807 45: y=3\\
1788 46: z=x+y\\
1808 46: z=x+y\\
1789 47: print x\\
1809 47: print x\\
1790 48: a=5\\
1810 48: a=5\\
1791 49: print 'x',x,'y',y\\
1811 49: print 'x',x,'y',y\\
1792
1812
1793 you can create a macro with lines 44 through 47 (included) and line 49
1813 you can create a macro with lines 44 through 47 (included) and line 49
1794 called my_macro with:
1814 called my_macro with:
1795
1815
1796 In [51]: %macro my_macro 44-47 49
1816 In [51]: %macro my_macro 44-47 49
1797
1817
1798 Now, typing `my_macro` (without quotes) will re-execute all this code
1818 Now, typing `my_macro` (without quotes) will re-execute all this code
1799 in one pass.
1819 in one pass.
1800
1820
1801 You don't need to give the line-numbers in order, and any given line
1821 You don't need to give the line-numbers in order, and any given line
1802 number can appear multiple times. You can assemble macros with any
1822 number can appear multiple times. You can assemble macros with any
1803 lines from your input history in any order.
1823 lines from your input history in any order.
1804
1824
1805 The macro is a simple object which holds its value in an attribute,
1825 The macro is a simple object which holds its value in an attribute,
1806 but IPython's display system checks for macros and executes them as
1826 but IPython's display system checks for macros and executes them as
1807 code instead of printing them when you type their name.
1827 code instead of printing them when you type their name.
1808
1828
1809 You can view a macro's contents by explicitly printing it with:
1829 You can view a macro's contents by explicitly printing it with:
1810
1830
1811 'print macro_name'.
1831 'print macro_name'.
1812
1832
1813 For one-off cases which DON'T contain magic function calls in them you
1833 For one-off cases which DON'T contain magic function calls in them you
1814 can obtain similar results by explicitly executing slices from your
1834 can obtain similar results by explicitly executing slices from your
1815 input history with:
1835 input history with:
1816
1836
1817 In [60]: exec In[44:48]+In[49]"""
1837 In [60]: exec In[44:48]+In[49]"""
1818
1838
1819 opts,args = self.parse_options(parameter_s,'r',mode='list')
1839 opts,args = self.parse_options(parameter_s,'r',mode='list')
1820 name,ranges = args[0], args[1:]
1840 name,ranges = args[0], args[1:]
1821 #print 'rng',ranges # dbg
1841 #print 'rng',ranges # dbg
1822 lines = self.extract_input_slices(ranges,opts.has_key('r'))
1842 lines = self.extract_input_slices(ranges,opts.has_key('r'))
1823 macro = Macro(lines)
1843 macro = Macro(lines)
1824 self.shell.user_ns.update({name:macro})
1844 self.shell.user_ns.update({name:macro})
1825 print 'Macro `%s` created. To execute, type its name (without quotes).' % name
1845 print 'Macro `%s` created. To execute, type its name (without quotes).' % name
1826 print 'Macro contents:'
1846 print 'Macro contents:'
1827 print macro,
1847 print macro,
1828
1848
1829 def magic_save(self,parameter_s = ''):
1849 def magic_save(self,parameter_s = ''):
1830 """Save a set of lines to a given filename.
1850 """Save a set of lines to a given filename.
1831
1851
1832 Usage:\\
1852 Usage:\\
1833 %save [options] filename n1-n2 n3-n4 ... n5 .. n6 ...
1853 %save [options] filename n1-n2 n3-n4 ... n5 .. n6 ...
1834
1854
1835 Options:
1855 Options:
1836
1856
1837 -r: use 'raw' input. By default, the 'processed' history is used,
1857 -r: use 'raw' input. By default, the 'processed' history is used,
1838 so that magics are loaded in their transformed version to valid
1858 so that magics are loaded in their transformed version to valid
1839 Python. If this option is given, the raw input as typed as the
1859 Python. If this option is given, the raw input as typed as the
1840 command line is used instead.
1860 command line is used instead.
1841
1861
1842 This function uses the same syntax as %macro for line extraction, but
1862 This function uses the same syntax as %macro for line extraction, but
1843 instead of creating a macro it saves the resulting string to the
1863 instead of creating a macro it saves the resulting string to the
1844 filename you specify.
1864 filename you specify.
1845
1865
1846 It adds a '.py' extension to the file if you don't do so yourself, and
1866 It adds a '.py' extension to the file if you don't do so yourself, and
1847 it asks for confirmation before overwriting existing files."""
1867 it asks for confirmation before overwriting existing files."""
1848
1868
1849 opts,args = self.parse_options(parameter_s,'r',mode='list')
1869 opts,args = self.parse_options(parameter_s,'r',mode='list')
1850 fname,ranges = args[0], args[1:]
1870 fname,ranges = args[0], args[1:]
1851 if not fname.endswith('.py'):
1871 if not fname.endswith('.py'):
1852 fname += '.py'
1872 fname += '.py'
1853 if os.path.isfile(fname):
1873 if os.path.isfile(fname):
1854 ans = raw_input('File `%s` exists. Overwrite (y/[N])? ' % fname)
1874 ans = raw_input('File `%s` exists. Overwrite (y/[N])? ' % fname)
1855 if ans.lower() not in ['y','yes']:
1875 if ans.lower() not in ['y','yes']:
1856 print 'Operation cancelled.'
1876 print 'Operation cancelled.'
1857 return
1877 return
1858 cmds = ''.join(self.extract_input_slices(ranges,opts.has_key('r')))
1878 cmds = ''.join(self.extract_input_slices(ranges,opts.has_key('r')))
1859 f = file(fname,'w')
1879 f = file(fname,'w')
1860 f.write(cmds)
1880 f.write(cmds)
1861 f.close()
1881 f.close()
1862 print 'The following commands were written to file `%s`:' % fname
1882 print 'The following commands were written to file `%s`:' % fname
1863 print cmds
1883 print cmds
1864
1884
1865 def _edit_macro(self,mname,macro):
1885 def _edit_macro(self,mname,macro):
1866 """open an editor with the macro data in a file"""
1886 """open an editor with the macro data in a file"""
1867 filename = self.shell.mktempfile(macro.value)
1887 filename = self.shell.mktempfile(macro.value)
1868 self.shell.hooks.editor(filename)
1888 self.shell.hooks.editor(filename)
1869
1889
1870 # and make a new macro object, to replace the old one
1890 # and make a new macro object, to replace the old one
1871 mfile = open(filename)
1891 mfile = open(filename)
1872 mvalue = mfile.read()
1892 mvalue = mfile.read()
1873 mfile.close()
1893 mfile.close()
1874 self.shell.user_ns[mname] = Macro(mvalue)
1894 self.shell.user_ns[mname] = Macro(mvalue)
1875
1895
1876 def magic_ed(self,parameter_s=''):
1896 def magic_ed(self,parameter_s=''):
1877 """Alias to %edit."""
1897 """Alias to %edit."""
1878 return self.magic_edit(parameter_s)
1898 return self.magic_edit(parameter_s)
1879
1899
1880 def magic_edit(self,parameter_s='',last_call=['','']):
1900 def magic_edit(self,parameter_s='',last_call=['','']):
1881 """Bring up an editor and execute the resulting code.
1901 """Bring up an editor and execute the resulting code.
1882
1902
1883 Usage:
1903 Usage:
1884 %edit [options] [args]
1904 %edit [options] [args]
1885
1905
1886 %edit runs IPython's editor hook. The default version of this hook is
1906 %edit runs IPython's editor hook. The default version of this hook is
1887 set to call the __IPYTHON__.rc.editor command. This is read from your
1907 set to call the __IPYTHON__.rc.editor command. This is read from your
1888 environment variable $EDITOR. If this isn't found, it will default to
1908 environment variable $EDITOR. If this isn't found, it will default to
1889 vi under Linux/Unix and to notepad under Windows. See the end of this
1909 vi under Linux/Unix and to notepad under Windows. See the end of this
1890 docstring for how to change the editor hook.
1910 docstring for how to change the editor hook.
1891
1911
1892 You can also set the value of this editor via the command line option
1912 You can also set the value of this editor via the command line option
1893 '-editor' or in your ipythonrc file. This is useful if you wish to use
1913 '-editor' or in your ipythonrc file. This is useful if you wish to use
1894 specifically for IPython an editor different from your typical default
1914 specifically for IPython an editor different from your typical default
1895 (and for Windows users who typically don't set environment variables).
1915 (and for Windows users who typically don't set environment variables).
1896
1916
1897 This command allows you to conveniently edit multi-line code right in
1917 This command allows you to conveniently edit multi-line code right in
1898 your IPython session.
1918 your IPython session.
1899
1919
1900 If called without arguments, %edit opens up an empty editor with a
1920 If called without arguments, %edit opens up an empty editor with a
1901 temporary file and will execute the contents of this file when you
1921 temporary file and will execute the contents of this file when you
1902 close it (don't forget to save it!).
1922 close it (don't forget to save it!).
1903
1923
1904
1924
1905 Options:
1925 Options:
1906
1926
1907 -n <number>: open the editor at a specified line number. By default,
1927 -n <number>: open the editor at a specified line number. By default,
1908 the IPython editor hook uses the unix syntax 'editor +N filename', but
1928 the IPython editor hook uses the unix syntax 'editor +N filename', but
1909 you can configure this by providing your own modified hook if your
1929 you can configure this by providing your own modified hook if your
1910 favorite editor supports line-number specifications with a different
1930 favorite editor supports line-number specifications with a different
1911 syntax.
1931 syntax.
1912
1932
1913 -p: this will call the editor with the same data as the previous time
1933 -p: this will call the editor with the same data as the previous time
1914 it was used, regardless of how long ago (in your current session) it
1934 it was used, regardless of how long ago (in your current session) it
1915 was.
1935 was.
1916
1936
1917 -r: use 'raw' input. This option only applies to input taken from the
1937 -r: use 'raw' input. This option only applies to input taken from the
1918 user's history. By default, the 'processed' history is used, so that
1938 user's history. By default, the 'processed' history is used, so that
1919 magics are loaded in their transformed version to valid Python. If
1939 magics are loaded in their transformed version to valid Python. If
1920 this option is given, the raw input as typed as the command line is
1940 this option is given, the raw input as typed as the command line is
1921 used instead. When you exit the editor, it will be executed by
1941 used instead. When you exit the editor, it will be executed by
1922 IPython's own processor.
1942 IPython's own processor.
1923
1943
1924 -x: do not execute the edited code immediately upon exit. This is
1944 -x: do not execute the edited code immediately upon exit. This is
1925 mainly useful if you are editing programs which need to be called with
1945 mainly useful if you are editing programs which need to be called with
1926 command line arguments, which you can then do using %run.
1946 command line arguments, which you can then do using %run.
1927
1947
1928
1948
1929 Arguments:
1949 Arguments:
1930
1950
1931 If arguments are given, the following possibilites exist:
1951 If arguments are given, the following possibilites exist:
1932
1952
1933 - The arguments are numbers or pairs of colon-separated numbers (like
1953 - The arguments are numbers or pairs of colon-separated numbers (like
1934 1 4:8 9). These are interpreted as lines of previous input to be
1954 1 4:8 9). These are interpreted as lines of previous input to be
1935 loaded into the editor. The syntax is the same of the %macro command.
1955 loaded into the editor. The syntax is the same of the %macro command.
1936
1956
1937 - If the argument doesn't start with a number, it is evaluated as a
1957 - If the argument doesn't start with a number, it is evaluated as a
1938 variable and its contents loaded into the editor. You can thus edit
1958 variable and its contents loaded into the editor. You can thus edit
1939 any string which contains python code (including the result of
1959 any string which contains python code (including the result of
1940 previous edits).
1960 previous edits).
1941
1961
1942 - If the argument is the name of an object (other than a string),
1962 - If the argument is the name of an object (other than a string),
1943 IPython will try to locate the file where it was defined and open the
1963 IPython will try to locate the file where it was defined and open the
1944 editor at the point where it is defined. You can use `%edit function`
1964 editor at the point where it is defined. You can use `%edit function`
1945 to load an editor exactly at the point where 'function' is defined,
1965 to load an editor exactly at the point where 'function' is defined,
1946 edit it and have the file be executed automatically.
1966 edit it and have the file be executed automatically.
1947
1967
1948 If the object is a macro (see %macro for details), this opens up your
1968 If the object is a macro (see %macro for details), this opens up your
1949 specified editor with a temporary file containing the macro's data.
1969 specified editor with a temporary file containing the macro's data.
1950 Upon exit, the macro is reloaded with the contents of the file.
1970 Upon exit, the macro is reloaded with the contents of the file.
1951
1971
1952 Note: opening at an exact line is only supported under Unix, and some
1972 Note: opening at an exact line is only supported under Unix, and some
1953 editors (like kedit and gedit up to Gnome 2.8) do not understand the
1973 editors (like kedit and gedit up to Gnome 2.8) do not understand the
1954 '+NUMBER' parameter necessary for this feature. Good editors like
1974 '+NUMBER' parameter necessary for this feature. Good editors like
1955 (X)Emacs, vi, jed, pico and joe all do.
1975 (X)Emacs, vi, jed, pico and joe all do.
1956
1976
1957 - If the argument is not found as a variable, IPython will look for a
1977 - If the argument is not found as a variable, IPython will look for a
1958 file with that name (adding .py if necessary) and load it into the
1978 file with that name (adding .py if necessary) and load it into the
1959 editor. It will execute its contents with execfile() when you exit,
1979 editor. It will execute its contents with execfile() when you exit,
1960 loading any code in the file into your interactive namespace.
1980 loading any code in the file into your interactive namespace.
1961
1981
1962 After executing your code, %edit will return as output the code you
1982 After executing your code, %edit will return as output the code you
1963 typed in the editor (except when it was an existing file). This way
1983 typed in the editor (except when it was an existing file). This way
1964 you can reload the code in further invocations of %edit as a variable,
1984 you can reload the code in further invocations of %edit as a variable,
1965 via _<NUMBER> or Out[<NUMBER>], where <NUMBER> is the prompt number of
1985 via _<NUMBER> or Out[<NUMBER>], where <NUMBER> is the prompt number of
1966 the output.
1986 the output.
1967
1987
1968 Note that %edit is also available through the alias %ed.
1988 Note that %edit is also available through the alias %ed.
1969
1989
1970 This is an example of creating a simple function inside the editor and
1990 This is an example of creating a simple function inside the editor and
1971 then modifying it. First, start up the editor:
1991 then modifying it. First, start up the editor:
1972
1992
1973 In [1]: ed\\
1993 In [1]: ed\\
1974 Editing... done. Executing edited code...\\
1994 Editing... done. Executing edited code...\\
1975 Out[1]: 'def foo():\\n print "foo() was defined in an editing session"\\n'
1995 Out[1]: 'def foo():\\n print "foo() was defined in an editing session"\\n'
1976
1996
1977 We can then call the function foo():
1997 We can then call the function foo():
1978
1998
1979 In [2]: foo()\\
1999 In [2]: foo()\\
1980 foo() was defined in an editing session
2000 foo() was defined in an editing session
1981
2001
1982 Now we edit foo. IPython automatically loads the editor with the
2002 Now we edit foo. IPython automatically loads the editor with the
1983 (temporary) file where foo() was previously defined:
2003 (temporary) file where foo() was previously defined:
1984
2004
1985 In [3]: ed foo\\
2005 In [3]: ed foo\\
1986 Editing... done. Executing edited code...
2006 Editing... done. Executing edited code...
1987
2007
1988 And if we call foo() again we get the modified version:
2008 And if we call foo() again we get the modified version:
1989
2009
1990 In [4]: foo()\\
2010 In [4]: foo()\\
1991 foo() has now been changed!
2011 foo() has now been changed!
1992
2012
1993 Here is an example of how to edit a code snippet successive
2013 Here is an example of how to edit a code snippet successive
1994 times. First we call the editor:
2014 times. First we call the editor:
1995
2015
1996 In [8]: ed\\
2016 In [8]: ed\\
1997 Editing... done. Executing edited code...\\
2017 Editing... done. Executing edited code...\\
1998 hello\\
2018 hello\\
1999 Out[8]: "print 'hello'\\n"
2019 Out[8]: "print 'hello'\\n"
2000
2020
2001 Now we call it again with the previous output (stored in _):
2021 Now we call it again with the previous output (stored in _):
2002
2022
2003 In [9]: ed _\\
2023 In [9]: ed _\\
2004 Editing... done. Executing edited code...\\
2024 Editing... done. Executing edited code...\\
2005 hello world\\
2025 hello world\\
2006 Out[9]: "print 'hello world'\\n"
2026 Out[9]: "print 'hello world'\\n"
2007
2027
2008 Now we call it with the output #8 (stored in _8, also as Out[8]):
2028 Now we call it with the output #8 (stored in _8, also as Out[8]):
2009
2029
2010 In [10]: ed _8\\
2030 In [10]: ed _8\\
2011 Editing... done. Executing edited code...\\
2031 Editing... done. Executing edited code...\\
2012 hello again\\
2032 hello again\\
2013 Out[10]: "print 'hello again'\\n"
2033 Out[10]: "print 'hello again'\\n"
2014
2034
2015
2035
2016 Changing the default editor hook:
2036 Changing the default editor hook:
2017
2037
2018 If you wish to write your own editor hook, you can put it in a
2038 If you wish to write your own editor hook, you can put it in a
2019 configuration file which you load at startup time. The default hook
2039 configuration file which you load at startup time. The default hook
2020 is defined in the IPython.hooks module, and you can use that as a
2040 is defined in the IPython.hooks module, and you can use that as a
2021 starting example for further modifications. That file also has
2041 starting example for further modifications. That file also has
2022 general instructions on how to set a new hook for use once you've
2042 general instructions on how to set a new hook for use once you've
2023 defined it."""
2043 defined it."""
2024
2044
2025 # FIXME: This function has become a convoluted mess. It needs a
2045 # FIXME: This function has become a convoluted mess. It needs a
2026 # ground-up rewrite with clean, simple logic.
2046 # ground-up rewrite with clean, simple logic.
2027
2047
2028 def make_filename(arg):
2048 def make_filename(arg):
2029 "Make a filename from the given args"
2049 "Make a filename from the given args"
2030 try:
2050 try:
2031 filename = get_py_filename(arg)
2051 filename = get_py_filename(arg)
2032 except IOError:
2052 except IOError:
2033 if args.endswith('.py'):
2053 if args.endswith('.py'):
2034 filename = arg
2054 filename = arg
2035 else:
2055 else:
2036 filename = None
2056 filename = None
2037 return filename
2057 return filename
2038
2058
2039 # custom exceptions
2059 # custom exceptions
2040 class DataIsObject(Exception): pass
2060 class DataIsObject(Exception): pass
2041
2061
2042 opts,args = self.parse_options(parameter_s,'prxn:')
2062 opts,args = self.parse_options(parameter_s,'prxn:')
2043 # Set a few locals from the options for convenience:
2063 # Set a few locals from the options for convenience:
2044 opts_p = opts.has_key('p')
2064 opts_p = opts.has_key('p')
2045 opts_r = opts.has_key('r')
2065 opts_r = opts.has_key('r')
2046
2066
2047 # Default line number value
2067 # Default line number value
2048 lineno = opts.get('n',None)
2068 lineno = opts.get('n',None)
2049
2069
2050 if opts_p:
2070 if opts_p:
2051 args = '_%s' % last_call[0]
2071 args = '_%s' % last_call[0]
2052 if not self.shell.user_ns.has_key(args):
2072 if not self.shell.user_ns.has_key(args):
2053 args = last_call[1]
2073 args = last_call[1]
2054
2074
2055 # use last_call to remember the state of the previous call, but don't
2075 # use last_call to remember the state of the previous call, but don't
2056 # let it be clobbered by successive '-p' calls.
2076 # let it be clobbered by successive '-p' calls.
2057 try:
2077 try:
2058 last_call[0] = self.shell.outputcache.prompt_count
2078 last_call[0] = self.shell.outputcache.prompt_count
2059 if not opts_p:
2079 if not opts_p:
2060 last_call[1] = parameter_s
2080 last_call[1] = parameter_s
2061 except:
2081 except:
2062 pass
2082 pass
2063
2083
2064 # by default this is done with temp files, except when the given
2084 # by default this is done with temp files, except when the given
2065 # arg is a filename
2085 # arg is a filename
2066 use_temp = 1
2086 use_temp = 1
2067
2087
2068 if re.match(r'\d',args):
2088 if re.match(r'\d',args):
2069 # Mode where user specifies ranges of lines, like in %macro.
2089 # Mode where user specifies ranges of lines, like in %macro.
2070 # This means that you can't edit files whose names begin with
2090 # This means that you can't edit files whose names begin with
2071 # numbers this way. Tough.
2091 # numbers this way. Tough.
2072 ranges = args.split()
2092 ranges = args.split()
2073 data = ''.join(self.extract_input_slices(ranges,opts_r))
2093 data = ''.join(self.extract_input_slices(ranges,opts_r))
2074 elif args.endswith('.py'):
2094 elif args.endswith('.py'):
2075 filename = make_filename(args)
2095 filename = make_filename(args)
2076 data = ''
2096 data = ''
2077 use_temp = 0
2097 use_temp = 0
2078 elif args:
2098 elif args:
2079 try:
2099 try:
2080 # Load the parameter given as a variable. If not a string,
2100 # Load the parameter given as a variable. If not a string,
2081 # process it as an object instead (below)
2101 # process it as an object instead (below)
2082
2102
2083 #print '*** args',args,'type',type(args) # dbg
2103 #print '*** args',args,'type',type(args) # dbg
2084 data = eval(args,self.shell.user_ns)
2104 data = eval(args,self.shell.user_ns)
2085 if not type(data) in StringTypes:
2105 if not type(data) in StringTypes:
2086 raise DataIsObject
2106 raise DataIsObject
2087
2107
2088 except (NameError,SyntaxError):
2108 except (NameError,SyntaxError):
2089 # given argument is not a variable, try as a filename
2109 # given argument is not a variable, try as a filename
2090 filename = make_filename(args)
2110 filename = make_filename(args)
2091 if filename is None:
2111 if filename is None:
2092 warn("Argument given (%s) can't be found as a variable "
2112 warn("Argument given (%s) can't be found as a variable "
2093 "or as a filename." % args)
2113 "or as a filename." % args)
2094 return
2114 return
2095
2115
2096 data = ''
2116 data = ''
2097 use_temp = 0
2117 use_temp = 0
2098 except DataIsObject:
2118 except DataIsObject:
2099
2119
2100 # macros have a special edit function
2120 # macros have a special edit function
2101 if isinstance(data,Macro):
2121 if isinstance(data,Macro):
2102 self._edit_macro(args,data)
2122 self._edit_macro(args,data)
2103 return
2123 return
2104
2124
2105 # For objects, try to edit the file where they are defined
2125 # For objects, try to edit the file where they are defined
2106 try:
2126 try:
2107 filename = inspect.getabsfile(data)
2127 filename = inspect.getabsfile(data)
2108 datafile = 1
2128 datafile = 1
2109 except TypeError:
2129 except TypeError:
2110 filename = make_filename(args)
2130 filename = make_filename(args)
2111 datafile = 1
2131 datafile = 1
2112 warn('Could not find file where `%s` is defined.\n'
2132 warn('Could not find file where `%s` is defined.\n'
2113 'Opening a file named `%s`' % (args,filename))
2133 'Opening a file named `%s`' % (args,filename))
2114 # Now, make sure we can actually read the source (if it was in
2134 # Now, make sure we can actually read the source (if it was in
2115 # a temp file it's gone by now).
2135 # a temp file it's gone by now).
2116 if datafile:
2136 if datafile:
2117 try:
2137 try:
2118 if lineno is None:
2138 if lineno is None:
2119 lineno = inspect.getsourcelines(data)[1]
2139 lineno = inspect.getsourcelines(data)[1]
2120 except IOError:
2140 except IOError:
2121 filename = make_filename(args)
2141 filename = make_filename(args)
2122 if filename is None:
2142 if filename is None:
2123 warn('The file `%s` where `%s` was defined cannot '
2143 warn('The file `%s` where `%s` was defined cannot '
2124 'be read.' % (filename,data))
2144 'be read.' % (filename,data))
2125 return
2145 return
2126 use_temp = 0
2146 use_temp = 0
2127 else:
2147 else:
2128 data = ''
2148 data = ''
2129
2149
2130 if use_temp:
2150 if use_temp:
2131 filename = self.shell.mktempfile(data)
2151 filename = self.shell.mktempfile(data)
2132 print 'IPython will make a temporary file named:',filename
2152 print 'IPython will make a temporary file named:',filename
2133
2153
2134 # do actual editing here
2154 # do actual editing here
2135 print 'Editing...',
2155 print 'Editing...',
2136 sys.stdout.flush()
2156 sys.stdout.flush()
2137 self.shell.hooks.editor(filename,lineno)
2157 self.shell.hooks.editor(filename,lineno)
2138 if opts.has_key('x'): # -x prevents actual execution
2158 if opts.has_key('x'): # -x prevents actual execution
2139 print
2159 print
2140 else:
2160 else:
2141 print 'done. Executing edited code...'
2161 print 'done. Executing edited code...'
2142 if opts_r:
2162 if opts_r:
2143 self.shell.runlines(file_read(filename))
2163 self.shell.runlines(file_read(filename))
2144 else:
2164 else:
2145 self.shell.safe_execfile(filename,self.shell.user_ns)
2165 self.shell.safe_execfile(filename,self.shell.user_ns)
2146 if use_temp:
2166 if use_temp:
2147 try:
2167 try:
2148 return open(filename).read()
2168 return open(filename).read()
2149 except IOError,msg:
2169 except IOError,msg:
2150 if msg.filename == filename:
2170 if msg.filename == filename:
2151 warn('File not found. Did you forget to save?')
2171 warn('File not found. Did you forget to save?')
2152 return
2172 return
2153 else:
2173 else:
2154 self.shell.showtraceback()
2174 self.shell.showtraceback()
2155
2175
2156 def magic_xmode(self,parameter_s = ''):
2176 def magic_xmode(self,parameter_s = ''):
2157 """Switch modes for the exception handlers.
2177 """Switch modes for the exception handlers.
2158
2178
2159 Valid modes: Plain, Context and Verbose.
2179 Valid modes: Plain, Context and Verbose.
2160
2180
2161 If called without arguments, acts as a toggle."""
2181 If called without arguments, acts as a toggle."""
2162
2182
2163 def xmode_switch_err(name):
2183 def xmode_switch_err(name):
2164 warn('Error changing %s exception modes.\n%s' %
2184 warn('Error changing %s exception modes.\n%s' %
2165 (name,sys.exc_info()[1]))
2185 (name,sys.exc_info()[1]))
2166
2186
2167 shell = self.shell
2187 shell = self.shell
2168 new_mode = parameter_s.strip().capitalize()
2188 new_mode = parameter_s.strip().capitalize()
2169 try:
2189 try:
2170 shell.InteractiveTB.set_mode(mode=new_mode)
2190 shell.InteractiveTB.set_mode(mode=new_mode)
2171 print 'Exception reporting mode:',shell.InteractiveTB.mode
2191 print 'Exception reporting mode:',shell.InteractiveTB.mode
2172 except:
2192 except:
2173 xmode_switch_err('user')
2193 xmode_switch_err('user')
2174
2194
2175 # threaded shells use a special handler in sys.excepthook
2195 # threaded shells use a special handler in sys.excepthook
2176 if shell.isthreaded:
2196 if shell.isthreaded:
2177 try:
2197 try:
2178 shell.sys_excepthook.set_mode(mode=new_mode)
2198 shell.sys_excepthook.set_mode(mode=new_mode)
2179 except:
2199 except:
2180 xmode_switch_err('threaded')
2200 xmode_switch_err('threaded')
2181
2201
2182 def magic_colors(self,parameter_s = ''):
2202 def magic_colors(self,parameter_s = ''):
2183 """Switch color scheme for prompts, info system and exception handlers.
2203 """Switch color scheme for prompts, info system and exception handlers.
2184
2204
2185 Currently implemented schemes: NoColor, Linux, LightBG.
2205 Currently implemented schemes: NoColor, Linux, LightBG.
2186
2206
2187 Color scheme names are not case-sensitive."""
2207 Color scheme names are not case-sensitive."""
2188
2208
2189 def color_switch_err(name):
2209 def color_switch_err(name):
2190 warn('Error changing %s color schemes.\n%s' %
2210 warn('Error changing %s color schemes.\n%s' %
2191 (name,sys.exc_info()[1]))
2211 (name,sys.exc_info()[1]))
2192
2212
2193
2213
2194 new_scheme = parameter_s.strip()
2214 new_scheme = parameter_s.strip()
2195 if not new_scheme:
2215 if not new_scheme:
2196 print 'You must specify a color scheme.'
2216 print 'You must specify a color scheme.'
2197 return
2217 return
2198 import IPython.rlineimpl as readline
2218 import IPython.rlineimpl as readline
2199 if not readline.have_readline:
2219 if not readline.have_readline:
2200 msg = """\
2220 msg = """\
2201 Proper color support under MS Windows requires the pyreadline library.
2221 Proper color support under MS Windows requires the pyreadline library.
2202 You can find it at:
2222 You can find it at:
2203 http://ipython.scipy.org/moin/PyReadline/Intro
2223 http://ipython.scipy.org/moin/PyReadline/Intro
2204 Gary's readline needs the ctypes module, from:
2224 Gary's readline needs the ctypes module, from:
2205 http://starship.python.net/crew/theller/ctypes
2225 http://starship.python.net/crew/theller/ctypes
2206 (Note that ctypes is already part of Python versions 2.5 and newer).
2226 (Note that ctypes is already part of Python versions 2.5 and newer).
2207
2227
2208 Defaulting color scheme to 'NoColor'"""
2228 Defaulting color scheme to 'NoColor'"""
2209 new_scheme = 'NoColor'
2229 new_scheme = 'NoColor'
2210 warn(msg)
2230 warn(msg)
2211 # local shortcut
2231 # local shortcut
2212 shell = self.shell
2232 shell = self.shell
2213
2233
2214 # Set prompt colors
2234 # Set prompt colors
2215 try:
2235 try:
2216 shell.outputcache.set_colors(new_scheme)
2236 shell.outputcache.set_colors(new_scheme)
2217 except:
2237 except:
2218 color_switch_err('prompt')
2238 color_switch_err('prompt')
2219 else:
2239 else:
2220 shell.rc.colors = \
2240 shell.rc.colors = \
2221 shell.outputcache.color_table.active_scheme_name
2241 shell.outputcache.color_table.active_scheme_name
2222 # Set exception colors
2242 # Set exception colors
2223 try:
2243 try:
2224 shell.InteractiveTB.set_colors(scheme = new_scheme)
2244 shell.InteractiveTB.set_colors(scheme = new_scheme)
2225 shell.SyntaxTB.set_colors(scheme = new_scheme)
2245 shell.SyntaxTB.set_colors(scheme = new_scheme)
2226 except:
2246 except:
2227 color_switch_err('exception')
2247 color_switch_err('exception')
2228
2248
2229 # threaded shells use a verbose traceback in sys.excepthook
2249 # threaded shells use a verbose traceback in sys.excepthook
2230 if shell.isthreaded:
2250 if shell.isthreaded:
2231 try:
2251 try:
2232 shell.sys_excepthook.set_colors(scheme=new_scheme)
2252 shell.sys_excepthook.set_colors(scheme=new_scheme)
2233 except:
2253 except:
2234 color_switch_err('system exception handler')
2254 color_switch_err('system exception handler')
2235
2255
2236 # Set info (for 'object?') colors
2256 # Set info (for 'object?') colors
2237 if shell.rc.color_info:
2257 if shell.rc.color_info:
2238 try:
2258 try:
2239 shell.inspector.set_active_scheme(new_scheme)
2259 shell.inspector.set_active_scheme(new_scheme)
2240 except:
2260 except:
2241 color_switch_err('object inspector')
2261 color_switch_err('object inspector')
2242 else:
2262 else:
2243 shell.inspector.set_active_scheme('NoColor')
2263 shell.inspector.set_active_scheme('NoColor')
2244
2264
2245 def magic_color_info(self,parameter_s = ''):
2265 def magic_color_info(self,parameter_s = ''):
2246 """Toggle color_info.
2266 """Toggle color_info.
2247
2267
2248 The color_info configuration parameter controls whether colors are
2268 The color_info configuration parameter controls whether colors are
2249 used for displaying object details (by things like %psource, %pfile or
2269 used for displaying object details (by things like %psource, %pfile or
2250 the '?' system). This function toggles this value with each call.
2270 the '?' system). This function toggles this value with each call.
2251
2271
2252 Note that unless you have a fairly recent pager (less works better
2272 Note that unless you have a fairly recent pager (less works better
2253 than more) in your system, using colored object information displays
2273 than more) in your system, using colored object information displays
2254 will not work properly. Test it and see."""
2274 will not work properly. Test it and see."""
2255
2275
2256 self.shell.rc.color_info = 1 - self.shell.rc.color_info
2276 self.shell.rc.color_info = 1 - self.shell.rc.color_info
2257 self.magic_colors(self.shell.rc.colors)
2277 self.magic_colors(self.shell.rc.colors)
2258 print 'Object introspection functions have now coloring:',
2278 print 'Object introspection functions have now coloring:',
2259 print ['OFF','ON'][self.shell.rc.color_info]
2279 print ['OFF','ON'][self.shell.rc.color_info]
2260
2280
2261 def magic_Pprint(self, parameter_s=''):
2281 def magic_Pprint(self, parameter_s=''):
2262 """Toggle pretty printing on/off."""
2282 """Toggle pretty printing on/off."""
2263
2283
2264 self.shell.rc.pprint = 1 - self.shell.rc.pprint
2284 self.shell.rc.pprint = 1 - self.shell.rc.pprint
2265 print 'Pretty printing has been turned', \
2285 print 'Pretty printing has been turned', \
2266 ['OFF','ON'][self.shell.rc.pprint]
2286 ['OFF','ON'][self.shell.rc.pprint]
2267
2287
2268 def magic_exit(self, parameter_s=''):
2288 def magic_exit(self, parameter_s=''):
2269 """Exit IPython, confirming if configured to do so.
2289 """Exit IPython, confirming if configured to do so.
2270
2290
2271 You can configure whether IPython asks for confirmation upon exit by
2291 You can configure whether IPython asks for confirmation upon exit by
2272 setting the confirm_exit flag in the ipythonrc file."""
2292 setting the confirm_exit flag in the ipythonrc file."""
2273
2293
2274 self.shell.exit()
2294 self.shell.exit()
2275
2295
2276 def magic_quit(self, parameter_s=''):
2296 def magic_quit(self, parameter_s=''):
2277 """Exit IPython, confirming if configured to do so (like %exit)"""
2297 """Exit IPython, confirming if configured to do so (like %exit)"""
2278
2298
2279 self.shell.exit()
2299 self.shell.exit()
2280
2300
2281 def magic_Exit(self, parameter_s=''):
2301 def magic_Exit(self, parameter_s=''):
2282 """Exit IPython without confirmation."""
2302 """Exit IPython without confirmation."""
2283
2303
2284 self.shell.exit_now = True
2304 self.shell.exit_now = True
2285
2305
2286 def magic_Quit(self, parameter_s=''):
2306 def magic_Quit(self, parameter_s=''):
2287 """Exit IPython without confirmation (like %Exit)."""
2307 """Exit IPython without confirmation (like %Exit)."""
2288
2308
2289 self.shell.exit_now = True
2309 self.shell.exit_now = True
2290
2310
2291 #......................................................................
2311 #......................................................................
2292 # Functions to implement unix shell-type things
2312 # Functions to implement unix shell-type things
2293
2313
2294 def magic_alias(self, parameter_s = ''):
2314 def magic_alias(self, parameter_s = ''):
2295 """Define an alias for a system command.
2315 """Define an alias for a system command.
2296
2316
2297 '%alias alias_name cmd' defines 'alias_name' as an alias for 'cmd'
2317 '%alias alias_name cmd' defines 'alias_name' as an alias for 'cmd'
2298
2318
2299 Then, typing 'alias_name params' will execute the system command 'cmd
2319 Then, typing 'alias_name params' will execute the system command 'cmd
2300 params' (from your underlying operating system).
2320 params' (from your underlying operating system).
2301
2321
2302 Aliases have lower precedence than magic functions and Python normal
2322 Aliases have lower precedence than magic functions and Python normal
2303 variables, so if 'foo' is both a Python variable and an alias, the
2323 variables, so if 'foo' is both a Python variable and an alias, the
2304 alias can not be executed until 'del foo' removes the Python variable.
2324 alias can not be executed until 'del foo' removes the Python variable.
2305
2325
2306 You can use the %l specifier in an alias definition to represent the
2326 You can use the %l specifier in an alias definition to represent the
2307 whole line when the alias is called. For example:
2327 whole line when the alias is called. For example:
2308
2328
2309 In [2]: alias all echo "Input in brackets: <%l>"\\
2329 In [2]: alias all echo "Input in brackets: <%l>"\\
2310 In [3]: all hello world\\
2330 In [3]: all hello world\\
2311 Input in brackets: <hello world>
2331 Input in brackets: <hello world>
2312
2332
2313 You can also define aliases with parameters using %s specifiers (one
2333 You can also define aliases with parameters using %s specifiers (one
2314 per parameter):
2334 per parameter):
2315
2335
2316 In [1]: alias parts echo first %s second %s\\
2336 In [1]: alias parts echo first %s second %s\\
2317 In [2]: %parts A B\\
2337 In [2]: %parts A B\\
2318 first A second B\\
2338 first A second B\\
2319 In [3]: %parts A\\
2339 In [3]: %parts A\\
2320 Incorrect number of arguments: 2 expected.\\
2340 Incorrect number of arguments: 2 expected.\\
2321 parts is an alias to: 'echo first %s second %s'
2341 parts is an alias to: 'echo first %s second %s'
2322
2342
2323 Note that %l and %s are mutually exclusive. You can only use one or
2343 Note that %l and %s are mutually exclusive. You can only use one or
2324 the other in your aliases.
2344 the other in your aliases.
2325
2345
2326 Aliases expand Python variables just like system calls using ! or !!
2346 Aliases expand Python variables just like system calls using ! or !!
2327 do: all expressions prefixed with '$' get expanded. For details of
2347 do: all expressions prefixed with '$' get expanded. For details of
2328 the semantic rules, see PEP-215:
2348 the semantic rules, see PEP-215:
2329 http://www.python.org/peps/pep-0215.html. This is the library used by
2349 http://www.python.org/peps/pep-0215.html. This is the library used by
2330 IPython for variable expansion. If you want to access a true shell
2350 IPython for variable expansion. If you want to access a true shell
2331 variable, an extra $ is necessary to prevent its expansion by IPython:
2351 variable, an extra $ is necessary to prevent its expansion by IPython:
2332
2352
2333 In [6]: alias show echo\\
2353 In [6]: alias show echo\\
2334 In [7]: PATH='A Python string'\\
2354 In [7]: PATH='A Python string'\\
2335 In [8]: show $PATH\\
2355 In [8]: show $PATH\\
2336 A Python string\\
2356 A Python string\\
2337 In [9]: show $$PATH\\
2357 In [9]: show $$PATH\\
2338 /usr/local/lf9560/bin:/usr/local/intel/compiler70/ia32/bin:...
2358 /usr/local/lf9560/bin:/usr/local/intel/compiler70/ia32/bin:...
2339
2359
2340 You can use the alias facility to acess all of $PATH. See the %rehash
2360 You can use the alias facility to acess all of $PATH. See the %rehash
2341 and %rehashx functions, which automatically create aliases for the
2361 and %rehashx functions, which automatically create aliases for the
2342 contents of your $PATH.
2362 contents of your $PATH.
2343
2363
2344 If called with no parameters, %alias prints the current alias table."""
2364 If called with no parameters, %alias prints the current alias table."""
2345
2365
2346 par = parameter_s.strip()
2366 par = parameter_s.strip()
2347 if not par:
2367 if not par:
2348 if self.shell.rc.automagic:
2368 if self.shell.rc.automagic:
2349 prechar = ''
2369 prechar = ''
2350 else:
2370 else:
2351 prechar = self.shell.ESC_MAGIC
2371 prechar = self.shell.ESC_MAGIC
2352 #print 'Alias\t\tSystem Command\n'+'-'*30
2372 #print 'Alias\t\tSystem Command\n'+'-'*30
2353 atab = self.shell.alias_table
2373 atab = self.shell.alias_table
2354 aliases = atab.keys()
2374 aliases = atab.keys()
2355 aliases.sort()
2375 aliases.sort()
2356 res = []
2376 res = []
2357 for alias in aliases:
2377 for alias in aliases:
2358 res.append((alias, atab[alias][1]))
2378 res.append((alias, atab[alias][1]))
2359 print "Total number of aliases:",len(aliases)
2379 print "Total number of aliases:",len(aliases)
2360 return res
2380 return res
2361 try:
2381 try:
2362 alias,cmd = par.split(None,1)
2382 alias,cmd = par.split(None,1)
2363 except:
2383 except:
2364 print OInspect.getdoc(self.magic_alias)
2384 print OInspect.getdoc(self.magic_alias)
2365 else:
2385 else:
2366 nargs = cmd.count('%s')
2386 nargs = cmd.count('%s')
2367 if nargs>0 and cmd.find('%l')>=0:
2387 if nargs>0 and cmd.find('%l')>=0:
2368 error('The %s and %l specifiers are mutually exclusive '
2388 error('The %s and %l specifiers are mutually exclusive '
2369 'in alias definitions.')
2389 'in alias definitions.')
2370 else: # all looks OK
2390 else: # all looks OK
2371 self.shell.alias_table[alias] = (nargs,cmd)
2391 self.shell.alias_table[alias] = (nargs,cmd)
2372 self.shell.alias_table_validate(verbose=0)
2392 self.shell.alias_table_validate(verbose=0)
2373 # end magic_alias
2393 # end magic_alias
2374
2394
2375 def magic_unalias(self, parameter_s = ''):
2395 def magic_unalias(self, parameter_s = ''):
2376 """Remove an alias"""
2396 """Remove an alias"""
2377
2397
2378 aname = parameter_s.strip()
2398 aname = parameter_s.strip()
2379 if aname in self.shell.alias_table:
2399 if aname in self.shell.alias_table:
2380 del self.shell.alias_table[aname]
2400 del self.shell.alias_table[aname]
2381
2401
2382 def magic_rehash(self, parameter_s = ''):
2402 def magic_rehash(self, parameter_s = ''):
2383 """Update the alias table with all entries in $PATH.
2403 """Update the alias table with all entries in $PATH.
2384
2404
2385 This version does no checks on execute permissions or whether the
2405 This version does no checks on execute permissions or whether the
2386 contents of $PATH are truly files (instead of directories or something
2406 contents of $PATH are truly files (instead of directories or something
2387 else). For such a safer (but slower) version, use %rehashx."""
2407 else). For such a safer (but slower) version, use %rehashx."""
2388
2408
2389 # This function (and rehashx) manipulate the alias_table directly
2409 # This function (and rehashx) manipulate the alias_table directly
2390 # rather than calling magic_alias, for speed reasons. A rehash on a
2410 # rather than calling magic_alias, for speed reasons. A rehash on a
2391 # typical Linux box involves several thousand entries, so efficiency
2411 # typical Linux box involves several thousand entries, so efficiency
2392 # here is a top concern.
2412 # here is a top concern.
2393
2413
2394 path = filter(os.path.isdir,os.environ['PATH'].split(os.pathsep))
2414 path = filter(os.path.isdir,os.environ['PATH'].split(os.pathsep))
2395 alias_table = self.shell.alias_table
2415 alias_table = self.shell.alias_table
2396 for pdir in path:
2416 for pdir in path:
2397 for ff in os.listdir(pdir):
2417 for ff in os.listdir(pdir):
2398 # each entry in the alias table must be (N,name), where
2418 # each entry in the alias table must be (N,name), where
2399 # N is the number of positional arguments of the alias.
2419 # N is the number of positional arguments of the alias.
2400 alias_table[ff] = (0,ff)
2420 alias_table[ff] = (0,ff)
2401 # Make sure the alias table doesn't contain keywords or builtins
2421 # Make sure the alias table doesn't contain keywords or builtins
2402 self.shell.alias_table_validate()
2422 self.shell.alias_table_validate()
2403 # Call again init_auto_alias() so we get 'rm -i' and other modified
2423 # Call again init_auto_alias() so we get 'rm -i' and other modified
2404 # aliases since %rehash will probably clobber them
2424 # aliases since %rehash will probably clobber them
2405 self.shell.init_auto_alias()
2425 self.shell.init_auto_alias()
2406
2426
2407 def magic_rehashx(self, parameter_s = ''):
2427 def magic_rehashx(self, parameter_s = ''):
2408 """Update the alias table with all executable files in $PATH.
2428 """Update the alias table with all executable files in $PATH.
2409
2429
2410 This version explicitly checks that every entry in $PATH is a file
2430 This version explicitly checks that every entry in $PATH is a file
2411 with execute access (os.X_OK), so it is much slower than %rehash.
2431 with execute access (os.X_OK), so it is much slower than %rehash.
2412
2432
2413 Under Windows, it checks executability as a match agains a
2433 Under Windows, it checks executability as a match agains a
2414 '|'-separated string of extensions, stored in the IPython config
2434 '|'-separated string of extensions, stored in the IPython config
2415 variable win_exec_ext. This defaults to 'exe|com|bat'. """
2435 variable win_exec_ext. This defaults to 'exe|com|bat'. """
2416
2436
2417 path = [os.path.abspath(os.path.expanduser(p)) for p in
2437 path = [os.path.abspath(os.path.expanduser(p)) for p in
2418 os.environ['PATH'].split(os.pathsep)]
2438 os.environ['PATH'].split(os.pathsep)]
2419 path = filter(os.path.isdir,path)
2439 path = filter(os.path.isdir,path)
2420
2440
2421 alias_table = self.shell.alias_table
2441 alias_table = self.shell.alias_table
2422 syscmdlist = []
2442 syscmdlist = []
2423 if os.name == 'posix':
2443 if os.name == 'posix':
2424 isexec = lambda fname:os.path.isfile(fname) and \
2444 isexec = lambda fname:os.path.isfile(fname) and \
2425 os.access(fname,os.X_OK)
2445 os.access(fname,os.X_OK)
2426 else:
2446 else:
2427
2447
2428 try:
2448 try:
2429 winext = os.environ['pathext'].replace(';','|').replace('.','')
2449 winext = os.environ['pathext'].replace(';','|').replace('.','')
2430 except KeyError:
2450 except KeyError:
2431 winext = 'exe|com|bat'
2451 winext = 'exe|com|bat'
2432
2452
2433 execre = re.compile(r'(.*)\.(%s)$' % winext,re.IGNORECASE)
2453 execre = re.compile(r'(.*)\.(%s)$' % winext,re.IGNORECASE)
2434 isexec = lambda fname:os.path.isfile(fname) and execre.match(fname)
2454 isexec = lambda fname:os.path.isfile(fname) and execre.match(fname)
2435 savedir = os.getcwd()
2455 savedir = os.getcwd()
2436 try:
2456 try:
2437 # write the whole loop for posix/Windows so we don't have an if in
2457 # write the whole loop for posix/Windows so we don't have an if in
2438 # the innermost part
2458 # the innermost part
2439 if os.name == 'posix':
2459 if os.name == 'posix':
2440 for pdir in path:
2460 for pdir in path:
2441 os.chdir(pdir)
2461 os.chdir(pdir)
2442 for ff in os.listdir(pdir):
2462 for ff in os.listdir(pdir):
2443 if isexec(ff) and ff not in self.shell.no_alias:
2463 if isexec(ff) and ff not in self.shell.no_alias:
2444 # each entry in the alias table must be (N,name),
2464 # each entry in the alias table must be (N,name),
2445 # where N is the number of positional arguments of the
2465 # where N is the number of positional arguments of the
2446 # alias.
2466 # alias.
2447 alias_table[ff] = (0,ff)
2467 alias_table[ff] = (0,ff)
2448 syscmdlist.append(ff)
2468 syscmdlist.append(ff)
2449 else:
2469 else:
2450 for pdir in path:
2470 for pdir in path:
2451 os.chdir(pdir)
2471 os.chdir(pdir)
2452 for ff in os.listdir(pdir):
2472 for ff in os.listdir(pdir):
2453 if isexec(ff) and os.path.splitext(ff)[0] not in self.shell.no_alias:
2473 if isexec(ff) and os.path.splitext(ff)[0] not in self.shell.no_alias:
2454 alias_table[execre.sub(r'\1',ff)] = (0,ff)
2474 alias_table[execre.sub(r'\1',ff)] = (0,ff)
2455 syscmdlist.append(ff)
2475 syscmdlist.append(ff)
2456 # Make sure the alias table doesn't contain keywords or builtins
2476 # Make sure the alias table doesn't contain keywords or builtins
2457 self.shell.alias_table_validate()
2477 self.shell.alias_table_validate()
2458 # Call again init_auto_alias() so we get 'rm -i' and other
2478 # Call again init_auto_alias() so we get 'rm -i' and other
2459 # modified aliases since %rehashx will probably clobber them
2479 # modified aliases since %rehashx will probably clobber them
2460 self.shell.init_auto_alias()
2480 self.shell.init_auto_alias()
2461 db = self.getapi().db
2481 db = self.getapi().db
2462 db['syscmdlist'] = syscmdlist
2482 db['syscmdlist'] = syscmdlist
2463 finally:
2483 finally:
2464 os.chdir(savedir)
2484 os.chdir(savedir)
2465
2485
2466 def magic_pwd(self, parameter_s = ''):
2486 def magic_pwd(self, parameter_s = ''):
2467 """Return the current working directory path."""
2487 """Return the current working directory path."""
2468 return os.getcwd()
2488 return os.getcwd()
2469
2489
2470 def magic_cd(self, parameter_s=''):
2490 def magic_cd(self, parameter_s=''):
2471 """Change the current working directory.
2491 """Change the current working directory.
2472
2492
2473 This command automatically maintains an internal list of directories
2493 This command automatically maintains an internal list of directories
2474 you visit during your IPython session, in the variable _dh. The
2494 you visit during your IPython session, in the variable _dh. The
2475 command %dhist shows this history nicely formatted.
2495 command %dhist shows this history nicely formatted.
2476
2496
2477 Usage:
2497 Usage:
2478
2498
2479 cd 'dir': changes to directory 'dir'.
2499 cd 'dir': changes to directory 'dir'.
2480
2500
2481 cd -: changes to the last visited directory.
2501 cd -: changes to the last visited directory.
2482
2502
2483 cd -<n>: changes to the n-th directory in the directory history.
2503 cd -<n>: changes to the n-th directory in the directory history.
2484
2504
2485 cd -b <bookmark_name>: jump to a bookmark set by %bookmark
2505 cd -b <bookmark_name>: jump to a bookmark set by %bookmark
2486 (note: cd <bookmark_name> is enough if there is no
2506 (note: cd <bookmark_name> is enough if there is no
2487 directory <bookmark_name>, but a bookmark with the name exists.)
2507 directory <bookmark_name>, but a bookmark with the name exists.)
2488
2508
2489 Options:
2509 Options:
2490
2510
2491 -q: quiet. Do not print the working directory after the cd command is
2511 -q: quiet. Do not print the working directory after the cd command is
2492 executed. By default IPython's cd command does print this directory,
2512 executed. By default IPython's cd command does print this directory,
2493 since the default prompts do not display path information.
2513 since the default prompts do not display path information.
2494
2514
2495 Note that !cd doesn't work for this purpose because the shell where
2515 Note that !cd doesn't work for this purpose because the shell where
2496 !command runs is immediately discarded after executing 'command'."""
2516 !command runs is immediately discarded after executing 'command'."""
2497
2517
2498 parameter_s = parameter_s.strip()
2518 parameter_s = parameter_s.strip()
2499 #bkms = self.shell.persist.get("bookmarks",{})
2519 #bkms = self.shell.persist.get("bookmarks",{})
2500
2520
2501 numcd = re.match(r'(-)(\d+)$',parameter_s)
2521 numcd = re.match(r'(-)(\d+)$',parameter_s)
2502 # jump in directory history by number
2522 # jump in directory history by number
2503 if numcd:
2523 if numcd:
2504 nn = int(numcd.group(2))
2524 nn = int(numcd.group(2))
2505 try:
2525 try:
2506 ps = self.shell.user_ns['_dh'][nn]
2526 ps = self.shell.user_ns['_dh'][nn]
2507 except IndexError:
2527 except IndexError:
2508 print 'The requested directory does not exist in history.'
2528 print 'The requested directory does not exist in history.'
2509 return
2529 return
2510 else:
2530 else:
2511 opts = {}
2531 opts = {}
2512 else:
2532 else:
2513 #turn all non-space-escaping backslashes to slashes,
2533 #turn all non-space-escaping backslashes to slashes,
2514 # for c:\windows\directory\names\
2534 # for c:\windows\directory\names\
2515 parameter_s = re.sub(r'\\(?! )','/', parameter_s)
2535 parameter_s = re.sub(r'\\(?! )','/', parameter_s)
2516 opts,ps = self.parse_options(parameter_s,'qb',mode='string')
2536 opts,ps = self.parse_options(parameter_s,'qb',mode='string')
2517 # jump to previous
2537 # jump to previous
2518 if ps == '-':
2538 if ps == '-':
2519 try:
2539 try:
2520 ps = self.shell.user_ns['_dh'][-2]
2540 ps = self.shell.user_ns['_dh'][-2]
2521 except IndexError:
2541 except IndexError:
2522 print 'No previous directory to change to.'
2542 print 'No previous directory to change to.'
2523 return
2543 return
2524 # jump to bookmark if needed
2544 # jump to bookmark if needed
2525 else:
2545 else:
2526 if not os.path.isdir(ps) or opts.has_key('b'):
2546 if not os.path.isdir(ps) or opts.has_key('b'):
2527 bkms = self.db.get('bookmarks', {})
2547 bkms = self.db.get('bookmarks', {})
2528
2548
2529 if bkms.has_key(ps):
2549 if bkms.has_key(ps):
2530 target = bkms[ps]
2550 target = bkms[ps]
2531 print '(bookmark:%s) -> %s' % (ps,target)
2551 print '(bookmark:%s) -> %s' % (ps,target)
2532 ps = target
2552 ps = target
2533 else:
2553 else:
2534 if opts.has_key('b'):
2554 if opts.has_key('b'):
2535 error("Bookmark '%s' not found. "
2555 error("Bookmark '%s' not found. "
2536 "Use '%%bookmark -l' to see your bookmarks." % ps)
2556 "Use '%%bookmark -l' to see your bookmarks." % ps)
2537 return
2557 return
2538
2558
2539 # at this point ps should point to the target dir
2559 # at this point ps should point to the target dir
2540 if ps:
2560 if ps:
2541 try:
2561 try:
2542 os.chdir(os.path.expanduser(ps))
2562 os.chdir(os.path.expanduser(ps))
2543 ttitle = ("IPy:" + (
2563 ttitle = ("IPy:" + (
2544 os.getcwd() == '/' and '/' or os.path.basename(os.getcwd())))
2564 os.getcwd() == '/' and '/' or os.path.basename(os.getcwd())))
2545 platutils.set_term_title(ttitle)
2565 platutils.set_term_title(ttitle)
2546 except OSError:
2566 except OSError:
2547 print sys.exc_info()[1]
2567 print sys.exc_info()[1]
2548 else:
2568 else:
2549 self.shell.user_ns['_dh'].append(os.getcwd())
2569 self.shell.user_ns['_dh'].append(os.getcwd())
2550 else:
2570 else:
2551 os.chdir(self.shell.home_dir)
2571 os.chdir(self.shell.home_dir)
2552 platutils.set_term_title("IPy:~")
2572 platutils.set_term_title("IPy:~")
2553 self.shell.user_ns['_dh'].append(os.getcwd())
2573 self.shell.user_ns['_dh'].append(os.getcwd())
2554 if not 'q' in opts:
2574 if not 'q' in opts:
2555 print self.shell.user_ns['_dh'][-1]
2575 print self.shell.user_ns['_dh'][-1]
2556
2576
2557 def magic_dhist(self, parameter_s=''):
2577 def magic_dhist(self, parameter_s=''):
2558 """Print your history of visited directories.
2578 """Print your history of visited directories.
2559
2579
2560 %dhist -> print full history\\
2580 %dhist -> print full history\\
2561 %dhist n -> print last n entries only\\
2581 %dhist n -> print last n entries only\\
2562 %dhist n1 n2 -> print entries between n1 and n2 (n1 not included)\\
2582 %dhist n1 n2 -> print entries between n1 and n2 (n1 not included)\\
2563
2583
2564 This history is automatically maintained by the %cd command, and
2584 This history is automatically maintained by the %cd command, and
2565 always available as the global list variable _dh. You can use %cd -<n>
2585 always available as the global list variable _dh. You can use %cd -<n>
2566 to go to directory number <n>."""
2586 to go to directory number <n>."""
2567
2587
2568 dh = self.shell.user_ns['_dh']
2588 dh = self.shell.user_ns['_dh']
2569 if parameter_s:
2589 if parameter_s:
2570 try:
2590 try:
2571 args = map(int,parameter_s.split())
2591 args = map(int,parameter_s.split())
2572 except:
2592 except:
2573 self.arg_err(Magic.magic_dhist)
2593 self.arg_err(Magic.magic_dhist)
2574 return
2594 return
2575 if len(args) == 1:
2595 if len(args) == 1:
2576 ini,fin = max(len(dh)-(args[0]),0),len(dh)
2596 ini,fin = max(len(dh)-(args[0]),0),len(dh)
2577 elif len(args) == 2:
2597 elif len(args) == 2:
2578 ini,fin = args
2598 ini,fin = args
2579 else:
2599 else:
2580 self.arg_err(Magic.magic_dhist)
2600 self.arg_err(Magic.magic_dhist)
2581 return
2601 return
2582 else:
2602 else:
2583 ini,fin = 0,len(dh)
2603 ini,fin = 0,len(dh)
2584 nlprint(dh,
2604 nlprint(dh,
2585 header = 'Directory history (kept in _dh)',
2605 header = 'Directory history (kept in _dh)',
2586 start=ini,stop=fin)
2606 start=ini,stop=fin)
2587
2607
2588 def magic_env(self, parameter_s=''):
2608 def magic_env(self, parameter_s=''):
2589 """List environment variables."""
2609 """List environment variables."""
2590
2610
2591 return os.environ.data
2611 return os.environ.data
2592
2612
2593 def magic_pushd(self, parameter_s=''):
2613 def magic_pushd(self, parameter_s=''):
2594 """Place the current dir on stack and change directory.
2614 """Place the current dir on stack and change directory.
2595
2615
2596 Usage:\\
2616 Usage:\\
2597 %pushd ['dirname']
2617 %pushd ['dirname']
2598
2618
2599 %pushd with no arguments does a %pushd to your home directory.
2619 %pushd with no arguments does a %pushd to your home directory.
2600 """
2620 """
2601 if parameter_s == '': parameter_s = '~'
2621 if parameter_s == '': parameter_s = '~'
2602 dir_s = self.shell.dir_stack
2622 dir_s = self.shell.dir_stack
2603 if len(dir_s)>0 and os.path.expanduser(parameter_s) != \
2623 if len(dir_s)>0 and os.path.expanduser(parameter_s) != \
2604 os.path.expanduser(self.shell.dir_stack[0]):
2624 os.path.expanduser(self.shell.dir_stack[0]):
2605 try:
2625 try:
2606 self.magic_cd(parameter_s)
2626 self.magic_cd(parameter_s)
2607 dir_s.insert(0,os.getcwd().replace(self.home_dir,'~'))
2627 dir_s.insert(0,os.getcwd().replace(self.home_dir,'~'))
2608 self.magic_dirs()
2628 self.magic_dirs()
2609 except:
2629 except:
2610 print 'Invalid directory'
2630 print 'Invalid directory'
2611 else:
2631 else:
2612 print 'You are already there!'
2632 print 'You are already there!'
2613
2633
2614 def magic_popd(self, parameter_s=''):
2634 def magic_popd(self, parameter_s=''):
2615 """Change to directory popped off the top of the stack.
2635 """Change to directory popped off the top of the stack.
2616 """
2636 """
2617 if len (self.shell.dir_stack) > 1:
2637 if len (self.shell.dir_stack) > 1:
2618 self.shell.dir_stack.pop(0)
2638 self.shell.dir_stack.pop(0)
2619 self.magic_cd(self.shell.dir_stack[0])
2639 self.magic_cd(self.shell.dir_stack[0])
2620 print self.shell.dir_stack[0]
2640 print self.shell.dir_stack[0]
2621 else:
2641 else:
2622 print "You can't remove the starting directory from the stack:",\
2642 print "You can't remove the starting directory from the stack:",\
2623 self.shell.dir_stack
2643 self.shell.dir_stack
2624
2644
2625 def magic_dirs(self, parameter_s=''):
2645 def magic_dirs(self, parameter_s=''):
2626 """Return the current directory stack."""
2646 """Return the current directory stack."""
2627
2647
2628 return self.shell.dir_stack[:]
2648 return self.shell.dir_stack[:]
2629
2649
2630 def magic_sc(self, parameter_s=''):
2650 def magic_sc(self, parameter_s=''):
2631 """Shell capture - execute a shell command and capture its output.
2651 """Shell capture - execute a shell command and capture its output.
2632
2652
2633 DEPRECATED. Suboptimal, retained for backwards compatibility.
2653 DEPRECATED. Suboptimal, retained for backwards compatibility.
2634
2654
2635 You should use the form 'var = !command' instead. Example:
2655 You should use the form 'var = !command' instead. Example:
2636
2656
2637 "%sc -l myfiles = ls ~" should now be written as
2657 "%sc -l myfiles = ls ~" should now be written as
2638
2658
2639 "myfiles = !ls ~"
2659 "myfiles = !ls ~"
2640
2660
2641 myfiles.s, myfiles.l and myfiles.n still apply as documented
2661 myfiles.s, myfiles.l and myfiles.n still apply as documented
2642 below.
2662 below.
2643
2663
2644 --
2664 --
2645 %sc [options] varname=command
2665 %sc [options] varname=command
2646
2666
2647 IPython will run the given command using commands.getoutput(), and
2667 IPython will run the given command using commands.getoutput(), and
2648 will then update the user's interactive namespace with a variable
2668 will then update the user's interactive namespace with a variable
2649 called varname, containing the value of the call. Your command can
2669 called varname, containing the value of the call. Your command can
2650 contain shell wildcards, pipes, etc.
2670 contain shell wildcards, pipes, etc.
2651
2671
2652 The '=' sign in the syntax is mandatory, and the variable name you
2672 The '=' sign in the syntax is mandatory, and the variable name you
2653 supply must follow Python's standard conventions for valid names.
2673 supply must follow Python's standard conventions for valid names.
2654
2674
2655 (A special format without variable name exists for internal use)
2675 (A special format without variable name exists for internal use)
2656
2676
2657 Options:
2677 Options:
2658
2678
2659 -l: list output. Split the output on newlines into a list before
2679 -l: list output. Split the output on newlines into a list before
2660 assigning it to the given variable. By default the output is stored
2680 assigning it to the given variable. By default the output is stored
2661 as a single string.
2681 as a single string.
2662
2682
2663 -v: verbose. Print the contents of the variable.
2683 -v: verbose. Print the contents of the variable.
2664
2684
2665 In most cases you should not need to split as a list, because the
2685 In most cases you should not need to split as a list, because the
2666 returned value is a special type of string which can automatically
2686 returned value is a special type of string which can automatically
2667 provide its contents either as a list (split on newlines) or as a
2687 provide its contents either as a list (split on newlines) or as a
2668 space-separated string. These are convenient, respectively, either
2688 space-separated string. These are convenient, respectively, either
2669 for sequential processing or to be passed to a shell command.
2689 for sequential processing or to be passed to a shell command.
2670
2690
2671 For example:
2691 For example:
2672
2692
2673 # Capture into variable a
2693 # Capture into variable a
2674 In [9]: sc a=ls *py
2694 In [9]: sc a=ls *py
2675
2695
2676 # a is a string with embedded newlines
2696 # a is a string with embedded newlines
2677 In [10]: a
2697 In [10]: a
2678 Out[10]: 'setup.py\nwin32_manual_post_install.py'
2698 Out[10]: 'setup.py\nwin32_manual_post_install.py'
2679
2699
2680 # which can be seen as a list:
2700 # which can be seen as a list:
2681 In [11]: a.l
2701 In [11]: a.l
2682 Out[11]: ['setup.py', 'win32_manual_post_install.py']
2702 Out[11]: ['setup.py', 'win32_manual_post_install.py']
2683
2703
2684 # or as a whitespace-separated string:
2704 # or as a whitespace-separated string:
2685 In [12]: a.s
2705 In [12]: a.s
2686 Out[12]: 'setup.py win32_manual_post_install.py'
2706 Out[12]: 'setup.py win32_manual_post_install.py'
2687
2707
2688 # a.s is useful to pass as a single command line:
2708 # a.s is useful to pass as a single command line:
2689 In [13]: !wc -l $a.s
2709 In [13]: !wc -l $a.s
2690 146 setup.py
2710 146 setup.py
2691 130 win32_manual_post_install.py
2711 130 win32_manual_post_install.py
2692 276 total
2712 276 total
2693
2713
2694 # while the list form is useful to loop over:
2714 # while the list form is useful to loop over:
2695 In [14]: for f in a.l:
2715 In [14]: for f in a.l:
2696 ....: !wc -l $f
2716 ....: !wc -l $f
2697 ....:
2717 ....:
2698 146 setup.py
2718 146 setup.py
2699 130 win32_manual_post_install.py
2719 130 win32_manual_post_install.py
2700
2720
2701 Similiarly, the lists returned by the -l option are also special, in
2721 Similiarly, the lists returned by the -l option are also special, in
2702 the sense that you can equally invoke the .s attribute on them to
2722 the sense that you can equally invoke the .s attribute on them to
2703 automatically get a whitespace-separated string from their contents:
2723 automatically get a whitespace-separated string from their contents:
2704
2724
2705 In [1]: sc -l b=ls *py
2725 In [1]: sc -l b=ls *py
2706
2726
2707 In [2]: b
2727 In [2]: b
2708 Out[2]: ['setup.py', 'win32_manual_post_install.py']
2728 Out[2]: ['setup.py', 'win32_manual_post_install.py']
2709
2729
2710 In [3]: b.s
2730 In [3]: b.s
2711 Out[3]: 'setup.py win32_manual_post_install.py'
2731 Out[3]: 'setup.py win32_manual_post_install.py'
2712
2732
2713 In summary, both the lists and strings used for ouptut capture have
2733 In summary, both the lists and strings used for ouptut capture have
2714 the following special attributes:
2734 the following special attributes:
2715
2735
2716 .l (or .list) : value as list.
2736 .l (or .list) : value as list.
2717 .n (or .nlstr): value as newline-separated string.
2737 .n (or .nlstr): value as newline-separated string.
2718 .s (or .spstr): value as space-separated string.
2738 .s (or .spstr): value as space-separated string.
2719 """
2739 """
2720
2740
2721 opts,args = self.parse_options(parameter_s,'lv')
2741 opts,args = self.parse_options(parameter_s,'lv')
2722 # Try to get a variable name and command to run
2742 # Try to get a variable name and command to run
2723 try:
2743 try:
2724 # the variable name must be obtained from the parse_options
2744 # the variable name must be obtained from the parse_options
2725 # output, which uses shlex.split to strip options out.
2745 # output, which uses shlex.split to strip options out.
2726 var,_ = args.split('=',1)
2746 var,_ = args.split('=',1)
2727 var = var.strip()
2747 var = var.strip()
2728 # But the the command has to be extracted from the original input
2748 # But the the command has to be extracted from the original input
2729 # parameter_s, not on what parse_options returns, to avoid the
2749 # parameter_s, not on what parse_options returns, to avoid the
2730 # quote stripping which shlex.split performs on it.
2750 # quote stripping which shlex.split performs on it.
2731 _,cmd = parameter_s.split('=',1)
2751 _,cmd = parameter_s.split('=',1)
2732 except ValueError:
2752 except ValueError:
2733 var,cmd = '',''
2753 var,cmd = '',''
2734 # If all looks ok, proceed
2754 # If all looks ok, proceed
2735 out,err = self.shell.getoutputerror(cmd)
2755 out,err = self.shell.getoutputerror(cmd)
2736 if err:
2756 if err:
2737 print >> Term.cerr,err
2757 print >> Term.cerr,err
2738 if opts.has_key('l'):
2758 if opts.has_key('l'):
2739 out = SList(out.split('\n'))
2759 out = SList(out.split('\n'))
2740 else:
2760 else:
2741 out = LSString(out)
2761 out = LSString(out)
2742 if opts.has_key('v'):
2762 if opts.has_key('v'):
2743 print '%s ==\n%s' % (var,pformat(out))
2763 print '%s ==\n%s' % (var,pformat(out))
2744 if var:
2764 if var:
2745 self.shell.user_ns.update({var:out})
2765 self.shell.user_ns.update({var:out})
2746 else:
2766 else:
2747 return out
2767 return out
2748
2768
2749 def magic_sx(self, parameter_s=''):
2769 def magic_sx(self, parameter_s=''):
2750 """Shell execute - run a shell command and capture its output.
2770 """Shell execute - run a shell command and capture its output.
2751
2771
2752 %sx command
2772 %sx command
2753
2773
2754 IPython will run the given command using commands.getoutput(), and
2774 IPython will run the given command using commands.getoutput(), and
2755 return the result formatted as a list (split on '\\n'). Since the
2775 return the result formatted as a list (split on '\\n'). Since the
2756 output is _returned_, it will be stored in ipython's regular output
2776 output is _returned_, it will be stored in ipython's regular output
2757 cache Out[N] and in the '_N' automatic variables.
2777 cache Out[N] and in the '_N' automatic variables.
2758
2778
2759 Notes:
2779 Notes:
2760
2780
2761 1) If an input line begins with '!!', then %sx is automatically
2781 1) If an input line begins with '!!', then %sx is automatically
2762 invoked. That is, while:
2782 invoked. That is, while:
2763 !ls
2783 !ls
2764 causes ipython to simply issue system('ls'), typing
2784 causes ipython to simply issue system('ls'), typing
2765 !!ls
2785 !!ls
2766 is a shorthand equivalent to:
2786 is a shorthand equivalent to:
2767 %sx ls
2787 %sx ls
2768
2788
2769 2) %sx differs from %sc in that %sx automatically splits into a list,
2789 2) %sx differs from %sc in that %sx automatically splits into a list,
2770 like '%sc -l'. The reason for this is to make it as easy as possible
2790 like '%sc -l'. The reason for this is to make it as easy as possible
2771 to process line-oriented shell output via further python commands.
2791 to process line-oriented shell output via further python commands.
2772 %sc is meant to provide much finer control, but requires more
2792 %sc is meant to provide much finer control, but requires more
2773 typing.
2793 typing.
2774
2794
2775 3) Just like %sc -l, this is a list with special attributes:
2795 3) Just like %sc -l, this is a list with special attributes:
2776
2796
2777 .l (or .list) : value as list.
2797 .l (or .list) : value as list.
2778 .n (or .nlstr): value as newline-separated string.
2798 .n (or .nlstr): value as newline-separated string.
2779 .s (or .spstr): value as whitespace-separated string.
2799 .s (or .spstr): value as whitespace-separated string.
2780
2800
2781 This is very useful when trying to use such lists as arguments to
2801 This is very useful when trying to use such lists as arguments to
2782 system commands."""
2802 system commands."""
2783
2803
2784 if parameter_s:
2804 if parameter_s:
2785 out,err = self.shell.getoutputerror(parameter_s)
2805 out,err = self.shell.getoutputerror(parameter_s)
2786 if err:
2806 if err:
2787 print >> Term.cerr,err
2807 print >> Term.cerr,err
2788 return SList(out.split('\n'))
2808 return SList(out.split('\n'))
2789
2809
2790 def magic_bg(self, parameter_s=''):
2810 def magic_bg(self, parameter_s=''):
2791 """Run a job in the background, in a separate thread.
2811 """Run a job in the background, in a separate thread.
2792
2812
2793 For example,
2813 For example,
2794
2814
2795 %bg myfunc(x,y,z=1)
2815 %bg myfunc(x,y,z=1)
2796
2816
2797 will execute 'myfunc(x,y,z=1)' in a background thread. As soon as the
2817 will execute 'myfunc(x,y,z=1)' in a background thread. As soon as the
2798 execution starts, a message will be printed indicating the job
2818 execution starts, a message will be printed indicating the job
2799 number. If your job number is 5, you can use
2819 number. If your job number is 5, you can use
2800
2820
2801 myvar = jobs.result(5) or myvar = jobs[5].result
2821 myvar = jobs.result(5) or myvar = jobs[5].result
2802
2822
2803 to assign this result to variable 'myvar'.
2823 to assign this result to variable 'myvar'.
2804
2824
2805 IPython has a job manager, accessible via the 'jobs' object. You can
2825 IPython has a job manager, accessible via the 'jobs' object. You can
2806 type jobs? to get more information about it, and use jobs.<TAB> to see
2826 type jobs? to get more information about it, and use jobs.<TAB> to see
2807 its attributes. All attributes not starting with an underscore are
2827 its attributes. All attributes not starting with an underscore are
2808 meant for public use.
2828 meant for public use.
2809
2829
2810 In particular, look at the jobs.new() method, which is used to create
2830 In particular, look at the jobs.new() method, which is used to create
2811 new jobs. This magic %bg function is just a convenience wrapper
2831 new jobs. This magic %bg function is just a convenience wrapper
2812 around jobs.new(), for expression-based jobs. If you want to create a
2832 around jobs.new(), for expression-based jobs. If you want to create a
2813 new job with an explicit function object and arguments, you must call
2833 new job with an explicit function object and arguments, you must call
2814 jobs.new() directly.
2834 jobs.new() directly.
2815
2835
2816 The jobs.new docstring also describes in detail several important
2836 The jobs.new docstring also describes in detail several important
2817 caveats associated with a thread-based model for background job
2837 caveats associated with a thread-based model for background job
2818 execution. Type jobs.new? for details.
2838 execution. Type jobs.new? for details.
2819
2839
2820 You can check the status of all jobs with jobs.status().
2840 You can check the status of all jobs with jobs.status().
2821
2841
2822 The jobs variable is set by IPython into the Python builtin namespace.
2842 The jobs variable is set by IPython into the Python builtin namespace.
2823 If you ever declare a variable named 'jobs', you will shadow this
2843 If you ever declare a variable named 'jobs', you will shadow this
2824 name. You can either delete your global jobs variable to regain
2844 name. You can either delete your global jobs variable to regain
2825 access to the job manager, or make a new name and assign it manually
2845 access to the job manager, or make a new name and assign it manually
2826 to the manager (stored in IPython's namespace). For example, to
2846 to the manager (stored in IPython's namespace). For example, to
2827 assign the job manager to the Jobs name, use:
2847 assign the job manager to the Jobs name, use:
2828
2848
2829 Jobs = __builtins__.jobs"""
2849 Jobs = __builtins__.jobs"""
2830
2850
2831 self.shell.jobs.new(parameter_s,self.shell.user_ns)
2851 self.shell.jobs.new(parameter_s,self.shell.user_ns)
2832
2852
2833
2853
2834 def magic_bookmark(self, parameter_s=''):
2854 def magic_bookmark(self, parameter_s=''):
2835 """Manage IPython's bookmark system.
2855 """Manage IPython's bookmark system.
2836
2856
2837 %bookmark <name> - set bookmark to current dir
2857 %bookmark <name> - set bookmark to current dir
2838 %bookmark <name> <dir> - set bookmark to <dir>
2858 %bookmark <name> <dir> - set bookmark to <dir>
2839 %bookmark -l - list all bookmarks
2859 %bookmark -l - list all bookmarks
2840 %bookmark -d <name> - remove bookmark
2860 %bookmark -d <name> - remove bookmark
2841 %bookmark -r - remove all bookmarks
2861 %bookmark -r - remove all bookmarks
2842
2862
2843 You can later on access a bookmarked folder with:
2863 You can later on access a bookmarked folder with:
2844 %cd -b <name>
2864 %cd -b <name>
2845 or simply '%cd <name>' if there is no directory called <name> AND
2865 or simply '%cd <name>' if there is no directory called <name> AND
2846 there is such a bookmark defined.
2866 there is such a bookmark defined.
2847
2867
2848 Your bookmarks persist through IPython sessions, but they are
2868 Your bookmarks persist through IPython sessions, but they are
2849 associated with each profile."""
2869 associated with each profile."""
2850
2870
2851 opts,args = self.parse_options(parameter_s,'drl',mode='list')
2871 opts,args = self.parse_options(parameter_s,'drl',mode='list')
2852 if len(args) > 2:
2872 if len(args) > 2:
2853 error('You can only give at most two arguments')
2873 error('You can only give at most two arguments')
2854 return
2874 return
2855
2875
2856 bkms = self.db.get('bookmarks',{})
2876 bkms = self.db.get('bookmarks',{})
2857
2877
2858 if opts.has_key('d'):
2878 if opts.has_key('d'):
2859 try:
2879 try:
2860 todel = args[0]
2880 todel = args[0]
2861 except IndexError:
2881 except IndexError:
2862 error('You must provide a bookmark to delete')
2882 error('You must provide a bookmark to delete')
2863 else:
2883 else:
2864 try:
2884 try:
2865 del bkms[todel]
2885 del bkms[todel]
2866 except:
2886 except:
2867 error("Can't delete bookmark '%s'" % todel)
2887 error("Can't delete bookmark '%s'" % todel)
2868 elif opts.has_key('r'):
2888 elif opts.has_key('r'):
2869 bkms = {}
2889 bkms = {}
2870 elif opts.has_key('l'):
2890 elif opts.has_key('l'):
2871 bks = bkms.keys()
2891 bks = bkms.keys()
2872 bks.sort()
2892 bks.sort()
2873 if bks:
2893 if bks:
2874 size = max(map(len,bks))
2894 size = max(map(len,bks))
2875 else:
2895 else:
2876 size = 0
2896 size = 0
2877 fmt = '%-'+str(size)+'s -> %s'
2897 fmt = '%-'+str(size)+'s -> %s'
2878 print 'Current bookmarks:'
2898 print 'Current bookmarks:'
2879 for bk in bks:
2899 for bk in bks:
2880 print fmt % (bk,bkms[bk])
2900 print fmt % (bk,bkms[bk])
2881 else:
2901 else:
2882 if not args:
2902 if not args:
2883 error("You must specify the bookmark name")
2903 error("You must specify the bookmark name")
2884 elif len(args)==1:
2904 elif len(args)==1:
2885 bkms[args[0]] = os.getcwd()
2905 bkms[args[0]] = os.getcwd()
2886 elif len(args)==2:
2906 elif len(args)==2:
2887 bkms[args[0]] = args[1]
2907 bkms[args[0]] = args[1]
2888 self.db['bookmarks'] = bkms
2908 self.db['bookmarks'] = bkms
2889
2909
2890 def magic_pycat(self, parameter_s=''):
2910 def magic_pycat(self, parameter_s=''):
2891 """Show a syntax-highlighted file through a pager.
2911 """Show a syntax-highlighted file through a pager.
2892
2912
2893 This magic is similar to the cat utility, but it will assume the file
2913 This magic is similar to the cat utility, but it will assume the file
2894 to be Python source and will show it with syntax highlighting. """
2914 to be Python source and will show it with syntax highlighting. """
2895
2915
2896 try:
2916 try:
2897 filename = get_py_filename(parameter_s)
2917 filename = get_py_filename(parameter_s)
2898 cont = file_read(filename)
2918 cont = file_read(filename)
2899 except IOError:
2919 except IOError:
2900 try:
2920 try:
2901 cont = eval(parameter_s,self.user_ns)
2921 cont = eval(parameter_s,self.user_ns)
2902 except NameError:
2922 except NameError:
2903 cont = None
2923 cont = None
2904 if cont is None:
2924 if cont is None:
2905 print "Error: no such file or variable"
2925 print "Error: no such file or variable"
2906 return
2926 return
2907
2927
2908 page(self.shell.pycolorize(cont),
2928 page(self.shell.pycolorize(cont),
2909 screen_lines=self.shell.rc.screen_length)
2929 screen_lines=self.shell.rc.screen_length)
2910
2930
2911 def magic_cpaste(self, parameter_s=''):
2931 def magic_cpaste(self, parameter_s=''):
2912 """Allows you to paste & execute a pre-formatted code block from clipboard
2932 """Allows you to paste & execute a pre-formatted code block from clipboard
2913
2933
2914 You must terminate the block with '--' (two minus-signs) alone on the
2934 You must terminate the block with '--' (two minus-signs) alone on the
2915 line. You can also provide your own sentinel with '%paste -s %%' ('%%'
2935 line. You can also provide your own sentinel with '%paste -s %%' ('%%'
2916 is the new sentinel for this operation)
2936 is the new sentinel for this operation)
2917
2937
2918 The block is dedented prior to execution to enable execution of
2938 The block is dedented prior to execution to enable execution of
2919 method definitions. '>' characters at the beginning of a line is
2939 method definitions. '>' characters at the beginning of a line is
2920 ignored, to allow pasting directly from e-mails. The executed block
2940 ignored, to allow pasting directly from e-mails. The executed block
2921 is also assigned to variable named 'pasted_block' for later editing
2941 is also assigned to variable named 'pasted_block' for later editing
2922 with '%edit pasted_block'.
2942 with '%edit pasted_block'.
2923
2943
2924 You can also pass a variable name as an argument, e.g. '%cpaste foo'.
2944 You can also pass a variable name as an argument, e.g. '%cpaste foo'.
2925 This assigns the pasted block to variable 'foo' as string, without
2945 This assigns the pasted block to variable 'foo' as string, without
2926 dedenting or executing it.
2946 dedenting or executing it.
2927
2947
2928 Do not be alarmed by garbled output on Windows (it's a readline bug).
2948 Do not be alarmed by garbled output on Windows (it's a readline bug).
2929 Just press enter and type -- (and press enter again) and the block
2949 Just press enter and type -- (and press enter again) and the block
2930 will be what was just pasted.
2950 will be what was just pasted.
2931
2951
2932 IPython statements (magics, shell escapes) are not supported (yet).
2952 IPython statements (magics, shell escapes) are not supported (yet).
2933 """
2953 """
2934 opts,args = self.parse_options(parameter_s,'s:',mode='string')
2954 opts,args = self.parse_options(parameter_s,'s:',mode='string')
2935 par = args.strip()
2955 par = args.strip()
2936 sentinel = opts.get('s','--')
2956 sentinel = opts.get('s','--')
2937
2957
2938 from IPython import iplib
2958 from IPython import iplib
2939 lines = []
2959 lines = []
2940 print "Pasting code; enter '%s' alone on the line to stop." % sentinel
2960 print "Pasting code; enter '%s' alone on the line to stop." % sentinel
2941 while 1:
2961 while 1:
2942 l = iplib.raw_input_original(':')
2962 l = iplib.raw_input_original(':')
2943 if l ==sentinel:
2963 if l ==sentinel:
2944 break
2964 break
2945 lines.append(l.lstrip('>'))
2965 lines.append(l.lstrip('>'))
2946 block = "\n".join(lines) + '\n'
2966 block = "\n".join(lines) + '\n'
2947 #print "block:\n",block
2967 #print "block:\n",block
2948 if not par:
2968 if not par:
2949 b = textwrap.dedent(block)
2969 b = textwrap.dedent(block)
2950 exec b in self.user_ns
2970 exec b in self.user_ns
2951 self.user_ns['pasted_block'] = b
2971 self.user_ns['pasted_block'] = b
2952 else:
2972 else:
2953 self.user_ns[par] = block
2973 self.user_ns[par] = block
2954 print "Block assigned to '%s'" % par
2974 print "Block assigned to '%s'" % par
2955
2975
2956 def magic_quickref(self,arg):
2976 def magic_quickref(self,arg):
2957 """ Show a quick reference sheet """
2977 """ Show a quick reference sheet """
2958 import IPython.usage
2978 import IPython.usage
2959 qr = IPython.usage.quick_reference + self.magic_magic('-brief')
2979 qr = IPython.usage.quick_reference + self.magic_magic('-brief')
2960
2980
2961 page(qr)
2981 page(qr)
2962
2982
2963 def magic_upgrade(self,arg):
2983 def magic_upgrade(self,arg):
2964 """ Upgrade your IPython installation
2984 """ Upgrade your IPython installation
2965
2985
2966 This will copy the config files that don't yet exist in your
2986 This will copy the config files that don't yet exist in your
2967 ipython dir from the system config dir. Use this after upgrading
2987 ipython dir from the system config dir. Use this after upgrading
2968 IPython if you don't wish to delete your .ipython dir.
2988 IPython if you don't wish to delete your .ipython dir.
2969
2989
2970 Call with -nolegacy to get rid of ipythonrc* files (recommended for
2990 Call with -nolegacy to get rid of ipythonrc* files (recommended for
2971 new users)
2991 new users)
2972
2992
2973 """
2993 """
2974 ip = self.getapi()
2994 ip = self.getapi()
2975 ipinstallation = path(IPython.__file__).dirname()
2995 ipinstallation = path(IPython.__file__).dirname()
2976 upgrade_script = '%s "%s"' % (sys.executable,ipinstallation / 'upgrade_dir.py')
2996 upgrade_script = '%s "%s"' % (sys.executable,ipinstallation / 'upgrade_dir.py')
2977 src_config = ipinstallation / 'UserConfig'
2997 src_config = ipinstallation / 'UserConfig'
2978 userdir = path(ip.options.ipythondir)
2998 userdir = path(ip.options.ipythondir)
2979 cmd = '%s "%s" "%s"' % (upgrade_script, src_config, userdir)
2999 cmd = '%s "%s" "%s"' % (upgrade_script, src_config, userdir)
2980 print ">",cmd
3000 print ">",cmd
2981 shell(cmd)
3001 shell(cmd)
2982 if arg == '-nolegacy':
3002 if arg == '-nolegacy':
2983 legacy = userdir.files('ipythonrc*')
3003 legacy = userdir.files('ipythonrc*')
2984 print "Nuking legacy files:",legacy
3004 print "Nuking legacy files:",legacy
2985
3005
2986 [p.remove() for p in legacy]
3006 [p.remove() for p in legacy]
2987 suffix = (sys.platform == 'win32' and '.ini' or '')
3007 suffix = (sys.platform == 'win32' and '.ini' or '')
2988 (userdir / ('ipythonrc' + suffix)).write_text('# Empty, see ipy_user_conf.py\n')
3008 (userdir / ('ipythonrc' + suffix)).write_text('# Empty, see ipy_user_conf.py\n')
2989
3009
2990
3010
2991 # end Magic
3011 # end Magic
@@ -1,5759 +1,5766 b''
1 2006-10-09 Fernando Perez <Fernando.Perez@colorado.edu>
2
3 * IPython/Magic.py (Magic.parse_options): add a new posix option
4 to allow parsing of input args in magics that doesn't strip quotes
5 (if posix=False). This also closes %timeit bug reported by
6 Stefan.
7
1 2006-10-03 Ville Vainio <vivainio@gmail.com>
8 2006-10-03 Ville Vainio <vivainio@gmail.com>
2
9
3 * iplib.py (raw_input, interact): Return ValueError catching for
10 * iplib.py (raw_input, interact): Return ValueError catching for
4 raw_input. Fixes infinite loop for sys.stdin.close() or
11 raw_input. Fixes infinite loop for sys.stdin.close() or
5 sys.stdout.close().
12 sys.stdout.close().
6
13
7 2006-09-27 Fernando Perez <Fernando.Perez@colorado.edu>
14 2006-09-27 Fernando Perez <Fernando.Perez@colorado.edu>
8
15
9 * IPython/irunner.py (InteractiveRunner.run_source): small fixes
16 * IPython/irunner.py (InteractiveRunner.run_source): small fixes
10 to help in handling doctests. irunner is now pretty useful for
17 to help in handling doctests. irunner is now pretty useful for
11 running standalone scripts and simulate a full interactive session
18 running standalone scripts and simulate a full interactive session
12 in a format that can be then pasted as a doctest.
19 in a format that can be then pasted as a doctest.
13
20
14 * IPython/iplib.py (InteractiveShell.__init__): Install exit/quit
21 * IPython/iplib.py (InteractiveShell.__init__): Install exit/quit
15 on top of the default (useless) ones. This also fixes the nasty
22 on top of the default (useless) ones. This also fixes the nasty
16 way in which 2.5's Quitter() exits (reverted [1785]).
23 way in which 2.5's Quitter() exits (reverted [1785]).
17
24
18 * IPython/Debugger.py (Pdb.__init__): Fix ipdb to work with python
25 * IPython/Debugger.py (Pdb.__init__): Fix ipdb to work with python
19 2.5.
26 2.5.
20
27
21 * IPython/ultraTB.py (TBTools.set_colors): Make sure that ipdb
28 * IPython/ultraTB.py (TBTools.set_colors): Make sure that ipdb
22 color scheme is updated as well when color scheme is changed
29 color scheme is updated as well when color scheme is changed
23 interactively.
30 interactively.
24
31
25 2006-09-27 Ville Vainio <vivainio@gmail.com>
32 2006-09-27 Ville Vainio <vivainio@gmail.com>
26
33
27 * iplib.py (raw_input): python 2.5 closes stdin on quit -> avoid
34 * iplib.py (raw_input): python 2.5 closes stdin on quit -> avoid
28 infinite loop and just exit. It's a hack, but will do for a while.
35 infinite loop and just exit. It's a hack, but will do for a while.
29
36
30 2006-08-25 Walter Doerwald <walter@livinglogic.de>
37 2006-08-25 Walter Doerwald <walter@livinglogic.de>
31
38
32 * IPython/Extensions/ipipe.py (ils): Add arguments dirs and files to
39 * IPython/Extensions/ipipe.py (ils): Add arguments dirs and files to
33 the constructor, this makes it possible to get a list of only directories
40 the constructor, this makes it possible to get a list of only directories
34 or only files.
41 or only files.
35
42
36 2006-08-12 Ville Vainio <vivainio@gmail.com>
43 2006-08-12 Ville Vainio <vivainio@gmail.com>
37
44
38 * Fakemodule.py, OInspect.py: Reverted 2006-08-11 mods,
45 * Fakemodule.py, OInspect.py: Reverted 2006-08-11 mods,
39 they broke unittest
46 they broke unittest
40
47
41 2006-08-11 Ville Vainio <vivainio@gmail.com>
48 2006-08-11 Ville Vainio <vivainio@gmail.com>
42
49
43 * Fakemodule.py, OInspect.py: remove 2006-08-09 monkepatch
50 * Fakemodule.py, OInspect.py: remove 2006-08-09 monkepatch
44 by resolving issue properly, i.e. by inheriting FakeModule
51 by resolving issue properly, i.e. by inheriting FakeModule
45 from types.ModuleType. Pickling ipython interactive data
52 from types.ModuleType. Pickling ipython interactive data
46 should still work as usual (testing appreciated).
53 should still work as usual (testing appreciated).
47
54
48 2006-08-09 Fernando Perez <Fernando.Perez@colorado.edu>
55 2006-08-09 Fernando Perez <Fernando.Perez@colorado.edu>
49
56
50 * IPython/OInspect.py: monkeypatch inspect from the stdlib if
57 * IPython/OInspect.py: monkeypatch inspect from the stdlib if
51 running under python 2.3 with code from 2.4 to fix a bug with
58 running under python 2.3 with code from 2.4 to fix a bug with
52 help(). Reported by the Debian maintainers, Norbert Tretkowski
59 help(). Reported by the Debian maintainers, Norbert Tretkowski
53 <norbert-AT-tretkowski.de> and Alexandre Fayolle
60 <norbert-AT-tretkowski.de> and Alexandre Fayolle
54 <afayolle-AT-debian.org>.
61 <afayolle-AT-debian.org>.
55
62
56 2006-08-04 Walter Doerwald <walter@livinglogic.de>
63 2006-08-04 Walter Doerwald <walter@livinglogic.de>
57
64
58 * IPython/Extensions/ibrowse.py: Fixed the help message in the footer
65 * IPython/Extensions/ibrowse.py: Fixed the help message in the footer
59 (which was displaying "quit" twice).
66 (which was displaying "quit" twice).
60
67
61 2006-07-28 Walter Doerwald <walter@livinglogic.de>
68 2006-07-28 Walter Doerwald <walter@livinglogic.de>
62
69
63 * IPython/Extensions/ipipe.py: Fix isort.__iter__() (was still using
70 * IPython/Extensions/ipipe.py: Fix isort.__iter__() (was still using
64 the mode argument).
71 the mode argument).
65
72
66 2006-07-27 Walter Doerwald <walter@livinglogic.de>
73 2006-07-27 Walter Doerwald <walter@livinglogic.de>
67
74
68 * IPython/Extensions/ipipe.py: Fix getglobals() if we're
75 * IPython/Extensions/ipipe.py: Fix getglobals() if we're
69 not running under IPython.
76 not running under IPython.
70
77
71 * IPython/Extensions/ipipe.py: Rename XAttr to AttributeDetail
78 * IPython/Extensions/ipipe.py: Rename XAttr to AttributeDetail
72 and make it iterable (iterating over the attribute itself). Add two new
79 and make it iterable (iterating over the attribute itself). Add two new
73 magic strings for __xattrs__(): If the string starts with "-", the attribute
80 magic strings for __xattrs__(): If the string starts with "-", the attribute
74 will not be displayed in ibrowse's detail view (but it can still be
81 will not be displayed in ibrowse's detail view (but it can still be
75 iterated over). This makes it possible to add attributes that are large
82 iterated over). This makes it possible to add attributes that are large
76 lists or generator methods to the detail view. Replace magic attribute names
83 lists or generator methods to the detail view. Replace magic attribute names
77 and _attrname() and _getattr() with "descriptors": For each type of magic
84 and _attrname() and _getattr() with "descriptors": For each type of magic
78 attribute name there's a subclass of Descriptor: None -> SelfDescriptor();
85 attribute name there's a subclass of Descriptor: None -> SelfDescriptor();
79 "foo" -> AttributeDescriptor("foo"); "foo()" -> MethodDescriptor("foo");
86 "foo" -> AttributeDescriptor("foo"); "foo()" -> MethodDescriptor("foo");
80 "-foo" -> IterAttributeDescriptor("foo"); "-foo()" -> IterMethodDescriptor("foo");
87 "-foo" -> IterAttributeDescriptor("foo"); "-foo()" -> IterMethodDescriptor("foo");
81 foo() -> FunctionDescriptor(foo). Magic strings returned from __xattrs__()
88 foo() -> FunctionDescriptor(foo). Magic strings returned from __xattrs__()
82 are still supported.
89 are still supported.
83
90
84 * IPython/Extensions/ibrowse.py: If fetching the next row from the input
91 * IPython/Extensions/ibrowse.py: If fetching the next row from the input
85 fails in ibrowse.fetch(), the exception object is added as the last item
92 fails in ibrowse.fetch(), the exception object is added as the last item
86 and item fetching is canceled. This prevents ibrowse from aborting if e.g.
93 and item fetching is canceled. This prevents ibrowse from aborting if e.g.
87 a generator throws an exception midway through execution.
94 a generator throws an exception midway through execution.
88
95
89 * IPython/Extensions/ipipe.py: Turn ifile's properties mimetype and
96 * IPython/Extensions/ipipe.py: Turn ifile's properties mimetype and
90 encoding into methods.
97 encoding into methods.
91
98
92 2006-07-26 Ville Vainio <vivainio@gmail.com>
99 2006-07-26 Ville Vainio <vivainio@gmail.com>
93
100
94 * iplib.py: history now stores multiline input as single
101 * iplib.py: history now stores multiline input as single
95 history entries. Patch by Jorgen Cederlof.
102 history entries. Patch by Jorgen Cederlof.
96
103
97 2006-07-18 Walter Doerwald <walter@livinglogic.de>
104 2006-07-18 Walter Doerwald <walter@livinglogic.de>
98
105
99 * IPython/Extensions/ibrowse.py: Make cursor visible over
106 * IPython/Extensions/ibrowse.py: Make cursor visible over
100 non existing attributes.
107 non existing attributes.
101
108
102 2006-07-14 Walter Doerwald <walter@livinglogic.de>
109 2006-07-14 Walter Doerwald <walter@livinglogic.de>
103
110
104 * IPython/Extensions/ipipe.py (ix): Use os.popen4() so that the
111 * IPython/Extensions/ipipe.py (ix): Use os.popen4() so that the
105 error output of the running command doesn't mess up the screen.
112 error output of the running command doesn't mess up the screen.
106
113
107 2006-07-13 Walter Doerwald <walter@livinglogic.de>
114 2006-07-13 Walter Doerwald <walter@livinglogic.de>
108
115
109 * IPython/Extensions/ipipe.py (isort): Make isort usable without
116 * IPython/Extensions/ipipe.py (isort): Make isort usable without
110 argument. This sorts the items themselves.
117 argument. This sorts the items themselves.
111
118
112 2006-07-12 Walter Doerwald <walter@livinglogic.de>
119 2006-07-12 Walter Doerwald <walter@livinglogic.de>
113
120
114 * IPython/Extensions/ipipe.py (eval, ifilter, isort, ieval):
121 * IPython/Extensions/ipipe.py (eval, ifilter, isort, ieval):
115 Compile expression strings into code objects. This should speed
122 Compile expression strings into code objects. This should speed
116 up ifilter and friends somewhat.
123 up ifilter and friends somewhat.
117
124
118 2006-07-08 Ville Vainio <vivainio@gmail.com>
125 2006-07-08 Ville Vainio <vivainio@gmail.com>
119
126
120 * Magic.py: %cpaste now strips > from the beginning of lines
127 * Magic.py: %cpaste now strips > from the beginning of lines
121 to ease pasting quoted code from emails. Contributed by
128 to ease pasting quoted code from emails. Contributed by
122 Stefan van der Walt.
129 Stefan van der Walt.
123
130
124 2006-06-29 Ville Vainio <vivainio@gmail.com>
131 2006-06-29 Ville Vainio <vivainio@gmail.com>
125
132
126 * ipmaker.py, Shell.py: qt4agg matplotlib backend support for pylab
133 * ipmaker.py, Shell.py: qt4agg matplotlib backend support for pylab
127 mode, patch contributed by Darren Dale. NEEDS TESTING!
134 mode, patch contributed by Darren Dale. NEEDS TESTING!
128
135
129 2006-06-28 Walter Doerwald <walter@livinglogic.de>
136 2006-06-28 Walter Doerwald <walter@livinglogic.de>
130
137
131 * IPython/Extensions/ibrowse.py: Give the ibrowse cursor row
138 * IPython/Extensions/ibrowse.py: Give the ibrowse cursor row
132 a blue background. Fix fetching new display rows when the browser
139 a blue background. Fix fetching new display rows when the browser
133 scrolls more than a screenful (e.g. by using the goto command).
140 scrolls more than a screenful (e.g. by using the goto command).
134
141
135 2006-06-27 Ville Vainio <vivainio@gmail.com>
142 2006-06-27 Ville Vainio <vivainio@gmail.com>
136
143
137 * Magic.py (_inspect, _ofind) Apply David Huard's
144 * Magic.py (_inspect, _ofind) Apply David Huard's
138 patch for displaying the correct docstring for 'property'
145 patch for displaying the correct docstring for 'property'
139 attributes.
146 attributes.
140
147
141 2006-06-23 Walter Doerwald <walter@livinglogic.de>
148 2006-06-23 Walter Doerwald <walter@livinglogic.de>
142
149
143 * IPython/Extensions/ibrowse.py: Put the documentation of the keyboard
150 * IPython/Extensions/ibrowse.py: Put the documentation of the keyboard
144 commands into the methods implementing them.
151 commands into the methods implementing them.
145
152
146 2006-06-22 Fernando Perez <Fernando.Perez@colorado.edu>
153 2006-06-22 Fernando Perez <Fernando.Perez@colorado.edu>
147
154
148 * ipython.el (ipython-indentation-hook): cleanup patch, submitted
155 * ipython.el (ipython-indentation-hook): cleanup patch, submitted
149 by Kov Chai <tchaikov-AT-gmail.com>. He notes that the original
156 by Kov Chai <tchaikov-AT-gmail.com>. He notes that the original
150 autoindent support was authored by Jin Liu.
157 autoindent support was authored by Jin Liu.
151
158
152 2006-06-22 Walter Doerwald <walter@livinglogic.de>
159 2006-06-22 Walter Doerwald <walter@livinglogic.de>
153
160
154 * IPython/Extensions/ibrowse.py: Replace the plain dictionaries used
161 * IPython/Extensions/ibrowse.py: Replace the plain dictionaries used
155 for keymaps with a custom class that simplifies handling.
162 for keymaps with a custom class that simplifies handling.
156
163
157 2006-06-19 Walter Doerwald <walter@livinglogic.de>
164 2006-06-19 Walter Doerwald <walter@livinglogic.de>
158
165
159 * IPython/Extensions/ibrowse.py: ibrowse now properly handles terminal
166 * IPython/Extensions/ibrowse.py: ibrowse now properly handles terminal
160 resizing. This requires Python 2.5 to work.
167 resizing. This requires Python 2.5 to work.
161
168
162 2006-06-16 Walter Doerwald <walter@livinglogic.de>
169 2006-06-16 Walter Doerwald <walter@livinglogic.de>
163
170
164 * IPython/Extensions/ibrowse.py: Add two new commands to
171 * IPython/Extensions/ibrowse.py: Add two new commands to
165 ibrowse: "hideattr" (mapped to "h") hides the attribute under
172 ibrowse: "hideattr" (mapped to "h") hides the attribute under
166 the cursor. "unhiderattrs" (mapped to "H") reveals all hidden
173 the cursor. "unhiderattrs" (mapped to "H") reveals all hidden
167 attributes again. Remapped the help command to "?". Display
174 attributes again. Remapped the help command to "?". Display
168 keycodes in the range 0x01-0x1F as CTRL-xx. Add CTRL-a and CTRL-e
175 keycodes in the range 0x01-0x1F as CTRL-xx. Add CTRL-a and CTRL-e
169 as keys for the "home" and "end" commands. Add three new commands
176 as keys for the "home" and "end" commands. Add three new commands
170 to the input mode for "find" and friends: "delend" (CTRL-K)
177 to the input mode for "find" and friends: "delend" (CTRL-K)
171 deletes to the end of line. "incsearchup" searches upwards in the
178 deletes to the end of line. "incsearchup" searches upwards in the
172 command history for an input that starts with the text before the cursor.
179 command history for an input that starts with the text before the cursor.
173 "incsearchdown" does the same downwards. Removed a bogus mapping of
180 "incsearchdown" does the same downwards. Removed a bogus mapping of
174 the x key to "delete".
181 the x key to "delete".
175
182
176 2006-06-15 Ville Vainio <vivainio@gmail.com>
183 2006-06-15 Ville Vainio <vivainio@gmail.com>
177
184
178 * iplib.py, hooks.py: Added new generate_prompt hook that can be
185 * iplib.py, hooks.py: Added new generate_prompt hook that can be
179 used to create prompts dynamically, instead of the "old" way of
186 used to create prompts dynamically, instead of the "old" way of
180 assigning "magic" strings to prompt_in1 and prompt_in2. The old
187 assigning "magic" strings to prompt_in1 and prompt_in2. The old
181 way still works (it's invoked by the default hook), of course.
188 way still works (it's invoked by the default hook), of course.
182
189
183 * Prompts.py: added generate_output_prompt hook for altering output
190 * Prompts.py: added generate_output_prompt hook for altering output
184 prompt
191 prompt
185
192
186 * Release.py: Changed version string to 0.7.3.svn.
193 * Release.py: Changed version string to 0.7.3.svn.
187
194
188 2006-06-15 Walter Doerwald <walter@livinglogic.de>
195 2006-06-15 Walter Doerwald <walter@livinglogic.de>
189
196
190 * IPython/Extensions/ibrowse.py: Change _BrowserLevel.moveto() so that
197 * IPython/Extensions/ibrowse.py: Change _BrowserLevel.moveto() so that
191 the call to fetch() always tries to fetch enough data for at least one
198 the call to fetch() always tries to fetch enough data for at least one
192 full screen. This makes it possible to simply call moveto(0,0,True) in
199 full screen. This makes it possible to simply call moveto(0,0,True) in
193 the constructor. Fix typos and removed the obsolete goto attribute.
200 the constructor. Fix typos and removed the obsolete goto attribute.
194
201
195 2006-06-12 Ville Vainio <vivainio@gmail.com>
202 2006-06-12 Ville Vainio <vivainio@gmail.com>
196
203
197 * ipy_profile_sh.py: applied Krisha Mohan Gundu's patch for
204 * ipy_profile_sh.py: applied Krisha Mohan Gundu's patch for
198 allowing $variable interpolation within multiline statements,
205 allowing $variable interpolation within multiline statements,
199 though so far only with "sh" profile for a testing period.
206 though so far only with "sh" profile for a testing period.
200 The patch also enables splitting long commands with \ but it
207 The patch also enables splitting long commands with \ but it
201 doesn't work properly yet.
208 doesn't work properly yet.
202
209
203 2006-06-12 Walter Doerwald <walter@livinglogic.de>
210 2006-06-12 Walter Doerwald <walter@livinglogic.de>
204
211
205 * IPython/Extensions/ibrowse.py (_dodisplay): Display the length of the
212 * IPython/Extensions/ibrowse.py (_dodisplay): Display the length of the
206 input history and the position of the cursor in the input history for
213 input history and the position of the cursor in the input history for
207 the find, findbackwards and goto command.
214 the find, findbackwards and goto command.
208
215
209 2006-06-10 Walter Doerwald <walter@livinglogic.de>
216 2006-06-10 Walter Doerwald <walter@livinglogic.de>
210
217
211 * IPython/Extensions/ibrowse.py: Add a class _CommandInput that
218 * IPython/Extensions/ibrowse.py: Add a class _CommandInput that
212 implements the basic functionality of browser commands that require
219 implements the basic functionality of browser commands that require
213 input. Reimplement the goto, find and findbackwards commands as
220 input. Reimplement the goto, find and findbackwards commands as
214 subclasses of _CommandInput. Add an input history and keymaps to those
221 subclasses of _CommandInput. Add an input history and keymaps to those
215 commands. Add "\r" as a keyboard shortcut for the enterdefault and
222 commands. Add "\r" as a keyboard shortcut for the enterdefault and
216 execute commands.
223 execute commands.
217
224
218 2006-06-07 Ville Vainio <vivainio@gmail.com>
225 2006-06-07 Ville Vainio <vivainio@gmail.com>
219
226
220 * iplib.py: ipython mybatch.ipy exits ipython immediately after
227 * iplib.py: ipython mybatch.ipy exits ipython immediately after
221 running the batch files instead of leaving the session open.
228 running the batch files instead of leaving the session open.
222
229
223 2006-06-07 Fernando Perez <Fernando.Perez@colorado.edu>
230 2006-06-07 Fernando Perez <Fernando.Perez@colorado.edu>
224
231
225 * IPython/iplib.py (InteractiveShell.__init__): update BSD fix, as
232 * IPython/iplib.py (InteractiveShell.__init__): update BSD fix, as
226 the original fix was incomplete. Patch submitted by W. Maier.
233 the original fix was incomplete. Patch submitted by W. Maier.
227
234
228 2006-06-07 Ville Vainio <vivainio@gmail.com>
235 2006-06-07 Ville Vainio <vivainio@gmail.com>
229
236
230 * iplib.py,Magic.py, ipmaker.py (magic_rehashx):
237 * iplib.py,Magic.py, ipmaker.py (magic_rehashx):
231 Confirmation prompts can be supressed by 'quiet' option.
238 Confirmation prompts can be supressed by 'quiet' option.
232 _ip.options.quiet = 1 means "assume yes for all yes/no queries".
239 _ip.options.quiet = 1 means "assume yes for all yes/no queries".
233
240
234 2006-06-06 *** Released version 0.7.2
241 2006-06-06 *** Released version 0.7.2
235
242
236 2006-06-06 Fernando Perez <Fernando.Perez@colorado.edu>
243 2006-06-06 Fernando Perez <Fernando.Perez@colorado.edu>
237
244
238 * IPython/Release.py (version): Made 0.7.2 final for release.
245 * IPython/Release.py (version): Made 0.7.2 final for release.
239 Repo tagged and release cut.
246 Repo tagged and release cut.
240
247
241 2006-06-05 Ville Vainio <vivainio@gmail.com>
248 2006-06-05 Ville Vainio <vivainio@gmail.com>
242
249
243 * Magic.py (magic_rehashx): Honor no_alias list earlier in
250 * Magic.py (magic_rehashx): Honor no_alias list earlier in
244 %rehashx, to avoid clobbering builtins in ipy_profile_sh.py
251 %rehashx, to avoid clobbering builtins in ipy_profile_sh.py
245
252
246 * upgrade_dir.py: try import 'path' module a bit harder
253 * upgrade_dir.py: try import 'path' module a bit harder
247 (for %upgrade)
254 (for %upgrade)
248
255
249 2006-06-03 Fernando Perez <Fernando.Perez@colorado.edu>
256 2006-06-03 Fernando Perez <Fernando.Perez@colorado.edu>
250
257
251 * IPython/genutils.py (ask_yes_no): treat EOF as a default answer
258 * IPython/genutils.py (ask_yes_no): treat EOF as a default answer
252 instead of looping 20 times.
259 instead of looping 20 times.
253
260
254 * IPython/ipmaker.py (make_IPython): honor -ipythondir flag
261 * IPython/ipmaker.py (make_IPython): honor -ipythondir flag
255 correctly at initialization time. Bug reported by Krishna Mohan
262 correctly at initialization time. Bug reported by Krishna Mohan
256 Gundu <gkmohan-AT-gmail.com> on the user list.
263 Gundu <gkmohan-AT-gmail.com> on the user list.
257
264
258 * IPython/Release.py (version): Mark 0.7.2 version to start
265 * IPython/Release.py (version): Mark 0.7.2 version to start
259 testing for release on 06/06.
266 testing for release on 06/06.
260
267
261 2006-05-31 Fernando Perez <Fernando.Perez@colorado.edu>
268 2006-05-31 Fernando Perez <Fernando.Perez@colorado.edu>
262
269
263 * scripts/irunner: thin script interface so users don't have to
270 * scripts/irunner: thin script interface so users don't have to
264 find the module and call it as an executable, since modules rarely
271 find the module and call it as an executable, since modules rarely
265 live in people's PATH.
272 live in people's PATH.
266
273
267 * IPython/irunner.py (InteractiveRunner.__init__): added
274 * IPython/irunner.py (InteractiveRunner.__init__): added
268 delaybeforesend attribute to control delays with newer versions of
275 delaybeforesend attribute to control delays with newer versions of
269 pexpect. Thanks to detailed help from pexpect's author, Noah
276 pexpect. Thanks to detailed help from pexpect's author, Noah
270 Spurrier <noah-AT-noah.org>. Noted how to use the SAGE runner
277 Spurrier <noah-AT-noah.org>. Noted how to use the SAGE runner
271 correctly (it works in NoColor mode).
278 correctly (it works in NoColor mode).
272
279
273 * IPython/iplib.py (handle_normal): fix nasty crash reported on
280 * IPython/iplib.py (handle_normal): fix nasty crash reported on
274 SAGE list, from improper log() calls.
281 SAGE list, from improper log() calls.
275
282
276 2006-05-31 Ville Vainio <vivainio@gmail.com>
283 2006-05-31 Ville Vainio <vivainio@gmail.com>
277
284
278 * upgrade_dir.py, Magic.py (magic_upgrade): call upgrade_dir
285 * upgrade_dir.py, Magic.py (magic_upgrade): call upgrade_dir
279 with args in parens to work correctly with dirs that have spaces.
286 with args in parens to work correctly with dirs that have spaces.
280
287
281 2006-05-30 Fernando Perez <Fernando.Perez@colorado.edu>
288 2006-05-30 Fernando Perez <Fernando.Perez@colorado.edu>
282
289
283 * IPython/Logger.py (Logger.logstart): add option to log raw input
290 * IPython/Logger.py (Logger.logstart): add option to log raw input
284 instead of the processed one. A -r flag was added to the
291 instead of the processed one. A -r flag was added to the
285 %logstart magic used for controlling logging.
292 %logstart magic used for controlling logging.
286
293
287 2006-05-29 Fernando Perez <Fernando.Perez@colorado.edu>
294 2006-05-29 Fernando Perez <Fernando.Perez@colorado.edu>
288
295
289 * IPython/iplib.py (InteractiveShell.__init__): add check for the
296 * IPython/iplib.py (InteractiveShell.__init__): add check for the
290 *BSDs to omit --color from all 'ls' aliases, since *BSD ls doesn't
297 *BSDs to omit --color from all 'ls' aliases, since *BSD ls doesn't
291 recognize the option. After a bug report by Will Maier. This
298 recognize the option. After a bug report by Will Maier. This
292 closes #64 (will do it after confirmation from W. Maier).
299 closes #64 (will do it after confirmation from W. Maier).
293
300
294 * IPython/irunner.py: New module to run scripts as if manually
301 * IPython/irunner.py: New module to run scripts as if manually
295 typed into an interactive environment, based on pexpect. After a
302 typed into an interactive environment, based on pexpect. After a
296 submission by Ken Schutte <kschutte-AT-csail.mit.edu> on the
303 submission by Ken Schutte <kschutte-AT-csail.mit.edu> on the
297 ipython-user list. Simple unittests in the tests/ directory.
304 ipython-user list. Simple unittests in the tests/ directory.
298
305
299 * tools/release: add Will Maier, OpenBSD port maintainer, to
306 * tools/release: add Will Maier, OpenBSD port maintainer, to
300 recepients list. We are now officially part of the OpenBSD ports:
307 recepients list. We are now officially part of the OpenBSD ports:
301 http://www.openbsd.org/ports.html ! Many thanks to Will for the
308 http://www.openbsd.org/ports.html ! Many thanks to Will for the
302 work.
309 work.
303
310
304 2006-05-26 Fernando Perez <Fernando.Perez@colorado.edu>
311 2006-05-26 Fernando Perez <Fernando.Perez@colorado.edu>
305
312
306 * IPython/ipmaker.py (make_IPython): modify sys.argv fix (below)
313 * IPython/ipmaker.py (make_IPython): modify sys.argv fix (below)
307 so that it doesn't break tkinter apps.
314 so that it doesn't break tkinter apps.
308
315
309 * IPython/iplib.py (_prefilter): fix bug where aliases would
316 * IPython/iplib.py (_prefilter): fix bug where aliases would
310 shadow variables when autocall was fully off. Reported by SAGE
317 shadow variables when autocall was fully off. Reported by SAGE
311 author William Stein.
318 author William Stein.
312
319
313 * IPython/OInspect.py (Inspector.__init__): add a flag to control
320 * IPython/OInspect.py (Inspector.__init__): add a flag to control
314 at what detail level strings are computed when foo? is requested.
321 at what detail level strings are computed when foo? is requested.
315 This allows users to ask for example that the string form of an
322 This allows users to ask for example that the string form of an
316 object is only computed when foo?? is called, or even never, by
323 object is only computed when foo?? is called, or even never, by
317 setting the object_info_string_level >= 2 in the configuration
324 setting the object_info_string_level >= 2 in the configuration
318 file. This new option has been added and documented. After a
325 file. This new option has been added and documented. After a
319 request by SAGE to be able to control the printing of very large
326 request by SAGE to be able to control the printing of very large
320 objects more easily.
327 objects more easily.
321
328
322 2006-05-25 Fernando Perez <Fernando.Perez@colorado.edu>
329 2006-05-25 Fernando Perez <Fernando.Perez@colorado.edu>
323
330
324 * IPython/ipmaker.py (make_IPython): remove the ipython call path
331 * IPython/ipmaker.py (make_IPython): remove the ipython call path
325 from sys.argv, to be 100% consistent with how Python itself works
332 from sys.argv, to be 100% consistent with how Python itself works
326 (as seen for example with python -i file.py). After a bug report
333 (as seen for example with python -i file.py). After a bug report
327 by Jeffrey Collins.
334 by Jeffrey Collins.
328
335
329 * IPython/Shell.py (MatplotlibShellBase._matplotlib_config): Fix
336 * IPython/Shell.py (MatplotlibShellBase._matplotlib_config): Fix
330 nasty bug which was preventing custom namespaces with -pylab,
337 nasty bug which was preventing custom namespaces with -pylab,
331 reported by M. Foord. Minor cleanup, remove old matplotlib.matlab
338 reported by M. Foord. Minor cleanup, remove old matplotlib.matlab
332 compatibility (long gone from mpl).
339 compatibility (long gone from mpl).
333
340
334 * IPython/ipapi.py (make_session): name change: create->make. We
341 * IPython/ipapi.py (make_session): name change: create->make. We
335 use make in other places (ipmaker,...), it's shorter and easier to
342 use make in other places (ipmaker,...), it's shorter and easier to
336 type and say, etc. I'm trying to clean things before 0.7.2 so
343 type and say, etc. I'm trying to clean things before 0.7.2 so
337 that I can keep things stable wrt to ipapi in the chainsaw branch.
344 that I can keep things stable wrt to ipapi in the chainsaw branch.
338
345
339 * ipython.el: fix the py-pdbtrack-input-prompt variable so that
346 * ipython.el: fix the py-pdbtrack-input-prompt variable so that
340 python-mode recognizes our debugger mode. Add support for
347 python-mode recognizes our debugger mode. Add support for
341 autoindent inside (X)emacs. After a patch sent in by Jin Liu
348 autoindent inside (X)emacs. After a patch sent in by Jin Liu
342 <m.liu.jin-AT-gmail.com> originally written by
349 <m.liu.jin-AT-gmail.com> originally written by
343 doxgen-AT-newsmth.net (with minor modifications for xemacs
350 doxgen-AT-newsmth.net (with minor modifications for xemacs
344 compatibility)
351 compatibility)
345
352
346 * IPython/Debugger.py (Pdb.format_stack_entry): fix formatting of
353 * IPython/Debugger.py (Pdb.format_stack_entry): fix formatting of
347 tracebacks when walking the stack so that the stack tracking system
354 tracebacks when walking the stack so that the stack tracking system
348 in emacs' python-mode can identify the frames correctly.
355 in emacs' python-mode can identify the frames correctly.
349
356
350 * IPython/ipmaker.py (make_IPython): make the internal (and
357 * IPython/ipmaker.py (make_IPython): make the internal (and
351 default config) autoedit_syntax value false by default. Too many
358 default config) autoedit_syntax value false by default. Too many
352 users have complained to me (both on and off-list) about problems
359 users have complained to me (both on and off-list) about problems
353 with this option being on by default, so I'm making it default to
360 with this option being on by default, so I'm making it default to
354 off. It can still be enabled by anyone via the usual mechanisms.
361 off. It can still be enabled by anyone via the usual mechanisms.
355
362
356 * IPython/completer.py (Completer.attr_matches): add support for
363 * IPython/completer.py (Completer.attr_matches): add support for
357 PyCrust-style _getAttributeNames magic method. Patch contributed
364 PyCrust-style _getAttributeNames magic method. Patch contributed
358 by <mscott-AT-goldenspud.com>. Closes #50.
365 by <mscott-AT-goldenspud.com>. Closes #50.
359
366
360 * IPython/iplib.py (InteractiveShell.__init__): remove the
367 * IPython/iplib.py (InteractiveShell.__init__): remove the
361 deletion of exit/quit from __builtin__, which can break
368 deletion of exit/quit from __builtin__, which can break
362 third-party tools like the Zope debugging console. The
369 third-party tools like the Zope debugging console. The
363 %exit/%quit magics remain. In general, it's probably a good idea
370 %exit/%quit magics remain. In general, it's probably a good idea
364 not to delete anything from __builtin__, since we never know what
371 not to delete anything from __builtin__, since we never know what
365 that will break. In any case, python now (for 2.5) will support
372 that will break. In any case, python now (for 2.5) will support
366 'real' exit/quit, so this issue is moot. Closes #55.
373 'real' exit/quit, so this issue is moot. Closes #55.
367
374
368 * IPython/genutils.py (with_obj): rename the 'with' function to
375 * IPython/genutils.py (with_obj): rename the 'with' function to
369 'withobj' to avoid incompatibilities with Python 2.5, where 'with'
376 'withobj' to avoid incompatibilities with Python 2.5, where 'with'
370 becomes a language keyword. Closes #53.
377 becomes a language keyword. Closes #53.
371
378
372 * IPython/FakeModule.py (FakeModule.__init__): add a proper
379 * IPython/FakeModule.py (FakeModule.__init__): add a proper
373 __file__ attribute to this so it fools more things into thinking
380 __file__ attribute to this so it fools more things into thinking
374 it is a real module. Closes #59.
381 it is a real module. Closes #59.
375
382
376 * IPython/Magic.py (magic_edit): add -n option to open the editor
383 * IPython/Magic.py (magic_edit): add -n option to open the editor
377 at a specific line number. After a patch by Stefan van der Walt.
384 at a specific line number. After a patch by Stefan van der Walt.
378
385
379 2006-05-23 Fernando Perez <Fernando.Perez@colorado.edu>
386 2006-05-23 Fernando Perez <Fernando.Perez@colorado.edu>
380
387
381 * IPython/iplib.py (edit_syntax_error): fix crash when for some
388 * IPython/iplib.py (edit_syntax_error): fix crash when for some
382 reason the file could not be opened. After automatic crash
389 reason the file could not be opened. After automatic crash
383 reports sent by James Graham <jgraham-AT-ast.cam.ac.uk> and
390 reports sent by James Graham <jgraham-AT-ast.cam.ac.uk> and
384 Charles Dolan <charlespatrickdolan-AT-yahoo.com>.
391 Charles Dolan <charlespatrickdolan-AT-yahoo.com>.
385 (_should_recompile): Don't fire editor if using %bg, since there
392 (_should_recompile): Don't fire editor if using %bg, since there
386 is no file in the first place. From the same report as above.
393 is no file in the first place. From the same report as above.
387 (raw_input): protect against faulty third-party prefilters. After
394 (raw_input): protect against faulty third-party prefilters. After
388 an automatic crash report sent by Dirk Laurie <dirk-AT-sun.ac.za>
395 an automatic crash report sent by Dirk Laurie <dirk-AT-sun.ac.za>
389 while running under SAGE.
396 while running under SAGE.
390
397
391 2006-05-23 Ville Vainio <vivainio@gmail.com>
398 2006-05-23 Ville Vainio <vivainio@gmail.com>
392
399
393 * ipapi.py: Stripped down ip.to_user_ns() to work only as
400 * ipapi.py: Stripped down ip.to_user_ns() to work only as
394 ip.to_user_ns("x1 y1"), which exposes vars x1 and y1. ipapi.get()
401 ip.to_user_ns("x1 y1"), which exposes vars x1 and y1. ipapi.get()
395 now returns None (again), unless dummy is specifically allowed by
402 now returns None (again), unless dummy is specifically allowed by
396 ipapi.get(allow_dummy=True).
403 ipapi.get(allow_dummy=True).
397
404
398 2006-05-18 Fernando Perez <Fernando.Perez@colorado.edu>
405 2006-05-18 Fernando Perez <Fernando.Perez@colorado.edu>
399
406
400 * IPython: remove all 2.2-compatibility objects and hacks from
407 * IPython: remove all 2.2-compatibility objects and hacks from
401 everywhere, since we only support 2.3 at this point. Docs
408 everywhere, since we only support 2.3 at this point. Docs
402 updated.
409 updated.
403
410
404 * IPython/ipapi.py (IPApi.__init__): Cleanup of all getters.
411 * IPython/ipapi.py (IPApi.__init__): Cleanup of all getters.
405 Anything requiring extra validation can be turned into a Python
412 Anything requiring extra validation can be turned into a Python
406 property in the future. I used a property for the db one b/c
413 property in the future. I used a property for the db one b/c
407 there was a nasty circularity problem with the initialization
414 there was a nasty circularity problem with the initialization
408 order, which right now I don't have time to clean up.
415 order, which right now I don't have time to clean up.
409
416
410 * IPython/Shell.py (MTInteractiveShell.runcode): Fix, I think,
417 * IPython/Shell.py (MTInteractiveShell.runcode): Fix, I think,
411 another locking bug reported by Jorgen. I'm not 100% sure though,
418 another locking bug reported by Jorgen. I'm not 100% sure though,
412 so more testing is needed...
419 so more testing is needed...
413
420
414 2006-05-17 Fernando Perez <Fernando.Perez@colorado.edu>
421 2006-05-17 Fernando Perez <Fernando.Perez@colorado.edu>
415
422
416 * IPython/ipapi.py (IPApi.to_user_ns): New function to inject
423 * IPython/ipapi.py (IPApi.to_user_ns): New function to inject
417 local variables from any routine in user code (typically executed
424 local variables from any routine in user code (typically executed
418 with %run) directly into the interactive namespace. Very useful
425 with %run) directly into the interactive namespace. Very useful
419 when doing complex debugging.
426 when doing complex debugging.
420 (IPythonNotRunning): Changed the default None object to a dummy
427 (IPythonNotRunning): Changed the default None object to a dummy
421 whose attributes can be queried as well as called without
428 whose attributes can be queried as well as called without
422 exploding, to ease writing code which works transparently both in
429 exploding, to ease writing code which works transparently both in
423 and out of ipython and uses some of this API.
430 and out of ipython and uses some of this API.
424
431
425 2006-05-16 Fernando Perez <Fernando.Perez@colorado.edu>
432 2006-05-16 Fernando Perez <Fernando.Perez@colorado.edu>
426
433
427 * IPython/hooks.py (result_display): Fix the fact that our display
434 * IPython/hooks.py (result_display): Fix the fact that our display
428 hook was using str() instead of repr(), as the default python
435 hook was using str() instead of repr(), as the default python
429 console does. This had gone unnoticed b/c it only happened if
436 console does. This had gone unnoticed b/c it only happened if
430 %Pprint was off, but the inconsistency was there.
437 %Pprint was off, but the inconsistency was there.
431
438
432 2006-05-15 Ville Vainio <vivainio@gmail.com>
439 2006-05-15 Ville Vainio <vivainio@gmail.com>
433
440
434 * Oinspect.py: Only show docstring for nonexisting/binary files
441 * Oinspect.py: Only show docstring for nonexisting/binary files
435 when doing object??, closing ticket #62
442 when doing object??, closing ticket #62
436
443
437 2006-05-13 Fernando Perez <Fernando.Perez@colorado.edu>
444 2006-05-13 Fernando Perez <Fernando.Perez@colorado.edu>
438
445
439 * IPython/Shell.py (MTInteractiveShell.runsource): Fix threading
446 * IPython/Shell.py (MTInteractiveShell.runsource): Fix threading
440 bug, closes http://www.scipy.net/roundup/ipython/issue55. A lock
447 bug, closes http://www.scipy.net/roundup/ipython/issue55. A lock
441 was being released in a routine which hadn't checked if it had
448 was being released in a routine which hadn't checked if it had
442 been the one to acquire it.
449 been the one to acquire it.
443
450
444 2006-05-07 Fernando Perez <Fernando.Perez@colorado.edu>
451 2006-05-07 Fernando Perez <Fernando.Perez@colorado.edu>
445
452
446 * IPython/Release.py (version): put out 0.7.2.rc1 for testing.
453 * IPython/Release.py (version): put out 0.7.2.rc1 for testing.
447
454
448 2006-04-11 Ville Vainio <vivainio@gmail.com>
455 2006-04-11 Ville Vainio <vivainio@gmail.com>
449
456
450 * iplib.py, ipmaker.py: .ipy extension now means "ipython batch file"
457 * iplib.py, ipmaker.py: .ipy extension now means "ipython batch file"
451 in command line. E.g. "ipython test.ipy" runs test.ipy with ipython
458 in command line. E.g. "ipython test.ipy" runs test.ipy with ipython
452 prefilters, allowing stuff like magics and aliases in the file.
459 prefilters, allowing stuff like magics and aliases in the file.
453
460
454 * Prompts.py, Extensions/clearcmd.py, ipy_system_conf.py: %clear magic
461 * Prompts.py, Extensions/clearcmd.py, ipy_system_conf.py: %clear magic
455 added. Supported now are "%clear in" and "%clear out" (clear input and
462 added. Supported now are "%clear in" and "%clear out" (clear input and
456 output history, respectively). Also fixed CachedOutput.flush to
463 output history, respectively). Also fixed CachedOutput.flush to
457 properly flush the output cache.
464 properly flush the output cache.
458
465
459 * Extensions/pspersistence.py: Fix %store to avoid "%store obj.attr"
466 * Extensions/pspersistence.py: Fix %store to avoid "%store obj.attr"
460 half-success (and fail explicitly).
467 half-success (and fail explicitly).
461
468
462 2006-03-28 Ville Vainio <vivainio@gmail.com>
469 2006-03-28 Ville Vainio <vivainio@gmail.com>
463
470
464 * iplib.py: Fix quoting of aliases so that only argless ones
471 * iplib.py: Fix quoting of aliases so that only argless ones
465 are quoted
472 are quoted
466
473
467 2006-03-28 Ville Vainio <vivainio@gmail.com>
474 2006-03-28 Ville Vainio <vivainio@gmail.com>
468
475
469 * iplib.py: Quote aliases with spaces in the name.
476 * iplib.py: Quote aliases with spaces in the name.
470 "c:\program files\blah\bin" is now legal alias target.
477 "c:\program files\blah\bin" is now legal alias target.
471
478
472 * ext_rehashdir.py: Space no longer allowed as arg
479 * ext_rehashdir.py: Space no longer allowed as arg
473 separator, since space is legal in path names.
480 separator, since space is legal in path names.
474
481
475 2006-03-16 Ville Vainio <vivainio@gmail.com>
482 2006-03-16 Ville Vainio <vivainio@gmail.com>
476
483
477 * upgrade_dir.py: Take path.py from Extensions, correcting
484 * upgrade_dir.py: Take path.py from Extensions, correcting
478 %upgrade magic
485 %upgrade magic
479
486
480 * ipmaker.py: Suggest using %upgrade if ipy_user_conf.py isn't found.
487 * ipmaker.py: Suggest using %upgrade if ipy_user_conf.py isn't found.
481
488
482 * hooks.py: Only enclose editor binary in quotes if legal and
489 * hooks.py: Only enclose editor binary in quotes if legal and
483 necessary (space in the name, and is an existing file). Fixes a bug
490 necessary (space in the name, and is an existing file). Fixes a bug
484 reported by Zachary Pincus.
491 reported by Zachary Pincus.
485
492
486 2006-03-13 Fernando Perez <Fernando.Perez@colorado.edu>
493 2006-03-13 Fernando Perez <Fernando.Perez@colorado.edu>
487
494
488 * Manual: thanks to a tip on proper color handling for Emacs, by
495 * Manual: thanks to a tip on proper color handling for Emacs, by
489 Eric J Haywiser <ejh1-AT-MIT.EDU>.
496 Eric J Haywiser <ejh1-AT-MIT.EDU>.
490
497
491 * ipython.el: close http://www.scipy.net/roundup/ipython/issue57
498 * ipython.el: close http://www.scipy.net/roundup/ipython/issue57
492 by applying the provided patch. Thanks to Liu Jin
499 by applying the provided patch. Thanks to Liu Jin
493 <m.liu.jin-AT-gmail.com> for the contribution. No problems under
500 <m.liu.jin-AT-gmail.com> for the contribution. No problems under
494 XEmacs/Linux, I'm trusting the submitter that it actually helps
501 XEmacs/Linux, I'm trusting the submitter that it actually helps
495 under win32/GNU Emacs. Will revisit if any problems are reported.
502 under win32/GNU Emacs. Will revisit if any problems are reported.
496
503
497 2006-03-12 Fernando Perez <Fernando.Perez@colorado.edu>
504 2006-03-12 Fernando Perez <Fernando.Perez@colorado.edu>
498
505
499 * IPython/Gnuplot2.py (_FileClass): update for current Gnuplot.py
506 * IPython/Gnuplot2.py (_FileClass): update for current Gnuplot.py
500 from SVN, thanks to a patch by Ryan Woodard <rywo@bas.ac.uk>.
507 from SVN, thanks to a patch by Ryan Woodard <rywo@bas.ac.uk>.
501
508
502 2006-03-12 Ville Vainio <vivainio@gmail.com>
509 2006-03-12 Ville Vainio <vivainio@gmail.com>
503
510
504 * Magic.py (magic_timeit): Added %timeit magic, contributed by
511 * Magic.py (magic_timeit): Added %timeit magic, contributed by
505 Torsten Marek.
512 Torsten Marek.
506
513
507 2006-03-12 Fernando Perez <Fernando.Perez@colorado.edu>
514 2006-03-12 Fernando Perez <Fernando.Perez@colorado.edu>
508
515
509 * IPython/Magic.py (magic_macro): fix so that the n1-n2 syntax for
516 * IPython/Magic.py (magic_macro): fix so that the n1-n2 syntax for
510 line ranges works again.
517 line ranges works again.
511
518
512 2006-03-11 Fernando Perez <Fernando.Perez@colorado.edu>
519 2006-03-11 Fernando Perez <Fernando.Perez@colorado.edu>
513
520
514 * IPython/iplib.py (showtraceback): add back sys.last_traceback
521 * IPython/iplib.py (showtraceback): add back sys.last_traceback
515 and friends, after a discussion with Zach Pincus on ipython-user.
522 and friends, after a discussion with Zach Pincus on ipython-user.
516 I'm not 100% sure, but after thinking about it quite a bit, it may
523 I'm not 100% sure, but after thinking about it quite a bit, it may
517 be OK. Testing with the multithreaded shells didn't reveal any
524 be OK. Testing with the multithreaded shells didn't reveal any
518 problems, but let's keep an eye out.
525 problems, but let's keep an eye out.
519
526
520 In the process, I fixed a few things which were calling
527 In the process, I fixed a few things which were calling
521 self.InteractiveTB() directly (like safe_execfile), which is a
528 self.InteractiveTB() directly (like safe_execfile), which is a
522 mistake: ALL exception reporting should be done by calling
529 mistake: ALL exception reporting should be done by calling
523 self.showtraceback(), which handles state and tab-completion and
530 self.showtraceback(), which handles state and tab-completion and
524 more.
531 more.
525
532
526 2006-03-01 Ville Vainio <vivainio@gmail.com>
533 2006-03-01 Ville Vainio <vivainio@gmail.com>
527
534
528 * Extensions/ipipe.py: Added Walter Doerwald's "ipipe" module.
535 * Extensions/ipipe.py: Added Walter Doerwald's "ipipe" module.
529 To use, do "from ipipe import *".
536 To use, do "from ipipe import *".
530
537
531 2006-02-24 Ville Vainio <vivainio@gmail.com>
538 2006-02-24 Ville Vainio <vivainio@gmail.com>
532
539
533 * Magic.py, upgrade_dir.py: %upgrade magic added. Does things more
540 * Magic.py, upgrade_dir.py: %upgrade magic added. Does things more
534 "cleanly" and safely than the older upgrade mechanism.
541 "cleanly" and safely than the older upgrade mechanism.
535
542
536 2006-02-21 Ville Vainio <vivainio@gmail.com>
543 2006-02-21 Ville Vainio <vivainio@gmail.com>
537
544
538 * Magic.py: %save works again.
545 * Magic.py: %save works again.
539
546
540 2006-02-15 Ville Vainio <vivainio@gmail.com>
547 2006-02-15 Ville Vainio <vivainio@gmail.com>
541
548
542 * Magic.py: %Pprint works again
549 * Magic.py: %Pprint works again
543
550
544 * Extensions/ipy_sane_defaults.py: Provide everything provided
551 * Extensions/ipy_sane_defaults.py: Provide everything provided
545 in default ipythonrc, to make it possible to have a completely empty
552 in default ipythonrc, to make it possible to have a completely empty
546 ipythonrc (and thus completely rc-file free configuration)
553 ipythonrc (and thus completely rc-file free configuration)
547
554
548 2006-02-11 Fernando Perez <Fernando.Perez@colorado.edu>
555 2006-02-11 Fernando Perez <Fernando.Perez@colorado.edu>
549
556
550 * IPython/hooks.py (editor): quote the call to the editor command,
557 * IPython/hooks.py (editor): quote the call to the editor command,
551 to allow commands with spaces in them. Problem noted by watching
558 to allow commands with spaces in them. Problem noted by watching
552 Ian Oswald's video about textpad under win32 at
559 Ian Oswald's video about textpad under win32 at
553 http://showmedo.com/videoListPage?listKey=PythonIPythonSeries
560 http://showmedo.com/videoListPage?listKey=PythonIPythonSeries
554
561
555 * IPython/UserConfig/ipythonrc: Replace @ signs with % when
562 * IPython/UserConfig/ipythonrc: Replace @ signs with % when
556 describing magics (we haven't used @ for a loong time).
563 describing magics (we haven't used @ for a loong time).
557
564
558 * IPython/ultraTB.py (VerboseTB.text.text_repr): Added patch
565 * IPython/ultraTB.py (VerboseTB.text.text_repr): Added patch
559 contributed by marienz to close
566 contributed by marienz to close
560 http://www.scipy.net/roundup/ipython/issue53.
567 http://www.scipy.net/roundup/ipython/issue53.
561
568
562 2006-02-10 Ville Vainio <vivainio@gmail.com>
569 2006-02-10 Ville Vainio <vivainio@gmail.com>
563
570
564 * genutils.py: getoutput now works in win32 too
571 * genutils.py: getoutput now works in win32 too
565
572
566 * completer.py: alias and magic completion only invoked
573 * completer.py: alias and magic completion only invoked
567 at the first "item" in the line, to avoid "cd %store"
574 at the first "item" in the line, to avoid "cd %store"
568 nonsense.
575 nonsense.
569
576
570 2006-02-09 Ville Vainio <vivainio@gmail.com>
577 2006-02-09 Ville Vainio <vivainio@gmail.com>
571
578
572 * test/*: Added a unit testing framework (finally).
579 * test/*: Added a unit testing framework (finally).
573 '%run runtests.py' to run test_*.
580 '%run runtests.py' to run test_*.
574
581
575 * ipapi.py: Exposed runlines and set_custom_exc
582 * ipapi.py: Exposed runlines and set_custom_exc
576
583
577 2006-02-07 Ville Vainio <vivainio@gmail.com>
584 2006-02-07 Ville Vainio <vivainio@gmail.com>
578
585
579 * iplib.py: don't split "f 1 2" to "f(1,2)" in autocall,
586 * iplib.py: don't split "f 1 2" to "f(1,2)" in autocall,
580 instead use "f(1 2)" as before.
587 instead use "f(1 2)" as before.
581
588
582 2006-02-05 Fernando Perez <Fernando.Perez@colorado.edu>
589 2006-02-05 Fernando Perez <Fernando.Perez@colorado.edu>
583
590
584 * IPython/demo.py (IPythonDemo): Add new classes to the demo
591 * IPython/demo.py (IPythonDemo): Add new classes to the demo
585 facilities, for demos processed by the IPython input filter
592 facilities, for demos processed by the IPython input filter
586 (IPythonDemo), and for running a script one-line-at-a-time as a
593 (IPythonDemo), and for running a script one-line-at-a-time as a
587 demo, both for pure Python (LineDemo) and for IPython-processed
594 demo, both for pure Python (LineDemo) and for IPython-processed
588 input (IPythonLineDemo). After a request by Dave Kohel, from the
595 input (IPythonLineDemo). After a request by Dave Kohel, from the
589 SAGE team.
596 SAGE team.
590 (Demo.edit): added an edit() method to the demo objects, to edit
597 (Demo.edit): added an edit() method to the demo objects, to edit
591 the in-memory copy of the last executed block.
598 the in-memory copy of the last executed block.
592
599
593 * IPython/Magic.py (magic_edit): add '-r' option for 'raw'
600 * IPython/Magic.py (magic_edit): add '-r' option for 'raw'
594 processing to %edit, %macro and %save. These commands can now be
601 processing to %edit, %macro and %save. These commands can now be
595 invoked on the unprocessed input as it was typed by the user
602 invoked on the unprocessed input as it was typed by the user
596 (without any prefilters applied). After requests by the SAGE team
603 (without any prefilters applied). After requests by the SAGE team
597 at SAGE days 2006: http://modular.ucsd.edu/sage/days1/schedule.html.
604 at SAGE days 2006: http://modular.ucsd.edu/sage/days1/schedule.html.
598
605
599 2006-02-01 Ville Vainio <vivainio@gmail.com>
606 2006-02-01 Ville Vainio <vivainio@gmail.com>
600
607
601 * setup.py, eggsetup.py: easy_install ipython==dev works
608 * setup.py, eggsetup.py: easy_install ipython==dev works
602 correctly now (on Linux)
609 correctly now (on Linux)
603
610
604 * ipy_user_conf,ipmaker: user config changes, removed spurious
611 * ipy_user_conf,ipmaker: user config changes, removed spurious
605 warnings
612 warnings
606
613
607 * iplib: if rc.banner is string, use it as is.
614 * iplib: if rc.banner is string, use it as is.
608
615
609 * Magic: %pycat accepts a string argument and pages it's contents.
616 * Magic: %pycat accepts a string argument and pages it's contents.
610
617
611
618
612 2006-01-30 Ville Vainio <vivainio@gmail.com>
619 2006-01-30 Ville Vainio <vivainio@gmail.com>
613
620
614 * pickleshare,pspersistence,ipapi,Magic: persistence overhaul.
621 * pickleshare,pspersistence,ipapi,Magic: persistence overhaul.
615 Now %store and bookmarks work through PickleShare, meaning that
622 Now %store and bookmarks work through PickleShare, meaning that
616 concurrent access is possible and all ipython sessions see the
623 concurrent access is possible and all ipython sessions see the
617 same database situation all the time, instead of snapshot of
624 same database situation all the time, instead of snapshot of
618 the situation when the session was started. Hence, %bookmark
625 the situation when the session was started. Hence, %bookmark
619 results are immediately accessible from othes sessions. The database
626 results are immediately accessible from othes sessions. The database
620 is also available for use by user extensions. See:
627 is also available for use by user extensions. See:
621 http://www.python.org/pypi/pickleshare
628 http://www.python.org/pypi/pickleshare
622
629
623 * hooks.py: Two new hooks, 'shutdown_hook' and 'late_startup_hook'.
630 * hooks.py: Two new hooks, 'shutdown_hook' and 'late_startup_hook'.
624
631
625 * aliases can now be %store'd
632 * aliases can now be %store'd
626
633
627 * path.py moved to Extensions so that pickleshare does not need
634 * path.py moved to Extensions so that pickleshare does not need
628 IPython-specific import. Extensions added to pythonpath right
635 IPython-specific import. Extensions added to pythonpath right
629 at __init__.
636 at __init__.
630
637
631 * iplib.py: ipalias deprecated/redundant; aliases are converted and
638 * iplib.py: ipalias deprecated/redundant; aliases are converted and
632 called with _ip.system and the pre-transformed command string.
639 called with _ip.system and the pre-transformed command string.
633
640
634 2006-01-29 Fernando Perez <Fernando.Perez@colorado.edu>
641 2006-01-29 Fernando Perez <Fernando.Perez@colorado.edu>
635
642
636 * IPython/iplib.py (interact): Fix that we were not catching
643 * IPython/iplib.py (interact): Fix that we were not catching
637 KeyboardInterrupt exceptions properly. I'm not quite sure why the
644 KeyboardInterrupt exceptions properly. I'm not quite sure why the
638 logic here had to change, but it's fixed now.
645 logic here had to change, but it's fixed now.
639
646
640 2006-01-29 Ville Vainio <vivainio@gmail.com>
647 2006-01-29 Ville Vainio <vivainio@gmail.com>
641
648
642 * iplib.py: Try to import pyreadline on Windows.
649 * iplib.py: Try to import pyreadline on Windows.
643
650
644 2006-01-27 Ville Vainio <vivainio@gmail.com>
651 2006-01-27 Ville Vainio <vivainio@gmail.com>
645
652
646 * iplib.py: Expose ipapi as _ip in builtin namespace.
653 * iplib.py: Expose ipapi as _ip in builtin namespace.
647 Makes ipmagic (-> _ip.magic), ipsystem (-> _ip.system)
654 Makes ipmagic (-> _ip.magic), ipsystem (-> _ip.system)
648 and ip_set_hook (-> _ip.set_hook) redundant. % and !
655 and ip_set_hook (-> _ip.set_hook) redundant. % and !
649 syntax now produce _ip.* variant of the commands.
656 syntax now produce _ip.* variant of the commands.
650
657
651 * "_ip.options().autoedit_syntax = 2" automatically throws
658 * "_ip.options().autoedit_syntax = 2" automatically throws
652 user to editor for syntax error correction without prompting.
659 user to editor for syntax error correction without prompting.
653
660
654 2006-01-27 Ville Vainio <vivainio@gmail.com>
661 2006-01-27 Ville Vainio <vivainio@gmail.com>
655
662
656 * ipmaker.py: Give "realistic" sys.argv for scripts (without
663 * ipmaker.py: Give "realistic" sys.argv for scripts (without
657 'ipython' at argv[0]) executed through command line.
664 'ipython' at argv[0]) executed through command line.
658 NOTE: this DEPRECATES calling ipython with multiple scripts
665 NOTE: this DEPRECATES calling ipython with multiple scripts
659 ("ipython a.py b.py c.py")
666 ("ipython a.py b.py c.py")
660
667
661 * iplib.py, hooks.py: Added configurable input prefilter,
668 * iplib.py, hooks.py: Added configurable input prefilter,
662 named 'input_prefilter'. See ext_rescapture.py for example
669 named 'input_prefilter'. See ext_rescapture.py for example
663 usage.
670 usage.
664
671
665 * ext_rescapture.py, Magic.py: Better system command output capture
672 * ext_rescapture.py, Magic.py: Better system command output capture
666 through 'var = !ls' (deprecates user-visible %sc). Same notation
673 through 'var = !ls' (deprecates user-visible %sc). Same notation
667 applies for magics, 'var = %alias' assigns alias list to var.
674 applies for magics, 'var = %alias' assigns alias list to var.
668
675
669 * ipapi.py: added meta() for accessing extension-usable data store.
676 * ipapi.py: added meta() for accessing extension-usable data store.
670
677
671 * iplib.py: added InteractiveShell.getapi(). New magics should be
678 * iplib.py: added InteractiveShell.getapi(). New magics should be
672 written doing self.getapi() instead of using the shell directly.
679 written doing self.getapi() instead of using the shell directly.
673
680
674 * Magic.py: %store now allows doing %store foo > ~/myfoo.txt and
681 * Magic.py: %store now allows doing %store foo > ~/myfoo.txt and
675 %store foo >> ~/myfoo.txt to store variables to files (in clean
682 %store foo >> ~/myfoo.txt to store variables to files (in clean
676 textual form, not a restorable pickle).
683 textual form, not a restorable pickle).
677
684
678 * ipmaker.py: now import ipy_profile_PROFILENAME automatically
685 * ipmaker.py: now import ipy_profile_PROFILENAME automatically
679
686
680 * usage.py, Magic.py: added %quickref
687 * usage.py, Magic.py: added %quickref
681
688
682 * iplib.py: ESC_PAREN fixes: /f 1 2 -> f(1,2), not f(1 2).
689 * iplib.py: ESC_PAREN fixes: /f 1 2 -> f(1,2), not f(1 2).
683
690
684 * GetoptErrors when invoking magics etc. with wrong args
691 * GetoptErrors when invoking magics etc. with wrong args
685 are now more helpful:
692 are now more helpful:
686 GetoptError: option -l not recognized (allowed: "qb" )
693 GetoptError: option -l not recognized (allowed: "qb" )
687
694
688 2006-01-25 Fernando Perez <Fernando.Perez@colorado.edu>
695 2006-01-25 Fernando Perez <Fernando.Perez@colorado.edu>
689
696
690 * IPython/demo.py (Demo.show): Flush stdout after each block, so
697 * IPython/demo.py (Demo.show): Flush stdout after each block, so
691 computationally intensive blocks don't appear to stall the demo.
698 computationally intensive blocks don't appear to stall the demo.
692
699
693 2006-01-24 Ville Vainio <vivainio@gmail.com>
700 2006-01-24 Ville Vainio <vivainio@gmail.com>
694
701
695 * iplib.py, hooks.py: 'result_display' hook can return a non-None
702 * iplib.py, hooks.py: 'result_display' hook can return a non-None
696 value to manipulate resulting history entry.
703 value to manipulate resulting history entry.
697
704
698 * ipapi.py: Moved TryNext here from hooks.py. Moved functions
705 * ipapi.py: Moved TryNext here from hooks.py. Moved functions
699 to instance methods of IPApi class, to make extending an embedded
706 to instance methods of IPApi class, to make extending an embedded
700 IPython feasible. See ext_rehashdir.py for example usage.
707 IPython feasible. See ext_rehashdir.py for example usage.
701
708
702 * Merged 1071-1076 from branches/0.7.1
709 * Merged 1071-1076 from branches/0.7.1
703
710
704
711
705 2006-01-23 Fernando Perez <Fernando.Perez@colorado.edu>
712 2006-01-23 Fernando Perez <Fernando.Perez@colorado.edu>
706
713
707 * tools/release (daystamp): Fix build tools to use the new
714 * tools/release (daystamp): Fix build tools to use the new
708 eggsetup.py script to build lightweight eggs.
715 eggsetup.py script to build lightweight eggs.
709
716
710 * Applied changesets 1062 and 1064 before 0.7.1 release.
717 * Applied changesets 1062 and 1064 before 0.7.1 release.
711
718
712 * IPython/Magic.py (magic_history): Add '-r' option to %hist, to
719 * IPython/Magic.py (magic_history): Add '-r' option to %hist, to
713 see the raw input history (without conversions like %ls ->
720 see the raw input history (without conversions like %ls ->
714 ipmagic("ls")). After a request from W. Stein, SAGE
721 ipmagic("ls")). After a request from W. Stein, SAGE
715 (http://modular.ucsd.edu/sage) developer. This information is
722 (http://modular.ucsd.edu/sage) developer. This information is
716 stored in the input_hist_raw attribute of the IPython instance, so
723 stored in the input_hist_raw attribute of the IPython instance, so
717 developers can access it if needed (it's an InputList instance).
724 developers can access it if needed (it's an InputList instance).
718
725
719 * Versionstring = 0.7.2.svn
726 * Versionstring = 0.7.2.svn
720
727
721 * eggsetup.py: A separate script for constructing eggs, creates
728 * eggsetup.py: A separate script for constructing eggs, creates
722 proper launch scripts even on Windows (an .exe file in
729 proper launch scripts even on Windows (an .exe file in
723 \python24\scripts).
730 \python24\scripts).
724
731
725 * ipapi.py: launch_new_instance, launch entry point needed for the
732 * ipapi.py: launch_new_instance, launch entry point needed for the
726 egg.
733 egg.
727
734
728 2006-01-23 Ville Vainio <vivainio@gmail.com>
735 2006-01-23 Ville Vainio <vivainio@gmail.com>
729
736
730 * Added %cpaste magic for pasting python code
737 * Added %cpaste magic for pasting python code
731
738
732 2006-01-22 Ville Vainio <vivainio@gmail.com>
739 2006-01-22 Ville Vainio <vivainio@gmail.com>
733
740
734 * Merge from branches/0.7.1 into trunk, revs 1052-1057
741 * Merge from branches/0.7.1 into trunk, revs 1052-1057
735
742
736 * Versionstring = 0.7.2.svn
743 * Versionstring = 0.7.2.svn
737
744
738 * eggsetup.py: A separate script for constructing eggs, creates
745 * eggsetup.py: A separate script for constructing eggs, creates
739 proper launch scripts even on Windows (an .exe file in
746 proper launch scripts even on Windows (an .exe file in
740 \python24\scripts).
747 \python24\scripts).
741
748
742 * ipapi.py: launch_new_instance, launch entry point needed for the
749 * ipapi.py: launch_new_instance, launch entry point needed for the
743 egg.
750 egg.
744
751
745 2006-01-22 Fernando Perez <Fernando.Perez@colorado.edu>
752 2006-01-22 Fernando Perez <Fernando.Perez@colorado.edu>
746
753
747 * IPython/OInspect.py (Inspector.pinfo): fix bug where foo?? or
754 * IPython/OInspect.py (Inspector.pinfo): fix bug where foo?? or
748 %pfile foo would print the file for foo even if it was a binary.
755 %pfile foo would print the file for foo even if it was a binary.
749 Now, extensions '.so' and '.dll' are skipped.
756 Now, extensions '.so' and '.dll' are skipped.
750
757
751 * IPython/Shell.py (MTInteractiveShell.__init__): Fix threading
758 * IPython/Shell.py (MTInteractiveShell.__init__): Fix threading
752 bug, where macros would fail in all threaded modes. I'm not 100%
759 bug, where macros would fail in all threaded modes. I'm not 100%
753 sure, so I'm going to put out an rc instead of making a release
760 sure, so I'm going to put out an rc instead of making a release
754 today, and wait for feedback for at least a few days.
761 today, and wait for feedback for at least a few days.
755
762
756 * IPython/iplib.py (handle_normal): fix (finally? somehow I doubt
763 * IPython/iplib.py (handle_normal): fix (finally? somehow I doubt
757 it...) the handling of pasting external code with autoindent on.
764 it...) the handling of pasting external code with autoindent on.
758 To get out of a multiline input, the rule will appear for most
765 To get out of a multiline input, the rule will appear for most
759 users unchanged: two blank lines or change the indent level
766 users unchanged: two blank lines or change the indent level
760 proposed by IPython. But there is a twist now: you can
767 proposed by IPython. But there is a twist now: you can
761 add/subtract only *one or two spaces*. If you add/subtract three
768 add/subtract only *one or two spaces*. If you add/subtract three
762 or more (unless you completely delete the line), IPython will
769 or more (unless you completely delete the line), IPython will
763 accept that line, and you'll need to enter a second one of pure
770 accept that line, and you'll need to enter a second one of pure
764 whitespace. I know it sounds complicated, but I can't find a
771 whitespace. I know it sounds complicated, but I can't find a
765 different solution that covers all the cases, with the right
772 different solution that covers all the cases, with the right
766 heuristics. Hopefully in actual use, nobody will really notice
773 heuristics. Hopefully in actual use, nobody will really notice
767 all these strange rules and things will 'just work'.
774 all these strange rules and things will 'just work'.
768
775
769 2006-01-21 Fernando Perez <Fernando.Perez@colorado.edu>
776 2006-01-21 Fernando Perez <Fernando.Perez@colorado.edu>
770
777
771 * IPython/iplib.py (interact): catch exceptions which can be
778 * IPython/iplib.py (interact): catch exceptions which can be
772 triggered asynchronously by signal handlers. Thanks to an
779 triggered asynchronously by signal handlers. Thanks to an
773 automatic crash report, submitted by Colin Kingsley
780 automatic crash report, submitted by Colin Kingsley
774 <tercel-AT-gentoo.org>.
781 <tercel-AT-gentoo.org>.
775
782
776 2006-01-20 Ville Vainio <vivainio@gmail.com>
783 2006-01-20 Ville Vainio <vivainio@gmail.com>
777
784
778 * Ipython/Extensions/ext_rehashdir.py: Created a usable example
785 * Ipython/Extensions/ext_rehashdir.py: Created a usable example
779 (%rehashdir, very useful, try it out) of how to extend ipython
786 (%rehashdir, very useful, try it out) of how to extend ipython
780 with new magics. Also added Extensions dir to pythonpath to make
787 with new magics. Also added Extensions dir to pythonpath to make
781 importing extensions easy.
788 importing extensions easy.
782
789
783 * %store now complains when trying to store interactively declared
790 * %store now complains when trying to store interactively declared
784 classes / instances of those classes.
791 classes / instances of those classes.
785
792
786 * Extensions/ipy_system_conf.py, UserConfig/ipy_user_conf.py,
793 * Extensions/ipy_system_conf.py, UserConfig/ipy_user_conf.py,
787 ipmaker.py: Config rehaul. Now ipy_..._conf.py are always imported
794 ipmaker.py: Config rehaul. Now ipy_..._conf.py are always imported
788 if they exist, and ipy_user_conf.py with some defaults is created for
795 if they exist, and ipy_user_conf.py with some defaults is created for
789 the user.
796 the user.
790
797
791 * Startup rehashing done by the config file, not InterpreterExec.
798 * Startup rehashing done by the config file, not InterpreterExec.
792 This means system commands are available even without selecting the
799 This means system commands are available even without selecting the
793 pysh profile. It's the sensible default after all.
800 pysh profile. It's the sensible default after all.
794
801
795 2006-01-20 Fernando Perez <Fernando.Perez@colorado.edu>
802 2006-01-20 Fernando Perez <Fernando.Perez@colorado.edu>
796
803
797 * IPython/iplib.py (raw_input): I _think_ I got the pasting of
804 * IPython/iplib.py (raw_input): I _think_ I got the pasting of
798 multiline code with autoindent on working. But I am really not
805 multiline code with autoindent on working. But I am really not
799 sure, so this needs more testing. Will commit a debug-enabled
806 sure, so this needs more testing. Will commit a debug-enabled
800 version for now, while I test it some more, so that Ville and
807 version for now, while I test it some more, so that Ville and
801 others may also catch any problems. Also made
808 others may also catch any problems. Also made
802 self.indent_current_str() a method, to ensure that there's no
809 self.indent_current_str() a method, to ensure that there's no
803 chance of the indent space count and the corresponding string
810 chance of the indent space count and the corresponding string
804 falling out of sync. All code needing the string should just call
811 falling out of sync. All code needing the string should just call
805 the method.
812 the method.
806
813
807 2006-01-18 Fernando Perez <Fernando.Perez@colorado.edu>
814 2006-01-18 Fernando Perez <Fernando.Perez@colorado.edu>
808
815
809 * IPython/Magic.py (magic_edit): fix check for when users don't
816 * IPython/Magic.py (magic_edit): fix check for when users don't
810 save their output files, the try/except was in the wrong section.
817 save their output files, the try/except was in the wrong section.
811
818
812 2006-01-17 Fernando Perez <Fernando.Perez@colorado.edu>
819 2006-01-17 Fernando Perez <Fernando.Perez@colorado.edu>
813
820
814 * IPython/Magic.py (magic_run): fix __file__ global missing from
821 * IPython/Magic.py (magic_run): fix __file__ global missing from
815 script's namespace when executed via %run. After a report by
822 script's namespace when executed via %run. After a report by
816 Vivian.
823 Vivian.
817
824
818 * IPython/Debugger.py (Pdb.__init__): Fix breakage with '%run -d'
825 * IPython/Debugger.py (Pdb.__init__): Fix breakage with '%run -d'
819 when using python 2.4. The parent constructor changed in 2.4, and
826 when using python 2.4. The parent constructor changed in 2.4, and
820 we need to track it directly (we can't call it, as it messes up
827 we need to track it directly (we can't call it, as it messes up
821 readline and tab-completion inside our pdb would stop working).
828 readline and tab-completion inside our pdb would stop working).
822 After a bug report by R. Bernstein <rocky-AT-panix.com>.
829 After a bug report by R. Bernstein <rocky-AT-panix.com>.
823
830
824 2006-01-16 Ville Vainio <vivainio@gmail.com>
831 2006-01-16 Ville Vainio <vivainio@gmail.com>
825
832
826 * Ipython/magic.py: Reverted back to old %edit functionality
833 * Ipython/magic.py: Reverted back to old %edit functionality
827 that returns file contents on exit.
834 that returns file contents on exit.
828
835
829 * IPython/path.py: Added Jason Orendorff's "path" module to
836 * IPython/path.py: Added Jason Orendorff's "path" module to
830 IPython tree, http://www.jorendorff.com/articles/python/path/.
837 IPython tree, http://www.jorendorff.com/articles/python/path/.
831 You can get path objects conveniently through %sc, and !!, e.g.:
838 You can get path objects conveniently through %sc, and !!, e.g.:
832 sc files=ls
839 sc files=ls
833 for p in files.paths: # or files.p
840 for p in files.paths: # or files.p
834 print p,p.mtime
841 print p,p.mtime
835
842
836 * Ipython/iplib.py:"," and ";" autoquoting-upon-autocall
843 * Ipython/iplib.py:"," and ";" autoquoting-upon-autocall
837 now work again without considering the exclusion regexp -
844 now work again without considering the exclusion regexp -
838 hence, things like ',foo my/path' turn to 'foo("my/path")'
845 hence, things like ',foo my/path' turn to 'foo("my/path")'
839 instead of syntax error.
846 instead of syntax error.
840
847
841
848
842 2006-01-14 Ville Vainio <vivainio@gmail.com>
849 2006-01-14 Ville Vainio <vivainio@gmail.com>
843
850
844 * IPython/ipapi.py (ashook, asmagic, options): Added convenience
851 * IPython/ipapi.py (ashook, asmagic, options): Added convenience
845 ipapi decorators for python 2.4 users, options() provides access to rc
852 ipapi decorators for python 2.4 users, options() provides access to rc
846 data.
853 data.
847
854
848 * IPython/Magic.py (magic_cd): %cd now accepts backslashes
855 * IPython/Magic.py (magic_cd): %cd now accepts backslashes
849 as path separators (even on Linux ;-). Space character after
856 as path separators (even on Linux ;-). Space character after
850 backslash (as yielded by tab completer) is still space;
857 backslash (as yielded by tab completer) is still space;
851 "%cd long\ name" works as expected.
858 "%cd long\ name" works as expected.
852
859
853 * IPython/ipapi.py,hooks.py,iplib.py: Hooks now implemented
860 * IPython/ipapi.py,hooks.py,iplib.py: Hooks now implemented
854 as "chain of command", with priority. API stays the same,
861 as "chain of command", with priority. API stays the same,
855 TryNext exception raised by a hook function signals that
862 TryNext exception raised by a hook function signals that
856 current hook failed and next hook should try handling it, as
863 current hook failed and next hook should try handling it, as
857 suggested by Walter DΓΆrwald <walter@livinglogic.de>. Walter also
864 suggested by Walter DΓΆrwald <walter@livinglogic.de>. Walter also
858 requested configurable display hook, which is now implemented.
865 requested configurable display hook, which is now implemented.
859
866
860 2006-01-13 Ville Vainio <vivainio@gmail.com>
867 2006-01-13 Ville Vainio <vivainio@gmail.com>
861
868
862 * IPython/platutils*.py: platform specific utility functions,
869 * IPython/platutils*.py: platform specific utility functions,
863 so far only set_term_title is implemented (change terminal
870 so far only set_term_title is implemented (change terminal
864 label in windowing systems). %cd now changes the title to
871 label in windowing systems). %cd now changes the title to
865 current dir.
872 current dir.
866
873
867 * IPython/Release.py: Added myself to "authors" list,
874 * IPython/Release.py: Added myself to "authors" list,
868 had to create new files.
875 had to create new files.
869
876
870 * IPython/iplib.py (handle_shell_escape): fixed logical flaw in
877 * IPython/iplib.py (handle_shell_escape): fixed logical flaw in
871 shell escape; not a known bug but had potential to be one in the
878 shell escape; not a known bug but had potential to be one in the
872 future.
879 future.
873
880
874 * IPython/ipapi.py (added),OInspect.py,iplib.py: "Public"
881 * IPython/ipapi.py (added),OInspect.py,iplib.py: "Public"
875 extension API for IPython! See the module for usage example. Fix
882 extension API for IPython! See the module for usage example. Fix
876 OInspect for docstring-less magic functions.
883 OInspect for docstring-less magic functions.
877
884
878
885
879 2006-01-13 Fernando Perez <Fernando.Perez@colorado.edu>
886 2006-01-13 Fernando Perez <Fernando.Perez@colorado.edu>
880
887
881 * IPython/iplib.py (raw_input): temporarily deactivate all
888 * IPython/iplib.py (raw_input): temporarily deactivate all
882 attempts at allowing pasting of code with autoindent on. It
889 attempts at allowing pasting of code with autoindent on. It
883 introduced bugs (reported by Prabhu) and I can't seem to find a
890 introduced bugs (reported by Prabhu) and I can't seem to find a
884 robust combination which works in all cases. Will have to revisit
891 robust combination which works in all cases. Will have to revisit
885 later.
892 later.
886
893
887 * IPython/genutils.py: remove isspace() function. We've dropped
894 * IPython/genutils.py: remove isspace() function. We've dropped
888 2.2 compatibility, so it's OK to use the string method.
895 2.2 compatibility, so it's OK to use the string method.
889
896
890 2006-01-12 Fernando Perez <Fernando.Perez@colorado.edu>
897 2006-01-12 Fernando Perez <Fernando.Perez@colorado.edu>
891
898
892 * IPython/iplib.py (InteractiveShell.__init__): fix regexp
899 * IPython/iplib.py (InteractiveShell.__init__): fix regexp
893 matching what NOT to autocall on, to include all python binary
900 matching what NOT to autocall on, to include all python binary
894 operators (including things like 'and', 'or', 'is' and 'in').
901 operators (including things like 'and', 'or', 'is' and 'in').
895 Prompted by a bug report on 'foo & bar', but I realized we had
902 Prompted by a bug report on 'foo & bar', but I realized we had
896 many more potential bug cases with other operators. The regexp is
903 many more potential bug cases with other operators. The regexp is
897 self.re_exclude_auto, it's fairly commented.
904 self.re_exclude_auto, it's fairly commented.
898
905
899 2006-01-12 Ville Vainio <vivainio@gmail.com>
906 2006-01-12 Ville Vainio <vivainio@gmail.com>
900
907
901 * IPython/iplib.py (make_quoted_expr,handle_shell_escape):
908 * IPython/iplib.py (make_quoted_expr,handle_shell_escape):
902 Prettified and hardened string/backslash quoting with ipsystem(),
909 Prettified and hardened string/backslash quoting with ipsystem(),
903 ipalias() and ipmagic(). Now even \ characters are passed to
910 ipalias() and ipmagic(). Now even \ characters are passed to
904 %magics, !shell escapes and aliases exactly as they are in the
911 %magics, !shell escapes and aliases exactly as they are in the
905 ipython command line. Should improve backslash experience,
912 ipython command line. Should improve backslash experience,
906 particularly in Windows (path delimiter for some commands that
913 particularly in Windows (path delimiter for some commands that
907 won't understand '/'), but Unix benefits as well (regexps). %cd
914 won't understand '/'), but Unix benefits as well (regexps). %cd
908 magic still doesn't support backslash path delimiters, though. Also
915 magic still doesn't support backslash path delimiters, though. Also
909 deleted all pretense of supporting multiline command strings in
916 deleted all pretense of supporting multiline command strings in
910 !system or %magic commands. Thanks to Jerry McRae for suggestions.
917 !system or %magic commands. Thanks to Jerry McRae for suggestions.
911
918
912 * doc/build_doc_instructions.txt added. Documentation on how to
919 * doc/build_doc_instructions.txt added. Documentation on how to
913 use doc/update_manual.py, added yesterday. Both files contributed
920 use doc/update_manual.py, added yesterday. Both files contributed
914 by JΓΆrgen Stenarson <jorgen.stenarson-AT-bostream.nu>. This slates
921 by JΓΆrgen Stenarson <jorgen.stenarson-AT-bostream.nu>. This slates
915 doc/*.sh for deprecation at a later date.
922 doc/*.sh for deprecation at a later date.
916
923
917 * /ipython.py Added ipython.py to root directory for
924 * /ipython.py Added ipython.py to root directory for
918 zero-installation (tar xzvf ipython.tgz; cd ipython; python
925 zero-installation (tar xzvf ipython.tgz; cd ipython; python
919 ipython.py) and development convenience (no need to keep doing
926 ipython.py) and development convenience (no need to keep doing
920 "setup.py install" between changes).
927 "setup.py install" between changes).
921
928
922 * Made ! and !! shell escapes work (again) in multiline expressions:
929 * Made ! and !! shell escapes work (again) in multiline expressions:
923 if 1:
930 if 1:
924 !ls
931 !ls
925 !!ls
932 !!ls
926
933
927 2006-01-12 Fernando Perez <Fernando.Perez@colorado.edu>
934 2006-01-12 Fernando Perez <Fernando.Perez@colorado.edu>
928
935
929 * IPython/ipstruct.py (Struct): Rename IPython.Struct to
936 * IPython/ipstruct.py (Struct): Rename IPython.Struct to
930 IPython.ipstruct, to avoid local shadowing of the stdlib 'struct'
937 IPython.ipstruct, to avoid local shadowing of the stdlib 'struct'
931 module in case-insensitive installation. Was causing crashes
938 module in case-insensitive installation. Was causing crashes
932 under win32. Closes http://www.scipy.net/roundup/ipython/issue49.
939 under win32. Closes http://www.scipy.net/roundup/ipython/issue49.
933
940
934 * IPython/Magic.py (magic_pycat): Fix pycat, patch by Marien Zwart
941 * IPython/Magic.py (magic_pycat): Fix pycat, patch by Marien Zwart
935 <marienz-AT-gentoo.org>, closes
942 <marienz-AT-gentoo.org>, closes
936 http://www.scipy.net/roundup/ipython/issue51.
943 http://www.scipy.net/roundup/ipython/issue51.
937
944
938 2006-01-11 Fernando Perez <Fernando.Perez@colorado.edu>
945 2006-01-11 Fernando Perez <Fernando.Perez@colorado.edu>
939
946
940 * IPython/Shell.py (IPShellGTK.on_timer): Finally fix the
947 * IPython/Shell.py (IPShellGTK.on_timer): Finally fix the
941 problem of excessive CPU usage under *nix and keyboard lag under
948 problem of excessive CPU usage under *nix and keyboard lag under
942 win32.
949 win32.
943
950
944 2006-01-10 *** Released version 0.7.0
951 2006-01-10 *** Released version 0.7.0
945
952
946 2006-01-10 Fernando Perez <Fernando.Perez@colorado.edu>
953 2006-01-10 Fernando Perez <Fernando.Perez@colorado.edu>
947
954
948 * IPython/Release.py (revision): tag version number to 0.7.0,
955 * IPython/Release.py (revision): tag version number to 0.7.0,
949 ready for release.
956 ready for release.
950
957
951 * IPython/Magic.py (magic_edit): Add print statement to %edit so
958 * IPython/Magic.py (magic_edit): Add print statement to %edit so
952 it informs the user of the name of the temp. file used. This can
959 it informs the user of the name of the temp. file used. This can
953 help if you decide later to reuse that same file, so you know
960 help if you decide later to reuse that same file, so you know
954 where to copy the info from.
961 where to copy the info from.
955
962
956 2006-01-09 Fernando Perez <Fernando.Perez@colorado.edu>
963 2006-01-09 Fernando Perez <Fernando.Perez@colorado.edu>
957
964
958 * setup_bdist_egg.py: little script to build an egg. Added
965 * setup_bdist_egg.py: little script to build an egg. Added
959 support in the release tools as well.
966 support in the release tools as well.
960
967
961 2006-01-08 Fernando Perez <Fernando.Perez@colorado.edu>
968 2006-01-08 Fernando Perez <Fernando.Perez@colorado.edu>
962
969
963 * IPython/Shell.py (IPShellWX.__init__): add support for WXPython
970 * IPython/Shell.py (IPShellWX.__init__): add support for WXPython
964 version selection (new -wxversion command line and ipythonrc
971 version selection (new -wxversion command line and ipythonrc
965 parameter). Patch contributed by Arnd Baecker
972 parameter). Patch contributed by Arnd Baecker
966 <arnd.baecker-AT-web.de>.
973 <arnd.baecker-AT-web.de>.
967
974
968 * IPython/iplib.py (embed_mainloop): fix tab-completion in
975 * IPython/iplib.py (embed_mainloop): fix tab-completion in
969 embedded instances, for variables defined at the interactive
976 embedded instances, for variables defined at the interactive
970 prompt of the embedded ipython. Reported by Arnd.
977 prompt of the embedded ipython. Reported by Arnd.
971
978
972 * IPython/Magic.py (magic_autocall): Fix %autocall magic. Now
979 * IPython/Magic.py (magic_autocall): Fix %autocall magic. Now
973 it can be used as a (stateful) toggle, or with a direct parameter.
980 it can be used as a (stateful) toggle, or with a direct parameter.
974
981
975 * IPython/ultraTB.py (_fixed_getinnerframes): remove debug assert which
982 * IPython/ultraTB.py (_fixed_getinnerframes): remove debug assert which
976 could be triggered in certain cases and cause the traceback
983 could be triggered in certain cases and cause the traceback
977 printer not to work.
984 printer not to work.
978
985
979 2006-01-07 Fernando Perez <Fernando.Perez@colorado.edu>
986 2006-01-07 Fernando Perez <Fernando.Perez@colorado.edu>
980
987
981 * IPython/iplib.py (_should_recompile): Small fix, closes
988 * IPython/iplib.py (_should_recompile): Small fix, closes
982 http://www.scipy.net/roundup/ipython/issue48. Patch by Scott.
989 http://www.scipy.net/roundup/ipython/issue48. Patch by Scott.
983
990
984 2006-01-04 Fernando Perez <Fernando.Perez@colorado.edu>
991 2006-01-04 Fernando Perez <Fernando.Perez@colorado.edu>
985
992
986 * IPython/Shell.py (IPShellGTK.mainloop): fix bug in the GTK
993 * IPython/Shell.py (IPShellGTK.mainloop): fix bug in the GTK
987 backend for matplotlib (100% cpu utiliziation). Thanks to Charlie
994 backend for matplotlib (100% cpu utiliziation). Thanks to Charlie
988 Moad for help with tracking it down.
995 Moad for help with tracking it down.
989
996
990 * IPython/iplib.py (handle_auto): fix autocall handling for
997 * IPython/iplib.py (handle_auto): fix autocall handling for
991 objects which support BOTH __getitem__ and __call__ (so that f [x]
998 objects which support BOTH __getitem__ and __call__ (so that f [x]
992 is left alone, instead of becoming f([x]) automatically).
999 is left alone, instead of becoming f([x]) automatically).
993
1000
994 * IPython/Magic.py (magic_cd): fix crash when cd -b was used.
1001 * IPython/Magic.py (magic_cd): fix crash when cd -b was used.
995 Ville's patch.
1002 Ville's patch.
996
1003
997 2006-01-03 Fernando Perez <Fernando.Perez@colorado.edu>
1004 2006-01-03 Fernando Perez <Fernando.Perez@colorado.edu>
998
1005
999 * IPython/iplib.py (handle_auto): changed autocall semantics to
1006 * IPython/iplib.py (handle_auto): changed autocall semantics to
1000 include 'smart' mode, where the autocall transformation is NOT
1007 include 'smart' mode, where the autocall transformation is NOT
1001 applied if there are no arguments on the line. This allows you to
1008 applied if there are no arguments on the line. This allows you to
1002 just type 'foo' if foo is a callable to see its internal form,
1009 just type 'foo' if foo is a callable to see its internal form,
1003 instead of having it called with no arguments (typically a
1010 instead of having it called with no arguments (typically a
1004 mistake). The old 'full' autocall still exists: for that, you
1011 mistake). The old 'full' autocall still exists: for that, you
1005 need to set the 'autocall' parameter to 2 in your ipythonrc file.
1012 need to set the 'autocall' parameter to 2 in your ipythonrc file.
1006
1013
1007 * IPython/completer.py (Completer.attr_matches): add
1014 * IPython/completer.py (Completer.attr_matches): add
1008 tab-completion support for Enthoughts' traits. After a report by
1015 tab-completion support for Enthoughts' traits. After a report by
1009 Arnd and a patch by Prabhu.
1016 Arnd and a patch by Prabhu.
1010
1017
1011 2006-01-02 Fernando Perez <Fernando.Perez@colorado.edu>
1018 2006-01-02 Fernando Perez <Fernando.Perez@colorado.edu>
1012
1019
1013 * IPython/ultraTB.py (_fixed_getinnerframes): added Alex
1020 * IPython/ultraTB.py (_fixed_getinnerframes): added Alex
1014 Schmolck's patch to fix inspect.getinnerframes().
1021 Schmolck's patch to fix inspect.getinnerframes().
1015
1022
1016 * IPython/iplib.py (InteractiveShell.__init__): significant fixes
1023 * IPython/iplib.py (InteractiveShell.__init__): significant fixes
1017 for embedded instances, regarding handling of namespaces and items
1024 for embedded instances, regarding handling of namespaces and items
1018 added to the __builtin__ one. Multiple embedded instances and
1025 added to the __builtin__ one. Multiple embedded instances and
1019 recursive embeddings should work better now (though I'm not sure
1026 recursive embeddings should work better now (though I'm not sure
1020 I've got all the corner cases fixed, that code is a bit of a brain
1027 I've got all the corner cases fixed, that code is a bit of a brain
1021 twister).
1028 twister).
1022
1029
1023 * IPython/Magic.py (magic_edit): added support to edit in-memory
1030 * IPython/Magic.py (magic_edit): added support to edit in-memory
1024 macros (automatically creates the necessary temp files). %edit
1031 macros (automatically creates the necessary temp files). %edit
1025 also doesn't return the file contents anymore, it's just noise.
1032 also doesn't return the file contents anymore, it's just noise.
1026
1033
1027 * IPython/completer.py (Completer.attr_matches): revert change to
1034 * IPython/completer.py (Completer.attr_matches): revert change to
1028 complete only on attributes listed in __all__. I realized it
1035 complete only on attributes listed in __all__. I realized it
1029 cripples the tab-completion system as a tool for exploring the
1036 cripples the tab-completion system as a tool for exploring the
1030 internals of unknown libraries (it renders any non-__all__
1037 internals of unknown libraries (it renders any non-__all__
1031 attribute off-limits). I got bit by this when trying to see
1038 attribute off-limits). I got bit by this when trying to see
1032 something inside the dis module.
1039 something inside the dis module.
1033
1040
1034 2005-12-31 Fernando Perez <Fernando.Perez@colorado.edu>
1041 2005-12-31 Fernando Perez <Fernando.Perez@colorado.edu>
1035
1042
1036 * IPython/iplib.py (InteractiveShell.__init__): add .meta
1043 * IPython/iplib.py (InteractiveShell.__init__): add .meta
1037 namespace for users and extension writers to hold data in. This
1044 namespace for users and extension writers to hold data in. This
1038 follows the discussion in
1045 follows the discussion in
1039 http://projects.scipy.org/ipython/ipython/wiki/RefactoringIPython.
1046 http://projects.scipy.org/ipython/ipython/wiki/RefactoringIPython.
1040
1047
1041 * IPython/completer.py (IPCompleter.complete): small patch to help
1048 * IPython/completer.py (IPCompleter.complete): small patch to help
1042 tab-completion under Emacs, after a suggestion by John Barnard
1049 tab-completion under Emacs, after a suggestion by John Barnard
1043 <barnarj-AT-ccf.org>.
1050 <barnarj-AT-ccf.org>.
1044
1051
1045 * IPython/Magic.py (Magic.extract_input_slices): added support for
1052 * IPython/Magic.py (Magic.extract_input_slices): added support for
1046 the slice notation in magics to use N-M to represent numbers N...M
1053 the slice notation in magics to use N-M to represent numbers N...M
1047 (closed endpoints). This is used by %macro and %save.
1054 (closed endpoints). This is used by %macro and %save.
1048
1055
1049 * IPython/completer.py (Completer.attr_matches): for modules which
1056 * IPython/completer.py (Completer.attr_matches): for modules which
1050 define __all__, complete only on those. After a patch by Jeffrey
1057 define __all__, complete only on those. After a patch by Jeffrey
1051 Collins <jcollins_boulder-AT-earthlink.net>. Also, clean up and
1058 Collins <jcollins_boulder-AT-earthlink.net>. Also, clean up and
1052 speed up this routine.
1059 speed up this routine.
1053
1060
1054 * IPython/Logger.py (Logger.log): fix a history handling bug. I
1061 * IPython/Logger.py (Logger.log): fix a history handling bug. I
1055 don't know if this is the end of it, but the behavior now is
1062 don't know if this is the end of it, but the behavior now is
1056 certainly much more correct. Note that coupled with macros,
1063 certainly much more correct. Note that coupled with macros,
1057 slightly surprising (at first) behavior may occur: a macro will in
1064 slightly surprising (at first) behavior may occur: a macro will in
1058 general expand to multiple lines of input, so upon exiting, the
1065 general expand to multiple lines of input, so upon exiting, the
1059 in/out counters will both be bumped by the corresponding amount
1066 in/out counters will both be bumped by the corresponding amount
1060 (as if the macro's contents had been typed interactively). Typing
1067 (as if the macro's contents had been typed interactively). Typing
1061 %hist will reveal the intermediate (silently processed) lines.
1068 %hist will reveal the intermediate (silently processed) lines.
1062
1069
1063 * IPython/Magic.py (magic_run): fix a subtle bug which could cause
1070 * IPython/Magic.py (magic_run): fix a subtle bug which could cause
1064 pickle to fail (%run was overwriting __main__ and not restoring
1071 pickle to fail (%run was overwriting __main__ and not restoring
1065 it, but pickle relies on __main__ to operate).
1072 it, but pickle relies on __main__ to operate).
1066
1073
1067 * IPython/iplib.py (InteractiveShell): fix pdb calling: I'm now
1074 * IPython/iplib.py (InteractiveShell): fix pdb calling: I'm now
1068 using properties, but forgot to make the main InteractiveShell
1075 using properties, but forgot to make the main InteractiveShell
1069 class a new-style class. Properties fail silently, and
1076 class a new-style class. Properties fail silently, and
1070 mysteriously, with old-style class (getters work, but
1077 mysteriously, with old-style class (getters work, but
1071 setters don't do anything).
1078 setters don't do anything).
1072
1079
1073 2005-12-30 Fernando Perez <Fernando.Perez@colorado.edu>
1080 2005-12-30 Fernando Perez <Fernando.Perez@colorado.edu>
1074
1081
1075 * IPython/Magic.py (magic_history): fix history reporting bug (I
1082 * IPython/Magic.py (magic_history): fix history reporting bug (I
1076 know some nasties are still there, I just can't seem to find a
1083 know some nasties are still there, I just can't seem to find a
1077 reproducible test case to track them down; the input history is
1084 reproducible test case to track them down; the input history is
1078 falling out of sync...)
1085 falling out of sync...)
1079
1086
1080 * IPython/iplib.py (handle_shell_escape): fix bug where both
1087 * IPython/iplib.py (handle_shell_escape): fix bug where both
1081 aliases and system accesses where broken for indented code (such
1088 aliases and system accesses where broken for indented code (such
1082 as loops).
1089 as loops).
1083
1090
1084 * IPython/genutils.py (shell): fix small but critical bug for
1091 * IPython/genutils.py (shell): fix small but critical bug for
1085 win32 system access.
1092 win32 system access.
1086
1093
1087 2005-12-29 Fernando Perez <Fernando.Perez@colorado.edu>
1094 2005-12-29 Fernando Perez <Fernando.Perez@colorado.edu>
1088
1095
1089 * IPython/iplib.py (showtraceback): remove use of the
1096 * IPython/iplib.py (showtraceback): remove use of the
1090 sys.last_{type/value/traceback} structures, which are non
1097 sys.last_{type/value/traceback} structures, which are non
1091 thread-safe.
1098 thread-safe.
1092 (_prefilter): change control flow to ensure that we NEVER
1099 (_prefilter): change control flow to ensure that we NEVER
1093 introspect objects when autocall is off. This will guarantee that
1100 introspect objects when autocall is off. This will guarantee that
1094 having an input line of the form 'x.y', where access to attribute
1101 having an input line of the form 'x.y', where access to attribute
1095 'y' has side effects, doesn't trigger the side effect TWICE. It
1102 'y' has side effects, doesn't trigger the side effect TWICE. It
1096 is important to note that, with autocall on, these side effects
1103 is important to note that, with autocall on, these side effects
1097 can still happen.
1104 can still happen.
1098 (ipsystem): new builtin, to complete the ip{magic/alias/system}
1105 (ipsystem): new builtin, to complete the ip{magic/alias/system}
1099 trio. IPython offers these three kinds of special calls which are
1106 trio. IPython offers these three kinds of special calls which are
1100 not python code, and it's a good thing to have their call method
1107 not python code, and it's a good thing to have their call method
1101 be accessible as pure python functions (not just special syntax at
1108 be accessible as pure python functions (not just special syntax at
1102 the command line). It gives us a better internal implementation
1109 the command line). It gives us a better internal implementation
1103 structure, as well as exposing these for user scripting more
1110 structure, as well as exposing these for user scripting more
1104 cleanly.
1111 cleanly.
1105
1112
1106 * IPython/macro.py (Macro.__init__): moved macros to a standalone
1113 * IPython/macro.py (Macro.__init__): moved macros to a standalone
1107 file. Now that they'll be more likely to be used with the
1114 file. Now that they'll be more likely to be used with the
1108 persistance system (%store), I want to make sure their module path
1115 persistance system (%store), I want to make sure their module path
1109 doesn't change in the future, so that we don't break things for
1116 doesn't change in the future, so that we don't break things for
1110 users' persisted data.
1117 users' persisted data.
1111
1118
1112 * IPython/iplib.py (autoindent_update): move indentation
1119 * IPython/iplib.py (autoindent_update): move indentation
1113 management into the _text_ processing loop, not the keyboard
1120 management into the _text_ processing loop, not the keyboard
1114 interactive one. This is necessary to correctly process non-typed
1121 interactive one. This is necessary to correctly process non-typed
1115 multiline input (such as macros).
1122 multiline input (such as macros).
1116
1123
1117 * IPython/Magic.py (Magic.format_latex): patch by Stefan van der
1124 * IPython/Magic.py (Magic.format_latex): patch by Stefan van der
1118 Walt <stefan-AT-sun.ac.za> to fix latex formatting of docstrings,
1125 Walt <stefan-AT-sun.ac.za> to fix latex formatting of docstrings,
1119 which was producing problems in the resulting manual.
1126 which was producing problems in the resulting manual.
1120 (magic_whos): improve reporting of instances (show their class,
1127 (magic_whos): improve reporting of instances (show their class,
1121 instead of simply printing 'instance' which isn't terribly
1128 instead of simply printing 'instance' which isn't terribly
1122 informative).
1129 informative).
1123
1130
1124 * IPython/genutils.py (shell): commit Jorgen Stenarson's patch
1131 * IPython/genutils.py (shell): commit Jorgen Stenarson's patch
1125 (minor mods) to support network shares under win32.
1132 (minor mods) to support network shares under win32.
1126
1133
1127 * IPython/winconsole.py (get_console_size): add new winconsole
1134 * IPython/winconsole.py (get_console_size): add new winconsole
1128 module and fixes to page_dumb() to improve its behavior under
1135 module and fixes to page_dumb() to improve its behavior under
1129 win32. Contributed by Alexander Belchenko <bialix-AT-ukr.net>.
1136 win32. Contributed by Alexander Belchenko <bialix-AT-ukr.net>.
1130
1137
1131 * IPython/Magic.py (Macro): simplified Macro class to just
1138 * IPython/Magic.py (Macro): simplified Macro class to just
1132 subclass list. We've had only 2.2 compatibility for a very long
1139 subclass list. We've had only 2.2 compatibility for a very long
1133 time, yet I was still avoiding subclassing the builtin types. No
1140 time, yet I was still avoiding subclassing the builtin types. No
1134 more (I'm also starting to use properties, though I won't shift to
1141 more (I'm also starting to use properties, though I won't shift to
1135 2.3-specific features quite yet).
1142 2.3-specific features quite yet).
1136 (magic_store): added Ville's patch for lightweight variable
1143 (magic_store): added Ville's patch for lightweight variable
1137 persistence, after a request on the user list by Matt Wilkie
1144 persistence, after a request on the user list by Matt Wilkie
1138 <maphew-AT-gmail.com>. The new %store magic's docstring has full
1145 <maphew-AT-gmail.com>. The new %store magic's docstring has full
1139 details.
1146 details.
1140
1147
1141 * IPython/iplib.py (InteractiveShell.post_config_initialization):
1148 * IPython/iplib.py (InteractiveShell.post_config_initialization):
1142 changed the default logfile name from 'ipython.log' to
1149 changed the default logfile name from 'ipython.log' to
1143 'ipython_log.py'. These logs are real python files, and now that
1150 'ipython_log.py'. These logs are real python files, and now that
1144 we have much better multiline support, people are more likely to
1151 we have much better multiline support, people are more likely to
1145 want to use them as such. Might as well name them correctly.
1152 want to use them as such. Might as well name them correctly.
1146
1153
1147 * IPython/Magic.py: substantial cleanup. While we can't stop
1154 * IPython/Magic.py: substantial cleanup. While we can't stop
1148 using magics as mixins, due to the existing customizations 'out
1155 using magics as mixins, due to the existing customizations 'out
1149 there' which rely on the mixin naming conventions, at least I
1156 there' which rely on the mixin naming conventions, at least I
1150 cleaned out all cross-class name usage. So once we are OK with
1157 cleaned out all cross-class name usage. So once we are OK with
1151 breaking compatibility, the two systems can be separated.
1158 breaking compatibility, the two systems can be separated.
1152
1159
1153 * IPython/Logger.py: major cleanup. This one is NOT a mixin
1160 * IPython/Logger.py: major cleanup. This one is NOT a mixin
1154 anymore, and the class is a fair bit less hideous as well. New
1161 anymore, and the class is a fair bit less hideous as well. New
1155 features were also introduced: timestamping of input, and logging
1162 features were also introduced: timestamping of input, and logging
1156 of output results. These are user-visible with the -t and -o
1163 of output results. These are user-visible with the -t and -o
1157 options to %logstart. Closes
1164 options to %logstart. Closes
1158 http://www.scipy.net/roundup/ipython/issue11 and a request by
1165 http://www.scipy.net/roundup/ipython/issue11 and a request by
1159 William Stein (SAGE developer - http://modular.ucsd.edu/sage).
1166 William Stein (SAGE developer - http://modular.ucsd.edu/sage).
1160
1167
1161 2005-12-28 Fernando Perez <Fernando.Perez@colorado.edu>
1168 2005-12-28 Fernando Perez <Fernando.Perez@colorado.edu>
1162
1169
1163 * IPython/iplib.py (handle_shell_escape): add Ville's patch to
1170 * IPython/iplib.py (handle_shell_escape): add Ville's patch to
1164 better handle backslashes in paths. See the thread 'More Windows
1171 better handle backslashes in paths. See the thread 'More Windows
1165 questions part 2 - \/ characters revisited' on the iypthon user
1172 questions part 2 - \/ characters revisited' on the iypthon user
1166 list:
1173 list:
1167 http://scipy.net/pipermail/ipython-user/2005-June/000907.html
1174 http://scipy.net/pipermail/ipython-user/2005-June/000907.html
1168
1175
1169 (InteractiveShell.__init__): fix tab-completion bug in threaded shells.
1176 (InteractiveShell.__init__): fix tab-completion bug in threaded shells.
1170
1177
1171 (InteractiveShell.__init__): change threaded shells to not use the
1178 (InteractiveShell.__init__): change threaded shells to not use the
1172 ipython crash handler. This was causing more problems than not,
1179 ipython crash handler. This was causing more problems than not,
1173 as exceptions in the main thread (GUI code, typically) would
1180 as exceptions in the main thread (GUI code, typically) would
1174 always show up as a 'crash', when they really weren't.
1181 always show up as a 'crash', when they really weren't.
1175
1182
1176 The colors and exception mode commands (%colors/%xmode) have been
1183 The colors and exception mode commands (%colors/%xmode) have been
1177 synchronized to also take this into account, so users can get
1184 synchronized to also take this into account, so users can get
1178 verbose exceptions for their threaded code as well. I also added
1185 verbose exceptions for their threaded code as well. I also added
1179 support for activating pdb inside this exception handler as well,
1186 support for activating pdb inside this exception handler as well,
1180 so now GUI authors can use IPython's enhanced pdb at runtime.
1187 so now GUI authors can use IPython's enhanced pdb at runtime.
1181
1188
1182 * IPython/ipmaker.py (make_IPython): make the autoedit_syntax flag
1189 * IPython/ipmaker.py (make_IPython): make the autoedit_syntax flag
1183 true by default, and add it to the shipped ipythonrc file. Since
1190 true by default, and add it to the shipped ipythonrc file. Since
1184 this asks the user before proceeding, I think it's OK to make it
1191 this asks the user before proceeding, I think it's OK to make it
1185 true by default.
1192 true by default.
1186
1193
1187 * IPython/Magic.py (magic_exit): make new exit/quit magics instead
1194 * IPython/Magic.py (magic_exit): make new exit/quit magics instead
1188 of the previous special-casing of input in the eval loop. I think
1195 of the previous special-casing of input in the eval loop. I think
1189 this is cleaner, as they really are commands and shouldn't have
1196 this is cleaner, as they really are commands and shouldn't have
1190 a special role in the middle of the core code.
1197 a special role in the middle of the core code.
1191
1198
1192 2005-12-27 Fernando Perez <Fernando.Perez@colorado.edu>
1199 2005-12-27 Fernando Perez <Fernando.Perez@colorado.edu>
1193
1200
1194 * IPython/iplib.py (edit_syntax_error): added support for
1201 * IPython/iplib.py (edit_syntax_error): added support for
1195 automatically reopening the editor if the file had a syntax error
1202 automatically reopening the editor if the file had a syntax error
1196 in it. Thanks to scottt who provided the patch at:
1203 in it. Thanks to scottt who provided the patch at:
1197 http://www.scipy.net/roundup/ipython/issue36 (slightly modified
1204 http://www.scipy.net/roundup/ipython/issue36 (slightly modified
1198 version committed).
1205 version committed).
1199
1206
1200 * IPython/iplib.py (handle_normal): add suport for multi-line
1207 * IPython/iplib.py (handle_normal): add suport for multi-line
1201 input with emtpy lines. This fixes
1208 input with emtpy lines. This fixes
1202 http://www.scipy.net/roundup/ipython/issue43 and a similar
1209 http://www.scipy.net/roundup/ipython/issue43 and a similar
1203 discussion on the user list.
1210 discussion on the user list.
1204
1211
1205 WARNING: a behavior change is necessarily introduced to support
1212 WARNING: a behavior change is necessarily introduced to support
1206 blank lines: now a single blank line with whitespace does NOT
1213 blank lines: now a single blank line with whitespace does NOT
1207 break the input loop, which means that when autoindent is on, by
1214 break the input loop, which means that when autoindent is on, by
1208 default hitting return on the next (indented) line does NOT exit.
1215 default hitting return on the next (indented) line does NOT exit.
1209
1216
1210 Instead, to exit a multiline input you can either have:
1217 Instead, to exit a multiline input you can either have:
1211
1218
1212 - TWO whitespace lines (just hit return again), or
1219 - TWO whitespace lines (just hit return again), or
1213 - a single whitespace line of a different length than provided
1220 - a single whitespace line of a different length than provided
1214 by the autoindent (add or remove a space).
1221 by the autoindent (add or remove a space).
1215
1222
1216 * IPython/completer.py (MagicCompleter.__init__): new 'completer'
1223 * IPython/completer.py (MagicCompleter.__init__): new 'completer'
1217 module to better organize all readline-related functionality.
1224 module to better organize all readline-related functionality.
1218 I've deleted FlexCompleter and put all completion clases here.
1225 I've deleted FlexCompleter and put all completion clases here.
1219
1226
1220 * IPython/iplib.py (raw_input): improve indentation management.
1227 * IPython/iplib.py (raw_input): improve indentation management.
1221 It is now possible to paste indented code with autoindent on, and
1228 It is now possible to paste indented code with autoindent on, and
1222 the code is interpreted correctly (though it still looks bad on
1229 the code is interpreted correctly (though it still looks bad on
1223 screen, due to the line-oriented nature of ipython).
1230 screen, due to the line-oriented nature of ipython).
1224 (MagicCompleter.complete): change behavior so that a TAB key on an
1231 (MagicCompleter.complete): change behavior so that a TAB key on an
1225 otherwise empty line actually inserts a tab, instead of completing
1232 otherwise empty line actually inserts a tab, instead of completing
1226 on the entire global namespace. This makes it easier to use the
1233 on the entire global namespace. This makes it easier to use the
1227 TAB key for indentation. After a request by Hans Meine
1234 TAB key for indentation. After a request by Hans Meine
1228 <hans_meine-AT-gmx.net>
1235 <hans_meine-AT-gmx.net>
1229 (_prefilter): add support so that typing plain 'exit' or 'quit'
1236 (_prefilter): add support so that typing plain 'exit' or 'quit'
1230 does a sensible thing. Originally I tried to deviate as little as
1237 does a sensible thing. Originally I tried to deviate as little as
1231 possible from the default python behavior, but even that one may
1238 possible from the default python behavior, but even that one may
1232 change in this direction (thread on python-dev to that effect).
1239 change in this direction (thread on python-dev to that effect).
1233 Regardless, ipython should do the right thing even if CPython's
1240 Regardless, ipython should do the right thing even if CPython's
1234 '>>>' prompt doesn't.
1241 '>>>' prompt doesn't.
1235 (InteractiveShell): removed subclassing code.InteractiveConsole
1242 (InteractiveShell): removed subclassing code.InteractiveConsole
1236 class. By now we'd overridden just about all of its methods: I've
1243 class. By now we'd overridden just about all of its methods: I've
1237 copied the remaining two over, and now ipython is a standalone
1244 copied the remaining two over, and now ipython is a standalone
1238 class. This will provide a clearer picture for the chainsaw
1245 class. This will provide a clearer picture for the chainsaw
1239 branch refactoring.
1246 branch refactoring.
1240
1247
1241 2005-12-26 Fernando Perez <Fernando.Perez@colorado.edu>
1248 2005-12-26 Fernando Perez <Fernando.Perez@colorado.edu>
1242
1249
1243 * IPython/ultraTB.py (VerboseTB.text): harden reporting against
1250 * IPython/ultraTB.py (VerboseTB.text): harden reporting against
1244 failures for objects which break when dir() is called on them.
1251 failures for objects which break when dir() is called on them.
1245
1252
1246 * IPython/FlexCompleter.py (Completer.__init__): Added support for
1253 * IPython/FlexCompleter.py (Completer.__init__): Added support for
1247 distinct local and global namespaces in the completer API. This
1254 distinct local and global namespaces in the completer API. This
1248 change allows us to properly handle completion with distinct
1255 change allows us to properly handle completion with distinct
1249 scopes, including in embedded instances (this had never really
1256 scopes, including in embedded instances (this had never really
1250 worked correctly).
1257 worked correctly).
1251
1258
1252 Note: this introduces a change in the constructor for
1259 Note: this introduces a change in the constructor for
1253 MagicCompleter, as a new global_namespace parameter is now the
1260 MagicCompleter, as a new global_namespace parameter is now the
1254 second argument (the others were bumped one position).
1261 second argument (the others were bumped one position).
1255
1262
1256 2005-12-25 Fernando Perez <Fernando.Perez@colorado.edu>
1263 2005-12-25 Fernando Perez <Fernando.Perez@colorado.edu>
1257
1264
1258 * IPython/iplib.py (embed_mainloop): fix tab-completion in
1265 * IPython/iplib.py (embed_mainloop): fix tab-completion in
1259 embedded instances (which can be done now thanks to Vivian's
1266 embedded instances (which can be done now thanks to Vivian's
1260 frame-handling fixes for pdb).
1267 frame-handling fixes for pdb).
1261 (InteractiveShell.__init__): Fix namespace handling problem in
1268 (InteractiveShell.__init__): Fix namespace handling problem in
1262 embedded instances. We were overwriting __main__ unconditionally,
1269 embedded instances. We were overwriting __main__ unconditionally,
1263 and this should only be done for 'full' (non-embedded) IPython;
1270 and this should only be done for 'full' (non-embedded) IPython;
1264 embedded instances must respect the caller's __main__. Thanks to
1271 embedded instances must respect the caller's __main__. Thanks to
1265 a bug report by Yaroslav Bulatov <yaroslavvb-AT-gmail.com>
1272 a bug report by Yaroslav Bulatov <yaroslavvb-AT-gmail.com>
1266
1273
1267 2005-12-24 Fernando Perez <Fernando.Perez@colorado.edu>
1274 2005-12-24 Fernando Perez <Fernando.Perez@colorado.edu>
1268
1275
1269 * setup.py: added download_url to setup(). This registers the
1276 * setup.py: added download_url to setup(). This registers the
1270 download address at PyPI, which is not only useful to humans
1277 download address at PyPI, which is not only useful to humans
1271 browsing the site, but is also picked up by setuptools (the Eggs
1278 browsing the site, but is also picked up by setuptools (the Eggs
1272 machinery). Thanks to Ville and R. Kern for the info/discussion
1279 machinery). Thanks to Ville and R. Kern for the info/discussion
1273 on this.
1280 on this.
1274
1281
1275 2005-12-23 Fernando Perez <Fernando.Perez@colorado.edu>
1282 2005-12-23 Fernando Perez <Fernando.Perez@colorado.edu>
1276
1283
1277 * IPython/Debugger.py (Pdb.__init__): Major pdb mode enhancements.
1284 * IPython/Debugger.py (Pdb.__init__): Major pdb mode enhancements.
1278 This brings a lot of nice functionality to the pdb mode, which now
1285 This brings a lot of nice functionality to the pdb mode, which now
1279 has tab-completion, syntax highlighting, and better stack handling
1286 has tab-completion, syntax highlighting, and better stack handling
1280 than before. Many thanks to Vivian De Smedt
1287 than before. Many thanks to Vivian De Smedt
1281 <vivian-AT-vdesmedt.com> for the original patches.
1288 <vivian-AT-vdesmedt.com> for the original patches.
1282
1289
1283 2005-12-08 Fernando Perez <Fernando.Perez@colorado.edu>
1290 2005-12-08 Fernando Perez <Fernando.Perez@colorado.edu>
1284
1291
1285 * IPython/Shell.py (IPShellGTK.mainloop): fix mainloop() calling
1292 * IPython/Shell.py (IPShellGTK.mainloop): fix mainloop() calling
1286 sequence to consistently accept the banner argument. The
1293 sequence to consistently accept the banner argument. The
1287 inconsistency was tripping SAGE, thanks to Gary Zablackis
1294 inconsistency was tripping SAGE, thanks to Gary Zablackis
1288 <gzabl-AT-yahoo.com> for the report.
1295 <gzabl-AT-yahoo.com> for the report.
1289
1296
1290 2005-11-15 Fernando Perez <Fernando.Perez@colorado.edu>
1297 2005-11-15 Fernando Perez <Fernando.Perez@colorado.edu>
1291
1298
1292 * IPython/iplib.py (InteractiveShell.post_config_initialization):
1299 * IPython/iplib.py (InteractiveShell.post_config_initialization):
1293 Fix bug where a naked 'alias' call in the ipythonrc file would
1300 Fix bug where a naked 'alias' call in the ipythonrc file would
1294 cause a crash. Bug reported by Jorgen Stenarson.
1301 cause a crash. Bug reported by Jorgen Stenarson.
1295
1302
1296 2005-11-15 Fernando Perez <Fernando.Perez@colorado.edu>
1303 2005-11-15 Fernando Perez <Fernando.Perez@colorado.edu>
1297
1304
1298 * IPython/ipmaker.py (make_IPython): cleanups which should improve
1305 * IPython/ipmaker.py (make_IPython): cleanups which should improve
1299 startup time.
1306 startup time.
1300
1307
1301 * IPython/iplib.py (runcode): my globals 'fix' for embedded
1308 * IPython/iplib.py (runcode): my globals 'fix' for embedded
1302 instances had introduced a bug with globals in normal code. Now
1309 instances had introduced a bug with globals in normal code. Now
1303 it's working in all cases.
1310 it's working in all cases.
1304
1311
1305 * IPython/Magic.py (magic_psearch): Finish wildcard cleanup and
1312 * IPython/Magic.py (magic_psearch): Finish wildcard cleanup and
1306 API changes. A new ipytonrc option, 'wildcards_case_sensitive'
1313 API changes. A new ipytonrc option, 'wildcards_case_sensitive'
1307 has been introduced to set the default case sensitivity of the
1314 has been introduced to set the default case sensitivity of the
1308 searches. Users can still select either mode at runtime on a
1315 searches. Users can still select either mode at runtime on a
1309 per-search basis.
1316 per-search basis.
1310
1317
1311 2005-11-13 Fernando Perez <Fernando.Perez@colorado.edu>
1318 2005-11-13 Fernando Perez <Fernando.Perez@colorado.edu>
1312
1319
1313 * IPython/wildcard.py (NameSpace.__init__): fix resolution of
1320 * IPython/wildcard.py (NameSpace.__init__): fix resolution of
1314 attributes in wildcard searches for subclasses. Modified version
1321 attributes in wildcard searches for subclasses. Modified version
1315 of a patch by Jorgen.
1322 of a patch by Jorgen.
1316
1323
1317 2005-11-12 Fernando Perez <Fernando.Perez@colorado.edu>
1324 2005-11-12 Fernando Perez <Fernando.Perez@colorado.edu>
1318
1325
1319 * IPython/iplib.py (embed_mainloop): Fix handling of globals for
1326 * IPython/iplib.py (embed_mainloop): Fix handling of globals for
1320 embedded instances. I added a user_global_ns attribute to the
1327 embedded instances. I added a user_global_ns attribute to the
1321 InteractiveShell class to handle this.
1328 InteractiveShell class to handle this.
1322
1329
1323 2005-10-31 Fernando Perez <Fernando.Perez@colorado.edu>
1330 2005-10-31 Fernando Perez <Fernando.Perez@colorado.edu>
1324
1331
1325 * IPython/Shell.py (IPShellGTK.mainloop): Change timeout_add to
1332 * IPython/Shell.py (IPShellGTK.mainloop): Change timeout_add to
1326 idle_add, which fixes horrible keyboard lag problems under gtk 2.6
1333 idle_add, which fixes horrible keyboard lag problems under gtk 2.6
1327 (reported under win32, but may happen also in other platforms).
1334 (reported under win32, but may happen also in other platforms).
1328 Bug report and fix courtesy of Sean Moore <smm-AT-logic.bm>
1335 Bug report and fix courtesy of Sean Moore <smm-AT-logic.bm>
1329
1336
1330 2005-10-15 Fernando Perez <Fernando.Perez@colorado.edu>
1337 2005-10-15 Fernando Perez <Fernando.Perez@colorado.edu>
1331
1338
1332 * IPython/Magic.py (magic_psearch): new support for wildcard
1339 * IPython/Magic.py (magic_psearch): new support for wildcard
1333 patterns. Now, typing ?a*b will list all names which begin with a
1340 patterns. Now, typing ?a*b will list all names which begin with a
1334 and end in b, for example. The %psearch magic has full
1341 and end in b, for example. The %psearch magic has full
1335 docstrings. Many thanks to JΓΆrgen Stenarson
1342 docstrings. Many thanks to JΓΆrgen Stenarson
1336 <jorgen.stenarson-AT-bostream.nu>, author of the patches
1343 <jorgen.stenarson-AT-bostream.nu>, author of the patches
1337 implementing this functionality.
1344 implementing this functionality.
1338
1345
1339 2005-09-27 Fernando Perez <Fernando.Perez@colorado.edu>
1346 2005-09-27 Fernando Perez <Fernando.Perez@colorado.edu>
1340
1347
1341 * Manual: fixed long-standing annoyance of double-dashes (as in
1348 * Manual: fixed long-standing annoyance of double-dashes (as in
1342 --prefix=~, for example) being stripped in the HTML version. This
1349 --prefix=~, for example) being stripped in the HTML version. This
1343 is a latex2html bug, but a workaround was provided. Many thanks
1350 is a latex2html bug, but a workaround was provided. Many thanks
1344 to George K. Thiruvathukal <gthiruv-AT-luc.edu> for the detailed
1351 to George K. Thiruvathukal <gthiruv-AT-luc.edu> for the detailed
1345 help, and Michael Tobis <mtobis-AT-gmail.com> for getting the ball
1352 help, and Michael Tobis <mtobis-AT-gmail.com> for getting the ball
1346 rolling. This seemingly small issue had tripped a number of users
1353 rolling. This seemingly small issue had tripped a number of users
1347 when first installing, so I'm glad to see it gone.
1354 when first installing, so I'm glad to see it gone.
1348
1355
1349 2005-09-27 Fernando Perez <Fernando.Perez@colorado.edu>
1356 2005-09-27 Fernando Perez <Fernando.Perez@colorado.edu>
1350
1357
1351 * IPython/Extensions/numeric_formats.py: fix missing import,
1358 * IPython/Extensions/numeric_formats.py: fix missing import,
1352 reported by Stephen Walton.
1359 reported by Stephen Walton.
1353
1360
1354 2005-09-24 Fernando Perez <Fernando.Perez@colorado.edu>
1361 2005-09-24 Fernando Perez <Fernando.Perez@colorado.edu>
1355
1362
1356 * IPython/demo.py: finish demo module, fully documented now.
1363 * IPython/demo.py: finish demo module, fully documented now.
1357
1364
1358 * IPython/genutils.py (file_read): simple little utility to read a
1365 * IPython/genutils.py (file_read): simple little utility to read a
1359 file and ensure it's closed afterwards.
1366 file and ensure it's closed afterwards.
1360
1367
1361 2005-09-23 Fernando Perez <Fernando.Perez@colorado.edu>
1368 2005-09-23 Fernando Perez <Fernando.Perez@colorado.edu>
1362
1369
1363 * IPython/demo.py (Demo.__init__): added support for individually
1370 * IPython/demo.py (Demo.__init__): added support for individually
1364 tagging blocks for automatic execution.
1371 tagging blocks for automatic execution.
1365
1372
1366 * IPython/Magic.py (magic_pycat): new %pycat magic for showing
1373 * IPython/Magic.py (magic_pycat): new %pycat magic for showing
1367 syntax-highlighted python sources, requested by John.
1374 syntax-highlighted python sources, requested by John.
1368
1375
1369 2005-09-22 Fernando Perez <Fernando.Perez@colorado.edu>
1376 2005-09-22 Fernando Perez <Fernando.Perez@colorado.edu>
1370
1377
1371 * IPython/demo.py (Demo.again): fix bug where again() blocks after
1378 * IPython/demo.py (Demo.again): fix bug where again() blocks after
1372 finishing.
1379 finishing.
1373
1380
1374 * IPython/genutils.py (shlex_split): moved from Magic to here,
1381 * IPython/genutils.py (shlex_split): moved from Magic to here,
1375 where all 2.2 compatibility stuff lives. I needed it for demo.py.
1382 where all 2.2 compatibility stuff lives. I needed it for demo.py.
1376
1383
1377 * IPython/demo.py (Demo.__init__): added support for silent
1384 * IPython/demo.py (Demo.__init__): added support for silent
1378 blocks, improved marks as regexps, docstrings written.
1385 blocks, improved marks as regexps, docstrings written.
1379 (Demo.__init__): better docstring, added support for sys.argv.
1386 (Demo.__init__): better docstring, added support for sys.argv.
1380
1387
1381 * IPython/genutils.py (marquee): little utility used by the demo
1388 * IPython/genutils.py (marquee): little utility used by the demo
1382 code, handy in general.
1389 code, handy in general.
1383
1390
1384 * IPython/demo.py (Demo.__init__): new class for interactive
1391 * IPython/demo.py (Demo.__init__): new class for interactive
1385 demos. Not documented yet, I just wrote it in a hurry for
1392 demos. Not documented yet, I just wrote it in a hurry for
1386 scipy'05. Will docstring later.
1393 scipy'05. Will docstring later.
1387
1394
1388 2005-09-20 Fernando Perez <Fernando.Perez@colorado.edu>
1395 2005-09-20 Fernando Perez <Fernando.Perez@colorado.edu>
1389
1396
1390 * IPython/Shell.py (sigint_handler): Drastic simplification which
1397 * IPython/Shell.py (sigint_handler): Drastic simplification which
1391 also seems to make Ctrl-C work correctly across threads! This is
1398 also seems to make Ctrl-C work correctly across threads! This is
1392 so simple, that I can't beleive I'd missed it before. Needs more
1399 so simple, that I can't beleive I'd missed it before. Needs more
1393 testing, though.
1400 testing, though.
1394 (KBINT): Never mind, revert changes. I'm sure I'd tried something
1401 (KBINT): Never mind, revert changes. I'm sure I'd tried something
1395 like this before...
1402 like this before...
1396
1403
1397 * IPython/genutils.py (get_home_dir): add protection against
1404 * IPython/genutils.py (get_home_dir): add protection against
1398 non-dirs in win32 registry.
1405 non-dirs in win32 registry.
1399
1406
1400 * IPython/iplib.py (InteractiveShell.alias_table_validate): fix
1407 * IPython/iplib.py (InteractiveShell.alias_table_validate): fix
1401 bug where dict was mutated while iterating (pysh crash).
1408 bug where dict was mutated while iterating (pysh crash).
1402
1409
1403 2005-09-06 Fernando Perez <Fernando.Perez@colorado.edu>
1410 2005-09-06 Fernando Perez <Fernando.Perez@colorado.edu>
1404
1411
1405 * IPython/iplib.py (handle_auto): Fix inconsistency arising from
1412 * IPython/iplib.py (handle_auto): Fix inconsistency arising from
1406 spurious newlines added by this routine. After a report by
1413 spurious newlines added by this routine. After a report by
1407 F. Mantegazza.
1414 F. Mantegazza.
1408
1415
1409 2005-09-05 Fernando Perez <Fernando.Perez@colorado.edu>
1416 2005-09-05 Fernando Perez <Fernando.Perez@colorado.edu>
1410
1417
1411 * IPython/Shell.py (hijack_gtk): remove pygtk.require("2.0")
1418 * IPython/Shell.py (hijack_gtk): remove pygtk.require("2.0")
1412 calls. These were a leftover from the GTK 1.x days, and can cause
1419 calls. These were a leftover from the GTK 1.x days, and can cause
1413 problems in certain cases (after a report by John Hunter).
1420 problems in certain cases (after a report by John Hunter).
1414
1421
1415 * IPython/iplib.py (InteractiveShell.__init__): Trap exception if
1422 * IPython/iplib.py (InteractiveShell.__init__): Trap exception if
1416 os.getcwd() fails at init time. Thanks to patch from David Remahl
1423 os.getcwd() fails at init time. Thanks to patch from David Remahl
1417 <chmod007-AT-mac.com>.
1424 <chmod007-AT-mac.com>.
1418 (InteractiveShell.__init__): prevent certain special magics from
1425 (InteractiveShell.__init__): prevent certain special magics from
1419 being shadowed by aliases. Closes
1426 being shadowed by aliases. Closes
1420 http://www.scipy.net/roundup/ipython/issue41.
1427 http://www.scipy.net/roundup/ipython/issue41.
1421
1428
1422 2005-08-31 Fernando Perez <Fernando.Perez@colorado.edu>
1429 2005-08-31 Fernando Perez <Fernando.Perez@colorado.edu>
1423
1430
1424 * IPython/iplib.py (InteractiveShell.complete): Added new
1431 * IPython/iplib.py (InteractiveShell.complete): Added new
1425 top-level completion method to expose the completion mechanism
1432 top-level completion method to expose the completion mechanism
1426 beyond readline-based environments.
1433 beyond readline-based environments.
1427
1434
1428 2005-08-19 Fernando Perez <Fernando.Perez@colorado.edu>
1435 2005-08-19 Fernando Perez <Fernando.Perez@colorado.edu>
1429
1436
1430 * tools/ipsvnc (svnversion): fix svnversion capture.
1437 * tools/ipsvnc (svnversion): fix svnversion capture.
1431
1438
1432 * IPython/iplib.py (InteractiveShell.__init__): Add has_readline
1439 * IPython/iplib.py (InteractiveShell.__init__): Add has_readline
1433 attribute to self, which was missing. Before, it was set by a
1440 attribute to self, which was missing. Before, it was set by a
1434 routine which in certain cases wasn't being called, so the
1441 routine which in certain cases wasn't being called, so the
1435 instance could end up missing the attribute. This caused a crash.
1442 instance could end up missing the attribute. This caused a crash.
1436 Closes http://www.scipy.net/roundup/ipython/issue40.
1443 Closes http://www.scipy.net/roundup/ipython/issue40.
1437
1444
1438 2005-08-16 Fernando Perez <fperez@colorado.edu>
1445 2005-08-16 Fernando Perez <fperez@colorado.edu>
1439
1446
1440 * IPython/ultraTB.py (VerboseTB.text): don't crash if object
1447 * IPython/ultraTB.py (VerboseTB.text): don't crash if object
1441 contains non-string attribute. Closes
1448 contains non-string attribute. Closes
1442 http://www.scipy.net/roundup/ipython/issue38.
1449 http://www.scipy.net/roundup/ipython/issue38.
1443
1450
1444 2005-08-14 Fernando Perez <fperez@colorado.edu>
1451 2005-08-14 Fernando Perez <fperez@colorado.edu>
1445
1452
1446 * tools/ipsvnc: Minor improvements, to add changeset info.
1453 * tools/ipsvnc: Minor improvements, to add changeset info.
1447
1454
1448 2005-08-12 Fernando Perez <fperez@colorado.edu>
1455 2005-08-12 Fernando Perez <fperez@colorado.edu>
1449
1456
1450 * IPython/iplib.py (runsource): remove self.code_to_run_src
1457 * IPython/iplib.py (runsource): remove self.code_to_run_src
1451 attribute. I realized this is nothing more than
1458 attribute. I realized this is nothing more than
1452 '\n'.join(self.buffer), and having the same data in two different
1459 '\n'.join(self.buffer), and having the same data in two different
1453 places is just asking for synchronization bugs. This may impact
1460 places is just asking for synchronization bugs. This may impact
1454 people who have custom exception handlers, so I need to warn
1461 people who have custom exception handlers, so I need to warn
1455 ipython-dev about it (F. Mantegazza may use them).
1462 ipython-dev about it (F. Mantegazza may use them).
1456
1463
1457 2005-07-29 Fernando Perez <Fernando.Perez@colorado.edu>
1464 2005-07-29 Fernando Perez <Fernando.Perez@colorado.edu>
1458
1465
1459 * IPython/genutils.py: fix 2.2 compatibility (generators)
1466 * IPython/genutils.py: fix 2.2 compatibility (generators)
1460
1467
1461 2005-07-18 Fernando Perez <fperez@colorado.edu>
1468 2005-07-18 Fernando Perez <fperez@colorado.edu>
1462
1469
1463 * IPython/genutils.py (get_home_dir): fix to help users with
1470 * IPython/genutils.py (get_home_dir): fix to help users with
1464 invalid $HOME under win32.
1471 invalid $HOME under win32.
1465
1472
1466 2005-07-17 Fernando Perez <fperez@colorado.edu>
1473 2005-07-17 Fernando Perez <fperez@colorado.edu>
1467
1474
1468 * IPython/Prompts.py (str_safe): Make unicode-safe. Also remove
1475 * IPython/Prompts.py (str_safe): Make unicode-safe. Also remove
1469 some old hacks and clean up a bit other routines; code should be
1476 some old hacks and clean up a bit other routines; code should be
1470 simpler and a bit faster.
1477 simpler and a bit faster.
1471
1478
1472 * IPython/iplib.py (interact): removed some last-resort attempts
1479 * IPython/iplib.py (interact): removed some last-resort attempts
1473 to survive broken stdout/stderr. That code was only making it
1480 to survive broken stdout/stderr. That code was only making it
1474 harder to abstract out the i/o (necessary for gui integration),
1481 harder to abstract out the i/o (necessary for gui integration),
1475 and the crashes it could prevent were extremely rare in practice
1482 and the crashes it could prevent were extremely rare in practice
1476 (besides being fully user-induced in a pretty violent manner).
1483 (besides being fully user-induced in a pretty violent manner).
1477
1484
1478 * IPython/genutils.py (IOStream.__init__): Simplify the i/o stuff.
1485 * IPython/genutils.py (IOStream.__init__): Simplify the i/o stuff.
1479 Nothing major yet, but the code is simpler to read; this should
1486 Nothing major yet, but the code is simpler to read; this should
1480 make it easier to do more serious modifications in the future.
1487 make it easier to do more serious modifications in the future.
1481
1488
1482 * IPython/Extensions/InterpreterExec.py: Fix auto-quoting in pysh,
1489 * IPython/Extensions/InterpreterExec.py: Fix auto-quoting in pysh,
1483 which broke in .15 (thanks to a report by Ville).
1490 which broke in .15 (thanks to a report by Ville).
1484
1491
1485 * IPython/Itpl.py (Itpl.__init__): add unicode support (it may not
1492 * IPython/Itpl.py (Itpl.__init__): add unicode support (it may not
1486 be quite correct, I know next to nothing about unicode). This
1493 be quite correct, I know next to nothing about unicode). This
1487 will allow unicode strings to be used in prompts, amongst other
1494 will allow unicode strings to be used in prompts, amongst other
1488 cases. It also will prevent ipython from crashing when unicode
1495 cases. It also will prevent ipython from crashing when unicode
1489 shows up unexpectedly in many places. If ascii encoding fails, we
1496 shows up unexpectedly in many places. If ascii encoding fails, we
1490 assume utf_8. Currently the encoding is not a user-visible
1497 assume utf_8. Currently the encoding is not a user-visible
1491 setting, though it could be made so if there is demand for it.
1498 setting, though it could be made so if there is demand for it.
1492
1499
1493 * IPython/ipmaker.py (make_IPython): remove old 2.1-specific hack.
1500 * IPython/ipmaker.py (make_IPython): remove old 2.1-specific hack.
1494
1501
1495 * IPython/Struct.py (Struct.merge): switch keys() to iterator.
1502 * IPython/Struct.py (Struct.merge): switch keys() to iterator.
1496
1503
1497 * IPython/background_jobs.py: moved 2.2 compatibility to genutils.
1504 * IPython/background_jobs.py: moved 2.2 compatibility to genutils.
1498
1505
1499 * IPython/genutils.py: Add 2.2 compatibility here, so all other
1506 * IPython/genutils.py: Add 2.2 compatibility here, so all other
1500 code can work transparently for 2.2/2.3.
1507 code can work transparently for 2.2/2.3.
1501
1508
1502 2005-07-16 Fernando Perez <fperez@colorado.edu>
1509 2005-07-16 Fernando Perez <fperez@colorado.edu>
1503
1510
1504 * IPython/ultraTB.py (ExceptionColors): Make a global variable
1511 * IPython/ultraTB.py (ExceptionColors): Make a global variable
1505 out of the color scheme table used for coloring exception
1512 out of the color scheme table used for coloring exception
1506 tracebacks. This allows user code to add new schemes at runtime.
1513 tracebacks. This allows user code to add new schemes at runtime.
1507 This is a minimally modified version of the patch at
1514 This is a minimally modified version of the patch at
1508 http://www.scipy.net/roundup/ipython/issue35, many thanks to pabw
1515 http://www.scipy.net/roundup/ipython/issue35, many thanks to pabw
1509 for the contribution.
1516 for the contribution.
1510
1517
1511 * IPython/FlexCompleter.py (Completer.attr_matches): Add a
1518 * IPython/FlexCompleter.py (Completer.attr_matches): Add a
1512 slightly modified version of the patch in
1519 slightly modified version of the patch in
1513 http://www.scipy.net/roundup/ipython/issue34, which also allows me
1520 http://www.scipy.net/roundup/ipython/issue34, which also allows me
1514 to remove the previous try/except solution (which was costlier).
1521 to remove the previous try/except solution (which was costlier).
1515 Thanks to Gaetan Lehmann <gaetan.lehmann-AT-jouy.inra.fr> for the fix.
1522 Thanks to Gaetan Lehmann <gaetan.lehmann-AT-jouy.inra.fr> for the fix.
1516
1523
1517 2005-06-08 Fernando Perez <fperez@colorado.edu>
1524 2005-06-08 Fernando Perez <fperez@colorado.edu>
1518
1525
1519 * IPython/iplib.py (write/write_err): Add methods to abstract all
1526 * IPython/iplib.py (write/write_err): Add methods to abstract all
1520 I/O a bit more.
1527 I/O a bit more.
1521
1528
1522 * IPython/Shell.py (IPShellGTK.mainloop): Fix GTK deprecation
1529 * IPython/Shell.py (IPShellGTK.mainloop): Fix GTK deprecation
1523 warning, reported by Aric Hagberg, fix by JD Hunter.
1530 warning, reported by Aric Hagberg, fix by JD Hunter.
1524
1531
1525 2005-06-02 *** Released version 0.6.15
1532 2005-06-02 *** Released version 0.6.15
1526
1533
1527 2005-06-01 Fernando Perez <fperez@colorado.edu>
1534 2005-06-01 Fernando Perez <fperez@colorado.edu>
1528
1535
1529 * IPython/iplib.py (MagicCompleter.file_matches): Fix
1536 * IPython/iplib.py (MagicCompleter.file_matches): Fix
1530 tab-completion of filenames within open-quoted strings. Note that
1537 tab-completion of filenames within open-quoted strings. Note that
1531 this requires that in ~/.ipython/ipythonrc, users change the
1538 this requires that in ~/.ipython/ipythonrc, users change the
1532 readline delimiters configuration to read:
1539 readline delimiters configuration to read:
1533
1540
1534 readline_remove_delims -/~
1541 readline_remove_delims -/~
1535
1542
1536
1543
1537 2005-05-31 *** Released version 0.6.14
1544 2005-05-31 *** Released version 0.6.14
1538
1545
1539 2005-05-29 Fernando Perez <fperez@colorado.edu>
1546 2005-05-29 Fernando Perez <fperez@colorado.edu>
1540
1547
1541 * IPython/ultraTB.py (VerboseTB.text): Fix crash for tracebacks
1548 * IPython/ultraTB.py (VerboseTB.text): Fix crash for tracebacks
1542 with files not on the filesystem. Reported by Eliyahu Sandler
1549 with files not on the filesystem. Reported by Eliyahu Sandler
1543 <eli@gondolin.net>
1550 <eli@gondolin.net>
1544
1551
1545 2005-05-22 Fernando Perez <fperez@colorado.edu>
1552 2005-05-22 Fernando Perez <fperez@colorado.edu>
1546
1553
1547 * IPython/iplib.py: Fix a few crashes in the --upgrade option.
1554 * IPython/iplib.py: Fix a few crashes in the --upgrade option.
1548 After an initial report by LUK ShunTim <shuntim.luk@polyu.edu.hk>.
1555 After an initial report by LUK ShunTim <shuntim.luk@polyu.edu.hk>.
1549
1556
1550 2005-05-19 Fernando Perez <fperez@colorado.edu>
1557 2005-05-19 Fernando Perez <fperez@colorado.edu>
1551
1558
1552 * IPython/iplib.py (safe_execfile): close a file which could be
1559 * IPython/iplib.py (safe_execfile): close a file which could be
1553 left open (causing problems in win32, which locks open files).
1560 left open (causing problems in win32, which locks open files).
1554 Thanks to a bug report by D Brown <dbrown2@yahoo.com>.
1561 Thanks to a bug report by D Brown <dbrown2@yahoo.com>.
1555
1562
1556 2005-05-18 Fernando Perez <fperez@colorado.edu>
1563 2005-05-18 Fernando Perez <fperez@colorado.edu>
1557
1564
1558 * IPython/Shell.py (MatplotlibShellBase.mplot_exec): pass all
1565 * IPython/Shell.py (MatplotlibShellBase.mplot_exec): pass all
1559 keyword arguments correctly to safe_execfile().
1566 keyword arguments correctly to safe_execfile().
1560
1567
1561 2005-05-13 Fernando Perez <fperez@colorado.edu>
1568 2005-05-13 Fernando Perez <fperez@colorado.edu>
1562
1569
1563 * ipython.1: Added info about Qt to manpage, and threads warning
1570 * ipython.1: Added info about Qt to manpage, and threads warning
1564 to usage page (invoked with --help).
1571 to usage page (invoked with --help).
1565
1572
1566 * IPython/iplib.py (MagicCompleter.python_func_kw_matches): Added
1573 * IPython/iplib.py (MagicCompleter.python_func_kw_matches): Added
1567 new matcher (it goes at the end of the priority list) to do
1574 new matcher (it goes at the end of the priority list) to do
1568 tab-completion on named function arguments. Submitted by George
1575 tab-completion on named function arguments. Submitted by George
1569 Sakkis <gsakkis-AT-eden.rutgers.edu>. See the thread at
1576 Sakkis <gsakkis-AT-eden.rutgers.edu>. See the thread at
1570 http://www.scipy.net/pipermail/ipython-dev/2005-April/000436.html
1577 http://www.scipy.net/pipermail/ipython-dev/2005-April/000436.html
1571 for more details.
1578 for more details.
1572
1579
1573 * IPython/Magic.py (magic_run): Added new -e flag to ignore
1580 * IPython/Magic.py (magic_run): Added new -e flag to ignore
1574 SystemExit exceptions in the script being run. Thanks to a report
1581 SystemExit exceptions in the script being run. Thanks to a report
1575 by danny shevitz <danny_shevitz-AT-yahoo.com>, about this
1582 by danny shevitz <danny_shevitz-AT-yahoo.com>, about this
1576 producing very annoying behavior when running unit tests.
1583 producing very annoying behavior when running unit tests.
1577
1584
1578 2005-05-12 Fernando Perez <fperez@colorado.edu>
1585 2005-05-12 Fernando Perez <fperez@colorado.edu>
1579
1586
1580 * IPython/iplib.py (handle_auto): fixed auto-quoting and parens,
1587 * IPython/iplib.py (handle_auto): fixed auto-quoting and parens,
1581 which I'd broken (again) due to a changed regexp. In the process,
1588 which I'd broken (again) due to a changed regexp. In the process,
1582 added ';' as an escape to auto-quote the whole line without
1589 added ';' as an escape to auto-quote the whole line without
1583 splitting its arguments. Thanks to a report by Jerry McRae
1590 splitting its arguments. Thanks to a report by Jerry McRae
1584 <qrs0xyc02-AT-sneakemail.com>.
1591 <qrs0xyc02-AT-sneakemail.com>.
1585
1592
1586 * IPython/ultraTB.py (VerboseTB.text): protect against rare but
1593 * IPython/ultraTB.py (VerboseTB.text): protect against rare but
1587 possible crashes caused by a TokenError. Reported by Ed Schofield
1594 possible crashes caused by a TokenError. Reported by Ed Schofield
1588 <schofield-AT-ftw.at>.
1595 <schofield-AT-ftw.at>.
1589
1596
1590 2005-05-06 Fernando Perez <fperez@colorado.edu>
1597 2005-05-06 Fernando Perez <fperez@colorado.edu>
1591
1598
1592 * IPython/Shell.py (hijack_wx): Fix to work with WX v.2.6.
1599 * IPython/Shell.py (hijack_wx): Fix to work with WX v.2.6.
1593
1600
1594 2005-04-29 Fernando Perez <fperez@colorado.edu>
1601 2005-04-29 Fernando Perez <fperez@colorado.edu>
1595
1602
1596 * IPython/Shell.py (IPShellQt): Thanks to Denis Rivière
1603 * IPython/Shell.py (IPShellQt): Thanks to Denis Rivière
1597 <nudz-AT-free.fr>, Yann Cointepas <yann-AT-sapetnioc.org> and Benjamin
1604 <nudz-AT-free.fr>, Yann Cointepas <yann-AT-sapetnioc.org> and Benjamin
1598 Thyreau <Benji2-AT-decideur.info>, we now have a -qthread option
1605 Thyreau <Benji2-AT-decideur.info>, we now have a -qthread option
1599 which provides support for Qt interactive usage (similar to the
1606 which provides support for Qt interactive usage (similar to the
1600 existing one for WX and GTK). This had been often requested.
1607 existing one for WX and GTK). This had been often requested.
1601
1608
1602 2005-04-14 *** Released version 0.6.13
1609 2005-04-14 *** Released version 0.6.13
1603
1610
1604 2005-04-08 Fernando Perez <fperez@colorado.edu>
1611 2005-04-08 Fernando Perez <fperez@colorado.edu>
1605
1612
1606 * IPython/Magic.py (Magic._ofind): remove docstring evaluation
1613 * IPython/Magic.py (Magic._ofind): remove docstring evaluation
1607 from _ofind, which gets called on almost every input line. Now,
1614 from _ofind, which gets called on almost every input line. Now,
1608 we only try to get docstrings if they are actually going to be
1615 we only try to get docstrings if they are actually going to be
1609 used (the overhead of fetching unnecessary docstrings can be
1616 used (the overhead of fetching unnecessary docstrings can be
1610 noticeable for certain objects, such as Pyro proxies).
1617 noticeable for certain objects, such as Pyro proxies).
1611
1618
1612 * IPython/iplib.py (MagicCompleter.python_matches): Change the API
1619 * IPython/iplib.py (MagicCompleter.python_matches): Change the API
1613 for completers. For some reason I had been passing them the state
1620 for completers. For some reason I had been passing them the state
1614 variable, which completers never actually need, and was in
1621 variable, which completers never actually need, and was in
1615 conflict with the rlcompleter API. Custom completers ONLY need to
1622 conflict with the rlcompleter API. Custom completers ONLY need to
1616 take the text parameter.
1623 take the text parameter.
1617
1624
1618 * IPython/Extensions/InterpreterExec.py: Fix regexp so that magics
1625 * IPython/Extensions/InterpreterExec.py: Fix regexp so that magics
1619 work correctly in pysh. I've also moved all the logic which used
1626 work correctly in pysh. I've also moved all the logic which used
1620 to be in pysh.py here, which will prevent problems with future
1627 to be in pysh.py here, which will prevent problems with future
1621 upgrades. However, this time I must warn users to update their
1628 upgrades. However, this time I must warn users to update their
1622 pysh profile to include the line
1629 pysh profile to include the line
1623
1630
1624 import_all IPython.Extensions.InterpreterExec
1631 import_all IPython.Extensions.InterpreterExec
1625
1632
1626 because otherwise things won't work for them. They MUST also
1633 because otherwise things won't work for them. They MUST also
1627 delete pysh.py and the line
1634 delete pysh.py and the line
1628
1635
1629 execfile pysh.py
1636 execfile pysh.py
1630
1637
1631 from their ipythonrc-pysh.
1638 from their ipythonrc-pysh.
1632
1639
1633 * IPython/FlexCompleter.py (Completer.attr_matches): Make more
1640 * IPython/FlexCompleter.py (Completer.attr_matches): Make more
1634 robust in the face of objects whose dir() returns non-strings
1641 robust in the face of objects whose dir() returns non-strings
1635 (which it shouldn't, but some broken libs like ITK do). Thanks to
1642 (which it shouldn't, but some broken libs like ITK do). Thanks to
1636 a patch by John Hunter (implemented differently, though). Also
1643 a patch by John Hunter (implemented differently, though). Also
1637 minor improvements by using .extend instead of + on lists.
1644 minor improvements by using .extend instead of + on lists.
1638
1645
1639 * pysh.py:
1646 * pysh.py:
1640
1647
1641 2005-04-06 Fernando Perez <fperez@colorado.edu>
1648 2005-04-06 Fernando Perez <fperez@colorado.edu>
1642
1649
1643 * IPython/ipmaker.py (make_IPython): Make multi_line_specials on
1650 * IPython/ipmaker.py (make_IPython): Make multi_line_specials on
1644 by default, so that all users benefit from it. Those who don't
1651 by default, so that all users benefit from it. Those who don't
1645 want it can still turn it off.
1652 want it can still turn it off.
1646
1653
1647 * IPython/UserConfig/ipythonrc: Add multi_line_specials to the
1654 * IPython/UserConfig/ipythonrc: Add multi_line_specials to the
1648 config file, I'd forgotten about this, so users were getting it
1655 config file, I'd forgotten about this, so users were getting it
1649 off by default.
1656 off by default.
1650
1657
1651 * IPython/iplib.py (ipmagic): big overhaul of the magic system for
1658 * IPython/iplib.py (ipmagic): big overhaul of the magic system for
1652 consistency. Now magics can be called in multiline statements,
1659 consistency. Now magics can be called in multiline statements,
1653 and python variables can be expanded in magic calls via $var.
1660 and python variables can be expanded in magic calls via $var.
1654 This makes the magic system behave just like aliases or !system
1661 This makes the magic system behave just like aliases or !system
1655 calls.
1662 calls.
1656
1663
1657 2005-03-28 Fernando Perez <fperez@colorado.edu>
1664 2005-03-28 Fernando Perez <fperez@colorado.edu>
1658
1665
1659 * IPython/iplib.py (handle_auto): cleanup to use %s instead of
1666 * IPython/iplib.py (handle_auto): cleanup to use %s instead of
1660 expensive string additions for building command. Add support for
1667 expensive string additions for building command. Add support for
1661 trailing ';' when autocall is used.
1668 trailing ';' when autocall is used.
1662
1669
1663 2005-03-26 Fernando Perez <fperez@colorado.edu>
1670 2005-03-26 Fernando Perez <fperez@colorado.edu>
1664
1671
1665 * ipython.el: Fix http://www.scipy.net/roundup/ipython/issue31.
1672 * ipython.el: Fix http://www.scipy.net/roundup/ipython/issue31.
1666 Bugfix by A. Schmolck, the ipython.el maintainer. Also make
1673 Bugfix by A. Schmolck, the ipython.el maintainer. Also make
1667 ipython.el robust against prompts with any number of spaces
1674 ipython.el robust against prompts with any number of spaces
1668 (including 0) after the ':' character.
1675 (including 0) after the ':' character.
1669
1676
1670 * IPython/Prompts.py (Prompt2.set_p_str): Fix spurious space in
1677 * IPython/Prompts.py (Prompt2.set_p_str): Fix spurious space in
1671 continuation prompt, which misled users to think the line was
1678 continuation prompt, which misled users to think the line was
1672 already indented. Closes debian Bug#300847, reported to me by
1679 already indented. Closes debian Bug#300847, reported to me by
1673 Norbert Tretkowski <tretkowski-AT-inittab.de>.
1680 Norbert Tretkowski <tretkowski-AT-inittab.de>.
1674
1681
1675 2005-03-23 Fernando Perez <fperez@colorado.edu>
1682 2005-03-23 Fernando Perez <fperez@colorado.edu>
1676
1683
1677 * IPython/Prompts.py (Prompt1.__str__): Make sure that prompts are
1684 * IPython/Prompts.py (Prompt1.__str__): Make sure that prompts are
1678 properly aligned if they have embedded newlines.
1685 properly aligned if they have embedded newlines.
1679
1686
1680 * IPython/iplib.py (runlines): Add a public method to expose
1687 * IPython/iplib.py (runlines): Add a public method to expose
1681 IPython's code execution machinery, so that users can run strings
1688 IPython's code execution machinery, so that users can run strings
1682 as if they had been typed at the prompt interactively.
1689 as if they had been typed at the prompt interactively.
1683 (InteractiveShell.__init__): Added getoutput() to the __IPYTHON__
1690 (InteractiveShell.__init__): Added getoutput() to the __IPYTHON__
1684 methods which can call the system shell, but with python variable
1691 methods which can call the system shell, but with python variable
1685 expansion. The three such methods are: __IPYTHON__.system,
1692 expansion. The three such methods are: __IPYTHON__.system,
1686 .getoutput and .getoutputerror. These need to be documented in a
1693 .getoutput and .getoutputerror. These need to be documented in a
1687 'public API' section (to be written) of the manual.
1694 'public API' section (to be written) of the manual.
1688
1695
1689 2005-03-20 Fernando Perez <fperez@colorado.edu>
1696 2005-03-20 Fernando Perez <fperez@colorado.edu>
1690
1697
1691 * IPython/iplib.py (InteractiveShell.set_custom_exc): new system
1698 * IPython/iplib.py (InteractiveShell.set_custom_exc): new system
1692 for custom exception handling. This is quite powerful, and it
1699 for custom exception handling. This is quite powerful, and it
1693 allows for user-installable exception handlers which can trap
1700 allows for user-installable exception handlers which can trap
1694 custom exceptions at runtime and treat them separately from
1701 custom exceptions at runtime and treat them separately from
1695 IPython's default mechanisms. At the request of FrΓ©dΓ©ric
1702 IPython's default mechanisms. At the request of FrΓ©dΓ©ric
1696 Mantegazza <mantegazza-AT-ill.fr>.
1703 Mantegazza <mantegazza-AT-ill.fr>.
1697 (InteractiveShell.set_custom_completer): public API function to
1704 (InteractiveShell.set_custom_completer): public API function to
1698 add new completers at runtime.
1705 add new completers at runtime.
1699
1706
1700 2005-03-19 Fernando Perez <fperez@colorado.edu>
1707 2005-03-19 Fernando Perez <fperez@colorado.edu>
1701
1708
1702 * IPython/OInspect.py (getdoc): Add a call to obj.getdoc(), to
1709 * IPython/OInspect.py (getdoc): Add a call to obj.getdoc(), to
1703 allow objects which provide their docstrings via non-standard
1710 allow objects which provide their docstrings via non-standard
1704 mechanisms (like Pyro proxies) to still be inspected by ipython's
1711 mechanisms (like Pyro proxies) to still be inspected by ipython's
1705 ? system.
1712 ? system.
1706
1713
1707 * IPython/iplib.py (InteractiveShell.__init__): back off the _o/_e
1714 * IPython/iplib.py (InteractiveShell.__init__): back off the _o/_e
1708 automatic capture system. I tried quite hard to make it work
1715 automatic capture system. I tried quite hard to make it work
1709 reliably, and simply failed. I tried many combinations with the
1716 reliably, and simply failed. I tried many combinations with the
1710 subprocess module, but eventually nothing worked in all needed
1717 subprocess module, but eventually nothing worked in all needed
1711 cases (not blocking stdin for the child, duplicating stdout
1718 cases (not blocking stdin for the child, duplicating stdout
1712 without blocking, etc). The new %sc/%sx still do capture to these
1719 without blocking, etc). The new %sc/%sx still do capture to these
1713 magical list/string objects which make shell use much more
1720 magical list/string objects which make shell use much more
1714 conveninent, so not all is lost.
1721 conveninent, so not all is lost.
1715
1722
1716 XXX - FIX MANUAL for the change above!
1723 XXX - FIX MANUAL for the change above!
1717
1724
1718 (runsource): I copied code.py's runsource() into ipython to modify
1725 (runsource): I copied code.py's runsource() into ipython to modify
1719 it a bit. Now the code object and source to be executed are
1726 it a bit. Now the code object and source to be executed are
1720 stored in ipython. This makes this info accessible to third-party
1727 stored in ipython. This makes this info accessible to third-party
1721 tools, like custom exception handlers. After a request by FrΓ©dΓ©ric
1728 tools, like custom exception handlers. After a request by FrΓ©dΓ©ric
1722 Mantegazza <mantegazza-AT-ill.fr>.
1729 Mantegazza <mantegazza-AT-ill.fr>.
1723
1730
1724 * IPython/UserConfig/ipythonrc: Add up/down arrow keys to
1731 * IPython/UserConfig/ipythonrc: Add up/down arrow keys to
1725 history-search via readline (like C-p/C-n). I'd wanted this for a
1732 history-search via readline (like C-p/C-n). I'd wanted this for a
1726 long time, but only recently found out how to do it. For users
1733 long time, but only recently found out how to do it. For users
1727 who already have their ipythonrc files made and want this, just
1734 who already have their ipythonrc files made and want this, just
1728 add:
1735 add:
1729
1736
1730 readline_parse_and_bind "\e[A": history-search-backward
1737 readline_parse_and_bind "\e[A": history-search-backward
1731 readline_parse_and_bind "\e[B": history-search-forward
1738 readline_parse_and_bind "\e[B": history-search-forward
1732
1739
1733 2005-03-18 Fernando Perez <fperez@colorado.edu>
1740 2005-03-18 Fernando Perez <fperez@colorado.edu>
1734
1741
1735 * IPython/Magic.py (magic_sc): %sc and %sx now use the fancy
1742 * IPython/Magic.py (magic_sc): %sc and %sx now use the fancy
1736 LSString and SList classes which allow transparent conversions
1743 LSString and SList classes which allow transparent conversions
1737 between list mode and whitespace-separated string.
1744 between list mode and whitespace-separated string.
1738 (magic_r): Fix recursion problem in %r.
1745 (magic_r): Fix recursion problem in %r.
1739
1746
1740 * IPython/genutils.py (LSString): New class to be used for
1747 * IPython/genutils.py (LSString): New class to be used for
1741 automatic storage of the results of all alias/system calls in _o
1748 automatic storage of the results of all alias/system calls in _o
1742 and _e (stdout/err). These provide a .l/.list attribute which
1749 and _e (stdout/err). These provide a .l/.list attribute which
1743 does automatic splitting on newlines. This means that for most
1750 does automatic splitting on newlines. This means that for most
1744 uses, you'll never need to do capturing of output with %sc/%sx
1751 uses, you'll never need to do capturing of output with %sc/%sx
1745 anymore, since ipython keeps this always done for you. Note that
1752 anymore, since ipython keeps this always done for you. Note that
1746 only the LAST results are stored, the _o/e variables are
1753 only the LAST results are stored, the _o/e variables are
1747 overwritten on each call. If you need to save their contents
1754 overwritten on each call. If you need to save their contents
1748 further, simply bind them to any other name.
1755 further, simply bind them to any other name.
1749
1756
1750 2005-03-17 Fernando Perez <fperez@colorado.edu>
1757 2005-03-17 Fernando Perez <fperez@colorado.edu>
1751
1758
1752 * IPython/Prompts.py (BasePrompt.cwd_filt): a few more fixes for
1759 * IPython/Prompts.py (BasePrompt.cwd_filt): a few more fixes for
1753 prompt namespace handling.
1760 prompt namespace handling.
1754
1761
1755 2005-03-16 Fernando Perez <fperez@colorado.edu>
1762 2005-03-16 Fernando Perez <fperez@colorado.edu>
1756
1763
1757 * IPython/Prompts.py (CachedOutput.__init__): Fix default and
1764 * IPython/Prompts.py (CachedOutput.__init__): Fix default and
1758 classic prompts to be '>>> ' (final space was missing, and it
1765 classic prompts to be '>>> ' (final space was missing, and it
1759 trips the emacs python mode).
1766 trips the emacs python mode).
1760 (BasePrompt.__str__): Added safe support for dynamic prompt
1767 (BasePrompt.__str__): Added safe support for dynamic prompt
1761 strings. Now you can set your prompt string to be '$x', and the
1768 strings. Now you can set your prompt string to be '$x', and the
1762 value of x will be printed from your interactive namespace. The
1769 value of x will be printed from your interactive namespace. The
1763 interpolation syntax includes the full Itpl support, so
1770 interpolation syntax includes the full Itpl support, so
1764 ${foo()+x+bar()} is a valid prompt string now, and the function
1771 ${foo()+x+bar()} is a valid prompt string now, and the function
1765 calls will be made at runtime.
1772 calls will be made at runtime.
1766
1773
1767 2005-03-15 Fernando Perez <fperez@colorado.edu>
1774 2005-03-15 Fernando Perez <fperez@colorado.edu>
1768
1775
1769 * IPython/Magic.py (magic_history): renamed %hist to %history, to
1776 * IPython/Magic.py (magic_history): renamed %hist to %history, to
1770 avoid name clashes in pylab. %hist still works, it just forwards
1777 avoid name clashes in pylab. %hist still works, it just forwards
1771 the call to %history.
1778 the call to %history.
1772
1779
1773 2005-03-02 *** Released version 0.6.12
1780 2005-03-02 *** Released version 0.6.12
1774
1781
1775 2005-03-02 Fernando Perez <fperez@colorado.edu>
1782 2005-03-02 Fernando Perez <fperez@colorado.edu>
1776
1783
1777 * IPython/iplib.py (handle_magic): log magic calls properly as
1784 * IPython/iplib.py (handle_magic): log magic calls properly as
1778 ipmagic() function calls.
1785 ipmagic() function calls.
1779
1786
1780 * IPython/Magic.py (magic_time): Improved %time to support
1787 * IPython/Magic.py (magic_time): Improved %time to support
1781 statements and provide wall-clock as well as CPU time.
1788 statements and provide wall-clock as well as CPU time.
1782
1789
1783 2005-02-27 Fernando Perez <fperez@colorado.edu>
1790 2005-02-27 Fernando Perez <fperez@colorado.edu>
1784
1791
1785 * IPython/hooks.py: New hooks module, to expose user-modifiable
1792 * IPython/hooks.py: New hooks module, to expose user-modifiable
1786 IPython functionality in a clean manner. For now only the editor
1793 IPython functionality in a clean manner. For now only the editor
1787 hook is actually written, and other thigns which I intend to turn
1794 hook is actually written, and other thigns which I intend to turn
1788 into proper hooks aren't yet there. The display and prefilter
1795 into proper hooks aren't yet there. The display and prefilter
1789 stuff, for example, should be hooks. But at least now the
1796 stuff, for example, should be hooks. But at least now the
1790 framework is in place, and the rest can be moved here with more
1797 framework is in place, and the rest can be moved here with more
1791 time later. IPython had had a .hooks variable for a long time for
1798 time later. IPython had had a .hooks variable for a long time for
1792 this purpose, but I'd never actually used it for anything.
1799 this purpose, but I'd never actually used it for anything.
1793
1800
1794 2005-02-26 Fernando Perez <fperez@colorado.edu>
1801 2005-02-26 Fernando Perez <fperez@colorado.edu>
1795
1802
1796 * IPython/ipmaker.py (make_IPython): make the default ipython
1803 * IPython/ipmaker.py (make_IPython): make the default ipython
1797 directory be called _ipython under win32, to follow more the
1804 directory be called _ipython under win32, to follow more the
1798 naming peculiarities of that platform (where buggy software like
1805 naming peculiarities of that platform (where buggy software like
1799 Visual Sourcesafe breaks with .named directories). Reported by
1806 Visual Sourcesafe breaks with .named directories). Reported by
1800 Ville Vainio.
1807 Ville Vainio.
1801
1808
1802 2005-02-23 Fernando Perez <fperez@colorado.edu>
1809 2005-02-23 Fernando Perez <fperez@colorado.edu>
1803
1810
1804 * IPython/iplib.py (InteractiveShell.__init__): removed a few
1811 * IPython/iplib.py (InteractiveShell.__init__): removed a few
1805 auto_aliases for win32 which were causing problems. Users can
1812 auto_aliases for win32 which were causing problems. Users can
1806 define the ones they personally like.
1813 define the ones they personally like.
1807
1814
1808 2005-02-21 Fernando Perez <fperez@colorado.edu>
1815 2005-02-21 Fernando Perez <fperez@colorado.edu>
1809
1816
1810 * IPython/Magic.py (magic_time): new magic to time execution of
1817 * IPython/Magic.py (magic_time): new magic to time execution of
1811 expressions. After a request by Charles Moad <cmoad-AT-indiana.edu>.
1818 expressions. After a request by Charles Moad <cmoad-AT-indiana.edu>.
1812
1819
1813 2005-02-19 Fernando Perez <fperez@colorado.edu>
1820 2005-02-19 Fernando Perez <fperez@colorado.edu>
1814
1821
1815 * IPython/ConfigLoader.py (ConfigLoader.load): Allow empty strings
1822 * IPython/ConfigLoader.py (ConfigLoader.load): Allow empty strings
1816 into keys (for prompts, for example).
1823 into keys (for prompts, for example).
1817
1824
1818 * IPython/Prompts.py (BasePrompt.set_p_str): Fix to allow empty
1825 * IPython/Prompts.py (BasePrompt.set_p_str): Fix to allow empty
1819 prompts in case users want them. This introduces a small behavior
1826 prompts in case users want them. This introduces a small behavior
1820 change: ipython does not automatically add a space to all prompts
1827 change: ipython does not automatically add a space to all prompts
1821 anymore. To get the old prompts with a space, users should add it
1828 anymore. To get the old prompts with a space, users should add it
1822 manually to their ipythonrc file, so for example prompt_in1 should
1829 manually to their ipythonrc file, so for example prompt_in1 should
1823 now read 'In [\#]: ' instead of 'In [\#]:'.
1830 now read 'In [\#]: ' instead of 'In [\#]:'.
1824 (BasePrompt.__init__): New option prompts_pad_left (only in rc
1831 (BasePrompt.__init__): New option prompts_pad_left (only in rc
1825 file) to control left-padding of secondary prompts.
1832 file) to control left-padding of secondary prompts.
1826
1833
1827 * IPython/Magic.py (Magic.profile_missing_notice): Don't crash if
1834 * IPython/Magic.py (Magic.profile_missing_notice): Don't crash if
1828 the profiler can't be imported. Fix for Debian, which removed
1835 the profiler can't be imported. Fix for Debian, which removed
1829 profile.py because of License issues. I applied a slightly
1836 profile.py because of License issues. I applied a slightly
1830 modified version of the original Debian patch at
1837 modified version of the original Debian patch at
1831 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=294500.
1838 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=294500.
1832
1839
1833 2005-02-17 Fernando Perez <fperez@colorado.edu>
1840 2005-02-17 Fernando Perez <fperez@colorado.edu>
1834
1841
1835 * IPython/genutils.py (native_line_ends): Fix bug which would
1842 * IPython/genutils.py (native_line_ends): Fix bug which would
1836 cause improper line-ends under win32 b/c I was not opening files
1843 cause improper line-ends under win32 b/c I was not opening files
1837 in binary mode. Bug report and fix thanks to Ville.
1844 in binary mode. Bug report and fix thanks to Ville.
1838
1845
1839 * IPython/iplib.py (handle_auto): Fix bug which I introduced when
1846 * IPython/iplib.py (handle_auto): Fix bug which I introduced when
1840 trying to catch spurious foo[1] autocalls. My fix actually broke
1847 trying to catch spurious foo[1] autocalls. My fix actually broke
1841 ',/' autoquote/call with explicit escape (bad regexp).
1848 ',/' autoquote/call with explicit escape (bad regexp).
1842
1849
1843 2005-02-15 *** Released version 0.6.11
1850 2005-02-15 *** Released version 0.6.11
1844
1851
1845 2005-02-14 Fernando Perez <fperez@colorado.edu>
1852 2005-02-14 Fernando Perez <fperez@colorado.edu>
1846
1853
1847 * IPython/background_jobs.py: New background job management
1854 * IPython/background_jobs.py: New background job management
1848 subsystem. This is implemented via a new set of classes, and
1855 subsystem. This is implemented via a new set of classes, and
1849 IPython now provides a builtin 'jobs' object for background job
1856 IPython now provides a builtin 'jobs' object for background job
1850 execution. A convenience %bg magic serves as a lightweight
1857 execution. A convenience %bg magic serves as a lightweight
1851 frontend for starting the more common type of calls. This was
1858 frontend for starting the more common type of calls. This was
1852 inspired by discussions with B. Granger and the BackgroundCommand
1859 inspired by discussions with B. Granger and the BackgroundCommand
1853 class described in the book Python Scripting for Computational
1860 class described in the book Python Scripting for Computational
1854 Science, by H. P. Langtangen: http://folk.uio.no/hpl/scripting
1861 Science, by H. P. Langtangen: http://folk.uio.no/hpl/scripting
1855 (although ultimately no code from this text was used, as IPython's
1862 (although ultimately no code from this text was used, as IPython's
1856 system is a separate implementation).
1863 system is a separate implementation).
1857
1864
1858 * IPython/iplib.py (MagicCompleter.python_matches): add new option
1865 * IPython/iplib.py (MagicCompleter.python_matches): add new option
1859 to control the completion of single/double underscore names
1866 to control the completion of single/double underscore names
1860 separately. As documented in the example ipytonrc file, the
1867 separately. As documented in the example ipytonrc file, the
1861 readline_omit__names variable can now be set to 2, to omit even
1868 readline_omit__names variable can now be set to 2, to omit even
1862 single underscore names. Thanks to a patch by Brian Wong
1869 single underscore names. Thanks to a patch by Brian Wong
1863 <BrianWong-AT-AirgoNetworks.Com>.
1870 <BrianWong-AT-AirgoNetworks.Com>.
1864 (InteractiveShell.__init__): Fix bug which would cause foo[1] to
1871 (InteractiveShell.__init__): Fix bug which would cause foo[1] to
1865 be autocalled as foo([1]) if foo were callable. A problem for
1872 be autocalled as foo([1]) if foo were callable. A problem for
1866 things which are both callable and implement __getitem__.
1873 things which are both callable and implement __getitem__.
1867 (init_readline): Fix autoindentation for win32. Thanks to a patch
1874 (init_readline): Fix autoindentation for win32. Thanks to a patch
1868 by Vivian De Smedt <vivian-AT-vdesmedt.com>.
1875 by Vivian De Smedt <vivian-AT-vdesmedt.com>.
1869
1876
1870 2005-02-12 Fernando Perez <fperez@colorado.edu>
1877 2005-02-12 Fernando Perez <fperez@colorado.edu>
1871
1878
1872 * IPython/ipmaker.py (make_IPython): Disabled the stout traps
1879 * IPython/ipmaker.py (make_IPython): Disabled the stout traps
1873 which I had written long ago to sort out user error messages which
1880 which I had written long ago to sort out user error messages which
1874 may occur during startup. This seemed like a good idea initially,
1881 may occur during startup. This seemed like a good idea initially,
1875 but it has proven a disaster in retrospect. I don't want to
1882 but it has proven a disaster in retrospect. I don't want to
1876 change much code for now, so my fix is to set the internal 'debug'
1883 change much code for now, so my fix is to set the internal 'debug'
1877 flag to true everywhere, whose only job was precisely to control
1884 flag to true everywhere, whose only job was precisely to control
1878 this subsystem. This closes issue 28 (as well as avoiding all
1885 this subsystem. This closes issue 28 (as well as avoiding all
1879 sorts of strange hangups which occur from time to time).
1886 sorts of strange hangups which occur from time to time).
1880
1887
1881 2005-02-07 Fernando Perez <fperez@colorado.edu>
1888 2005-02-07 Fernando Perez <fperez@colorado.edu>
1882
1889
1883 * IPython/Magic.py (magic_edit): Fix 'ed -p' not working when the
1890 * IPython/Magic.py (magic_edit): Fix 'ed -p' not working when the
1884 previous call produced a syntax error.
1891 previous call produced a syntax error.
1885
1892
1886 * IPython/OInspect.py (Inspector.pinfo): Fix crash when inspecting
1893 * IPython/OInspect.py (Inspector.pinfo): Fix crash when inspecting
1887 classes without constructor.
1894 classes without constructor.
1888
1895
1889 2005-02-06 Fernando Perez <fperez@colorado.edu>
1896 2005-02-06 Fernando Perez <fperez@colorado.edu>
1890
1897
1891 * IPython/iplib.py (MagicCompleter.complete): Extend the list of
1898 * IPython/iplib.py (MagicCompleter.complete): Extend the list of
1892 completions with the results of each matcher, so we return results
1899 completions with the results of each matcher, so we return results
1893 to the user from all namespaces. This breaks with ipython
1900 to the user from all namespaces. This breaks with ipython
1894 tradition, but I think it's a nicer behavior. Now you get all
1901 tradition, but I think it's a nicer behavior. Now you get all
1895 possible completions listed, from all possible namespaces (python,
1902 possible completions listed, from all possible namespaces (python,
1896 filesystem, magics...) After a request by John Hunter
1903 filesystem, magics...) After a request by John Hunter
1897 <jdhunter-AT-nitace.bsd.uchicago.edu>.
1904 <jdhunter-AT-nitace.bsd.uchicago.edu>.
1898
1905
1899 2005-02-05 Fernando Perez <fperez@colorado.edu>
1906 2005-02-05 Fernando Perez <fperez@colorado.edu>
1900
1907
1901 * IPython/Magic.py (magic_prun): Fix bug where prun would fail if
1908 * IPython/Magic.py (magic_prun): Fix bug where prun would fail if
1902 the call had quote characters in it (the quotes were stripped).
1909 the call had quote characters in it (the quotes were stripped).
1903
1910
1904 2005-01-31 Fernando Perez <fperez@colorado.edu>
1911 2005-01-31 Fernando Perez <fperez@colorado.edu>
1905
1912
1906 * IPython/iplib.py (InteractiveShell.__init__): reduce reliance on
1913 * IPython/iplib.py (InteractiveShell.__init__): reduce reliance on
1907 Itpl.itpl() to make the code more robust against psyco
1914 Itpl.itpl() to make the code more robust against psyco
1908 optimizations.
1915 optimizations.
1909
1916
1910 * IPython/Itpl.py (Itpl.__str__): Use a _getframe() call instead
1917 * IPython/Itpl.py (Itpl.__str__): Use a _getframe() call instead
1911 of causing an exception. Quicker, cleaner.
1918 of causing an exception. Quicker, cleaner.
1912
1919
1913 2005-01-28 Fernando Perez <fperez@colorado.edu>
1920 2005-01-28 Fernando Perez <fperez@colorado.edu>
1914
1921
1915 * scripts/ipython_win_post_install.py (install): hardcode
1922 * scripts/ipython_win_post_install.py (install): hardcode
1916 sys.prefix+'python.exe' as the executable path. It turns out that
1923 sys.prefix+'python.exe' as the executable path. It turns out that
1917 during the post-installation run, sys.executable resolves to the
1924 during the post-installation run, sys.executable resolves to the
1918 name of the binary installer! I should report this as a distutils
1925 name of the binary installer! I should report this as a distutils
1919 bug, I think. I updated the .10 release with this tiny fix, to
1926 bug, I think. I updated the .10 release with this tiny fix, to
1920 avoid annoying the lists further.
1927 avoid annoying the lists further.
1921
1928
1922 2005-01-27 *** Released version 0.6.10
1929 2005-01-27 *** Released version 0.6.10
1923
1930
1924 2005-01-27 Fernando Perez <fperez@colorado.edu>
1931 2005-01-27 Fernando Perez <fperez@colorado.edu>
1925
1932
1926 * IPython/numutils.py (norm): Added 'inf' as optional name for
1933 * IPython/numutils.py (norm): Added 'inf' as optional name for
1927 L-infinity norm, included references to mathworld.com for vector
1934 L-infinity norm, included references to mathworld.com for vector
1928 norm definitions.
1935 norm definitions.
1929 (amin/amax): added amin/amax for array min/max. Similar to what
1936 (amin/amax): added amin/amax for array min/max. Similar to what
1930 pylab ships with after the recent reorganization of names.
1937 pylab ships with after the recent reorganization of names.
1931 (spike/spike_odd): removed deprecated spike/spike_odd functions.
1938 (spike/spike_odd): removed deprecated spike/spike_odd functions.
1932
1939
1933 * ipython.el: committed Alex's recent fixes and improvements.
1940 * ipython.el: committed Alex's recent fixes and improvements.
1934 Tested with python-mode from CVS, and it looks excellent. Since
1941 Tested with python-mode from CVS, and it looks excellent. Since
1935 python-mode hasn't released anything in a while, I'm temporarily
1942 python-mode hasn't released anything in a while, I'm temporarily
1936 putting a copy of today's CVS (v 4.70) of python-mode in:
1943 putting a copy of today's CVS (v 4.70) of python-mode in:
1937 http://ipython.scipy.org/tmp/python-mode.el
1944 http://ipython.scipy.org/tmp/python-mode.el
1938
1945
1939 * scripts/ipython_win_post_install.py (install): Win32 fix to use
1946 * scripts/ipython_win_post_install.py (install): Win32 fix to use
1940 sys.executable for the executable name, instead of assuming it's
1947 sys.executable for the executable name, instead of assuming it's
1941 called 'python.exe' (the post-installer would have produced broken
1948 called 'python.exe' (the post-installer would have produced broken
1942 setups on systems with a differently named python binary).
1949 setups on systems with a differently named python binary).
1943
1950
1944 * IPython/PyColorize.py (Parser.__call__): change explicit '\n'
1951 * IPython/PyColorize.py (Parser.__call__): change explicit '\n'
1945 references to os.linesep, to make the code more
1952 references to os.linesep, to make the code more
1946 platform-independent. This is also part of the win32 coloring
1953 platform-independent. This is also part of the win32 coloring
1947 fixes.
1954 fixes.
1948
1955
1949 * IPython/genutils.py (page_dumb): Remove attempts to chop long
1956 * IPython/genutils.py (page_dumb): Remove attempts to chop long
1950 lines, which actually cause coloring bugs because the length of
1957 lines, which actually cause coloring bugs because the length of
1951 the line is very difficult to correctly compute with embedded
1958 the line is very difficult to correctly compute with embedded
1952 escapes. This was the source of all the coloring problems under
1959 escapes. This was the source of all the coloring problems under
1953 Win32. I think that _finally_, Win32 users have a properly
1960 Win32. I think that _finally_, Win32 users have a properly
1954 working ipython in all respects. This would never have happened
1961 working ipython in all respects. This would never have happened
1955 if not for Gary Bishop and Viktor Ransmayr's great help and work.
1962 if not for Gary Bishop and Viktor Ransmayr's great help and work.
1956
1963
1957 2005-01-26 *** Released version 0.6.9
1964 2005-01-26 *** Released version 0.6.9
1958
1965
1959 2005-01-25 Fernando Perez <fperez@colorado.edu>
1966 2005-01-25 Fernando Perez <fperez@colorado.edu>
1960
1967
1961 * setup.py: finally, we have a true Windows installer, thanks to
1968 * setup.py: finally, we have a true Windows installer, thanks to
1962 the excellent work of Viktor Ransmayr
1969 the excellent work of Viktor Ransmayr
1963 <viktor.ransmayr-AT-t-online.de>. The docs have been updated for
1970 <viktor.ransmayr-AT-t-online.de>. The docs have been updated for
1964 Windows users. The setup routine is quite a bit cleaner thanks to
1971 Windows users. The setup routine is quite a bit cleaner thanks to
1965 this, and the post-install script uses the proper functions to
1972 this, and the post-install script uses the proper functions to
1966 allow a clean de-installation using the standard Windows Control
1973 allow a clean de-installation using the standard Windows Control
1967 Panel.
1974 Panel.
1968
1975
1969 * IPython/genutils.py (get_home_dir): changed to use the $HOME
1976 * IPython/genutils.py (get_home_dir): changed to use the $HOME
1970 environment variable under all OSes (including win32) if
1977 environment variable under all OSes (including win32) if
1971 available. This will give consistency to win32 users who have set
1978 available. This will give consistency to win32 users who have set
1972 this variable for any reason. If os.environ['HOME'] fails, the
1979 this variable for any reason. If os.environ['HOME'] fails, the
1973 previous policy of using HOMEDRIVE\HOMEPATH kicks in.
1980 previous policy of using HOMEDRIVE\HOMEPATH kicks in.
1974
1981
1975 2005-01-24 Fernando Perez <fperez@colorado.edu>
1982 2005-01-24 Fernando Perez <fperez@colorado.edu>
1976
1983
1977 * IPython/numutils.py (empty_like): add empty_like(), similar to
1984 * IPython/numutils.py (empty_like): add empty_like(), similar to
1978 zeros_like() but taking advantage of the new empty() Numeric routine.
1985 zeros_like() but taking advantage of the new empty() Numeric routine.
1979
1986
1980 2005-01-23 *** Released version 0.6.8
1987 2005-01-23 *** Released version 0.6.8
1981
1988
1982 2005-01-22 Fernando Perez <fperez@colorado.edu>
1989 2005-01-22 Fernando Perez <fperez@colorado.edu>
1983
1990
1984 * IPython/Shell.py (MatplotlibShellBase.mplot_exec): I removed the
1991 * IPython/Shell.py (MatplotlibShellBase.mplot_exec): I removed the
1985 automatic show() calls. After discussing things with JDH, it
1992 automatic show() calls. After discussing things with JDH, it
1986 turns out there are too many corner cases where this can go wrong.
1993 turns out there are too many corner cases where this can go wrong.
1987 It's best not to try to be 'too smart', and simply have ipython
1994 It's best not to try to be 'too smart', and simply have ipython
1988 reproduce as much as possible the default behavior of a normal
1995 reproduce as much as possible the default behavior of a normal
1989 python shell.
1996 python shell.
1990
1997
1991 * IPython/iplib.py (InteractiveShell.__init__): Modified the
1998 * IPython/iplib.py (InteractiveShell.__init__): Modified the
1992 line-splitting regexp and _prefilter() to avoid calling getattr()
1999 line-splitting regexp and _prefilter() to avoid calling getattr()
1993 on assignments. This closes
2000 on assignments. This closes
1994 http://www.scipy.net/roundup/ipython/issue24. Note that Python's
2001 http://www.scipy.net/roundup/ipython/issue24. Note that Python's
1995 readline uses getattr(), so a simple <TAB> keypress is still
2002 readline uses getattr(), so a simple <TAB> keypress is still
1996 enough to trigger getattr() calls on an object.
2003 enough to trigger getattr() calls on an object.
1997
2004
1998 2005-01-21 Fernando Perez <fperez@colorado.edu>
2005 2005-01-21 Fernando Perez <fperez@colorado.edu>
1999
2006
2000 * IPython/Shell.py (MatplotlibShellBase.magic_run): Fix the %run
2007 * IPython/Shell.py (MatplotlibShellBase.magic_run): Fix the %run
2001 docstring under pylab so it doesn't mask the original.
2008 docstring under pylab so it doesn't mask the original.
2002
2009
2003 2005-01-21 *** Released version 0.6.7
2010 2005-01-21 *** Released version 0.6.7
2004
2011
2005 2005-01-21 Fernando Perez <fperez@colorado.edu>
2012 2005-01-21 Fernando Perez <fperez@colorado.edu>
2006
2013
2007 * IPython/Shell.py (MTInteractiveShell.runcode): Trap a crash with
2014 * IPython/Shell.py (MTInteractiveShell.runcode): Trap a crash with
2008 signal handling for win32 users in multithreaded mode.
2015 signal handling for win32 users in multithreaded mode.
2009
2016
2010 2005-01-17 Fernando Perez <fperez@colorado.edu>
2017 2005-01-17 Fernando Perez <fperez@colorado.edu>
2011
2018
2012 * IPython/OInspect.py (Inspector.pinfo): Fix crash when inspecting
2019 * IPython/OInspect.py (Inspector.pinfo): Fix crash when inspecting
2013 instances with no __init__. After a crash report by Norbert Nemec
2020 instances with no __init__. After a crash report by Norbert Nemec
2014 <Norbert-AT-nemec-online.de>.
2021 <Norbert-AT-nemec-online.de>.
2015
2022
2016 2005-01-14 Fernando Perez <fperez@colorado.edu>
2023 2005-01-14 Fernando Perez <fperez@colorado.edu>
2017
2024
2018 * IPython/ultraTB.py (VerboseTB.text): Fix bug in reporting of
2025 * IPython/ultraTB.py (VerboseTB.text): Fix bug in reporting of
2019 names for verbose exceptions, when multiple dotted names and the
2026 names for verbose exceptions, when multiple dotted names and the
2020 'parent' object were present on the same line.
2027 'parent' object were present on the same line.
2021
2028
2022 2005-01-11 Fernando Perez <fperez@colorado.edu>
2029 2005-01-11 Fernando Perez <fperez@colorado.edu>
2023
2030
2024 * IPython/genutils.py (flag_calls): new utility to trap and flag
2031 * IPython/genutils.py (flag_calls): new utility to trap and flag
2025 calls in functions. I need it to clean up matplotlib support.
2032 calls in functions. I need it to clean up matplotlib support.
2026 Also removed some deprecated code in genutils.
2033 Also removed some deprecated code in genutils.
2027
2034
2028 * IPython/Shell.py (MatplotlibShellBase.mplot_exec): small fix so
2035 * IPython/Shell.py (MatplotlibShellBase.mplot_exec): small fix so
2029 that matplotlib scripts called with %run, which don't call show()
2036 that matplotlib scripts called with %run, which don't call show()
2030 themselves, still have their plotting windows open.
2037 themselves, still have their plotting windows open.
2031
2038
2032 2005-01-05 Fernando Perez <fperez@colorado.edu>
2039 2005-01-05 Fernando Perez <fperez@colorado.edu>
2033
2040
2034 * IPython/Shell.py (IPShellGTK.__init__): Patch by Andrew Straw
2041 * IPython/Shell.py (IPShellGTK.__init__): Patch by Andrew Straw
2035 <astraw-AT-caltech.edu>, to fix gtk deprecation warnings.
2042 <astraw-AT-caltech.edu>, to fix gtk deprecation warnings.
2036
2043
2037 2004-12-19 Fernando Perez <fperez@colorado.edu>
2044 2004-12-19 Fernando Perez <fperez@colorado.edu>
2038
2045
2039 * IPython/Shell.py (MTInteractiveShell.runcode): Get rid of
2046 * IPython/Shell.py (MTInteractiveShell.runcode): Get rid of
2040 parent_runcode, which was an eyesore. The same result can be
2047 parent_runcode, which was an eyesore. The same result can be
2041 obtained with Python's regular superclass mechanisms.
2048 obtained with Python's regular superclass mechanisms.
2042
2049
2043 2004-12-17 Fernando Perez <fperez@colorado.edu>
2050 2004-12-17 Fernando Perez <fperez@colorado.edu>
2044
2051
2045 * IPython/Magic.py (Magic.magic_sc): Fix quote stripping problem
2052 * IPython/Magic.py (Magic.magic_sc): Fix quote stripping problem
2046 reported by Prabhu.
2053 reported by Prabhu.
2047 (Magic.magic_sx): direct all errors to Term.cerr (defaults to
2054 (Magic.magic_sx): direct all errors to Term.cerr (defaults to
2048 sys.stderr) instead of explicitly calling sys.stderr. This helps
2055 sys.stderr) instead of explicitly calling sys.stderr. This helps
2049 maintain our I/O abstractions clean, for future GUI embeddings.
2056 maintain our I/O abstractions clean, for future GUI embeddings.
2050
2057
2051 * IPython/genutils.py (info): added new utility for sys.stderr
2058 * IPython/genutils.py (info): added new utility for sys.stderr
2052 unified info message handling (thin wrapper around warn()).
2059 unified info message handling (thin wrapper around warn()).
2053
2060
2054 * IPython/ultraTB.py (VerboseTB.text): Fix misreported global
2061 * IPython/ultraTB.py (VerboseTB.text): Fix misreported global
2055 composite (dotted) names on verbose exceptions.
2062 composite (dotted) names on verbose exceptions.
2056 (VerboseTB.nullrepr): harden against another kind of errors which
2063 (VerboseTB.nullrepr): harden against another kind of errors which
2057 Python's inspect module can trigger, and which were crashing
2064 Python's inspect module can trigger, and which were crashing
2058 IPython. Thanks to a report by Marco Lombardi
2065 IPython. Thanks to a report by Marco Lombardi
2059 <mlombard-AT-ma010192.hq.eso.org>.
2066 <mlombard-AT-ma010192.hq.eso.org>.
2060
2067
2061 2004-12-13 *** Released version 0.6.6
2068 2004-12-13 *** Released version 0.6.6
2062
2069
2063 2004-12-12 Fernando Perez <fperez@colorado.edu>
2070 2004-12-12 Fernando Perez <fperez@colorado.edu>
2064
2071
2065 * IPython/Shell.py (IPShellGTK.mainloop): catch RuntimeErrors
2072 * IPython/Shell.py (IPShellGTK.mainloop): catch RuntimeErrors
2066 generated by pygtk upon initialization if it was built without
2073 generated by pygtk upon initialization if it was built without
2067 threads (for matplotlib users). After a crash reported by
2074 threads (for matplotlib users). After a crash reported by
2068 Leguijt, Jaap J SIEP-EPT-RES <Jaap.Leguijt-AT-shell.com>.
2075 Leguijt, Jaap J SIEP-EPT-RES <Jaap.Leguijt-AT-shell.com>.
2069
2076
2070 * IPython/ipmaker.py (make_IPython): fix small bug in the
2077 * IPython/ipmaker.py (make_IPython): fix small bug in the
2071 import_some parameter for multiple imports.
2078 import_some parameter for multiple imports.
2072
2079
2073 * IPython/iplib.py (ipmagic): simplified the interface of
2080 * IPython/iplib.py (ipmagic): simplified the interface of
2074 ipmagic() to take a single string argument, just as it would be
2081 ipmagic() to take a single string argument, just as it would be
2075 typed at the IPython cmd line.
2082 typed at the IPython cmd line.
2076 (ipalias): Added new ipalias() with an interface identical to
2083 (ipalias): Added new ipalias() with an interface identical to
2077 ipmagic(). This completes exposing a pure python interface to the
2084 ipmagic(). This completes exposing a pure python interface to the
2078 alias and magic system, which can be used in loops or more complex
2085 alias and magic system, which can be used in loops or more complex
2079 code where IPython's automatic line mangling is not active.
2086 code where IPython's automatic line mangling is not active.
2080
2087
2081 * IPython/genutils.py (timing): changed interface of timing to
2088 * IPython/genutils.py (timing): changed interface of timing to
2082 simply run code once, which is the most common case. timings()
2089 simply run code once, which is the most common case. timings()
2083 remains unchanged, for the cases where you want multiple runs.
2090 remains unchanged, for the cases where you want multiple runs.
2084
2091
2085 * IPython/Shell.py (MatplotlibShellBase._matplotlib_config): Fix a
2092 * IPython/Shell.py (MatplotlibShellBase._matplotlib_config): Fix a
2086 bug where Python2.2 crashes with exec'ing code which does not end
2093 bug where Python2.2 crashes with exec'ing code which does not end
2087 in a single newline. Python 2.3 is OK, so I hadn't noticed this
2094 in a single newline. Python 2.3 is OK, so I hadn't noticed this
2088 before.
2095 before.
2089
2096
2090 2004-12-10 Fernando Perez <fperez@colorado.edu>
2097 2004-12-10 Fernando Perez <fperez@colorado.edu>
2091
2098
2092 * IPython/Magic.py (Magic.magic_prun): changed name of option from
2099 * IPython/Magic.py (Magic.magic_prun): changed name of option from
2093 -t to -T, to accomodate the new -t flag in %run (the %run and
2100 -t to -T, to accomodate the new -t flag in %run (the %run and
2094 %prun options are kind of intermixed, and it's not easy to change
2101 %prun options are kind of intermixed, and it's not easy to change
2095 this with the limitations of python's getopt).
2102 this with the limitations of python's getopt).
2096
2103
2097 * IPython/Magic.py (Magic.magic_run): Added new -t option to time
2104 * IPython/Magic.py (Magic.magic_run): Added new -t option to time
2098 the execution of scripts. It's not as fine-tuned as timeit.py,
2105 the execution of scripts. It's not as fine-tuned as timeit.py,
2099 but it works from inside ipython (and under 2.2, which lacks
2106 but it works from inside ipython (and under 2.2, which lacks
2100 timeit.py). Optionally a number of runs > 1 can be given for
2107 timeit.py). Optionally a number of runs > 1 can be given for
2101 timing very short-running code.
2108 timing very short-running code.
2102
2109
2103 * IPython/genutils.py (uniq_stable): new routine which returns a
2110 * IPython/genutils.py (uniq_stable): new routine which returns a
2104 list of unique elements in any iterable, but in stable order of
2111 list of unique elements in any iterable, but in stable order of
2105 appearance. I needed this for the ultraTB fixes, and it's a handy
2112 appearance. I needed this for the ultraTB fixes, and it's a handy
2106 utility.
2113 utility.
2107
2114
2108 * IPython/ultraTB.py (VerboseTB.text): Fix proper reporting of
2115 * IPython/ultraTB.py (VerboseTB.text): Fix proper reporting of
2109 dotted names in Verbose exceptions. This had been broken since
2116 dotted names in Verbose exceptions. This had been broken since
2110 the very start, now x.y will properly be printed in a Verbose
2117 the very start, now x.y will properly be printed in a Verbose
2111 traceback, instead of x being shown and y appearing always as an
2118 traceback, instead of x being shown and y appearing always as an
2112 'undefined global'. Getting this to work was a bit tricky,
2119 'undefined global'. Getting this to work was a bit tricky,
2113 because by default python tokenizers are stateless. Saved by
2120 because by default python tokenizers are stateless. Saved by
2114 python's ability to easily add a bit of state to an arbitrary
2121 python's ability to easily add a bit of state to an arbitrary
2115 function (without needing to build a full-blown callable object).
2122 function (without needing to build a full-blown callable object).
2116
2123
2117 Also big cleanup of this code, which had horrendous runtime
2124 Also big cleanup of this code, which had horrendous runtime
2118 lookups of zillions of attributes for colorization. Moved all
2125 lookups of zillions of attributes for colorization. Moved all
2119 this code into a few templates, which make it cleaner and quicker.
2126 this code into a few templates, which make it cleaner and quicker.
2120
2127
2121 Printout quality was also improved for Verbose exceptions: one
2128 Printout quality was also improved for Verbose exceptions: one
2122 variable per line, and memory addresses are printed (this can be
2129 variable per line, and memory addresses are printed (this can be
2123 quite handy in nasty debugging situations, which is what Verbose
2130 quite handy in nasty debugging situations, which is what Verbose
2124 is for).
2131 is for).
2125
2132
2126 * IPython/ipmaker.py (make_IPython): Do NOT execute files named in
2133 * IPython/ipmaker.py (make_IPython): Do NOT execute files named in
2127 the command line as scripts to be loaded by embedded instances.
2134 the command line as scripts to be loaded by embedded instances.
2128 Doing so has the potential for an infinite recursion if there are
2135 Doing so has the potential for an infinite recursion if there are
2129 exceptions thrown in the process. This fixes a strange crash
2136 exceptions thrown in the process. This fixes a strange crash
2130 reported by Philippe MULLER <muller-AT-irit.fr>.
2137 reported by Philippe MULLER <muller-AT-irit.fr>.
2131
2138
2132 2004-12-09 Fernando Perez <fperez@colorado.edu>
2139 2004-12-09 Fernando Perez <fperez@colorado.edu>
2133
2140
2134 * IPython/Shell.py (MatplotlibShellBase.use): Change pylab support
2141 * IPython/Shell.py (MatplotlibShellBase.use): Change pylab support
2135 to reflect new names in matplotlib, which now expose the
2142 to reflect new names in matplotlib, which now expose the
2136 matlab-compatible interface via a pylab module instead of the
2143 matlab-compatible interface via a pylab module instead of the
2137 'matlab' name. The new code is backwards compatible, so users of
2144 'matlab' name. The new code is backwards compatible, so users of
2138 all matplotlib versions are OK. Patch by J. Hunter.
2145 all matplotlib versions are OK. Patch by J. Hunter.
2139
2146
2140 * IPython/OInspect.py (Inspector.pinfo): Add to object? printing
2147 * IPython/OInspect.py (Inspector.pinfo): Add to object? printing
2141 of __init__ docstrings for instances (class docstrings are already
2148 of __init__ docstrings for instances (class docstrings are already
2142 automatically printed). Instances with customized docstrings
2149 automatically printed). Instances with customized docstrings
2143 (indep. of the class) are also recognized and all 3 separate
2150 (indep. of the class) are also recognized and all 3 separate
2144 docstrings are printed (instance, class, constructor). After some
2151 docstrings are printed (instance, class, constructor). After some
2145 comments/suggestions by J. Hunter.
2152 comments/suggestions by J. Hunter.
2146
2153
2147 2004-12-05 Fernando Perez <fperez@colorado.edu>
2154 2004-12-05 Fernando Perez <fperez@colorado.edu>
2148
2155
2149 * IPython/iplib.py (MagicCompleter.complete): Remove annoying
2156 * IPython/iplib.py (MagicCompleter.complete): Remove annoying
2150 warnings when tab-completion fails and triggers an exception.
2157 warnings when tab-completion fails and triggers an exception.
2151
2158
2152 2004-12-03 Fernando Perez <fperez@colorado.edu>
2159 2004-12-03 Fernando Perez <fperez@colorado.edu>
2153
2160
2154 * IPython/Magic.py (magic_prun): Fix bug where an exception would
2161 * IPython/Magic.py (magic_prun): Fix bug where an exception would
2155 be triggered when using 'run -p'. An incorrect option flag was
2162 be triggered when using 'run -p'. An incorrect option flag was
2156 being set ('d' instead of 'D').
2163 being set ('d' instead of 'D').
2157 (manpage): fix missing escaped \- sign.
2164 (manpage): fix missing escaped \- sign.
2158
2165
2159 2004-11-30 *** Released version 0.6.5
2166 2004-11-30 *** Released version 0.6.5
2160
2167
2161 2004-11-30 Fernando Perez <fperez@colorado.edu>
2168 2004-11-30 Fernando Perez <fperez@colorado.edu>
2162
2169
2163 * IPython/Magic.py (Magic.magic_run): Fix bug in breakpoint
2170 * IPython/Magic.py (Magic.magic_run): Fix bug in breakpoint
2164 setting with -d option.
2171 setting with -d option.
2165
2172
2166 * setup.py (docfiles): Fix problem where the doc glob I was using
2173 * setup.py (docfiles): Fix problem where the doc glob I was using
2167 was COMPLETELY BROKEN. It was giving the right files by pure
2174 was COMPLETELY BROKEN. It was giving the right files by pure
2168 accident, but failed once I tried to include ipython.el. Note:
2175 accident, but failed once I tried to include ipython.el. Note:
2169 glob() does NOT allow you to do exclusion on multiple endings!
2176 glob() does NOT allow you to do exclusion on multiple endings!
2170
2177
2171 2004-11-29 Fernando Perez <fperez@colorado.edu>
2178 2004-11-29 Fernando Perez <fperez@colorado.edu>
2172
2179
2173 * IPython/usage.py (__doc__): cleaned up usage docstring, by using
2180 * IPython/usage.py (__doc__): cleaned up usage docstring, by using
2174 the manpage as the source. Better formatting & consistency.
2181 the manpage as the source. Better formatting & consistency.
2175
2182
2176 * IPython/Magic.py (magic_run): Added new -d option, to run
2183 * IPython/Magic.py (magic_run): Added new -d option, to run
2177 scripts under the control of the python pdb debugger. Note that
2184 scripts under the control of the python pdb debugger. Note that
2178 this required changing the %prun option -d to -D, to avoid a clash
2185 this required changing the %prun option -d to -D, to avoid a clash
2179 (since %run must pass options to %prun, and getopt is too dumb to
2186 (since %run must pass options to %prun, and getopt is too dumb to
2180 handle options with string values with embedded spaces). Thanks
2187 handle options with string values with embedded spaces). Thanks
2181 to a suggestion by Matthew Arnison <maffew-AT-cat.org.au>.
2188 to a suggestion by Matthew Arnison <maffew-AT-cat.org.au>.
2182 (magic_who_ls): added type matching to %who and %whos, so that one
2189 (magic_who_ls): added type matching to %who and %whos, so that one
2183 can filter their output to only include variables of certain
2190 can filter their output to only include variables of certain
2184 types. Another suggestion by Matthew.
2191 types. Another suggestion by Matthew.
2185 (magic_whos): Added memory summaries in kb and Mb for arrays.
2192 (magic_whos): Added memory summaries in kb and Mb for arrays.
2186 (magic_who): Improve formatting (break lines every 9 vars).
2193 (magic_who): Improve formatting (break lines every 9 vars).
2187
2194
2188 2004-11-28 Fernando Perez <fperez@colorado.edu>
2195 2004-11-28 Fernando Perez <fperez@colorado.edu>
2189
2196
2190 * IPython/Logger.py (Logger.log): Fix bug in syncing the input
2197 * IPython/Logger.py (Logger.log): Fix bug in syncing the input
2191 cache when empty lines were present.
2198 cache when empty lines were present.
2192
2199
2193 2004-11-24 Fernando Perez <fperez@colorado.edu>
2200 2004-11-24 Fernando Perez <fperez@colorado.edu>
2194
2201
2195 * IPython/usage.py (__doc__): document the re-activated threading
2202 * IPython/usage.py (__doc__): document the re-activated threading
2196 options for WX and GTK.
2203 options for WX and GTK.
2197
2204
2198 2004-11-23 Fernando Perez <fperez@colorado.edu>
2205 2004-11-23 Fernando Perez <fperez@colorado.edu>
2199
2206
2200 * IPython/Shell.py (start): Added Prabhu's big patch to reactivate
2207 * IPython/Shell.py (start): Added Prabhu's big patch to reactivate
2201 the -wthread and -gthread options, along with a new -tk one to try
2208 the -wthread and -gthread options, along with a new -tk one to try
2202 and coordinate Tk threading with wx/gtk. The tk support is very
2209 and coordinate Tk threading with wx/gtk. The tk support is very
2203 platform dependent, since it seems to require Tcl and Tk to be
2210 platform dependent, since it seems to require Tcl and Tk to be
2204 built with threads (Fedora1/2 appears NOT to have it, but in
2211 built with threads (Fedora1/2 appears NOT to have it, but in
2205 Prabhu's Debian boxes it works OK). But even with some Tk
2212 Prabhu's Debian boxes it works OK). But even with some Tk
2206 limitations, this is a great improvement.
2213 limitations, this is a great improvement.
2207
2214
2208 * IPython/Prompts.py (prompt_specials_color): Added \t for time
2215 * IPython/Prompts.py (prompt_specials_color): Added \t for time
2209 info in user prompts. Patch by Prabhu.
2216 info in user prompts. Patch by Prabhu.
2210
2217
2211 2004-11-18 Fernando Perez <fperez@colorado.edu>
2218 2004-11-18 Fernando Perez <fperez@colorado.edu>
2212
2219
2213 * IPython/genutils.py (ask_yes_no): Add check for a max of 20
2220 * IPython/genutils.py (ask_yes_no): Add check for a max of 20
2214 EOFErrors and bail, to avoid infinite loops if a non-terminating
2221 EOFErrors and bail, to avoid infinite loops if a non-terminating
2215 file is fed into ipython. Patch submitted in issue 19 by user,
2222 file is fed into ipython. Patch submitted in issue 19 by user,
2216 many thanks.
2223 many thanks.
2217
2224
2218 * IPython/iplib.py (InteractiveShell.handle_auto): do NOT trigger
2225 * IPython/iplib.py (InteractiveShell.handle_auto): do NOT trigger
2219 autoquote/parens in continuation prompts, which can cause lots of
2226 autoquote/parens in continuation prompts, which can cause lots of
2220 problems. Closes roundup issue 20.
2227 problems. Closes roundup issue 20.
2221
2228
2222 2004-11-17 Fernando Perez <fperez@colorado.edu>
2229 2004-11-17 Fernando Perez <fperez@colorado.edu>
2223
2230
2224 * debian/control (Build-Depends-Indep): Fix dpatch dependency,
2231 * debian/control (Build-Depends-Indep): Fix dpatch dependency,
2225 reported as debian bug #280505. I'm not sure my local changelog
2232 reported as debian bug #280505. I'm not sure my local changelog
2226 entry has the proper debian format (Jack?).
2233 entry has the proper debian format (Jack?).
2227
2234
2228 2004-11-08 *** Released version 0.6.4
2235 2004-11-08 *** Released version 0.6.4
2229
2236
2230 2004-11-08 Fernando Perez <fperez@colorado.edu>
2237 2004-11-08 Fernando Perez <fperez@colorado.edu>
2231
2238
2232 * IPython/iplib.py (init_readline): Fix exit message for Windows
2239 * IPython/iplib.py (init_readline): Fix exit message for Windows
2233 when readline is active. Thanks to a report by Eric Jones
2240 when readline is active. Thanks to a report by Eric Jones
2234 <eric-AT-enthought.com>.
2241 <eric-AT-enthought.com>.
2235
2242
2236 2004-11-07 Fernando Perez <fperez@colorado.edu>
2243 2004-11-07 Fernando Perez <fperez@colorado.edu>
2237
2244
2238 * IPython/genutils.py (page): Add a trap for OSError exceptions,
2245 * IPython/genutils.py (page): Add a trap for OSError exceptions,
2239 sometimes seen by win2k/cygwin users.
2246 sometimes seen by win2k/cygwin users.
2240
2247
2241 2004-11-06 Fernando Perez <fperez@colorado.edu>
2248 2004-11-06 Fernando Perez <fperez@colorado.edu>
2242
2249
2243 * IPython/iplib.py (interact): Change the handling of %Exit from
2250 * IPython/iplib.py (interact): Change the handling of %Exit from
2244 trying to propagate a SystemExit to an internal ipython flag.
2251 trying to propagate a SystemExit to an internal ipython flag.
2245 This is less elegant than using Python's exception mechanism, but
2252 This is less elegant than using Python's exception mechanism, but
2246 I can't get that to work reliably with threads, so under -pylab
2253 I can't get that to work reliably with threads, so under -pylab
2247 %Exit was hanging IPython. Cross-thread exception handling is
2254 %Exit was hanging IPython. Cross-thread exception handling is
2248 really a bitch. Thaks to a bug report by Stephen Walton
2255 really a bitch. Thaks to a bug report by Stephen Walton
2249 <stephen.walton-AT-csun.edu>.
2256 <stephen.walton-AT-csun.edu>.
2250
2257
2251 2004-11-04 Fernando Perez <fperez@colorado.edu>
2258 2004-11-04 Fernando Perez <fperez@colorado.edu>
2252
2259
2253 * IPython/iplib.py (raw_input_original): store a pointer to the
2260 * IPython/iplib.py (raw_input_original): store a pointer to the
2254 true raw_input to harden against code which can modify it
2261 true raw_input to harden against code which can modify it
2255 (wx.py.PyShell does this and would otherwise crash ipython).
2262 (wx.py.PyShell does this and would otherwise crash ipython).
2256 Thanks to a bug report by Jim Flowers <james.flowers-AT-lgx.com>.
2263 Thanks to a bug report by Jim Flowers <james.flowers-AT-lgx.com>.
2257
2264
2258 * IPython/Shell.py (MTInteractiveShell.runsource): Cleaner fix for
2265 * IPython/Shell.py (MTInteractiveShell.runsource): Cleaner fix for
2259 Ctrl-C problem, which does not mess up the input line.
2266 Ctrl-C problem, which does not mess up the input line.
2260
2267
2261 2004-11-03 Fernando Perez <fperez@colorado.edu>
2268 2004-11-03 Fernando Perez <fperez@colorado.edu>
2262
2269
2263 * IPython/Release.py: Changed licensing to BSD, in all files.
2270 * IPython/Release.py: Changed licensing to BSD, in all files.
2264 (name): lowercase name for tarball/RPM release.
2271 (name): lowercase name for tarball/RPM release.
2265
2272
2266 * IPython/OInspect.py (getdoc): wrap inspect.getdoc() safely for
2273 * IPython/OInspect.py (getdoc): wrap inspect.getdoc() safely for
2267 use throughout ipython.
2274 use throughout ipython.
2268
2275
2269 * IPython/Magic.py (Magic._ofind): Switch to using the new
2276 * IPython/Magic.py (Magic._ofind): Switch to using the new
2270 OInspect.getdoc() function.
2277 OInspect.getdoc() function.
2271
2278
2272 * IPython/Shell.py (sigint_handler): Hack to ignore the execution
2279 * IPython/Shell.py (sigint_handler): Hack to ignore the execution
2273 of the line currently being canceled via Ctrl-C. It's extremely
2280 of the line currently being canceled via Ctrl-C. It's extremely
2274 ugly, but I don't know how to do it better (the problem is one of
2281 ugly, but I don't know how to do it better (the problem is one of
2275 handling cross-thread exceptions).
2282 handling cross-thread exceptions).
2276
2283
2277 2004-10-28 Fernando Perez <fperez@colorado.edu>
2284 2004-10-28 Fernando Perez <fperez@colorado.edu>
2278
2285
2279 * IPython/Shell.py (signal_handler): add signal handlers to trap
2286 * IPython/Shell.py (signal_handler): add signal handlers to trap
2280 SIGINT and SIGSEGV in threaded code properly. Thanks to a bug
2287 SIGINT and SIGSEGV in threaded code properly. Thanks to a bug
2281 report by Francesc Alted.
2288 report by Francesc Alted.
2282
2289
2283 2004-10-21 Fernando Perez <fperez@colorado.edu>
2290 2004-10-21 Fernando Perez <fperez@colorado.edu>
2284
2291
2285 * IPython/Extensions/InterpreterExec.py (prefilter_shell): Fix @
2292 * IPython/Extensions/InterpreterExec.py (prefilter_shell): Fix @
2286 to % for pysh syntax extensions.
2293 to % for pysh syntax extensions.
2287
2294
2288 2004-10-09 Fernando Perez <fperez@colorado.edu>
2295 2004-10-09 Fernando Perez <fperez@colorado.edu>
2289
2296
2290 * IPython/Magic.py (Magic.magic_whos): modify output of Numeric
2297 * IPython/Magic.py (Magic.magic_whos): modify output of Numeric
2291 arrays to print a more useful summary, without calling str(arr).
2298 arrays to print a more useful summary, without calling str(arr).
2292 This avoids the problem of extremely lengthy computations which
2299 This avoids the problem of extremely lengthy computations which
2293 occur if arr is large, and appear to the user as a system lockup
2300 occur if arr is large, and appear to the user as a system lockup
2294 with 100% cpu activity. After a suggestion by Kristian Sandberg
2301 with 100% cpu activity. After a suggestion by Kristian Sandberg
2295 <Kristian.Sandberg@colorado.edu>.
2302 <Kristian.Sandberg@colorado.edu>.
2296 (Magic.__init__): fix bug in global magic escapes not being
2303 (Magic.__init__): fix bug in global magic escapes not being
2297 correctly set.
2304 correctly set.
2298
2305
2299 2004-10-08 Fernando Perez <fperez@colorado.edu>
2306 2004-10-08 Fernando Perez <fperez@colorado.edu>
2300
2307
2301 * IPython/Magic.py (__license__): change to absolute imports of
2308 * IPython/Magic.py (__license__): change to absolute imports of
2302 ipython's own internal packages, to start adapting to the absolute
2309 ipython's own internal packages, to start adapting to the absolute
2303 import requirement of PEP-328.
2310 import requirement of PEP-328.
2304
2311
2305 * IPython/genutils.py (__author__): Fix coding to utf-8 on all
2312 * IPython/genutils.py (__author__): Fix coding to utf-8 on all
2306 files, and standardize author/license marks through the Release
2313 files, and standardize author/license marks through the Release
2307 module instead of having per/file stuff (except for files with
2314 module instead of having per/file stuff (except for files with
2308 particular licenses, like the MIT/PSF-licensed codes).
2315 particular licenses, like the MIT/PSF-licensed codes).
2309
2316
2310 * IPython/Debugger.py: remove dead code for python 2.1
2317 * IPython/Debugger.py: remove dead code for python 2.1
2311
2318
2312 2004-10-04 Fernando Perez <fperez@colorado.edu>
2319 2004-10-04 Fernando Perez <fperez@colorado.edu>
2313
2320
2314 * IPython/iplib.py (ipmagic): New function for accessing magics
2321 * IPython/iplib.py (ipmagic): New function for accessing magics
2315 via a normal python function call.
2322 via a normal python function call.
2316
2323
2317 * IPython/Magic.py (Magic.magic_magic): Change the magic escape
2324 * IPython/Magic.py (Magic.magic_magic): Change the magic escape
2318 from '@' to '%', to accomodate the new @decorator syntax of python
2325 from '@' to '%', to accomodate the new @decorator syntax of python
2319 2.4.
2326 2.4.
2320
2327
2321 2004-09-29 Fernando Perez <fperez@colorado.edu>
2328 2004-09-29 Fernando Perez <fperez@colorado.edu>
2322
2329
2323 * IPython/Shell.py (MatplotlibShellBase.use): Added a wrapper to
2330 * IPython/Shell.py (MatplotlibShellBase.use): Added a wrapper to
2324 matplotlib.use to prevent running scripts which try to switch
2331 matplotlib.use to prevent running scripts which try to switch
2325 interactive backends from within ipython. This will just crash
2332 interactive backends from within ipython. This will just crash
2326 the python interpreter, so we can't allow it (but a detailed error
2333 the python interpreter, so we can't allow it (but a detailed error
2327 is given to the user).
2334 is given to the user).
2328
2335
2329 2004-09-28 Fernando Perez <fperez@colorado.edu>
2336 2004-09-28 Fernando Perez <fperez@colorado.edu>
2330
2337
2331 * IPython/Shell.py (MatplotlibShellBase.mplot_exec):
2338 * IPython/Shell.py (MatplotlibShellBase.mplot_exec):
2332 matplotlib-related fixes so that using @run with non-matplotlib
2339 matplotlib-related fixes so that using @run with non-matplotlib
2333 scripts doesn't pop up spurious plot windows. This requires
2340 scripts doesn't pop up spurious plot windows. This requires
2334 matplotlib >= 0.63, where I had to make some changes as well.
2341 matplotlib >= 0.63, where I had to make some changes as well.
2335
2342
2336 * IPython/ipmaker.py (make_IPython): update version requirement to
2343 * IPython/ipmaker.py (make_IPython): update version requirement to
2337 python 2.2.
2344 python 2.2.
2338
2345
2339 * IPython/iplib.py (InteractiveShell.mainloop): Add an optional
2346 * IPython/iplib.py (InteractiveShell.mainloop): Add an optional
2340 banner arg for embedded customization.
2347 banner arg for embedded customization.
2341
2348
2342 * IPython/Magic.py (Magic.__init__): big cleanup to remove all
2349 * IPython/Magic.py (Magic.__init__): big cleanup to remove all
2343 explicit uses of __IP as the IPython's instance name. Now things
2350 explicit uses of __IP as the IPython's instance name. Now things
2344 are properly handled via the shell.name value. The actual code
2351 are properly handled via the shell.name value. The actual code
2345 is a bit ugly b/c I'm doing it via a global in Magic.py, but this
2352 is a bit ugly b/c I'm doing it via a global in Magic.py, but this
2346 is much better than before. I'll clean things completely when the
2353 is much better than before. I'll clean things completely when the
2347 magic stuff gets a real overhaul.
2354 magic stuff gets a real overhaul.
2348
2355
2349 * ipython.1: small fixes, sent in by Jack Moffit. He also sent in
2356 * ipython.1: small fixes, sent in by Jack Moffit. He also sent in
2350 minor changes to debian dir.
2357 minor changes to debian dir.
2351
2358
2352 * IPython/iplib.py (InteractiveShell.__init__): Fix adding a
2359 * IPython/iplib.py (InteractiveShell.__init__): Fix adding a
2353 pointer to the shell itself in the interactive namespace even when
2360 pointer to the shell itself in the interactive namespace even when
2354 a user-supplied dict is provided. This is needed for embedding
2361 a user-supplied dict is provided. This is needed for embedding
2355 purposes (found by tests with Michel Sanner).
2362 purposes (found by tests with Michel Sanner).
2356
2363
2357 2004-09-27 Fernando Perez <fperez@colorado.edu>
2364 2004-09-27 Fernando Perez <fperez@colorado.edu>
2358
2365
2359 * IPython/UserConfig/ipythonrc: remove []{} from
2366 * IPython/UserConfig/ipythonrc: remove []{} from
2360 readline_remove_delims, so that things like [modname.<TAB> do
2367 readline_remove_delims, so that things like [modname.<TAB> do
2361 proper completion. This disables [].TAB, but that's a less common
2368 proper completion. This disables [].TAB, but that's a less common
2362 case than module names in list comprehensions, for example.
2369 case than module names in list comprehensions, for example.
2363 Thanks to a report by Andrea Riciputi.
2370 Thanks to a report by Andrea Riciputi.
2364
2371
2365 2004-09-09 Fernando Perez <fperez@colorado.edu>
2372 2004-09-09 Fernando Perez <fperez@colorado.edu>
2366
2373
2367 * IPython/Shell.py (IPShellGTK.mainloop): reorder to avoid
2374 * IPython/Shell.py (IPShellGTK.mainloop): reorder to avoid
2368 blocking problems in win32 and osx. Fix by John.
2375 blocking problems in win32 and osx. Fix by John.
2369
2376
2370 2004-09-08 Fernando Perez <fperez@colorado.edu>
2377 2004-09-08 Fernando Perez <fperez@colorado.edu>
2371
2378
2372 * IPython/Shell.py (IPShellWX.OnInit): Fix output redirection bug
2379 * IPython/Shell.py (IPShellWX.OnInit): Fix output redirection bug
2373 for Win32 and OSX. Fix by John Hunter.
2380 for Win32 and OSX. Fix by John Hunter.
2374
2381
2375 2004-08-30 *** Released version 0.6.3
2382 2004-08-30 *** Released version 0.6.3
2376
2383
2377 2004-08-30 Fernando Perez <fperez@colorado.edu>
2384 2004-08-30 Fernando Perez <fperez@colorado.edu>
2378
2385
2379 * setup.py (isfile): Add manpages to list of dependent files to be
2386 * setup.py (isfile): Add manpages to list of dependent files to be
2380 updated.
2387 updated.
2381
2388
2382 2004-08-27 Fernando Perez <fperez@colorado.edu>
2389 2004-08-27 Fernando Perez <fperez@colorado.edu>
2383
2390
2384 * IPython/Shell.py (start): I've disabled -wthread and -gthread
2391 * IPython/Shell.py (start): I've disabled -wthread and -gthread
2385 for now. They don't really work with standalone WX/GTK code
2392 for now. They don't really work with standalone WX/GTK code
2386 (though matplotlib IS working fine with both of those backends).
2393 (though matplotlib IS working fine with both of those backends).
2387 This will neeed much more testing. I disabled most things with
2394 This will neeed much more testing. I disabled most things with
2388 comments, so turning it back on later should be pretty easy.
2395 comments, so turning it back on later should be pretty easy.
2389
2396
2390 * IPython/iplib.py (InteractiveShell.__init__): Fix accidental
2397 * IPython/iplib.py (InteractiveShell.__init__): Fix accidental
2391 autocalling of expressions like r'foo', by modifying the line
2398 autocalling of expressions like r'foo', by modifying the line
2392 split regexp. Closes
2399 split regexp. Closes
2393 http://www.scipy.net/roundup/ipython/issue18, reported by Nicholas
2400 http://www.scipy.net/roundup/ipython/issue18, reported by Nicholas
2394 Riley <ipythonbugs-AT-sabi.net>.
2401 Riley <ipythonbugs-AT-sabi.net>.
2395 (InteractiveShell.mainloop): honor --nobanner with banner
2402 (InteractiveShell.mainloop): honor --nobanner with banner
2396 extensions.
2403 extensions.
2397
2404
2398 * IPython/Shell.py: Significant refactoring of all classes, so
2405 * IPython/Shell.py: Significant refactoring of all classes, so
2399 that we can really support ALL matplotlib backends and threading
2406 that we can really support ALL matplotlib backends and threading
2400 models (John spotted a bug with Tk which required this). Now we
2407 models (John spotted a bug with Tk which required this). Now we
2401 should support single-threaded, WX-threads and GTK-threads, both
2408 should support single-threaded, WX-threads and GTK-threads, both
2402 for generic code and for matplotlib.
2409 for generic code and for matplotlib.
2403
2410
2404 * IPython/ipmaker.py (__call__): Changed -mpthread option to
2411 * IPython/ipmaker.py (__call__): Changed -mpthread option to
2405 -pylab, to simplify things for users. Will also remove the pylab
2412 -pylab, to simplify things for users. Will also remove the pylab
2406 profile, since now all of matplotlib configuration is directly
2413 profile, since now all of matplotlib configuration is directly
2407 handled here. This also reduces startup time.
2414 handled here. This also reduces startup time.
2408
2415
2409 * IPython/Shell.py (IPShellGTK.run): Fixed bug where mainloop() of
2416 * IPython/Shell.py (IPShellGTK.run): Fixed bug where mainloop() of
2410 shell wasn't being correctly called. Also in IPShellWX.
2417 shell wasn't being correctly called. Also in IPShellWX.
2411
2418
2412 * IPython/iplib.py (InteractiveShell.__init__): Added option to
2419 * IPython/iplib.py (InteractiveShell.__init__): Added option to
2413 fine-tune banner.
2420 fine-tune banner.
2414
2421
2415 * IPython/numutils.py (spike): Deprecate these spike functions,
2422 * IPython/numutils.py (spike): Deprecate these spike functions,
2416 delete (long deprecated) gnuplot_exec handler.
2423 delete (long deprecated) gnuplot_exec handler.
2417
2424
2418 2004-08-26 Fernando Perez <fperez@colorado.edu>
2425 2004-08-26 Fernando Perez <fperez@colorado.edu>
2419
2426
2420 * ipython.1: Update for threading options, plus some others which
2427 * ipython.1: Update for threading options, plus some others which
2421 were missing.
2428 were missing.
2422
2429
2423 * IPython/ipmaker.py (__call__): Added -wthread option for
2430 * IPython/ipmaker.py (__call__): Added -wthread option for
2424 wxpython thread handling. Make sure threading options are only
2431 wxpython thread handling. Make sure threading options are only
2425 valid at the command line.
2432 valid at the command line.
2426
2433
2427 * scripts/ipython: moved shell selection into a factory function
2434 * scripts/ipython: moved shell selection into a factory function
2428 in Shell.py, to keep the starter script to a minimum.
2435 in Shell.py, to keep the starter script to a minimum.
2429
2436
2430 2004-08-25 Fernando Perez <fperez@colorado.edu>
2437 2004-08-25 Fernando Perez <fperez@colorado.edu>
2431
2438
2432 * IPython/Shell.py (IPShellWX.wxexit): fixes to WX threading, by
2439 * IPython/Shell.py (IPShellWX.wxexit): fixes to WX threading, by
2433 John. Along with some recent changes he made to matplotlib, the
2440 John. Along with some recent changes he made to matplotlib, the
2434 next versions of both systems should work very well together.
2441 next versions of both systems should work very well together.
2435
2442
2436 2004-08-24 Fernando Perez <fperez@colorado.edu>
2443 2004-08-24 Fernando Perez <fperez@colorado.edu>
2437
2444
2438 * IPython/Magic.py (Magic.magic_prun): cleanup some dead code. I
2445 * IPython/Magic.py (Magic.magic_prun): cleanup some dead code. I
2439 tried to switch the profiling to using hotshot, but I'm getting
2446 tried to switch the profiling to using hotshot, but I'm getting
2440 strange errors from prof.runctx() there. I may be misreading the
2447 strange errors from prof.runctx() there. I may be misreading the
2441 docs, but it looks weird. For now the profiling code will
2448 docs, but it looks weird. For now the profiling code will
2442 continue to use the standard profiler.
2449 continue to use the standard profiler.
2443
2450
2444 2004-08-23 Fernando Perez <fperez@colorado.edu>
2451 2004-08-23 Fernando Perez <fperez@colorado.edu>
2445
2452
2446 * IPython/Shell.py (IPShellWX.__init__): Improvements to the WX
2453 * IPython/Shell.py (IPShellWX.__init__): Improvements to the WX
2447 threaded shell, by John Hunter. It's not quite ready yet, but
2454 threaded shell, by John Hunter. It's not quite ready yet, but
2448 close.
2455 close.
2449
2456
2450 2004-08-22 Fernando Perez <fperez@colorado.edu>
2457 2004-08-22 Fernando Perez <fperez@colorado.edu>
2451
2458
2452 * IPython/iplib.py (InteractiveShell.interact): tab cleanups, also
2459 * IPython/iplib.py (InteractiveShell.interact): tab cleanups, also
2453 in Magic and ultraTB.
2460 in Magic and ultraTB.
2454
2461
2455 * ipython.1: document threading options in manpage.
2462 * ipython.1: document threading options in manpage.
2456
2463
2457 * scripts/ipython: Changed name of -thread option to -gthread,
2464 * scripts/ipython: Changed name of -thread option to -gthread,
2458 since this is GTK specific. I want to leave the door open for a
2465 since this is GTK specific. I want to leave the door open for a
2459 -wthread option for WX, which will most likely be necessary. This
2466 -wthread option for WX, which will most likely be necessary. This
2460 change affects usage and ipmaker as well.
2467 change affects usage and ipmaker as well.
2461
2468
2462 * IPython/Shell.py (matplotlib_shell): Add a factory function to
2469 * IPython/Shell.py (matplotlib_shell): Add a factory function to
2463 handle the matplotlib shell issues. Code by John Hunter
2470 handle the matplotlib shell issues. Code by John Hunter
2464 <jdhunter-AT-nitace.bsd.uchicago.edu>.
2471 <jdhunter-AT-nitace.bsd.uchicago.edu>.
2465 (IPShellMatplotlibWX.__init__): Rudimentary WX support. It's
2472 (IPShellMatplotlibWX.__init__): Rudimentary WX support. It's
2466 broken (and disabled for end users) for now, but it puts the
2473 broken (and disabled for end users) for now, but it puts the
2467 infrastructure in place.
2474 infrastructure in place.
2468
2475
2469 2004-08-21 Fernando Perez <fperez@colorado.edu>
2476 2004-08-21 Fernando Perez <fperez@colorado.edu>
2470
2477
2471 * ipythonrc-pylab: Add matplotlib support.
2478 * ipythonrc-pylab: Add matplotlib support.
2472
2479
2473 * matplotlib_config.py: new files for matplotlib support, part of
2480 * matplotlib_config.py: new files for matplotlib support, part of
2474 the pylab profile.
2481 the pylab profile.
2475
2482
2476 * IPython/usage.py (__doc__): documented the threading options.
2483 * IPython/usage.py (__doc__): documented the threading options.
2477
2484
2478 2004-08-20 Fernando Perez <fperez@colorado.edu>
2485 2004-08-20 Fernando Perez <fperez@colorado.edu>
2479
2486
2480 * ipython: Modified the main calling routine to handle the -thread
2487 * ipython: Modified the main calling routine to handle the -thread
2481 and -mpthread options. This needs to be done as a top-level hack,
2488 and -mpthread options. This needs to be done as a top-level hack,
2482 because it determines which class to instantiate for IPython
2489 because it determines which class to instantiate for IPython
2483 itself.
2490 itself.
2484
2491
2485 * IPython/Shell.py (MTInteractiveShell.__init__): New set of
2492 * IPython/Shell.py (MTInteractiveShell.__init__): New set of
2486 classes to support multithreaded GTK operation without blocking,
2493 classes to support multithreaded GTK operation without blocking,
2487 and matplotlib with all backends. This is a lot of still very
2494 and matplotlib with all backends. This is a lot of still very
2488 experimental code, and threads are tricky. So it may still have a
2495 experimental code, and threads are tricky. So it may still have a
2489 few rough edges... This code owes a lot to
2496 few rough edges... This code owes a lot to
2490 http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/65109, by
2497 http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/65109, by
2491 Brian # McErlean and John Finlay, to Antoon Pardon for fixes, and
2498 Brian # McErlean and John Finlay, to Antoon Pardon for fixes, and
2492 to John Hunter for all the matplotlib work.
2499 to John Hunter for all the matplotlib work.
2493
2500
2494 * IPython/ipmaker.py (__call__): Added -thread and -mpthread
2501 * IPython/ipmaker.py (__call__): Added -thread and -mpthread
2495 options for gtk thread and matplotlib support.
2502 options for gtk thread and matplotlib support.
2496
2503
2497 2004-08-16 Fernando Perez <fperez@colorado.edu>
2504 2004-08-16 Fernando Perez <fperez@colorado.edu>
2498
2505
2499 * IPython/iplib.py (InteractiveShell.__init__): don't trigger
2506 * IPython/iplib.py (InteractiveShell.__init__): don't trigger
2500 autocall for things like p*q,p/q,p+q,p-q, when p is callable. Bug
2507 autocall for things like p*q,p/q,p+q,p-q, when p is callable. Bug
2501 reported by Stephen Walton <stephen.walton-AT-csun.edu>.
2508 reported by Stephen Walton <stephen.walton-AT-csun.edu>.
2502
2509
2503 2004-08-11 Fernando Perez <fperez@colorado.edu>
2510 2004-08-11 Fernando Perez <fperez@colorado.edu>
2504
2511
2505 * setup.py (isfile): Fix build so documentation gets updated for
2512 * setup.py (isfile): Fix build so documentation gets updated for
2506 rpms (it was only done for .tgz builds).
2513 rpms (it was only done for .tgz builds).
2507
2514
2508 2004-08-10 Fernando Perez <fperez@colorado.edu>
2515 2004-08-10 Fernando Perez <fperez@colorado.edu>
2509
2516
2510 * genutils.py (Term): Fix misspell of stdin stream (sin->cin).
2517 * genutils.py (Term): Fix misspell of stdin stream (sin->cin).
2511
2518
2512 * iplib.py : Silence syntax error exceptions in tab-completion.
2519 * iplib.py : Silence syntax error exceptions in tab-completion.
2513
2520
2514 2004-08-05 Fernando Perez <fperez@colorado.edu>
2521 2004-08-05 Fernando Perez <fperez@colorado.edu>
2515
2522
2516 * IPython/Prompts.py (Prompt2.set_colors): Fix incorrectly set
2523 * IPython/Prompts.py (Prompt2.set_colors): Fix incorrectly set
2517 'color off' mark for continuation prompts. This was causing long
2524 'color off' mark for continuation prompts. This was causing long
2518 continuation lines to mis-wrap.
2525 continuation lines to mis-wrap.
2519
2526
2520 2004-08-01 Fernando Perez <fperez@colorado.edu>
2527 2004-08-01 Fernando Perez <fperez@colorado.edu>
2521
2528
2522 * IPython/ipmaker.py (make_IPython): Allow the shell class used
2529 * IPython/ipmaker.py (make_IPython): Allow the shell class used
2523 for building ipython to be a parameter. All this is necessary
2530 for building ipython to be a parameter. All this is necessary
2524 right now to have a multithreaded version, but this insane
2531 right now to have a multithreaded version, but this insane
2525 non-design will be cleaned up soon. For now, it's a hack that
2532 non-design will be cleaned up soon. For now, it's a hack that
2526 works.
2533 works.
2527
2534
2528 * IPython/Shell.py (IPShell.__init__): Stop using mutable default
2535 * IPython/Shell.py (IPShell.__init__): Stop using mutable default
2529 args in various places. No bugs so far, but it's a dangerous
2536 args in various places. No bugs so far, but it's a dangerous
2530 practice.
2537 practice.
2531
2538
2532 2004-07-31 Fernando Perez <fperez@colorado.edu>
2539 2004-07-31 Fernando Perez <fperez@colorado.edu>
2533
2540
2534 * IPython/iplib.py (complete): ignore SyntaxError exceptions to
2541 * IPython/iplib.py (complete): ignore SyntaxError exceptions to
2535 fix completion of files with dots in their names under most
2542 fix completion of files with dots in their names under most
2536 profiles (pysh was OK because the completion order is different).
2543 profiles (pysh was OK because the completion order is different).
2537
2544
2538 2004-07-27 Fernando Perez <fperez@colorado.edu>
2545 2004-07-27 Fernando Perez <fperez@colorado.edu>
2539
2546
2540 * IPython/iplib.py (InteractiveShell.__init__): build dict of
2547 * IPython/iplib.py (InteractiveShell.__init__): build dict of
2541 keywords manually, b/c the one in keyword.py was removed in python
2548 keywords manually, b/c the one in keyword.py was removed in python
2542 2.4. Patch by Anakim Border <aborder-AT-users.sourceforge.net>.
2549 2.4. Patch by Anakim Border <aborder-AT-users.sourceforge.net>.
2543 This is NOT a bug under python 2.3 and earlier.
2550 This is NOT a bug under python 2.3 and earlier.
2544
2551
2545 2004-07-26 Fernando Perez <fperez@colorado.edu>
2552 2004-07-26 Fernando Perez <fperez@colorado.edu>
2546
2553
2547 * IPython/ultraTB.py (VerboseTB.text): Add another
2554 * IPython/ultraTB.py (VerboseTB.text): Add another
2548 linecache.checkcache() call to try to prevent inspect.py from
2555 linecache.checkcache() call to try to prevent inspect.py from
2549 crashing under python 2.3. I think this fixes
2556 crashing under python 2.3. I think this fixes
2550 http://www.scipy.net/roundup/ipython/issue17.
2557 http://www.scipy.net/roundup/ipython/issue17.
2551
2558
2552 2004-07-26 *** Released version 0.6.2
2559 2004-07-26 *** Released version 0.6.2
2553
2560
2554 2004-07-26 Fernando Perez <fperez@colorado.edu>
2561 2004-07-26 Fernando Perez <fperez@colorado.edu>
2555
2562
2556 * IPython/Magic.py (Magic.magic_cd): Fix bug where 'cd -N' would
2563 * IPython/Magic.py (Magic.magic_cd): Fix bug where 'cd -N' would
2557 fail for any number.
2564 fail for any number.
2558 (Magic.magic_bookmark): Fix bug where 'bookmark -l' would fail for
2565 (Magic.magic_bookmark): Fix bug where 'bookmark -l' would fail for
2559 empty bookmarks.
2566 empty bookmarks.
2560
2567
2561 2004-07-26 *** Released version 0.6.1
2568 2004-07-26 *** Released version 0.6.1
2562
2569
2563 2004-07-26 Fernando Perez <fperez@colorado.edu>
2570 2004-07-26 Fernando Perez <fperez@colorado.edu>
2564
2571
2565 * ipython_win_post_install.py (run): Added pysh shortcut for Windows.
2572 * ipython_win_post_install.py (run): Added pysh shortcut for Windows.
2566
2573
2567 * IPython/iplib.py (protect_filename): Applied Ville's patch for
2574 * IPython/iplib.py (protect_filename): Applied Ville's patch for
2568 escaping '()[]{}' in filenames.
2575 escaping '()[]{}' in filenames.
2569
2576
2570 * IPython/Magic.py (shlex_split): Fix handling of '*' and '?' for
2577 * IPython/Magic.py (shlex_split): Fix handling of '*' and '?' for
2571 Python 2.2 users who lack a proper shlex.split.
2578 Python 2.2 users who lack a proper shlex.split.
2572
2579
2573 2004-07-19 Fernando Perez <fperez@colorado.edu>
2580 2004-07-19 Fernando Perez <fperez@colorado.edu>
2574
2581
2575 * IPython/iplib.py (InteractiveShell.init_readline): Add support
2582 * IPython/iplib.py (InteractiveShell.init_readline): Add support
2576 for reading readline's init file. I follow the normal chain:
2583 for reading readline's init file. I follow the normal chain:
2577 $INPUTRC is honored, otherwise ~/.inputrc is used. Thanks to a
2584 $INPUTRC is honored, otherwise ~/.inputrc is used. Thanks to a
2578 report by Mike Heeter. This closes
2585 report by Mike Heeter. This closes
2579 http://www.scipy.net/roundup/ipython/issue16.
2586 http://www.scipy.net/roundup/ipython/issue16.
2580
2587
2581 2004-07-18 Fernando Perez <fperez@colorado.edu>
2588 2004-07-18 Fernando Perez <fperez@colorado.edu>
2582
2589
2583 * IPython/iplib.py (__init__): Add better handling of '\' under
2590 * IPython/iplib.py (__init__): Add better handling of '\' under
2584 Win32 for filenames. After a patch by Ville.
2591 Win32 for filenames. After a patch by Ville.
2585
2592
2586 2004-07-17 Fernando Perez <fperez@colorado.edu>
2593 2004-07-17 Fernando Perez <fperez@colorado.edu>
2587
2594
2588 * IPython/iplib.py (InteractiveShell._prefilter): fix bug where
2595 * IPython/iplib.py (InteractiveShell._prefilter): fix bug where
2589 autocalling would be triggered for 'foo is bar' if foo is
2596 autocalling would be triggered for 'foo is bar' if foo is
2590 callable. I also cleaned up the autocall detection code to use a
2597 callable. I also cleaned up the autocall detection code to use a
2591 regexp, which is faster. Bug reported by Alexander Schmolck.
2598 regexp, which is faster. Bug reported by Alexander Schmolck.
2592
2599
2593 * IPython/Magic.py (Magic.magic_pinfo): Fix bug where strings with
2600 * IPython/Magic.py (Magic.magic_pinfo): Fix bug where strings with
2594 '?' in them would confuse the help system. Reported by Alex
2601 '?' in them would confuse the help system. Reported by Alex
2595 Schmolck.
2602 Schmolck.
2596
2603
2597 2004-07-16 Fernando Perez <fperez@colorado.edu>
2604 2004-07-16 Fernando Perez <fperez@colorado.edu>
2598
2605
2599 * IPython/GnuplotInteractive.py (__all__): added plot2.
2606 * IPython/GnuplotInteractive.py (__all__): added plot2.
2600
2607
2601 * IPython/Gnuplot2.py (Gnuplot.plot2): added new function for
2608 * IPython/Gnuplot2.py (Gnuplot.plot2): added new function for
2602 plotting dictionaries, lists or tuples of 1d arrays.
2609 plotting dictionaries, lists or tuples of 1d arrays.
2603
2610
2604 * IPython/Magic.py (Magic.magic_hist): small clenaups and
2611 * IPython/Magic.py (Magic.magic_hist): small clenaups and
2605 optimizations.
2612 optimizations.
2606
2613
2607 * IPython/iplib.py:Remove old Changelog info for cleanup. This is
2614 * IPython/iplib.py:Remove old Changelog info for cleanup. This is
2608 the information which was there from Janko's original IPP code:
2615 the information which was there from Janko's original IPP code:
2609
2616
2610 03.05.99 20:53 porto.ifm.uni-kiel.de
2617 03.05.99 20:53 porto.ifm.uni-kiel.de
2611 --Started changelog.
2618 --Started changelog.
2612 --make clear do what it say it does
2619 --make clear do what it say it does
2613 --added pretty output of lines from inputcache
2620 --added pretty output of lines from inputcache
2614 --Made Logger a mixin class, simplifies handling of switches
2621 --Made Logger a mixin class, simplifies handling of switches
2615 --Added own completer class. .string<TAB> expands to last history
2622 --Added own completer class. .string<TAB> expands to last history
2616 line which starts with string. The new expansion is also present
2623 line which starts with string. The new expansion is also present
2617 with Ctrl-r from the readline library. But this shows, who this
2624 with Ctrl-r from the readline library. But this shows, who this
2618 can be done for other cases.
2625 can be done for other cases.
2619 --Added convention that all shell functions should accept a
2626 --Added convention that all shell functions should accept a
2620 parameter_string This opens the door for different behaviour for
2627 parameter_string This opens the door for different behaviour for
2621 each function. @cd is a good example of this.
2628 each function. @cd is a good example of this.
2622
2629
2623 04.05.99 12:12 porto.ifm.uni-kiel.de
2630 04.05.99 12:12 porto.ifm.uni-kiel.de
2624 --added logfile rotation
2631 --added logfile rotation
2625 --added new mainloop method which freezes first the namespace
2632 --added new mainloop method which freezes first the namespace
2626
2633
2627 07.05.99 21:24 porto.ifm.uni-kiel.de
2634 07.05.99 21:24 porto.ifm.uni-kiel.de
2628 --added the docreader classes. Now there is a help system.
2635 --added the docreader classes. Now there is a help system.
2629 -This is only a first try. Currently it's not easy to put new
2636 -This is only a first try. Currently it's not easy to put new
2630 stuff in the indices. But this is the way to go. Info would be
2637 stuff in the indices. But this is the way to go. Info would be
2631 better, but HTML is every where and not everybody has an info
2638 better, but HTML is every where and not everybody has an info
2632 system installed and it's not so easy to change html-docs to info.
2639 system installed and it's not so easy to change html-docs to info.
2633 --added global logfile option
2640 --added global logfile option
2634 --there is now a hook for object inspection method pinfo needs to
2641 --there is now a hook for object inspection method pinfo needs to
2635 be provided for this. Can be reached by two '??'.
2642 be provided for this. Can be reached by two '??'.
2636
2643
2637 08.05.99 20:51 porto.ifm.uni-kiel.de
2644 08.05.99 20:51 porto.ifm.uni-kiel.de
2638 --added a README
2645 --added a README
2639 --bug in rc file. Something has changed so functions in the rc
2646 --bug in rc file. Something has changed so functions in the rc
2640 file need to reference the shell and not self. Not clear if it's a
2647 file need to reference the shell and not self. Not clear if it's a
2641 bug or feature.
2648 bug or feature.
2642 --changed rc file for new behavior
2649 --changed rc file for new behavior
2643
2650
2644 2004-07-15 Fernando Perez <fperez@colorado.edu>
2651 2004-07-15 Fernando Perez <fperez@colorado.edu>
2645
2652
2646 * IPython/Logger.py (Logger.log): fixed recent bug where the input
2653 * IPython/Logger.py (Logger.log): fixed recent bug where the input
2647 cache was falling out of sync in bizarre manners when multi-line
2654 cache was falling out of sync in bizarre manners when multi-line
2648 input was present. Minor optimizations and cleanup.
2655 input was present. Minor optimizations and cleanup.
2649
2656
2650 (Logger): Remove old Changelog info for cleanup. This is the
2657 (Logger): Remove old Changelog info for cleanup. This is the
2651 information which was there from Janko's original code:
2658 information which was there from Janko's original code:
2652
2659
2653 Changes to Logger: - made the default log filename a parameter
2660 Changes to Logger: - made the default log filename a parameter
2654
2661
2655 - put a check for lines beginning with !@? in log(). Needed
2662 - put a check for lines beginning with !@? in log(). Needed
2656 (even if the handlers properly log their lines) for mid-session
2663 (even if the handlers properly log their lines) for mid-session
2657 logging activation to work properly. Without this, lines logged
2664 logging activation to work properly. Without this, lines logged
2658 in mid session, which get read from the cache, would end up
2665 in mid session, which get read from the cache, would end up
2659 'bare' (with !@? in the open) in the log. Now they are caught
2666 'bare' (with !@? in the open) in the log. Now they are caught
2660 and prepended with a #.
2667 and prepended with a #.
2661
2668
2662 * IPython/iplib.py (InteractiveShell.init_readline): added check
2669 * IPython/iplib.py (InteractiveShell.init_readline): added check
2663 in case MagicCompleter fails to be defined, so we don't crash.
2670 in case MagicCompleter fails to be defined, so we don't crash.
2664
2671
2665 2004-07-13 Fernando Perez <fperez@colorado.edu>
2672 2004-07-13 Fernando Perez <fperez@colorado.edu>
2666
2673
2667 * IPython/Gnuplot2.py (Gnuplot.hardcopy): add automatic generation
2674 * IPython/Gnuplot2.py (Gnuplot.hardcopy): add automatic generation
2668 of EPS if the requested filename ends in '.eps'.
2675 of EPS if the requested filename ends in '.eps'.
2669
2676
2670 2004-07-04 Fernando Perez <fperez@colorado.edu>
2677 2004-07-04 Fernando Perez <fperez@colorado.edu>
2671
2678
2672 * IPython/iplib.py (InteractiveShell.handle_shell_escape): Fix
2679 * IPython/iplib.py (InteractiveShell.handle_shell_escape): Fix
2673 escaping of quotes when calling the shell.
2680 escaping of quotes when calling the shell.
2674
2681
2675 2004-07-02 Fernando Perez <fperez@colorado.edu>
2682 2004-07-02 Fernando Perez <fperez@colorado.edu>
2676
2683
2677 * IPython/Prompts.py (CachedOutput.update): Fix problem with
2684 * IPython/Prompts.py (CachedOutput.update): Fix problem with
2678 gettext not working because we were clobbering '_'. Fixes
2685 gettext not working because we were clobbering '_'. Fixes
2679 http://www.scipy.net/roundup/ipython/issue6.
2686 http://www.scipy.net/roundup/ipython/issue6.
2680
2687
2681 2004-07-01 Fernando Perez <fperez@colorado.edu>
2688 2004-07-01 Fernando Perez <fperez@colorado.edu>
2682
2689
2683 * IPython/Magic.py (Magic.magic_cd): integrated bookmark handling
2690 * IPython/Magic.py (Magic.magic_cd): integrated bookmark handling
2684 into @cd. Patch by Ville.
2691 into @cd. Patch by Ville.
2685
2692
2686 * IPython/iplib.py (InteractiveShell.post_config_initialization):
2693 * IPython/iplib.py (InteractiveShell.post_config_initialization):
2687 new function to store things after ipmaker runs. Patch by Ville.
2694 new function to store things after ipmaker runs. Patch by Ville.
2688 Eventually this will go away once ipmaker is removed and the class
2695 Eventually this will go away once ipmaker is removed and the class
2689 gets cleaned up, but for now it's ok. Key functionality here is
2696 gets cleaned up, but for now it's ok. Key functionality here is
2690 the addition of the persistent storage mechanism, a dict for
2697 the addition of the persistent storage mechanism, a dict for
2691 keeping data across sessions (for now just bookmarks, but more can
2698 keeping data across sessions (for now just bookmarks, but more can
2692 be implemented later).
2699 be implemented later).
2693
2700
2694 * IPython/Magic.py (Magic.magic_bookmark): New bookmark system,
2701 * IPython/Magic.py (Magic.magic_bookmark): New bookmark system,
2695 persistent across sections. Patch by Ville, I modified it
2702 persistent across sections. Patch by Ville, I modified it
2696 soemwhat to allow bookmarking arbitrary dirs other than CWD. Also
2703 soemwhat to allow bookmarking arbitrary dirs other than CWD. Also
2697 added a '-l' option to list all bookmarks.
2704 added a '-l' option to list all bookmarks.
2698
2705
2699 * IPython/iplib.py (InteractiveShell.atexit_operations): new
2706 * IPython/iplib.py (InteractiveShell.atexit_operations): new
2700 center for cleanup. Registered with atexit.register(). I moved
2707 center for cleanup. Registered with atexit.register(). I moved
2701 here the old exit_cleanup(). After a patch by Ville.
2708 here the old exit_cleanup(). After a patch by Ville.
2702
2709
2703 * IPython/Magic.py (get_py_filename): added '~' to the accepted
2710 * IPython/Magic.py (get_py_filename): added '~' to the accepted
2704 characters in the hacked shlex_split for python 2.2.
2711 characters in the hacked shlex_split for python 2.2.
2705
2712
2706 * IPython/iplib.py (file_matches): more fixes to filenames with
2713 * IPython/iplib.py (file_matches): more fixes to filenames with
2707 whitespace in them. It's not perfect, but limitations in python's
2714 whitespace in them. It's not perfect, but limitations in python's
2708 readline make it impossible to go further.
2715 readline make it impossible to go further.
2709
2716
2710 2004-06-29 Fernando Perez <fperez@colorado.edu>
2717 2004-06-29 Fernando Perez <fperez@colorado.edu>
2711
2718
2712 * IPython/iplib.py (file_matches): escape whitespace correctly in
2719 * IPython/iplib.py (file_matches): escape whitespace correctly in
2713 filename completions. Bug reported by Ville.
2720 filename completions. Bug reported by Ville.
2714
2721
2715 2004-06-28 Fernando Perez <fperez@colorado.edu>
2722 2004-06-28 Fernando Perez <fperez@colorado.edu>
2716
2723
2717 * IPython/ipmaker.py (__call__): Added per-profile histories. Now
2724 * IPython/ipmaker.py (__call__): Added per-profile histories. Now
2718 the history file will be called 'history-PROFNAME' (or just
2725 the history file will be called 'history-PROFNAME' (or just
2719 'history' if no profile is loaded). I was getting annoyed at
2726 'history' if no profile is loaded). I was getting annoyed at
2720 getting my Numerical work history clobbered by pysh sessions.
2727 getting my Numerical work history clobbered by pysh sessions.
2721
2728
2722 * IPython/iplib.py (InteractiveShell.__init__): Internal
2729 * IPython/iplib.py (InteractiveShell.__init__): Internal
2723 getoutputerror() function so that we can honor the system_verbose
2730 getoutputerror() function so that we can honor the system_verbose
2724 flag for _all_ system calls. I also added escaping of #
2731 flag for _all_ system calls. I also added escaping of #
2725 characters here to avoid confusing Itpl.
2732 characters here to avoid confusing Itpl.
2726
2733
2727 * IPython/Magic.py (shlex_split): removed call to shell in
2734 * IPython/Magic.py (shlex_split): removed call to shell in
2728 parse_options and replaced it with shlex.split(). The annoying
2735 parse_options and replaced it with shlex.split(). The annoying
2729 part was that in Python 2.2, shlex.split() doesn't exist, so I had
2736 part was that in Python 2.2, shlex.split() doesn't exist, so I had
2730 to backport it from 2.3, with several frail hacks (the shlex
2737 to backport it from 2.3, with several frail hacks (the shlex
2731 module is rather limited in 2.2). Thanks to a suggestion by Ville
2738 module is rather limited in 2.2). Thanks to a suggestion by Ville
2732 Vainio <vivainio@kolumbus.fi>. For Python 2.3 there should be no
2739 Vainio <vivainio@kolumbus.fi>. For Python 2.3 there should be no
2733 problem.
2740 problem.
2734
2741
2735 (Magic.magic_system_verbose): new toggle to print the actual
2742 (Magic.magic_system_verbose): new toggle to print the actual
2736 system calls made by ipython. Mainly for debugging purposes.
2743 system calls made by ipython. Mainly for debugging purposes.
2737
2744
2738 * IPython/GnuplotRuntime.py (gnu_out): fix bug for cygwin, which
2745 * IPython/GnuplotRuntime.py (gnu_out): fix bug for cygwin, which
2739 doesn't support persistence. Reported (and fix suggested) by
2746 doesn't support persistence. Reported (and fix suggested) by
2740 Travis Caldwell <travis_caldwell2000@yahoo.com>.
2747 Travis Caldwell <travis_caldwell2000@yahoo.com>.
2741
2748
2742 2004-06-26 Fernando Perez <fperez@colorado.edu>
2749 2004-06-26 Fernando Perez <fperez@colorado.edu>
2743
2750
2744 * IPython/Logger.py (Logger.log): fix to handle correctly empty
2751 * IPython/Logger.py (Logger.log): fix to handle correctly empty
2745 continue prompts.
2752 continue prompts.
2746
2753
2747 * IPython/Extensions/InterpreterExec.py (pysh): moved the pysh()
2754 * IPython/Extensions/InterpreterExec.py (pysh): moved the pysh()
2748 function (basically a big docstring) and a few more things here to
2755 function (basically a big docstring) and a few more things here to
2749 speedup startup. pysh.py is now very lightweight. We want because
2756 speedup startup. pysh.py is now very lightweight. We want because
2750 it gets execfile'd, while InterpreterExec gets imported, so
2757 it gets execfile'd, while InterpreterExec gets imported, so
2751 byte-compilation saves time.
2758 byte-compilation saves time.
2752
2759
2753 2004-06-25 Fernando Perez <fperez@colorado.edu>
2760 2004-06-25 Fernando Perez <fperez@colorado.edu>
2754
2761
2755 * IPython/Magic.py (Magic.magic_cd): Fixed to restore usage of 'cd
2762 * IPython/Magic.py (Magic.magic_cd): Fixed to restore usage of 'cd
2756 -NUM', which was recently broken.
2763 -NUM', which was recently broken.
2757
2764
2758 * IPython/iplib.py (InteractiveShell.handle_shell_escape): allow !
2765 * IPython/iplib.py (InteractiveShell.handle_shell_escape): allow !
2759 in multi-line input (but not !!, which doesn't make sense there).
2766 in multi-line input (but not !!, which doesn't make sense there).
2760
2767
2761 * IPython/UserConfig/ipythonrc: made autoindent on by default.
2768 * IPython/UserConfig/ipythonrc: made autoindent on by default.
2762 It's just too useful, and people can turn it off in the less
2769 It's just too useful, and people can turn it off in the less
2763 common cases where it's a problem.
2770 common cases where it's a problem.
2764
2771
2765 2004-06-24 Fernando Perez <fperez@colorado.edu>
2772 2004-06-24 Fernando Perez <fperez@colorado.edu>
2766
2773
2767 * IPython/iplib.py (InteractiveShell._prefilter): big change -
2774 * IPython/iplib.py (InteractiveShell._prefilter): big change -
2768 special syntaxes (like alias calling) is now allied in multi-line
2775 special syntaxes (like alias calling) is now allied in multi-line
2769 input. This is still _very_ experimental, but it's necessary for
2776 input. This is still _very_ experimental, but it's necessary for
2770 efficient shell usage combining python looping syntax with system
2777 efficient shell usage combining python looping syntax with system
2771 calls. For now it's restricted to aliases, I don't think it
2778 calls. For now it's restricted to aliases, I don't think it
2772 really even makes sense to have this for magics.
2779 really even makes sense to have this for magics.
2773
2780
2774 2004-06-23 Fernando Perez <fperez@colorado.edu>
2781 2004-06-23 Fernando Perez <fperez@colorado.edu>
2775
2782
2776 * IPython/Extensions/InterpreterExec.py (prefilter_shell): Added
2783 * IPython/Extensions/InterpreterExec.py (prefilter_shell): Added
2777 $var=cmd <=> @sc var=cmd and $$var=cmd <=> @sc -l var=cmd.
2784 $var=cmd <=> @sc var=cmd and $$var=cmd <=> @sc -l var=cmd.
2778
2785
2779 * IPython/Magic.py (Magic.magic_rehashx): modified to handle
2786 * IPython/Magic.py (Magic.magic_rehashx): modified to handle
2780 extensions under Windows (after code sent by Gary Bishop). The
2787 extensions under Windows (after code sent by Gary Bishop). The
2781 extensions considered 'executable' are stored in IPython's rc
2788 extensions considered 'executable' are stored in IPython's rc
2782 structure as win_exec_ext.
2789 structure as win_exec_ext.
2783
2790
2784 * IPython/genutils.py (shell): new function, like system() but
2791 * IPython/genutils.py (shell): new function, like system() but
2785 without return value. Very useful for interactive shell work.
2792 without return value. Very useful for interactive shell work.
2786
2793
2787 * IPython/Magic.py (Magic.magic_unalias): New @unalias function to
2794 * IPython/Magic.py (Magic.magic_unalias): New @unalias function to
2788 delete aliases.
2795 delete aliases.
2789
2796
2790 * IPython/iplib.py (InteractiveShell.alias_table_update): make
2797 * IPython/iplib.py (InteractiveShell.alias_table_update): make
2791 sure that the alias table doesn't contain python keywords.
2798 sure that the alias table doesn't contain python keywords.
2792
2799
2793 2004-06-21 Fernando Perez <fperez@colorado.edu>
2800 2004-06-21 Fernando Perez <fperez@colorado.edu>
2794
2801
2795 * IPython/Magic.py (Magic.magic_rehash): Fix crash when
2802 * IPython/Magic.py (Magic.magic_rehash): Fix crash when
2796 non-existent items are found in $PATH. Reported by Thorsten.
2803 non-existent items are found in $PATH. Reported by Thorsten.
2797
2804
2798 2004-06-20 Fernando Perez <fperez@colorado.edu>
2805 2004-06-20 Fernando Perez <fperez@colorado.edu>
2799
2806
2800 * IPython/iplib.py (complete): modified the completer so that the
2807 * IPython/iplib.py (complete): modified the completer so that the
2801 order of priorities can be easily changed at runtime.
2808 order of priorities can be easily changed at runtime.
2802
2809
2803 * IPython/Extensions/InterpreterExec.py (prefilter_shell):
2810 * IPython/Extensions/InterpreterExec.py (prefilter_shell):
2804 Modified to auto-execute all lines beginning with '~', '/' or '.'.
2811 Modified to auto-execute all lines beginning with '~', '/' or '.'.
2805
2812
2806 * IPython/Magic.py (Magic.magic_sx): modified @sc and @sx to
2813 * IPython/Magic.py (Magic.magic_sx): modified @sc and @sx to
2807 expand Python variables prepended with $ in all system calls. The
2814 expand Python variables prepended with $ in all system calls. The
2808 same was done to InteractiveShell.handle_shell_escape. Now all
2815 same was done to InteractiveShell.handle_shell_escape. Now all
2809 system access mechanisms (!, !!, @sc, @sx and aliases) allow the
2816 system access mechanisms (!, !!, @sc, @sx and aliases) allow the
2810 expansion of python variables and expressions according to the
2817 expansion of python variables and expressions according to the
2811 syntax of PEP-215 - http://www.python.org/peps/pep-0215.html.
2818 syntax of PEP-215 - http://www.python.org/peps/pep-0215.html.
2812
2819
2813 Though PEP-215 has been rejected, a similar (but simpler) one
2820 Though PEP-215 has been rejected, a similar (but simpler) one
2814 seems like it will go into Python 2.4, PEP-292 -
2821 seems like it will go into Python 2.4, PEP-292 -
2815 http://www.python.org/peps/pep-0292.html.
2822 http://www.python.org/peps/pep-0292.html.
2816
2823
2817 I'll keep the full syntax of PEP-215, since IPython has since the
2824 I'll keep the full syntax of PEP-215, since IPython has since the
2818 start used Ka-Ping Yee's reference implementation discussed there
2825 start used Ka-Ping Yee's reference implementation discussed there
2819 (Itpl), and I actually like the powerful semantics it offers.
2826 (Itpl), and I actually like the powerful semantics it offers.
2820
2827
2821 In order to access normal shell variables, the $ has to be escaped
2828 In order to access normal shell variables, the $ has to be escaped
2822 via an extra $. For example:
2829 via an extra $. For example:
2823
2830
2824 In [7]: PATH='a python variable'
2831 In [7]: PATH='a python variable'
2825
2832
2826 In [8]: !echo $PATH
2833 In [8]: !echo $PATH
2827 a python variable
2834 a python variable
2828
2835
2829 In [9]: !echo $$PATH
2836 In [9]: !echo $$PATH
2830 /usr/local/lf9560/bin:/usr/local/intel/compiler70/ia32/bin:...
2837 /usr/local/lf9560/bin:/usr/local/intel/compiler70/ia32/bin:...
2831
2838
2832 (Magic.parse_options): escape $ so the shell doesn't evaluate
2839 (Magic.parse_options): escape $ so the shell doesn't evaluate
2833 things prematurely.
2840 things prematurely.
2834
2841
2835 * IPython/iplib.py (InteractiveShell.call_alias): added the
2842 * IPython/iplib.py (InteractiveShell.call_alias): added the
2836 ability for aliases to expand python variables via $.
2843 ability for aliases to expand python variables via $.
2837
2844
2838 * IPython/Magic.py (Magic.magic_rehash): based on the new alias
2845 * IPython/Magic.py (Magic.magic_rehash): based on the new alias
2839 system, now there's a @rehash/@rehashx pair of magics. These work
2846 system, now there's a @rehash/@rehashx pair of magics. These work
2840 like the csh rehash command, and can be invoked at any time. They
2847 like the csh rehash command, and can be invoked at any time. They
2841 build a table of aliases to everything in the user's $PATH
2848 build a table of aliases to everything in the user's $PATH
2842 (@rehash uses everything, @rehashx is slower but only adds
2849 (@rehash uses everything, @rehashx is slower but only adds
2843 executable files). With this, the pysh.py-based shell profile can
2850 executable files). With this, the pysh.py-based shell profile can
2844 now simply call rehash upon startup, and full access to all
2851 now simply call rehash upon startup, and full access to all
2845 programs in the user's path is obtained.
2852 programs in the user's path is obtained.
2846
2853
2847 * IPython/iplib.py (InteractiveShell.call_alias): The new alias
2854 * IPython/iplib.py (InteractiveShell.call_alias): The new alias
2848 functionality is now fully in place. I removed the old dynamic
2855 functionality is now fully in place. I removed the old dynamic
2849 code generation based approach, in favor of a much lighter one
2856 code generation based approach, in favor of a much lighter one
2850 based on a simple dict. The advantage is that this allows me to
2857 based on a simple dict. The advantage is that this allows me to
2851 now have thousands of aliases with negligible cost (unthinkable
2858 now have thousands of aliases with negligible cost (unthinkable
2852 with the old system).
2859 with the old system).
2853
2860
2854 2004-06-19 Fernando Perez <fperez@colorado.edu>
2861 2004-06-19 Fernando Perez <fperez@colorado.edu>
2855
2862
2856 * IPython/iplib.py (__init__): extended MagicCompleter class to
2863 * IPython/iplib.py (__init__): extended MagicCompleter class to
2857 also complete (last in priority) on user aliases.
2864 also complete (last in priority) on user aliases.
2858
2865
2859 * IPython/Itpl.py (Itpl.__str__): fixed order of globals/locals in
2866 * IPython/Itpl.py (Itpl.__str__): fixed order of globals/locals in
2860 call to eval.
2867 call to eval.
2861 (ItplNS.__init__): Added a new class which functions like Itpl,
2868 (ItplNS.__init__): Added a new class which functions like Itpl,
2862 but allows configuring the namespace for the evaluation to occur
2869 but allows configuring the namespace for the evaluation to occur
2863 in.
2870 in.
2864
2871
2865 2004-06-18 Fernando Perez <fperez@colorado.edu>
2872 2004-06-18 Fernando Perez <fperez@colorado.edu>
2866
2873
2867 * IPython/iplib.py (InteractiveShell.runcode): modify to print a
2874 * IPython/iplib.py (InteractiveShell.runcode): modify to print a
2868 better message when 'exit' or 'quit' are typed (a common newbie
2875 better message when 'exit' or 'quit' are typed (a common newbie
2869 confusion).
2876 confusion).
2870
2877
2871 * IPython/Magic.py (Magic.magic_colors): Added the runtime color
2878 * IPython/Magic.py (Magic.magic_colors): Added the runtime color
2872 check for Windows users.
2879 check for Windows users.
2873
2880
2874 * IPython/iplib.py (InteractiveShell.user_setup): removed
2881 * IPython/iplib.py (InteractiveShell.user_setup): removed
2875 disabling of colors for Windows. I'll test at runtime and issue a
2882 disabling of colors for Windows. I'll test at runtime and issue a
2876 warning if Gary's readline isn't found, as to nudge users to
2883 warning if Gary's readline isn't found, as to nudge users to
2877 download it.
2884 download it.
2878
2885
2879 2004-06-16 Fernando Perez <fperez@colorado.edu>
2886 2004-06-16 Fernando Perez <fperez@colorado.edu>
2880
2887
2881 * IPython/genutils.py (Stream.__init__): changed to print errors
2888 * IPython/genutils.py (Stream.__init__): changed to print errors
2882 to sys.stderr. I had a circular dependency here. Now it's
2889 to sys.stderr. I had a circular dependency here. Now it's
2883 possible to run ipython as IDLE's shell (consider this pre-alpha,
2890 possible to run ipython as IDLE's shell (consider this pre-alpha,
2884 since true stdout things end up in the starting terminal instead
2891 since true stdout things end up in the starting terminal instead
2885 of IDLE's out).
2892 of IDLE's out).
2886
2893
2887 * IPython/Prompts.py (Prompt2.set_colors): prevent crashes for
2894 * IPython/Prompts.py (Prompt2.set_colors): prevent crashes for
2888 users who haven't # updated their prompt_in2 definitions. Remove
2895 users who haven't # updated their prompt_in2 definitions. Remove
2889 eventually.
2896 eventually.
2890 (multiple_replace): added credit to original ASPN recipe.
2897 (multiple_replace): added credit to original ASPN recipe.
2891
2898
2892 2004-06-15 Fernando Perez <fperez@colorado.edu>
2899 2004-06-15 Fernando Perez <fperez@colorado.edu>
2893
2900
2894 * IPython/iplib.py (InteractiveShell.__init__): add 'cp' to the
2901 * IPython/iplib.py (InteractiveShell.__init__): add 'cp' to the
2895 list of auto-defined aliases.
2902 list of auto-defined aliases.
2896
2903
2897 2004-06-13 Fernando Perez <fperez@colorado.edu>
2904 2004-06-13 Fernando Perez <fperez@colorado.edu>
2898
2905
2899 * setup.py (scriptfiles): Don't trigger win_post_install unless an
2906 * setup.py (scriptfiles): Don't trigger win_post_install unless an
2900 install was really requested (so setup.py can be used for other
2907 install was really requested (so setup.py can be used for other
2901 things under Windows).
2908 things under Windows).
2902
2909
2903 2004-06-10 Fernando Perez <fperez@colorado.edu>
2910 2004-06-10 Fernando Perez <fperez@colorado.edu>
2904
2911
2905 * IPython/Logger.py (Logger.create_log): Manually remove any old
2912 * IPython/Logger.py (Logger.create_log): Manually remove any old
2906 backup, since os.remove may fail under Windows. Fixes bug
2913 backup, since os.remove may fail under Windows. Fixes bug
2907 reported by Thorsten.
2914 reported by Thorsten.
2908
2915
2909 2004-06-09 Fernando Perez <fperez@colorado.edu>
2916 2004-06-09 Fernando Perez <fperez@colorado.edu>
2910
2917
2911 * examples/example-embed.py: fixed all references to %n (replaced
2918 * examples/example-embed.py: fixed all references to %n (replaced
2912 with \\# for ps1/out prompts and with \\D for ps2 prompts). Done
2919 with \\# for ps1/out prompts and with \\D for ps2 prompts). Done
2913 for all examples and the manual as well.
2920 for all examples and the manual as well.
2914
2921
2915 2004-06-08 Fernando Perez <fperez@colorado.edu>
2922 2004-06-08 Fernando Perez <fperez@colorado.edu>
2916
2923
2917 * IPython/Prompts.py (Prompt2.set_p_str): fixed all prompt
2924 * IPython/Prompts.py (Prompt2.set_p_str): fixed all prompt
2918 alignment and color management. All 3 prompt subsystems now
2925 alignment and color management. All 3 prompt subsystems now
2919 inherit from BasePrompt.
2926 inherit from BasePrompt.
2920
2927
2921 * tools/release: updates for windows installer build and tag rpms
2928 * tools/release: updates for windows installer build and tag rpms
2922 with python version (since paths are fixed).
2929 with python version (since paths are fixed).
2923
2930
2924 * IPython/UserConfig/ipythonrc: modified to use \# instead of %n,
2931 * IPython/UserConfig/ipythonrc: modified to use \# instead of %n,
2925 which will become eventually obsolete. Also fixed the default
2932 which will become eventually obsolete. Also fixed the default
2926 prompt_in2 to use \D, so at least new users start with the correct
2933 prompt_in2 to use \D, so at least new users start with the correct
2927 defaults.
2934 defaults.
2928 WARNING: Users with existing ipythonrc files will need to apply
2935 WARNING: Users with existing ipythonrc files will need to apply
2929 this fix manually!
2936 this fix manually!
2930
2937
2931 * setup.py: make windows installer (.exe). This is finally the
2938 * setup.py: make windows installer (.exe). This is finally the
2932 integration of an old patch by Cory Dodt <dodt-AT-fcoe.k12.ca.us>,
2939 integration of an old patch by Cory Dodt <dodt-AT-fcoe.k12.ca.us>,
2933 which I hadn't included because it required Python 2.3 (or recent
2940 which I hadn't included because it required Python 2.3 (or recent
2934 distutils).
2941 distutils).
2935
2942
2936 * IPython/usage.py (__doc__): update docs (and manpage) to reflect
2943 * IPython/usage.py (__doc__): update docs (and manpage) to reflect
2937 usage of new '\D' escape.
2944 usage of new '\D' escape.
2938
2945
2939 * IPython/Prompts.py (ROOT_SYMBOL): Small fix for Windows (which
2946 * IPython/Prompts.py (ROOT_SYMBOL): Small fix for Windows (which
2940 lacks os.getuid())
2947 lacks os.getuid())
2941 (CachedOutput.set_colors): Added the ability to turn coloring
2948 (CachedOutput.set_colors): Added the ability to turn coloring
2942 on/off with @colors even for manually defined prompt colors. It
2949 on/off with @colors even for manually defined prompt colors. It
2943 uses a nasty global, but it works safely and via the generic color
2950 uses a nasty global, but it works safely and via the generic color
2944 handling mechanism.
2951 handling mechanism.
2945 (Prompt2.__init__): Introduced new escape '\D' for continuation
2952 (Prompt2.__init__): Introduced new escape '\D' for continuation
2946 prompts. It represents the counter ('\#') as dots.
2953 prompts. It represents the counter ('\#') as dots.
2947 *** NOTE *** THIS IS A BACKWARDS-INCOMPATIBLE CHANGE. Users will
2954 *** NOTE *** THIS IS A BACKWARDS-INCOMPATIBLE CHANGE. Users will
2948 need to update their ipythonrc files and replace '%n' with '\D' in
2955 need to update their ipythonrc files and replace '%n' with '\D' in
2949 their prompt_in2 settings everywhere. Sorry, but there's
2956 their prompt_in2 settings everywhere. Sorry, but there's
2950 otherwise no clean way to get all prompts to properly align. The
2957 otherwise no clean way to get all prompts to properly align. The
2951 ipythonrc shipped with IPython has been updated.
2958 ipythonrc shipped with IPython has been updated.
2952
2959
2953 2004-06-07 Fernando Perez <fperez@colorado.edu>
2960 2004-06-07 Fernando Perez <fperez@colorado.edu>
2954
2961
2955 * setup.py (isfile): Pass local_icons option to latex2html, so the
2962 * setup.py (isfile): Pass local_icons option to latex2html, so the
2956 resulting HTML file is self-contained. Thanks to
2963 resulting HTML file is self-contained. Thanks to
2957 dryice-AT-liu.com.cn for the tip.
2964 dryice-AT-liu.com.cn for the tip.
2958
2965
2959 * pysh.py: I created a new profile 'shell', which implements a
2966 * pysh.py: I created a new profile 'shell', which implements a
2960 _rudimentary_ IPython-based shell. This is in NO WAY a realy
2967 _rudimentary_ IPython-based shell. This is in NO WAY a realy
2961 system shell, nor will it become one anytime soon. It's mainly
2968 system shell, nor will it become one anytime soon. It's mainly
2962 meant to illustrate the use of the new flexible bash-like prompts.
2969 meant to illustrate the use of the new flexible bash-like prompts.
2963 I guess it could be used by hardy souls for true shell management,
2970 I guess it could be used by hardy souls for true shell management,
2964 but it's no tcsh/bash... pysh.py is loaded by the 'shell'
2971 but it's no tcsh/bash... pysh.py is loaded by the 'shell'
2965 profile. This uses the InterpreterExec extension provided by
2972 profile. This uses the InterpreterExec extension provided by
2966 W.J. van der Laan <gnufnork-AT-hetdigitalegat.nl>
2973 W.J. van der Laan <gnufnork-AT-hetdigitalegat.nl>
2967
2974
2968 * IPython/Prompts.py (PromptOut.__str__): now it will correctly
2975 * IPython/Prompts.py (PromptOut.__str__): now it will correctly
2969 auto-align itself with the length of the previous input prompt
2976 auto-align itself with the length of the previous input prompt
2970 (taking into account the invisible color escapes).
2977 (taking into account the invisible color escapes).
2971 (CachedOutput.__init__): Large restructuring of this class. Now
2978 (CachedOutput.__init__): Large restructuring of this class. Now
2972 all three prompts (primary1, primary2, output) are proper objects,
2979 all three prompts (primary1, primary2, output) are proper objects,
2973 managed by the 'parent' CachedOutput class. The code is still a
2980 managed by the 'parent' CachedOutput class. The code is still a
2974 bit hackish (all prompts share state via a pointer to the cache),
2981 bit hackish (all prompts share state via a pointer to the cache),
2975 but it's overall far cleaner than before.
2982 but it's overall far cleaner than before.
2976
2983
2977 * IPython/genutils.py (getoutputerror): modified to add verbose,
2984 * IPython/genutils.py (getoutputerror): modified to add verbose,
2978 debug and header options. This makes the interface of all getout*
2985 debug and header options. This makes the interface of all getout*
2979 functions uniform.
2986 functions uniform.
2980 (SystemExec.getoutputerror): added getoutputerror to SystemExec.
2987 (SystemExec.getoutputerror): added getoutputerror to SystemExec.
2981
2988
2982 * IPython/Magic.py (Magic.default_option): added a function to
2989 * IPython/Magic.py (Magic.default_option): added a function to
2983 allow registering default options for any magic command. This
2990 allow registering default options for any magic command. This
2984 makes it easy to have profiles which customize the magics globally
2991 makes it easy to have profiles which customize the magics globally
2985 for a certain use. The values set through this function are
2992 for a certain use. The values set through this function are
2986 picked up by the parse_options() method, which all magics should
2993 picked up by the parse_options() method, which all magics should
2987 use to parse their options.
2994 use to parse their options.
2988
2995
2989 * IPython/genutils.py (warn): modified the warnings framework to
2996 * IPython/genutils.py (warn): modified the warnings framework to
2990 use the Term I/O class. I'm trying to slowly unify all of
2997 use the Term I/O class. I'm trying to slowly unify all of
2991 IPython's I/O operations to pass through Term.
2998 IPython's I/O operations to pass through Term.
2992
2999
2993 * IPython/Prompts.py (Prompt2._str_other): Added functionality in
3000 * IPython/Prompts.py (Prompt2._str_other): Added functionality in
2994 the secondary prompt to correctly match the length of the primary
3001 the secondary prompt to correctly match the length of the primary
2995 one for any prompt. Now multi-line code will properly line up
3002 one for any prompt. Now multi-line code will properly line up
2996 even for path dependent prompts, such as the new ones available
3003 even for path dependent prompts, such as the new ones available
2997 via the prompt_specials.
3004 via the prompt_specials.
2998
3005
2999 2004-06-06 Fernando Perez <fperez@colorado.edu>
3006 2004-06-06 Fernando Perez <fperez@colorado.edu>
3000
3007
3001 * IPython/Prompts.py (prompt_specials): Added the ability to have
3008 * IPython/Prompts.py (prompt_specials): Added the ability to have
3002 bash-like special sequences in the prompts, which get
3009 bash-like special sequences in the prompts, which get
3003 automatically expanded. Things like hostname, current working
3010 automatically expanded. Things like hostname, current working
3004 directory and username are implemented already, but it's easy to
3011 directory and username are implemented already, but it's easy to
3005 add more in the future. Thanks to a patch by W.J. van der Laan
3012 add more in the future. Thanks to a patch by W.J. van der Laan
3006 <gnufnork-AT-hetdigitalegat.nl>
3013 <gnufnork-AT-hetdigitalegat.nl>
3007 (prompt_specials): Added color support for prompt strings, so
3014 (prompt_specials): Added color support for prompt strings, so
3008 users can define arbitrary color setups for their prompts.
3015 users can define arbitrary color setups for their prompts.
3009
3016
3010 2004-06-05 Fernando Perez <fperez@colorado.edu>
3017 2004-06-05 Fernando Perez <fperez@colorado.edu>
3011
3018
3012 * IPython/genutils.py (Term.reopen_all): Added Windows-specific
3019 * IPython/genutils.py (Term.reopen_all): Added Windows-specific
3013 code to load Gary Bishop's readline and configure it
3020 code to load Gary Bishop's readline and configure it
3014 automatically. Thanks to Gary for help on this.
3021 automatically. Thanks to Gary for help on this.
3015
3022
3016 2004-06-01 Fernando Perez <fperez@colorado.edu>
3023 2004-06-01 Fernando Perez <fperez@colorado.edu>
3017
3024
3018 * IPython/Logger.py (Logger.create_log): fix bug for logging
3025 * IPython/Logger.py (Logger.create_log): fix bug for logging
3019 with no filename (previous fix was incomplete).
3026 with no filename (previous fix was incomplete).
3020
3027
3021 2004-05-25 Fernando Perez <fperez@colorado.edu>
3028 2004-05-25 Fernando Perez <fperez@colorado.edu>
3022
3029
3023 * IPython/Magic.py (Magic.parse_options): fix bug where naked
3030 * IPython/Magic.py (Magic.parse_options): fix bug where naked
3024 parens would get passed to the shell.
3031 parens would get passed to the shell.
3025
3032
3026 2004-05-20 Fernando Perez <fperez@colorado.edu>
3033 2004-05-20 Fernando Perez <fperez@colorado.edu>
3027
3034
3028 * IPython/Magic.py (Magic.magic_prun): changed default profile
3035 * IPython/Magic.py (Magic.magic_prun): changed default profile
3029 sort order to 'time' (the more common profiling need).
3036 sort order to 'time' (the more common profiling need).
3030
3037
3031 * IPython/OInspect.py (Inspector.pinfo): flush the inspect cache
3038 * IPython/OInspect.py (Inspector.pinfo): flush the inspect cache
3032 so that source code shown is guaranteed in sync with the file on
3039 so that source code shown is guaranteed in sync with the file on
3033 disk (also changed in psource). Similar fix to the one for
3040 disk (also changed in psource). Similar fix to the one for
3034 ultraTB on 2004-05-06. Thanks to a bug report by Yann Le Du
3041 ultraTB on 2004-05-06. Thanks to a bug report by Yann Le Du
3035 <yann.ledu-AT-noos.fr>.
3042 <yann.ledu-AT-noos.fr>.
3036
3043
3037 * IPython/Magic.py (Magic.parse_options): Fixed bug where commands
3044 * IPython/Magic.py (Magic.parse_options): Fixed bug where commands
3038 with a single option would not be correctly parsed. Closes
3045 with a single option would not be correctly parsed. Closes
3039 http://www.scipy.net/roundup/ipython/issue14. This bug had been
3046 http://www.scipy.net/roundup/ipython/issue14. This bug had been
3040 introduced in 0.6.0 (on 2004-05-06).
3047 introduced in 0.6.0 (on 2004-05-06).
3041
3048
3042 2004-05-13 *** Released version 0.6.0
3049 2004-05-13 *** Released version 0.6.0
3043
3050
3044 2004-05-13 Fernando Perez <fperez@colorado.edu>
3051 2004-05-13 Fernando Perez <fperez@colorado.edu>
3045
3052
3046 * debian/: Added debian/ directory to CVS, so that debian support
3053 * debian/: Added debian/ directory to CVS, so that debian support
3047 is publicly accessible. The debian package is maintained by Jack
3054 is publicly accessible. The debian package is maintained by Jack
3048 Moffit <jack-AT-xiph.org>.
3055 Moffit <jack-AT-xiph.org>.
3049
3056
3050 * Documentation: included the notes about an ipython-based system
3057 * Documentation: included the notes about an ipython-based system
3051 shell (the hypothetical 'pysh') into the new_design.pdf document,
3058 shell (the hypothetical 'pysh') into the new_design.pdf document,
3052 so that these ideas get distributed to users along with the
3059 so that these ideas get distributed to users along with the
3053 official documentation.
3060 official documentation.
3054
3061
3055 2004-05-10 Fernando Perez <fperez@colorado.edu>
3062 2004-05-10 Fernando Perez <fperez@colorado.edu>
3056
3063
3057 * IPython/Logger.py (Logger.create_log): fix recently introduced
3064 * IPython/Logger.py (Logger.create_log): fix recently introduced
3058 bug (misindented line) where logstart would fail when not given an
3065 bug (misindented line) where logstart would fail when not given an
3059 explicit filename.
3066 explicit filename.
3060
3067
3061 2004-05-09 Fernando Perez <fperez@colorado.edu>
3068 2004-05-09 Fernando Perez <fperez@colorado.edu>
3062
3069
3063 * IPython/Magic.py (Magic.parse_options): skip system call when
3070 * IPython/Magic.py (Magic.parse_options): skip system call when
3064 there are no options to look for. Faster, cleaner for the common
3071 there are no options to look for. Faster, cleaner for the common
3065 case.
3072 case.
3066
3073
3067 * Documentation: many updates to the manual: describing Windows
3074 * Documentation: many updates to the manual: describing Windows
3068 support better, Gnuplot updates, credits, misc small stuff. Also
3075 support better, Gnuplot updates, credits, misc small stuff. Also
3069 updated the new_design doc a bit.
3076 updated the new_design doc a bit.
3070
3077
3071 2004-05-06 *** Released version 0.6.0.rc1
3078 2004-05-06 *** Released version 0.6.0.rc1
3072
3079
3073 2004-05-06 Fernando Perez <fperez@colorado.edu>
3080 2004-05-06 Fernando Perez <fperez@colorado.edu>
3074
3081
3075 * IPython/ultraTB.py (ListTB.text): modified a ton of string +=
3082 * IPython/ultraTB.py (ListTB.text): modified a ton of string +=
3076 operations to use the vastly more efficient list/''.join() method.
3083 operations to use the vastly more efficient list/''.join() method.
3077 (FormattedTB.text): Fix
3084 (FormattedTB.text): Fix
3078 http://www.scipy.net/roundup/ipython/issue12 - exception source
3085 http://www.scipy.net/roundup/ipython/issue12 - exception source
3079 extract not updated after reload. Thanks to Mike Salib
3086 extract not updated after reload. Thanks to Mike Salib
3080 <msalib-AT-mit.edu> for pinning the source of the problem.
3087 <msalib-AT-mit.edu> for pinning the source of the problem.
3081 Fortunately, the solution works inside ipython and doesn't require
3088 Fortunately, the solution works inside ipython and doesn't require
3082 any changes to python proper.
3089 any changes to python proper.
3083
3090
3084 * IPython/Magic.py (Magic.parse_options): Improved to process the
3091 * IPython/Magic.py (Magic.parse_options): Improved to process the
3085 argument list as a true shell would (by actually using the
3092 argument list as a true shell would (by actually using the
3086 underlying system shell). This way, all @magics automatically get
3093 underlying system shell). This way, all @magics automatically get
3087 shell expansion for variables. Thanks to a comment by Alex
3094 shell expansion for variables. Thanks to a comment by Alex
3088 Schmolck.
3095 Schmolck.
3089
3096
3090 2004-04-04 Fernando Perez <fperez@colorado.edu>
3097 2004-04-04 Fernando Perez <fperez@colorado.edu>
3091
3098
3092 * IPython/iplib.py (InteractiveShell.interact): Added a special
3099 * IPython/iplib.py (InteractiveShell.interact): Added a special
3093 trap for a debugger quit exception, which is basically impossible
3100 trap for a debugger quit exception, which is basically impossible
3094 to handle by normal mechanisms, given what pdb does to the stack.
3101 to handle by normal mechanisms, given what pdb does to the stack.
3095 This fixes a crash reported by <fgibbons-AT-llama.med.harvard.edu>.
3102 This fixes a crash reported by <fgibbons-AT-llama.med.harvard.edu>.
3096
3103
3097 2004-04-03 Fernando Perez <fperez@colorado.edu>
3104 2004-04-03 Fernando Perez <fperez@colorado.edu>
3098
3105
3099 * IPython/genutils.py (Term): Standardized the names of the Term
3106 * IPython/genutils.py (Term): Standardized the names of the Term
3100 class streams to cin/cout/cerr, following C++ naming conventions
3107 class streams to cin/cout/cerr, following C++ naming conventions
3101 (I can't use in/out/err because 'in' is not a valid attribute
3108 (I can't use in/out/err because 'in' is not a valid attribute
3102 name).
3109 name).
3103
3110
3104 * IPython/iplib.py (InteractiveShell.interact): don't increment
3111 * IPython/iplib.py (InteractiveShell.interact): don't increment
3105 the prompt if there's no user input. By Daniel 'Dang' Griffith
3112 the prompt if there's no user input. By Daniel 'Dang' Griffith
3106 <pythondev-dang-AT-lazytwinacres.net>, after a suggestion from
3113 <pythondev-dang-AT-lazytwinacres.net>, after a suggestion from
3107 Francois Pinard.
3114 Francois Pinard.
3108
3115
3109 2004-04-02 Fernando Perez <fperez@colorado.edu>
3116 2004-04-02 Fernando Perez <fperez@colorado.edu>
3110
3117
3111 * IPython/genutils.py (Stream.__init__): Modified to survive at
3118 * IPython/genutils.py (Stream.__init__): Modified to survive at
3112 least importing in contexts where stdin/out/err aren't true file
3119 least importing in contexts where stdin/out/err aren't true file
3113 objects, such as PyCrust (they lack fileno() and mode). However,
3120 objects, such as PyCrust (they lack fileno() and mode). However,
3114 the recovery facilities which rely on these things existing will
3121 the recovery facilities which rely on these things existing will
3115 not work.
3122 not work.
3116
3123
3117 2004-04-01 Fernando Perez <fperez@colorado.edu>
3124 2004-04-01 Fernando Perez <fperez@colorado.edu>
3118
3125
3119 * IPython/Magic.py (Magic.magic_sx): modified (as well as @sc) to
3126 * IPython/Magic.py (Magic.magic_sx): modified (as well as @sc) to
3120 use the new getoutputerror() function, so it properly
3127 use the new getoutputerror() function, so it properly
3121 distinguishes stdout/err.
3128 distinguishes stdout/err.
3122
3129
3123 * IPython/genutils.py (getoutputerror): added a function to
3130 * IPython/genutils.py (getoutputerror): added a function to
3124 capture separately the standard output and error of a command.
3131 capture separately the standard output and error of a command.
3125 After a comment from dang on the mailing lists. This code is
3132 After a comment from dang on the mailing lists. This code is
3126 basically a modified version of commands.getstatusoutput(), from
3133 basically a modified version of commands.getstatusoutput(), from
3127 the standard library.
3134 the standard library.
3128
3135
3129 * IPython/iplib.py (InteractiveShell.handle_shell_escape): added
3136 * IPython/iplib.py (InteractiveShell.handle_shell_escape): added
3130 '!!' as a special syntax (shorthand) to access @sx.
3137 '!!' as a special syntax (shorthand) to access @sx.
3131
3138
3132 * IPython/Magic.py (Magic.magic_sx): new magic, to execute a shell
3139 * IPython/Magic.py (Magic.magic_sx): new magic, to execute a shell
3133 command and return its output as a list split on '\n'.
3140 command and return its output as a list split on '\n'.
3134
3141
3135 2004-03-31 Fernando Perez <fperez@colorado.edu>
3142 2004-03-31 Fernando Perez <fperez@colorado.edu>
3136
3143
3137 * IPython/FakeModule.py (FakeModule.__init__): added __nonzero__
3144 * IPython/FakeModule.py (FakeModule.__init__): added __nonzero__
3138 method to dictionaries used as FakeModule instances if they lack
3145 method to dictionaries used as FakeModule instances if they lack
3139 it. At least pydoc in python2.3 breaks for runtime-defined
3146 it. At least pydoc in python2.3 breaks for runtime-defined
3140 functions without this hack. At some point I need to _really_
3147 functions without this hack. At some point I need to _really_
3141 understand what FakeModule is doing, because it's a gross hack.
3148 understand what FakeModule is doing, because it's a gross hack.
3142 But it solves Arnd's problem for now...
3149 But it solves Arnd's problem for now...
3143
3150
3144 2004-02-27 Fernando Perez <fperez@colorado.edu>
3151 2004-02-27 Fernando Perez <fperez@colorado.edu>
3145
3152
3146 * IPython/Logger.py (Logger.create_log): Fix bug where 'rotate'
3153 * IPython/Logger.py (Logger.create_log): Fix bug where 'rotate'
3147 mode would behave erratically. Also increased the number of
3154 mode would behave erratically. Also increased the number of
3148 possible logs in rotate mod to 999. Thanks to Rod Holland
3155 possible logs in rotate mod to 999. Thanks to Rod Holland
3149 <rhh@StructureLABS.com> for the report and fixes.
3156 <rhh@StructureLABS.com> for the report and fixes.
3150
3157
3151 2004-02-26 Fernando Perez <fperez@colorado.edu>
3158 2004-02-26 Fernando Perez <fperez@colorado.edu>
3152
3159
3153 * IPython/genutils.py (page): Check that the curses module really
3160 * IPython/genutils.py (page): Check that the curses module really
3154 has the initscr attribute before trying to use it. For some
3161 has the initscr attribute before trying to use it. For some
3155 reason, the Solaris curses module is missing this. I think this
3162 reason, the Solaris curses module is missing this. I think this
3156 should be considered a Solaris python bug, but I'm not sure.
3163 should be considered a Solaris python bug, but I'm not sure.
3157
3164
3158 2004-01-17 Fernando Perez <fperez@colorado.edu>
3165 2004-01-17 Fernando Perez <fperez@colorado.edu>
3159
3166
3160 * IPython/genutils.py (Stream.__init__): Changes to try to make
3167 * IPython/genutils.py (Stream.__init__): Changes to try to make
3161 ipython robust against stdin/out/err being closed by the user.
3168 ipython robust against stdin/out/err being closed by the user.
3162 This is 'user error' (and blocks a normal python session, at least
3169 This is 'user error' (and blocks a normal python session, at least
3163 the stdout case). However, Ipython should be able to survive such
3170 the stdout case). However, Ipython should be able to survive such
3164 instances of abuse as gracefully as possible. To simplify the
3171 instances of abuse as gracefully as possible. To simplify the
3165 coding and maintain compatibility with Gary Bishop's Term
3172 coding and maintain compatibility with Gary Bishop's Term
3166 contributions, I've made use of classmethods for this. I think
3173 contributions, I've made use of classmethods for this. I think
3167 this introduces a dependency on python 2.2.
3174 this introduces a dependency on python 2.2.
3168
3175
3169 2004-01-13 Fernando Perez <fperez@colorado.edu>
3176 2004-01-13 Fernando Perez <fperez@colorado.edu>
3170
3177
3171 * IPython/numutils.py (exp_safe): simplified the code a bit and
3178 * IPython/numutils.py (exp_safe): simplified the code a bit and
3172 removed the need for importing the kinds module altogether.
3179 removed the need for importing the kinds module altogether.
3173
3180
3174 2004-01-06 Fernando Perez <fperez@colorado.edu>
3181 2004-01-06 Fernando Perez <fperez@colorado.edu>
3175
3182
3176 * IPython/Magic.py (Magic.magic_sc): Made the shell capture system
3183 * IPython/Magic.py (Magic.magic_sc): Made the shell capture system
3177 a magic function instead, after some community feedback. No
3184 a magic function instead, after some community feedback. No
3178 special syntax will exist for it, but its name is deliberately
3185 special syntax will exist for it, but its name is deliberately
3179 very short.
3186 very short.
3180
3187
3181 2003-12-20 Fernando Perez <fperez@colorado.edu>
3188 2003-12-20 Fernando Perez <fperez@colorado.edu>
3182
3189
3183 * IPython/iplib.py (InteractiveShell.handle_shell_assign): Added
3190 * IPython/iplib.py (InteractiveShell.handle_shell_assign): Added
3184 new functionality, to automagically assign the result of a shell
3191 new functionality, to automagically assign the result of a shell
3185 command to a variable. I'll solicit some community feedback on
3192 command to a variable. I'll solicit some community feedback on
3186 this before making it permanent.
3193 this before making it permanent.
3187
3194
3188 * IPython/OInspect.py (Inspector.pinfo): Fix crash when info was
3195 * IPython/OInspect.py (Inspector.pinfo): Fix crash when info was
3189 requested about callables for which inspect couldn't obtain a
3196 requested about callables for which inspect couldn't obtain a
3190 proper argspec. Thanks to a crash report sent by Etienne
3197 proper argspec. Thanks to a crash report sent by Etienne
3191 Posthumus <etienne-AT-apple01.cs.vu.nl>.
3198 Posthumus <etienne-AT-apple01.cs.vu.nl>.
3192
3199
3193 2003-12-09 Fernando Perez <fperez@colorado.edu>
3200 2003-12-09 Fernando Perez <fperez@colorado.edu>
3194
3201
3195 * IPython/genutils.py (page): patch for the pager to work across
3202 * IPython/genutils.py (page): patch for the pager to work across
3196 various versions of Windows. By Gary Bishop.
3203 various versions of Windows. By Gary Bishop.
3197
3204
3198 2003-12-04 Fernando Perez <fperez@colorado.edu>
3205 2003-12-04 Fernando Perez <fperez@colorado.edu>
3199
3206
3200 * IPython/Gnuplot2.py (PlotItems): Fixes for working with
3207 * IPython/Gnuplot2.py (PlotItems): Fixes for working with
3201 Gnuplot.py version 1.7, whose internal names changed quite a bit.
3208 Gnuplot.py version 1.7, whose internal names changed quite a bit.
3202 While I tested this and it looks ok, there may still be corner
3209 While I tested this and it looks ok, there may still be corner
3203 cases I've missed.
3210 cases I've missed.
3204
3211
3205 2003-12-01 Fernando Perez <fperez@colorado.edu>
3212 2003-12-01 Fernando Perez <fperez@colorado.edu>
3206
3213
3207 * IPython/iplib.py (InteractiveShell._prefilter): Fixed a bug
3214 * IPython/iplib.py (InteractiveShell._prefilter): Fixed a bug
3208 where a line like 'p,q=1,2' would fail because the automagic
3215 where a line like 'p,q=1,2' would fail because the automagic
3209 system would be triggered for @p.
3216 system would be triggered for @p.
3210
3217
3211 * IPython/DPyGetOpt.py (DPyGetOpt.processArguments): Tab-related
3218 * IPython/DPyGetOpt.py (DPyGetOpt.processArguments): Tab-related
3212 cleanups, code unmodified.
3219 cleanups, code unmodified.
3213
3220
3214 * IPython/genutils.py (Term): added a class for IPython to handle
3221 * IPython/genutils.py (Term): added a class for IPython to handle
3215 output. In most cases it will just be a proxy for stdout/err, but
3222 output. In most cases it will just be a proxy for stdout/err, but
3216 having this allows modifications to be made for some platforms,
3223 having this allows modifications to be made for some platforms,
3217 such as handling color escapes under Windows. All of this code
3224 such as handling color escapes under Windows. All of this code
3218 was contributed by Gary Bishop, with minor modifications by me.
3225 was contributed by Gary Bishop, with minor modifications by me.
3219 The actual changes affect many files.
3226 The actual changes affect many files.
3220
3227
3221 2003-11-30 Fernando Perez <fperez@colorado.edu>
3228 2003-11-30 Fernando Perez <fperez@colorado.edu>
3222
3229
3223 * IPython/iplib.py (file_matches): new completion code, courtesy
3230 * IPython/iplib.py (file_matches): new completion code, courtesy
3224 of Jeff Collins. This enables filename completion again under
3231 of Jeff Collins. This enables filename completion again under
3225 python 2.3, which disabled it at the C level.
3232 python 2.3, which disabled it at the C level.
3226
3233
3227 2003-11-11 Fernando Perez <fperez@colorado.edu>
3234 2003-11-11 Fernando Perez <fperez@colorado.edu>
3228
3235
3229 * IPython/numutils.py (amap): Added amap() fn. Simple shorthand
3236 * IPython/numutils.py (amap): Added amap() fn. Simple shorthand
3230 for Numeric.array(map(...)), but often convenient.
3237 for Numeric.array(map(...)), but often convenient.
3231
3238
3232 2003-11-05 Fernando Perez <fperez@colorado.edu>
3239 2003-11-05 Fernando Perez <fperez@colorado.edu>
3233
3240
3234 * IPython/numutils.py (frange): Changed a call from int() to
3241 * IPython/numutils.py (frange): Changed a call from int() to
3235 int(round()) to prevent a problem reported with arange() in the
3242 int(round()) to prevent a problem reported with arange() in the
3236 numpy list.
3243 numpy list.
3237
3244
3238 2003-10-06 Fernando Perez <fperez@colorado.edu>
3245 2003-10-06 Fernando Perez <fperez@colorado.edu>
3239
3246
3240 * IPython/DPyGetOpt.py (DPyGetOpt.processArguments): changed to
3247 * IPython/DPyGetOpt.py (DPyGetOpt.processArguments): changed to
3241 prevent crashes if sys lacks an argv attribute (it happens with
3248 prevent crashes if sys lacks an argv attribute (it happens with
3242 embedded interpreters which build a bare-bones sys module).
3249 embedded interpreters which build a bare-bones sys module).
3243 Thanks to a report/bugfix by Adam Hupp <hupp-AT-cs.wisc.edu>.
3250 Thanks to a report/bugfix by Adam Hupp <hupp-AT-cs.wisc.edu>.
3244
3251
3245 2003-09-24 Fernando Perez <fperez@colorado.edu>
3252 2003-09-24 Fernando Perez <fperez@colorado.edu>
3246
3253
3247 * IPython/Magic.py (Magic._ofind): blanket except around getattr()
3254 * IPython/Magic.py (Magic._ofind): blanket except around getattr()
3248 to protect against poorly written user objects where __getattr__
3255 to protect against poorly written user objects where __getattr__
3249 raises exceptions other than AttributeError. Thanks to a bug
3256 raises exceptions other than AttributeError. Thanks to a bug
3250 report by Oliver Sander <osander-AT-gmx.de>.
3257 report by Oliver Sander <osander-AT-gmx.de>.
3251
3258
3252 * IPython/FakeModule.py (FakeModule.__repr__): this method was
3259 * IPython/FakeModule.py (FakeModule.__repr__): this method was
3253 missing. Thanks to bug report by Ralf Schmitt <ralf-AT-brainbot.com>.
3260 missing. Thanks to bug report by Ralf Schmitt <ralf-AT-brainbot.com>.
3254
3261
3255 2003-09-09 Fernando Perez <fperez@colorado.edu>
3262 2003-09-09 Fernando Perez <fperez@colorado.edu>
3256
3263
3257 * IPython/iplib.py (InteractiveShell._prefilter): fix bug where
3264 * IPython/iplib.py (InteractiveShell._prefilter): fix bug where
3258 unpacking a list whith a callable as first element would
3265 unpacking a list whith a callable as first element would
3259 mistakenly trigger autocalling. Thanks to a bug report by Jeffery
3266 mistakenly trigger autocalling. Thanks to a bug report by Jeffery
3260 Collins.
3267 Collins.
3261
3268
3262 2003-08-25 *** Released version 0.5.0
3269 2003-08-25 *** Released version 0.5.0
3263
3270
3264 2003-08-22 Fernando Perez <fperez@colorado.edu>
3271 2003-08-22 Fernando Perez <fperez@colorado.edu>
3265
3272
3266 * IPython/ultraTB.py (VerboseTB.linereader): Improved handling of
3273 * IPython/ultraTB.py (VerboseTB.linereader): Improved handling of
3267 improperly defined user exceptions. Thanks to feedback from Mark
3274 improperly defined user exceptions. Thanks to feedback from Mark
3268 Russell <mrussell-AT-verio.net>.
3275 Russell <mrussell-AT-verio.net>.
3269
3276
3270 2003-08-20 Fernando Perez <fperez@colorado.edu>
3277 2003-08-20 Fernando Perez <fperez@colorado.edu>
3271
3278
3272 * IPython/OInspect.py (Inspector.pinfo): changed String Form
3279 * IPython/OInspect.py (Inspector.pinfo): changed String Form
3273 printing so that it would print multi-line string forms starting
3280 printing so that it would print multi-line string forms starting
3274 with a new line. This way the formatting is better respected for
3281 with a new line. This way the formatting is better respected for
3275 objects which work hard to make nice string forms.
3282 objects which work hard to make nice string forms.
3276
3283
3277 * IPython/iplib.py (InteractiveShell.handle_auto): Fix bug where
3284 * IPython/iplib.py (InteractiveShell.handle_auto): Fix bug where
3278 autocall would overtake data access for objects with both
3285 autocall would overtake data access for objects with both
3279 __getitem__ and __call__.
3286 __getitem__ and __call__.
3280
3287
3281 2003-08-19 *** Released version 0.5.0-rc1
3288 2003-08-19 *** Released version 0.5.0-rc1
3282
3289
3283 2003-08-19 Fernando Perez <fperez@colorado.edu>
3290 2003-08-19 Fernando Perez <fperez@colorado.edu>
3284
3291
3285 * IPython/deep_reload.py (load_tail): single tiny change here
3292 * IPython/deep_reload.py (load_tail): single tiny change here
3286 seems to fix the long-standing bug of dreload() failing to work
3293 seems to fix the long-standing bug of dreload() failing to work
3287 for dotted names. But this module is pretty tricky, so I may have
3294 for dotted names. But this module is pretty tricky, so I may have
3288 missed some subtlety. Needs more testing!.
3295 missed some subtlety. Needs more testing!.
3289
3296
3290 * IPython/ultraTB.py (VerboseTB.linereader): harden against user
3297 * IPython/ultraTB.py (VerboseTB.linereader): harden against user
3291 exceptions which have badly implemented __str__ methods.
3298 exceptions which have badly implemented __str__ methods.
3292 (VerboseTB.text): harden against inspect.getinnerframes crashing,
3299 (VerboseTB.text): harden against inspect.getinnerframes crashing,
3293 which I've been getting reports about from Python 2.3 users. I
3300 which I've been getting reports about from Python 2.3 users. I
3294 wish I had a simple test case to reproduce the problem, so I could
3301 wish I had a simple test case to reproduce the problem, so I could
3295 either write a cleaner workaround or file a bug report if
3302 either write a cleaner workaround or file a bug report if
3296 necessary.
3303 necessary.
3297
3304
3298 * IPython/Magic.py (Magic.magic_edit): fixed bug where after
3305 * IPython/Magic.py (Magic.magic_edit): fixed bug where after
3299 making a class 'foo', file 'foo.py' couldn't be edited. Thanks to
3306 making a class 'foo', file 'foo.py' couldn't be edited. Thanks to
3300 a bug report by Tjabo Kloppenburg.
3307 a bug report by Tjabo Kloppenburg.
3301
3308
3302 * IPython/ultraTB.py (VerboseTB.debugger): hardened against pdb
3309 * IPython/ultraTB.py (VerboseTB.debugger): hardened against pdb
3303 crashes. Wrapped the pdb call in a blanket try/except, since pdb
3310 crashes. Wrapped the pdb call in a blanket try/except, since pdb
3304 seems rather unstable. Thanks to a bug report by Tjabo
3311 seems rather unstable. Thanks to a bug report by Tjabo
3305 Kloppenburg <tjabo.kloppenburg-AT-unix-ag.uni-siegen.de>.
3312 Kloppenburg <tjabo.kloppenburg-AT-unix-ag.uni-siegen.de>.
3306
3313
3307 * IPython/Release.py (version): release 0.5.0-rc1. I want to put
3314 * IPython/Release.py (version): release 0.5.0-rc1. I want to put
3308 this out soon because of the critical fixes in the inner loop for
3315 this out soon because of the critical fixes in the inner loop for
3309 generators.
3316 generators.
3310
3317
3311 * IPython/Magic.py (Magic.getargspec): removed. This (and
3318 * IPython/Magic.py (Magic.getargspec): removed. This (and
3312 _get_def) have been obsoleted by OInspect for a long time, I
3319 _get_def) have been obsoleted by OInspect for a long time, I
3313 hadn't noticed that they were dead code.
3320 hadn't noticed that they were dead code.
3314 (Magic._ofind): restored _ofind functionality for a few literals
3321 (Magic._ofind): restored _ofind functionality for a few literals
3315 (those in ["''",'""','[]','{}','()']). But it won't work anymore
3322 (those in ["''",'""','[]','{}','()']). But it won't work anymore
3316 for things like "hello".capitalize?, since that would require a
3323 for things like "hello".capitalize?, since that would require a
3317 potentially dangerous eval() again.
3324 potentially dangerous eval() again.
3318
3325
3319 * IPython/iplib.py (InteractiveShell._prefilter): reorganized the
3326 * IPython/iplib.py (InteractiveShell._prefilter): reorganized the
3320 logic a bit more to clean up the escapes handling and minimize the
3327 logic a bit more to clean up the escapes handling and minimize the
3321 use of _ofind to only necessary cases. The interactive 'feel' of
3328 use of _ofind to only necessary cases. The interactive 'feel' of
3322 IPython should have improved quite a bit with the changes in
3329 IPython should have improved quite a bit with the changes in
3323 _prefilter and _ofind (besides being far safer than before).
3330 _prefilter and _ofind (besides being far safer than before).
3324
3331
3325 * IPython/Magic.py (Magic.magic_edit): Fixed old bug (but rather
3332 * IPython/Magic.py (Magic.magic_edit): Fixed old bug (but rather
3326 obscure, never reported). Edit would fail to find the object to
3333 obscure, never reported). Edit would fail to find the object to
3327 edit under some circumstances.
3334 edit under some circumstances.
3328 (Magic._ofind): CRITICAL FIX. Finally removed the eval() calls
3335 (Magic._ofind): CRITICAL FIX. Finally removed the eval() calls
3329 which were causing double-calling of generators. Those eval calls
3336 which were causing double-calling of generators. Those eval calls
3330 were _very_ dangerous, since code with side effects could be
3337 were _very_ dangerous, since code with side effects could be
3331 triggered. As they say, 'eval is evil'... These were the
3338 triggered. As they say, 'eval is evil'... These were the
3332 nastiest evals in IPython. Besides, _ofind is now far simpler,
3339 nastiest evals in IPython. Besides, _ofind is now far simpler,
3333 and it should also be quite a bit faster. Its use of inspect is
3340 and it should also be quite a bit faster. Its use of inspect is
3334 also safer, so perhaps some of the inspect-related crashes I've
3341 also safer, so perhaps some of the inspect-related crashes I've
3335 seen lately with Python 2.3 might be taken care of. That will
3342 seen lately with Python 2.3 might be taken care of. That will
3336 need more testing.
3343 need more testing.
3337
3344
3338 2003-08-17 Fernando Perez <fperez@colorado.edu>
3345 2003-08-17 Fernando Perez <fperez@colorado.edu>
3339
3346
3340 * IPython/iplib.py (InteractiveShell._prefilter): significant
3347 * IPython/iplib.py (InteractiveShell._prefilter): significant
3341 simplifications to the logic for handling user escapes. Faster
3348 simplifications to the logic for handling user escapes. Faster
3342 and simpler code.
3349 and simpler code.
3343
3350
3344 2003-08-14 Fernando Perez <fperez@colorado.edu>
3351 2003-08-14 Fernando Perez <fperez@colorado.edu>
3345
3352
3346 * IPython/numutils.py (sum_flat): rewrote to be non-recursive.
3353 * IPython/numutils.py (sum_flat): rewrote to be non-recursive.
3347 Now it requires O(N) storage (N=size(a)) for non-contiguous input,
3354 Now it requires O(N) storage (N=size(a)) for non-contiguous input,
3348 but it should be quite a bit faster. And the recursive version
3355 but it should be quite a bit faster. And the recursive version
3349 generated O(log N) intermediate storage for all rank>1 arrays,
3356 generated O(log N) intermediate storage for all rank>1 arrays,
3350 even if they were contiguous.
3357 even if they were contiguous.
3351 (l1norm): Added this function.
3358 (l1norm): Added this function.
3352 (norm): Added this function for arbitrary norms (including
3359 (norm): Added this function for arbitrary norms (including
3353 l-infinity). l1 and l2 are still special cases for convenience
3360 l-infinity). l1 and l2 are still special cases for convenience
3354 and speed.
3361 and speed.
3355
3362
3356 2003-08-03 Fernando Perez <fperez@colorado.edu>
3363 2003-08-03 Fernando Perez <fperez@colorado.edu>
3357
3364
3358 * IPython/Magic.py (Magic.magic_edit): Removed all remaining string
3365 * IPython/Magic.py (Magic.magic_edit): Removed all remaining string
3359 exceptions, which now raise PendingDeprecationWarnings in Python
3366 exceptions, which now raise PendingDeprecationWarnings in Python
3360 2.3. There were some in Magic and some in Gnuplot2.
3367 2.3. There were some in Magic and some in Gnuplot2.
3361
3368
3362 2003-06-30 Fernando Perez <fperez@colorado.edu>
3369 2003-06-30 Fernando Perez <fperez@colorado.edu>
3363
3370
3364 * IPython/genutils.py (page): modified to call curses only for
3371 * IPython/genutils.py (page): modified to call curses only for
3365 terminals where TERM=='xterm'. After problems under many other
3372 terminals where TERM=='xterm'. After problems under many other
3366 terminals were reported by Keith Beattie <KSBeattie-AT-lbl.gov>.
3373 terminals were reported by Keith Beattie <KSBeattie-AT-lbl.gov>.
3367
3374
3368 * IPython/iplib.py (complete): removed spurious 'print "IE"' which
3375 * IPython/iplib.py (complete): removed spurious 'print "IE"' which
3369 would be triggered when readline was absent. This was just an old
3376 would be triggered when readline was absent. This was just an old
3370 debugging statement I'd forgotten to take out.
3377 debugging statement I'd forgotten to take out.
3371
3378
3372 2003-06-20 Fernando Perez <fperez@colorado.edu>
3379 2003-06-20 Fernando Perez <fperez@colorado.edu>
3373
3380
3374 * IPython/genutils.py (clock): modified to return only user time
3381 * IPython/genutils.py (clock): modified to return only user time
3375 (not counting system time), after a discussion on scipy. While
3382 (not counting system time), after a discussion on scipy. While
3376 system time may be a useful quantity occasionally, it may much
3383 system time may be a useful quantity occasionally, it may much
3377 more easily be skewed by occasional swapping or other similar
3384 more easily be skewed by occasional swapping or other similar
3378 activity.
3385 activity.
3379
3386
3380 2003-06-05 Fernando Perez <fperez@colorado.edu>
3387 2003-06-05 Fernando Perez <fperez@colorado.edu>
3381
3388
3382 * IPython/numutils.py (identity): new function, for building
3389 * IPython/numutils.py (identity): new function, for building
3383 arbitrary rank Kronecker deltas (mostly backwards compatible with
3390 arbitrary rank Kronecker deltas (mostly backwards compatible with
3384 Numeric.identity)
3391 Numeric.identity)
3385
3392
3386 2003-06-03 Fernando Perez <fperez@colorado.edu>
3393 2003-06-03 Fernando Perez <fperez@colorado.edu>
3387
3394
3388 * IPython/iplib.py (InteractiveShell.handle_magic): protect
3395 * IPython/iplib.py (InteractiveShell.handle_magic): protect
3389 arguments passed to magics with spaces, to allow trailing '\' to
3396 arguments passed to magics with spaces, to allow trailing '\' to
3390 work normally (mainly for Windows users).
3397 work normally (mainly for Windows users).
3391
3398
3392 2003-05-29 Fernando Perez <fperez@colorado.edu>
3399 2003-05-29 Fernando Perez <fperez@colorado.edu>
3393
3400
3394 * IPython/ipmaker.py (make_IPython): Load site._Helper() as help
3401 * IPython/ipmaker.py (make_IPython): Load site._Helper() as help
3395 instead of pydoc.help. This fixes a bizarre behavior where
3402 instead of pydoc.help. This fixes a bizarre behavior where
3396 printing '%s' % locals() would trigger the help system. Now
3403 printing '%s' % locals() would trigger the help system. Now
3397 ipython behaves like normal python does.
3404 ipython behaves like normal python does.
3398
3405
3399 Note that if one does 'from pydoc import help', the bizarre
3406 Note that if one does 'from pydoc import help', the bizarre
3400 behavior returns, but this will also happen in normal python, so
3407 behavior returns, but this will also happen in normal python, so
3401 it's not an ipython bug anymore (it has to do with how pydoc.help
3408 it's not an ipython bug anymore (it has to do with how pydoc.help
3402 is implemented).
3409 is implemented).
3403
3410
3404 2003-05-22 Fernando Perez <fperez@colorado.edu>
3411 2003-05-22 Fernando Perez <fperez@colorado.edu>
3405
3412
3406 * IPython/FlexCompleter.py (Completer.attr_matches): fixed to
3413 * IPython/FlexCompleter.py (Completer.attr_matches): fixed to
3407 return [] instead of None when nothing matches, also match to end
3414 return [] instead of None when nothing matches, also match to end
3408 of line. Patch by Gary Bishop.
3415 of line. Patch by Gary Bishop.
3409
3416
3410 * IPython/ipmaker.py (make_IPython): Added same sys.excepthook
3417 * IPython/ipmaker.py (make_IPython): Added same sys.excepthook
3411 protection as before, for files passed on the command line. This
3418 protection as before, for files passed on the command line. This
3412 prevents the CrashHandler from kicking in if user files call into
3419 prevents the CrashHandler from kicking in if user files call into
3413 sys.excepthook (such as PyQt and WxWindows have a nasty habit of
3420 sys.excepthook (such as PyQt and WxWindows have a nasty habit of
3414 doing). After a report by Kasper Souren <Kasper.Souren-AT-ircam.fr>
3421 doing). After a report by Kasper Souren <Kasper.Souren-AT-ircam.fr>
3415
3422
3416 2003-05-20 *** Released version 0.4.0
3423 2003-05-20 *** Released version 0.4.0
3417
3424
3418 2003-05-20 Fernando Perez <fperez@colorado.edu>
3425 2003-05-20 Fernando Perez <fperez@colorado.edu>
3419
3426
3420 * setup.py: added support for manpages. It's a bit hackish b/c of
3427 * setup.py: added support for manpages. It's a bit hackish b/c of
3421 a bug in the way the bdist_rpm distutils target handles gzipped
3428 a bug in the way the bdist_rpm distutils target handles gzipped
3422 manpages, but it works. After a patch by Jack.
3429 manpages, but it works. After a patch by Jack.
3423
3430
3424 2003-05-19 Fernando Perez <fperez@colorado.edu>
3431 2003-05-19 Fernando Perez <fperez@colorado.edu>
3425
3432
3426 * IPython/numutils.py: added a mockup of the kinds module, since
3433 * IPython/numutils.py: added a mockup of the kinds module, since
3427 it was recently removed from Numeric. This way, numutils will
3434 it was recently removed from Numeric. This way, numutils will
3428 work for all users even if they are missing kinds.
3435 work for all users even if they are missing kinds.
3429
3436
3430 * IPython/Magic.py (Magic._ofind): Harden against an inspect
3437 * IPython/Magic.py (Magic._ofind): Harden against an inspect
3431 failure, which can occur with SWIG-wrapped extensions. After a
3438 failure, which can occur with SWIG-wrapped extensions. After a
3432 crash report from Prabhu.
3439 crash report from Prabhu.
3433
3440
3434 2003-05-16 Fernando Perez <fperez@colorado.edu>
3441 2003-05-16 Fernando Perez <fperez@colorado.edu>
3435
3442
3436 * IPython/iplib.py (InteractiveShell.excepthook): New method to
3443 * IPython/iplib.py (InteractiveShell.excepthook): New method to
3437 protect ipython from user code which may call directly
3444 protect ipython from user code which may call directly
3438 sys.excepthook (this looks like an ipython crash to the user, even
3445 sys.excepthook (this looks like an ipython crash to the user, even
3439 when it isn't). After a patch by Gary Bishop <gb-AT-cs.unc.edu>.
3446 when it isn't). After a patch by Gary Bishop <gb-AT-cs.unc.edu>.
3440 This is especially important to help users of WxWindows, but may
3447 This is especially important to help users of WxWindows, but may
3441 also be useful in other cases.
3448 also be useful in other cases.
3442
3449
3443 * IPython/ultraTB.py (AutoFormattedTB.__call__): Changed to allow
3450 * IPython/ultraTB.py (AutoFormattedTB.__call__): Changed to allow
3444 an optional tb_offset to be specified, and to preserve exception
3451 an optional tb_offset to be specified, and to preserve exception
3445 info if given. After a patch by Gary Bishop <gb-AT-cs.unc.edu>.
3452 info if given. After a patch by Gary Bishop <gb-AT-cs.unc.edu>.
3446
3453
3447 * ipython.1 (Default): Thanks to Jack's work, we now have manpages!
3454 * ipython.1 (Default): Thanks to Jack's work, we now have manpages!
3448
3455
3449 2003-05-15 Fernando Perez <fperez@colorado.edu>
3456 2003-05-15 Fernando Perez <fperez@colorado.edu>
3450
3457
3451 * IPython/iplib.py (InteractiveShell.user_setup): Fix crash when
3458 * IPython/iplib.py (InteractiveShell.user_setup): Fix crash when
3452 installing for a new user under Windows.
3459 installing for a new user under Windows.
3453
3460
3454 2003-05-12 Fernando Perez <fperez@colorado.edu>
3461 2003-05-12 Fernando Perez <fperez@colorado.edu>
3455
3462
3456 * IPython/iplib.py (InteractiveShell.handle_emacs): New line
3463 * IPython/iplib.py (InteractiveShell.handle_emacs): New line
3457 handler for Emacs comint-based lines. Currently it doesn't do
3464 handler for Emacs comint-based lines. Currently it doesn't do
3458 much (but importantly, it doesn't update the history cache). In
3465 much (but importantly, it doesn't update the history cache). In
3459 the future it may be expanded if Alex needs more functionality
3466 the future it may be expanded if Alex needs more functionality
3460 there.
3467 there.
3461
3468
3462 * IPython/CrashHandler.py (CrashHandler.__call__): Added platform
3469 * IPython/CrashHandler.py (CrashHandler.__call__): Added platform
3463 info to crash reports.
3470 info to crash reports.
3464
3471
3465 * IPython/iplib.py (InteractiveShell.mainloop): Added -c option,
3472 * IPython/iplib.py (InteractiveShell.mainloop): Added -c option,
3466 just like Python's -c. Also fixed crash with invalid -color
3473 just like Python's -c. Also fixed crash with invalid -color
3467 option value at startup. Thanks to Will French
3474 option value at startup. Thanks to Will French
3468 <wfrench-AT-bestweb.net> for the bug report.
3475 <wfrench-AT-bestweb.net> for the bug report.
3469
3476
3470 2003-05-09 Fernando Perez <fperez@colorado.edu>
3477 2003-05-09 Fernando Perez <fperez@colorado.edu>
3471
3478
3472 * IPython/genutils.py (EvalDict.__getitem__): Renamed EvalString
3479 * IPython/genutils.py (EvalDict.__getitem__): Renamed EvalString
3473 to EvalDict (it's a mapping, after all) and simplified its code
3480 to EvalDict (it's a mapping, after all) and simplified its code
3474 quite a bit, after a nice discussion on c.l.py where Gustavo
3481 quite a bit, after a nice discussion on c.l.py where Gustavo
3475 CΓ³rdova <gcordova-AT-sismex.com> suggested the new version.
3482 CΓ³rdova <gcordova-AT-sismex.com> suggested the new version.
3476
3483
3477 2003-04-30 Fernando Perez <fperez@colorado.edu>
3484 2003-04-30 Fernando Perez <fperez@colorado.edu>
3478
3485
3479 * IPython/genutils.py (timings_out): modified it to reduce its
3486 * IPython/genutils.py (timings_out): modified it to reduce its
3480 overhead in the common reps==1 case.
3487 overhead in the common reps==1 case.
3481
3488
3482 2003-04-29 Fernando Perez <fperez@colorado.edu>
3489 2003-04-29 Fernando Perez <fperez@colorado.edu>
3483
3490
3484 * IPython/genutils.py (timings_out): Modified to use the resource
3491 * IPython/genutils.py (timings_out): Modified to use the resource
3485 module, which avoids the wraparound problems of time.clock().
3492 module, which avoids the wraparound problems of time.clock().
3486
3493
3487 2003-04-17 *** Released version 0.2.15pre4
3494 2003-04-17 *** Released version 0.2.15pre4
3488
3495
3489 2003-04-17 Fernando Perez <fperez@colorado.edu>
3496 2003-04-17 Fernando Perez <fperez@colorado.edu>
3490
3497
3491 * setup.py (scriptfiles): Split windows-specific stuff over to a
3498 * setup.py (scriptfiles): Split windows-specific stuff over to a
3492 separate file, in an attempt to have a Windows GUI installer.
3499 separate file, in an attempt to have a Windows GUI installer.
3493 That didn't work, but part of the groundwork is done.
3500 That didn't work, but part of the groundwork is done.
3494
3501
3495 * IPython/UserConfig/ipythonrc: Added M-i, M-o and M-I for
3502 * IPython/UserConfig/ipythonrc: Added M-i, M-o and M-I for
3496 indent/unindent with 4 spaces. Particularly useful in combination
3503 indent/unindent with 4 spaces. Particularly useful in combination
3497 with the new auto-indent option.
3504 with the new auto-indent option.
3498
3505
3499 2003-04-16 Fernando Perez <fperez@colorado.edu>
3506 2003-04-16 Fernando Perez <fperez@colorado.edu>
3500
3507
3501 * IPython/Magic.py: various replacements of self.rc for
3508 * IPython/Magic.py: various replacements of self.rc for
3502 self.shell.rc. A lot more remains to be done to fully disentangle
3509 self.shell.rc. A lot more remains to be done to fully disentangle
3503 this class from the main Shell class.
3510 this class from the main Shell class.
3504
3511
3505 * IPython/GnuplotRuntime.py: added checks for mouse support so
3512 * IPython/GnuplotRuntime.py: added checks for mouse support so
3506 that we don't try to enable it if the current gnuplot doesn't
3513 that we don't try to enable it if the current gnuplot doesn't
3507 really support it. Also added checks so that we don't try to
3514 really support it. Also added checks so that we don't try to
3508 enable persist under Windows (where Gnuplot doesn't recognize the
3515 enable persist under Windows (where Gnuplot doesn't recognize the
3509 option).
3516 option).
3510
3517
3511 * IPython/iplib.py (InteractiveShell.interact): Added optional
3518 * IPython/iplib.py (InteractiveShell.interact): Added optional
3512 auto-indenting code, after a patch by King C. Shu
3519 auto-indenting code, after a patch by King C. Shu
3513 <kingshu-AT-myrealbox.com>. It's off by default because it doesn't
3520 <kingshu-AT-myrealbox.com>. It's off by default because it doesn't
3514 get along well with pasting indented code. If I ever figure out
3521 get along well with pasting indented code. If I ever figure out
3515 how to make that part go well, it will become on by default.
3522 how to make that part go well, it will become on by default.
3516
3523
3517 * IPython/Prompts.py (Prompt1.auto_rewrite): Fixed bug which would
3524 * IPython/Prompts.py (Prompt1.auto_rewrite): Fixed bug which would
3518 crash ipython if there was an unmatched '%' in the user's prompt
3525 crash ipython if there was an unmatched '%' in the user's prompt
3519 string. Reported by Thorsten Kampe <thorsten-AT-thorstenkampe.de>.
3526 string. Reported by Thorsten Kampe <thorsten-AT-thorstenkampe.de>.
3520
3527
3521 * IPython/iplib.py (InteractiveShell.interact): removed the
3528 * IPython/iplib.py (InteractiveShell.interact): removed the
3522 ability to ask the user whether he wants to crash or not at the
3529 ability to ask the user whether he wants to crash or not at the
3523 'last line' exception handler. Calling functions at that point
3530 'last line' exception handler. Calling functions at that point
3524 changes the stack, and the error reports would have incorrect
3531 changes the stack, and the error reports would have incorrect
3525 tracebacks.
3532 tracebacks.
3526
3533
3527 * IPython/Magic.py (Magic.magic_page): Added new @page magic, to
3534 * IPython/Magic.py (Magic.magic_page): Added new @page magic, to
3528 pass through a peger a pretty-printed form of any object. After a
3535 pass through a peger a pretty-printed form of any object. After a
3529 contribution by Olivier Aubert <oaubert-AT-bat710.univ-lyon1.fr>
3536 contribution by Olivier Aubert <oaubert-AT-bat710.univ-lyon1.fr>
3530
3537
3531 2003-04-14 Fernando Perez <fperez@colorado.edu>
3538 2003-04-14 Fernando Perez <fperez@colorado.edu>
3532
3539
3533 * IPython/iplib.py (InteractiveShell.user_setup): Fixed bug where
3540 * IPython/iplib.py (InteractiveShell.user_setup): Fixed bug where
3534 all files in ~ would be modified at first install (instead of
3541 all files in ~ would be modified at first install (instead of
3535 ~/.ipython). This could be potentially disastrous, as the
3542 ~/.ipython). This could be potentially disastrous, as the
3536 modification (make line-endings native) could damage binary files.
3543 modification (make line-endings native) could damage binary files.
3537
3544
3538 2003-04-10 Fernando Perez <fperez@colorado.edu>
3545 2003-04-10 Fernando Perez <fperez@colorado.edu>
3539
3546
3540 * IPython/iplib.py (InteractiveShell.handle_help): Modified to
3547 * IPython/iplib.py (InteractiveShell.handle_help): Modified to
3541 handle only lines which are invalid python. This now means that
3548 handle only lines which are invalid python. This now means that
3542 lines like 'x=1 #?' execute properly. Thanks to Jeffery Collins
3549 lines like 'x=1 #?' execute properly. Thanks to Jeffery Collins
3543 for the bug report.
3550 for the bug report.
3544
3551
3545 2003-04-01 Fernando Perez <fperez@colorado.edu>
3552 2003-04-01 Fernando Perez <fperez@colorado.edu>
3546
3553
3547 * IPython/iplib.py (InteractiveShell.showtraceback): Fixed bug
3554 * IPython/iplib.py (InteractiveShell.showtraceback): Fixed bug
3548 where failing to set sys.last_traceback would crash pdb.pm().
3555 where failing to set sys.last_traceback would crash pdb.pm().
3549 Thanks to Jeffery D. Collins <Jeff.Collins-AT-vexcel.com> for the bug
3556 Thanks to Jeffery D. Collins <Jeff.Collins-AT-vexcel.com> for the bug
3550 report.
3557 report.
3551
3558
3552 2003-03-25 Fernando Perez <fperez@colorado.edu>
3559 2003-03-25 Fernando Perez <fperez@colorado.edu>
3553
3560
3554 * IPython/Magic.py (Magic.magic_prun): rstrip() output of profiler
3561 * IPython/Magic.py (Magic.magic_prun): rstrip() output of profiler
3555 before printing it (it had a lot of spurious blank lines at the
3562 before printing it (it had a lot of spurious blank lines at the
3556 end).
3563 end).
3557
3564
3558 * IPython/Gnuplot2.py (Gnuplot.hardcopy): fixed bug where lpr
3565 * IPython/Gnuplot2.py (Gnuplot.hardcopy): fixed bug where lpr
3559 output would be sent 21 times! Obviously people don't use this
3566 output would be sent 21 times! Obviously people don't use this
3560 too often, or I would have heard about it.
3567 too often, or I would have heard about it.
3561
3568
3562 2003-03-24 Fernando Perez <fperez@colorado.edu>
3569 2003-03-24 Fernando Perez <fperez@colorado.edu>
3563
3570
3564 * setup.py (scriptfiles): renamed the data_files parameter from
3571 * setup.py (scriptfiles): renamed the data_files parameter from
3565 'base' to 'data' to fix rpm build issues. Thanks to Ralf Ahlbrink
3572 'base' to 'data' to fix rpm build issues. Thanks to Ralf Ahlbrink
3566 for the patch.
3573 for the patch.
3567
3574
3568 2003-03-20 Fernando Perez <fperez@colorado.edu>
3575 2003-03-20 Fernando Perez <fperez@colorado.edu>
3569
3576
3570 * IPython/genutils.py (error): added error() and fatal()
3577 * IPython/genutils.py (error): added error() and fatal()
3571 functions.
3578 functions.
3572
3579
3573 2003-03-18 *** Released version 0.2.15pre3
3580 2003-03-18 *** Released version 0.2.15pre3
3574
3581
3575 2003-03-18 Fernando Perez <fperez@colorado.edu>
3582 2003-03-18 Fernando Perez <fperez@colorado.edu>
3576
3583
3577 * setupext/install_data_ext.py
3584 * setupext/install_data_ext.py
3578 (install_data_ext.initialize_options): Class contributed by Jack
3585 (install_data_ext.initialize_options): Class contributed by Jack
3579 Moffit for fixing the old distutils hack. He is sending this to
3586 Moffit for fixing the old distutils hack. He is sending this to
3580 the distutils folks so in the future we may not need it as a
3587 the distutils folks so in the future we may not need it as a
3581 private fix.
3588 private fix.
3582
3589
3583 * MANIFEST.in: Extensive reorganization, based on Jack Moffit's
3590 * MANIFEST.in: Extensive reorganization, based on Jack Moffit's
3584 changes for Debian packaging. See his patch for full details.
3591 changes for Debian packaging. See his patch for full details.
3585 The old distutils hack of making the ipythonrc* files carry a
3592 The old distutils hack of making the ipythonrc* files carry a
3586 bogus .py extension is gone, at last. Examples were moved to a
3593 bogus .py extension is gone, at last. Examples were moved to a
3587 separate subdir under doc/, and the separate executable scripts
3594 separate subdir under doc/, and the separate executable scripts
3588 now live in their own directory. Overall a great cleanup. The
3595 now live in their own directory. Overall a great cleanup. The
3589 manual was updated to use the new files, and setup.py has been
3596 manual was updated to use the new files, and setup.py has been
3590 fixed for this setup.
3597 fixed for this setup.
3591
3598
3592 * IPython/PyColorize.py (Parser.usage): made non-executable and
3599 * IPython/PyColorize.py (Parser.usage): made non-executable and
3593 created a pycolor wrapper around it to be included as a script.
3600 created a pycolor wrapper around it to be included as a script.
3594
3601
3595 2003-03-12 *** Released version 0.2.15pre2
3602 2003-03-12 *** Released version 0.2.15pre2
3596
3603
3597 2003-03-12 Fernando Perez <fperez@colorado.edu>
3604 2003-03-12 Fernando Perez <fperez@colorado.edu>
3598
3605
3599 * IPython/ColorANSI.py (make_color_table): Finally fixed the
3606 * IPython/ColorANSI.py (make_color_table): Finally fixed the
3600 long-standing problem with garbage characters in some terminals.
3607 long-standing problem with garbage characters in some terminals.
3601 The issue was really that the \001 and \002 escapes must _only_ be
3608 The issue was really that the \001 and \002 escapes must _only_ be
3602 passed to input prompts (which call readline), but _never_ to
3609 passed to input prompts (which call readline), but _never_ to
3603 normal text to be printed on screen. I changed ColorANSI to have
3610 normal text to be printed on screen. I changed ColorANSI to have
3604 two classes: TermColors and InputTermColors, each with the
3611 two classes: TermColors and InputTermColors, each with the
3605 appropriate escapes for input prompts or normal text. The code in
3612 appropriate escapes for input prompts or normal text. The code in
3606 Prompts.py got slightly more complicated, but this very old and
3613 Prompts.py got slightly more complicated, but this very old and
3607 annoying bug is finally fixed.
3614 annoying bug is finally fixed.
3608
3615
3609 All the credit for nailing down the real origin of this problem
3616 All the credit for nailing down the real origin of this problem
3610 and the correct solution goes to Jack Moffit <jack-AT-xiph.org>.
3617 and the correct solution goes to Jack Moffit <jack-AT-xiph.org>.
3611 *Many* thanks to him for spending quite a bit of effort on this.
3618 *Many* thanks to him for spending quite a bit of effort on this.
3612
3619
3613 2003-03-05 *** Released version 0.2.15pre1
3620 2003-03-05 *** Released version 0.2.15pre1
3614
3621
3615 2003-03-03 Fernando Perez <fperez@colorado.edu>
3622 2003-03-03 Fernando Perez <fperez@colorado.edu>
3616
3623
3617 * IPython/FakeModule.py: Moved the former _FakeModule to a
3624 * IPython/FakeModule.py: Moved the former _FakeModule to a
3618 separate file, because it's also needed by Magic (to fix a similar
3625 separate file, because it's also needed by Magic (to fix a similar
3619 pickle-related issue in @run).
3626 pickle-related issue in @run).
3620
3627
3621 2003-03-02 Fernando Perez <fperez@colorado.edu>
3628 2003-03-02 Fernando Perez <fperez@colorado.edu>
3622
3629
3623 * IPython/Magic.py (Magic.magic_autocall): new magic to control
3630 * IPython/Magic.py (Magic.magic_autocall): new magic to control
3624 the autocall option at runtime.
3631 the autocall option at runtime.
3625 (Magic.magic_dhist): changed self.user_ns to self.shell.user_ns
3632 (Magic.magic_dhist): changed self.user_ns to self.shell.user_ns
3626 across Magic.py to start separating Magic from InteractiveShell.
3633 across Magic.py to start separating Magic from InteractiveShell.
3627 (Magic._ofind): Fixed to return proper namespace for dotted
3634 (Magic._ofind): Fixed to return proper namespace for dotted
3628 names. Before, a dotted name would always return 'not currently
3635 names. Before, a dotted name would always return 'not currently
3629 defined', because it would find the 'parent'. s.x would be found,
3636 defined', because it would find the 'parent'. s.x would be found,
3630 but since 'x' isn't defined by itself, it would get confused.
3637 but since 'x' isn't defined by itself, it would get confused.
3631 (Magic.magic_run): Fixed pickling problems reported by Ralf
3638 (Magic.magic_run): Fixed pickling problems reported by Ralf
3632 Ahlbrink <RAhlbrink-AT-RosenInspection.net>. The fix was similar to
3639 Ahlbrink <RAhlbrink-AT-RosenInspection.net>. The fix was similar to
3633 that I'd used when Mike Heeter reported similar issues at the
3640 that I'd used when Mike Heeter reported similar issues at the
3634 top-level, but now for @run. It boils down to injecting the
3641 top-level, but now for @run. It boils down to injecting the
3635 namespace where code is being executed with something that looks
3642 namespace where code is being executed with something that looks
3636 enough like a module to fool pickle.dump(). Since a pickle stores
3643 enough like a module to fool pickle.dump(). Since a pickle stores
3637 a named reference to the importing module, we need this for
3644 a named reference to the importing module, we need this for
3638 pickles to save something sensible.
3645 pickles to save something sensible.
3639
3646
3640 * IPython/ipmaker.py (make_IPython): added an autocall option.
3647 * IPython/ipmaker.py (make_IPython): added an autocall option.
3641
3648
3642 * IPython/iplib.py (InteractiveShell._prefilter): reordered all of
3649 * IPython/iplib.py (InteractiveShell._prefilter): reordered all of
3643 the auto-eval code. Now autocalling is an option, and the code is
3650 the auto-eval code. Now autocalling is an option, and the code is
3644 also vastly safer. There is no more eval() involved at all.
3651 also vastly safer. There is no more eval() involved at all.
3645
3652
3646 2003-03-01 Fernando Perez <fperez@colorado.edu>
3653 2003-03-01 Fernando Perez <fperez@colorado.edu>
3647
3654
3648 * IPython/Magic.py (Magic._ofind): Changed interface to return a
3655 * IPython/Magic.py (Magic._ofind): Changed interface to return a
3649 dict with named keys instead of a tuple.
3656 dict with named keys instead of a tuple.
3650
3657
3651 * IPython: Started using CVS for IPython as of 0.2.15pre1.
3658 * IPython: Started using CVS for IPython as of 0.2.15pre1.
3652
3659
3653 * setup.py (make_shortcut): Fixed message about directories
3660 * setup.py (make_shortcut): Fixed message about directories
3654 created during Windows installation (the directories were ok, just
3661 created during Windows installation (the directories were ok, just
3655 the printed message was misleading). Thanks to Chris Liechti
3662 the printed message was misleading). Thanks to Chris Liechti
3656 <cliechti-AT-gmx.net> for the heads up.
3663 <cliechti-AT-gmx.net> for the heads up.
3657
3664
3658 2003-02-21 Fernando Perez <fperez@colorado.edu>
3665 2003-02-21 Fernando Perez <fperez@colorado.edu>
3659
3666
3660 * IPython/iplib.py (InteractiveShell._prefilter): Fixed catching
3667 * IPython/iplib.py (InteractiveShell._prefilter): Fixed catching
3661 of ValueError exception when checking for auto-execution. This
3668 of ValueError exception when checking for auto-execution. This
3662 one is raised by things like Numeric arrays arr.flat when the
3669 one is raised by things like Numeric arrays arr.flat when the
3663 array is non-contiguous.
3670 array is non-contiguous.
3664
3671
3665 2003-01-31 Fernando Perez <fperez@colorado.edu>
3672 2003-01-31 Fernando Perez <fperez@colorado.edu>
3666
3673
3667 * IPython/genutils.py (SystemExec.bq): Fixed bug where bq would
3674 * IPython/genutils.py (SystemExec.bq): Fixed bug where bq would
3668 not return any value at all (even though the command would get
3675 not return any value at all (even though the command would get
3669 executed).
3676 executed).
3670 (xsys): Flush stdout right after printing the command to ensure
3677 (xsys): Flush stdout right after printing the command to ensure
3671 proper ordering of commands and command output in the total
3678 proper ordering of commands and command output in the total
3672 output.
3679 output.
3673 (SystemExec/xsys/bq): Switched the names of xsys/bq and
3680 (SystemExec/xsys/bq): Switched the names of xsys/bq and
3674 system/getoutput as defaults. The old ones are kept for
3681 system/getoutput as defaults. The old ones are kept for
3675 compatibility reasons, so no code which uses this library needs
3682 compatibility reasons, so no code which uses this library needs
3676 changing.
3683 changing.
3677
3684
3678 2003-01-27 *** Released version 0.2.14
3685 2003-01-27 *** Released version 0.2.14
3679
3686
3680 2003-01-25 Fernando Perez <fperez@colorado.edu>
3687 2003-01-25 Fernando Perez <fperez@colorado.edu>
3681
3688
3682 * IPython/Magic.py (Magic.magic_edit): Fixed problem where
3689 * IPython/Magic.py (Magic.magic_edit): Fixed problem where
3683 functions defined in previous edit sessions could not be re-edited
3690 functions defined in previous edit sessions could not be re-edited
3684 (because the temp files were immediately removed). Now temp files
3691 (because the temp files were immediately removed). Now temp files
3685 are removed only at IPython's exit.
3692 are removed only at IPython's exit.
3686 (Magic.magic_run): Improved @run to perform shell-like expansions
3693 (Magic.magic_run): Improved @run to perform shell-like expansions
3687 on its arguments (~users and $VARS). With this, @run becomes more
3694 on its arguments (~users and $VARS). With this, @run becomes more
3688 like a normal command-line.
3695 like a normal command-line.
3689
3696
3690 * IPython/Shell.py (IPShellEmbed.__call__): Fixed a bunch of small
3697 * IPython/Shell.py (IPShellEmbed.__call__): Fixed a bunch of small
3691 bugs related to embedding and cleaned up that code. A fairly
3698 bugs related to embedding and cleaned up that code. A fairly
3692 important one was the impossibility to access the global namespace
3699 important one was the impossibility to access the global namespace
3693 through the embedded IPython (only local variables were visible).
3700 through the embedded IPython (only local variables were visible).
3694
3701
3695 2003-01-14 Fernando Perez <fperez@colorado.edu>
3702 2003-01-14 Fernando Perez <fperez@colorado.edu>
3696
3703
3697 * IPython/iplib.py (InteractiveShell._prefilter): Fixed
3704 * IPython/iplib.py (InteractiveShell._prefilter): Fixed
3698 auto-calling to be a bit more conservative. Now it doesn't get
3705 auto-calling to be a bit more conservative. Now it doesn't get
3699 triggered if any of '!=()<>' are in the rest of the input line, to
3706 triggered if any of '!=()<>' are in the rest of the input line, to
3700 allow comparing callables. Thanks to Alex for the heads up.
3707 allow comparing callables. Thanks to Alex for the heads up.
3701
3708
3702 2003-01-07 Fernando Perez <fperez@colorado.edu>
3709 2003-01-07 Fernando Perez <fperez@colorado.edu>
3703
3710
3704 * IPython/genutils.py (page): fixed estimation of the number of
3711 * IPython/genutils.py (page): fixed estimation of the number of
3705 lines in a string to be paged to simply count newlines. This
3712 lines in a string to be paged to simply count newlines. This
3706 prevents over-guessing due to embedded escape sequences. A better
3713 prevents over-guessing due to embedded escape sequences. A better
3707 long-term solution would involve stripping out the control chars
3714 long-term solution would involve stripping out the control chars
3708 for the count, but it's potentially so expensive I just don't
3715 for the count, but it's potentially so expensive I just don't
3709 think it's worth doing.
3716 think it's worth doing.
3710
3717
3711 2002-12-19 *** Released version 0.2.14pre50
3718 2002-12-19 *** Released version 0.2.14pre50
3712
3719
3713 2002-12-19 Fernando Perez <fperez@colorado.edu>
3720 2002-12-19 Fernando Perez <fperez@colorado.edu>
3714
3721
3715 * tools/release (version): Changed release scripts to inform
3722 * tools/release (version): Changed release scripts to inform
3716 Andrea and build a NEWS file with a list of recent changes.
3723 Andrea and build a NEWS file with a list of recent changes.
3717
3724
3718 * IPython/ColorANSI.py (__all__): changed terminal detection
3725 * IPython/ColorANSI.py (__all__): changed terminal detection
3719 code. Seems to work better for xterms without breaking
3726 code. Seems to work better for xterms without breaking
3720 konsole. Will need more testing to determine if WinXP and Mac OSX
3727 konsole. Will need more testing to determine if WinXP and Mac OSX
3721 also work ok.
3728 also work ok.
3722
3729
3723 2002-12-18 *** Released version 0.2.14pre49
3730 2002-12-18 *** Released version 0.2.14pre49
3724
3731
3725 2002-12-18 Fernando Perez <fperez@colorado.edu>
3732 2002-12-18 Fernando Perez <fperez@colorado.edu>
3726
3733
3727 * Docs: added new info about Mac OSX, from Andrea.
3734 * Docs: added new info about Mac OSX, from Andrea.
3728
3735
3729 * IPython/Gnuplot2.py (String): Added a String PlotItem class to
3736 * IPython/Gnuplot2.py (String): Added a String PlotItem class to
3730 allow direct plotting of python strings whose format is the same
3737 allow direct plotting of python strings whose format is the same
3731 of gnuplot data files.
3738 of gnuplot data files.
3732
3739
3733 2002-12-16 Fernando Perez <fperez@colorado.edu>
3740 2002-12-16 Fernando Perez <fperez@colorado.edu>
3734
3741
3735 * IPython/iplib.py (InteractiveShell.interact): fixed default (y)
3742 * IPython/iplib.py (InteractiveShell.interact): fixed default (y)
3736 value of exit question to be acknowledged.
3743 value of exit question to be acknowledged.
3737
3744
3738 2002-12-03 Fernando Perez <fperez@colorado.edu>
3745 2002-12-03 Fernando Perez <fperez@colorado.edu>
3739
3746
3740 * IPython/ipmaker.py: removed generators, which had been added
3747 * IPython/ipmaker.py: removed generators, which had been added
3741 by mistake in an earlier debugging run. This was causing trouble
3748 by mistake in an earlier debugging run. This was causing trouble
3742 to users of python 2.1.x. Thanks to Abel Daniel <abli-AT-freemail.hu>
3749 to users of python 2.1.x. Thanks to Abel Daniel <abli-AT-freemail.hu>
3743 for pointing this out.
3750 for pointing this out.
3744
3751
3745 2002-11-17 Fernando Perez <fperez@colorado.edu>
3752 2002-11-17 Fernando Perez <fperez@colorado.edu>
3746
3753
3747 * Manual: updated the Gnuplot section.
3754 * Manual: updated the Gnuplot section.
3748
3755
3749 * IPython/GnuplotRuntime.py: refactored a lot all this code, with
3756 * IPython/GnuplotRuntime.py: refactored a lot all this code, with
3750 a much better split of what goes in Runtime and what goes in
3757 a much better split of what goes in Runtime and what goes in
3751 Interactive.
3758 Interactive.
3752
3759
3753 * IPython/ipmaker.py: fixed bug where import_fail_info wasn't
3760 * IPython/ipmaker.py: fixed bug where import_fail_info wasn't
3754 being imported from iplib.
3761 being imported from iplib.
3755
3762
3756 * IPython/GnuplotInteractive.py (magic_gpc): renamed @gp to @gpc
3763 * IPython/GnuplotInteractive.py (magic_gpc): renamed @gp to @gpc
3757 for command-passing. Now the global Gnuplot instance is called
3764 for command-passing. Now the global Gnuplot instance is called
3758 'gp' instead of 'g', which was really a far too fragile and
3765 'gp' instead of 'g', which was really a far too fragile and
3759 common name.
3766 common name.
3760
3767
3761 * IPython/Gnuplot2.py (eps_fix_bbox): added this to fix broken
3768 * IPython/Gnuplot2.py (eps_fix_bbox): added this to fix broken
3762 bounding boxes generated by Gnuplot for square plots.
3769 bounding boxes generated by Gnuplot for square plots.
3763
3770
3764 * IPython/genutils.py (popkey): new function added. I should
3771 * IPython/genutils.py (popkey): new function added. I should
3765 suggest this on c.l.py as a dict method, it seems useful.
3772 suggest this on c.l.py as a dict method, it seems useful.
3766
3773
3767 * IPython/Gnuplot2.py (Gnuplot.plot): Overhauled plot and replot
3774 * IPython/Gnuplot2.py (Gnuplot.plot): Overhauled plot and replot
3768 to transparently handle PostScript generation. MUCH better than
3775 to transparently handle PostScript generation. MUCH better than
3769 the previous plot_eps/replot_eps (which I removed now). The code
3776 the previous plot_eps/replot_eps (which I removed now). The code
3770 is also fairly clean and well documented now (including
3777 is also fairly clean and well documented now (including
3771 docstrings).
3778 docstrings).
3772
3779
3773 2002-11-13 Fernando Perez <fperez@colorado.edu>
3780 2002-11-13 Fernando Perez <fperez@colorado.edu>
3774
3781
3775 * IPython/Magic.py (Magic.magic_edit): fixed docstring
3782 * IPython/Magic.py (Magic.magic_edit): fixed docstring
3776 (inconsistent with options).
3783 (inconsistent with options).
3777
3784
3778 * IPython/Gnuplot2.py (Gnuplot.hardcopy): hardcopy had been
3785 * IPython/Gnuplot2.py (Gnuplot.hardcopy): hardcopy had been
3779 manually disabled, I don't know why. Fixed it.
3786 manually disabled, I don't know why. Fixed it.
3780 (Gnuplot._plot_eps): added new plot_eps/replot_eps to get directly
3787 (Gnuplot._plot_eps): added new plot_eps/replot_eps to get directly
3781 eps output.
3788 eps output.
3782
3789
3783 2002-11-12 Fernando Perez <fperez@colorado.edu>
3790 2002-11-12 Fernando Perez <fperez@colorado.edu>
3784
3791
3785 * IPython/genutils.py (ask_yes_no): trap EOF and ^C so that they
3792 * IPython/genutils.py (ask_yes_no): trap EOF and ^C so that they
3786 don't propagate up to caller. Fixes crash reported by François
3793 don't propagate up to caller. Fixes crash reported by François
3787 Pinard.
3794 Pinard.
3788
3795
3789 2002-11-09 Fernando Perez <fperez@colorado.edu>
3796 2002-11-09 Fernando Perez <fperez@colorado.edu>
3790
3797
3791 * IPython/ipmaker.py (make_IPython): fixed problem with writing
3798 * IPython/ipmaker.py (make_IPython): fixed problem with writing
3792 history file for new users.
3799 history file for new users.
3793 (make_IPython): fixed bug where initial install would leave the
3800 (make_IPython): fixed bug where initial install would leave the
3794 user running in the .ipython dir.
3801 user running in the .ipython dir.
3795 (make_IPython): fixed bug where config dir .ipython would be
3802 (make_IPython): fixed bug where config dir .ipython would be
3796 created regardless of the given -ipythondir option. Thanks to Cory
3803 created regardless of the given -ipythondir option. Thanks to Cory
3797 Dodt <cdodt-AT-fcoe.k12.ca.us> for the bug report.
3804 Dodt <cdodt-AT-fcoe.k12.ca.us> for the bug report.
3798
3805
3799 * IPython/genutils.py (ask_yes_no): new function for asking yes/no
3806 * IPython/genutils.py (ask_yes_no): new function for asking yes/no
3800 type confirmations. Will need to use it in all of IPython's code
3807 type confirmations. Will need to use it in all of IPython's code
3801 consistently.
3808 consistently.
3802
3809
3803 * IPython/CrashHandler.py (CrashHandler.__call__): changed the
3810 * IPython/CrashHandler.py (CrashHandler.__call__): changed the
3804 context to print 31 lines instead of the default 5. This will make
3811 context to print 31 lines instead of the default 5. This will make
3805 the crash reports extremely detailed in case the problem is in
3812 the crash reports extremely detailed in case the problem is in
3806 libraries I don't have access to.
3813 libraries I don't have access to.
3807
3814
3808 * IPython/iplib.py (InteractiveShell.interact): changed the 'last
3815 * IPython/iplib.py (InteractiveShell.interact): changed the 'last
3809 line of defense' code to still crash, but giving users fair
3816 line of defense' code to still crash, but giving users fair
3810 warning. I don't want internal errors to go unreported: if there's
3817 warning. I don't want internal errors to go unreported: if there's
3811 an internal problem, IPython should crash and generate a full
3818 an internal problem, IPython should crash and generate a full
3812 report.
3819 report.
3813
3820
3814 2002-11-08 Fernando Perez <fperez@colorado.edu>
3821 2002-11-08 Fernando Perez <fperez@colorado.edu>
3815
3822
3816 * IPython/iplib.py (InteractiveShell.interact): added code to trap
3823 * IPython/iplib.py (InteractiveShell.interact): added code to trap
3817 otherwise uncaught exceptions which can appear if people set
3824 otherwise uncaught exceptions which can appear if people set
3818 sys.stdout to something badly broken. Thanks to a crash report
3825 sys.stdout to something badly broken. Thanks to a crash report
3819 from henni-AT-mail.brainbot.com.
3826 from henni-AT-mail.brainbot.com.
3820
3827
3821 2002-11-04 Fernando Perez <fperez@colorado.edu>
3828 2002-11-04 Fernando Perez <fperez@colorado.edu>
3822
3829
3823 * IPython/iplib.py (InteractiveShell.interact): added
3830 * IPython/iplib.py (InteractiveShell.interact): added
3824 __IPYTHON__active to the builtins. It's a flag which goes on when
3831 __IPYTHON__active to the builtins. It's a flag which goes on when
3825 the interaction starts and goes off again when it stops. This
3832 the interaction starts and goes off again when it stops. This
3826 allows embedding code to detect being inside IPython. Before this
3833 allows embedding code to detect being inside IPython. Before this
3827 was done via __IPYTHON__, but that only shows that an IPython
3834 was done via __IPYTHON__, but that only shows that an IPython
3828 instance has been created.
3835 instance has been created.
3829
3836
3830 * IPython/Magic.py (Magic.magic_env): I realized that in a
3837 * IPython/Magic.py (Magic.magic_env): I realized that in a
3831 UserDict, instance.data holds the data as a normal dict. So I
3838 UserDict, instance.data holds the data as a normal dict. So I
3832 modified @env to return os.environ.data instead of rebuilding a
3839 modified @env to return os.environ.data instead of rebuilding a
3833 dict by hand.
3840 dict by hand.
3834
3841
3835 2002-11-02 Fernando Perez <fperez@colorado.edu>
3842 2002-11-02 Fernando Perez <fperez@colorado.edu>
3836
3843
3837 * IPython/genutils.py (warn): changed so that level 1 prints no
3844 * IPython/genutils.py (warn): changed so that level 1 prints no
3838 header. Level 2 is now the default (with 'WARNING' header, as
3845 header. Level 2 is now the default (with 'WARNING' header, as
3839 before). I think I tracked all places where changes were needed in
3846 before). I think I tracked all places where changes were needed in
3840 IPython, but outside code using the old level numbering may have
3847 IPython, but outside code using the old level numbering may have
3841 broken.
3848 broken.
3842
3849
3843 * IPython/iplib.py (InteractiveShell.runcode): added this to
3850 * IPython/iplib.py (InteractiveShell.runcode): added this to
3844 handle the tracebacks in SystemExit traps correctly. The previous
3851 handle the tracebacks in SystemExit traps correctly. The previous
3845 code (through interact) was printing more of the stack than
3852 code (through interact) was printing more of the stack than
3846 necessary, showing IPython internal code to the user.
3853 necessary, showing IPython internal code to the user.
3847
3854
3848 * IPython/UserConfig/ipythonrc.py: Made confirm_exit 1 by
3855 * IPython/UserConfig/ipythonrc.py: Made confirm_exit 1 by
3849 default. Now that the default at the confirmation prompt is yes,
3856 default. Now that the default at the confirmation prompt is yes,
3850 it's not so intrusive. François' argument that ipython sessions
3857 it's not so intrusive. François' argument that ipython sessions
3851 tend to be complex enough not to lose them from an accidental C-d,
3858 tend to be complex enough not to lose them from an accidental C-d,
3852 is a valid one.
3859 is a valid one.
3853
3860
3854 * IPython/iplib.py (InteractiveShell.interact): added a
3861 * IPython/iplib.py (InteractiveShell.interact): added a
3855 showtraceback() call to the SystemExit trap, and modified the exit
3862 showtraceback() call to the SystemExit trap, and modified the exit
3856 confirmation to have yes as the default.
3863 confirmation to have yes as the default.
3857
3864
3858 * IPython/UserConfig/ipythonrc.py: removed 'session' option from
3865 * IPython/UserConfig/ipythonrc.py: removed 'session' option from
3859 this file. It's been gone from the code for a long time, this was
3866 this file. It's been gone from the code for a long time, this was
3860 simply leftover junk.
3867 simply leftover junk.
3861
3868
3862 2002-11-01 Fernando Perez <fperez@colorado.edu>
3869 2002-11-01 Fernando Perez <fperez@colorado.edu>
3863
3870
3864 * IPython/UserConfig/ipythonrc.py: new confirm_exit option
3871 * IPython/UserConfig/ipythonrc.py: new confirm_exit option
3865 added. If set, IPython now traps EOF and asks for
3872 added. If set, IPython now traps EOF and asks for
3866 confirmation. After a request by François Pinard.
3873 confirmation. After a request by François Pinard.
3867
3874
3868 * IPython/Magic.py (Magic.magic_Exit): New @Exit and @Quit instead
3875 * IPython/Magic.py (Magic.magic_Exit): New @Exit and @Quit instead
3869 of @abort, and with a new (better) mechanism for handling the
3876 of @abort, and with a new (better) mechanism for handling the
3870 exceptions.
3877 exceptions.
3871
3878
3872 2002-10-27 Fernando Perez <fperez@colorado.edu>
3879 2002-10-27 Fernando Perez <fperez@colorado.edu>
3873
3880
3874 * IPython/usage.py (__doc__): updated the --help information and
3881 * IPython/usage.py (__doc__): updated the --help information and
3875 the ipythonrc file to indicate that -log generates
3882 the ipythonrc file to indicate that -log generates
3876 ./ipython.log. Also fixed the corresponding info in @logstart.
3883 ./ipython.log. Also fixed the corresponding info in @logstart.
3877 This and several other fixes in the manuals thanks to reports by
3884 This and several other fixes in the manuals thanks to reports by
3878 François Pinard <pinard-AT-iro.umontreal.ca>.
3885 François Pinard <pinard-AT-iro.umontreal.ca>.
3879
3886
3880 * IPython/Logger.py (Logger.switch_log): Fixed error message to
3887 * IPython/Logger.py (Logger.switch_log): Fixed error message to
3881 refer to @logstart (instead of @log, which doesn't exist).
3888 refer to @logstart (instead of @log, which doesn't exist).
3882
3889
3883 * IPython/iplib.py (InteractiveShell._prefilter): fixed
3890 * IPython/iplib.py (InteractiveShell._prefilter): fixed
3884 AttributeError crash. Thanks to Christopher Armstrong
3891 AttributeError crash. Thanks to Christopher Armstrong
3885 <radix-AT-twistedmatrix.com> for the report/fix. This bug had been
3892 <radix-AT-twistedmatrix.com> for the report/fix. This bug had been
3886 introduced recently (in 0.2.14pre37) with the fix to the eval
3893 introduced recently (in 0.2.14pre37) with the fix to the eval
3887 problem mentioned below.
3894 problem mentioned below.
3888
3895
3889 2002-10-17 Fernando Perez <fperez@colorado.edu>
3896 2002-10-17 Fernando Perez <fperez@colorado.edu>
3890
3897
3891 * IPython/ConfigLoader.py (ConfigLoader.load): Fixes for Windows
3898 * IPython/ConfigLoader.py (ConfigLoader.load): Fixes for Windows
3892 installation. Thanks to Leonardo Santagada <retype-AT-terra.com.br>.
3899 installation. Thanks to Leonardo Santagada <retype-AT-terra.com.br>.
3893
3900
3894 * IPython/iplib.py (InteractiveShell._prefilter): Many changes to
3901 * IPython/iplib.py (InteractiveShell._prefilter): Many changes to
3895 this function to fix a problem reported by Alex Schmolck. He saw
3902 this function to fix a problem reported by Alex Schmolck. He saw
3896 it with list comprehensions and generators, which were getting
3903 it with list comprehensions and generators, which were getting
3897 called twice. The real problem was an 'eval' call in testing for
3904 called twice. The real problem was an 'eval' call in testing for
3898 automagic which was evaluating the input line silently.
3905 automagic which was evaluating the input line silently.
3899
3906
3900 This is a potentially very nasty bug, if the input has side
3907 This is a potentially very nasty bug, if the input has side
3901 effects which must not be repeated. The code is much cleaner now,
3908 effects which must not be repeated. The code is much cleaner now,
3902 without any blanket 'except' left and with a regexp test for
3909 without any blanket 'except' left and with a regexp test for
3903 actual function names.
3910 actual function names.
3904
3911
3905 But an eval remains, which I'm not fully comfortable with. I just
3912 But an eval remains, which I'm not fully comfortable with. I just
3906 don't know how to find out if an expression could be a callable in
3913 don't know how to find out if an expression could be a callable in
3907 the user's namespace without doing an eval on the string. However
3914 the user's namespace without doing an eval on the string. However
3908 that string is now much more strictly checked so that no code
3915 that string is now much more strictly checked so that no code
3909 slips by, so the eval should only happen for things that can
3916 slips by, so the eval should only happen for things that can
3910 really be only function/method names.
3917 really be only function/method names.
3911
3918
3912 2002-10-15 Fernando Perez <fperez@colorado.edu>
3919 2002-10-15 Fernando Perez <fperez@colorado.edu>
3913
3920
3914 * Updated LyX to 1.2.1 so I can work on the docs again. Added Mac
3921 * Updated LyX to 1.2.1 so I can work on the docs again. Added Mac
3915 OSX information to main manual, removed README_Mac_OSX file from
3922 OSX information to main manual, removed README_Mac_OSX file from
3916 distribution. Also updated credits for recent additions.
3923 distribution. Also updated credits for recent additions.
3917
3924
3918 2002-10-10 Fernando Perez <fperez@colorado.edu>
3925 2002-10-10 Fernando Perez <fperez@colorado.edu>
3919
3926
3920 * README_Mac_OSX: Added a README for Mac OSX users for fixing
3927 * README_Mac_OSX: Added a README for Mac OSX users for fixing
3921 terminal-related issues. Many thanks to Andrea Riciputi
3928 terminal-related issues. Many thanks to Andrea Riciputi
3922 <andrea.riciputi-AT-libero.it> for writing it.
3929 <andrea.riciputi-AT-libero.it> for writing it.
3923
3930
3924 * IPython/UserConfig/ipythonrc.py: Fixes to various small issues,
3931 * IPython/UserConfig/ipythonrc.py: Fixes to various small issues,
3925 thanks to Thorsten Kampe <thorsten-AT-thorstenkampe.de>.
3932 thanks to Thorsten Kampe <thorsten-AT-thorstenkampe.de>.
3926
3933
3927 * setup.py (make_shortcut): Fixes for Windows installation. Thanks
3934 * setup.py (make_shortcut): Fixes for Windows installation. Thanks
3928 to Fredrik Kant <fredrik.kant-AT-front.com> and Syver Enstad
3935 to Fredrik Kant <fredrik.kant-AT-front.com> and Syver Enstad
3929 <syver-en-AT-online.no> who both submitted patches for this problem.
3936 <syver-en-AT-online.no> who both submitted patches for this problem.
3930
3937
3931 * IPython/iplib.py (InteractiveShell.embed_mainloop): Patch for
3938 * IPython/iplib.py (InteractiveShell.embed_mainloop): Patch for
3932 global embedding to make sure that things don't overwrite user
3939 global embedding to make sure that things don't overwrite user
3933 globals accidentally. Thanks to Richard <rxe-AT-renre-europe.com>
3940 globals accidentally. Thanks to Richard <rxe-AT-renre-europe.com>
3934
3941
3935 * IPython/Gnuplot2.py (gp): Patch for Gnuplot.py 1.6
3942 * IPython/Gnuplot2.py (gp): Patch for Gnuplot.py 1.6
3936 compatibility. Thanks to Hayden Callow
3943 compatibility. Thanks to Hayden Callow
3937 <h.callow-AT-elec.canterbury.ac.nz>
3944 <h.callow-AT-elec.canterbury.ac.nz>
3938
3945
3939 2002-10-04 Fernando Perez <fperez@colorado.edu>
3946 2002-10-04 Fernando Perez <fperez@colorado.edu>
3940
3947
3941 * IPython/Gnuplot2.py (PlotItem): Added 'index' option for
3948 * IPython/Gnuplot2.py (PlotItem): Added 'index' option for
3942 Gnuplot.File objects.
3949 Gnuplot.File objects.
3943
3950
3944 2002-07-23 Fernando Perez <fperez@colorado.edu>
3951 2002-07-23 Fernando Perez <fperez@colorado.edu>
3945
3952
3946 * IPython/genutils.py (timing): Added timings() and timing() for
3953 * IPython/genutils.py (timing): Added timings() and timing() for
3947 quick access to the most commonly needed data, the execution
3954 quick access to the most commonly needed data, the execution
3948 times. Old timing() renamed to timings_out().
3955 times. Old timing() renamed to timings_out().
3949
3956
3950 2002-07-18 Fernando Perez <fperez@colorado.edu>
3957 2002-07-18 Fernando Perez <fperez@colorado.edu>
3951
3958
3952 * IPython/Shell.py (IPShellEmbed.restore_system_completer): fixed
3959 * IPython/Shell.py (IPShellEmbed.restore_system_completer): fixed
3953 bug with nested instances disrupting the parent's tab completion.
3960 bug with nested instances disrupting the parent's tab completion.
3954
3961
3955 * IPython/iplib.py (all_completions): Added Alex Schmolck's
3962 * IPython/iplib.py (all_completions): Added Alex Schmolck's
3956 all_completions code to begin the emacs integration.
3963 all_completions code to begin the emacs integration.
3957
3964
3958 * IPython/Gnuplot2.py (zip_items): Added optional 'titles'
3965 * IPython/Gnuplot2.py (zip_items): Added optional 'titles'
3959 argument to allow titling individual arrays when plotting.
3966 argument to allow titling individual arrays when plotting.
3960
3967
3961 2002-07-15 Fernando Perez <fperez@colorado.edu>
3968 2002-07-15 Fernando Perez <fperez@colorado.edu>
3962
3969
3963 * setup.py (make_shortcut): changed to retrieve the value of
3970 * setup.py (make_shortcut): changed to retrieve the value of
3964 'Program Files' directory from the registry (this value changes in
3971 'Program Files' directory from the registry (this value changes in
3965 non-english versions of Windows). Thanks to Thomas Fanslau
3972 non-english versions of Windows). Thanks to Thomas Fanslau
3966 <tfanslau-AT-gmx.de> for the report.
3973 <tfanslau-AT-gmx.de> for the report.
3967
3974
3968 2002-07-10 Fernando Perez <fperez@colorado.edu>
3975 2002-07-10 Fernando Perez <fperez@colorado.edu>
3969
3976
3970 * IPython/ultraTB.py (VerboseTB.debugger): enabled workaround for
3977 * IPython/ultraTB.py (VerboseTB.debugger): enabled workaround for
3971 a bug in pdb, which crashes if a line with only whitespace is
3978 a bug in pdb, which crashes if a line with only whitespace is
3972 entered. Bug report submitted to sourceforge.
3979 entered. Bug report submitted to sourceforge.
3973
3980
3974 2002-07-09 Fernando Perez <fperez@colorado.edu>
3981 2002-07-09 Fernando Perez <fperez@colorado.edu>
3975
3982
3976 * IPython/ultraTB.py (VerboseTB.nullrepr): fixed rare crash when
3983 * IPython/ultraTB.py (VerboseTB.nullrepr): fixed rare crash when
3977 reporting exceptions (it's a bug in inspect.py, I just set a
3984 reporting exceptions (it's a bug in inspect.py, I just set a
3978 workaround).
3985 workaround).
3979
3986
3980 2002-07-08 Fernando Perez <fperez@colorado.edu>
3987 2002-07-08 Fernando Perez <fperez@colorado.edu>
3981
3988
3982 * IPython/iplib.py (InteractiveShell.__init__): fixed reference to
3989 * IPython/iplib.py (InteractiveShell.__init__): fixed reference to
3983 __IPYTHON__ in __builtins__ to show up in user_ns.
3990 __IPYTHON__ in __builtins__ to show up in user_ns.
3984
3991
3985 2002-07-03 Fernando Perez <fperez@colorado.edu>
3992 2002-07-03 Fernando Perez <fperez@colorado.edu>
3986
3993
3987 * IPython/GnuplotInteractive.py (magic_gp_set_default): changed
3994 * IPython/GnuplotInteractive.py (magic_gp_set_default): changed
3988 name from @gp_set_instance to @gp_set_default.
3995 name from @gp_set_instance to @gp_set_default.
3989
3996
3990 * IPython/ipmaker.py (make_IPython): default editor value set to
3997 * IPython/ipmaker.py (make_IPython): default editor value set to
3991 '0' (a string), to match the rc file. Otherwise will crash when
3998 '0' (a string), to match the rc file. Otherwise will crash when
3992 .strip() is called on it.
3999 .strip() is called on it.
3993
4000
3994
4001
3995 2002-06-28 Fernando Perez <fperez@colorado.edu>
4002 2002-06-28 Fernando Perez <fperez@colorado.edu>
3996
4003
3997 * IPython/iplib.py (InteractiveShell.safe_execfile): fix importing
4004 * IPython/iplib.py (InteractiveShell.safe_execfile): fix importing
3998 of files in current directory when a file is executed via
4005 of files in current directory when a file is executed via
3999 @run. Patch also by RA <ralf_ahlbrink-AT-web.de>.
4006 @run. Patch also by RA <ralf_ahlbrink-AT-web.de>.
4000
4007
4001 * setup.py (manfiles): fix for rpm builds, submitted by RA
4008 * setup.py (manfiles): fix for rpm builds, submitted by RA
4002 <ralf_ahlbrink-AT-web.de>. Now we have RPMs!
4009 <ralf_ahlbrink-AT-web.de>. Now we have RPMs!
4003
4010
4004 * IPython/ipmaker.py (make_IPython): fixed lookup of default
4011 * IPython/ipmaker.py (make_IPython): fixed lookup of default
4005 editor when set to '0'. Problem was, '0' evaluates to True (it's a
4012 editor when set to '0'. Problem was, '0' evaluates to True (it's a
4006 string!). A. Schmolck caught this one.
4013 string!). A. Schmolck caught this one.
4007
4014
4008 2002-06-27 Fernando Perez <fperez@colorado.edu>
4015 2002-06-27 Fernando Perez <fperez@colorado.edu>
4009
4016
4010 * IPython/ipmaker.py (make_IPython): fixed bug when running user
4017 * IPython/ipmaker.py (make_IPython): fixed bug when running user
4011 defined files at the cmd line. __name__ wasn't being set to
4018 defined files at the cmd line. __name__ wasn't being set to
4012 __main__.
4019 __main__.
4013
4020
4014 * IPython/Gnuplot2.py (zip_items): improved it so it can plot also
4021 * IPython/Gnuplot2.py (zip_items): improved it so it can plot also
4015 regular lists and tuples besides Numeric arrays.
4022 regular lists and tuples besides Numeric arrays.
4016
4023
4017 * IPython/Prompts.py (CachedOutput.__call__): Added output
4024 * IPython/Prompts.py (CachedOutput.__call__): Added output
4018 supression for input ending with ';'. Similar to Mathematica and
4025 supression for input ending with ';'. Similar to Mathematica and
4019 Matlab. The _* vars and Out[] list are still updated, just like
4026 Matlab. The _* vars and Out[] list are still updated, just like
4020 Mathematica behaves.
4027 Mathematica behaves.
4021
4028
4022 2002-06-25 Fernando Perez <fperez@colorado.edu>
4029 2002-06-25 Fernando Perez <fperez@colorado.edu>
4023
4030
4024 * IPython/ConfigLoader.py (ConfigLoader.load): fixed checking of
4031 * IPython/ConfigLoader.py (ConfigLoader.load): fixed checking of
4025 .ini extensions for profiels under Windows.
4032 .ini extensions for profiels under Windows.
4026
4033
4027 * IPython/OInspect.py (Inspector.pinfo): improved alignment of
4034 * IPython/OInspect.py (Inspector.pinfo): improved alignment of
4028 string form. Fix contributed by Alexander Schmolck
4035 string form. Fix contributed by Alexander Schmolck
4029 <a.schmolck-AT-gmx.net>
4036 <a.schmolck-AT-gmx.net>
4030
4037
4031 * IPython/GnuplotRuntime.py (gp_new): new function. Returns a
4038 * IPython/GnuplotRuntime.py (gp_new): new function. Returns a
4032 pre-configured Gnuplot instance.
4039 pre-configured Gnuplot instance.
4033
4040
4034 2002-06-21 Fernando Perez <fperez@colorado.edu>
4041 2002-06-21 Fernando Perez <fperez@colorado.edu>
4035
4042
4036 * IPython/numutils.py (exp_safe): new function, works around the
4043 * IPython/numutils.py (exp_safe): new function, works around the
4037 underflow problems in Numeric.
4044 underflow problems in Numeric.
4038 (log2): New fn. Safe log in base 2: returns exact integer answer
4045 (log2): New fn. Safe log in base 2: returns exact integer answer
4039 for exact integer powers of 2.
4046 for exact integer powers of 2.
4040
4047
4041 * IPython/Magic.py (get_py_filename): fixed it not expanding '~'
4048 * IPython/Magic.py (get_py_filename): fixed it not expanding '~'
4042 properly.
4049 properly.
4043
4050
4044 2002-06-20 Fernando Perez <fperez@colorado.edu>
4051 2002-06-20 Fernando Perez <fperez@colorado.edu>
4045
4052
4046 * IPython/genutils.py (timing): new function like
4053 * IPython/genutils.py (timing): new function like
4047 Mathematica's. Similar to time_test, but returns more info.
4054 Mathematica's. Similar to time_test, but returns more info.
4048
4055
4049 2002-06-18 Fernando Perez <fperez@colorado.edu>
4056 2002-06-18 Fernando Perez <fperez@colorado.edu>
4050
4057
4051 * IPython/Magic.py (Magic.magic_save): modified @save and @r
4058 * IPython/Magic.py (Magic.magic_save): modified @save and @r
4052 according to Mike Heeter's suggestions.
4059 according to Mike Heeter's suggestions.
4053
4060
4054 2002-06-16 Fernando Perez <fperez@colorado.edu>
4061 2002-06-16 Fernando Perez <fperez@colorado.edu>
4055
4062
4056 * IPython/GnuplotRuntime.py: Massive overhaul to the Gnuplot
4063 * IPython/GnuplotRuntime.py: Massive overhaul to the Gnuplot
4057 system. GnuplotMagic is gone as a user-directory option. New files
4064 system. GnuplotMagic is gone as a user-directory option. New files
4058 make it easier to use all the gnuplot stuff both from external
4065 make it easier to use all the gnuplot stuff both from external
4059 programs as well as from IPython. Had to rewrite part of
4066 programs as well as from IPython. Had to rewrite part of
4060 hardcopy() b/c of a strange bug: often the ps files simply don't
4067 hardcopy() b/c of a strange bug: often the ps files simply don't
4061 get created, and require a repeat of the command (often several
4068 get created, and require a repeat of the command (often several
4062 times).
4069 times).
4063
4070
4064 * IPython/ultraTB.py (AutoFormattedTB.__call__): changed to
4071 * IPython/ultraTB.py (AutoFormattedTB.__call__): changed to
4065 resolve output channel at call time, so that if sys.stderr has
4072 resolve output channel at call time, so that if sys.stderr has
4066 been redirected by user this gets honored.
4073 been redirected by user this gets honored.
4067
4074
4068 2002-06-13 Fernando Perez <fperez@colorado.edu>
4075 2002-06-13 Fernando Perez <fperez@colorado.edu>
4069
4076
4070 * IPython/Shell.py (IPShell.__init__): Changed IPythonShell to
4077 * IPython/Shell.py (IPShell.__init__): Changed IPythonShell to
4071 IPShell. Kept a copy with the old names to avoid breaking people's
4078 IPShell. Kept a copy with the old names to avoid breaking people's
4072 embedded code.
4079 embedded code.
4073
4080
4074 * IPython/ipython: simplified it to the bare minimum after
4081 * IPython/ipython: simplified it to the bare minimum after
4075 Holger's suggestions. Added info about how to use it in
4082 Holger's suggestions. Added info about how to use it in
4076 PYTHONSTARTUP.
4083 PYTHONSTARTUP.
4077
4084
4078 * IPython/Shell.py (IPythonShell): changed the options passing
4085 * IPython/Shell.py (IPythonShell): changed the options passing
4079 from a string with funky %s replacements to a straight list. Maybe
4086 from a string with funky %s replacements to a straight list. Maybe
4080 a bit more typing, but it follows sys.argv conventions, so there's
4087 a bit more typing, but it follows sys.argv conventions, so there's
4081 less special-casing to remember.
4088 less special-casing to remember.
4082
4089
4083 2002-06-12 Fernando Perez <fperez@colorado.edu>
4090 2002-06-12 Fernando Perez <fperez@colorado.edu>
4084
4091
4085 * IPython/Magic.py (Magic.magic_r): new magic auto-repeat
4092 * IPython/Magic.py (Magic.magic_r): new magic auto-repeat
4086 command. Thanks to a suggestion by Mike Heeter.
4093 command. Thanks to a suggestion by Mike Heeter.
4087 (Magic.magic_pfile): added behavior to look at filenames if given
4094 (Magic.magic_pfile): added behavior to look at filenames if given
4088 arg is not a defined object.
4095 arg is not a defined object.
4089 (Magic.magic_save): New @save function to save code snippets. Also
4096 (Magic.magic_save): New @save function to save code snippets. Also
4090 a Mike Heeter idea.
4097 a Mike Heeter idea.
4091
4098
4092 * IPython/UserConfig/GnuplotMagic.py (plot): Improvements to
4099 * IPython/UserConfig/GnuplotMagic.py (plot): Improvements to
4093 plot() and replot(). Much more convenient now, especially for
4100 plot() and replot(). Much more convenient now, especially for
4094 interactive use.
4101 interactive use.
4095
4102
4096 * IPython/Magic.py (Magic.magic_run): Added .py automatically to
4103 * IPython/Magic.py (Magic.magic_run): Added .py automatically to
4097 filenames.
4104 filenames.
4098
4105
4099 2002-06-02 Fernando Perez <fperez@colorado.edu>
4106 2002-06-02 Fernando Perez <fperez@colorado.edu>
4100
4107
4101 * IPython/Struct.py (Struct.__init__): modified to admit
4108 * IPython/Struct.py (Struct.__init__): modified to admit
4102 initialization via another struct.
4109 initialization via another struct.
4103
4110
4104 * IPython/genutils.py (SystemExec.__init__): New stateful
4111 * IPython/genutils.py (SystemExec.__init__): New stateful
4105 interface to xsys and bq. Useful for writing system scripts.
4112 interface to xsys and bq. Useful for writing system scripts.
4106
4113
4107 2002-05-30 Fernando Perez <fperez@colorado.edu>
4114 2002-05-30 Fernando Perez <fperez@colorado.edu>
4108
4115
4109 * MANIFEST.in: Changed docfile selection to exclude all the lyx
4116 * MANIFEST.in: Changed docfile selection to exclude all the lyx
4110 documents. This will make the user download smaller (it's getting
4117 documents. This will make the user download smaller (it's getting
4111 too big).
4118 too big).
4112
4119
4113 2002-05-29 Fernando Perez <fperez@colorado.edu>
4120 2002-05-29 Fernando Perez <fperez@colorado.edu>
4114
4121
4115 * IPython/iplib.py (_FakeModule.__init__): New class introduced to
4122 * IPython/iplib.py (_FakeModule.__init__): New class introduced to
4116 fix problems with shelve and pickle. Seems to work, but I don't
4123 fix problems with shelve and pickle. Seems to work, but I don't
4117 know if corner cases break it. Thanks to Mike Heeter
4124 know if corner cases break it. Thanks to Mike Heeter
4118 <korora-AT-SDF.LONESTAR.ORG> for the bug reports and test cases.
4125 <korora-AT-SDF.LONESTAR.ORG> for the bug reports and test cases.
4119
4126
4120 2002-05-24 Fernando Perez <fperez@colorado.edu>
4127 2002-05-24 Fernando Perez <fperez@colorado.edu>
4121
4128
4122 * IPython/Magic.py (Macro.__init__): fixed magics embedded in
4129 * IPython/Magic.py (Macro.__init__): fixed magics embedded in
4123 macros having broken.
4130 macros having broken.
4124
4131
4125 2002-05-21 Fernando Perez <fperez@colorado.edu>
4132 2002-05-21 Fernando Perez <fperez@colorado.edu>
4126
4133
4127 * IPython/Magic.py (Magic.magic_logstart): fixed recently
4134 * IPython/Magic.py (Magic.magic_logstart): fixed recently
4128 introduced logging bug: all history before logging started was
4135 introduced logging bug: all history before logging started was
4129 being written one character per line! This came from the redesign
4136 being written one character per line! This came from the redesign
4130 of the input history as a special list which slices to strings,
4137 of the input history as a special list which slices to strings,
4131 not to lists.
4138 not to lists.
4132
4139
4133 2002-05-20 Fernando Perez <fperez@colorado.edu>
4140 2002-05-20 Fernando Perez <fperez@colorado.edu>
4134
4141
4135 * IPython/Prompts.py (CachedOutput.__init__): made the color table
4142 * IPython/Prompts.py (CachedOutput.__init__): made the color table
4136 be an attribute of all classes in this module. The design of these
4143 be an attribute of all classes in this module. The design of these
4137 classes needs some serious overhauling.
4144 classes needs some serious overhauling.
4138
4145
4139 * IPython/DPyGetOpt.py (DPyGetOpt.setPosixCompliance): fixed bug
4146 * IPython/DPyGetOpt.py (DPyGetOpt.setPosixCompliance): fixed bug
4140 which was ignoring '_' in option names.
4147 which was ignoring '_' in option names.
4141
4148
4142 * IPython/ultraTB.py (FormattedTB.__init__): Changed
4149 * IPython/ultraTB.py (FormattedTB.__init__): Changed
4143 'Verbose_novars' to 'Context' and made it the new default. It's a
4150 'Verbose_novars' to 'Context' and made it the new default. It's a
4144 bit more readable and also safer than verbose.
4151 bit more readable and also safer than verbose.
4145
4152
4146 * IPython/PyColorize.py (Parser.__call__): Fixed coloring of
4153 * IPython/PyColorize.py (Parser.__call__): Fixed coloring of
4147 triple-quoted strings.
4154 triple-quoted strings.
4148
4155
4149 * IPython/OInspect.py (__all__): new module exposing the object
4156 * IPython/OInspect.py (__all__): new module exposing the object
4150 introspection facilities. Now the corresponding magics are dummy
4157 introspection facilities. Now the corresponding magics are dummy
4151 wrappers around this. Having this module will make it much easier
4158 wrappers around this. Having this module will make it much easier
4152 to put these functions into our modified pdb.
4159 to put these functions into our modified pdb.
4153 This new object inspector system uses the new colorizing module,
4160 This new object inspector system uses the new colorizing module,
4154 so source code and other things are nicely syntax highlighted.
4161 so source code and other things are nicely syntax highlighted.
4155
4162
4156 2002-05-18 Fernando Perez <fperez@colorado.edu>
4163 2002-05-18 Fernando Perez <fperez@colorado.edu>
4157
4164
4158 * IPython/ColorANSI.py: Split the coloring tools into a separate
4165 * IPython/ColorANSI.py: Split the coloring tools into a separate
4159 module so I can use them in other code easier (they were part of
4166 module so I can use them in other code easier (they were part of
4160 ultraTB).
4167 ultraTB).
4161
4168
4162 2002-05-17 Fernando Perez <fperez@colorado.edu>
4169 2002-05-17 Fernando Perez <fperez@colorado.edu>
4163
4170
4164 * IPython/UserConfig/GnuplotMagic.py (magic_gp_set_instance):
4171 * IPython/UserConfig/GnuplotMagic.py (magic_gp_set_instance):
4165 fixed it to set the global 'g' also to the called instance, as
4172 fixed it to set the global 'g' also to the called instance, as
4166 long as 'g' was still a gnuplot instance (so it doesn't overwrite
4173 long as 'g' was still a gnuplot instance (so it doesn't overwrite
4167 user's 'g' variables).
4174 user's 'g' variables).
4168
4175
4169 * IPython/iplib.py (InteractiveShell.__init__): Added In/Out
4176 * IPython/iplib.py (InteractiveShell.__init__): Added In/Out
4170 global variables (aliases to _ih,_oh) so that users which expect
4177 global variables (aliases to _ih,_oh) so that users which expect
4171 In[5] or Out[7] to work aren't unpleasantly surprised.
4178 In[5] or Out[7] to work aren't unpleasantly surprised.
4172 (InputList.__getslice__): new class to allow executing slices of
4179 (InputList.__getslice__): new class to allow executing slices of
4173 input history directly. Very simple class, complements the use of
4180 input history directly. Very simple class, complements the use of
4174 macros.
4181 macros.
4175
4182
4176 2002-05-16 Fernando Perez <fperez@colorado.edu>
4183 2002-05-16 Fernando Perez <fperez@colorado.edu>
4177
4184
4178 * setup.py (docdirbase): make doc directory be just doc/IPython
4185 * setup.py (docdirbase): make doc directory be just doc/IPython
4179 without version numbers, it will reduce clutter for users.
4186 without version numbers, it will reduce clutter for users.
4180
4187
4181 * IPython/Magic.py (Magic.magic_run): Add explicit local dict to
4188 * IPython/Magic.py (Magic.magic_run): Add explicit local dict to
4182 execfile call to prevent possible memory leak. See for details:
4189 execfile call to prevent possible memory leak. See for details:
4183 http://mail.python.org/pipermail/python-list/2002-February/088476.html
4190 http://mail.python.org/pipermail/python-list/2002-February/088476.html
4184
4191
4185 2002-05-15 Fernando Perez <fperez@colorado.edu>
4192 2002-05-15 Fernando Perez <fperez@colorado.edu>
4186
4193
4187 * IPython/Magic.py (Magic.magic_psource): made the object
4194 * IPython/Magic.py (Magic.magic_psource): made the object
4188 introspection names be more standard: pdoc, pdef, pfile and
4195 introspection names be more standard: pdoc, pdef, pfile and
4189 psource. They all print/page their output, and it makes
4196 psource. They all print/page their output, and it makes
4190 remembering them easier. Kept old names for compatibility as
4197 remembering them easier. Kept old names for compatibility as
4191 aliases.
4198 aliases.
4192
4199
4193 2002-05-14 Fernando Perez <fperez@colorado.edu>
4200 2002-05-14 Fernando Perez <fperez@colorado.edu>
4194
4201
4195 * IPython/UserConfig/GnuplotMagic.py: I think I finally understood
4202 * IPython/UserConfig/GnuplotMagic.py: I think I finally understood
4196 what the mouse problem was. The trick is to use gnuplot with temp
4203 what the mouse problem was. The trick is to use gnuplot with temp
4197 files and NOT with pipes (for data communication), because having
4204 files and NOT with pipes (for data communication), because having
4198 both pipes and the mouse on is bad news.
4205 both pipes and the mouse on is bad news.
4199
4206
4200 2002-05-13 Fernando Perez <fperez@colorado.edu>
4207 2002-05-13 Fernando Perez <fperez@colorado.edu>
4201
4208
4202 * IPython/Magic.py (Magic._ofind): fixed namespace order search
4209 * IPython/Magic.py (Magic._ofind): fixed namespace order search
4203 bug. Information would be reported about builtins even when
4210 bug. Information would be reported about builtins even when
4204 user-defined functions overrode them.
4211 user-defined functions overrode them.
4205
4212
4206 2002-05-11 Fernando Perez <fperez@colorado.edu>
4213 2002-05-11 Fernando Perez <fperez@colorado.edu>
4207
4214
4208 * IPython/__init__.py (__all__): removed FlexCompleter from
4215 * IPython/__init__.py (__all__): removed FlexCompleter from
4209 __all__ so that things don't fail in platforms without readline.
4216 __all__ so that things don't fail in platforms without readline.
4210
4217
4211 2002-05-10 Fernando Perez <fperez@colorado.edu>
4218 2002-05-10 Fernando Perez <fperez@colorado.edu>
4212
4219
4213 * IPython/__init__.py (__all__): removed numutils from __all__ b/c
4220 * IPython/__init__.py (__all__): removed numutils from __all__ b/c
4214 it requires Numeric, effectively making Numeric a dependency for
4221 it requires Numeric, effectively making Numeric a dependency for
4215 IPython.
4222 IPython.
4216
4223
4217 * Released 0.2.13
4224 * Released 0.2.13
4218
4225
4219 * IPython/Magic.py (Magic.magic_prun): big overhaul to the
4226 * IPython/Magic.py (Magic.magic_prun): big overhaul to the
4220 profiler interface. Now all the major options from the profiler
4227 profiler interface. Now all the major options from the profiler
4221 module are directly supported in IPython, both for single
4228 module are directly supported in IPython, both for single
4222 expressions (@prun) and for full programs (@run -p).
4229 expressions (@prun) and for full programs (@run -p).
4223
4230
4224 2002-05-09 Fernando Perez <fperez@colorado.edu>
4231 2002-05-09 Fernando Perez <fperez@colorado.edu>
4225
4232
4226 * IPython/Magic.py (Magic.magic_doc): fixed to show docstrings of
4233 * IPython/Magic.py (Magic.magic_doc): fixed to show docstrings of
4227 magic properly formatted for screen.
4234 magic properly formatted for screen.
4228
4235
4229 * setup.py (make_shortcut): Changed things to put pdf version in
4236 * setup.py (make_shortcut): Changed things to put pdf version in
4230 doc/ instead of doc/manual (had to change lyxport a bit).
4237 doc/ instead of doc/manual (had to change lyxport a bit).
4231
4238
4232 * IPython/Magic.py (Profile.string_stats): made profile runs go
4239 * IPython/Magic.py (Profile.string_stats): made profile runs go
4233 through pager (they are long and a pager allows searching, saving,
4240 through pager (they are long and a pager allows searching, saving,
4234 etc.)
4241 etc.)
4235
4242
4236 2002-05-08 Fernando Perez <fperez@colorado.edu>
4243 2002-05-08 Fernando Perez <fperez@colorado.edu>
4237
4244
4238 * Released 0.2.12
4245 * Released 0.2.12
4239
4246
4240 2002-05-06 Fernando Perez <fperez@colorado.edu>
4247 2002-05-06 Fernando Perez <fperez@colorado.edu>
4241
4248
4242 * IPython/Magic.py (Magic.magic_hist): small bug fixed (recently
4249 * IPython/Magic.py (Magic.magic_hist): small bug fixed (recently
4243 introduced); 'hist n1 n2' was broken.
4250 introduced); 'hist n1 n2' was broken.
4244 (Magic.magic_pdb): added optional on/off arguments to @pdb
4251 (Magic.magic_pdb): added optional on/off arguments to @pdb
4245 (Magic.magic_run): added option -i to @run, which executes code in
4252 (Magic.magic_run): added option -i to @run, which executes code in
4246 the IPython namespace instead of a clean one. Also added @irun as
4253 the IPython namespace instead of a clean one. Also added @irun as
4247 an alias to @run -i.
4254 an alias to @run -i.
4248
4255
4249 * IPython/UserConfig/GnuplotMagic.py (magic_gp_set_instance):
4256 * IPython/UserConfig/GnuplotMagic.py (magic_gp_set_instance):
4250 fixed (it didn't really do anything, the namespaces were wrong).
4257 fixed (it didn't really do anything, the namespaces were wrong).
4251
4258
4252 * IPython/Debugger.py (__init__): Added workaround for python 2.1
4259 * IPython/Debugger.py (__init__): Added workaround for python 2.1
4253
4260
4254 * IPython/__init__.py (__all__): Fixed package namespace, now
4261 * IPython/__init__.py (__all__): Fixed package namespace, now
4255 'import IPython' does give access to IPython.<all> as
4262 'import IPython' does give access to IPython.<all> as
4256 expected. Also renamed __release__ to Release.
4263 expected. Also renamed __release__ to Release.
4257
4264
4258 * IPython/Debugger.py (__license__): created new Pdb class which
4265 * IPython/Debugger.py (__license__): created new Pdb class which
4259 functions like a drop-in for the normal pdb.Pdb but does NOT
4266 functions like a drop-in for the normal pdb.Pdb but does NOT
4260 import readline by default. This way it doesn't muck up IPython's
4267 import readline by default. This way it doesn't muck up IPython's
4261 readline handling, and now tab-completion finally works in the
4268 readline handling, and now tab-completion finally works in the
4262 debugger -- sort of. It completes things globally visible, but the
4269 debugger -- sort of. It completes things globally visible, but the
4263 completer doesn't track the stack as pdb walks it. That's a bit
4270 completer doesn't track the stack as pdb walks it. That's a bit
4264 tricky, and I'll have to implement it later.
4271 tricky, and I'll have to implement it later.
4265
4272
4266 2002-05-05 Fernando Perez <fperez@colorado.edu>
4273 2002-05-05 Fernando Perez <fperez@colorado.edu>
4267
4274
4268 * IPython/Magic.py (Magic.magic_oinfo): fixed formatting bug for
4275 * IPython/Magic.py (Magic.magic_oinfo): fixed formatting bug for
4269 magic docstrings when printed via ? (explicit \'s were being
4276 magic docstrings when printed via ? (explicit \'s were being
4270 printed).
4277 printed).
4271
4278
4272 * IPython/ipmaker.py (make_IPython): fixed namespace
4279 * IPython/ipmaker.py (make_IPython): fixed namespace
4273 identification bug. Now variables loaded via logs or command-line
4280 identification bug. Now variables loaded via logs or command-line
4274 files are recognized in the interactive namespace by @who.
4281 files are recognized in the interactive namespace by @who.
4275
4282
4276 * IPython/iplib.py (InteractiveShell.safe_execfile): Fixed bug in
4283 * IPython/iplib.py (InteractiveShell.safe_execfile): Fixed bug in
4277 log replay system stemming from the string form of Structs.
4284 log replay system stemming from the string form of Structs.
4278
4285
4279 * IPython/Magic.py (Macro.__init__): improved macros to properly
4286 * IPython/Magic.py (Macro.__init__): improved macros to properly
4280 handle magic commands in them.
4287 handle magic commands in them.
4281 (Magic.magic_logstart): usernames are now expanded so 'logstart
4288 (Magic.magic_logstart): usernames are now expanded so 'logstart
4282 ~/mylog' now works.
4289 ~/mylog' now works.
4283
4290
4284 * IPython/iplib.py (complete): fixed bug where paths starting with
4291 * IPython/iplib.py (complete): fixed bug where paths starting with
4285 '/' would be completed as magic names.
4292 '/' would be completed as magic names.
4286
4293
4287 2002-05-04 Fernando Perez <fperez@colorado.edu>
4294 2002-05-04 Fernando Perez <fperez@colorado.edu>
4288
4295
4289 * IPython/Magic.py (Magic.magic_run): added options -p and -f to
4296 * IPython/Magic.py (Magic.magic_run): added options -p and -f to
4290 allow running full programs under the profiler's control.
4297 allow running full programs under the profiler's control.
4291
4298
4292 * IPython/ultraTB.py (FormattedTB.__init__): Added Verbose_novars
4299 * IPython/ultraTB.py (FormattedTB.__init__): Added Verbose_novars
4293 mode to report exceptions verbosely but without formatting
4300 mode to report exceptions verbosely but without formatting
4294 variables. This addresses the issue of ipython 'freezing' (it's
4301 variables. This addresses the issue of ipython 'freezing' (it's
4295 not frozen, but caught in an expensive formatting loop) when huge
4302 not frozen, but caught in an expensive formatting loop) when huge
4296 variables are in the context of an exception.
4303 variables are in the context of an exception.
4297 (VerboseTB.text): Added '--->' markers at line where exception was
4304 (VerboseTB.text): Added '--->' markers at line where exception was
4298 triggered. Much clearer to read, especially in NoColor modes.
4305 triggered. Much clearer to read, especially in NoColor modes.
4299
4306
4300 * IPython/Magic.py (Magic.magic_run): bugfix: -n option had been
4307 * IPython/Magic.py (Magic.magic_run): bugfix: -n option had been
4301 implemented in reverse when changing to the new parse_options().
4308 implemented in reverse when changing to the new parse_options().
4302
4309
4303 2002-05-03 Fernando Perez <fperez@colorado.edu>
4310 2002-05-03 Fernando Perez <fperez@colorado.edu>
4304
4311
4305 * IPython/Magic.py (Magic.parse_options): new function so that
4312 * IPython/Magic.py (Magic.parse_options): new function so that
4306 magics can parse options easier.
4313 magics can parse options easier.
4307 (Magic.magic_prun): new function similar to profile.run(),
4314 (Magic.magic_prun): new function similar to profile.run(),
4308 suggested by Chris Hart.
4315 suggested by Chris Hart.
4309 (Magic.magic_cd): fixed behavior so that it only changes if
4316 (Magic.magic_cd): fixed behavior so that it only changes if
4310 directory actually is in history.
4317 directory actually is in history.
4311
4318
4312 * IPython/usage.py (__doc__): added information about potential
4319 * IPython/usage.py (__doc__): added information about potential
4313 slowness of Verbose exception mode when there are huge data
4320 slowness of Verbose exception mode when there are huge data
4314 structures to be formatted (thanks to Archie Paulson).
4321 structures to be formatted (thanks to Archie Paulson).
4315
4322
4316 * IPython/ipmaker.py (make_IPython): Changed default logging
4323 * IPython/ipmaker.py (make_IPython): Changed default logging
4317 (when simply called with -log) to use curr_dir/ipython.log in
4324 (when simply called with -log) to use curr_dir/ipython.log in
4318 rotate mode. Fixed crash which was occuring with -log before
4325 rotate mode. Fixed crash which was occuring with -log before
4319 (thanks to Jim Boyle).
4326 (thanks to Jim Boyle).
4320
4327
4321 2002-05-01 Fernando Perez <fperez@colorado.edu>
4328 2002-05-01 Fernando Perez <fperez@colorado.edu>
4322
4329
4323 * Released 0.2.11 for these fixes (mainly the ultraTB one which
4330 * Released 0.2.11 for these fixes (mainly the ultraTB one which
4324 was nasty -- though somewhat of a corner case).
4331 was nasty -- though somewhat of a corner case).
4325
4332
4326 * IPython/ultraTB.py (AutoFormattedTB.text): renamed __text to
4333 * IPython/ultraTB.py (AutoFormattedTB.text): renamed __text to
4327 text (was a bug).
4334 text (was a bug).
4328
4335
4329 2002-04-30 Fernando Perez <fperez@colorado.edu>
4336 2002-04-30 Fernando Perez <fperez@colorado.edu>
4330
4337
4331 * IPython/UserConfig/GnuplotMagic.py (magic_gp): Minor fix to add
4338 * IPython/UserConfig/GnuplotMagic.py (magic_gp): Minor fix to add
4332 a print after ^D or ^C from the user so that the In[] prompt
4339 a print after ^D or ^C from the user so that the In[] prompt
4333 doesn't over-run the gnuplot one.
4340 doesn't over-run the gnuplot one.
4334
4341
4335 2002-04-29 Fernando Perez <fperez@colorado.edu>
4342 2002-04-29 Fernando Perez <fperez@colorado.edu>
4336
4343
4337 * Released 0.2.10
4344 * Released 0.2.10
4338
4345
4339 * IPython/__release__.py (version): get date dynamically.
4346 * IPython/__release__.py (version): get date dynamically.
4340
4347
4341 * Misc. documentation updates thanks to Arnd's comments. Also ran
4348 * Misc. documentation updates thanks to Arnd's comments. Also ran
4342 a full spellcheck on the manual (hadn't been done in a while).
4349 a full spellcheck on the manual (hadn't been done in a while).
4343
4350
4344 2002-04-27 Fernando Perez <fperez@colorado.edu>
4351 2002-04-27 Fernando Perez <fperez@colorado.edu>
4345
4352
4346 * IPython/Magic.py (Magic.magic_logstart): Fixed bug where
4353 * IPython/Magic.py (Magic.magic_logstart): Fixed bug where
4347 starting a log in mid-session would reset the input history list.
4354 starting a log in mid-session would reset the input history list.
4348
4355
4349 2002-04-26 Fernando Perez <fperez@colorado.edu>
4356 2002-04-26 Fernando Perez <fperez@colorado.edu>
4350
4357
4351 * IPython/iplib.py (InteractiveShell.wait): Fixed bug where not
4358 * IPython/iplib.py (InteractiveShell.wait): Fixed bug where not
4352 all files were being included in an update. Now anything in
4359 all files were being included in an update. Now anything in
4353 UserConfig that matches [A-Za-z]*.py will go (this excludes
4360 UserConfig that matches [A-Za-z]*.py will go (this excludes
4354 __init__.py)
4361 __init__.py)
4355
4362
4356 2002-04-25 Fernando Perez <fperez@colorado.edu>
4363 2002-04-25 Fernando Perez <fperez@colorado.edu>
4357
4364
4358 * IPython/iplib.py (InteractiveShell.__init__): Added __IPYTHON__
4365 * IPython/iplib.py (InteractiveShell.__init__): Added __IPYTHON__
4359 to __builtins__ so that any form of embedded or imported code can
4366 to __builtins__ so that any form of embedded or imported code can
4360 test for being inside IPython.
4367 test for being inside IPython.
4361
4368
4362 * IPython/UserConfig/GnuplotMagic.py: (magic_gp_set_instance):
4369 * IPython/UserConfig/GnuplotMagic.py: (magic_gp_set_instance):
4363 changed to GnuplotMagic because it's now an importable module,
4370 changed to GnuplotMagic because it's now an importable module,
4364 this makes the name follow that of the standard Gnuplot module.
4371 this makes the name follow that of the standard Gnuplot module.
4365 GnuplotMagic can now be loaded at any time in mid-session.
4372 GnuplotMagic can now be loaded at any time in mid-session.
4366
4373
4367 2002-04-24 Fernando Perez <fperez@colorado.edu>
4374 2002-04-24 Fernando Perez <fperez@colorado.edu>
4368
4375
4369 * IPython/numutils.py: removed SIUnits. It doesn't properly set
4376 * IPython/numutils.py: removed SIUnits. It doesn't properly set
4370 the globals (IPython has its own namespace) and the
4377 the globals (IPython has its own namespace) and the
4371 PhysicalQuantity stuff is much better anyway.
4378 PhysicalQuantity stuff is much better anyway.
4372
4379
4373 * IPython/UserConfig/example-gnuplot.py (g2): Added gnuplot
4380 * IPython/UserConfig/example-gnuplot.py (g2): Added gnuplot
4374 embedding example to standard user directory for
4381 embedding example to standard user directory for
4375 distribution. Also put it in the manual.
4382 distribution. Also put it in the manual.
4376
4383
4377 * IPython/numutils.py (gnuplot_exec): Changed to take a gnuplot
4384 * IPython/numutils.py (gnuplot_exec): Changed to take a gnuplot
4378 instance as first argument (so it doesn't rely on some obscure
4385 instance as first argument (so it doesn't rely on some obscure
4379 hidden global).
4386 hidden global).
4380
4387
4381 * IPython/UserConfig/ipythonrc.py: put () back in accepted
4388 * IPython/UserConfig/ipythonrc.py: put () back in accepted
4382 delimiters. While it prevents ().TAB from working, it allows
4389 delimiters. While it prevents ().TAB from working, it allows
4383 completions in open (... expressions. This is by far a more common
4390 completions in open (... expressions. This is by far a more common
4384 case.
4391 case.
4385
4392
4386 2002-04-23 Fernando Perez <fperez@colorado.edu>
4393 2002-04-23 Fernando Perez <fperez@colorado.edu>
4387
4394
4388 * IPython/Extensions/InterpreterPasteInput.py: new
4395 * IPython/Extensions/InterpreterPasteInput.py: new
4389 syntax-processing module for pasting lines with >>> or ... at the
4396 syntax-processing module for pasting lines with >>> or ... at the
4390 start.
4397 start.
4391
4398
4392 * IPython/Extensions/PhysicalQ_Interactive.py
4399 * IPython/Extensions/PhysicalQ_Interactive.py
4393 (PhysicalQuantityInteractive.__int__): fixed to work with either
4400 (PhysicalQuantityInteractive.__int__): fixed to work with either
4394 Numeric or math.
4401 Numeric or math.
4395
4402
4396 * IPython/UserConfig/ipythonrc-numeric.py: reorganized the
4403 * IPython/UserConfig/ipythonrc-numeric.py: reorganized the
4397 provided profiles. Now we have:
4404 provided profiles. Now we have:
4398 -math -> math module as * and cmath with its own namespace.
4405 -math -> math module as * and cmath with its own namespace.
4399 -numeric -> Numeric as *, plus gnuplot & grace
4406 -numeric -> Numeric as *, plus gnuplot & grace
4400 -physics -> same as before
4407 -physics -> same as before
4401
4408
4402 * IPython/Magic.py (Magic.magic_magic): Fixed bug where
4409 * IPython/Magic.py (Magic.magic_magic): Fixed bug where
4403 user-defined magics wouldn't be found by @magic if they were
4410 user-defined magics wouldn't be found by @magic if they were
4404 defined as class methods. Also cleaned up the namespace search
4411 defined as class methods. Also cleaned up the namespace search
4405 logic and the string building (to use %s instead of many repeated
4412 logic and the string building (to use %s instead of many repeated
4406 string adds).
4413 string adds).
4407
4414
4408 * IPython/UserConfig/example-magic.py (magic_foo): updated example
4415 * IPython/UserConfig/example-magic.py (magic_foo): updated example
4409 of user-defined magics to operate with class methods (cleaner, in
4416 of user-defined magics to operate with class methods (cleaner, in
4410 line with the gnuplot code).
4417 line with the gnuplot code).
4411
4418
4412 2002-04-22 Fernando Perez <fperez@colorado.edu>
4419 2002-04-22 Fernando Perez <fperez@colorado.edu>
4413
4420
4414 * setup.py: updated dependency list so that manual is updated when
4421 * setup.py: updated dependency list so that manual is updated when
4415 all included files change.
4422 all included files change.
4416
4423
4417 * IPython/ipmaker.py (make_IPython): Fixed bug which was ignoring
4424 * IPython/ipmaker.py (make_IPython): Fixed bug which was ignoring
4418 the delimiter removal option (the fix is ugly right now).
4425 the delimiter removal option (the fix is ugly right now).
4419
4426
4420 * IPython/UserConfig/ipythonrc-physics.py: simplified not to load
4427 * IPython/UserConfig/ipythonrc-physics.py: simplified not to load
4421 all of the math profile (quicker loading, no conflict between
4428 all of the math profile (quicker loading, no conflict between
4422 g-9.8 and g-gnuplot).
4429 g-9.8 and g-gnuplot).
4423
4430
4424 * IPython/CrashHandler.py (CrashHandler.__call__): changed default
4431 * IPython/CrashHandler.py (CrashHandler.__call__): changed default
4425 name of post-mortem files to IPython_crash_report.txt.
4432 name of post-mortem files to IPython_crash_report.txt.
4426
4433
4427 * Cleanup/update of the docs. Added all the new readline info and
4434 * Cleanup/update of the docs. Added all the new readline info and
4428 formatted all lists as 'real lists'.
4435 formatted all lists as 'real lists'.
4429
4436
4430 * IPython/ipmaker.py (make_IPython): removed now-obsolete
4437 * IPython/ipmaker.py (make_IPython): removed now-obsolete
4431 tab-completion options, since the full readline parse_and_bind is
4438 tab-completion options, since the full readline parse_and_bind is
4432 now accessible.
4439 now accessible.
4433
4440
4434 * IPython/iplib.py (InteractiveShell.init_readline): Changed
4441 * IPython/iplib.py (InteractiveShell.init_readline): Changed
4435 handling of readline options. Now users can specify any string to
4442 handling of readline options. Now users can specify any string to
4436 be passed to parse_and_bind(), as well as the delimiters to be
4443 be passed to parse_and_bind(), as well as the delimiters to be
4437 removed.
4444 removed.
4438 (InteractiveShell.__init__): Added __name__ to the global
4445 (InteractiveShell.__init__): Added __name__ to the global
4439 namespace so that things like Itpl which rely on its existence
4446 namespace so that things like Itpl which rely on its existence
4440 don't crash.
4447 don't crash.
4441 (InteractiveShell._prefilter): Defined the default with a _ so
4448 (InteractiveShell._prefilter): Defined the default with a _ so
4442 that prefilter() is easier to override, while the default one
4449 that prefilter() is easier to override, while the default one
4443 remains available.
4450 remains available.
4444
4451
4445 2002-04-18 Fernando Perez <fperez@colorado.edu>
4452 2002-04-18 Fernando Perez <fperez@colorado.edu>
4446
4453
4447 * Added information about pdb in the docs.
4454 * Added information about pdb in the docs.
4448
4455
4449 2002-04-17 Fernando Perez <fperez@colorado.edu>
4456 2002-04-17 Fernando Perez <fperez@colorado.edu>
4450
4457
4451 * IPython/ipmaker.py (make_IPython): added rc_override option to
4458 * IPython/ipmaker.py (make_IPython): added rc_override option to
4452 allow passing config options at creation time which may override
4459 allow passing config options at creation time which may override
4453 anything set in the config files or command line. This is
4460 anything set in the config files or command line. This is
4454 particularly useful for configuring embedded instances.
4461 particularly useful for configuring embedded instances.
4455
4462
4456 2002-04-15 Fernando Perez <fperez@colorado.edu>
4463 2002-04-15 Fernando Perez <fperez@colorado.edu>
4457
4464
4458 * IPython/Logger.py (Logger.log): Fixed a nasty bug which could
4465 * IPython/Logger.py (Logger.log): Fixed a nasty bug which could
4459 crash embedded instances because of the input cache falling out of
4466 crash embedded instances because of the input cache falling out of
4460 sync with the output counter.
4467 sync with the output counter.
4461
4468
4462 * IPython/Shell.py (IPythonShellEmbed.__init__): added a debug
4469 * IPython/Shell.py (IPythonShellEmbed.__init__): added a debug
4463 mode which calls pdb after an uncaught exception in IPython itself.
4470 mode which calls pdb after an uncaught exception in IPython itself.
4464
4471
4465 2002-04-14 Fernando Perez <fperez@colorado.edu>
4472 2002-04-14 Fernando Perez <fperez@colorado.edu>
4466
4473
4467 * IPython/iplib.py (InteractiveShell.showtraceback): pdb mucks up
4474 * IPython/iplib.py (InteractiveShell.showtraceback): pdb mucks up
4468 readline, fix it back after each call.
4475 readline, fix it back after each call.
4469
4476
4470 * IPython/ultraTB.py (AutoFormattedTB.__text): made text a private
4477 * IPython/ultraTB.py (AutoFormattedTB.__text): made text a private
4471 method to force all access via __call__(), which guarantees that
4478 method to force all access via __call__(), which guarantees that
4472 traceback references are properly deleted.
4479 traceback references are properly deleted.
4473
4480
4474 * IPython/Prompts.py (CachedOutput._display): minor fixes to
4481 * IPython/Prompts.py (CachedOutput._display): minor fixes to
4475 improve printing when pprint is in use.
4482 improve printing when pprint is in use.
4476
4483
4477 2002-04-13 Fernando Perez <fperez@colorado.edu>
4484 2002-04-13 Fernando Perez <fperez@colorado.edu>
4478
4485
4479 * IPython/Shell.py (IPythonShellEmbed.__call__): SystemExit
4486 * IPython/Shell.py (IPythonShellEmbed.__call__): SystemExit
4480 exceptions aren't caught anymore. If the user triggers one, he
4487 exceptions aren't caught anymore. If the user triggers one, he
4481 should know why he's doing it and it should go all the way up,
4488 should know why he's doing it and it should go all the way up,
4482 just like any other exception. So now @abort will fully kill the
4489 just like any other exception. So now @abort will fully kill the
4483 embedded interpreter and the embedding code (unless that happens
4490 embedded interpreter and the embedding code (unless that happens
4484 to catch SystemExit).
4491 to catch SystemExit).
4485
4492
4486 * IPython/ultraTB.py (VerboseTB.__init__): added a call_pdb flag
4493 * IPython/ultraTB.py (VerboseTB.__init__): added a call_pdb flag
4487 and a debugger() method to invoke the interactive pdb debugger
4494 and a debugger() method to invoke the interactive pdb debugger
4488 after printing exception information. Also added the corresponding
4495 after printing exception information. Also added the corresponding
4489 -pdb option and @pdb magic to control this feature, and updated
4496 -pdb option and @pdb magic to control this feature, and updated
4490 the docs. After a suggestion from Christopher Hart
4497 the docs. After a suggestion from Christopher Hart
4491 (hart-AT-caltech.edu).
4498 (hart-AT-caltech.edu).
4492
4499
4493 2002-04-12 Fernando Perez <fperez@colorado.edu>
4500 2002-04-12 Fernando Perez <fperez@colorado.edu>
4494
4501
4495 * IPython/Shell.py (IPythonShellEmbed.__init__): modified to use
4502 * IPython/Shell.py (IPythonShellEmbed.__init__): modified to use
4496 the exception handlers defined by the user (not the CrashHandler)
4503 the exception handlers defined by the user (not the CrashHandler)
4497 so that user exceptions don't trigger an ipython bug report.
4504 so that user exceptions don't trigger an ipython bug report.
4498
4505
4499 * IPython/ultraTB.py (ColorTB.__init__): made the color scheme
4506 * IPython/ultraTB.py (ColorTB.__init__): made the color scheme
4500 configurable (it should have always been so).
4507 configurable (it should have always been so).
4501
4508
4502 2002-03-26 Fernando Perez <fperez@colorado.edu>
4509 2002-03-26 Fernando Perez <fperez@colorado.edu>
4503
4510
4504 * IPython/Shell.py (IPythonShellEmbed.__call__): many changes here
4511 * IPython/Shell.py (IPythonShellEmbed.__call__): many changes here
4505 and there to fix embedding namespace issues. This should all be
4512 and there to fix embedding namespace issues. This should all be
4506 done in a more elegant way.
4513 done in a more elegant way.
4507
4514
4508 2002-03-25 Fernando Perez <fperez@colorado.edu>
4515 2002-03-25 Fernando Perez <fperez@colorado.edu>
4509
4516
4510 * IPython/genutils.py (get_home_dir): Try to make it work under
4517 * IPython/genutils.py (get_home_dir): Try to make it work under
4511 win9x also.
4518 win9x also.
4512
4519
4513 2002-03-20 Fernando Perez <fperez@colorado.edu>
4520 2002-03-20 Fernando Perez <fperez@colorado.edu>
4514
4521
4515 * IPython/Shell.py (IPythonShellEmbed.__init__): leave
4522 * IPython/Shell.py (IPythonShellEmbed.__init__): leave
4516 sys.displayhook untouched upon __init__.
4523 sys.displayhook untouched upon __init__.
4517
4524
4518 2002-03-19 Fernando Perez <fperez@colorado.edu>
4525 2002-03-19 Fernando Perez <fperez@colorado.edu>
4519
4526
4520 * Released 0.2.9 (for embedding bug, basically).
4527 * Released 0.2.9 (for embedding bug, basically).
4521
4528
4522 * IPython/Shell.py (IPythonShellEmbed.__call__): Trap SystemExit
4529 * IPython/Shell.py (IPythonShellEmbed.__call__): Trap SystemExit
4523 exceptions so that enclosing shell's state can be restored.
4530 exceptions so that enclosing shell's state can be restored.
4524
4531
4525 * Changed magic_gnuplot.py to magic-gnuplot.py to standardize
4532 * Changed magic_gnuplot.py to magic-gnuplot.py to standardize
4526 naming conventions in the .ipython/ dir.
4533 naming conventions in the .ipython/ dir.
4527
4534
4528 * IPython/iplib.py (InteractiveShell.init_readline): removed '-'
4535 * IPython/iplib.py (InteractiveShell.init_readline): removed '-'
4529 from delimiters list so filenames with - in them get expanded.
4536 from delimiters list so filenames with - in them get expanded.
4530
4537
4531 * IPython/Shell.py (IPythonShellEmbed.__call__): fixed bug with
4538 * IPython/Shell.py (IPythonShellEmbed.__call__): fixed bug with
4532 sys.displayhook not being properly restored after an embedded call.
4539 sys.displayhook not being properly restored after an embedded call.
4533
4540
4534 2002-03-18 Fernando Perez <fperez@colorado.edu>
4541 2002-03-18 Fernando Perez <fperez@colorado.edu>
4535
4542
4536 * Released 0.2.8
4543 * Released 0.2.8
4537
4544
4538 * IPython/iplib.py (InteractiveShell.user_setup): fixed bug where
4545 * IPython/iplib.py (InteractiveShell.user_setup): fixed bug where
4539 some files weren't being included in a -upgrade.
4546 some files weren't being included in a -upgrade.
4540 (InteractiveShell.init_readline): Added 'set show-all-if-ambiguous
4547 (InteractiveShell.init_readline): Added 'set show-all-if-ambiguous
4541 on' so that the first tab completes.
4548 on' so that the first tab completes.
4542 (InteractiveShell.handle_magic): fixed bug with spaces around
4549 (InteractiveShell.handle_magic): fixed bug with spaces around
4543 quotes breaking many magic commands.
4550 quotes breaking many magic commands.
4544
4551
4545 * setup.py: added note about ignoring the syntax error messages at
4552 * setup.py: added note about ignoring the syntax error messages at
4546 installation.
4553 installation.
4547
4554
4548 * IPython/UserConfig/magic_gnuplot.py (magic_gp): finished
4555 * IPython/UserConfig/magic_gnuplot.py (magic_gp): finished
4549 streamlining the gnuplot interface, now there's only one magic @gp.
4556 streamlining the gnuplot interface, now there's only one magic @gp.
4550
4557
4551 2002-03-17 Fernando Perez <fperez@colorado.edu>
4558 2002-03-17 Fernando Perez <fperez@colorado.edu>
4552
4559
4553 * IPython/UserConfig/magic_gnuplot.py: new name for the
4560 * IPython/UserConfig/magic_gnuplot.py: new name for the
4554 example-magic_pm.py file. Much enhanced system, now with a shell
4561 example-magic_pm.py file. Much enhanced system, now with a shell
4555 for communicating directly with gnuplot, one command at a time.
4562 for communicating directly with gnuplot, one command at a time.
4556
4563
4557 * IPython/Magic.py (Magic.magic_run): added option -n to prevent
4564 * IPython/Magic.py (Magic.magic_run): added option -n to prevent
4558 setting __name__=='__main__'.
4565 setting __name__=='__main__'.
4559
4566
4560 * IPython/UserConfig/example-magic_pm.py (magic_pm): Added
4567 * IPython/UserConfig/example-magic_pm.py (magic_pm): Added
4561 mini-shell for accessing gnuplot from inside ipython. Should
4568 mini-shell for accessing gnuplot from inside ipython. Should
4562 extend it later for grace access too. Inspired by Arnd's
4569 extend it later for grace access too. Inspired by Arnd's
4563 suggestion.
4570 suggestion.
4564
4571
4565 * IPython/iplib.py (InteractiveShell.handle_magic): fixed bug when
4572 * IPython/iplib.py (InteractiveShell.handle_magic): fixed bug when
4566 calling magic functions with () in their arguments. Thanks to Arnd
4573 calling magic functions with () in their arguments. Thanks to Arnd
4567 Baecker for pointing this to me.
4574 Baecker for pointing this to me.
4568
4575
4569 * IPython/numutils.py (sum_flat): fixed bug. Would recurse
4576 * IPython/numutils.py (sum_flat): fixed bug. Would recurse
4570 infinitely for integer or complex arrays (only worked with floats).
4577 infinitely for integer or complex arrays (only worked with floats).
4571
4578
4572 2002-03-16 Fernando Perez <fperez@colorado.edu>
4579 2002-03-16 Fernando Perez <fperez@colorado.edu>
4573
4580
4574 * setup.py: Merged setup and setup_windows into a single script
4581 * setup.py: Merged setup and setup_windows into a single script
4575 which properly handles things for windows users.
4582 which properly handles things for windows users.
4576
4583
4577 2002-03-15 Fernando Perez <fperez@colorado.edu>
4584 2002-03-15 Fernando Perez <fperez@colorado.edu>
4578
4585
4579 * Big change to the manual: now the magics are all automatically
4586 * Big change to the manual: now the magics are all automatically
4580 documented. This information is generated from their docstrings
4587 documented. This information is generated from their docstrings
4581 and put in a latex file included by the manual lyx file. This way
4588 and put in a latex file included by the manual lyx file. This way
4582 we get always up to date information for the magics. The manual
4589 we get always up to date information for the magics. The manual
4583 now also has proper version information, also auto-synced.
4590 now also has proper version information, also auto-synced.
4584
4591
4585 For this to work, an undocumented --magic_docstrings option was added.
4592 For this to work, an undocumented --magic_docstrings option was added.
4586
4593
4587 2002-03-13 Fernando Perez <fperez@colorado.edu>
4594 2002-03-13 Fernando Perez <fperez@colorado.edu>
4588
4595
4589 * IPython/ultraTB.py (TermColors): fixed problem with dark colors
4596 * IPython/ultraTB.py (TermColors): fixed problem with dark colors
4590 under CDE terminals. An explicit ;2 color reset is needed in the escapes.
4597 under CDE terminals. An explicit ;2 color reset is needed in the escapes.
4591
4598
4592 2002-03-12 Fernando Perez <fperez@colorado.edu>
4599 2002-03-12 Fernando Perez <fperez@colorado.edu>
4593
4600
4594 * IPython/ultraTB.py (TermColors): changed color escapes again to
4601 * IPython/ultraTB.py (TermColors): changed color escapes again to
4595 fix the (old, reintroduced) line-wrapping bug. Basically, if
4602 fix the (old, reintroduced) line-wrapping bug. Basically, if
4596 \001..\002 aren't given in the color escapes, lines get wrapped
4603 \001..\002 aren't given in the color escapes, lines get wrapped
4597 weirdly. But giving those screws up old xterms and emacs terms. So
4604 weirdly. But giving those screws up old xterms and emacs terms. So
4598 I added some logic for emacs terms to be ok, but I can't identify old
4605 I added some logic for emacs terms to be ok, but I can't identify old
4599 xterms separately ($TERM=='xterm' for many terminals, like konsole).
4606 xterms separately ($TERM=='xterm' for many terminals, like konsole).
4600
4607
4601 2002-03-10 Fernando Perez <fperez@colorado.edu>
4608 2002-03-10 Fernando Perez <fperez@colorado.edu>
4602
4609
4603 * IPython/usage.py (__doc__): Various documentation cleanups and
4610 * IPython/usage.py (__doc__): Various documentation cleanups and
4604 updates, both in usage docstrings and in the manual.
4611 updates, both in usage docstrings and in the manual.
4605
4612
4606 * IPython/Prompts.py (CachedOutput.set_colors): cleanups for
4613 * IPython/Prompts.py (CachedOutput.set_colors): cleanups for
4607 handling of caching. Set minimum acceptabe value for having a
4614 handling of caching. Set minimum acceptabe value for having a
4608 cache at 20 values.
4615 cache at 20 values.
4609
4616
4610 * IPython/iplib.py (InteractiveShell.user_setup): moved the
4617 * IPython/iplib.py (InteractiveShell.user_setup): moved the
4611 install_first_time function to a method, renamed it and added an
4618 install_first_time function to a method, renamed it and added an
4612 'upgrade' mode. Now people can update their config directory with
4619 'upgrade' mode. Now people can update their config directory with
4613 a simple command line switch (-upgrade, also new).
4620 a simple command line switch (-upgrade, also new).
4614
4621
4615 * IPython/Magic.py (Magic.magic_pfile): Made @pfile an alias to
4622 * IPython/Magic.py (Magic.magic_pfile): Made @pfile an alias to
4616 @file (convenient for automagic users under Python >= 2.2).
4623 @file (convenient for automagic users under Python >= 2.2).
4617 Removed @files (it seemed more like a plural than an abbrev. of
4624 Removed @files (it seemed more like a plural than an abbrev. of
4618 'file show').
4625 'file show').
4619
4626
4620 * IPython/iplib.py (install_first_time): Fixed crash if there were
4627 * IPython/iplib.py (install_first_time): Fixed crash if there were
4621 backup files ('~') in .ipython/ install directory.
4628 backup files ('~') in .ipython/ install directory.
4622
4629
4623 * IPython/ipmaker.py (make_IPython): fixes for new prompt
4630 * IPython/ipmaker.py (make_IPython): fixes for new prompt
4624 system. Things look fine, but these changes are fairly
4631 system. Things look fine, but these changes are fairly
4625 intrusive. Test them for a few days.
4632 intrusive. Test them for a few days.
4626
4633
4627 * IPython/Prompts.py (CachedOutput.__init__): Massive rewrite of
4634 * IPython/Prompts.py (CachedOutput.__init__): Massive rewrite of
4628 the prompts system. Now all in/out prompt strings are user
4635 the prompts system. Now all in/out prompt strings are user
4629 controllable. This is particularly useful for embedding, as one
4636 controllable. This is particularly useful for embedding, as one
4630 can tag embedded instances with particular prompts.
4637 can tag embedded instances with particular prompts.
4631
4638
4632 Also removed global use of sys.ps1/2, which now allows nested
4639 Also removed global use of sys.ps1/2, which now allows nested
4633 embeddings without any problems. Added command-line options for
4640 embeddings without any problems. Added command-line options for
4634 the prompt strings.
4641 the prompt strings.
4635
4642
4636 2002-03-08 Fernando Perez <fperez@colorado.edu>
4643 2002-03-08 Fernando Perez <fperez@colorado.edu>
4637
4644
4638 * IPython/UserConfig/example-embed-short.py (ipshell): added
4645 * IPython/UserConfig/example-embed-short.py (ipshell): added
4639 example file with the bare minimum code for embedding.
4646 example file with the bare minimum code for embedding.
4640
4647
4641 * IPython/Shell.py (IPythonShellEmbed.set_dummy_mode): added
4648 * IPython/Shell.py (IPythonShellEmbed.set_dummy_mode): added
4642 functionality for the embeddable shell to be activated/deactivated
4649 functionality for the embeddable shell to be activated/deactivated
4643 either globally or at each call.
4650 either globally or at each call.
4644
4651
4645 * IPython/Prompts.py (Prompt1.auto_rewrite): Fixes the problem of
4652 * IPython/Prompts.py (Prompt1.auto_rewrite): Fixes the problem of
4646 rewriting the prompt with '--->' for auto-inputs with proper
4653 rewriting the prompt with '--->' for auto-inputs with proper
4647 coloring. Now the previous UGLY hack in handle_auto() is gone, and
4654 coloring. Now the previous UGLY hack in handle_auto() is gone, and
4648 this is handled by the prompts class itself, as it should.
4655 this is handled by the prompts class itself, as it should.
4649
4656
4650 2002-03-05 Fernando Perez <fperez@colorado.edu>
4657 2002-03-05 Fernando Perez <fperez@colorado.edu>
4651
4658
4652 * IPython/Magic.py (Magic.magic_logstart): Changed @log to
4659 * IPython/Magic.py (Magic.magic_logstart): Changed @log to
4653 @logstart to avoid name clashes with the math log function.
4660 @logstart to avoid name clashes with the math log function.
4654
4661
4655 * Big updates to X/Emacs section of the manual.
4662 * Big updates to X/Emacs section of the manual.
4656
4663
4657 * Removed ipython_emacs. Milan explained to me how to pass
4664 * Removed ipython_emacs. Milan explained to me how to pass
4658 arguments to ipython through Emacs. Some day I'm going to end up
4665 arguments to ipython through Emacs. Some day I'm going to end up
4659 learning some lisp...
4666 learning some lisp...
4660
4667
4661 2002-03-04 Fernando Perez <fperez@colorado.edu>
4668 2002-03-04 Fernando Perez <fperez@colorado.edu>
4662
4669
4663 * IPython/ipython_emacs: Created script to be used as the
4670 * IPython/ipython_emacs: Created script to be used as the
4664 py-python-command Emacs variable so we can pass IPython
4671 py-python-command Emacs variable so we can pass IPython
4665 parameters. I can't figure out how to tell Emacs directly to pass
4672 parameters. I can't figure out how to tell Emacs directly to pass
4666 parameters to IPython, so a dummy shell script will do it.
4673 parameters to IPython, so a dummy shell script will do it.
4667
4674
4668 Other enhancements made for things to work better under Emacs'
4675 Other enhancements made for things to work better under Emacs'
4669 various types of terminals. Many thanks to Milan Zamazal
4676 various types of terminals. Many thanks to Milan Zamazal
4670 <pdm-AT-zamazal.org> for all the suggestions and pointers.
4677 <pdm-AT-zamazal.org> for all the suggestions and pointers.
4671
4678
4672 2002-03-01 Fernando Perez <fperez@colorado.edu>
4679 2002-03-01 Fernando Perez <fperez@colorado.edu>
4673
4680
4674 * IPython/ipmaker.py (make_IPython): added a --readline! option so
4681 * IPython/ipmaker.py (make_IPython): added a --readline! option so
4675 that loading of readline is now optional. This gives better
4682 that loading of readline is now optional. This gives better
4676 control to emacs users.
4683 control to emacs users.
4677
4684
4678 * IPython/ultraTB.py (__date__): Modified color escape sequences
4685 * IPython/ultraTB.py (__date__): Modified color escape sequences
4679 and now things work fine under xterm and in Emacs' term buffers
4686 and now things work fine under xterm and in Emacs' term buffers
4680 (though not shell ones). Well, in emacs you get colors, but all
4687 (though not shell ones). Well, in emacs you get colors, but all
4681 seem to be 'light' colors (no difference between dark and light
4688 seem to be 'light' colors (no difference between dark and light
4682 ones). But the garbage chars are gone, and also in xterms. It
4689 ones). But the garbage chars are gone, and also in xterms. It
4683 seems that now I'm using 'cleaner' ansi sequences.
4690 seems that now I'm using 'cleaner' ansi sequences.
4684
4691
4685 2002-02-21 Fernando Perez <fperez@colorado.edu>
4692 2002-02-21 Fernando Perez <fperez@colorado.edu>
4686
4693
4687 * Released 0.2.7 (mainly to publish the scoping fix).
4694 * Released 0.2.7 (mainly to publish the scoping fix).
4688
4695
4689 * IPython/Logger.py (Logger.logstate): added. A corresponding
4696 * IPython/Logger.py (Logger.logstate): added. A corresponding
4690 @logstate magic was created.
4697 @logstate magic was created.
4691
4698
4692 * IPython/Magic.py: fixed nested scoping problem under Python
4699 * IPython/Magic.py: fixed nested scoping problem under Python
4693 2.1.x (automagic wasn't working).
4700 2.1.x (automagic wasn't working).
4694
4701
4695 2002-02-20 Fernando Perez <fperez@colorado.edu>
4702 2002-02-20 Fernando Perez <fperez@colorado.edu>
4696
4703
4697 * Released 0.2.6.
4704 * Released 0.2.6.
4698
4705
4699 * IPython/OutputTrap.py (OutputTrap.__init__): added a 'quiet'
4706 * IPython/OutputTrap.py (OutputTrap.__init__): added a 'quiet'
4700 option so that logs can come out without any headers at all.
4707 option so that logs can come out without any headers at all.
4701
4708
4702 * IPython/UserConfig/ipythonrc-scipy.py: created a profile for
4709 * IPython/UserConfig/ipythonrc-scipy.py: created a profile for
4703 SciPy.
4710 SciPy.
4704
4711
4705 * IPython/iplib.py (InteractiveShell.embed_mainloop): Changed so
4712 * IPython/iplib.py (InteractiveShell.embed_mainloop): Changed so
4706 that embedded IPython calls don't require vars() to be explicitly
4713 that embedded IPython calls don't require vars() to be explicitly
4707 passed. Now they are extracted from the caller's frame (code
4714 passed. Now they are extracted from the caller's frame (code
4708 snatched from Eric Jones' weave). Added better documentation to
4715 snatched from Eric Jones' weave). Added better documentation to
4709 the section on embedding and the example file.
4716 the section on embedding and the example file.
4710
4717
4711 * IPython/genutils.py (page): Changed so that under emacs, it just
4718 * IPython/genutils.py (page): Changed so that under emacs, it just
4712 prints the string. You can then page up and down in the emacs
4719 prints the string. You can then page up and down in the emacs
4713 buffer itself. This is how the builtin help() works.
4720 buffer itself. This is how the builtin help() works.
4714
4721
4715 * IPython/Prompts.py (CachedOutput.__call__): Fixed issue with
4722 * IPython/Prompts.py (CachedOutput.__call__): Fixed issue with
4716 macro scoping: macros need to be executed in the user's namespace
4723 macro scoping: macros need to be executed in the user's namespace
4717 to work as if they had been typed by the user.
4724 to work as if they had been typed by the user.
4718
4725
4719 * IPython/Magic.py (Magic.magic_macro): Changed macros so they
4726 * IPython/Magic.py (Magic.magic_macro): Changed macros so they
4720 execute automatically (no need to type 'exec...'). They then
4727 execute automatically (no need to type 'exec...'). They then
4721 behave like 'true macros'. The printing system was also modified
4728 behave like 'true macros'. The printing system was also modified
4722 for this to work.
4729 for this to work.
4723
4730
4724 2002-02-19 Fernando Perez <fperez@colorado.edu>
4731 2002-02-19 Fernando Perez <fperez@colorado.edu>
4725
4732
4726 * IPython/genutils.py (page_file): new function for paging files
4733 * IPython/genutils.py (page_file): new function for paging files
4727 in an OS-independent way. Also necessary for file viewing to work
4734 in an OS-independent way. Also necessary for file viewing to work
4728 well inside Emacs buffers.
4735 well inside Emacs buffers.
4729 (page): Added checks for being in an emacs buffer.
4736 (page): Added checks for being in an emacs buffer.
4730 (page): fixed bug for Windows ($TERM isn't set in Windows). Fixed
4737 (page): fixed bug for Windows ($TERM isn't set in Windows). Fixed
4731 same bug in iplib.
4738 same bug in iplib.
4732
4739
4733 2002-02-18 Fernando Perez <fperez@colorado.edu>
4740 2002-02-18 Fernando Perez <fperez@colorado.edu>
4734
4741
4735 * IPython/iplib.py (InteractiveShell.init_readline): modified use
4742 * IPython/iplib.py (InteractiveShell.init_readline): modified use
4736 of readline so that IPython can work inside an Emacs buffer.
4743 of readline so that IPython can work inside an Emacs buffer.
4737
4744
4738 * IPython/ultraTB.py (AutoFormattedTB.__call__): some fixes to
4745 * IPython/ultraTB.py (AutoFormattedTB.__call__): some fixes to
4739 method signatures (they weren't really bugs, but it looks cleaner
4746 method signatures (they weren't really bugs, but it looks cleaner
4740 and keeps PyChecker happy).
4747 and keeps PyChecker happy).
4741
4748
4742 * IPython/ipmaker.py (make_IPython): added hooks Struct to __IP
4749 * IPython/ipmaker.py (make_IPython): added hooks Struct to __IP
4743 for implementing various user-defined hooks. Currently only
4750 for implementing various user-defined hooks. Currently only
4744 display is done.
4751 display is done.
4745
4752
4746 * IPython/Prompts.py (CachedOutput._display): changed display
4753 * IPython/Prompts.py (CachedOutput._display): changed display
4747 functions so that they can be dynamically changed by users easily.
4754 functions so that they can be dynamically changed by users easily.
4748
4755
4749 * IPython/Extensions/numeric_formats.py (num_display): added an
4756 * IPython/Extensions/numeric_formats.py (num_display): added an
4750 extension for printing NumPy arrays in flexible manners. It
4757 extension for printing NumPy arrays in flexible manners. It
4751 doesn't do anything yet, but all the structure is in
4758 doesn't do anything yet, but all the structure is in
4752 place. Ultimately the plan is to implement output format control
4759 place. Ultimately the plan is to implement output format control
4753 like in Octave.
4760 like in Octave.
4754
4761
4755 * IPython/Magic.py (Magic.lsmagic): changed so that bound magic
4762 * IPython/Magic.py (Magic.lsmagic): changed so that bound magic
4756 methods are found at run-time by all the automatic machinery.
4763 methods are found at run-time by all the automatic machinery.
4757
4764
4758 2002-02-17 Fernando Perez <fperez@colorado.edu>
4765 2002-02-17 Fernando Perez <fperez@colorado.edu>
4759
4766
4760 * setup_Windows.py (make_shortcut): documented. Cleaned up the
4767 * setup_Windows.py (make_shortcut): documented. Cleaned up the
4761 whole file a little.
4768 whole file a little.
4762
4769
4763 * ToDo: closed this document. Now there's a new_design.lyx
4770 * ToDo: closed this document. Now there's a new_design.lyx
4764 document for all new ideas. Added making a pdf of it for the
4771 document for all new ideas. Added making a pdf of it for the
4765 end-user distro.
4772 end-user distro.
4766
4773
4767 * IPython/Logger.py (Logger.switch_log): Created this to replace
4774 * IPython/Logger.py (Logger.switch_log): Created this to replace
4768 logon() and logoff(). It also fixes a nasty crash reported by
4775 logon() and logoff(). It also fixes a nasty crash reported by
4769 Philip Hisley <compsys-AT-starpower.net>. Many thanks to him.
4776 Philip Hisley <compsys-AT-starpower.net>. Many thanks to him.
4770
4777
4771 * IPython/iplib.py (complete): got auto-completion to work with
4778 * IPython/iplib.py (complete): got auto-completion to work with
4772 automagic (I had wanted this for a long time).
4779 automagic (I had wanted this for a long time).
4773
4780
4774 * IPython/Magic.py (Magic.magic_files): Added @files as an alias
4781 * IPython/Magic.py (Magic.magic_files): Added @files as an alias
4775 to @file, since file() is now a builtin and clashes with automagic
4782 to @file, since file() is now a builtin and clashes with automagic
4776 for @file.
4783 for @file.
4777
4784
4778 * Made some new files: Prompts, CrashHandler, Magic, Logger. All
4785 * Made some new files: Prompts, CrashHandler, Magic, Logger. All
4779 of this was previously in iplib, which had grown to more than 2000
4786 of this was previously in iplib, which had grown to more than 2000
4780 lines, way too long. No new functionality, but it makes managing
4787 lines, way too long. No new functionality, but it makes managing
4781 the code a bit easier.
4788 the code a bit easier.
4782
4789
4783 * IPython/iplib.py (IPythonCrashHandler.__call__): Added version
4790 * IPython/iplib.py (IPythonCrashHandler.__call__): Added version
4784 information to crash reports.
4791 information to crash reports.
4785
4792
4786 2002-02-12 Fernando Perez <fperez@colorado.edu>
4793 2002-02-12 Fernando Perez <fperez@colorado.edu>
4787
4794
4788 * Released 0.2.5.
4795 * Released 0.2.5.
4789
4796
4790 2002-02-11 Fernando Perez <fperez@colorado.edu>
4797 2002-02-11 Fernando Perez <fperez@colorado.edu>
4791
4798
4792 * Wrote a relatively complete Windows installer. It puts
4799 * Wrote a relatively complete Windows installer. It puts
4793 everything in place, creates Start Menu entries and fixes the
4800 everything in place, creates Start Menu entries and fixes the
4794 color issues. Nothing fancy, but it works.
4801 color issues. Nothing fancy, but it works.
4795
4802
4796 2002-02-10 Fernando Perez <fperez@colorado.edu>
4803 2002-02-10 Fernando Perez <fperez@colorado.edu>
4797
4804
4798 * IPython/iplib.py (InteractiveShell.safe_execfile): added an
4805 * IPython/iplib.py (InteractiveShell.safe_execfile): added an
4799 os.path.expanduser() call so that we can type @run ~/myfile.py and
4806 os.path.expanduser() call so that we can type @run ~/myfile.py and
4800 have thigs work as expected.
4807 have thigs work as expected.
4801
4808
4802 * IPython/genutils.py (page): fixed exception handling so things
4809 * IPython/genutils.py (page): fixed exception handling so things
4803 work both in Unix and Windows correctly. Quitting a pager triggers
4810 work both in Unix and Windows correctly. Quitting a pager triggers
4804 an IOError/broken pipe in Unix, and in windows not finding a pager
4811 an IOError/broken pipe in Unix, and in windows not finding a pager
4805 is also an IOError, so I had to actually look at the return value
4812 is also an IOError, so I had to actually look at the return value
4806 of the exception, not just the exception itself. Should be ok now.
4813 of the exception, not just the exception itself. Should be ok now.
4807
4814
4808 * IPython/ultraTB.py (ColorSchemeTable.set_active_scheme):
4815 * IPython/ultraTB.py (ColorSchemeTable.set_active_scheme):
4809 modified to allow case-insensitive color scheme changes.
4816 modified to allow case-insensitive color scheme changes.
4810
4817
4811 2002-02-09 Fernando Perez <fperez@colorado.edu>
4818 2002-02-09 Fernando Perez <fperez@colorado.edu>
4812
4819
4813 * IPython/genutils.py (native_line_ends): new function to leave
4820 * IPython/genutils.py (native_line_ends): new function to leave
4814 user config files with os-native line-endings.
4821 user config files with os-native line-endings.
4815
4822
4816 * README and manual updates.
4823 * README and manual updates.
4817
4824
4818 * IPython/genutils.py: fixed unicode bug: use types.StringTypes
4825 * IPython/genutils.py: fixed unicode bug: use types.StringTypes
4819 instead of StringType to catch Unicode strings.
4826 instead of StringType to catch Unicode strings.
4820
4827
4821 * IPython/genutils.py (filefind): fixed bug for paths with
4828 * IPython/genutils.py (filefind): fixed bug for paths with
4822 embedded spaces (very common in Windows).
4829 embedded spaces (very common in Windows).
4823
4830
4824 * IPython/ipmaker.py (make_IPython): added a '.ini' to the rc
4831 * IPython/ipmaker.py (make_IPython): added a '.ini' to the rc
4825 files under Windows, so that they get automatically associated
4832 files under Windows, so that they get automatically associated
4826 with a text editor. Windows makes it a pain to handle
4833 with a text editor. Windows makes it a pain to handle
4827 extension-less files.
4834 extension-less files.
4828
4835
4829 * IPython/iplib.py (InteractiveShell.init_readline): Made the
4836 * IPython/iplib.py (InteractiveShell.init_readline): Made the
4830 warning about readline only occur for Posix. In Windows there's no
4837 warning about readline only occur for Posix. In Windows there's no
4831 way to get readline, so why bother with the warning.
4838 way to get readline, so why bother with the warning.
4832
4839
4833 * IPython/Struct.py (Struct.__str__): fixed to use self.__dict__
4840 * IPython/Struct.py (Struct.__str__): fixed to use self.__dict__
4834 for __str__ instead of dir(self), since dir() changed in 2.2.
4841 for __str__ instead of dir(self), since dir() changed in 2.2.
4835
4842
4836 * Ported to Windows! Tested on XP, I suspect it should work fine
4843 * Ported to Windows! Tested on XP, I suspect it should work fine
4837 on NT/2000, but I don't think it will work on 98 et al. That
4844 on NT/2000, but I don't think it will work on 98 et al. That
4838 series of Windows is such a piece of junk anyway that I won't try
4845 series of Windows is such a piece of junk anyway that I won't try
4839 porting it there. The XP port was straightforward, showed a few
4846 porting it there. The XP port was straightforward, showed a few
4840 bugs here and there (fixed all), in particular some string
4847 bugs here and there (fixed all), in particular some string
4841 handling stuff which required considering Unicode strings (which
4848 handling stuff which required considering Unicode strings (which
4842 Windows uses). This is good, but hasn't been too tested :) No
4849 Windows uses). This is good, but hasn't been too tested :) No
4843 fancy installer yet, I'll put a note in the manual so people at
4850 fancy installer yet, I'll put a note in the manual so people at
4844 least make manually a shortcut.
4851 least make manually a shortcut.
4845
4852
4846 * IPython/iplib.py (Magic.magic_colors): Unified the color options
4853 * IPython/iplib.py (Magic.magic_colors): Unified the color options
4847 into a single one, "colors". This now controls both prompt and
4854 into a single one, "colors". This now controls both prompt and
4848 exception color schemes, and can be changed both at startup
4855 exception color schemes, and can be changed both at startup
4849 (either via command-line switches or via ipythonrc files) and at
4856 (either via command-line switches or via ipythonrc files) and at
4850 runtime, with @colors.
4857 runtime, with @colors.
4851 (Magic.magic_run): renamed @prun to @run and removed the old
4858 (Magic.magic_run): renamed @prun to @run and removed the old
4852 @run. The two were too similar to warrant keeping both.
4859 @run. The two were too similar to warrant keeping both.
4853
4860
4854 2002-02-03 Fernando Perez <fperez@colorado.edu>
4861 2002-02-03 Fernando Perez <fperez@colorado.edu>
4855
4862
4856 * IPython/iplib.py (install_first_time): Added comment on how to
4863 * IPython/iplib.py (install_first_time): Added comment on how to
4857 configure the color options for first-time users. Put a <return>
4864 configure the color options for first-time users. Put a <return>
4858 request at the end so that small-terminal users get a chance to
4865 request at the end so that small-terminal users get a chance to
4859 read the startup info.
4866 read the startup info.
4860
4867
4861 2002-01-23 Fernando Perez <fperez@colorado.edu>
4868 2002-01-23 Fernando Perez <fperez@colorado.edu>
4862
4869
4863 * IPython/iplib.py (CachedOutput.update): Changed output memory
4870 * IPython/iplib.py (CachedOutput.update): Changed output memory
4864 variable names from _o,_oo,_ooo,_o<n> to simply _,__,___,_<n>. For
4871 variable names from _o,_oo,_ooo,_o<n> to simply _,__,___,_<n>. For
4865 input history we still use _i. Did this b/c these variable are
4872 input history we still use _i. Did this b/c these variable are
4866 very commonly used in interactive work, so the less we need to
4873 very commonly used in interactive work, so the less we need to
4867 type the better off we are.
4874 type the better off we are.
4868 (Magic.magic_prun): updated @prun to better handle the namespaces
4875 (Magic.magic_prun): updated @prun to better handle the namespaces
4869 the file will run in, including a fix for __name__ not being set
4876 the file will run in, including a fix for __name__ not being set
4870 before.
4877 before.
4871
4878
4872 2002-01-20 Fernando Perez <fperez@colorado.edu>
4879 2002-01-20 Fernando Perez <fperez@colorado.edu>
4873
4880
4874 * IPython/ultraTB.py (VerboseTB.linereader): Fixed printing of
4881 * IPython/ultraTB.py (VerboseTB.linereader): Fixed printing of
4875 extra garbage for Python 2.2. Need to look more carefully into
4882 extra garbage for Python 2.2. Need to look more carefully into
4876 this later.
4883 this later.
4877
4884
4878 2002-01-19 Fernando Perez <fperez@colorado.edu>
4885 2002-01-19 Fernando Perez <fperez@colorado.edu>
4879
4886
4880 * IPython/iplib.py (InteractiveShell.showtraceback): fixed to
4887 * IPython/iplib.py (InteractiveShell.showtraceback): fixed to
4881 display SyntaxError exceptions properly formatted when they occur
4888 display SyntaxError exceptions properly formatted when they occur
4882 (they can be triggered by imported code).
4889 (they can be triggered by imported code).
4883
4890
4884 2002-01-18 Fernando Perez <fperez@colorado.edu>
4891 2002-01-18 Fernando Perez <fperez@colorado.edu>
4885
4892
4886 * IPython/iplib.py (InteractiveShell.safe_execfile): now
4893 * IPython/iplib.py (InteractiveShell.safe_execfile): now
4887 SyntaxError exceptions are reported nicely formatted, instead of
4894 SyntaxError exceptions are reported nicely formatted, instead of
4888 spitting out only offset information as before.
4895 spitting out only offset information as before.
4889 (Magic.magic_prun): Added the @prun function for executing
4896 (Magic.magic_prun): Added the @prun function for executing
4890 programs with command line args inside IPython.
4897 programs with command line args inside IPython.
4891
4898
4892 2002-01-16 Fernando Perez <fperez@colorado.edu>
4899 2002-01-16 Fernando Perez <fperez@colorado.edu>
4893
4900
4894 * IPython/iplib.py (Magic.magic_hist): Changed @hist and @dhist
4901 * IPython/iplib.py (Magic.magic_hist): Changed @hist and @dhist
4895 to *not* include the last item given in a range. This brings their
4902 to *not* include the last item given in a range. This brings their
4896 behavior in line with Python's slicing:
4903 behavior in line with Python's slicing:
4897 a[n1:n2] -> a[n1]...a[n2-1]
4904 a[n1:n2] -> a[n1]...a[n2-1]
4898 It may be a bit less convenient, but I prefer to stick to Python's
4905 It may be a bit less convenient, but I prefer to stick to Python's
4899 conventions *everywhere*, so users never have to wonder.
4906 conventions *everywhere*, so users never have to wonder.
4900 (Magic.magic_macro): Added @macro function to ease the creation of
4907 (Magic.magic_macro): Added @macro function to ease the creation of
4901 macros.
4908 macros.
4902
4909
4903 2002-01-05 Fernando Perez <fperez@colorado.edu>
4910 2002-01-05 Fernando Perez <fperez@colorado.edu>
4904
4911
4905 * Released 0.2.4.
4912 * Released 0.2.4.
4906
4913
4907 * IPython/iplib.py (Magic.magic_pdef):
4914 * IPython/iplib.py (Magic.magic_pdef):
4908 (InteractiveShell.safe_execfile): report magic lines and error
4915 (InteractiveShell.safe_execfile): report magic lines and error
4909 lines without line numbers so one can easily copy/paste them for
4916 lines without line numbers so one can easily copy/paste them for
4910 re-execution.
4917 re-execution.
4911
4918
4912 * Updated manual with recent changes.
4919 * Updated manual with recent changes.
4913
4920
4914 * IPython/iplib.py (Magic.magic_oinfo): added constructor
4921 * IPython/iplib.py (Magic.magic_oinfo): added constructor
4915 docstring printing when class? is called. Very handy for knowing
4922 docstring printing when class? is called. Very handy for knowing
4916 how to create class instances (as long as __init__ is well
4923 how to create class instances (as long as __init__ is well
4917 documented, of course :)
4924 documented, of course :)
4918 (Magic.magic_doc): print both class and constructor docstrings.
4925 (Magic.magic_doc): print both class and constructor docstrings.
4919 (Magic.magic_pdef): give constructor info if passed a class and
4926 (Magic.magic_pdef): give constructor info if passed a class and
4920 __call__ info for callable object instances.
4927 __call__ info for callable object instances.
4921
4928
4922 2002-01-04 Fernando Perez <fperez@colorado.edu>
4929 2002-01-04 Fernando Perez <fperez@colorado.edu>
4923
4930
4924 * Made deep_reload() off by default. It doesn't always work
4931 * Made deep_reload() off by default. It doesn't always work
4925 exactly as intended, so it's probably safer to have it off. It's
4932 exactly as intended, so it's probably safer to have it off. It's
4926 still available as dreload() anyway, so nothing is lost.
4933 still available as dreload() anyway, so nothing is lost.
4927
4934
4928 2002-01-02 Fernando Perez <fperez@colorado.edu>
4935 2002-01-02 Fernando Perez <fperez@colorado.edu>
4929
4936
4930 * Released 0.2.3 (contacted R.Singh at CU about biopython course,
4937 * Released 0.2.3 (contacted R.Singh at CU about biopython course,
4931 so I wanted an updated release).
4938 so I wanted an updated release).
4932
4939
4933 2001-12-27 Fernando Perez <fperez@colorado.edu>
4940 2001-12-27 Fernando Perez <fperez@colorado.edu>
4934
4941
4935 * IPython/iplib.py (InteractiveShell.interact): Added the original
4942 * IPython/iplib.py (InteractiveShell.interact): Added the original
4936 code from 'code.py' for this module in order to change the
4943 code from 'code.py' for this module in order to change the
4937 handling of a KeyboardInterrupt. This was necessary b/c otherwise
4944 handling of a KeyboardInterrupt. This was necessary b/c otherwise
4938 the history cache would break when the user hit Ctrl-C, and
4945 the history cache would break when the user hit Ctrl-C, and
4939 interact() offers no way to add any hooks to it.
4946 interact() offers no way to add any hooks to it.
4940
4947
4941 2001-12-23 Fernando Perez <fperez@colorado.edu>
4948 2001-12-23 Fernando Perez <fperez@colorado.edu>
4942
4949
4943 * setup.py: added check for 'MANIFEST' before trying to remove
4950 * setup.py: added check for 'MANIFEST' before trying to remove
4944 it. Thanks to Sean Reifschneider.
4951 it. Thanks to Sean Reifschneider.
4945
4952
4946 2001-12-22 Fernando Perez <fperez@colorado.edu>
4953 2001-12-22 Fernando Perez <fperez@colorado.edu>
4947
4954
4948 * Released 0.2.2.
4955 * Released 0.2.2.
4949
4956
4950 * Finished (reasonably) writing the manual. Later will add the
4957 * Finished (reasonably) writing the manual. Later will add the
4951 python-standard navigation stylesheets, but for the time being
4958 python-standard navigation stylesheets, but for the time being
4952 it's fairly complete. Distribution will include html and pdf
4959 it's fairly complete. Distribution will include html and pdf
4953 versions.
4960 versions.
4954
4961
4955 * Bugfix: '.' wasn't being added to sys.path. Thanks to Prabhu
4962 * Bugfix: '.' wasn't being added to sys.path. Thanks to Prabhu
4956 (MayaVi author).
4963 (MayaVi author).
4957
4964
4958 2001-12-21 Fernando Perez <fperez@colorado.edu>
4965 2001-12-21 Fernando Perez <fperez@colorado.edu>
4959
4966
4960 * Released 0.2.1. Barring any nasty bugs, this is it as far as a
4967 * Released 0.2.1. Barring any nasty bugs, this is it as far as a
4961 good public release, I think (with the manual and the distutils
4968 good public release, I think (with the manual and the distutils
4962 installer). The manual can use some work, but that can go
4969 installer). The manual can use some work, but that can go
4963 slowly. Otherwise I think it's quite nice for end users. Next
4970 slowly. Otherwise I think it's quite nice for end users. Next
4964 summer, rewrite the guts of it...
4971 summer, rewrite the guts of it...
4965
4972
4966 * Changed format of ipythonrc files to use whitespace as the
4973 * Changed format of ipythonrc files to use whitespace as the
4967 separator instead of an explicit '='. Cleaner.
4974 separator instead of an explicit '='. Cleaner.
4968
4975
4969 2001-12-20 Fernando Perez <fperez@colorado.edu>
4976 2001-12-20 Fernando Perez <fperez@colorado.edu>
4970
4977
4971 * Started a manual in LyX. For now it's just a quick merge of the
4978 * Started a manual in LyX. For now it's just a quick merge of the
4972 various internal docstrings and READMEs. Later it may grow into a
4979 various internal docstrings and READMEs. Later it may grow into a
4973 nice, full-blown manual.
4980 nice, full-blown manual.
4974
4981
4975 * Set up a distutils based installer. Installation should now be
4982 * Set up a distutils based installer. Installation should now be
4976 trivially simple for end-users.
4983 trivially simple for end-users.
4977
4984
4978 2001-12-11 Fernando Perez <fperez@colorado.edu>
4985 2001-12-11 Fernando Perez <fperez@colorado.edu>
4979
4986
4980 * Released 0.2.0. First public release, announced it at
4987 * Released 0.2.0. First public release, announced it at
4981 comp.lang.python. From now on, just bugfixes...
4988 comp.lang.python. From now on, just bugfixes...
4982
4989
4983 * Went through all the files, set copyright/license notices and
4990 * Went through all the files, set copyright/license notices and
4984 cleaned up things. Ready for release.
4991 cleaned up things. Ready for release.
4985
4992
4986 2001-12-10 Fernando Perez <fperez@colorado.edu>
4993 2001-12-10 Fernando Perez <fperez@colorado.edu>
4987
4994
4988 * Changed the first-time installer not to use tarfiles. It's more
4995 * Changed the first-time installer not to use tarfiles. It's more
4989 robust now and less unix-dependent. Also makes it easier for
4996 robust now and less unix-dependent. Also makes it easier for
4990 people to later upgrade versions.
4997 people to later upgrade versions.
4991
4998
4992 * Changed @exit to @abort to reflect the fact that it's pretty
4999 * Changed @exit to @abort to reflect the fact that it's pretty
4993 brutal (a sys.exit()). The difference between @abort and Ctrl-D
5000 brutal (a sys.exit()). The difference between @abort and Ctrl-D
4994 becomes significant only when IPyhton is embedded: in that case,
5001 becomes significant only when IPyhton is embedded: in that case,
4995 C-D closes IPython only, but @abort kills the enclosing program
5002 C-D closes IPython only, but @abort kills the enclosing program
4996 too (unless it had called IPython inside a try catching
5003 too (unless it had called IPython inside a try catching
4997 SystemExit).
5004 SystemExit).
4998
5005
4999 * Created Shell module which exposes the actuall IPython Shell
5006 * Created Shell module which exposes the actuall IPython Shell
5000 classes, currently the normal and the embeddable one. This at
5007 classes, currently the normal and the embeddable one. This at
5001 least offers a stable interface we won't need to change when
5008 least offers a stable interface we won't need to change when
5002 (later) the internals are rewritten. That rewrite will be confined
5009 (later) the internals are rewritten. That rewrite will be confined
5003 to iplib and ipmaker, but the Shell interface should remain as is.
5010 to iplib and ipmaker, but the Shell interface should remain as is.
5004
5011
5005 * Added embed module which offers an embeddable IPShell object,
5012 * Added embed module which offers an embeddable IPShell object,
5006 useful to fire up IPython *inside* a running program. Great for
5013 useful to fire up IPython *inside* a running program. Great for
5007 debugging or dynamical data analysis.
5014 debugging or dynamical data analysis.
5008
5015
5009 2001-12-08 Fernando Perez <fperez@colorado.edu>
5016 2001-12-08 Fernando Perez <fperez@colorado.edu>
5010
5017
5011 * Fixed small bug preventing seeing info from methods of defined
5018 * Fixed small bug preventing seeing info from methods of defined
5012 objects (incorrect namespace in _ofind()).
5019 objects (incorrect namespace in _ofind()).
5013
5020
5014 * Documentation cleanup. Moved the main usage docstrings to a
5021 * Documentation cleanup. Moved the main usage docstrings to a
5015 separate file, usage.py (cleaner to maintain, and hopefully in the
5022 separate file, usage.py (cleaner to maintain, and hopefully in the
5016 future some perlpod-like way of producing interactive, man and
5023 future some perlpod-like way of producing interactive, man and
5017 html docs out of it will be found).
5024 html docs out of it will be found).
5018
5025
5019 * Added @profile to see your profile at any time.
5026 * Added @profile to see your profile at any time.
5020
5027
5021 * Added @p as an alias for 'print'. It's especially convenient if
5028 * Added @p as an alias for 'print'. It's especially convenient if
5022 using automagic ('p x' prints x).
5029 using automagic ('p x' prints x).
5023
5030
5024 * Small cleanups and fixes after a pychecker run.
5031 * Small cleanups and fixes after a pychecker run.
5025
5032
5026 * Changed the @cd command to handle @cd - and @cd -<n> for
5033 * Changed the @cd command to handle @cd - and @cd -<n> for
5027 visiting any directory in _dh.
5034 visiting any directory in _dh.
5028
5035
5029 * Introduced _dh, a history of visited directories. @dhist prints
5036 * Introduced _dh, a history of visited directories. @dhist prints
5030 it out with numbers.
5037 it out with numbers.
5031
5038
5032 2001-12-07 Fernando Perez <fperez@colorado.edu>
5039 2001-12-07 Fernando Perez <fperez@colorado.edu>
5033
5040
5034 * Released 0.1.22
5041 * Released 0.1.22
5035
5042
5036 * Made initialization a bit more robust against invalid color
5043 * Made initialization a bit more robust against invalid color
5037 options in user input (exit, not traceback-crash).
5044 options in user input (exit, not traceback-crash).
5038
5045
5039 * Changed the bug crash reporter to write the report only in the
5046 * Changed the bug crash reporter to write the report only in the
5040 user's .ipython directory. That way IPython won't litter people's
5047 user's .ipython directory. That way IPython won't litter people's
5041 hard disks with crash files all over the place. Also print on
5048 hard disks with crash files all over the place. Also print on
5042 screen the necessary mail command.
5049 screen the necessary mail command.
5043
5050
5044 * With the new ultraTB, implemented LightBG color scheme for light
5051 * With the new ultraTB, implemented LightBG color scheme for light
5045 background terminals. A lot of people like white backgrounds, so I
5052 background terminals. A lot of people like white backgrounds, so I
5046 guess we should at least give them something readable.
5053 guess we should at least give them something readable.
5047
5054
5048 2001-12-06 Fernando Perez <fperez@colorado.edu>
5055 2001-12-06 Fernando Perez <fperez@colorado.edu>
5049
5056
5050 * Modified the structure of ultraTB. Now there's a proper class
5057 * Modified the structure of ultraTB. Now there's a proper class
5051 for tables of color schemes which allow adding schemes easily and
5058 for tables of color schemes which allow adding schemes easily and
5052 switching the active scheme without creating a new instance every
5059 switching the active scheme without creating a new instance every
5053 time (which was ridiculous). The syntax for creating new schemes
5060 time (which was ridiculous). The syntax for creating new schemes
5054 is also cleaner. I think ultraTB is finally done, with a clean
5061 is also cleaner. I think ultraTB is finally done, with a clean
5055 class structure. Names are also much cleaner (now there's proper
5062 class structure. Names are also much cleaner (now there's proper
5056 color tables, no need for every variable to also have 'color' in
5063 color tables, no need for every variable to also have 'color' in
5057 its name).
5064 its name).
5058
5065
5059 * Broke down genutils into separate files. Now genutils only
5066 * Broke down genutils into separate files. Now genutils only
5060 contains utility functions, and classes have been moved to their
5067 contains utility functions, and classes have been moved to their
5061 own files (they had enough independent functionality to warrant
5068 own files (they had enough independent functionality to warrant
5062 it): ConfigLoader, OutputTrap, Struct.
5069 it): ConfigLoader, OutputTrap, Struct.
5063
5070
5064 2001-12-05 Fernando Perez <fperez@colorado.edu>
5071 2001-12-05 Fernando Perez <fperez@colorado.edu>
5065
5072
5066 * IPython turns 21! Released version 0.1.21, as a candidate for
5073 * IPython turns 21! Released version 0.1.21, as a candidate for
5067 public consumption. If all goes well, release in a few days.
5074 public consumption. If all goes well, release in a few days.
5068
5075
5069 * Fixed path bug (files in Extensions/ directory wouldn't be found
5076 * Fixed path bug (files in Extensions/ directory wouldn't be found
5070 unless IPython/ was explicitly in sys.path).
5077 unless IPython/ was explicitly in sys.path).
5071
5078
5072 * Extended the FlexCompleter class as MagicCompleter to allow
5079 * Extended the FlexCompleter class as MagicCompleter to allow
5073 completion of @-starting lines.
5080 completion of @-starting lines.
5074
5081
5075 * Created __release__.py file as a central repository for release
5082 * Created __release__.py file as a central repository for release
5076 info that other files can read from.
5083 info that other files can read from.
5077
5084
5078 * Fixed small bug in logging: when logging was turned on in
5085 * Fixed small bug in logging: when logging was turned on in
5079 mid-session, old lines with special meanings (!@?) were being
5086 mid-session, old lines with special meanings (!@?) were being
5080 logged without the prepended comment, which is necessary since
5087 logged without the prepended comment, which is necessary since
5081 they are not truly valid python syntax. This should make session
5088 they are not truly valid python syntax. This should make session
5082 restores produce less errors.
5089 restores produce less errors.
5083
5090
5084 * The namespace cleanup forced me to make a FlexCompleter class
5091 * The namespace cleanup forced me to make a FlexCompleter class
5085 which is nothing but a ripoff of rlcompleter, but with selectable
5092 which is nothing but a ripoff of rlcompleter, but with selectable
5086 namespace (rlcompleter only works in __main__.__dict__). I'll try
5093 namespace (rlcompleter only works in __main__.__dict__). I'll try
5087 to submit a note to the authors to see if this change can be
5094 to submit a note to the authors to see if this change can be
5088 incorporated in future rlcompleter releases (Dec.6: done)
5095 incorporated in future rlcompleter releases (Dec.6: done)
5089
5096
5090 * More fixes to namespace handling. It was a mess! Now all
5097 * More fixes to namespace handling. It was a mess! Now all
5091 explicit references to __main__.__dict__ are gone (except when
5098 explicit references to __main__.__dict__ are gone (except when
5092 really needed) and everything is handled through the namespace
5099 really needed) and everything is handled through the namespace
5093 dicts in the IPython instance. We seem to be getting somewhere
5100 dicts in the IPython instance. We seem to be getting somewhere
5094 with this, finally...
5101 with this, finally...
5095
5102
5096 * Small documentation updates.
5103 * Small documentation updates.
5097
5104
5098 * Created the Extensions directory under IPython (with an
5105 * Created the Extensions directory under IPython (with an
5099 __init__.py). Put the PhysicalQ stuff there. This directory should
5106 __init__.py). Put the PhysicalQ stuff there. This directory should
5100 be used for all special-purpose extensions.
5107 be used for all special-purpose extensions.
5101
5108
5102 * File renaming:
5109 * File renaming:
5103 ipythonlib --> ipmaker
5110 ipythonlib --> ipmaker
5104 ipplib --> iplib
5111 ipplib --> iplib
5105 This makes a bit more sense in terms of what these files actually do.
5112 This makes a bit more sense in terms of what these files actually do.
5106
5113
5107 * Moved all the classes and functions in ipythonlib to ipplib, so
5114 * Moved all the classes and functions in ipythonlib to ipplib, so
5108 now ipythonlib only has make_IPython(). This will ease up its
5115 now ipythonlib only has make_IPython(). This will ease up its
5109 splitting in smaller functional chunks later.
5116 splitting in smaller functional chunks later.
5110
5117
5111 * Cleaned up (done, I think) output of @whos. Better column
5118 * Cleaned up (done, I think) output of @whos. Better column
5112 formatting, and now shows str(var) for as much as it can, which is
5119 formatting, and now shows str(var) for as much as it can, which is
5113 typically what one gets with a 'print var'.
5120 typically what one gets with a 'print var'.
5114
5121
5115 2001-12-04 Fernando Perez <fperez@colorado.edu>
5122 2001-12-04 Fernando Perez <fperez@colorado.edu>
5116
5123
5117 * Fixed namespace problems. Now builtin/IPyhton/user names get
5124 * Fixed namespace problems. Now builtin/IPyhton/user names get
5118 properly reported in their namespace. Internal namespace handling
5125 properly reported in their namespace. Internal namespace handling
5119 is finally getting decent (not perfect yet, but much better than
5126 is finally getting decent (not perfect yet, but much better than
5120 the ad-hoc mess we had).
5127 the ad-hoc mess we had).
5121
5128
5122 * Removed -exit option. If people just want to run a python
5129 * Removed -exit option. If people just want to run a python
5123 script, that's what the normal interpreter is for. Less
5130 script, that's what the normal interpreter is for. Less
5124 unnecessary options, less chances for bugs.
5131 unnecessary options, less chances for bugs.
5125
5132
5126 * Added a crash handler which generates a complete post-mortem if
5133 * Added a crash handler which generates a complete post-mortem if
5127 IPython crashes. This will help a lot in tracking bugs down the
5134 IPython crashes. This will help a lot in tracking bugs down the
5128 road.
5135 road.
5129
5136
5130 * Fixed nasty bug in auto-evaluation part of prefilter(). Names
5137 * Fixed nasty bug in auto-evaluation part of prefilter(). Names
5131 which were boud to functions being reassigned would bypass the
5138 which were boud to functions being reassigned would bypass the
5132 logger, breaking the sync of _il with the prompt counter. This
5139 logger, breaking the sync of _il with the prompt counter. This
5133 would then crash IPython later when a new line was logged.
5140 would then crash IPython later when a new line was logged.
5134
5141
5135 2001-12-02 Fernando Perez <fperez@colorado.edu>
5142 2001-12-02 Fernando Perez <fperez@colorado.edu>
5136
5143
5137 * Made IPython a package. This means people don't have to clutter
5144 * Made IPython a package. This means people don't have to clutter
5138 their sys.path with yet another directory. Changed the INSTALL
5145 their sys.path with yet another directory. Changed the INSTALL
5139 file accordingly.
5146 file accordingly.
5140
5147
5141 * Cleaned up the output of @who_ls, @who and @whos. @who_ls now
5148 * Cleaned up the output of @who_ls, @who and @whos. @who_ls now
5142 sorts its output (so @who shows it sorted) and @whos formats the
5149 sorts its output (so @who shows it sorted) and @whos formats the
5143 table according to the width of the first column. Nicer, easier to
5150 table according to the width of the first column. Nicer, easier to
5144 read. Todo: write a generic table_format() which takes a list of
5151 read. Todo: write a generic table_format() which takes a list of
5145 lists and prints it nicely formatted, with optional row/column
5152 lists and prints it nicely formatted, with optional row/column
5146 separators and proper padding and justification.
5153 separators and proper padding and justification.
5147
5154
5148 * Released 0.1.20
5155 * Released 0.1.20
5149
5156
5150 * Fixed bug in @log which would reverse the inputcache list (a
5157 * Fixed bug in @log which would reverse the inputcache list (a
5151 copy operation was missing).
5158 copy operation was missing).
5152
5159
5153 * Code cleanup. @config was changed to use page(). Better, since
5160 * Code cleanup. @config was changed to use page(). Better, since
5154 its output is always quite long.
5161 its output is always quite long.
5155
5162
5156 * Itpl is back as a dependency. I was having too many problems
5163 * Itpl is back as a dependency. I was having too many problems
5157 getting the parametric aliases to work reliably, and it's just
5164 getting the parametric aliases to work reliably, and it's just
5158 easier to code weird string operations with it than playing %()s
5165 easier to code weird string operations with it than playing %()s
5159 games. It's only ~6k, so I don't think it's too big a deal.
5166 games. It's only ~6k, so I don't think it's too big a deal.
5160
5167
5161 * Found (and fixed) a very nasty bug with history. !lines weren't
5168 * Found (and fixed) a very nasty bug with history. !lines weren't
5162 getting cached, and the out of sync caches would crash
5169 getting cached, and the out of sync caches would crash
5163 IPython. Fixed it by reorganizing the prefilter/handlers/logger
5170 IPython. Fixed it by reorganizing the prefilter/handlers/logger
5164 division of labor a bit better. Bug fixed, cleaner structure.
5171 division of labor a bit better. Bug fixed, cleaner structure.
5165
5172
5166 2001-12-01 Fernando Perez <fperez@colorado.edu>
5173 2001-12-01 Fernando Perez <fperez@colorado.edu>
5167
5174
5168 * Released 0.1.19
5175 * Released 0.1.19
5169
5176
5170 * Added option -n to @hist to prevent line number printing. Much
5177 * Added option -n to @hist to prevent line number printing. Much
5171 easier to copy/paste code this way.
5178 easier to copy/paste code this way.
5172
5179
5173 * Created global _il to hold the input list. Allows easy
5180 * Created global _il to hold the input list. Allows easy
5174 re-execution of blocks of code by slicing it (inspired by Janko's
5181 re-execution of blocks of code by slicing it (inspired by Janko's
5175 comment on 'macros').
5182 comment on 'macros').
5176
5183
5177 * Small fixes and doc updates.
5184 * Small fixes and doc updates.
5178
5185
5179 * Rewrote @history function (was @h). Renamed it to @hist, @h is
5186 * Rewrote @history function (was @h). Renamed it to @hist, @h is
5180 much too fragile with automagic. Handles properly multi-line
5187 much too fragile with automagic. Handles properly multi-line
5181 statements and takes parameters.
5188 statements and takes parameters.
5182
5189
5183 2001-11-30 Fernando Perez <fperez@colorado.edu>
5190 2001-11-30 Fernando Perez <fperez@colorado.edu>
5184
5191
5185 * Version 0.1.18 released.
5192 * Version 0.1.18 released.
5186
5193
5187 * Fixed nasty namespace bug in initial module imports.
5194 * Fixed nasty namespace bug in initial module imports.
5188
5195
5189 * Added copyright/license notes to all code files (except
5196 * Added copyright/license notes to all code files (except
5190 DPyGetOpt). For the time being, LGPL. That could change.
5197 DPyGetOpt). For the time being, LGPL. That could change.
5191
5198
5192 * Rewrote a much nicer README, updated INSTALL, cleaned up
5199 * Rewrote a much nicer README, updated INSTALL, cleaned up
5193 ipythonrc-* samples.
5200 ipythonrc-* samples.
5194
5201
5195 * Overall code/documentation cleanup. Basically ready for
5202 * Overall code/documentation cleanup. Basically ready for
5196 release. Only remaining thing: licence decision (LGPL?).
5203 release. Only remaining thing: licence decision (LGPL?).
5197
5204
5198 * Converted load_config to a class, ConfigLoader. Now recursion
5205 * Converted load_config to a class, ConfigLoader. Now recursion
5199 control is better organized. Doesn't include the same file twice.
5206 control is better organized. Doesn't include the same file twice.
5200
5207
5201 2001-11-29 Fernando Perez <fperez@colorado.edu>
5208 2001-11-29 Fernando Perez <fperez@colorado.edu>
5202
5209
5203 * Got input history working. Changed output history variables from
5210 * Got input history working. Changed output history variables from
5204 _p to _o so that _i is for input and _o for output. Just cleaner
5211 _p to _o so that _i is for input and _o for output. Just cleaner
5205 convention.
5212 convention.
5206
5213
5207 * Implemented parametric aliases. This pretty much allows the
5214 * Implemented parametric aliases. This pretty much allows the
5208 alias system to offer full-blown shell convenience, I think.
5215 alias system to offer full-blown shell convenience, I think.
5209
5216
5210 * Version 0.1.17 released, 0.1.18 opened.
5217 * Version 0.1.17 released, 0.1.18 opened.
5211
5218
5212 * dot_ipython/ipythonrc (alias): added documentation.
5219 * dot_ipython/ipythonrc (alias): added documentation.
5213 (xcolor): Fixed small bug (xcolors -> xcolor)
5220 (xcolor): Fixed small bug (xcolors -> xcolor)
5214
5221
5215 * Changed the alias system. Now alias is a magic command to define
5222 * Changed the alias system. Now alias is a magic command to define
5216 aliases just like the shell. Rationale: the builtin magics should
5223 aliases just like the shell. Rationale: the builtin magics should
5217 be there for things deeply connected to IPython's
5224 be there for things deeply connected to IPython's
5218 architecture. And this is a much lighter system for what I think
5225 architecture. And this is a much lighter system for what I think
5219 is the really important feature: allowing users to define quickly
5226 is the really important feature: allowing users to define quickly
5220 magics that will do shell things for them, so they can customize
5227 magics that will do shell things for them, so they can customize
5221 IPython easily to match their work habits. If someone is really
5228 IPython easily to match their work habits. If someone is really
5222 desperate to have another name for a builtin alias, they can
5229 desperate to have another name for a builtin alias, they can
5223 always use __IP.magic_newname = __IP.magic_oldname. Hackish but
5230 always use __IP.magic_newname = __IP.magic_oldname. Hackish but
5224 works.
5231 works.
5225
5232
5226 2001-11-28 Fernando Perez <fperez@colorado.edu>
5233 2001-11-28 Fernando Perez <fperez@colorado.edu>
5227
5234
5228 * Changed @file so that it opens the source file at the proper
5235 * Changed @file so that it opens the source file at the proper
5229 line. Since it uses less, if your EDITOR environment is
5236 line. Since it uses less, if your EDITOR environment is
5230 configured, typing v will immediately open your editor of choice
5237 configured, typing v will immediately open your editor of choice
5231 right at the line where the object is defined. Not as quick as
5238 right at the line where the object is defined. Not as quick as
5232 having a direct @edit command, but for all intents and purposes it
5239 having a direct @edit command, but for all intents and purposes it
5233 works. And I don't have to worry about writing @edit to deal with
5240 works. And I don't have to worry about writing @edit to deal with
5234 all the editors, less does that.
5241 all the editors, less does that.
5235
5242
5236 * Version 0.1.16 released, 0.1.17 opened.
5243 * Version 0.1.16 released, 0.1.17 opened.
5237
5244
5238 * Fixed some nasty bugs in the page/page_dumb combo that could
5245 * Fixed some nasty bugs in the page/page_dumb combo that could
5239 crash IPython.
5246 crash IPython.
5240
5247
5241 2001-11-27 Fernando Perez <fperez@colorado.edu>
5248 2001-11-27 Fernando Perez <fperez@colorado.edu>
5242
5249
5243 * Version 0.1.15 released, 0.1.16 opened.
5250 * Version 0.1.15 released, 0.1.16 opened.
5244
5251
5245 * Finally got ? and ?? to work for undefined things: now it's
5252 * Finally got ? and ?? to work for undefined things: now it's
5246 possible to type {}.get? and get information about the get method
5253 possible to type {}.get? and get information about the get method
5247 of dicts, or os.path? even if only os is defined (so technically
5254 of dicts, or os.path? even if only os is defined (so technically
5248 os.path isn't). Works at any level. For example, after import os,
5255 os.path isn't). Works at any level. For example, after import os,
5249 os?, os.path?, os.path.abspath? all work. This is great, took some
5256 os?, os.path?, os.path.abspath? all work. This is great, took some
5250 work in _ofind.
5257 work in _ofind.
5251
5258
5252 * Fixed more bugs with logging. The sanest way to do it was to add
5259 * Fixed more bugs with logging. The sanest way to do it was to add
5253 to @log a 'mode' parameter. Killed two in one shot (this mode
5260 to @log a 'mode' parameter. Killed two in one shot (this mode
5254 option was a request of Janko's). I think it's finally clean
5261 option was a request of Janko's). I think it's finally clean
5255 (famous last words).
5262 (famous last words).
5256
5263
5257 * Added a page_dumb() pager which does a decent job of paging on
5264 * Added a page_dumb() pager which does a decent job of paging on
5258 screen, if better things (like less) aren't available. One less
5265 screen, if better things (like less) aren't available. One less
5259 unix dependency (someday maybe somebody will port this to
5266 unix dependency (someday maybe somebody will port this to
5260 windows).
5267 windows).
5261
5268
5262 * Fixed problem in magic_log: would lock of logging out if log
5269 * Fixed problem in magic_log: would lock of logging out if log
5263 creation failed (because it would still think it had succeeded).
5270 creation failed (because it would still think it had succeeded).
5264
5271
5265 * Improved the page() function using curses to auto-detect screen
5272 * Improved the page() function using curses to auto-detect screen
5266 size. Now it can make a much better decision on whether to print
5273 size. Now it can make a much better decision on whether to print
5267 or page a string. Option screen_length was modified: a value 0
5274 or page a string. Option screen_length was modified: a value 0
5268 means auto-detect, and that's the default now.
5275 means auto-detect, and that's the default now.
5269
5276
5270 * Version 0.1.14 released, 0.1.15 opened. I think this is ready to
5277 * Version 0.1.14 released, 0.1.15 opened. I think this is ready to
5271 go out. I'll test it for a few days, then talk to Janko about
5278 go out. I'll test it for a few days, then talk to Janko about
5272 licences and announce it.
5279 licences and announce it.
5273
5280
5274 * Fixed the length of the auto-generated ---> prompt which appears
5281 * Fixed the length of the auto-generated ---> prompt which appears
5275 for auto-parens and auto-quotes. Getting this right isn't trivial,
5282 for auto-parens and auto-quotes. Getting this right isn't trivial,
5276 with all the color escapes, different prompt types and optional
5283 with all the color escapes, different prompt types and optional
5277 separators. But it seems to be working in all the combinations.
5284 separators. But it seems to be working in all the combinations.
5278
5285
5279 2001-11-26 Fernando Perez <fperez@colorado.edu>
5286 2001-11-26 Fernando Perez <fperez@colorado.edu>
5280
5287
5281 * Wrote a regexp filter to get option types from the option names
5288 * Wrote a regexp filter to get option types from the option names
5282 string. This eliminates the need to manually keep two duplicate
5289 string. This eliminates the need to manually keep two duplicate
5283 lists.
5290 lists.
5284
5291
5285 * Removed the unneeded check_option_names. Now options are handled
5292 * Removed the unneeded check_option_names. Now options are handled
5286 in a much saner manner and it's easy to visually check that things
5293 in a much saner manner and it's easy to visually check that things
5287 are ok.
5294 are ok.
5288
5295
5289 * Updated version numbers on all files I modified to carry a
5296 * Updated version numbers on all files I modified to carry a
5290 notice so Janko and Nathan have clear version markers.
5297 notice so Janko and Nathan have clear version markers.
5291
5298
5292 * Updated docstring for ultraTB with my changes. I should send
5299 * Updated docstring for ultraTB with my changes. I should send
5293 this to Nathan.
5300 this to Nathan.
5294
5301
5295 * Lots of small fixes. Ran everything through pychecker again.
5302 * Lots of small fixes. Ran everything through pychecker again.
5296
5303
5297 * Made loading of deep_reload an cmd line option. If it's not too
5304 * Made loading of deep_reload an cmd line option. If it's not too
5298 kosher, now people can just disable it. With -nodeep_reload it's
5305 kosher, now people can just disable it. With -nodeep_reload it's
5299 still available as dreload(), it just won't overwrite reload().
5306 still available as dreload(), it just won't overwrite reload().
5300
5307
5301 * Moved many options to the no| form (-opt and -noopt
5308 * Moved many options to the no| form (-opt and -noopt
5302 accepted). Cleaner.
5309 accepted). Cleaner.
5303
5310
5304 * Changed magic_log so that if called with no parameters, it uses
5311 * Changed magic_log so that if called with no parameters, it uses
5305 'rotate' mode. That way auto-generated logs aren't automatically
5312 'rotate' mode. That way auto-generated logs aren't automatically
5306 over-written. For normal logs, now a backup is made if it exists
5313 over-written. For normal logs, now a backup is made if it exists
5307 (only 1 level of backups). A new 'backup' mode was added to the
5314 (only 1 level of backups). A new 'backup' mode was added to the
5308 Logger class to support this. This was a request by Janko.
5315 Logger class to support this. This was a request by Janko.
5309
5316
5310 * Added @logoff/@logon to stop/restart an active log.
5317 * Added @logoff/@logon to stop/restart an active log.
5311
5318
5312 * Fixed a lot of bugs in log saving/replay. It was pretty
5319 * Fixed a lot of bugs in log saving/replay. It was pretty
5313 broken. Now special lines (!@,/) appear properly in the command
5320 broken. Now special lines (!@,/) appear properly in the command
5314 history after a log replay.
5321 history after a log replay.
5315
5322
5316 * Tried and failed to implement full session saving via pickle. My
5323 * Tried and failed to implement full session saving via pickle. My
5317 idea was to pickle __main__.__dict__, but modules can't be
5324 idea was to pickle __main__.__dict__, but modules can't be
5318 pickled. This would be a better alternative to replaying logs, but
5325 pickled. This would be a better alternative to replaying logs, but
5319 seems quite tricky to get to work. Changed -session to be called
5326 seems quite tricky to get to work. Changed -session to be called
5320 -logplay, which more accurately reflects what it does. And if we
5327 -logplay, which more accurately reflects what it does. And if we
5321 ever get real session saving working, -session is now available.
5328 ever get real session saving working, -session is now available.
5322
5329
5323 * Implemented color schemes for prompts also. As for tracebacks,
5330 * Implemented color schemes for prompts also. As for tracebacks,
5324 currently only NoColor and Linux are supported. But now the
5331 currently only NoColor and Linux are supported. But now the
5325 infrastructure is in place, based on a generic ColorScheme
5332 infrastructure is in place, based on a generic ColorScheme
5326 class. So writing and activating new schemes both for the prompts
5333 class. So writing and activating new schemes both for the prompts
5327 and the tracebacks should be straightforward.
5334 and the tracebacks should be straightforward.
5328
5335
5329 * Version 0.1.13 released, 0.1.14 opened.
5336 * Version 0.1.13 released, 0.1.14 opened.
5330
5337
5331 * Changed handling of options for output cache. Now counter is
5338 * Changed handling of options for output cache. Now counter is
5332 hardwired starting at 1 and one specifies the maximum number of
5339 hardwired starting at 1 and one specifies the maximum number of
5333 entries *in the outcache* (not the max prompt counter). This is
5340 entries *in the outcache* (not the max prompt counter). This is
5334 much better, since many statements won't increase the cache
5341 much better, since many statements won't increase the cache
5335 count. It also eliminated some confusing options, now there's only
5342 count. It also eliminated some confusing options, now there's only
5336 one: cache_size.
5343 one: cache_size.
5337
5344
5338 * Added 'alias' magic function and magic_alias option in the
5345 * Added 'alias' magic function and magic_alias option in the
5339 ipythonrc file. Now the user can easily define whatever names he
5346 ipythonrc file. Now the user can easily define whatever names he
5340 wants for the magic functions without having to play weird
5347 wants for the magic functions without having to play weird
5341 namespace games. This gives IPython a real shell-like feel.
5348 namespace games. This gives IPython a real shell-like feel.
5342
5349
5343 * Fixed doc/?/?? for magics. Now all work, in all forms (explicit
5350 * Fixed doc/?/?? for magics. Now all work, in all forms (explicit
5344 @ or not).
5351 @ or not).
5345
5352
5346 This was one of the last remaining 'visible' bugs (that I know
5353 This was one of the last remaining 'visible' bugs (that I know
5347 of). I think if I can clean up the session loading so it works
5354 of). I think if I can clean up the session loading so it works
5348 100% I'll release a 0.2.0 version on c.p.l (talk to Janko first
5355 100% I'll release a 0.2.0 version on c.p.l (talk to Janko first
5349 about licensing).
5356 about licensing).
5350
5357
5351 2001-11-25 Fernando Perez <fperez@colorado.edu>
5358 2001-11-25 Fernando Perez <fperez@colorado.edu>
5352
5359
5353 * Rewrote somewhat oinfo (?/??). Nicer, now uses page() and
5360 * Rewrote somewhat oinfo (?/??). Nicer, now uses page() and
5354 there's a cleaner distinction between what ? and ?? show.
5361 there's a cleaner distinction between what ? and ?? show.
5355
5362
5356 * Added screen_length option. Now the user can define his own
5363 * Added screen_length option. Now the user can define his own
5357 screen size for page() operations.
5364 screen size for page() operations.
5358
5365
5359 * Implemented magic shell-like functions with automatic code
5366 * Implemented magic shell-like functions with automatic code
5360 generation. Now adding another function is just a matter of adding
5367 generation. Now adding another function is just a matter of adding
5361 an entry to a dict, and the function is dynamically generated at
5368 an entry to a dict, and the function is dynamically generated at
5362 run-time. Python has some really cool features!
5369 run-time. Python has some really cool features!
5363
5370
5364 * Renamed many options to cleanup conventions a little. Now all
5371 * Renamed many options to cleanup conventions a little. Now all
5365 are lowercase, and only underscores where needed. Also in the code
5372 are lowercase, and only underscores where needed. Also in the code
5366 option name tables are clearer.
5373 option name tables are clearer.
5367
5374
5368 * Changed prompts a little. Now input is 'In [n]:' instead of
5375 * Changed prompts a little. Now input is 'In [n]:' instead of
5369 'In[n]:='. This allows it the numbers to be aligned with the
5376 'In[n]:='. This allows it the numbers to be aligned with the
5370 Out[n] numbers, and removes usage of ':=' which doesn't exist in
5377 Out[n] numbers, and removes usage of ':=' which doesn't exist in
5371 Python (it was a Mathematica thing). The '...' continuation prompt
5378 Python (it was a Mathematica thing). The '...' continuation prompt
5372 was also changed a little to align better.
5379 was also changed a little to align better.
5373
5380
5374 * Fixed bug when flushing output cache. Not all _p<n> variables
5381 * Fixed bug when flushing output cache. Not all _p<n> variables
5375 exist, so their deletion needs to be wrapped in a try:
5382 exist, so their deletion needs to be wrapped in a try:
5376
5383
5377 * Figured out how to properly use inspect.formatargspec() (it
5384 * Figured out how to properly use inspect.formatargspec() (it
5378 requires the args preceded by *). So I removed all the code from
5385 requires the args preceded by *). So I removed all the code from
5379 _get_pdef in Magic, which was just replicating that.
5386 _get_pdef in Magic, which was just replicating that.
5380
5387
5381 * Added test to prefilter to allow redefining magic function names
5388 * Added test to prefilter to allow redefining magic function names
5382 as variables. This is ok, since the @ form is always available,
5389 as variables. This is ok, since the @ form is always available,
5383 but whe should allow the user to define a variable called 'ls' if
5390 but whe should allow the user to define a variable called 'ls' if
5384 he needs it.
5391 he needs it.
5385
5392
5386 * Moved the ToDo information from README into a separate ToDo.
5393 * Moved the ToDo information from README into a separate ToDo.
5387
5394
5388 * General code cleanup and small bugfixes. I think it's close to a
5395 * General code cleanup and small bugfixes. I think it's close to a
5389 state where it can be released, obviously with a big 'beta'
5396 state where it can be released, obviously with a big 'beta'
5390 warning on it.
5397 warning on it.
5391
5398
5392 * Got the magic function split to work. Now all magics are defined
5399 * Got the magic function split to work. Now all magics are defined
5393 in a separate class. It just organizes things a bit, and now
5400 in a separate class. It just organizes things a bit, and now
5394 Xemacs behaves nicer (it was choking on InteractiveShell b/c it
5401 Xemacs behaves nicer (it was choking on InteractiveShell b/c it
5395 was too long).
5402 was too long).
5396
5403
5397 * Changed @clear to @reset to avoid potential confusions with
5404 * Changed @clear to @reset to avoid potential confusions with
5398 the shell command clear. Also renamed @cl to @clear, which does
5405 the shell command clear. Also renamed @cl to @clear, which does
5399 exactly what people expect it to from their shell experience.
5406 exactly what people expect it to from their shell experience.
5400
5407
5401 Added a check to the @reset command (since it's so
5408 Added a check to the @reset command (since it's so
5402 destructive, it's probably a good idea to ask for confirmation).
5409 destructive, it's probably a good idea to ask for confirmation).
5403 But now reset only works for full namespace resetting. Since the
5410 But now reset only works for full namespace resetting. Since the
5404 del keyword is already there for deleting a few specific
5411 del keyword is already there for deleting a few specific
5405 variables, I don't see the point of having a redundant magic
5412 variables, I don't see the point of having a redundant magic
5406 function for the same task.
5413 function for the same task.
5407
5414
5408 2001-11-24 Fernando Perez <fperez@colorado.edu>
5415 2001-11-24 Fernando Perez <fperez@colorado.edu>
5409
5416
5410 * Updated the builtin docs (esp. the ? ones).
5417 * Updated the builtin docs (esp. the ? ones).
5411
5418
5412 * Ran all the code through pychecker. Not terribly impressed with
5419 * Ran all the code through pychecker. Not terribly impressed with
5413 it: lots of spurious warnings and didn't really find anything of
5420 it: lots of spurious warnings and didn't really find anything of
5414 substance (just a few modules being imported and not used).
5421 substance (just a few modules being imported and not used).
5415
5422
5416 * Implemented the new ultraTB functionality into IPython. New
5423 * Implemented the new ultraTB functionality into IPython. New
5417 option: xcolors. This chooses color scheme. xmode now only selects
5424 option: xcolors. This chooses color scheme. xmode now only selects
5418 between Plain and Verbose. Better orthogonality.
5425 between Plain and Verbose. Better orthogonality.
5419
5426
5420 * Large rewrite of ultraTB. Much cleaner now, with a separation of
5427 * Large rewrite of ultraTB. Much cleaner now, with a separation of
5421 mode and color scheme for the exception handlers. Now it's
5428 mode and color scheme for the exception handlers. Now it's
5422 possible to have the verbose traceback with no coloring.
5429 possible to have the verbose traceback with no coloring.
5423
5430
5424 2001-11-23 Fernando Perez <fperez@colorado.edu>
5431 2001-11-23 Fernando Perez <fperez@colorado.edu>
5425
5432
5426 * Version 0.1.12 released, 0.1.13 opened.
5433 * Version 0.1.12 released, 0.1.13 opened.
5427
5434
5428 * Removed option to set auto-quote and auto-paren escapes by
5435 * Removed option to set auto-quote and auto-paren escapes by
5429 user. The chances of breaking valid syntax are just too high. If
5436 user. The chances of breaking valid syntax are just too high. If
5430 someone *really* wants, they can always dig into the code.
5437 someone *really* wants, they can always dig into the code.
5431
5438
5432 * Made prompt separators configurable.
5439 * Made prompt separators configurable.
5433
5440
5434 2001-11-22 Fernando Perez <fperez@colorado.edu>
5441 2001-11-22 Fernando Perez <fperez@colorado.edu>
5435
5442
5436 * Small bugfixes in many places.
5443 * Small bugfixes in many places.
5437
5444
5438 * Removed the MyCompleter class from ipplib. It seemed redundant
5445 * Removed the MyCompleter class from ipplib. It seemed redundant
5439 with the C-p,C-n history search functionality. Less code to
5446 with the C-p,C-n history search functionality. Less code to
5440 maintain.
5447 maintain.
5441
5448
5442 * Moved all the original ipython.py code into ipythonlib.py. Right
5449 * Moved all the original ipython.py code into ipythonlib.py. Right
5443 now it's just one big dump into a function called make_IPython, so
5450 now it's just one big dump into a function called make_IPython, so
5444 no real modularity has been gained. But at least it makes the
5451 no real modularity has been gained. But at least it makes the
5445 wrapper script tiny, and since ipythonlib is a module, it gets
5452 wrapper script tiny, and since ipythonlib is a module, it gets
5446 compiled and startup is much faster.
5453 compiled and startup is much faster.
5447
5454
5448 This is a reasobably 'deep' change, so we should test it for a
5455 This is a reasobably 'deep' change, so we should test it for a
5449 while without messing too much more with the code.
5456 while without messing too much more with the code.
5450
5457
5451 2001-11-21 Fernando Perez <fperez@colorado.edu>
5458 2001-11-21 Fernando Perez <fperez@colorado.edu>
5452
5459
5453 * Version 0.1.11 released, 0.1.12 opened for further work.
5460 * Version 0.1.11 released, 0.1.12 opened for further work.
5454
5461
5455 * Removed dependency on Itpl. It was only needed in one place. It
5462 * Removed dependency on Itpl. It was only needed in one place. It
5456 would be nice if this became part of python, though. It makes life
5463 would be nice if this became part of python, though. It makes life
5457 *a lot* easier in some cases.
5464 *a lot* easier in some cases.
5458
5465
5459 * Simplified the prefilter code a bit. Now all handlers are
5466 * Simplified the prefilter code a bit. Now all handlers are
5460 expected to explicitly return a value (at least a blank string).
5467 expected to explicitly return a value (at least a blank string).
5461
5468
5462 * Heavy edits in ipplib. Removed the help system altogether. Now
5469 * Heavy edits in ipplib. Removed the help system altogether. Now
5463 obj?/?? is used for inspecting objects, a magic @doc prints
5470 obj?/?? is used for inspecting objects, a magic @doc prints
5464 docstrings, and full-blown Python help is accessed via the 'help'
5471 docstrings, and full-blown Python help is accessed via the 'help'
5465 keyword. This cleans up a lot of code (less to maintain) and does
5472 keyword. This cleans up a lot of code (less to maintain) and does
5466 the job. Since 'help' is now a standard Python component, might as
5473 the job. Since 'help' is now a standard Python component, might as
5467 well use it and remove duplicate functionality.
5474 well use it and remove duplicate functionality.
5468
5475
5469 Also removed the option to use ipplib as a standalone program. By
5476 Also removed the option to use ipplib as a standalone program. By
5470 now it's too dependent on other parts of IPython to function alone.
5477 now it's too dependent on other parts of IPython to function alone.
5471
5478
5472 * Fixed bug in genutils.pager. It would crash if the pager was
5479 * Fixed bug in genutils.pager. It would crash if the pager was
5473 exited immediately after opening (broken pipe).
5480 exited immediately after opening (broken pipe).
5474
5481
5475 * Trimmed down the VerboseTB reporting a little. The header is
5482 * Trimmed down the VerboseTB reporting a little. The header is
5476 much shorter now and the repeated exception arguments at the end
5483 much shorter now and the repeated exception arguments at the end
5477 have been removed. For interactive use the old header seemed a bit
5484 have been removed. For interactive use the old header seemed a bit
5478 excessive.
5485 excessive.
5479
5486
5480 * Fixed small bug in output of @whos for variables with multi-word
5487 * Fixed small bug in output of @whos for variables with multi-word
5481 types (only first word was displayed).
5488 types (only first word was displayed).
5482
5489
5483 2001-11-17 Fernando Perez <fperez@colorado.edu>
5490 2001-11-17 Fernando Perez <fperez@colorado.edu>
5484
5491
5485 * Version 0.1.10 released, 0.1.11 opened for further work.
5492 * Version 0.1.10 released, 0.1.11 opened for further work.
5486
5493
5487 * Modified dirs and friends. dirs now *returns* the stack (not
5494 * Modified dirs and friends. dirs now *returns* the stack (not
5488 prints), so one can manipulate it as a variable. Convenient to
5495 prints), so one can manipulate it as a variable. Convenient to
5489 travel along many directories.
5496 travel along many directories.
5490
5497
5491 * Fixed bug in magic_pdef: would only work with functions with
5498 * Fixed bug in magic_pdef: would only work with functions with
5492 arguments with default values.
5499 arguments with default values.
5493
5500
5494 2001-11-14 Fernando Perez <fperez@colorado.edu>
5501 2001-11-14 Fernando Perez <fperez@colorado.edu>
5495
5502
5496 * Added the PhysicsInput stuff to dot_ipython so it ships as an
5503 * Added the PhysicsInput stuff to dot_ipython so it ships as an
5497 example with IPython. Various other minor fixes and cleanups.
5504 example with IPython. Various other minor fixes and cleanups.
5498
5505
5499 * Version 0.1.9 released, 0.1.10 opened for further work.
5506 * Version 0.1.9 released, 0.1.10 opened for further work.
5500
5507
5501 * Added sys.path to the list of directories searched in the
5508 * Added sys.path to the list of directories searched in the
5502 execfile= option. It used to be the current directory and the
5509 execfile= option. It used to be the current directory and the
5503 user's IPYTHONDIR only.
5510 user's IPYTHONDIR only.
5504
5511
5505 2001-11-13 Fernando Perez <fperez@colorado.edu>
5512 2001-11-13 Fernando Perez <fperez@colorado.edu>
5506
5513
5507 * Reinstated the raw_input/prefilter separation that Janko had
5514 * Reinstated the raw_input/prefilter separation that Janko had
5508 initially. This gives a more convenient setup for extending the
5515 initially. This gives a more convenient setup for extending the
5509 pre-processor from the outside: raw_input always gets a string,
5516 pre-processor from the outside: raw_input always gets a string,
5510 and prefilter has to process it. We can then redefine prefilter
5517 and prefilter has to process it. We can then redefine prefilter
5511 from the outside and implement extensions for special
5518 from the outside and implement extensions for special
5512 purposes.
5519 purposes.
5513
5520
5514 Today I got one for inputting PhysicalQuantity objects
5521 Today I got one for inputting PhysicalQuantity objects
5515 (from Scientific) without needing any function calls at
5522 (from Scientific) without needing any function calls at
5516 all. Extremely convenient, and it's all done as a user-level
5523 all. Extremely convenient, and it's all done as a user-level
5517 extension (no IPython code was touched). Now instead of:
5524 extension (no IPython code was touched). Now instead of:
5518 a = PhysicalQuantity(4.2,'m/s**2')
5525 a = PhysicalQuantity(4.2,'m/s**2')
5519 one can simply say
5526 one can simply say
5520 a = 4.2 m/s**2
5527 a = 4.2 m/s**2
5521 or even
5528 or even
5522 a = 4.2 m/s^2
5529 a = 4.2 m/s^2
5523
5530
5524 I use this, but it's also a proof of concept: IPython really is
5531 I use this, but it's also a proof of concept: IPython really is
5525 fully user-extensible, even at the level of the parsing of the
5532 fully user-extensible, even at the level of the parsing of the
5526 command line. It's not trivial, but it's perfectly doable.
5533 command line. It's not trivial, but it's perfectly doable.
5527
5534
5528 * Added 'add_flip' method to inclusion conflict resolver. Fixes
5535 * Added 'add_flip' method to inclusion conflict resolver. Fixes
5529 the problem of modules being loaded in the inverse order in which
5536 the problem of modules being loaded in the inverse order in which
5530 they were defined in
5537 they were defined in
5531
5538
5532 * Version 0.1.8 released, 0.1.9 opened for further work.
5539 * Version 0.1.8 released, 0.1.9 opened for further work.
5533
5540
5534 * Added magics pdef, source and file. They respectively show the
5541 * Added magics pdef, source and file. They respectively show the
5535 definition line ('prototype' in C), source code and full python
5542 definition line ('prototype' in C), source code and full python
5536 file for any callable object. The object inspector oinfo uses
5543 file for any callable object. The object inspector oinfo uses
5537 these to show the same information.
5544 these to show the same information.
5538
5545
5539 * Version 0.1.7 released, 0.1.8 opened for further work.
5546 * Version 0.1.7 released, 0.1.8 opened for further work.
5540
5547
5541 * Separated all the magic functions into a class called Magic. The
5548 * Separated all the magic functions into a class called Magic. The
5542 InteractiveShell class was becoming too big for Xemacs to handle
5549 InteractiveShell class was becoming too big for Xemacs to handle
5543 (de-indenting a line would lock it up for 10 seconds while it
5550 (de-indenting a line would lock it up for 10 seconds while it
5544 backtracked on the whole class!)
5551 backtracked on the whole class!)
5545
5552
5546 FIXME: didn't work. It can be done, but right now namespaces are
5553 FIXME: didn't work. It can be done, but right now namespaces are
5547 all messed up. Do it later (reverted it for now, so at least
5554 all messed up. Do it later (reverted it for now, so at least
5548 everything works as before).
5555 everything works as before).
5549
5556
5550 * Got the object introspection system (magic_oinfo) working! I
5557 * Got the object introspection system (magic_oinfo) working! I
5551 think this is pretty much ready for release to Janko, so he can
5558 think this is pretty much ready for release to Janko, so he can
5552 test it for a while and then announce it. Pretty much 100% of what
5559 test it for a while and then announce it. Pretty much 100% of what
5553 I wanted for the 'phase 1' release is ready. Happy, tired.
5560 I wanted for the 'phase 1' release is ready. Happy, tired.
5554
5561
5555 2001-11-12 Fernando Perez <fperez@colorado.edu>
5562 2001-11-12 Fernando Perez <fperez@colorado.edu>
5556
5563
5557 * Version 0.1.6 released, 0.1.7 opened for further work.
5564 * Version 0.1.6 released, 0.1.7 opened for further work.
5558
5565
5559 * Fixed bug in printing: it used to test for truth before
5566 * Fixed bug in printing: it used to test for truth before
5560 printing, so 0 wouldn't print. Now checks for None.
5567 printing, so 0 wouldn't print. Now checks for None.
5561
5568
5562 * Fixed bug where auto-execs increase the prompt counter by 2 (b/c
5569 * Fixed bug where auto-execs increase the prompt counter by 2 (b/c
5563 they have to call len(str(sys.ps1)) ). But the fix is ugly, it
5570 they have to call len(str(sys.ps1)) ). But the fix is ugly, it
5564 reaches by hand into the outputcache. Think of a better way to do
5571 reaches by hand into the outputcache. Think of a better way to do
5565 this later.
5572 this later.
5566
5573
5567 * Various small fixes thanks to Nathan's comments.
5574 * Various small fixes thanks to Nathan's comments.
5568
5575
5569 * Changed magic_pprint to magic_Pprint. This way it doesn't
5576 * Changed magic_pprint to magic_Pprint. This way it doesn't
5570 collide with pprint() and the name is consistent with the command
5577 collide with pprint() and the name is consistent with the command
5571 line option.
5578 line option.
5572
5579
5573 * Changed prompt counter behavior to be fully like
5580 * Changed prompt counter behavior to be fully like
5574 Mathematica's. That is, even input that doesn't return a result
5581 Mathematica's. That is, even input that doesn't return a result
5575 raises the prompt counter. The old behavior was kind of confusing
5582 raises the prompt counter. The old behavior was kind of confusing
5576 (getting the same prompt number several times if the operation
5583 (getting the same prompt number several times if the operation
5577 didn't return a result).
5584 didn't return a result).
5578
5585
5579 * Fixed Nathan's last name in a couple of places (Gray, not Graham).
5586 * Fixed Nathan's last name in a couple of places (Gray, not Graham).
5580
5587
5581 * Fixed -Classic mode (wasn't working anymore).
5588 * Fixed -Classic mode (wasn't working anymore).
5582
5589
5583 * Added colored prompts using Nathan's new code. Colors are
5590 * Added colored prompts using Nathan's new code. Colors are
5584 currently hardwired, they can be user-configurable. For
5591 currently hardwired, they can be user-configurable. For
5585 developers, they can be chosen in file ipythonlib.py, at the
5592 developers, they can be chosen in file ipythonlib.py, at the
5586 beginning of the CachedOutput class def.
5593 beginning of the CachedOutput class def.
5587
5594
5588 2001-11-11 Fernando Perez <fperez@colorado.edu>
5595 2001-11-11 Fernando Perez <fperez@colorado.edu>
5589
5596
5590 * Version 0.1.5 released, 0.1.6 opened for further work.
5597 * Version 0.1.5 released, 0.1.6 opened for further work.
5591
5598
5592 * Changed magic_env to *return* the environment as a dict (not to
5599 * Changed magic_env to *return* the environment as a dict (not to
5593 print it). This way it prints, but it can also be processed.
5600 print it). This way it prints, but it can also be processed.
5594
5601
5595 * Added Verbose exception reporting to interactive
5602 * Added Verbose exception reporting to interactive
5596 exceptions. Very nice, now even 1/0 at the prompt gives a verbose
5603 exceptions. Very nice, now even 1/0 at the prompt gives a verbose
5597 traceback. Had to make some changes to the ultraTB file. This is
5604 traceback. Had to make some changes to the ultraTB file. This is
5598 probably the last 'big' thing in my mental todo list. This ties
5605 probably the last 'big' thing in my mental todo list. This ties
5599 in with the next entry:
5606 in with the next entry:
5600
5607
5601 * Changed -Xi and -Xf to a single -xmode option. Now all the user
5608 * Changed -Xi and -Xf to a single -xmode option. Now all the user
5602 has to specify is Plain, Color or Verbose for all exception
5609 has to specify is Plain, Color or Verbose for all exception
5603 handling.
5610 handling.
5604
5611
5605 * Removed ShellServices option. All this can really be done via
5612 * Removed ShellServices option. All this can really be done via
5606 the magic system. It's easier to extend, cleaner and has automatic
5613 the magic system. It's easier to extend, cleaner and has automatic
5607 namespace protection and documentation.
5614 namespace protection and documentation.
5608
5615
5609 2001-11-09 Fernando Perez <fperez@colorado.edu>
5616 2001-11-09 Fernando Perez <fperez@colorado.edu>
5610
5617
5611 * Fixed bug in output cache flushing (missing parameter to
5618 * Fixed bug in output cache flushing (missing parameter to
5612 __init__). Other small bugs fixed (found using pychecker).
5619 __init__). Other small bugs fixed (found using pychecker).
5613
5620
5614 * Version 0.1.4 opened for bugfixing.
5621 * Version 0.1.4 opened for bugfixing.
5615
5622
5616 2001-11-07 Fernando Perez <fperez@colorado.edu>
5623 2001-11-07 Fernando Perez <fperez@colorado.edu>
5617
5624
5618 * Version 0.1.3 released, mainly because of the raw_input bug.
5625 * Version 0.1.3 released, mainly because of the raw_input bug.
5619
5626
5620 * Fixed NASTY bug in raw_input: input line wasn't properly parsed
5627 * Fixed NASTY bug in raw_input: input line wasn't properly parsed
5621 and when testing for whether things were callable, a call could
5628 and when testing for whether things were callable, a call could
5622 actually be made to certain functions. They would get called again
5629 actually be made to certain functions. They would get called again
5623 once 'really' executed, with a resulting double call. A disaster
5630 once 'really' executed, with a resulting double call. A disaster
5624 in many cases (list.reverse() would never work!).
5631 in many cases (list.reverse() would never work!).
5625
5632
5626 * Removed prefilter() function, moved its code to raw_input (which
5633 * Removed prefilter() function, moved its code to raw_input (which
5627 after all was just a near-empty caller for prefilter). This saves
5634 after all was just a near-empty caller for prefilter). This saves
5628 a function call on every prompt, and simplifies the class a tiny bit.
5635 a function call on every prompt, and simplifies the class a tiny bit.
5629
5636
5630 * Fix _ip to __ip name in magic example file.
5637 * Fix _ip to __ip name in magic example file.
5631
5638
5632 * Changed 'tar -x -f' to 'tar xvf' in auto-installer. This should
5639 * Changed 'tar -x -f' to 'tar xvf' in auto-installer. This should
5633 work with non-gnu versions of tar.
5640 work with non-gnu versions of tar.
5634
5641
5635 2001-11-06 Fernando Perez <fperez@colorado.edu>
5642 2001-11-06 Fernando Perez <fperez@colorado.edu>
5636
5643
5637 * Version 0.1.2. Just to keep track of the recent changes.
5644 * Version 0.1.2. Just to keep track of the recent changes.
5638
5645
5639 * Fixed nasty bug in output prompt routine. It used to check 'if
5646 * Fixed nasty bug in output prompt routine. It used to check 'if
5640 arg != None...'. Problem is, this fails if arg implements a
5647 arg != None...'. Problem is, this fails if arg implements a
5641 special comparison (__cmp__) which disallows comparing to
5648 special comparison (__cmp__) which disallows comparing to
5642 None. Found it when trying to use the PhysicalQuantity module from
5649 None. Found it when trying to use the PhysicalQuantity module from
5643 ScientificPython.
5650 ScientificPython.
5644
5651
5645 2001-11-05 Fernando Perez <fperez@colorado.edu>
5652 2001-11-05 Fernando Perez <fperez@colorado.edu>
5646
5653
5647 * Also added dirs. Now the pushd/popd/dirs family functions
5654 * Also added dirs. Now the pushd/popd/dirs family functions
5648 basically like the shell, with the added convenience of going home
5655 basically like the shell, with the added convenience of going home
5649 when called with no args.
5656 when called with no args.
5650
5657
5651 * pushd/popd slightly modified to mimic shell behavior more
5658 * pushd/popd slightly modified to mimic shell behavior more
5652 closely.
5659 closely.
5653
5660
5654 * Added env,pushd,popd from ShellServices as magic functions. I
5661 * Added env,pushd,popd from ShellServices as magic functions. I
5655 think the cleanest will be to port all desired functions from
5662 think the cleanest will be to port all desired functions from
5656 ShellServices as magics and remove ShellServices altogether. This
5663 ShellServices as magics and remove ShellServices altogether. This
5657 will provide a single, clean way of adding functionality
5664 will provide a single, clean way of adding functionality
5658 (shell-type or otherwise) to IP.
5665 (shell-type or otherwise) to IP.
5659
5666
5660 2001-11-04 Fernando Perez <fperez@colorado.edu>
5667 2001-11-04 Fernando Perez <fperez@colorado.edu>
5661
5668
5662 * Added .ipython/ directory to sys.path. This way users can keep
5669 * Added .ipython/ directory to sys.path. This way users can keep
5663 customizations there and access them via import.
5670 customizations there and access them via import.
5664
5671
5665 2001-11-03 Fernando Perez <fperez@colorado.edu>
5672 2001-11-03 Fernando Perez <fperez@colorado.edu>
5666
5673
5667 * Opened version 0.1.1 for new changes.
5674 * Opened version 0.1.1 for new changes.
5668
5675
5669 * Changed version number to 0.1.0: first 'public' release, sent to
5676 * Changed version number to 0.1.0: first 'public' release, sent to
5670 Nathan and Janko.
5677 Nathan and Janko.
5671
5678
5672 * Lots of small fixes and tweaks.
5679 * Lots of small fixes and tweaks.
5673
5680
5674 * Minor changes to whos format. Now strings are shown, snipped if
5681 * Minor changes to whos format. Now strings are shown, snipped if
5675 too long.
5682 too long.
5676
5683
5677 * Changed ShellServices to work on __main__ so they show up in @who
5684 * Changed ShellServices to work on __main__ so they show up in @who
5678
5685
5679 * Help also works with ? at the end of a line:
5686 * Help also works with ? at the end of a line:
5680 ?sin and sin?
5687 ?sin and sin?
5681 both produce the same effect. This is nice, as often I use the
5688 both produce the same effect. This is nice, as often I use the
5682 tab-complete to find the name of a method, but I used to then have
5689 tab-complete to find the name of a method, but I used to then have
5683 to go to the beginning of the line to put a ? if I wanted more
5690 to go to the beginning of the line to put a ? if I wanted more
5684 info. Now I can just add the ? and hit return. Convenient.
5691 info. Now I can just add the ? and hit return. Convenient.
5685
5692
5686 2001-11-02 Fernando Perez <fperez@colorado.edu>
5693 2001-11-02 Fernando Perez <fperez@colorado.edu>
5687
5694
5688 * Python version check (>=2.1) added.
5695 * Python version check (>=2.1) added.
5689
5696
5690 * Added LazyPython documentation. At this point the docs are quite
5697 * Added LazyPython documentation. At this point the docs are quite
5691 a mess. A cleanup is in order.
5698 a mess. A cleanup is in order.
5692
5699
5693 * Auto-installer created. For some bizarre reason, the zipfiles
5700 * Auto-installer created. For some bizarre reason, the zipfiles
5694 module isn't working on my system. So I made a tar version
5701 module isn't working on my system. So I made a tar version
5695 (hopefully the command line options in various systems won't kill
5702 (hopefully the command line options in various systems won't kill
5696 me).
5703 me).
5697
5704
5698 * Fixes to Struct in genutils. Now all dictionary-like methods are
5705 * Fixes to Struct in genutils. Now all dictionary-like methods are
5699 protected (reasonably).
5706 protected (reasonably).
5700
5707
5701 * Added pager function to genutils and changed ? to print usage
5708 * Added pager function to genutils and changed ? to print usage
5702 note through it (it was too long).
5709 note through it (it was too long).
5703
5710
5704 * Added the LazyPython functionality. Works great! I changed the
5711 * Added the LazyPython functionality. Works great! I changed the
5705 auto-quote escape to ';', it's on home row and next to '. But
5712 auto-quote escape to ';', it's on home row and next to '. But
5706 both auto-quote and auto-paren (still /) escapes are command-line
5713 both auto-quote and auto-paren (still /) escapes are command-line
5707 parameters.
5714 parameters.
5708
5715
5709
5716
5710 2001-11-01 Fernando Perez <fperez@colorado.edu>
5717 2001-11-01 Fernando Perez <fperez@colorado.edu>
5711
5718
5712 * Version changed to 0.0.7. Fairly large change: configuration now
5719 * Version changed to 0.0.7. Fairly large change: configuration now
5713 is all stored in a directory, by default .ipython. There, all
5720 is all stored in a directory, by default .ipython. There, all
5714 config files have normal looking names (not .names)
5721 config files have normal looking names (not .names)
5715
5722
5716 * Version 0.0.6 Released first to Lucas and Archie as a test
5723 * Version 0.0.6 Released first to Lucas and Archie as a test
5717 run. Since it's the first 'semi-public' release, change version to
5724 run. Since it's the first 'semi-public' release, change version to
5718 > 0.0.6 for any changes now.
5725 > 0.0.6 for any changes now.
5719
5726
5720 * Stuff I had put in the ipplib.py changelog:
5727 * Stuff I had put in the ipplib.py changelog:
5721
5728
5722 Changes to InteractiveShell:
5729 Changes to InteractiveShell:
5723
5730
5724 - Made the usage message a parameter.
5731 - Made the usage message a parameter.
5725
5732
5726 - Require the name of the shell variable to be given. It's a bit
5733 - Require the name of the shell variable to be given. It's a bit
5727 of a hack, but allows the name 'shell' not to be hardwired in the
5734 of a hack, but allows the name 'shell' not to be hardwired in the
5728 magic (@) handler, which is problematic b/c it requires
5735 magic (@) handler, which is problematic b/c it requires
5729 polluting the global namespace with 'shell'. This in turn is
5736 polluting the global namespace with 'shell'. This in turn is
5730 fragile: if a user redefines a variable called shell, things
5737 fragile: if a user redefines a variable called shell, things
5731 break.
5738 break.
5732
5739
5733 - magic @: all functions available through @ need to be defined
5740 - magic @: all functions available through @ need to be defined
5734 as magic_<name>, even though they can be called simply as
5741 as magic_<name>, even though they can be called simply as
5735 @<name>. This allows the special command @magic to gather
5742 @<name>. This allows the special command @magic to gather
5736 information automatically about all existing magic functions,
5743 information automatically about all existing magic functions,
5737 even if they are run-time user extensions, by parsing the shell
5744 even if they are run-time user extensions, by parsing the shell
5738 instance __dict__ looking for special magic_ names.
5745 instance __dict__ looking for special magic_ names.
5739
5746
5740 - mainloop: added *two* local namespace parameters. This allows
5747 - mainloop: added *two* local namespace parameters. This allows
5741 the class to differentiate between parameters which were there
5748 the class to differentiate between parameters which were there
5742 before and after command line initialization was processed. This
5749 before and after command line initialization was processed. This
5743 way, later @who can show things loaded at startup by the
5750 way, later @who can show things loaded at startup by the
5744 user. This trick was necessary to make session saving/reloading
5751 user. This trick was necessary to make session saving/reloading
5745 really work: ideally after saving/exiting/reloading a session,
5752 really work: ideally after saving/exiting/reloading a session,
5746 *everything* should look the same, including the output of @who. I
5753 *everything* should look the same, including the output of @who. I
5747 was only able to make this work with this double namespace
5754 was only able to make this work with this double namespace
5748 trick.
5755 trick.
5749
5756
5750 - added a header to the logfile which allows (almost) full
5757 - added a header to the logfile which allows (almost) full
5751 session restoring.
5758 session restoring.
5752
5759
5753 - prepend lines beginning with @ or !, with a and log
5760 - prepend lines beginning with @ or !, with a and log
5754 them. Why? !lines: may be useful to know what you did @lines:
5761 them. Why? !lines: may be useful to know what you did @lines:
5755 they may affect session state. So when restoring a session, at
5762 they may affect session state. So when restoring a session, at
5756 least inform the user of their presence. I couldn't quite get
5763 least inform the user of their presence. I couldn't quite get
5757 them to properly re-execute, but at least the user is warned.
5764 them to properly re-execute, but at least the user is warned.
5758
5765
5759 * Started ChangeLog.
5766 * Started ChangeLog.
General Comments 0
You need to be logged in to leave comments. Login now