##// END OF EJS Templates
Added platutils modules, now only needed for %cd to ...
vivainio -
Show More
@@ -0,0 +1,35 b''
1 # -*- coding: utf-8 -*-
2 """ Proxy module for accessing platform specific utility functions.
3
4 Importing this module should give you the implementations that are correct
5 for your operation system, from platutils_PLATFORMNAME module.
6
7 $Id: ipstruct.py 1005 2006-01-12 08:39:26Z fperez $
8
9
10 """
11
12
13 #*****************************************************************************
14 # Copyright (C) 2001-2006 Fernando Perez <fperez@colorado.edu>
15 #
16 # Distributed under the terms of the BSD License. The full license is in
17 # the file COPYING, distributed as part of this software.
18 #*****************************************************************************
19
20 from IPython import Release
21 __author__ = '%s <%s>' % Release.authors['Ville']
22 __license__ = Release.license
23
24 import os
25
26 if os.name == 'posix':
27 from platutils_posix import *
28 elif os.name == 'win32':
29 from platutils_win32 import *
30 else:
31 from platutils_dummy import *
32 import warnings
33 warnings.warn("Platutils not available for platform '%s', some features may be missing" %
34 os.name)
35 del warnings
@@ -0,0 +1,29 b''
1 # -*- coding: utf-8 -*-
2 """ Platform specific utility functions, dummy version
3
4 This has empty implementation of the platutils functions, used for
5 unsupported operating systems.
6
7 $Id: ipstruct.py 1005 2006-01-12 08:39:26Z fperez $
8
9
10 """
11
12
13 #*****************************************************************************
14 # Copyright (C) 2001-2006 Fernando Perez <fperez@colorado.edu>
15 #
16 # Distributed under the terms of the BSD License. The full license is in
17 # the file COPYING, distributed as part of this software.
18 #*****************************************************************************
19
20 from IPython import Release
21 __author__ = '%s <%s>' % Release.authors['Ville']
22 __license__ = Release.license
23
24
25 def _dummy(*args,**kw):
26 pass
27
28 set_term_title = _dummy
29
@@ -0,0 +1,26 b''
1 # -*- coding: utf-8 -*-
2 """ Platform specific utility functions, posix version
3
4 Importing this module directly is not portable - rather, import platutils
5 to use these functions in platform agnostic fashion.
6
7 $Id: ipstruct.py 1005 2006-01-12 08:39:26Z fperez $
8
9 """
10
11
12 #*****************************************************************************
13 # Copyright (C) 2001-2006 Fernando Perez <fperez@colorado.edu>
14 #
15 # Distributed under the terms of the BSD License. The full license is in
16 # the file COPYING, distributed as part of this software.
17 #*****************************************************************************
18
19 from IPython import Release
20 __author__ = '%s <%s>' % Release.authors['Ville']
21 __license__ = Release.license
22
23 import sys
24
25 def set_term_title(title):
26 sys.stdout.write('\033]%d;%s\007' % (0,title))
@@ -0,0 +1,25 b''
1 # -*- coding: utf-8 -*-
2 """ Platform specific utility functions, win32 version
3
4 Importing this module directly is not portable - rather, import platutils
5 to use these functions in platform agnostic fashion.
6
7 $Id: ipstruct.py 1005 2006-01-12 08:39:26Z fperez $
8
9 """
10
11
12 #*****************************************************************************
13 # Copyright (C) 2001-2006 Fernando Perez <fperez@colorado.edu>
14 #
15 # Distributed under the terms of the BSD License. The full license is in
16 # the file COPYING, distributed as part of this software.
17 #*****************************************************************************
18
19 from IPython import Release
20 __author__ = '%s <%s>' % Release.authors['Ville']
21 __license__ = Release.license
22
23
24 def set_term_title(title):
25 """ TBD """
@@ -1,2741 +1,2745 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 1005 2006-01-12 08:39:26Z fperez $"""
4 $Id: Magic.py 1014 2006-01-13 19:16:41Z vivainio $"""
5
5
6 #*****************************************************************************
6 #*****************************************************************************
7 # Copyright (C) 2001 Janko Hauser <jhauser@zscout.de> and
7 # Copyright (C) 2001 Janko Hauser <jhauser@zscout.de> and
8 # Copyright (C) 2001-2006 Fernando Perez <fperez@colorado.edu>
8 # Copyright (C) 2001-2006 Fernando Perez <fperez@colorado.edu>
9 #
9 #
10 # Distributed under the terms of the BSD License. The full license is in
10 # Distributed under the terms of the BSD License. The full license is in
11 # the file COPYING, distributed as part of this software.
11 # the file COPYING, distributed as part of this software.
12 #*****************************************************************************
12 #*****************************************************************************
13
13
14 #****************************************************************************
14 #****************************************************************************
15 # Modules and globals
15 # Modules and globals
16
16
17 from IPython import Release
17 from IPython import Release
18 __author__ = '%s <%s>\n%s <%s>' % \
18 __author__ = '%s <%s>\n%s <%s>' % \
19 ( Release.authors['Janko'] + Release.authors['Fernando'] )
19 ( Release.authors['Janko'] + Release.authors['Fernando'] )
20 __license__ = Release.license
20 __license__ = Release.license
21
21
22 # Python standard modules
22 # Python standard modules
23 import __builtin__
23 import __builtin__
24 import bdb
24 import bdb
25 import inspect
25 import inspect
26 import os
26 import os
27 import pdb
27 import pdb
28 import pydoc
28 import pydoc
29 import sys
29 import sys
30 import re
30 import re
31 import tempfile
31 import tempfile
32 import time
32 import time
33 import cPickle as pickle
33 import cPickle as pickle
34 from cStringIO import StringIO
34 from cStringIO import StringIO
35 from getopt import getopt
35 from getopt import getopt
36 from pprint import pprint, pformat
36 from pprint import pprint, pformat
37
37
38 # profile isn't bundled by default in Debian for license reasons
38 # profile isn't bundled by default in Debian for license reasons
39 try:
39 try:
40 import profile,pstats
40 import profile,pstats
41 except ImportError:
41 except ImportError:
42 profile = pstats = None
42 profile = pstats = None
43
43
44 # Homebrewed
44 # Homebrewed
45 from IPython import Debugger, OInspect, wildcard
45 from IPython import Debugger, OInspect, wildcard
46 from IPython.FakeModule import FakeModule
46 from IPython.FakeModule import FakeModule
47 from IPython.Itpl import Itpl, itpl, printpl,itplns
47 from IPython.Itpl import Itpl, itpl, printpl,itplns
48 from IPython.PyColorize import Parser
48 from IPython.PyColorize import Parser
49 from IPython.ipstruct import Struct
49 from IPython.ipstruct import Struct
50 from IPython.macro import Macro
50 from IPython.macro import Macro
51 from IPython.genutils import *
51 from IPython.genutils import *
52
52 from IPython import platutils
53 #***************************************************************************
53 #***************************************************************************
54 # Utility functions
54 # Utility functions
55 def on_off(tag):
55 def on_off(tag):
56 """Return an ON/OFF string for a 1/0 input. Simple utility function."""
56 """Return an ON/OFF string for a 1/0 input. Simple utility function."""
57 return ['OFF','ON'][tag]
57 return ['OFF','ON'][tag]
58
58
59 class Bunch: pass
59 class Bunch: pass
60
60
61 #***************************************************************************
61 #***************************************************************************
62 # Main class implementing Magic functionality
62 # Main class implementing Magic functionality
63 class Magic:
63 class Magic:
64 """Magic functions for InteractiveShell.
64 """Magic functions for InteractiveShell.
65
65
66 Shell functions which can be reached as %function_name. All magic
66 Shell functions which can be reached as %function_name. All magic
67 functions should accept a string, which they can parse for their own
67 functions should accept a string, which they can parse for their own
68 needs. This can make some functions easier to type, eg `%cd ../`
68 needs. This can make some functions easier to type, eg `%cd ../`
69 vs. `%cd("../")`
69 vs. `%cd("../")`
70
70
71 ALL definitions MUST begin with the prefix magic_. The user won't need it
71 ALL definitions MUST begin with the prefix magic_. The user won't need it
72 at the command line, but it is is needed in the definition. """
72 at the command line, but it is is needed in the definition. """
73
73
74 # class globals
74 # class globals
75 auto_status = ['Automagic is OFF, % prefix IS needed for magic functions.',
75 auto_status = ['Automagic is OFF, % prefix IS needed for magic functions.',
76 'Automagic is ON, % prefix NOT needed for magic functions.']
76 'Automagic is ON, % prefix NOT needed for magic functions.']
77
77
78 #......................................................................
78 #......................................................................
79 # some utility functions
79 # some utility functions
80
80
81 def __init__(self,shell):
81 def __init__(self,shell):
82
82
83 self.options_table = {}
83 self.options_table = {}
84 if profile is None:
84 if profile is None:
85 self.magic_prun = self.profile_missing_notice
85 self.magic_prun = self.profile_missing_notice
86 self.shell = shell
86 self.shell = shell
87
87
88 # namespace for holding state we may need
88 # namespace for holding state we may need
89 self._magic_state = Bunch()
89 self._magic_state = Bunch()
90
90
91 def profile_missing_notice(self, *args, **kwargs):
91 def profile_missing_notice(self, *args, **kwargs):
92 error("""\
92 error("""\
93 The profile module could not be found. If you are a Debian user,
93 The profile module could not be found. If you are a Debian user,
94 it has been removed from the standard Debian package because of its non-free
94 it has been removed from the standard Debian package because of its non-free
95 license. To use profiling, please install"python2.3-profiler" from non-free.""")
95 license. To use profiling, please install"python2.3-profiler" from non-free.""")
96
96
97 def default_option(self,fn,optstr):
97 def default_option(self,fn,optstr):
98 """Make an entry in the options_table for fn, with value optstr"""
98 """Make an entry in the options_table for fn, with value optstr"""
99
99
100 if fn not in self.lsmagic():
100 if fn not in self.lsmagic():
101 error("%s is not a magic function" % fn)
101 error("%s is not a magic function" % fn)
102 self.options_table[fn] = optstr
102 self.options_table[fn] = optstr
103
103
104 def lsmagic(self):
104 def lsmagic(self):
105 """Return a list of currently available magic functions.
105 """Return a list of currently available magic functions.
106
106
107 Gives a list of the bare names after mangling (['ls','cd', ...], not
107 Gives a list of the bare names after mangling (['ls','cd', ...], not
108 ['magic_ls','magic_cd',...]"""
108 ['magic_ls','magic_cd',...]"""
109
109
110 # FIXME. This needs a cleanup, in the way the magics list is built.
110 # FIXME. This needs a cleanup, in the way the magics list is built.
111
111
112 # magics in class definition
112 # magics in class definition
113 class_magic = lambda fn: fn.startswith('magic_') and \
113 class_magic = lambda fn: fn.startswith('magic_') and \
114 callable(Magic.__dict__[fn])
114 callable(Magic.__dict__[fn])
115 # in instance namespace (run-time user additions)
115 # in instance namespace (run-time user additions)
116 inst_magic = lambda fn: fn.startswith('magic_') and \
116 inst_magic = lambda fn: fn.startswith('magic_') and \
117 callable(self.__dict__[fn])
117 callable(self.__dict__[fn])
118 # and bound magics by user (so they can access self):
118 # and bound magics by user (so they can access self):
119 inst_bound_magic = lambda fn: fn.startswith('magic_') and \
119 inst_bound_magic = lambda fn: fn.startswith('magic_') and \
120 callable(self.__class__.__dict__[fn])
120 callable(self.__class__.__dict__[fn])
121 magics = filter(class_magic,Magic.__dict__.keys()) + \
121 magics = filter(class_magic,Magic.__dict__.keys()) + \
122 filter(inst_magic,self.__dict__.keys()) + \
122 filter(inst_magic,self.__dict__.keys()) + \
123 filter(inst_bound_magic,self.__class__.__dict__.keys())
123 filter(inst_bound_magic,self.__class__.__dict__.keys())
124 out = []
124 out = []
125 for fn in magics:
125 for fn in magics:
126 out.append(fn.replace('magic_','',1))
126 out.append(fn.replace('magic_','',1))
127 out.sort()
127 out.sort()
128 return out
128 return out
129
129
130 def extract_input_slices(self,slices):
130 def extract_input_slices(self,slices):
131 """Return as a string a set of input history slices.
131 """Return as a string a set of input history slices.
132
132
133 The set of slices is given as a list of strings (like ['1','4:8','9'],
133 The set of slices is given as a list of strings (like ['1','4:8','9'],
134 since this function is for use by magic functions which get their
134 since this function is for use by magic functions which get their
135 arguments as strings.
135 arguments as strings.
136
136
137 Note that slices can be called with two notations:
137 Note that slices can be called with two notations:
138
138
139 N:M -> standard python form, means including items N...(M-1).
139 N:M -> standard python form, means including items N...(M-1).
140
140
141 N-M -> include items N..M (closed endpoint)."""
141 N-M -> include items N..M (closed endpoint)."""
142
142
143 cmds = []
143 cmds = []
144 for chunk in slices:
144 for chunk in slices:
145 if ':' in chunk:
145 if ':' in chunk:
146 ini,fin = map(int,chunk.split(':'))
146 ini,fin = map(int,chunk.split(':'))
147 elif '-' in chunk:
147 elif '-' in chunk:
148 ini,fin = map(int,chunk.split('-'))
148 ini,fin = map(int,chunk.split('-'))
149 fin += 1
149 fin += 1
150 else:
150 else:
151 ini = int(chunk)
151 ini = int(chunk)
152 fin = ini+1
152 fin = ini+1
153 cmds.append(self.shell.input_hist[ini:fin])
153 cmds.append(self.shell.input_hist[ini:fin])
154 return cmds
154 return cmds
155
155
156 def _ofind(self,oname):
156 def _ofind(self,oname):
157 """Find an object in the available namespaces.
157 """Find an object in the available namespaces.
158
158
159 self._ofind(oname) -> dict with keys: found,obj,ospace,ismagic
159 self._ofind(oname) -> dict with keys: found,obj,ospace,ismagic
160
160
161 Has special code to detect magic functions.
161 Has special code to detect magic functions.
162 """
162 """
163
163
164 oname = oname.strip()
164 oname = oname.strip()
165
165
166 # Namespaces to search in:
166 # Namespaces to search in:
167 user_ns = self.shell.user_ns
167 user_ns = self.shell.user_ns
168 internal_ns = self.shell.internal_ns
168 internal_ns = self.shell.internal_ns
169 builtin_ns = __builtin__.__dict__
169 builtin_ns = __builtin__.__dict__
170 alias_ns = self.shell.alias_table
170 alias_ns = self.shell.alias_table
171
171
172 # Put them in a list. The order is important so that we find things in
172 # Put them in a list. The order is important so that we find things in
173 # the same order that Python finds them.
173 # the same order that Python finds them.
174 namespaces = [ ('Interactive',user_ns),
174 namespaces = [ ('Interactive',user_ns),
175 ('IPython internal',internal_ns),
175 ('IPython internal',internal_ns),
176 ('Python builtin',builtin_ns),
176 ('Python builtin',builtin_ns),
177 ('Alias',alias_ns),
177 ('Alias',alias_ns),
178 ]
178 ]
179
179
180 # initialize results to 'null'
180 # initialize results to 'null'
181 found = 0; obj = None; ospace = None; ds = None;
181 found = 0; obj = None; ospace = None; ds = None;
182 ismagic = 0; isalias = 0
182 ismagic = 0; isalias = 0
183
183
184 # Look for the given name by splitting it in parts. If the head is
184 # Look for the given name by splitting it in parts. If the head is
185 # found, then we look for all the remaining parts as members, and only
185 # found, then we look for all the remaining parts as members, and only
186 # declare success if we can find them all.
186 # declare success if we can find them all.
187 oname_parts = oname.split('.')
187 oname_parts = oname.split('.')
188 oname_head, oname_rest = oname_parts[0],oname_parts[1:]
188 oname_head, oname_rest = oname_parts[0],oname_parts[1:]
189 for nsname,ns in namespaces:
189 for nsname,ns in namespaces:
190 try:
190 try:
191 obj = ns[oname_head]
191 obj = ns[oname_head]
192 except KeyError:
192 except KeyError:
193 continue
193 continue
194 else:
194 else:
195 for part in oname_rest:
195 for part in oname_rest:
196 try:
196 try:
197 obj = getattr(obj,part)
197 obj = getattr(obj,part)
198 except:
198 except:
199 # Blanket except b/c some badly implemented objects
199 # Blanket except b/c some badly implemented objects
200 # allow __getattr__ to raise exceptions other than
200 # allow __getattr__ to raise exceptions other than
201 # AttributeError, which then crashes IPython.
201 # AttributeError, which then crashes IPython.
202 break
202 break
203 else:
203 else:
204 # If we finish the for loop (no break), we got all members
204 # If we finish the for loop (no break), we got all members
205 found = 1
205 found = 1
206 ospace = nsname
206 ospace = nsname
207 if ns == alias_ns:
207 if ns == alias_ns:
208 isalias = 1
208 isalias = 1
209 break # namespace loop
209 break # namespace loop
210
210
211 # Try to see if it's magic
211 # Try to see if it's magic
212 if not found:
212 if not found:
213 if oname.startswith(self.shell.ESC_MAGIC):
213 if oname.startswith(self.shell.ESC_MAGIC):
214 oname = oname[1:]
214 oname = oname[1:]
215 obj = getattr(self,'magic_'+oname,None)
215 obj = getattr(self,'magic_'+oname,None)
216 if obj is not None:
216 if obj is not None:
217 found = 1
217 found = 1
218 ospace = 'IPython internal'
218 ospace = 'IPython internal'
219 ismagic = 1
219 ismagic = 1
220
220
221 # Last try: special-case some literals like '', [], {}, etc:
221 # Last try: special-case some literals like '', [], {}, etc:
222 if not found and oname_head in ["''",'""','[]','{}','()']:
222 if not found and oname_head in ["''",'""','[]','{}','()']:
223 obj = eval(oname_head)
223 obj = eval(oname_head)
224 found = 1
224 found = 1
225 ospace = 'Interactive'
225 ospace = 'Interactive'
226
226
227 return {'found':found, 'obj':obj, 'namespace':ospace,
227 return {'found':found, 'obj':obj, 'namespace':ospace,
228 'ismagic':ismagic, 'isalias':isalias}
228 'ismagic':ismagic, 'isalias':isalias}
229
229
230 def arg_err(self,func):
230 def arg_err(self,func):
231 """Print docstring if incorrect arguments were passed"""
231 """Print docstring if incorrect arguments were passed"""
232 print 'Error in arguments:'
232 print 'Error in arguments:'
233 print OInspect.getdoc(func)
233 print OInspect.getdoc(func)
234
234
235 def format_latex(self,strng):
235 def format_latex(self,strng):
236 """Format a string for latex inclusion."""
236 """Format a string for latex inclusion."""
237
237
238 # Characters that need to be escaped for latex:
238 # Characters that need to be escaped for latex:
239 escape_re = re.compile(r'(%|_|\$|#)',re.MULTILINE)
239 escape_re = re.compile(r'(%|_|\$|#)',re.MULTILINE)
240 # Magic command names as headers:
240 # Magic command names as headers:
241 cmd_name_re = re.compile(r'^(%s.*?):' % self.shell.ESC_MAGIC,
241 cmd_name_re = re.compile(r'^(%s.*?):' % self.shell.ESC_MAGIC,
242 re.MULTILINE)
242 re.MULTILINE)
243 # Magic commands
243 # Magic commands
244 cmd_re = re.compile(r'(?P<cmd>%s.+?\b)(?!\}\}:)' % self.shell.ESC_MAGIC,
244 cmd_re = re.compile(r'(?P<cmd>%s.+?\b)(?!\}\}:)' % self.shell.ESC_MAGIC,
245 re.MULTILINE)
245 re.MULTILINE)
246 # Paragraph continue
246 # Paragraph continue
247 par_re = re.compile(r'\\$',re.MULTILINE)
247 par_re = re.compile(r'\\$',re.MULTILINE)
248
248
249 # The "\n" symbol
249 # The "\n" symbol
250 newline_re = re.compile(r'\\n')
250 newline_re = re.compile(r'\\n')
251
251
252 # Now build the string for output:
252 # Now build the string for output:
253 #strng = cmd_name_re.sub(r'\n\\texttt{\\textsl{\\large \1}}:',strng)
253 #strng = cmd_name_re.sub(r'\n\\texttt{\\textsl{\\large \1}}:',strng)
254 strng = cmd_name_re.sub(r'\n\\bigskip\n\\texttt{\\textbf{ \1}}:',
254 strng = cmd_name_re.sub(r'\n\\bigskip\n\\texttt{\\textbf{ \1}}:',
255 strng)
255 strng)
256 strng = cmd_re.sub(r'\\texttt{\g<cmd>}',strng)
256 strng = cmd_re.sub(r'\\texttt{\g<cmd>}',strng)
257 strng = par_re.sub(r'\\\\',strng)
257 strng = par_re.sub(r'\\\\',strng)
258 strng = escape_re.sub(r'\\\1',strng)
258 strng = escape_re.sub(r'\\\1',strng)
259 strng = newline_re.sub(r'\\textbackslash{}n',strng)
259 strng = newline_re.sub(r'\\textbackslash{}n',strng)
260 return strng
260 return strng
261
261
262 def format_screen(self,strng):
262 def format_screen(self,strng):
263 """Format a string for screen printing.
263 """Format a string for screen printing.
264
264
265 This removes some latex-type format codes."""
265 This removes some latex-type format codes."""
266 # Paragraph continue
266 # Paragraph continue
267 par_re = re.compile(r'\\$',re.MULTILINE)
267 par_re = re.compile(r'\\$',re.MULTILINE)
268 strng = par_re.sub('',strng)
268 strng = par_re.sub('',strng)
269 return strng
269 return strng
270
270
271 def parse_options(self,arg_str,opt_str,*long_opts,**kw):
271 def parse_options(self,arg_str,opt_str,*long_opts,**kw):
272 """Parse options passed to an argument string.
272 """Parse options passed to an argument string.
273
273
274 The interface is similar to that of getopt(), but it returns back a
274 The interface is similar to that of getopt(), but it returns back a
275 Struct with the options as keys and the stripped argument string still
275 Struct with the options as keys and the stripped argument string still
276 as a string.
276 as a string.
277
277
278 arg_str is quoted as a true sys.argv vector by using shlex.split.
278 arg_str is quoted as a true sys.argv vector by using shlex.split.
279 This allows us to easily expand variables, glob files, quote
279 This allows us to easily expand variables, glob files, quote
280 arguments, etc.
280 arguments, etc.
281
281
282 Options:
282 Options:
283 -mode: default 'string'. If given as 'list', the argument string is
283 -mode: default 'string'. If given as 'list', the argument string is
284 returned as a list (split on whitespace) instead of a string.
284 returned as a list (split on whitespace) instead of a string.
285
285
286 -list_all: put all option values in lists. Normally only options
286 -list_all: put all option values in lists. Normally only options
287 appearing more than once are put in a list."""
287 appearing more than once are put in a list."""
288
288
289 # inject default options at the beginning of the input line
289 # inject default options at the beginning of the input line
290 caller = sys._getframe(1).f_code.co_name.replace('magic_','')
290 caller = sys._getframe(1).f_code.co_name.replace('magic_','')
291 arg_str = '%s %s' % (self.options_table.get(caller,''),arg_str)
291 arg_str = '%s %s' % (self.options_table.get(caller,''),arg_str)
292
292
293 mode = kw.get('mode','string')
293 mode = kw.get('mode','string')
294 if mode not in ['string','list']:
294 if mode not in ['string','list']:
295 raise ValueError,'incorrect mode given: %s' % mode
295 raise ValueError,'incorrect mode given: %s' % mode
296 # Get options
296 # Get options
297 list_all = kw.get('list_all',0)
297 list_all = kw.get('list_all',0)
298
298
299 # Check if we have more than one argument to warrant extra processing:
299 # Check if we have more than one argument to warrant extra processing:
300 odict = {} # Dictionary with options
300 odict = {} # Dictionary with options
301 args = arg_str.split()
301 args = arg_str.split()
302 if len(args) >= 1:
302 if len(args) >= 1:
303 # If the list of inputs only has 0 or 1 thing in it, there's no
303 # If the list of inputs only has 0 or 1 thing in it, there's no
304 # need to look for options
304 # need to look for options
305 argv = shlex_split(arg_str)
305 argv = shlex_split(arg_str)
306 # Do regular option processing
306 # Do regular option processing
307 opts,args = getopt(argv,opt_str,*long_opts)
307 opts,args = getopt(argv,opt_str,*long_opts)
308 for o,a in opts:
308 for o,a in opts:
309 if o.startswith('--'):
309 if o.startswith('--'):
310 o = o[2:]
310 o = o[2:]
311 else:
311 else:
312 o = o[1:]
312 o = o[1:]
313 try:
313 try:
314 odict[o].append(a)
314 odict[o].append(a)
315 except AttributeError:
315 except AttributeError:
316 odict[o] = [odict[o],a]
316 odict[o] = [odict[o],a]
317 except KeyError:
317 except KeyError:
318 if list_all:
318 if list_all:
319 odict[o] = [a]
319 odict[o] = [a]
320 else:
320 else:
321 odict[o] = a
321 odict[o] = a
322
322
323 # Prepare opts,args for return
323 # Prepare opts,args for return
324 opts = Struct(odict)
324 opts = Struct(odict)
325 if mode == 'string':
325 if mode == 'string':
326 args = ' '.join(args)
326 args = ' '.join(args)
327
327
328 return opts,args
328 return opts,args
329
329
330 #......................................................................
330 #......................................................................
331 # And now the actual magic functions
331 # And now the actual magic functions
332
332
333 # Functions for IPython shell work (vars,funcs, config, etc)
333 # Functions for IPython shell work (vars,funcs, config, etc)
334 def magic_lsmagic(self, parameter_s = ''):
334 def magic_lsmagic(self, parameter_s = ''):
335 """List currently available magic functions."""
335 """List currently available magic functions."""
336 mesc = self.shell.ESC_MAGIC
336 mesc = self.shell.ESC_MAGIC
337 print 'Available magic functions:\n'+mesc+\
337 print 'Available magic functions:\n'+mesc+\
338 (' '+mesc).join(self.lsmagic())
338 (' '+mesc).join(self.lsmagic())
339 print '\n' + Magic.auto_status[self.shell.rc.automagic]
339 print '\n' + Magic.auto_status[self.shell.rc.automagic]
340 return None
340 return None
341
341
342 def magic_magic(self, parameter_s = ''):
342 def magic_magic(self, parameter_s = ''):
343 """Print information about the magic function system."""
343 """Print information about the magic function system."""
344
344
345 mode = ''
345 mode = ''
346 try:
346 try:
347 if parameter_s.split()[0] == '-latex':
347 if parameter_s.split()[0] == '-latex':
348 mode = 'latex'
348 mode = 'latex'
349 except:
349 except:
350 pass
350 pass
351
351
352 magic_docs = []
352 magic_docs = []
353 for fname in self.lsmagic():
353 for fname in self.lsmagic():
354 mname = 'magic_' + fname
354 mname = 'magic_' + fname
355 for space in (Magic,self,self.__class__):
355 for space in (Magic,self,self.__class__):
356 try:
356 try:
357 fn = space.__dict__[mname]
357 fn = space.__dict__[mname]
358 except KeyError:
358 except KeyError:
359 pass
359 pass
360 else:
360 else:
361 break
361 break
362 magic_docs.append('%s%s:\n\t%s\n' %(self.shell.ESC_MAGIC,
362 magic_docs.append('%s%s:\n\t%s\n' %(self.shell.ESC_MAGIC,
363 fname,fn.__doc__))
363 fname,fn.__doc__))
364 magic_docs = ''.join(magic_docs)
364 magic_docs = ''.join(magic_docs)
365
365
366 if mode == 'latex':
366 if mode == 'latex':
367 print self.format_latex(magic_docs)
367 print self.format_latex(magic_docs)
368 return
368 return
369 else:
369 else:
370 magic_docs = self.format_screen(magic_docs)
370 magic_docs = self.format_screen(magic_docs)
371
371
372 outmsg = """
372 outmsg = """
373 IPython's 'magic' functions
373 IPython's 'magic' functions
374 ===========================
374 ===========================
375
375
376 The magic function system provides a series of functions which allow you to
376 The magic function system provides a series of functions which allow you to
377 control the behavior of IPython itself, plus a lot of system-type
377 control the behavior of IPython itself, plus a lot of system-type
378 features. All these functions are prefixed with a % character, but parameters
378 features. All these functions are prefixed with a % character, but parameters
379 are given without parentheses or quotes.
379 are given without parentheses or quotes.
380
380
381 NOTE: If you have 'automagic' enabled (via the command line option or with the
381 NOTE: If you have 'automagic' enabled (via the command line option or with the
382 %automagic function), you don't need to type in the % explicitly. By default,
382 %automagic function), you don't need to type in the % explicitly. By default,
383 IPython ships with automagic on, so you should only rarely need the % escape.
383 IPython ships with automagic on, so you should only rarely need the % escape.
384
384
385 Example: typing '%cd mydir' (without the quotes) changes you working directory
385 Example: typing '%cd mydir' (without the quotes) changes you working directory
386 to 'mydir', if it exists.
386 to 'mydir', if it exists.
387
387
388 You can define your own magic functions to extend the system. See the supplied
388 You can define your own magic functions to extend the system. See the supplied
389 ipythonrc and example-magic.py files for details (in your ipython
389 ipythonrc and example-magic.py files for details (in your ipython
390 configuration directory, typically $HOME/.ipython/).
390 configuration directory, typically $HOME/.ipython/).
391
391
392 You can also define your own aliased names for magic functions. In your
392 You can also define your own aliased names for magic functions. In your
393 ipythonrc file, placing a line like:
393 ipythonrc file, placing a line like:
394
394
395 execute __IPYTHON__.magic_pf = __IPYTHON__.magic_profile
395 execute __IPYTHON__.magic_pf = __IPYTHON__.magic_profile
396
396
397 will define %pf as a new name for %profile.
397 will define %pf as a new name for %profile.
398
398
399 You can also call magics in code using the ipmagic() function, which IPython
399 You can also call magics in code using the ipmagic() function, which IPython
400 automatically adds to the builtin namespace. Type 'ipmagic?' for details.
400 automatically adds to the builtin namespace. Type 'ipmagic?' for details.
401
401
402 For a list of the available magic functions, use %lsmagic. For a description
402 For a list of the available magic functions, use %lsmagic. For a description
403 of any of them, type %magic_name?, e.g. '%cd?'.
403 of any of them, type %magic_name?, e.g. '%cd?'.
404
404
405 Currently the magic system has the following functions:\n"""
405 Currently the magic system has the following functions:\n"""
406
406
407 mesc = self.shell.ESC_MAGIC
407 mesc = self.shell.ESC_MAGIC
408 outmsg = ("%s\n%s\n\nSummary of magic functions (from %slsmagic):"
408 outmsg = ("%s\n%s\n\nSummary of magic functions (from %slsmagic):"
409 "\n\n%s%s\n\n%s" % (outmsg,
409 "\n\n%s%s\n\n%s" % (outmsg,
410 magic_docs,mesc,mesc,
410 magic_docs,mesc,mesc,
411 (' '+mesc).join(self.lsmagic()),
411 (' '+mesc).join(self.lsmagic()),
412 Magic.auto_status[self.shell.rc.automagic] ) )
412 Magic.auto_status[self.shell.rc.automagic] ) )
413
413
414 page(outmsg,screen_lines=self.shell.rc.screen_length)
414 page(outmsg,screen_lines=self.shell.rc.screen_length)
415
415
416 def magic_automagic(self, parameter_s = ''):
416 def magic_automagic(self, parameter_s = ''):
417 """Make magic functions callable without having to type the initial %.
417 """Make magic functions callable without having to type the initial %.
418
418
419 Toggles on/off (when off, you must call it as %automagic, of
419 Toggles on/off (when off, you must call it as %automagic, of
420 course). Note that magic functions have lowest priority, so if there's
420 course). Note that magic functions have lowest priority, so if there's
421 a variable whose name collides with that of a magic fn, automagic
421 a variable whose name collides with that of a magic fn, automagic
422 won't work for that function (you get the variable instead). However,
422 won't work for that function (you get the variable instead). However,
423 if you delete the variable (del var), the previously shadowed magic
423 if you delete the variable (del var), the previously shadowed magic
424 function becomes visible to automagic again."""
424 function becomes visible to automagic again."""
425
425
426 rc = self.shell.rc
426 rc = self.shell.rc
427 rc.automagic = not rc.automagic
427 rc.automagic = not rc.automagic
428 print '\n' + Magic.auto_status[rc.automagic]
428 print '\n' + Magic.auto_status[rc.automagic]
429
429
430 def magic_autocall(self, parameter_s = ''):
430 def magic_autocall(self, parameter_s = ''):
431 """Make functions callable without having to type parentheses.
431 """Make functions callable without having to type parentheses.
432
432
433 Usage:
433 Usage:
434
434
435 %autocall [mode]
435 %autocall [mode]
436
436
437 The mode can be one of: 0->Off, 1->Smart, 2->Full. If not given, the
437 The mode can be one of: 0->Off, 1->Smart, 2->Full. If not given, the
438 value is toggled on and off (remembering the previous state)."""
438 value is toggled on and off (remembering the previous state)."""
439
439
440 rc = self.shell.rc
440 rc = self.shell.rc
441
441
442 if parameter_s:
442 if parameter_s:
443 arg = int(parameter_s)
443 arg = int(parameter_s)
444 else:
444 else:
445 arg = 'toggle'
445 arg = 'toggle'
446
446
447 if not arg in (0,1,2,'toggle'):
447 if not arg in (0,1,2,'toggle'):
448 error('Valid modes: (0->Off, 1->Smart, 2->Full')
448 error('Valid modes: (0->Off, 1->Smart, 2->Full')
449 return
449 return
450
450
451 if arg in (0,1,2):
451 if arg in (0,1,2):
452 rc.autocall = arg
452 rc.autocall = arg
453 else: # toggle
453 else: # toggle
454 if rc.autocall:
454 if rc.autocall:
455 self._magic_state.autocall_save = rc.autocall
455 self._magic_state.autocall_save = rc.autocall
456 rc.autocall = 0
456 rc.autocall = 0
457 else:
457 else:
458 try:
458 try:
459 rc.autocall = self._magic_state.autocall_save
459 rc.autocall = self._magic_state.autocall_save
460 except AttributeError:
460 except AttributeError:
461 rc.autocall = self._magic_state.autocall_save = 1
461 rc.autocall = self._magic_state.autocall_save = 1
462
462
463 print "Automatic calling is:",['OFF','Smart','Full'][rc.autocall]
463 print "Automatic calling is:",['OFF','Smart','Full'][rc.autocall]
464
464
465 def magic_autoindent(self, parameter_s = ''):
465 def magic_autoindent(self, parameter_s = ''):
466 """Toggle autoindent on/off (if available)."""
466 """Toggle autoindent on/off (if available)."""
467
467
468 self.shell.set_autoindent()
468 self.shell.set_autoindent()
469 print "Automatic indentation is:",['OFF','ON'][self.shell.autoindent]
469 print "Automatic indentation is:",['OFF','ON'][self.shell.autoindent]
470
470
471 def magic_system_verbose(self, parameter_s = ''):
471 def magic_system_verbose(self, parameter_s = ''):
472 """Toggle verbose printing of system calls on/off."""
472 """Toggle verbose printing of system calls on/off."""
473
473
474 self.shell.rc_set_toggle('system_verbose')
474 self.shell.rc_set_toggle('system_verbose')
475 print "System verbose printing is:",\
475 print "System verbose printing is:",\
476 ['OFF','ON'][self.shell.rc.system_verbose]
476 ['OFF','ON'][self.shell.rc.system_verbose]
477
477
478 def magic_history(self, parameter_s = ''):
478 def magic_history(self, parameter_s = ''):
479 """Print input history (_i<n> variables), with most recent last.
479 """Print input history (_i<n> variables), with most recent last.
480
480
481 %history [-n] -> print at most 40 inputs (some may be multi-line)\\
481 %history [-n] -> print at most 40 inputs (some may be multi-line)\\
482 %history [-n] n -> print at most n inputs\\
482 %history [-n] n -> print at most n inputs\\
483 %history [-n] n1 n2 -> print inputs between n1 and n2 (n2 not included)\\
483 %history [-n] n1 n2 -> print inputs between n1 and n2 (n2 not included)\\
484
484
485 Each input's number <n> is shown, and is accessible as the
485 Each input's number <n> is shown, and is accessible as the
486 automatically generated variable _i<n>. Multi-line statements are
486 automatically generated variable _i<n>. Multi-line statements are
487 printed starting at a new line for easy copy/paste.
487 printed starting at a new line for easy copy/paste.
488
488
489 If option -n is used, input numbers are not printed. This is useful if
489 If option -n is used, input numbers are not printed. This is useful if
490 you want to get a printout of many lines which can be directly pasted
490 you want to get a printout of many lines which can be directly pasted
491 into a text editor.
491 into a text editor.
492
492
493 This feature is only available if numbered prompts are in use."""
493 This feature is only available if numbered prompts are in use."""
494
494
495 shell = self.shell
495 shell = self.shell
496 if not shell.outputcache.do_full_cache:
496 if not shell.outputcache.do_full_cache:
497 print 'This feature is only available if numbered prompts are in use.'
497 print 'This feature is only available if numbered prompts are in use.'
498 return
498 return
499 opts,args = self.parse_options(parameter_s,'n',mode='list')
499 opts,args = self.parse_options(parameter_s,'n',mode='list')
500
500
501 input_hist = shell.input_hist
501 input_hist = shell.input_hist
502 default_length = 40
502 default_length = 40
503 if len(args) == 0:
503 if len(args) == 0:
504 final = len(input_hist)
504 final = len(input_hist)
505 init = max(1,final-default_length)
505 init = max(1,final-default_length)
506 elif len(args) == 1:
506 elif len(args) == 1:
507 final = len(input_hist)
507 final = len(input_hist)
508 init = max(1,final-int(args[0]))
508 init = max(1,final-int(args[0]))
509 elif len(args) == 2:
509 elif len(args) == 2:
510 init,final = map(int,args)
510 init,final = map(int,args)
511 else:
511 else:
512 warn('%hist takes 0, 1 or 2 arguments separated by spaces.')
512 warn('%hist takes 0, 1 or 2 arguments separated by spaces.')
513 print self.magic_hist.__doc__
513 print self.magic_hist.__doc__
514 return
514 return
515 width = len(str(final))
515 width = len(str(final))
516 line_sep = ['','\n']
516 line_sep = ['','\n']
517 print_nums = not opts.has_key('n')
517 print_nums = not opts.has_key('n')
518 for in_num in range(init,final):
518 for in_num in range(init,final):
519 inline = input_hist[in_num]
519 inline = input_hist[in_num]
520 multiline = int(inline.count('\n') > 1)
520 multiline = int(inline.count('\n') > 1)
521 if print_nums:
521 if print_nums:
522 print '%s:%s' % (str(in_num).ljust(width),line_sep[multiline]),
522 print '%s:%s' % (str(in_num).ljust(width),line_sep[multiline]),
523 print inline,
523 print inline,
524
524
525 def magic_hist(self, parameter_s=''):
525 def magic_hist(self, parameter_s=''):
526 """Alternate name for %history."""
526 """Alternate name for %history."""
527 return self.magic_history(parameter_s)
527 return self.magic_history(parameter_s)
528
528
529 def magic_p(self, parameter_s=''):
529 def magic_p(self, parameter_s=''):
530 """Just a short alias for Python's 'print'."""
530 """Just a short alias for Python's 'print'."""
531 exec 'print ' + parameter_s in self.shell.user_ns
531 exec 'print ' + parameter_s in self.shell.user_ns
532
532
533 def magic_r(self, parameter_s=''):
533 def magic_r(self, parameter_s=''):
534 """Repeat previous input.
534 """Repeat previous input.
535
535
536 If given an argument, repeats the previous command which starts with
536 If given an argument, repeats the previous command which starts with
537 the same string, otherwise it just repeats the previous input.
537 the same string, otherwise it just repeats the previous input.
538
538
539 Shell escaped commands (with ! as first character) are not recognized
539 Shell escaped commands (with ! as first character) are not recognized
540 by this system, only pure python code and magic commands.
540 by this system, only pure python code and magic commands.
541 """
541 """
542
542
543 start = parameter_s.strip()
543 start = parameter_s.strip()
544 esc_magic = self.shell.ESC_MAGIC
544 esc_magic = self.shell.ESC_MAGIC
545 # Identify magic commands even if automagic is on (which means
545 # Identify magic commands even if automagic is on (which means
546 # the in-memory version is different from that typed by the user).
546 # the in-memory version is different from that typed by the user).
547 if self.shell.rc.automagic:
547 if self.shell.rc.automagic:
548 start_magic = esc_magic+start
548 start_magic = esc_magic+start
549 else:
549 else:
550 start_magic = start
550 start_magic = start
551 # Look through the input history in reverse
551 # Look through the input history in reverse
552 for n in range(len(self.shell.input_hist)-2,0,-1):
552 for n in range(len(self.shell.input_hist)-2,0,-1):
553 input = self.shell.input_hist[n]
553 input = self.shell.input_hist[n]
554 # skip plain 'r' lines so we don't recurse to infinity
554 # skip plain 'r' lines so we don't recurse to infinity
555 if input != 'ipmagic("r")\n' and \
555 if input != 'ipmagic("r")\n' and \
556 (input.startswith(start) or input.startswith(start_magic)):
556 (input.startswith(start) or input.startswith(start_magic)):
557 #print 'match',`input` # dbg
557 #print 'match',`input` # dbg
558 print 'Executing:',input,
558 print 'Executing:',input,
559 self.shell.runlines(input)
559 self.shell.runlines(input)
560 return
560 return
561 print 'No previous input matching `%s` found.' % start
561 print 'No previous input matching `%s` found.' % start
562
562
563 def magic_page(self, parameter_s=''):
563 def magic_page(self, parameter_s=''):
564 """Pretty print the object and display it through a pager.
564 """Pretty print the object and display it through a pager.
565
565
566 If no parameter is given, use _ (last output)."""
566 If no parameter is given, use _ (last output)."""
567 # After a function contributed by Olivier Aubert, slightly modified.
567 # After a function contributed by Olivier Aubert, slightly modified.
568
568
569 oname = parameter_s and parameter_s or '_'
569 oname = parameter_s and parameter_s or '_'
570 info = self._ofind(oname)
570 info = self._ofind(oname)
571 if info['found']:
571 if info['found']:
572 page(pformat(info['obj']))
572 page(pformat(info['obj']))
573 else:
573 else:
574 print 'Object `%s` not found' % oname
574 print 'Object `%s` not found' % oname
575
575
576 def magic_profile(self, parameter_s=''):
576 def magic_profile(self, parameter_s=''):
577 """Print your currently active IPyhton profile."""
577 """Print your currently active IPyhton profile."""
578 if self.shell.rc.profile:
578 if self.shell.rc.profile:
579 printpl('Current IPython profile: $self.shell.rc.profile.')
579 printpl('Current IPython profile: $self.shell.rc.profile.')
580 else:
580 else:
581 print 'No profile active.'
581 print 'No profile active.'
582
582
583 def _inspect(self,meth,oname,**kw):
583 def _inspect(self,meth,oname,**kw):
584 """Generic interface to the inspector system.
584 """Generic interface to the inspector system.
585
585
586 This function is meant to be called by pdef, pdoc & friends."""
586 This function is meant to be called by pdef, pdoc & friends."""
587
587
588 oname = oname.strip()
588 oname = oname.strip()
589 info = Struct(self._ofind(oname))
589 info = Struct(self._ofind(oname))
590 if info.found:
590 if info.found:
591 pmethod = getattr(self.shell.inspector,meth)
591 pmethod = getattr(self.shell.inspector,meth)
592 formatter = info.ismagic and self.format_screen or None
592 formatter = info.ismagic and self.format_screen or None
593 if meth == 'pdoc':
593 if meth == 'pdoc':
594 pmethod(info.obj,oname,formatter)
594 pmethod(info.obj,oname,formatter)
595 elif meth == 'pinfo':
595 elif meth == 'pinfo':
596 pmethod(info.obj,oname,formatter,info,**kw)
596 pmethod(info.obj,oname,formatter,info,**kw)
597 else:
597 else:
598 pmethod(info.obj,oname)
598 pmethod(info.obj,oname)
599 else:
599 else:
600 print 'Object `%s` not found.' % oname
600 print 'Object `%s` not found.' % oname
601 return 'not found' # so callers can take other action
601 return 'not found' # so callers can take other action
602
602
603 def magic_pdef(self, parameter_s=''):
603 def magic_pdef(self, parameter_s=''):
604 """Print the definition header for any callable object.
604 """Print the definition header for any callable object.
605
605
606 If the object is a class, print the constructor information."""
606 If the object is a class, print the constructor information."""
607 self._inspect('pdef',parameter_s)
607 self._inspect('pdef',parameter_s)
608
608
609 def magic_pdoc(self, parameter_s=''):
609 def magic_pdoc(self, parameter_s=''):
610 """Print the docstring for an object.
610 """Print the docstring for an object.
611
611
612 If the given object is a class, it will print both the class and the
612 If the given object is a class, it will print both the class and the
613 constructor docstrings."""
613 constructor docstrings."""
614 self._inspect('pdoc',parameter_s)
614 self._inspect('pdoc',parameter_s)
615
615
616 def magic_psource(self, parameter_s=''):
616 def magic_psource(self, parameter_s=''):
617 """Print (or run through pager) the source code for an object."""
617 """Print (or run through pager) the source code for an object."""
618 self._inspect('psource',parameter_s)
618 self._inspect('psource',parameter_s)
619
619
620 def magic_pfile(self, parameter_s=''):
620 def magic_pfile(self, parameter_s=''):
621 """Print (or run through pager) the file where an object is defined.
621 """Print (or run through pager) the file where an object is defined.
622
622
623 The file opens at the line where the object definition begins. IPython
623 The file opens at the line where the object definition begins. IPython
624 will honor the environment variable PAGER if set, and otherwise will
624 will honor the environment variable PAGER if set, and otherwise will
625 do its best to print the file in a convenient form.
625 do its best to print the file in a convenient form.
626
626
627 If the given argument is not an object currently defined, IPython will
627 If the given argument is not an object currently defined, IPython will
628 try to interpret it as a filename (automatically adding a .py extension
628 try to interpret it as a filename (automatically adding a .py extension
629 if needed). You can thus use %pfile as a syntax highlighting code
629 if needed). You can thus use %pfile as a syntax highlighting code
630 viewer."""
630 viewer."""
631
631
632 # first interpret argument as an object name
632 # first interpret argument as an object name
633 out = self._inspect('pfile',parameter_s)
633 out = self._inspect('pfile',parameter_s)
634 # if not, try the input as a filename
634 # if not, try the input as a filename
635 if out == 'not found':
635 if out == 'not found':
636 try:
636 try:
637 filename = get_py_filename(parameter_s)
637 filename = get_py_filename(parameter_s)
638 except IOError,msg:
638 except IOError,msg:
639 print msg
639 print msg
640 return
640 return
641 page(self.shell.inspector.format(file(filename).read()))
641 page(self.shell.inspector.format(file(filename).read()))
642
642
643 def magic_pinfo(self, parameter_s=''):
643 def magic_pinfo(self, parameter_s=''):
644 """Provide detailed information about an object.
644 """Provide detailed information about an object.
645
645
646 '%pinfo object' is just a synonym for object? or ?object."""
646 '%pinfo object' is just a synonym for object? or ?object."""
647
647
648 #print 'pinfo par: <%s>' % parameter_s # dbg
648 #print 'pinfo par: <%s>' % parameter_s # dbg
649
649
650 # detail_level: 0 -> obj? , 1 -> obj??
650 # detail_level: 0 -> obj? , 1 -> obj??
651 detail_level = 0
651 detail_level = 0
652 # We need to detect if we got called as 'pinfo pinfo foo', which can
652 # We need to detect if we got called as 'pinfo pinfo foo', which can
653 # happen if the user types 'pinfo foo?' at the cmd line.
653 # happen if the user types 'pinfo foo?' at the cmd line.
654 pinfo,qmark1,oname,qmark2 = \
654 pinfo,qmark1,oname,qmark2 = \
655 re.match('(pinfo )?(\?*)(.*?)(\??$)',parameter_s).groups()
655 re.match('(pinfo )?(\?*)(.*?)(\??$)',parameter_s).groups()
656 if pinfo or qmark1 or qmark2:
656 if pinfo or qmark1 or qmark2:
657 detail_level = 1
657 detail_level = 1
658 if "*" in oname:
658 if "*" in oname:
659 self.magic_psearch(oname)
659 self.magic_psearch(oname)
660 else:
660 else:
661 self._inspect('pinfo',oname,detail_level=detail_level)
661 self._inspect('pinfo',oname,detail_level=detail_level)
662
662
663 def magic_psearch(self, parameter_s=''):
663 def magic_psearch(self, parameter_s=''):
664 """Search for object in namespaces by wildcard.
664 """Search for object in namespaces by wildcard.
665
665
666 %psearch [options] PATTERN [OBJECT TYPE]
666 %psearch [options] PATTERN [OBJECT TYPE]
667
667
668 Note: ? can be used as a synonym for %psearch, at the beginning or at
668 Note: ? can be used as a synonym for %psearch, at the beginning or at
669 the end: both a*? and ?a* are equivalent to '%psearch a*'. Still, the
669 the end: both a*? and ?a* are equivalent to '%psearch a*'. Still, the
670 rest of the command line must be unchanged (options come first), so
670 rest of the command line must be unchanged (options come first), so
671 for example the following forms are equivalent
671 for example the following forms are equivalent
672
672
673 %psearch -i a* function
673 %psearch -i a* function
674 -i a* function?
674 -i a* function?
675 ?-i a* function
675 ?-i a* function
676
676
677 Arguments:
677 Arguments:
678
678
679 PATTERN
679 PATTERN
680
680
681 where PATTERN is a string containing * as a wildcard similar to its
681 where PATTERN is a string containing * as a wildcard similar to its
682 use in a shell. The pattern is matched in all namespaces on the
682 use in a shell. The pattern is matched in all namespaces on the
683 search path. By default objects starting with a single _ are not
683 search path. By default objects starting with a single _ are not
684 matched, many IPython generated objects have a single
684 matched, many IPython generated objects have a single
685 underscore. The default is case insensitive matching. Matching is
685 underscore. The default is case insensitive matching. Matching is
686 also done on the attributes of objects and not only on the objects
686 also done on the attributes of objects and not only on the objects
687 in a module.
687 in a module.
688
688
689 [OBJECT TYPE]
689 [OBJECT TYPE]
690
690
691 Is the name of a python type from the types module. The name is
691 Is the name of a python type from the types module. The name is
692 given in lowercase without the ending type, ex. StringType is
692 given in lowercase without the ending type, ex. StringType is
693 written string. By adding a type here only objects matching the
693 written string. By adding a type here only objects matching the
694 given type are matched. Using all here makes the pattern match all
694 given type are matched. Using all here makes the pattern match all
695 types (this is the default).
695 types (this is the default).
696
696
697 Options:
697 Options:
698
698
699 -a: makes the pattern match even objects whose names start with a
699 -a: makes the pattern match even objects whose names start with a
700 single underscore. These names are normally ommitted from the
700 single underscore. These names are normally ommitted from the
701 search.
701 search.
702
702
703 -i/-c: make the pattern case insensitive/sensitive. If neither of
703 -i/-c: make the pattern case insensitive/sensitive. If neither of
704 these options is given, the default is read from your ipythonrc
704 these options is given, the default is read from your ipythonrc
705 file. The option name which sets this value is
705 file. The option name which sets this value is
706 'wildcards_case_sensitive'. If this option is not specified in your
706 'wildcards_case_sensitive'. If this option is not specified in your
707 ipythonrc file, IPython's internal default is to do a case sensitive
707 ipythonrc file, IPython's internal default is to do a case sensitive
708 search.
708 search.
709
709
710 -e/-s NAMESPACE: exclude/search a given namespace. The pattern you
710 -e/-s NAMESPACE: exclude/search a given namespace. The pattern you
711 specifiy can be searched in any of the following namespaces:
711 specifiy can be searched in any of the following namespaces:
712 'builtin', 'user', 'user_global','internal', 'alias', where
712 'builtin', 'user', 'user_global','internal', 'alias', where
713 'builtin' and 'user' are the search defaults. Note that you should
713 'builtin' and 'user' are the search defaults. Note that you should
714 not use quotes when specifying namespaces.
714 not use quotes when specifying namespaces.
715
715
716 'Builtin' contains the python module builtin, 'user' contains all
716 'Builtin' contains the python module builtin, 'user' contains all
717 user data, 'alias' only contain the shell aliases and no python
717 user data, 'alias' only contain the shell aliases and no python
718 objects, 'internal' contains objects used by IPython. The
718 objects, 'internal' contains objects used by IPython. The
719 'user_global' namespace is only used by embedded IPython instances,
719 'user_global' namespace is only used by embedded IPython instances,
720 and it contains module-level globals. You can add namespaces to the
720 and it contains module-level globals. You can add namespaces to the
721 search with -s or exclude them with -e (these options can be given
721 search with -s or exclude them with -e (these options can be given
722 more than once).
722 more than once).
723
723
724 Examples:
724 Examples:
725
725
726 %psearch a* -> objects beginning with an a
726 %psearch a* -> objects beginning with an a
727 %psearch -e builtin a* -> objects NOT in the builtin space starting in a
727 %psearch -e builtin a* -> objects NOT in the builtin space starting in a
728 %psearch a* function -> all functions beginning with an a
728 %psearch a* function -> all functions beginning with an a
729 %psearch re.e* -> objects beginning with an e in module re
729 %psearch re.e* -> objects beginning with an e in module re
730 %psearch r*.e* -> objects that start with e in modules starting in r
730 %psearch r*.e* -> objects that start with e in modules starting in r
731 %psearch r*.* string -> all strings in modules beginning with r
731 %psearch r*.* string -> all strings in modules beginning with r
732
732
733 Case sensitve search:
733 Case sensitve search:
734
734
735 %psearch -c a* list all object beginning with lower case a
735 %psearch -c a* list all object beginning with lower case a
736
736
737 Show objects beginning with a single _:
737 Show objects beginning with a single _:
738
738
739 %psearch -a _* list objects beginning with a single underscore"""
739 %psearch -a _* list objects beginning with a single underscore"""
740
740
741 # default namespaces to be searched
741 # default namespaces to be searched
742 def_search = ['user','builtin']
742 def_search = ['user','builtin']
743
743
744 # Process options/args
744 # Process options/args
745 opts,args = self.parse_options(parameter_s,'cias:e:',list_all=True)
745 opts,args = self.parse_options(parameter_s,'cias:e:',list_all=True)
746 opt = opts.get
746 opt = opts.get
747 shell = self.shell
747 shell = self.shell
748 psearch = shell.inspector.psearch
748 psearch = shell.inspector.psearch
749
749
750 # select case options
750 # select case options
751 if opts.has_key('i'):
751 if opts.has_key('i'):
752 ignore_case = True
752 ignore_case = True
753 elif opts.has_key('c'):
753 elif opts.has_key('c'):
754 ignore_case = False
754 ignore_case = False
755 else:
755 else:
756 ignore_case = not shell.rc.wildcards_case_sensitive
756 ignore_case = not shell.rc.wildcards_case_sensitive
757
757
758 # Build list of namespaces to search from user options
758 # Build list of namespaces to search from user options
759 def_search.extend(opt('s',[]))
759 def_search.extend(opt('s',[]))
760 ns_exclude = ns_exclude=opt('e',[])
760 ns_exclude = ns_exclude=opt('e',[])
761 ns_search = [nm for nm in def_search if nm not in ns_exclude]
761 ns_search = [nm for nm in def_search if nm not in ns_exclude]
762
762
763 # Call the actual search
763 # Call the actual search
764 try:
764 try:
765 psearch(args,shell.ns_table,ns_search,
765 psearch(args,shell.ns_table,ns_search,
766 show_all=opt('a'),ignore_case=ignore_case)
766 show_all=opt('a'),ignore_case=ignore_case)
767 except:
767 except:
768 shell.showtraceback()
768 shell.showtraceback()
769
769
770 def magic_who_ls(self, parameter_s=''):
770 def magic_who_ls(self, parameter_s=''):
771 """Return a sorted list of all interactive variables.
771 """Return a sorted list of all interactive variables.
772
772
773 If arguments are given, only variables of types matching these
773 If arguments are given, only variables of types matching these
774 arguments are returned."""
774 arguments are returned."""
775
775
776 user_ns = self.shell.user_ns
776 user_ns = self.shell.user_ns
777 internal_ns = self.shell.internal_ns
777 internal_ns = self.shell.internal_ns
778 user_config_ns = self.shell.user_config_ns
778 user_config_ns = self.shell.user_config_ns
779 out = []
779 out = []
780 typelist = parameter_s.split()
780 typelist = parameter_s.split()
781
781
782 for i in user_ns:
782 for i in user_ns:
783 if not (i.startswith('_') or i.startswith('_i')) \
783 if not (i.startswith('_') or i.startswith('_i')) \
784 and not (i in internal_ns or i in user_config_ns):
784 and not (i in internal_ns or i in user_config_ns):
785 if typelist:
785 if typelist:
786 if type(user_ns[i]).__name__ in typelist:
786 if type(user_ns[i]).__name__ in typelist:
787 out.append(i)
787 out.append(i)
788 else:
788 else:
789 out.append(i)
789 out.append(i)
790 out.sort()
790 out.sort()
791 return out
791 return out
792
792
793 def magic_who(self, parameter_s=''):
793 def magic_who(self, parameter_s=''):
794 """Print all interactive variables, with some minimal formatting.
794 """Print all interactive variables, with some minimal formatting.
795
795
796 If any arguments are given, only variables whose type matches one of
796 If any arguments are given, only variables whose type matches one of
797 these are printed. For example:
797 these are printed. For example:
798
798
799 %who function str
799 %who function str
800
800
801 will only list functions and strings, excluding all other types of
801 will only list functions and strings, excluding all other types of
802 variables. To find the proper type names, simply use type(var) at a
802 variables. To find the proper type names, simply use type(var) at a
803 command line to see how python prints type names. For example:
803 command line to see how python prints type names. For example:
804
804
805 In [1]: type('hello')\\
805 In [1]: type('hello')\\
806 Out[1]: <type 'str'>
806 Out[1]: <type 'str'>
807
807
808 indicates that the type name for strings is 'str'.
808 indicates that the type name for strings is 'str'.
809
809
810 %who always excludes executed names loaded through your configuration
810 %who always excludes executed names loaded through your configuration
811 file and things which are internal to IPython.
811 file and things which are internal to IPython.
812
812
813 This is deliberate, as typically you may load many modules and the
813 This is deliberate, as typically you may load many modules and the
814 purpose of %who is to show you only what you've manually defined."""
814 purpose of %who is to show you only what you've manually defined."""
815
815
816 varlist = self.magic_who_ls(parameter_s)
816 varlist = self.magic_who_ls(parameter_s)
817 if not varlist:
817 if not varlist:
818 print 'Interactive namespace is empty.'
818 print 'Interactive namespace is empty.'
819 return
819 return
820
820
821 # if we have variables, move on...
821 # if we have variables, move on...
822
822
823 # stupid flushing problem: when prompts have no separators, stdout is
823 # stupid flushing problem: when prompts have no separators, stdout is
824 # getting lost. I'm starting to think this is a python bug. I'm having
824 # getting lost. I'm starting to think this is a python bug. I'm having
825 # to force a flush with a print because even a sys.stdout.flush
825 # to force a flush with a print because even a sys.stdout.flush
826 # doesn't seem to do anything!
826 # doesn't seem to do anything!
827
827
828 count = 0
828 count = 0
829 for i in varlist:
829 for i in varlist:
830 print i+'\t',
830 print i+'\t',
831 count += 1
831 count += 1
832 if count > 8:
832 if count > 8:
833 count = 0
833 count = 0
834 print
834 print
835 sys.stdout.flush() # FIXME. Why the hell isn't this flushing???
835 sys.stdout.flush() # FIXME. Why the hell isn't this flushing???
836
836
837 print # well, this does force a flush at the expense of an extra \n
837 print # well, this does force a flush at the expense of an extra \n
838
838
839 def magic_whos(self, parameter_s=''):
839 def magic_whos(self, parameter_s=''):
840 """Like %who, but gives some extra information about each variable.
840 """Like %who, but gives some extra information about each variable.
841
841
842 The same type filtering of %who can be applied here.
842 The same type filtering of %who can be applied here.
843
843
844 For all variables, the type is printed. Additionally it prints:
844 For all variables, the type is printed. Additionally it prints:
845
845
846 - For {},[],(): their length.
846 - For {},[],(): their length.
847
847
848 - For Numeric arrays, a summary with shape, number of elements,
848 - For Numeric arrays, a summary with shape, number of elements,
849 typecode and size in memory.
849 typecode and size in memory.
850
850
851 - Everything else: a string representation, snipping their middle if
851 - Everything else: a string representation, snipping their middle if
852 too long."""
852 too long."""
853
853
854 varnames = self.magic_who_ls(parameter_s)
854 varnames = self.magic_who_ls(parameter_s)
855 if not varnames:
855 if not varnames:
856 print 'Interactive namespace is empty.'
856 print 'Interactive namespace is empty.'
857 return
857 return
858
858
859 # if we have variables, move on...
859 # if we have variables, move on...
860
860
861 # for these types, show len() instead of data:
861 # for these types, show len() instead of data:
862 seq_types = [types.DictType,types.ListType,types.TupleType]
862 seq_types = [types.DictType,types.ListType,types.TupleType]
863
863
864 # for Numeric arrays, display summary info
864 # for Numeric arrays, display summary info
865 try:
865 try:
866 import Numeric
866 import Numeric
867 except ImportError:
867 except ImportError:
868 array_type = None
868 array_type = None
869 else:
869 else:
870 array_type = Numeric.ArrayType.__name__
870 array_type = Numeric.ArrayType.__name__
871
871
872 # Find all variable names and types so we can figure out column sizes
872 # Find all variable names and types so we can figure out column sizes
873 get_vars = lambda i: self.shell.user_ns[i]
873 get_vars = lambda i: self.shell.user_ns[i]
874 type_name = lambda v: type(v).__name__
874 type_name = lambda v: type(v).__name__
875 varlist = map(get_vars,varnames)
875 varlist = map(get_vars,varnames)
876
876
877 typelist = []
877 typelist = []
878 for vv in varlist:
878 for vv in varlist:
879 tt = type_name(vv)
879 tt = type_name(vv)
880 if tt=='instance':
880 if tt=='instance':
881 typelist.append(str(vv.__class__))
881 typelist.append(str(vv.__class__))
882 else:
882 else:
883 typelist.append(tt)
883 typelist.append(tt)
884
884
885 # column labels and # of spaces as separator
885 # column labels and # of spaces as separator
886 varlabel = 'Variable'
886 varlabel = 'Variable'
887 typelabel = 'Type'
887 typelabel = 'Type'
888 datalabel = 'Data/Info'
888 datalabel = 'Data/Info'
889 colsep = 3
889 colsep = 3
890 # variable format strings
890 # variable format strings
891 vformat = "$vname.ljust(varwidth)$vtype.ljust(typewidth)"
891 vformat = "$vname.ljust(varwidth)$vtype.ljust(typewidth)"
892 vfmt_short = '$vstr[:25]<...>$vstr[-25:]'
892 vfmt_short = '$vstr[:25]<...>$vstr[-25:]'
893 aformat = "%s: %s elems, type `%s`, %s bytes"
893 aformat = "%s: %s elems, type `%s`, %s bytes"
894 # find the size of the columns to format the output nicely
894 # find the size of the columns to format the output nicely
895 varwidth = max(max(map(len,varnames)), len(varlabel)) + colsep
895 varwidth = max(max(map(len,varnames)), len(varlabel)) + colsep
896 typewidth = max(max(map(len,typelist)), len(typelabel)) + colsep
896 typewidth = max(max(map(len,typelist)), len(typelabel)) + colsep
897 # table header
897 # table header
898 print varlabel.ljust(varwidth) + typelabel.ljust(typewidth) + \
898 print varlabel.ljust(varwidth) + typelabel.ljust(typewidth) + \
899 ' '+datalabel+'\n' + '-'*(varwidth+typewidth+len(datalabel)+1)
899 ' '+datalabel+'\n' + '-'*(varwidth+typewidth+len(datalabel)+1)
900 # and the table itself
900 # and the table itself
901 kb = 1024
901 kb = 1024
902 Mb = 1048576 # kb**2
902 Mb = 1048576 # kb**2
903 for vname,var,vtype in zip(varnames,varlist,typelist):
903 for vname,var,vtype in zip(varnames,varlist,typelist):
904 print itpl(vformat),
904 print itpl(vformat),
905 if vtype in seq_types:
905 if vtype in seq_types:
906 print len(var)
906 print len(var)
907 elif vtype==array_type:
907 elif vtype==array_type:
908 vshape = str(var.shape).replace(',','').replace(' ','x')[1:-1]
908 vshape = str(var.shape).replace(',','').replace(' ','x')[1:-1]
909 vsize = Numeric.size(var)
909 vsize = Numeric.size(var)
910 vbytes = vsize*var.itemsize()
910 vbytes = vsize*var.itemsize()
911 if vbytes < 100000:
911 if vbytes < 100000:
912 print aformat % (vshape,vsize,var.typecode(),vbytes)
912 print aformat % (vshape,vsize,var.typecode(),vbytes)
913 else:
913 else:
914 print aformat % (vshape,vsize,var.typecode(),vbytes),
914 print aformat % (vshape,vsize,var.typecode(),vbytes),
915 if vbytes < Mb:
915 if vbytes < Mb:
916 print '(%s kb)' % (vbytes/kb,)
916 print '(%s kb)' % (vbytes/kb,)
917 else:
917 else:
918 print '(%s Mb)' % (vbytes/Mb,)
918 print '(%s Mb)' % (vbytes/Mb,)
919 else:
919 else:
920 vstr = str(var).replace('\n','\\n')
920 vstr = str(var).replace('\n','\\n')
921 if len(vstr) < 50:
921 if len(vstr) < 50:
922 print vstr
922 print vstr
923 else:
923 else:
924 printpl(vfmt_short)
924 printpl(vfmt_short)
925
925
926 def magic_reset(self, parameter_s=''):
926 def magic_reset(self, parameter_s=''):
927 """Resets the namespace by removing all names defined by the user.
927 """Resets the namespace by removing all names defined by the user.
928
928
929 Input/Output history are left around in case you need them."""
929 Input/Output history are left around in case you need them."""
930
930
931 ans = raw_input(
931 ans = raw_input(
932 "Once deleted, variables cannot be recovered. Proceed (y/n)? ")
932 "Once deleted, variables cannot be recovered. Proceed (y/n)? ")
933 if not ans.lower() == 'y':
933 if not ans.lower() == 'y':
934 print 'Nothing done.'
934 print 'Nothing done.'
935 return
935 return
936 user_ns = self.shell.user_ns
936 user_ns = self.shell.user_ns
937 for i in self.magic_who_ls():
937 for i in self.magic_who_ls():
938 del(user_ns[i])
938 del(user_ns[i])
939
939
940 def magic_config(self,parameter_s=''):
940 def magic_config(self,parameter_s=''):
941 """Show IPython's internal configuration."""
941 """Show IPython's internal configuration."""
942
942
943 page('Current configuration structure:\n'+
943 page('Current configuration structure:\n'+
944 pformat(self.shell.rc.dict()))
944 pformat(self.shell.rc.dict()))
945
945
946 def magic_logstart(self,parameter_s=''):
946 def magic_logstart(self,parameter_s=''):
947 """Start logging anywhere in a session.
947 """Start logging anywhere in a session.
948
948
949 %logstart [-o|-t] [log_name [log_mode]]
949 %logstart [-o|-t] [log_name [log_mode]]
950
950
951 If no name is given, it defaults to a file named 'ipython_log.py' in your
951 If no name is given, it defaults to a file named 'ipython_log.py' in your
952 current directory, in 'rotate' mode (see below).
952 current directory, in 'rotate' mode (see below).
953
953
954 '%logstart name' saves to file 'name' in 'backup' mode. It saves your
954 '%logstart name' saves to file 'name' in 'backup' mode. It saves your
955 history up to that point and then continues logging.
955 history up to that point and then continues logging.
956
956
957 %logstart takes a second optional parameter: logging mode. This can be one
957 %logstart takes a second optional parameter: logging mode. This can be one
958 of (note that the modes are given unquoted):\\
958 of (note that the modes are given unquoted):\\
959 append: well, that says it.\\
959 append: well, that says it.\\
960 backup: rename (if exists) to name~ and start name.\\
960 backup: rename (if exists) to name~ and start name.\\
961 global: single logfile in your home dir, appended to.\\
961 global: single logfile in your home dir, appended to.\\
962 over : overwrite existing log.\\
962 over : overwrite existing log.\\
963 rotate: create rotating logs name.1~, name.2~, etc.
963 rotate: create rotating logs name.1~, name.2~, etc.
964
964
965 Options:
965 Options:
966
966
967 -o: log also IPython's output. In this mode, all commands which
967 -o: log also IPython's output. In this mode, all commands which
968 generate an Out[NN] prompt are recorded to the logfile, right after
968 generate an Out[NN] prompt are recorded to the logfile, right after
969 their corresponding input line. The output lines are always
969 their corresponding input line. The output lines are always
970 prepended with a '#[Out]# ' marker, so that the log remains valid
970 prepended with a '#[Out]# ' marker, so that the log remains valid
971 Python code.
971 Python code.
972
972
973 Since this marker is always the same, filtering only the output from
973 Since this marker is always the same, filtering only the output from
974 a log is very easy, using for example a simple awk call:
974 a log is very easy, using for example a simple awk call:
975
975
976 awk -F'#\\[Out\\]# ' '{if($2) {print $2}}' ipython_log.py
976 awk -F'#\\[Out\\]# ' '{if($2) {print $2}}' ipython_log.py
977
977
978 -t: put timestamps before each input line logged (these are put in
978 -t: put timestamps before each input line logged (these are put in
979 comments)."""
979 comments)."""
980
980
981 opts,par = self.parse_options(parameter_s,'ot')
981 opts,par = self.parse_options(parameter_s,'ot')
982 log_output = 'o' in opts
982 log_output = 'o' in opts
983 timestamp = 't' in opts
983 timestamp = 't' in opts
984
984
985 rc = self.shell.rc
985 rc = self.shell.rc
986 logger = self.shell.logger
986 logger = self.shell.logger
987
987
988 # if no args are given, the defaults set in the logger constructor by
988 # if no args are given, the defaults set in the logger constructor by
989 # ipytohn remain valid
989 # ipytohn remain valid
990 if par:
990 if par:
991 try:
991 try:
992 logfname,logmode = par.split()
992 logfname,logmode = par.split()
993 except:
993 except:
994 logfname = par
994 logfname = par
995 logmode = 'backup'
995 logmode = 'backup'
996 else:
996 else:
997 logfname = logger.logfname
997 logfname = logger.logfname
998 logmode = logger.logmode
998 logmode = logger.logmode
999 # put logfname into rc struct as if it had been called on the command
999 # put logfname into rc struct as if it had been called on the command
1000 # line, so it ends up saved in the log header Save it in case we need
1000 # line, so it ends up saved in the log header Save it in case we need
1001 # to restore it...
1001 # to restore it...
1002 old_logfile = rc.opts.get('logfile','')
1002 old_logfile = rc.opts.get('logfile','')
1003 if logfname:
1003 if logfname:
1004 logfname = os.path.expanduser(logfname)
1004 logfname = os.path.expanduser(logfname)
1005 rc.opts.logfile = logfname
1005 rc.opts.logfile = logfname
1006 loghead = self.shell.loghead_tpl % (rc.opts,rc.args)
1006 loghead = self.shell.loghead_tpl % (rc.opts,rc.args)
1007 try:
1007 try:
1008 started = logger.logstart(logfname,loghead,logmode,
1008 started = logger.logstart(logfname,loghead,logmode,
1009 log_output,timestamp)
1009 log_output,timestamp)
1010 except:
1010 except:
1011 rc.opts.logfile = old_logfile
1011 rc.opts.logfile = old_logfile
1012 warn("Couldn't start log: %s" % sys.exc_info()[1])
1012 warn("Couldn't start log: %s" % sys.exc_info()[1])
1013 else:
1013 else:
1014 # log input history up to this point, optionally interleaving
1014 # log input history up to this point, optionally interleaving
1015 # output if requested
1015 # output if requested
1016
1016
1017 if timestamp:
1017 if timestamp:
1018 # disable timestamping for the previous history, since we've
1018 # disable timestamping for the previous history, since we've
1019 # lost those already (no time machine here).
1019 # lost those already (no time machine here).
1020 logger.timestamp = False
1020 logger.timestamp = False
1021 if log_output:
1021 if log_output:
1022 log_write = logger.log_write
1022 log_write = logger.log_write
1023 input_hist = self.shell.input_hist
1023 input_hist = self.shell.input_hist
1024 output_hist = self.shell.output_hist
1024 output_hist = self.shell.output_hist
1025 for n in range(1,len(input_hist)-1):
1025 for n in range(1,len(input_hist)-1):
1026 log_write(input_hist[n].rstrip())
1026 log_write(input_hist[n].rstrip())
1027 if n in output_hist:
1027 if n in output_hist:
1028 log_write(repr(output_hist[n]),'output')
1028 log_write(repr(output_hist[n]),'output')
1029 else:
1029 else:
1030 logger.log_write(self.shell.input_hist[1:])
1030 logger.log_write(self.shell.input_hist[1:])
1031 if timestamp:
1031 if timestamp:
1032 # re-enable timestamping
1032 # re-enable timestamping
1033 logger.timestamp = True
1033 logger.timestamp = True
1034
1034
1035 print ('Activating auto-logging. '
1035 print ('Activating auto-logging. '
1036 'Current session state plus future input saved.')
1036 'Current session state plus future input saved.')
1037 logger.logstate()
1037 logger.logstate()
1038
1038
1039 def magic_logoff(self,parameter_s=''):
1039 def magic_logoff(self,parameter_s=''):
1040 """Temporarily stop logging.
1040 """Temporarily stop logging.
1041
1041
1042 You must have previously started logging."""
1042 You must have previously started logging."""
1043 self.shell.logger.switch_log(0)
1043 self.shell.logger.switch_log(0)
1044
1044
1045 def magic_logon(self,parameter_s=''):
1045 def magic_logon(self,parameter_s=''):
1046 """Restart logging.
1046 """Restart logging.
1047
1047
1048 This function is for restarting logging which you've temporarily
1048 This function is for restarting logging which you've temporarily
1049 stopped with %logoff. For starting logging for the first time, you
1049 stopped with %logoff. For starting logging for the first time, you
1050 must use the %logstart function, which allows you to specify an
1050 must use the %logstart function, which allows you to specify an
1051 optional log filename."""
1051 optional log filename."""
1052
1052
1053 self.shell.logger.switch_log(1)
1053 self.shell.logger.switch_log(1)
1054
1054
1055 def magic_logstate(self,parameter_s=''):
1055 def magic_logstate(self,parameter_s=''):
1056 """Print the status of the logging system."""
1056 """Print the status of the logging system."""
1057
1057
1058 self.shell.logger.logstate()
1058 self.shell.logger.logstate()
1059
1059
1060 def magic_pdb(self, parameter_s=''):
1060 def magic_pdb(self, parameter_s=''):
1061 """Control the calling of the pdb interactive debugger.
1061 """Control the calling of the pdb interactive debugger.
1062
1062
1063 Call as '%pdb on', '%pdb 1', '%pdb off' or '%pdb 0'. If called without
1063 Call as '%pdb on', '%pdb 1', '%pdb off' or '%pdb 0'. If called without
1064 argument it works as a toggle.
1064 argument it works as a toggle.
1065
1065
1066 When an exception is triggered, IPython can optionally call the
1066 When an exception is triggered, IPython can optionally call the
1067 interactive pdb debugger after the traceback printout. %pdb toggles
1067 interactive pdb debugger after the traceback printout. %pdb toggles
1068 this feature on and off."""
1068 this feature on and off."""
1069
1069
1070 par = parameter_s.strip().lower()
1070 par = parameter_s.strip().lower()
1071
1071
1072 if par:
1072 if par:
1073 try:
1073 try:
1074 new_pdb = {'off':0,'0':0,'on':1,'1':1}[par]
1074 new_pdb = {'off':0,'0':0,'on':1,'1':1}[par]
1075 except KeyError:
1075 except KeyError:
1076 print ('Incorrect argument. Use on/1, off/0, '
1076 print ('Incorrect argument. Use on/1, off/0, '
1077 'or nothing for a toggle.')
1077 'or nothing for a toggle.')
1078 return
1078 return
1079 else:
1079 else:
1080 # toggle
1080 # toggle
1081 new_pdb = not self.shell.InteractiveTB.call_pdb
1081 new_pdb = not self.shell.InteractiveTB.call_pdb
1082
1082
1083 # set on the shell
1083 # set on the shell
1084 self.shell.call_pdb = new_pdb
1084 self.shell.call_pdb = new_pdb
1085 print 'Automatic pdb calling has been turned',on_off(new_pdb)
1085 print 'Automatic pdb calling has been turned',on_off(new_pdb)
1086
1086
1087 def magic_prun(self, parameter_s ='',user_mode=1,
1087 def magic_prun(self, parameter_s ='',user_mode=1,
1088 opts=None,arg_lst=None,prog_ns=None):
1088 opts=None,arg_lst=None,prog_ns=None):
1089
1089
1090 """Run a statement through the python code profiler.
1090 """Run a statement through the python code profiler.
1091
1091
1092 Usage:\\
1092 Usage:\\
1093 %prun [options] statement
1093 %prun [options] statement
1094
1094
1095 The given statement (which doesn't require quote marks) is run via the
1095 The given statement (which doesn't require quote marks) is run via the
1096 python profiler in a manner similar to the profile.run() function.
1096 python profiler in a manner similar to the profile.run() function.
1097 Namespaces are internally managed to work correctly; profile.run
1097 Namespaces are internally managed to work correctly; profile.run
1098 cannot be used in IPython because it makes certain assumptions about
1098 cannot be used in IPython because it makes certain assumptions about
1099 namespaces which do not hold under IPython.
1099 namespaces which do not hold under IPython.
1100
1100
1101 Options:
1101 Options:
1102
1102
1103 -l <limit>: you can place restrictions on what or how much of the
1103 -l <limit>: you can place restrictions on what or how much of the
1104 profile gets printed. The limit value can be:
1104 profile gets printed. The limit value can be:
1105
1105
1106 * A string: only information for function names containing this string
1106 * A string: only information for function names containing this string
1107 is printed.
1107 is printed.
1108
1108
1109 * An integer: only these many lines are printed.
1109 * An integer: only these many lines are printed.
1110
1110
1111 * A float (between 0 and 1): this fraction of the report is printed
1111 * A float (between 0 and 1): this fraction of the report is printed
1112 (for example, use a limit of 0.4 to see the topmost 40% only).
1112 (for example, use a limit of 0.4 to see the topmost 40% only).
1113
1113
1114 You can combine several limits with repeated use of the option. For
1114 You can combine several limits with repeated use of the option. For
1115 example, '-l __init__ -l 5' will print only the topmost 5 lines of
1115 example, '-l __init__ -l 5' will print only the topmost 5 lines of
1116 information about class constructors.
1116 information about class constructors.
1117
1117
1118 -r: return the pstats.Stats object generated by the profiling. This
1118 -r: return the pstats.Stats object generated by the profiling. This
1119 object has all the information about the profile in it, and you can
1119 object has all the information about the profile in it, and you can
1120 later use it for further analysis or in other functions.
1120 later use it for further analysis or in other functions.
1121
1121
1122 Since magic functions have a particular form of calling which prevents
1122 Since magic functions have a particular form of calling which prevents
1123 you from writing something like:\\
1123 you from writing something like:\\
1124 In [1]: p = %prun -r print 4 # invalid!\\
1124 In [1]: p = %prun -r print 4 # invalid!\\
1125 you must instead use IPython's automatic variables to assign this:\\
1125 you must instead use IPython's automatic variables to assign this:\\
1126 In [1]: %prun -r print 4 \\
1126 In [1]: %prun -r print 4 \\
1127 Out[1]: <pstats.Stats instance at 0x8222cec>\\
1127 Out[1]: <pstats.Stats instance at 0x8222cec>\\
1128 In [2]: stats = _
1128 In [2]: stats = _
1129
1129
1130 If you really need to assign this value via an explicit function call,
1130 If you really need to assign this value via an explicit function call,
1131 you can always tap directly into the true name of the magic function
1131 you can always tap directly into the true name of the magic function
1132 by using the ipmagic function (which IPython automatically adds to the
1132 by using the ipmagic function (which IPython automatically adds to the
1133 builtins):\\
1133 builtins):\\
1134 In [3]: stats = ipmagic('prun','-r print 4')
1134 In [3]: stats = ipmagic('prun','-r print 4')
1135
1135
1136 You can type ipmagic? for more details on ipmagic.
1136 You can type ipmagic? for more details on ipmagic.
1137
1137
1138 -s <key>: sort profile by given key. You can provide more than one key
1138 -s <key>: sort profile by given key. You can provide more than one key
1139 by using the option several times: '-s key1 -s key2 -s key3...'. The
1139 by using the option several times: '-s key1 -s key2 -s key3...'. The
1140 default sorting key is 'time'.
1140 default sorting key is 'time'.
1141
1141
1142 The following is copied verbatim from the profile documentation
1142 The following is copied verbatim from the profile documentation
1143 referenced below:
1143 referenced below:
1144
1144
1145 When more than one key is provided, additional keys are used as
1145 When more than one key is provided, additional keys are used as
1146 secondary criteria when the there is equality in all keys selected
1146 secondary criteria when the there is equality in all keys selected
1147 before them.
1147 before them.
1148
1148
1149 Abbreviations can be used for any key names, as long as the
1149 Abbreviations can be used for any key names, as long as the
1150 abbreviation is unambiguous. The following are the keys currently
1150 abbreviation is unambiguous. The following are the keys currently
1151 defined:
1151 defined:
1152
1152
1153 Valid Arg Meaning\\
1153 Valid Arg Meaning\\
1154 "calls" call count\\
1154 "calls" call count\\
1155 "cumulative" cumulative time\\
1155 "cumulative" cumulative time\\
1156 "file" file name\\
1156 "file" file name\\
1157 "module" file name\\
1157 "module" file name\\
1158 "pcalls" primitive call count\\
1158 "pcalls" primitive call count\\
1159 "line" line number\\
1159 "line" line number\\
1160 "name" function name\\
1160 "name" function name\\
1161 "nfl" name/file/line\\
1161 "nfl" name/file/line\\
1162 "stdname" standard name\\
1162 "stdname" standard name\\
1163 "time" internal time
1163 "time" internal time
1164
1164
1165 Note that all sorts on statistics are in descending order (placing
1165 Note that all sorts on statistics are in descending order (placing
1166 most time consuming items first), where as name, file, and line number
1166 most time consuming items first), where as name, file, and line number
1167 searches are in ascending order (i.e., alphabetical). The subtle
1167 searches are in ascending order (i.e., alphabetical). The subtle
1168 distinction between "nfl" and "stdname" is that the standard name is a
1168 distinction between "nfl" and "stdname" is that the standard name is a
1169 sort of the name as printed, which means that the embedded line
1169 sort of the name as printed, which means that the embedded line
1170 numbers get compared in an odd way. For example, lines 3, 20, and 40
1170 numbers get compared in an odd way. For example, lines 3, 20, and 40
1171 would (if the file names were the same) appear in the string order
1171 would (if the file names were the same) appear in the string order
1172 "20" "3" and "40". In contrast, "nfl" does a numeric compare of the
1172 "20" "3" and "40". In contrast, "nfl" does a numeric compare of the
1173 line numbers. In fact, sort_stats("nfl") is the same as
1173 line numbers. In fact, sort_stats("nfl") is the same as
1174 sort_stats("name", "file", "line").
1174 sort_stats("name", "file", "line").
1175
1175
1176 -T <filename>: save profile results as shown on screen to a text
1176 -T <filename>: save profile results as shown on screen to a text
1177 file. The profile is still shown on screen.
1177 file. The profile is still shown on screen.
1178
1178
1179 -D <filename>: save (via dump_stats) profile statistics to given
1179 -D <filename>: save (via dump_stats) profile statistics to given
1180 filename. This data is in a format understod by the pstats module, and
1180 filename. This data is in a format understod by the pstats module, and
1181 is generated by a call to the dump_stats() method of profile
1181 is generated by a call to the dump_stats() method of profile
1182 objects. The profile is still shown on screen.
1182 objects. The profile is still shown on screen.
1183
1183
1184 If you want to run complete programs under the profiler's control, use
1184 If you want to run complete programs under the profiler's control, use
1185 '%run -p [prof_opts] filename.py [args to program]' where prof_opts
1185 '%run -p [prof_opts] filename.py [args to program]' where prof_opts
1186 contains profiler specific options as described here.
1186 contains profiler specific options as described here.
1187
1187
1188 You can read the complete documentation for the profile module with:\\
1188 You can read the complete documentation for the profile module with:\\
1189 In [1]: import profile; profile.help() """
1189 In [1]: import profile; profile.help() """
1190
1190
1191 opts_def = Struct(D=[''],l=[],s=['time'],T=[''])
1191 opts_def = Struct(D=[''],l=[],s=['time'],T=[''])
1192 # protect user quote marks
1192 # protect user quote marks
1193 parameter_s = parameter_s.replace('"',r'\"').replace("'",r"\'")
1193 parameter_s = parameter_s.replace('"',r'\"').replace("'",r"\'")
1194
1194
1195 if user_mode: # regular user call
1195 if user_mode: # regular user call
1196 opts,arg_str = self.parse_options(parameter_s,'D:l:rs:T:',
1196 opts,arg_str = self.parse_options(parameter_s,'D:l:rs:T:',
1197 list_all=1)
1197 list_all=1)
1198 namespace = self.shell.user_ns
1198 namespace = self.shell.user_ns
1199 else: # called to run a program by %run -p
1199 else: # called to run a program by %run -p
1200 try:
1200 try:
1201 filename = get_py_filename(arg_lst[0])
1201 filename = get_py_filename(arg_lst[0])
1202 except IOError,msg:
1202 except IOError,msg:
1203 error(msg)
1203 error(msg)
1204 return
1204 return
1205
1205
1206 arg_str = 'execfile(filename,prog_ns)'
1206 arg_str = 'execfile(filename,prog_ns)'
1207 namespace = locals()
1207 namespace = locals()
1208
1208
1209 opts.merge(opts_def)
1209 opts.merge(opts_def)
1210
1210
1211 prof = profile.Profile()
1211 prof = profile.Profile()
1212 try:
1212 try:
1213 prof = prof.runctx(arg_str,namespace,namespace)
1213 prof = prof.runctx(arg_str,namespace,namespace)
1214 sys_exit = ''
1214 sys_exit = ''
1215 except SystemExit:
1215 except SystemExit:
1216 sys_exit = """*** SystemExit exception caught in code being profiled."""
1216 sys_exit = """*** SystemExit exception caught in code being profiled."""
1217
1217
1218 stats = pstats.Stats(prof).strip_dirs().sort_stats(*opts.s)
1218 stats = pstats.Stats(prof).strip_dirs().sort_stats(*opts.s)
1219
1219
1220 lims = opts.l
1220 lims = opts.l
1221 if lims:
1221 if lims:
1222 lims = [] # rebuild lims with ints/floats/strings
1222 lims = [] # rebuild lims with ints/floats/strings
1223 for lim in opts.l:
1223 for lim in opts.l:
1224 try:
1224 try:
1225 lims.append(int(lim))
1225 lims.append(int(lim))
1226 except ValueError:
1226 except ValueError:
1227 try:
1227 try:
1228 lims.append(float(lim))
1228 lims.append(float(lim))
1229 except ValueError:
1229 except ValueError:
1230 lims.append(lim)
1230 lims.append(lim)
1231
1231
1232 # trap output
1232 # trap output
1233 sys_stdout = sys.stdout
1233 sys_stdout = sys.stdout
1234 stdout_trap = StringIO()
1234 stdout_trap = StringIO()
1235 try:
1235 try:
1236 sys.stdout = stdout_trap
1236 sys.stdout = stdout_trap
1237 stats.print_stats(*lims)
1237 stats.print_stats(*lims)
1238 finally:
1238 finally:
1239 sys.stdout = sys_stdout
1239 sys.stdout = sys_stdout
1240 output = stdout_trap.getvalue()
1240 output = stdout_trap.getvalue()
1241 output = output.rstrip()
1241 output = output.rstrip()
1242
1242
1243 page(output,screen_lines=self.shell.rc.screen_length)
1243 page(output,screen_lines=self.shell.rc.screen_length)
1244 print sys_exit,
1244 print sys_exit,
1245
1245
1246 dump_file = opts.D[0]
1246 dump_file = opts.D[0]
1247 text_file = opts.T[0]
1247 text_file = opts.T[0]
1248 if dump_file:
1248 if dump_file:
1249 prof.dump_stats(dump_file)
1249 prof.dump_stats(dump_file)
1250 print '\n*** Profile stats marshalled to file',\
1250 print '\n*** Profile stats marshalled to file',\
1251 `dump_file`+'.',sys_exit
1251 `dump_file`+'.',sys_exit
1252 if text_file:
1252 if text_file:
1253 file(text_file,'w').write(output)
1253 file(text_file,'w').write(output)
1254 print '\n*** Profile printout saved to text file',\
1254 print '\n*** Profile printout saved to text file',\
1255 `text_file`+'.',sys_exit
1255 `text_file`+'.',sys_exit
1256
1256
1257 if opts.has_key('r'):
1257 if opts.has_key('r'):
1258 return stats
1258 return stats
1259 else:
1259 else:
1260 return None
1260 return None
1261
1261
1262 def magic_run(self, parameter_s ='',runner=None):
1262 def magic_run(self, parameter_s ='',runner=None):
1263 """Run the named file inside IPython as a program.
1263 """Run the named file inside IPython as a program.
1264
1264
1265 Usage:\\
1265 Usage:\\
1266 %run [-n -i -t [-N<N>] -d [-b<N>] -p [profile options]] file [args]
1266 %run [-n -i -t [-N<N>] -d [-b<N>] -p [profile options]] file [args]
1267
1267
1268 Parameters after the filename are passed as command-line arguments to
1268 Parameters after the filename are passed as command-line arguments to
1269 the program (put in sys.argv). Then, control returns to IPython's
1269 the program (put in sys.argv). Then, control returns to IPython's
1270 prompt.
1270 prompt.
1271
1271
1272 This is similar to running at a system prompt:\\
1272 This is similar to running at a system prompt:\\
1273 $ python file args\\
1273 $ python file args\\
1274 but with the advantage of giving you IPython's tracebacks, and of
1274 but with the advantage of giving you IPython's tracebacks, and of
1275 loading all variables into your interactive namespace for further use
1275 loading all variables into your interactive namespace for further use
1276 (unless -p is used, see below).
1276 (unless -p is used, see below).
1277
1277
1278 The file is executed in a namespace initially consisting only of
1278 The file is executed in a namespace initially consisting only of
1279 __name__=='__main__' and sys.argv constructed as indicated. It thus
1279 __name__=='__main__' and sys.argv constructed as indicated. It thus
1280 sees its environment as if it were being run as a stand-alone
1280 sees its environment as if it were being run as a stand-alone
1281 program. But after execution, the IPython interactive namespace gets
1281 program. But after execution, the IPython interactive namespace gets
1282 updated with all variables defined in the program (except for __name__
1282 updated with all variables defined in the program (except for __name__
1283 and sys.argv). This allows for very convenient loading of code for
1283 and sys.argv). This allows for very convenient loading of code for
1284 interactive work, while giving each program a 'clean sheet' to run in.
1284 interactive work, while giving each program a 'clean sheet' to run in.
1285
1285
1286 Options:
1286 Options:
1287
1287
1288 -n: __name__ is NOT set to '__main__', but to the running file's name
1288 -n: __name__ is NOT set to '__main__', but to the running file's name
1289 without extension (as python does under import). This allows running
1289 without extension (as python does under import). This allows running
1290 scripts and reloading the definitions in them without calling code
1290 scripts and reloading the definitions in them without calling code
1291 protected by an ' if __name__ == "__main__" ' clause.
1291 protected by an ' if __name__ == "__main__" ' clause.
1292
1292
1293 -i: run the file in IPython's namespace instead of an empty one. This
1293 -i: run the file in IPython's namespace instead of an empty one. This
1294 is useful if you are experimenting with code written in a text editor
1294 is useful if you are experimenting with code written in a text editor
1295 which depends on variables defined interactively.
1295 which depends on variables defined interactively.
1296
1296
1297 -e: ignore sys.exit() calls or SystemExit exceptions in the script
1297 -e: ignore sys.exit() calls or SystemExit exceptions in the script
1298 being run. This is particularly useful if IPython is being used to
1298 being run. This is particularly useful if IPython is being used to
1299 run unittests, which always exit with a sys.exit() call. In such
1299 run unittests, which always exit with a sys.exit() call. In such
1300 cases you are interested in the output of the test results, not in
1300 cases you are interested in the output of the test results, not in
1301 seeing a traceback of the unittest module.
1301 seeing a traceback of the unittest module.
1302
1302
1303 -t: print timing information at the end of the run. IPython will give
1303 -t: print timing information at the end of the run. IPython will give
1304 you an estimated CPU time consumption for your script, which under
1304 you an estimated CPU time consumption for your script, which under
1305 Unix uses the resource module to avoid the wraparound problems of
1305 Unix uses the resource module to avoid the wraparound problems of
1306 time.clock(). Under Unix, an estimate of time spent on system tasks
1306 time.clock(). Under Unix, an estimate of time spent on system tasks
1307 is also given (for Windows platforms this is reported as 0.0).
1307 is also given (for Windows platforms this is reported as 0.0).
1308
1308
1309 If -t is given, an additional -N<N> option can be given, where <N>
1309 If -t is given, an additional -N<N> option can be given, where <N>
1310 must be an integer indicating how many times you want the script to
1310 must be an integer indicating how many times you want the script to
1311 run. The final timing report will include total and per run results.
1311 run. The final timing report will include total and per run results.
1312
1312
1313 For example (testing the script uniq_stable.py):
1313 For example (testing the script uniq_stable.py):
1314
1314
1315 In [1]: run -t uniq_stable
1315 In [1]: run -t uniq_stable
1316
1316
1317 IPython CPU timings (estimated):\\
1317 IPython CPU timings (estimated):\\
1318 User : 0.19597 s.\\
1318 User : 0.19597 s.\\
1319 System: 0.0 s.\\
1319 System: 0.0 s.\\
1320
1320
1321 In [2]: run -t -N5 uniq_stable
1321 In [2]: run -t -N5 uniq_stable
1322
1322
1323 IPython CPU timings (estimated):\\
1323 IPython CPU timings (estimated):\\
1324 Total runs performed: 5\\
1324 Total runs performed: 5\\
1325 Times : Total Per run\\
1325 Times : Total Per run\\
1326 User : 0.910862 s, 0.1821724 s.\\
1326 User : 0.910862 s, 0.1821724 s.\\
1327 System: 0.0 s, 0.0 s.
1327 System: 0.0 s, 0.0 s.
1328
1328
1329 -d: run your program under the control of pdb, the Python debugger.
1329 -d: run your program under the control of pdb, the Python debugger.
1330 This allows you to execute your program step by step, watch variables,
1330 This allows you to execute your program step by step, watch variables,
1331 etc. Internally, what IPython does is similar to calling:
1331 etc. Internally, what IPython does is similar to calling:
1332
1332
1333 pdb.run('execfile("YOURFILENAME")')
1333 pdb.run('execfile("YOURFILENAME")')
1334
1334
1335 with a breakpoint set on line 1 of your file. You can change the line
1335 with a breakpoint set on line 1 of your file. You can change the line
1336 number for this automatic breakpoint to be <N> by using the -bN option
1336 number for this automatic breakpoint to be <N> by using the -bN option
1337 (where N must be an integer). For example:
1337 (where N must be an integer). For example:
1338
1338
1339 %run -d -b40 myscript
1339 %run -d -b40 myscript
1340
1340
1341 will set the first breakpoint at line 40 in myscript.py. Note that
1341 will set the first breakpoint at line 40 in myscript.py. Note that
1342 the first breakpoint must be set on a line which actually does
1342 the first breakpoint must be set on a line which actually does
1343 something (not a comment or docstring) for it to stop execution.
1343 something (not a comment or docstring) for it to stop execution.
1344
1344
1345 When the pdb debugger starts, you will see a (Pdb) prompt. You must
1345 When the pdb debugger starts, you will see a (Pdb) prompt. You must
1346 first enter 'c' (without qoutes) to start execution up to the first
1346 first enter 'c' (without qoutes) to start execution up to the first
1347 breakpoint.
1347 breakpoint.
1348
1348
1349 Entering 'help' gives information about the use of the debugger. You
1349 Entering 'help' gives information about the use of the debugger. You
1350 can easily see pdb's full documentation with "import pdb;pdb.help()"
1350 can easily see pdb's full documentation with "import pdb;pdb.help()"
1351 at a prompt.
1351 at a prompt.
1352
1352
1353 -p: run program under the control of the Python profiler module (which
1353 -p: run program under the control of the Python profiler module (which
1354 prints a detailed report of execution times, function calls, etc).
1354 prints a detailed report of execution times, function calls, etc).
1355
1355
1356 You can pass other options after -p which affect the behavior of the
1356 You can pass other options after -p which affect the behavior of the
1357 profiler itself. See the docs for %prun for details.
1357 profiler itself. See the docs for %prun for details.
1358
1358
1359 In this mode, the program's variables do NOT propagate back to the
1359 In this mode, the program's variables do NOT propagate back to the
1360 IPython interactive namespace (because they remain in the namespace
1360 IPython interactive namespace (because they remain in the namespace
1361 where the profiler executes them).
1361 where the profiler executes them).
1362
1362
1363 Internally this triggers a call to %prun, see its documentation for
1363 Internally this triggers a call to %prun, see its documentation for
1364 details on the options available specifically for profiling."""
1364 details on the options available specifically for profiling."""
1365
1365
1366 # get arguments and set sys.argv for program to be run.
1366 # get arguments and set sys.argv for program to be run.
1367 opts,arg_lst = self.parse_options(parameter_s,'nidtN:b:pD:l:rs:T:e',
1367 opts,arg_lst = self.parse_options(parameter_s,'nidtN:b:pD:l:rs:T:e',
1368 mode='list',list_all=1)
1368 mode='list',list_all=1)
1369
1369
1370 try:
1370 try:
1371 filename = get_py_filename(arg_lst[0])
1371 filename = get_py_filename(arg_lst[0])
1372 except IndexError:
1372 except IndexError:
1373 warn('you must provide at least a filename.')
1373 warn('you must provide at least a filename.')
1374 print '\n%run:\n',OInspect.getdoc(self.magic_run)
1374 print '\n%run:\n',OInspect.getdoc(self.magic_run)
1375 return
1375 return
1376 except IOError,msg:
1376 except IOError,msg:
1377 error(msg)
1377 error(msg)
1378 return
1378 return
1379
1379
1380 # Control the response to exit() calls made by the script being run
1380 # Control the response to exit() calls made by the script being run
1381 exit_ignore = opts.has_key('e')
1381 exit_ignore = opts.has_key('e')
1382
1382
1383 # Make sure that the running script gets a proper sys.argv as if it
1383 # Make sure that the running script gets a proper sys.argv as if it
1384 # were run from a system shell.
1384 # were run from a system shell.
1385 save_argv = sys.argv # save it for later restoring
1385 save_argv = sys.argv # save it for later restoring
1386 sys.argv = [filename]+ arg_lst[1:] # put in the proper filename
1386 sys.argv = [filename]+ arg_lst[1:] # put in the proper filename
1387
1387
1388 if opts.has_key('i'):
1388 if opts.has_key('i'):
1389 prog_ns = self.shell.user_ns
1389 prog_ns = self.shell.user_ns
1390 __name__save = self.shell.user_ns['__name__']
1390 __name__save = self.shell.user_ns['__name__']
1391 prog_ns['__name__'] = '__main__'
1391 prog_ns['__name__'] = '__main__'
1392 else:
1392 else:
1393 if opts.has_key('n'):
1393 if opts.has_key('n'):
1394 name = os.path.splitext(os.path.basename(filename))[0]
1394 name = os.path.splitext(os.path.basename(filename))[0]
1395 else:
1395 else:
1396 name = '__main__'
1396 name = '__main__'
1397 prog_ns = {'__name__':name}
1397 prog_ns = {'__name__':name}
1398
1398
1399 # pickle fix. See iplib for an explanation. But we need to make sure
1399 # pickle fix. See iplib for an explanation. But we need to make sure
1400 # that, if we overwrite __main__, we replace it at the end
1400 # that, if we overwrite __main__, we replace it at the end
1401 if prog_ns['__name__'] == '__main__':
1401 if prog_ns['__name__'] == '__main__':
1402 restore_main = sys.modules['__main__']
1402 restore_main = sys.modules['__main__']
1403 else:
1403 else:
1404 restore_main = False
1404 restore_main = False
1405
1405
1406 sys.modules[prog_ns['__name__']] = FakeModule(prog_ns)
1406 sys.modules[prog_ns['__name__']] = FakeModule(prog_ns)
1407
1407
1408 stats = None
1408 stats = None
1409 try:
1409 try:
1410 if opts.has_key('p'):
1410 if opts.has_key('p'):
1411 stats = self.magic_prun('',0,opts,arg_lst,prog_ns)
1411 stats = self.magic_prun('',0,opts,arg_lst,prog_ns)
1412 else:
1412 else:
1413 if opts.has_key('d'):
1413 if opts.has_key('d'):
1414 deb = Debugger.Pdb(self.shell.rc.colors)
1414 deb = Debugger.Pdb(self.shell.rc.colors)
1415 # reset Breakpoint state, which is moronically kept
1415 # reset Breakpoint state, which is moronically kept
1416 # in a class
1416 # in a class
1417 bdb.Breakpoint.next = 1
1417 bdb.Breakpoint.next = 1
1418 bdb.Breakpoint.bplist = {}
1418 bdb.Breakpoint.bplist = {}
1419 bdb.Breakpoint.bpbynumber = [None]
1419 bdb.Breakpoint.bpbynumber = [None]
1420 # Set an initial breakpoint to stop execution
1420 # Set an initial breakpoint to stop execution
1421 maxtries = 10
1421 maxtries = 10
1422 bp = int(opts.get('b',[1])[0])
1422 bp = int(opts.get('b',[1])[0])
1423 checkline = deb.checkline(filename,bp)
1423 checkline = deb.checkline(filename,bp)
1424 if not checkline:
1424 if not checkline:
1425 for bp in range(bp+1,bp+maxtries+1):
1425 for bp in range(bp+1,bp+maxtries+1):
1426 if deb.checkline(filename,bp):
1426 if deb.checkline(filename,bp):
1427 break
1427 break
1428 else:
1428 else:
1429 msg = ("\nI failed to find a valid line to set "
1429 msg = ("\nI failed to find a valid line to set "
1430 "a breakpoint\n"
1430 "a breakpoint\n"
1431 "after trying up to line: %s.\n"
1431 "after trying up to line: %s.\n"
1432 "Please set a valid breakpoint manually "
1432 "Please set a valid breakpoint manually "
1433 "with the -b option." % bp)
1433 "with the -b option." % bp)
1434 error(msg)
1434 error(msg)
1435 return
1435 return
1436 # if we find a good linenumber, set the breakpoint
1436 # if we find a good linenumber, set the breakpoint
1437 deb.do_break('%s:%s' % (filename,bp))
1437 deb.do_break('%s:%s' % (filename,bp))
1438 # Start file run
1438 # Start file run
1439 print "NOTE: Enter 'c' at the",
1439 print "NOTE: Enter 'c' at the",
1440 print "ipdb> prompt to start your script."
1440 print "ipdb> prompt to start your script."
1441 try:
1441 try:
1442 deb.run('execfile("%s")' % filename,prog_ns)
1442 deb.run('execfile("%s")' % filename,prog_ns)
1443 except:
1443 except:
1444 etype, value, tb = sys.exc_info()
1444 etype, value, tb = sys.exc_info()
1445 # Skip three frames in the traceback: the %run one,
1445 # Skip three frames in the traceback: the %run one,
1446 # one inside bdb.py, and the command-line typed by the
1446 # one inside bdb.py, and the command-line typed by the
1447 # user (run by exec in pdb itself).
1447 # user (run by exec in pdb itself).
1448 self.shell.InteractiveTB(etype,value,tb,tb_offset=3)
1448 self.shell.InteractiveTB(etype,value,tb,tb_offset=3)
1449 else:
1449 else:
1450 if runner is None:
1450 if runner is None:
1451 runner = self.shell.safe_execfile
1451 runner = self.shell.safe_execfile
1452 if opts.has_key('t'):
1452 if opts.has_key('t'):
1453 try:
1453 try:
1454 nruns = int(opts['N'][0])
1454 nruns = int(opts['N'][0])
1455 if nruns < 1:
1455 if nruns < 1:
1456 error('Number of runs must be >=1')
1456 error('Number of runs must be >=1')
1457 return
1457 return
1458 except (KeyError):
1458 except (KeyError):
1459 nruns = 1
1459 nruns = 1
1460 if nruns == 1:
1460 if nruns == 1:
1461 t0 = clock2()
1461 t0 = clock2()
1462 runner(filename,prog_ns,prog_ns,exit_ignore=exit_ignore)
1462 runner(filename,prog_ns,prog_ns,exit_ignore=exit_ignore)
1463 t1 = clock2()
1463 t1 = clock2()
1464 t_usr = t1[0]-t0[0]
1464 t_usr = t1[0]-t0[0]
1465 t_sys = t1[1]-t1[1]
1465 t_sys = t1[1]-t1[1]
1466 print "\nIPython CPU timings (estimated):"
1466 print "\nIPython CPU timings (estimated):"
1467 print " User : %10s s." % t_usr
1467 print " User : %10s s." % t_usr
1468 print " System: %10s s." % t_sys
1468 print " System: %10s s." % t_sys
1469 else:
1469 else:
1470 runs = range(nruns)
1470 runs = range(nruns)
1471 t0 = clock2()
1471 t0 = clock2()
1472 for nr in runs:
1472 for nr in runs:
1473 runner(filename,prog_ns,prog_ns,exit_ignore=exit_ignore)
1473 runner(filename,prog_ns,prog_ns,exit_ignore=exit_ignore)
1474 t1 = clock2()
1474 t1 = clock2()
1475 t_usr = t1[0]-t0[0]
1475 t_usr = t1[0]-t0[0]
1476 t_sys = t1[1]-t1[1]
1476 t_sys = t1[1]-t1[1]
1477 print "\nIPython CPU timings (estimated):"
1477 print "\nIPython CPU timings (estimated):"
1478 print "Total runs performed:",nruns
1478 print "Total runs performed:",nruns
1479 print " Times : %10s %10s" % ('Total','Per run')
1479 print " Times : %10s %10s" % ('Total','Per run')
1480 print " User : %10s s, %10s s." % (t_usr,t_usr/nruns)
1480 print " User : %10s s, %10s s." % (t_usr,t_usr/nruns)
1481 print " System: %10s s, %10s s." % (t_sys,t_sys/nruns)
1481 print " System: %10s s, %10s s." % (t_sys,t_sys/nruns)
1482
1482
1483 else:
1483 else:
1484 runner(filename,prog_ns,prog_ns,exit_ignore=exit_ignore)
1484 runner(filename,prog_ns,prog_ns,exit_ignore=exit_ignore)
1485 if opts.has_key('i'):
1485 if opts.has_key('i'):
1486 self.shell.user_ns['__name__'] = __name__save
1486 self.shell.user_ns['__name__'] = __name__save
1487 else:
1487 else:
1488 # update IPython interactive namespace
1488 # update IPython interactive namespace
1489 del prog_ns['__name__']
1489 del prog_ns['__name__']
1490 self.shell.user_ns.update(prog_ns)
1490 self.shell.user_ns.update(prog_ns)
1491 finally:
1491 finally:
1492 sys.argv = save_argv
1492 sys.argv = save_argv
1493 if restore_main:
1493 if restore_main:
1494 sys.modules['__main__'] = restore_main
1494 sys.modules['__main__'] = restore_main
1495 return stats
1495 return stats
1496
1496
1497 def magic_runlog(self, parameter_s =''):
1497 def magic_runlog(self, parameter_s =''):
1498 """Run files as logs.
1498 """Run files as logs.
1499
1499
1500 Usage:\\
1500 Usage:\\
1501 %runlog file1 file2 ...
1501 %runlog file1 file2 ...
1502
1502
1503 Run the named files (treating them as log files) in sequence inside
1503 Run the named files (treating them as log files) in sequence inside
1504 the interpreter, and return to the prompt. This is much slower than
1504 the interpreter, and return to the prompt. This is much slower than
1505 %run because each line is executed in a try/except block, but it
1505 %run because each line is executed in a try/except block, but it
1506 allows running files with syntax errors in them.
1506 allows running files with syntax errors in them.
1507
1507
1508 Normally IPython will guess when a file is one of its own logfiles, so
1508 Normally IPython will guess when a file is one of its own logfiles, so
1509 you can typically use %run even for logs. This shorthand allows you to
1509 you can typically use %run even for logs. This shorthand allows you to
1510 force any file to be treated as a log file."""
1510 force any file to be treated as a log file."""
1511
1511
1512 for f in parameter_s.split():
1512 for f in parameter_s.split():
1513 self.shell.safe_execfile(f,self.shell.user_ns,
1513 self.shell.safe_execfile(f,self.shell.user_ns,
1514 self.shell.user_ns,islog=1)
1514 self.shell.user_ns,islog=1)
1515
1515
1516 def magic_time(self,parameter_s = ''):
1516 def magic_time(self,parameter_s = ''):
1517 """Time execution of a Python statement or expression.
1517 """Time execution of a Python statement or expression.
1518
1518
1519 The CPU and wall clock times are printed, and the value of the
1519 The CPU and wall clock times are printed, and the value of the
1520 expression (if any) is returned. Note that under Win32, system time
1520 expression (if any) is returned. Note that under Win32, system time
1521 is always reported as 0, since it can not be measured.
1521 is always reported as 0, since it can not be measured.
1522
1522
1523 This function provides very basic timing functionality. In Python
1523 This function provides very basic timing functionality. In Python
1524 2.3, the timeit module offers more control and sophistication, but for
1524 2.3, the timeit module offers more control and sophistication, but for
1525 now IPython supports Python 2.2, so we can not rely on timeit being
1525 now IPython supports Python 2.2, so we can not rely on timeit being
1526 present.
1526 present.
1527
1527
1528 Some examples:
1528 Some examples:
1529
1529
1530 In [1]: time 2**128
1530 In [1]: time 2**128
1531 CPU times: user 0.00 s, sys: 0.00 s, total: 0.00 s
1531 CPU times: user 0.00 s, sys: 0.00 s, total: 0.00 s
1532 Wall time: 0.00
1532 Wall time: 0.00
1533 Out[1]: 340282366920938463463374607431768211456L
1533 Out[1]: 340282366920938463463374607431768211456L
1534
1534
1535 In [2]: n = 1000000
1535 In [2]: n = 1000000
1536
1536
1537 In [3]: time sum(range(n))
1537 In [3]: time sum(range(n))
1538 CPU times: user 1.20 s, sys: 0.05 s, total: 1.25 s
1538 CPU times: user 1.20 s, sys: 0.05 s, total: 1.25 s
1539 Wall time: 1.37
1539 Wall time: 1.37
1540 Out[3]: 499999500000L
1540 Out[3]: 499999500000L
1541
1541
1542 In [4]: time print 'hello world'
1542 In [4]: time print 'hello world'
1543 hello world
1543 hello world
1544 CPU times: user 0.00 s, sys: 0.00 s, total: 0.00 s
1544 CPU times: user 0.00 s, sys: 0.00 s, total: 0.00 s
1545 Wall time: 0.00
1545 Wall time: 0.00
1546 """
1546 """
1547
1547
1548 # fail immediately if the given expression can't be compiled
1548 # fail immediately if the given expression can't be compiled
1549 try:
1549 try:
1550 mode = 'eval'
1550 mode = 'eval'
1551 code = compile(parameter_s,'<timed eval>',mode)
1551 code = compile(parameter_s,'<timed eval>',mode)
1552 except SyntaxError:
1552 except SyntaxError:
1553 mode = 'exec'
1553 mode = 'exec'
1554 code = compile(parameter_s,'<timed exec>',mode)
1554 code = compile(parameter_s,'<timed exec>',mode)
1555 # skew measurement as little as possible
1555 # skew measurement as little as possible
1556 glob = self.shell.user_ns
1556 glob = self.shell.user_ns
1557 clk = clock2
1557 clk = clock2
1558 wtime = time.time
1558 wtime = time.time
1559 # time execution
1559 # time execution
1560 wall_st = wtime()
1560 wall_st = wtime()
1561 if mode=='eval':
1561 if mode=='eval':
1562 st = clk()
1562 st = clk()
1563 out = eval(code,glob)
1563 out = eval(code,glob)
1564 end = clk()
1564 end = clk()
1565 else:
1565 else:
1566 st = clk()
1566 st = clk()
1567 exec code in glob
1567 exec code in glob
1568 end = clk()
1568 end = clk()
1569 out = None
1569 out = None
1570 wall_end = wtime()
1570 wall_end = wtime()
1571 # Compute actual times and report
1571 # Compute actual times and report
1572 wall_time = wall_end-wall_st
1572 wall_time = wall_end-wall_st
1573 cpu_user = end[0]-st[0]
1573 cpu_user = end[0]-st[0]
1574 cpu_sys = end[1]-st[1]
1574 cpu_sys = end[1]-st[1]
1575 cpu_tot = cpu_user+cpu_sys
1575 cpu_tot = cpu_user+cpu_sys
1576 print "CPU times: user %.2f s, sys: %.2f s, total: %.2f s" % \
1576 print "CPU times: user %.2f s, sys: %.2f s, total: %.2f s" % \
1577 (cpu_user,cpu_sys,cpu_tot)
1577 (cpu_user,cpu_sys,cpu_tot)
1578 print "Wall time: %.2f" % wall_time
1578 print "Wall time: %.2f" % wall_time
1579 return out
1579 return out
1580
1580
1581 def magic_macro(self,parameter_s = ''):
1581 def magic_macro(self,parameter_s = ''):
1582 """Define a set of input lines as a macro for future re-execution.
1582 """Define a set of input lines as a macro for future re-execution.
1583
1583
1584 Usage:\\
1584 Usage:\\
1585 %macro name n1-n2 n3-n4 ... n5 .. n6 ...
1585 %macro name n1-n2 n3-n4 ... n5 .. n6 ...
1586
1586
1587 This will define a global variable called `name` which is a string
1587 This will define a global variable called `name` which is a string
1588 made of joining the slices and lines you specify (n1,n2,... numbers
1588 made of joining the slices and lines you specify (n1,n2,... numbers
1589 above) from your input history into a single string. This variable
1589 above) from your input history into a single string. This variable
1590 acts like an automatic function which re-executes those lines as if
1590 acts like an automatic function which re-executes those lines as if
1591 you had typed them. You just type 'name' at the prompt and the code
1591 you had typed them. You just type 'name' at the prompt and the code
1592 executes.
1592 executes.
1593
1593
1594 The notation for indicating number ranges is: n1-n2 means 'use line
1594 The notation for indicating number ranges is: n1-n2 means 'use line
1595 numbers n1,...n2' (the endpoint is included). That is, '5-7' means
1595 numbers n1,...n2' (the endpoint is included). That is, '5-7' means
1596 using the lines numbered 5,6 and 7.
1596 using the lines numbered 5,6 and 7.
1597
1597
1598 Note: as a 'hidden' feature, you can also use traditional python slice
1598 Note: as a 'hidden' feature, you can also use traditional python slice
1599 notation, where N:M means numbers N through M-1.
1599 notation, where N:M means numbers N through M-1.
1600
1600
1601 For example, if your history contains (%hist prints it):
1601 For example, if your history contains (%hist prints it):
1602
1602
1603 44: x=1\\
1603 44: x=1\\
1604 45: y=3\\
1604 45: y=3\\
1605 46: z=x+y\\
1605 46: z=x+y\\
1606 47: print x\\
1606 47: print x\\
1607 48: a=5\\
1607 48: a=5\\
1608 49: print 'x',x,'y',y\\
1608 49: print 'x',x,'y',y\\
1609
1609
1610 you can create a macro with lines 44 through 47 (included) and line 49
1610 you can create a macro with lines 44 through 47 (included) and line 49
1611 called my_macro with:
1611 called my_macro with:
1612
1612
1613 In [51]: %macro my_macro 44-47 49
1613 In [51]: %macro my_macro 44-47 49
1614
1614
1615 Now, typing `my_macro` (without quotes) will re-execute all this code
1615 Now, typing `my_macro` (without quotes) will re-execute all this code
1616 in one pass.
1616 in one pass.
1617
1617
1618 You don't need to give the line-numbers in order, and any given line
1618 You don't need to give the line-numbers in order, and any given line
1619 number can appear multiple times. You can assemble macros with any
1619 number can appear multiple times. You can assemble macros with any
1620 lines from your input history in any order.
1620 lines from your input history in any order.
1621
1621
1622 The macro is a simple object which holds its value in an attribute,
1622 The macro is a simple object which holds its value in an attribute,
1623 but IPython's display system checks for macros and executes them as
1623 but IPython's display system checks for macros and executes them as
1624 code instead of printing them when you type their name.
1624 code instead of printing them when you type their name.
1625
1625
1626 You can view a macro's contents by explicitly printing it with:
1626 You can view a macro's contents by explicitly printing it with:
1627
1627
1628 'print macro_name'.
1628 'print macro_name'.
1629
1629
1630 For one-off cases which DON'T contain magic function calls in them you
1630 For one-off cases which DON'T contain magic function calls in them you
1631 can obtain similar results by explicitly executing slices from your
1631 can obtain similar results by explicitly executing slices from your
1632 input history with:
1632 input history with:
1633
1633
1634 In [60]: exec In[44:48]+In[49]"""
1634 In [60]: exec In[44:48]+In[49]"""
1635
1635
1636 args = parameter_s.split()
1636 args = parameter_s.split()
1637 name,ranges = args[0], args[1:]
1637 name,ranges = args[0], args[1:]
1638 #print 'rng',ranges # dbg
1638 #print 'rng',ranges # dbg
1639 lines = self.extract_input_slices(ranges)
1639 lines = self.extract_input_slices(ranges)
1640 macro = Macro(lines)
1640 macro = Macro(lines)
1641 self.shell.user_ns.update({name:macro})
1641 self.shell.user_ns.update({name:macro})
1642 print 'Macro `%s` created. To execute, type its name (without quotes).' % name
1642 print 'Macro `%s` created. To execute, type its name (without quotes).' % name
1643 print 'Macro contents:'
1643 print 'Macro contents:'
1644 print macro,
1644 print macro,
1645
1645
1646 def magic_save(self,parameter_s = ''):
1646 def magic_save(self,parameter_s = ''):
1647 """Save a set of lines to a given filename.
1647 """Save a set of lines to a given filename.
1648
1648
1649 Usage:\\
1649 Usage:\\
1650 %save filename n1-n2 n3-n4 ... n5 .. n6 ...
1650 %save filename n1-n2 n3-n4 ... n5 .. n6 ...
1651
1651
1652 This function uses the same syntax as %macro for line extraction, but
1652 This function uses the same syntax as %macro for line extraction, but
1653 instead of creating a macro it saves the resulting string to the
1653 instead of creating a macro it saves the resulting string to the
1654 filename you specify.
1654 filename you specify.
1655
1655
1656 It adds a '.py' extension to the file if you don't do so yourself, and
1656 It adds a '.py' extension to the file if you don't do so yourself, and
1657 it asks for confirmation before overwriting existing files."""
1657 it asks for confirmation before overwriting existing files."""
1658
1658
1659 args = parameter_s.split()
1659 args = parameter_s.split()
1660 fname,ranges = args[0], args[1:]
1660 fname,ranges = args[0], args[1:]
1661 if not fname.endswith('.py'):
1661 if not fname.endswith('.py'):
1662 fname += '.py'
1662 fname += '.py'
1663 if os.path.isfile(fname):
1663 if os.path.isfile(fname):
1664 ans = raw_input('File `%s` exists. Overwrite (y/[N])? ' % fname)
1664 ans = raw_input('File `%s` exists. Overwrite (y/[N])? ' % fname)
1665 if ans.lower() not in ['y','yes']:
1665 if ans.lower() not in ['y','yes']:
1666 print 'Operation cancelled.'
1666 print 'Operation cancelled.'
1667 return
1667 return
1668 cmds = ''.join(self.extract_input_slices(ranges))
1668 cmds = ''.join(self.extract_input_slices(ranges))
1669 f = file(fname,'w')
1669 f = file(fname,'w')
1670 f.write(cmds)
1670 f.write(cmds)
1671 f.close()
1671 f.close()
1672 print 'The following commands were written to file `%s`:' % fname
1672 print 'The following commands were written to file `%s`:' % fname
1673 print cmds
1673 print cmds
1674
1674
1675 def _edit_macro(self,mname,macro):
1675 def _edit_macro(self,mname,macro):
1676 """open an editor with the macro data in a file"""
1676 """open an editor with the macro data in a file"""
1677 filename = self.shell.mktempfile(macro.value)
1677 filename = self.shell.mktempfile(macro.value)
1678 self.shell.hooks.editor(filename)
1678 self.shell.hooks.editor(filename)
1679
1679
1680 # and make a new macro object, to replace the old one
1680 # and make a new macro object, to replace the old one
1681 mfile = open(filename)
1681 mfile = open(filename)
1682 mvalue = mfile.read()
1682 mvalue = mfile.read()
1683 mfile.close()
1683 mfile.close()
1684 self.shell.user_ns[mname] = Macro(mvalue)
1684 self.shell.user_ns[mname] = Macro(mvalue)
1685
1685
1686 def magic_ed(self,parameter_s=''):
1686 def magic_ed(self,parameter_s=''):
1687 """Alias to %edit."""
1687 """Alias to %edit."""
1688 return self.magic_edit(parameter_s)
1688 return self.magic_edit(parameter_s)
1689
1689
1690 def magic_edit(self,parameter_s='',last_call=['','']):
1690 def magic_edit(self,parameter_s='',last_call=['','']):
1691 """Bring up an editor and execute the resulting code.
1691 """Bring up an editor and execute the resulting code.
1692
1692
1693 Usage:
1693 Usage:
1694 %edit [options] [args]
1694 %edit [options] [args]
1695
1695
1696 %edit runs IPython's editor hook. The default version of this hook is
1696 %edit runs IPython's editor hook. The default version of this hook is
1697 set to call the __IPYTHON__.rc.editor command. This is read from your
1697 set to call the __IPYTHON__.rc.editor command. This is read from your
1698 environment variable $EDITOR. If this isn't found, it will default to
1698 environment variable $EDITOR. If this isn't found, it will default to
1699 vi under Linux/Unix and to notepad under Windows. See the end of this
1699 vi under Linux/Unix and to notepad under Windows. See the end of this
1700 docstring for how to change the editor hook.
1700 docstring for how to change the editor hook.
1701
1701
1702 You can also set the value of this editor via the command line option
1702 You can also set the value of this editor via the command line option
1703 '-editor' or in your ipythonrc file. This is useful if you wish to use
1703 '-editor' or in your ipythonrc file. This is useful if you wish to use
1704 specifically for IPython an editor different from your typical default
1704 specifically for IPython an editor different from your typical default
1705 (and for Windows users who typically don't set environment variables).
1705 (and for Windows users who typically don't set environment variables).
1706
1706
1707 This command allows you to conveniently edit multi-line code right in
1707 This command allows you to conveniently edit multi-line code right in
1708 your IPython session.
1708 your IPython session.
1709
1709
1710 If called without arguments, %edit opens up an empty editor with a
1710 If called without arguments, %edit opens up an empty editor with a
1711 temporary file and will execute the contents of this file when you
1711 temporary file and will execute the contents of this file when you
1712 close it (don't forget to save it!).
1712 close it (don't forget to save it!).
1713
1713
1714
1714
1715 Options:
1715 Options:
1716
1716
1717 -p: this will call the editor with the same data as the previous time
1717 -p: this will call the editor with the same data as the previous time
1718 it was used, regardless of how long ago (in your current session) it
1718 it was used, regardless of how long ago (in your current session) it
1719 was.
1719 was.
1720
1720
1721 -x: do not execute the edited code immediately upon exit. This is
1721 -x: do not execute the edited code immediately upon exit. This is
1722 mainly useful if you are editing programs which need to be called with
1722 mainly useful if you are editing programs which need to be called with
1723 command line arguments, which you can then do using %run.
1723 command line arguments, which you can then do using %run.
1724
1724
1725
1725
1726 Arguments:
1726 Arguments:
1727
1727
1728 If arguments are given, the following possibilites exist:
1728 If arguments are given, the following possibilites exist:
1729
1729
1730 - The arguments are numbers or pairs of colon-separated numbers (like
1730 - The arguments are numbers or pairs of colon-separated numbers (like
1731 1 4:8 9). These are interpreted as lines of previous input to be
1731 1 4:8 9). These are interpreted as lines of previous input to be
1732 loaded into the editor. The syntax is the same of the %macro command.
1732 loaded into the editor. The syntax is the same of the %macro command.
1733
1733
1734 - If the argument doesn't start with a number, it is evaluated as a
1734 - If the argument doesn't start with a number, it is evaluated as a
1735 variable and its contents loaded into the editor. You can thus edit
1735 variable and its contents loaded into the editor. You can thus edit
1736 any string which contains python code (including the result of
1736 any string which contains python code (including the result of
1737 previous edits).
1737 previous edits).
1738
1738
1739 - If the argument is the name of an object (other than a string),
1739 - If the argument is the name of an object (other than a string),
1740 IPython will try to locate the file where it was defined and open the
1740 IPython will try to locate the file where it was defined and open the
1741 editor at the point where it is defined. You can use `%edit function`
1741 editor at the point where it is defined. You can use `%edit function`
1742 to load an editor exactly at the point where 'function' is defined,
1742 to load an editor exactly at the point where 'function' is defined,
1743 edit it and have the file be executed automatically.
1743 edit it and have the file be executed automatically.
1744
1744
1745 If the object is a macro (see %macro for details), this opens up your
1745 If the object is a macro (see %macro for details), this opens up your
1746 specified editor with a temporary file containing the macro's data.
1746 specified editor with a temporary file containing the macro's data.
1747 Upon exit, the macro is reloaded with the contents of the file.
1747 Upon exit, the macro is reloaded with the contents of the file.
1748
1748
1749 Note: opening at an exact line is only supported under Unix, and some
1749 Note: opening at an exact line is only supported under Unix, and some
1750 editors (like kedit and gedit up to Gnome 2.8) do not understand the
1750 editors (like kedit and gedit up to Gnome 2.8) do not understand the
1751 '+NUMBER' parameter necessary for this feature. Good editors like
1751 '+NUMBER' parameter necessary for this feature. Good editors like
1752 (X)Emacs, vi, jed, pico and joe all do.
1752 (X)Emacs, vi, jed, pico and joe all do.
1753
1753
1754 - If the argument is not found as a variable, IPython will look for a
1754 - If the argument is not found as a variable, IPython will look for a
1755 file with that name (adding .py if necessary) and load it into the
1755 file with that name (adding .py if necessary) and load it into the
1756 editor. It will execute its contents with execfile() when you exit,
1756 editor. It will execute its contents with execfile() when you exit,
1757 loading any code in the file into your interactive namespace.
1757 loading any code in the file into your interactive namespace.
1758
1758
1759 After executing your code, %edit will return as output the code you
1759 After executing your code, %edit will return as output the code you
1760 typed in the editor (except when it was an existing file). This way
1760 typed in the editor (except when it was an existing file). This way
1761 you can reload the code in further invocations of %edit as a variable,
1761 you can reload the code in further invocations of %edit as a variable,
1762 via _<NUMBER> or Out[<NUMBER>], where <NUMBER> is the prompt number of
1762 via _<NUMBER> or Out[<NUMBER>], where <NUMBER> is the prompt number of
1763 the output.
1763 the output.
1764
1764
1765 Note that %edit is also available through the alias %ed.
1765 Note that %edit is also available through the alias %ed.
1766
1766
1767 This is an example of creating a simple function inside the editor and
1767 This is an example of creating a simple function inside the editor and
1768 then modifying it. First, start up the editor:
1768 then modifying it. First, start up the editor:
1769
1769
1770 In [1]: ed\\
1770 In [1]: ed\\
1771 Editing... done. Executing edited code...\\
1771 Editing... done. Executing edited code...\\
1772 Out[1]: 'def foo():\\n print "foo() was defined in an editing session"\\n'
1772 Out[1]: 'def foo():\\n print "foo() was defined in an editing session"\\n'
1773
1773
1774 We can then call the function foo():
1774 We can then call the function foo():
1775
1775
1776 In [2]: foo()\\
1776 In [2]: foo()\\
1777 foo() was defined in an editing session
1777 foo() was defined in an editing session
1778
1778
1779 Now we edit foo. IPython automatically loads the editor with the
1779 Now we edit foo. IPython automatically loads the editor with the
1780 (temporary) file where foo() was previously defined:
1780 (temporary) file where foo() was previously defined:
1781
1781
1782 In [3]: ed foo\\
1782 In [3]: ed foo\\
1783 Editing... done. Executing edited code...
1783 Editing... done. Executing edited code...
1784
1784
1785 And if we call foo() again we get the modified version:
1785 And if we call foo() again we get the modified version:
1786
1786
1787 In [4]: foo()\\
1787 In [4]: foo()\\
1788 foo() has now been changed!
1788 foo() has now been changed!
1789
1789
1790 Here is an example of how to edit a code snippet successive
1790 Here is an example of how to edit a code snippet successive
1791 times. First we call the editor:
1791 times. First we call the editor:
1792
1792
1793 In [8]: ed\\
1793 In [8]: ed\\
1794 Editing... done. Executing edited code...\\
1794 Editing... done. Executing edited code...\\
1795 hello\\
1795 hello\\
1796 Out[8]: "print 'hello'\\n"
1796 Out[8]: "print 'hello'\\n"
1797
1797
1798 Now we call it again with the previous output (stored in _):
1798 Now we call it again with the previous output (stored in _):
1799
1799
1800 In [9]: ed _\\
1800 In [9]: ed _\\
1801 Editing... done. Executing edited code...\\
1801 Editing... done. Executing edited code...\\
1802 hello world\\
1802 hello world\\
1803 Out[9]: "print 'hello world'\\n"
1803 Out[9]: "print 'hello world'\\n"
1804
1804
1805 Now we call it with the output #8 (stored in _8, also as Out[8]):
1805 Now we call it with the output #8 (stored in _8, also as Out[8]):
1806
1806
1807 In [10]: ed _8\\
1807 In [10]: ed _8\\
1808 Editing... done. Executing edited code...\\
1808 Editing... done. Executing edited code...\\
1809 hello again\\
1809 hello again\\
1810 Out[10]: "print 'hello again'\\n"
1810 Out[10]: "print 'hello again'\\n"
1811
1811
1812
1812
1813 Changing the default editor hook:
1813 Changing the default editor hook:
1814
1814
1815 If you wish to write your own editor hook, you can put it in a
1815 If you wish to write your own editor hook, you can put it in a
1816 configuration file which you load at startup time. The default hook
1816 configuration file which you load at startup time. The default hook
1817 is defined in the IPython.hooks module, and you can use that as a
1817 is defined in the IPython.hooks module, and you can use that as a
1818 starting example for further modifications. That file also has
1818 starting example for further modifications. That file also has
1819 general instructions on how to set a new hook for use once you've
1819 general instructions on how to set a new hook for use once you've
1820 defined it."""
1820 defined it."""
1821
1821
1822 # FIXME: This function has become a convoluted mess. It needs a
1822 # FIXME: This function has become a convoluted mess. It needs a
1823 # ground-up rewrite with clean, simple logic.
1823 # ground-up rewrite with clean, simple logic.
1824
1824
1825 def make_filename(arg):
1825 def make_filename(arg):
1826 "Make a filename from the given args"
1826 "Make a filename from the given args"
1827 try:
1827 try:
1828 filename = get_py_filename(arg)
1828 filename = get_py_filename(arg)
1829 except IOError:
1829 except IOError:
1830 if args.endswith('.py'):
1830 if args.endswith('.py'):
1831 filename = arg
1831 filename = arg
1832 else:
1832 else:
1833 filename = None
1833 filename = None
1834 return filename
1834 return filename
1835
1835
1836 # custom exceptions
1836 # custom exceptions
1837 class DataIsObject(Exception): pass
1837 class DataIsObject(Exception): pass
1838
1838
1839 opts,args = self.parse_options(parameter_s,'px')
1839 opts,args = self.parse_options(parameter_s,'px')
1840
1840
1841 # Default line number value
1841 # Default line number value
1842 lineno = None
1842 lineno = None
1843 if opts.has_key('p'):
1843 if opts.has_key('p'):
1844 args = '_%s' % last_call[0]
1844 args = '_%s' % last_call[0]
1845 if not self.shell.user_ns.has_key(args):
1845 if not self.shell.user_ns.has_key(args):
1846 args = last_call[1]
1846 args = last_call[1]
1847
1847
1848 # use last_call to remember the state of the previous call, but don't
1848 # use last_call to remember the state of the previous call, but don't
1849 # let it be clobbered by successive '-p' calls.
1849 # let it be clobbered by successive '-p' calls.
1850 try:
1850 try:
1851 last_call[0] = self.shell.outputcache.prompt_count
1851 last_call[0] = self.shell.outputcache.prompt_count
1852 if not opts.has_key('p'):
1852 if not opts.has_key('p'):
1853 last_call[1] = parameter_s
1853 last_call[1] = parameter_s
1854 except:
1854 except:
1855 pass
1855 pass
1856
1856
1857 # by default this is done with temp files, except when the given
1857 # by default this is done with temp files, except when the given
1858 # arg is a filename
1858 # arg is a filename
1859 use_temp = 1
1859 use_temp = 1
1860
1860
1861 if re.match(r'\d',args):
1861 if re.match(r'\d',args):
1862 # Mode where user specifies ranges of lines, like in %macro.
1862 # Mode where user specifies ranges of lines, like in %macro.
1863 # This means that you can't edit files whose names begin with
1863 # This means that you can't edit files whose names begin with
1864 # numbers this way. Tough.
1864 # numbers this way. Tough.
1865 ranges = args.split()
1865 ranges = args.split()
1866 data = ''.join(self.extract_input_slices(ranges))
1866 data = ''.join(self.extract_input_slices(ranges))
1867 elif args.endswith('.py'):
1867 elif args.endswith('.py'):
1868 filename = make_filename(args)
1868 filename = make_filename(args)
1869 data = ''
1869 data = ''
1870 use_temp = 0
1870 use_temp = 0
1871 elif args:
1871 elif args:
1872 try:
1872 try:
1873 # Load the parameter given as a variable. If not a string,
1873 # Load the parameter given as a variable. If not a string,
1874 # process it as an object instead (below)
1874 # process it as an object instead (below)
1875
1875
1876 #print '*** args',args,'type',type(args) # dbg
1876 #print '*** args',args,'type',type(args) # dbg
1877 data = eval(args,self.shell.user_ns)
1877 data = eval(args,self.shell.user_ns)
1878 if not type(data) in StringTypes:
1878 if not type(data) in StringTypes:
1879 raise DataIsObject
1879 raise DataIsObject
1880
1880
1881 except (NameError,SyntaxError):
1881 except (NameError,SyntaxError):
1882 # given argument is not a variable, try as a filename
1882 # given argument is not a variable, try as a filename
1883 filename = make_filename(args)
1883 filename = make_filename(args)
1884 if filename is None:
1884 if filename is None:
1885 warn("Argument given (%s) can't be found as a variable "
1885 warn("Argument given (%s) can't be found as a variable "
1886 "or as a filename." % args)
1886 "or as a filename." % args)
1887 return
1887 return
1888
1888
1889 data = ''
1889 data = ''
1890 use_temp = 0
1890 use_temp = 0
1891 except DataIsObject:
1891 except DataIsObject:
1892
1892
1893 # macros have a special edit function
1893 # macros have a special edit function
1894 if isinstance(data,Macro):
1894 if isinstance(data,Macro):
1895 self._edit_macro(args,data)
1895 self._edit_macro(args,data)
1896 return
1896 return
1897
1897
1898 # For objects, try to edit the file where they are defined
1898 # For objects, try to edit the file where they are defined
1899 try:
1899 try:
1900 filename = inspect.getabsfile(data)
1900 filename = inspect.getabsfile(data)
1901 datafile = 1
1901 datafile = 1
1902 except TypeError:
1902 except TypeError:
1903 filename = make_filename(args)
1903 filename = make_filename(args)
1904 datafile = 1
1904 datafile = 1
1905 warn('Could not find file where `%s` is defined.\n'
1905 warn('Could not find file where `%s` is defined.\n'
1906 'Opening a file named `%s`' % (args,filename))
1906 'Opening a file named `%s`' % (args,filename))
1907 # Now, make sure we can actually read the source (if it was in
1907 # Now, make sure we can actually read the source (if it was in
1908 # a temp file it's gone by now).
1908 # a temp file it's gone by now).
1909 if datafile:
1909 if datafile:
1910 try:
1910 try:
1911 lineno = inspect.getsourcelines(data)[1]
1911 lineno = inspect.getsourcelines(data)[1]
1912 except IOError:
1912 except IOError:
1913 filename = make_filename(args)
1913 filename = make_filename(args)
1914 if filename is None:
1914 if filename is None:
1915 warn('The file `%s` where `%s` was defined cannot '
1915 warn('The file `%s` where `%s` was defined cannot '
1916 'be read.' % (filename,data))
1916 'be read.' % (filename,data))
1917 return
1917 return
1918 use_temp = 0
1918 use_temp = 0
1919 else:
1919 else:
1920 data = ''
1920 data = ''
1921
1921
1922 if use_temp:
1922 if use_temp:
1923 filename = self.shell.mktempfile(data)
1923 filename = self.shell.mktempfile(data)
1924 print 'IPython will make a temporary file named:',filename
1924 print 'IPython will make a temporary file named:',filename
1925
1925
1926 # do actual editing here
1926 # do actual editing here
1927 print 'Editing...',
1927 print 'Editing...',
1928 sys.stdout.flush()
1928 sys.stdout.flush()
1929 self.shell.hooks.editor(filename,lineno)
1929 self.shell.hooks.editor(filename,lineno)
1930 if opts.has_key('x'): # -x prevents actual execution
1930 if opts.has_key('x'): # -x prevents actual execution
1931 print
1931 print
1932 else:
1932 else:
1933 print 'done. Executing edited code...'
1933 print 'done. Executing edited code...'
1934 try:
1934 try:
1935 self.shell.safe_execfile(filename,self.shell.user_ns)
1935 self.shell.safe_execfile(filename,self.shell.user_ns)
1936 except IOError,msg:
1936 except IOError,msg:
1937 if msg.filename == filename:
1937 if msg.filename == filename:
1938 warn('File not found. Did you forget to save?')
1938 warn('File not found. Did you forget to save?')
1939 return
1939 return
1940 else:
1940 else:
1941 self.shell.showtraceback()
1941 self.shell.showtraceback()
1942 except:
1942 except:
1943 self.shell.showtraceback()
1943 self.shell.showtraceback()
1944
1944
1945 def magic_xmode(self,parameter_s = ''):
1945 def magic_xmode(self,parameter_s = ''):
1946 """Switch modes for the exception handlers.
1946 """Switch modes for the exception handlers.
1947
1947
1948 Valid modes: Plain, Context and Verbose.
1948 Valid modes: Plain, Context and Verbose.
1949
1949
1950 If called without arguments, acts as a toggle."""
1950 If called without arguments, acts as a toggle."""
1951
1951
1952 def xmode_switch_err(name):
1952 def xmode_switch_err(name):
1953 warn('Error changing %s exception modes.\n%s' %
1953 warn('Error changing %s exception modes.\n%s' %
1954 (name,sys.exc_info()[1]))
1954 (name,sys.exc_info()[1]))
1955
1955
1956 shell = self.shell
1956 shell = self.shell
1957 new_mode = parameter_s.strip().capitalize()
1957 new_mode = parameter_s.strip().capitalize()
1958 try:
1958 try:
1959 shell.InteractiveTB.set_mode(mode=new_mode)
1959 shell.InteractiveTB.set_mode(mode=new_mode)
1960 print 'Exception reporting mode:',shell.InteractiveTB.mode
1960 print 'Exception reporting mode:',shell.InteractiveTB.mode
1961 except:
1961 except:
1962 xmode_switch_err('user')
1962 xmode_switch_err('user')
1963
1963
1964 # threaded shells use a special handler in sys.excepthook
1964 # threaded shells use a special handler in sys.excepthook
1965 if shell.isthreaded:
1965 if shell.isthreaded:
1966 try:
1966 try:
1967 shell.sys_excepthook.set_mode(mode=new_mode)
1967 shell.sys_excepthook.set_mode(mode=new_mode)
1968 except:
1968 except:
1969 xmode_switch_err('threaded')
1969 xmode_switch_err('threaded')
1970
1970
1971 def magic_colors(self,parameter_s = ''):
1971 def magic_colors(self,parameter_s = ''):
1972 """Switch color scheme for prompts, info system and exception handlers.
1972 """Switch color scheme for prompts, info system and exception handlers.
1973
1973
1974 Currently implemented schemes: NoColor, Linux, LightBG.
1974 Currently implemented schemes: NoColor, Linux, LightBG.
1975
1975
1976 Color scheme names are not case-sensitive."""
1976 Color scheme names are not case-sensitive."""
1977
1977
1978 def color_switch_err(name):
1978 def color_switch_err(name):
1979 warn('Error changing %s color schemes.\n%s' %
1979 warn('Error changing %s color schemes.\n%s' %
1980 (name,sys.exc_info()[1]))
1980 (name,sys.exc_info()[1]))
1981
1981
1982
1982
1983 new_scheme = parameter_s.strip()
1983 new_scheme = parameter_s.strip()
1984 if not new_scheme:
1984 if not new_scheme:
1985 print 'You must specify a color scheme.'
1985 print 'You must specify a color scheme.'
1986 return
1986 return
1987 # Under Windows, check for Gary Bishop's readline, which is necessary
1987 # Under Windows, check for Gary Bishop's readline, which is necessary
1988 # for ANSI coloring
1988 # for ANSI coloring
1989 if os.name in ['nt','dos']:
1989 if os.name in ['nt','dos']:
1990 try:
1990 try:
1991 import readline
1991 import readline
1992 except ImportError:
1992 except ImportError:
1993 has_readline = 0
1993 has_readline = 0
1994 else:
1994 else:
1995 try:
1995 try:
1996 readline.GetOutputFile()
1996 readline.GetOutputFile()
1997 except AttributeError:
1997 except AttributeError:
1998 has_readline = 0
1998 has_readline = 0
1999 else:
1999 else:
2000 has_readline = 1
2000 has_readline = 1
2001 if not has_readline:
2001 if not has_readline:
2002 msg = """\
2002 msg = """\
2003 Proper color support under MS Windows requires Gary Bishop's readline library.
2003 Proper color support under MS Windows requires Gary Bishop's readline library.
2004 You can find it at:
2004 You can find it at:
2005 http://sourceforge.net/projects/uncpythontools
2005 http://sourceforge.net/projects/uncpythontools
2006 Gary's readline needs the ctypes module, from:
2006 Gary's readline needs the ctypes module, from:
2007 http://starship.python.net/crew/theller/ctypes
2007 http://starship.python.net/crew/theller/ctypes
2008
2008
2009 Defaulting color scheme to 'NoColor'"""
2009 Defaulting color scheme to 'NoColor'"""
2010 new_scheme = 'NoColor'
2010 new_scheme = 'NoColor'
2011 warn(msg)
2011 warn(msg)
2012 # local shortcut
2012 # local shortcut
2013 shell = self.shell
2013 shell = self.shell
2014
2014
2015 # Set prompt colors
2015 # Set prompt colors
2016 try:
2016 try:
2017 shell.outputcache.set_colors(new_scheme)
2017 shell.outputcache.set_colors(new_scheme)
2018 except:
2018 except:
2019 color_switch_err('prompt')
2019 color_switch_err('prompt')
2020 else:
2020 else:
2021 shell.rc.colors = \
2021 shell.rc.colors = \
2022 shell.outputcache.color_table.active_scheme_name
2022 shell.outputcache.color_table.active_scheme_name
2023 # Set exception colors
2023 # Set exception colors
2024 try:
2024 try:
2025 shell.InteractiveTB.set_colors(scheme = new_scheme)
2025 shell.InteractiveTB.set_colors(scheme = new_scheme)
2026 shell.SyntaxTB.set_colors(scheme = new_scheme)
2026 shell.SyntaxTB.set_colors(scheme = new_scheme)
2027 except:
2027 except:
2028 color_switch_err('exception')
2028 color_switch_err('exception')
2029
2029
2030 # threaded shells use a verbose traceback in sys.excepthook
2030 # threaded shells use a verbose traceback in sys.excepthook
2031 if shell.isthreaded:
2031 if shell.isthreaded:
2032 try:
2032 try:
2033 shell.sys_excepthook.set_colors(scheme=new_scheme)
2033 shell.sys_excepthook.set_colors(scheme=new_scheme)
2034 except:
2034 except:
2035 color_switch_err('system exception handler')
2035 color_switch_err('system exception handler')
2036
2036
2037 # Set info (for 'object?') colors
2037 # Set info (for 'object?') colors
2038 if shell.rc.color_info:
2038 if shell.rc.color_info:
2039 try:
2039 try:
2040 shell.inspector.set_active_scheme(new_scheme)
2040 shell.inspector.set_active_scheme(new_scheme)
2041 except:
2041 except:
2042 color_switch_err('object inspector')
2042 color_switch_err('object inspector')
2043 else:
2043 else:
2044 shell.inspector.set_active_scheme('NoColor')
2044 shell.inspector.set_active_scheme('NoColor')
2045
2045
2046 def magic_color_info(self,parameter_s = ''):
2046 def magic_color_info(self,parameter_s = ''):
2047 """Toggle color_info.
2047 """Toggle color_info.
2048
2048
2049 The color_info configuration parameter controls whether colors are
2049 The color_info configuration parameter controls whether colors are
2050 used for displaying object details (by things like %psource, %pfile or
2050 used for displaying object details (by things like %psource, %pfile or
2051 the '?' system). This function toggles this value with each call.
2051 the '?' system). This function toggles this value with each call.
2052
2052
2053 Note that unless you have a fairly recent pager (less works better
2053 Note that unless you have a fairly recent pager (less works better
2054 than more) in your system, using colored object information displays
2054 than more) in your system, using colored object information displays
2055 will not work properly. Test it and see."""
2055 will not work properly. Test it and see."""
2056
2056
2057 self.shell.rc.color_info = 1 - self.shell.rc.color_info
2057 self.shell.rc.color_info = 1 - self.shell.rc.color_info
2058 self.magic_colors(self.shell.rc.colors)
2058 self.magic_colors(self.shell.rc.colors)
2059 print 'Object introspection functions have now coloring:',
2059 print 'Object introspection functions have now coloring:',
2060 print ['OFF','ON'][self.shell.rc.color_info]
2060 print ['OFF','ON'][self.shell.rc.color_info]
2061
2061
2062 def magic_Pprint(self, parameter_s=''):
2062 def magic_Pprint(self, parameter_s=''):
2063 """Toggle pretty printing on/off."""
2063 """Toggle pretty printing on/off."""
2064
2064
2065 self.shell.outputcache.Pprint = 1 - self.shell.outputcache.Pprint
2065 self.shell.outputcache.Pprint = 1 - self.shell.outputcache.Pprint
2066 print 'Pretty printing has been turned', \
2066 print 'Pretty printing has been turned', \
2067 ['OFF','ON'][self.shell.outputcache.Pprint]
2067 ['OFF','ON'][self.shell.outputcache.Pprint]
2068
2068
2069 def magic_exit(self, parameter_s=''):
2069 def magic_exit(self, parameter_s=''):
2070 """Exit IPython, confirming if configured to do so.
2070 """Exit IPython, confirming if configured to do so.
2071
2071
2072 You can configure whether IPython asks for confirmation upon exit by
2072 You can configure whether IPython asks for confirmation upon exit by
2073 setting the confirm_exit flag in the ipythonrc file."""
2073 setting the confirm_exit flag in the ipythonrc file."""
2074
2074
2075 self.shell.exit()
2075 self.shell.exit()
2076
2076
2077 def magic_quit(self, parameter_s=''):
2077 def magic_quit(self, parameter_s=''):
2078 """Exit IPython, confirming if configured to do so (like %exit)"""
2078 """Exit IPython, confirming if configured to do so (like %exit)"""
2079
2079
2080 self.shell.exit()
2080 self.shell.exit()
2081
2081
2082 def magic_Exit(self, parameter_s=''):
2082 def magic_Exit(self, parameter_s=''):
2083 """Exit IPython without confirmation."""
2083 """Exit IPython without confirmation."""
2084
2084
2085 self.shell.exit_now = True
2085 self.shell.exit_now = True
2086
2086
2087 def magic_Quit(self, parameter_s=''):
2087 def magic_Quit(self, parameter_s=''):
2088 """Exit IPython without confirmation (like %Exit)."""
2088 """Exit IPython without confirmation (like %Exit)."""
2089
2089
2090 self.shell.exit_now = True
2090 self.shell.exit_now = True
2091
2091
2092 #......................................................................
2092 #......................................................................
2093 # Functions to implement unix shell-type things
2093 # Functions to implement unix shell-type things
2094
2094
2095 def magic_alias(self, parameter_s = ''):
2095 def magic_alias(self, parameter_s = ''):
2096 """Define an alias for a system command.
2096 """Define an alias for a system command.
2097
2097
2098 '%alias alias_name cmd' defines 'alias_name' as an alias for 'cmd'
2098 '%alias alias_name cmd' defines 'alias_name' as an alias for 'cmd'
2099
2099
2100 Then, typing 'alias_name params' will execute the system command 'cmd
2100 Then, typing 'alias_name params' will execute the system command 'cmd
2101 params' (from your underlying operating system).
2101 params' (from your underlying operating system).
2102
2102
2103 Aliases have lower precedence than magic functions and Python normal
2103 Aliases have lower precedence than magic functions and Python normal
2104 variables, so if 'foo' is both a Python variable and an alias, the
2104 variables, so if 'foo' is both a Python variable and an alias, the
2105 alias can not be executed until 'del foo' removes the Python variable.
2105 alias can not be executed until 'del foo' removes the Python variable.
2106
2106
2107 You can use the %l specifier in an alias definition to represent the
2107 You can use the %l specifier in an alias definition to represent the
2108 whole line when the alias is called. For example:
2108 whole line when the alias is called. For example:
2109
2109
2110 In [2]: alias all echo "Input in brackets: <%l>"\\
2110 In [2]: alias all echo "Input in brackets: <%l>"\\
2111 In [3]: all hello world\\
2111 In [3]: all hello world\\
2112 Input in brackets: <hello world>
2112 Input in brackets: <hello world>
2113
2113
2114 You can also define aliases with parameters using %s specifiers (one
2114 You can also define aliases with parameters using %s specifiers (one
2115 per parameter):
2115 per parameter):
2116
2116
2117 In [1]: alias parts echo first %s second %s\\
2117 In [1]: alias parts echo first %s second %s\\
2118 In [2]: %parts A B\\
2118 In [2]: %parts A B\\
2119 first A second B\\
2119 first A second B\\
2120 In [3]: %parts A\\
2120 In [3]: %parts A\\
2121 Incorrect number of arguments: 2 expected.\\
2121 Incorrect number of arguments: 2 expected.\\
2122 parts is an alias to: 'echo first %s second %s'
2122 parts is an alias to: 'echo first %s second %s'
2123
2123
2124 Note that %l and %s are mutually exclusive. You can only use one or
2124 Note that %l and %s are mutually exclusive. You can only use one or
2125 the other in your aliases.
2125 the other in your aliases.
2126
2126
2127 Aliases expand Python variables just like system calls using ! or !!
2127 Aliases expand Python variables just like system calls using ! or !!
2128 do: all expressions prefixed with '$' get expanded. For details of
2128 do: all expressions prefixed with '$' get expanded. For details of
2129 the semantic rules, see PEP-215:
2129 the semantic rules, see PEP-215:
2130 http://www.python.org/peps/pep-0215.html. This is the library used by
2130 http://www.python.org/peps/pep-0215.html. This is the library used by
2131 IPython for variable expansion. If you want to access a true shell
2131 IPython for variable expansion. If you want to access a true shell
2132 variable, an extra $ is necessary to prevent its expansion by IPython:
2132 variable, an extra $ is necessary to prevent its expansion by IPython:
2133
2133
2134 In [6]: alias show echo\\
2134 In [6]: alias show echo\\
2135 In [7]: PATH='A Python string'\\
2135 In [7]: PATH='A Python string'\\
2136 In [8]: show $PATH\\
2136 In [8]: show $PATH\\
2137 A Python string\\
2137 A Python string\\
2138 In [9]: show $$PATH\\
2138 In [9]: show $$PATH\\
2139 /usr/local/lf9560/bin:/usr/local/intel/compiler70/ia32/bin:...
2139 /usr/local/lf9560/bin:/usr/local/intel/compiler70/ia32/bin:...
2140
2140
2141 You can use the alias facility to acess all of $PATH. See the %rehash
2141 You can use the alias facility to acess all of $PATH. See the %rehash
2142 and %rehashx functions, which automatically create aliases for the
2142 and %rehashx functions, which automatically create aliases for the
2143 contents of your $PATH.
2143 contents of your $PATH.
2144
2144
2145 If called with no parameters, %alias prints the current alias table."""
2145 If called with no parameters, %alias prints the current alias table."""
2146
2146
2147 par = parameter_s.strip()
2147 par = parameter_s.strip()
2148 if not par:
2148 if not par:
2149 if self.shell.rc.automagic:
2149 if self.shell.rc.automagic:
2150 prechar = ''
2150 prechar = ''
2151 else:
2151 else:
2152 prechar = self.shell.ESC_MAGIC
2152 prechar = self.shell.ESC_MAGIC
2153 print 'Alias\t\tSystem Command\n'+'-'*30
2153 print 'Alias\t\tSystem Command\n'+'-'*30
2154 atab = self.shell.alias_table
2154 atab = self.shell.alias_table
2155 aliases = atab.keys()
2155 aliases = atab.keys()
2156 aliases.sort()
2156 aliases.sort()
2157 for alias in aliases:
2157 for alias in aliases:
2158 print prechar+alias+'\t\t'+atab[alias][1]
2158 print prechar+alias+'\t\t'+atab[alias][1]
2159 print '-'*30+'\nTotal number of aliases:',len(aliases)
2159 print '-'*30+'\nTotal number of aliases:',len(aliases)
2160 return
2160 return
2161 try:
2161 try:
2162 alias,cmd = par.split(None,1)
2162 alias,cmd = par.split(None,1)
2163 except:
2163 except:
2164 print OInspect.getdoc(self.magic_alias)
2164 print OInspect.getdoc(self.magic_alias)
2165 else:
2165 else:
2166 nargs = cmd.count('%s')
2166 nargs = cmd.count('%s')
2167 if nargs>0 and cmd.find('%l')>=0:
2167 if nargs>0 and cmd.find('%l')>=0:
2168 error('The %s and %l specifiers are mutually exclusive '
2168 error('The %s and %l specifiers are mutually exclusive '
2169 'in alias definitions.')
2169 'in alias definitions.')
2170 else: # all looks OK
2170 else: # all looks OK
2171 self.shell.alias_table[alias] = (nargs,cmd)
2171 self.shell.alias_table[alias] = (nargs,cmd)
2172 self.shell.alias_table_validate(verbose=1)
2172 self.shell.alias_table_validate(verbose=1)
2173 # end magic_alias
2173 # end magic_alias
2174
2174
2175 def magic_unalias(self, parameter_s = ''):
2175 def magic_unalias(self, parameter_s = ''):
2176 """Remove an alias"""
2176 """Remove an alias"""
2177
2177
2178 aname = parameter_s.strip()
2178 aname = parameter_s.strip()
2179 if aname in self.shell.alias_table:
2179 if aname in self.shell.alias_table:
2180 del self.shell.alias_table[aname]
2180 del self.shell.alias_table[aname]
2181
2181
2182 def magic_rehash(self, parameter_s = ''):
2182 def magic_rehash(self, parameter_s = ''):
2183 """Update the alias table with all entries in $PATH.
2183 """Update the alias table with all entries in $PATH.
2184
2184
2185 This version does no checks on execute permissions or whether the
2185 This version does no checks on execute permissions or whether the
2186 contents of $PATH are truly files (instead of directories or something
2186 contents of $PATH are truly files (instead of directories or something
2187 else). For such a safer (but slower) version, use %rehashx."""
2187 else). For such a safer (but slower) version, use %rehashx."""
2188
2188
2189 # This function (and rehashx) manipulate the alias_table directly
2189 # This function (and rehashx) manipulate the alias_table directly
2190 # rather than calling magic_alias, for speed reasons. A rehash on a
2190 # rather than calling magic_alias, for speed reasons. A rehash on a
2191 # typical Linux box involves several thousand entries, so efficiency
2191 # typical Linux box involves several thousand entries, so efficiency
2192 # here is a top concern.
2192 # here is a top concern.
2193
2193
2194 path = filter(os.path.isdir,os.environ['PATH'].split(os.pathsep))
2194 path = filter(os.path.isdir,os.environ['PATH'].split(os.pathsep))
2195 alias_table = self.shell.alias_table
2195 alias_table = self.shell.alias_table
2196 for pdir in path:
2196 for pdir in path:
2197 for ff in os.listdir(pdir):
2197 for ff in os.listdir(pdir):
2198 # each entry in the alias table must be (N,name), where
2198 # each entry in the alias table must be (N,name), where
2199 # N is the number of positional arguments of the alias.
2199 # N is the number of positional arguments of the alias.
2200 alias_table[ff] = (0,ff)
2200 alias_table[ff] = (0,ff)
2201 # Make sure the alias table doesn't contain keywords or builtins
2201 # Make sure the alias table doesn't contain keywords or builtins
2202 self.shell.alias_table_validate()
2202 self.shell.alias_table_validate()
2203 # Call again init_auto_alias() so we get 'rm -i' and other modified
2203 # Call again init_auto_alias() so we get 'rm -i' and other modified
2204 # aliases since %rehash will probably clobber them
2204 # aliases since %rehash will probably clobber them
2205 self.shell.init_auto_alias()
2205 self.shell.init_auto_alias()
2206
2206
2207 def magic_rehashx(self, parameter_s = ''):
2207 def magic_rehashx(self, parameter_s = ''):
2208 """Update the alias table with all executable files in $PATH.
2208 """Update the alias table with all executable files in $PATH.
2209
2209
2210 This version explicitly checks that every entry in $PATH is a file
2210 This version explicitly checks that every entry in $PATH is a file
2211 with execute access (os.X_OK), so it is much slower than %rehash.
2211 with execute access (os.X_OK), so it is much slower than %rehash.
2212
2212
2213 Under Windows, it checks executability as a match agains a
2213 Under Windows, it checks executability as a match agains a
2214 '|'-separated string of extensions, stored in the IPython config
2214 '|'-separated string of extensions, stored in the IPython config
2215 variable win_exec_ext. This defaults to 'exe|com|bat'. """
2215 variable win_exec_ext. This defaults to 'exe|com|bat'. """
2216
2216
2217 path = filter(os.path.isdir,os.environ['PATH'].split(os.pathsep))
2217 path = filter(os.path.isdir,os.environ['PATH'].split(os.pathsep))
2218 alias_table = self.shell.alias_table
2218 alias_table = self.shell.alias_table
2219
2219
2220 if os.name == 'posix':
2220 if os.name == 'posix':
2221 isexec = lambda fname:os.path.isfile(fname) and \
2221 isexec = lambda fname:os.path.isfile(fname) and \
2222 os.access(fname,os.X_OK)
2222 os.access(fname,os.X_OK)
2223 else:
2223 else:
2224
2224
2225 try:
2225 try:
2226 winext = os.environ['pathext'].replace(';','|').replace('.','')
2226 winext = os.environ['pathext'].replace(';','|').replace('.','')
2227 except KeyError:
2227 except KeyError:
2228 winext = 'exe|com|bat'
2228 winext = 'exe|com|bat'
2229
2229
2230 execre = re.compile(r'(.*)\.(%s)$' % winext,re.IGNORECASE)
2230 execre = re.compile(r'(.*)\.(%s)$' % winext,re.IGNORECASE)
2231 isexec = lambda fname:os.path.isfile(fname) and execre.match(fname)
2231 isexec = lambda fname:os.path.isfile(fname) and execre.match(fname)
2232 savedir = os.getcwd()
2232 savedir = os.getcwd()
2233 try:
2233 try:
2234 # write the whole loop for posix/Windows so we don't have an if in
2234 # write the whole loop for posix/Windows so we don't have an if in
2235 # the innermost part
2235 # the innermost part
2236 if os.name == 'posix':
2236 if os.name == 'posix':
2237 for pdir in path:
2237 for pdir in path:
2238 os.chdir(pdir)
2238 os.chdir(pdir)
2239 for ff in os.listdir(pdir):
2239 for ff in os.listdir(pdir):
2240 if isexec(ff):
2240 if isexec(ff):
2241 # each entry in the alias table must be (N,name),
2241 # each entry in the alias table must be (N,name),
2242 # where N is the number of positional arguments of the
2242 # where N is the number of positional arguments of the
2243 # alias.
2243 # alias.
2244 alias_table[ff] = (0,ff)
2244 alias_table[ff] = (0,ff)
2245 else:
2245 else:
2246 for pdir in path:
2246 for pdir in path:
2247 os.chdir(pdir)
2247 os.chdir(pdir)
2248 for ff in os.listdir(pdir):
2248 for ff in os.listdir(pdir):
2249 if isexec(ff):
2249 if isexec(ff):
2250 alias_table[execre.sub(r'\1',ff)] = (0,ff)
2250 alias_table[execre.sub(r'\1',ff)] = (0,ff)
2251 # Make sure the alias table doesn't contain keywords or builtins
2251 # Make sure the alias table doesn't contain keywords or builtins
2252 self.shell.alias_table_validate()
2252 self.shell.alias_table_validate()
2253 # Call again init_auto_alias() so we get 'rm -i' and other
2253 # Call again init_auto_alias() so we get 'rm -i' and other
2254 # modified aliases since %rehashx will probably clobber them
2254 # modified aliases since %rehashx will probably clobber them
2255 self.shell.init_auto_alias()
2255 self.shell.init_auto_alias()
2256 finally:
2256 finally:
2257 os.chdir(savedir)
2257 os.chdir(savedir)
2258
2258
2259 def magic_pwd(self, parameter_s = ''):
2259 def magic_pwd(self, parameter_s = ''):
2260 """Return the current working directory path."""
2260 """Return the current working directory path."""
2261 return os.getcwd()
2261 return os.getcwd()
2262
2262
2263 def magic_cd(self, parameter_s=''):
2263 def magic_cd(self, parameter_s=''):
2264 """Change the current working directory.
2264 """Change the current working directory.
2265
2265
2266 This command automatically maintains an internal list of directories
2266 This command automatically maintains an internal list of directories
2267 you visit during your IPython session, in the variable _dh. The
2267 you visit during your IPython session, in the variable _dh. The
2268 command %dhist shows this history nicely formatted.
2268 command %dhist shows this history nicely formatted.
2269
2269
2270 Usage:
2270 Usage:
2271
2271
2272 cd 'dir': changes to directory 'dir'.
2272 cd 'dir': changes to directory 'dir'.
2273
2273
2274 cd -: changes to the last visited directory.
2274 cd -: changes to the last visited directory.
2275
2275
2276 cd -<n>: changes to the n-th directory in the directory history.
2276 cd -<n>: changes to the n-th directory in the directory history.
2277
2277
2278 cd -b <bookmark_name>: jump to a bookmark set by %bookmark
2278 cd -b <bookmark_name>: jump to a bookmark set by %bookmark
2279 (note: cd <bookmark_name> is enough if there is no
2279 (note: cd <bookmark_name> is enough if there is no
2280 directory <bookmark_name>, but a bookmark with the name exists.)
2280 directory <bookmark_name>, but a bookmark with the name exists.)
2281
2281
2282 Options:
2282 Options:
2283
2283
2284 -q: quiet. Do not print the working directory after the cd command is
2284 -q: quiet. Do not print the working directory after the cd command is
2285 executed. By default IPython's cd command does print this directory,
2285 executed. By default IPython's cd command does print this directory,
2286 since the default prompts do not display path information.
2286 since the default prompts do not display path information.
2287
2287
2288 Note that !cd doesn't work for this purpose because the shell where
2288 Note that !cd doesn't work for this purpose because the shell where
2289 !command runs is immediately discarded after executing 'command'."""
2289 !command runs is immediately discarded after executing 'command'."""
2290
2290
2291 parameter_s = parameter_s.strip()
2291 parameter_s = parameter_s.strip()
2292 bkms = self.shell.persist.get("bookmarks",{})
2292 bkms = self.shell.persist.get("bookmarks",{})
2293
2293
2294 numcd = re.match(r'(-)(\d+)$',parameter_s)
2294 numcd = re.match(r'(-)(\d+)$',parameter_s)
2295 # jump in directory history by number
2295 # jump in directory history by number
2296 if numcd:
2296 if numcd:
2297 nn = int(numcd.group(2))
2297 nn = int(numcd.group(2))
2298 try:
2298 try:
2299 ps = self.shell.user_ns['_dh'][nn]
2299 ps = self.shell.user_ns['_dh'][nn]
2300 except IndexError:
2300 except IndexError:
2301 print 'The requested directory does not exist in history.'
2301 print 'The requested directory does not exist in history.'
2302 return
2302 return
2303 else:
2303 else:
2304 opts = {}
2304 opts = {}
2305 else:
2305 else:
2306 opts,ps = self.parse_options(parameter_s,'qb',mode='string')
2306 opts,ps = self.parse_options(parameter_s,'qb',mode='string')
2307 # jump to previous
2307 # jump to previous
2308 if ps == '-':
2308 if ps == '-':
2309 try:
2309 try:
2310 ps = self.shell.user_ns['_dh'][-2]
2310 ps = self.shell.user_ns['_dh'][-2]
2311 except IndexError:
2311 except IndexError:
2312 print 'No previous directory to change to.'
2312 print 'No previous directory to change to.'
2313 return
2313 return
2314 # jump to bookmark
2314 # jump to bookmark
2315 elif opts.has_key('b') or (bkms.has_key(ps) and not os.path.isdir(ps)):
2315 elif opts.has_key('b') or (bkms.has_key(ps) and not os.path.isdir(ps)):
2316 if bkms.has_key(ps):
2316 if bkms.has_key(ps):
2317 target = bkms[ps]
2317 target = bkms[ps]
2318 print '(bookmark:%s) -> %s' % (ps,target)
2318 print '(bookmark:%s) -> %s' % (ps,target)
2319 ps = target
2319 ps = target
2320 else:
2320 else:
2321 if bkms:
2321 if bkms:
2322 error("Bookmark '%s' not found. "
2322 error("Bookmark '%s' not found. "
2323 "Use '%%bookmark -l' to see your bookmarks." % ps)
2323 "Use '%%bookmark -l' to see your bookmarks." % ps)
2324 else:
2324 else:
2325 print "Bookmarks not set - use %bookmark <bookmarkname>"
2325 print "Bookmarks not set - use %bookmark <bookmarkname>"
2326 return
2326 return
2327
2327
2328 # at this point ps should point to the target dir
2328 # at this point ps should point to the target dir
2329 if ps:
2329 if ps:
2330 try:
2330 try:
2331 os.chdir(os.path.expanduser(ps))
2331 os.chdir(os.path.expanduser(ps))
2332 ttitle = ("IPy:" + (
2333 os.getcwd() == '/' and '/' or os.path.basename(os.getcwd())))
2334 platutils.set_term_title(ttitle)
2332 except OSError:
2335 except OSError:
2333 print sys.exc_info()[1]
2336 print sys.exc_info()[1]
2334 else:
2337 else:
2335 self.shell.user_ns['_dh'].append(os.getcwd())
2338 self.shell.user_ns['_dh'].append(os.getcwd())
2336 else:
2339 else:
2337 os.chdir(self.shell.home_dir)
2340 os.chdir(self.shell.home_dir)
2341 platutils.set_term_title("IPy:~")
2338 self.shell.user_ns['_dh'].append(os.getcwd())
2342 self.shell.user_ns['_dh'].append(os.getcwd())
2339 if not 'q' in opts:
2343 if not 'q' in opts:
2340 print self.shell.user_ns['_dh'][-1]
2344 print self.shell.user_ns['_dh'][-1]
2341
2345
2342 def magic_dhist(self, parameter_s=''):
2346 def magic_dhist(self, parameter_s=''):
2343 """Print your history of visited directories.
2347 """Print your history of visited directories.
2344
2348
2345 %dhist -> print full history\\
2349 %dhist -> print full history\\
2346 %dhist n -> print last n entries only\\
2350 %dhist n -> print last n entries only\\
2347 %dhist n1 n2 -> print entries between n1 and n2 (n1 not included)\\
2351 %dhist n1 n2 -> print entries between n1 and n2 (n1 not included)\\
2348
2352
2349 This history is automatically maintained by the %cd command, and
2353 This history is automatically maintained by the %cd command, and
2350 always available as the global list variable _dh. You can use %cd -<n>
2354 always available as the global list variable _dh. You can use %cd -<n>
2351 to go to directory number <n>."""
2355 to go to directory number <n>."""
2352
2356
2353 dh = self.shell.user_ns['_dh']
2357 dh = self.shell.user_ns['_dh']
2354 if parameter_s:
2358 if parameter_s:
2355 try:
2359 try:
2356 args = map(int,parameter_s.split())
2360 args = map(int,parameter_s.split())
2357 except:
2361 except:
2358 self.arg_err(Magic.magic_dhist)
2362 self.arg_err(Magic.magic_dhist)
2359 return
2363 return
2360 if len(args) == 1:
2364 if len(args) == 1:
2361 ini,fin = max(len(dh)-(args[0]),0),len(dh)
2365 ini,fin = max(len(dh)-(args[0]),0),len(dh)
2362 elif len(args) == 2:
2366 elif len(args) == 2:
2363 ini,fin = args
2367 ini,fin = args
2364 else:
2368 else:
2365 self.arg_err(Magic.magic_dhist)
2369 self.arg_err(Magic.magic_dhist)
2366 return
2370 return
2367 else:
2371 else:
2368 ini,fin = 0,len(dh)
2372 ini,fin = 0,len(dh)
2369 nlprint(dh,
2373 nlprint(dh,
2370 header = 'Directory history (kept in _dh)',
2374 header = 'Directory history (kept in _dh)',
2371 start=ini,stop=fin)
2375 start=ini,stop=fin)
2372
2376
2373 def magic_env(self, parameter_s=''):
2377 def magic_env(self, parameter_s=''):
2374 """List environment variables."""
2378 """List environment variables."""
2375
2379
2376 return os.environ.data
2380 return os.environ.data
2377
2381
2378 def magic_pushd(self, parameter_s=''):
2382 def magic_pushd(self, parameter_s=''):
2379 """Place the current dir on stack and change directory.
2383 """Place the current dir on stack and change directory.
2380
2384
2381 Usage:\\
2385 Usage:\\
2382 %pushd ['dirname']
2386 %pushd ['dirname']
2383
2387
2384 %pushd with no arguments does a %pushd to your home directory.
2388 %pushd with no arguments does a %pushd to your home directory.
2385 """
2389 """
2386 if parameter_s == '': parameter_s = '~'
2390 if parameter_s == '': parameter_s = '~'
2387 dir_s = self.shell.dir_stack
2391 dir_s = self.shell.dir_stack
2388 if len(dir_s)>0 and os.path.expanduser(parameter_s) != \
2392 if len(dir_s)>0 and os.path.expanduser(parameter_s) != \
2389 os.path.expanduser(self.shell.dir_stack[0]):
2393 os.path.expanduser(self.shell.dir_stack[0]):
2390 try:
2394 try:
2391 self.magic_cd(parameter_s)
2395 self.magic_cd(parameter_s)
2392 dir_s.insert(0,os.getcwd().replace(self.home_dir,'~'))
2396 dir_s.insert(0,os.getcwd().replace(self.home_dir,'~'))
2393 self.magic_dirs()
2397 self.magic_dirs()
2394 except:
2398 except:
2395 print 'Invalid directory'
2399 print 'Invalid directory'
2396 else:
2400 else:
2397 print 'You are already there!'
2401 print 'You are already there!'
2398
2402
2399 def magic_popd(self, parameter_s=''):
2403 def magic_popd(self, parameter_s=''):
2400 """Change to directory popped off the top of the stack.
2404 """Change to directory popped off the top of the stack.
2401 """
2405 """
2402 if len (self.shell.dir_stack) > 1:
2406 if len (self.shell.dir_stack) > 1:
2403 self.shell.dir_stack.pop(0)
2407 self.shell.dir_stack.pop(0)
2404 self.magic_cd(self.shell.dir_stack[0])
2408 self.magic_cd(self.shell.dir_stack[0])
2405 print self.shell.dir_stack[0]
2409 print self.shell.dir_stack[0]
2406 else:
2410 else:
2407 print "You can't remove the starting directory from the stack:",\
2411 print "You can't remove the starting directory from the stack:",\
2408 self.shell.dir_stack
2412 self.shell.dir_stack
2409
2413
2410 def magic_dirs(self, parameter_s=''):
2414 def magic_dirs(self, parameter_s=''):
2411 """Return the current directory stack."""
2415 """Return the current directory stack."""
2412
2416
2413 return self.shell.dir_stack[:]
2417 return self.shell.dir_stack[:]
2414
2418
2415 def magic_sc(self, parameter_s=''):
2419 def magic_sc(self, parameter_s=''):
2416 """Shell capture - execute a shell command and capture its output.
2420 """Shell capture - execute a shell command and capture its output.
2417
2421
2418 %sc [options] varname=command
2422 %sc [options] varname=command
2419
2423
2420 IPython will run the given command using commands.getoutput(), and
2424 IPython will run the given command using commands.getoutput(), and
2421 will then update the user's interactive namespace with a variable
2425 will then update the user's interactive namespace with a variable
2422 called varname, containing the value of the call. Your command can
2426 called varname, containing the value of the call. Your command can
2423 contain shell wildcards, pipes, etc.
2427 contain shell wildcards, pipes, etc.
2424
2428
2425 The '=' sign in the syntax is mandatory, and the variable name you
2429 The '=' sign in the syntax is mandatory, and the variable name you
2426 supply must follow Python's standard conventions for valid names.
2430 supply must follow Python's standard conventions for valid names.
2427
2431
2428 Options:
2432 Options:
2429
2433
2430 -l: list output. Split the output on newlines into a list before
2434 -l: list output. Split the output on newlines into a list before
2431 assigning it to the given variable. By default the output is stored
2435 assigning it to the given variable. By default the output is stored
2432 as a single string.
2436 as a single string.
2433
2437
2434 -v: verbose. Print the contents of the variable.
2438 -v: verbose. Print the contents of the variable.
2435
2439
2436 In most cases you should not need to split as a list, because the
2440 In most cases you should not need to split as a list, because the
2437 returned value is a special type of string which can automatically
2441 returned value is a special type of string which can automatically
2438 provide its contents either as a list (split on newlines) or as a
2442 provide its contents either as a list (split on newlines) or as a
2439 space-separated string. These are convenient, respectively, either
2443 space-separated string. These are convenient, respectively, either
2440 for sequential processing or to be passed to a shell command.
2444 for sequential processing or to be passed to a shell command.
2441
2445
2442 For example:
2446 For example:
2443
2447
2444 # Capture into variable a
2448 # Capture into variable a
2445 In [9]: sc a=ls *py
2449 In [9]: sc a=ls *py
2446
2450
2447 # a is a string with embedded newlines
2451 # a is a string with embedded newlines
2448 In [10]: a
2452 In [10]: a
2449 Out[10]: 'setup.py\nwin32_manual_post_install.py'
2453 Out[10]: 'setup.py\nwin32_manual_post_install.py'
2450
2454
2451 # which can be seen as a list:
2455 # which can be seen as a list:
2452 In [11]: a.l
2456 In [11]: a.l
2453 Out[11]: ['setup.py', 'win32_manual_post_install.py']
2457 Out[11]: ['setup.py', 'win32_manual_post_install.py']
2454
2458
2455 # or as a whitespace-separated string:
2459 # or as a whitespace-separated string:
2456 In [12]: a.s
2460 In [12]: a.s
2457 Out[12]: 'setup.py win32_manual_post_install.py'
2461 Out[12]: 'setup.py win32_manual_post_install.py'
2458
2462
2459 # a.s is useful to pass as a single command line:
2463 # a.s is useful to pass as a single command line:
2460 In [13]: !wc -l $a.s
2464 In [13]: !wc -l $a.s
2461 146 setup.py
2465 146 setup.py
2462 130 win32_manual_post_install.py
2466 130 win32_manual_post_install.py
2463 276 total
2467 276 total
2464
2468
2465 # while the list form is useful to loop over:
2469 # while the list form is useful to loop over:
2466 In [14]: for f in a.l:
2470 In [14]: for f in a.l:
2467 ....: !wc -l $f
2471 ....: !wc -l $f
2468 ....:
2472 ....:
2469 146 setup.py
2473 146 setup.py
2470 130 win32_manual_post_install.py
2474 130 win32_manual_post_install.py
2471
2475
2472 Similiarly, the lists returned by the -l option are also special, in
2476 Similiarly, the lists returned by the -l option are also special, in
2473 the sense that you can equally invoke the .s attribute on them to
2477 the sense that you can equally invoke the .s attribute on them to
2474 automatically get a whitespace-separated string from their contents:
2478 automatically get a whitespace-separated string from their contents:
2475
2479
2476 In [1]: sc -l b=ls *py
2480 In [1]: sc -l b=ls *py
2477
2481
2478 In [2]: b
2482 In [2]: b
2479 Out[2]: ['setup.py', 'win32_manual_post_install.py']
2483 Out[2]: ['setup.py', 'win32_manual_post_install.py']
2480
2484
2481 In [3]: b.s
2485 In [3]: b.s
2482 Out[3]: 'setup.py win32_manual_post_install.py'
2486 Out[3]: 'setup.py win32_manual_post_install.py'
2483
2487
2484 In summary, both the lists and strings used for ouptut capture have
2488 In summary, both the lists and strings used for ouptut capture have
2485 the following special attributes:
2489 the following special attributes:
2486
2490
2487 .l (or .list) : value as list.
2491 .l (or .list) : value as list.
2488 .n (or .nlstr): value as newline-separated string.
2492 .n (or .nlstr): value as newline-separated string.
2489 .s (or .spstr): value as space-separated string.
2493 .s (or .spstr): value as space-separated string.
2490 """
2494 """
2491
2495
2492 opts,args = self.parse_options(parameter_s,'lv')
2496 opts,args = self.parse_options(parameter_s,'lv')
2493 # Try to get a variable name and command to run
2497 # Try to get a variable name and command to run
2494 try:
2498 try:
2495 # the variable name must be obtained from the parse_options
2499 # the variable name must be obtained from the parse_options
2496 # output, which uses shlex.split to strip options out.
2500 # output, which uses shlex.split to strip options out.
2497 var,_ = args.split('=',1)
2501 var,_ = args.split('=',1)
2498 var = var.strip()
2502 var = var.strip()
2499 # But the the command has to be extracted from the original input
2503 # But the the command has to be extracted from the original input
2500 # parameter_s, not on what parse_options returns, to avoid the
2504 # parameter_s, not on what parse_options returns, to avoid the
2501 # quote stripping which shlex.split performs on it.
2505 # quote stripping which shlex.split performs on it.
2502 _,cmd = parameter_s.split('=',1)
2506 _,cmd = parameter_s.split('=',1)
2503 except ValueError:
2507 except ValueError:
2504 var,cmd = '',''
2508 var,cmd = '',''
2505 if not var:
2509 if not var:
2506 error('you must specify a variable to assign the command to.')
2510 error('you must specify a variable to assign the command to.')
2507 return
2511 return
2508 # If all looks ok, proceed
2512 # If all looks ok, proceed
2509 out,err = self.shell.getoutputerror(cmd)
2513 out,err = self.shell.getoutputerror(cmd)
2510 if err:
2514 if err:
2511 print >> Term.cerr,err
2515 print >> Term.cerr,err
2512 if opts.has_key('l'):
2516 if opts.has_key('l'):
2513 out = SList(out.split('\n'))
2517 out = SList(out.split('\n'))
2514 else:
2518 else:
2515 out = LSString(out)
2519 out = LSString(out)
2516 if opts.has_key('v'):
2520 if opts.has_key('v'):
2517 print '%s ==\n%s' % (var,pformat(out))
2521 print '%s ==\n%s' % (var,pformat(out))
2518 self.shell.user_ns.update({var:out})
2522 self.shell.user_ns.update({var:out})
2519
2523
2520 def magic_sx(self, parameter_s=''):
2524 def magic_sx(self, parameter_s=''):
2521 """Shell execute - run a shell command and capture its output.
2525 """Shell execute - run a shell command and capture its output.
2522
2526
2523 %sx command
2527 %sx command
2524
2528
2525 IPython will run the given command using commands.getoutput(), and
2529 IPython will run the given command using commands.getoutput(), and
2526 return the result formatted as a list (split on '\\n'). Since the
2530 return the result formatted as a list (split on '\\n'). Since the
2527 output is _returned_, it will be stored in ipython's regular output
2531 output is _returned_, it will be stored in ipython's regular output
2528 cache Out[N] and in the '_N' automatic variables.
2532 cache Out[N] and in the '_N' automatic variables.
2529
2533
2530 Notes:
2534 Notes:
2531
2535
2532 1) If an input line begins with '!!', then %sx is automatically
2536 1) If an input line begins with '!!', then %sx is automatically
2533 invoked. That is, while:
2537 invoked. That is, while:
2534 !ls
2538 !ls
2535 causes ipython to simply issue system('ls'), typing
2539 causes ipython to simply issue system('ls'), typing
2536 !!ls
2540 !!ls
2537 is a shorthand equivalent to:
2541 is a shorthand equivalent to:
2538 %sx ls
2542 %sx ls
2539
2543
2540 2) %sx differs from %sc in that %sx automatically splits into a list,
2544 2) %sx differs from %sc in that %sx automatically splits into a list,
2541 like '%sc -l'. The reason for this is to make it as easy as possible
2545 like '%sc -l'. The reason for this is to make it as easy as possible
2542 to process line-oriented shell output via further python commands.
2546 to process line-oriented shell output via further python commands.
2543 %sc is meant to provide much finer control, but requires more
2547 %sc is meant to provide much finer control, but requires more
2544 typing.
2548 typing.
2545
2549
2546 3) Just like %sc -l, this is a list with special attributes:
2550 3) Just like %sc -l, this is a list with special attributes:
2547
2551
2548 .l (or .list) : value as list.
2552 .l (or .list) : value as list.
2549 .n (or .nlstr): value as newline-separated string.
2553 .n (or .nlstr): value as newline-separated string.
2550 .s (or .spstr): value as whitespace-separated string.
2554 .s (or .spstr): value as whitespace-separated string.
2551
2555
2552 This is very useful when trying to use such lists as arguments to
2556 This is very useful when trying to use such lists as arguments to
2553 system commands."""
2557 system commands."""
2554
2558
2555 if parameter_s:
2559 if parameter_s:
2556 out,err = self.shell.getoutputerror(parameter_s)
2560 out,err = self.shell.getoutputerror(parameter_s)
2557 if err:
2561 if err:
2558 print >> Term.cerr,err
2562 print >> Term.cerr,err
2559 return SList(out.split('\n'))
2563 return SList(out.split('\n'))
2560
2564
2561 def magic_bg(self, parameter_s=''):
2565 def magic_bg(self, parameter_s=''):
2562 """Run a job in the background, in a separate thread.
2566 """Run a job in the background, in a separate thread.
2563
2567
2564 For example,
2568 For example,
2565
2569
2566 %bg myfunc(x,y,z=1)
2570 %bg myfunc(x,y,z=1)
2567
2571
2568 will execute 'myfunc(x,y,z=1)' in a background thread. As soon as the
2572 will execute 'myfunc(x,y,z=1)' in a background thread. As soon as the
2569 execution starts, a message will be printed indicating the job
2573 execution starts, a message will be printed indicating the job
2570 number. If your job number is 5, you can use
2574 number. If your job number is 5, you can use
2571
2575
2572 myvar = jobs.result(5) or myvar = jobs[5].result
2576 myvar = jobs.result(5) or myvar = jobs[5].result
2573
2577
2574 to assign this result to variable 'myvar'.
2578 to assign this result to variable 'myvar'.
2575
2579
2576 IPython has a job manager, accessible via the 'jobs' object. You can
2580 IPython has a job manager, accessible via the 'jobs' object. You can
2577 type jobs? to get more information about it, and use jobs.<TAB> to see
2581 type jobs? to get more information about it, and use jobs.<TAB> to see
2578 its attributes. All attributes not starting with an underscore are
2582 its attributes. All attributes not starting with an underscore are
2579 meant for public use.
2583 meant for public use.
2580
2584
2581 In particular, look at the jobs.new() method, which is used to create
2585 In particular, look at the jobs.new() method, which is used to create
2582 new jobs. This magic %bg function is just a convenience wrapper
2586 new jobs. This magic %bg function is just a convenience wrapper
2583 around jobs.new(), for expression-based jobs. If you want to create a
2587 around jobs.new(), for expression-based jobs. If you want to create a
2584 new job with an explicit function object and arguments, you must call
2588 new job with an explicit function object and arguments, you must call
2585 jobs.new() directly.
2589 jobs.new() directly.
2586
2590
2587 The jobs.new docstring also describes in detail several important
2591 The jobs.new docstring also describes in detail several important
2588 caveats associated with a thread-based model for background job
2592 caveats associated with a thread-based model for background job
2589 execution. Type jobs.new? for details.
2593 execution. Type jobs.new? for details.
2590
2594
2591 You can check the status of all jobs with jobs.status().
2595 You can check the status of all jobs with jobs.status().
2592
2596
2593 The jobs variable is set by IPython into the Python builtin namespace.
2597 The jobs variable is set by IPython into the Python builtin namespace.
2594 If you ever declare a variable named 'jobs', you will shadow this
2598 If you ever declare a variable named 'jobs', you will shadow this
2595 name. You can either delete your global jobs variable to regain
2599 name. You can either delete your global jobs variable to regain
2596 access to the job manager, or make a new name and assign it manually
2600 access to the job manager, or make a new name and assign it manually
2597 to the manager (stored in IPython's namespace). For example, to
2601 to the manager (stored in IPython's namespace). For example, to
2598 assign the job manager to the Jobs name, use:
2602 assign the job manager to the Jobs name, use:
2599
2603
2600 Jobs = __builtins__.jobs"""
2604 Jobs = __builtins__.jobs"""
2601
2605
2602 self.shell.jobs.new(parameter_s,self.shell.user_ns)
2606 self.shell.jobs.new(parameter_s,self.shell.user_ns)
2603
2607
2604 def magic_store(self, parameter_s=''):
2608 def magic_store(self, parameter_s=''):
2605 """Lightweight persistence for python variables.
2609 """Lightweight persistence for python variables.
2606
2610
2607 Example:
2611 Example:
2608
2612
2609 ville@badger[~]|1> A = ['hello',10,'world']\\
2613 ville@badger[~]|1> A = ['hello',10,'world']\\
2610 ville@badger[~]|2> %store A\\
2614 ville@badger[~]|2> %store A\\
2611 ville@badger[~]|3> Exit
2615 ville@badger[~]|3> Exit
2612
2616
2613 (IPython session is closed and started again...)
2617 (IPython session is closed and started again...)
2614
2618
2615 ville@badger:~$ ipython -p pysh\\
2619 ville@badger:~$ ipython -p pysh\\
2616 ville@badger[~]|1> print A
2620 ville@badger[~]|1> print A
2617
2621
2618 ['hello', 10, 'world']
2622 ['hello', 10, 'world']
2619
2623
2620 Usage:
2624 Usage:
2621
2625
2622 %store - Show list of all variables and their current values\\
2626 %store - Show list of all variables and their current values\\
2623 %store <var> - Store the *current* value of the variable to disk\\
2627 %store <var> - Store the *current* value of the variable to disk\\
2624 %store -d <var> - Remove the variable and its value from storage\\
2628 %store -d <var> - Remove the variable and its value from storage\\
2625 %store -r - Remove all variables from storage
2629 %store -r - Remove all variables from storage
2626
2630
2627 It should be noted that if you change the value of a variable, you
2631 It should be noted that if you change the value of a variable, you
2628 need to %store it again if you want to persist the new value.
2632 need to %store it again if you want to persist the new value.
2629
2633
2630 Note also that the variables will need to be pickleable; most basic
2634 Note also that the variables will need to be pickleable; most basic
2631 python types can be safely %stored.
2635 python types can be safely %stored.
2632 """
2636 """
2633
2637
2634 opts,args = self.parse_options(parameter_s,'dr',mode='list')
2638 opts,args = self.parse_options(parameter_s,'dr',mode='list')
2635 # delete
2639 # delete
2636 if opts.has_key('d'):
2640 if opts.has_key('d'):
2637 try:
2641 try:
2638 todel = args[0]
2642 todel = args[0]
2639 except IndexError:
2643 except IndexError:
2640 error('You must provide the variable to forget')
2644 error('You must provide the variable to forget')
2641 else:
2645 else:
2642 try:
2646 try:
2643 del self.shell.persist['S:' + todel]
2647 del self.shell.persist['S:' + todel]
2644 except:
2648 except:
2645 error("Can't delete variable '%s'" % todel)
2649 error("Can't delete variable '%s'" % todel)
2646 # reset
2650 # reset
2647 elif opts.has_key('r'):
2651 elif opts.has_key('r'):
2648 for k in self.shell.persist.keys():
2652 for k in self.shell.persist.keys():
2649 if k.startswith('S:'):
2653 if k.startswith('S:'):
2650 del self.shell.persist[k]
2654 del self.shell.persist[k]
2651
2655
2652 # run without arguments -> list variables & values
2656 # run without arguments -> list variables & values
2653 elif not args:
2657 elif not args:
2654 vars = [v[2:] for v in self.shell.persist.keys()
2658 vars = [v[2:] for v in self.shell.persist.keys()
2655 if v.startswith('S:')]
2659 if v.startswith('S:')]
2656 vars.sort()
2660 vars.sort()
2657 if vars:
2661 if vars:
2658 size = max(map(len,vars))
2662 size = max(map(len,vars))
2659 else:
2663 else:
2660 size = 0
2664 size = 0
2661
2665
2662 print 'Stored variables and their in-memory values:'
2666 print 'Stored variables and their in-memory values:'
2663 fmt = '%-'+str(size)+'s -> %s'
2667 fmt = '%-'+str(size)+'s -> %s'
2664 get = self.shell.user_ns.get
2668 get = self.shell.user_ns.get
2665 for var in vars:
2669 for var in vars:
2666 # print 30 first characters from every var
2670 # print 30 first characters from every var
2667 print fmt % (var,repr(get(var,'<unavailable>'))[:50])
2671 print fmt % (var,repr(get(var,'<unavailable>'))[:50])
2668
2672
2669 # default action - store the variable
2673 # default action - store the variable
2670 else:
2674 else:
2671 pickled = pickle.dumps(self.shell.user_ns[args[0] ])
2675 pickled = pickle.dumps(self.shell.user_ns[args[0] ])
2672 self.shell.persist[ 'S:' + args[0] ] = pickled
2676 self.shell.persist[ 'S:' + args[0] ] = pickled
2673 print "Stored '%s' (%d bytes)" % (args[0], len(pickled))
2677 print "Stored '%s' (%d bytes)" % (args[0], len(pickled))
2674
2678
2675 def magic_bookmark(self, parameter_s=''):
2679 def magic_bookmark(self, parameter_s=''):
2676 """Manage IPython's bookmark system.
2680 """Manage IPython's bookmark system.
2677
2681
2678 %bookmark <name> - set bookmark to current dir
2682 %bookmark <name> - set bookmark to current dir
2679 %bookmark <name> <dir> - set bookmark to <dir>
2683 %bookmark <name> <dir> - set bookmark to <dir>
2680 %bookmark -l - list all bookmarks
2684 %bookmark -l - list all bookmarks
2681 %bookmark -d <name> - remove bookmark
2685 %bookmark -d <name> - remove bookmark
2682 %bookmark -r - remove all bookmarks
2686 %bookmark -r - remove all bookmarks
2683
2687
2684 You can later on access a bookmarked folder with:
2688 You can later on access a bookmarked folder with:
2685 %cd -b <name>
2689 %cd -b <name>
2686 or simply '%cd <name>' if there is no directory called <name> AND
2690 or simply '%cd <name>' if there is no directory called <name> AND
2687 there is such a bookmark defined.
2691 there is such a bookmark defined.
2688
2692
2689 Your bookmarks persist through IPython sessions, but they are
2693 Your bookmarks persist through IPython sessions, but they are
2690 associated with each profile."""
2694 associated with each profile."""
2691
2695
2692 opts,args = self.parse_options(parameter_s,'drl',mode='list')
2696 opts,args = self.parse_options(parameter_s,'drl',mode='list')
2693 if len(args) > 2:
2697 if len(args) > 2:
2694 error('You can only give at most two arguments')
2698 error('You can only give at most two arguments')
2695 return
2699 return
2696
2700
2697 bkms = self.shell.persist.get('bookmarks',{})
2701 bkms = self.shell.persist.get('bookmarks',{})
2698
2702
2699 if opts.has_key('d'):
2703 if opts.has_key('d'):
2700 try:
2704 try:
2701 todel = args[0]
2705 todel = args[0]
2702 except IndexError:
2706 except IndexError:
2703 error('You must provide a bookmark to delete')
2707 error('You must provide a bookmark to delete')
2704 else:
2708 else:
2705 try:
2709 try:
2706 del bkms[todel]
2710 del bkms[todel]
2707 except:
2711 except:
2708 error("Can't delete bookmark '%s'" % todel)
2712 error("Can't delete bookmark '%s'" % todel)
2709 elif opts.has_key('r'):
2713 elif opts.has_key('r'):
2710 bkms = {}
2714 bkms = {}
2711 elif opts.has_key('l'):
2715 elif opts.has_key('l'):
2712 bks = bkms.keys()
2716 bks = bkms.keys()
2713 bks.sort()
2717 bks.sort()
2714 if bks:
2718 if bks:
2715 size = max(map(len,bks))
2719 size = max(map(len,bks))
2716 else:
2720 else:
2717 size = 0
2721 size = 0
2718 fmt = '%-'+str(size)+'s -> %s'
2722 fmt = '%-'+str(size)+'s -> %s'
2719 print 'Current bookmarks:'
2723 print 'Current bookmarks:'
2720 for bk in bks:
2724 for bk in bks:
2721 print fmt % (bk,bkms[bk])
2725 print fmt % (bk,bkms[bk])
2722 else:
2726 else:
2723 if not args:
2727 if not args:
2724 error("You must specify the bookmark name")
2728 error("You must specify the bookmark name")
2725 elif len(args)==1:
2729 elif len(args)==1:
2726 bkms[args[0]] = os.getcwd()
2730 bkms[args[0]] = os.getcwd()
2727 elif len(args)==2:
2731 elif len(args)==2:
2728 bkms[args[0]] = args[1]
2732 bkms[args[0]] = args[1]
2729 self.shell.persist['bookmarks'] = bkms
2733 self.shell.persist['bookmarks'] = bkms
2730
2734
2731 def magic_pycat(self, parameter_s=''):
2735 def magic_pycat(self, parameter_s=''):
2732 """Show a syntax-highlighted file through a pager.
2736 """Show a syntax-highlighted file through a pager.
2733
2737
2734 This magic is similar to the cat utility, but it will assume the file
2738 This magic is similar to the cat utility, but it will assume the file
2735 to be Python source and will show it with syntax highlighting. """
2739 to be Python source and will show it with syntax highlighting. """
2736
2740
2737 filename = get_py_filename(parameter_s)
2741 filename = get_py_filename(parameter_s)
2738 page(self.shell.pycolorize(file_read(filename)),
2742 page(self.shell.pycolorize(file_read(filename)),
2739 screen_lines=self.shell.rc.screen_length)
2743 screen_lines=self.shell.rc.screen_length)
2740
2744
2741 # end Magic
2745 # end Magic
@@ -1,76 +1,77 b''
1 # -*- coding: utf-8 -*-
1 # -*- coding: utf-8 -*-
2 """Release data for the IPython project.
2 """Release data for the IPython project.
3
3
4 $Id: Release.py 1002 2006-01-11 22:18:29Z fperez $"""
4 $Id: Release.py 1014 2006-01-13 19:16:41Z vivainio $"""
5
5
6 #*****************************************************************************
6 #*****************************************************************************
7 # Copyright (C) 2001-2006 Fernando Perez <fperez@colorado.edu>
7 # Copyright (C) 2001-2006 Fernando Perez <fperez@colorado.edu>
8 #
8 #
9 # Copyright (c) 2001 Janko Hauser <jhauser@zscout.de> and Nathaniel Gray
9 # Copyright (c) 2001 Janko Hauser <jhauser@zscout.de> and Nathaniel Gray
10 # <n8gray@caltech.edu>
10 # <n8gray@caltech.edu>
11 #
11 #
12 # Distributed under the terms of the BSD License. The full license is in
12 # Distributed under the terms of the BSD License. The full license is in
13 # the file COPYING, distributed as part of this software.
13 # the file COPYING, distributed as part of this software.
14 #*****************************************************************************
14 #*****************************************************************************
15
15
16 # Name of the package for release purposes. This is the name which labels
16 # Name of the package for release purposes. This is the name which labels
17 # the tarballs and RPMs made by distutils, so it's best to lowercase it.
17 # the tarballs and RPMs made by distutils, so it's best to lowercase it.
18 name = 'ipython'
18 name = 'ipython'
19
19
20 # For versions with substrings (like 0.6.16.svn), use an extra . to separate
20 # For versions with substrings (like 0.6.16.svn), use an extra . to separate
21 # the new substring. We have to avoid using either dashes or underscores,
21 # the new substring. We have to avoid using either dashes or underscores,
22 # because bdist_rpm does not accept dashes (an RPM) convention, and
22 # because bdist_rpm does not accept dashes (an RPM) convention, and
23 # bdist_deb does not accept underscores (a Debian convention).
23 # bdist_deb does not accept underscores (a Debian convention).
24
24
25 version = '0.7.1.svn'
25 version = '0.7.1.svn'
26
26
27 revision = '$Revision: 1002 $'
27 revision = '$Revision: 1014 $'
28
28
29 description = "An enhanced interactive Python shell."
29 description = "An enhanced interactive Python shell."
30
30
31 long_description = \
31 long_description = \
32 """
32 """
33 IPython provides a replacement for the interactive Python interpreter with
33 IPython provides a replacement for the interactive Python interpreter with
34 extra functionality.
34 extra functionality.
35
35
36 Main features:
36 Main features:
37
37
38 * Comprehensive object introspection.
38 * Comprehensive object introspection.
39
39
40 * Input history, persistent across sessions.
40 * Input history, persistent across sessions.
41
41
42 * Caching of output results during a session with automatically generated
42 * Caching of output results during a session with automatically generated
43 references.
43 references.
44
44
45 * Readline based name completion.
45 * Readline based name completion.
46
46
47 * Extensible system of 'magic' commands for controlling the environment and
47 * Extensible system of 'magic' commands for controlling the environment and
48 performing many tasks related either to IPython or the operating system.
48 performing many tasks related either to IPython or the operating system.
49
49
50 * Configuration system with easy switching between different setups (simpler
50 * Configuration system with easy switching between different setups (simpler
51 than changing $PYTHONSTARTUP environment variables every time).
51 than changing $PYTHONSTARTUP environment variables every time).
52
52
53 * Session logging and reloading.
53 * Session logging and reloading.
54
54
55 * Extensible syntax processing for special purpose situations.
55 * Extensible syntax processing for special purpose situations.
56
56
57 * Access to the system shell with user-extensible alias system.
57 * Access to the system shell with user-extensible alias system.
58
58
59 * Easily embeddable in other Python programs.
59 * Easily embeddable in other Python programs.
60
60
61 * Integrated access to the pdb debugger and the Python profiler. """
61 * Integrated access to the pdb debugger and the Python profiler. """
62
62
63 license = 'BSD'
63 license = 'BSD'
64
64
65 authors = {'Fernando' : ('Fernando Perez','fperez@colorado.edu'),
65 authors = {'Fernando' : ('Fernando Perez','fperez@colorado.edu'),
66 'Janko' : ('Janko Hauser','jhauser@zscout.de'),
66 'Janko' : ('Janko Hauser','jhauser@zscout.de'),
67 'Nathan' : ('Nathaniel Gray','n8gray@caltech.edu')
67 'Nathan' : ('Nathaniel Gray','n8gray@caltech.edu'),
68 'Ville' : ('Ville Vainio','vivainio@gmail.com')
68 }
69 }
69
70
70 url = 'http://ipython.scipy.org'
71 url = 'http://ipython.scipy.org'
71
72
72 download_url = 'http://ipython.scipy.org/dist'
73 download_url = 'http://ipython.scipy.org/dist'
73
74
74 platforms = ['Linux','Mac OSX','Windows XP/2000/NT','Windows 95/98/ME']
75 platforms = ['Linux','Mac OSX','Windows XP/2000/NT','Windows 95/98/ME']
75
76
76 keywords = ['Interactive','Interpreter','Shell']
77 keywords = ['Interactive','Interpreter','Shell']
@@ -1,64 +1,65 b''
1 # -*- coding: utf-8 -*-
1 # -*- coding: utf-8 -*-
2 """
2 """
3 IPython -- An enhanced Interactive Python
3 IPython -- An enhanced Interactive Python
4
4
5 One of Python's nicest features is its interactive interpreter. This allows
5 One of Python's nicest features is its interactive interpreter. This allows
6 very fast testing of ideas without the overhead of creating test files as is
6 very fast testing of ideas without the overhead of creating test files as is
7 typical in most programming languages. However, the interpreter supplied with
7 typical in most programming languages. However, the interpreter supplied with
8 the standard Python distribution is fairly primitive (and IDLE isn't really
8 the standard Python distribution is fairly primitive (and IDLE isn't really
9 much better).
9 much better).
10
10
11 IPython tries to:
11 IPython tries to:
12
12
13 i - provide an efficient environment for interactive work in Python
13 i - provide an efficient environment for interactive work in Python
14 programming. It tries to address what we see as shortcomings of the standard
14 programming. It tries to address what we see as shortcomings of the standard
15 Python prompt, and adds many features to make interactive work much more
15 Python prompt, and adds many features to make interactive work much more
16 efficient.
16 efficient.
17
17
18 ii - offer a flexible framework so that it can be used as the base
18 ii - offer a flexible framework so that it can be used as the base
19 environment for other projects and problems where Python can be the
19 environment for other projects and problems where Python can be the
20 underlying language. Specifically scientific environments like Mathematica,
20 underlying language. Specifically scientific environments like Mathematica,
21 IDL and Mathcad inspired its design, but similar ideas can be useful in many
21 IDL and Mathcad inspired its design, but similar ideas can be useful in many
22 fields. Python is a fabulous language for implementing this kind of system
22 fields. Python is a fabulous language for implementing this kind of system
23 (due to its dynamic and introspective features), and with suitable libraries
23 (due to its dynamic and introspective features), and with suitable libraries
24 entire systems could be built leveraging Python's power.
24 entire systems could be built leveraging Python's power.
25
25
26 iii - serve as an embeddable, ready to go interpreter for your own programs.
26 iii - serve as an embeddable, ready to go interpreter for your own programs.
27
27
28 IPython requires Python 2.2 or newer.
28 IPython requires Python 2.2 or newer.
29
29
30 $Id: __init__.py 1005 2006-01-12 08:39:26Z fperez $"""
30 $Id: __init__.py 1014 2006-01-13 19:16:41Z vivainio $"""
31
31
32 #*****************************************************************************
32 #*****************************************************************************
33 # Copyright (C) 2001-2004 Fernando Perez. <fperez@colorado.edu>
33 # Copyright (C) 2001-2004 Fernando Perez. <fperez@colorado.edu>
34 #
34 #
35 # Distributed under the terms of the BSD License. The full license is in
35 # Distributed under the terms of the BSD License. The full license is in
36 # the file COPYING, distributed as part of this software.
36 # the file COPYING, distributed as part of this software.
37 #*****************************************************************************
37 #*****************************************************************************
38
38
39 # Enforce proper version requirements
39 # Enforce proper version requirements
40 import sys
40 import sys
41 if sys.version[0:3] < '2.3':
41 if sys.version[0:3] < '2.3':
42 raise ImportError, 'Python Version 2.3 or above is required.'
42 raise ImportError, 'Python Version 2.3 or above is required.'
43
43
44 # Define what gets imported with a 'from IPython import *'
44 # Define what gets imported with a 'from IPython import *'
45 __all__ = ['deep_reload','genutils','ipstruct','ultraTB','DPyGetOpt',
45 __all__ = ['deep_reload','genutils','ipstruct','ultraTB','DPyGetOpt',
46 'Itpl','hooks','ConfigLoader','OutputTrap','Release','Shell']
46 'Itpl','hooks','ConfigLoader','OutputTrap','Release','Shell',
47 'platutils','platutils_win32','platutils_posix','platutils_dummy']
47
48
48 # Load __all__ in IPython namespace so that a simple 'import IPython' gives
49 # Load __all__ in IPython namespace so that a simple 'import IPython' gives
49 # access to them via IPython.<name>
50 # access to them via IPython.<name>
50 glob,loc = globals(),locals()
51 glob,loc = globals(),locals()
51 for name in __all__:
52 for name in __all__:
52 __import__(name,glob,loc,[])
53 __import__(name,glob,loc,[])
53
54
54 # Release data
55 # Release data
55 from IPython import Release # do it explicitly so pydoc can see it - pydoc bug
56 from IPython import Release # do it explicitly so pydoc can see it - pydoc bug
56 __author__ = '%s <%s>\n%s <%s>\n%s <%s>' % \
57 __author__ = '%s <%s>\n%s <%s>\n%s <%s>' % \
57 ( Release.authors['Fernando'] + Release.authors['Janko'] + \
58 ( Release.authors['Fernando'] + Release.authors['Janko'] + \
58 Release.authors['Nathan'] )
59 Release.authors['Nathan'] )
59 __license__ = Release.license
60 __license__ = Release.license
60 __version__ = Release.version
61 __version__ = Release.version
61 __revision__ = Release.revision
62 __revision__ = Release.revision
62
63
63 # Namespace cleanup
64 # Namespace cleanup
64 del name,glob,loc
65 del name,glob,loc
@@ -1,4881 +1,4890 b''
1 2006-01-13 Ville Vainio <vivainio@gmail.com>
2
3 * IPython/platutils*.py: platform specific utility functions,
4 so far only set_term_title is implemented (change terminal
5 label in windowing systems). %cd now changes the title to
6 current dir.
7
8 * Added myself to "authors" list, had to create new files.
9
1 2006-01-13 Fernando Perez <Fernando.Perez@colorado.edu>
10 2006-01-13 Fernando Perez <Fernando.Perez@colorado.edu>
2
11
3 * IPython/iplib.py (raw_input): temporarily deactivate all
12 * IPython/iplib.py (raw_input): temporarily deactivate all
4 attempts at allowing pasting of code with autoindent on. It
13 attempts at allowing pasting of code with autoindent on. It
5 introduced bugs (reported by Prabhu) and I can't seem to find a
14 introduced bugs (reported by Prabhu) and I can't seem to find a
6 robust combination which works in all cases. Will have to revisit
15 robust combination which works in all cases. Will have to revisit
7 later.
16 later.
8
17
9 * IPython/genutils.py: remove isspace() function. We've dropped
18 * IPython/genutils.py: remove isspace() function. We've dropped
10 2.2 compatibility, so it's OK to use the string method.
19 2.2 compatibility, so it's OK to use the string method.
11
20
12 2006-01-12 Fernando Perez <Fernando.Perez@colorado.edu>
21 2006-01-12 Fernando Perez <Fernando.Perez@colorado.edu>
13
22
14 * IPython/iplib.py (InteractiveShell.__init__): fix regexp
23 * IPython/iplib.py (InteractiveShell.__init__): fix regexp
15 matching what NOT to autocall on, to include all python binary
24 matching what NOT to autocall on, to include all python binary
16 operators (including things like 'and', 'or', 'is' and 'in').
25 operators (including things like 'and', 'or', 'is' and 'in').
17 Prompted by a bug report on 'foo & bar', but I realized we had
26 Prompted by a bug report on 'foo & bar', but I realized we had
18 many more potential bug cases with other operators. The regexp is
27 many more potential bug cases with other operators. The regexp is
19 self.re_exclude_auto, it's fairly commented.
28 self.re_exclude_auto, it's fairly commented.
20
29
21 2006-01-12 Ville Vainio <vivainio@gmail.com>
30 2006-01-12 Ville Vainio <vivainio@gmail.com>
22
31
23 * IPython/iplib.py (make_quoted_expr,handle_shell_escape):
32 * IPython/iplib.py (make_quoted_expr,handle_shell_escape):
24 Prettified and hardened string/backslash quoting with ipsystem(),
33 Prettified and hardened string/backslash quoting with ipsystem(),
25 ipalias() and ipmagic(). Now even \ characters are passed to
34 ipalias() and ipmagic(). Now even \ characters are passed to
26 %magics, !shell escapes and aliases exactly as they are in the
35 %magics, !shell escapes and aliases exactly as they are in the
27 ipython command line. Should improve backslash experience,
36 ipython command line. Should improve backslash experience,
28 particularly in Windows (path delimiter for some commands that
37 particularly in Windows (path delimiter for some commands that
29 won't understand '/'), but Unix benefits as well (regexps). %cd
38 won't understand '/'), but Unix benefits as well (regexps). %cd
30 magic still doesn't support backslash path delimiters, though. Also
39 magic still doesn't support backslash path delimiters, though. Also
31 deleted all pretense of supporting multiline command strings in
40 deleted all pretense of supporting multiline command strings in
32 !system or %magic commands. Thanks to Jerry McRae for suggestions.
41 !system or %magic commands. Thanks to Jerry McRae for suggestions.
33
42
34 * doc/build_doc_instructions.txt added. Documentation on how to
43 * doc/build_doc_instructions.txt added. Documentation on how to
35 use doc/update_manual.py, added yesterday. Both files contributed
44 use doc/update_manual.py, added yesterday. Both files contributed
36 by JΓΆrgen Stenarson <jorgen.stenarson-AT-bostream.nu>. This slates
45 by JΓΆrgen Stenarson <jorgen.stenarson-AT-bostream.nu>. This slates
37 doc/*.sh for deprecation at a later date.
46 doc/*.sh for deprecation at a later date.
38
47
39 * /ipython.py Added ipython.py to root directory for
48 * /ipython.py Added ipython.py to root directory for
40 zero-installation (tar xzvf ipython.tgz; cd ipython; python
49 zero-installation (tar xzvf ipython.tgz; cd ipython; python
41 ipython.py) and development convenience (no need to kee doing
50 ipython.py) and development convenience (no need to kee doing
42 "setup.py install" between changes).
51 "setup.py install" between changes).
43
52
44 * Made ! and !! shell escapes work (again) in multiline expressions:
53 * Made ! and !! shell escapes work (again) in multiline expressions:
45 if 1:
54 if 1:
46 !ls
55 !ls
47 !!ls
56 !!ls
48
57
49 2006-01-12 Fernando Perez <Fernando.Perez@colorado.edu>
58 2006-01-12 Fernando Perez <Fernando.Perez@colorado.edu>
50
59
51 * IPython/ipstruct.py (Struct): Rename IPython.Struct to
60 * IPython/ipstruct.py (Struct): Rename IPython.Struct to
52 IPython.ipstruct, to avoid local shadowing of the stdlib 'struct'
61 IPython.ipstruct, to avoid local shadowing of the stdlib 'struct'
53 module in case-insensitive installation. Was causing crashes
62 module in case-insensitive installation. Was causing crashes
54 under win32. Closes http://www.scipy.net/roundup/ipython/issue49.
63 under win32. Closes http://www.scipy.net/roundup/ipython/issue49.
55
64
56 * IPython/Magic.py (magic_pycat): Fix pycat, patch by Marien Zwart
65 * IPython/Magic.py (magic_pycat): Fix pycat, patch by Marien Zwart
57 <marienz-AT-gentoo.org>, closes
66 <marienz-AT-gentoo.org>, closes
58 http://www.scipy.net/roundup/ipython/issue51.
67 http://www.scipy.net/roundup/ipython/issue51.
59
68
60 2006-01-11 Fernando Perez <Fernando.Perez@colorado.edu>
69 2006-01-11 Fernando Perez <Fernando.Perez@colorado.edu>
61
70
62 * IPython/Shell.py (IPShellGTK.on_timer): Finally fix the the
71 * IPython/Shell.py (IPShellGTK.on_timer): Finally fix the the
63 problem of excessive CPU usage under *nix and keyboard lag under
72 problem of excessive CPU usage under *nix and keyboard lag under
64 win32.
73 win32.
65
74
66 2006-01-10 *** Released version 0.7.0
75 2006-01-10 *** Released version 0.7.0
67
76
68 2006-01-10 Fernando Perez <Fernando.Perez@colorado.edu>
77 2006-01-10 Fernando Perez <Fernando.Perez@colorado.edu>
69
78
70 * IPython/Release.py (revision): tag version number to 0.7.0,
79 * IPython/Release.py (revision): tag version number to 0.7.0,
71 ready for release.
80 ready for release.
72
81
73 * IPython/Magic.py (magic_edit): Add print statement to %edit so
82 * IPython/Magic.py (magic_edit): Add print statement to %edit so
74 it informs the user of the name of the temp. file used. This can
83 it informs the user of the name of the temp. file used. This can
75 help if you decide later to reuse that same file, so you know
84 help if you decide later to reuse that same file, so you know
76 where to copy the info from.
85 where to copy the info from.
77
86
78 2006-01-09 Fernando Perez <Fernando.Perez@colorado.edu>
87 2006-01-09 Fernando Perez <Fernando.Perez@colorado.edu>
79
88
80 * setup_bdist_egg.py: little script to build an egg. Added
89 * setup_bdist_egg.py: little script to build an egg. Added
81 support in the release tools as well.
90 support in the release tools as well.
82
91
83 2006-01-08 Fernando Perez <Fernando.Perez@colorado.edu>
92 2006-01-08 Fernando Perez <Fernando.Perez@colorado.edu>
84
93
85 * IPython/Shell.py (IPShellWX.__init__): add support for WXPython
94 * IPython/Shell.py (IPShellWX.__init__): add support for WXPython
86 version selection (new -wxversion command line and ipythonrc
95 version selection (new -wxversion command line and ipythonrc
87 parameter). Patch contributed by Arnd Baecker
96 parameter). Patch contributed by Arnd Baecker
88 <arnd.baecker-AT-web.de>.
97 <arnd.baecker-AT-web.de>.
89
98
90 * IPython/iplib.py (embed_mainloop): fix tab-completion in
99 * IPython/iplib.py (embed_mainloop): fix tab-completion in
91 embedded instances, for variables defined at the interactive
100 embedded instances, for variables defined at the interactive
92 prompt of the embedded ipython. Reported by Arnd.
101 prompt of the embedded ipython. Reported by Arnd.
93
102
94 * IPython/Magic.py (magic_autocall): Fix %autocall magic. Now
103 * IPython/Magic.py (magic_autocall): Fix %autocall magic. Now
95 it can be used as a (stateful) toggle, or with a direct parameter.
104 it can be used as a (stateful) toggle, or with a direct parameter.
96
105
97 * IPython/ultraTB.py (_fixed_getinnerframes): remove debug assert which
106 * IPython/ultraTB.py (_fixed_getinnerframes): remove debug assert which
98 could be triggered in certain cases and cause the traceback
107 could be triggered in certain cases and cause the traceback
99 printer not to work.
108 printer not to work.
100
109
101 2006-01-07 Fernando Perez <Fernando.Perez@colorado.edu>
110 2006-01-07 Fernando Perez <Fernando.Perez@colorado.edu>
102
111
103 * IPython/iplib.py (_should_recompile): Small fix, closes
112 * IPython/iplib.py (_should_recompile): Small fix, closes
104 http://www.scipy.net/roundup/ipython/issue48. Patch by Scott.
113 http://www.scipy.net/roundup/ipython/issue48. Patch by Scott.
105
114
106 2006-01-04 Fernando Perez <Fernando.Perez@colorado.edu>
115 2006-01-04 Fernando Perez <Fernando.Perez@colorado.edu>
107
116
108 * IPython/Shell.py (IPShellGTK.mainloop): fix bug in the GTK
117 * IPython/Shell.py (IPShellGTK.mainloop): fix bug in the GTK
109 backend for matplotlib (100% cpu utiliziation). Thanks to Charlie
118 backend for matplotlib (100% cpu utiliziation). Thanks to Charlie
110 Moad for help with tracking it down.
119 Moad for help with tracking it down.
111
120
112 * IPython/iplib.py (handle_auto): fix autocall handling for
121 * IPython/iplib.py (handle_auto): fix autocall handling for
113 objects which support BOTH __getitem__ and __call__ (so that f [x]
122 objects which support BOTH __getitem__ and __call__ (so that f [x]
114 is left alone, instead of becoming f([x]) automatically).
123 is left alone, instead of becoming f([x]) automatically).
115
124
116 * IPython/Magic.py (magic_cd): fix crash when cd -b was used.
125 * IPython/Magic.py (magic_cd): fix crash when cd -b was used.
117 Ville's patch.
126 Ville's patch.
118
127
119 2006-01-03 Fernando Perez <Fernando.Perez@colorado.edu>
128 2006-01-03 Fernando Perez <Fernando.Perez@colorado.edu>
120
129
121 * IPython/iplib.py (handle_auto): changed autocall semantics to
130 * IPython/iplib.py (handle_auto): changed autocall semantics to
122 include 'smart' mode, where the autocall transformation is NOT
131 include 'smart' mode, where the autocall transformation is NOT
123 applied if there are no arguments on the line. This allows you to
132 applied if there are no arguments on the line. This allows you to
124 just type 'foo' if foo is a callable to see its internal form,
133 just type 'foo' if foo is a callable to see its internal form,
125 instead of having it called with no arguments (typically a
134 instead of having it called with no arguments (typically a
126 mistake). The old 'full' autocall still exists: for that, you
135 mistake). The old 'full' autocall still exists: for that, you
127 need to set the 'autocall' parameter to 2 in your ipythonrc file.
136 need to set the 'autocall' parameter to 2 in your ipythonrc file.
128
137
129 * IPython/completer.py (Completer.attr_matches): add
138 * IPython/completer.py (Completer.attr_matches): add
130 tab-completion support for Enthoughts' traits. After a report by
139 tab-completion support for Enthoughts' traits. After a report by
131 Arnd and a patch by Prabhu.
140 Arnd and a patch by Prabhu.
132
141
133 2006-01-02 Fernando Perez <Fernando.Perez@colorado.edu>
142 2006-01-02 Fernando Perez <Fernando.Perez@colorado.edu>
134
143
135 * IPython/ultraTB.py (_fixed_getinnerframes): added Alex
144 * IPython/ultraTB.py (_fixed_getinnerframes): added Alex
136 Schmolck's patch to fix inspect.getinnerframes().
145 Schmolck's patch to fix inspect.getinnerframes().
137
146
138 * IPython/iplib.py (InteractiveShell.__init__): significant fixes
147 * IPython/iplib.py (InteractiveShell.__init__): significant fixes
139 for embedded instances, regarding handling of namespaces and items
148 for embedded instances, regarding handling of namespaces and items
140 added to the __builtin__ one. Multiple embedded instances and
149 added to the __builtin__ one. Multiple embedded instances and
141 recursive embeddings should work better now (though I'm not sure
150 recursive embeddings should work better now (though I'm not sure
142 I've got all the corner cases fixed, that code is a bit of a brain
151 I've got all the corner cases fixed, that code is a bit of a brain
143 twister).
152 twister).
144
153
145 * IPython/Magic.py (magic_edit): added support to edit in-memory
154 * IPython/Magic.py (magic_edit): added support to edit in-memory
146 macros (automatically creates the necessary temp files). %edit
155 macros (automatically creates the necessary temp files). %edit
147 also doesn't return the file contents anymore, it's just noise.
156 also doesn't return the file contents anymore, it's just noise.
148
157
149 * IPython/completer.py (Completer.attr_matches): revert change to
158 * IPython/completer.py (Completer.attr_matches): revert change to
150 complete only on attributes listed in __all__. I realized it
159 complete only on attributes listed in __all__. I realized it
151 cripples the tab-completion system as a tool for exploring the
160 cripples the tab-completion system as a tool for exploring the
152 internals of unknown libraries (it renders any non-__all__
161 internals of unknown libraries (it renders any non-__all__
153 attribute off-limits). I got bit by this when trying to see
162 attribute off-limits). I got bit by this when trying to see
154 something inside the dis module.
163 something inside the dis module.
155
164
156 2005-12-31 Fernando Perez <Fernando.Perez@colorado.edu>
165 2005-12-31 Fernando Perez <Fernando.Perez@colorado.edu>
157
166
158 * IPython/iplib.py (InteractiveShell.__init__): add .meta
167 * IPython/iplib.py (InteractiveShell.__init__): add .meta
159 namespace for users and extension writers to hold data in. This
168 namespace for users and extension writers to hold data in. This
160 follows the discussion in
169 follows the discussion in
161 http://projects.scipy.org/ipython/ipython/wiki/RefactoringIPython.
170 http://projects.scipy.org/ipython/ipython/wiki/RefactoringIPython.
162
171
163 * IPython/completer.py (IPCompleter.complete): small patch to help
172 * IPython/completer.py (IPCompleter.complete): small patch to help
164 tab-completion under Emacs, after a suggestion by John Barnard
173 tab-completion under Emacs, after a suggestion by John Barnard
165 <barnarj-AT-ccf.org>.
174 <barnarj-AT-ccf.org>.
166
175
167 * IPython/Magic.py (Magic.extract_input_slices): added support for
176 * IPython/Magic.py (Magic.extract_input_slices): added support for
168 the slice notation in magics to use N-M to represent numbers N...M
177 the slice notation in magics to use N-M to represent numbers N...M
169 (closed endpoints). This is used by %macro and %save.
178 (closed endpoints). This is used by %macro and %save.
170
179
171 * IPython/completer.py (Completer.attr_matches): for modules which
180 * IPython/completer.py (Completer.attr_matches): for modules which
172 define __all__, complete only on those. After a patch by Jeffrey
181 define __all__, complete only on those. After a patch by Jeffrey
173 Collins <jcollins_boulder-AT-earthlink.net>. Also, clean up and
182 Collins <jcollins_boulder-AT-earthlink.net>. Also, clean up and
174 speed up this routine.
183 speed up this routine.
175
184
176 * IPython/Logger.py (Logger.log): fix a history handling bug. I
185 * IPython/Logger.py (Logger.log): fix a history handling bug. I
177 don't know if this is the end of it, but the behavior now is
186 don't know if this is the end of it, but the behavior now is
178 certainly much more correct. Note that coupled with macros,
187 certainly much more correct. Note that coupled with macros,
179 slightly surprising (at first) behavior may occur: a macro will in
188 slightly surprising (at first) behavior may occur: a macro will in
180 general expand to multiple lines of input, so upon exiting, the
189 general expand to multiple lines of input, so upon exiting, the
181 in/out counters will both be bumped by the corresponding amount
190 in/out counters will both be bumped by the corresponding amount
182 (as if the macro's contents had been typed interactively). Typing
191 (as if the macro's contents had been typed interactively). Typing
183 %hist will reveal the intermediate (silently processed) lines.
192 %hist will reveal the intermediate (silently processed) lines.
184
193
185 * IPython/Magic.py (magic_run): fix a subtle bug which could cause
194 * IPython/Magic.py (magic_run): fix a subtle bug which could cause
186 pickle to fail (%run was overwriting __main__ and not restoring
195 pickle to fail (%run was overwriting __main__ and not restoring
187 it, but pickle relies on __main__ to operate).
196 it, but pickle relies on __main__ to operate).
188
197
189 * IPython/iplib.py (InteractiveShell): fix pdb calling: I'm now
198 * IPython/iplib.py (InteractiveShell): fix pdb calling: I'm now
190 using properties, but forgot to make the main InteractiveShell
199 using properties, but forgot to make the main InteractiveShell
191 class a new-style class. Properties fail silently, and
200 class a new-style class. Properties fail silently, and
192 misteriously, with old-style class (getters work, but
201 misteriously, with old-style class (getters work, but
193 setters don't do anything).
202 setters don't do anything).
194
203
195 2005-12-30 Fernando Perez <Fernando.Perez@colorado.edu>
204 2005-12-30 Fernando Perez <Fernando.Perez@colorado.edu>
196
205
197 * IPython/Magic.py (magic_history): fix history reporting bug (I
206 * IPython/Magic.py (magic_history): fix history reporting bug (I
198 know some nasties are still there, I just can't seem to find a
207 know some nasties are still there, I just can't seem to find a
199 reproducible test case to track them down; the input history is
208 reproducible test case to track them down; the input history is
200 falling out of sync...)
209 falling out of sync...)
201
210
202 * IPython/iplib.py (handle_shell_escape): fix bug where both
211 * IPython/iplib.py (handle_shell_escape): fix bug where both
203 aliases and system accesses where broken for indented code (such
212 aliases and system accesses where broken for indented code (such
204 as loops).
213 as loops).
205
214
206 * IPython/genutils.py (shell): fix small but critical bug for
215 * IPython/genutils.py (shell): fix small but critical bug for
207 win32 system access.
216 win32 system access.
208
217
209 2005-12-29 Fernando Perez <Fernando.Perez@colorado.edu>
218 2005-12-29 Fernando Perez <Fernando.Perez@colorado.edu>
210
219
211 * IPython/iplib.py (showtraceback): remove use of the
220 * IPython/iplib.py (showtraceback): remove use of the
212 sys.last_{type/value/traceback} structures, which are non
221 sys.last_{type/value/traceback} structures, which are non
213 thread-safe.
222 thread-safe.
214 (_prefilter): change control flow to ensure that we NEVER
223 (_prefilter): change control flow to ensure that we NEVER
215 introspect objects when autocall is off. This will guarantee that
224 introspect objects when autocall is off. This will guarantee that
216 having an input line of the form 'x.y', where access to attribute
225 having an input line of the form 'x.y', where access to attribute
217 'y' has side effects, doesn't trigger the side effect TWICE. It
226 'y' has side effects, doesn't trigger the side effect TWICE. It
218 is important to note that, with autocall on, these side effects
227 is important to note that, with autocall on, these side effects
219 can still happen.
228 can still happen.
220 (ipsystem): new builtin, to complete the ip{magic/alias/system}
229 (ipsystem): new builtin, to complete the ip{magic/alias/system}
221 trio. IPython offers these three kinds of special calls which are
230 trio. IPython offers these three kinds of special calls which are
222 not python code, and it's a good thing to have their call method
231 not python code, and it's a good thing to have their call method
223 be accessible as pure python functions (not just special syntax at
232 be accessible as pure python functions (not just special syntax at
224 the command line). It gives us a better internal implementation
233 the command line). It gives us a better internal implementation
225 structure, as well as exposing these for user scripting more
234 structure, as well as exposing these for user scripting more
226 cleanly.
235 cleanly.
227
236
228 * IPython/macro.py (Macro.__init__): moved macros to a standalone
237 * IPython/macro.py (Macro.__init__): moved macros to a standalone
229 file. Now that they'll be more likely to be used with the
238 file. Now that they'll be more likely to be used with the
230 persistance system (%store), I want to make sure their module path
239 persistance system (%store), I want to make sure their module path
231 doesn't change in the future, so that we don't break things for
240 doesn't change in the future, so that we don't break things for
232 users' persisted data.
241 users' persisted data.
233
242
234 * IPython/iplib.py (autoindent_update): move indentation
243 * IPython/iplib.py (autoindent_update): move indentation
235 management into the _text_ processing loop, not the keyboard
244 management into the _text_ processing loop, not the keyboard
236 interactive one. This is necessary to correctly process non-typed
245 interactive one. This is necessary to correctly process non-typed
237 multiline input (such as macros).
246 multiline input (such as macros).
238
247
239 * IPython/Magic.py (Magic.format_latex): patch by Stefan van der
248 * IPython/Magic.py (Magic.format_latex): patch by Stefan van der
240 Walt <stefan-AT-sun.ac.za> to fix latex formatting of docstrings,
249 Walt <stefan-AT-sun.ac.za> to fix latex formatting of docstrings,
241 which was producing problems in the resulting manual.
250 which was producing problems in the resulting manual.
242 (magic_whos): improve reporting of instances (show their class,
251 (magic_whos): improve reporting of instances (show their class,
243 instead of simply printing 'instance' which isn't terribly
252 instead of simply printing 'instance' which isn't terribly
244 informative).
253 informative).
245
254
246 * IPython/genutils.py (shell): commit Jorgen Stenarson's patch
255 * IPython/genutils.py (shell): commit Jorgen Stenarson's patch
247 (minor mods) to support network shares under win32.
256 (minor mods) to support network shares under win32.
248
257
249 * IPython/winconsole.py (get_console_size): add new winconsole
258 * IPython/winconsole.py (get_console_size): add new winconsole
250 module and fixes to page_dumb() to improve its behavior under
259 module and fixes to page_dumb() to improve its behavior under
251 win32. Contributed by Alexander Belchenko <bialix-AT-ukr.net>.
260 win32. Contributed by Alexander Belchenko <bialix-AT-ukr.net>.
252
261
253 * IPython/Magic.py (Macro): simplified Macro class to just
262 * IPython/Magic.py (Macro): simplified Macro class to just
254 subclass list. We've had only 2.2 compatibility for a very long
263 subclass list. We've had only 2.2 compatibility for a very long
255 time, yet I was still avoiding subclassing the builtin types. No
264 time, yet I was still avoiding subclassing the builtin types. No
256 more (I'm also starting to use properties, though I won't shift to
265 more (I'm also starting to use properties, though I won't shift to
257 2.3-specific features quite yet).
266 2.3-specific features quite yet).
258 (magic_store): added Ville's patch for lightweight variable
267 (magic_store): added Ville's patch for lightweight variable
259 persistence, after a request on the user list by Matt Wilkie
268 persistence, after a request on the user list by Matt Wilkie
260 <maphew-AT-gmail.com>. The new %store magic's docstring has full
269 <maphew-AT-gmail.com>. The new %store magic's docstring has full
261 details.
270 details.
262
271
263 * IPython/iplib.py (InteractiveShell.post_config_initialization):
272 * IPython/iplib.py (InteractiveShell.post_config_initialization):
264 changed the default logfile name from 'ipython.log' to
273 changed the default logfile name from 'ipython.log' to
265 'ipython_log.py'. These logs are real python files, and now that
274 'ipython_log.py'. These logs are real python files, and now that
266 we have much better multiline support, people are more likely to
275 we have much better multiline support, people are more likely to
267 want to use them as such. Might as well name them correctly.
276 want to use them as such. Might as well name them correctly.
268
277
269 * IPython/Magic.py: substantial cleanup. While we can't stop
278 * IPython/Magic.py: substantial cleanup. While we can't stop
270 using magics as mixins, due to the existing customizations 'out
279 using magics as mixins, due to the existing customizations 'out
271 there' which rely on the mixin naming conventions, at least I
280 there' which rely on the mixin naming conventions, at least I
272 cleaned out all cross-class name usage. So once we are OK with
281 cleaned out all cross-class name usage. So once we are OK with
273 breaking compatibility, the two systems can be separated.
282 breaking compatibility, the two systems can be separated.
274
283
275 * IPython/Logger.py: major cleanup. This one is NOT a mixin
284 * IPython/Logger.py: major cleanup. This one is NOT a mixin
276 anymore, and the class is a fair bit less hideous as well. New
285 anymore, and the class is a fair bit less hideous as well. New
277 features were also introduced: timestamping of input, and logging
286 features were also introduced: timestamping of input, and logging
278 of output results. These are user-visible with the -t and -o
287 of output results. These are user-visible with the -t and -o
279 options to %logstart. Closes
288 options to %logstart. Closes
280 http://www.scipy.net/roundup/ipython/issue11 and a request by
289 http://www.scipy.net/roundup/ipython/issue11 and a request by
281 William Stein (SAGE developer - http://modular.ucsd.edu/sage).
290 William Stein (SAGE developer - http://modular.ucsd.edu/sage).
282
291
283 2005-12-28 Fernando Perez <Fernando.Perez@colorado.edu>
292 2005-12-28 Fernando Perez <Fernando.Perez@colorado.edu>
284
293
285 * IPython/iplib.py (handle_shell_escape): add Ville's patch to
294 * IPython/iplib.py (handle_shell_escape): add Ville's patch to
286 better hadnle backslashes in paths. See the thread 'More Windows
295 better hadnle backslashes in paths. See the thread 'More Windows
287 questions part 2 - \/ characters revisited' on the iypthon user
296 questions part 2 - \/ characters revisited' on the iypthon user
288 list:
297 list:
289 http://scipy.net/pipermail/ipython-user/2005-June/000907.html
298 http://scipy.net/pipermail/ipython-user/2005-June/000907.html
290
299
291 (InteractiveShell.__init__): fix tab-completion bug in threaded shells.
300 (InteractiveShell.__init__): fix tab-completion bug in threaded shells.
292
301
293 (InteractiveShell.__init__): change threaded shells to not use the
302 (InteractiveShell.__init__): change threaded shells to not use the
294 ipython crash handler. This was causing more problems than not,
303 ipython crash handler. This was causing more problems than not,
295 as exceptions in the main thread (GUI code, typically) would
304 as exceptions in the main thread (GUI code, typically) would
296 always show up as a 'crash', when they really weren't.
305 always show up as a 'crash', when they really weren't.
297
306
298 The colors and exception mode commands (%colors/%xmode) have been
307 The colors and exception mode commands (%colors/%xmode) have been
299 synchronized to also take this into account, so users can get
308 synchronized to also take this into account, so users can get
300 verbose exceptions for their threaded code as well. I also added
309 verbose exceptions for their threaded code as well. I also added
301 support for activating pdb inside this exception handler as well,
310 support for activating pdb inside this exception handler as well,
302 so now GUI authors can use IPython's enhanced pdb at runtime.
311 so now GUI authors can use IPython's enhanced pdb at runtime.
303
312
304 * IPython/ipmaker.py (make_IPython): make the autoedit_syntax flag
313 * IPython/ipmaker.py (make_IPython): make the autoedit_syntax flag
305 true by default, and add it to the shipped ipythonrc file. Since
314 true by default, and add it to the shipped ipythonrc file. Since
306 this asks the user before proceeding, I think it's OK to make it
315 this asks the user before proceeding, I think it's OK to make it
307 true by default.
316 true by default.
308
317
309 * IPython/Magic.py (magic_exit): make new exit/quit magics instead
318 * IPython/Magic.py (magic_exit): make new exit/quit magics instead
310 of the previous special-casing of input in the eval loop. I think
319 of the previous special-casing of input in the eval loop. I think
311 this is cleaner, as they really are commands and shouldn't have
320 this is cleaner, as they really are commands and shouldn't have
312 a special role in the middle of the core code.
321 a special role in the middle of the core code.
313
322
314 2005-12-27 Fernando Perez <Fernando.Perez@colorado.edu>
323 2005-12-27 Fernando Perez <Fernando.Perez@colorado.edu>
315
324
316 * IPython/iplib.py (edit_syntax_error): added support for
325 * IPython/iplib.py (edit_syntax_error): added support for
317 automatically reopening the editor if the file had a syntax error
326 automatically reopening the editor if the file had a syntax error
318 in it. Thanks to scottt who provided the patch at:
327 in it. Thanks to scottt who provided the patch at:
319 http://www.scipy.net/roundup/ipython/issue36 (slightly modified
328 http://www.scipy.net/roundup/ipython/issue36 (slightly modified
320 version committed).
329 version committed).
321
330
322 * IPython/iplib.py (handle_normal): add suport for multi-line
331 * IPython/iplib.py (handle_normal): add suport for multi-line
323 input with emtpy lines. This fixes
332 input with emtpy lines. This fixes
324 http://www.scipy.net/roundup/ipython/issue43 and a similar
333 http://www.scipy.net/roundup/ipython/issue43 and a similar
325 discussion on the user list.
334 discussion on the user list.
326
335
327 WARNING: a behavior change is necessarily introduced to support
336 WARNING: a behavior change is necessarily introduced to support
328 blank lines: now a single blank line with whitespace does NOT
337 blank lines: now a single blank line with whitespace does NOT
329 break the input loop, which means that when autoindent is on, by
338 break the input loop, which means that when autoindent is on, by
330 default hitting return on the next (indented) line does NOT exit.
339 default hitting return on the next (indented) line does NOT exit.
331
340
332 Instead, to exit a multiline input you can either have:
341 Instead, to exit a multiline input you can either have:
333
342
334 - TWO whitespace lines (just hit return again), or
343 - TWO whitespace lines (just hit return again), or
335 - a single whitespace line of a different length than provided
344 - a single whitespace line of a different length than provided
336 by the autoindent (add or remove a space).
345 by the autoindent (add or remove a space).
337
346
338 * IPython/completer.py (MagicCompleter.__init__): new 'completer'
347 * IPython/completer.py (MagicCompleter.__init__): new 'completer'
339 module to better organize all readline-related functionality.
348 module to better organize all readline-related functionality.
340 I've deleted FlexCompleter and put all completion clases here.
349 I've deleted FlexCompleter and put all completion clases here.
341
350
342 * IPython/iplib.py (raw_input): improve indentation management.
351 * IPython/iplib.py (raw_input): improve indentation management.
343 It is now possible to paste indented code with autoindent on, and
352 It is now possible to paste indented code with autoindent on, and
344 the code is interpreted correctly (though it still looks bad on
353 the code is interpreted correctly (though it still looks bad on
345 screen, due to the line-oriented nature of ipython).
354 screen, due to the line-oriented nature of ipython).
346 (MagicCompleter.complete): change behavior so that a TAB key on an
355 (MagicCompleter.complete): change behavior so that a TAB key on an
347 otherwise empty line actually inserts a tab, instead of completing
356 otherwise empty line actually inserts a tab, instead of completing
348 on the entire global namespace. This makes it easier to use the
357 on the entire global namespace. This makes it easier to use the
349 TAB key for indentation. After a request by Hans Meine
358 TAB key for indentation. After a request by Hans Meine
350 <hans_meine-AT-gmx.net>
359 <hans_meine-AT-gmx.net>
351 (_prefilter): add support so that typing plain 'exit' or 'quit'
360 (_prefilter): add support so that typing plain 'exit' or 'quit'
352 does a sensible thing. Originally I tried to deviate as little as
361 does a sensible thing. Originally I tried to deviate as little as
353 possible from the default python behavior, but even that one may
362 possible from the default python behavior, but even that one may
354 change in this direction (thread on python-dev to that effect).
363 change in this direction (thread on python-dev to that effect).
355 Regardless, ipython should do the right thing even if CPython's
364 Regardless, ipython should do the right thing even if CPython's
356 '>>>' prompt doesn't.
365 '>>>' prompt doesn't.
357 (InteractiveShell): removed subclassing code.InteractiveConsole
366 (InteractiveShell): removed subclassing code.InteractiveConsole
358 class. By now we'd overridden just about all of its methods: I've
367 class. By now we'd overridden just about all of its methods: I've
359 copied the remaining two over, and now ipython is a standalone
368 copied the remaining two over, and now ipython is a standalone
360 class. This will provide a clearer picture for the chainsaw
369 class. This will provide a clearer picture for the chainsaw
361 branch refactoring.
370 branch refactoring.
362
371
363 2005-12-26 Fernando Perez <Fernando.Perez@colorado.edu>
372 2005-12-26 Fernando Perez <Fernando.Perez@colorado.edu>
364
373
365 * IPython/ultraTB.py (VerboseTB.text): harden reporting against
374 * IPython/ultraTB.py (VerboseTB.text): harden reporting against
366 failures for objects which break when dir() is called on them.
375 failures for objects which break when dir() is called on them.
367
376
368 * IPython/FlexCompleter.py (Completer.__init__): Added support for
377 * IPython/FlexCompleter.py (Completer.__init__): Added support for
369 distinct local and global namespaces in the completer API. This
378 distinct local and global namespaces in the completer API. This
370 change allows us top properly handle completion with distinct
379 change allows us top properly handle completion with distinct
371 scopes, including in embedded instances (this had never really
380 scopes, including in embedded instances (this had never really
372 worked correctly).
381 worked correctly).
373
382
374 Note: this introduces a change in the constructor for
383 Note: this introduces a change in the constructor for
375 MagicCompleter, as a new global_namespace parameter is now the
384 MagicCompleter, as a new global_namespace parameter is now the
376 second argument (the others were bumped one position).
385 second argument (the others were bumped one position).
377
386
378 2005-12-25 Fernando Perez <Fernando.Perez@colorado.edu>
387 2005-12-25 Fernando Perez <Fernando.Perez@colorado.edu>
379
388
380 * IPython/iplib.py (embed_mainloop): fix tab-completion in
389 * IPython/iplib.py (embed_mainloop): fix tab-completion in
381 embedded instances (which can be done now thanks to Vivian's
390 embedded instances (which can be done now thanks to Vivian's
382 frame-handling fixes for pdb).
391 frame-handling fixes for pdb).
383 (InteractiveShell.__init__): Fix namespace handling problem in
392 (InteractiveShell.__init__): Fix namespace handling problem in
384 embedded instances. We were overwriting __main__ unconditionally,
393 embedded instances. We were overwriting __main__ unconditionally,
385 and this should only be done for 'full' (non-embedded) IPython;
394 and this should only be done for 'full' (non-embedded) IPython;
386 embedded instances must respect the caller's __main__. Thanks to
395 embedded instances must respect the caller's __main__. Thanks to
387 a bug report by Yaroslav Bulatov <yaroslavvb-AT-gmail.com>
396 a bug report by Yaroslav Bulatov <yaroslavvb-AT-gmail.com>
388
397
389 2005-12-24 Fernando Perez <Fernando.Perez@colorado.edu>
398 2005-12-24 Fernando Perez <Fernando.Perez@colorado.edu>
390
399
391 * setup.py: added download_url to setup(). This registers the
400 * setup.py: added download_url to setup(). This registers the
392 download address at PyPI, which is not only useful to humans
401 download address at PyPI, which is not only useful to humans
393 browsing the site, but is also picked up by setuptools (the Eggs
402 browsing the site, but is also picked up by setuptools (the Eggs
394 machinery). Thanks to Ville and R. Kern for the info/discussion
403 machinery). Thanks to Ville and R. Kern for the info/discussion
395 on this.
404 on this.
396
405
397 2005-12-23 Fernando Perez <Fernando.Perez@colorado.edu>
406 2005-12-23 Fernando Perez <Fernando.Perez@colorado.edu>
398
407
399 * IPython/Debugger.py (Pdb.__init__): Major pdb mode enhancements.
408 * IPython/Debugger.py (Pdb.__init__): Major pdb mode enhancements.
400 This brings a lot of nice functionality to the pdb mode, which now
409 This brings a lot of nice functionality to the pdb mode, which now
401 has tab-completion, syntax highlighting, and better stack handling
410 has tab-completion, syntax highlighting, and better stack handling
402 than before. Many thanks to Vivian De Smedt
411 than before. Many thanks to Vivian De Smedt
403 <vivian-AT-vdesmedt.com> for the original patches.
412 <vivian-AT-vdesmedt.com> for the original patches.
404
413
405 2005-12-08 Fernando Perez <Fernando.Perez@colorado.edu>
414 2005-12-08 Fernando Perez <Fernando.Perez@colorado.edu>
406
415
407 * IPython/Shell.py (IPShellGTK.mainloop): fix mainloop() calling
416 * IPython/Shell.py (IPShellGTK.mainloop): fix mainloop() calling
408 sequence to consistently accept the banner argument. The
417 sequence to consistently accept the banner argument. The
409 inconsistency was tripping SAGE, thanks to Gary Zablackis
418 inconsistency was tripping SAGE, thanks to Gary Zablackis
410 <gzabl-AT-yahoo.com> for the report.
419 <gzabl-AT-yahoo.com> for the report.
411
420
412 2005-11-15 Fernando Perez <Fernando.Perez@colorado.edu>
421 2005-11-15 Fernando Perez <Fernando.Perez@colorado.edu>
413
422
414 * IPython/iplib.py (InteractiveShell.post_config_initialization):
423 * IPython/iplib.py (InteractiveShell.post_config_initialization):
415 Fix bug where a naked 'alias' call in the ipythonrc file would
424 Fix bug where a naked 'alias' call in the ipythonrc file would
416 cause a crash. Bug reported by Jorgen Stenarson.
425 cause a crash. Bug reported by Jorgen Stenarson.
417
426
418 2005-11-15 Fernando Perez <Fernando.Perez@colorado.edu>
427 2005-11-15 Fernando Perez <Fernando.Perez@colorado.edu>
419
428
420 * IPython/ipmaker.py (make_IPython): cleanups which should improve
429 * IPython/ipmaker.py (make_IPython): cleanups which should improve
421 startup time.
430 startup time.
422
431
423 * IPython/iplib.py (runcode): my globals 'fix' for embedded
432 * IPython/iplib.py (runcode): my globals 'fix' for embedded
424 instances had introduced a bug with globals in normal code. Now
433 instances had introduced a bug with globals in normal code. Now
425 it's working in all cases.
434 it's working in all cases.
426
435
427 * IPython/Magic.py (magic_psearch): Finish wildcard cleanup and
436 * IPython/Magic.py (magic_psearch): Finish wildcard cleanup and
428 API changes. A new ipytonrc option, 'wildcards_case_sensitive'
437 API changes. A new ipytonrc option, 'wildcards_case_sensitive'
429 has been introduced to set the default case sensitivity of the
438 has been introduced to set the default case sensitivity of the
430 searches. Users can still select either mode at runtime on a
439 searches. Users can still select either mode at runtime on a
431 per-search basis.
440 per-search basis.
432
441
433 2005-11-13 Fernando Perez <Fernando.Perez@colorado.edu>
442 2005-11-13 Fernando Perez <Fernando.Perez@colorado.edu>
434
443
435 * IPython/wildcard.py (NameSpace.__init__): fix resolution of
444 * IPython/wildcard.py (NameSpace.__init__): fix resolution of
436 attributes in wildcard searches for subclasses. Modified version
445 attributes in wildcard searches for subclasses. Modified version
437 of a patch by Jorgen.
446 of a patch by Jorgen.
438
447
439 2005-11-12 Fernando Perez <Fernando.Perez@colorado.edu>
448 2005-11-12 Fernando Perez <Fernando.Perez@colorado.edu>
440
449
441 * IPython/iplib.py (embed_mainloop): Fix handling of globals for
450 * IPython/iplib.py (embed_mainloop): Fix handling of globals for
442 embedded instances. I added a user_global_ns attribute to the
451 embedded instances. I added a user_global_ns attribute to the
443 InteractiveShell class to handle this.
452 InteractiveShell class to handle this.
444
453
445 2005-10-31 Fernando Perez <Fernando.Perez@colorado.edu>
454 2005-10-31 Fernando Perez <Fernando.Perez@colorado.edu>
446
455
447 * IPython/Shell.py (IPShellGTK.mainloop): Change timeout_add to
456 * IPython/Shell.py (IPShellGTK.mainloop): Change timeout_add to
448 idle_add, which fixes horrible keyboard lag problems under gtk 2.6
457 idle_add, which fixes horrible keyboard lag problems under gtk 2.6
449 (reported under win32, but may happen also in other platforms).
458 (reported under win32, but may happen also in other platforms).
450 Bug report and fix courtesy of Sean Moore <smm-AT-logic.bm>
459 Bug report and fix courtesy of Sean Moore <smm-AT-logic.bm>
451
460
452 2005-10-15 Fernando Perez <Fernando.Perez@colorado.edu>
461 2005-10-15 Fernando Perez <Fernando.Perez@colorado.edu>
453
462
454 * IPython/Magic.py (magic_psearch): new support for wildcard
463 * IPython/Magic.py (magic_psearch): new support for wildcard
455 patterns. Now, typing ?a*b will list all names which begin with a
464 patterns. Now, typing ?a*b will list all names which begin with a
456 and end in b, for example. The %psearch magic has full
465 and end in b, for example. The %psearch magic has full
457 docstrings. Many thanks to JΓΆrgen Stenarson
466 docstrings. Many thanks to JΓΆrgen Stenarson
458 <jorgen.stenarson-AT-bostream.nu>, author of the patches
467 <jorgen.stenarson-AT-bostream.nu>, author of the patches
459 implementing this functionality.
468 implementing this functionality.
460
469
461 2005-09-27 Fernando Perez <Fernando.Perez@colorado.edu>
470 2005-09-27 Fernando Perez <Fernando.Perez@colorado.edu>
462
471
463 * Manual: fixed long-standing annoyance of double-dashes (as in
472 * Manual: fixed long-standing annoyance of double-dashes (as in
464 --prefix=~, for example) being stripped in the HTML version. This
473 --prefix=~, for example) being stripped in the HTML version. This
465 is a latex2html bug, but a workaround was provided. Many thanks
474 is a latex2html bug, but a workaround was provided. Many thanks
466 to George K. Thiruvathukal <gthiruv-AT-luc.edu> for the detailed
475 to George K. Thiruvathukal <gthiruv-AT-luc.edu> for the detailed
467 help, and Michael Tobis <mtobis-AT-gmail.com> for getting the ball
476 help, and Michael Tobis <mtobis-AT-gmail.com> for getting the ball
468 rolling. This seemingly small issue had tripped a number of users
477 rolling. This seemingly small issue had tripped a number of users
469 when first installing, so I'm glad to see it gone.
478 when first installing, so I'm glad to see it gone.
470
479
471 2005-09-27 Fernando Perez <Fernando.Perez@colorado.edu>
480 2005-09-27 Fernando Perez <Fernando.Perez@colorado.edu>
472
481
473 * IPython/Extensions/numeric_formats.py: fix missing import,
482 * IPython/Extensions/numeric_formats.py: fix missing import,
474 reported by Stephen Walton.
483 reported by Stephen Walton.
475
484
476 2005-09-24 Fernando Perez <Fernando.Perez@colorado.edu>
485 2005-09-24 Fernando Perez <Fernando.Perez@colorado.edu>
477
486
478 * IPython/demo.py: finish demo module, fully documented now.
487 * IPython/demo.py: finish demo module, fully documented now.
479
488
480 * IPython/genutils.py (file_read): simple little utility to read a
489 * IPython/genutils.py (file_read): simple little utility to read a
481 file and ensure it's closed afterwards.
490 file and ensure it's closed afterwards.
482
491
483 2005-09-23 Fernando Perez <Fernando.Perez@colorado.edu>
492 2005-09-23 Fernando Perez <Fernando.Perez@colorado.edu>
484
493
485 * IPython/demo.py (Demo.__init__): added support for individually
494 * IPython/demo.py (Demo.__init__): added support for individually
486 tagging blocks for automatic execution.
495 tagging blocks for automatic execution.
487
496
488 * IPython/Magic.py (magic_pycat): new %pycat magic for showing
497 * IPython/Magic.py (magic_pycat): new %pycat magic for showing
489 syntax-highlighted python sources, requested by John.
498 syntax-highlighted python sources, requested by John.
490
499
491 2005-09-22 Fernando Perez <Fernando.Perez@colorado.edu>
500 2005-09-22 Fernando Perez <Fernando.Perez@colorado.edu>
492
501
493 * IPython/demo.py (Demo.again): fix bug where again() blocks after
502 * IPython/demo.py (Demo.again): fix bug where again() blocks after
494 finishing.
503 finishing.
495
504
496 * IPython/genutils.py (shlex_split): moved from Magic to here,
505 * IPython/genutils.py (shlex_split): moved from Magic to here,
497 where all 2.2 compatibility stuff lives. I needed it for demo.py.
506 where all 2.2 compatibility stuff lives. I needed it for demo.py.
498
507
499 * IPython/demo.py (Demo.__init__): added support for silent
508 * IPython/demo.py (Demo.__init__): added support for silent
500 blocks, improved marks as regexps, docstrings written.
509 blocks, improved marks as regexps, docstrings written.
501 (Demo.__init__): better docstring, added support for sys.argv.
510 (Demo.__init__): better docstring, added support for sys.argv.
502
511
503 * IPython/genutils.py (marquee): little utility used by the demo
512 * IPython/genutils.py (marquee): little utility used by the demo
504 code, handy in general.
513 code, handy in general.
505
514
506 * IPython/demo.py (Demo.__init__): new class for interactive
515 * IPython/demo.py (Demo.__init__): new class for interactive
507 demos. Not documented yet, I just wrote it in a hurry for
516 demos. Not documented yet, I just wrote it in a hurry for
508 scipy'05. Will docstring later.
517 scipy'05. Will docstring later.
509
518
510 2005-09-20 Fernando Perez <Fernando.Perez@colorado.edu>
519 2005-09-20 Fernando Perez <Fernando.Perez@colorado.edu>
511
520
512 * IPython/Shell.py (sigint_handler): Drastic simplification which
521 * IPython/Shell.py (sigint_handler): Drastic simplification which
513 also seems to make Ctrl-C work correctly across threads! This is
522 also seems to make Ctrl-C work correctly across threads! This is
514 so simple, that I can't beleive I'd missed it before. Needs more
523 so simple, that I can't beleive I'd missed it before. Needs more
515 testing, though.
524 testing, though.
516 (KBINT): Never mind, revert changes. I'm sure I'd tried something
525 (KBINT): Never mind, revert changes. I'm sure I'd tried something
517 like this before...
526 like this before...
518
527
519 * IPython/genutils.py (get_home_dir): add protection against
528 * IPython/genutils.py (get_home_dir): add protection against
520 non-dirs in win32 registry.
529 non-dirs in win32 registry.
521
530
522 * IPython/iplib.py (InteractiveShell.alias_table_validate): fix
531 * IPython/iplib.py (InteractiveShell.alias_table_validate): fix
523 bug where dict was mutated while iterating (pysh crash).
532 bug where dict was mutated while iterating (pysh crash).
524
533
525 2005-09-06 Fernando Perez <Fernando.Perez@colorado.edu>
534 2005-09-06 Fernando Perez <Fernando.Perez@colorado.edu>
526
535
527 * IPython/iplib.py (handle_auto): Fix inconsistency arising from
536 * IPython/iplib.py (handle_auto): Fix inconsistency arising from
528 spurious newlines added by this routine. After a report by
537 spurious newlines added by this routine. After a report by
529 F. Mantegazza.
538 F. Mantegazza.
530
539
531 2005-09-05 Fernando Perez <Fernando.Perez@colorado.edu>
540 2005-09-05 Fernando Perez <Fernando.Perez@colorado.edu>
532
541
533 * IPython/Shell.py (hijack_gtk): remove pygtk.require("2.0")
542 * IPython/Shell.py (hijack_gtk): remove pygtk.require("2.0")
534 calls. These were a leftover from the GTK 1.x days, and can cause
543 calls. These were a leftover from the GTK 1.x days, and can cause
535 problems in certain cases (after a report by John Hunter).
544 problems in certain cases (after a report by John Hunter).
536
545
537 * IPython/iplib.py (InteractiveShell.__init__): Trap exception if
546 * IPython/iplib.py (InteractiveShell.__init__): Trap exception if
538 os.getcwd() fails at init time. Thanks to patch from David Remahl
547 os.getcwd() fails at init time. Thanks to patch from David Remahl
539 <chmod007-AT-mac.com>.
548 <chmod007-AT-mac.com>.
540 (InteractiveShell.__init__): prevent certain special magics from
549 (InteractiveShell.__init__): prevent certain special magics from
541 being shadowed by aliases. Closes
550 being shadowed by aliases. Closes
542 http://www.scipy.net/roundup/ipython/issue41.
551 http://www.scipy.net/roundup/ipython/issue41.
543
552
544 2005-08-31 Fernando Perez <Fernando.Perez@colorado.edu>
553 2005-08-31 Fernando Perez <Fernando.Perez@colorado.edu>
545
554
546 * IPython/iplib.py (InteractiveShell.complete): Added new
555 * IPython/iplib.py (InteractiveShell.complete): Added new
547 top-level completion method to expose the completion mechanism
556 top-level completion method to expose the completion mechanism
548 beyond readline-based environments.
557 beyond readline-based environments.
549
558
550 2005-08-19 Fernando Perez <Fernando.Perez@colorado.edu>
559 2005-08-19 Fernando Perez <Fernando.Perez@colorado.edu>
551
560
552 * tools/ipsvnc (svnversion): fix svnversion capture.
561 * tools/ipsvnc (svnversion): fix svnversion capture.
553
562
554 * IPython/iplib.py (InteractiveShell.__init__): Add has_readline
563 * IPython/iplib.py (InteractiveShell.__init__): Add has_readline
555 attribute to self, which was missing. Before, it was set by a
564 attribute to self, which was missing. Before, it was set by a
556 routine which in certain cases wasn't being called, so the
565 routine which in certain cases wasn't being called, so the
557 instance could end up missing the attribute. This caused a crash.
566 instance could end up missing the attribute. This caused a crash.
558 Closes http://www.scipy.net/roundup/ipython/issue40.
567 Closes http://www.scipy.net/roundup/ipython/issue40.
559
568
560 2005-08-16 Fernando Perez <fperez@colorado.edu>
569 2005-08-16 Fernando Perez <fperez@colorado.edu>
561
570
562 * IPython/ultraTB.py (VerboseTB.text): don't crash if object
571 * IPython/ultraTB.py (VerboseTB.text): don't crash if object
563 contains non-string attribute. Closes
572 contains non-string attribute. Closes
564 http://www.scipy.net/roundup/ipython/issue38.
573 http://www.scipy.net/roundup/ipython/issue38.
565
574
566 2005-08-14 Fernando Perez <fperez@colorado.edu>
575 2005-08-14 Fernando Perez <fperez@colorado.edu>
567
576
568 * tools/ipsvnc: Minor improvements, to add changeset info.
577 * tools/ipsvnc: Minor improvements, to add changeset info.
569
578
570 2005-08-12 Fernando Perez <fperez@colorado.edu>
579 2005-08-12 Fernando Perez <fperez@colorado.edu>
571
580
572 * IPython/iplib.py (runsource): remove self.code_to_run_src
581 * IPython/iplib.py (runsource): remove self.code_to_run_src
573 attribute. I realized this is nothing more than
582 attribute. I realized this is nothing more than
574 '\n'.join(self.buffer), and having the same data in two different
583 '\n'.join(self.buffer), and having the same data in two different
575 places is just asking for synchronization bugs. This may impact
584 places is just asking for synchronization bugs. This may impact
576 people who have custom exception handlers, so I need to warn
585 people who have custom exception handlers, so I need to warn
577 ipython-dev about it (F. Mantegazza may use them).
586 ipython-dev about it (F. Mantegazza may use them).
578
587
579 2005-07-29 Fernando Perez <Fernando.Perez@colorado.edu>
588 2005-07-29 Fernando Perez <Fernando.Perez@colorado.edu>
580
589
581 * IPython/genutils.py: fix 2.2 compatibility (generators)
590 * IPython/genutils.py: fix 2.2 compatibility (generators)
582
591
583 2005-07-18 Fernando Perez <fperez@colorado.edu>
592 2005-07-18 Fernando Perez <fperez@colorado.edu>
584
593
585 * IPython/genutils.py (get_home_dir): fix to help users with
594 * IPython/genutils.py (get_home_dir): fix to help users with
586 invalid $HOME under win32.
595 invalid $HOME under win32.
587
596
588 2005-07-17 Fernando Perez <fperez@colorado.edu>
597 2005-07-17 Fernando Perez <fperez@colorado.edu>
589
598
590 * IPython/Prompts.py (str_safe): Make unicode-safe. Also remove
599 * IPython/Prompts.py (str_safe): Make unicode-safe. Also remove
591 some old hacks and clean up a bit other routines; code should be
600 some old hacks and clean up a bit other routines; code should be
592 simpler and a bit faster.
601 simpler and a bit faster.
593
602
594 * IPython/iplib.py (interact): removed some last-resort attempts
603 * IPython/iplib.py (interact): removed some last-resort attempts
595 to survive broken stdout/stderr. That code was only making it
604 to survive broken stdout/stderr. That code was only making it
596 harder to abstract out the i/o (necessary for gui integration),
605 harder to abstract out the i/o (necessary for gui integration),
597 and the crashes it could prevent were extremely rare in practice
606 and the crashes it could prevent were extremely rare in practice
598 (besides being fully user-induced in a pretty violent manner).
607 (besides being fully user-induced in a pretty violent manner).
599
608
600 * IPython/genutils.py (IOStream.__init__): Simplify the i/o stuff.
609 * IPython/genutils.py (IOStream.__init__): Simplify the i/o stuff.
601 Nothing major yet, but the code is simpler to read; this should
610 Nothing major yet, but the code is simpler to read; this should
602 make it easier to do more serious modifications in the future.
611 make it easier to do more serious modifications in the future.
603
612
604 * IPython/Extensions/InterpreterExec.py: Fix auto-quoting in pysh,
613 * IPython/Extensions/InterpreterExec.py: Fix auto-quoting in pysh,
605 which broke in .15 (thanks to a report by Ville).
614 which broke in .15 (thanks to a report by Ville).
606
615
607 * IPython/Itpl.py (Itpl.__init__): add unicode support (it may not
616 * IPython/Itpl.py (Itpl.__init__): add unicode support (it may not
608 be quite correct, I know next to nothing about unicode). This
617 be quite correct, I know next to nothing about unicode). This
609 will allow unicode strings to be used in prompts, amongst other
618 will allow unicode strings to be used in prompts, amongst other
610 cases. It also will prevent ipython from crashing when unicode
619 cases. It also will prevent ipython from crashing when unicode
611 shows up unexpectedly in many places. If ascii encoding fails, we
620 shows up unexpectedly in many places. If ascii encoding fails, we
612 assume utf_8. Currently the encoding is not a user-visible
621 assume utf_8. Currently the encoding is not a user-visible
613 setting, though it could be made so if there is demand for it.
622 setting, though it could be made so if there is demand for it.
614
623
615 * IPython/ipmaker.py (make_IPython): remove old 2.1-specific hack.
624 * IPython/ipmaker.py (make_IPython): remove old 2.1-specific hack.
616
625
617 * IPython/Struct.py (Struct.merge): switch keys() to iterator.
626 * IPython/Struct.py (Struct.merge): switch keys() to iterator.
618
627
619 * IPython/background_jobs.py: moved 2.2 compatibility to genutils.
628 * IPython/background_jobs.py: moved 2.2 compatibility to genutils.
620
629
621 * IPython/genutils.py: Add 2.2 compatibility here, so all other
630 * IPython/genutils.py: Add 2.2 compatibility here, so all other
622 code can work transparently for 2.2/2.3.
631 code can work transparently for 2.2/2.3.
623
632
624 2005-07-16 Fernando Perez <fperez@colorado.edu>
633 2005-07-16 Fernando Perez <fperez@colorado.edu>
625
634
626 * IPython/ultraTB.py (ExceptionColors): Make a global variable
635 * IPython/ultraTB.py (ExceptionColors): Make a global variable
627 out of the color scheme table used for coloring exception
636 out of the color scheme table used for coloring exception
628 tracebacks. This allows user code to add new schemes at runtime.
637 tracebacks. This allows user code to add new schemes at runtime.
629 This is a minimally modified version of the patch at
638 This is a minimally modified version of the patch at
630 http://www.scipy.net/roundup/ipython/issue35, many thanks to pabw
639 http://www.scipy.net/roundup/ipython/issue35, many thanks to pabw
631 for the contribution.
640 for the contribution.
632
641
633 * IPython/FlexCompleter.py (Completer.attr_matches): Add a
642 * IPython/FlexCompleter.py (Completer.attr_matches): Add a
634 slightly modified version of the patch in
643 slightly modified version of the patch in
635 http://www.scipy.net/roundup/ipython/issue34, which also allows me
644 http://www.scipy.net/roundup/ipython/issue34, which also allows me
636 to remove the previous try/except solution (which was costlier).
645 to remove the previous try/except solution (which was costlier).
637 Thanks to Gaetan Lehmann <gaetan.lehmann-AT-jouy.inra.fr> for the fix.
646 Thanks to Gaetan Lehmann <gaetan.lehmann-AT-jouy.inra.fr> for the fix.
638
647
639 2005-06-08 Fernando Perez <fperez@colorado.edu>
648 2005-06-08 Fernando Perez <fperez@colorado.edu>
640
649
641 * IPython/iplib.py (write/write_err): Add methods to abstract all
650 * IPython/iplib.py (write/write_err): Add methods to abstract all
642 I/O a bit more.
651 I/O a bit more.
643
652
644 * IPython/Shell.py (IPShellGTK.mainloop): Fix GTK deprecation
653 * IPython/Shell.py (IPShellGTK.mainloop): Fix GTK deprecation
645 warning, reported by Aric Hagberg, fix by JD Hunter.
654 warning, reported by Aric Hagberg, fix by JD Hunter.
646
655
647 2005-06-02 *** Released version 0.6.15
656 2005-06-02 *** Released version 0.6.15
648
657
649 2005-06-01 Fernando Perez <fperez@colorado.edu>
658 2005-06-01 Fernando Perez <fperez@colorado.edu>
650
659
651 * IPython/iplib.py (MagicCompleter.file_matches): Fix
660 * IPython/iplib.py (MagicCompleter.file_matches): Fix
652 tab-completion of filenames within open-quoted strings. Note that
661 tab-completion of filenames within open-quoted strings. Note that
653 this requires that in ~/.ipython/ipythonrc, users change the
662 this requires that in ~/.ipython/ipythonrc, users change the
654 readline delimiters configuration to read:
663 readline delimiters configuration to read:
655
664
656 readline_remove_delims -/~
665 readline_remove_delims -/~
657
666
658
667
659 2005-05-31 *** Released version 0.6.14
668 2005-05-31 *** Released version 0.6.14
660
669
661 2005-05-29 Fernando Perez <fperez@colorado.edu>
670 2005-05-29 Fernando Perez <fperez@colorado.edu>
662
671
663 * IPython/ultraTB.py (VerboseTB.text): Fix crash for tracebacks
672 * IPython/ultraTB.py (VerboseTB.text): Fix crash for tracebacks
664 with files not on the filesystem. Reported by Eliyahu Sandler
673 with files not on the filesystem. Reported by Eliyahu Sandler
665 <eli@gondolin.net>
674 <eli@gondolin.net>
666
675
667 2005-05-22 Fernando Perez <fperez@colorado.edu>
676 2005-05-22 Fernando Perez <fperez@colorado.edu>
668
677
669 * IPython/iplib.py: Fix a few crashes in the --upgrade option.
678 * IPython/iplib.py: Fix a few crashes in the --upgrade option.
670 After an initial report by LUK ShunTim <shuntim.luk@polyu.edu.hk>.
679 After an initial report by LUK ShunTim <shuntim.luk@polyu.edu.hk>.
671
680
672 2005-05-19 Fernando Perez <fperez@colorado.edu>
681 2005-05-19 Fernando Perez <fperez@colorado.edu>
673
682
674 * IPython/iplib.py (safe_execfile): close a file which could be
683 * IPython/iplib.py (safe_execfile): close a file which could be
675 left open (causing problems in win32, which locks open files).
684 left open (causing problems in win32, which locks open files).
676 Thanks to a bug report by D Brown <dbrown2@yahoo.com>.
685 Thanks to a bug report by D Brown <dbrown2@yahoo.com>.
677
686
678 2005-05-18 Fernando Perez <fperez@colorado.edu>
687 2005-05-18 Fernando Perez <fperez@colorado.edu>
679
688
680 * IPython/Shell.py (MatplotlibShellBase.mplot_exec): pass all
689 * IPython/Shell.py (MatplotlibShellBase.mplot_exec): pass all
681 keyword arguments correctly to safe_execfile().
690 keyword arguments correctly to safe_execfile().
682
691
683 2005-05-13 Fernando Perez <fperez@colorado.edu>
692 2005-05-13 Fernando Perez <fperez@colorado.edu>
684
693
685 * ipython.1: Added info about Qt to manpage, and threads warning
694 * ipython.1: Added info about Qt to manpage, and threads warning
686 to usage page (invoked with --help).
695 to usage page (invoked with --help).
687
696
688 * IPython/iplib.py (MagicCompleter.python_func_kw_matches): Added
697 * IPython/iplib.py (MagicCompleter.python_func_kw_matches): Added
689 new matcher (it goes at the end of the priority list) to do
698 new matcher (it goes at the end of the priority list) to do
690 tab-completion on named function arguments. Submitted by George
699 tab-completion on named function arguments. Submitted by George
691 Sakkis <gsakkis-AT-eden.rutgers.edu>. See the thread at
700 Sakkis <gsakkis-AT-eden.rutgers.edu>. See the thread at
692 http://www.scipy.net/pipermail/ipython-dev/2005-April/000436.html
701 http://www.scipy.net/pipermail/ipython-dev/2005-April/000436.html
693 for more details.
702 for more details.
694
703
695 * IPython/Magic.py (magic_run): Added new -e flag to ignore
704 * IPython/Magic.py (magic_run): Added new -e flag to ignore
696 SystemExit exceptions in the script being run. Thanks to a report
705 SystemExit exceptions in the script being run. Thanks to a report
697 by danny shevitz <danny_shevitz-AT-yahoo.com>, about this
706 by danny shevitz <danny_shevitz-AT-yahoo.com>, about this
698 producing very annoying behavior when running unit tests.
707 producing very annoying behavior when running unit tests.
699
708
700 2005-05-12 Fernando Perez <fperez@colorado.edu>
709 2005-05-12 Fernando Perez <fperez@colorado.edu>
701
710
702 * IPython/iplib.py (handle_auto): fixed auto-quoting and parens,
711 * IPython/iplib.py (handle_auto): fixed auto-quoting and parens,
703 which I'd broken (again) due to a changed regexp. In the process,
712 which I'd broken (again) due to a changed regexp. In the process,
704 added ';' as an escape to auto-quote the whole line without
713 added ';' as an escape to auto-quote the whole line without
705 splitting its arguments. Thanks to a report by Jerry McRae
714 splitting its arguments. Thanks to a report by Jerry McRae
706 <qrs0xyc02-AT-sneakemail.com>.
715 <qrs0xyc02-AT-sneakemail.com>.
707
716
708 * IPython/ultraTB.py (VerboseTB.text): protect against rare but
717 * IPython/ultraTB.py (VerboseTB.text): protect against rare but
709 possible crashes caused by a TokenError. Reported by Ed Schofield
718 possible crashes caused by a TokenError. Reported by Ed Schofield
710 <schofield-AT-ftw.at>.
719 <schofield-AT-ftw.at>.
711
720
712 2005-05-06 Fernando Perez <fperez@colorado.edu>
721 2005-05-06 Fernando Perez <fperez@colorado.edu>
713
722
714 * IPython/Shell.py (hijack_wx): Fix to work with WX v.2.6.
723 * IPython/Shell.py (hijack_wx): Fix to work with WX v.2.6.
715
724
716 2005-04-29 Fernando Perez <fperez@colorado.edu>
725 2005-04-29 Fernando Perez <fperez@colorado.edu>
717
726
718 * IPython/Shell.py (IPShellQt): Thanks to Denis Rivière
727 * IPython/Shell.py (IPShellQt): Thanks to Denis Rivière
719 <nudz-AT-free.fr>, Yann Cointepas <yann-AT-sapetnioc.org> and Benjamin
728 <nudz-AT-free.fr>, Yann Cointepas <yann-AT-sapetnioc.org> and Benjamin
720 Thyreau <Benji2-AT-decideur.info>, we now have a -qthread option
729 Thyreau <Benji2-AT-decideur.info>, we now have a -qthread option
721 which provides support for Qt interactive usage (similar to the
730 which provides support for Qt interactive usage (similar to the
722 existing one for WX and GTK). This had been often requested.
731 existing one for WX and GTK). This had been often requested.
723
732
724 2005-04-14 *** Released version 0.6.13
733 2005-04-14 *** Released version 0.6.13
725
734
726 2005-04-08 Fernando Perez <fperez@colorado.edu>
735 2005-04-08 Fernando Perez <fperez@colorado.edu>
727
736
728 * IPython/Magic.py (Magic._ofind): remove docstring evaluation
737 * IPython/Magic.py (Magic._ofind): remove docstring evaluation
729 from _ofind, which gets called on almost every input line. Now,
738 from _ofind, which gets called on almost every input line. Now,
730 we only try to get docstrings if they are actually going to be
739 we only try to get docstrings if they are actually going to be
731 used (the overhead of fetching unnecessary docstrings can be
740 used (the overhead of fetching unnecessary docstrings can be
732 noticeable for certain objects, such as Pyro proxies).
741 noticeable for certain objects, such as Pyro proxies).
733
742
734 * IPython/iplib.py (MagicCompleter.python_matches): Change the API
743 * IPython/iplib.py (MagicCompleter.python_matches): Change the API
735 for completers. For some reason I had been passing them the state
744 for completers. For some reason I had been passing them the state
736 variable, which completers never actually need, and was in
745 variable, which completers never actually need, and was in
737 conflict with the rlcompleter API. Custom completers ONLY need to
746 conflict with the rlcompleter API. Custom completers ONLY need to
738 take the text parameter.
747 take the text parameter.
739
748
740 * IPython/Extensions/InterpreterExec.py: Fix regexp so that magics
749 * IPython/Extensions/InterpreterExec.py: Fix regexp so that magics
741 work correctly in pysh. I've also moved all the logic which used
750 work correctly in pysh. I've also moved all the logic which used
742 to be in pysh.py here, which will prevent problems with future
751 to be in pysh.py here, which will prevent problems with future
743 upgrades. However, this time I must warn users to update their
752 upgrades. However, this time I must warn users to update their
744 pysh profile to include the line
753 pysh profile to include the line
745
754
746 import_all IPython.Extensions.InterpreterExec
755 import_all IPython.Extensions.InterpreterExec
747
756
748 because otherwise things won't work for them. They MUST also
757 because otherwise things won't work for them. They MUST also
749 delete pysh.py and the line
758 delete pysh.py and the line
750
759
751 execfile pysh.py
760 execfile pysh.py
752
761
753 from their ipythonrc-pysh.
762 from their ipythonrc-pysh.
754
763
755 * IPython/FlexCompleter.py (Completer.attr_matches): Make more
764 * IPython/FlexCompleter.py (Completer.attr_matches): Make more
756 robust in the face of objects whose dir() returns non-strings
765 robust in the face of objects whose dir() returns non-strings
757 (which it shouldn't, but some broken libs like ITK do). Thanks to
766 (which it shouldn't, but some broken libs like ITK do). Thanks to
758 a patch by John Hunter (implemented differently, though). Also
767 a patch by John Hunter (implemented differently, though). Also
759 minor improvements by using .extend instead of + on lists.
768 minor improvements by using .extend instead of + on lists.
760
769
761 * pysh.py:
770 * pysh.py:
762
771
763 2005-04-06 Fernando Perez <fperez@colorado.edu>
772 2005-04-06 Fernando Perez <fperez@colorado.edu>
764
773
765 * IPython/ipmaker.py (make_IPython): Make multi_line_specials on
774 * IPython/ipmaker.py (make_IPython): Make multi_line_specials on
766 by default, so that all users benefit from it. Those who don't
775 by default, so that all users benefit from it. Those who don't
767 want it can still turn it off.
776 want it can still turn it off.
768
777
769 * IPython/UserConfig/ipythonrc: Add multi_line_specials to the
778 * IPython/UserConfig/ipythonrc: Add multi_line_specials to the
770 config file, I'd forgotten about this, so users were getting it
779 config file, I'd forgotten about this, so users were getting it
771 off by default.
780 off by default.
772
781
773 * IPython/iplib.py (ipmagic): big overhaul of the magic system for
782 * IPython/iplib.py (ipmagic): big overhaul of the magic system for
774 consistency. Now magics can be called in multiline statements,
783 consistency. Now magics can be called in multiline statements,
775 and python variables can be expanded in magic calls via $var.
784 and python variables can be expanded in magic calls via $var.
776 This makes the magic system behave just like aliases or !system
785 This makes the magic system behave just like aliases or !system
777 calls.
786 calls.
778
787
779 2005-03-28 Fernando Perez <fperez@colorado.edu>
788 2005-03-28 Fernando Perez <fperez@colorado.edu>
780
789
781 * IPython/iplib.py (handle_auto): cleanup to use %s instead of
790 * IPython/iplib.py (handle_auto): cleanup to use %s instead of
782 expensive string additions for building command. Add support for
791 expensive string additions for building command. Add support for
783 trailing ';' when autocall is used.
792 trailing ';' when autocall is used.
784
793
785 2005-03-26 Fernando Perez <fperez@colorado.edu>
794 2005-03-26 Fernando Perez <fperez@colorado.edu>
786
795
787 * ipython.el: Fix http://www.scipy.net/roundup/ipython/issue31.
796 * ipython.el: Fix http://www.scipy.net/roundup/ipython/issue31.
788 Bugfix by A. Schmolck, the ipython.el maintainer. Also make
797 Bugfix by A. Schmolck, the ipython.el maintainer. Also make
789 ipython.el robust against prompts with any number of spaces
798 ipython.el robust against prompts with any number of spaces
790 (including 0) after the ':' character.
799 (including 0) after the ':' character.
791
800
792 * IPython/Prompts.py (Prompt2.set_p_str): Fix spurious space in
801 * IPython/Prompts.py (Prompt2.set_p_str): Fix spurious space in
793 continuation prompt, which misled users to think the line was
802 continuation prompt, which misled users to think the line was
794 already indented. Closes debian Bug#300847, reported to me by
803 already indented. Closes debian Bug#300847, reported to me by
795 Norbert Tretkowski <tretkowski-AT-inittab.de>.
804 Norbert Tretkowski <tretkowski-AT-inittab.de>.
796
805
797 2005-03-23 Fernando Perez <fperez@colorado.edu>
806 2005-03-23 Fernando Perez <fperez@colorado.edu>
798
807
799 * IPython/Prompts.py (Prompt1.__str__): Make sure that prompts are
808 * IPython/Prompts.py (Prompt1.__str__): Make sure that prompts are
800 properly aligned if they have embedded newlines.
809 properly aligned if they have embedded newlines.
801
810
802 * IPython/iplib.py (runlines): Add a public method to expose
811 * IPython/iplib.py (runlines): Add a public method to expose
803 IPython's code execution machinery, so that users can run strings
812 IPython's code execution machinery, so that users can run strings
804 as if they had been typed at the prompt interactively.
813 as if they had been typed at the prompt interactively.
805 (InteractiveShell.__init__): Added getoutput() to the __IPYTHON__
814 (InteractiveShell.__init__): Added getoutput() to the __IPYTHON__
806 methods which can call the system shell, but with python variable
815 methods which can call the system shell, but with python variable
807 expansion. The three such methods are: __IPYTHON__.system,
816 expansion. The three such methods are: __IPYTHON__.system,
808 .getoutput and .getoutputerror. These need to be documented in a
817 .getoutput and .getoutputerror. These need to be documented in a
809 'public API' section (to be written) of the manual.
818 'public API' section (to be written) of the manual.
810
819
811 2005-03-20 Fernando Perez <fperez@colorado.edu>
820 2005-03-20 Fernando Perez <fperez@colorado.edu>
812
821
813 * IPython/iplib.py (InteractiveShell.set_custom_exc): new system
822 * IPython/iplib.py (InteractiveShell.set_custom_exc): new system
814 for custom exception handling. This is quite powerful, and it
823 for custom exception handling. This is quite powerful, and it
815 allows for user-installable exception handlers which can trap
824 allows for user-installable exception handlers which can trap
816 custom exceptions at runtime and treat them separately from
825 custom exceptions at runtime and treat them separately from
817 IPython's default mechanisms. At the request of FrΓ©dΓ©ric
826 IPython's default mechanisms. At the request of FrΓ©dΓ©ric
818 Mantegazza <mantegazza-AT-ill.fr>.
827 Mantegazza <mantegazza-AT-ill.fr>.
819 (InteractiveShell.set_custom_completer): public API function to
828 (InteractiveShell.set_custom_completer): public API function to
820 add new completers at runtime.
829 add new completers at runtime.
821
830
822 2005-03-19 Fernando Perez <fperez@colorado.edu>
831 2005-03-19 Fernando Perez <fperez@colorado.edu>
823
832
824 * IPython/OInspect.py (getdoc): Add a call to obj.getdoc(), to
833 * IPython/OInspect.py (getdoc): Add a call to obj.getdoc(), to
825 allow objects which provide their docstrings via non-standard
834 allow objects which provide their docstrings via non-standard
826 mechanisms (like Pyro proxies) to still be inspected by ipython's
835 mechanisms (like Pyro proxies) to still be inspected by ipython's
827 ? system.
836 ? system.
828
837
829 * IPython/iplib.py (InteractiveShell.__init__): back off the _o/_e
838 * IPython/iplib.py (InteractiveShell.__init__): back off the _o/_e
830 automatic capture system. I tried quite hard to make it work
839 automatic capture system. I tried quite hard to make it work
831 reliably, and simply failed. I tried many combinations with the
840 reliably, and simply failed. I tried many combinations with the
832 subprocess module, but eventually nothing worked in all needed
841 subprocess module, but eventually nothing worked in all needed
833 cases (not blocking stdin for the child, duplicating stdout
842 cases (not blocking stdin for the child, duplicating stdout
834 without blocking, etc). The new %sc/%sx still do capture to these
843 without blocking, etc). The new %sc/%sx still do capture to these
835 magical list/string objects which make shell use much more
844 magical list/string objects which make shell use much more
836 conveninent, so not all is lost.
845 conveninent, so not all is lost.
837
846
838 XXX - FIX MANUAL for the change above!
847 XXX - FIX MANUAL for the change above!
839
848
840 (runsource): I copied code.py's runsource() into ipython to modify
849 (runsource): I copied code.py's runsource() into ipython to modify
841 it a bit. Now the code object and source to be executed are
850 it a bit. Now the code object and source to be executed are
842 stored in ipython. This makes this info accessible to third-party
851 stored in ipython. This makes this info accessible to third-party
843 tools, like custom exception handlers. After a request by FrΓ©dΓ©ric
852 tools, like custom exception handlers. After a request by FrΓ©dΓ©ric
844 Mantegazza <mantegazza-AT-ill.fr>.
853 Mantegazza <mantegazza-AT-ill.fr>.
845
854
846 * IPython/UserConfig/ipythonrc: Add up/down arrow keys to
855 * IPython/UserConfig/ipythonrc: Add up/down arrow keys to
847 history-search via readline (like C-p/C-n). I'd wanted this for a
856 history-search via readline (like C-p/C-n). I'd wanted this for a
848 long time, but only recently found out how to do it. For users
857 long time, but only recently found out how to do it. For users
849 who already have their ipythonrc files made and want this, just
858 who already have their ipythonrc files made and want this, just
850 add:
859 add:
851
860
852 readline_parse_and_bind "\e[A": history-search-backward
861 readline_parse_and_bind "\e[A": history-search-backward
853 readline_parse_and_bind "\e[B": history-search-forward
862 readline_parse_and_bind "\e[B": history-search-forward
854
863
855 2005-03-18 Fernando Perez <fperez@colorado.edu>
864 2005-03-18 Fernando Perez <fperez@colorado.edu>
856
865
857 * IPython/Magic.py (magic_sc): %sc and %sx now use the fancy
866 * IPython/Magic.py (magic_sc): %sc and %sx now use the fancy
858 LSString and SList classes which allow transparent conversions
867 LSString and SList classes which allow transparent conversions
859 between list mode and whitespace-separated string.
868 between list mode and whitespace-separated string.
860 (magic_r): Fix recursion problem in %r.
869 (magic_r): Fix recursion problem in %r.
861
870
862 * IPython/genutils.py (LSString): New class to be used for
871 * IPython/genutils.py (LSString): New class to be used for
863 automatic storage of the results of all alias/system calls in _o
872 automatic storage of the results of all alias/system calls in _o
864 and _e (stdout/err). These provide a .l/.list attribute which
873 and _e (stdout/err). These provide a .l/.list attribute which
865 does automatic splitting on newlines. This means that for most
874 does automatic splitting on newlines. This means that for most
866 uses, you'll never need to do capturing of output with %sc/%sx
875 uses, you'll never need to do capturing of output with %sc/%sx
867 anymore, since ipython keeps this always done for you. Note that
876 anymore, since ipython keeps this always done for you. Note that
868 only the LAST results are stored, the _o/e variables are
877 only the LAST results are stored, the _o/e variables are
869 overwritten on each call. If you need to save their contents
878 overwritten on each call. If you need to save their contents
870 further, simply bind them to any other name.
879 further, simply bind them to any other name.
871
880
872 2005-03-17 Fernando Perez <fperez@colorado.edu>
881 2005-03-17 Fernando Perez <fperez@colorado.edu>
873
882
874 * IPython/Prompts.py (BasePrompt.cwd_filt): a few more fixes for
883 * IPython/Prompts.py (BasePrompt.cwd_filt): a few more fixes for
875 prompt namespace handling.
884 prompt namespace handling.
876
885
877 2005-03-16 Fernando Perez <fperez@colorado.edu>
886 2005-03-16 Fernando Perez <fperez@colorado.edu>
878
887
879 * IPython/Prompts.py (CachedOutput.__init__): Fix default and
888 * IPython/Prompts.py (CachedOutput.__init__): Fix default and
880 classic prompts to be '>>> ' (final space was missing, and it
889 classic prompts to be '>>> ' (final space was missing, and it
881 trips the emacs python mode).
890 trips the emacs python mode).
882 (BasePrompt.__str__): Added safe support for dynamic prompt
891 (BasePrompt.__str__): Added safe support for dynamic prompt
883 strings. Now you can set your prompt string to be '$x', and the
892 strings. Now you can set your prompt string to be '$x', and the
884 value of x will be printed from your interactive namespace. The
893 value of x will be printed from your interactive namespace. The
885 interpolation syntax includes the full Itpl support, so
894 interpolation syntax includes the full Itpl support, so
886 ${foo()+x+bar()} is a valid prompt string now, and the function
895 ${foo()+x+bar()} is a valid prompt string now, and the function
887 calls will be made at runtime.
896 calls will be made at runtime.
888
897
889 2005-03-15 Fernando Perez <fperez@colorado.edu>
898 2005-03-15 Fernando Perez <fperez@colorado.edu>
890
899
891 * IPython/Magic.py (magic_history): renamed %hist to %history, to
900 * IPython/Magic.py (magic_history): renamed %hist to %history, to
892 avoid name clashes in pylab. %hist still works, it just forwards
901 avoid name clashes in pylab. %hist still works, it just forwards
893 the call to %history.
902 the call to %history.
894
903
895 2005-03-02 *** Released version 0.6.12
904 2005-03-02 *** Released version 0.6.12
896
905
897 2005-03-02 Fernando Perez <fperez@colorado.edu>
906 2005-03-02 Fernando Perez <fperez@colorado.edu>
898
907
899 * IPython/iplib.py (handle_magic): log magic calls properly as
908 * IPython/iplib.py (handle_magic): log magic calls properly as
900 ipmagic() function calls.
909 ipmagic() function calls.
901
910
902 * IPython/Magic.py (magic_time): Improved %time to support
911 * IPython/Magic.py (magic_time): Improved %time to support
903 statements and provide wall-clock as well as CPU time.
912 statements and provide wall-clock as well as CPU time.
904
913
905 2005-02-27 Fernando Perez <fperez@colorado.edu>
914 2005-02-27 Fernando Perez <fperez@colorado.edu>
906
915
907 * IPython/hooks.py: New hooks module, to expose user-modifiable
916 * IPython/hooks.py: New hooks module, to expose user-modifiable
908 IPython functionality in a clean manner. For now only the editor
917 IPython functionality in a clean manner. For now only the editor
909 hook is actually written, and other thigns which I intend to turn
918 hook is actually written, and other thigns which I intend to turn
910 into proper hooks aren't yet there. The display and prefilter
919 into proper hooks aren't yet there. The display and prefilter
911 stuff, for example, should be hooks. But at least now the
920 stuff, for example, should be hooks. But at least now the
912 framework is in place, and the rest can be moved here with more
921 framework is in place, and the rest can be moved here with more
913 time later. IPython had had a .hooks variable for a long time for
922 time later. IPython had had a .hooks variable for a long time for
914 this purpose, but I'd never actually used it for anything.
923 this purpose, but I'd never actually used it for anything.
915
924
916 2005-02-26 Fernando Perez <fperez@colorado.edu>
925 2005-02-26 Fernando Perez <fperez@colorado.edu>
917
926
918 * IPython/ipmaker.py (make_IPython): make the default ipython
927 * IPython/ipmaker.py (make_IPython): make the default ipython
919 directory be called _ipython under win32, to follow more the
928 directory be called _ipython under win32, to follow more the
920 naming peculiarities of that platform (where buggy software like
929 naming peculiarities of that platform (where buggy software like
921 Visual Sourcesafe breaks with .named directories). Reported by
930 Visual Sourcesafe breaks with .named directories). Reported by
922 Ville Vainio.
931 Ville Vainio.
923
932
924 2005-02-23 Fernando Perez <fperez@colorado.edu>
933 2005-02-23 Fernando Perez <fperez@colorado.edu>
925
934
926 * IPython/iplib.py (InteractiveShell.__init__): removed a few
935 * IPython/iplib.py (InteractiveShell.__init__): removed a few
927 auto_aliases for win32 which were causing problems. Users can
936 auto_aliases for win32 which were causing problems. Users can
928 define the ones they personally like.
937 define the ones they personally like.
929
938
930 2005-02-21 Fernando Perez <fperez@colorado.edu>
939 2005-02-21 Fernando Perez <fperez@colorado.edu>
931
940
932 * IPython/Magic.py (magic_time): new magic to time execution of
941 * IPython/Magic.py (magic_time): new magic to time execution of
933 expressions. After a request by Charles Moad <cmoad-AT-indiana.edu>.
942 expressions. After a request by Charles Moad <cmoad-AT-indiana.edu>.
934
943
935 2005-02-19 Fernando Perez <fperez@colorado.edu>
944 2005-02-19 Fernando Perez <fperez@colorado.edu>
936
945
937 * IPython/ConfigLoader.py (ConfigLoader.load): Allow empty strings
946 * IPython/ConfigLoader.py (ConfigLoader.load): Allow empty strings
938 into keys (for prompts, for example).
947 into keys (for prompts, for example).
939
948
940 * IPython/Prompts.py (BasePrompt.set_p_str): Fix to allow empty
949 * IPython/Prompts.py (BasePrompt.set_p_str): Fix to allow empty
941 prompts in case users want them. This introduces a small behavior
950 prompts in case users want them. This introduces a small behavior
942 change: ipython does not automatically add a space to all prompts
951 change: ipython does not automatically add a space to all prompts
943 anymore. To get the old prompts with a space, users should add it
952 anymore. To get the old prompts with a space, users should add it
944 manually to their ipythonrc file, so for example prompt_in1 should
953 manually to their ipythonrc file, so for example prompt_in1 should
945 now read 'In [\#]: ' instead of 'In [\#]:'.
954 now read 'In [\#]: ' instead of 'In [\#]:'.
946 (BasePrompt.__init__): New option prompts_pad_left (only in rc
955 (BasePrompt.__init__): New option prompts_pad_left (only in rc
947 file) to control left-padding of secondary prompts.
956 file) to control left-padding of secondary prompts.
948
957
949 * IPython/Magic.py (Magic.profile_missing_notice): Don't crash if
958 * IPython/Magic.py (Magic.profile_missing_notice): Don't crash if
950 the profiler can't be imported. Fix for Debian, which removed
959 the profiler can't be imported. Fix for Debian, which removed
951 profile.py because of License issues. I applied a slightly
960 profile.py because of License issues. I applied a slightly
952 modified version of the original Debian patch at
961 modified version of the original Debian patch at
953 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=294500.
962 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=294500.
954
963
955 2005-02-17 Fernando Perez <fperez@colorado.edu>
964 2005-02-17 Fernando Perez <fperez@colorado.edu>
956
965
957 * IPython/genutils.py (native_line_ends): Fix bug which would
966 * IPython/genutils.py (native_line_ends): Fix bug which would
958 cause improper line-ends under win32 b/c I was not opening files
967 cause improper line-ends under win32 b/c I was not opening files
959 in binary mode. Bug report and fix thanks to Ville.
968 in binary mode. Bug report and fix thanks to Ville.
960
969
961 * IPython/iplib.py (handle_auto): Fix bug which I introduced when
970 * IPython/iplib.py (handle_auto): Fix bug which I introduced when
962 trying to catch spurious foo[1] autocalls. My fix actually broke
971 trying to catch spurious foo[1] autocalls. My fix actually broke
963 ',/' autoquote/call with explicit escape (bad regexp).
972 ',/' autoquote/call with explicit escape (bad regexp).
964
973
965 2005-02-15 *** Released version 0.6.11
974 2005-02-15 *** Released version 0.6.11
966
975
967 2005-02-14 Fernando Perez <fperez@colorado.edu>
976 2005-02-14 Fernando Perez <fperez@colorado.edu>
968
977
969 * IPython/background_jobs.py: New background job management
978 * IPython/background_jobs.py: New background job management
970 subsystem. This is implemented via a new set of classes, and
979 subsystem. This is implemented via a new set of classes, and
971 IPython now provides a builtin 'jobs' object for background job
980 IPython now provides a builtin 'jobs' object for background job
972 execution. A convenience %bg magic serves as a lightweight
981 execution. A convenience %bg magic serves as a lightweight
973 frontend for starting the more common type of calls. This was
982 frontend for starting the more common type of calls. This was
974 inspired by discussions with B. Granger and the BackgroundCommand
983 inspired by discussions with B. Granger and the BackgroundCommand
975 class described in the book Python Scripting for Computational
984 class described in the book Python Scripting for Computational
976 Science, by H. P. Langtangen: http://folk.uio.no/hpl/scripting
985 Science, by H. P. Langtangen: http://folk.uio.no/hpl/scripting
977 (although ultimately no code from this text was used, as IPython's
986 (although ultimately no code from this text was used, as IPython's
978 system is a separate implementation).
987 system is a separate implementation).
979
988
980 * IPython/iplib.py (MagicCompleter.python_matches): add new option
989 * IPython/iplib.py (MagicCompleter.python_matches): add new option
981 to control the completion of single/double underscore names
990 to control the completion of single/double underscore names
982 separately. As documented in the example ipytonrc file, the
991 separately. As documented in the example ipytonrc file, the
983 readline_omit__names variable can now be set to 2, to omit even
992 readline_omit__names variable can now be set to 2, to omit even
984 single underscore names. Thanks to a patch by Brian Wong
993 single underscore names. Thanks to a patch by Brian Wong
985 <BrianWong-AT-AirgoNetworks.Com>.
994 <BrianWong-AT-AirgoNetworks.Com>.
986 (InteractiveShell.__init__): Fix bug which would cause foo[1] to
995 (InteractiveShell.__init__): Fix bug which would cause foo[1] to
987 be autocalled as foo([1]) if foo were callable. A problem for
996 be autocalled as foo([1]) if foo were callable. A problem for
988 things which are both callable and implement __getitem__.
997 things which are both callable and implement __getitem__.
989 (init_readline): Fix autoindentation for win32. Thanks to a patch
998 (init_readline): Fix autoindentation for win32. Thanks to a patch
990 by Vivian De Smedt <vivian-AT-vdesmedt.com>.
999 by Vivian De Smedt <vivian-AT-vdesmedt.com>.
991
1000
992 2005-02-12 Fernando Perez <fperez@colorado.edu>
1001 2005-02-12 Fernando Perez <fperez@colorado.edu>
993
1002
994 * IPython/ipmaker.py (make_IPython): Disabled the stout traps
1003 * IPython/ipmaker.py (make_IPython): Disabled the stout traps
995 which I had written long ago to sort out user error messages which
1004 which I had written long ago to sort out user error messages which
996 may occur during startup. This seemed like a good idea initially,
1005 may occur during startup. This seemed like a good idea initially,
997 but it has proven a disaster in retrospect. I don't want to
1006 but it has proven a disaster in retrospect. I don't want to
998 change much code for now, so my fix is to set the internal 'debug'
1007 change much code for now, so my fix is to set the internal 'debug'
999 flag to true everywhere, whose only job was precisely to control
1008 flag to true everywhere, whose only job was precisely to control
1000 this subsystem. This closes issue 28 (as well as avoiding all
1009 this subsystem. This closes issue 28 (as well as avoiding all
1001 sorts of strange hangups which occur from time to time).
1010 sorts of strange hangups which occur from time to time).
1002
1011
1003 2005-02-07 Fernando Perez <fperez@colorado.edu>
1012 2005-02-07 Fernando Perez <fperez@colorado.edu>
1004
1013
1005 * IPython/Magic.py (magic_edit): Fix 'ed -p' not working when the
1014 * IPython/Magic.py (magic_edit): Fix 'ed -p' not working when the
1006 previous call produced a syntax error.
1015 previous call produced a syntax error.
1007
1016
1008 * IPython/OInspect.py (Inspector.pinfo): Fix crash when inspecting
1017 * IPython/OInspect.py (Inspector.pinfo): Fix crash when inspecting
1009 classes without constructor.
1018 classes without constructor.
1010
1019
1011 2005-02-06 Fernando Perez <fperez@colorado.edu>
1020 2005-02-06 Fernando Perez <fperez@colorado.edu>
1012
1021
1013 * IPython/iplib.py (MagicCompleter.complete): Extend the list of
1022 * IPython/iplib.py (MagicCompleter.complete): Extend the list of
1014 completions with the results of each matcher, so we return results
1023 completions with the results of each matcher, so we return results
1015 to the user from all namespaces. This breaks with ipython
1024 to the user from all namespaces. This breaks with ipython
1016 tradition, but I think it's a nicer behavior. Now you get all
1025 tradition, but I think it's a nicer behavior. Now you get all
1017 possible completions listed, from all possible namespaces (python,
1026 possible completions listed, from all possible namespaces (python,
1018 filesystem, magics...) After a request by John Hunter
1027 filesystem, magics...) After a request by John Hunter
1019 <jdhunter-AT-nitace.bsd.uchicago.edu>.
1028 <jdhunter-AT-nitace.bsd.uchicago.edu>.
1020
1029
1021 2005-02-05 Fernando Perez <fperez@colorado.edu>
1030 2005-02-05 Fernando Perez <fperez@colorado.edu>
1022
1031
1023 * IPython/Magic.py (magic_prun): Fix bug where prun would fail if
1032 * IPython/Magic.py (magic_prun): Fix bug where prun would fail if
1024 the call had quote characters in it (the quotes were stripped).
1033 the call had quote characters in it (the quotes were stripped).
1025
1034
1026 2005-01-31 Fernando Perez <fperez@colorado.edu>
1035 2005-01-31 Fernando Perez <fperez@colorado.edu>
1027
1036
1028 * IPython/iplib.py (InteractiveShell.__init__): reduce reliance on
1037 * IPython/iplib.py (InteractiveShell.__init__): reduce reliance on
1029 Itpl.itpl() to make the code more robust against psyco
1038 Itpl.itpl() to make the code more robust against psyco
1030 optimizations.
1039 optimizations.
1031
1040
1032 * IPython/Itpl.py (Itpl.__str__): Use a _getframe() call instead
1041 * IPython/Itpl.py (Itpl.__str__): Use a _getframe() call instead
1033 of causing an exception. Quicker, cleaner.
1042 of causing an exception. Quicker, cleaner.
1034
1043
1035 2005-01-28 Fernando Perez <fperez@colorado.edu>
1044 2005-01-28 Fernando Perez <fperez@colorado.edu>
1036
1045
1037 * scripts/ipython_win_post_install.py (install): hardcode
1046 * scripts/ipython_win_post_install.py (install): hardcode
1038 sys.prefix+'python.exe' as the executable path. It turns out that
1047 sys.prefix+'python.exe' as the executable path. It turns out that
1039 during the post-installation run, sys.executable resolves to the
1048 during the post-installation run, sys.executable resolves to the
1040 name of the binary installer! I should report this as a distutils
1049 name of the binary installer! I should report this as a distutils
1041 bug, I think. I updated the .10 release with this tiny fix, to
1050 bug, I think. I updated the .10 release with this tiny fix, to
1042 avoid annoying the lists further.
1051 avoid annoying the lists further.
1043
1052
1044 2005-01-27 *** Released version 0.6.10
1053 2005-01-27 *** Released version 0.6.10
1045
1054
1046 2005-01-27 Fernando Perez <fperez@colorado.edu>
1055 2005-01-27 Fernando Perez <fperez@colorado.edu>
1047
1056
1048 * IPython/numutils.py (norm): Added 'inf' as optional name for
1057 * IPython/numutils.py (norm): Added 'inf' as optional name for
1049 L-infinity norm, included references to mathworld.com for vector
1058 L-infinity norm, included references to mathworld.com for vector
1050 norm definitions.
1059 norm definitions.
1051 (amin/amax): added amin/amax for array min/max. Similar to what
1060 (amin/amax): added amin/amax for array min/max. Similar to what
1052 pylab ships with after the recent reorganization of names.
1061 pylab ships with after the recent reorganization of names.
1053 (spike/spike_odd): removed deprecated spike/spike_odd functions.
1062 (spike/spike_odd): removed deprecated spike/spike_odd functions.
1054
1063
1055 * ipython.el: committed Alex's recent fixes and improvements.
1064 * ipython.el: committed Alex's recent fixes and improvements.
1056 Tested with python-mode from CVS, and it looks excellent. Since
1065 Tested with python-mode from CVS, and it looks excellent. Since
1057 python-mode hasn't released anything in a while, I'm temporarily
1066 python-mode hasn't released anything in a while, I'm temporarily
1058 putting a copy of today's CVS (v 4.70) of python-mode in:
1067 putting a copy of today's CVS (v 4.70) of python-mode in:
1059 http://ipython.scipy.org/tmp/python-mode.el
1068 http://ipython.scipy.org/tmp/python-mode.el
1060
1069
1061 * scripts/ipython_win_post_install.py (install): Win32 fix to use
1070 * scripts/ipython_win_post_install.py (install): Win32 fix to use
1062 sys.executable for the executable name, instead of assuming it's
1071 sys.executable for the executable name, instead of assuming it's
1063 called 'python.exe' (the post-installer would have produced broken
1072 called 'python.exe' (the post-installer would have produced broken
1064 setups on systems with a differently named python binary).
1073 setups on systems with a differently named python binary).
1065
1074
1066 * IPython/PyColorize.py (Parser.__call__): change explicit '\n'
1075 * IPython/PyColorize.py (Parser.__call__): change explicit '\n'
1067 references to os.linesep, to make the code more
1076 references to os.linesep, to make the code more
1068 platform-independent. This is also part of the win32 coloring
1077 platform-independent. This is also part of the win32 coloring
1069 fixes.
1078 fixes.
1070
1079
1071 * IPython/genutils.py (page_dumb): Remove attempts to chop long
1080 * IPython/genutils.py (page_dumb): Remove attempts to chop long
1072 lines, which actually cause coloring bugs because the length of
1081 lines, which actually cause coloring bugs because the length of
1073 the line is very difficult to correctly compute with embedded
1082 the line is very difficult to correctly compute with embedded
1074 escapes. This was the source of all the coloring problems under
1083 escapes. This was the source of all the coloring problems under
1075 Win32. I think that _finally_, Win32 users have a properly
1084 Win32. I think that _finally_, Win32 users have a properly
1076 working ipython in all respects. This would never have happened
1085 working ipython in all respects. This would never have happened
1077 if not for Gary Bishop and Viktor Ransmayr's great help and work.
1086 if not for Gary Bishop and Viktor Ransmayr's great help and work.
1078
1087
1079 2005-01-26 *** Released version 0.6.9
1088 2005-01-26 *** Released version 0.6.9
1080
1089
1081 2005-01-25 Fernando Perez <fperez@colorado.edu>
1090 2005-01-25 Fernando Perez <fperez@colorado.edu>
1082
1091
1083 * setup.py: finally, we have a true Windows installer, thanks to
1092 * setup.py: finally, we have a true Windows installer, thanks to
1084 the excellent work of Viktor Ransmayr
1093 the excellent work of Viktor Ransmayr
1085 <viktor.ransmayr-AT-t-online.de>. The docs have been updated for
1094 <viktor.ransmayr-AT-t-online.de>. The docs have been updated for
1086 Windows users. The setup routine is quite a bit cleaner thanks to
1095 Windows users. The setup routine is quite a bit cleaner thanks to
1087 this, and the post-install script uses the proper functions to
1096 this, and the post-install script uses the proper functions to
1088 allow a clean de-installation using the standard Windows Control
1097 allow a clean de-installation using the standard Windows Control
1089 Panel.
1098 Panel.
1090
1099
1091 * IPython/genutils.py (get_home_dir): changed to use the $HOME
1100 * IPython/genutils.py (get_home_dir): changed to use the $HOME
1092 environment variable under all OSes (including win32) if
1101 environment variable under all OSes (including win32) if
1093 available. This will give consistency to win32 users who have set
1102 available. This will give consistency to win32 users who have set
1094 this variable for any reason. If os.environ['HOME'] fails, the
1103 this variable for any reason. If os.environ['HOME'] fails, the
1095 previous policy of using HOMEDRIVE\HOMEPATH kicks in.
1104 previous policy of using HOMEDRIVE\HOMEPATH kicks in.
1096
1105
1097 2005-01-24 Fernando Perez <fperez@colorado.edu>
1106 2005-01-24 Fernando Perez <fperez@colorado.edu>
1098
1107
1099 * IPython/numutils.py (empty_like): add empty_like(), similar to
1108 * IPython/numutils.py (empty_like): add empty_like(), similar to
1100 zeros_like() but taking advantage of the new empty() Numeric routine.
1109 zeros_like() but taking advantage of the new empty() Numeric routine.
1101
1110
1102 2005-01-23 *** Released version 0.6.8
1111 2005-01-23 *** Released version 0.6.8
1103
1112
1104 2005-01-22 Fernando Perez <fperez@colorado.edu>
1113 2005-01-22 Fernando Perez <fperez@colorado.edu>
1105
1114
1106 * IPython/Shell.py (MatplotlibShellBase.mplot_exec): I removed the
1115 * IPython/Shell.py (MatplotlibShellBase.mplot_exec): I removed the
1107 automatic show() calls. After discussing things with JDH, it
1116 automatic show() calls. After discussing things with JDH, it
1108 turns out there are too many corner cases where this can go wrong.
1117 turns out there are too many corner cases where this can go wrong.
1109 It's best not to try to be 'too smart', and simply have ipython
1118 It's best not to try to be 'too smart', and simply have ipython
1110 reproduce as much as possible the default behavior of a normal
1119 reproduce as much as possible the default behavior of a normal
1111 python shell.
1120 python shell.
1112
1121
1113 * IPython/iplib.py (InteractiveShell.__init__): Modified the
1122 * IPython/iplib.py (InteractiveShell.__init__): Modified the
1114 line-splitting regexp and _prefilter() to avoid calling getattr()
1123 line-splitting regexp and _prefilter() to avoid calling getattr()
1115 on assignments. This closes
1124 on assignments. This closes
1116 http://www.scipy.net/roundup/ipython/issue24. Note that Python's
1125 http://www.scipy.net/roundup/ipython/issue24. Note that Python's
1117 readline uses getattr(), so a simple <TAB> keypress is still
1126 readline uses getattr(), so a simple <TAB> keypress is still
1118 enough to trigger getattr() calls on an object.
1127 enough to trigger getattr() calls on an object.
1119
1128
1120 2005-01-21 Fernando Perez <fperez@colorado.edu>
1129 2005-01-21 Fernando Perez <fperez@colorado.edu>
1121
1130
1122 * IPython/Shell.py (MatplotlibShellBase.magic_run): Fix the %run
1131 * IPython/Shell.py (MatplotlibShellBase.magic_run): Fix the %run
1123 docstring under pylab so it doesn't mask the original.
1132 docstring under pylab so it doesn't mask the original.
1124
1133
1125 2005-01-21 *** Released version 0.6.7
1134 2005-01-21 *** Released version 0.6.7
1126
1135
1127 2005-01-21 Fernando Perez <fperez@colorado.edu>
1136 2005-01-21 Fernando Perez <fperez@colorado.edu>
1128
1137
1129 * IPython/Shell.py (MTInteractiveShell.runcode): Trap a crash with
1138 * IPython/Shell.py (MTInteractiveShell.runcode): Trap a crash with
1130 signal handling for win32 users in multithreaded mode.
1139 signal handling for win32 users in multithreaded mode.
1131
1140
1132 2005-01-17 Fernando Perez <fperez@colorado.edu>
1141 2005-01-17 Fernando Perez <fperez@colorado.edu>
1133
1142
1134 * IPython/OInspect.py (Inspector.pinfo): Fix crash when inspecting
1143 * IPython/OInspect.py (Inspector.pinfo): Fix crash when inspecting
1135 instances with no __init__. After a crash report by Norbert Nemec
1144 instances with no __init__. After a crash report by Norbert Nemec
1136 <Norbert-AT-nemec-online.de>.
1145 <Norbert-AT-nemec-online.de>.
1137
1146
1138 2005-01-14 Fernando Perez <fperez@colorado.edu>
1147 2005-01-14 Fernando Perez <fperez@colorado.edu>
1139
1148
1140 * IPython/ultraTB.py (VerboseTB.text): Fix bug in reporting of
1149 * IPython/ultraTB.py (VerboseTB.text): Fix bug in reporting of
1141 names for verbose exceptions, when multiple dotted names and the
1150 names for verbose exceptions, when multiple dotted names and the
1142 'parent' object were present on the same line.
1151 'parent' object were present on the same line.
1143
1152
1144 2005-01-11 Fernando Perez <fperez@colorado.edu>
1153 2005-01-11 Fernando Perez <fperez@colorado.edu>
1145
1154
1146 * IPython/genutils.py (flag_calls): new utility to trap and flag
1155 * IPython/genutils.py (flag_calls): new utility to trap and flag
1147 calls in functions. I need it to clean up matplotlib support.
1156 calls in functions. I need it to clean up matplotlib support.
1148 Also removed some deprecated code in genutils.
1157 Also removed some deprecated code in genutils.
1149
1158
1150 * IPython/Shell.py (MatplotlibShellBase.mplot_exec): small fix so
1159 * IPython/Shell.py (MatplotlibShellBase.mplot_exec): small fix so
1151 that matplotlib scripts called with %run, which don't call show()
1160 that matplotlib scripts called with %run, which don't call show()
1152 themselves, still have their plotting windows open.
1161 themselves, still have their plotting windows open.
1153
1162
1154 2005-01-05 Fernando Perez <fperez@colorado.edu>
1163 2005-01-05 Fernando Perez <fperez@colorado.edu>
1155
1164
1156 * IPython/Shell.py (IPShellGTK.__init__): Patch by Andrew Straw
1165 * IPython/Shell.py (IPShellGTK.__init__): Patch by Andrew Straw
1157 <astraw-AT-caltech.edu>, to fix gtk deprecation warnings.
1166 <astraw-AT-caltech.edu>, to fix gtk deprecation warnings.
1158
1167
1159 2004-12-19 Fernando Perez <fperez@colorado.edu>
1168 2004-12-19 Fernando Perez <fperez@colorado.edu>
1160
1169
1161 * IPython/Shell.py (MTInteractiveShell.runcode): Get rid of
1170 * IPython/Shell.py (MTInteractiveShell.runcode): Get rid of
1162 parent_runcode, which was an eyesore. The same result can be
1171 parent_runcode, which was an eyesore. The same result can be
1163 obtained with Python's regular superclass mechanisms.
1172 obtained with Python's regular superclass mechanisms.
1164
1173
1165 2004-12-17 Fernando Perez <fperez@colorado.edu>
1174 2004-12-17 Fernando Perez <fperez@colorado.edu>
1166
1175
1167 * IPython/Magic.py (Magic.magic_sc): Fix quote stripping problem
1176 * IPython/Magic.py (Magic.magic_sc): Fix quote stripping problem
1168 reported by Prabhu.
1177 reported by Prabhu.
1169 (Magic.magic_sx): direct all errors to Term.cerr (defaults to
1178 (Magic.magic_sx): direct all errors to Term.cerr (defaults to
1170 sys.stderr) instead of explicitly calling sys.stderr. This helps
1179 sys.stderr) instead of explicitly calling sys.stderr. This helps
1171 maintain our I/O abstractions clean, for future GUI embeddings.
1180 maintain our I/O abstractions clean, for future GUI embeddings.
1172
1181
1173 * IPython/genutils.py (info): added new utility for sys.stderr
1182 * IPython/genutils.py (info): added new utility for sys.stderr
1174 unified info message handling (thin wrapper around warn()).
1183 unified info message handling (thin wrapper around warn()).
1175
1184
1176 * IPython/ultraTB.py (VerboseTB.text): Fix misreported global
1185 * IPython/ultraTB.py (VerboseTB.text): Fix misreported global
1177 composite (dotted) names on verbose exceptions.
1186 composite (dotted) names on verbose exceptions.
1178 (VerboseTB.nullrepr): harden against another kind of errors which
1187 (VerboseTB.nullrepr): harden against another kind of errors which
1179 Python's inspect module can trigger, and which were crashing
1188 Python's inspect module can trigger, and which were crashing
1180 IPython. Thanks to a report by Marco Lombardi
1189 IPython. Thanks to a report by Marco Lombardi
1181 <mlombard-AT-ma010192.hq.eso.org>.
1190 <mlombard-AT-ma010192.hq.eso.org>.
1182
1191
1183 2004-12-13 *** Released version 0.6.6
1192 2004-12-13 *** Released version 0.6.6
1184
1193
1185 2004-12-12 Fernando Perez <fperez@colorado.edu>
1194 2004-12-12 Fernando Perez <fperez@colorado.edu>
1186
1195
1187 * IPython/Shell.py (IPShellGTK.mainloop): catch RuntimeErrors
1196 * IPython/Shell.py (IPShellGTK.mainloop): catch RuntimeErrors
1188 generated by pygtk upon initialization if it was built without
1197 generated by pygtk upon initialization if it was built without
1189 threads (for matplotlib users). After a crash reported by
1198 threads (for matplotlib users). After a crash reported by
1190 Leguijt, Jaap J SIEP-EPT-RES <Jaap.Leguijt-AT-shell.com>.
1199 Leguijt, Jaap J SIEP-EPT-RES <Jaap.Leguijt-AT-shell.com>.
1191
1200
1192 * IPython/ipmaker.py (make_IPython): fix small bug in the
1201 * IPython/ipmaker.py (make_IPython): fix small bug in the
1193 import_some parameter for multiple imports.
1202 import_some parameter for multiple imports.
1194
1203
1195 * IPython/iplib.py (ipmagic): simplified the interface of
1204 * IPython/iplib.py (ipmagic): simplified the interface of
1196 ipmagic() to take a single string argument, just as it would be
1205 ipmagic() to take a single string argument, just as it would be
1197 typed at the IPython cmd line.
1206 typed at the IPython cmd line.
1198 (ipalias): Added new ipalias() with an interface identical to
1207 (ipalias): Added new ipalias() with an interface identical to
1199 ipmagic(). This completes exposing a pure python interface to the
1208 ipmagic(). This completes exposing a pure python interface to the
1200 alias and magic system, which can be used in loops or more complex
1209 alias and magic system, which can be used in loops or more complex
1201 code where IPython's automatic line mangling is not active.
1210 code where IPython's automatic line mangling is not active.
1202
1211
1203 * IPython/genutils.py (timing): changed interface of timing to
1212 * IPython/genutils.py (timing): changed interface of timing to
1204 simply run code once, which is the most common case. timings()
1213 simply run code once, which is the most common case. timings()
1205 remains unchanged, for the cases where you want multiple runs.
1214 remains unchanged, for the cases where you want multiple runs.
1206
1215
1207 * IPython/Shell.py (MatplotlibShellBase._matplotlib_config): Fix a
1216 * IPython/Shell.py (MatplotlibShellBase._matplotlib_config): Fix a
1208 bug where Python2.2 crashes with exec'ing code which does not end
1217 bug where Python2.2 crashes with exec'ing code which does not end
1209 in a single newline. Python 2.3 is OK, so I hadn't noticed this
1218 in a single newline. Python 2.3 is OK, so I hadn't noticed this
1210 before.
1219 before.
1211
1220
1212 2004-12-10 Fernando Perez <fperez@colorado.edu>
1221 2004-12-10 Fernando Perez <fperez@colorado.edu>
1213
1222
1214 * IPython/Magic.py (Magic.magic_prun): changed name of option from
1223 * IPython/Magic.py (Magic.magic_prun): changed name of option from
1215 -t to -T, to accomodate the new -t flag in %run (the %run and
1224 -t to -T, to accomodate the new -t flag in %run (the %run and
1216 %prun options are kind of intermixed, and it's not easy to change
1225 %prun options are kind of intermixed, and it's not easy to change
1217 this with the limitations of python's getopt).
1226 this with the limitations of python's getopt).
1218
1227
1219 * IPython/Magic.py (Magic.magic_run): Added new -t option to time
1228 * IPython/Magic.py (Magic.magic_run): Added new -t option to time
1220 the execution of scripts. It's not as fine-tuned as timeit.py,
1229 the execution of scripts. It's not as fine-tuned as timeit.py,
1221 but it works from inside ipython (and under 2.2, which lacks
1230 but it works from inside ipython (and under 2.2, which lacks
1222 timeit.py). Optionally a number of runs > 1 can be given for
1231 timeit.py). Optionally a number of runs > 1 can be given for
1223 timing very short-running code.
1232 timing very short-running code.
1224
1233
1225 * IPython/genutils.py (uniq_stable): new routine which returns a
1234 * IPython/genutils.py (uniq_stable): new routine which returns a
1226 list of unique elements in any iterable, but in stable order of
1235 list of unique elements in any iterable, but in stable order of
1227 appearance. I needed this for the ultraTB fixes, and it's a handy
1236 appearance. I needed this for the ultraTB fixes, and it's a handy
1228 utility.
1237 utility.
1229
1238
1230 * IPython/ultraTB.py (VerboseTB.text): Fix proper reporting of
1239 * IPython/ultraTB.py (VerboseTB.text): Fix proper reporting of
1231 dotted names in Verbose exceptions. This had been broken since
1240 dotted names in Verbose exceptions. This had been broken since
1232 the very start, now x.y will properly be printed in a Verbose
1241 the very start, now x.y will properly be printed in a Verbose
1233 traceback, instead of x being shown and y appearing always as an
1242 traceback, instead of x being shown and y appearing always as an
1234 'undefined global'. Getting this to work was a bit tricky,
1243 'undefined global'. Getting this to work was a bit tricky,
1235 because by default python tokenizers are stateless. Saved by
1244 because by default python tokenizers are stateless. Saved by
1236 python's ability to easily add a bit of state to an arbitrary
1245 python's ability to easily add a bit of state to an arbitrary
1237 function (without needing to build a full-blown callable object).
1246 function (without needing to build a full-blown callable object).
1238
1247
1239 Also big cleanup of this code, which had horrendous runtime
1248 Also big cleanup of this code, which had horrendous runtime
1240 lookups of zillions of attributes for colorization. Moved all
1249 lookups of zillions of attributes for colorization. Moved all
1241 this code into a few templates, which make it cleaner and quicker.
1250 this code into a few templates, which make it cleaner and quicker.
1242
1251
1243 Printout quality was also improved for Verbose exceptions: one
1252 Printout quality was also improved for Verbose exceptions: one
1244 variable per line, and memory addresses are printed (this can be
1253 variable per line, and memory addresses are printed (this can be
1245 quite handy in nasty debugging situations, which is what Verbose
1254 quite handy in nasty debugging situations, which is what Verbose
1246 is for).
1255 is for).
1247
1256
1248 * IPython/ipmaker.py (make_IPython): Do NOT execute files named in
1257 * IPython/ipmaker.py (make_IPython): Do NOT execute files named in
1249 the command line as scripts to be loaded by embedded instances.
1258 the command line as scripts to be loaded by embedded instances.
1250 Doing so has the potential for an infinite recursion if there are
1259 Doing so has the potential for an infinite recursion if there are
1251 exceptions thrown in the process. This fixes a strange crash
1260 exceptions thrown in the process. This fixes a strange crash
1252 reported by Philippe MULLER <muller-AT-irit.fr>.
1261 reported by Philippe MULLER <muller-AT-irit.fr>.
1253
1262
1254 2004-12-09 Fernando Perez <fperez@colorado.edu>
1263 2004-12-09 Fernando Perez <fperez@colorado.edu>
1255
1264
1256 * IPython/Shell.py (MatplotlibShellBase.use): Change pylab support
1265 * IPython/Shell.py (MatplotlibShellBase.use): Change pylab support
1257 to reflect new names in matplotlib, which now expose the
1266 to reflect new names in matplotlib, which now expose the
1258 matlab-compatible interface via a pylab module instead of the
1267 matlab-compatible interface via a pylab module instead of the
1259 'matlab' name. The new code is backwards compatible, so users of
1268 'matlab' name. The new code is backwards compatible, so users of
1260 all matplotlib versions are OK. Patch by J. Hunter.
1269 all matplotlib versions are OK. Patch by J. Hunter.
1261
1270
1262 * IPython/OInspect.py (Inspector.pinfo): Add to object? printing
1271 * IPython/OInspect.py (Inspector.pinfo): Add to object? printing
1263 of __init__ docstrings for instances (class docstrings are already
1272 of __init__ docstrings for instances (class docstrings are already
1264 automatically printed). Instances with customized docstrings
1273 automatically printed). Instances with customized docstrings
1265 (indep. of the class) are also recognized and all 3 separate
1274 (indep. of the class) are also recognized and all 3 separate
1266 docstrings are printed (instance, class, constructor). After some
1275 docstrings are printed (instance, class, constructor). After some
1267 comments/suggestions by J. Hunter.
1276 comments/suggestions by J. Hunter.
1268
1277
1269 2004-12-05 Fernando Perez <fperez@colorado.edu>
1278 2004-12-05 Fernando Perez <fperez@colorado.edu>
1270
1279
1271 * IPython/iplib.py (MagicCompleter.complete): Remove annoying
1280 * IPython/iplib.py (MagicCompleter.complete): Remove annoying
1272 warnings when tab-completion fails and triggers an exception.
1281 warnings when tab-completion fails and triggers an exception.
1273
1282
1274 2004-12-03 Fernando Perez <fperez@colorado.edu>
1283 2004-12-03 Fernando Perez <fperez@colorado.edu>
1275
1284
1276 * IPython/Magic.py (magic_prun): Fix bug where an exception would
1285 * IPython/Magic.py (magic_prun): Fix bug where an exception would
1277 be triggered when using 'run -p'. An incorrect option flag was
1286 be triggered when using 'run -p'. An incorrect option flag was
1278 being set ('d' instead of 'D').
1287 being set ('d' instead of 'D').
1279 (manpage): fix missing escaped \- sign.
1288 (manpage): fix missing escaped \- sign.
1280
1289
1281 2004-11-30 *** Released version 0.6.5
1290 2004-11-30 *** Released version 0.6.5
1282
1291
1283 2004-11-30 Fernando Perez <fperez@colorado.edu>
1292 2004-11-30 Fernando Perez <fperez@colorado.edu>
1284
1293
1285 * IPython/Magic.py (Magic.magic_run): Fix bug in breakpoint
1294 * IPython/Magic.py (Magic.magic_run): Fix bug in breakpoint
1286 setting with -d option.
1295 setting with -d option.
1287
1296
1288 * setup.py (docfiles): Fix problem where the doc glob I was using
1297 * setup.py (docfiles): Fix problem where the doc glob I was using
1289 was COMPLETELY BROKEN. It was giving the right files by pure
1298 was COMPLETELY BROKEN. It was giving the right files by pure
1290 accident, but failed once I tried to include ipython.el. Note:
1299 accident, but failed once I tried to include ipython.el. Note:
1291 glob() does NOT allow you to do exclusion on multiple endings!
1300 glob() does NOT allow you to do exclusion on multiple endings!
1292
1301
1293 2004-11-29 Fernando Perez <fperez@colorado.edu>
1302 2004-11-29 Fernando Perez <fperez@colorado.edu>
1294
1303
1295 * IPython/usage.py (__doc__): cleaned up usage docstring, by using
1304 * IPython/usage.py (__doc__): cleaned up usage docstring, by using
1296 the manpage as the source. Better formatting & consistency.
1305 the manpage as the source. Better formatting & consistency.
1297
1306
1298 * IPython/Magic.py (magic_run): Added new -d option, to run
1307 * IPython/Magic.py (magic_run): Added new -d option, to run
1299 scripts under the control of the python pdb debugger. Note that
1308 scripts under the control of the python pdb debugger. Note that
1300 this required changing the %prun option -d to -D, to avoid a clash
1309 this required changing the %prun option -d to -D, to avoid a clash
1301 (since %run must pass options to %prun, and getopt is too dumb to
1310 (since %run must pass options to %prun, and getopt is too dumb to
1302 handle options with string values with embedded spaces). Thanks
1311 handle options with string values with embedded spaces). Thanks
1303 to a suggestion by Matthew Arnison <maffew-AT-cat.org.au>.
1312 to a suggestion by Matthew Arnison <maffew-AT-cat.org.au>.
1304 (magic_who_ls): added type matching to %who and %whos, so that one
1313 (magic_who_ls): added type matching to %who and %whos, so that one
1305 can filter their output to only include variables of certain
1314 can filter their output to only include variables of certain
1306 types. Another suggestion by Matthew.
1315 types. Another suggestion by Matthew.
1307 (magic_whos): Added memory summaries in kb and Mb for arrays.
1316 (magic_whos): Added memory summaries in kb and Mb for arrays.
1308 (magic_who): Improve formatting (break lines every 9 vars).
1317 (magic_who): Improve formatting (break lines every 9 vars).
1309
1318
1310 2004-11-28 Fernando Perez <fperez@colorado.edu>
1319 2004-11-28 Fernando Perez <fperez@colorado.edu>
1311
1320
1312 * IPython/Logger.py (Logger.log): Fix bug in syncing the input
1321 * IPython/Logger.py (Logger.log): Fix bug in syncing the input
1313 cache when empty lines were present.
1322 cache when empty lines were present.
1314
1323
1315 2004-11-24 Fernando Perez <fperez@colorado.edu>
1324 2004-11-24 Fernando Perez <fperez@colorado.edu>
1316
1325
1317 * IPython/usage.py (__doc__): document the re-activated threading
1326 * IPython/usage.py (__doc__): document the re-activated threading
1318 options for WX and GTK.
1327 options for WX and GTK.
1319
1328
1320 2004-11-23 Fernando Perez <fperez@colorado.edu>
1329 2004-11-23 Fernando Perez <fperez@colorado.edu>
1321
1330
1322 * IPython/Shell.py (start): Added Prabhu's big patch to reactivate
1331 * IPython/Shell.py (start): Added Prabhu's big patch to reactivate
1323 the -wthread and -gthread options, along with a new -tk one to try
1332 the -wthread and -gthread options, along with a new -tk one to try
1324 and coordinate Tk threading with wx/gtk. The tk support is very
1333 and coordinate Tk threading with wx/gtk. The tk support is very
1325 platform dependent, since it seems to require Tcl and Tk to be
1334 platform dependent, since it seems to require Tcl and Tk to be
1326 built with threads (Fedora1/2 appears NOT to have it, but in
1335 built with threads (Fedora1/2 appears NOT to have it, but in
1327 Prabhu's Debian boxes it works OK). But even with some Tk
1336 Prabhu's Debian boxes it works OK). But even with some Tk
1328 limitations, this is a great improvement.
1337 limitations, this is a great improvement.
1329
1338
1330 * IPython/Prompts.py (prompt_specials_color): Added \t for time
1339 * IPython/Prompts.py (prompt_specials_color): Added \t for time
1331 info in user prompts. Patch by Prabhu.
1340 info in user prompts. Patch by Prabhu.
1332
1341
1333 2004-11-18 Fernando Perez <fperez@colorado.edu>
1342 2004-11-18 Fernando Perez <fperez@colorado.edu>
1334
1343
1335 * IPython/genutils.py (ask_yes_no): Add check for a max of 20
1344 * IPython/genutils.py (ask_yes_no): Add check for a max of 20
1336 EOFErrors and bail, to avoid infinite loops if a non-terminating
1345 EOFErrors and bail, to avoid infinite loops if a non-terminating
1337 file is fed into ipython. Patch submitted in issue 19 by user,
1346 file is fed into ipython. Patch submitted in issue 19 by user,
1338 many thanks.
1347 many thanks.
1339
1348
1340 * IPython/iplib.py (InteractiveShell.handle_auto): do NOT trigger
1349 * IPython/iplib.py (InteractiveShell.handle_auto): do NOT trigger
1341 autoquote/parens in continuation prompts, which can cause lots of
1350 autoquote/parens in continuation prompts, which can cause lots of
1342 problems. Closes roundup issue 20.
1351 problems. Closes roundup issue 20.
1343
1352
1344 2004-11-17 Fernando Perez <fperez@colorado.edu>
1353 2004-11-17 Fernando Perez <fperez@colorado.edu>
1345
1354
1346 * debian/control (Build-Depends-Indep): Fix dpatch dependency,
1355 * debian/control (Build-Depends-Indep): Fix dpatch dependency,
1347 reported as debian bug #280505. I'm not sure my local changelog
1356 reported as debian bug #280505. I'm not sure my local changelog
1348 entry has the proper debian format (Jack?).
1357 entry has the proper debian format (Jack?).
1349
1358
1350 2004-11-08 *** Released version 0.6.4
1359 2004-11-08 *** Released version 0.6.4
1351
1360
1352 2004-11-08 Fernando Perez <fperez@colorado.edu>
1361 2004-11-08 Fernando Perez <fperez@colorado.edu>
1353
1362
1354 * IPython/iplib.py (init_readline): Fix exit message for Windows
1363 * IPython/iplib.py (init_readline): Fix exit message for Windows
1355 when readline is active. Thanks to a report by Eric Jones
1364 when readline is active. Thanks to a report by Eric Jones
1356 <eric-AT-enthought.com>.
1365 <eric-AT-enthought.com>.
1357
1366
1358 2004-11-07 Fernando Perez <fperez@colorado.edu>
1367 2004-11-07 Fernando Perez <fperez@colorado.edu>
1359
1368
1360 * IPython/genutils.py (page): Add a trap for OSError exceptions,
1369 * IPython/genutils.py (page): Add a trap for OSError exceptions,
1361 sometimes seen by win2k/cygwin users.
1370 sometimes seen by win2k/cygwin users.
1362
1371
1363 2004-11-06 Fernando Perez <fperez@colorado.edu>
1372 2004-11-06 Fernando Perez <fperez@colorado.edu>
1364
1373
1365 * IPython/iplib.py (interact): Change the handling of %Exit from
1374 * IPython/iplib.py (interact): Change the handling of %Exit from
1366 trying to propagate a SystemExit to an internal ipython flag.
1375 trying to propagate a SystemExit to an internal ipython flag.
1367 This is less elegant than using Python's exception mechanism, but
1376 This is less elegant than using Python's exception mechanism, but
1368 I can't get that to work reliably with threads, so under -pylab
1377 I can't get that to work reliably with threads, so under -pylab
1369 %Exit was hanging IPython. Cross-thread exception handling is
1378 %Exit was hanging IPython. Cross-thread exception handling is
1370 really a bitch. Thaks to a bug report by Stephen Walton
1379 really a bitch. Thaks to a bug report by Stephen Walton
1371 <stephen.walton-AT-csun.edu>.
1380 <stephen.walton-AT-csun.edu>.
1372
1381
1373 2004-11-04 Fernando Perez <fperez@colorado.edu>
1382 2004-11-04 Fernando Perez <fperez@colorado.edu>
1374
1383
1375 * IPython/iplib.py (raw_input_original): store a pointer to the
1384 * IPython/iplib.py (raw_input_original): store a pointer to the
1376 true raw_input to harden against code which can modify it
1385 true raw_input to harden against code which can modify it
1377 (wx.py.PyShell does this and would otherwise crash ipython).
1386 (wx.py.PyShell does this and would otherwise crash ipython).
1378 Thanks to a bug report by Jim Flowers <james.flowers-AT-lgx.com>.
1387 Thanks to a bug report by Jim Flowers <james.flowers-AT-lgx.com>.
1379
1388
1380 * IPython/Shell.py (MTInteractiveShell.runsource): Cleaner fix for
1389 * IPython/Shell.py (MTInteractiveShell.runsource): Cleaner fix for
1381 Ctrl-C problem, which does not mess up the input line.
1390 Ctrl-C problem, which does not mess up the input line.
1382
1391
1383 2004-11-03 Fernando Perez <fperez@colorado.edu>
1392 2004-11-03 Fernando Perez <fperez@colorado.edu>
1384
1393
1385 * IPython/Release.py: Changed licensing to BSD, in all files.
1394 * IPython/Release.py: Changed licensing to BSD, in all files.
1386 (name): lowercase name for tarball/RPM release.
1395 (name): lowercase name for tarball/RPM release.
1387
1396
1388 * IPython/OInspect.py (getdoc): wrap inspect.getdoc() safely for
1397 * IPython/OInspect.py (getdoc): wrap inspect.getdoc() safely for
1389 use throughout ipython.
1398 use throughout ipython.
1390
1399
1391 * IPython/Magic.py (Magic._ofind): Switch to using the new
1400 * IPython/Magic.py (Magic._ofind): Switch to using the new
1392 OInspect.getdoc() function.
1401 OInspect.getdoc() function.
1393
1402
1394 * IPython/Shell.py (sigint_handler): Hack to ignore the execution
1403 * IPython/Shell.py (sigint_handler): Hack to ignore the execution
1395 of the line currently being canceled via Ctrl-C. It's extremely
1404 of the line currently being canceled via Ctrl-C. It's extremely
1396 ugly, but I don't know how to do it better (the problem is one of
1405 ugly, but I don't know how to do it better (the problem is one of
1397 handling cross-thread exceptions).
1406 handling cross-thread exceptions).
1398
1407
1399 2004-10-28 Fernando Perez <fperez@colorado.edu>
1408 2004-10-28 Fernando Perez <fperez@colorado.edu>
1400
1409
1401 * IPython/Shell.py (signal_handler): add signal handlers to trap
1410 * IPython/Shell.py (signal_handler): add signal handlers to trap
1402 SIGINT and SIGSEGV in threaded code properly. Thanks to a bug
1411 SIGINT and SIGSEGV in threaded code properly. Thanks to a bug
1403 report by Francesc Alted.
1412 report by Francesc Alted.
1404
1413
1405 2004-10-21 Fernando Perez <fperez@colorado.edu>
1414 2004-10-21 Fernando Perez <fperez@colorado.edu>
1406
1415
1407 * IPython/Extensions/InterpreterExec.py (prefilter_shell): Fix @
1416 * IPython/Extensions/InterpreterExec.py (prefilter_shell): Fix @
1408 to % for pysh syntax extensions.
1417 to % for pysh syntax extensions.
1409
1418
1410 2004-10-09 Fernando Perez <fperez@colorado.edu>
1419 2004-10-09 Fernando Perez <fperez@colorado.edu>
1411
1420
1412 * IPython/Magic.py (Magic.magic_whos): modify output of Numeric
1421 * IPython/Magic.py (Magic.magic_whos): modify output of Numeric
1413 arrays to print a more useful summary, without calling str(arr).
1422 arrays to print a more useful summary, without calling str(arr).
1414 This avoids the problem of extremely lengthy computations which
1423 This avoids the problem of extremely lengthy computations which
1415 occur if arr is large, and appear to the user as a system lockup
1424 occur if arr is large, and appear to the user as a system lockup
1416 with 100% cpu activity. After a suggestion by Kristian Sandberg
1425 with 100% cpu activity. After a suggestion by Kristian Sandberg
1417 <Kristian.Sandberg@colorado.edu>.
1426 <Kristian.Sandberg@colorado.edu>.
1418 (Magic.__init__): fix bug in global magic escapes not being
1427 (Magic.__init__): fix bug in global magic escapes not being
1419 correctly set.
1428 correctly set.
1420
1429
1421 2004-10-08 Fernando Perez <fperez@colorado.edu>
1430 2004-10-08 Fernando Perez <fperez@colorado.edu>
1422
1431
1423 * IPython/Magic.py (__license__): change to absolute imports of
1432 * IPython/Magic.py (__license__): change to absolute imports of
1424 ipython's own internal packages, to start adapting to the absolute
1433 ipython's own internal packages, to start adapting to the absolute
1425 import requirement of PEP-328.
1434 import requirement of PEP-328.
1426
1435
1427 * IPython/genutils.py (__author__): Fix coding to utf-8 on all
1436 * IPython/genutils.py (__author__): Fix coding to utf-8 on all
1428 files, and standardize author/license marks through the Release
1437 files, and standardize author/license marks through the Release
1429 module instead of having per/file stuff (except for files with
1438 module instead of having per/file stuff (except for files with
1430 particular licenses, like the MIT/PSF-licensed codes).
1439 particular licenses, like the MIT/PSF-licensed codes).
1431
1440
1432 * IPython/Debugger.py: remove dead code for python 2.1
1441 * IPython/Debugger.py: remove dead code for python 2.1
1433
1442
1434 2004-10-04 Fernando Perez <fperez@colorado.edu>
1443 2004-10-04 Fernando Perez <fperez@colorado.edu>
1435
1444
1436 * IPython/iplib.py (ipmagic): New function for accessing magics
1445 * IPython/iplib.py (ipmagic): New function for accessing magics
1437 via a normal python function call.
1446 via a normal python function call.
1438
1447
1439 * IPython/Magic.py (Magic.magic_magic): Change the magic escape
1448 * IPython/Magic.py (Magic.magic_magic): Change the magic escape
1440 from '@' to '%', to accomodate the new @decorator syntax of python
1449 from '@' to '%', to accomodate the new @decorator syntax of python
1441 2.4.
1450 2.4.
1442
1451
1443 2004-09-29 Fernando Perez <fperez@colorado.edu>
1452 2004-09-29 Fernando Perez <fperez@colorado.edu>
1444
1453
1445 * IPython/Shell.py (MatplotlibShellBase.use): Added a wrapper to
1454 * IPython/Shell.py (MatplotlibShellBase.use): Added a wrapper to
1446 matplotlib.use to prevent running scripts which try to switch
1455 matplotlib.use to prevent running scripts which try to switch
1447 interactive backends from within ipython. This will just crash
1456 interactive backends from within ipython. This will just crash
1448 the python interpreter, so we can't allow it (but a detailed error
1457 the python interpreter, so we can't allow it (but a detailed error
1449 is given to the user).
1458 is given to the user).
1450
1459
1451 2004-09-28 Fernando Perez <fperez@colorado.edu>
1460 2004-09-28 Fernando Perez <fperez@colorado.edu>
1452
1461
1453 * IPython/Shell.py (MatplotlibShellBase.mplot_exec):
1462 * IPython/Shell.py (MatplotlibShellBase.mplot_exec):
1454 matplotlib-related fixes so that using @run with non-matplotlib
1463 matplotlib-related fixes so that using @run with non-matplotlib
1455 scripts doesn't pop up spurious plot windows. This requires
1464 scripts doesn't pop up spurious plot windows. This requires
1456 matplotlib >= 0.63, where I had to make some changes as well.
1465 matplotlib >= 0.63, where I had to make some changes as well.
1457
1466
1458 * IPython/ipmaker.py (make_IPython): update version requirement to
1467 * IPython/ipmaker.py (make_IPython): update version requirement to
1459 python 2.2.
1468 python 2.2.
1460
1469
1461 * IPython/iplib.py (InteractiveShell.mainloop): Add an optional
1470 * IPython/iplib.py (InteractiveShell.mainloop): Add an optional
1462 banner arg for embedded customization.
1471 banner arg for embedded customization.
1463
1472
1464 * IPython/Magic.py (Magic.__init__): big cleanup to remove all
1473 * IPython/Magic.py (Magic.__init__): big cleanup to remove all
1465 explicit uses of __IP as the IPython's instance name. Now things
1474 explicit uses of __IP as the IPython's instance name. Now things
1466 are properly handled via the shell.name value. The actual code
1475 are properly handled via the shell.name value. The actual code
1467 is a bit ugly b/c I'm doing it via a global in Magic.py, but this
1476 is a bit ugly b/c I'm doing it via a global in Magic.py, but this
1468 is much better than before. I'll clean things completely when the
1477 is much better than before. I'll clean things completely when the
1469 magic stuff gets a real overhaul.
1478 magic stuff gets a real overhaul.
1470
1479
1471 * ipython.1: small fixes, sent in by Jack Moffit. He also sent in
1480 * ipython.1: small fixes, sent in by Jack Moffit. He also sent in
1472 minor changes to debian dir.
1481 minor changes to debian dir.
1473
1482
1474 * IPython/iplib.py (InteractiveShell.__init__): Fix adding a
1483 * IPython/iplib.py (InteractiveShell.__init__): Fix adding a
1475 pointer to the shell itself in the interactive namespace even when
1484 pointer to the shell itself in the interactive namespace even when
1476 a user-supplied dict is provided. This is needed for embedding
1485 a user-supplied dict is provided. This is needed for embedding
1477 purposes (found by tests with Michel Sanner).
1486 purposes (found by tests with Michel Sanner).
1478
1487
1479 2004-09-27 Fernando Perez <fperez@colorado.edu>
1488 2004-09-27 Fernando Perez <fperez@colorado.edu>
1480
1489
1481 * IPython/UserConfig/ipythonrc: remove []{} from
1490 * IPython/UserConfig/ipythonrc: remove []{} from
1482 readline_remove_delims, so that things like [modname.<TAB> do
1491 readline_remove_delims, so that things like [modname.<TAB> do
1483 proper completion. This disables [].TAB, but that's a less common
1492 proper completion. This disables [].TAB, but that's a less common
1484 case than module names in list comprehensions, for example.
1493 case than module names in list comprehensions, for example.
1485 Thanks to a report by Andrea Riciputi.
1494 Thanks to a report by Andrea Riciputi.
1486
1495
1487 2004-09-09 Fernando Perez <fperez@colorado.edu>
1496 2004-09-09 Fernando Perez <fperez@colorado.edu>
1488
1497
1489 * IPython/Shell.py (IPShellGTK.mainloop): reorder to avoid
1498 * IPython/Shell.py (IPShellGTK.mainloop): reorder to avoid
1490 blocking problems in win32 and osx. Fix by John.
1499 blocking problems in win32 and osx. Fix by John.
1491
1500
1492 2004-09-08 Fernando Perez <fperez@colorado.edu>
1501 2004-09-08 Fernando Perez <fperez@colorado.edu>
1493
1502
1494 * IPython/Shell.py (IPShellWX.OnInit): Fix output redirection bug
1503 * IPython/Shell.py (IPShellWX.OnInit): Fix output redirection bug
1495 for Win32 and OSX. Fix by John Hunter.
1504 for Win32 and OSX. Fix by John Hunter.
1496
1505
1497 2004-08-30 *** Released version 0.6.3
1506 2004-08-30 *** Released version 0.6.3
1498
1507
1499 2004-08-30 Fernando Perez <fperez@colorado.edu>
1508 2004-08-30 Fernando Perez <fperez@colorado.edu>
1500
1509
1501 * setup.py (isfile): Add manpages to list of dependent files to be
1510 * setup.py (isfile): Add manpages to list of dependent files to be
1502 updated.
1511 updated.
1503
1512
1504 2004-08-27 Fernando Perez <fperez@colorado.edu>
1513 2004-08-27 Fernando Perez <fperez@colorado.edu>
1505
1514
1506 * IPython/Shell.py (start): I've disabled -wthread and -gthread
1515 * IPython/Shell.py (start): I've disabled -wthread and -gthread
1507 for now. They don't really work with standalone WX/GTK code
1516 for now. They don't really work with standalone WX/GTK code
1508 (though matplotlib IS working fine with both of those backends).
1517 (though matplotlib IS working fine with both of those backends).
1509 This will neeed much more testing. I disabled most things with
1518 This will neeed much more testing. I disabled most things with
1510 comments, so turning it back on later should be pretty easy.
1519 comments, so turning it back on later should be pretty easy.
1511
1520
1512 * IPython/iplib.py (InteractiveShell.__init__): Fix accidental
1521 * IPython/iplib.py (InteractiveShell.__init__): Fix accidental
1513 autocalling of expressions like r'foo', by modifying the line
1522 autocalling of expressions like r'foo', by modifying the line
1514 split regexp. Closes
1523 split regexp. Closes
1515 http://www.scipy.net/roundup/ipython/issue18, reported by Nicholas
1524 http://www.scipy.net/roundup/ipython/issue18, reported by Nicholas
1516 Riley <ipythonbugs-AT-sabi.net>.
1525 Riley <ipythonbugs-AT-sabi.net>.
1517 (InteractiveShell.mainloop): honor --nobanner with banner
1526 (InteractiveShell.mainloop): honor --nobanner with banner
1518 extensions.
1527 extensions.
1519
1528
1520 * IPython/Shell.py: Significant refactoring of all classes, so
1529 * IPython/Shell.py: Significant refactoring of all classes, so
1521 that we can really support ALL matplotlib backends and threading
1530 that we can really support ALL matplotlib backends and threading
1522 models (John spotted a bug with Tk which required this). Now we
1531 models (John spotted a bug with Tk which required this). Now we
1523 should support single-threaded, WX-threads and GTK-threads, both
1532 should support single-threaded, WX-threads and GTK-threads, both
1524 for generic code and for matplotlib.
1533 for generic code and for matplotlib.
1525
1534
1526 * IPython/ipmaker.py (__call__): Changed -mpthread option to
1535 * IPython/ipmaker.py (__call__): Changed -mpthread option to
1527 -pylab, to simplify things for users. Will also remove the pylab
1536 -pylab, to simplify things for users. Will also remove the pylab
1528 profile, since now all of matplotlib configuration is directly
1537 profile, since now all of matplotlib configuration is directly
1529 handled here. This also reduces startup time.
1538 handled here. This also reduces startup time.
1530
1539
1531 * IPython/Shell.py (IPShellGTK.run): Fixed bug where mainloop() of
1540 * IPython/Shell.py (IPShellGTK.run): Fixed bug where mainloop() of
1532 shell wasn't being correctly called. Also in IPShellWX.
1541 shell wasn't being correctly called. Also in IPShellWX.
1533
1542
1534 * IPython/iplib.py (InteractiveShell.__init__): Added option to
1543 * IPython/iplib.py (InteractiveShell.__init__): Added option to
1535 fine-tune banner.
1544 fine-tune banner.
1536
1545
1537 * IPython/numutils.py (spike): Deprecate these spike functions,
1546 * IPython/numutils.py (spike): Deprecate these spike functions,
1538 delete (long deprecated) gnuplot_exec handler.
1547 delete (long deprecated) gnuplot_exec handler.
1539
1548
1540 2004-08-26 Fernando Perez <fperez@colorado.edu>
1549 2004-08-26 Fernando Perez <fperez@colorado.edu>
1541
1550
1542 * ipython.1: Update for threading options, plus some others which
1551 * ipython.1: Update for threading options, plus some others which
1543 were missing.
1552 were missing.
1544
1553
1545 * IPython/ipmaker.py (__call__): Added -wthread option for
1554 * IPython/ipmaker.py (__call__): Added -wthread option for
1546 wxpython thread handling. Make sure threading options are only
1555 wxpython thread handling. Make sure threading options are only
1547 valid at the command line.
1556 valid at the command line.
1548
1557
1549 * scripts/ipython: moved shell selection into a factory function
1558 * scripts/ipython: moved shell selection into a factory function
1550 in Shell.py, to keep the starter script to a minimum.
1559 in Shell.py, to keep the starter script to a minimum.
1551
1560
1552 2004-08-25 Fernando Perez <fperez@colorado.edu>
1561 2004-08-25 Fernando Perez <fperez@colorado.edu>
1553
1562
1554 * IPython/Shell.py (IPShellWX.wxexit): fixes to WX threading, by
1563 * IPython/Shell.py (IPShellWX.wxexit): fixes to WX threading, by
1555 John. Along with some recent changes he made to matplotlib, the
1564 John. Along with some recent changes he made to matplotlib, the
1556 next versions of both systems should work very well together.
1565 next versions of both systems should work very well together.
1557
1566
1558 2004-08-24 Fernando Perez <fperez@colorado.edu>
1567 2004-08-24 Fernando Perez <fperez@colorado.edu>
1559
1568
1560 * IPython/Magic.py (Magic.magic_prun): cleanup some dead code. I
1569 * IPython/Magic.py (Magic.magic_prun): cleanup some dead code. I
1561 tried to switch the profiling to using hotshot, but I'm getting
1570 tried to switch the profiling to using hotshot, but I'm getting
1562 strange errors from prof.runctx() there. I may be misreading the
1571 strange errors from prof.runctx() there. I may be misreading the
1563 docs, but it looks weird. For now the profiling code will
1572 docs, but it looks weird. For now the profiling code will
1564 continue to use the standard profiler.
1573 continue to use the standard profiler.
1565
1574
1566 2004-08-23 Fernando Perez <fperez@colorado.edu>
1575 2004-08-23 Fernando Perez <fperez@colorado.edu>
1567
1576
1568 * IPython/Shell.py (IPShellWX.__init__): Improvements to the WX
1577 * IPython/Shell.py (IPShellWX.__init__): Improvements to the WX
1569 threaded shell, by John Hunter. It's not quite ready yet, but
1578 threaded shell, by John Hunter. It's not quite ready yet, but
1570 close.
1579 close.
1571
1580
1572 2004-08-22 Fernando Perez <fperez@colorado.edu>
1581 2004-08-22 Fernando Perez <fperez@colorado.edu>
1573
1582
1574 * IPython/iplib.py (InteractiveShell.interact): tab cleanups, also
1583 * IPython/iplib.py (InteractiveShell.interact): tab cleanups, also
1575 in Magic and ultraTB.
1584 in Magic and ultraTB.
1576
1585
1577 * ipython.1: document threading options in manpage.
1586 * ipython.1: document threading options in manpage.
1578
1587
1579 * scripts/ipython: Changed name of -thread option to -gthread,
1588 * scripts/ipython: Changed name of -thread option to -gthread,
1580 since this is GTK specific. I want to leave the door open for a
1589 since this is GTK specific. I want to leave the door open for a
1581 -wthread option for WX, which will most likely be necessary. This
1590 -wthread option for WX, which will most likely be necessary. This
1582 change affects usage and ipmaker as well.
1591 change affects usage and ipmaker as well.
1583
1592
1584 * IPython/Shell.py (matplotlib_shell): Add a factory function to
1593 * IPython/Shell.py (matplotlib_shell): Add a factory function to
1585 handle the matplotlib shell issues. Code by John Hunter
1594 handle the matplotlib shell issues. Code by John Hunter
1586 <jdhunter-AT-nitace.bsd.uchicago.edu>.
1595 <jdhunter-AT-nitace.bsd.uchicago.edu>.
1587 (IPShellMatplotlibWX.__init__): Rudimentary WX support. It's
1596 (IPShellMatplotlibWX.__init__): Rudimentary WX support. It's
1588 broken (and disabled for end users) for now, but it puts the
1597 broken (and disabled for end users) for now, but it puts the
1589 infrastructure in place.
1598 infrastructure in place.
1590
1599
1591 2004-08-21 Fernando Perez <fperez@colorado.edu>
1600 2004-08-21 Fernando Perez <fperez@colorado.edu>
1592
1601
1593 * ipythonrc-pylab: Add matplotlib support.
1602 * ipythonrc-pylab: Add matplotlib support.
1594
1603
1595 * matplotlib_config.py: new files for matplotlib support, part of
1604 * matplotlib_config.py: new files for matplotlib support, part of
1596 the pylab profile.
1605 the pylab profile.
1597
1606
1598 * IPython/usage.py (__doc__): documented the threading options.
1607 * IPython/usage.py (__doc__): documented the threading options.
1599
1608
1600 2004-08-20 Fernando Perez <fperez@colorado.edu>
1609 2004-08-20 Fernando Perez <fperez@colorado.edu>
1601
1610
1602 * ipython: Modified the main calling routine to handle the -thread
1611 * ipython: Modified the main calling routine to handle the -thread
1603 and -mpthread options. This needs to be done as a top-level hack,
1612 and -mpthread options. This needs to be done as a top-level hack,
1604 because it determines which class to instantiate for IPython
1613 because it determines which class to instantiate for IPython
1605 itself.
1614 itself.
1606
1615
1607 * IPython/Shell.py (MTInteractiveShell.__init__): New set of
1616 * IPython/Shell.py (MTInteractiveShell.__init__): New set of
1608 classes to support multithreaded GTK operation without blocking,
1617 classes to support multithreaded GTK operation without blocking,
1609 and matplotlib with all backends. This is a lot of still very
1618 and matplotlib with all backends. This is a lot of still very
1610 experimental code, and threads are tricky. So it may still have a
1619 experimental code, and threads are tricky. So it may still have a
1611 few rough edges... This code owes a lot to
1620 few rough edges... This code owes a lot to
1612 http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/65109, by
1621 http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/65109, by
1613 Brian # McErlean and John Finlay, to Antoon Pardon for fixes, and
1622 Brian # McErlean and John Finlay, to Antoon Pardon for fixes, and
1614 to John Hunter for all the matplotlib work.
1623 to John Hunter for all the matplotlib work.
1615
1624
1616 * IPython/ipmaker.py (__call__): Added -thread and -mpthread
1625 * IPython/ipmaker.py (__call__): Added -thread and -mpthread
1617 options for gtk thread and matplotlib support.
1626 options for gtk thread and matplotlib support.
1618
1627
1619 2004-08-16 Fernando Perez <fperez@colorado.edu>
1628 2004-08-16 Fernando Perez <fperez@colorado.edu>
1620
1629
1621 * IPython/iplib.py (InteractiveShell.__init__): don't trigger
1630 * IPython/iplib.py (InteractiveShell.__init__): don't trigger
1622 autocall for things like p*q,p/q,p+q,p-q, when p is callable. Bug
1631 autocall for things like p*q,p/q,p+q,p-q, when p is callable. Bug
1623 reported by Stephen Walton <stephen.walton-AT-csun.edu>.
1632 reported by Stephen Walton <stephen.walton-AT-csun.edu>.
1624
1633
1625 2004-08-11 Fernando Perez <fperez@colorado.edu>
1634 2004-08-11 Fernando Perez <fperez@colorado.edu>
1626
1635
1627 * setup.py (isfile): Fix build so documentation gets updated for
1636 * setup.py (isfile): Fix build so documentation gets updated for
1628 rpms (it was only done for .tgz builds).
1637 rpms (it was only done for .tgz builds).
1629
1638
1630 2004-08-10 Fernando Perez <fperez@colorado.edu>
1639 2004-08-10 Fernando Perez <fperez@colorado.edu>
1631
1640
1632 * genutils.py (Term): Fix misspell of stdin stream (sin->cin).
1641 * genutils.py (Term): Fix misspell of stdin stream (sin->cin).
1633
1642
1634 * iplib.py : Silence syntax error exceptions in tab-completion.
1643 * iplib.py : Silence syntax error exceptions in tab-completion.
1635
1644
1636 2004-08-05 Fernando Perez <fperez@colorado.edu>
1645 2004-08-05 Fernando Perez <fperez@colorado.edu>
1637
1646
1638 * IPython/Prompts.py (Prompt2.set_colors): Fix incorrectly set
1647 * IPython/Prompts.py (Prompt2.set_colors): Fix incorrectly set
1639 'color off' mark for continuation prompts. This was causing long
1648 'color off' mark for continuation prompts. This was causing long
1640 continuation lines to mis-wrap.
1649 continuation lines to mis-wrap.
1641
1650
1642 2004-08-01 Fernando Perez <fperez@colorado.edu>
1651 2004-08-01 Fernando Perez <fperez@colorado.edu>
1643
1652
1644 * IPython/ipmaker.py (make_IPython): Allow the shell class used
1653 * IPython/ipmaker.py (make_IPython): Allow the shell class used
1645 for building ipython to be a parameter. All this is necessary
1654 for building ipython to be a parameter. All this is necessary
1646 right now to have a multithreaded version, but this insane
1655 right now to have a multithreaded version, but this insane
1647 non-design will be cleaned up soon. For now, it's a hack that
1656 non-design will be cleaned up soon. For now, it's a hack that
1648 works.
1657 works.
1649
1658
1650 * IPython/Shell.py (IPShell.__init__): Stop using mutable default
1659 * IPython/Shell.py (IPShell.__init__): Stop using mutable default
1651 args in various places. No bugs so far, but it's a dangerous
1660 args in various places. No bugs so far, but it's a dangerous
1652 practice.
1661 practice.
1653
1662
1654 2004-07-31 Fernando Perez <fperez@colorado.edu>
1663 2004-07-31 Fernando Perez <fperez@colorado.edu>
1655
1664
1656 * IPython/iplib.py (complete): ignore SyntaxError exceptions to
1665 * IPython/iplib.py (complete): ignore SyntaxError exceptions to
1657 fix completion of files with dots in their names under most
1666 fix completion of files with dots in their names under most
1658 profiles (pysh was OK because the completion order is different).
1667 profiles (pysh was OK because the completion order is different).
1659
1668
1660 2004-07-27 Fernando Perez <fperez@colorado.edu>
1669 2004-07-27 Fernando Perez <fperez@colorado.edu>
1661
1670
1662 * IPython/iplib.py (InteractiveShell.__init__): build dict of
1671 * IPython/iplib.py (InteractiveShell.__init__): build dict of
1663 keywords manually, b/c the one in keyword.py was removed in python
1672 keywords manually, b/c the one in keyword.py was removed in python
1664 2.4. Patch by Anakim Border <aborder-AT-users.sourceforge.net>.
1673 2.4. Patch by Anakim Border <aborder-AT-users.sourceforge.net>.
1665 This is NOT a bug under python 2.3 and earlier.
1674 This is NOT a bug under python 2.3 and earlier.
1666
1675
1667 2004-07-26 Fernando Perez <fperez@colorado.edu>
1676 2004-07-26 Fernando Perez <fperez@colorado.edu>
1668
1677
1669 * IPython/ultraTB.py (VerboseTB.text): Add another
1678 * IPython/ultraTB.py (VerboseTB.text): Add another
1670 linecache.checkcache() call to try to prevent inspect.py from
1679 linecache.checkcache() call to try to prevent inspect.py from
1671 crashing under python 2.3. I think this fixes
1680 crashing under python 2.3. I think this fixes
1672 http://www.scipy.net/roundup/ipython/issue17.
1681 http://www.scipy.net/roundup/ipython/issue17.
1673
1682
1674 2004-07-26 *** Released version 0.6.2
1683 2004-07-26 *** Released version 0.6.2
1675
1684
1676 2004-07-26 Fernando Perez <fperez@colorado.edu>
1685 2004-07-26 Fernando Perez <fperez@colorado.edu>
1677
1686
1678 * IPython/Magic.py (Magic.magic_cd): Fix bug where 'cd -N' would
1687 * IPython/Magic.py (Magic.magic_cd): Fix bug where 'cd -N' would
1679 fail for any number.
1688 fail for any number.
1680 (Magic.magic_bookmark): Fix bug where 'bookmark -l' would fail for
1689 (Magic.magic_bookmark): Fix bug where 'bookmark -l' would fail for
1681 empty bookmarks.
1690 empty bookmarks.
1682
1691
1683 2004-07-26 *** Released version 0.6.1
1692 2004-07-26 *** Released version 0.6.1
1684
1693
1685 2004-07-26 Fernando Perez <fperez@colorado.edu>
1694 2004-07-26 Fernando Perez <fperez@colorado.edu>
1686
1695
1687 * ipython_win_post_install.py (run): Added pysh shortcut for Windows.
1696 * ipython_win_post_install.py (run): Added pysh shortcut for Windows.
1688
1697
1689 * IPython/iplib.py (protect_filename): Applied Ville's patch for
1698 * IPython/iplib.py (protect_filename): Applied Ville's patch for
1690 escaping '()[]{}' in filenames.
1699 escaping '()[]{}' in filenames.
1691
1700
1692 * IPython/Magic.py (shlex_split): Fix handling of '*' and '?' for
1701 * IPython/Magic.py (shlex_split): Fix handling of '*' and '?' for
1693 Python 2.2 users who lack a proper shlex.split.
1702 Python 2.2 users who lack a proper shlex.split.
1694
1703
1695 2004-07-19 Fernando Perez <fperez@colorado.edu>
1704 2004-07-19 Fernando Perez <fperez@colorado.edu>
1696
1705
1697 * IPython/iplib.py (InteractiveShell.init_readline): Add support
1706 * IPython/iplib.py (InteractiveShell.init_readline): Add support
1698 for reading readline's init file. I follow the normal chain:
1707 for reading readline's init file. I follow the normal chain:
1699 $INPUTRC is honored, otherwise ~/.inputrc is used. Thanks to a
1708 $INPUTRC is honored, otherwise ~/.inputrc is used. Thanks to a
1700 report by Mike Heeter. This closes
1709 report by Mike Heeter. This closes
1701 http://www.scipy.net/roundup/ipython/issue16.
1710 http://www.scipy.net/roundup/ipython/issue16.
1702
1711
1703 2004-07-18 Fernando Perez <fperez@colorado.edu>
1712 2004-07-18 Fernando Perez <fperez@colorado.edu>
1704
1713
1705 * IPython/iplib.py (__init__): Add better handling of '\' under
1714 * IPython/iplib.py (__init__): Add better handling of '\' under
1706 Win32 for filenames. After a patch by Ville.
1715 Win32 for filenames. After a patch by Ville.
1707
1716
1708 2004-07-17 Fernando Perez <fperez@colorado.edu>
1717 2004-07-17 Fernando Perez <fperez@colorado.edu>
1709
1718
1710 * IPython/iplib.py (InteractiveShell._prefilter): fix bug where
1719 * IPython/iplib.py (InteractiveShell._prefilter): fix bug where
1711 autocalling would be triggered for 'foo is bar' if foo is
1720 autocalling would be triggered for 'foo is bar' if foo is
1712 callable. I also cleaned up the autocall detection code to use a
1721 callable. I also cleaned up the autocall detection code to use a
1713 regexp, which is faster. Bug reported by Alexander Schmolck.
1722 regexp, which is faster. Bug reported by Alexander Schmolck.
1714
1723
1715 * IPython/Magic.py (Magic.magic_pinfo): Fix bug where strings with
1724 * IPython/Magic.py (Magic.magic_pinfo): Fix bug where strings with
1716 '?' in them would confuse the help system. Reported by Alex
1725 '?' in them would confuse the help system. Reported by Alex
1717 Schmolck.
1726 Schmolck.
1718
1727
1719 2004-07-16 Fernando Perez <fperez@colorado.edu>
1728 2004-07-16 Fernando Perez <fperez@colorado.edu>
1720
1729
1721 * IPython/GnuplotInteractive.py (__all__): added plot2.
1730 * IPython/GnuplotInteractive.py (__all__): added plot2.
1722
1731
1723 * IPython/Gnuplot2.py (Gnuplot.plot2): added new function for
1732 * IPython/Gnuplot2.py (Gnuplot.plot2): added new function for
1724 plotting dictionaries, lists or tuples of 1d arrays.
1733 plotting dictionaries, lists or tuples of 1d arrays.
1725
1734
1726 * IPython/Magic.py (Magic.magic_hist): small clenaups and
1735 * IPython/Magic.py (Magic.magic_hist): small clenaups and
1727 optimizations.
1736 optimizations.
1728
1737
1729 * IPython/iplib.py:Remove old Changelog info for cleanup. This is
1738 * IPython/iplib.py:Remove old Changelog info for cleanup. This is
1730 the information which was there from Janko's original IPP code:
1739 the information which was there from Janko's original IPP code:
1731
1740
1732 03.05.99 20:53 porto.ifm.uni-kiel.de
1741 03.05.99 20:53 porto.ifm.uni-kiel.de
1733 --Started changelog.
1742 --Started changelog.
1734 --make clear do what it say it does
1743 --make clear do what it say it does
1735 --added pretty output of lines from inputcache
1744 --added pretty output of lines from inputcache
1736 --Made Logger a mixin class, simplifies handling of switches
1745 --Made Logger a mixin class, simplifies handling of switches
1737 --Added own completer class. .string<TAB> expands to last history
1746 --Added own completer class. .string<TAB> expands to last history
1738 line which starts with string. The new expansion is also present
1747 line which starts with string. The new expansion is also present
1739 with Ctrl-r from the readline library. But this shows, who this
1748 with Ctrl-r from the readline library. But this shows, who this
1740 can be done for other cases.
1749 can be done for other cases.
1741 --Added convention that all shell functions should accept a
1750 --Added convention that all shell functions should accept a
1742 parameter_string This opens the door for different behaviour for
1751 parameter_string This opens the door for different behaviour for
1743 each function. @cd is a good example of this.
1752 each function. @cd is a good example of this.
1744
1753
1745 04.05.99 12:12 porto.ifm.uni-kiel.de
1754 04.05.99 12:12 porto.ifm.uni-kiel.de
1746 --added logfile rotation
1755 --added logfile rotation
1747 --added new mainloop method which freezes first the namespace
1756 --added new mainloop method which freezes first the namespace
1748
1757
1749 07.05.99 21:24 porto.ifm.uni-kiel.de
1758 07.05.99 21:24 porto.ifm.uni-kiel.de
1750 --added the docreader classes. Now there is a help system.
1759 --added the docreader classes. Now there is a help system.
1751 -This is only a first try. Currently it's not easy to put new
1760 -This is only a first try. Currently it's not easy to put new
1752 stuff in the indices. But this is the way to go. Info would be
1761 stuff in the indices. But this is the way to go. Info would be
1753 better, but HTML is every where and not everybody has an info
1762 better, but HTML is every where and not everybody has an info
1754 system installed and it's not so easy to change html-docs to info.
1763 system installed and it's not so easy to change html-docs to info.
1755 --added global logfile option
1764 --added global logfile option
1756 --there is now a hook for object inspection method pinfo needs to
1765 --there is now a hook for object inspection method pinfo needs to
1757 be provided for this. Can be reached by two '??'.
1766 be provided for this. Can be reached by two '??'.
1758
1767
1759 08.05.99 20:51 porto.ifm.uni-kiel.de
1768 08.05.99 20:51 porto.ifm.uni-kiel.de
1760 --added a README
1769 --added a README
1761 --bug in rc file. Something has changed so functions in the rc
1770 --bug in rc file. Something has changed so functions in the rc
1762 file need to reference the shell and not self. Not clear if it's a
1771 file need to reference the shell and not self. Not clear if it's a
1763 bug or feature.
1772 bug or feature.
1764 --changed rc file for new behavior
1773 --changed rc file for new behavior
1765
1774
1766 2004-07-15 Fernando Perez <fperez@colorado.edu>
1775 2004-07-15 Fernando Perez <fperez@colorado.edu>
1767
1776
1768 * IPython/Logger.py (Logger.log): fixed recent bug where the input
1777 * IPython/Logger.py (Logger.log): fixed recent bug where the input
1769 cache was falling out of sync in bizarre manners when multi-line
1778 cache was falling out of sync in bizarre manners when multi-line
1770 input was present. Minor optimizations and cleanup.
1779 input was present. Minor optimizations and cleanup.
1771
1780
1772 (Logger): Remove old Changelog info for cleanup. This is the
1781 (Logger): Remove old Changelog info for cleanup. This is the
1773 information which was there from Janko's original code:
1782 information which was there from Janko's original code:
1774
1783
1775 Changes to Logger: - made the default log filename a parameter
1784 Changes to Logger: - made the default log filename a parameter
1776
1785
1777 - put a check for lines beginning with !@? in log(). Needed
1786 - put a check for lines beginning with !@? in log(). Needed
1778 (even if the handlers properly log their lines) for mid-session
1787 (even if the handlers properly log their lines) for mid-session
1779 logging activation to work properly. Without this, lines logged
1788 logging activation to work properly. Without this, lines logged
1780 in mid session, which get read from the cache, would end up
1789 in mid session, which get read from the cache, would end up
1781 'bare' (with !@? in the open) in the log. Now they are caught
1790 'bare' (with !@? in the open) in the log. Now they are caught
1782 and prepended with a #.
1791 and prepended with a #.
1783
1792
1784 * IPython/iplib.py (InteractiveShell.init_readline): added check
1793 * IPython/iplib.py (InteractiveShell.init_readline): added check
1785 in case MagicCompleter fails to be defined, so we don't crash.
1794 in case MagicCompleter fails to be defined, so we don't crash.
1786
1795
1787 2004-07-13 Fernando Perez <fperez@colorado.edu>
1796 2004-07-13 Fernando Perez <fperez@colorado.edu>
1788
1797
1789 * IPython/Gnuplot2.py (Gnuplot.hardcopy): add automatic generation
1798 * IPython/Gnuplot2.py (Gnuplot.hardcopy): add automatic generation
1790 of EPS if the requested filename ends in '.eps'.
1799 of EPS if the requested filename ends in '.eps'.
1791
1800
1792 2004-07-04 Fernando Perez <fperez@colorado.edu>
1801 2004-07-04 Fernando Perez <fperez@colorado.edu>
1793
1802
1794 * IPython/iplib.py (InteractiveShell.handle_shell_escape): Fix
1803 * IPython/iplib.py (InteractiveShell.handle_shell_escape): Fix
1795 escaping of quotes when calling the shell.
1804 escaping of quotes when calling the shell.
1796
1805
1797 2004-07-02 Fernando Perez <fperez@colorado.edu>
1806 2004-07-02 Fernando Perez <fperez@colorado.edu>
1798
1807
1799 * IPython/Prompts.py (CachedOutput.update): Fix problem with
1808 * IPython/Prompts.py (CachedOutput.update): Fix problem with
1800 gettext not working because we were clobbering '_'. Fixes
1809 gettext not working because we were clobbering '_'. Fixes
1801 http://www.scipy.net/roundup/ipython/issue6.
1810 http://www.scipy.net/roundup/ipython/issue6.
1802
1811
1803 2004-07-01 Fernando Perez <fperez@colorado.edu>
1812 2004-07-01 Fernando Perez <fperez@colorado.edu>
1804
1813
1805 * IPython/Magic.py (Magic.magic_cd): integrated bookmark handling
1814 * IPython/Magic.py (Magic.magic_cd): integrated bookmark handling
1806 into @cd. Patch by Ville.
1815 into @cd. Patch by Ville.
1807
1816
1808 * IPython/iplib.py (InteractiveShell.post_config_initialization):
1817 * IPython/iplib.py (InteractiveShell.post_config_initialization):
1809 new function to store things after ipmaker runs. Patch by Ville.
1818 new function to store things after ipmaker runs. Patch by Ville.
1810 Eventually this will go away once ipmaker is removed and the class
1819 Eventually this will go away once ipmaker is removed and the class
1811 gets cleaned up, but for now it's ok. Key functionality here is
1820 gets cleaned up, but for now it's ok. Key functionality here is
1812 the addition of the persistent storage mechanism, a dict for
1821 the addition of the persistent storage mechanism, a dict for
1813 keeping data across sessions (for now just bookmarks, but more can
1822 keeping data across sessions (for now just bookmarks, but more can
1814 be implemented later).
1823 be implemented later).
1815
1824
1816 * IPython/Magic.py (Magic.magic_bookmark): New bookmark system,
1825 * IPython/Magic.py (Magic.magic_bookmark): New bookmark system,
1817 persistent across sections. Patch by Ville, I modified it
1826 persistent across sections. Patch by Ville, I modified it
1818 soemwhat to allow bookmarking arbitrary dirs other than CWD. Also
1827 soemwhat to allow bookmarking arbitrary dirs other than CWD. Also
1819 added a '-l' option to list all bookmarks.
1828 added a '-l' option to list all bookmarks.
1820
1829
1821 * IPython/iplib.py (InteractiveShell.atexit_operations): new
1830 * IPython/iplib.py (InteractiveShell.atexit_operations): new
1822 center for cleanup. Registered with atexit.register(). I moved
1831 center for cleanup. Registered with atexit.register(). I moved
1823 here the old exit_cleanup(). After a patch by Ville.
1832 here the old exit_cleanup(). After a patch by Ville.
1824
1833
1825 * IPython/Magic.py (get_py_filename): added '~' to the accepted
1834 * IPython/Magic.py (get_py_filename): added '~' to the accepted
1826 characters in the hacked shlex_split for python 2.2.
1835 characters in the hacked shlex_split for python 2.2.
1827
1836
1828 * IPython/iplib.py (file_matches): more fixes to filenames with
1837 * IPython/iplib.py (file_matches): more fixes to filenames with
1829 whitespace in them. It's not perfect, but limitations in python's
1838 whitespace in them. It's not perfect, but limitations in python's
1830 readline make it impossible to go further.
1839 readline make it impossible to go further.
1831
1840
1832 2004-06-29 Fernando Perez <fperez@colorado.edu>
1841 2004-06-29 Fernando Perez <fperez@colorado.edu>
1833
1842
1834 * IPython/iplib.py (file_matches): escape whitespace correctly in
1843 * IPython/iplib.py (file_matches): escape whitespace correctly in
1835 filename completions. Bug reported by Ville.
1844 filename completions. Bug reported by Ville.
1836
1845
1837 2004-06-28 Fernando Perez <fperez@colorado.edu>
1846 2004-06-28 Fernando Perez <fperez@colorado.edu>
1838
1847
1839 * IPython/ipmaker.py (__call__): Added per-profile histories. Now
1848 * IPython/ipmaker.py (__call__): Added per-profile histories. Now
1840 the history file will be called 'history-PROFNAME' (or just
1849 the history file will be called 'history-PROFNAME' (or just
1841 'history' if no profile is loaded). I was getting annoyed at
1850 'history' if no profile is loaded). I was getting annoyed at
1842 getting my Numerical work history clobbered by pysh sessions.
1851 getting my Numerical work history clobbered by pysh sessions.
1843
1852
1844 * IPython/iplib.py (InteractiveShell.__init__): Internal
1853 * IPython/iplib.py (InteractiveShell.__init__): Internal
1845 getoutputerror() function so that we can honor the system_verbose
1854 getoutputerror() function so that we can honor the system_verbose
1846 flag for _all_ system calls. I also added escaping of #
1855 flag for _all_ system calls. I also added escaping of #
1847 characters here to avoid confusing Itpl.
1856 characters here to avoid confusing Itpl.
1848
1857
1849 * IPython/Magic.py (shlex_split): removed call to shell in
1858 * IPython/Magic.py (shlex_split): removed call to shell in
1850 parse_options and replaced it with shlex.split(). The annoying
1859 parse_options and replaced it with shlex.split(). The annoying
1851 part was that in Python 2.2, shlex.split() doesn't exist, so I had
1860 part was that in Python 2.2, shlex.split() doesn't exist, so I had
1852 to backport it from 2.3, with several frail hacks (the shlex
1861 to backport it from 2.3, with several frail hacks (the shlex
1853 module is rather limited in 2.2). Thanks to a suggestion by Ville
1862 module is rather limited in 2.2). Thanks to a suggestion by Ville
1854 Vainio <vivainio@kolumbus.fi>. For Python 2.3 there should be no
1863 Vainio <vivainio@kolumbus.fi>. For Python 2.3 there should be no
1855 problem.
1864 problem.
1856
1865
1857 (Magic.magic_system_verbose): new toggle to print the actual
1866 (Magic.magic_system_verbose): new toggle to print the actual
1858 system calls made by ipython. Mainly for debugging purposes.
1867 system calls made by ipython. Mainly for debugging purposes.
1859
1868
1860 * IPython/GnuplotRuntime.py (gnu_out): fix bug for cygwin, which
1869 * IPython/GnuplotRuntime.py (gnu_out): fix bug for cygwin, which
1861 doesn't support persistence. Reported (and fix suggested) by
1870 doesn't support persistence. Reported (and fix suggested) by
1862 Travis Caldwell <travis_caldwell2000@yahoo.com>.
1871 Travis Caldwell <travis_caldwell2000@yahoo.com>.
1863
1872
1864 2004-06-26 Fernando Perez <fperez@colorado.edu>
1873 2004-06-26 Fernando Perez <fperez@colorado.edu>
1865
1874
1866 * IPython/Logger.py (Logger.log): fix to handle correctly empty
1875 * IPython/Logger.py (Logger.log): fix to handle correctly empty
1867 continue prompts.
1876 continue prompts.
1868
1877
1869 * IPython/Extensions/InterpreterExec.py (pysh): moved the pysh()
1878 * IPython/Extensions/InterpreterExec.py (pysh): moved the pysh()
1870 function (basically a big docstring) and a few more things here to
1879 function (basically a big docstring) and a few more things here to
1871 speedup startup. pysh.py is now very lightweight. We want because
1880 speedup startup. pysh.py is now very lightweight. We want because
1872 it gets execfile'd, while InterpreterExec gets imported, so
1881 it gets execfile'd, while InterpreterExec gets imported, so
1873 byte-compilation saves time.
1882 byte-compilation saves time.
1874
1883
1875 2004-06-25 Fernando Perez <fperez@colorado.edu>
1884 2004-06-25 Fernando Perez <fperez@colorado.edu>
1876
1885
1877 * IPython/Magic.py (Magic.magic_cd): Fixed to restore usage of 'cd
1886 * IPython/Magic.py (Magic.magic_cd): Fixed to restore usage of 'cd
1878 -NUM', which was recently broken.
1887 -NUM', which was recently broken.
1879
1888
1880 * IPython/iplib.py (InteractiveShell.handle_shell_escape): allow !
1889 * IPython/iplib.py (InteractiveShell.handle_shell_escape): allow !
1881 in multi-line input (but not !!, which doesn't make sense there).
1890 in multi-line input (but not !!, which doesn't make sense there).
1882
1891
1883 * IPython/UserConfig/ipythonrc: made autoindent on by default.
1892 * IPython/UserConfig/ipythonrc: made autoindent on by default.
1884 It's just too useful, and people can turn it off in the less
1893 It's just too useful, and people can turn it off in the less
1885 common cases where it's a problem.
1894 common cases where it's a problem.
1886
1895
1887 2004-06-24 Fernando Perez <fperez@colorado.edu>
1896 2004-06-24 Fernando Perez <fperez@colorado.edu>
1888
1897
1889 * IPython/iplib.py (InteractiveShell._prefilter): big change -
1898 * IPython/iplib.py (InteractiveShell._prefilter): big change -
1890 special syntaxes (like alias calling) is now allied in multi-line
1899 special syntaxes (like alias calling) is now allied in multi-line
1891 input. This is still _very_ experimental, but it's necessary for
1900 input. This is still _very_ experimental, but it's necessary for
1892 efficient shell usage combining python looping syntax with system
1901 efficient shell usage combining python looping syntax with system
1893 calls. For now it's restricted to aliases, I don't think it
1902 calls. For now it's restricted to aliases, I don't think it
1894 really even makes sense to have this for magics.
1903 really even makes sense to have this for magics.
1895
1904
1896 2004-06-23 Fernando Perez <fperez@colorado.edu>
1905 2004-06-23 Fernando Perez <fperez@colorado.edu>
1897
1906
1898 * IPython/Extensions/InterpreterExec.py (prefilter_shell): Added
1907 * IPython/Extensions/InterpreterExec.py (prefilter_shell): Added
1899 $var=cmd <=> @sc var=cmd and $$var=cmd <=> @sc -l var=cmd.
1908 $var=cmd <=> @sc var=cmd and $$var=cmd <=> @sc -l var=cmd.
1900
1909
1901 * IPython/Magic.py (Magic.magic_rehashx): modified to handle
1910 * IPython/Magic.py (Magic.magic_rehashx): modified to handle
1902 extensions under Windows (after code sent by Gary Bishop). The
1911 extensions under Windows (after code sent by Gary Bishop). The
1903 extensions considered 'executable' are stored in IPython's rc
1912 extensions considered 'executable' are stored in IPython's rc
1904 structure as win_exec_ext.
1913 structure as win_exec_ext.
1905
1914
1906 * IPython/genutils.py (shell): new function, like system() but
1915 * IPython/genutils.py (shell): new function, like system() but
1907 without return value. Very useful for interactive shell work.
1916 without return value. Very useful for interactive shell work.
1908
1917
1909 * IPython/Magic.py (Magic.magic_unalias): New @unalias function to
1918 * IPython/Magic.py (Magic.magic_unalias): New @unalias function to
1910 delete aliases.
1919 delete aliases.
1911
1920
1912 * IPython/iplib.py (InteractiveShell.alias_table_update): make
1921 * IPython/iplib.py (InteractiveShell.alias_table_update): make
1913 sure that the alias table doesn't contain python keywords.
1922 sure that the alias table doesn't contain python keywords.
1914
1923
1915 2004-06-21 Fernando Perez <fperez@colorado.edu>
1924 2004-06-21 Fernando Perez <fperez@colorado.edu>
1916
1925
1917 * IPython/Magic.py (Magic.magic_rehash): Fix crash when
1926 * IPython/Magic.py (Magic.magic_rehash): Fix crash when
1918 non-existent items are found in $PATH. Reported by Thorsten.
1927 non-existent items are found in $PATH. Reported by Thorsten.
1919
1928
1920 2004-06-20 Fernando Perez <fperez@colorado.edu>
1929 2004-06-20 Fernando Perez <fperez@colorado.edu>
1921
1930
1922 * IPython/iplib.py (complete): modified the completer so that the
1931 * IPython/iplib.py (complete): modified the completer so that the
1923 order of priorities can be easily changed at runtime.
1932 order of priorities can be easily changed at runtime.
1924
1933
1925 * IPython/Extensions/InterpreterExec.py (prefilter_shell):
1934 * IPython/Extensions/InterpreterExec.py (prefilter_shell):
1926 Modified to auto-execute all lines beginning with '~', '/' or '.'.
1935 Modified to auto-execute all lines beginning with '~', '/' or '.'.
1927
1936
1928 * IPython/Magic.py (Magic.magic_sx): modified @sc and @sx to
1937 * IPython/Magic.py (Magic.magic_sx): modified @sc and @sx to
1929 expand Python variables prepended with $ in all system calls. The
1938 expand Python variables prepended with $ in all system calls. The
1930 same was done to InteractiveShell.handle_shell_escape. Now all
1939 same was done to InteractiveShell.handle_shell_escape. Now all
1931 system access mechanisms (!, !!, @sc, @sx and aliases) allow the
1940 system access mechanisms (!, !!, @sc, @sx and aliases) allow the
1932 expansion of python variables and expressions according to the
1941 expansion of python variables and expressions according to the
1933 syntax of PEP-215 - http://www.python.org/peps/pep-0215.html.
1942 syntax of PEP-215 - http://www.python.org/peps/pep-0215.html.
1934
1943
1935 Though PEP-215 has been rejected, a similar (but simpler) one
1944 Though PEP-215 has been rejected, a similar (but simpler) one
1936 seems like it will go into Python 2.4, PEP-292 -
1945 seems like it will go into Python 2.4, PEP-292 -
1937 http://www.python.org/peps/pep-0292.html.
1946 http://www.python.org/peps/pep-0292.html.
1938
1947
1939 I'll keep the full syntax of PEP-215, since IPython has since the
1948 I'll keep the full syntax of PEP-215, since IPython has since the
1940 start used Ka-Ping Yee's reference implementation discussed there
1949 start used Ka-Ping Yee's reference implementation discussed there
1941 (Itpl), and I actually like the powerful semantics it offers.
1950 (Itpl), and I actually like the powerful semantics it offers.
1942
1951
1943 In order to access normal shell variables, the $ has to be escaped
1952 In order to access normal shell variables, the $ has to be escaped
1944 via an extra $. For example:
1953 via an extra $. For example:
1945
1954
1946 In [7]: PATH='a python variable'
1955 In [7]: PATH='a python variable'
1947
1956
1948 In [8]: !echo $PATH
1957 In [8]: !echo $PATH
1949 a python variable
1958 a python variable
1950
1959
1951 In [9]: !echo $$PATH
1960 In [9]: !echo $$PATH
1952 /usr/local/lf9560/bin:/usr/local/intel/compiler70/ia32/bin:...
1961 /usr/local/lf9560/bin:/usr/local/intel/compiler70/ia32/bin:...
1953
1962
1954 (Magic.parse_options): escape $ so the shell doesn't evaluate
1963 (Magic.parse_options): escape $ so the shell doesn't evaluate
1955 things prematurely.
1964 things prematurely.
1956
1965
1957 * IPython/iplib.py (InteractiveShell.call_alias): added the
1966 * IPython/iplib.py (InteractiveShell.call_alias): added the
1958 ability for aliases to expand python variables via $.
1967 ability for aliases to expand python variables via $.
1959
1968
1960 * IPython/Magic.py (Magic.magic_rehash): based on the new alias
1969 * IPython/Magic.py (Magic.magic_rehash): based on the new alias
1961 system, now there's a @rehash/@rehashx pair of magics. These work
1970 system, now there's a @rehash/@rehashx pair of magics. These work
1962 like the csh rehash command, and can be invoked at any time. They
1971 like the csh rehash command, and can be invoked at any time. They
1963 build a table of aliases to everything in the user's $PATH
1972 build a table of aliases to everything in the user's $PATH
1964 (@rehash uses everything, @rehashx is slower but only adds
1973 (@rehash uses everything, @rehashx is slower but only adds
1965 executable files). With this, the pysh.py-based shell profile can
1974 executable files). With this, the pysh.py-based shell profile can
1966 now simply call rehash upon startup, and full access to all
1975 now simply call rehash upon startup, and full access to all
1967 programs in the user's path is obtained.
1976 programs in the user's path is obtained.
1968
1977
1969 * IPython/iplib.py (InteractiveShell.call_alias): The new alias
1978 * IPython/iplib.py (InteractiveShell.call_alias): The new alias
1970 functionality is now fully in place. I removed the old dynamic
1979 functionality is now fully in place. I removed the old dynamic
1971 code generation based approach, in favor of a much lighter one
1980 code generation based approach, in favor of a much lighter one
1972 based on a simple dict. The advantage is that this allows me to
1981 based on a simple dict. The advantage is that this allows me to
1973 now have thousands of aliases with negligible cost (unthinkable
1982 now have thousands of aliases with negligible cost (unthinkable
1974 with the old system).
1983 with the old system).
1975
1984
1976 2004-06-19 Fernando Perez <fperez@colorado.edu>
1985 2004-06-19 Fernando Perez <fperez@colorado.edu>
1977
1986
1978 * IPython/iplib.py (__init__): extended MagicCompleter class to
1987 * IPython/iplib.py (__init__): extended MagicCompleter class to
1979 also complete (last in priority) on user aliases.
1988 also complete (last in priority) on user aliases.
1980
1989
1981 * IPython/Itpl.py (Itpl.__str__): fixed order of globals/locals in
1990 * IPython/Itpl.py (Itpl.__str__): fixed order of globals/locals in
1982 call to eval.
1991 call to eval.
1983 (ItplNS.__init__): Added a new class which functions like Itpl,
1992 (ItplNS.__init__): Added a new class which functions like Itpl,
1984 but allows configuring the namespace for the evaluation to occur
1993 but allows configuring the namespace for the evaluation to occur
1985 in.
1994 in.
1986
1995
1987 2004-06-18 Fernando Perez <fperez@colorado.edu>
1996 2004-06-18 Fernando Perez <fperez@colorado.edu>
1988
1997
1989 * IPython/iplib.py (InteractiveShell.runcode): modify to print a
1998 * IPython/iplib.py (InteractiveShell.runcode): modify to print a
1990 better message when 'exit' or 'quit' are typed (a common newbie
1999 better message when 'exit' or 'quit' are typed (a common newbie
1991 confusion).
2000 confusion).
1992
2001
1993 * IPython/Magic.py (Magic.magic_colors): Added the runtime color
2002 * IPython/Magic.py (Magic.magic_colors): Added the runtime color
1994 check for Windows users.
2003 check for Windows users.
1995
2004
1996 * IPython/iplib.py (InteractiveShell.user_setup): removed
2005 * IPython/iplib.py (InteractiveShell.user_setup): removed
1997 disabling of colors for Windows. I'll test at runtime and issue a
2006 disabling of colors for Windows. I'll test at runtime and issue a
1998 warning if Gary's readline isn't found, as to nudge users to
2007 warning if Gary's readline isn't found, as to nudge users to
1999 download it.
2008 download it.
2000
2009
2001 2004-06-16 Fernando Perez <fperez@colorado.edu>
2010 2004-06-16 Fernando Perez <fperez@colorado.edu>
2002
2011
2003 * IPython/genutils.py (Stream.__init__): changed to print errors
2012 * IPython/genutils.py (Stream.__init__): changed to print errors
2004 to sys.stderr. I had a circular dependency here. Now it's
2013 to sys.stderr. I had a circular dependency here. Now it's
2005 possible to run ipython as IDLE's shell (consider this pre-alpha,
2014 possible to run ipython as IDLE's shell (consider this pre-alpha,
2006 since true stdout things end up in the starting terminal instead
2015 since true stdout things end up in the starting terminal instead
2007 of IDLE's out).
2016 of IDLE's out).
2008
2017
2009 * IPython/Prompts.py (Prompt2.set_colors): prevent crashes for
2018 * IPython/Prompts.py (Prompt2.set_colors): prevent crashes for
2010 users who haven't # updated their prompt_in2 definitions. Remove
2019 users who haven't # updated their prompt_in2 definitions. Remove
2011 eventually.
2020 eventually.
2012 (multiple_replace): added credit to original ASPN recipe.
2021 (multiple_replace): added credit to original ASPN recipe.
2013
2022
2014 2004-06-15 Fernando Perez <fperez@colorado.edu>
2023 2004-06-15 Fernando Perez <fperez@colorado.edu>
2015
2024
2016 * IPython/iplib.py (InteractiveShell.__init__): add 'cp' to the
2025 * IPython/iplib.py (InteractiveShell.__init__): add 'cp' to the
2017 list of auto-defined aliases.
2026 list of auto-defined aliases.
2018
2027
2019 2004-06-13 Fernando Perez <fperez@colorado.edu>
2028 2004-06-13 Fernando Perez <fperez@colorado.edu>
2020
2029
2021 * setup.py (scriptfiles): Don't trigger win_post_install unless an
2030 * setup.py (scriptfiles): Don't trigger win_post_install unless an
2022 install was really requested (so setup.py can be used for other
2031 install was really requested (so setup.py can be used for other
2023 things under Windows).
2032 things under Windows).
2024
2033
2025 2004-06-10 Fernando Perez <fperez@colorado.edu>
2034 2004-06-10 Fernando Perez <fperez@colorado.edu>
2026
2035
2027 * IPython/Logger.py (Logger.create_log): Manually remove any old
2036 * IPython/Logger.py (Logger.create_log): Manually remove any old
2028 backup, since os.remove may fail under Windows. Fixes bug
2037 backup, since os.remove may fail under Windows. Fixes bug
2029 reported by Thorsten.
2038 reported by Thorsten.
2030
2039
2031 2004-06-09 Fernando Perez <fperez@colorado.edu>
2040 2004-06-09 Fernando Perez <fperez@colorado.edu>
2032
2041
2033 * examples/example-embed.py: fixed all references to %n (replaced
2042 * examples/example-embed.py: fixed all references to %n (replaced
2034 with \\# for ps1/out prompts and with \\D for ps2 prompts). Done
2043 with \\# for ps1/out prompts and with \\D for ps2 prompts). Done
2035 for all examples and the manual as well.
2044 for all examples and the manual as well.
2036
2045
2037 2004-06-08 Fernando Perez <fperez@colorado.edu>
2046 2004-06-08 Fernando Perez <fperez@colorado.edu>
2038
2047
2039 * IPython/Prompts.py (Prompt2.set_p_str): fixed all prompt
2048 * IPython/Prompts.py (Prompt2.set_p_str): fixed all prompt
2040 alignment and color management. All 3 prompt subsystems now
2049 alignment and color management. All 3 prompt subsystems now
2041 inherit from BasePrompt.
2050 inherit from BasePrompt.
2042
2051
2043 * tools/release: updates for windows installer build and tag rpms
2052 * tools/release: updates for windows installer build and tag rpms
2044 with python version (since paths are fixed).
2053 with python version (since paths are fixed).
2045
2054
2046 * IPython/UserConfig/ipythonrc: modified to use \# instead of %n,
2055 * IPython/UserConfig/ipythonrc: modified to use \# instead of %n,
2047 which will become eventually obsolete. Also fixed the default
2056 which will become eventually obsolete. Also fixed the default
2048 prompt_in2 to use \D, so at least new users start with the correct
2057 prompt_in2 to use \D, so at least new users start with the correct
2049 defaults.
2058 defaults.
2050 WARNING: Users with existing ipythonrc files will need to apply
2059 WARNING: Users with existing ipythonrc files will need to apply
2051 this fix manually!
2060 this fix manually!
2052
2061
2053 * setup.py: make windows installer (.exe). This is finally the
2062 * setup.py: make windows installer (.exe). This is finally the
2054 integration of an old patch by Cory Dodt <dodt-AT-fcoe.k12.ca.us>,
2063 integration of an old patch by Cory Dodt <dodt-AT-fcoe.k12.ca.us>,
2055 which I hadn't included because it required Python 2.3 (or recent
2064 which I hadn't included because it required Python 2.3 (or recent
2056 distutils).
2065 distutils).
2057
2066
2058 * IPython/usage.py (__doc__): update docs (and manpage) to reflect
2067 * IPython/usage.py (__doc__): update docs (and manpage) to reflect
2059 usage of new '\D' escape.
2068 usage of new '\D' escape.
2060
2069
2061 * IPython/Prompts.py (ROOT_SYMBOL): Small fix for Windows (which
2070 * IPython/Prompts.py (ROOT_SYMBOL): Small fix for Windows (which
2062 lacks os.getuid())
2071 lacks os.getuid())
2063 (CachedOutput.set_colors): Added the ability to turn coloring
2072 (CachedOutput.set_colors): Added the ability to turn coloring
2064 on/off with @colors even for manually defined prompt colors. It
2073 on/off with @colors even for manually defined prompt colors. It
2065 uses a nasty global, but it works safely and via the generic color
2074 uses a nasty global, but it works safely and via the generic color
2066 handling mechanism.
2075 handling mechanism.
2067 (Prompt2.__init__): Introduced new escape '\D' for continuation
2076 (Prompt2.__init__): Introduced new escape '\D' for continuation
2068 prompts. It represents the counter ('\#') as dots.
2077 prompts. It represents the counter ('\#') as dots.
2069 *** NOTE *** THIS IS A BACKWARDS-INCOMPATIBLE CHANGE. Users will
2078 *** NOTE *** THIS IS A BACKWARDS-INCOMPATIBLE CHANGE. Users will
2070 need to update their ipythonrc files and replace '%n' with '\D' in
2079 need to update their ipythonrc files and replace '%n' with '\D' in
2071 their prompt_in2 settings everywhere. Sorry, but there's
2080 their prompt_in2 settings everywhere. Sorry, but there's
2072 otherwise no clean way to get all prompts to properly align. The
2081 otherwise no clean way to get all prompts to properly align. The
2073 ipythonrc shipped with IPython has been updated.
2082 ipythonrc shipped with IPython has been updated.
2074
2083
2075 2004-06-07 Fernando Perez <fperez@colorado.edu>
2084 2004-06-07 Fernando Perez <fperez@colorado.edu>
2076
2085
2077 * setup.py (isfile): Pass local_icons option to latex2html, so the
2086 * setup.py (isfile): Pass local_icons option to latex2html, so the
2078 resulting HTML file is self-contained. Thanks to
2087 resulting HTML file is self-contained. Thanks to
2079 dryice-AT-liu.com.cn for the tip.
2088 dryice-AT-liu.com.cn for the tip.
2080
2089
2081 * pysh.py: I created a new profile 'shell', which implements a
2090 * pysh.py: I created a new profile 'shell', which implements a
2082 _rudimentary_ IPython-based shell. This is in NO WAY a realy
2091 _rudimentary_ IPython-based shell. This is in NO WAY a realy
2083 system shell, nor will it become one anytime soon. It's mainly
2092 system shell, nor will it become one anytime soon. It's mainly
2084 meant to illustrate the use of the new flexible bash-like prompts.
2093 meant to illustrate the use of the new flexible bash-like prompts.
2085 I guess it could be used by hardy souls for true shell management,
2094 I guess it could be used by hardy souls for true shell management,
2086 but it's no tcsh/bash... pysh.py is loaded by the 'shell'
2095 but it's no tcsh/bash... pysh.py is loaded by the 'shell'
2087 profile. This uses the InterpreterExec extension provided by
2096 profile. This uses the InterpreterExec extension provided by
2088 W.J. van der Laan <gnufnork-AT-hetdigitalegat.nl>
2097 W.J. van der Laan <gnufnork-AT-hetdigitalegat.nl>
2089
2098
2090 * IPython/Prompts.py (PromptOut.__str__): now it will correctly
2099 * IPython/Prompts.py (PromptOut.__str__): now it will correctly
2091 auto-align itself with the length of the previous input prompt
2100 auto-align itself with the length of the previous input prompt
2092 (taking into account the invisible color escapes).
2101 (taking into account the invisible color escapes).
2093 (CachedOutput.__init__): Large restructuring of this class. Now
2102 (CachedOutput.__init__): Large restructuring of this class. Now
2094 all three prompts (primary1, primary2, output) are proper objects,
2103 all three prompts (primary1, primary2, output) are proper objects,
2095 managed by the 'parent' CachedOutput class. The code is still a
2104 managed by the 'parent' CachedOutput class. The code is still a
2096 bit hackish (all prompts share state via a pointer to the cache),
2105 bit hackish (all prompts share state via a pointer to the cache),
2097 but it's overall far cleaner than before.
2106 but it's overall far cleaner than before.
2098
2107
2099 * IPython/genutils.py (getoutputerror): modified to add verbose,
2108 * IPython/genutils.py (getoutputerror): modified to add verbose,
2100 debug and header options. This makes the interface of all getout*
2109 debug and header options. This makes the interface of all getout*
2101 functions uniform.
2110 functions uniform.
2102 (SystemExec.getoutputerror): added getoutputerror to SystemExec.
2111 (SystemExec.getoutputerror): added getoutputerror to SystemExec.
2103
2112
2104 * IPython/Magic.py (Magic.default_option): added a function to
2113 * IPython/Magic.py (Magic.default_option): added a function to
2105 allow registering default options for any magic command. This
2114 allow registering default options for any magic command. This
2106 makes it easy to have profiles which customize the magics globally
2115 makes it easy to have profiles which customize the magics globally
2107 for a certain use. The values set through this function are
2116 for a certain use. The values set through this function are
2108 picked up by the parse_options() method, which all magics should
2117 picked up by the parse_options() method, which all magics should
2109 use to parse their options.
2118 use to parse their options.
2110
2119
2111 * IPython/genutils.py (warn): modified the warnings framework to
2120 * IPython/genutils.py (warn): modified the warnings framework to
2112 use the Term I/O class. I'm trying to slowly unify all of
2121 use the Term I/O class. I'm trying to slowly unify all of
2113 IPython's I/O operations to pass through Term.
2122 IPython's I/O operations to pass through Term.
2114
2123
2115 * IPython/Prompts.py (Prompt2._str_other): Added functionality in
2124 * IPython/Prompts.py (Prompt2._str_other): Added functionality in
2116 the secondary prompt to correctly match the length of the primary
2125 the secondary prompt to correctly match the length of the primary
2117 one for any prompt. Now multi-line code will properly line up
2126 one for any prompt. Now multi-line code will properly line up
2118 even for path dependent prompts, such as the new ones available
2127 even for path dependent prompts, such as the new ones available
2119 via the prompt_specials.
2128 via the prompt_specials.
2120
2129
2121 2004-06-06 Fernando Perez <fperez@colorado.edu>
2130 2004-06-06 Fernando Perez <fperez@colorado.edu>
2122
2131
2123 * IPython/Prompts.py (prompt_specials): Added the ability to have
2132 * IPython/Prompts.py (prompt_specials): Added the ability to have
2124 bash-like special sequences in the prompts, which get
2133 bash-like special sequences in the prompts, which get
2125 automatically expanded. Things like hostname, current working
2134 automatically expanded. Things like hostname, current working
2126 directory and username are implemented already, but it's easy to
2135 directory and username are implemented already, but it's easy to
2127 add more in the future. Thanks to a patch by W.J. van der Laan
2136 add more in the future. Thanks to a patch by W.J. van der Laan
2128 <gnufnork-AT-hetdigitalegat.nl>
2137 <gnufnork-AT-hetdigitalegat.nl>
2129 (prompt_specials): Added color support for prompt strings, so
2138 (prompt_specials): Added color support for prompt strings, so
2130 users can define arbitrary color setups for their prompts.
2139 users can define arbitrary color setups for their prompts.
2131
2140
2132 2004-06-05 Fernando Perez <fperez@colorado.edu>
2141 2004-06-05 Fernando Perez <fperez@colorado.edu>
2133
2142
2134 * IPython/genutils.py (Term.reopen_all): Added Windows-specific
2143 * IPython/genutils.py (Term.reopen_all): Added Windows-specific
2135 code to load Gary Bishop's readline and configure it
2144 code to load Gary Bishop's readline and configure it
2136 automatically. Thanks to Gary for help on this.
2145 automatically. Thanks to Gary for help on this.
2137
2146
2138 2004-06-01 Fernando Perez <fperez@colorado.edu>
2147 2004-06-01 Fernando Perez <fperez@colorado.edu>
2139
2148
2140 * IPython/Logger.py (Logger.create_log): fix bug for logging
2149 * IPython/Logger.py (Logger.create_log): fix bug for logging
2141 with no filename (previous fix was incomplete).
2150 with no filename (previous fix was incomplete).
2142
2151
2143 2004-05-25 Fernando Perez <fperez@colorado.edu>
2152 2004-05-25 Fernando Perez <fperez@colorado.edu>
2144
2153
2145 * IPython/Magic.py (Magic.parse_options): fix bug where naked
2154 * IPython/Magic.py (Magic.parse_options): fix bug where naked
2146 parens would get passed to the shell.
2155 parens would get passed to the shell.
2147
2156
2148 2004-05-20 Fernando Perez <fperez@colorado.edu>
2157 2004-05-20 Fernando Perez <fperez@colorado.edu>
2149
2158
2150 * IPython/Magic.py (Magic.magic_prun): changed default profile
2159 * IPython/Magic.py (Magic.magic_prun): changed default profile
2151 sort order to 'time' (the more common profiling need).
2160 sort order to 'time' (the more common profiling need).
2152
2161
2153 * IPython/OInspect.py (Inspector.pinfo): flush the inspect cache
2162 * IPython/OInspect.py (Inspector.pinfo): flush the inspect cache
2154 so that source code shown is guaranteed in sync with the file on
2163 so that source code shown is guaranteed in sync with the file on
2155 disk (also changed in psource). Similar fix to the one for
2164 disk (also changed in psource). Similar fix to the one for
2156 ultraTB on 2004-05-06. Thanks to a bug report by Yann Le Du
2165 ultraTB on 2004-05-06. Thanks to a bug report by Yann Le Du
2157 <yann.ledu-AT-noos.fr>.
2166 <yann.ledu-AT-noos.fr>.
2158
2167
2159 * IPython/Magic.py (Magic.parse_options): Fixed bug where commands
2168 * IPython/Magic.py (Magic.parse_options): Fixed bug where commands
2160 with a single option would not be correctly parsed. Closes
2169 with a single option would not be correctly parsed. Closes
2161 http://www.scipy.net/roundup/ipython/issue14. This bug had been
2170 http://www.scipy.net/roundup/ipython/issue14. This bug had been
2162 introduced in 0.6.0 (on 2004-05-06).
2171 introduced in 0.6.0 (on 2004-05-06).
2163
2172
2164 2004-05-13 *** Released version 0.6.0
2173 2004-05-13 *** Released version 0.6.0
2165
2174
2166 2004-05-13 Fernando Perez <fperez@colorado.edu>
2175 2004-05-13 Fernando Perez <fperez@colorado.edu>
2167
2176
2168 * debian/: Added debian/ directory to CVS, so that debian support
2177 * debian/: Added debian/ directory to CVS, so that debian support
2169 is publicly accessible. The debian package is maintained by Jack
2178 is publicly accessible. The debian package is maintained by Jack
2170 Moffit <jack-AT-xiph.org>.
2179 Moffit <jack-AT-xiph.org>.
2171
2180
2172 * Documentation: included the notes about an ipython-based system
2181 * Documentation: included the notes about an ipython-based system
2173 shell (the hypothetical 'pysh') into the new_design.pdf document,
2182 shell (the hypothetical 'pysh') into the new_design.pdf document,
2174 so that these ideas get distributed to users along with the
2183 so that these ideas get distributed to users along with the
2175 official documentation.
2184 official documentation.
2176
2185
2177 2004-05-10 Fernando Perez <fperez@colorado.edu>
2186 2004-05-10 Fernando Perez <fperez@colorado.edu>
2178
2187
2179 * IPython/Logger.py (Logger.create_log): fix recently introduced
2188 * IPython/Logger.py (Logger.create_log): fix recently introduced
2180 bug (misindented line) where logstart would fail when not given an
2189 bug (misindented line) where logstart would fail when not given an
2181 explicit filename.
2190 explicit filename.
2182
2191
2183 2004-05-09 Fernando Perez <fperez@colorado.edu>
2192 2004-05-09 Fernando Perez <fperez@colorado.edu>
2184
2193
2185 * IPython/Magic.py (Magic.parse_options): skip system call when
2194 * IPython/Magic.py (Magic.parse_options): skip system call when
2186 there are no options to look for. Faster, cleaner for the common
2195 there are no options to look for. Faster, cleaner for the common
2187 case.
2196 case.
2188
2197
2189 * Documentation: many updates to the manual: describing Windows
2198 * Documentation: many updates to the manual: describing Windows
2190 support better, Gnuplot updates, credits, misc small stuff. Also
2199 support better, Gnuplot updates, credits, misc small stuff. Also
2191 updated the new_design doc a bit.
2200 updated the new_design doc a bit.
2192
2201
2193 2004-05-06 *** Released version 0.6.0.rc1
2202 2004-05-06 *** Released version 0.6.0.rc1
2194
2203
2195 2004-05-06 Fernando Perez <fperez@colorado.edu>
2204 2004-05-06 Fernando Perez <fperez@colorado.edu>
2196
2205
2197 * IPython/ultraTB.py (ListTB.text): modified a ton of string +=
2206 * IPython/ultraTB.py (ListTB.text): modified a ton of string +=
2198 operations to use the vastly more efficient list/''.join() method.
2207 operations to use the vastly more efficient list/''.join() method.
2199 (FormattedTB.text): Fix
2208 (FormattedTB.text): Fix
2200 http://www.scipy.net/roundup/ipython/issue12 - exception source
2209 http://www.scipy.net/roundup/ipython/issue12 - exception source
2201 extract not updated after reload. Thanks to Mike Salib
2210 extract not updated after reload. Thanks to Mike Salib
2202 <msalib-AT-mit.edu> for pinning the source of the problem.
2211 <msalib-AT-mit.edu> for pinning the source of the problem.
2203 Fortunately, the solution works inside ipython and doesn't require
2212 Fortunately, the solution works inside ipython and doesn't require
2204 any changes to python proper.
2213 any changes to python proper.
2205
2214
2206 * IPython/Magic.py (Magic.parse_options): Improved to process the
2215 * IPython/Magic.py (Magic.parse_options): Improved to process the
2207 argument list as a true shell would (by actually using the
2216 argument list as a true shell would (by actually using the
2208 underlying system shell). This way, all @magics automatically get
2217 underlying system shell). This way, all @magics automatically get
2209 shell expansion for variables. Thanks to a comment by Alex
2218 shell expansion for variables. Thanks to a comment by Alex
2210 Schmolck.
2219 Schmolck.
2211
2220
2212 2004-04-04 Fernando Perez <fperez@colorado.edu>
2221 2004-04-04 Fernando Perez <fperez@colorado.edu>
2213
2222
2214 * IPython/iplib.py (InteractiveShell.interact): Added a special
2223 * IPython/iplib.py (InteractiveShell.interact): Added a special
2215 trap for a debugger quit exception, which is basically impossible
2224 trap for a debugger quit exception, which is basically impossible
2216 to handle by normal mechanisms, given what pdb does to the stack.
2225 to handle by normal mechanisms, given what pdb does to the stack.
2217 This fixes a crash reported by <fgibbons-AT-llama.med.harvard.edu>.
2226 This fixes a crash reported by <fgibbons-AT-llama.med.harvard.edu>.
2218
2227
2219 2004-04-03 Fernando Perez <fperez@colorado.edu>
2228 2004-04-03 Fernando Perez <fperez@colorado.edu>
2220
2229
2221 * IPython/genutils.py (Term): Standardized the names of the Term
2230 * IPython/genutils.py (Term): Standardized the names of the Term
2222 class streams to cin/cout/cerr, following C++ naming conventions
2231 class streams to cin/cout/cerr, following C++ naming conventions
2223 (I can't use in/out/err because 'in' is not a valid attribute
2232 (I can't use in/out/err because 'in' is not a valid attribute
2224 name).
2233 name).
2225
2234
2226 * IPython/iplib.py (InteractiveShell.interact): don't increment
2235 * IPython/iplib.py (InteractiveShell.interact): don't increment
2227 the prompt if there's no user input. By Daniel 'Dang' Griffith
2236 the prompt if there's no user input. By Daniel 'Dang' Griffith
2228 <pythondev-dang-AT-lazytwinacres.net>, after a suggestion from
2237 <pythondev-dang-AT-lazytwinacres.net>, after a suggestion from
2229 Francois Pinard.
2238 Francois Pinard.
2230
2239
2231 2004-04-02 Fernando Perez <fperez@colorado.edu>
2240 2004-04-02 Fernando Perez <fperez@colorado.edu>
2232
2241
2233 * IPython/genutils.py (Stream.__init__): Modified to survive at
2242 * IPython/genutils.py (Stream.__init__): Modified to survive at
2234 least importing in contexts where stdin/out/err aren't true file
2243 least importing in contexts where stdin/out/err aren't true file
2235 objects, such as PyCrust (they lack fileno() and mode). However,
2244 objects, such as PyCrust (they lack fileno() and mode). However,
2236 the recovery facilities which rely on these things existing will
2245 the recovery facilities which rely on these things existing will
2237 not work.
2246 not work.
2238
2247
2239 2004-04-01 Fernando Perez <fperez@colorado.edu>
2248 2004-04-01 Fernando Perez <fperez@colorado.edu>
2240
2249
2241 * IPython/Magic.py (Magic.magic_sx): modified (as well as @sc) to
2250 * IPython/Magic.py (Magic.magic_sx): modified (as well as @sc) to
2242 use the new getoutputerror() function, so it properly
2251 use the new getoutputerror() function, so it properly
2243 distinguishes stdout/err.
2252 distinguishes stdout/err.
2244
2253
2245 * IPython/genutils.py (getoutputerror): added a function to
2254 * IPython/genutils.py (getoutputerror): added a function to
2246 capture separately the standard output and error of a command.
2255 capture separately the standard output and error of a command.
2247 After a comment from dang on the mailing lists. This code is
2256 After a comment from dang on the mailing lists. This code is
2248 basically a modified version of commands.getstatusoutput(), from
2257 basically a modified version of commands.getstatusoutput(), from
2249 the standard library.
2258 the standard library.
2250
2259
2251 * IPython/iplib.py (InteractiveShell.handle_shell_escape): added
2260 * IPython/iplib.py (InteractiveShell.handle_shell_escape): added
2252 '!!' as a special syntax (shorthand) to access @sx.
2261 '!!' as a special syntax (shorthand) to access @sx.
2253
2262
2254 * IPython/Magic.py (Magic.magic_sx): new magic, to execute a shell
2263 * IPython/Magic.py (Magic.magic_sx): new magic, to execute a shell
2255 command and return its output as a list split on '\n'.
2264 command and return its output as a list split on '\n'.
2256
2265
2257 2004-03-31 Fernando Perez <fperez@colorado.edu>
2266 2004-03-31 Fernando Perez <fperez@colorado.edu>
2258
2267
2259 * IPython/FakeModule.py (FakeModule.__init__): added __nonzero__
2268 * IPython/FakeModule.py (FakeModule.__init__): added __nonzero__
2260 method to dictionaries used as FakeModule instances if they lack
2269 method to dictionaries used as FakeModule instances if they lack
2261 it. At least pydoc in python2.3 breaks for runtime-defined
2270 it. At least pydoc in python2.3 breaks for runtime-defined
2262 functions without this hack. At some point I need to _really_
2271 functions without this hack. At some point I need to _really_
2263 understand what FakeModule is doing, because it's a gross hack.
2272 understand what FakeModule is doing, because it's a gross hack.
2264 But it solves Arnd's problem for now...
2273 But it solves Arnd's problem for now...
2265
2274
2266 2004-02-27 Fernando Perez <fperez@colorado.edu>
2275 2004-02-27 Fernando Perez <fperez@colorado.edu>
2267
2276
2268 * IPython/Logger.py (Logger.create_log): Fix bug where 'rotate'
2277 * IPython/Logger.py (Logger.create_log): Fix bug where 'rotate'
2269 mode would behave erratically. Also increased the number of
2278 mode would behave erratically. Also increased the number of
2270 possible logs in rotate mod to 999. Thanks to Rod Holland
2279 possible logs in rotate mod to 999. Thanks to Rod Holland
2271 <rhh@StructureLABS.com> for the report and fixes.
2280 <rhh@StructureLABS.com> for the report and fixes.
2272
2281
2273 2004-02-26 Fernando Perez <fperez@colorado.edu>
2282 2004-02-26 Fernando Perez <fperez@colorado.edu>
2274
2283
2275 * IPython/genutils.py (page): Check that the curses module really
2284 * IPython/genutils.py (page): Check that the curses module really
2276 has the initscr attribute before trying to use it. For some
2285 has the initscr attribute before trying to use it. For some
2277 reason, the Solaris curses module is missing this. I think this
2286 reason, the Solaris curses module is missing this. I think this
2278 should be considered a Solaris python bug, but I'm not sure.
2287 should be considered a Solaris python bug, but I'm not sure.
2279
2288
2280 2004-01-17 Fernando Perez <fperez@colorado.edu>
2289 2004-01-17 Fernando Perez <fperez@colorado.edu>
2281
2290
2282 * IPython/genutils.py (Stream.__init__): Changes to try to make
2291 * IPython/genutils.py (Stream.__init__): Changes to try to make
2283 ipython robust against stdin/out/err being closed by the user.
2292 ipython robust against stdin/out/err being closed by the user.
2284 This is 'user error' (and blocks a normal python session, at least
2293 This is 'user error' (and blocks a normal python session, at least
2285 the stdout case). However, Ipython should be able to survive such
2294 the stdout case). However, Ipython should be able to survive such
2286 instances of abuse as gracefully as possible. To simplify the
2295 instances of abuse as gracefully as possible. To simplify the
2287 coding and maintain compatibility with Gary Bishop's Term
2296 coding and maintain compatibility with Gary Bishop's Term
2288 contributions, I've made use of classmethods for this. I think
2297 contributions, I've made use of classmethods for this. I think
2289 this introduces a dependency on python 2.2.
2298 this introduces a dependency on python 2.2.
2290
2299
2291 2004-01-13 Fernando Perez <fperez@colorado.edu>
2300 2004-01-13 Fernando Perez <fperez@colorado.edu>
2292
2301
2293 * IPython/numutils.py (exp_safe): simplified the code a bit and
2302 * IPython/numutils.py (exp_safe): simplified the code a bit and
2294 removed the need for importing the kinds module altogether.
2303 removed the need for importing the kinds module altogether.
2295
2304
2296 2004-01-06 Fernando Perez <fperez@colorado.edu>
2305 2004-01-06 Fernando Perez <fperez@colorado.edu>
2297
2306
2298 * IPython/Magic.py (Magic.magic_sc): Made the shell capture system
2307 * IPython/Magic.py (Magic.magic_sc): Made the shell capture system
2299 a magic function instead, after some community feedback. No
2308 a magic function instead, after some community feedback. No
2300 special syntax will exist for it, but its name is deliberately
2309 special syntax will exist for it, but its name is deliberately
2301 very short.
2310 very short.
2302
2311
2303 2003-12-20 Fernando Perez <fperez@colorado.edu>
2312 2003-12-20 Fernando Perez <fperez@colorado.edu>
2304
2313
2305 * IPython/iplib.py (InteractiveShell.handle_shell_assign): Added
2314 * IPython/iplib.py (InteractiveShell.handle_shell_assign): Added
2306 new functionality, to automagically assign the result of a shell
2315 new functionality, to automagically assign the result of a shell
2307 command to a variable. I'll solicit some community feedback on
2316 command to a variable. I'll solicit some community feedback on
2308 this before making it permanent.
2317 this before making it permanent.
2309
2318
2310 * IPython/OInspect.py (Inspector.pinfo): Fix crash when info was
2319 * IPython/OInspect.py (Inspector.pinfo): Fix crash when info was
2311 requested about callables for which inspect couldn't obtain a
2320 requested about callables for which inspect couldn't obtain a
2312 proper argspec. Thanks to a crash report sent by Etienne
2321 proper argspec. Thanks to a crash report sent by Etienne
2313 Posthumus <etienne-AT-apple01.cs.vu.nl>.
2322 Posthumus <etienne-AT-apple01.cs.vu.nl>.
2314
2323
2315 2003-12-09 Fernando Perez <fperez@colorado.edu>
2324 2003-12-09 Fernando Perez <fperez@colorado.edu>
2316
2325
2317 * IPython/genutils.py (page): patch for the pager to work across
2326 * IPython/genutils.py (page): patch for the pager to work across
2318 various versions of Windows. By Gary Bishop.
2327 various versions of Windows. By Gary Bishop.
2319
2328
2320 2003-12-04 Fernando Perez <fperez@colorado.edu>
2329 2003-12-04 Fernando Perez <fperez@colorado.edu>
2321
2330
2322 * IPython/Gnuplot2.py (PlotItems): Fixes for working with
2331 * IPython/Gnuplot2.py (PlotItems): Fixes for working with
2323 Gnuplot.py version 1.7, whose internal names changed quite a bit.
2332 Gnuplot.py version 1.7, whose internal names changed quite a bit.
2324 While I tested this and it looks ok, there may still be corner
2333 While I tested this and it looks ok, there may still be corner
2325 cases I've missed.
2334 cases I've missed.
2326
2335
2327 2003-12-01 Fernando Perez <fperez@colorado.edu>
2336 2003-12-01 Fernando Perez <fperez@colorado.edu>
2328
2337
2329 * IPython/iplib.py (InteractiveShell._prefilter): Fixed a bug
2338 * IPython/iplib.py (InteractiveShell._prefilter): Fixed a bug
2330 where a line like 'p,q=1,2' would fail because the automagic
2339 where a line like 'p,q=1,2' would fail because the automagic
2331 system would be triggered for @p.
2340 system would be triggered for @p.
2332
2341
2333 * IPython/DPyGetOpt.py (DPyGetOpt.processArguments): Tab-related
2342 * IPython/DPyGetOpt.py (DPyGetOpt.processArguments): Tab-related
2334 cleanups, code unmodified.
2343 cleanups, code unmodified.
2335
2344
2336 * IPython/genutils.py (Term): added a class for IPython to handle
2345 * IPython/genutils.py (Term): added a class for IPython to handle
2337 output. In most cases it will just be a proxy for stdout/err, but
2346 output. In most cases it will just be a proxy for stdout/err, but
2338 having this allows modifications to be made for some platforms,
2347 having this allows modifications to be made for some platforms,
2339 such as handling color escapes under Windows. All of this code
2348 such as handling color escapes under Windows. All of this code
2340 was contributed by Gary Bishop, with minor modifications by me.
2349 was contributed by Gary Bishop, with minor modifications by me.
2341 The actual changes affect many files.
2350 The actual changes affect many files.
2342
2351
2343 2003-11-30 Fernando Perez <fperez@colorado.edu>
2352 2003-11-30 Fernando Perez <fperez@colorado.edu>
2344
2353
2345 * IPython/iplib.py (file_matches): new completion code, courtesy
2354 * IPython/iplib.py (file_matches): new completion code, courtesy
2346 of Jeff Collins. This enables filename completion again under
2355 of Jeff Collins. This enables filename completion again under
2347 python 2.3, which disabled it at the C level.
2356 python 2.3, which disabled it at the C level.
2348
2357
2349 2003-11-11 Fernando Perez <fperez@colorado.edu>
2358 2003-11-11 Fernando Perez <fperez@colorado.edu>
2350
2359
2351 * IPython/numutils.py (amap): Added amap() fn. Simple shorthand
2360 * IPython/numutils.py (amap): Added amap() fn. Simple shorthand
2352 for Numeric.array(map(...)), but often convenient.
2361 for Numeric.array(map(...)), but often convenient.
2353
2362
2354 2003-11-05 Fernando Perez <fperez@colorado.edu>
2363 2003-11-05 Fernando Perez <fperez@colorado.edu>
2355
2364
2356 * IPython/numutils.py (frange): Changed a call from int() to
2365 * IPython/numutils.py (frange): Changed a call from int() to
2357 int(round()) to prevent a problem reported with arange() in the
2366 int(round()) to prevent a problem reported with arange() in the
2358 numpy list.
2367 numpy list.
2359
2368
2360 2003-10-06 Fernando Perez <fperez@colorado.edu>
2369 2003-10-06 Fernando Perez <fperez@colorado.edu>
2361
2370
2362 * IPython/DPyGetOpt.py (DPyGetOpt.processArguments): changed to
2371 * IPython/DPyGetOpt.py (DPyGetOpt.processArguments): changed to
2363 prevent crashes if sys lacks an argv attribute (it happens with
2372 prevent crashes if sys lacks an argv attribute (it happens with
2364 embedded interpreters which build a bare-bones sys module).
2373 embedded interpreters which build a bare-bones sys module).
2365 Thanks to a report/bugfix by Adam Hupp <hupp-AT-cs.wisc.edu>.
2374 Thanks to a report/bugfix by Adam Hupp <hupp-AT-cs.wisc.edu>.
2366
2375
2367 2003-09-24 Fernando Perez <fperez@colorado.edu>
2376 2003-09-24 Fernando Perez <fperez@colorado.edu>
2368
2377
2369 * IPython/Magic.py (Magic._ofind): blanket except around getattr()
2378 * IPython/Magic.py (Magic._ofind): blanket except around getattr()
2370 to protect against poorly written user objects where __getattr__
2379 to protect against poorly written user objects where __getattr__
2371 raises exceptions other than AttributeError. Thanks to a bug
2380 raises exceptions other than AttributeError. Thanks to a bug
2372 report by Oliver Sander <osander-AT-gmx.de>.
2381 report by Oliver Sander <osander-AT-gmx.de>.
2373
2382
2374 * IPython/FakeModule.py (FakeModule.__repr__): this method was
2383 * IPython/FakeModule.py (FakeModule.__repr__): this method was
2375 missing. Thanks to bug report by Ralf Schmitt <ralf-AT-brainbot.com>.
2384 missing. Thanks to bug report by Ralf Schmitt <ralf-AT-brainbot.com>.
2376
2385
2377 2003-09-09 Fernando Perez <fperez@colorado.edu>
2386 2003-09-09 Fernando Perez <fperez@colorado.edu>
2378
2387
2379 * IPython/iplib.py (InteractiveShell._prefilter): fix bug where
2388 * IPython/iplib.py (InteractiveShell._prefilter): fix bug where
2380 unpacking a list whith a callable as first element would
2389 unpacking a list whith a callable as first element would
2381 mistakenly trigger autocalling. Thanks to a bug report by Jeffery
2390 mistakenly trigger autocalling. Thanks to a bug report by Jeffery
2382 Collins.
2391 Collins.
2383
2392
2384 2003-08-25 *** Released version 0.5.0
2393 2003-08-25 *** Released version 0.5.0
2385
2394
2386 2003-08-22 Fernando Perez <fperez@colorado.edu>
2395 2003-08-22 Fernando Perez <fperez@colorado.edu>
2387
2396
2388 * IPython/ultraTB.py (VerboseTB.linereader): Improved handling of
2397 * IPython/ultraTB.py (VerboseTB.linereader): Improved handling of
2389 improperly defined user exceptions. Thanks to feedback from Mark
2398 improperly defined user exceptions. Thanks to feedback from Mark
2390 Russell <mrussell-AT-verio.net>.
2399 Russell <mrussell-AT-verio.net>.
2391
2400
2392 2003-08-20 Fernando Perez <fperez@colorado.edu>
2401 2003-08-20 Fernando Perez <fperez@colorado.edu>
2393
2402
2394 * IPython/OInspect.py (Inspector.pinfo): changed String Form
2403 * IPython/OInspect.py (Inspector.pinfo): changed String Form
2395 printing so that it would print multi-line string forms starting
2404 printing so that it would print multi-line string forms starting
2396 with a new line. This way the formatting is better respected for
2405 with a new line. This way the formatting is better respected for
2397 objects which work hard to make nice string forms.
2406 objects which work hard to make nice string forms.
2398
2407
2399 * IPython/iplib.py (InteractiveShell.handle_auto): Fix bug where
2408 * IPython/iplib.py (InteractiveShell.handle_auto): Fix bug where
2400 autocall would overtake data access for objects with both
2409 autocall would overtake data access for objects with both
2401 __getitem__ and __call__.
2410 __getitem__ and __call__.
2402
2411
2403 2003-08-19 *** Released version 0.5.0-rc1
2412 2003-08-19 *** Released version 0.5.0-rc1
2404
2413
2405 2003-08-19 Fernando Perez <fperez@colorado.edu>
2414 2003-08-19 Fernando Perez <fperez@colorado.edu>
2406
2415
2407 * IPython/deep_reload.py (load_tail): single tiny change here
2416 * IPython/deep_reload.py (load_tail): single tiny change here
2408 seems to fix the long-standing bug of dreload() failing to work
2417 seems to fix the long-standing bug of dreload() failing to work
2409 for dotted names. But this module is pretty tricky, so I may have
2418 for dotted names. But this module is pretty tricky, so I may have
2410 missed some subtlety. Needs more testing!.
2419 missed some subtlety. Needs more testing!.
2411
2420
2412 * IPython/ultraTB.py (VerboseTB.linereader): harden against user
2421 * IPython/ultraTB.py (VerboseTB.linereader): harden against user
2413 exceptions which have badly implemented __str__ methods.
2422 exceptions which have badly implemented __str__ methods.
2414 (VerboseTB.text): harden against inspect.getinnerframes crashing,
2423 (VerboseTB.text): harden against inspect.getinnerframes crashing,
2415 which I've been getting reports about from Python 2.3 users. I
2424 which I've been getting reports about from Python 2.3 users. I
2416 wish I had a simple test case to reproduce the problem, so I could
2425 wish I had a simple test case to reproduce the problem, so I could
2417 either write a cleaner workaround or file a bug report if
2426 either write a cleaner workaround or file a bug report if
2418 necessary.
2427 necessary.
2419
2428
2420 * IPython/Magic.py (Magic.magic_edit): fixed bug where after
2429 * IPython/Magic.py (Magic.magic_edit): fixed bug where after
2421 making a class 'foo', file 'foo.py' couldn't be edited. Thanks to
2430 making a class 'foo', file 'foo.py' couldn't be edited. Thanks to
2422 a bug report by Tjabo Kloppenburg.
2431 a bug report by Tjabo Kloppenburg.
2423
2432
2424 * IPython/ultraTB.py (VerboseTB.debugger): hardened against pdb
2433 * IPython/ultraTB.py (VerboseTB.debugger): hardened against pdb
2425 crashes. Wrapped the pdb call in a blanket try/except, since pdb
2434 crashes. Wrapped the pdb call in a blanket try/except, since pdb
2426 seems rather unstable. Thanks to a bug report by Tjabo
2435 seems rather unstable. Thanks to a bug report by Tjabo
2427 Kloppenburg <tjabo.kloppenburg-AT-unix-ag.uni-siegen.de>.
2436 Kloppenburg <tjabo.kloppenburg-AT-unix-ag.uni-siegen.de>.
2428
2437
2429 * IPython/Release.py (version): release 0.5.0-rc1. I want to put
2438 * IPython/Release.py (version): release 0.5.0-rc1. I want to put
2430 this out soon because of the critical fixes in the inner loop for
2439 this out soon because of the critical fixes in the inner loop for
2431 generators.
2440 generators.
2432
2441
2433 * IPython/Magic.py (Magic.getargspec): removed. This (and
2442 * IPython/Magic.py (Magic.getargspec): removed. This (and
2434 _get_def) have been obsoleted by OInspect for a long time, I
2443 _get_def) have been obsoleted by OInspect for a long time, I
2435 hadn't noticed that they were dead code.
2444 hadn't noticed that they were dead code.
2436 (Magic._ofind): restored _ofind functionality for a few literals
2445 (Magic._ofind): restored _ofind functionality for a few literals
2437 (those in ["''",'""','[]','{}','()']). But it won't work anymore
2446 (those in ["''",'""','[]','{}','()']). But it won't work anymore
2438 for things like "hello".capitalize?, since that would require a
2447 for things like "hello".capitalize?, since that would require a
2439 potentially dangerous eval() again.
2448 potentially dangerous eval() again.
2440
2449
2441 * IPython/iplib.py (InteractiveShell._prefilter): reorganized the
2450 * IPython/iplib.py (InteractiveShell._prefilter): reorganized the
2442 logic a bit more to clean up the escapes handling and minimize the
2451 logic a bit more to clean up the escapes handling and minimize the
2443 use of _ofind to only necessary cases. The interactive 'feel' of
2452 use of _ofind to only necessary cases. The interactive 'feel' of
2444 IPython should have improved quite a bit with the changes in
2453 IPython should have improved quite a bit with the changes in
2445 _prefilter and _ofind (besides being far safer than before).
2454 _prefilter and _ofind (besides being far safer than before).
2446
2455
2447 * IPython/Magic.py (Magic.magic_edit): Fixed old bug (but rather
2456 * IPython/Magic.py (Magic.magic_edit): Fixed old bug (but rather
2448 obscure, never reported). Edit would fail to find the object to
2457 obscure, never reported). Edit would fail to find the object to
2449 edit under some circumstances.
2458 edit under some circumstances.
2450 (Magic._ofind): CRITICAL FIX. Finally removed the eval() calls
2459 (Magic._ofind): CRITICAL FIX. Finally removed the eval() calls
2451 which were causing double-calling of generators. Those eval calls
2460 which were causing double-calling of generators. Those eval calls
2452 were _very_ dangerous, since code with side effects could be
2461 were _very_ dangerous, since code with side effects could be
2453 triggered. As they say, 'eval is evil'... These were the
2462 triggered. As they say, 'eval is evil'... These were the
2454 nastiest evals in IPython. Besides, _ofind is now far simpler,
2463 nastiest evals in IPython. Besides, _ofind is now far simpler,
2455 and it should also be quite a bit faster. Its use of inspect is
2464 and it should also be quite a bit faster. Its use of inspect is
2456 also safer, so perhaps some of the inspect-related crashes I've
2465 also safer, so perhaps some of the inspect-related crashes I've
2457 seen lately with Python 2.3 might be taken care of. That will
2466 seen lately with Python 2.3 might be taken care of. That will
2458 need more testing.
2467 need more testing.
2459
2468
2460 2003-08-17 Fernando Perez <fperez@colorado.edu>
2469 2003-08-17 Fernando Perez <fperez@colorado.edu>
2461
2470
2462 * IPython/iplib.py (InteractiveShell._prefilter): significant
2471 * IPython/iplib.py (InteractiveShell._prefilter): significant
2463 simplifications to the logic for handling user escapes. Faster
2472 simplifications to the logic for handling user escapes. Faster
2464 and simpler code.
2473 and simpler code.
2465
2474
2466 2003-08-14 Fernando Perez <fperez@colorado.edu>
2475 2003-08-14 Fernando Perez <fperez@colorado.edu>
2467
2476
2468 * IPython/numutils.py (sum_flat): rewrote to be non-recursive.
2477 * IPython/numutils.py (sum_flat): rewrote to be non-recursive.
2469 Now it requires O(N) storage (N=size(a)) for non-contiguous input,
2478 Now it requires O(N) storage (N=size(a)) for non-contiguous input,
2470 but it should be quite a bit faster. And the recursive version
2479 but it should be quite a bit faster. And the recursive version
2471 generated O(log N) intermediate storage for all rank>1 arrays,
2480 generated O(log N) intermediate storage for all rank>1 arrays,
2472 even if they were contiguous.
2481 even if they were contiguous.
2473 (l1norm): Added this function.
2482 (l1norm): Added this function.
2474 (norm): Added this function for arbitrary norms (including
2483 (norm): Added this function for arbitrary norms (including
2475 l-infinity). l1 and l2 are still special cases for convenience
2484 l-infinity). l1 and l2 are still special cases for convenience
2476 and speed.
2485 and speed.
2477
2486
2478 2003-08-03 Fernando Perez <fperez@colorado.edu>
2487 2003-08-03 Fernando Perez <fperez@colorado.edu>
2479
2488
2480 * IPython/Magic.py (Magic.magic_edit): Removed all remaining string
2489 * IPython/Magic.py (Magic.magic_edit): Removed all remaining string
2481 exceptions, which now raise PendingDeprecationWarnings in Python
2490 exceptions, which now raise PendingDeprecationWarnings in Python
2482 2.3. There were some in Magic and some in Gnuplot2.
2491 2.3. There were some in Magic and some in Gnuplot2.
2483
2492
2484 2003-06-30 Fernando Perez <fperez@colorado.edu>
2493 2003-06-30 Fernando Perez <fperez@colorado.edu>
2485
2494
2486 * IPython/genutils.py (page): modified to call curses only for
2495 * IPython/genutils.py (page): modified to call curses only for
2487 terminals where TERM=='xterm'. After problems under many other
2496 terminals where TERM=='xterm'. After problems under many other
2488 terminals were reported by Keith Beattie <KSBeattie-AT-lbl.gov>.
2497 terminals were reported by Keith Beattie <KSBeattie-AT-lbl.gov>.
2489
2498
2490 * IPython/iplib.py (complete): removed spurious 'print "IE"' which
2499 * IPython/iplib.py (complete): removed spurious 'print "IE"' which
2491 would be triggered when readline was absent. This was just an old
2500 would be triggered when readline was absent. This was just an old
2492 debugging statement I'd forgotten to take out.
2501 debugging statement I'd forgotten to take out.
2493
2502
2494 2003-06-20 Fernando Perez <fperez@colorado.edu>
2503 2003-06-20 Fernando Perez <fperez@colorado.edu>
2495
2504
2496 * IPython/genutils.py (clock): modified to return only user time
2505 * IPython/genutils.py (clock): modified to return only user time
2497 (not counting system time), after a discussion on scipy. While
2506 (not counting system time), after a discussion on scipy. While
2498 system time may be a useful quantity occasionally, it may much
2507 system time may be a useful quantity occasionally, it may much
2499 more easily be skewed by occasional swapping or other similar
2508 more easily be skewed by occasional swapping or other similar
2500 activity.
2509 activity.
2501
2510
2502 2003-06-05 Fernando Perez <fperez@colorado.edu>
2511 2003-06-05 Fernando Perez <fperez@colorado.edu>
2503
2512
2504 * IPython/numutils.py (identity): new function, for building
2513 * IPython/numutils.py (identity): new function, for building
2505 arbitrary rank Kronecker deltas (mostly backwards compatible with
2514 arbitrary rank Kronecker deltas (mostly backwards compatible with
2506 Numeric.identity)
2515 Numeric.identity)
2507
2516
2508 2003-06-03 Fernando Perez <fperez@colorado.edu>
2517 2003-06-03 Fernando Perez <fperez@colorado.edu>
2509
2518
2510 * IPython/iplib.py (InteractiveShell.handle_magic): protect
2519 * IPython/iplib.py (InteractiveShell.handle_magic): protect
2511 arguments passed to magics with spaces, to allow trailing '\' to
2520 arguments passed to magics with spaces, to allow trailing '\' to
2512 work normally (mainly for Windows users).
2521 work normally (mainly for Windows users).
2513
2522
2514 2003-05-29 Fernando Perez <fperez@colorado.edu>
2523 2003-05-29 Fernando Perez <fperez@colorado.edu>
2515
2524
2516 * IPython/ipmaker.py (make_IPython): Load site._Helper() as help
2525 * IPython/ipmaker.py (make_IPython): Load site._Helper() as help
2517 instead of pydoc.help. This fixes a bizarre behavior where
2526 instead of pydoc.help. This fixes a bizarre behavior where
2518 printing '%s' % locals() would trigger the help system. Now
2527 printing '%s' % locals() would trigger the help system. Now
2519 ipython behaves like normal python does.
2528 ipython behaves like normal python does.
2520
2529
2521 Note that if one does 'from pydoc import help', the bizarre
2530 Note that if one does 'from pydoc import help', the bizarre
2522 behavior returns, but this will also happen in normal python, so
2531 behavior returns, but this will also happen in normal python, so
2523 it's not an ipython bug anymore (it has to do with how pydoc.help
2532 it's not an ipython bug anymore (it has to do with how pydoc.help
2524 is implemented).
2533 is implemented).
2525
2534
2526 2003-05-22 Fernando Perez <fperez@colorado.edu>
2535 2003-05-22 Fernando Perez <fperez@colorado.edu>
2527
2536
2528 * IPython/FlexCompleter.py (Completer.attr_matches): fixed to
2537 * IPython/FlexCompleter.py (Completer.attr_matches): fixed to
2529 return [] instead of None when nothing matches, also match to end
2538 return [] instead of None when nothing matches, also match to end
2530 of line. Patch by Gary Bishop.
2539 of line. Patch by Gary Bishop.
2531
2540
2532 * IPython/ipmaker.py (make_IPython): Added same sys.excepthook
2541 * IPython/ipmaker.py (make_IPython): Added same sys.excepthook
2533 protection as before, for files passed on the command line. This
2542 protection as before, for files passed on the command line. This
2534 prevents the CrashHandler from kicking in if user files call into
2543 prevents the CrashHandler from kicking in if user files call into
2535 sys.excepthook (such as PyQt and WxWindows have a nasty habit of
2544 sys.excepthook (such as PyQt and WxWindows have a nasty habit of
2536 doing). After a report by Kasper Souren <Kasper.Souren-AT-ircam.fr>
2545 doing). After a report by Kasper Souren <Kasper.Souren-AT-ircam.fr>
2537
2546
2538 2003-05-20 *** Released version 0.4.0
2547 2003-05-20 *** Released version 0.4.0
2539
2548
2540 2003-05-20 Fernando Perez <fperez@colorado.edu>
2549 2003-05-20 Fernando Perez <fperez@colorado.edu>
2541
2550
2542 * setup.py: added support for manpages. It's a bit hackish b/c of
2551 * setup.py: added support for manpages. It's a bit hackish b/c of
2543 a bug in the way the bdist_rpm distutils target handles gzipped
2552 a bug in the way the bdist_rpm distutils target handles gzipped
2544 manpages, but it works. After a patch by Jack.
2553 manpages, but it works. After a patch by Jack.
2545
2554
2546 2003-05-19 Fernando Perez <fperez@colorado.edu>
2555 2003-05-19 Fernando Perez <fperez@colorado.edu>
2547
2556
2548 * IPython/numutils.py: added a mockup of the kinds module, since
2557 * IPython/numutils.py: added a mockup of the kinds module, since
2549 it was recently removed from Numeric. This way, numutils will
2558 it was recently removed from Numeric. This way, numutils will
2550 work for all users even if they are missing kinds.
2559 work for all users even if they are missing kinds.
2551
2560
2552 * IPython/Magic.py (Magic._ofind): Harden against an inspect
2561 * IPython/Magic.py (Magic._ofind): Harden against an inspect
2553 failure, which can occur with SWIG-wrapped extensions. After a
2562 failure, which can occur with SWIG-wrapped extensions. After a
2554 crash report from Prabhu.
2563 crash report from Prabhu.
2555
2564
2556 2003-05-16 Fernando Perez <fperez@colorado.edu>
2565 2003-05-16 Fernando Perez <fperez@colorado.edu>
2557
2566
2558 * IPython/iplib.py (InteractiveShell.excepthook): New method to
2567 * IPython/iplib.py (InteractiveShell.excepthook): New method to
2559 protect ipython from user code which may call directly
2568 protect ipython from user code which may call directly
2560 sys.excepthook (this looks like an ipython crash to the user, even
2569 sys.excepthook (this looks like an ipython crash to the user, even
2561 when it isn't). After a patch by Gary Bishop <gb-AT-cs.unc.edu>.
2570 when it isn't). After a patch by Gary Bishop <gb-AT-cs.unc.edu>.
2562 This is especially important to help users of WxWindows, but may
2571 This is especially important to help users of WxWindows, but may
2563 also be useful in other cases.
2572 also be useful in other cases.
2564
2573
2565 * IPython/ultraTB.py (AutoFormattedTB.__call__): Changed to allow
2574 * IPython/ultraTB.py (AutoFormattedTB.__call__): Changed to allow
2566 an optional tb_offset to be specified, and to preserve exception
2575 an optional tb_offset to be specified, and to preserve exception
2567 info if given. After a patch by Gary Bishop <gb-AT-cs.unc.edu>.
2576 info if given. After a patch by Gary Bishop <gb-AT-cs.unc.edu>.
2568
2577
2569 * ipython.1 (Default): Thanks to Jack's work, we now have manpages!
2578 * ipython.1 (Default): Thanks to Jack's work, we now have manpages!
2570
2579
2571 2003-05-15 Fernando Perez <fperez@colorado.edu>
2580 2003-05-15 Fernando Perez <fperez@colorado.edu>
2572
2581
2573 * IPython/iplib.py (InteractiveShell.user_setup): Fix crash when
2582 * IPython/iplib.py (InteractiveShell.user_setup): Fix crash when
2574 installing for a new user under Windows.
2583 installing for a new user under Windows.
2575
2584
2576 2003-05-12 Fernando Perez <fperez@colorado.edu>
2585 2003-05-12 Fernando Perez <fperez@colorado.edu>
2577
2586
2578 * IPython/iplib.py (InteractiveShell.handle_emacs): New line
2587 * IPython/iplib.py (InteractiveShell.handle_emacs): New line
2579 handler for Emacs comint-based lines. Currently it doesn't do
2588 handler for Emacs comint-based lines. Currently it doesn't do
2580 much (but importantly, it doesn't update the history cache). In
2589 much (but importantly, it doesn't update the history cache). In
2581 the future it may be expanded if Alex needs more functionality
2590 the future it may be expanded if Alex needs more functionality
2582 there.
2591 there.
2583
2592
2584 * IPython/CrashHandler.py (CrashHandler.__call__): Added platform
2593 * IPython/CrashHandler.py (CrashHandler.__call__): Added platform
2585 info to crash reports.
2594 info to crash reports.
2586
2595
2587 * IPython/iplib.py (InteractiveShell.mainloop): Added -c option,
2596 * IPython/iplib.py (InteractiveShell.mainloop): Added -c option,
2588 just like Python's -c. Also fixed crash with invalid -color
2597 just like Python's -c. Also fixed crash with invalid -color
2589 option value at startup. Thanks to Will French
2598 option value at startup. Thanks to Will French
2590 <wfrench-AT-bestweb.net> for the bug report.
2599 <wfrench-AT-bestweb.net> for the bug report.
2591
2600
2592 2003-05-09 Fernando Perez <fperez@colorado.edu>
2601 2003-05-09 Fernando Perez <fperez@colorado.edu>
2593
2602
2594 * IPython/genutils.py (EvalDict.__getitem__): Renamed EvalString
2603 * IPython/genutils.py (EvalDict.__getitem__): Renamed EvalString
2595 to EvalDict (it's a mapping, after all) and simplified its code
2604 to EvalDict (it's a mapping, after all) and simplified its code
2596 quite a bit, after a nice discussion on c.l.py where Gustavo
2605 quite a bit, after a nice discussion on c.l.py where Gustavo
2597 CΓ³rdova <gcordova-AT-sismex.com> suggested the new version.
2606 CΓ³rdova <gcordova-AT-sismex.com> suggested the new version.
2598
2607
2599 2003-04-30 Fernando Perez <fperez@colorado.edu>
2608 2003-04-30 Fernando Perez <fperez@colorado.edu>
2600
2609
2601 * IPython/genutils.py (timings_out): modified it to reduce its
2610 * IPython/genutils.py (timings_out): modified it to reduce its
2602 overhead in the common reps==1 case.
2611 overhead in the common reps==1 case.
2603
2612
2604 2003-04-29 Fernando Perez <fperez@colorado.edu>
2613 2003-04-29 Fernando Perez <fperez@colorado.edu>
2605
2614
2606 * IPython/genutils.py (timings_out): Modified to use the resource
2615 * IPython/genutils.py (timings_out): Modified to use the resource
2607 module, which avoids the wraparound problems of time.clock().
2616 module, which avoids the wraparound problems of time.clock().
2608
2617
2609 2003-04-17 *** Released version 0.2.15pre4
2618 2003-04-17 *** Released version 0.2.15pre4
2610
2619
2611 2003-04-17 Fernando Perez <fperez@colorado.edu>
2620 2003-04-17 Fernando Perez <fperez@colorado.edu>
2612
2621
2613 * setup.py (scriptfiles): Split windows-specific stuff over to a
2622 * setup.py (scriptfiles): Split windows-specific stuff over to a
2614 separate file, in an attempt to have a Windows GUI installer.
2623 separate file, in an attempt to have a Windows GUI installer.
2615 That didn't work, but part of the groundwork is done.
2624 That didn't work, but part of the groundwork is done.
2616
2625
2617 * IPython/UserConfig/ipythonrc: Added M-i, M-o and M-I for
2626 * IPython/UserConfig/ipythonrc: Added M-i, M-o and M-I for
2618 indent/unindent with 4 spaces. Particularly useful in combination
2627 indent/unindent with 4 spaces. Particularly useful in combination
2619 with the new auto-indent option.
2628 with the new auto-indent option.
2620
2629
2621 2003-04-16 Fernando Perez <fperez@colorado.edu>
2630 2003-04-16 Fernando Perez <fperez@colorado.edu>
2622
2631
2623 * IPython/Magic.py: various replacements of self.rc for
2632 * IPython/Magic.py: various replacements of self.rc for
2624 self.shell.rc. A lot more remains to be done to fully disentangle
2633 self.shell.rc. A lot more remains to be done to fully disentangle
2625 this class from the main Shell class.
2634 this class from the main Shell class.
2626
2635
2627 * IPython/GnuplotRuntime.py: added checks for mouse support so
2636 * IPython/GnuplotRuntime.py: added checks for mouse support so
2628 that we don't try to enable it if the current gnuplot doesn't
2637 that we don't try to enable it if the current gnuplot doesn't
2629 really support it. Also added checks so that we don't try to
2638 really support it. Also added checks so that we don't try to
2630 enable persist under Windows (where Gnuplot doesn't recognize the
2639 enable persist under Windows (where Gnuplot doesn't recognize the
2631 option).
2640 option).
2632
2641
2633 * IPython/iplib.py (InteractiveShell.interact): Added optional
2642 * IPython/iplib.py (InteractiveShell.interact): Added optional
2634 auto-indenting code, after a patch by King C. Shu
2643 auto-indenting code, after a patch by King C. Shu
2635 <kingshu-AT-myrealbox.com>. It's off by default because it doesn't
2644 <kingshu-AT-myrealbox.com>. It's off by default because it doesn't
2636 get along well with pasting indented code. If I ever figure out
2645 get along well with pasting indented code. If I ever figure out
2637 how to make that part go well, it will become on by default.
2646 how to make that part go well, it will become on by default.
2638
2647
2639 * IPython/Prompts.py (Prompt1.auto_rewrite): Fixed bug which would
2648 * IPython/Prompts.py (Prompt1.auto_rewrite): Fixed bug which would
2640 crash ipython if there was an unmatched '%' in the user's prompt
2649 crash ipython if there was an unmatched '%' in the user's prompt
2641 string. Reported by Thorsten Kampe <thorsten-AT-thorstenkampe.de>.
2650 string. Reported by Thorsten Kampe <thorsten-AT-thorstenkampe.de>.
2642
2651
2643 * IPython/iplib.py (InteractiveShell.interact): removed the
2652 * IPython/iplib.py (InteractiveShell.interact): removed the
2644 ability to ask the user whether he wants to crash or not at the
2653 ability to ask the user whether he wants to crash or not at the
2645 'last line' exception handler. Calling functions at that point
2654 'last line' exception handler. Calling functions at that point
2646 changes the stack, and the error reports would have incorrect
2655 changes the stack, and the error reports would have incorrect
2647 tracebacks.
2656 tracebacks.
2648
2657
2649 * IPython/Magic.py (Magic.magic_page): Added new @page magic, to
2658 * IPython/Magic.py (Magic.magic_page): Added new @page magic, to
2650 pass through a peger a pretty-printed form of any object. After a
2659 pass through a peger a pretty-printed form of any object. After a
2651 contribution by Olivier Aubert <oaubert-AT-bat710.univ-lyon1.fr>
2660 contribution by Olivier Aubert <oaubert-AT-bat710.univ-lyon1.fr>
2652
2661
2653 2003-04-14 Fernando Perez <fperez@colorado.edu>
2662 2003-04-14 Fernando Perez <fperez@colorado.edu>
2654
2663
2655 * IPython/iplib.py (InteractiveShell.user_setup): Fixed bug where
2664 * IPython/iplib.py (InteractiveShell.user_setup): Fixed bug where
2656 all files in ~ would be modified at first install (instead of
2665 all files in ~ would be modified at first install (instead of
2657 ~/.ipython). This could be potentially disastrous, as the
2666 ~/.ipython). This could be potentially disastrous, as the
2658 modification (make line-endings native) could damage binary files.
2667 modification (make line-endings native) could damage binary files.
2659
2668
2660 2003-04-10 Fernando Perez <fperez@colorado.edu>
2669 2003-04-10 Fernando Perez <fperez@colorado.edu>
2661
2670
2662 * IPython/iplib.py (InteractiveShell.handle_help): Modified to
2671 * IPython/iplib.py (InteractiveShell.handle_help): Modified to
2663 handle only lines which are invalid python. This now means that
2672 handle only lines which are invalid python. This now means that
2664 lines like 'x=1 #?' execute properly. Thanks to Jeffery Collins
2673 lines like 'x=1 #?' execute properly. Thanks to Jeffery Collins
2665 for the bug report.
2674 for the bug report.
2666
2675
2667 2003-04-01 Fernando Perez <fperez@colorado.edu>
2676 2003-04-01 Fernando Perez <fperez@colorado.edu>
2668
2677
2669 * IPython/iplib.py (InteractiveShell.showtraceback): Fixed bug
2678 * IPython/iplib.py (InteractiveShell.showtraceback): Fixed bug
2670 where failing to set sys.last_traceback would crash pdb.pm().
2679 where failing to set sys.last_traceback would crash pdb.pm().
2671 Thanks to Jeffery D. Collins <Jeff.Collins-AT-vexcel.com> for the bug
2680 Thanks to Jeffery D. Collins <Jeff.Collins-AT-vexcel.com> for the bug
2672 report.
2681 report.
2673
2682
2674 2003-03-25 Fernando Perez <fperez@colorado.edu>
2683 2003-03-25 Fernando Perez <fperez@colorado.edu>
2675
2684
2676 * IPython/Magic.py (Magic.magic_prun): rstrip() output of profiler
2685 * IPython/Magic.py (Magic.magic_prun): rstrip() output of profiler
2677 before printing it (it had a lot of spurious blank lines at the
2686 before printing it (it had a lot of spurious blank lines at the
2678 end).
2687 end).
2679
2688
2680 * IPython/Gnuplot2.py (Gnuplot.hardcopy): fixed bug where lpr
2689 * IPython/Gnuplot2.py (Gnuplot.hardcopy): fixed bug where lpr
2681 output would be sent 21 times! Obviously people don't use this
2690 output would be sent 21 times! Obviously people don't use this
2682 too often, or I would have heard about it.
2691 too often, or I would have heard about it.
2683
2692
2684 2003-03-24 Fernando Perez <fperez@colorado.edu>
2693 2003-03-24 Fernando Perez <fperez@colorado.edu>
2685
2694
2686 * setup.py (scriptfiles): renamed the data_files parameter from
2695 * setup.py (scriptfiles): renamed the data_files parameter from
2687 'base' to 'data' to fix rpm build issues. Thanks to Ralf Ahlbrink
2696 'base' to 'data' to fix rpm build issues. Thanks to Ralf Ahlbrink
2688 for the patch.
2697 for the patch.
2689
2698
2690 2003-03-20 Fernando Perez <fperez@colorado.edu>
2699 2003-03-20 Fernando Perez <fperez@colorado.edu>
2691
2700
2692 * IPython/genutils.py (error): added error() and fatal()
2701 * IPython/genutils.py (error): added error() and fatal()
2693 functions.
2702 functions.
2694
2703
2695 2003-03-18 *** Released version 0.2.15pre3
2704 2003-03-18 *** Released version 0.2.15pre3
2696
2705
2697 2003-03-18 Fernando Perez <fperez@colorado.edu>
2706 2003-03-18 Fernando Perez <fperez@colorado.edu>
2698
2707
2699 * setupext/install_data_ext.py
2708 * setupext/install_data_ext.py
2700 (install_data_ext.initialize_options): Class contributed by Jack
2709 (install_data_ext.initialize_options): Class contributed by Jack
2701 Moffit for fixing the old distutils hack. He is sending this to
2710 Moffit for fixing the old distutils hack. He is sending this to
2702 the distutils folks so in the future we may not need it as a
2711 the distutils folks so in the future we may not need it as a
2703 private fix.
2712 private fix.
2704
2713
2705 * MANIFEST.in: Extensive reorganization, based on Jack Moffit's
2714 * MANIFEST.in: Extensive reorganization, based on Jack Moffit's
2706 changes for Debian packaging. See his patch for full details.
2715 changes for Debian packaging. See his patch for full details.
2707 The old distutils hack of making the ipythonrc* files carry a
2716 The old distutils hack of making the ipythonrc* files carry a
2708 bogus .py extension is gone, at last. Examples were moved to a
2717 bogus .py extension is gone, at last. Examples were moved to a
2709 separate subdir under doc/, and the separate executable scripts
2718 separate subdir under doc/, and the separate executable scripts
2710 now live in their own directory. Overall a great cleanup. The
2719 now live in their own directory. Overall a great cleanup. The
2711 manual was updated to use the new files, and setup.py has been
2720 manual was updated to use the new files, and setup.py has been
2712 fixed for this setup.
2721 fixed for this setup.
2713
2722
2714 * IPython/PyColorize.py (Parser.usage): made non-executable and
2723 * IPython/PyColorize.py (Parser.usage): made non-executable and
2715 created a pycolor wrapper around it to be included as a script.
2724 created a pycolor wrapper around it to be included as a script.
2716
2725
2717 2003-03-12 *** Released version 0.2.15pre2
2726 2003-03-12 *** Released version 0.2.15pre2
2718
2727
2719 2003-03-12 Fernando Perez <fperez@colorado.edu>
2728 2003-03-12 Fernando Perez <fperez@colorado.edu>
2720
2729
2721 * IPython/ColorANSI.py (make_color_table): Finally fixed the
2730 * IPython/ColorANSI.py (make_color_table): Finally fixed the
2722 long-standing problem with garbage characters in some terminals.
2731 long-standing problem with garbage characters in some terminals.
2723 The issue was really that the \001 and \002 escapes must _only_ be
2732 The issue was really that the \001 and \002 escapes must _only_ be
2724 passed to input prompts (which call readline), but _never_ to
2733 passed to input prompts (which call readline), but _never_ to
2725 normal text to be printed on screen. I changed ColorANSI to have
2734 normal text to be printed on screen. I changed ColorANSI to have
2726 two classes: TermColors and InputTermColors, each with the
2735 two classes: TermColors and InputTermColors, each with the
2727 appropriate escapes for input prompts or normal text. The code in
2736 appropriate escapes for input prompts or normal text. The code in
2728 Prompts.py got slightly more complicated, but this very old and
2737 Prompts.py got slightly more complicated, but this very old and
2729 annoying bug is finally fixed.
2738 annoying bug is finally fixed.
2730
2739
2731 All the credit for nailing down the real origin of this problem
2740 All the credit for nailing down the real origin of this problem
2732 and the correct solution goes to Jack Moffit <jack-AT-xiph.org>.
2741 and the correct solution goes to Jack Moffit <jack-AT-xiph.org>.
2733 *Many* thanks to him for spending quite a bit of effort on this.
2742 *Many* thanks to him for spending quite a bit of effort on this.
2734
2743
2735 2003-03-05 *** Released version 0.2.15pre1
2744 2003-03-05 *** Released version 0.2.15pre1
2736
2745
2737 2003-03-03 Fernando Perez <fperez@colorado.edu>
2746 2003-03-03 Fernando Perez <fperez@colorado.edu>
2738
2747
2739 * IPython/FakeModule.py: Moved the former _FakeModule to a
2748 * IPython/FakeModule.py: Moved the former _FakeModule to a
2740 separate file, because it's also needed by Magic (to fix a similar
2749 separate file, because it's also needed by Magic (to fix a similar
2741 pickle-related issue in @run).
2750 pickle-related issue in @run).
2742
2751
2743 2003-03-02 Fernando Perez <fperez@colorado.edu>
2752 2003-03-02 Fernando Perez <fperez@colorado.edu>
2744
2753
2745 * IPython/Magic.py (Magic.magic_autocall): new magic to control
2754 * IPython/Magic.py (Magic.magic_autocall): new magic to control
2746 the autocall option at runtime.
2755 the autocall option at runtime.
2747 (Magic.magic_dhist): changed self.user_ns to self.shell.user_ns
2756 (Magic.magic_dhist): changed self.user_ns to self.shell.user_ns
2748 across Magic.py to start separating Magic from InteractiveShell.
2757 across Magic.py to start separating Magic from InteractiveShell.
2749 (Magic._ofind): Fixed to return proper namespace for dotted
2758 (Magic._ofind): Fixed to return proper namespace for dotted
2750 names. Before, a dotted name would always return 'not currently
2759 names. Before, a dotted name would always return 'not currently
2751 defined', because it would find the 'parent'. s.x would be found,
2760 defined', because it would find the 'parent'. s.x would be found,
2752 but since 'x' isn't defined by itself, it would get confused.
2761 but since 'x' isn't defined by itself, it would get confused.
2753 (Magic.magic_run): Fixed pickling problems reported by Ralf
2762 (Magic.magic_run): Fixed pickling problems reported by Ralf
2754 Ahlbrink <RAhlbrink-AT-RosenInspection.net>. The fix was similar to
2763 Ahlbrink <RAhlbrink-AT-RosenInspection.net>. The fix was similar to
2755 that I'd used when Mike Heeter reported similar issues at the
2764 that I'd used when Mike Heeter reported similar issues at the
2756 top-level, but now for @run. It boils down to injecting the
2765 top-level, but now for @run. It boils down to injecting the
2757 namespace where code is being executed with something that looks
2766 namespace where code is being executed with something that looks
2758 enough like a module to fool pickle.dump(). Since a pickle stores
2767 enough like a module to fool pickle.dump(). Since a pickle stores
2759 a named reference to the importing module, we need this for
2768 a named reference to the importing module, we need this for
2760 pickles to save something sensible.
2769 pickles to save something sensible.
2761
2770
2762 * IPython/ipmaker.py (make_IPython): added an autocall option.
2771 * IPython/ipmaker.py (make_IPython): added an autocall option.
2763
2772
2764 * IPython/iplib.py (InteractiveShell._prefilter): reordered all of
2773 * IPython/iplib.py (InteractiveShell._prefilter): reordered all of
2765 the auto-eval code. Now autocalling is an option, and the code is
2774 the auto-eval code. Now autocalling is an option, and the code is
2766 also vastly safer. There is no more eval() involved at all.
2775 also vastly safer. There is no more eval() involved at all.
2767
2776
2768 2003-03-01 Fernando Perez <fperez@colorado.edu>
2777 2003-03-01 Fernando Perez <fperez@colorado.edu>
2769
2778
2770 * IPython/Magic.py (Magic._ofind): Changed interface to return a
2779 * IPython/Magic.py (Magic._ofind): Changed interface to return a
2771 dict with named keys instead of a tuple.
2780 dict with named keys instead of a tuple.
2772
2781
2773 * IPython: Started using CVS for IPython as of 0.2.15pre1.
2782 * IPython: Started using CVS for IPython as of 0.2.15pre1.
2774
2783
2775 * setup.py (make_shortcut): Fixed message about directories
2784 * setup.py (make_shortcut): Fixed message about directories
2776 created during Windows installation (the directories were ok, just
2785 created during Windows installation (the directories were ok, just
2777 the printed message was misleading). Thanks to Chris Liechti
2786 the printed message was misleading). Thanks to Chris Liechti
2778 <cliechti-AT-gmx.net> for the heads up.
2787 <cliechti-AT-gmx.net> for the heads up.
2779
2788
2780 2003-02-21 Fernando Perez <fperez@colorado.edu>
2789 2003-02-21 Fernando Perez <fperez@colorado.edu>
2781
2790
2782 * IPython/iplib.py (InteractiveShell._prefilter): Fixed catching
2791 * IPython/iplib.py (InteractiveShell._prefilter): Fixed catching
2783 of ValueError exception when checking for auto-execution. This
2792 of ValueError exception when checking for auto-execution. This
2784 one is raised by things like Numeric arrays arr.flat when the
2793 one is raised by things like Numeric arrays arr.flat when the
2785 array is non-contiguous.
2794 array is non-contiguous.
2786
2795
2787 2003-01-31 Fernando Perez <fperez@colorado.edu>
2796 2003-01-31 Fernando Perez <fperez@colorado.edu>
2788
2797
2789 * IPython/genutils.py (SystemExec.bq): Fixed bug where bq would
2798 * IPython/genutils.py (SystemExec.bq): Fixed bug where bq would
2790 not return any value at all (even though the command would get
2799 not return any value at all (even though the command would get
2791 executed).
2800 executed).
2792 (xsys): Flush stdout right after printing the command to ensure
2801 (xsys): Flush stdout right after printing the command to ensure
2793 proper ordering of commands and command output in the total
2802 proper ordering of commands and command output in the total
2794 output.
2803 output.
2795 (SystemExec/xsys/bq): Switched the names of xsys/bq and
2804 (SystemExec/xsys/bq): Switched the names of xsys/bq and
2796 system/getoutput as defaults. The old ones are kept for
2805 system/getoutput as defaults. The old ones are kept for
2797 compatibility reasons, so no code which uses this library needs
2806 compatibility reasons, so no code which uses this library needs
2798 changing.
2807 changing.
2799
2808
2800 2003-01-27 *** Released version 0.2.14
2809 2003-01-27 *** Released version 0.2.14
2801
2810
2802 2003-01-25 Fernando Perez <fperez@colorado.edu>
2811 2003-01-25 Fernando Perez <fperez@colorado.edu>
2803
2812
2804 * IPython/Magic.py (Magic.magic_edit): Fixed problem where
2813 * IPython/Magic.py (Magic.magic_edit): Fixed problem where
2805 functions defined in previous edit sessions could not be re-edited
2814 functions defined in previous edit sessions could not be re-edited
2806 (because the temp files were immediately removed). Now temp files
2815 (because the temp files were immediately removed). Now temp files
2807 are removed only at IPython's exit.
2816 are removed only at IPython's exit.
2808 (Magic.magic_run): Improved @run to perform shell-like expansions
2817 (Magic.magic_run): Improved @run to perform shell-like expansions
2809 on its arguments (~users and $VARS). With this, @run becomes more
2818 on its arguments (~users and $VARS). With this, @run becomes more
2810 like a normal command-line.
2819 like a normal command-line.
2811
2820
2812 * IPython/Shell.py (IPShellEmbed.__call__): Fixed a bunch of small
2821 * IPython/Shell.py (IPShellEmbed.__call__): Fixed a bunch of small
2813 bugs related to embedding and cleaned up that code. A fairly
2822 bugs related to embedding and cleaned up that code. A fairly
2814 important one was the impossibility to access the global namespace
2823 important one was the impossibility to access the global namespace
2815 through the embedded IPython (only local variables were visible).
2824 through the embedded IPython (only local variables were visible).
2816
2825
2817 2003-01-14 Fernando Perez <fperez@colorado.edu>
2826 2003-01-14 Fernando Perez <fperez@colorado.edu>
2818
2827
2819 * IPython/iplib.py (InteractiveShell._prefilter): Fixed
2828 * IPython/iplib.py (InteractiveShell._prefilter): Fixed
2820 auto-calling to be a bit more conservative. Now it doesn't get
2829 auto-calling to be a bit more conservative. Now it doesn't get
2821 triggered if any of '!=()<>' are in the rest of the input line, to
2830 triggered if any of '!=()<>' are in the rest of the input line, to
2822 allow comparing callables. Thanks to Alex for the heads up.
2831 allow comparing callables. Thanks to Alex for the heads up.
2823
2832
2824 2003-01-07 Fernando Perez <fperez@colorado.edu>
2833 2003-01-07 Fernando Perez <fperez@colorado.edu>
2825
2834
2826 * IPython/genutils.py (page): fixed estimation of the number of
2835 * IPython/genutils.py (page): fixed estimation of the number of
2827 lines in a string to be paged to simply count newlines. This
2836 lines in a string to be paged to simply count newlines. This
2828 prevents over-guessing due to embedded escape sequences. A better
2837 prevents over-guessing due to embedded escape sequences. A better
2829 long-term solution would involve stripping out the control chars
2838 long-term solution would involve stripping out the control chars
2830 for the count, but it's potentially so expensive I just don't
2839 for the count, but it's potentially so expensive I just don't
2831 think it's worth doing.
2840 think it's worth doing.
2832
2841
2833 2002-12-19 *** Released version 0.2.14pre50
2842 2002-12-19 *** Released version 0.2.14pre50
2834
2843
2835 2002-12-19 Fernando Perez <fperez@colorado.edu>
2844 2002-12-19 Fernando Perez <fperez@colorado.edu>
2836
2845
2837 * tools/release (version): Changed release scripts to inform
2846 * tools/release (version): Changed release scripts to inform
2838 Andrea and build a NEWS file with a list of recent changes.
2847 Andrea and build a NEWS file with a list of recent changes.
2839
2848
2840 * IPython/ColorANSI.py (__all__): changed terminal detection
2849 * IPython/ColorANSI.py (__all__): changed terminal detection
2841 code. Seems to work better for xterms without breaking
2850 code. Seems to work better for xterms without breaking
2842 konsole. Will need more testing to determine if WinXP and Mac OSX
2851 konsole. Will need more testing to determine if WinXP and Mac OSX
2843 also work ok.
2852 also work ok.
2844
2853
2845 2002-12-18 *** Released version 0.2.14pre49
2854 2002-12-18 *** Released version 0.2.14pre49
2846
2855
2847 2002-12-18 Fernando Perez <fperez@colorado.edu>
2856 2002-12-18 Fernando Perez <fperez@colorado.edu>
2848
2857
2849 * Docs: added new info about Mac OSX, from Andrea.
2858 * Docs: added new info about Mac OSX, from Andrea.
2850
2859
2851 * IPython/Gnuplot2.py (String): Added a String PlotItem class to
2860 * IPython/Gnuplot2.py (String): Added a String PlotItem class to
2852 allow direct plotting of python strings whose format is the same
2861 allow direct plotting of python strings whose format is the same
2853 of gnuplot data files.
2862 of gnuplot data files.
2854
2863
2855 2002-12-16 Fernando Perez <fperez@colorado.edu>
2864 2002-12-16 Fernando Perez <fperez@colorado.edu>
2856
2865
2857 * IPython/iplib.py (InteractiveShell.interact): fixed default (y)
2866 * IPython/iplib.py (InteractiveShell.interact): fixed default (y)
2858 value of exit question to be acknowledged.
2867 value of exit question to be acknowledged.
2859
2868
2860 2002-12-03 Fernando Perez <fperez@colorado.edu>
2869 2002-12-03 Fernando Perez <fperez@colorado.edu>
2861
2870
2862 * IPython/ipmaker.py: removed generators, which had been added
2871 * IPython/ipmaker.py: removed generators, which had been added
2863 by mistake in an earlier debugging run. This was causing trouble
2872 by mistake in an earlier debugging run. This was causing trouble
2864 to users of python 2.1.x. Thanks to Abel Daniel <abli-AT-freemail.hu>
2873 to users of python 2.1.x. Thanks to Abel Daniel <abli-AT-freemail.hu>
2865 for pointing this out.
2874 for pointing this out.
2866
2875
2867 2002-11-17 Fernando Perez <fperez@colorado.edu>
2876 2002-11-17 Fernando Perez <fperez@colorado.edu>
2868
2877
2869 * Manual: updated the Gnuplot section.
2878 * Manual: updated the Gnuplot section.
2870
2879
2871 * IPython/GnuplotRuntime.py: refactored a lot all this code, with
2880 * IPython/GnuplotRuntime.py: refactored a lot all this code, with
2872 a much better split of what goes in Runtime and what goes in
2881 a much better split of what goes in Runtime and what goes in
2873 Interactive.
2882 Interactive.
2874
2883
2875 * IPython/ipmaker.py: fixed bug where import_fail_info wasn't
2884 * IPython/ipmaker.py: fixed bug where import_fail_info wasn't
2876 being imported from iplib.
2885 being imported from iplib.
2877
2886
2878 * IPython/GnuplotInteractive.py (magic_gpc): renamed @gp to @gpc
2887 * IPython/GnuplotInteractive.py (magic_gpc): renamed @gp to @gpc
2879 for command-passing. Now the global Gnuplot instance is called
2888 for command-passing. Now the global Gnuplot instance is called
2880 'gp' instead of 'g', which was really a far too fragile and
2889 'gp' instead of 'g', which was really a far too fragile and
2881 common name.
2890 common name.
2882
2891
2883 * IPython/Gnuplot2.py (eps_fix_bbox): added this to fix broken
2892 * IPython/Gnuplot2.py (eps_fix_bbox): added this to fix broken
2884 bounding boxes generated by Gnuplot for square plots.
2893 bounding boxes generated by Gnuplot for square plots.
2885
2894
2886 * IPython/genutils.py (popkey): new function added. I should
2895 * IPython/genutils.py (popkey): new function added. I should
2887 suggest this on c.l.py as a dict method, it seems useful.
2896 suggest this on c.l.py as a dict method, it seems useful.
2888
2897
2889 * IPython/Gnuplot2.py (Gnuplot.plot): Overhauled plot and replot
2898 * IPython/Gnuplot2.py (Gnuplot.plot): Overhauled plot and replot
2890 to transparently handle PostScript generation. MUCH better than
2899 to transparently handle PostScript generation. MUCH better than
2891 the previous plot_eps/replot_eps (which I removed now). The code
2900 the previous plot_eps/replot_eps (which I removed now). The code
2892 is also fairly clean and well documented now (including
2901 is also fairly clean and well documented now (including
2893 docstrings).
2902 docstrings).
2894
2903
2895 2002-11-13 Fernando Perez <fperez@colorado.edu>
2904 2002-11-13 Fernando Perez <fperez@colorado.edu>
2896
2905
2897 * IPython/Magic.py (Magic.magic_edit): fixed docstring
2906 * IPython/Magic.py (Magic.magic_edit): fixed docstring
2898 (inconsistent with options).
2907 (inconsistent with options).
2899
2908
2900 * IPython/Gnuplot2.py (Gnuplot.hardcopy): hardcopy had been
2909 * IPython/Gnuplot2.py (Gnuplot.hardcopy): hardcopy had been
2901 manually disabled, I don't know why. Fixed it.
2910 manually disabled, I don't know why. Fixed it.
2902 (Gnuplot._plot_eps): added new plot_eps/replot_eps to get directly
2911 (Gnuplot._plot_eps): added new plot_eps/replot_eps to get directly
2903 eps output.
2912 eps output.
2904
2913
2905 2002-11-12 Fernando Perez <fperez@colorado.edu>
2914 2002-11-12 Fernando Perez <fperez@colorado.edu>
2906
2915
2907 * IPython/genutils.py (ask_yes_no): trap EOF and ^C so that they
2916 * IPython/genutils.py (ask_yes_no): trap EOF and ^C so that they
2908 don't propagate up to caller. Fixes crash reported by François
2917 don't propagate up to caller. Fixes crash reported by François
2909 Pinard.
2918 Pinard.
2910
2919
2911 2002-11-09 Fernando Perez <fperez@colorado.edu>
2920 2002-11-09 Fernando Perez <fperez@colorado.edu>
2912
2921
2913 * IPython/ipmaker.py (make_IPython): fixed problem with writing
2922 * IPython/ipmaker.py (make_IPython): fixed problem with writing
2914 history file for new users.
2923 history file for new users.
2915 (make_IPython): fixed bug where initial install would leave the
2924 (make_IPython): fixed bug where initial install would leave the
2916 user running in the .ipython dir.
2925 user running in the .ipython dir.
2917 (make_IPython): fixed bug where config dir .ipython would be
2926 (make_IPython): fixed bug where config dir .ipython would be
2918 created regardless of the given -ipythondir option. Thanks to Cory
2927 created regardless of the given -ipythondir option. Thanks to Cory
2919 Dodt <cdodt-AT-fcoe.k12.ca.us> for the bug report.
2928 Dodt <cdodt-AT-fcoe.k12.ca.us> for the bug report.
2920
2929
2921 * IPython/genutils.py (ask_yes_no): new function for asking yes/no
2930 * IPython/genutils.py (ask_yes_no): new function for asking yes/no
2922 type confirmations. Will need to use it in all of IPython's code
2931 type confirmations. Will need to use it in all of IPython's code
2923 consistently.
2932 consistently.
2924
2933
2925 * IPython/CrashHandler.py (CrashHandler.__call__): changed the
2934 * IPython/CrashHandler.py (CrashHandler.__call__): changed the
2926 context to print 31 lines instead of the default 5. This will make
2935 context to print 31 lines instead of the default 5. This will make
2927 the crash reports extremely detailed in case the problem is in
2936 the crash reports extremely detailed in case the problem is in
2928 libraries I don't have access to.
2937 libraries I don't have access to.
2929
2938
2930 * IPython/iplib.py (InteractiveShell.interact): changed the 'last
2939 * IPython/iplib.py (InteractiveShell.interact): changed the 'last
2931 line of defense' code to still crash, but giving users fair
2940 line of defense' code to still crash, but giving users fair
2932 warning. I don't want internal errors to go unreported: if there's
2941 warning. I don't want internal errors to go unreported: if there's
2933 an internal problem, IPython should crash and generate a full
2942 an internal problem, IPython should crash and generate a full
2934 report.
2943 report.
2935
2944
2936 2002-11-08 Fernando Perez <fperez@colorado.edu>
2945 2002-11-08 Fernando Perez <fperez@colorado.edu>
2937
2946
2938 * IPython/iplib.py (InteractiveShell.interact): added code to trap
2947 * IPython/iplib.py (InteractiveShell.interact): added code to trap
2939 otherwise uncaught exceptions which can appear if people set
2948 otherwise uncaught exceptions which can appear if people set
2940 sys.stdout to something badly broken. Thanks to a crash report
2949 sys.stdout to something badly broken. Thanks to a crash report
2941 from henni-AT-mail.brainbot.com.
2950 from henni-AT-mail.brainbot.com.
2942
2951
2943 2002-11-04 Fernando Perez <fperez@colorado.edu>
2952 2002-11-04 Fernando Perez <fperez@colorado.edu>
2944
2953
2945 * IPython/iplib.py (InteractiveShell.interact): added
2954 * IPython/iplib.py (InteractiveShell.interact): added
2946 __IPYTHON__active to the builtins. It's a flag which goes on when
2955 __IPYTHON__active to the builtins. It's a flag which goes on when
2947 the interaction starts and goes off again when it stops. This
2956 the interaction starts and goes off again when it stops. This
2948 allows embedding code to detect being inside IPython. Before this
2957 allows embedding code to detect being inside IPython. Before this
2949 was done via __IPYTHON__, but that only shows that an IPython
2958 was done via __IPYTHON__, but that only shows that an IPython
2950 instance has been created.
2959 instance has been created.
2951
2960
2952 * IPython/Magic.py (Magic.magic_env): I realized that in a
2961 * IPython/Magic.py (Magic.magic_env): I realized that in a
2953 UserDict, instance.data holds the data as a normal dict. So I
2962 UserDict, instance.data holds the data as a normal dict. So I
2954 modified @env to return os.environ.data instead of rebuilding a
2963 modified @env to return os.environ.data instead of rebuilding a
2955 dict by hand.
2964 dict by hand.
2956
2965
2957 2002-11-02 Fernando Perez <fperez@colorado.edu>
2966 2002-11-02 Fernando Perez <fperez@colorado.edu>
2958
2967
2959 * IPython/genutils.py (warn): changed so that level 1 prints no
2968 * IPython/genutils.py (warn): changed so that level 1 prints no
2960 header. Level 2 is now the default (with 'WARNING' header, as
2969 header. Level 2 is now the default (with 'WARNING' header, as
2961 before). I think I tracked all places where changes were needed in
2970 before). I think I tracked all places where changes were needed in
2962 IPython, but outside code using the old level numbering may have
2971 IPython, but outside code using the old level numbering may have
2963 broken.
2972 broken.
2964
2973
2965 * IPython/iplib.py (InteractiveShell.runcode): added this to
2974 * IPython/iplib.py (InteractiveShell.runcode): added this to
2966 handle the tracebacks in SystemExit traps correctly. The previous
2975 handle the tracebacks in SystemExit traps correctly. The previous
2967 code (through interact) was printing more of the stack than
2976 code (through interact) was printing more of the stack than
2968 necessary, showing IPython internal code to the user.
2977 necessary, showing IPython internal code to the user.
2969
2978
2970 * IPython/UserConfig/ipythonrc.py: Made confirm_exit 1 by
2979 * IPython/UserConfig/ipythonrc.py: Made confirm_exit 1 by
2971 default. Now that the default at the confirmation prompt is yes,
2980 default. Now that the default at the confirmation prompt is yes,
2972 it's not so intrusive. François' argument that ipython sessions
2981 it's not so intrusive. François' argument that ipython sessions
2973 tend to be complex enough not to lose them from an accidental C-d,
2982 tend to be complex enough not to lose them from an accidental C-d,
2974 is a valid one.
2983 is a valid one.
2975
2984
2976 * IPython/iplib.py (InteractiveShell.interact): added a
2985 * IPython/iplib.py (InteractiveShell.interact): added a
2977 showtraceback() call to the SystemExit trap, and modified the exit
2986 showtraceback() call to the SystemExit trap, and modified the exit
2978 confirmation to have yes as the default.
2987 confirmation to have yes as the default.
2979
2988
2980 * IPython/UserConfig/ipythonrc.py: removed 'session' option from
2989 * IPython/UserConfig/ipythonrc.py: removed 'session' option from
2981 this file. It's been gone from the code for a long time, this was
2990 this file. It's been gone from the code for a long time, this was
2982 simply leftover junk.
2991 simply leftover junk.
2983
2992
2984 2002-11-01 Fernando Perez <fperez@colorado.edu>
2993 2002-11-01 Fernando Perez <fperez@colorado.edu>
2985
2994
2986 * IPython/UserConfig/ipythonrc.py: new confirm_exit option
2995 * IPython/UserConfig/ipythonrc.py: new confirm_exit option
2987 added. If set, IPython now traps EOF and asks for
2996 added. If set, IPython now traps EOF and asks for
2988 confirmation. After a request by François Pinard.
2997 confirmation. After a request by François Pinard.
2989
2998
2990 * IPython/Magic.py (Magic.magic_Exit): New @Exit and @Quit instead
2999 * IPython/Magic.py (Magic.magic_Exit): New @Exit and @Quit instead
2991 of @abort, and with a new (better) mechanism for handling the
3000 of @abort, and with a new (better) mechanism for handling the
2992 exceptions.
3001 exceptions.
2993
3002
2994 2002-10-27 Fernando Perez <fperez@colorado.edu>
3003 2002-10-27 Fernando Perez <fperez@colorado.edu>
2995
3004
2996 * IPython/usage.py (__doc__): updated the --help information and
3005 * IPython/usage.py (__doc__): updated the --help information and
2997 the ipythonrc file to indicate that -log generates
3006 the ipythonrc file to indicate that -log generates
2998 ./ipython.log. Also fixed the corresponding info in @logstart.
3007 ./ipython.log. Also fixed the corresponding info in @logstart.
2999 This and several other fixes in the manuals thanks to reports by
3008 This and several other fixes in the manuals thanks to reports by
3000 François Pinard <pinard-AT-iro.umontreal.ca>.
3009 François Pinard <pinard-AT-iro.umontreal.ca>.
3001
3010
3002 * IPython/Logger.py (Logger.switch_log): Fixed error message to
3011 * IPython/Logger.py (Logger.switch_log): Fixed error message to
3003 refer to @logstart (instead of @log, which doesn't exist).
3012 refer to @logstart (instead of @log, which doesn't exist).
3004
3013
3005 * IPython/iplib.py (InteractiveShell._prefilter): fixed
3014 * IPython/iplib.py (InteractiveShell._prefilter): fixed
3006 AttributeError crash. Thanks to Christopher Armstrong
3015 AttributeError crash. Thanks to Christopher Armstrong
3007 <radix-AT-twistedmatrix.com> for the report/fix. This bug had been
3016 <radix-AT-twistedmatrix.com> for the report/fix. This bug had been
3008 introduced recently (in 0.2.14pre37) with the fix to the eval
3017 introduced recently (in 0.2.14pre37) with the fix to the eval
3009 problem mentioned below.
3018 problem mentioned below.
3010
3019
3011 2002-10-17 Fernando Perez <fperez@colorado.edu>
3020 2002-10-17 Fernando Perez <fperez@colorado.edu>
3012
3021
3013 * IPython/ConfigLoader.py (ConfigLoader.load): Fixes for Windows
3022 * IPython/ConfigLoader.py (ConfigLoader.load): Fixes for Windows
3014 installation. Thanks to Leonardo Santagada <retype-AT-terra.com.br>.
3023 installation. Thanks to Leonardo Santagada <retype-AT-terra.com.br>.
3015
3024
3016 * IPython/iplib.py (InteractiveShell._prefilter): Many changes to
3025 * IPython/iplib.py (InteractiveShell._prefilter): Many changes to
3017 this function to fix a problem reported by Alex Schmolck. He saw
3026 this function to fix a problem reported by Alex Schmolck. He saw
3018 it with list comprehensions and generators, which were getting
3027 it with list comprehensions and generators, which were getting
3019 called twice. The real problem was an 'eval' call in testing for
3028 called twice. The real problem was an 'eval' call in testing for
3020 automagic which was evaluating the input line silently.
3029 automagic which was evaluating the input line silently.
3021
3030
3022 This is a potentially very nasty bug, if the input has side
3031 This is a potentially very nasty bug, if the input has side
3023 effects which must not be repeated. The code is much cleaner now,
3032 effects which must not be repeated. The code is much cleaner now,
3024 without any blanket 'except' left and with a regexp test for
3033 without any blanket 'except' left and with a regexp test for
3025 actual function names.
3034 actual function names.
3026
3035
3027 But an eval remains, which I'm not fully comfortable with. I just
3036 But an eval remains, which I'm not fully comfortable with. I just
3028 don't know how to find out if an expression could be a callable in
3037 don't know how to find out if an expression could be a callable in
3029 the user's namespace without doing an eval on the string. However
3038 the user's namespace without doing an eval on the string. However
3030 that string is now much more strictly checked so that no code
3039 that string is now much more strictly checked so that no code
3031 slips by, so the eval should only happen for things that can
3040 slips by, so the eval should only happen for things that can
3032 really be only function/method names.
3041 really be only function/method names.
3033
3042
3034 2002-10-15 Fernando Perez <fperez@colorado.edu>
3043 2002-10-15 Fernando Perez <fperez@colorado.edu>
3035
3044
3036 * Updated LyX to 1.2.1 so I can work on the docs again. Added Mac
3045 * Updated LyX to 1.2.1 so I can work on the docs again. Added Mac
3037 OSX information to main manual, removed README_Mac_OSX file from
3046 OSX information to main manual, removed README_Mac_OSX file from
3038 distribution. Also updated credits for recent additions.
3047 distribution. Also updated credits for recent additions.
3039
3048
3040 2002-10-10 Fernando Perez <fperez@colorado.edu>
3049 2002-10-10 Fernando Perez <fperez@colorado.edu>
3041
3050
3042 * README_Mac_OSX: Added a README for Mac OSX users for fixing
3051 * README_Mac_OSX: Added a README for Mac OSX users for fixing
3043 terminal-related issues. Many thanks to Andrea Riciputi
3052 terminal-related issues. Many thanks to Andrea Riciputi
3044 <andrea.riciputi-AT-libero.it> for writing it.
3053 <andrea.riciputi-AT-libero.it> for writing it.
3045
3054
3046 * IPython/UserConfig/ipythonrc.py: Fixes to various small issues,
3055 * IPython/UserConfig/ipythonrc.py: Fixes to various small issues,
3047 thanks to Thorsten Kampe <thorsten-AT-thorstenkampe.de>.
3056 thanks to Thorsten Kampe <thorsten-AT-thorstenkampe.de>.
3048
3057
3049 * setup.py (make_shortcut): Fixes for Windows installation. Thanks
3058 * setup.py (make_shortcut): Fixes for Windows installation. Thanks
3050 to Fredrik Kant <fredrik.kant-AT-front.com> and Syver Enstad
3059 to Fredrik Kant <fredrik.kant-AT-front.com> and Syver Enstad
3051 <syver-en-AT-online.no> who both submitted patches for this problem.
3060 <syver-en-AT-online.no> who both submitted patches for this problem.
3052
3061
3053 * IPython/iplib.py (InteractiveShell.embed_mainloop): Patch for
3062 * IPython/iplib.py (InteractiveShell.embed_mainloop): Patch for
3054 global embedding to make sure that things don't overwrite user
3063 global embedding to make sure that things don't overwrite user
3055 globals accidentally. Thanks to Richard <rxe-AT-renre-europe.com>
3064 globals accidentally. Thanks to Richard <rxe-AT-renre-europe.com>
3056
3065
3057 * IPython/Gnuplot2.py (gp): Patch for Gnuplot.py 1.6
3066 * IPython/Gnuplot2.py (gp): Patch for Gnuplot.py 1.6
3058 compatibility. Thanks to Hayden Callow
3067 compatibility. Thanks to Hayden Callow
3059 <h.callow-AT-elec.canterbury.ac.nz>
3068 <h.callow-AT-elec.canterbury.ac.nz>
3060
3069
3061 2002-10-04 Fernando Perez <fperez@colorado.edu>
3070 2002-10-04 Fernando Perez <fperez@colorado.edu>
3062
3071
3063 * IPython/Gnuplot2.py (PlotItem): Added 'index' option for
3072 * IPython/Gnuplot2.py (PlotItem): Added 'index' option for
3064 Gnuplot.File objects.
3073 Gnuplot.File objects.
3065
3074
3066 2002-07-23 Fernando Perez <fperez@colorado.edu>
3075 2002-07-23 Fernando Perez <fperez@colorado.edu>
3067
3076
3068 * IPython/genutils.py (timing): Added timings() and timing() for
3077 * IPython/genutils.py (timing): Added timings() and timing() for
3069 quick access to the most commonly needed data, the execution
3078 quick access to the most commonly needed data, the execution
3070 times. Old timing() renamed to timings_out().
3079 times. Old timing() renamed to timings_out().
3071
3080
3072 2002-07-18 Fernando Perez <fperez@colorado.edu>
3081 2002-07-18 Fernando Perez <fperez@colorado.edu>
3073
3082
3074 * IPython/Shell.py (IPShellEmbed.restore_system_completer): fixed
3083 * IPython/Shell.py (IPShellEmbed.restore_system_completer): fixed
3075 bug with nested instances disrupting the parent's tab completion.
3084 bug with nested instances disrupting the parent's tab completion.
3076
3085
3077 * IPython/iplib.py (all_completions): Added Alex Schmolck's
3086 * IPython/iplib.py (all_completions): Added Alex Schmolck's
3078 all_completions code to begin the emacs integration.
3087 all_completions code to begin the emacs integration.
3079
3088
3080 * IPython/Gnuplot2.py (zip_items): Added optional 'titles'
3089 * IPython/Gnuplot2.py (zip_items): Added optional 'titles'
3081 argument to allow titling individual arrays when plotting.
3090 argument to allow titling individual arrays when plotting.
3082
3091
3083 2002-07-15 Fernando Perez <fperez@colorado.edu>
3092 2002-07-15 Fernando Perez <fperez@colorado.edu>
3084
3093
3085 * setup.py (make_shortcut): changed to retrieve the value of
3094 * setup.py (make_shortcut): changed to retrieve the value of
3086 'Program Files' directory from the registry (this value changes in
3095 'Program Files' directory from the registry (this value changes in
3087 non-english versions of Windows). Thanks to Thomas Fanslau
3096 non-english versions of Windows). Thanks to Thomas Fanslau
3088 <tfanslau-AT-gmx.de> for the report.
3097 <tfanslau-AT-gmx.de> for the report.
3089
3098
3090 2002-07-10 Fernando Perez <fperez@colorado.edu>
3099 2002-07-10 Fernando Perez <fperez@colorado.edu>
3091
3100
3092 * IPython/ultraTB.py (VerboseTB.debugger): enabled workaround for
3101 * IPython/ultraTB.py (VerboseTB.debugger): enabled workaround for
3093 a bug in pdb, which crashes if a line with only whitespace is
3102 a bug in pdb, which crashes if a line with only whitespace is
3094 entered. Bug report submitted to sourceforge.
3103 entered. Bug report submitted to sourceforge.
3095
3104
3096 2002-07-09 Fernando Perez <fperez@colorado.edu>
3105 2002-07-09 Fernando Perez <fperez@colorado.edu>
3097
3106
3098 * IPython/ultraTB.py (VerboseTB.nullrepr): fixed rare crash when
3107 * IPython/ultraTB.py (VerboseTB.nullrepr): fixed rare crash when
3099 reporting exceptions (it's a bug in inspect.py, I just set a
3108 reporting exceptions (it's a bug in inspect.py, I just set a
3100 workaround).
3109 workaround).
3101
3110
3102 2002-07-08 Fernando Perez <fperez@colorado.edu>
3111 2002-07-08 Fernando Perez <fperez@colorado.edu>
3103
3112
3104 * IPython/iplib.py (InteractiveShell.__init__): fixed reference to
3113 * IPython/iplib.py (InteractiveShell.__init__): fixed reference to
3105 __IPYTHON__ in __builtins__ to show up in user_ns.
3114 __IPYTHON__ in __builtins__ to show up in user_ns.
3106
3115
3107 2002-07-03 Fernando Perez <fperez@colorado.edu>
3116 2002-07-03 Fernando Perez <fperez@colorado.edu>
3108
3117
3109 * IPython/GnuplotInteractive.py (magic_gp_set_default): changed
3118 * IPython/GnuplotInteractive.py (magic_gp_set_default): changed
3110 name from @gp_set_instance to @gp_set_default.
3119 name from @gp_set_instance to @gp_set_default.
3111
3120
3112 * IPython/ipmaker.py (make_IPython): default editor value set to
3121 * IPython/ipmaker.py (make_IPython): default editor value set to
3113 '0' (a string), to match the rc file. Otherwise will crash when
3122 '0' (a string), to match the rc file. Otherwise will crash when
3114 .strip() is called on it.
3123 .strip() is called on it.
3115
3124
3116
3125
3117 2002-06-28 Fernando Perez <fperez@colorado.edu>
3126 2002-06-28 Fernando Perez <fperez@colorado.edu>
3118
3127
3119 * IPython/iplib.py (InteractiveShell.safe_execfile): fix importing
3128 * IPython/iplib.py (InteractiveShell.safe_execfile): fix importing
3120 of files in current directory when a file is executed via
3129 of files in current directory when a file is executed via
3121 @run. Patch also by RA <ralf_ahlbrink-AT-web.de>.
3130 @run. Patch also by RA <ralf_ahlbrink-AT-web.de>.
3122
3131
3123 * setup.py (manfiles): fix for rpm builds, submitted by RA
3132 * setup.py (manfiles): fix for rpm builds, submitted by RA
3124 <ralf_ahlbrink-AT-web.de>. Now we have RPMs!
3133 <ralf_ahlbrink-AT-web.de>. Now we have RPMs!
3125
3134
3126 * IPython/ipmaker.py (make_IPython): fixed lookup of default
3135 * IPython/ipmaker.py (make_IPython): fixed lookup of default
3127 editor when set to '0'. Problem was, '0' evaluates to True (it's a
3136 editor when set to '0'. Problem was, '0' evaluates to True (it's a
3128 string!). A. Schmolck caught this one.
3137 string!). A. Schmolck caught this one.
3129
3138
3130 2002-06-27 Fernando Perez <fperez@colorado.edu>
3139 2002-06-27 Fernando Perez <fperez@colorado.edu>
3131
3140
3132 * IPython/ipmaker.py (make_IPython): fixed bug when running user
3141 * IPython/ipmaker.py (make_IPython): fixed bug when running user
3133 defined files at the cmd line. __name__ wasn't being set to
3142 defined files at the cmd line. __name__ wasn't being set to
3134 __main__.
3143 __main__.
3135
3144
3136 * IPython/Gnuplot2.py (zip_items): improved it so it can plot also
3145 * IPython/Gnuplot2.py (zip_items): improved it so it can plot also
3137 regular lists and tuples besides Numeric arrays.
3146 regular lists and tuples besides Numeric arrays.
3138
3147
3139 * IPython/Prompts.py (CachedOutput.__call__): Added output
3148 * IPython/Prompts.py (CachedOutput.__call__): Added output
3140 supression for input ending with ';'. Similar to Mathematica and
3149 supression for input ending with ';'. Similar to Mathematica and
3141 Matlab. The _* vars and Out[] list are still updated, just like
3150 Matlab. The _* vars and Out[] list are still updated, just like
3142 Mathematica behaves.
3151 Mathematica behaves.
3143
3152
3144 2002-06-25 Fernando Perez <fperez@colorado.edu>
3153 2002-06-25 Fernando Perez <fperez@colorado.edu>
3145
3154
3146 * IPython/ConfigLoader.py (ConfigLoader.load): fixed checking of
3155 * IPython/ConfigLoader.py (ConfigLoader.load): fixed checking of
3147 .ini extensions for profiels under Windows.
3156 .ini extensions for profiels under Windows.
3148
3157
3149 * IPython/OInspect.py (Inspector.pinfo): improved alignment of
3158 * IPython/OInspect.py (Inspector.pinfo): improved alignment of
3150 string form. Fix contributed by Alexander Schmolck
3159 string form. Fix contributed by Alexander Schmolck
3151 <a.schmolck-AT-gmx.net>
3160 <a.schmolck-AT-gmx.net>
3152
3161
3153 * IPython/GnuplotRuntime.py (gp_new): new function. Returns a
3162 * IPython/GnuplotRuntime.py (gp_new): new function. Returns a
3154 pre-configured Gnuplot instance.
3163 pre-configured Gnuplot instance.
3155
3164
3156 2002-06-21 Fernando Perez <fperez@colorado.edu>
3165 2002-06-21 Fernando Perez <fperez@colorado.edu>
3157
3166
3158 * IPython/numutils.py (exp_safe): new function, works around the
3167 * IPython/numutils.py (exp_safe): new function, works around the
3159 underflow problems in Numeric.
3168 underflow problems in Numeric.
3160 (log2): New fn. Safe log in base 2: returns exact integer answer
3169 (log2): New fn. Safe log in base 2: returns exact integer answer
3161 for exact integer powers of 2.
3170 for exact integer powers of 2.
3162
3171
3163 * IPython/Magic.py (get_py_filename): fixed it not expanding '~'
3172 * IPython/Magic.py (get_py_filename): fixed it not expanding '~'
3164 properly.
3173 properly.
3165
3174
3166 2002-06-20 Fernando Perez <fperez@colorado.edu>
3175 2002-06-20 Fernando Perez <fperez@colorado.edu>
3167
3176
3168 * IPython/genutils.py (timing): new function like
3177 * IPython/genutils.py (timing): new function like
3169 Mathematica's. Similar to time_test, but returns more info.
3178 Mathematica's. Similar to time_test, but returns more info.
3170
3179
3171 2002-06-18 Fernando Perez <fperez@colorado.edu>
3180 2002-06-18 Fernando Perez <fperez@colorado.edu>
3172
3181
3173 * IPython/Magic.py (Magic.magic_save): modified @save and @r
3182 * IPython/Magic.py (Magic.magic_save): modified @save and @r
3174 according to Mike Heeter's suggestions.
3183 according to Mike Heeter's suggestions.
3175
3184
3176 2002-06-16 Fernando Perez <fperez@colorado.edu>
3185 2002-06-16 Fernando Perez <fperez@colorado.edu>
3177
3186
3178 * IPython/GnuplotRuntime.py: Massive overhaul to the Gnuplot
3187 * IPython/GnuplotRuntime.py: Massive overhaul to the Gnuplot
3179 system. GnuplotMagic is gone as a user-directory option. New files
3188 system. GnuplotMagic is gone as a user-directory option. New files
3180 make it easier to use all the gnuplot stuff both from external
3189 make it easier to use all the gnuplot stuff both from external
3181 programs as well as from IPython. Had to rewrite part of
3190 programs as well as from IPython. Had to rewrite part of
3182 hardcopy() b/c of a strange bug: often the ps files simply don't
3191 hardcopy() b/c of a strange bug: often the ps files simply don't
3183 get created, and require a repeat of the command (often several
3192 get created, and require a repeat of the command (often several
3184 times).
3193 times).
3185
3194
3186 * IPython/ultraTB.py (AutoFormattedTB.__call__): changed to
3195 * IPython/ultraTB.py (AutoFormattedTB.__call__): changed to
3187 resolve output channel at call time, so that if sys.stderr has
3196 resolve output channel at call time, so that if sys.stderr has
3188 been redirected by user this gets honored.
3197 been redirected by user this gets honored.
3189
3198
3190 2002-06-13 Fernando Perez <fperez@colorado.edu>
3199 2002-06-13 Fernando Perez <fperez@colorado.edu>
3191
3200
3192 * IPython/Shell.py (IPShell.__init__): Changed IPythonShell to
3201 * IPython/Shell.py (IPShell.__init__): Changed IPythonShell to
3193 IPShell. Kept a copy with the old names to avoid breaking people's
3202 IPShell. Kept a copy with the old names to avoid breaking people's
3194 embedded code.
3203 embedded code.
3195
3204
3196 * IPython/ipython: simplified it to the bare minimum after
3205 * IPython/ipython: simplified it to the bare minimum after
3197 Holger's suggestions. Added info about how to use it in
3206 Holger's suggestions. Added info about how to use it in
3198 PYTHONSTARTUP.
3207 PYTHONSTARTUP.
3199
3208
3200 * IPython/Shell.py (IPythonShell): changed the options passing
3209 * IPython/Shell.py (IPythonShell): changed the options passing
3201 from a string with funky %s replacements to a straight list. Maybe
3210 from a string with funky %s replacements to a straight list. Maybe
3202 a bit more typing, but it follows sys.argv conventions, so there's
3211 a bit more typing, but it follows sys.argv conventions, so there's
3203 less special-casing to remember.
3212 less special-casing to remember.
3204
3213
3205 2002-06-12 Fernando Perez <fperez@colorado.edu>
3214 2002-06-12 Fernando Perez <fperez@colorado.edu>
3206
3215
3207 * IPython/Magic.py (Magic.magic_r): new magic auto-repeat
3216 * IPython/Magic.py (Magic.magic_r): new magic auto-repeat
3208 command. Thanks to a suggestion by Mike Heeter.
3217 command. Thanks to a suggestion by Mike Heeter.
3209 (Magic.magic_pfile): added behavior to look at filenames if given
3218 (Magic.magic_pfile): added behavior to look at filenames if given
3210 arg is not a defined object.
3219 arg is not a defined object.
3211 (Magic.magic_save): New @save function to save code snippets. Also
3220 (Magic.magic_save): New @save function to save code snippets. Also
3212 a Mike Heeter idea.
3221 a Mike Heeter idea.
3213
3222
3214 * IPython/UserConfig/GnuplotMagic.py (plot): Improvements to
3223 * IPython/UserConfig/GnuplotMagic.py (plot): Improvements to
3215 plot() and replot(). Much more convenient now, especially for
3224 plot() and replot(). Much more convenient now, especially for
3216 interactive use.
3225 interactive use.
3217
3226
3218 * IPython/Magic.py (Magic.magic_run): Added .py automatically to
3227 * IPython/Magic.py (Magic.magic_run): Added .py automatically to
3219 filenames.
3228 filenames.
3220
3229
3221 2002-06-02 Fernando Perez <fperez@colorado.edu>
3230 2002-06-02 Fernando Perez <fperez@colorado.edu>
3222
3231
3223 * IPython/Struct.py (Struct.__init__): modified to admit
3232 * IPython/Struct.py (Struct.__init__): modified to admit
3224 initialization via another struct.
3233 initialization via another struct.
3225
3234
3226 * IPython/genutils.py (SystemExec.__init__): New stateful
3235 * IPython/genutils.py (SystemExec.__init__): New stateful
3227 interface to xsys and bq. Useful for writing system scripts.
3236 interface to xsys and bq. Useful for writing system scripts.
3228
3237
3229 2002-05-30 Fernando Perez <fperez@colorado.edu>
3238 2002-05-30 Fernando Perez <fperez@colorado.edu>
3230
3239
3231 * MANIFEST.in: Changed docfile selection to exclude all the lyx
3240 * MANIFEST.in: Changed docfile selection to exclude all the lyx
3232 documents. This will make the user download smaller (it's getting
3241 documents. This will make the user download smaller (it's getting
3233 too big).
3242 too big).
3234
3243
3235 2002-05-29 Fernando Perez <fperez@colorado.edu>
3244 2002-05-29 Fernando Perez <fperez@colorado.edu>
3236
3245
3237 * IPython/iplib.py (_FakeModule.__init__): New class introduced to
3246 * IPython/iplib.py (_FakeModule.__init__): New class introduced to
3238 fix problems with shelve and pickle. Seems to work, but I don't
3247 fix problems with shelve and pickle. Seems to work, but I don't
3239 know if corner cases break it. Thanks to Mike Heeter
3248 know if corner cases break it. Thanks to Mike Heeter
3240 <korora-AT-SDF.LONESTAR.ORG> for the bug reports and test cases.
3249 <korora-AT-SDF.LONESTAR.ORG> for the bug reports and test cases.
3241
3250
3242 2002-05-24 Fernando Perez <fperez@colorado.edu>
3251 2002-05-24 Fernando Perez <fperez@colorado.edu>
3243
3252
3244 * IPython/Magic.py (Macro.__init__): fixed magics embedded in
3253 * IPython/Magic.py (Macro.__init__): fixed magics embedded in
3245 macros having broken.
3254 macros having broken.
3246
3255
3247 2002-05-21 Fernando Perez <fperez@colorado.edu>
3256 2002-05-21 Fernando Perez <fperez@colorado.edu>
3248
3257
3249 * IPython/Magic.py (Magic.magic_logstart): fixed recently
3258 * IPython/Magic.py (Magic.magic_logstart): fixed recently
3250 introduced logging bug: all history before logging started was
3259 introduced logging bug: all history before logging started was
3251 being written one character per line! This came from the redesign
3260 being written one character per line! This came from the redesign
3252 of the input history as a special list which slices to strings,
3261 of the input history as a special list which slices to strings,
3253 not to lists.
3262 not to lists.
3254
3263
3255 2002-05-20 Fernando Perez <fperez@colorado.edu>
3264 2002-05-20 Fernando Perez <fperez@colorado.edu>
3256
3265
3257 * IPython/Prompts.py (CachedOutput.__init__): made the color table
3266 * IPython/Prompts.py (CachedOutput.__init__): made the color table
3258 be an attribute of all classes in this module. The design of these
3267 be an attribute of all classes in this module. The design of these
3259 classes needs some serious overhauling.
3268 classes needs some serious overhauling.
3260
3269
3261 * IPython/DPyGetOpt.py (DPyGetOpt.setPosixCompliance): fixed bug
3270 * IPython/DPyGetOpt.py (DPyGetOpt.setPosixCompliance): fixed bug
3262 which was ignoring '_' in option names.
3271 which was ignoring '_' in option names.
3263
3272
3264 * IPython/ultraTB.py (FormattedTB.__init__): Changed
3273 * IPython/ultraTB.py (FormattedTB.__init__): Changed
3265 'Verbose_novars' to 'Context' and made it the new default. It's a
3274 'Verbose_novars' to 'Context' and made it the new default. It's a
3266 bit more readable and also safer than verbose.
3275 bit more readable and also safer than verbose.
3267
3276
3268 * IPython/PyColorize.py (Parser.__call__): Fixed coloring of
3277 * IPython/PyColorize.py (Parser.__call__): Fixed coloring of
3269 triple-quoted strings.
3278 triple-quoted strings.
3270
3279
3271 * IPython/OInspect.py (__all__): new module exposing the object
3280 * IPython/OInspect.py (__all__): new module exposing the object
3272 introspection facilities. Now the corresponding magics are dummy
3281 introspection facilities. Now the corresponding magics are dummy
3273 wrappers around this. Having this module will make it much easier
3282 wrappers around this. Having this module will make it much easier
3274 to put these functions into our modified pdb.
3283 to put these functions into our modified pdb.
3275 This new object inspector system uses the new colorizing module,
3284 This new object inspector system uses the new colorizing module,
3276 so source code and other things are nicely syntax highlighted.
3285 so source code and other things are nicely syntax highlighted.
3277
3286
3278 2002-05-18 Fernando Perez <fperez@colorado.edu>
3287 2002-05-18 Fernando Perez <fperez@colorado.edu>
3279
3288
3280 * IPython/ColorANSI.py: Split the coloring tools into a separate
3289 * IPython/ColorANSI.py: Split the coloring tools into a separate
3281 module so I can use them in other code easier (they were part of
3290 module so I can use them in other code easier (they were part of
3282 ultraTB).
3291 ultraTB).
3283
3292
3284 2002-05-17 Fernando Perez <fperez@colorado.edu>
3293 2002-05-17 Fernando Perez <fperez@colorado.edu>
3285
3294
3286 * IPython/UserConfig/GnuplotMagic.py (magic_gp_set_instance):
3295 * IPython/UserConfig/GnuplotMagic.py (magic_gp_set_instance):
3287 fixed it to set the global 'g' also to the called instance, as
3296 fixed it to set the global 'g' also to the called instance, as
3288 long as 'g' was still a gnuplot instance (so it doesn't overwrite
3297 long as 'g' was still a gnuplot instance (so it doesn't overwrite
3289 user's 'g' variables).
3298 user's 'g' variables).
3290
3299
3291 * IPython/iplib.py (InteractiveShell.__init__): Added In/Out
3300 * IPython/iplib.py (InteractiveShell.__init__): Added In/Out
3292 global variables (aliases to _ih,_oh) so that users which expect
3301 global variables (aliases to _ih,_oh) so that users which expect
3293 In[5] or Out[7] to work aren't unpleasantly surprised.
3302 In[5] or Out[7] to work aren't unpleasantly surprised.
3294 (InputList.__getslice__): new class to allow executing slices of
3303 (InputList.__getslice__): new class to allow executing slices of
3295 input history directly. Very simple class, complements the use of
3304 input history directly. Very simple class, complements the use of
3296 macros.
3305 macros.
3297
3306
3298 2002-05-16 Fernando Perez <fperez@colorado.edu>
3307 2002-05-16 Fernando Perez <fperez@colorado.edu>
3299
3308
3300 * setup.py (docdirbase): make doc directory be just doc/IPython
3309 * setup.py (docdirbase): make doc directory be just doc/IPython
3301 without version numbers, it will reduce clutter for users.
3310 without version numbers, it will reduce clutter for users.
3302
3311
3303 * IPython/Magic.py (Magic.magic_run): Add explicit local dict to
3312 * IPython/Magic.py (Magic.magic_run): Add explicit local dict to
3304 execfile call to prevent possible memory leak. See for details:
3313 execfile call to prevent possible memory leak. See for details:
3305 http://mail.python.org/pipermail/python-list/2002-February/088476.html
3314 http://mail.python.org/pipermail/python-list/2002-February/088476.html
3306
3315
3307 2002-05-15 Fernando Perez <fperez@colorado.edu>
3316 2002-05-15 Fernando Perez <fperez@colorado.edu>
3308
3317
3309 * IPython/Magic.py (Magic.magic_psource): made the object
3318 * IPython/Magic.py (Magic.magic_psource): made the object
3310 introspection names be more standard: pdoc, pdef, pfile and
3319 introspection names be more standard: pdoc, pdef, pfile and
3311 psource. They all print/page their output, and it makes
3320 psource. They all print/page their output, and it makes
3312 remembering them easier. Kept old names for compatibility as
3321 remembering them easier. Kept old names for compatibility as
3313 aliases.
3322 aliases.
3314
3323
3315 2002-05-14 Fernando Perez <fperez@colorado.edu>
3324 2002-05-14 Fernando Perez <fperez@colorado.edu>
3316
3325
3317 * IPython/UserConfig/GnuplotMagic.py: I think I finally understood
3326 * IPython/UserConfig/GnuplotMagic.py: I think I finally understood
3318 what the mouse problem was. The trick is to use gnuplot with temp
3327 what the mouse problem was. The trick is to use gnuplot with temp
3319 files and NOT with pipes (for data communication), because having
3328 files and NOT with pipes (for data communication), because having
3320 both pipes and the mouse on is bad news.
3329 both pipes and the mouse on is bad news.
3321
3330
3322 2002-05-13 Fernando Perez <fperez@colorado.edu>
3331 2002-05-13 Fernando Perez <fperez@colorado.edu>
3323
3332
3324 * IPython/Magic.py (Magic._ofind): fixed namespace order search
3333 * IPython/Magic.py (Magic._ofind): fixed namespace order search
3325 bug. Information would be reported about builtins even when
3334 bug. Information would be reported about builtins even when
3326 user-defined functions overrode them.
3335 user-defined functions overrode them.
3327
3336
3328 2002-05-11 Fernando Perez <fperez@colorado.edu>
3337 2002-05-11 Fernando Perez <fperez@colorado.edu>
3329
3338
3330 * IPython/__init__.py (__all__): removed FlexCompleter from
3339 * IPython/__init__.py (__all__): removed FlexCompleter from
3331 __all__ so that things don't fail in platforms without readline.
3340 __all__ so that things don't fail in platforms without readline.
3332
3341
3333 2002-05-10 Fernando Perez <fperez@colorado.edu>
3342 2002-05-10 Fernando Perez <fperez@colorado.edu>
3334
3343
3335 * IPython/__init__.py (__all__): removed numutils from __all__ b/c
3344 * IPython/__init__.py (__all__): removed numutils from __all__ b/c
3336 it requires Numeric, effectively making Numeric a dependency for
3345 it requires Numeric, effectively making Numeric a dependency for
3337 IPython.
3346 IPython.
3338
3347
3339 * Released 0.2.13
3348 * Released 0.2.13
3340
3349
3341 * IPython/Magic.py (Magic.magic_prun): big overhaul to the
3350 * IPython/Magic.py (Magic.magic_prun): big overhaul to the
3342 profiler interface. Now all the major options from the profiler
3351 profiler interface. Now all the major options from the profiler
3343 module are directly supported in IPython, both for single
3352 module are directly supported in IPython, both for single
3344 expressions (@prun) and for full programs (@run -p).
3353 expressions (@prun) and for full programs (@run -p).
3345
3354
3346 2002-05-09 Fernando Perez <fperez@colorado.edu>
3355 2002-05-09 Fernando Perez <fperez@colorado.edu>
3347
3356
3348 * IPython/Magic.py (Magic.magic_doc): fixed to show docstrings of
3357 * IPython/Magic.py (Magic.magic_doc): fixed to show docstrings of
3349 magic properly formatted for screen.
3358 magic properly formatted for screen.
3350
3359
3351 * setup.py (make_shortcut): Changed things to put pdf version in
3360 * setup.py (make_shortcut): Changed things to put pdf version in
3352 doc/ instead of doc/manual (had to change lyxport a bit).
3361 doc/ instead of doc/manual (had to change lyxport a bit).
3353
3362
3354 * IPython/Magic.py (Profile.string_stats): made profile runs go
3363 * IPython/Magic.py (Profile.string_stats): made profile runs go
3355 through pager (they are long and a pager allows searching, saving,
3364 through pager (they are long and a pager allows searching, saving,
3356 etc.)
3365 etc.)
3357
3366
3358 2002-05-08 Fernando Perez <fperez@colorado.edu>
3367 2002-05-08 Fernando Perez <fperez@colorado.edu>
3359
3368
3360 * Released 0.2.12
3369 * Released 0.2.12
3361
3370
3362 2002-05-06 Fernando Perez <fperez@colorado.edu>
3371 2002-05-06 Fernando Perez <fperez@colorado.edu>
3363
3372
3364 * IPython/Magic.py (Magic.magic_hist): small bug fixed (recently
3373 * IPython/Magic.py (Magic.magic_hist): small bug fixed (recently
3365 introduced); 'hist n1 n2' was broken.
3374 introduced); 'hist n1 n2' was broken.
3366 (Magic.magic_pdb): added optional on/off arguments to @pdb
3375 (Magic.magic_pdb): added optional on/off arguments to @pdb
3367 (Magic.magic_run): added option -i to @run, which executes code in
3376 (Magic.magic_run): added option -i to @run, which executes code in
3368 the IPython namespace instead of a clean one. Also added @irun as
3377 the IPython namespace instead of a clean one. Also added @irun as
3369 an alias to @run -i.
3378 an alias to @run -i.
3370
3379
3371 * IPython/UserConfig/GnuplotMagic.py (magic_gp_set_instance):
3380 * IPython/UserConfig/GnuplotMagic.py (magic_gp_set_instance):
3372 fixed (it didn't really do anything, the namespaces were wrong).
3381 fixed (it didn't really do anything, the namespaces were wrong).
3373
3382
3374 * IPython/Debugger.py (__init__): Added workaround for python 2.1
3383 * IPython/Debugger.py (__init__): Added workaround for python 2.1
3375
3384
3376 * IPython/__init__.py (__all__): Fixed package namespace, now
3385 * IPython/__init__.py (__all__): Fixed package namespace, now
3377 'import IPython' does give access to IPython.<all> as
3386 'import IPython' does give access to IPython.<all> as
3378 expected. Also renamed __release__ to Release.
3387 expected. Also renamed __release__ to Release.
3379
3388
3380 * IPython/Debugger.py (__license__): created new Pdb class which
3389 * IPython/Debugger.py (__license__): created new Pdb class which
3381 functions like a drop-in for the normal pdb.Pdb but does NOT
3390 functions like a drop-in for the normal pdb.Pdb but does NOT
3382 import readline by default. This way it doesn't muck up IPython's
3391 import readline by default. This way it doesn't muck up IPython's
3383 readline handling, and now tab-completion finally works in the
3392 readline handling, and now tab-completion finally works in the
3384 debugger -- sort of. It completes things globally visible, but the
3393 debugger -- sort of. It completes things globally visible, but the
3385 completer doesn't track the stack as pdb walks it. That's a bit
3394 completer doesn't track the stack as pdb walks it. That's a bit
3386 tricky, and I'll have to implement it later.
3395 tricky, and I'll have to implement it later.
3387
3396
3388 2002-05-05 Fernando Perez <fperez@colorado.edu>
3397 2002-05-05 Fernando Perez <fperez@colorado.edu>
3389
3398
3390 * IPython/Magic.py (Magic.magic_oinfo): fixed formatting bug for
3399 * IPython/Magic.py (Magic.magic_oinfo): fixed formatting bug for
3391 magic docstrings when printed via ? (explicit \'s were being
3400 magic docstrings when printed via ? (explicit \'s were being
3392 printed).
3401 printed).
3393
3402
3394 * IPython/ipmaker.py (make_IPython): fixed namespace
3403 * IPython/ipmaker.py (make_IPython): fixed namespace
3395 identification bug. Now variables loaded via logs or command-line
3404 identification bug. Now variables loaded via logs or command-line
3396 files are recognized in the interactive namespace by @who.
3405 files are recognized in the interactive namespace by @who.
3397
3406
3398 * IPython/iplib.py (InteractiveShell.safe_execfile): Fixed bug in
3407 * IPython/iplib.py (InteractiveShell.safe_execfile): Fixed bug in
3399 log replay system stemming from the string form of Structs.
3408 log replay system stemming from the string form of Structs.
3400
3409
3401 * IPython/Magic.py (Macro.__init__): improved macros to properly
3410 * IPython/Magic.py (Macro.__init__): improved macros to properly
3402 handle magic commands in them.
3411 handle magic commands in them.
3403 (Magic.magic_logstart): usernames are now expanded so 'logstart
3412 (Magic.magic_logstart): usernames are now expanded so 'logstart
3404 ~/mylog' now works.
3413 ~/mylog' now works.
3405
3414
3406 * IPython/iplib.py (complete): fixed bug where paths starting with
3415 * IPython/iplib.py (complete): fixed bug where paths starting with
3407 '/' would be completed as magic names.
3416 '/' would be completed as magic names.
3408
3417
3409 2002-05-04 Fernando Perez <fperez@colorado.edu>
3418 2002-05-04 Fernando Perez <fperez@colorado.edu>
3410
3419
3411 * IPython/Magic.py (Magic.magic_run): added options -p and -f to
3420 * IPython/Magic.py (Magic.magic_run): added options -p and -f to
3412 allow running full programs under the profiler's control.
3421 allow running full programs under the profiler's control.
3413
3422
3414 * IPython/ultraTB.py (FormattedTB.__init__): Added Verbose_novars
3423 * IPython/ultraTB.py (FormattedTB.__init__): Added Verbose_novars
3415 mode to report exceptions verbosely but without formatting
3424 mode to report exceptions verbosely but without formatting
3416 variables. This addresses the issue of ipython 'freezing' (it's
3425 variables. This addresses the issue of ipython 'freezing' (it's
3417 not frozen, but caught in an expensive formatting loop) when huge
3426 not frozen, but caught in an expensive formatting loop) when huge
3418 variables are in the context of an exception.
3427 variables are in the context of an exception.
3419 (VerboseTB.text): Added '--->' markers at line where exception was
3428 (VerboseTB.text): Added '--->' markers at line where exception was
3420 triggered. Much clearer to read, especially in NoColor modes.
3429 triggered. Much clearer to read, especially in NoColor modes.
3421
3430
3422 * IPython/Magic.py (Magic.magic_run): bugfix: -n option had been
3431 * IPython/Magic.py (Magic.magic_run): bugfix: -n option had been
3423 implemented in reverse when changing to the new parse_options().
3432 implemented in reverse when changing to the new parse_options().
3424
3433
3425 2002-05-03 Fernando Perez <fperez@colorado.edu>
3434 2002-05-03 Fernando Perez <fperez@colorado.edu>
3426
3435
3427 * IPython/Magic.py (Magic.parse_options): new function so that
3436 * IPython/Magic.py (Magic.parse_options): new function so that
3428 magics can parse options easier.
3437 magics can parse options easier.
3429 (Magic.magic_prun): new function similar to profile.run(),
3438 (Magic.magic_prun): new function similar to profile.run(),
3430 suggested by Chris Hart.
3439 suggested by Chris Hart.
3431 (Magic.magic_cd): fixed behavior so that it only changes if
3440 (Magic.magic_cd): fixed behavior so that it only changes if
3432 directory actually is in history.
3441 directory actually is in history.
3433
3442
3434 * IPython/usage.py (__doc__): added information about potential
3443 * IPython/usage.py (__doc__): added information about potential
3435 slowness of Verbose exception mode when there are huge data
3444 slowness of Verbose exception mode when there are huge data
3436 structures to be formatted (thanks to Archie Paulson).
3445 structures to be formatted (thanks to Archie Paulson).
3437
3446
3438 * IPython/ipmaker.py (make_IPython): Changed default logging
3447 * IPython/ipmaker.py (make_IPython): Changed default logging
3439 (when simply called with -log) to use curr_dir/ipython.log in
3448 (when simply called with -log) to use curr_dir/ipython.log in
3440 rotate mode. Fixed crash which was occuring with -log before
3449 rotate mode. Fixed crash which was occuring with -log before
3441 (thanks to Jim Boyle).
3450 (thanks to Jim Boyle).
3442
3451
3443 2002-05-01 Fernando Perez <fperez@colorado.edu>
3452 2002-05-01 Fernando Perez <fperez@colorado.edu>
3444
3453
3445 * Released 0.2.11 for these fixes (mainly the ultraTB one which
3454 * Released 0.2.11 for these fixes (mainly the ultraTB one which
3446 was nasty -- though somewhat of a corner case).
3455 was nasty -- though somewhat of a corner case).
3447
3456
3448 * IPython/ultraTB.py (AutoFormattedTB.text): renamed __text to
3457 * IPython/ultraTB.py (AutoFormattedTB.text): renamed __text to
3449 text (was a bug).
3458 text (was a bug).
3450
3459
3451 2002-04-30 Fernando Perez <fperez@colorado.edu>
3460 2002-04-30 Fernando Perez <fperez@colorado.edu>
3452
3461
3453 * IPython/UserConfig/GnuplotMagic.py (magic_gp): Minor fix to add
3462 * IPython/UserConfig/GnuplotMagic.py (magic_gp): Minor fix to add
3454 a print after ^D or ^C from the user so that the In[] prompt
3463 a print after ^D or ^C from the user so that the In[] prompt
3455 doesn't over-run the gnuplot one.
3464 doesn't over-run the gnuplot one.
3456
3465
3457 2002-04-29 Fernando Perez <fperez@colorado.edu>
3466 2002-04-29 Fernando Perez <fperez@colorado.edu>
3458
3467
3459 * Released 0.2.10
3468 * Released 0.2.10
3460
3469
3461 * IPython/__release__.py (version): get date dynamically.
3470 * IPython/__release__.py (version): get date dynamically.
3462
3471
3463 * Misc. documentation updates thanks to Arnd's comments. Also ran
3472 * Misc. documentation updates thanks to Arnd's comments. Also ran
3464 a full spellcheck on the manual (hadn't been done in a while).
3473 a full spellcheck on the manual (hadn't been done in a while).
3465
3474
3466 2002-04-27 Fernando Perez <fperez@colorado.edu>
3475 2002-04-27 Fernando Perez <fperez@colorado.edu>
3467
3476
3468 * IPython/Magic.py (Magic.magic_logstart): Fixed bug where
3477 * IPython/Magic.py (Magic.magic_logstart): Fixed bug where
3469 starting a log in mid-session would reset the input history list.
3478 starting a log in mid-session would reset the input history list.
3470
3479
3471 2002-04-26 Fernando Perez <fperez@colorado.edu>
3480 2002-04-26 Fernando Perez <fperez@colorado.edu>
3472
3481
3473 * IPython/iplib.py (InteractiveShell.wait): Fixed bug where not
3482 * IPython/iplib.py (InteractiveShell.wait): Fixed bug where not
3474 all files were being included in an update. Now anything in
3483 all files were being included in an update. Now anything in
3475 UserConfig that matches [A-Za-z]*.py will go (this excludes
3484 UserConfig that matches [A-Za-z]*.py will go (this excludes
3476 __init__.py)
3485 __init__.py)
3477
3486
3478 2002-04-25 Fernando Perez <fperez@colorado.edu>
3487 2002-04-25 Fernando Perez <fperez@colorado.edu>
3479
3488
3480 * IPython/iplib.py (InteractiveShell.__init__): Added __IPYTHON__
3489 * IPython/iplib.py (InteractiveShell.__init__): Added __IPYTHON__
3481 to __builtins__ so that any form of embedded or imported code can
3490 to __builtins__ so that any form of embedded or imported code can
3482 test for being inside IPython.
3491 test for being inside IPython.
3483
3492
3484 * IPython/UserConfig/GnuplotMagic.py: (magic_gp_set_instance):
3493 * IPython/UserConfig/GnuplotMagic.py: (magic_gp_set_instance):
3485 changed to GnuplotMagic because it's now an importable module,
3494 changed to GnuplotMagic because it's now an importable module,
3486 this makes the name follow that of the standard Gnuplot module.
3495 this makes the name follow that of the standard Gnuplot module.
3487 GnuplotMagic can now be loaded at any time in mid-session.
3496 GnuplotMagic can now be loaded at any time in mid-session.
3488
3497
3489 2002-04-24 Fernando Perez <fperez@colorado.edu>
3498 2002-04-24 Fernando Perez <fperez@colorado.edu>
3490
3499
3491 * IPython/numutils.py: removed SIUnits. It doesn't properly set
3500 * IPython/numutils.py: removed SIUnits. It doesn't properly set
3492 the globals (IPython has its own namespace) and the
3501 the globals (IPython has its own namespace) and the
3493 PhysicalQuantity stuff is much better anyway.
3502 PhysicalQuantity stuff is much better anyway.
3494
3503
3495 * IPython/UserConfig/example-gnuplot.py (g2): Added gnuplot
3504 * IPython/UserConfig/example-gnuplot.py (g2): Added gnuplot
3496 embedding example to standard user directory for
3505 embedding example to standard user directory for
3497 distribution. Also put it in the manual.
3506 distribution. Also put it in the manual.
3498
3507
3499 * IPython/numutils.py (gnuplot_exec): Changed to take a gnuplot
3508 * IPython/numutils.py (gnuplot_exec): Changed to take a gnuplot
3500 instance as first argument (so it doesn't rely on some obscure
3509 instance as first argument (so it doesn't rely on some obscure
3501 hidden global).
3510 hidden global).
3502
3511
3503 * IPython/UserConfig/ipythonrc.py: put () back in accepted
3512 * IPython/UserConfig/ipythonrc.py: put () back in accepted
3504 delimiters. While it prevents ().TAB from working, it allows
3513 delimiters. While it prevents ().TAB from working, it allows
3505 completions in open (... expressions. This is by far a more common
3514 completions in open (... expressions. This is by far a more common
3506 case.
3515 case.
3507
3516
3508 2002-04-23 Fernando Perez <fperez@colorado.edu>
3517 2002-04-23 Fernando Perez <fperez@colorado.edu>
3509
3518
3510 * IPython/Extensions/InterpreterPasteInput.py: new
3519 * IPython/Extensions/InterpreterPasteInput.py: new
3511 syntax-processing module for pasting lines with >>> or ... at the
3520 syntax-processing module for pasting lines with >>> or ... at the
3512 start.
3521 start.
3513
3522
3514 * IPython/Extensions/PhysicalQ_Interactive.py
3523 * IPython/Extensions/PhysicalQ_Interactive.py
3515 (PhysicalQuantityInteractive.__int__): fixed to work with either
3524 (PhysicalQuantityInteractive.__int__): fixed to work with either
3516 Numeric or math.
3525 Numeric or math.
3517
3526
3518 * IPython/UserConfig/ipythonrc-numeric.py: reorganized the
3527 * IPython/UserConfig/ipythonrc-numeric.py: reorganized the
3519 provided profiles. Now we have:
3528 provided profiles. Now we have:
3520 -math -> math module as * and cmath with its own namespace.
3529 -math -> math module as * and cmath with its own namespace.
3521 -numeric -> Numeric as *, plus gnuplot & grace
3530 -numeric -> Numeric as *, plus gnuplot & grace
3522 -physics -> same as before
3531 -physics -> same as before
3523
3532
3524 * IPython/Magic.py (Magic.magic_magic): Fixed bug where
3533 * IPython/Magic.py (Magic.magic_magic): Fixed bug where
3525 user-defined magics wouldn't be found by @magic if they were
3534 user-defined magics wouldn't be found by @magic if they were
3526 defined as class methods. Also cleaned up the namespace search
3535 defined as class methods. Also cleaned up the namespace search
3527 logic and the string building (to use %s instead of many repeated
3536 logic and the string building (to use %s instead of many repeated
3528 string adds).
3537 string adds).
3529
3538
3530 * IPython/UserConfig/example-magic.py (magic_foo): updated example
3539 * IPython/UserConfig/example-magic.py (magic_foo): updated example
3531 of user-defined magics to operate with class methods (cleaner, in
3540 of user-defined magics to operate with class methods (cleaner, in
3532 line with the gnuplot code).
3541 line with the gnuplot code).
3533
3542
3534 2002-04-22 Fernando Perez <fperez@colorado.edu>
3543 2002-04-22 Fernando Perez <fperez@colorado.edu>
3535
3544
3536 * setup.py: updated dependency list so that manual is updated when
3545 * setup.py: updated dependency list so that manual is updated when
3537 all included files change.
3546 all included files change.
3538
3547
3539 * IPython/ipmaker.py (make_IPython): Fixed bug which was ignoring
3548 * IPython/ipmaker.py (make_IPython): Fixed bug which was ignoring
3540 the delimiter removal option (the fix is ugly right now).
3549 the delimiter removal option (the fix is ugly right now).
3541
3550
3542 * IPython/UserConfig/ipythonrc-physics.py: simplified not to load
3551 * IPython/UserConfig/ipythonrc-physics.py: simplified not to load
3543 all of the math profile (quicker loading, no conflict between
3552 all of the math profile (quicker loading, no conflict between
3544 g-9.8 and g-gnuplot).
3553 g-9.8 and g-gnuplot).
3545
3554
3546 * IPython/CrashHandler.py (CrashHandler.__call__): changed default
3555 * IPython/CrashHandler.py (CrashHandler.__call__): changed default
3547 name of post-mortem files to IPython_crash_report.txt.
3556 name of post-mortem files to IPython_crash_report.txt.
3548
3557
3549 * Cleanup/update of the docs. Added all the new readline info and
3558 * Cleanup/update of the docs. Added all the new readline info and
3550 formatted all lists as 'real lists'.
3559 formatted all lists as 'real lists'.
3551
3560
3552 * IPython/ipmaker.py (make_IPython): removed now-obsolete
3561 * IPython/ipmaker.py (make_IPython): removed now-obsolete
3553 tab-completion options, since the full readline parse_and_bind is
3562 tab-completion options, since the full readline parse_and_bind is
3554 now accessible.
3563 now accessible.
3555
3564
3556 * IPython/iplib.py (InteractiveShell.init_readline): Changed
3565 * IPython/iplib.py (InteractiveShell.init_readline): Changed
3557 handling of readline options. Now users can specify any string to
3566 handling of readline options. Now users can specify any string to
3558 be passed to parse_and_bind(), as well as the delimiters to be
3567 be passed to parse_and_bind(), as well as the delimiters to be
3559 removed.
3568 removed.
3560 (InteractiveShell.__init__): Added __name__ to the global
3569 (InteractiveShell.__init__): Added __name__ to the global
3561 namespace so that things like Itpl which rely on its existence
3570 namespace so that things like Itpl which rely on its existence
3562 don't crash.
3571 don't crash.
3563 (InteractiveShell._prefilter): Defined the default with a _ so
3572 (InteractiveShell._prefilter): Defined the default with a _ so
3564 that prefilter() is easier to override, while the default one
3573 that prefilter() is easier to override, while the default one
3565 remains available.
3574 remains available.
3566
3575
3567 2002-04-18 Fernando Perez <fperez@colorado.edu>
3576 2002-04-18 Fernando Perez <fperez@colorado.edu>
3568
3577
3569 * Added information about pdb in the docs.
3578 * Added information about pdb in the docs.
3570
3579
3571 2002-04-17 Fernando Perez <fperez@colorado.edu>
3580 2002-04-17 Fernando Perez <fperez@colorado.edu>
3572
3581
3573 * IPython/ipmaker.py (make_IPython): added rc_override option to
3582 * IPython/ipmaker.py (make_IPython): added rc_override option to
3574 allow passing config options at creation time which may override
3583 allow passing config options at creation time which may override
3575 anything set in the config files or command line. This is
3584 anything set in the config files or command line. This is
3576 particularly useful for configuring embedded instances.
3585 particularly useful for configuring embedded instances.
3577
3586
3578 2002-04-15 Fernando Perez <fperez@colorado.edu>
3587 2002-04-15 Fernando Perez <fperez@colorado.edu>
3579
3588
3580 * IPython/Logger.py (Logger.log): Fixed a nasty bug which could
3589 * IPython/Logger.py (Logger.log): Fixed a nasty bug which could
3581 crash embedded instances because of the input cache falling out of
3590 crash embedded instances because of the input cache falling out of
3582 sync with the output counter.
3591 sync with the output counter.
3583
3592
3584 * IPython/Shell.py (IPythonShellEmbed.__init__): added a debug
3593 * IPython/Shell.py (IPythonShellEmbed.__init__): added a debug
3585 mode which calls pdb after an uncaught exception in IPython itself.
3594 mode which calls pdb after an uncaught exception in IPython itself.
3586
3595
3587 2002-04-14 Fernando Perez <fperez@colorado.edu>
3596 2002-04-14 Fernando Perez <fperez@colorado.edu>
3588
3597
3589 * IPython/iplib.py (InteractiveShell.showtraceback): pdb mucks up
3598 * IPython/iplib.py (InteractiveShell.showtraceback): pdb mucks up
3590 readline, fix it back after each call.
3599 readline, fix it back after each call.
3591
3600
3592 * IPython/ultraTB.py (AutoFormattedTB.__text): made text a private
3601 * IPython/ultraTB.py (AutoFormattedTB.__text): made text a private
3593 method to force all access via __call__(), which guarantees that
3602 method to force all access via __call__(), which guarantees that
3594 traceback references are properly deleted.
3603 traceback references are properly deleted.
3595
3604
3596 * IPython/Prompts.py (CachedOutput._display): minor fixes to
3605 * IPython/Prompts.py (CachedOutput._display): minor fixes to
3597 improve printing when pprint is in use.
3606 improve printing when pprint is in use.
3598
3607
3599 2002-04-13 Fernando Perez <fperez@colorado.edu>
3608 2002-04-13 Fernando Perez <fperez@colorado.edu>
3600
3609
3601 * IPython/Shell.py (IPythonShellEmbed.__call__): SystemExit
3610 * IPython/Shell.py (IPythonShellEmbed.__call__): SystemExit
3602 exceptions aren't caught anymore. If the user triggers one, he
3611 exceptions aren't caught anymore. If the user triggers one, he
3603 should know why he's doing it and it should go all the way up,
3612 should know why he's doing it and it should go all the way up,
3604 just like any other exception. So now @abort will fully kill the
3613 just like any other exception. So now @abort will fully kill the
3605 embedded interpreter and the embedding code (unless that happens
3614 embedded interpreter and the embedding code (unless that happens
3606 to catch SystemExit).
3615 to catch SystemExit).
3607
3616
3608 * IPython/ultraTB.py (VerboseTB.__init__): added a call_pdb flag
3617 * IPython/ultraTB.py (VerboseTB.__init__): added a call_pdb flag
3609 and a debugger() method to invoke the interactive pdb debugger
3618 and a debugger() method to invoke the interactive pdb debugger
3610 after printing exception information. Also added the corresponding
3619 after printing exception information. Also added the corresponding
3611 -pdb option and @pdb magic to control this feature, and updated
3620 -pdb option and @pdb magic to control this feature, and updated
3612 the docs. After a suggestion from Christopher Hart
3621 the docs. After a suggestion from Christopher Hart
3613 (hart-AT-caltech.edu).
3622 (hart-AT-caltech.edu).
3614
3623
3615 2002-04-12 Fernando Perez <fperez@colorado.edu>
3624 2002-04-12 Fernando Perez <fperez@colorado.edu>
3616
3625
3617 * IPython/Shell.py (IPythonShellEmbed.__init__): modified to use
3626 * IPython/Shell.py (IPythonShellEmbed.__init__): modified to use
3618 the exception handlers defined by the user (not the CrashHandler)
3627 the exception handlers defined by the user (not the CrashHandler)
3619 so that user exceptions don't trigger an ipython bug report.
3628 so that user exceptions don't trigger an ipython bug report.
3620
3629
3621 * IPython/ultraTB.py (ColorTB.__init__): made the color scheme
3630 * IPython/ultraTB.py (ColorTB.__init__): made the color scheme
3622 configurable (it should have always been so).
3631 configurable (it should have always been so).
3623
3632
3624 2002-03-26 Fernando Perez <fperez@colorado.edu>
3633 2002-03-26 Fernando Perez <fperez@colorado.edu>
3625
3634
3626 * IPython/Shell.py (IPythonShellEmbed.__call__): many changes here
3635 * IPython/Shell.py (IPythonShellEmbed.__call__): many changes here
3627 and there to fix embedding namespace issues. This should all be
3636 and there to fix embedding namespace issues. This should all be
3628 done in a more elegant way.
3637 done in a more elegant way.
3629
3638
3630 2002-03-25 Fernando Perez <fperez@colorado.edu>
3639 2002-03-25 Fernando Perez <fperez@colorado.edu>
3631
3640
3632 * IPython/genutils.py (get_home_dir): Try to make it work under
3641 * IPython/genutils.py (get_home_dir): Try to make it work under
3633 win9x also.
3642 win9x also.
3634
3643
3635 2002-03-20 Fernando Perez <fperez@colorado.edu>
3644 2002-03-20 Fernando Perez <fperez@colorado.edu>
3636
3645
3637 * IPython/Shell.py (IPythonShellEmbed.__init__): leave
3646 * IPython/Shell.py (IPythonShellEmbed.__init__): leave
3638 sys.displayhook untouched upon __init__.
3647 sys.displayhook untouched upon __init__.
3639
3648
3640 2002-03-19 Fernando Perez <fperez@colorado.edu>
3649 2002-03-19 Fernando Perez <fperez@colorado.edu>
3641
3650
3642 * Released 0.2.9 (for embedding bug, basically).
3651 * Released 0.2.9 (for embedding bug, basically).
3643
3652
3644 * IPython/Shell.py (IPythonShellEmbed.__call__): Trap SystemExit
3653 * IPython/Shell.py (IPythonShellEmbed.__call__): Trap SystemExit
3645 exceptions so that enclosing shell's state can be restored.
3654 exceptions so that enclosing shell's state can be restored.
3646
3655
3647 * Changed magic_gnuplot.py to magic-gnuplot.py to standardize
3656 * Changed magic_gnuplot.py to magic-gnuplot.py to standardize
3648 naming conventions in the .ipython/ dir.
3657 naming conventions in the .ipython/ dir.
3649
3658
3650 * IPython/iplib.py (InteractiveShell.init_readline): removed '-'
3659 * IPython/iplib.py (InteractiveShell.init_readline): removed '-'
3651 from delimiters list so filenames with - in them get expanded.
3660 from delimiters list so filenames with - in them get expanded.
3652
3661
3653 * IPython/Shell.py (IPythonShellEmbed.__call__): fixed bug with
3662 * IPython/Shell.py (IPythonShellEmbed.__call__): fixed bug with
3654 sys.displayhook not being properly restored after an embedded call.
3663 sys.displayhook not being properly restored after an embedded call.
3655
3664
3656 2002-03-18 Fernando Perez <fperez@colorado.edu>
3665 2002-03-18 Fernando Perez <fperez@colorado.edu>
3657
3666
3658 * Released 0.2.8
3667 * Released 0.2.8
3659
3668
3660 * IPython/iplib.py (InteractiveShell.user_setup): fixed bug where
3669 * IPython/iplib.py (InteractiveShell.user_setup): fixed bug where
3661 some files weren't being included in a -upgrade.
3670 some files weren't being included in a -upgrade.
3662 (InteractiveShell.init_readline): Added 'set show-all-if-ambiguous
3671 (InteractiveShell.init_readline): Added 'set show-all-if-ambiguous
3663 on' so that the first tab completes.
3672 on' so that the first tab completes.
3664 (InteractiveShell.handle_magic): fixed bug with spaces around
3673 (InteractiveShell.handle_magic): fixed bug with spaces around
3665 quotes breaking many magic commands.
3674 quotes breaking many magic commands.
3666
3675
3667 * setup.py: added note about ignoring the syntax error messages at
3676 * setup.py: added note about ignoring the syntax error messages at
3668 installation.
3677 installation.
3669
3678
3670 * IPython/UserConfig/magic_gnuplot.py (magic_gp): finished
3679 * IPython/UserConfig/magic_gnuplot.py (magic_gp): finished
3671 streamlining the gnuplot interface, now there's only one magic @gp.
3680 streamlining the gnuplot interface, now there's only one magic @gp.
3672
3681
3673 2002-03-17 Fernando Perez <fperez@colorado.edu>
3682 2002-03-17 Fernando Perez <fperez@colorado.edu>
3674
3683
3675 * IPython/UserConfig/magic_gnuplot.py: new name for the
3684 * IPython/UserConfig/magic_gnuplot.py: new name for the
3676 example-magic_pm.py file. Much enhanced system, now with a shell
3685 example-magic_pm.py file. Much enhanced system, now with a shell
3677 for communicating directly with gnuplot, one command at a time.
3686 for communicating directly with gnuplot, one command at a time.
3678
3687
3679 * IPython/Magic.py (Magic.magic_run): added option -n to prevent
3688 * IPython/Magic.py (Magic.magic_run): added option -n to prevent
3680 setting __name__=='__main__'.
3689 setting __name__=='__main__'.
3681
3690
3682 * IPython/UserConfig/example-magic_pm.py (magic_pm): Added
3691 * IPython/UserConfig/example-magic_pm.py (magic_pm): Added
3683 mini-shell for accessing gnuplot from inside ipython. Should
3692 mini-shell for accessing gnuplot from inside ipython. Should
3684 extend it later for grace access too. Inspired by Arnd's
3693 extend it later for grace access too. Inspired by Arnd's
3685 suggestion.
3694 suggestion.
3686
3695
3687 * IPython/iplib.py (InteractiveShell.handle_magic): fixed bug when
3696 * IPython/iplib.py (InteractiveShell.handle_magic): fixed bug when
3688 calling magic functions with () in their arguments. Thanks to Arnd
3697 calling magic functions with () in their arguments. Thanks to Arnd
3689 Baecker for pointing this to me.
3698 Baecker for pointing this to me.
3690
3699
3691 * IPython/numutils.py (sum_flat): fixed bug. Would recurse
3700 * IPython/numutils.py (sum_flat): fixed bug. Would recurse
3692 infinitely for integer or complex arrays (only worked with floats).
3701 infinitely for integer or complex arrays (only worked with floats).
3693
3702
3694 2002-03-16 Fernando Perez <fperez@colorado.edu>
3703 2002-03-16 Fernando Perez <fperez@colorado.edu>
3695
3704
3696 * setup.py: Merged setup and setup_windows into a single script
3705 * setup.py: Merged setup and setup_windows into a single script
3697 which properly handles things for windows users.
3706 which properly handles things for windows users.
3698
3707
3699 2002-03-15 Fernando Perez <fperez@colorado.edu>
3708 2002-03-15 Fernando Perez <fperez@colorado.edu>
3700
3709
3701 * Big change to the manual: now the magics are all automatically
3710 * Big change to the manual: now the magics are all automatically
3702 documented. This information is generated from their docstrings
3711 documented. This information is generated from their docstrings
3703 and put in a latex file included by the manual lyx file. This way
3712 and put in a latex file included by the manual lyx file. This way
3704 we get always up to date information for the magics. The manual
3713 we get always up to date information for the magics. The manual
3705 now also has proper version information, also auto-synced.
3714 now also has proper version information, also auto-synced.
3706
3715
3707 For this to work, an undocumented --magic_docstrings option was added.
3716 For this to work, an undocumented --magic_docstrings option was added.
3708
3717
3709 2002-03-13 Fernando Perez <fperez@colorado.edu>
3718 2002-03-13 Fernando Perez <fperez@colorado.edu>
3710
3719
3711 * IPython/ultraTB.py (TermColors): fixed problem with dark colors
3720 * IPython/ultraTB.py (TermColors): fixed problem with dark colors
3712 under CDE terminals. An explicit ;2 color reset is needed in the escapes.
3721 under CDE terminals. An explicit ;2 color reset is needed in the escapes.
3713
3722
3714 2002-03-12 Fernando Perez <fperez@colorado.edu>
3723 2002-03-12 Fernando Perez <fperez@colorado.edu>
3715
3724
3716 * IPython/ultraTB.py (TermColors): changed color escapes again to
3725 * IPython/ultraTB.py (TermColors): changed color escapes again to
3717 fix the (old, reintroduced) line-wrapping bug. Basically, if
3726 fix the (old, reintroduced) line-wrapping bug. Basically, if
3718 \001..\002 aren't given in the color escapes, lines get wrapped
3727 \001..\002 aren't given in the color escapes, lines get wrapped
3719 weirdly. But giving those screws up old xterms and emacs terms. So
3728 weirdly. But giving those screws up old xterms and emacs terms. So
3720 I added some logic for emacs terms to be ok, but I can't identify old
3729 I added some logic for emacs terms to be ok, but I can't identify old
3721 xterms separately ($TERM=='xterm' for many terminals, like konsole).
3730 xterms separately ($TERM=='xterm' for many terminals, like konsole).
3722
3731
3723 2002-03-10 Fernando Perez <fperez@colorado.edu>
3732 2002-03-10 Fernando Perez <fperez@colorado.edu>
3724
3733
3725 * IPython/usage.py (__doc__): Various documentation cleanups and
3734 * IPython/usage.py (__doc__): Various documentation cleanups and
3726 updates, both in usage docstrings and in the manual.
3735 updates, both in usage docstrings and in the manual.
3727
3736
3728 * IPython/Prompts.py (CachedOutput.set_colors): cleanups for
3737 * IPython/Prompts.py (CachedOutput.set_colors): cleanups for
3729 handling of caching. Set minimum acceptabe value for having a
3738 handling of caching. Set minimum acceptabe value for having a
3730 cache at 20 values.
3739 cache at 20 values.
3731
3740
3732 * IPython/iplib.py (InteractiveShell.user_setup): moved the
3741 * IPython/iplib.py (InteractiveShell.user_setup): moved the
3733 install_first_time function to a method, renamed it and added an
3742 install_first_time function to a method, renamed it and added an
3734 'upgrade' mode. Now people can update their config directory with
3743 'upgrade' mode. Now people can update their config directory with
3735 a simple command line switch (-upgrade, also new).
3744 a simple command line switch (-upgrade, also new).
3736
3745
3737 * IPython/Magic.py (Magic.magic_pfile): Made @pfile an alias to
3746 * IPython/Magic.py (Magic.magic_pfile): Made @pfile an alias to
3738 @file (convenient for automagic users under Python >= 2.2).
3747 @file (convenient for automagic users under Python >= 2.2).
3739 Removed @files (it seemed more like a plural than an abbrev. of
3748 Removed @files (it seemed more like a plural than an abbrev. of
3740 'file show').
3749 'file show').
3741
3750
3742 * IPython/iplib.py (install_first_time): Fixed crash if there were
3751 * IPython/iplib.py (install_first_time): Fixed crash if there were
3743 backup files ('~') in .ipython/ install directory.
3752 backup files ('~') in .ipython/ install directory.
3744
3753
3745 * IPython/ipmaker.py (make_IPython): fixes for new prompt
3754 * IPython/ipmaker.py (make_IPython): fixes for new prompt
3746 system. Things look fine, but these changes are fairly
3755 system. Things look fine, but these changes are fairly
3747 intrusive. Test them for a few days.
3756 intrusive. Test them for a few days.
3748
3757
3749 * IPython/Prompts.py (CachedOutput.__init__): Massive rewrite of
3758 * IPython/Prompts.py (CachedOutput.__init__): Massive rewrite of
3750 the prompts system. Now all in/out prompt strings are user
3759 the prompts system. Now all in/out prompt strings are user
3751 controllable. This is particularly useful for embedding, as one
3760 controllable. This is particularly useful for embedding, as one
3752 can tag embedded instances with particular prompts.
3761 can tag embedded instances with particular prompts.
3753
3762
3754 Also removed global use of sys.ps1/2, which now allows nested
3763 Also removed global use of sys.ps1/2, which now allows nested
3755 embeddings without any problems. Added command-line options for
3764 embeddings without any problems. Added command-line options for
3756 the prompt strings.
3765 the prompt strings.
3757
3766
3758 2002-03-08 Fernando Perez <fperez@colorado.edu>
3767 2002-03-08 Fernando Perez <fperez@colorado.edu>
3759
3768
3760 * IPython/UserConfig/example-embed-short.py (ipshell): added
3769 * IPython/UserConfig/example-embed-short.py (ipshell): added
3761 example file with the bare minimum code for embedding.
3770 example file with the bare minimum code for embedding.
3762
3771
3763 * IPython/Shell.py (IPythonShellEmbed.set_dummy_mode): added
3772 * IPython/Shell.py (IPythonShellEmbed.set_dummy_mode): added
3764 functionality for the embeddable shell to be activated/deactivated
3773 functionality for the embeddable shell to be activated/deactivated
3765 either globally or at each call.
3774 either globally or at each call.
3766
3775
3767 * IPython/Prompts.py (Prompt1.auto_rewrite): Fixes the problem of
3776 * IPython/Prompts.py (Prompt1.auto_rewrite): Fixes the problem of
3768 rewriting the prompt with '--->' for auto-inputs with proper
3777 rewriting the prompt with '--->' for auto-inputs with proper
3769 coloring. Now the previous UGLY hack in handle_auto() is gone, and
3778 coloring. Now the previous UGLY hack in handle_auto() is gone, and
3770 this is handled by the prompts class itself, as it should.
3779 this is handled by the prompts class itself, as it should.
3771
3780
3772 2002-03-05 Fernando Perez <fperez@colorado.edu>
3781 2002-03-05 Fernando Perez <fperez@colorado.edu>
3773
3782
3774 * IPython/Magic.py (Magic.magic_logstart): Changed @log to
3783 * IPython/Magic.py (Magic.magic_logstart): Changed @log to
3775 @logstart to avoid name clashes with the math log function.
3784 @logstart to avoid name clashes with the math log function.
3776
3785
3777 * Big updates to X/Emacs section of the manual.
3786 * Big updates to X/Emacs section of the manual.
3778
3787
3779 * Removed ipython_emacs. Milan explained to me how to pass
3788 * Removed ipython_emacs. Milan explained to me how to pass
3780 arguments to ipython through Emacs. Some day I'm going to end up
3789 arguments to ipython through Emacs. Some day I'm going to end up
3781 learning some lisp...
3790 learning some lisp...
3782
3791
3783 2002-03-04 Fernando Perez <fperez@colorado.edu>
3792 2002-03-04 Fernando Perez <fperez@colorado.edu>
3784
3793
3785 * IPython/ipython_emacs: Created script to be used as the
3794 * IPython/ipython_emacs: Created script to be used as the
3786 py-python-command Emacs variable so we can pass IPython
3795 py-python-command Emacs variable so we can pass IPython
3787 parameters. I can't figure out how to tell Emacs directly to pass
3796 parameters. I can't figure out how to tell Emacs directly to pass
3788 parameters to IPython, so a dummy shell script will do it.
3797 parameters to IPython, so a dummy shell script will do it.
3789
3798
3790 Other enhancements made for things to work better under Emacs'
3799 Other enhancements made for things to work better under Emacs'
3791 various types of terminals. Many thanks to Milan Zamazal
3800 various types of terminals. Many thanks to Milan Zamazal
3792 <pdm-AT-zamazal.org> for all the suggestions and pointers.
3801 <pdm-AT-zamazal.org> for all the suggestions and pointers.
3793
3802
3794 2002-03-01 Fernando Perez <fperez@colorado.edu>
3803 2002-03-01 Fernando Perez <fperez@colorado.edu>
3795
3804
3796 * IPython/ipmaker.py (make_IPython): added a --readline! option so
3805 * IPython/ipmaker.py (make_IPython): added a --readline! option so
3797 that loading of readline is now optional. This gives better
3806 that loading of readline is now optional. This gives better
3798 control to emacs users.
3807 control to emacs users.
3799
3808
3800 * IPython/ultraTB.py (__date__): Modified color escape sequences
3809 * IPython/ultraTB.py (__date__): Modified color escape sequences
3801 and now things work fine under xterm and in Emacs' term buffers
3810 and now things work fine under xterm and in Emacs' term buffers
3802 (though not shell ones). Well, in emacs you get colors, but all
3811 (though not shell ones). Well, in emacs you get colors, but all
3803 seem to be 'light' colors (no difference between dark and light
3812 seem to be 'light' colors (no difference between dark and light
3804 ones). But the garbage chars are gone, and also in xterms. It
3813 ones). But the garbage chars are gone, and also in xterms. It
3805 seems that now I'm using 'cleaner' ansi sequences.
3814 seems that now I'm using 'cleaner' ansi sequences.
3806
3815
3807 2002-02-21 Fernando Perez <fperez@colorado.edu>
3816 2002-02-21 Fernando Perez <fperez@colorado.edu>
3808
3817
3809 * Released 0.2.7 (mainly to publish the scoping fix).
3818 * Released 0.2.7 (mainly to publish the scoping fix).
3810
3819
3811 * IPython/Logger.py (Logger.logstate): added. A corresponding
3820 * IPython/Logger.py (Logger.logstate): added. A corresponding
3812 @logstate magic was created.
3821 @logstate magic was created.
3813
3822
3814 * IPython/Magic.py: fixed nested scoping problem under Python
3823 * IPython/Magic.py: fixed nested scoping problem under Python
3815 2.1.x (automagic wasn't working).
3824 2.1.x (automagic wasn't working).
3816
3825
3817 2002-02-20 Fernando Perez <fperez@colorado.edu>
3826 2002-02-20 Fernando Perez <fperez@colorado.edu>
3818
3827
3819 * Released 0.2.6.
3828 * Released 0.2.6.
3820
3829
3821 * IPython/OutputTrap.py (OutputTrap.__init__): added a 'quiet'
3830 * IPython/OutputTrap.py (OutputTrap.__init__): added a 'quiet'
3822 option so that logs can come out without any headers at all.
3831 option so that logs can come out without any headers at all.
3823
3832
3824 * IPython/UserConfig/ipythonrc-scipy.py: created a profile for
3833 * IPython/UserConfig/ipythonrc-scipy.py: created a profile for
3825 SciPy.
3834 SciPy.
3826
3835
3827 * IPython/iplib.py (InteractiveShell.embed_mainloop): Changed so
3836 * IPython/iplib.py (InteractiveShell.embed_mainloop): Changed so
3828 that embedded IPython calls don't require vars() to be explicitly
3837 that embedded IPython calls don't require vars() to be explicitly
3829 passed. Now they are extracted from the caller's frame (code
3838 passed. Now they are extracted from the caller's frame (code
3830 snatched from Eric Jones' weave). Added better documentation to
3839 snatched from Eric Jones' weave). Added better documentation to
3831 the section on embedding and the example file.
3840 the section on embedding and the example file.
3832
3841
3833 * IPython/genutils.py (page): Changed so that under emacs, it just
3842 * IPython/genutils.py (page): Changed so that under emacs, it just
3834 prints the string. You can then page up and down in the emacs
3843 prints the string. You can then page up and down in the emacs
3835 buffer itself. This is how the builtin help() works.
3844 buffer itself. This is how the builtin help() works.
3836
3845
3837 * IPython/Prompts.py (CachedOutput.__call__): Fixed issue with
3846 * IPython/Prompts.py (CachedOutput.__call__): Fixed issue with
3838 macro scoping: macros need to be executed in the user's namespace
3847 macro scoping: macros need to be executed in the user's namespace
3839 to work as if they had been typed by the user.
3848 to work as if they had been typed by the user.
3840
3849
3841 * IPython/Magic.py (Magic.magic_macro): Changed macros so they
3850 * IPython/Magic.py (Magic.magic_macro): Changed macros so they
3842 execute automatically (no need to type 'exec...'). They then
3851 execute automatically (no need to type 'exec...'). They then
3843 behave like 'true macros'. The printing system was also modified
3852 behave like 'true macros'. The printing system was also modified
3844 for this to work.
3853 for this to work.
3845
3854
3846 2002-02-19 Fernando Perez <fperez@colorado.edu>
3855 2002-02-19 Fernando Perez <fperez@colorado.edu>
3847
3856
3848 * IPython/genutils.py (page_file): new function for paging files
3857 * IPython/genutils.py (page_file): new function for paging files
3849 in an OS-independent way. Also necessary for file viewing to work
3858 in an OS-independent way. Also necessary for file viewing to work
3850 well inside Emacs buffers.
3859 well inside Emacs buffers.
3851 (page): Added checks for being in an emacs buffer.
3860 (page): Added checks for being in an emacs buffer.
3852 (page): fixed bug for Windows ($TERM isn't set in Windows). Fixed
3861 (page): fixed bug for Windows ($TERM isn't set in Windows). Fixed
3853 same bug in iplib.
3862 same bug in iplib.
3854
3863
3855 2002-02-18 Fernando Perez <fperez@colorado.edu>
3864 2002-02-18 Fernando Perez <fperez@colorado.edu>
3856
3865
3857 * IPython/iplib.py (InteractiveShell.init_readline): modified use
3866 * IPython/iplib.py (InteractiveShell.init_readline): modified use
3858 of readline so that IPython can work inside an Emacs buffer.
3867 of readline so that IPython can work inside an Emacs buffer.
3859
3868
3860 * IPython/ultraTB.py (AutoFormattedTB.__call__): some fixes to
3869 * IPython/ultraTB.py (AutoFormattedTB.__call__): some fixes to
3861 method signatures (they weren't really bugs, but it looks cleaner
3870 method signatures (they weren't really bugs, but it looks cleaner
3862 and keeps PyChecker happy).
3871 and keeps PyChecker happy).
3863
3872
3864 * IPython/ipmaker.py (make_IPython): added hooks Struct to __IP
3873 * IPython/ipmaker.py (make_IPython): added hooks Struct to __IP
3865 for implementing various user-defined hooks. Currently only
3874 for implementing various user-defined hooks. Currently only
3866 display is done.
3875 display is done.
3867
3876
3868 * IPython/Prompts.py (CachedOutput._display): changed display
3877 * IPython/Prompts.py (CachedOutput._display): changed display
3869 functions so that they can be dynamically changed by users easily.
3878 functions so that they can be dynamically changed by users easily.
3870
3879
3871 * IPython/Extensions/numeric_formats.py (num_display): added an
3880 * IPython/Extensions/numeric_formats.py (num_display): added an
3872 extension for printing NumPy arrays in flexible manners. It
3881 extension for printing NumPy arrays in flexible manners. It
3873 doesn't do anything yet, but all the structure is in
3882 doesn't do anything yet, but all the structure is in
3874 place. Ultimately the plan is to implement output format control
3883 place. Ultimately the plan is to implement output format control
3875 like in Octave.
3884 like in Octave.
3876
3885
3877 * IPython/Magic.py (Magic.lsmagic): changed so that bound magic
3886 * IPython/Magic.py (Magic.lsmagic): changed so that bound magic
3878 methods are found at run-time by all the automatic machinery.
3887 methods are found at run-time by all the automatic machinery.
3879
3888
3880 2002-02-17 Fernando Perez <fperez@colorado.edu>
3889 2002-02-17 Fernando Perez <fperez@colorado.edu>
3881
3890
3882 * setup_Windows.py (make_shortcut): documented. Cleaned up the
3891 * setup_Windows.py (make_shortcut): documented. Cleaned up the
3883 whole file a little.
3892 whole file a little.
3884
3893
3885 * ToDo: closed this document. Now there's a new_design.lyx
3894 * ToDo: closed this document. Now there's a new_design.lyx
3886 document for all new ideas. Added making a pdf of it for the
3895 document for all new ideas. Added making a pdf of it for the
3887 end-user distro.
3896 end-user distro.
3888
3897
3889 * IPython/Logger.py (Logger.switch_log): Created this to replace
3898 * IPython/Logger.py (Logger.switch_log): Created this to replace
3890 logon() and logoff(). It also fixes a nasty crash reported by
3899 logon() and logoff(). It also fixes a nasty crash reported by
3891 Philip Hisley <compsys-AT-starpower.net>. Many thanks to him.
3900 Philip Hisley <compsys-AT-starpower.net>. Many thanks to him.
3892
3901
3893 * IPython/iplib.py (complete): got auto-completion to work with
3902 * IPython/iplib.py (complete): got auto-completion to work with
3894 automagic (I had wanted this for a long time).
3903 automagic (I had wanted this for a long time).
3895
3904
3896 * IPython/Magic.py (Magic.magic_files): Added @files as an alias
3905 * IPython/Magic.py (Magic.magic_files): Added @files as an alias
3897 to @file, since file() is now a builtin and clashes with automagic
3906 to @file, since file() is now a builtin and clashes with automagic
3898 for @file.
3907 for @file.
3899
3908
3900 * Made some new files: Prompts, CrashHandler, Magic, Logger. All
3909 * Made some new files: Prompts, CrashHandler, Magic, Logger. All
3901 of this was previously in iplib, which had grown to more than 2000
3910 of this was previously in iplib, which had grown to more than 2000
3902 lines, way too long. No new functionality, but it makes managing
3911 lines, way too long. No new functionality, but it makes managing
3903 the code a bit easier.
3912 the code a bit easier.
3904
3913
3905 * IPython/iplib.py (IPythonCrashHandler.__call__): Added version
3914 * IPython/iplib.py (IPythonCrashHandler.__call__): Added version
3906 information to crash reports.
3915 information to crash reports.
3907
3916
3908 2002-02-12 Fernando Perez <fperez@colorado.edu>
3917 2002-02-12 Fernando Perez <fperez@colorado.edu>
3909
3918
3910 * Released 0.2.5.
3919 * Released 0.2.5.
3911
3920
3912 2002-02-11 Fernando Perez <fperez@colorado.edu>
3921 2002-02-11 Fernando Perez <fperez@colorado.edu>
3913
3922
3914 * Wrote a relatively complete Windows installer. It puts
3923 * Wrote a relatively complete Windows installer. It puts
3915 everything in place, creates Start Menu entries and fixes the
3924 everything in place, creates Start Menu entries and fixes the
3916 color issues. Nothing fancy, but it works.
3925 color issues. Nothing fancy, but it works.
3917
3926
3918 2002-02-10 Fernando Perez <fperez@colorado.edu>
3927 2002-02-10 Fernando Perez <fperez@colorado.edu>
3919
3928
3920 * IPython/iplib.py (InteractiveShell.safe_execfile): added an
3929 * IPython/iplib.py (InteractiveShell.safe_execfile): added an
3921 os.path.expanduser() call so that we can type @run ~/myfile.py and
3930 os.path.expanduser() call so that we can type @run ~/myfile.py and
3922 have thigs work as expected.
3931 have thigs work as expected.
3923
3932
3924 * IPython/genutils.py (page): fixed exception handling so things
3933 * IPython/genutils.py (page): fixed exception handling so things
3925 work both in Unix and Windows correctly. Quitting a pager triggers
3934 work both in Unix and Windows correctly. Quitting a pager triggers
3926 an IOError/broken pipe in Unix, and in windows not finding a pager
3935 an IOError/broken pipe in Unix, and in windows not finding a pager
3927 is also an IOError, so I had to actually look at the return value
3936 is also an IOError, so I had to actually look at the return value
3928 of the exception, not just the exception itself. Should be ok now.
3937 of the exception, not just the exception itself. Should be ok now.
3929
3938
3930 * IPython/ultraTB.py (ColorSchemeTable.set_active_scheme):
3939 * IPython/ultraTB.py (ColorSchemeTable.set_active_scheme):
3931 modified to allow case-insensitive color scheme changes.
3940 modified to allow case-insensitive color scheme changes.
3932
3941
3933 2002-02-09 Fernando Perez <fperez@colorado.edu>
3942 2002-02-09 Fernando Perez <fperez@colorado.edu>
3934
3943
3935 * IPython/genutils.py (native_line_ends): new function to leave
3944 * IPython/genutils.py (native_line_ends): new function to leave
3936 user config files with os-native line-endings.
3945 user config files with os-native line-endings.
3937
3946
3938 * README and manual updates.
3947 * README and manual updates.
3939
3948
3940 * IPython/genutils.py: fixed unicode bug: use types.StringTypes
3949 * IPython/genutils.py: fixed unicode bug: use types.StringTypes
3941 instead of StringType to catch Unicode strings.
3950 instead of StringType to catch Unicode strings.
3942
3951
3943 * IPython/genutils.py (filefind): fixed bug for paths with
3952 * IPython/genutils.py (filefind): fixed bug for paths with
3944 embedded spaces (very common in Windows).
3953 embedded spaces (very common in Windows).
3945
3954
3946 * IPython/ipmaker.py (make_IPython): added a '.ini' to the rc
3955 * IPython/ipmaker.py (make_IPython): added a '.ini' to the rc
3947 files under Windows, so that they get automatically associated
3956 files under Windows, so that they get automatically associated
3948 with a text editor. Windows makes it a pain to handle
3957 with a text editor. Windows makes it a pain to handle
3949 extension-less files.
3958 extension-less files.
3950
3959
3951 * IPython/iplib.py (InteractiveShell.init_readline): Made the
3960 * IPython/iplib.py (InteractiveShell.init_readline): Made the
3952 warning about readline only occur for Posix. In Windows there's no
3961 warning about readline only occur for Posix. In Windows there's no
3953 way to get readline, so why bother with the warning.
3962 way to get readline, so why bother with the warning.
3954
3963
3955 * IPython/Struct.py (Struct.__str__): fixed to use self.__dict__
3964 * IPython/Struct.py (Struct.__str__): fixed to use self.__dict__
3956 for __str__ instead of dir(self), since dir() changed in 2.2.
3965 for __str__ instead of dir(self), since dir() changed in 2.2.
3957
3966
3958 * Ported to Windows! Tested on XP, I suspect it should work fine
3967 * Ported to Windows! Tested on XP, I suspect it should work fine
3959 on NT/2000, but I don't think it will work on 98 et al. That
3968 on NT/2000, but I don't think it will work on 98 et al. That
3960 series of Windows is such a piece of junk anyway that I won't try
3969 series of Windows is such a piece of junk anyway that I won't try
3961 porting it there. The XP port was straightforward, showed a few
3970 porting it there. The XP port was straightforward, showed a few
3962 bugs here and there (fixed all), in particular some string
3971 bugs here and there (fixed all), in particular some string
3963 handling stuff which required considering Unicode strings (which
3972 handling stuff which required considering Unicode strings (which
3964 Windows uses). This is good, but hasn't been too tested :) No
3973 Windows uses). This is good, but hasn't been too tested :) No
3965 fancy installer yet, I'll put a note in the manual so people at
3974 fancy installer yet, I'll put a note in the manual so people at
3966 least make manually a shortcut.
3975 least make manually a shortcut.
3967
3976
3968 * IPython/iplib.py (Magic.magic_colors): Unified the color options
3977 * IPython/iplib.py (Magic.magic_colors): Unified the color options
3969 into a single one, "colors". This now controls both prompt and
3978 into a single one, "colors". This now controls both prompt and
3970 exception color schemes, and can be changed both at startup
3979 exception color schemes, and can be changed both at startup
3971 (either via command-line switches or via ipythonrc files) and at
3980 (either via command-line switches or via ipythonrc files) and at
3972 runtime, with @colors.
3981 runtime, with @colors.
3973 (Magic.magic_run): renamed @prun to @run and removed the old
3982 (Magic.magic_run): renamed @prun to @run and removed the old
3974 @run. The two were too similar to warrant keeping both.
3983 @run. The two were too similar to warrant keeping both.
3975
3984
3976 2002-02-03 Fernando Perez <fperez@colorado.edu>
3985 2002-02-03 Fernando Perez <fperez@colorado.edu>
3977
3986
3978 * IPython/iplib.py (install_first_time): Added comment on how to
3987 * IPython/iplib.py (install_first_time): Added comment on how to
3979 configure the color options for first-time users. Put a <return>
3988 configure the color options for first-time users. Put a <return>
3980 request at the end so that small-terminal users get a chance to
3989 request at the end so that small-terminal users get a chance to
3981 read the startup info.
3990 read the startup info.
3982
3991
3983 2002-01-23 Fernando Perez <fperez@colorado.edu>
3992 2002-01-23 Fernando Perez <fperez@colorado.edu>
3984
3993
3985 * IPython/iplib.py (CachedOutput.update): Changed output memory
3994 * IPython/iplib.py (CachedOutput.update): Changed output memory
3986 variable names from _o,_oo,_ooo,_o<n> to simply _,__,___,_<n>. For
3995 variable names from _o,_oo,_ooo,_o<n> to simply _,__,___,_<n>. For
3987 input history we still use _i. Did this b/c these variable are
3996 input history we still use _i. Did this b/c these variable are
3988 very commonly used in interactive work, so the less we need to
3997 very commonly used in interactive work, so the less we need to
3989 type the better off we are.
3998 type the better off we are.
3990 (Magic.magic_prun): updated @prun to better handle the namespaces
3999 (Magic.magic_prun): updated @prun to better handle the namespaces
3991 the file will run in, including a fix for __name__ not being set
4000 the file will run in, including a fix for __name__ not being set
3992 before.
4001 before.
3993
4002
3994 2002-01-20 Fernando Perez <fperez@colorado.edu>
4003 2002-01-20 Fernando Perez <fperez@colorado.edu>
3995
4004
3996 * IPython/ultraTB.py (VerboseTB.linereader): Fixed printing of
4005 * IPython/ultraTB.py (VerboseTB.linereader): Fixed printing of
3997 extra garbage for Python 2.2. Need to look more carefully into
4006 extra garbage for Python 2.2. Need to look more carefully into
3998 this later.
4007 this later.
3999
4008
4000 2002-01-19 Fernando Perez <fperez@colorado.edu>
4009 2002-01-19 Fernando Perez <fperez@colorado.edu>
4001
4010
4002 * IPython/iplib.py (InteractiveShell.showtraceback): fixed to
4011 * IPython/iplib.py (InteractiveShell.showtraceback): fixed to
4003 display SyntaxError exceptions properly formatted when they occur
4012 display SyntaxError exceptions properly formatted when they occur
4004 (they can be triggered by imported code).
4013 (they can be triggered by imported code).
4005
4014
4006 2002-01-18 Fernando Perez <fperez@colorado.edu>
4015 2002-01-18 Fernando Perez <fperez@colorado.edu>
4007
4016
4008 * IPython/iplib.py (InteractiveShell.safe_execfile): now
4017 * IPython/iplib.py (InteractiveShell.safe_execfile): now
4009 SyntaxError exceptions are reported nicely formatted, instead of
4018 SyntaxError exceptions are reported nicely formatted, instead of
4010 spitting out only offset information as before.
4019 spitting out only offset information as before.
4011 (Magic.magic_prun): Added the @prun function for executing
4020 (Magic.magic_prun): Added the @prun function for executing
4012 programs with command line args inside IPython.
4021 programs with command line args inside IPython.
4013
4022
4014 2002-01-16 Fernando Perez <fperez@colorado.edu>
4023 2002-01-16 Fernando Perez <fperez@colorado.edu>
4015
4024
4016 * IPython/iplib.py (Magic.magic_hist): Changed @hist and @dhist
4025 * IPython/iplib.py (Magic.magic_hist): Changed @hist and @dhist
4017 to *not* include the last item given in a range. This brings their
4026 to *not* include the last item given in a range. This brings their
4018 behavior in line with Python's slicing:
4027 behavior in line with Python's slicing:
4019 a[n1:n2] -> a[n1]...a[n2-1]
4028 a[n1:n2] -> a[n1]...a[n2-1]
4020 It may be a bit less convenient, but I prefer to stick to Python's
4029 It may be a bit less convenient, but I prefer to stick to Python's
4021 conventions *everywhere*, so users never have to wonder.
4030 conventions *everywhere*, so users never have to wonder.
4022 (Magic.magic_macro): Added @macro function to ease the creation of
4031 (Magic.magic_macro): Added @macro function to ease the creation of
4023 macros.
4032 macros.
4024
4033
4025 2002-01-05 Fernando Perez <fperez@colorado.edu>
4034 2002-01-05 Fernando Perez <fperez@colorado.edu>
4026
4035
4027 * Released 0.2.4.
4036 * Released 0.2.4.
4028
4037
4029 * IPython/iplib.py (Magic.magic_pdef):
4038 * IPython/iplib.py (Magic.magic_pdef):
4030 (InteractiveShell.safe_execfile): report magic lines and error
4039 (InteractiveShell.safe_execfile): report magic lines and error
4031 lines without line numbers so one can easily copy/paste them for
4040 lines without line numbers so one can easily copy/paste them for
4032 re-execution.
4041 re-execution.
4033
4042
4034 * Updated manual with recent changes.
4043 * Updated manual with recent changes.
4035
4044
4036 * IPython/iplib.py (Magic.magic_oinfo): added constructor
4045 * IPython/iplib.py (Magic.magic_oinfo): added constructor
4037 docstring printing when class? is called. Very handy for knowing
4046 docstring printing when class? is called. Very handy for knowing
4038 how to create class instances (as long as __init__ is well
4047 how to create class instances (as long as __init__ is well
4039 documented, of course :)
4048 documented, of course :)
4040 (Magic.magic_doc): print both class and constructor docstrings.
4049 (Magic.magic_doc): print both class and constructor docstrings.
4041 (Magic.magic_pdef): give constructor info if passed a class and
4050 (Magic.magic_pdef): give constructor info if passed a class and
4042 __call__ info for callable object instances.
4051 __call__ info for callable object instances.
4043
4052
4044 2002-01-04 Fernando Perez <fperez@colorado.edu>
4053 2002-01-04 Fernando Perez <fperez@colorado.edu>
4045
4054
4046 * Made deep_reload() off by default. It doesn't always work
4055 * Made deep_reload() off by default. It doesn't always work
4047 exactly as intended, so it's probably safer to have it off. It's
4056 exactly as intended, so it's probably safer to have it off. It's
4048 still available as dreload() anyway, so nothing is lost.
4057 still available as dreload() anyway, so nothing is lost.
4049
4058
4050 2002-01-02 Fernando Perez <fperez@colorado.edu>
4059 2002-01-02 Fernando Perez <fperez@colorado.edu>
4051
4060
4052 * Released 0.2.3 (contacted R.Singh at CU about biopython course,
4061 * Released 0.2.3 (contacted R.Singh at CU about biopython course,
4053 so I wanted an updated release).
4062 so I wanted an updated release).
4054
4063
4055 2001-12-27 Fernando Perez <fperez@colorado.edu>
4064 2001-12-27 Fernando Perez <fperez@colorado.edu>
4056
4065
4057 * IPython/iplib.py (InteractiveShell.interact): Added the original
4066 * IPython/iplib.py (InteractiveShell.interact): Added the original
4058 code from 'code.py' for this module in order to change the
4067 code from 'code.py' for this module in order to change the
4059 handling of a KeyboardInterrupt. This was necessary b/c otherwise
4068 handling of a KeyboardInterrupt. This was necessary b/c otherwise
4060 the history cache would break when the user hit Ctrl-C, and
4069 the history cache would break when the user hit Ctrl-C, and
4061 interact() offers no way to add any hooks to it.
4070 interact() offers no way to add any hooks to it.
4062
4071
4063 2001-12-23 Fernando Perez <fperez@colorado.edu>
4072 2001-12-23 Fernando Perez <fperez@colorado.edu>
4064
4073
4065 * setup.py: added check for 'MANIFEST' before trying to remove
4074 * setup.py: added check for 'MANIFEST' before trying to remove
4066 it. Thanks to Sean Reifschneider.
4075 it. Thanks to Sean Reifschneider.
4067
4076
4068 2001-12-22 Fernando Perez <fperez@colorado.edu>
4077 2001-12-22 Fernando Perez <fperez@colorado.edu>
4069
4078
4070 * Released 0.2.2.
4079 * Released 0.2.2.
4071
4080
4072 * Finished (reasonably) writing the manual. Later will add the
4081 * Finished (reasonably) writing the manual. Later will add the
4073 python-standard navigation stylesheets, but for the time being
4082 python-standard navigation stylesheets, but for the time being
4074 it's fairly complete. Distribution will include html and pdf
4083 it's fairly complete. Distribution will include html and pdf
4075 versions.
4084 versions.
4076
4085
4077 * Bugfix: '.' wasn't being added to sys.path. Thanks to Prabhu
4086 * Bugfix: '.' wasn't being added to sys.path. Thanks to Prabhu
4078 (MayaVi author).
4087 (MayaVi author).
4079
4088
4080 2001-12-21 Fernando Perez <fperez@colorado.edu>
4089 2001-12-21 Fernando Perez <fperez@colorado.edu>
4081
4090
4082 * Released 0.2.1. Barring any nasty bugs, this is it as far as a
4091 * Released 0.2.1. Barring any nasty bugs, this is it as far as a
4083 good public release, I think (with the manual and the distutils
4092 good public release, I think (with the manual and the distutils
4084 installer). The manual can use some work, but that can go
4093 installer). The manual can use some work, but that can go
4085 slowly. Otherwise I think it's quite nice for end users. Next
4094 slowly. Otherwise I think it's quite nice for end users. Next
4086 summer, rewrite the guts of it...
4095 summer, rewrite the guts of it...
4087
4096
4088 * Changed format of ipythonrc files to use whitespace as the
4097 * Changed format of ipythonrc files to use whitespace as the
4089 separator instead of an explicit '='. Cleaner.
4098 separator instead of an explicit '='. Cleaner.
4090
4099
4091 2001-12-20 Fernando Perez <fperez@colorado.edu>
4100 2001-12-20 Fernando Perez <fperez@colorado.edu>
4092
4101
4093 * Started a manual in LyX. For now it's just a quick merge of the
4102 * Started a manual in LyX. For now it's just a quick merge of the
4094 various internal docstrings and READMEs. Later it may grow into a
4103 various internal docstrings and READMEs. Later it may grow into a
4095 nice, full-blown manual.
4104 nice, full-blown manual.
4096
4105
4097 * Set up a distutils based installer. Installation should now be
4106 * Set up a distutils based installer. Installation should now be
4098 trivially simple for end-users.
4107 trivially simple for end-users.
4099
4108
4100 2001-12-11 Fernando Perez <fperez@colorado.edu>
4109 2001-12-11 Fernando Perez <fperez@colorado.edu>
4101
4110
4102 * Released 0.2.0. First public release, announced it at
4111 * Released 0.2.0. First public release, announced it at
4103 comp.lang.python. From now on, just bugfixes...
4112 comp.lang.python. From now on, just bugfixes...
4104
4113
4105 * Went through all the files, set copyright/license notices and
4114 * Went through all the files, set copyright/license notices and
4106 cleaned up things. Ready for release.
4115 cleaned up things. Ready for release.
4107
4116
4108 2001-12-10 Fernando Perez <fperez@colorado.edu>
4117 2001-12-10 Fernando Perez <fperez@colorado.edu>
4109
4118
4110 * Changed the first-time installer not to use tarfiles. It's more
4119 * Changed the first-time installer not to use tarfiles. It's more
4111 robust now and less unix-dependent. Also makes it easier for
4120 robust now and less unix-dependent. Also makes it easier for
4112 people to later upgrade versions.
4121 people to later upgrade versions.
4113
4122
4114 * Changed @exit to @abort to reflect the fact that it's pretty
4123 * Changed @exit to @abort to reflect the fact that it's pretty
4115 brutal (a sys.exit()). The difference between @abort and Ctrl-D
4124 brutal (a sys.exit()). The difference between @abort and Ctrl-D
4116 becomes significant only when IPyhton is embedded: in that case,
4125 becomes significant only when IPyhton is embedded: in that case,
4117 C-D closes IPython only, but @abort kills the enclosing program
4126 C-D closes IPython only, but @abort kills the enclosing program
4118 too (unless it had called IPython inside a try catching
4127 too (unless it had called IPython inside a try catching
4119 SystemExit).
4128 SystemExit).
4120
4129
4121 * Created Shell module which exposes the actuall IPython Shell
4130 * Created Shell module which exposes the actuall IPython Shell
4122 classes, currently the normal and the embeddable one. This at
4131 classes, currently the normal and the embeddable one. This at
4123 least offers a stable interface we won't need to change when
4132 least offers a stable interface we won't need to change when
4124 (later) the internals are rewritten. That rewrite will be confined
4133 (later) the internals are rewritten. That rewrite will be confined
4125 to iplib and ipmaker, but the Shell interface should remain as is.
4134 to iplib and ipmaker, but the Shell interface should remain as is.
4126
4135
4127 * Added embed module which offers an embeddable IPShell object,
4136 * Added embed module which offers an embeddable IPShell object,
4128 useful to fire up IPython *inside* a running program. Great for
4137 useful to fire up IPython *inside* a running program. Great for
4129 debugging or dynamical data analysis.
4138 debugging or dynamical data analysis.
4130
4139
4131 2001-12-08 Fernando Perez <fperez@colorado.edu>
4140 2001-12-08 Fernando Perez <fperez@colorado.edu>
4132
4141
4133 * Fixed small bug preventing seeing info from methods of defined
4142 * Fixed small bug preventing seeing info from methods of defined
4134 objects (incorrect namespace in _ofind()).
4143 objects (incorrect namespace in _ofind()).
4135
4144
4136 * Documentation cleanup. Moved the main usage docstrings to a
4145 * Documentation cleanup. Moved the main usage docstrings to a
4137 separate file, usage.py (cleaner to maintain, and hopefully in the
4146 separate file, usage.py (cleaner to maintain, and hopefully in the
4138 future some perlpod-like way of producing interactive, man and
4147 future some perlpod-like way of producing interactive, man and
4139 html docs out of it will be found).
4148 html docs out of it will be found).
4140
4149
4141 * Added @profile to see your profile at any time.
4150 * Added @profile to see your profile at any time.
4142
4151
4143 * Added @p as an alias for 'print'. It's especially convenient if
4152 * Added @p as an alias for 'print'. It's especially convenient if
4144 using automagic ('p x' prints x).
4153 using automagic ('p x' prints x).
4145
4154
4146 * Small cleanups and fixes after a pychecker run.
4155 * Small cleanups and fixes after a pychecker run.
4147
4156
4148 * Changed the @cd command to handle @cd - and @cd -<n> for
4157 * Changed the @cd command to handle @cd - and @cd -<n> for
4149 visiting any directory in _dh.
4158 visiting any directory in _dh.
4150
4159
4151 * Introduced _dh, a history of visited directories. @dhist prints
4160 * Introduced _dh, a history of visited directories. @dhist prints
4152 it out with numbers.
4161 it out with numbers.
4153
4162
4154 2001-12-07 Fernando Perez <fperez@colorado.edu>
4163 2001-12-07 Fernando Perez <fperez@colorado.edu>
4155
4164
4156 * Released 0.1.22
4165 * Released 0.1.22
4157
4166
4158 * Made initialization a bit more robust against invalid color
4167 * Made initialization a bit more robust against invalid color
4159 options in user input (exit, not traceback-crash).
4168 options in user input (exit, not traceback-crash).
4160
4169
4161 * Changed the bug crash reporter to write the report only in the
4170 * Changed the bug crash reporter to write the report only in the
4162 user's .ipython directory. That way IPython won't litter people's
4171 user's .ipython directory. That way IPython won't litter people's
4163 hard disks with crash files all over the place. Also print on
4172 hard disks with crash files all over the place. Also print on
4164 screen the necessary mail command.
4173 screen the necessary mail command.
4165
4174
4166 * With the new ultraTB, implemented LightBG color scheme for light
4175 * With the new ultraTB, implemented LightBG color scheme for light
4167 background terminals. A lot of people like white backgrounds, so I
4176 background terminals. A lot of people like white backgrounds, so I
4168 guess we should at least give them something readable.
4177 guess we should at least give them something readable.
4169
4178
4170 2001-12-06 Fernando Perez <fperez@colorado.edu>
4179 2001-12-06 Fernando Perez <fperez@colorado.edu>
4171
4180
4172 * Modified the structure of ultraTB. Now there's a proper class
4181 * Modified the structure of ultraTB. Now there's a proper class
4173 for tables of color schemes which allow adding schemes easily and
4182 for tables of color schemes which allow adding schemes easily and
4174 switching the active scheme without creating a new instance every
4183 switching the active scheme without creating a new instance every
4175 time (which was ridiculous). The syntax for creating new schemes
4184 time (which was ridiculous). The syntax for creating new schemes
4176 is also cleaner. I think ultraTB is finally done, with a clean
4185 is also cleaner. I think ultraTB is finally done, with a clean
4177 class structure. Names are also much cleaner (now there's proper
4186 class structure. Names are also much cleaner (now there's proper
4178 color tables, no need for every variable to also have 'color' in
4187 color tables, no need for every variable to also have 'color' in
4179 its name).
4188 its name).
4180
4189
4181 * Broke down genutils into separate files. Now genutils only
4190 * Broke down genutils into separate files. Now genutils only
4182 contains utility functions, and classes have been moved to their
4191 contains utility functions, and classes have been moved to their
4183 own files (they had enough independent functionality to warrant
4192 own files (they had enough independent functionality to warrant
4184 it): ConfigLoader, OutputTrap, Struct.
4193 it): ConfigLoader, OutputTrap, Struct.
4185
4194
4186 2001-12-05 Fernando Perez <fperez@colorado.edu>
4195 2001-12-05 Fernando Perez <fperez@colorado.edu>
4187
4196
4188 * IPython turns 21! Released version 0.1.21, as a candidate for
4197 * IPython turns 21! Released version 0.1.21, as a candidate for
4189 public consumption. If all goes well, release in a few days.
4198 public consumption. If all goes well, release in a few days.
4190
4199
4191 * Fixed path bug (files in Extensions/ directory wouldn't be found
4200 * Fixed path bug (files in Extensions/ directory wouldn't be found
4192 unless IPython/ was explicitly in sys.path).
4201 unless IPython/ was explicitly in sys.path).
4193
4202
4194 * Extended the FlexCompleter class as MagicCompleter to allow
4203 * Extended the FlexCompleter class as MagicCompleter to allow
4195 completion of @-starting lines.
4204 completion of @-starting lines.
4196
4205
4197 * Created __release__.py file as a central repository for release
4206 * Created __release__.py file as a central repository for release
4198 info that other files can read from.
4207 info that other files can read from.
4199
4208
4200 * Fixed small bug in logging: when logging was turned on in
4209 * Fixed small bug in logging: when logging was turned on in
4201 mid-session, old lines with special meanings (!@?) were being
4210 mid-session, old lines with special meanings (!@?) were being
4202 logged without the prepended comment, which is necessary since
4211 logged without the prepended comment, which is necessary since
4203 they are not truly valid python syntax. This should make session
4212 they are not truly valid python syntax. This should make session
4204 restores produce less errors.
4213 restores produce less errors.
4205
4214
4206 * The namespace cleanup forced me to make a FlexCompleter class
4215 * The namespace cleanup forced me to make a FlexCompleter class
4207 which is nothing but a ripoff of rlcompleter, but with selectable
4216 which is nothing but a ripoff of rlcompleter, but with selectable
4208 namespace (rlcompleter only works in __main__.__dict__). I'll try
4217 namespace (rlcompleter only works in __main__.__dict__). I'll try
4209 to submit a note to the authors to see if this change can be
4218 to submit a note to the authors to see if this change can be
4210 incorporated in future rlcompleter releases (Dec.6: done)
4219 incorporated in future rlcompleter releases (Dec.6: done)
4211
4220
4212 * More fixes to namespace handling. It was a mess! Now all
4221 * More fixes to namespace handling. It was a mess! Now all
4213 explicit references to __main__.__dict__ are gone (except when
4222 explicit references to __main__.__dict__ are gone (except when
4214 really needed) and everything is handled through the namespace
4223 really needed) and everything is handled through the namespace
4215 dicts in the IPython instance. We seem to be getting somewhere
4224 dicts in the IPython instance. We seem to be getting somewhere
4216 with this, finally...
4225 with this, finally...
4217
4226
4218 * Small documentation updates.
4227 * Small documentation updates.
4219
4228
4220 * Created the Extensions directory under IPython (with an
4229 * Created the Extensions directory under IPython (with an
4221 __init__.py). Put the PhysicalQ stuff there. This directory should
4230 __init__.py). Put the PhysicalQ stuff there. This directory should
4222 be used for all special-purpose extensions.
4231 be used for all special-purpose extensions.
4223
4232
4224 * File renaming:
4233 * File renaming:
4225 ipythonlib --> ipmaker
4234 ipythonlib --> ipmaker
4226 ipplib --> iplib
4235 ipplib --> iplib
4227 This makes a bit more sense in terms of what these files actually do.
4236 This makes a bit more sense in terms of what these files actually do.
4228
4237
4229 * Moved all the classes and functions in ipythonlib to ipplib, so
4238 * Moved all the classes and functions in ipythonlib to ipplib, so
4230 now ipythonlib only has make_IPython(). This will ease up its
4239 now ipythonlib only has make_IPython(). This will ease up its
4231 splitting in smaller functional chunks later.
4240 splitting in smaller functional chunks later.
4232
4241
4233 * Cleaned up (done, I think) output of @whos. Better column
4242 * Cleaned up (done, I think) output of @whos. Better column
4234 formatting, and now shows str(var) for as much as it can, which is
4243 formatting, and now shows str(var) for as much as it can, which is
4235 typically what one gets with a 'print var'.
4244 typically what one gets with a 'print var'.
4236
4245
4237 2001-12-04 Fernando Perez <fperez@colorado.edu>
4246 2001-12-04 Fernando Perez <fperez@colorado.edu>
4238
4247
4239 * Fixed namespace problems. Now builtin/IPyhton/user names get
4248 * Fixed namespace problems. Now builtin/IPyhton/user names get
4240 properly reported in their namespace. Internal namespace handling
4249 properly reported in their namespace. Internal namespace handling
4241 is finally getting decent (not perfect yet, but much better than
4250 is finally getting decent (not perfect yet, but much better than
4242 the ad-hoc mess we had).
4251 the ad-hoc mess we had).
4243
4252
4244 * Removed -exit option. If people just want to run a python
4253 * Removed -exit option. If people just want to run a python
4245 script, that's what the normal interpreter is for. Less
4254 script, that's what the normal interpreter is for. Less
4246 unnecessary options, less chances for bugs.
4255 unnecessary options, less chances for bugs.
4247
4256
4248 * Added a crash handler which generates a complete post-mortem if
4257 * Added a crash handler which generates a complete post-mortem if
4249 IPython crashes. This will help a lot in tracking bugs down the
4258 IPython crashes. This will help a lot in tracking bugs down the
4250 road.
4259 road.
4251
4260
4252 * Fixed nasty bug in auto-evaluation part of prefilter(). Names
4261 * Fixed nasty bug in auto-evaluation part of prefilter(). Names
4253 which were boud to functions being reassigned would bypass the
4262 which were boud to functions being reassigned would bypass the
4254 logger, breaking the sync of _il with the prompt counter. This
4263 logger, breaking the sync of _il with the prompt counter. This
4255 would then crash IPython later when a new line was logged.
4264 would then crash IPython later when a new line was logged.
4256
4265
4257 2001-12-02 Fernando Perez <fperez@colorado.edu>
4266 2001-12-02 Fernando Perez <fperez@colorado.edu>
4258
4267
4259 * Made IPython a package. This means people don't have to clutter
4268 * Made IPython a package. This means people don't have to clutter
4260 their sys.path with yet another directory. Changed the INSTALL
4269 their sys.path with yet another directory. Changed the INSTALL
4261 file accordingly.
4270 file accordingly.
4262
4271
4263 * Cleaned up the output of @who_ls, @who and @whos. @who_ls now
4272 * Cleaned up the output of @who_ls, @who and @whos. @who_ls now
4264 sorts its output (so @who shows it sorted) and @whos formats the
4273 sorts its output (so @who shows it sorted) and @whos formats the
4265 table according to the width of the first column. Nicer, easier to
4274 table according to the width of the first column. Nicer, easier to
4266 read. Todo: write a generic table_format() which takes a list of
4275 read. Todo: write a generic table_format() which takes a list of
4267 lists and prints it nicely formatted, with optional row/column
4276 lists and prints it nicely formatted, with optional row/column
4268 separators and proper padding and justification.
4277 separators and proper padding and justification.
4269
4278
4270 * Released 0.1.20
4279 * Released 0.1.20
4271
4280
4272 * Fixed bug in @log which would reverse the inputcache list (a
4281 * Fixed bug in @log which would reverse the inputcache list (a
4273 copy operation was missing).
4282 copy operation was missing).
4274
4283
4275 * Code cleanup. @config was changed to use page(). Better, since
4284 * Code cleanup. @config was changed to use page(). Better, since
4276 its output is always quite long.
4285 its output is always quite long.
4277
4286
4278 * Itpl is back as a dependency. I was having too many problems
4287 * Itpl is back as a dependency. I was having too many problems
4279 getting the parametric aliases to work reliably, and it's just
4288 getting the parametric aliases to work reliably, and it's just
4280 easier to code weird string operations with it than playing %()s
4289 easier to code weird string operations with it than playing %()s
4281 games. It's only ~6k, so I don't think it's too big a deal.
4290 games. It's only ~6k, so I don't think it's too big a deal.
4282
4291
4283 * Found (and fixed) a very nasty bug with history. !lines weren't
4292 * Found (and fixed) a very nasty bug with history. !lines weren't
4284 getting cached, and the out of sync caches would crash
4293 getting cached, and the out of sync caches would crash
4285 IPython. Fixed it by reorganizing the prefilter/handlers/logger
4294 IPython. Fixed it by reorganizing the prefilter/handlers/logger
4286 division of labor a bit better. Bug fixed, cleaner structure.
4295 division of labor a bit better. Bug fixed, cleaner structure.
4287
4296
4288 2001-12-01 Fernando Perez <fperez@colorado.edu>
4297 2001-12-01 Fernando Perez <fperez@colorado.edu>
4289
4298
4290 * Released 0.1.19
4299 * Released 0.1.19
4291
4300
4292 * Added option -n to @hist to prevent line number printing. Much
4301 * Added option -n to @hist to prevent line number printing. Much
4293 easier to copy/paste code this way.
4302 easier to copy/paste code this way.
4294
4303
4295 * Created global _il to hold the input list. Allows easy
4304 * Created global _il to hold the input list. Allows easy
4296 re-execution of blocks of code by slicing it (inspired by Janko's
4305 re-execution of blocks of code by slicing it (inspired by Janko's
4297 comment on 'macros').
4306 comment on 'macros').
4298
4307
4299 * Small fixes and doc updates.
4308 * Small fixes and doc updates.
4300
4309
4301 * Rewrote @history function (was @h). Renamed it to @hist, @h is
4310 * Rewrote @history function (was @h). Renamed it to @hist, @h is
4302 much too fragile with automagic. Handles properly multi-line
4311 much too fragile with automagic. Handles properly multi-line
4303 statements and takes parameters.
4312 statements and takes parameters.
4304
4313
4305 2001-11-30 Fernando Perez <fperez@colorado.edu>
4314 2001-11-30 Fernando Perez <fperez@colorado.edu>
4306
4315
4307 * Version 0.1.18 released.
4316 * Version 0.1.18 released.
4308
4317
4309 * Fixed nasty namespace bug in initial module imports.
4318 * Fixed nasty namespace bug in initial module imports.
4310
4319
4311 * Added copyright/license notes to all code files (except
4320 * Added copyright/license notes to all code files (except
4312 DPyGetOpt). For the time being, LGPL. That could change.
4321 DPyGetOpt). For the time being, LGPL. That could change.
4313
4322
4314 * Rewrote a much nicer README, updated INSTALL, cleaned up
4323 * Rewrote a much nicer README, updated INSTALL, cleaned up
4315 ipythonrc-* samples.
4324 ipythonrc-* samples.
4316
4325
4317 * Overall code/documentation cleanup. Basically ready for
4326 * Overall code/documentation cleanup. Basically ready for
4318 release. Only remaining thing: licence decision (LGPL?).
4327 release. Only remaining thing: licence decision (LGPL?).
4319
4328
4320 * Converted load_config to a class, ConfigLoader. Now recursion
4329 * Converted load_config to a class, ConfigLoader. Now recursion
4321 control is better organized. Doesn't include the same file twice.
4330 control is better organized. Doesn't include the same file twice.
4322
4331
4323 2001-11-29 Fernando Perez <fperez@colorado.edu>
4332 2001-11-29 Fernando Perez <fperez@colorado.edu>
4324
4333
4325 * Got input history working. Changed output history variables from
4334 * Got input history working. Changed output history variables from
4326 _p to _o so that _i is for input and _o for output. Just cleaner
4335 _p to _o so that _i is for input and _o for output. Just cleaner
4327 convention.
4336 convention.
4328
4337
4329 * Implemented parametric aliases. This pretty much allows the
4338 * Implemented parametric aliases. This pretty much allows the
4330 alias system to offer full-blown shell convenience, I think.
4339 alias system to offer full-blown shell convenience, I think.
4331
4340
4332 * Version 0.1.17 released, 0.1.18 opened.
4341 * Version 0.1.17 released, 0.1.18 opened.
4333
4342
4334 * dot_ipython/ipythonrc (alias): added documentation.
4343 * dot_ipython/ipythonrc (alias): added documentation.
4335 (xcolor): Fixed small bug (xcolors -> xcolor)
4344 (xcolor): Fixed small bug (xcolors -> xcolor)
4336
4345
4337 * Changed the alias system. Now alias is a magic command to define
4346 * Changed the alias system. Now alias is a magic command to define
4338 aliases just like the shell. Rationale: the builtin magics should
4347 aliases just like the shell. Rationale: the builtin magics should
4339 be there for things deeply connected to IPython's
4348 be there for things deeply connected to IPython's
4340 architecture. And this is a much lighter system for what I think
4349 architecture. And this is a much lighter system for what I think
4341 is the really important feature: allowing users to define quickly
4350 is the really important feature: allowing users to define quickly
4342 magics that will do shell things for them, so they can customize
4351 magics that will do shell things for them, so they can customize
4343 IPython easily to match their work habits. If someone is really
4352 IPython easily to match their work habits. If someone is really
4344 desperate to have another name for a builtin alias, they can
4353 desperate to have another name for a builtin alias, they can
4345 always use __IP.magic_newname = __IP.magic_oldname. Hackish but
4354 always use __IP.magic_newname = __IP.magic_oldname. Hackish but
4346 works.
4355 works.
4347
4356
4348 2001-11-28 Fernando Perez <fperez@colorado.edu>
4357 2001-11-28 Fernando Perez <fperez@colorado.edu>
4349
4358
4350 * Changed @file so that it opens the source file at the proper
4359 * Changed @file so that it opens the source file at the proper
4351 line. Since it uses less, if your EDITOR environment is
4360 line. Since it uses less, if your EDITOR environment is
4352 configured, typing v will immediately open your editor of choice
4361 configured, typing v will immediately open your editor of choice
4353 right at the line where the object is defined. Not as quick as
4362 right at the line where the object is defined. Not as quick as
4354 having a direct @edit command, but for all intents and purposes it
4363 having a direct @edit command, but for all intents and purposes it
4355 works. And I don't have to worry about writing @edit to deal with
4364 works. And I don't have to worry about writing @edit to deal with
4356 all the editors, less does that.
4365 all the editors, less does that.
4357
4366
4358 * Version 0.1.16 released, 0.1.17 opened.
4367 * Version 0.1.16 released, 0.1.17 opened.
4359
4368
4360 * Fixed some nasty bugs in the page/page_dumb combo that could
4369 * Fixed some nasty bugs in the page/page_dumb combo that could
4361 crash IPython.
4370 crash IPython.
4362
4371
4363 2001-11-27 Fernando Perez <fperez@colorado.edu>
4372 2001-11-27 Fernando Perez <fperez@colorado.edu>
4364
4373
4365 * Version 0.1.15 released, 0.1.16 opened.
4374 * Version 0.1.15 released, 0.1.16 opened.
4366
4375
4367 * Finally got ? and ?? to work for undefined things: now it's
4376 * Finally got ? and ?? to work for undefined things: now it's
4368 possible to type {}.get? and get information about the get method
4377 possible to type {}.get? and get information about the get method
4369 of dicts, or os.path? even if only os is defined (so technically
4378 of dicts, or os.path? even if only os is defined (so technically
4370 os.path isn't). Works at any level. For example, after import os,
4379 os.path isn't). Works at any level. For example, after import os,
4371 os?, os.path?, os.path.abspath? all work. This is great, took some
4380 os?, os.path?, os.path.abspath? all work. This is great, took some
4372 work in _ofind.
4381 work in _ofind.
4373
4382
4374 * Fixed more bugs with logging. The sanest way to do it was to add
4383 * Fixed more bugs with logging. The sanest way to do it was to add
4375 to @log a 'mode' parameter. Killed two in one shot (this mode
4384 to @log a 'mode' parameter. Killed two in one shot (this mode
4376 option was a request of Janko's). I think it's finally clean
4385 option was a request of Janko's). I think it's finally clean
4377 (famous last words).
4386 (famous last words).
4378
4387
4379 * Added a page_dumb() pager which does a decent job of paging on
4388 * Added a page_dumb() pager which does a decent job of paging on
4380 screen, if better things (like less) aren't available. One less
4389 screen, if better things (like less) aren't available. One less
4381 unix dependency (someday maybe somebody will port this to
4390 unix dependency (someday maybe somebody will port this to
4382 windows).
4391 windows).
4383
4392
4384 * Fixed problem in magic_log: would lock of logging out if log
4393 * Fixed problem in magic_log: would lock of logging out if log
4385 creation failed (because it would still think it had succeeded).
4394 creation failed (because it would still think it had succeeded).
4386
4395
4387 * Improved the page() function using curses to auto-detect screen
4396 * Improved the page() function using curses to auto-detect screen
4388 size. Now it can make a much better decision on whether to print
4397 size. Now it can make a much better decision on whether to print
4389 or page a string. Option screen_length was modified: a value 0
4398 or page a string. Option screen_length was modified: a value 0
4390 means auto-detect, and that's the default now.
4399 means auto-detect, and that's the default now.
4391
4400
4392 * Version 0.1.14 released, 0.1.15 opened. I think this is ready to
4401 * Version 0.1.14 released, 0.1.15 opened. I think this is ready to
4393 go out. I'll test it for a few days, then talk to Janko about
4402 go out. I'll test it for a few days, then talk to Janko about
4394 licences and announce it.
4403 licences and announce it.
4395
4404
4396 * Fixed the length of the auto-generated ---> prompt which appears
4405 * Fixed the length of the auto-generated ---> prompt which appears
4397 for auto-parens and auto-quotes. Getting this right isn't trivial,
4406 for auto-parens and auto-quotes. Getting this right isn't trivial,
4398 with all the color escapes, different prompt types and optional
4407 with all the color escapes, different prompt types and optional
4399 separators. But it seems to be working in all the combinations.
4408 separators. But it seems to be working in all the combinations.
4400
4409
4401 2001-11-26 Fernando Perez <fperez@colorado.edu>
4410 2001-11-26 Fernando Perez <fperez@colorado.edu>
4402
4411
4403 * Wrote a regexp filter to get option types from the option names
4412 * Wrote a regexp filter to get option types from the option names
4404 string. This eliminates the need to manually keep two duplicate
4413 string. This eliminates the need to manually keep two duplicate
4405 lists.
4414 lists.
4406
4415
4407 * Removed the unneeded check_option_names. Now options are handled
4416 * Removed the unneeded check_option_names. Now options are handled
4408 in a much saner manner and it's easy to visually check that things
4417 in a much saner manner and it's easy to visually check that things
4409 are ok.
4418 are ok.
4410
4419
4411 * Updated version numbers on all files I modified to carry a
4420 * Updated version numbers on all files I modified to carry a
4412 notice so Janko and Nathan have clear version markers.
4421 notice so Janko and Nathan have clear version markers.
4413
4422
4414 * Updated docstring for ultraTB with my changes. I should send
4423 * Updated docstring for ultraTB with my changes. I should send
4415 this to Nathan.
4424 this to Nathan.
4416
4425
4417 * Lots of small fixes. Ran everything through pychecker again.
4426 * Lots of small fixes. Ran everything through pychecker again.
4418
4427
4419 * Made loading of deep_reload an cmd line option. If it's not too
4428 * Made loading of deep_reload an cmd line option. If it's not too
4420 kosher, now people can just disable it. With -nodeep_reload it's
4429 kosher, now people can just disable it. With -nodeep_reload it's
4421 still available as dreload(), it just won't overwrite reload().
4430 still available as dreload(), it just won't overwrite reload().
4422
4431
4423 * Moved many options to the no| form (-opt and -noopt
4432 * Moved many options to the no| form (-opt and -noopt
4424 accepted). Cleaner.
4433 accepted). Cleaner.
4425
4434
4426 * Changed magic_log so that if called with no parameters, it uses
4435 * Changed magic_log so that if called with no parameters, it uses
4427 'rotate' mode. That way auto-generated logs aren't automatically
4436 'rotate' mode. That way auto-generated logs aren't automatically
4428 over-written. For normal logs, now a backup is made if it exists
4437 over-written. For normal logs, now a backup is made if it exists
4429 (only 1 level of backups). A new 'backup' mode was added to the
4438 (only 1 level of backups). A new 'backup' mode was added to the
4430 Logger class to support this. This was a request by Janko.
4439 Logger class to support this. This was a request by Janko.
4431
4440
4432 * Added @logoff/@logon to stop/restart an active log.
4441 * Added @logoff/@logon to stop/restart an active log.
4433
4442
4434 * Fixed a lot of bugs in log saving/replay. It was pretty
4443 * Fixed a lot of bugs in log saving/replay. It was pretty
4435 broken. Now special lines (!@,/) appear properly in the command
4444 broken. Now special lines (!@,/) appear properly in the command
4436 history after a log replay.
4445 history after a log replay.
4437
4446
4438 * Tried and failed to implement full session saving via pickle. My
4447 * Tried and failed to implement full session saving via pickle. My
4439 idea was to pickle __main__.__dict__, but modules can't be
4448 idea was to pickle __main__.__dict__, but modules can't be
4440 pickled. This would be a better alternative to replaying logs, but
4449 pickled. This would be a better alternative to replaying logs, but
4441 seems quite tricky to get to work. Changed -session to be called
4450 seems quite tricky to get to work. Changed -session to be called
4442 -logplay, which more accurately reflects what it does. And if we
4451 -logplay, which more accurately reflects what it does. And if we
4443 ever get real session saving working, -session is now available.
4452 ever get real session saving working, -session is now available.
4444
4453
4445 * Implemented color schemes for prompts also. As for tracebacks,
4454 * Implemented color schemes for prompts also. As for tracebacks,
4446 currently only NoColor and Linux are supported. But now the
4455 currently only NoColor and Linux are supported. But now the
4447 infrastructure is in place, based on a generic ColorScheme
4456 infrastructure is in place, based on a generic ColorScheme
4448 class. So writing and activating new schemes both for the prompts
4457 class. So writing and activating new schemes both for the prompts
4449 and the tracebacks should be straightforward.
4458 and the tracebacks should be straightforward.
4450
4459
4451 * Version 0.1.13 released, 0.1.14 opened.
4460 * Version 0.1.13 released, 0.1.14 opened.
4452
4461
4453 * Changed handling of options for output cache. Now counter is
4462 * Changed handling of options for output cache. Now counter is
4454 hardwired starting at 1 and one specifies the maximum number of
4463 hardwired starting at 1 and one specifies the maximum number of
4455 entries *in the outcache* (not the max prompt counter). This is
4464 entries *in the outcache* (not the max prompt counter). This is
4456 much better, since many statements won't increase the cache
4465 much better, since many statements won't increase the cache
4457 count. It also eliminated some confusing options, now there's only
4466 count. It also eliminated some confusing options, now there's only
4458 one: cache_size.
4467 one: cache_size.
4459
4468
4460 * Added 'alias' magic function and magic_alias option in the
4469 * Added 'alias' magic function and magic_alias option in the
4461 ipythonrc file. Now the user can easily define whatever names he
4470 ipythonrc file. Now the user can easily define whatever names he
4462 wants for the magic functions without having to play weird
4471 wants for the magic functions without having to play weird
4463 namespace games. This gives IPython a real shell-like feel.
4472 namespace games. This gives IPython a real shell-like feel.
4464
4473
4465 * Fixed doc/?/?? for magics. Now all work, in all forms (explicit
4474 * Fixed doc/?/?? for magics. Now all work, in all forms (explicit
4466 @ or not).
4475 @ or not).
4467
4476
4468 This was one of the last remaining 'visible' bugs (that I know
4477 This was one of the last remaining 'visible' bugs (that I know
4469 of). I think if I can clean up the session loading so it works
4478 of). I think if I can clean up the session loading so it works
4470 100% I'll release a 0.2.0 version on c.p.l (talk to Janko first
4479 100% I'll release a 0.2.0 version on c.p.l (talk to Janko first
4471 about licensing).
4480 about licensing).
4472
4481
4473 2001-11-25 Fernando Perez <fperez@colorado.edu>
4482 2001-11-25 Fernando Perez <fperez@colorado.edu>
4474
4483
4475 * Rewrote somewhat oinfo (?/??). Nicer, now uses page() and
4484 * Rewrote somewhat oinfo (?/??). Nicer, now uses page() and
4476 there's a cleaner distinction between what ? and ?? show.
4485 there's a cleaner distinction between what ? and ?? show.
4477
4486
4478 * Added screen_length option. Now the user can define his own
4487 * Added screen_length option. Now the user can define his own
4479 screen size for page() operations.
4488 screen size for page() operations.
4480
4489
4481 * Implemented magic shell-like functions with automatic code
4490 * Implemented magic shell-like functions with automatic code
4482 generation. Now adding another function is just a matter of adding
4491 generation. Now adding another function is just a matter of adding
4483 an entry to a dict, and the function is dynamically generated at
4492 an entry to a dict, and the function is dynamically generated at
4484 run-time. Python has some really cool features!
4493 run-time. Python has some really cool features!
4485
4494
4486 * Renamed many options to cleanup conventions a little. Now all
4495 * Renamed many options to cleanup conventions a little. Now all
4487 are lowercase, and only underscores where needed. Also in the code
4496 are lowercase, and only underscores where needed. Also in the code
4488 option name tables are clearer.
4497 option name tables are clearer.
4489
4498
4490 * Changed prompts a little. Now input is 'In [n]:' instead of
4499 * Changed prompts a little. Now input is 'In [n]:' instead of
4491 'In[n]:='. This allows it the numbers to be aligned with the
4500 'In[n]:='. This allows it the numbers to be aligned with the
4492 Out[n] numbers, and removes usage of ':=' which doesn't exist in
4501 Out[n] numbers, and removes usage of ':=' which doesn't exist in
4493 Python (it was a Mathematica thing). The '...' continuation prompt
4502 Python (it was a Mathematica thing). The '...' continuation prompt
4494 was also changed a little to align better.
4503 was also changed a little to align better.
4495
4504
4496 * Fixed bug when flushing output cache. Not all _p<n> variables
4505 * Fixed bug when flushing output cache. Not all _p<n> variables
4497 exist, so their deletion needs to be wrapped in a try:
4506 exist, so their deletion needs to be wrapped in a try:
4498
4507
4499 * Figured out how to properly use inspect.formatargspec() (it
4508 * Figured out how to properly use inspect.formatargspec() (it
4500 requires the args preceded by *). So I removed all the code from
4509 requires the args preceded by *). So I removed all the code from
4501 _get_pdef in Magic, which was just replicating that.
4510 _get_pdef in Magic, which was just replicating that.
4502
4511
4503 * Added test to prefilter to allow redefining magic function names
4512 * Added test to prefilter to allow redefining magic function names
4504 as variables. This is ok, since the @ form is always available,
4513 as variables. This is ok, since the @ form is always available,
4505 but whe should allow the user to define a variable called 'ls' if
4514 but whe should allow the user to define a variable called 'ls' if
4506 he needs it.
4515 he needs it.
4507
4516
4508 * Moved the ToDo information from README into a separate ToDo.
4517 * Moved the ToDo information from README into a separate ToDo.
4509
4518
4510 * General code cleanup and small bugfixes. I think it's close to a
4519 * General code cleanup and small bugfixes. I think it's close to a
4511 state where it can be released, obviously with a big 'beta'
4520 state where it can be released, obviously with a big 'beta'
4512 warning on it.
4521 warning on it.
4513
4522
4514 * Got the magic function split to work. Now all magics are defined
4523 * Got the magic function split to work. Now all magics are defined
4515 in a separate class. It just organizes things a bit, and now
4524 in a separate class. It just organizes things a bit, and now
4516 Xemacs behaves nicer (it was choking on InteractiveShell b/c it
4525 Xemacs behaves nicer (it was choking on InteractiveShell b/c it
4517 was too long).
4526 was too long).
4518
4527
4519 * Changed @clear to @reset to avoid potential confusions with
4528 * Changed @clear to @reset to avoid potential confusions with
4520 the shell command clear. Also renamed @cl to @clear, which does
4529 the shell command clear. Also renamed @cl to @clear, which does
4521 exactly what people expect it to from their shell experience.
4530 exactly what people expect it to from their shell experience.
4522
4531
4523 Added a check to the @reset command (since it's so
4532 Added a check to the @reset command (since it's so
4524 destructive, it's probably a good idea to ask for confirmation).
4533 destructive, it's probably a good idea to ask for confirmation).
4525 But now reset only works for full namespace resetting. Since the
4534 But now reset only works for full namespace resetting. Since the
4526 del keyword is already there for deleting a few specific
4535 del keyword is already there for deleting a few specific
4527 variables, I don't see the point of having a redundant magic
4536 variables, I don't see the point of having a redundant magic
4528 function for the same task.
4537 function for the same task.
4529
4538
4530 2001-11-24 Fernando Perez <fperez@colorado.edu>
4539 2001-11-24 Fernando Perez <fperez@colorado.edu>
4531
4540
4532 * Updated the builtin docs (esp. the ? ones).
4541 * Updated the builtin docs (esp. the ? ones).
4533
4542
4534 * Ran all the code through pychecker. Not terribly impressed with
4543 * Ran all the code through pychecker. Not terribly impressed with
4535 it: lots of spurious warnings and didn't really find anything of
4544 it: lots of spurious warnings and didn't really find anything of
4536 substance (just a few modules being imported and not used).
4545 substance (just a few modules being imported and not used).
4537
4546
4538 * Implemented the new ultraTB functionality into IPython. New
4547 * Implemented the new ultraTB functionality into IPython. New
4539 option: xcolors. This chooses color scheme. xmode now only selects
4548 option: xcolors. This chooses color scheme. xmode now only selects
4540 between Plain and Verbose. Better orthogonality.
4549 between Plain and Verbose. Better orthogonality.
4541
4550
4542 * Large rewrite of ultraTB. Much cleaner now, with a separation of
4551 * Large rewrite of ultraTB. Much cleaner now, with a separation of
4543 mode and color scheme for the exception handlers. Now it's
4552 mode and color scheme for the exception handlers. Now it's
4544 possible to have the verbose traceback with no coloring.
4553 possible to have the verbose traceback with no coloring.
4545
4554
4546 2001-11-23 Fernando Perez <fperez@colorado.edu>
4555 2001-11-23 Fernando Perez <fperez@colorado.edu>
4547
4556
4548 * Version 0.1.12 released, 0.1.13 opened.
4557 * Version 0.1.12 released, 0.1.13 opened.
4549
4558
4550 * Removed option to set auto-quote and auto-paren escapes by
4559 * Removed option to set auto-quote and auto-paren escapes by
4551 user. The chances of breaking valid syntax are just too high. If
4560 user. The chances of breaking valid syntax are just too high. If
4552 someone *really* wants, they can always dig into the code.
4561 someone *really* wants, they can always dig into the code.
4553
4562
4554 * Made prompt separators configurable.
4563 * Made prompt separators configurable.
4555
4564
4556 2001-11-22 Fernando Perez <fperez@colorado.edu>
4565 2001-11-22 Fernando Perez <fperez@colorado.edu>
4557
4566
4558 * Small bugfixes in many places.
4567 * Small bugfixes in many places.
4559
4568
4560 * Removed the MyCompleter class from ipplib. It seemed redundant
4569 * Removed the MyCompleter class from ipplib. It seemed redundant
4561 with the C-p,C-n history search functionality. Less code to
4570 with the C-p,C-n history search functionality. Less code to
4562 maintain.
4571 maintain.
4563
4572
4564 * Moved all the original ipython.py code into ipythonlib.py. Right
4573 * Moved all the original ipython.py code into ipythonlib.py. Right
4565 now it's just one big dump into a function called make_IPython, so
4574 now it's just one big dump into a function called make_IPython, so
4566 no real modularity has been gained. But at least it makes the
4575 no real modularity has been gained. But at least it makes the
4567 wrapper script tiny, and since ipythonlib is a module, it gets
4576 wrapper script tiny, and since ipythonlib is a module, it gets
4568 compiled and startup is much faster.
4577 compiled and startup is much faster.
4569
4578
4570 This is a reasobably 'deep' change, so we should test it for a
4579 This is a reasobably 'deep' change, so we should test it for a
4571 while without messing too much more with the code.
4580 while without messing too much more with the code.
4572
4581
4573 2001-11-21 Fernando Perez <fperez@colorado.edu>
4582 2001-11-21 Fernando Perez <fperez@colorado.edu>
4574
4583
4575 * Version 0.1.11 released, 0.1.12 opened for further work.
4584 * Version 0.1.11 released, 0.1.12 opened for further work.
4576
4585
4577 * Removed dependency on Itpl. It was only needed in one place. It
4586 * Removed dependency on Itpl. It was only needed in one place. It
4578 would be nice if this became part of python, though. It makes life
4587 would be nice if this became part of python, though. It makes life
4579 *a lot* easier in some cases.
4588 *a lot* easier in some cases.
4580
4589
4581 * Simplified the prefilter code a bit. Now all handlers are
4590 * Simplified the prefilter code a bit. Now all handlers are
4582 expected to explicitly return a value (at least a blank string).
4591 expected to explicitly return a value (at least a blank string).
4583
4592
4584 * Heavy edits in ipplib. Removed the help system altogether. Now
4593 * Heavy edits in ipplib. Removed the help system altogether. Now
4585 obj?/?? is used for inspecting objects, a magic @doc prints
4594 obj?/?? is used for inspecting objects, a magic @doc prints
4586 docstrings, and full-blown Python help is accessed via the 'help'
4595 docstrings, and full-blown Python help is accessed via the 'help'
4587 keyword. This cleans up a lot of code (less to maintain) and does
4596 keyword. This cleans up a lot of code (less to maintain) and does
4588 the job. Since 'help' is now a standard Python component, might as
4597 the job. Since 'help' is now a standard Python component, might as
4589 well use it and remove duplicate functionality.
4598 well use it and remove duplicate functionality.
4590
4599
4591 Also removed the option to use ipplib as a standalone program. By
4600 Also removed the option to use ipplib as a standalone program. By
4592 now it's too dependent on other parts of IPython to function alone.
4601 now it's too dependent on other parts of IPython to function alone.
4593
4602
4594 * Fixed bug in genutils.pager. It would crash if the pager was
4603 * Fixed bug in genutils.pager. It would crash if the pager was
4595 exited immediately after opening (broken pipe).
4604 exited immediately after opening (broken pipe).
4596
4605
4597 * Trimmed down the VerboseTB reporting a little. The header is
4606 * Trimmed down the VerboseTB reporting a little. The header is
4598 much shorter now and the repeated exception arguments at the end
4607 much shorter now and the repeated exception arguments at the end
4599 have been removed. For interactive use the old header seemed a bit
4608 have been removed. For interactive use the old header seemed a bit
4600 excessive.
4609 excessive.
4601
4610
4602 * Fixed small bug in output of @whos for variables with multi-word
4611 * Fixed small bug in output of @whos for variables with multi-word
4603 types (only first word was displayed).
4612 types (only first word was displayed).
4604
4613
4605 2001-11-17 Fernando Perez <fperez@colorado.edu>
4614 2001-11-17 Fernando Perez <fperez@colorado.edu>
4606
4615
4607 * Version 0.1.10 released, 0.1.11 opened for further work.
4616 * Version 0.1.10 released, 0.1.11 opened for further work.
4608
4617
4609 * Modified dirs and friends. dirs now *returns* the stack (not
4618 * Modified dirs and friends. dirs now *returns* the stack (not
4610 prints), so one can manipulate it as a variable. Convenient to
4619 prints), so one can manipulate it as a variable. Convenient to
4611 travel along many directories.
4620 travel along many directories.
4612
4621
4613 * Fixed bug in magic_pdef: would only work with functions with
4622 * Fixed bug in magic_pdef: would only work with functions with
4614 arguments with default values.
4623 arguments with default values.
4615
4624
4616 2001-11-14 Fernando Perez <fperez@colorado.edu>
4625 2001-11-14 Fernando Perez <fperez@colorado.edu>
4617
4626
4618 * Added the PhysicsInput stuff to dot_ipython so it ships as an
4627 * Added the PhysicsInput stuff to dot_ipython so it ships as an
4619 example with IPython. Various other minor fixes and cleanups.
4628 example with IPython. Various other minor fixes and cleanups.
4620
4629
4621 * Version 0.1.9 released, 0.1.10 opened for further work.
4630 * Version 0.1.9 released, 0.1.10 opened for further work.
4622
4631
4623 * Added sys.path to the list of directories searched in the
4632 * Added sys.path to the list of directories searched in the
4624 execfile= option. It used to be the current directory and the
4633 execfile= option. It used to be the current directory and the
4625 user's IPYTHONDIR only.
4634 user's IPYTHONDIR only.
4626
4635
4627 2001-11-13 Fernando Perez <fperez@colorado.edu>
4636 2001-11-13 Fernando Perez <fperez@colorado.edu>
4628
4637
4629 * Reinstated the raw_input/prefilter separation that Janko had
4638 * Reinstated the raw_input/prefilter separation that Janko had
4630 initially. This gives a more convenient setup for extending the
4639 initially. This gives a more convenient setup for extending the
4631 pre-processor from the outside: raw_input always gets a string,
4640 pre-processor from the outside: raw_input always gets a string,
4632 and prefilter has to process it. We can then redefine prefilter
4641 and prefilter has to process it. We can then redefine prefilter
4633 from the outside and implement extensions for special
4642 from the outside and implement extensions for special
4634 purposes.
4643 purposes.
4635
4644
4636 Today I got one for inputting PhysicalQuantity objects
4645 Today I got one for inputting PhysicalQuantity objects
4637 (from Scientific) without needing any function calls at
4646 (from Scientific) without needing any function calls at
4638 all. Extremely convenient, and it's all done as a user-level
4647 all. Extremely convenient, and it's all done as a user-level
4639 extension (no IPython code was touched). Now instead of:
4648 extension (no IPython code was touched). Now instead of:
4640 a = PhysicalQuantity(4.2,'m/s**2')
4649 a = PhysicalQuantity(4.2,'m/s**2')
4641 one can simply say
4650 one can simply say
4642 a = 4.2 m/s**2
4651 a = 4.2 m/s**2
4643 or even
4652 or even
4644 a = 4.2 m/s^2
4653 a = 4.2 m/s^2
4645
4654
4646 I use this, but it's also a proof of concept: IPython really is
4655 I use this, but it's also a proof of concept: IPython really is
4647 fully user-extensible, even at the level of the parsing of the
4656 fully user-extensible, even at the level of the parsing of the
4648 command line. It's not trivial, but it's perfectly doable.
4657 command line. It's not trivial, but it's perfectly doable.
4649
4658
4650 * Added 'add_flip' method to inclusion conflict resolver. Fixes
4659 * Added 'add_flip' method to inclusion conflict resolver. Fixes
4651 the problem of modules being loaded in the inverse order in which
4660 the problem of modules being loaded in the inverse order in which
4652 they were defined in
4661 they were defined in
4653
4662
4654 * Version 0.1.8 released, 0.1.9 opened for further work.
4663 * Version 0.1.8 released, 0.1.9 opened for further work.
4655
4664
4656 * Added magics pdef, source and file. They respectively show the
4665 * Added magics pdef, source and file. They respectively show the
4657 definition line ('prototype' in C), source code and full python
4666 definition line ('prototype' in C), source code and full python
4658 file for any callable object. The object inspector oinfo uses
4667 file for any callable object. The object inspector oinfo uses
4659 these to show the same information.
4668 these to show the same information.
4660
4669
4661 * Version 0.1.7 released, 0.1.8 opened for further work.
4670 * Version 0.1.7 released, 0.1.8 opened for further work.
4662
4671
4663 * Separated all the magic functions into a class called Magic. The
4672 * Separated all the magic functions into a class called Magic. The
4664 InteractiveShell class was becoming too big for Xemacs to handle
4673 InteractiveShell class was becoming too big for Xemacs to handle
4665 (de-indenting a line would lock it up for 10 seconds while it
4674 (de-indenting a line would lock it up for 10 seconds while it
4666 backtracked on the whole class!)
4675 backtracked on the whole class!)
4667
4676
4668 FIXME: didn't work. It can be done, but right now namespaces are
4677 FIXME: didn't work. It can be done, but right now namespaces are
4669 all messed up. Do it later (reverted it for now, so at least
4678 all messed up. Do it later (reverted it for now, so at least
4670 everything works as before).
4679 everything works as before).
4671
4680
4672 * Got the object introspection system (magic_oinfo) working! I
4681 * Got the object introspection system (magic_oinfo) working! I
4673 think this is pretty much ready for release to Janko, so he can
4682 think this is pretty much ready for release to Janko, so he can
4674 test it for a while and then announce it. Pretty much 100% of what
4683 test it for a while and then announce it. Pretty much 100% of what
4675 I wanted for the 'phase 1' release is ready. Happy, tired.
4684 I wanted for the 'phase 1' release is ready. Happy, tired.
4676
4685
4677 2001-11-12 Fernando Perez <fperez@colorado.edu>
4686 2001-11-12 Fernando Perez <fperez@colorado.edu>
4678
4687
4679 * Version 0.1.6 released, 0.1.7 opened for further work.
4688 * Version 0.1.6 released, 0.1.7 opened for further work.
4680
4689
4681 * Fixed bug in printing: it used to test for truth before
4690 * Fixed bug in printing: it used to test for truth before
4682 printing, so 0 wouldn't print. Now checks for None.
4691 printing, so 0 wouldn't print. Now checks for None.
4683
4692
4684 * Fixed bug where auto-execs increase the prompt counter by 2 (b/c
4693 * Fixed bug where auto-execs increase the prompt counter by 2 (b/c
4685 they have to call len(str(sys.ps1)) ). But the fix is ugly, it
4694 they have to call len(str(sys.ps1)) ). But the fix is ugly, it
4686 reaches by hand into the outputcache. Think of a better way to do
4695 reaches by hand into the outputcache. Think of a better way to do
4687 this later.
4696 this later.
4688
4697
4689 * Various small fixes thanks to Nathan's comments.
4698 * Various small fixes thanks to Nathan's comments.
4690
4699
4691 * Changed magic_pprint to magic_Pprint. This way it doesn't
4700 * Changed magic_pprint to magic_Pprint. This way it doesn't
4692 collide with pprint() and the name is consistent with the command
4701 collide with pprint() and the name is consistent with the command
4693 line option.
4702 line option.
4694
4703
4695 * Changed prompt counter behavior to be fully like
4704 * Changed prompt counter behavior to be fully like
4696 Mathematica's. That is, even input that doesn't return a result
4705 Mathematica's. That is, even input that doesn't return a result
4697 raises the prompt counter. The old behavior was kind of confusing
4706 raises the prompt counter. The old behavior was kind of confusing
4698 (getting the same prompt number several times if the operation
4707 (getting the same prompt number several times if the operation
4699 didn't return a result).
4708 didn't return a result).
4700
4709
4701 * Fixed Nathan's last name in a couple of places (Gray, not Graham).
4710 * Fixed Nathan's last name in a couple of places (Gray, not Graham).
4702
4711
4703 * Fixed -Classic mode (wasn't working anymore).
4712 * Fixed -Classic mode (wasn't working anymore).
4704
4713
4705 * Added colored prompts using Nathan's new code. Colors are
4714 * Added colored prompts using Nathan's new code. Colors are
4706 currently hardwired, they can be user-configurable. For
4715 currently hardwired, they can be user-configurable. For
4707 developers, they can be chosen in file ipythonlib.py, at the
4716 developers, they can be chosen in file ipythonlib.py, at the
4708 beginning of the CachedOutput class def.
4717 beginning of the CachedOutput class def.
4709
4718
4710 2001-11-11 Fernando Perez <fperez@colorado.edu>
4719 2001-11-11 Fernando Perez <fperez@colorado.edu>
4711
4720
4712 * Version 0.1.5 released, 0.1.6 opened for further work.
4721 * Version 0.1.5 released, 0.1.6 opened for further work.
4713
4722
4714 * Changed magic_env to *return* the environment as a dict (not to
4723 * Changed magic_env to *return* the environment as a dict (not to
4715 print it). This way it prints, but it can also be processed.
4724 print it). This way it prints, but it can also be processed.
4716
4725
4717 * Added Verbose exception reporting to interactive
4726 * Added Verbose exception reporting to interactive
4718 exceptions. Very nice, now even 1/0 at the prompt gives a verbose
4727 exceptions. Very nice, now even 1/0 at the prompt gives a verbose
4719 traceback. Had to make some changes to the ultraTB file. This is
4728 traceback. Had to make some changes to the ultraTB file. This is
4720 probably the last 'big' thing in my mental todo list. This ties
4729 probably the last 'big' thing in my mental todo list. This ties
4721 in with the next entry:
4730 in with the next entry:
4722
4731
4723 * Changed -Xi and -Xf to a single -xmode option. Now all the user
4732 * Changed -Xi and -Xf to a single -xmode option. Now all the user
4724 has to specify is Plain, Color or Verbose for all exception
4733 has to specify is Plain, Color or Verbose for all exception
4725 handling.
4734 handling.
4726
4735
4727 * Removed ShellServices option. All this can really be done via
4736 * Removed ShellServices option. All this can really be done via
4728 the magic system. It's easier to extend, cleaner and has automatic
4737 the magic system. It's easier to extend, cleaner and has automatic
4729 namespace protection and documentation.
4738 namespace protection and documentation.
4730
4739
4731 2001-11-09 Fernando Perez <fperez@colorado.edu>
4740 2001-11-09 Fernando Perez <fperez@colorado.edu>
4732
4741
4733 * Fixed bug in output cache flushing (missing parameter to
4742 * Fixed bug in output cache flushing (missing parameter to
4734 __init__). Other small bugs fixed (found using pychecker).
4743 __init__). Other small bugs fixed (found using pychecker).
4735
4744
4736 * Version 0.1.4 opened for bugfixing.
4745 * Version 0.1.4 opened for bugfixing.
4737
4746
4738 2001-11-07 Fernando Perez <fperez@colorado.edu>
4747 2001-11-07 Fernando Perez <fperez@colorado.edu>
4739
4748
4740 * Version 0.1.3 released, mainly because of the raw_input bug.
4749 * Version 0.1.3 released, mainly because of the raw_input bug.
4741
4750
4742 * Fixed NASTY bug in raw_input: input line wasn't properly parsed
4751 * Fixed NASTY bug in raw_input: input line wasn't properly parsed
4743 and when testing for whether things were callable, a call could
4752 and when testing for whether things were callable, a call could
4744 actually be made to certain functions. They would get called again
4753 actually be made to certain functions. They would get called again
4745 once 'really' executed, with a resulting double call. A disaster
4754 once 'really' executed, with a resulting double call. A disaster
4746 in many cases (list.reverse() would never work!).
4755 in many cases (list.reverse() would never work!).
4747
4756
4748 * Removed prefilter() function, moved its code to raw_input (which
4757 * Removed prefilter() function, moved its code to raw_input (which
4749 after all was just a near-empty caller for prefilter). This saves
4758 after all was just a near-empty caller for prefilter). This saves
4750 a function call on every prompt, and simplifies the class a tiny bit.
4759 a function call on every prompt, and simplifies the class a tiny bit.
4751
4760
4752 * Fix _ip to __ip name in magic example file.
4761 * Fix _ip to __ip name in magic example file.
4753
4762
4754 * Changed 'tar -x -f' to 'tar xvf' in auto-installer. This should
4763 * Changed 'tar -x -f' to 'tar xvf' in auto-installer. This should
4755 work with non-gnu versions of tar.
4764 work with non-gnu versions of tar.
4756
4765
4757 2001-11-06 Fernando Perez <fperez@colorado.edu>
4766 2001-11-06 Fernando Perez <fperez@colorado.edu>
4758
4767
4759 * Version 0.1.2. Just to keep track of the recent changes.
4768 * Version 0.1.2. Just to keep track of the recent changes.
4760
4769
4761 * Fixed nasty bug in output prompt routine. It used to check 'if
4770 * Fixed nasty bug in output prompt routine. It used to check 'if
4762 arg != None...'. Problem is, this fails if arg implements a
4771 arg != None...'. Problem is, this fails if arg implements a
4763 special comparison (__cmp__) which disallows comparing to
4772 special comparison (__cmp__) which disallows comparing to
4764 None. Found it when trying to use the PhysicalQuantity module from
4773 None. Found it when trying to use the PhysicalQuantity module from
4765 ScientificPython.
4774 ScientificPython.
4766
4775
4767 2001-11-05 Fernando Perez <fperez@colorado.edu>
4776 2001-11-05 Fernando Perez <fperez@colorado.edu>
4768
4777
4769 * Also added dirs. Now the pushd/popd/dirs family functions
4778 * Also added dirs. Now the pushd/popd/dirs family functions
4770 basically like the shell, with the added convenience of going home
4779 basically like the shell, with the added convenience of going home
4771 when called with no args.
4780 when called with no args.
4772
4781
4773 * pushd/popd slightly modified to mimic shell behavior more
4782 * pushd/popd slightly modified to mimic shell behavior more
4774 closely.
4783 closely.
4775
4784
4776 * Added env,pushd,popd from ShellServices as magic functions. I
4785 * Added env,pushd,popd from ShellServices as magic functions. I
4777 think the cleanest will be to port all desired functions from
4786 think the cleanest will be to port all desired functions from
4778 ShellServices as magics and remove ShellServices altogether. This
4787 ShellServices as magics and remove ShellServices altogether. This
4779 will provide a single, clean way of adding functionality
4788 will provide a single, clean way of adding functionality
4780 (shell-type or otherwise) to IP.
4789 (shell-type or otherwise) to IP.
4781
4790
4782 2001-11-04 Fernando Perez <fperez@colorado.edu>
4791 2001-11-04 Fernando Perez <fperez@colorado.edu>
4783
4792
4784 * Added .ipython/ directory to sys.path. This way users can keep
4793 * Added .ipython/ directory to sys.path. This way users can keep
4785 customizations there and access them via import.
4794 customizations there and access them via import.
4786
4795
4787 2001-11-03 Fernando Perez <fperez@colorado.edu>
4796 2001-11-03 Fernando Perez <fperez@colorado.edu>
4788
4797
4789 * Opened version 0.1.1 for new changes.
4798 * Opened version 0.1.1 for new changes.
4790
4799
4791 * Changed version number to 0.1.0: first 'public' release, sent to
4800 * Changed version number to 0.1.0: first 'public' release, sent to
4792 Nathan and Janko.
4801 Nathan and Janko.
4793
4802
4794 * Lots of small fixes and tweaks.
4803 * Lots of small fixes and tweaks.
4795
4804
4796 * Minor changes to whos format. Now strings are shown, snipped if
4805 * Minor changes to whos format. Now strings are shown, snipped if
4797 too long.
4806 too long.
4798
4807
4799 * Changed ShellServices to work on __main__ so they show up in @who
4808 * Changed ShellServices to work on __main__ so they show up in @who
4800
4809
4801 * Help also works with ? at the end of a line:
4810 * Help also works with ? at the end of a line:
4802 ?sin and sin?
4811 ?sin and sin?
4803 both produce the same effect. This is nice, as often I use the
4812 both produce the same effect. This is nice, as often I use the
4804 tab-complete to find the name of a method, but I used to then have
4813 tab-complete to find the name of a method, but I used to then have
4805 to go to the beginning of the line to put a ? if I wanted more
4814 to go to the beginning of the line to put a ? if I wanted more
4806 info. Now I can just add the ? and hit return. Convenient.
4815 info. Now I can just add the ? and hit return. Convenient.
4807
4816
4808 2001-11-02 Fernando Perez <fperez@colorado.edu>
4817 2001-11-02 Fernando Perez <fperez@colorado.edu>
4809
4818
4810 * Python version check (>=2.1) added.
4819 * Python version check (>=2.1) added.
4811
4820
4812 * Added LazyPython documentation. At this point the docs are quite
4821 * Added LazyPython documentation. At this point the docs are quite
4813 a mess. A cleanup is in order.
4822 a mess. A cleanup is in order.
4814
4823
4815 * Auto-installer created. For some bizarre reason, the zipfiles
4824 * Auto-installer created. For some bizarre reason, the zipfiles
4816 module isn't working on my system. So I made a tar version
4825 module isn't working on my system. So I made a tar version
4817 (hopefully the command line options in various systems won't kill
4826 (hopefully the command line options in various systems won't kill
4818 me).
4827 me).
4819
4828
4820 * Fixes to Struct in genutils. Now all dictionary-like methods are
4829 * Fixes to Struct in genutils. Now all dictionary-like methods are
4821 protected (reasonably).
4830 protected (reasonably).
4822
4831
4823 * Added pager function to genutils and changed ? to print usage
4832 * Added pager function to genutils and changed ? to print usage
4824 note through it (it was too long).
4833 note through it (it was too long).
4825
4834
4826 * Added the LazyPython functionality. Works great! I changed the
4835 * Added the LazyPython functionality. Works great! I changed the
4827 auto-quote escape to ';', it's on home row and next to '. But
4836 auto-quote escape to ';', it's on home row and next to '. But
4828 both auto-quote and auto-paren (still /) escapes are command-line
4837 both auto-quote and auto-paren (still /) escapes are command-line
4829 parameters.
4838 parameters.
4830
4839
4831
4840
4832 2001-11-01 Fernando Perez <fperez@colorado.edu>
4841 2001-11-01 Fernando Perez <fperez@colorado.edu>
4833
4842
4834 * Version changed to 0.0.7. Fairly large change: configuration now
4843 * Version changed to 0.0.7. Fairly large change: configuration now
4835 is all stored in a directory, by default .ipython. There, all
4844 is all stored in a directory, by default .ipython. There, all
4836 config files have normal looking names (not .names)
4845 config files have normal looking names (not .names)
4837
4846
4838 * Version 0.0.6 Released first to Lucas and Archie as a test
4847 * Version 0.0.6 Released first to Lucas and Archie as a test
4839 run. Since it's the first 'semi-public' release, change version to
4848 run. Since it's the first 'semi-public' release, change version to
4840 > 0.0.6 for any changes now.
4849 > 0.0.6 for any changes now.
4841
4850
4842 * Stuff I had put in the ipplib.py changelog:
4851 * Stuff I had put in the ipplib.py changelog:
4843
4852
4844 Changes to InteractiveShell:
4853 Changes to InteractiveShell:
4845
4854
4846 - Made the usage message a parameter.
4855 - Made the usage message a parameter.
4847
4856
4848 - Require the name of the shell variable to be given. It's a bit
4857 - Require the name of the shell variable to be given. It's a bit
4849 of a hack, but allows the name 'shell' not to be hardwire in the
4858 of a hack, but allows the name 'shell' not to be hardwire in the
4850 magic (@) handler, which is problematic b/c it requires
4859 magic (@) handler, which is problematic b/c it requires
4851 polluting the global namespace with 'shell'. This in turn is
4860 polluting the global namespace with 'shell'. This in turn is
4852 fragile: if a user redefines a variable called shell, things
4861 fragile: if a user redefines a variable called shell, things
4853 break.
4862 break.
4854
4863
4855 - magic @: all functions available through @ need to be defined
4864 - magic @: all functions available through @ need to be defined
4856 as magic_<name>, even though they can be called simply as
4865 as magic_<name>, even though they can be called simply as
4857 @<name>. This allows the special command @magic to gather
4866 @<name>. This allows the special command @magic to gather
4858 information automatically about all existing magic functions,
4867 information automatically about all existing magic functions,
4859 even if they are run-time user extensions, by parsing the shell
4868 even if they are run-time user extensions, by parsing the shell
4860 instance __dict__ looking for special magic_ names.
4869 instance __dict__ looking for special magic_ names.
4861
4870
4862 - mainloop: added *two* local namespace parameters. This allows
4871 - mainloop: added *two* local namespace parameters. This allows
4863 the class to differentiate between parameters which were there
4872 the class to differentiate between parameters which were there
4864 before and after command line initialization was processed. This
4873 before and after command line initialization was processed. This
4865 way, later @who can show things loaded at startup by the
4874 way, later @who can show things loaded at startup by the
4866 user. This trick was necessary to make session saving/reloading
4875 user. This trick was necessary to make session saving/reloading
4867 really work: ideally after saving/exiting/reloading a session,
4876 really work: ideally after saving/exiting/reloading a session,
4868 *everythin* should look the same, including the output of @who. I
4877 *everythin* should look the same, including the output of @who. I
4869 was only able to make this work with this double namespace
4878 was only able to make this work with this double namespace
4870 trick.
4879 trick.
4871
4880
4872 - added a header to the logfile which allows (almost) full
4881 - added a header to the logfile which allows (almost) full
4873 session restoring.
4882 session restoring.
4874
4883
4875 - prepend lines beginning with @ or !, with a and log
4884 - prepend lines beginning with @ or !, with a and log
4876 them. Why? !lines: may be useful to know what you did @lines:
4885 them. Why? !lines: may be useful to know what you did @lines:
4877 they may affect session state. So when restoring a session, at
4886 they may affect session state. So when restoring a session, at
4878 least inform the user of their presence. I couldn't quite get
4887 least inform the user of their presence. I couldn't quite get
4879 them to properly re-execute, but at least the user is warned.
4888 them to properly re-execute, but at least the user is warned.
4880
4889
4881 * Started ChangeLog.
4890 * Started ChangeLog.
General Comments 0
You need to be logged in to leave comments. Login now