##// END OF EJS Templates
- Make the execution of 'from pylab import *' when -pylab is given be...
fperez -
Show More
@@ -1,1046 +1,1061 b''
1 # -*- coding: utf-8 -*-
1 # -*- coding: utf-8 -*-
2 """IPython Shell classes.
2 """IPython Shell classes.
3
3
4 All the matplotlib support code was co-developed with John Hunter,
4 All the matplotlib support code was co-developed with John Hunter,
5 matplotlib's author.
5 matplotlib's author.
6
6
7 $Id: Shell.py 2151 2007-03-18 01:17:00Z fperez $"""
7 $Id: Shell.py 2156 2007-03-19 02:32:19Z fperez $"""
8
8
9 #*****************************************************************************
9 #*****************************************************************************
10 # Copyright (C) 2001-2006 Fernando Perez <fperez@colorado.edu>
10 # Copyright (C) 2001-2006 Fernando Perez <fperez@colorado.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 from IPython import Release
16 from IPython import Release
17 __author__ = '%s <%s>' % Release.authors['Fernando']
17 __author__ = '%s <%s>' % Release.authors['Fernando']
18 __license__ = Release.license
18 __license__ = Release.license
19
19
20 # Code begins
20 # Code begins
21 import __builtin__
21 import __builtin__
22 import __main__
22 import __main__
23 import Queue
23 import Queue
24 import os
24 import os
25 import signal
25 import signal
26 import sys
26 import sys
27 import threading
27 import threading
28 import time
28 import time
29
29
30 import IPython
30 import IPython
31 from IPython import ultraTB
31 from IPython import ultraTB
32 from IPython.genutils import Term,warn,error,flag_calls
32 from IPython.genutils import Term,warn,error,flag_calls
33 from IPython.iplib import InteractiveShell
33 from IPython.iplib import InteractiveShell
34 from IPython.ipmaker import make_IPython
34 from IPython.ipmaker import make_IPython
35 from IPython.Magic import Magic
35 from IPython.Magic import Magic
36 from IPython.ipstruct import Struct
36 from IPython.ipstruct import Struct
37
37
38 # global flag to pass around information about Ctrl-C without exceptions
38 # global flag to pass around information about Ctrl-C without exceptions
39 KBINT = False
39 KBINT = False
40
40
41 # global flag to turn on/off Tk support.
41 # global flag to turn on/off Tk support.
42 USE_TK = False
42 USE_TK = False
43
43
44 #-----------------------------------------------------------------------------
44 #-----------------------------------------------------------------------------
45 # This class is trivial now, but I want to have it in to publish a clean
45 # This class is trivial now, but I want to have it in to publish a clean
46 # interface. Later when the internals are reorganized, code that uses this
46 # interface. Later when the internals are reorganized, code that uses this
47 # shouldn't have to change.
47 # shouldn't have to change.
48
48
49 class IPShell:
49 class IPShell:
50 """Create an IPython instance."""
50 """Create an IPython instance."""
51
51
52 def __init__(self,argv=None,user_ns=None,user_global_ns=None,
52 def __init__(self,argv=None,user_ns=None,user_global_ns=None,
53 debug=1,shell_class=InteractiveShell):
53 debug=1,shell_class=InteractiveShell):
54 self.IP = make_IPython(argv,user_ns=user_ns,
54 self.IP = make_IPython(argv,user_ns=user_ns,
55 user_global_ns=user_global_ns,
55 user_global_ns=user_global_ns,
56 debug=debug,shell_class=shell_class)
56 debug=debug,shell_class=shell_class)
57
57
58 def mainloop(self,sys_exit=0,banner=None):
58 def mainloop(self,sys_exit=0,banner=None):
59 self.IP.mainloop(banner)
59 self.IP.mainloop(banner)
60 if sys_exit:
60 if sys_exit:
61 sys.exit()
61 sys.exit()
62
62
63 #-----------------------------------------------------------------------------
63 #-----------------------------------------------------------------------------
64 class IPShellEmbed:
64 class IPShellEmbed:
65 """Allow embedding an IPython shell into a running program.
65 """Allow embedding an IPython shell into a running program.
66
66
67 Instances of this class are callable, with the __call__ method being an
67 Instances of this class are callable, with the __call__ method being an
68 alias to the embed() method of an InteractiveShell instance.
68 alias to the embed() method of an InteractiveShell instance.
69
69
70 Usage (see also the example-embed.py file for a running example):
70 Usage (see also the example-embed.py file for a running example):
71
71
72 ipshell = IPShellEmbed([argv,banner,exit_msg,rc_override])
72 ipshell = IPShellEmbed([argv,banner,exit_msg,rc_override])
73
73
74 - argv: list containing valid command-line options for IPython, as they
74 - argv: list containing valid command-line options for IPython, as they
75 would appear in sys.argv[1:].
75 would appear in sys.argv[1:].
76
76
77 For example, the following command-line options:
77 For example, the following command-line options:
78
78
79 $ ipython -prompt_in1 'Input <\\#>' -colors LightBG
79 $ ipython -prompt_in1 'Input <\\#>' -colors LightBG
80
80
81 would be passed in the argv list as:
81 would be passed in the argv list as:
82
82
83 ['-prompt_in1','Input <\\#>','-colors','LightBG']
83 ['-prompt_in1','Input <\\#>','-colors','LightBG']
84
84
85 - banner: string which gets printed every time the interpreter starts.
85 - banner: string which gets printed every time the interpreter starts.
86
86
87 - exit_msg: string which gets printed every time the interpreter exits.
87 - exit_msg: string which gets printed every time the interpreter exits.
88
88
89 - rc_override: a dict or Struct of configuration options such as those
89 - rc_override: a dict or Struct of configuration options such as those
90 used by IPython. These options are read from your ~/.ipython/ipythonrc
90 used by IPython. These options are read from your ~/.ipython/ipythonrc
91 file when the Shell object is created. Passing an explicit rc_override
91 file when the Shell object is created. Passing an explicit rc_override
92 dict with any options you want allows you to override those values at
92 dict with any options you want allows you to override those values at
93 creation time without having to modify the file. This way you can create
93 creation time without having to modify the file. This way you can create
94 embeddable instances configured in any way you want without editing any
94 embeddable instances configured in any way you want without editing any
95 global files (thus keeping your interactive IPython configuration
95 global files (thus keeping your interactive IPython configuration
96 unchanged).
96 unchanged).
97
97
98 Then the ipshell instance can be called anywhere inside your code:
98 Then the ipshell instance can be called anywhere inside your code:
99
99
100 ipshell(header='') -> Opens up an IPython shell.
100 ipshell(header='') -> Opens up an IPython shell.
101
101
102 - header: string printed by the IPython shell upon startup. This can let
102 - header: string printed by the IPython shell upon startup. This can let
103 you know where in your code you are when dropping into the shell. Note
103 you know where in your code you are when dropping into the shell. Note
104 that 'banner' gets prepended to all calls, so header is used for
104 that 'banner' gets prepended to all calls, so header is used for
105 location-specific information.
105 location-specific information.
106
106
107 For more details, see the __call__ method below.
107 For more details, see the __call__ method below.
108
108
109 When the IPython shell is exited with Ctrl-D, normal program execution
109 When the IPython shell is exited with Ctrl-D, normal program execution
110 resumes.
110 resumes.
111
111
112 This functionality was inspired by a posting on comp.lang.python by cmkl
112 This functionality was inspired by a posting on comp.lang.python by cmkl
113 <cmkleffner@gmx.de> on Dec. 06/01 concerning similar uses of pyrepl, and
113 <cmkleffner@gmx.de> on Dec. 06/01 concerning similar uses of pyrepl, and
114 by the IDL stop/continue commands."""
114 by the IDL stop/continue commands."""
115
115
116 def __init__(self,argv=None,banner='',exit_msg=None,rc_override=None,
116 def __init__(self,argv=None,banner='',exit_msg=None,rc_override=None,
117 user_ns=None):
117 user_ns=None):
118 """Note that argv here is a string, NOT a list."""
118 """Note that argv here is a string, NOT a list."""
119 self.set_banner(banner)
119 self.set_banner(banner)
120 self.set_exit_msg(exit_msg)
120 self.set_exit_msg(exit_msg)
121 self.set_dummy_mode(0)
121 self.set_dummy_mode(0)
122
122
123 # sys.displayhook is a global, we need to save the user's original
123 # sys.displayhook is a global, we need to save the user's original
124 # Don't rely on __displayhook__, as the user may have changed that.
124 # Don't rely on __displayhook__, as the user may have changed that.
125 self.sys_displayhook_ori = sys.displayhook
125 self.sys_displayhook_ori = sys.displayhook
126
126
127 # save readline completer status
127 # save readline completer status
128 try:
128 try:
129 #print 'Save completer',sys.ipcompleter # dbg
129 #print 'Save completer',sys.ipcompleter # dbg
130 self.sys_ipcompleter_ori = sys.ipcompleter
130 self.sys_ipcompleter_ori = sys.ipcompleter
131 except:
131 except:
132 pass # not nested with IPython
132 pass # not nested with IPython
133
133
134 self.IP = make_IPython(argv,rc_override=rc_override,
134 self.IP = make_IPython(argv,rc_override=rc_override,
135 embedded=True,
135 embedded=True,
136 user_ns=user_ns)
136 user_ns=user_ns)
137
137
138 # copy our own displayhook also
138 # copy our own displayhook also
139 self.sys_displayhook_embed = sys.displayhook
139 self.sys_displayhook_embed = sys.displayhook
140 # and leave the system's display hook clean
140 # and leave the system's display hook clean
141 sys.displayhook = self.sys_displayhook_ori
141 sys.displayhook = self.sys_displayhook_ori
142 # don't use the ipython crash handler so that user exceptions aren't
142 # don't use the ipython crash handler so that user exceptions aren't
143 # trapped
143 # trapped
144 sys.excepthook = ultraTB.FormattedTB(color_scheme = self.IP.rc.colors,
144 sys.excepthook = ultraTB.FormattedTB(color_scheme = self.IP.rc.colors,
145 mode = self.IP.rc.xmode,
145 mode = self.IP.rc.xmode,
146 call_pdb = self.IP.rc.pdb)
146 call_pdb = self.IP.rc.pdb)
147 self.restore_system_completer()
147 self.restore_system_completer()
148
148
149 def restore_system_completer(self):
149 def restore_system_completer(self):
150 """Restores the readline completer which was in place.
150 """Restores the readline completer which was in place.
151
151
152 This allows embedded IPython within IPython not to disrupt the
152 This allows embedded IPython within IPython not to disrupt the
153 parent's completion.
153 parent's completion.
154 """
154 """
155
155
156 try:
156 try:
157 self.IP.readline.set_completer(self.sys_ipcompleter_ori)
157 self.IP.readline.set_completer(self.sys_ipcompleter_ori)
158 sys.ipcompleter = self.sys_ipcompleter_ori
158 sys.ipcompleter = self.sys_ipcompleter_ori
159 except:
159 except:
160 pass
160 pass
161
161
162 def __call__(self,header='',local_ns=None,global_ns=None,dummy=None):
162 def __call__(self,header='',local_ns=None,global_ns=None,dummy=None):
163 """Activate the interactive interpreter.
163 """Activate the interactive interpreter.
164
164
165 __call__(self,header='',local_ns=None,global_ns,dummy=None) -> Start
165 __call__(self,header='',local_ns=None,global_ns,dummy=None) -> Start
166 the interpreter shell with the given local and global namespaces, and
166 the interpreter shell with the given local and global namespaces, and
167 optionally print a header string at startup.
167 optionally print a header string at startup.
168
168
169 The shell can be globally activated/deactivated using the
169 The shell can be globally activated/deactivated using the
170 set/get_dummy_mode methods. This allows you to turn off a shell used
170 set/get_dummy_mode methods. This allows you to turn off a shell used
171 for debugging globally.
171 for debugging globally.
172
172
173 However, *each* time you call the shell you can override the current
173 However, *each* time you call the shell you can override the current
174 state of dummy_mode with the optional keyword parameter 'dummy'. For
174 state of dummy_mode with the optional keyword parameter 'dummy'. For
175 example, if you set dummy mode on with IPShell.set_dummy_mode(1), you
175 example, if you set dummy mode on with IPShell.set_dummy_mode(1), you
176 can still have a specific call work by making it as IPShell(dummy=0).
176 can still have a specific call work by making it as IPShell(dummy=0).
177
177
178 The optional keyword parameter dummy controls whether the call
178 The optional keyword parameter dummy controls whether the call
179 actually does anything. """
179 actually does anything. """
180
180
181 # Allow the dummy parameter to override the global __dummy_mode
181 # Allow the dummy parameter to override the global __dummy_mode
182 if dummy or (dummy != 0 and self.__dummy_mode):
182 if dummy or (dummy != 0 and self.__dummy_mode):
183 return
183 return
184
184
185 # Set global subsystems (display,completions) to our values
185 # Set global subsystems (display,completions) to our values
186 sys.displayhook = self.sys_displayhook_embed
186 sys.displayhook = self.sys_displayhook_embed
187 if self.IP.has_readline:
187 if self.IP.has_readline:
188 self.IP.readline.set_completer(self.IP.Completer.complete)
188 self.IP.readline.set_completer(self.IP.Completer.complete)
189
189
190 if self.banner and header:
190 if self.banner and header:
191 format = '%s\n%s\n'
191 format = '%s\n%s\n'
192 else:
192 else:
193 format = '%s%s\n'
193 format = '%s%s\n'
194 banner = format % (self.banner,header)
194 banner = format % (self.banner,header)
195
195
196 # Call the embedding code with a stack depth of 1 so it can skip over
196 # Call the embedding code with a stack depth of 1 so it can skip over
197 # our call and get the original caller's namespaces.
197 # our call and get the original caller's namespaces.
198 self.IP.embed_mainloop(banner,local_ns,global_ns,stack_depth=1)
198 self.IP.embed_mainloop(banner,local_ns,global_ns,stack_depth=1)
199
199
200 if self.exit_msg:
200 if self.exit_msg:
201 print self.exit_msg
201 print self.exit_msg
202
202
203 # Restore global systems (display, completion)
203 # Restore global systems (display, completion)
204 sys.displayhook = self.sys_displayhook_ori
204 sys.displayhook = self.sys_displayhook_ori
205 self.restore_system_completer()
205 self.restore_system_completer()
206
206
207 def set_dummy_mode(self,dummy):
207 def set_dummy_mode(self,dummy):
208 """Sets the embeddable shell's dummy mode parameter.
208 """Sets the embeddable shell's dummy mode parameter.
209
209
210 set_dummy_mode(dummy): dummy = 0 or 1.
210 set_dummy_mode(dummy): dummy = 0 or 1.
211
211
212 This parameter is persistent and makes calls to the embeddable shell
212 This parameter is persistent and makes calls to the embeddable shell
213 silently return without performing any action. This allows you to
213 silently return without performing any action. This allows you to
214 globally activate or deactivate a shell you're using with a single call.
214 globally activate or deactivate a shell you're using with a single call.
215
215
216 If you need to manually"""
216 If you need to manually"""
217
217
218 if dummy not in [0,1,False,True]:
218 if dummy not in [0,1,False,True]:
219 raise ValueError,'dummy parameter must be boolean'
219 raise ValueError,'dummy parameter must be boolean'
220 self.__dummy_mode = dummy
220 self.__dummy_mode = dummy
221
221
222 def get_dummy_mode(self):
222 def get_dummy_mode(self):
223 """Return the current value of the dummy mode parameter.
223 """Return the current value of the dummy mode parameter.
224 """
224 """
225 return self.__dummy_mode
225 return self.__dummy_mode
226
226
227 def set_banner(self,banner):
227 def set_banner(self,banner):
228 """Sets the global banner.
228 """Sets the global banner.
229
229
230 This banner gets prepended to every header printed when the shell
230 This banner gets prepended to every header printed when the shell
231 instance is called."""
231 instance is called."""
232
232
233 self.banner = banner
233 self.banner = banner
234
234
235 def set_exit_msg(self,exit_msg):
235 def set_exit_msg(self,exit_msg):
236 """Sets the global exit_msg.
236 """Sets the global exit_msg.
237
237
238 This exit message gets printed upon exiting every time the embedded
238 This exit message gets printed upon exiting every time the embedded
239 shell is called. It is None by default. """
239 shell is called. It is None by default. """
240
240
241 self.exit_msg = exit_msg
241 self.exit_msg = exit_msg
242
242
243 #-----------------------------------------------------------------------------
243 #-----------------------------------------------------------------------------
244 def sigint_handler (signum,stack_frame):
244 def sigint_handler (signum,stack_frame):
245 """Sigint handler for threaded apps.
245 """Sigint handler for threaded apps.
246
246
247 This is a horrible hack to pass information about SIGINT _without_ using
247 This is a horrible hack to pass information about SIGINT _without_ using
248 exceptions, since I haven't been able to properly manage cross-thread
248 exceptions, since I haven't been able to properly manage cross-thread
249 exceptions in GTK/WX. In fact, I don't think it can be done (or at least
249 exceptions in GTK/WX. In fact, I don't think it can be done (or at least
250 that's my understanding from a c.l.py thread where this was discussed)."""
250 that's my understanding from a c.l.py thread where this was discussed)."""
251
251
252 global KBINT
252 global KBINT
253
253
254 print '\nKeyboardInterrupt - Press <Enter> to continue.',
254 print '\nKeyboardInterrupt - Press <Enter> to continue.',
255 Term.cout.flush()
255 Term.cout.flush()
256 # Set global flag so that runsource can know that Ctrl-C was hit
256 # Set global flag so that runsource can know that Ctrl-C was hit
257 KBINT = True
257 KBINT = True
258
258
259 class MTInteractiveShell(InteractiveShell):
259 class MTInteractiveShell(InteractiveShell):
260 """Simple multi-threaded shell."""
260 """Simple multi-threaded shell."""
261
261
262 # Threading strategy taken from:
262 # Threading strategy taken from:
263 # http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/65109, by Brian
263 # http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/65109, by Brian
264 # McErlean and John Finlay. Modified with corrections by Antoon Pardon,
264 # McErlean and John Finlay. Modified with corrections by Antoon Pardon,
265 # from the pygtk mailing list, to avoid lockups with system calls.
265 # from the pygtk mailing list, to avoid lockups with system calls.
266
266
267 # class attribute to indicate whether the class supports threads or not.
267 # class attribute to indicate whether the class supports threads or not.
268 # Subclasses with thread support should override this as needed.
268 # Subclasses with thread support should override this as needed.
269 isthreaded = True
269 isthreaded = True
270
270
271 def __init__(self,name,usage=None,rc=Struct(opts=None,args=None),
271 def __init__(self,name,usage=None,rc=Struct(opts=None,args=None),
272 user_ns=None,user_global_ns=None,banner2='',**kw):
272 user_ns=None,user_global_ns=None,banner2='',**kw):
273 """Similar to the normal InteractiveShell, but with threading control"""
273 """Similar to the normal InteractiveShell, but with threading control"""
274
274
275 InteractiveShell.__init__(self,name,usage,rc,user_ns,
275 InteractiveShell.__init__(self,name,usage,rc,user_ns,
276 user_global_ns,banner2)
276 user_global_ns,banner2)
277
277
278 # Locking control variable. We need to use a norma lock, not an RLock
278 # Locking control variable. We need to use a norma lock, not an RLock
279 # here. I'm not exactly sure why, it seems to me like it should be
279 # here. I'm not exactly sure why, it seems to me like it should be
280 # the opposite, but we deadlock with an RLock. Puzzled...
280 # the opposite, but we deadlock with an RLock. Puzzled...
281 self.thread_ready = threading.Condition(threading.Lock())
281 self.thread_ready = threading.Condition(threading.Lock())
282
282
283 # A queue to hold the code to be executed. A scalar variable is NOT
283 # A queue to hold the code to be executed. A scalar variable is NOT
284 # enough, because uses like macros cause reentrancy.
284 # enough, because uses like macros cause reentrancy.
285 self.code_queue = Queue.Queue()
285 self.code_queue = Queue.Queue()
286
286
287 # Stuff to do at closing time
287 # Stuff to do at closing time
288 self._kill = False
288 self._kill = False
289 on_kill = kw.get('on_kill')
289 on_kill = kw.get('on_kill')
290 if on_kill is None:
290 if on_kill is None:
291 on_kill = []
291 on_kill = []
292 # Check that all things to kill are callable:
292 # Check that all things to kill are callable:
293 for t in on_kill:
293 for t in on_kill:
294 if not callable(t):
294 if not callable(t):
295 raise TypeError,'on_kill must be a list of callables'
295 raise TypeError,'on_kill must be a list of callables'
296 self.on_kill = on_kill
296 self.on_kill = on_kill
297
297
298 def runsource(self, source, filename="<input>", symbol="single"):
298 def runsource(self, source, filename="<input>", symbol="single"):
299 """Compile and run some source in the interpreter.
299 """Compile and run some source in the interpreter.
300
300
301 Modified version of code.py's runsource(), to handle threading issues.
301 Modified version of code.py's runsource(), to handle threading issues.
302 See the original for full docstring details."""
302 See the original for full docstring details."""
303
303
304 global KBINT
304 global KBINT
305
305
306 # If Ctrl-C was typed, we reset the flag and return right away
306 # If Ctrl-C was typed, we reset the flag and return right away
307 if KBINT:
307 if KBINT:
308 KBINT = False
308 KBINT = False
309 return False
309 return False
310
310
311 try:
311 try:
312 code = self.compile(source, filename, symbol)
312 code = self.compile(source, filename, symbol)
313 except (OverflowError, SyntaxError, ValueError):
313 except (OverflowError, SyntaxError, ValueError):
314 # Case 1
314 # Case 1
315 self.showsyntaxerror(filename)
315 self.showsyntaxerror(filename)
316 return False
316 return False
317
317
318 if code is None:
318 if code is None:
319 # Case 2
319 # Case 2
320 return True
320 return True
321
321
322 # Case 3
322 # Case 3
323 # Store code in queue, so the execution thread can handle it.
323 # Store code in queue, so the execution thread can handle it.
324
324
325 # Note that with macros and other applications, we MAY re-enter this
325 # Note that with macros and other applications, we MAY re-enter this
326 # section, so we have to acquire the lock with non-blocking semantics,
326 # section, so we have to acquire the lock with non-blocking semantics,
327 # else we deadlock.
327 # else we deadlock.
328 got_lock = self.thread_ready.acquire(False)
328 got_lock = self.thread_ready.acquire(False)
329 self.code_queue.put(code)
329 self.code_queue.put(code)
330 if got_lock:
330 if got_lock:
331 self.thread_ready.wait() # Wait until processed in timeout interval
331 self.thread_ready.wait() # Wait until processed in timeout interval
332 self.thread_ready.release()
332 self.thread_ready.release()
333
333
334 return False
334 return False
335
335
336 def runcode(self):
336 def runcode(self):
337 """Execute a code object.
337 """Execute a code object.
338
338
339 Multithreaded wrapper around IPython's runcode()."""
339 Multithreaded wrapper around IPython's runcode()."""
340
340
341 # lock thread-protected stuff
341 # lock thread-protected stuff
342 got_lock = self.thread_ready.acquire(False)
342 got_lock = self.thread_ready.acquire(False)
343
343
344 # Install sigint handler
344 # Install sigint handler
345 try:
345 try:
346 signal.signal(signal.SIGINT, sigint_handler)
346 signal.signal(signal.SIGINT, sigint_handler)
347 except SystemError:
347 except SystemError:
348 # This happens under Windows, which seems to have all sorts
348 # This happens under Windows, which seems to have all sorts
349 # of problems with signal handling. Oh well...
349 # of problems with signal handling. Oh well...
350 pass
350 pass
351
351
352 if self._kill:
352 if self._kill:
353 print >>Term.cout, 'Closing threads...',
353 print >>Term.cout, 'Closing threads...',
354 Term.cout.flush()
354 Term.cout.flush()
355 for tokill in self.on_kill:
355 for tokill in self.on_kill:
356 tokill()
356 tokill()
357 print >>Term.cout, 'Done.'
357 print >>Term.cout, 'Done.'
358
358
359 # Flush queue of pending code by calling the run methood of the parent
359 # Flush queue of pending code by calling the run methood of the parent
360 # class with all items which may be in the queue.
360 # class with all items which may be in the queue.
361 while 1:
361 while 1:
362 try:
362 try:
363 code_to_run = self.code_queue.get_nowait()
363 code_to_run = self.code_queue.get_nowait()
364 except Queue.Empty:
364 except Queue.Empty:
365 break
365 break
366 if got_lock:
366 if got_lock:
367 self.thread_ready.notify()
367 self.thread_ready.notify()
368 InteractiveShell.runcode(self,code_to_run)
368 InteractiveShell.runcode(self,code_to_run)
369 else:
369 else:
370 break
370 break
371
371
372 # We're done with thread-protected variables
372 # We're done with thread-protected variables
373 if got_lock:
373 if got_lock:
374 self.thread_ready.release()
374 self.thread_ready.release()
375 # This MUST return true for gtk threading to work
375 # This MUST return true for gtk threading to work
376 return True
376 return True
377
377
378 def kill(self):
378 def kill(self):
379 """Kill the thread, returning when it has been shut down."""
379 """Kill the thread, returning when it has been shut down."""
380 got_lock = self.thread_ready.acquire(False)
380 got_lock = self.thread_ready.acquire(False)
381 self._kill = True
381 self._kill = True
382 if got_lock:
382 if got_lock:
383 self.thread_ready.release()
383 self.thread_ready.release()
384
384
385 class MatplotlibShellBase:
385 class MatplotlibShellBase:
386 """Mixin class to provide the necessary modifications to regular IPython
386 """Mixin class to provide the necessary modifications to regular IPython
387 shell classes for matplotlib support.
387 shell classes for matplotlib support.
388
388
389 Given Python's MRO, this should be used as the FIRST class in the
389 Given Python's MRO, this should be used as the FIRST class in the
390 inheritance hierarchy, so that it overrides the relevant methods."""
390 inheritance hierarchy, so that it overrides the relevant methods."""
391
391
392 def _matplotlib_config(self,name,user_ns):
392 def _matplotlib_config(self,name,user_ns):
393 """Return items needed to setup the user's shell with matplotlib"""
393 """Return items needed to setup the user's shell with matplotlib"""
394
394
395 # Initialize matplotlib to interactive mode always
395 # Initialize matplotlib to interactive mode always
396 import matplotlib
396 import matplotlib
397 from matplotlib import backends
397 from matplotlib import backends
398 matplotlib.interactive(True)
398 matplotlib.interactive(True)
399
399
400 def use(arg):
400 def use(arg):
401 """IPython wrapper for matplotlib's backend switcher.
401 """IPython wrapper for matplotlib's backend switcher.
402
402
403 In interactive use, we can not allow switching to a different
403 In interactive use, we can not allow switching to a different
404 interactive backend, since thread conflicts will most likely crash
404 interactive backend, since thread conflicts will most likely crash
405 the python interpreter. This routine does a safety check first,
405 the python interpreter. This routine does a safety check first,
406 and refuses to perform a dangerous switch. It still allows
406 and refuses to perform a dangerous switch. It still allows
407 switching to non-interactive backends."""
407 switching to non-interactive backends."""
408
408
409 if arg in backends.interactive_bk and arg != self.mpl_backend:
409 if arg in backends.interactive_bk and arg != self.mpl_backend:
410 m=('invalid matplotlib backend switch.\n'
410 m=('invalid matplotlib backend switch.\n'
411 'This script attempted to switch to the interactive '
411 'This script attempted to switch to the interactive '
412 'backend: `%s`\n'
412 'backend: `%s`\n'
413 'Your current choice of interactive backend is: `%s`\n\n'
413 'Your current choice of interactive backend is: `%s`\n\n'
414 'Switching interactive matplotlib backends at runtime\n'
414 'Switching interactive matplotlib backends at runtime\n'
415 'would crash the python interpreter, '
415 'would crash the python interpreter, '
416 'and IPython has blocked it.\n\n'
416 'and IPython has blocked it.\n\n'
417 'You need to either change your choice of matplotlib backend\n'
417 'You need to either change your choice of matplotlib backend\n'
418 'by editing your .matplotlibrc file, or run this script as a \n'
418 'by editing your .matplotlibrc file, or run this script as a \n'
419 'standalone file from the command line, not using IPython.\n' %
419 'standalone file from the command line, not using IPython.\n' %
420 (arg,self.mpl_backend) )
420 (arg,self.mpl_backend) )
421 raise RuntimeError, m
421 raise RuntimeError, m
422 else:
422 else:
423 self.mpl_use(arg)
423 self.mpl_use(arg)
424 self.mpl_use._called = True
424 self.mpl_use._called = True
425
425
426 self.matplotlib = matplotlib
426 self.matplotlib = matplotlib
427 self.mpl_backend = matplotlib.rcParams['backend']
427 self.mpl_backend = matplotlib.rcParams['backend']
428
428
429 # we also need to block switching of interactive backends by use()
429 # we also need to block switching of interactive backends by use()
430 self.mpl_use = matplotlib.use
430 self.mpl_use = matplotlib.use
431 self.mpl_use._called = False
431 self.mpl_use._called = False
432 # overwrite the original matplotlib.use with our wrapper
432 # overwrite the original matplotlib.use with our wrapper
433 matplotlib.use = use
433 matplotlib.use = use
434
434
435 # This must be imported last in the matplotlib series, after
435 # This must be imported last in the matplotlib series, after
436 # backend/interactivity choices have been made
436 # backend/interactivity choices have been made
437 import matplotlib.pylab as pylab
437 import matplotlib.pylab as pylab
438 self.pylab = pylab
438 self.pylab = pylab
439
439
440 self.pylab.show._needmain = False
440 self.pylab.show._needmain = False
441 # We need to detect at runtime whether show() is called by the user.
441 # We need to detect at runtime whether show() is called by the user.
442 # For this, we wrap it into a decorator which adds a 'called' flag.
442 # For this, we wrap it into a decorator which adds a 'called' flag.
443 self.pylab.draw_if_interactive = flag_calls(self.pylab.draw_if_interactive)
443 self.pylab.draw_if_interactive = flag_calls(self.pylab.draw_if_interactive)
444
444
445 # Build a user namespace initialized with matplotlib/matlab features.
445 # Build a user namespace initialized with matplotlib/matlab features.
446 user_ns = IPython.ipapi.make_user_ns(user_ns)
446 user_ns = IPython.ipapi.make_user_ns(user_ns)
447
447
448 exec ("import matplotlib\n"
448 exec ("import matplotlib\n"
449 "import matplotlib.pylab as pylab\n"
449 "import matplotlib.pylab as pylab\n") in user_ns
450 "from matplotlib.pylab import *") in user_ns
451
450
452 # Build matplotlib info banner
451 # Build matplotlib info banner
453 b="""
452 b="""
454 Welcome to pylab, a matplotlib-based Python environment.
453 Welcome to pylab, a matplotlib-based Python environment.
455 For more information, type 'help(pylab)'.
454 For more information, type 'help(pylab)'.
456 """
455 """
457 return user_ns,b
456 return user_ns,b
458
457
459 def mplot_exec(self,fname,*where,**kw):
458 def mplot_exec(self,fname,*where,**kw):
460 """Execute a matplotlib script.
459 """Execute a matplotlib script.
461
460
462 This is a call to execfile(), but wrapped in safeties to properly
461 This is a call to execfile(), but wrapped in safeties to properly
463 handle interactive rendering and backend switching."""
462 handle interactive rendering and backend switching."""
464
463
465 #print '*** Matplotlib runner ***' # dbg
464 #print '*** Matplotlib runner ***' # dbg
466 # turn off rendering until end of script
465 # turn off rendering until end of script
467 isInteractive = self.matplotlib.rcParams['interactive']
466 isInteractive = self.matplotlib.rcParams['interactive']
468 self.matplotlib.interactive(False)
467 self.matplotlib.interactive(False)
469 self.safe_execfile(fname,*where,**kw)
468 self.safe_execfile(fname,*where,**kw)
470 self.matplotlib.interactive(isInteractive)
469 self.matplotlib.interactive(isInteractive)
471 # make rendering call now, if the user tried to do it
470 # make rendering call now, if the user tried to do it
472 if self.pylab.draw_if_interactive.called:
471 if self.pylab.draw_if_interactive.called:
473 self.pylab.draw()
472 self.pylab.draw()
474 self.pylab.draw_if_interactive.called = False
473 self.pylab.draw_if_interactive.called = False
475
474
476 # if a backend switch was performed, reverse it now
475 # if a backend switch was performed, reverse it now
477 if self.mpl_use._called:
476 if self.mpl_use._called:
478 self.matplotlib.rcParams['backend'] = self.mpl_backend
477 self.matplotlib.rcParams['backend'] = self.mpl_backend
479
478
480 def magic_run(self,parameter_s=''):
479 def magic_run(self,parameter_s=''):
481 Magic.magic_run(self,parameter_s,runner=self.mplot_exec)
480 Magic.magic_run(self,parameter_s,runner=self.mplot_exec)
482
481
483 # Fix the docstring so users see the original as well
482 # Fix the docstring so users see the original as well
484 magic_run.__doc__ = "%s\n%s" % (Magic.magic_run.__doc__,
483 magic_run.__doc__ = "%s\n%s" % (Magic.magic_run.__doc__,
485 "\n *** Modified %run for Matplotlib,"
484 "\n *** Modified %run for Matplotlib,"
486 " with proper interactive handling ***")
485 " with proper interactive handling ***")
487
486
488 # Now we provide 2 versions of a matplotlib-aware IPython base shells, single
487 # Now we provide 2 versions of a matplotlib-aware IPython base shells, single
489 # and multithreaded. Note that these are meant for internal use, the IPShell*
488 # and multithreaded. Note that these are meant for internal use, the IPShell*
490 # classes below are the ones meant for public consumption.
489 # classes below are the ones meant for public consumption.
491
490
492 class MatplotlibShell(MatplotlibShellBase,InteractiveShell):
491 class MatplotlibShell(MatplotlibShellBase,InteractiveShell):
493 """Single-threaded shell with matplotlib support."""
492 """Single-threaded shell with matplotlib support."""
494
493
495 def __init__(self,name,usage=None,rc=Struct(opts=None,args=None),
494 def __init__(self,name,usage=None,rc=Struct(opts=None,args=None),
496 user_ns=None,user_global_ns=None,**kw):
495 user_ns=None,user_global_ns=None,**kw):
497 user_ns,b2 = self._matplotlib_config(name,user_ns)
496 user_ns,b2 = self._matplotlib_config(name,user_ns)
498 InteractiveShell.__init__(self,name,usage,rc,user_ns,user_global_ns,
497 InteractiveShell.__init__(self,name,usage,rc,user_ns,user_global_ns,
499 banner2=b2,**kw)
498 banner2=b2,**kw)
500
499
501 class MatplotlibMTShell(MatplotlibShellBase,MTInteractiveShell):
500 class MatplotlibMTShell(MatplotlibShellBase,MTInteractiveShell):
502 """Multi-threaded shell with matplotlib support."""
501 """Multi-threaded shell with matplotlib support."""
503
502
504 def __init__(self,name,usage=None,rc=Struct(opts=None,args=None),
503 def __init__(self,name,usage=None,rc=Struct(opts=None,args=None),
505 user_ns=None,user_global_ns=None, **kw):
504 user_ns=None,user_global_ns=None, **kw):
506 user_ns,b2 = self._matplotlib_config(name,user_ns)
505 user_ns,b2 = self._matplotlib_config(name,user_ns)
507 MTInteractiveShell.__init__(self,name,usage,rc,user_ns,user_global_ns,
506 MTInteractiveShell.__init__(self,name,usage,rc,user_ns,user_global_ns,
508 banner2=b2,**kw)
507 banner2=b2,**kw)
509
508
510 #-----------------------------------------------------------------------------
509 #-----------------------------------------------------------------------------
511 # Utility functions for the different GUI enabled IPShell* classes.
510 # Utility functions for the different GUI enabled IPShell* classes.
512
511
513 def get_tk():
512 def get_tk():
514 """Tries to import Tkinter and returns a withdrawn Tkinter root
513 """Tries to import Tkinter and returns a withdrawn Tkinter root
515 window. If Tkinter is already imported or not available, this
514 window. If Tkinter is already imported or not available, this
516 returns None. This function calls `hijack_tk` underneath.
515 returns None. This function calls `hijack_tk` underneath.
517 """
516 """
518 if not USE_TK or sys.modules.has_key('Tkinter'):
517 if not USE_TK or sys.modules.has_key('Tkinter'):
519 return None
518 return None
520 else:
519 else:
521 try:
520 try:
522 import Tkinter
521 import Tkinter
523 except ImportError:
522 except ImportError:
524 return None
523 return None
525 else:
524 else:
526 hijack_tk()
525 hijack_tk()
527 r = Tkinter.Tk()
526 r = Tkinter.Tk()
528 r.withdraw()
527 r.withdraw()
529 return r
528 return r
530
529
531 def hijack_tk():
530 def hijack_tk():
532 """Modifies Tkinter's mainloop with a dummy so when a module calls
531 """Modifies Tkinter's mainloop with a dummy so when a module calls
533 mainloop, it does not block.
532 mainloop, it does not block.
534
533
535 """
534 """
536 def misc_mainloop(self, n=0):
535 def misc_mainloop(self, n=0):
537 pass
536 pass
538 def tkinter_mainloop(n=0):
537 def tkinter_mainloop(n=0):
539 pass
538 pass
540
539
541 import Tkinter
540 import Tkinter
542 Tkinter.Misc.mainloop = misc_mainloop
541 Tkinter.Misc.mainloop = misc_mainloop
543 Tkinter.mainloop = tkinter_mainloop
542 Tkinter.mainloop = tkinter_mainloop
544
543
545 def update_tk(tk):
544 def update_tk(tk):
546 """Updates the Tkinter event loop. This is typically called from
545 """Updates the Tkinter event loop. This is typically called from
547 the respective WX or GTK mainloops.
546 the respective WX or GTK mainloops.
548 """
547 """
549 if tk:
548 if tk:
550 tk.update()
549 tk.update()
551
550
552 def hijack_wx():
551 def hijack_wx():
553 """Modifies wxPython's MainLoop with a dummy so user code does not
552 """Modifies wxPython's MainLoop with a dummy so user code does not
554 block IPython. The hijacked mainloop function is returned.
553 block IPython. The hijacked mainloop function is returned.
555 """
554 """
556 def dummy_mainloop(*args, **kw):
555 def dummy_mainloop(*args, **kw):
557 pass
556 pass
558
557
559 try:
558 try:
560 import wx
559 import wx
561 except ImportError:
560 except ImportError:
562 # For very old versions of WX
561 # For very old versions of WX
563 import wxPython as wx
562 import wxPython as wx
564
563
565 ver = wx.__version__
564 ver = wx.__version__
566 orig_mainloop = None
565 orig_mainloop = None
567 if ver[:3] >= '2.5':
566 if ver[:3] >= '2.5':
568 import wx
567 import wx
569 if hasattr(wx, '_core_'): core = getattr(wx, '_core_')
568 if hasattr(wx, '_core_'): core = getattr(wx, '_core_')
570 elif hasattr(wx, '_core'): core = getattr(wx, '_core')
569 elif hasattr(wx, '_core'): core = getattr(wx, '_core')
571 else: raise AttributeError('Could not find wx core module')
570 else: raise AttributeError('Could not find wx core module')
572 orig_mainloop = core.PyApp_MainLoop
571 orig_mainloop = core.PyApp_MainLoop
573 core.PyApp_MainLoop = dummy_mainloop
572 core.PyApp_MainLoop = dummy_mainloop
574 elif ver[:3] == '2.4':
573 elif ver[:3] == '2.4':
575 orig_mainloop = wx.wxc.wxPyApp_MainLoop
574 orig_mainloop = wx.wxc.wxPyApp_MainLoop
576 wx.wxc.wxPyApp_MainLoop = dummy_mainloop
575 wx.wxc.wxPyApp_MainLoop = dummy_mainloop
577 else:
576 else:
578 warn("Unable to find either wxPython version 2.4 or >= 2.5.")
577 warn("Unable to find either wxPython version 2.4 or >= 2.5.")
579 return orig_mainloop
578 return orig_mainloop
580
579
581 def hijack_gtk():
580 def hijack_gtk():
582 """Modifies pyGTK's mainloop with a dummy so user code does not
581 """Modifies pyGTK's mainloop with a dummy so user code does not
583 block IPython. This function returns the original `gtk.mainloop`
582 block IPython. This function returns the original `gtk.mainloop`
584 function that has been hijacked.
583 function that has been hijacked.
585 """
584 """
586 def dummy_mainloop(*args, **kw):
585 def dummy_mainloop(*args, **kw):
587 pass
586 pass
588 import gtk
587 import gtk
589 if gtk.pygtk_version >= (2,4,0): orig_mainloop = gtk.main
588 if gtk.pygtk_version >= (2,4,0): orig_mainloop = gtk.main
590 else: orig_mainloop = gtk.mainloop
589 else: orig_mainloop = gtk.mainloop
591 gtk.mainloop = dummy_mainloop
590 gtk.mainloop = dummy_mainloop
592 gtk.main = dummy_mainloop
591 gtk.main = dummy_mainloop
593 return orig_mainloop
592 return orig_mainloop
594
593
595 #-----------------------------------------------------------------------------
594 #-----------------------------------------------------------------------------
596 # The IPShell* classes below are the ones meant to be run by external code as
595 # The IPShell* classes below are the ones meant to be run by external code as
597 # IPython instances. Note that unless a specific threading strategy is
596 # IPython instances. Note that unless a specific threading strategy is
598 # desired, the factory function start() below should be used instead (it
597 # desired, the factory function start() below should be used instead (it
599 # selects the proper threaded class).
598 # selects the proper threaded class).
600
599
601 class IPShellGTK(threading.Thread):
600 class IPShellGTK(threading.Thread):
602 """Run a gtk mainloop() in a separate thread.
601 """Run a gtk mainloop() in a separate thread.
603
602
604 Python commands can be passed to the thread where they will be executed.
603 Python commands can be passed to the thread where they will be executed.
605 This is implemented by periodically checking for passed code using a
604 This is implemented by periodically checking for passed code using a
606 GTK timeout callback."""
605 GTK timeout callback."""
607
606
608 TIMEOUT = 100 # Millisecond interval between timeouts.
607 TIMEOUT = 100 # Millisecond interval between timeouts.
609
608
610 def __init__(self,argv=None,user_ns=None,user_global_ns=None,
609 def __init__(self,argv=None,user_ns=None,user_global_ns=None,
611 debug=1,shell_class=MTInteractiveShell):
610 debug=1,shell_class=MTInteractiveShell):
612
611
613 import gtk
612 import gtk
614
613
615 self.gtk = gtk
614 self.gtk = gtk
616 self.gtk_mainloop = hijack_gtk()
615 self.gtk_mainloop = hijack_gtk()
617
616
618 # Allows us to use both Tk and GTK.
617 # Allows us to use both Tk and GTK.
619 self.tk = get_tk()
618 self.tk = get_tk()
620
619
621 if gtk.pygtk_version >= (2,4,0): mainquit = self.gtk.main_quit
620 if gtk.pygtk_version >= (2,4,0): mainquit = self.gtk.main_quit
622 else: mainquit = self.gtk.mainquit
621 else: mainquit = self.gtk.mainquit
623
622
624 self.IP = make_IPython(argv,user_ns=user_ns,
623 self.IP = make_IPython(argv,user_ns=user_ns,
625 user_global_ns=user_global_ns,
624 user_global_ns=user_global_ns,
626 debug=debug,
625 debug=debug,
627 shell_class=shell_class,
626 shell_class=shell_class,
628 on_kill=[mainquit])
627 on_kill=[mainquit])
629
628
630 # HACK: slot for banner in self; it will be passed to the mainloop
629 # HACK: slot for banner in self; it will be passed to the mainloop
631 # method only and .run() needs it. The actual value will be set by
630 # method only and .run() needs it. The actual value will be set by
632 # .mainloop().
631 # .mainloop().
633 self._banner = None
632 self._banner = None
634
633
635 threading.Thread.__init__(self)
634 threading.Thread.__init__(self)
636
635
637 def run(self):
636 def run(self):
638 self.IP.mainloop(self._banner)
637 self.IP.mainloop(self._banner)
639 self.IP.kill()
638 self.IP.kill()
640
639
641 def mainloop(self,sys_exit=0,banner=None):
640 def mainloop(self,sys_exit=0,banner=None):
642
641
643 self._banner = banner
642 self._banner = banner
644
643
645 if self.gtk.pygtk_version >= (2,4,0):
644 if self.gtk.pygtk_version >= (2,4,0):
646 import gobject
645 import gobject
647 gobject.idle_add(self.on_timer)
646 gobject.idle_add(self.on_timer)
648 else:
647 else:
649 self.gtk.idle_add(self.on_timer)
648 self.gtk.idle_add(self.on_timer)
650
649
651 if sys.platform != 'win32':
650 if sys.platform != 'win32':
652 try:
651 try:
653 if self.gtk.gtk_version[0] >= 2:
652 if self.gtk.gtk_version[0] >= 2:
654 self.gtk.gdk.threads_init()
653 self.gtk.gdk.threads_init()
655 except AttributeError:
654 except AttributeError:
656 pass
655 pass
657 except RuntimeError:
656 except RuntimeError:
658 error('Your pyGTK likely has not been compiled with '
657 error('Your pyGTK likely has not been compiled with '
659 'threading support.\n'
658 'threading support.\n'
660 'The exception printout is below.\n'
659 'The exception printout is below.\n'
661 'You can either rebuild pyGTK with threads, or '
660 'You can either rebuild pyGTK with threads, or '
662 'try using \n'
661 'try using \n'
663 'matplotlib with a different backend (like Tk or WX).\n'
662 'matplotlib with a different backend (like Tk or WX).\n'
664 'Note that matplotlib will most likely not work in its '
663 'Note that matplotlib will most likely not work in its '
665 'current state!')
664 'current state!')
666 self.IP.InteractiveTB()
665 self.IP.InteractiveTB()
667
666
668 self.start()
667 self.start()
669 self.gtk.gdk.threads_enter()
668 self.gtk.gdk.threads_enter()
670 self.gtk_mainloop()
669 self.gtk_mainloop()
671 self.gtk.gdk.threads_leave()
670 self.gtk.gdk.threads_leave()
672 self.join()
671 self.join()
673
672
674 def on_timer(self):
673 def on_timer(self):
675 """Called when GTK is idle.
674 """Called when GTK is idle.
676
675
677 Must return True always, otherwise GTK stops calling it"""
676 Must return True always, otherwise GTK stops calling it"""
678
677
679 update_tk(self.tk)
678 update_tk(self.tk)
680 self.IP.runcode()
679 self.IP.runcode()
681 time.sleep(0.01)
680 time.sleep(0.01)
682 return True
681 return True
683
682
684 class IPShellWX(threading.Thread):
683 class IPShellWX(threading.Thread):
685 """Run a wx mainloop() in a separate thread.
684 """Run a wx mainloop() in a separate thread.
686
685
687 Python commands can be passed to the thread where they will be executed.
686 Python commands can be passed to the thread where they will be executed.
688 This is implemented by periodically checking for passed code using a
687 This is implemented by periodically checking for passed code using a
689 GTK timeout callback."""
688 GTK timeout callback."""
690
689
691 TIMEOUT = 100 # Millisecond interval between timeouts.
690 TIMEOUT = 100 # Millisecond interval between timeouts.
692
691
693 def __init__(self,argv=None,user_ns=None,user_global_ns=None,
692 def __init__(self,argv=None,user_ns=None,user_global_ns=None,
694 debug=1,shell_class=MTInteractiveShell):
693 debug=1,shell_class=MTInteractiveShell):
695
694
696 self.IP = make_IPython(argv,user_ns=user_ns,
695 self.IP = make_IPython(argv,user_ns=user_ns,
697 user_global_ns=user_global_ns,
696 user_global_ns=user_global_ns,
698 debug=debug,
697 debug=debug,
699 shell_class=shell_class,
698 shell_class=shell_class,
700 on_kill=[self.wxexit])
699 on_kill=[self.wxexit])
701
700
702 wantedwxversion=self.IP.rc.wxversion
701 wantedwxversion=self.IP.rc.wxversion
703 if wantedwxversion!="0":
702 if wantedwxversion!="0":
704 try:
703 try:
705 import wxversion
704 import wxversion
706 except ImportError:
705 except ImportError:
707 error('The wxversion module is needed for WX version selection')
706 error('The wxversion module is needed for WX version selection')
708 else:
707 else:
709 try:
708 try:
710 wxversion.select(wantedwxversion)
709 wxversion.select(wantedwxversion)
711 except:
710 except:
712 self.IP.InteractiveTB()
711 self.IP.InteractiveTB()
713 error('Requested wxPython version %s could not be loaded' %
712 error('Requested wxPython version %s could not be loaded' %
714 wantedwxversion)
713 wantedwxversion)
715
714
716 import wx
715 import wx
717
716
718 threading.Thread.__init__(self)
717 threading.Thread.__init__(self)
719 self.wx = wx
718 self.wx = wx
720 self.wx_mainloop = hijack_wx()
719 self.wx_mainloop = hijack_wx()
721
720
722 # Allows us to use both Tk and GTK.
721 # Allows us to use both Tk and GTK.
723 self.tk = get_tk()
722 self.tk = get_tk()
724
723
725
724
726 # HACK: slot for banner in self; it will be passed to the mainloop
725 # HACK: slot for banner in self; it will be passed to the mainloop
727 # method only and .run() needs it. The actual value will be set by
726 # method only and .run() needs it. The actual value will be set by
728 # .mainloop().
727 # .mainloop().
729 self._banner = None
728 self._banner = None
730
729
731 self.app = None
730 self.app = None
732
731
733 def wxexit(self, *args):
732 def wxexit(self, *args):
734 if self.app is not None:
733 if self.app is not None:
735 self.app.agent.timer.Stop()
734 self.app.agent.timer.Stop()
736 self.app.ExitMainLoop()
735 self.app.ExitMainLoop()
737
736
738 def run(self):
737 def run(self):
739 self.IP.mainloop(self._banner)
738 self.IP.mainloop(self._banner)
740 self.IP.kill()
739 self.IP.kill()
741
740
742 def mainloop(self,sys_exit=0,banner=None):
741 def mainloop(self,sys_exit=0,banner=None):
743
742
744 self._banner = banner
743 self._banner = banner
745
744
746 self.start()
745 self.start()
747
746
748 class TimerAgent(self.wx.MiniFrame):
747 class TimerAgent(self.wx.MiniFrame):
749 wx = self.wx
748 wx = self.wx
750 IP = self.IP
749 IP = self.IP
751 tk = self.tk
750 tk = self.tk
752 def __init__(self, parent, interval):
751 def __init__(self, parent, interval):
753 style = self.wx.DEFAULT_FRAME_STYLE | self.wx.TINY_CAPTION_HORIZ
752 style = self.wx.DEFAULT_FRAME_STYLE | self.wx.TINY_CAPTION_HORIZ
754 self.wx.MiniFrame.__init__(self, parent, -1, ' ', pos=(200, 200),
753 self.wx.MiniFrame.__init__(self, parent, -1, ' ', pos=(200, 200),
755 size=(100, 100),style=style)
754 size=(100, 100),style=style)
756 self.Show(False)
755 self.Show(False)
757 self.interval = interval
756 self.interval = interval
758 self.timerId = self.wx.NewId()
757 self.timerId = self.wx.NewId()
759
758
760 def StartWork(self):
759 def StartWork(self):
761 self.timer = self.wx.Timer(self, self.timerId)
760 self.timer = self.wx.Timer(self, self.timerId)
762 self.wx.EVT_TIMER(self, self.timerId, self.OnTimer)
761 self.wx.EVT_TIMER(self, self.timerId, self.OnTimer)
763 self.timer.Start(self.interval)
762 self.timer.Start(self.interval)
764
763
765 def OnTimer(self, event):
764 def OnTimer(self, event):
766 update_tk(self.tk)
765 update_tk(self.tk)
767 self.IP.runcode()
766 self.IP.runcode()
768
767
769 class App(self.wx.App):
768 class App(self.wx.App):
770 wx = self.wx
769 wx = self.wx
771 TIMEOUT = self.TIMEOUT
770 TIMEOUT = self.TIMEOUT
772 def OnInit(self):
771 def OnInit(self):
773 'Create the main window and insert the custom frame'
772 'Create the main window and insert the custom frame'
774 self.agent = TimerAgent(None, self.TIMEOUT)
773 self.agent = TimerAgent(None, self.TIMEOUT)
775 self.agent.Show(False)
774 self.agent.Show(False)
776 self.agent.StartWork()
775 self.agent.StartWork()
777 return True
776 return True
778
777
779 self.app = App(redirect=False)
778 self.app = App(redirect=False)
780 self.wx_mainloop(self.app)
779 self.wx_mainloop(self.app)
781 self.join()
780 self.join()
782
781
783
782
784 class IPShellQt(threading.Thread):
783 class IPShellQt(threading.Thread):
785 """Run a Qt event loop in a separate thread.
784 """Run a Qt event loop in a separate thread.
786
785
787 Python commands can be passed to the thread where they will be executed.
786 Python commands can be passed to the thread where they will be executed.
788 This is implemented by periodically checking for passed code using a
787 This is implemented by periodically checking for passed code using a
789 Qt timer / slot."""
788 Qt timer / slot."""
790
789
791 TIMEOUT = 100 # Millisecond interval between timeouts.
790 TIMEOUT = 100 # Millisecond interval between timeouts.
792
791
793 def __init__(self,argv=None,user_ns=None,user_global_ns=None,
792 def __init__(self,argv=None,user_ns=None,user_global_ns=None,
794 debug=0,shell_class=MTInteractiveShell):
793 debug=0,shell_class=MTInteractiveShell):
795
794
796 import qt
795 import qt
797
796
798 class newQApplication:
797 class newQApplication:
799 def __init__( self ):
798 def __init__( self ):
800 self.QApplication = qt.QApplication
799 self.QApplication = qt.QApplication
801
800
802 def __call__( *args, **kwargs ):
801 def __call__( *args, **kwargs ):
803 return qt.qApp
802 return qt.qApp
804
803
805 def exec_loop( *args, **kwargs ):
804 def exec_loop( *args, **kwargs ):
806 pass
805 pass
807
806
808 def __getattr__( self, name ):
807 def __getattr__( self, name ):
809 return getattr( self.QApplication, name )
808 return getattr( self.QApplication, name )
810
809
811 qt.QApplication = newQApplication()
810 qt.QApplication = newQApplication()
812
811
813 # Allows us to use both Tk and QT.
812 # Allows us to use both Tk and QT.
814 self.tk = get_tk()
813 self.tk = get_tk()
815
814
816 self.IP = make_IPython(argv,user_ns=user_ns,
815 self.IP = make_IPython(argv,user_ns=user_ns,
817 user_global_ns=user_global_ns,
816 user_global_ns=user_global_ns,
818 debug=debug,
817 debug=debug,
819 shell_class=shell_class,
818 shell_class=shell_class,
820 on_kill=[qt.qApp.exit])
819 on_kill=[qt.qApp.exit])
821
820
822 # HACK: slot for banner in self; it will be passed to the mainloop
821 # HACK: slot for banner in self; it will be passed to the mainloop
823 # method only and .run() needs it. The actual value will be set by
822 # method only and .run() needs it. The actual value will be set by
824 # .mainloop().
823 # .mainloop().
825 self._banner = None
824 self._banner = None
826
825
827 threading.Thread.__init__(self)
826 threading.Thread.__init__(self)
828
827
829 def run(self):
828 def run(self):
830 self.IP.mainloop(self._banner)
829 self.IP.mainloop(self._banner)
831 self.IP.kill()
830 self.IP.kill()
832
831
833 def mainloop(self,sys_exit=0,banner=None):
832 def mainloop(self,sys_exit=0,banner=None):
834
833
835 import qt
834 import qt
836
835
837 self._banner = banner
836 self._banner = banner
838
837
839 if qt.QApplication.startingUp():
838 if qt.QApplication.startingUp():
840 a = qt.QApplication.QApplication(sys.argv)
839 a = qt.QApplication.QApplication(sys.argv)
841 self.timer = qt.QTimer()
840 self.timer = qt.QTimer()
842 qt.QObject.connect( self.timer, qt.SIGNAL( 'timeout()' ), self.on_timer )
841 qt.QObject.connect( self.timer, qt.SIGNAL( 'timeout()' ), self.on_timer )
843
842
844 self.start()
843 self.start()
845 self.timer.start( self.TIMEOUT, True )
844 self.timer.start( self.TIMEOUT, True )
846 while True:
845 while True:
847 if self.IP._kill: break
846 if self.IP._kill: break
848 qt.qApp.exec_loop()
847 qt.qApp.exec_loop()
849 self.join()
848 self.join()
850
849
851 def on_timer(self):
850 def on_timer(self):
852 update_tk(self.tk)
851 update_tk(self.tk)
853 result = self.IP.runcode()
852 result = self.IP.runcode()
854 self.timer.start( self.TIMEOUT, True )
853 self.timer.start( self.TIMEOUT, True )
855 return result
854 return result
856
855
857
856
858 class IPShellQt4(threading.Thread):
857 class IPShellQt4(threading.Thread):
859 """Run a Qt event loop in a separate thread.
858 """Run a Qt event loop in a separate thread.
860
859
861 Python commands can be passed to the thread where they will be executed.
860 Python commands can be passed to the thread where they will be executed.
862 This is implemented by periodically checking for passed code using a
861 This is implemented by periodically checking for passed code using a
863 Qt timer / slot."""
862 Qt timer / slot."""
864
863
865 TIMEOUT = 100 # Millisecond interval between timeouts.
864 TIMEOUT = 100 # Millisecond interval between timeouts.
866
865
867 def __init__(self,argv=None,user_ns=None,user_global_ns=None,
866 def __init__(self,argv=None,user_ns=None,user_global_ns=None,
868 debug=0,shell_class=MTInteractiveShell):
867 debug=0,shell_class=MTInteractiveShell):
869
868
870 from PyQt4 import QtCore, QtGui
869 from PyQt4 import QtCore, QtGui
871
870
872 class newQApplication:
871 class newQApplication:
873 def __init__( self ):
872 def __init__( self ):
874 self.QApplication = QtGui.QApplication
873 self.QApplication = QtGui.QApplication
875
874
876 def __call__( *args, **kwargs ):
875 def __call__( *args, **kwargs ):
877 return QtGui.qApp
876 return QtGui.qApp
878
877
879 def exec_loop( *args, **kwargs ):
878 def exec_loop( *args, **kwargs ):
880 pass
879 pass
881
880
882 def __getattr__( self, name ):
881 def __getattr__( self, name ):
883 return getattr( self.QApplication, name )
882 return getattr( self.QApplication, name )
884
883
885 QtGui.QApplication = newQApplication()
884 QtGui.QApplication = newQApplication()
886
885
887 # Allows us to use both Tk and QT.
886 # Allows us to use both Tk and QT.
888 self.tk = get_tk()
887 self.tk = get_tk()
889
888
890 self.IP = make_IPython(argv,user_ns=user_ns,
889 self.IP = make_IPython(argv,user_ns=user_ns,
891 user_global_ns=user_global_ns,
890 user_global_ns=user_global_ns,
892 debug=debug,
891 debug=debug,
893 shell_class=shell_class,
892 shell_class=shell_class,
894 on_kill=[QtGui.qApp.exit])
893 on_kill=[QtGui.qApp.exit])
895
894
896 # HACK: slot for banner in self; it will be passed to the mainloop
895 # HACK: slot for banner in self; it will be passed to the mainloop
897 # method only and .run() needs it. The actual value will be set by
896 # method only and .run() needs it. The actual value will be set by
898 # .mainloop().
897 # .mainloop().
899 self._banner = None
898 self._banner = None
900
899
901 threading.Thread.__init__(self)
900 threading.Thread.__init__(self)
902
901
903 def run(self):
902 def run(self):
904 self.IP.mainloop(self._banner)
903 self.IP.mainloop(self._banner)
905 self.IP.kill()
904 self.IP.kill()
906
905
907 def mainloop(self,sys_exit=0,banner=None):
906 def mainloop(self,sys_exit=0,banner=None):
908
907
909 from PyQt4 import QtCore, QtGui
908 from PyQt4 import QtCore, QtGui
910
909
911 self._banner = banner
910 self._banner = banner
912
911
913 if QtGui.QApplication.startingUp():
912 if QtGui.QApplication.startingUp():
914 a = QtGui.QApplication.QApplication(sys.argv)
913 a = QtGui.QApplication.QApplication(sys.argv)
915 self.timer = QtCore.QTimer()
914 self.timer = QtCore.QTimer()
916 QtCore.QObject.connect( self.timer, QtCore.SIGNAL( 'timeout()' ), self.on_timer )
915 QtCore.QObject.connect( self.timer, QtCore.SIGNAL( 'timeout()' ), self.on_timer )
917
916
918 self.start()
917 self.start()
919 self.timer.start( self.TIMEOUT )
918 self.timer.start( self.TIMEOUT )
920 while True:
919 while True:
921 if self.IP._kill: break
920 if self.IP._kill: break
922 QtGui.qApp.exec_()
921 QtGui.qApp.exec_()
923 self.join()
922 self.join()
924
923
925 def on_timer(self):
924 def on_timer(self):
926 update_tk(self.tk)
925 update_tk(self.tk)
927 result = self.IP.runcode()
926 result = self.IP.runcode()
928 self.timer.start( self.TIMEOUT )
927 self.timer.start( self.TIMEOUT )
929 return result
928 return result
930
929
931
930
932 # A set of matplotlib public IPython shell classes, for single-threaded
931 # A set of matplotlib public IPython shell classes, for single-threaded
933 # (Tk* and FLTK* backends) and multithreaded (GTK* and WX* backends) use.
932 # (Tk* and FLTK* backends) and multithreaded (GTK* and WX* backends) use.
933 def _load_pylab(user_ns):
934 """Allow users to disable pulling all of pylab into the top-level
935 namespace.
936
937 This little utility must be called AFTER the actual ipython instance is
938 running, since only then will the options file have been fully parsed."""
939
940 ip = IPython.ipapi.get()
941 if ip.options.pylab_import_all:
942 exec "from matplotlib.pylab import *" in user_ns
943
934 class IPShellMatplotlib(IPShell):
944 class IPShellMatplotlib(IPShell):
935 """Subclass IPShell with MatplotlibShell as the internal shell.
945 """Subclass IPShell with MatplotlibShell as the internal shell.
936
946
937 Single-threaded class, meant for the Tk* and FLTK* backends.
947 Single-threaded class, meant for the Tk* and FLTK* backends.
938
948
939 Having this on a separate class simplifies the external driver code."""
949 Having this on a separate class simplifies the external driver code."""
940
950
941 def __init__(self,argv=None,user_ns=None,user_global_ns=None,debug=1):
951 def __init__(self,argv=None,user_ns=None,user_global_ns=None,debug=1):
942 IPShell.__init__(self,argv,user_ns,user_global_ns,debug,
952 IPShell.__init__(self,argv,user_ns,user_global_ns,debug,
943 shell_class=MatplotlibShell)
953 shell_class=MatplotlibShell)
954 _load_pylab(user_ns)
944
955
945 class IPShellMatplotlibGTK(IPShellGTK):
956 class IPShellMatplotlibGTK(IPShellGTK):
946 """Subclass IPShellGTK with MatplotlibMTShell as the internal shell.
957 """Subclass IPShellGTK with MatplotlibMTShell as the internal shell.
947
958
948 Multi-threaded class, meant for the GTK* backends."""
959 Multi-threaded class, meant for the GTK* backends."""
949
960
950 def __init__(self,argv=None,user_ns=None,user_global_ns=None,debug=1):
961 def __init__(self,argv=None,user_ns=None,user_global_ns=None,debug=1):
951 IPShellGTK.__init__(self,argv,user_ns,user_global_ns,debug,
962 IPShellGTK.__init__(self,argv,user_ns,user_global_ns,debug,
952 shell_class=MatplotlibMTShell)
963 shell_class=MatplotlibMTShell)
964 _load_pylab(user_ns)
953
965
954 class IPShellMatplotlibWX(IPShellWX):
966 class IPShellMatplotlibWX(IPShellWX):
955 """Subclass IPShellWX with MatplotlibMTShell as the internal shell.
967 """Subclass IPShellWX with MatplotlibMTShell as the internal shell.
956
968
957 Multi-threaded class, meant for the WX* backends."""
969 Multi-threaded class, meant for the WX* backends."""
958
970
959 def __init__(self,argv=None,user_ns=None,user_global_ns=None,debug=1):
971 def __init__(self,argv=None,user_ns=None,user_global_ns=None,debug=1):
960 IPShellWX.__init__(self,argv,user_ns,user_global_ns,debug,
972 IPShellWX.__init__(self,argv,user_ns,user_global_ns,debug,
961 shell_class=MatplotlibMTShell)
973 shell_class=MatplotlibMTShell)
974 _load_pylab(user_ns)
962
975
963 class IPShellMatplotlibQt(IPShellQt):
976 class IPShellMatplotlibQt(IPShellQt):
964 """Subclass IPShellQt with MatplotlibMTShell as the internal shell.
977 """Subclass IPShellQt with MatplotlibMTShell as the internal shell.
965
978
966 Multi-threaded class, meant for the Qt* backends."""
979 Multi-threaded class, meant for the Qt* backends."""
967
980
968 def __init__(self,argv=None,user_ns=None,user_global_ns=None,debug=1):
981 def __init__(self,argv=None,user_ns=None,user_global_ns=None,debug=1):
969 IPShellQt.__init__(self,argv,user_ns,user_global_ns,debug,
982 IPShellQt.__init__(self,argv,user_ns,user_global_ns,debug,
970 shell_class=MatplotlibMTShell)
983 shell_class=MatplotlibMTShell)
984 _load_pylab(user_ns)
971
985
972 class IPShellMatplotlibQt4(IPShellQt4):
986 class IPShellMatplotlibQt4(IPShellQt4):
973 """Subclass IPShellQt4 with MatplotlibMTShell as the internal shell.
987 """Subclass IPShellQt4 with MatplotlibMTShell as the internal shell.
974
988
975 Multi-threaded class, meant for the Qt4* backends."""
989 Multi-threaded class, meant for the Qt4* backends."""
976
990
977 def __init__(self,argv=None,user_ns=None,user_global_ns=None,debug=1):
991 def __init__(self,argv=None,user_ns=None,user_global_ns=None,debug=1):
978 IPShellQt4.__init__(self,argv,user_ns,user_global_ns,debug,
992 IPShellQt4.__init__(self,argv,user_ns,user_global_ns,debug,
979 shell_class=MatplotlibMTShell)
993 shell_class=MatplotlibMTShell)
994 _load_pylab(user_ns)
980
995
981 #-----------------------------------------------------------------------------
996 #-----------------------------------------------------------------------------
982 # Factory functions to actually start the proper thread-aware shell
997 # Factory functions to actually start the proper thread-aware shell
983
998
984 def _matplotlib_shell_class():
999 def _matplotlib_shell_class():
985 """Factory function to handle shell class selection for matplotlib.
1000 """Factory function to handle shell class selection for matplotlib.
986
1001
987 The proper shell class to use depends on the matplotlib backend, since
1002 The proper shell class to use depends on the matplotlib backend, since
988 each backend requires a different threading strategy."""
1003 each backend requires a different threading strategy."""
989
1004
990 try:
1005 try:
991 import matplotlib
1006 import matplotlib
992 except ImportError:
1007 except ImportError:
993 error('matplotlib could NOT be imported! Starting normal IPython.')
1008 error('matplotlib could NOT be imported! Starting normal IPython.')
994 sh_class = IPShell
1009 sh_class = IPShell
995 else:
1010 else:
996 backend = matplotlib.rcParams['backend']
1011 backend = matplotlib.rcParams['backend']
997 if backend.startswith('GTK'):
1012 if backend.startswith('GTK'):
998 sh_class = IPShellMatplotlibGTK
1013 sh_class = IPShellMatplotlibGTK
999 elif backend.startswith('WX'):
1014 elif backend.startswith('WX'):
1000 sh_class = IPShellMatplotlibWX
1015 sh_class = IPShellMatplotlibWX
1001 elif backend.startswith('Qt4'):
1016 elif backend.startswith('Qt4'):
1002 sh_class = IPShellMatplotlibQt4
1017 sh_class = IPShellMatplotlibQt4
1003 elif backend.startswith('Qt'):
1018 elif backend.startswith('Qt'):
1004 sh_class = IPShellMatplotlibQt
1019 sh_class = IPShellMatplotlibQt
1005 else:
1020 else:
1006 sh_class = IPShellMatplotlib
1021 sh_class = IPShellMatplotlib
1007 #print 'Using %s with the %s backend.' % (sh_class,backend) # dbg
1022 #print 'Using %s with the %s backend.' % (sh_class,backend) # dbg
1008 return sh_class
1023 return sh_class
1009
1024
1010 # This is the one which should be called by external code.
1025 # This is the one which should be called by external code.
1011 def start(user_ns = None):
1026 def start(user_ns = None):
1012 """Return a running shell instance, dealing with threading options.
1027 """Return a running shell instance, dealing with threading options.
1013
1028
1014 This is a factory function which will instantiate the proper IPython shell
1029 This is a factory function which will instantiate the proper IPython shell
1015 based on the user's threading choice. Such a selector is needed because
1030 based on the user's threading choice. Such a selector is needed because
1016 different GUI toolkits require different thread handling details."""
1031 different GUI toolkits require different thread handling details."""
1017
1032
1018 global USE_TK
1033 global USE_TK
1019 # Crude sys.argv hack to extract the threading options.
1034 # Crude sys.argv hack to extract the threading options.
1020 argv = sys.argv
1035 argv = sys.argv
1021 if len(argv) > 1:
1036 if len(argv) > 1:
1022 if len(argv) > 2:
1037 if len(argv) > 2:
1023 arg2 = argv[2]
1038 arg2 = argv[2]
1024 if arg2.endswith('-tk'):
1039 if arg2.endswith('-tk'):
1025 USE_TK = True
1040 USE_TK = True
1026 arg1 = argv[1]
1041 arg1 = argv[1]
1027 if arg1.endswith('-gthread'):
1042 if arg1.endswith('-gthread'):
1028 shell = IPShellGTK
1043 shell = IPShellGTK
1029 elif arg1.endswith( '-qthread' ):
1044 elif arg1.endswith( '-qthread' ):
1030 shell = IPShellQt
1045 shell = IPShellQt
1031 elif arg1.endswith( '-q4thread' ):
1046 elif arg1.endswith( '-q4thread' ):
1032 shell = IPShellQt4
1047 shell = IPShellQt4
1033 elif arg1.endswith('-wthread'):
1048 elif arg1.endswith('-wthread'):
1034 shell = IPShellWX
1049 shell = IPShellWX
1035 elif arg1.endswith('-pylab'):
1050 elif arg1.endswith('-pylab'):
1036 shell = _matplotlib_shell_class()
1051 shell = _matplotlib_shell_class()
1037 else:
1052 else:
1038 shell = IPShell
1053 shell = IPShell
1039 else:
1054 else:
1040 shell = IPShell
1055 shell = IPShell
1041 return shell(user_ns = user_ns)
1056 return shell(user_ns = user_ns)
1042
1057
1043 # Some aliases for backwards compatibility
1058 # Some aliases for backwards compatibility
1044 IPythonShell = IPShell
1059 IPythonShell = IPShell
1045 IPythonShellEmbed = IPShellEmbed
1060 IPythonShellEmbed = IPShellEmbed
1046 #************************ End of file <Shell.py> ***************************
1061 #************************ End of file <Shell.py> ***************************
@@ -1,623 +1,632 b''
1 # -*- Mode: Shell-Script -*- Not really, but shows comments correctly
1 # -*- Mode: Shell-Script -*- Not really, but shows comments correctly
2 # $Id: ipythonrc 1979 2006-12-12 18:50:20Z vivainio $
2 # $Id: ipythonrc 2156 2007-03-19 02:32:19Z fperez $
3
3
4 #***************************************************************************
4 #***************************************************************************
5 #
5 #
6 # Configuration file for IPython -- ipythonrc format
6 # Configuration file for IPython -- ipythonrc format
7 #
7 #
8 # ===========================================================
8 # ===========================================================
9 # Deprecation note: you should look into modifying ipy_user_conf.py (located
9 # Deprecation note: you should look into modifying ipy_user_conf.py (located
10 # in ~/.ipython or ~/_ipython, depending on your platform) instead, it's a
10 # in ~/.ipython or ~/_ipython, depending on your platform) instead, it's a
11 # more flexible and robust (and better supported!) configuration
11 # more flexible and robust (and better supported!) configuration
12 # method.
12 # method.
13 # ===========================================================
13 # ===========================================================
14 #
14 #
15 # The format of this file is simply one of 'key value' lines.
15 # The format of this file is simply one of 'key value' lines.
16 # Lines containing only whitespace at the beginning and then a # are ignored
16 # Lines containing only whitespace at the beginning and then a # are ignored
17 # as comments. But comments can NOT be put on lines with data.
17 # as comments. But comments can NOT be put on lines with data.
18
18
19 # The meaning and use of each key are explained below.
19 # The meaning and use of each key are explained below.
20
20
21 #---------------------------------------------------------------------------
21 #---------------------------------------------------------------------------
22 # Section: included files
22 # Section: included files
23
23
24 # Put one or more *config* files (with the syntax of this file) you want to
24 # Put one or more *config* files (with the syntax of this file) you want to
25 # include. For keys with a unique value the outermost file has precedence. For
25 # include. For keys with a unique value the outermost file has precedence. For
26 # keys with multiple values, they all get assembled into a list which then
26 # keys with multiple values, they all get assembled into a list which then
27 # gets loaded by IPython.
27 # gets loaded by IPython.
28
28
29 # In this file, all lists of things should simply be space-separated.
29 # In this file, all lists of things should simply be space-separated.
30
30
31 # This allows you to build hierarchies of files which recursively load
31 # This allows you to build hierarchies of files which recursively load
32 # lower-level services. If this is your main ~/.ipython/ipythonrc file, you
32 # lower-level services. If this is your main ~/.ipython/ipythonrc file, you
33 # should only keep here basic things you always want available. Then you can
33 # should only keep here basic things you always want available. Then you can
34 # include it in every other special-purpose config file you create.
34 # include it in every other special-purpose config file you create.
35 include
35 include
36
36
37 #---------------------------------------------------------------------------
37 #---------------------------------------------------------------------------
38 # Section: startup setup
38 # Section: startup setup
39
39
40 # These are mostly things which parallel a command line option of the same
40 # These are mostly things which parallel a command line option of the same
41 # name.
41 # name.
42
42
43 # Keys in this section should only appear once. If any key from this section
43 # Keys in this section should only appear once. If any key from this section
44 # is encountered more than once, the last value remains, all earlier ones get
44 # is encountered more than once, the last value remains, all earlier ones get
45 # discarded.
45 # discarded.
46
46
47
47
48 # Automatic calling of callable objects. If set to 1 or 2, callable objects
48 # Automatic calling of callable objects. If set to 1 or 2, callable objects
49 # are automatically called when invoked at the command line, even if you don't
49 # are automatically called when invoked at the command line, even if you don't
50 # type parentheses. IPython adds the parentheses for you. For example:
50 # type parentheses. IPython adds the parentheses for you. For example:
51
51
52 #In [1]: str 45
52 #In [1]: str 45
53 #------> str(45)
53 #------> str(45)
54 #Out[1]: '45'
54 #Out[1]: '45'
55
55
56 # IPython reprints your line with '---->' indicating that it added
56 # IPython reprints your line with '---->' indicating that it added
57 # parentheses. While this option is very convenient for interactive use, it
57 # parentheses. While this option is very convenient for interactive use, it
58 # may occasionally cause problems with objects which have side-effects if
58 # may occasionally cause problems with objects which have side-effects if
59 # called unexpectedly.
59 # called unexpectedly.
60
60
61 # The valid values for autocall are:
61 # The valid values for autocall are:
62
62
63 # autocall 0 -> disabled (you can toggle it at runtime with the %autocall magic)
63 # autocall 0 -> disabled (you can toggle it at runtime with the %autocall magic)
64
64
65 # autocall 1 -> active, but do not apply if there are no arguments on the line.
65 # autocall 1 -> active, but do not apply if there are no arguments on the line.
66
66
67 # In this mode, you get:
67 # In this mode, you get:
68
68
69 #In [1]: callable
69 #In [1]: callable
70 #Out[1]: <built-in function callable>
70 #Out[1]: <built-in function callable>
71
71
72 #In [2]: callable 'hello'
72 #In [2]: callable 'hello'
73 #------> callable('hello')
73 #------> callable('hello')
74 #Out[2]: False
74 #Out[2]: False
75
75
76 # 2 -> Active always. Even if no arguments are present, the callable object
76 # 2 -> Active always. Even if no arguments are present, the callable object
77 # is called:
77 # is called:
78
78
79 #In [4]: callable
79 #In [4]: callable
80 #------> callable()
80 #------> callable()
81
81
82 # Note that even with autocall off, you can still use '/' at the start of a
82 # Note that even with autocall off, you can still use '/' at the start of a
83 # line to treat the first argument on the command line as a function and add
83 # line to treat the first argument on the command line as a function and add
84 # parentheses to it:
84 # parentheses to it:
85
85
86 #In [8]: /str 43
86 #In [8]: /str 43
87 #------> str(43)
87 #------> str(43)
88 #Out[8]: '43'
88 #Out[8]: '43'
89
89
90 autocall 1
90 autocall 1
91
91
92 # Auto-edit syntax errors. When you use the %edit magic in ipython to edit
92 # Auto-edit syntax errors. When you use the %edit magic in ipython to edit
93 # source code (see the 'editor' variable below), it is possible that you save
93 # source code (see the 'editor' variable below), it is possible that you save
94 # a file with syntax errors in it. If this variable is true, IPython will ask
94 # a file with syntax errors in it. If this variable is true, IPython will ask
95 # you whether to re-open the editor immediately to correct such an error.
95 # you whether to re-open the editor immediately to correct such an error.
96
96
97 autoedit_syntax 0
97 autoedit_syntax 0
98
98
99 # Auto-indent. IPython can recognize lines ending in ':' and indent the next
99 # Auto-indent. IPython can recognize lines ending in ':' and indent the next
100 # line, while also un-indenting automatically after 'raise' or 'return'.
100 # line, while also un-indenting automatically after 'raise' or 'return'.
101
101
102 # This feature uses the readline library, so it will honor your ~/.inputrc
102 # This feature uses the readline library, so it will honor your ~/.inputrc
103 # configuration (or whatever file your INPUTRC variable points to). Adding
103 # configuration (or whatever file your INPUTRC variable points to). Adding
104 # the following lines to your .inputrc file can make indent/unindenting more
104 # the following lines to your .inputrc file can make indent/unindenting more
105 # convenient (M-i indents, M-u unindents):
105 # convenient (M-i indents, M-u unindents):
106
106
107 # $if Python
107 # $if Python
108 # "\M-i": " "
108 # "\M-i": " "
109 # "\M-u": "\d\d\d\d"
109 # "\M-u": "\d\d\d\d"
110 # $endif
110 # $endif
111
111
112 # The feature is potentially a bit dangerous, because it can cause problems
112 # The feature is potentially a bit dangerous, because it can cause problems
113 # with pasting of indented code (the pasted code gets re-indented on each
113 # with pasting of indented code (the pasted code gets re-indented on each
114 # line). But it's a huge time-saver when working interactively. The magic
114 # line). But it's a huge time-saver when working interactively. The magic
115 # function %autoindent allows you to toggle it on/off at runtime.
115 # function %autoindent allows you to toggle it on/off at runtime.
116
116
117 autoindent 1
117 autoindent 1
118
118
119 # Auto-magic. This gives you access to all the magic functions without having
119 # Auto-magic. This gives you access to all the magic functions without having
120 # to prepend them with an % sign. If you define a variable with the same name
120 # to prepend them with an % sign. If you define a variable with the same name
121 # as a magic function (say who=1), you will need to access the magic function
121 # as a magic function (say who=1), you will need to access the magic function
122 # with % (%who in this example). However, if later you delete your variable
122 # with % (%who in this example). However, if later you delete your variable
123 # (del who), you'll recover the automagic calling form.
123 # (del who), you'll recover the automagic calling form.
124
124
125 # Considering that many magic functions provide a lot of shell-like
125 # Considering that many magic functions provide a lot of shell-like
126 # functionality, automagic gives you something close to a full Python+system
126 # functionality, automagic gives you something close to a full Python+system
127 # shell environment (and you can extend it further if you want).
127 # shell environment (and you can extend it further if you want).
128
128
129 automagic 1
129 automagic 1
130
130
131 # Size of the output cache. After this many entries are stored, the cache will
131 # Size of the output cache. After this many entries are stored, the cache will
132 # get flushed. Depending on the size of your intermediate calculations, you
132 # get flushed. Depending on the size of your intermediate calculations, you
133 # may have memory problems if you make it too big, since keeping things in the
133 # may have memory problems if you make it too big, since keeping things in the
134 # cache prevents Python from reclaiming the memory for old results. Experiment
134 # cache prevents Python from reclaiming the memory for old results. Experiment
135 # with a value that works well for you.
135 # with a value that works well for you.
136
136
137 # If you choose cache_size 0 IPython will revert to python's regular >>>
137 # If you choose cache_size 0 IPython will revert to python's regular >>>
138 # unnumbered prompt. You will still have _, __ and ___ for your last three
138 # unnumbered prompt. You will still have _, __ and ___ for your last three
139 # results, but that will be it. No dynamic _1, _2, etc. will be created. If
139 # results, but that will be it. No dynamic _1, _2, etc. will be created. If
140 # you are running on a slow machine or with very limited memory, this may
140 # you are running on a slow machine or with very limited memory, this may
141 # help.
141 # help.
142
142
143 cache_size 1000
143 cache_size 1000
144
144
145 # Classic mode: Setting 'classic 1' you lose many of IPython niceties,
145 # Classic mode: Setting 'classic 1' you lose many of IPython niceties,
146 # but that's your choice! Classic 1 -> same as IPython -classic.
146 # but that's your choice! Classic 1 -> same as IPython -classic.
147 # Note that this is _not_ the normal python interpreter, it's simply
147 # Note that this is _not_ the normal python interpreter, it's simply
148 # IPython emulating most of the classic interpreter's behavior.
148 # IPython emulating most of the classic interpreter's behavior.
149 classic 0
149 classic 0
150
150
151 # colors - Coloring option for prompts and traceback printouts.
151 # colors - Coloring option for prompts and traceback printouts.
152
152
153 # Currently available schemes: NoColor, Linux, LightBG.
153 # Currently available schemes: NoColor, Linux, LightBG.
154
154
155 # This option allows coloring the prompts and traceback printouts. This
155 # This option allows coloring the prompts and traceback printouts. This
156 # requires a terminal which can properly handle color escape sequences. If you
156 # requires a terminal which can properly handle color escape sequences. If you
157 # are having problems with this, use the NoColor scheme (uses no color escapes
157 # are having problems with this, use the NoColor scheme (uses no color escapes
158 # at all).
158 # at all).
159
159
160 # The Linux option works well in linux console type environments: dark
160 # The Linux option works well in linux console type environments: dark
161 # background with light fonts.
161 # background with light fonts.
162
162
163 # LightBG is similar to Linux but swaps dark/light colors to be more readable
163 # LightBG is similar to Linux but swaps dark/light colors to be more readable
164 # in light background terminals.
164 # in light background terminals.
165
165
166 # keep uncommented only the one you want:
166 # keep uncommented only the one you want:
167 colors Linux
167 colors Linux
168 #colors LightBG
168 #colors LightBG
169 #colors NoColor
169 #colors NoColor
170
170
171 ########################
171 ########################
172 # Note to Windows users
172 # Note to Windows users
173 #
173 #
174 # Color and readline support is avaialble to Windows users via Gary Bishop's
174 # Color and readline support is avaialble to Windows users via Gary Bishop's
175 # readline library. You can find Gary's tools at
175 # readline library. You can find Gary's tools at
176 # http://sourceforge.net/projects/uncpythontools.
176 # http://sourceforge.net/projects/uncpythontools.
177 # Note that his readline module requires in turn the ctypes library, available
177 # Note that his readline module requires in turn the ctypes library, available
178 # at http://starship.python.net/crew/theller/ctypes.
178 # at http://starship.python.net/crew/theller/ctypes.
179 ########################
179 ########################
180
180
181 # color_info: IPython can display information about objects via a set of
181 # color_info: IPython can display information about objects via a set of
182 # functions, and optionally can use colors for this, syntax highlighting
182 # functions, and optionally can use colors for this, syntax highlighting
183 # source code and various other elements. This information is passed through a
183 # source code and various other elements. This information is passed through a
184 # pager (it defaults to 'less' if $PAGER is not set).
184 # pager (it defaults to 'less' if $PAGER is not set).
185
185
186 # If your pager has problems, try to setting it to properly handle escapes
186 # If your pager has problems, try to setting it to properly handle escapes
187 # (see the less manpage for detail), or disable this option. The magic
187 # (see the less manpage for detail), or disable this option. The magic
188 # function %color_info allows you to toggle this interactively for testing.
188 # function %color_info allows you to toggle this interactively for testing.
189
189
190 color_info 1
190 color_info 1
191
191
192 # confirm_exit: set to 1 if you want IPython to confirm when you try to exit
192 # confirm_exit: set to 1 if you want IPython to confirm when you try to exit
193 # with an EOF (Control-d in Unix, Control-Z/Enter in Windows). Note that using
193 # with an EOF (Control-d in Unix, Control-Z/Enter in Windows). Note that using
194 # the magic functions %Exit or %Quit you can force a direct exit, bypassing
194 # the magic functions %Exit or %Quit you can force a direct exit, bypassing
195 # any confirmation.
195 # any confirmation.
196
196
197 confirm_exit 1
197 confirm_exit 1
198
198
199 # Use deep_reload() as a substitute for reload() by default. deep_reload() is
199 # Use deep_reload() as a substitute for reload() by default. deep_reload() is
200 # still available as dreload() and appears as a builtin.
200 # still available as dreload() and appears as a builtin.
201
201
202 deep_reload 0
202 deep_reload 0
203
203
204 # Which editor to use with the %edit command. If you leave this at 0, IPython
204 # Which editor to use with the %edit command. If you leave this at 0, IPython
205 # will honor your EDITOR environment variable. Since this editor is invoked on
205 # will honor your EDITOR environment variable. Since this editor is invoked on
206 # the fly by ipython and is meant for editing small code snippets, you may
206 # the fly by ipython and is meant for editing small code snippets, you may
207 # want to use a small, lightweight editor here.
207 # want to use a small, lightweight editor here.
208
208
209 # For Emacs users, setting up your Emacs server properly as described in the
209 # For Emacs users, setting up your Emacs server properly as described in the
210 # manual is a good idea. An alternative is to use jed, a very light editor
210 # manual is a good idea. An alternative is to use jed, a very light editor
211 # with much of the feel of Emacs (though not as powerful for heavy-duty work).
211 # with much of the feel of Emacs (though not as powerful for heavy-duty work).
212
212
213 editor 0
213 editor 0
214
214
215 # log 1 -> same as ipython -log. This automatically logs to ./ipython.log
215 # log 1 -> same as ipython -log. This automatically logs to ./ipython.log
216 log 0
216 log 0
217
217
218 # Same as ipython -Logfile YourLogfileName.
218 # Same as ipython -Logfile YourLogfileName.
219 # Don't use with log 1 (use one or the other)
219 # Don't use with log 1 (use one or the other)
220 logfile ''
220 logfile ''
221
221
222 # banner 0 -> same as ipython -nobanner
222 # banner 0 -> same as ipython -nobanner
223 banner 1
223 banner 1
224
224
225 # messages 0 -> same as ipython -nomessages
225 # messages 0 -> same as ipython -nomessages
226 messages 1
226 messages 1
227
227
228 # Automatically call the pdb debugger after every uncaught exception. If you
228 # Automatically call the pdb debugger after every uncaught exception. If you
229 # are used to debugging using pdb, this puts you automatically inside of it
229 # are used to debugging using pdb, this puts you automatically inside of it
230 # after any call (either in IPython or in code called by it) which triggers an
230 # after any call (either in IPython or in code called by it) which triggers an
231 # exception which goes uncaught.
231 # exception which goes uncaught.
232 pdb 0
232 pdb 0
233
233
234 # Enable the pprint module for printing. pprint tends to give a more readable
234 # Enable the pprint module for printing. pprint tends to give a more readable
235 # display (than print) for complex nested data structures.
235 # display (than print) for complex nested data structures.
236 pprint 1
236 pprint 1
237
237
238 # Prompt strings
238 # Prompt strings
239
239
240 # Most bash-like escapes can be used to customize IPython's prompts, as well as
240 # Most bash-like escapes can be used to customize IPython's prompts, as well as
241 # a few additional ones which are IPython-specific. All valid prompt escapes
241 # a few additional ones which are IPython-specific. All valid prompt escapes
242 # are described in detail in the Customization section of the IPython HTML/PDF
242 # are described in detail in the Customization section of the IPython HTML/PDF
243 # manual.
243 # manual.
244
244
245 # Use \# to represent the current prompt number, and quote them to protect
245 # Use \# to represent the current prompt number, and quote them to protect
246 # spaces.
246 # spaces.
247 prompt_in1 'In [\#]: '
247 prompt_in1 'In [\#]: '
248
248
249 # \D is replaced by as many dots as there are digits in the
249 # \D is replaced by as many dots as there are digits in the
250 # current value of \#.
250 # current value of \#.
251 prompt_in2 ' .\D.: '
251 prompt_in2 ' .\D.: '
252
252
253 prompt_out 'Out[\#]: '
253 prompt_out 'Out[\#]: '
254
254
255 # Select whether to left-pad the output prompts to match the length of the
255 # Select whether to left-pad the output prompts to match the length of the
256 # input ones. This allows you for example to use a simple '>' as an output
256 # input ones. This allows you for example to use a simple '>' as an output
257 # prompt, and yet have the output line up with the input. If set to false,
257 # prompt, and yet have the output line up with the input. If set to false,
258 # the output prompts will be unpadded (flush left).
258 # the output prompts will be unpadded (flush left).
259 prompts_pad_left 1
259 prompts_pad_left 1
260
260
261 # Pylab support: when ipython is started with the -pylab switch, by default it
262 # executes 'from matplotlib.pylab import *'. Set this variable to false if you
263 # want to disable this behavior.
264
265 # For details on pylab, see the matplotlib website:
266 # http://matplotlib.sf.net
267 pylab_import_all 1
268
269
261 # quick 1 -> same as ipython -quick
270 # quick 1 -> same as ipython -quick
262 quick 0
271 quick 0
263
272
264 # Use the readline library (1) or not (0). Most users will want this on, but
273 # Use the readline library (1) or not (0). Most users will want this on, but
265 # if you experience strange problems with line management (mainly when using
274 # if you experience strange problems with line management (mainly when using
266 # IPython inside Emacs buffers) you may try disabling it. Not having it on
275 # IPython inside Emacs buffers) you may try disabling it. Not having it on
267 # prevents you from getting command history with the arrow keys, searching and
276 # prevents you from getting command history with the arrow keys, searching and
268 # name completion using TAB.
277 # name completion using TAB.
269
278
270 readline 1
279 readline 1
271
280
272 # Screen Length: number of lines of your screen. This is used to control
281 # Screen Length: number of lines of your screen. This is used to control
273 # printing of very long strings. Strings longer than this number of lines will
282 # printing of very long strings. Strings longer than this number of lines will
274 # be paged with the less command instead of directly printed.
283 # be paged with the less command instead of directly printed.
275
284
276 # The default value for this is 0, which means IPython will auto-detect your
285 # The default value for this is 0, which means IPython will auto-detect your
277 # screen size every time it needs to print. If for some reason this isn't
286 # screen size every time it needs to print. If for some reason this isn't
278 # working well (it needs curses support), specify it yourself. Otherwise don't
287 # working well (it needs curses support), specify it yourself. Otherwise don't
279 # change the default.
288 # change the default.
280
289
281 screen_length 0
290 screen_length 0
282
291
283 # Prompt separators for input and output.
292 # Prompt separators for input and output.
284 # Use \n for newline explicitly, without quotes.
293 # Use \n for newline explicitly, without quotes.
285 # Use 0 (like at the cmd line) to turn off a given separator.
294 # Use 0 (like at the cmd line) to turn off a given separator.
286
295
287 # The structure of prompt printing is:
296 # The structure of prompt printing is:
288 # (SeparateIn)Input....
297 # (SeparateIn)Input....
289 # (SeparateOut)Output...
298 # (SeparateOut)Output...
290 # (SeparateOut2), # that is, no newline is printed after Out2
299 # (SeparateOut2), # that is, no newline is printed after Out2
291 # By choosing these you can organize your output any way you want.
300 # By choosing these you can organize your output any way you want.
292
301
293 separate_in \n
302 separate_in \n
294 separate_out 0
303 separate_out 0
295 separate_out2 0
304 separate_out2 0
296
305
297 # 'nosep 1' is a shorthand for '-SeparateIn 0 -SeparateOut 0 -SeparateOut2 0'.
306 # 'nosep 1' is a shorthand for '-SeparateIn 0 -SeparateOut 0 -SeparateOut2 0'.
298 # Simply removes all input/output separators, overriding the choices above.
307 # Simply removes all input/output separators, overriding the choices above.
299 nosep 0
308 nosep 0
300
309
301 # Wildcard searches - IPython has a system for searching names using
310 # Wildcard searches - IPython has a system for searching names using
302 # shell-like wildcards; type %psearch? for details. This variables sets
311 # shell-like wildcards; type %psearch? for details. This variables sets
303 # whether by default such searches should be case sensitive or not. You can
312 # whether by default such searches should be case sensitive or not. You can
304 # always override the default at the system command line or the IPython
313 # always override the default at the system command line or the IPython
305 # prompt.
314 # prompt.
306
315
307 wildcards_case_sensitive 1
316 wildcards_case_sensitive 1
308
317
309 # Object information: at what level of detail to display the string form of an
318 # Object information: at what level of detail to display the string form of an
310 # object. If set to 0, ipython will compute the string form of any object X,
319 # object. If set to 0, ipython will compute the string form of any object X,
311 # by calling str(X), when X? is typed. If set to 1, str(X) will only be
320 # by calling str(X), when X? is typed. If set to 1, str(X) will only be
312 # computed when X?? is given, and if set to 2 or higher, it will never be
321 # computed when X?? is given, and if set to 2 or higher, it will never be
313 # computed (there is no X??? level of detail). This is mostly of use to
322 # computed (there is no X??? level of detail). This is mostly of use to
314 # people who frequently manipulate objects whose string representation is
323 # people who frequently manipulate objects whose string representation is
315 # extremely expensive to compute.
324 # extremely expensive to compute.
316
325
317 object_info_string_level 0
326 object_info_string_level 0
318
327
319 # xmode - Exception reporting mode.
328 # xmode - Exception reporting mode.
320
329
321 # Valid modes: Plain, Context and Verbose.
330 # Valid modes: Plain, Context and Verbose.
322
331
323 # Plain: similar to python's normal traceback printing.
332 # Plain: similar to python's normal traceback printing.
324
333
325 # Context: prints 5 lines of context source code around each line in the
334 # Context: prints 5 lines of context source code around each line in the
326 # traceback.
335 # traceback.
327
336
328 # Verbose: similar to Context, but additionally prints the variables currently
337 # Verbose: similar to Context, but additionally prints the variables currently
329 # visible where the exception happened (shortening their strings if too
338 # visible where the exception happened (shortening their strings if too
330 # long). This can potentially be very slow, if you happen to have a huge data
339 # long). This can potentially be very slow, if you happen to have a huge data
331 # structure whose string representation is complex to compute. Your computer
340 # structure whose string representation is complex to compute. Your computer
332 # may appear to freeze for a while with cpu usage at 100%. If this occurs, you
341 # may appear to freeze for a while with cpu usage at 100%. If this occurs, you
333 # can cancel the traceback with Ctrl-C (maybe hitting it more than once).
342 # can cancel the traceback with Ctrl-C (maybe hitting it more than once).
334
343
335 #xmode Plain
344 #xmode Plain
336 xmode Context
345 xmode Context
337 #xmode Verbose
346 #xmode Verbose
338
347
339 # multi_line_specials: if true, allow magics, aliases and shell escapes (via
348 # multi_line_specials: if true, allow magics, aliases and shell escapes (via
340 # !cmd) to be used in multi-line input (like for loops). For example, if you
349 # !cmd) to be used in multi-line input (like for loops). For example, if you
341 # have this active, the following is valid in IPython:
350 # have this active, the following is valid in IPython:
342 #
351 #
343 #In [17]: for i in range(3):
352 #In [17]: for i in range(3):
344 # ....: mkdir $i
353 # ....: mkdir $i
345 # ....: !touch $i/hello
354 # ....: !touch $i/hello
346 # ....: ls -l $i
355 # ....: ls -l $i
347
356
348 multi_line_specials 1
357 multi_line_specials 1
349
358
350
359
351 # System calls: When IPython makes system calls (e.g. via special syntax like
360 # System calls: When IPython makes system calls (e.g. via special syntax like
352 # !cmd or !!cmd, or magics like %sc or %sx), it can print the command it is
361 # !cmd or !!cmd, or magics like %sc or %sx), it can print the command it is
353 # executing to standard output, prefixed by a header string.
362 # executing to standard output, prefixed by a header string.
354
363
355 system_header "IPython system call: "
364 system_header "IPython system call: "
356
365
357 system_verbose 1
366 system_verbose 1
358
367
359 # wxversion: request a specific wxPython version (used for -wthread)
368 # wxversion: request a specific wxPython version (used for -wthread)
360
369
361 # Set this to the value of wxPython you want to use, but note that this
370 # Set this to the value of wxPython you want to use, but note that this
362 # feature requires you to have the wxversion Python module to work. If you
371 # feature requires you to have the wxversion Python module to work. If you
363 # don't have the wxversion module (try 'import wxversion' at the prompt to
372 # don't have the wxversion module (try 'import wxversion' at the prompt to
364 # check) or simply want to leave the system to pick up the default, leave this
373 # check) or simply want to leave the system to pick up the default, leave this
365 # variable at 0.
374 # variable at 0.
366
375
367 wxversion 0
376 wxversion 0
368
377
369 #---------------------------------------------------------------------------
378 #---------------------------------------------------------------------------
370 # Section: Readline configuration (readline is not available for MS-Windows)
379 # Section: Readline configuration (readline is not available for MS-Windows)
371
380
372 # This is done via the following options:
381 # This is done via the following options:
373
382
374 # (i) readline_parse_and_bind: this option can appear as many times as you
383 # (i) readline_parse_and_bind: this option can appear as many times as you
375 # want, each time defining a string to be executed via a
384 # want, each time defining a string to be executed via a
376 # readline.parse_and_bind() command. The syntax for valid commands of this
385 # readline.parse_and_bind() command. The syntax for valid commands of this
377 # kind can be found by reading the documentation for the GNU readline library,
386 # kind can be found by reading the documentation for the GNU readline library,
378 # as these commands are of the kind which readline accepts in its
387 # as these commands are of the kind which readline accepts in its
379 # configuration file.
388 # configuration file.
380
389
381 # The TAB key can be used to complete names at the command line in one of two
390 # The TAB key can be used to complete names at the command line in one of two
382 # ways: 'complete' and 'menu-complete'. The difference is that 'complete' only
391 # ways: 'complete' and 'menu-complete'. The difference is that 'complete' only
383 # completes as much as possible while 'menu-complete' cycles through all
392 # completes as much as possible while 'menu-complete' cycles through all
384 # possible completions. Leave the one you prefer uncommented.
393 # possible completions. Leave the one you prefer uncommented.
385
394
386 readline_parse_and_bind tab: complete
395 readline_parse_and_bind tab: complete
387 #readline_parse_and_bind tab: menu-complete
396 #readline_parse_and_bind tab: menu-complete
388
397
389 # This binds Control-l to printing the list of all possible completions when
398 # This binds Control-l to printing the list of all possible completions when
390 # there is more than one (what 'complete' does when hitting TAB twice, or at
399 # there is more than one (what 'complete' does when hitting TAB twice, or at
391 # the first TAB if show-all-if-ambiguous is on)
400 # the first TAB if show-all-if-ambiguous is on)
392 readline_parse_and_bind "\C-l": possible-completions
401 readline_parse_and_bind "\C-l": possible-completions
393
402
394 # This forces readline to automatically print the above list when tab
403 # This forces readline to automatically print the above list when tab
395 # completion is set to 'complete'. You can still get this list manually by
404 # completion is set to 'complete'. You can still get this list manually by
396 # using the key bound to 'possible-completions' (Control-l by default) or by
405 # using the key bound to 'possible-completions' (Control-l by default) or by
397 # hitting TAB twice. Turning this on makes the printing happen at the first
406 # hitting TAB twice. Turning this on makes the printing happen at the first
398 # TAB.
407 # TAB.
399 readline_parse_and_bind set show-all-if-ambiguous on
408 readline_parse_and_bind set show-all-if-ambiguous on
400
409
401 # If you have TAB set to complete names, you can rebind any key (Control-o by
410 # If you have TAB set to complete names, you can rebind any key (Control-o by
402 # default) to insert a true TAB character.
411 # default) to insert a true TAB character.
403 readline_parse_and_bind "\C-o": tab-insert
412 readline_parse_and_bind "\C-o": tab-insert
404
413
405 # These commands allow you to indent/unindent easily, with the 4-space
414 # These commands allow you to indent/unindent easily, with the 4-space
406 # convention of the Python coding standards. Since IPython's internal
415 # convention of the Python coding standards. Since IPython's internal
407 # auto-indent system also uses 4 spaces, you should not change the number of
416 # auto-indent system also uses 4 spaces, you should not change the number of
408 # spaces in the code below.
417 # spaces in the code below.
409 readline_parse_and_bind "\M-i": " "
418 readline_parse_and_bind "\M-i": " "
410 readline_parse_and_bind "\M-o": "\d\d\d\d"
419 readline_parse_and_bind "\M-o": "\d\d\d\d"
411 readline_parse_and_bind "\M-I": "\d\d\d\d"
420 readline_parse_and_bind "\M-I": "\d\d\d\d"
412
421
413 # Bindings for incremental searches in the history. These searches use the
422 # Bindings for incremental searches in the history. These searches use the
414 # string typed so far on the command line and search anything in the previous
423 # string typed so far on the command line and search anything in the previous
415 # input history containing them.
424 # input history containing them.
416 readline_parse_and_bind "\C-r": reverse-search-history
425 readline_parse_and_bind "\C-r": reverse-search-history
417 readline_parse_and_bind "\C-s": forward-search-history
426 readline_parse_and_bind "\C-s": forward-search-history
418
427
419 # Bindings for completing the current line in the history of previous
428 # Bindings for completing the current line in the history of previous
420 # commands. This allows you to recall any previous command by typing its first
429 # commands. This allows you to recall any previous command by typing its first
421 # few letters and hitting Control-p, bypassing all intermediate commands which
430 # few letters and hitting Control-p, bypassing all intermediate commands which
422 # may be in the history (much faster than hitting up-arrow 50 times!)
431 # may be in the history (much faster than hitting up-arrow 50 times!)
423 readline_parse_and_bind "\C-p": history-search-backward
432 readline_parse_and_bind "\C-p": history-search-backward
424 readline_parse_and_bind "\C-n": history-search-forward
433 readline_parse_and_bind "\C-n": history-search-forward
425
434
426 # I also like to have the same functionality on the plain arrow keys. If you'd
435 # I also like to have the same functionality on the plain arrow keys. If you'd
427 # rather have the arrows use all the history (and not just match what you've
436 # rather have the arrows use all the history (and not just match what you've
428 # typed so far), comment out or delete the next two lines.
437 # typed so far), comment out or delete the next two lines.
429 readline_parse_and_bind "\e[A": history-search-backward
438 readline_parse_and_bind "\e[A": history-search-backward
430 readline_parse_and_bind "\e[B": history-search-forward
439 readline_parse_and_bind "\e[B": history-search-forward
431
440
432 # These are typically on by default under *nix, but not win32.
441 # These are typically on by default under *nix, but not win32.
433 readline_parse_and_bind "\C-k": kill-line
442 readline_parse_and_bind "\C-k": kill-line
434 readline_parse_and_bind "\C-u": unix-line-discard
443 readline_parse_and_bind "\C-u": unix-line-discard
435
444
436 # (ii) readline_remove_delims: a string of characters to be removed from the
445 # (ii) readline_remove_delims: a string of characters to be removed from the
437 # default word-delimiters list used by readline, so that completions may be
446 # default word-delimiters list used by readline, so that completions may be
438 # performed on strings which contain them.
447 # performed on strings which contain them.
439
448
440 readline_remove_delims -/~
449 readline_remove_delims -/~
441
450
442 # (iii) readline_merge_completions: whether to merge the result of all
451 # (iii) readline_merge_completions: whether to merge the result of all
443 # possible completions or not. If true, IPython will complete filenames,
452 # possible completions or not. If true, IPython will complete filenames,
444 # python names and aliases and return all possible completions. If you set it
453 # python names and aliases and return all possible completions. If you set it
445 # to false, each completer is used at a time, and only if it doesn't return
454 # to false, each completer is used at a time, and only if it doesn't return
446 # any completions is the next one used.
455 # any completions is the next one used.
447
456
448 # The default order is: [python_matches, file_matches, alias_matches]
457 # The default order is: [python_matches, file_matches, alias_matches]
449
458
450 readline_merge_completions 1
459 readline_merge_completions 1
451
460
452 # (iv) readline_omit__names: normally hitting <tab> after a '.' in a name
461 # (iv) readline_omit__names: normally hitting <tab> after a '.' in a name
453 # will complete all attributes of an object, including all the special methods
462 # will complete all attributes of an object, including all the special methods
454 # whose names start with single or double underscores (like __getitem__ or
463 # whose names start with single or double underscores (like __getitem__ or
455 # __class__).
464 # __class__).
456
465
457 # This variable allows you to control this completion behavior:
466 # This variable allows you to control this completion behavior:
458
467
459 # readline_omit__names 1 -> completion will omit showing any names starting
468 # readline_omit__names 1 -> completion will omit showing any names starting
460 # with two __, but it will still show names starting with one _.
469 # with two __, but it will still show names starting with one _.
461
470
462 # readline_omit__names 2 -> completion will omit all names beginning with one
471 # readline_omit__names 2 -> completion will omit all names beginning with one
463 # _ (which obviously means filtering out the double __ ones).
472 # _ (which obviously means filtering out the double __ ones).
464
473
465 # Even when this option is set, you can still see those names by explicitly
474 # Even when this option is set, you can still see those names by explicitly
466 # typing a _ after the period and hitting <tab>: 'name._<tab>' will always
475 # typing a _ after the period and hitting <tab>: 'name._<tab>' will always
467 # complete attribute names starting with '_'.
476 # complete attribute names starting with '_'.
468
477
469 # This option is off by default so that new users see all attributes of any
478 # This option is off by default so that new users see all attributes of any
470 # objects they are dealing with.
479 # objects they are dealing with.
471
480
472 readline_omit__names 0
481 readline_omit__names 0
473
482
474 #---------------------------------------------------------------------------
483 #---------------------------------------------------------------------------
475 # Section: modules to be loaded with 'import ...'
484 # Section: modules to be loaded with 'import ...'
476
485
477 # List, separated by spaces, the names of the modules you want to import
486 # List, separated by spaces, the names of the modules you want to import
478
487
479 # Example:
488 # Example:
480 # import_mod sys os
489 # import_mod sys os
481 # will produce internally the statements
490 # will produce internally the statements
482 # import sys
491 # import sys
483 # import os
492 # import os
484
493
485 # Each import is executed in its own try/except block, so if one module
494 # Each import is executed in its own try/except block, so if one module
486 # fails to load the others will still be ok.
495 # fails to load the others will still be ok.
487
496
488 import_mod
497 import_mod
489
498
490 #---------------------------------------------------------------------------
499 #---------------------------------------------------------------------------
491 # Section: modules to import some functions from: 'from ... import ...'
500 # Section: modules to import some functions from: 'from ... import ...'
492
501
493 # List, one per line, the modules for which you want only to import some
502 # List, one per line, the modules for which you want only to import some
494 # functions. Give the module name first and then the name of functions to be
503 # functions. Give the module name first and then the name of functions to be
495 # imported from that module.
504 # imported from that module.
496
505
497 # Example:
506 # Example:
498
507
499 # import_some IPython.genutils timing timings
508 # import_some IPython.genutils timing timings
500 # will produce internally the statement
509 # will produce internally the statement
501 # from IPython.genutils import timing, timings
510 # from IPython.genutils import timing, timings
502
511
503 # timing() and timings() are two IPython utilities for timing the execution of
512 # timing() and timings() are two IPython utilities for timing the execution of
504 # your own functions, which you may find useful. Just commment out the above
513 # your own functions, which you may find useful. Just commment out the above
505 # line if you want to test them.
514 # line if you want to test them.
506
515
507 # If you have more than one modules_some line, each gets its own try/except
516 # If you have more than one modules_some line, each gets its own try/except
508 # block (like modules, see above).
517 # block (like modules, see above).
509
518
510 import_some
519 import_some
511
520
512 #---------------------------------------------------------------------------
521 #---------------------------------------------------------------------------
513 # Section: modules to import all from : 'from ... import *'
522 # Section: modules to import all from : 'from ... import *'
514
523
515 # List (same syntax as import_mod above) those modules for which you want to
524 # List (same syntax as import_mod above) those modules for which you want to
516 # import all functions. Remember, this is a potentially dangerous thing to do,
525 # import all functions. Remember, this is a potentially dangerous thing to do,
517 # since it is very easy to overwrite names of things you need. Use with
526 # since it is very easy to overwrite names of things you need. Use with
518 # caution.
527 # caution.
519
528
520 # Example:
529 # Example:
521 # import_all sys os
530 # import_all sys os
522 # will produce internally the statements
531 # will produce internally the statements
523 # from sys import *
532 # from sys import *
524 # from os import *
533 # from os import *
525
534
526 # As before, each will be called in a separate try/except block.
535 # As before, each will be called in a separate try/except block.
527
536
528 import_all
537 import_all
529
538
530 #---------------------------------------------------------------------------
539 #---------------------------------------------------------------------------
531 # Section: Python code to execute.
540 # Section: Python code to execute.
532
541
533 # Put here code to be explicitly executed (keep it simple!)
542 # Put here code to be explicitly executed (keep it simple!)
534 # Put one line of python code per line. All whitespace is removed (this is a
543 # Put one line of python code per line. All whitespace is removed (this is a
535 # feature, not a bug), so don't get fancy building loops here.
544 # feature, not a bug), so don't get fancy building loops here.
536 # This is just for quick convenient creation of things you want available.
545 # This is just for quick convenient creation of things you want available.
537
546
538 # Example:
547 # Example:
539 # execute x = 1
548 # execute x = 1
540 # execute print 'hello world'; y = z = 'a'
549 # execute print 'hello world'; y = z = 'a'
541 # will produce internally
550 # will produce internally
542 # x = 1
551 # x = 1
543 # print 'hello world'; y = z = 'a'
552 # print 'hello world'; y = z = 'a'
544 # and each *line* (not each statement, we don't do python syntax parsing) is
553 # and each *line* (not each statement, we don't do python syntax parsing) is
545 # executed in its own try/except block.
554 # executed in its own try/except block.
546
555
547 execute
556 execute
548
557
549 # Note for the adventurous: you can use this to define your own names for the
558 # Note for the adventurous: you can use this to define your own names for the
550 # magic functions, by playing some namespace tricks:
559 # magic functions, by playing some namespace tricks:
551
560
552 # execute __IPYTHON__.magic_pf = __IPYTHON__.magic_profile
561 # execute __IPYTHON__.magic_pf = __IPYTHON__.magic_profile
553
562
554 # defines %pf as a new name for %profile.
563 # defines %pf as a new name for %profile.
555
564
556 #---------------------------------------------------------------------------
565 #---------------------------------------------------------------------------
557 # Section: Pyhton files to load and execute.
566 # Section: Pyhton files to load and execute.
558
567
559 # Put here the full names of files you want executed with execfile(file). If
568 # Put here the full names of files you want executed with execfile(file). If
560 # you want complicated initialization, just write whatever you want in a
569 # you want complicated initialization, just write whatever you want in a
561 # regular python file and load it from here.
570 # regular python file and load it from here.
562
571
563 # Filenames defined here (which *must* include the extension) are searched for
572 # Filenames defined here (which *must* include the extension) are searched for
564 # through all of sys.path. Since IPython adds your .ipython directory to
573 # through all of sys.path. Since IPython adds your .ipython directory to
565 # sys.path, they can also be placed in your .ipython dir and will be
574 # sys.path, they can also be placed in your .ipython dir and will be
566 # found. Otherwise (if you want to execute things not in .ipyton nor in
575 # found. Otherwise (if you want to execute things not in .ipyton nor in
567 # sys.path) give a full path (you can use ~, it gets expanded)
576 # sys.path) give a full path (you can use ~, it gets expanded)
568
577
569 # Example:
578 # Example:
570 # execfile file1.py ~/file2.py
579 # execfile file1.py ~/file2.py
571 # will generate
580 # will generate
572 # execfile('file1.py')
581 # execfile('file1.py')
573 # execfile('_path_to_your_home/file2.py')
582 # execfile('_path_to_your_home/file2.py')
574
583
575 # As before, each file gets its own try/except block.
584 # As before, each file gets its own try/except block.
576
585
577 execfile
586 execfile
578
587
579 # If you are feeling adventurous, you can even add functionality to IPython
588 # If you are feeling adventurous, you can even add functionality to IPython
580 # through here. IPython works through a global variable called __ip which
589 # through here. IPython works through a global variable called __ip which
581 # exists at the time when these files are read. If you know what you are doing
590 # exists at the time when these files are read. If you know what you are doing
582 # (read the source) you can add functions to __ip in files loaded here.
591 # (read the source) you can add functions to __ip in files loaded here.
583
592
584 # The file example-magic.py contains a simple but correct example. Try it:
593 # The file example-magic.py contains a simple but correct example. Try it:
585
594
586 # execfile example-magic.py
595 # execfile example-magic.py
587
596
588 # Look at the examples in IPython/iplib.py for more details on how these magic
597 # Look at the examples in IPython/iplib.py for more details on how these magic
589 # functions need to process their arguments.
598 # functions need to process their arguments.
590
599
591 #---------------------------------------------------------------------------
600 #---------------------------------------------------------------------------
592 # Section: aliases for system shell commands
601 # Section: aliases for system shell commands
593
602
594 # Here you can define your own names for system commands. The syntax is
603 # Here you can define your own names for system commands. The syntax is
595 # similar to that of the builtin %alias function:
604 # similar to that of the builtin %alias function:
596
605
597 # alias alias_name command_string
606 # alias alias_name command_string
598
607
599 # The resulting aliases are auto-generated magic functions (hence usable as
608 # The resulting aliases are auto-generated magic functions (hence usable as
600 # %alias_name)
609 # %alias_name)
601
610
602 # For example:
611 # For example:
603
612
604 # alias myls ls -la
613 # alias myls ls -la
605
614
606 # will define 'myls' as an alias for executing the system command 'ls -la'.
615 # will define 'myls' as an alias for executing the system command 'ls -la'.
607 # This allows you to customize IPython's environment to have the same aliases
616 # This allows you to customize IPython's environment to have the same aliases
608 # you are accustomed to from your own shell.
617 # you are accustomed to from your own shell.
609
618
610 # You can also define aliases with parameters using %s specifiers (one per
619 # You can also define aliases with parameters using %s specifiers (one per
611 # parameter):
620 # parameter):
612
621
613 # alias parts echo first %s second %s
622 # alias parts echo first %s second %s
614
623
615 # will give you in IPython:
624 # will give you in IPython:
616 # >>> %parts A B
625 # >>> %parts A B
617 # first A second B
626 # first A second B
618
627
619 # Use one 'alias' statement per alias you wish to define.
628 # Use one 'alias' statement per alias you wish to define.
620
629
621 # alias
630 # alias
622
631
623 #************************* end of file <ipythonrc> ************************
632 #************************* end of file <ipythonrc> ************************
@@ -1,759 +1,761 b''
1 # -*- coding: utf-8 -*-
1 # -*- coding: utf-8 -*-
2 """
2 """
3 IPython -- An enhanced Interactive Python
3 IPython -- An enhanced Interactive Python
4
4
5 Requires Python 2.1 or better.
5 Requires Python 2.1 or better.
6
6
7 This file contains the main make_IPython() starter function.
7 This file contains the main make_IPython() starter function.
8
8
9 $Id: ipmaker.py 2093 2007-02-09 21:28:58Z fperez $"""
9 $Id: ipmaker.py 2156 2007-03-19 02:32:19Z fperez $"""
10
10
11 #*****************************************************************************
11 #*****************************************************************************
12 # Copyright (C) 2001-2006 Fernando Perez. <fperez@colorado.edu>
12 # Copyright (C) 2001-2006 Fernando Perez. <fperez@colorado.edu>
13 #
13 #
14 # Distributed under the terms of the BSD License. The full license is in
14 # Distributed under the terms of the BSD License. The full license is in
15 # the file COPYING, distributed as part of this software.
15 # the file COPYING, distributed as part of this software.
16 #*****************************************************************************
16 #*****************************************************************************
17
17
18 from IPython import Release
18 from IPython import Release
19 __author__ = '%s <%s>' % Release.authors['Fernando']
19 __author__ = '%s <%s>' % Release.authors['Fernando']
20 __license__ = Release.license
20 __license__ = Release.license
21 __version__ = Release.version
21 __version__ = Release.version
22
22
23 try:
23 try:
24 credits._Printer__data = """
24 credits._Printer__data = """
25 Python: %s
25 Python: %s
26
26
27 IPython: Fernando Perez, Janko Hauser, Nathan Gray, and many users.
27 IPython: Fernando Perez, Janko Hauser, Nathan Gray, and many users.
28 See http://ipython.scipy.org for more information.""" \
28 See http://ipython.scipy.org for more information.""" \
29 % credits._Printer__data
29 % credits._Printer__data
30
30
31 copyright._Printer__data += """
31 copyright._Printer__data += """
32
32
33 Copyright (c) 2001-2004 Fernando Perez, Janko Hauser, Nathan Gray.
33 Copyright (c) 2001-2004 Fernando Perez, Janko Hauser, Nathan Gray.
34 All Rights Reserved."""
34 All Rights Reserved."""
35 except NameError:
35 except NameError:
36 # Can happen if ipython was started with 'python -S', so that site.py is
36 # Can happen if ipython was started with 'python -S', so that site.py is
37 # not loaded
37 # not loaded
38 pass
38 pass
39
39
40 #****************************************************************************
40 #****************************************************************************
41 # Required modules
41 # Required modules
42
42
43 # From the standard library
43 # From the standard library
44 import __main__
44 import __main__
45 import __builtin__
45 import __builtin__
46 import os
46 import os
47 import re
47 import re
48 import sys
48 import sys
49 import types
49 import types
50 from pprint import pprint,pformat
50 from pprint import pprint,pformat
51
51
52 # Our own
52 # Our own
53 from IPython import DPyGetOpt
53 from IPython import DPyGetOpt
54 from IPython.ipstruct import Struct
54 from IPython.ipstruct import Struct
55 from IPython.OutputTrap import OutputTrap
55 from IPython.OutputTrap import OutputTrap
56 from IPython.ConfigLoader import ConfigLoader
56 from IPython.ConfigLoader import ConfigLoader
57 from IPython.iplib import InteractiveShell
57 from IPython.iplib import InteractiveShell
58 from IPython.usage import cmd_line_usage,interactive_usage
58 from IPython.usage import cmd_line_usage,interactive_usage
59 from IPython.genutils import *
59 from IPython.genutils import *
60
60
61 #-----------------------------------------------------------------------------
61 #-----------------------------------------------------------------------------
62 def make_IPython(argv=None,user_ns=None,user_global_ns=None,debug=1,
62 def make_IPython(argv=None,user_ns=None,user_global_ns=None,debug=1,
63 rc_override=None,shell_class=InteractiveShell,
63 rc_override=None,shell_class=InteractiveShell,
64 embedded=False,**kw):
64 embedded=False,**kw):
65 """This is a dump of IPython into a single function.
65 """This is a dump of IPython into a single function.
66
66
67 Later it will have to be broken up in a sensible manner.
67 Later it will have to be broken up in a sensible manner.
68
68
69 Arguments:
69 Arguments:
70
70
71 - argv: a list similar to sys.argv[1:]. It should NOT contain the desired
71 - argv: a list similar to sys.argv[1:]. It should NOT contain the desired
72 script name, b/c DPyGetOpt strips the first argument only for the real
72 script name, b/c DPyGetOpt strips the first argument only for the real
73 sys.argv.
73 sys.argv.
74
74
75 - user_ns: a dict to be used as the user's namespace."""
75 - user_ns: a dict to be used as the user's namespace."""
76
76
77 #----------------------------------------------------------------------
77 #----------------------------------------------------------------------
78 # Defaults and initialization
78 # Defaults and initialization
79
79
80 # For developer debugging, deactivates crash handler and uses pdb.
80 # For developer debugging, deactivates crash handler and uses pdb.
81 DEVDEBUG = False
81 DEVDEBUG = False
82
82
83 if argv is None:
83 if argv is None:
84 argv = sys.argv
84 argv = sys.argv
85
85
86 # __IP is the main global that lives throughout and represents the whole
86 # __IP is the main global that lives throughout and represents the whole
87 # application. If the user redefines it, all bets are off as to what
87 # application. If the user redefines it, all bets are off as to what
88 # happens.
88 # happens.
89
89
90 # __IP is the name of he global which the caller will have accessible as
90 # __IP is the name of he global which the caller will have accessible as
91 # __IP.name. We set its name via the first parameter passed to
91 # __IP.name. We set its name via the first parameter passed to
92 # InteractiveShell:
92 # InteractiveShell:
93
93
94 IP = shell_class('__IP',user_ns=user_ns,user_global_ns=user_global_ns,
94 IP = shell_class('__IP',user_ns=user_ns,user_global_ns=user_global_ns,
95 embedded=embedded,**kw)
95 embedded=embedded,**kw)
96
96
97 # Put 'help' in the user namespace
97 # Put 'help' in the user namespace
98 from site import _Helper
98 from site import _Helper
99 IP.user_ns['help'] = _Helper()
99 IP.user_ns['help'] = _Helper()
100
100
101
101
102 if DEVDEBUG:
102 if DEVDEBUG:
103 # For developer debugging only (global flag)
103 # For developer debugging only (global flag)
104 from IPython import ultraTB
104 from IPython import ultraTB
105 sys.excepthook = ultraTB.VerboseTB(call_pdb=1)
105 sys.excepthook = ultraTB.VerboseTB(call_pdb=1)
106
106
107 IP.BANNER_PARTS = ['Python %s\n'
107 IP.BANNER_PARTS = ['Python %s\n'
108 'Type "copyright", "credits" or "license" '
108 'Type "copyright", "credits" or "license" '
109 'for more information.\n'
109 'for more information.\n'
110 % (sys.version.split('\n')[0],),
110 % (sys.version.split('\n')[0],),
111 "IPython %s -- An enhanced Interactive Python."
111 "IPython %s -- An enhanced Interactive Python."
112 % (__version__,),
112 % (__version__,),
113 """? -> Introduction to IPython's features.
113 """? -> Introduction to IPython's features.
114 %magic -> Information about IPython's 'magic' % functions.
114 %magic -> Information about IPython's 'magic' % functions.
115 help -> Python's own help system.
115 help -> Python's own help system.
116 object? -> Details about 'object'. ?object also works, ?? prints more.
116 object? -> Details about 'object'. ?object also works, ?? prints more.
117 """ ]
117 """ ]
118
118
119 IP.usage = interactive_usage
119 IP.usage = interactive_usage
120
120
121 # Platform-dependent suffix and directory names. We use _ipython instead
121 # Platform-dependent suffix and directory names. We use _ipython instead
122 # of .ipython under win32 b/c there's software that breaks with .named
122 # of .ipython under win32 b/c there's software that breaks with .named
123 # directories on that platform.
123 # directories on that platform.
124 if os.name == 'posix':
124 if os.name == 'posix':
125 rc_suffix = ''
125 rc_suffix = ''
126 ipdir_def = '.ipython'
126 ipdir_def = '.ipython'
127 else:
127 else:
128 rc_suffix = '.ini'
128 rc_suffix = '.ini'
129 ipdir_def = '_ipython'
129 ipdir_def = '_ipython'
130
130
131 # default directory for configuration
131 # default directory for configuration
132 ipythondir_def = os.path.abspath(os.environ.get('IPYTHONDIR',
132 ipythondir_def = os.path.abspath(os.environ.get('IPYTHONDIR',
133 os.path.join(IP.home_dir,ipdir_def)))
133 os.path.join(IP.home_dir,ipdir_def)))
134
134
135 sys.path.insert(0, '') # add . to sys.path. Fix from Prabhu Ramachandran
135 sys.path.insert(0, '') # add . to sys.path. Fix from Prabhu Ramachandran
136
136
137 # we need the directory where IPython itself is installed
137 # we need the directory where IPython itself is installed
138 import IPython
138 import IPython
139 IPython_dir = os.path.dirname(IPython.__file__)
139 IPython_dir = os.path.dirname(IPython.__file__)
140 del IPython
140 del IPython
141
141
142 #-------------------------------------------------------------------------
142 #-------------------------------------------------------------------------
143 # Command line handling
143 # Command line handling
144
144
145 # Valid command line options (uses DPyGetOpt syntax, like Perl's
145 # Valid command line options (uses DPyGetOpt syntax, like Perl's
146 # GetOpt::Long)
146 # GetOpt::Long)
147
147
148 # Any key not listed here gets deleted even if in the file (like session
148 # Any key not listed here gets deleted even if in the file (like session
149 # or profile). That's deliberate, to maintain the rc namespace clean.
149 # or profile). That's deliberate, to maintain the rc namespace clean.
150
150
151 # Each set of options appears twice: under _conv only the names are
151 # Each set of options appears twice: under _conv only the names are
152 # listed, indicating which type they must be converted to when reading the
152 # listed, indicating which type they must be converted to when reading the
153 # ipythonrc file. And under DPyGetOpt they are listed with the regular
153 # ipythonrc file. And under DPyGetOpt they are listed with the regular
154 # DPyGetOpt syntax (=s,=i,:f,etc).
154 # DPyGetOpt syntax (=s,=i,:f,etc).
155
155
156 # Make sure there's a space before each end of line (they get auto-joined!)
156 # Make sure there's a space before each end of line (they get auto-joined!)
157 cmdline_opts = ('autocall=i autoindent! automagic! banner! cache_size|cs=i '
157 cmdline_opts = ('autocall=i autoindent! automagic! banner! cache_size|cs=i '
158 'c=s classic|cl color_info! colors=s confirm_exit! '
158 'c=s classic|cl color_info! colors=s confirm_exit! '
159 'debug! deep_reload! editor=s log|l messages! nosep '
159 'debug! deep_reload! editor=s log|l messages! nosep '
160 'object_info_string_level=i pdb! '
160 'object_info_string_level=i pdb! '
161 'pprint! prompt_in1|pi1=s prompt_in2|pi2=s prompt_out|po=s '
161 'pprint! prompt_in1|pi1=s prompt_in2|pi2=s prompt_out|po=s '
162 'pylab_import_all! '
162 'quick screen_length|sl=i prompts_pad_left=i '
163 'quick screen_length|sl=i prompts_pad_left=i '
163 'logfile|lf=s logplay|lp=s profile|p=s '
164 'logfile|lf=s logplay|lp=s profile|p=s '
164 'readline! readline_merge_completions! '
165 'readline! readline_merge_completions! '
165 'readline_omit__names! '
166 'readline_omit__names! '
166 'rcfile=s separate_in|si=s separate_out|so=s '
167 'rcfile=s separate_in|si=s separate_out|so=s '
167 'separate_out2|so2=s xmode=s wildcards_case_sensitive! '
168 'separate_out2|so2=s xmode=s wildcards_case_sensitive! '
168 'magic_docstrings system_verbose! '
169 'magic_docstrings system_verbose! '
169 'multi_line_specials! '
170 'multi_line_specials! '
170 'term_title! wxversion=s '
171 'term_title! wxversion=s '
171 'autoedit_syntax!')
172 'autoedit_syntax!')
172
173
173 # Options that can *only* appear at the cmd line (not in rcfiles).
174 # Options that can *only* appear at the cmd line (not in rcfiles).
174
175
175 # The "ignore" option is a kludge so that Emacs buffers don't crash, since
176 # The "ignore" option is a kludge so that Emacs buffers don't crash, since
176 # the 'C-c !' command in emacs automatically appends a -i option at the end.
177 # the 'C-c !' command in emacs automatically appends a -i option at the end.
177 cmdline_only = ('help ignore|i ipythondir=s Version upgrade '
178 cmdline_only = ('help ignore|i ipythondir=s Version upgrade '
178 'gthread! qthread! q4thread! wthread! pylab! tk!')
179 'gthread! qthread! q4thread! wthread! pylab! tk!')
179
180
180 # Build the actual name list to be used by DPyGetOpt
181 # Build the actual name list to be used by DPyGetOpt
181 opts_names = qw(cmdline_opts) + qw(cmdline_only)
182 opts_names = qw(cmdline_opts) + qw(cmdline_only)
182
183
183 # Set sensible command line defaults.
184 # Set sensible command line defaults.
184 # This should have everything from cmdline_opts and cmdline_only
185 # This should have everything from cmdline_opts and cmdline_only
185 opts_def = Struct(autocall = 1,
186 opts_def = Struct(autocall = 1,
186 autoedit_syntax = 0,
187 autoedit_syntax = 0,
187 autoindent = 0,
188 autoindent = 0,
188 automagic = 1,
189 automagic = 1,
189 banner = 1,
190 banner = 1,
190 cache_size = 1000,
191 cache_size = 1000,
191 c = '',
192 c = '',
192 classic = 0,
193 classic = 0,
193 colors = 'NoColor',
194 colors = 'NoColor',
194 color_info = 0,
195 color_info = 0,
195 confirm_exit = 1,
196 confirm_exit = 1,
196 debug = 0,
197 debug = 0,
197 deep_reload = 0,
198 deep_reload = 0,
198 editor = '0',
199 editor = '0',
199 help = 0,
200 help = 0,
200 ignore = 0,
201 ignore = 0,
201 ipythondir = ipythondir_def,
202 ipythondir = ipythondir_def,
202 log = 0,
203 log = 0,
203 logfile = '',
204 logfile = '',
204 logplay = '',
205 logplay = '',
205 multi_line_specials = 1,
206 multi_line_specials = 1,
206 messages = 1,
207 messages = 1,
207 object_info_string_level = 0,
208 object_info_string_level = 0,
208 nosep = 0,
209 nosep = 0,
209 pdb = 0,
210 pdb = 0,
210 pprint = 0,
211 pprint = 0,
211 profile = '',
212 profile = '',
212 prompt_in1 = 'In [\\#]: ',
213 prompt_in1 = 'In [\\#]: ',
213 prompt_in2 = ' .\\D.: ',
214 prompt_in2 = ' .\\D.: ',
214 prompt_out = 'Out[\\#]: ',
215 prompt_out = 'Out[\\#]: ',
215 prompts_pad_left = 1,
216 prompts_pad_left = 1,
217 pylab_import_all = 1,
216 quiet = 0,
218 quiet = 0,
217 quick = 0,
219 quick = 0,
218 readline = 1,
220 readline = 1,
219 readline_merge_completions = 1,
221 readline_merge_completions = 1,
220 readline_omit__names = 0,
222 readline_omit__names = 0,
221 rcfile = 'ipythonrc' + rc_suffix,
223 rcfile = 'ipythonrc' + rc_suffix,
222 screen_length = 0,
224 screen_length = 0,
223 separate_in = '\n',
225 separate_in = '\n',
224 separate_out = '\n',
226 separate_out = '\n',
225 separate_out2 = '',
227 separate_out2 = '',
226 system_header = 'IPython system call: ',
228 system_header = 'IPython system call: ',
227 system_verbose = 0,
229 system_verbose = 0,
228 gthread = 0,
230 gthread = 0,
229 qthread = 0,
231 qthread = 0,
230 q4thread = 0,
232 q4thread = 0,
231 wthread = 0,
233 wthread = 0,
232 pylab = 0,
234 pylab = 0,
233 term_title = 1,
235 term_title = 1,
234 tk = 0,
236 tk = 0,
235 upgrade = 0,
237 upgrade = 0,
236 Version = 0,
238 Version = 0,
237 xmode = 'Verbose',
239 xmode = 'Verbose',
238 wildcards_case_sensitive = 1,
240 wildcards_case_sensitive = 1,
239 wxversion = '0',
241 wxversion = '0',
240 magic_docstrings = 0, # undocumented, for doc generation
242 magic_docstrings = 0, # undocumented, for doc generation
241 )
243 )
242
244
243 # Things that will *only* appear in rcfiles (not at the command line).
245 # Things that will *only* appear in rcfiles (not at the command line).
244 # Make sure there's a space before each end of line (they get auto-joined!)
246 # Make sure there's a space before each end of line (they get auto-joined!)
245 rcfile_opts = { qwflat: 'include import_mod import_all execfile ',
247 rcfile_opts = { qwflat: 'include import_mod import_all execfile ',
246 qw_lol: 'import_some ',
248 qw_lol: 'import_some ',
247 # for things with embedded whitespace:
249 # for things with embedded whitespace:
248 list_strings:'execute alias readline_parse_and_bind ',
250 list_strings:'execute alias readline_parse_and_bind ',
249 # Regular strings need no conversion:
251 # Regular strings need no conversion:
250 None:'readline_remove_delims ',
252 None:'readline_remove_delims ',
251 }
253 }
252 # Default values for these
254 # Default values for these
253 rc_def = Struct(include = [],
255 rc_def = Struct(include = [],
254 import_mod = [],
256 import_mod = [],
255 import_all = [],
257 import_all = [],
256 import_some = [[]],
258 import_some = [[]],
257 execute = [],
259 execute = [],
258 execfile = [],
260 execfile = [],
259 alias = [],
261 alias = [],
260 readline_parse_and_bind = [],
262 readline_parse_and_bind = [],
261 readline_remove_delims = '',
263 readline_remove_delims = '',
262 )
264 )
263
265
264 # Build the type conversion dictionary from the above tables:
266 # Build the type conversion dictionary from the above tables:
265 typeconv = rcfile_opts.copy()
267 typeconv = rcfile_opts.copy()
266 typeconv.update(optstr2types(cmdline_opts))
268 typeconv.update(optstr2types(cmdline_opts))
267
269
268 # FIXME: the None key appears in both, put that back together by hand. Ugly!
270 # FIXME: the None key appears in both, put that back together by hand. Ugly!
269 typeconv[None] += ' ' + rcfile_opts[None]
271 typeconv[None] += ' ' + rcfile_opts[None]
270
272
271 # Remove quotes at ends of all strings (used to protect spaces)
273 # Remove quotes at ends of all strings (used to protect spaces)
272 typeconv[unquote_ends] = typeconv[None]
274 typeconv[unquote_ends] = typeconv[None]
273 del typeconv[None]
275 del typeconv[None]
274
276
275 # Build the list we'll use to make all config decisions with defaults:
277 # Build the list we'll use to make all config decisions with defaults:
276 opts_all = opts_def.copy()
278 opts_all = opts_def.copy()
277 opts_all.update(rc_def)
279 opts_all.update(rc_def)
278
280
279 # Build conflict resolver for recursive loading of config files:
281 # Build conflict resolver for recursive loading of config files:
280 # - preserve means the outermost file maintains the value, it is not
282 # - preserve means the outermost file maintains the value, it is not
281 # overwritten if an included file has the same key.
283 # overwritten if an included file has the same key.
282 # - add_flip applies + to the two values, so it better make sense to add
284 # - add_flip applies + to the two values, so it better make sense to add
283 # those types of keys. But it flips them first so that things loaded
285 # those types of keys. But it flips them first so that things loaded
284 # deeper in the inclusion chain have lower precedence.
286 # deeper in the inclusion chain have lower precedence.
285 conflict = {'preserve': ' '.join([ typeconv[int],
287 conflict = {'preserve': ' '.join([ typeconv[int],
286 typeconv[unquote_ends] ]),
288 typeconv[unquote_ends] ]),
287 'add_flip': ' '.join([ typeconv[qwflat],
289 'add_flip': ' '.join([ typeconv[qwflat],
288 typeconv[qw_lol],
290 typeconv[qw_lol],
289 typeconv[list_strings] ])
291 typeconv[list_strings] ])
290 }
292 }
291
293
292 # Now actually process the command line
294 # Now actually process the command line
293 getopt = DPyGetOpt.DPyGetOpt()
295 getopt = DPyGetOpt.DPyGetOpt()
294 getopt.setIgnoreCase(0)
296 getopt.setIgnoreCase(0)
295
297
296 getopt.parseConfiguration(opts_names)
298 getopt.parseConfiguration(opts_names)
297
299
298 try:
300 try:
299 getopt.processArguments(argv)
301 getopt.processArguments(argv)
300 except:
302 except:
301 print cmd_line_usage
303 print cmd_line_usage
302 warn('\nError in Arguments: ' + `sys.exc_value`)
304 warn('\nError in Arguments: ' + `sys.exc_value`)
303 sys.exit(1)
305 sys.exit(1)
304
306
305 # convert the options dict to a struct for much lighter syntax later
307 # convert the options dict to a struct for much lighter syntax later
306 opts = Struct(getopt.optionValues)
308 opts = Struct(getopt.optionValues)
307 args = getopt.freeValues
309 args = getopt.freeValues
308
310
309 # this is the struct (which has default values at this point) with which
311 # this is the struct (which has default values at this point) with which
310 # we make all decisions:
312 # we make all decisions:
311 opts_all.update(opts)
313 opts_all.update(opts)
312
314
313 # Options that force an immediate exit
315 # Options that force an immediate exit
314 if opts_all.help:
316 if opts_all.help:
315 page(cmd_line_usage)
317 page(cmd_line_usage)
316 sys.exit()
318 sys.exit()
317
319
318 if opts_all.Version:
320 if opts_all.Version:
319 print __version__
321 print __version__
320 sys.exit()
322 sys.exit()
321
323
322 if opts_all.magic_docstrings:
324 if opts_all.magic_docstrings:
323 IP.magic_magic('-latex')
325 IP.magic_magic('-latex')
324 sys.exit()
326 sys.exit()
325
327
326 # add personal ipythondir to sys.path so that users can put things in
328 # add personal ipythondir to sys.path so that users can put things in
327 # there for customization
329 # there for customization
328 sys.path.append(os.path.abspath(opts_all.ipythondir))
330 sys.path.append(os.path.abspath(opts_all.ipythondir))
329
331
330 # Create user config directory if it doesn't exist. This must be done
332 # Create user config directory if it doesn't exist. This must be done
331 # *after* getting the cmd line options.
333 # *after* getting the cmd line options.
332 if not os.path.isdir(opts_all.ipythondir):
334 if not os.path.isdir(opts_all.ipythondir):
333 IP.user_setup(opts_all.ipythondir,rc_suffix,'install')
335 IP.user_setup(opts_all.ipythondir,rc_suffix,'install')
334
336
335 # upgrade user config files while preserving a copy of the originals
337 # upgrade user config files while preserving a copy of the originals
336 if opts_all.upgrade:
338 if opts_all.upgrade:
337 IP.user_setup(opts_all.ipythondir,rc_suffix,'upgrade')
339 IP.user_setup(opts_all.ipythondir,rc_suffix,'upgrade')
338
340
339 # check mutually exclusive options in the *original* command line
341 # check mutually exclusive options in the *original* command line
340 mutex_opts(opts,[qw('log logfile'),qw('rcfile profile'),
342 mutex_opts(opts,[qw('log logfile'),qw('rcfile profile'),
341 qw('classic profile'),qw('classic rcfile')])
343 qw('classic profile'),qw('classic rcfile')])
342
344
343 #---------------------------------------------------------------------------
345 #---------------------------------------------------------------------------
344 # Log replay
346 # Log replay
345
347
346 # if -logplay, we need to 'become' the other session. That basically means
348 # if -logplay, we need to 'become' the other session. That basically means
347 # replacing the current command line environment with that of the old
349 # replacing the current command line environment with that of the old
348 # session and moving on.
350 # session and moving on.
349
351
350 # this is needed so that later we know we're in session reload mode, as
352 # this is needed so that later we know we're in session reload mode, as
351 # opts_all will get overwritten:
353 # opts_all will get overwritten:
352 load_logplay = 0
354 load_logplay = 0
353
355
354 if opts_all.logplay:
356 if opts_all.logplay:
355 load_logplay = opts_all.logplay
357 load_logplay = opts_all.logplay
356 opts_debug_save = opts_all.debug
358 opts_debug_save = opts_all.debug
357 try:
359 try:
358 logplay = open(opts_all.logplay)
360 logplay = open(opts_all.logplay)
359 except IOError:
361 except IOError:
360 if opts_all.debug: IP.InteractiveTB()
362 if opts_all.debug: IP.InteractiveTB()
361 warn('Could not open logplay file '+`opts_all.logplay`)
363 warn('Could not open logplay file '+`opts_all.logplay`)
362 # restore state as if nothing had happened and move on, but make
364 # restore state as if nothing had happened and move on, but make
363 # sure that later we don't try to actually load the session file
365 # sure that later we don't try to actually load the session file
364 logplay = None
366 logplay = None
365 load_logplay = 0
367 load_logplay = 0
366 del opts_all.logplay
368 del opts_all.logplay
367 else:
369 else:
368 try:
370 try:
369 logplay.readline()
371 logplay.readline()
370 logplay.readline();
372 logplay.readline();
371 # this reloads that session's command line
373 # this reloads that session's command line
372 cmd = logplay.readline()[6:]
374 cmd = logplay.readline()[6:]
373 exec cmd
375 exec cmd
374 # restore the true debug flag given so that the process of
376 # restore the true debug flag given so that the process of
375 # session loading itself can be monitored.
377 # session loading itself can be monitored.
376 opts.debug = opts_debug_save
378 opts.debug = opts_debug_save
377 # save the logplay flag so later we don't overwrite the log
379 # save the logplay flag so later we don't overwrite the log
378 opts.logplay = load_logplay
380 opts.logplay = load_logplay
379 # now we must update our own structure with defaults
381 # now we must update our own structure with defaults
380 opts_all.update(opts)
382 opts_all.update(opts)
381 # now load args
383 # now load args
382 cmd = logplay.readline()[6:]
384 cmd = logplay.readline()[6:]
383 exec cmd
385 exec cmd
384 logplay.close()
386 logplay.close()
385 except:
387 except:
386 logplay.close()
388 logplay.close()
387 if opts_all.debug: IP.InteractiveTB()
389 if opts_all.debug: IP.InteractiveTB()
388 warn("Logplay file lacking full configuration information.\n"
390 warn("Logplay file lacking full configuration information.\n"
389 "I'll try to read it, but some things may not work.")
391 "I'll try to read it, but some things may not work.")
390
392
391 #-------------------------------------------------------------------------
393 #-------------------------------------------------------------------------
392 # set up output traps: catch all output from files, being run, modules
394 # set up output traps: catch all output from files, being run, modules
393 # loaded, etc. Then give it to the user in a clean form at the end.
395 # loaded, etc. Then give it to the user in a clean form at the end.
394
396
395 msg_out = 'Output messages. '
397 msg_out = 'Output messages. '
396 msg_err = 'Error messages. '
398 msg_err = 'Error messages. '
397 msg_sep = '\n'
399 msg_sep = '\n'
398 msg = Struct(config = OutputTrap('Configuration Loader',msg_out,
400 msg = Struct(config = OutputTrap('Configuration Loader',msg_out,
399 msg_err,msg_sep,debug,
401 msg_err,msg_sep,debug,
400 quiet_out=1),
402 quiet_out=1),
401 user_exec = OutputTrap('User File Execution',msg_out,
403 user_exec = OutputTrap('User File Execution',msg_out,
402 msg_err,msg_sep,debug),
404 msg_err,msg_sep,debug),
403 logplay = OutputTrap('Log Loader',msg_out,
405 logplay = OutputTrap('Log Loader',msg_out,
404 msg_err,msg_sep,debug),
406 msg_err,msg_sep,debug),
405 summary = ''
407 summary = ''
406 )
408 )
407
409
408 #-------------------------------------------------------------------------
410 #-------------------------------------------------------------------------
409 # Process user ipythonrc-type configuration files
411 # Process user ipythonrc-type configuration files
410
412
411 # turn on output trapping and log to msg.config
413 # turn on output trapping and log to msg.config
412 # remember that with debug on, trapping is actually disabled
414 # remember that with debug on, trapping is actually disabled
413 msg.config.trap_all()
415 msg.config.trap_all()
414
416
415 # look for rcfile in current or default directory
417 # look for rcfile in current or default directory
416 try:
418 try:
417 opts_all.rcfile = filefind(opts_all.rcfile,opts_all.ipythondir)
419 opts_all.rcfile = filefind(opts_all.rcfile,opts_all.ipythondir)
418 except IOError:
420 except IOError:
419 if opts_all.debug: IP.InteractiveTB()
421 if opts_all.debug: IP.InteractiveTB()
420 warn('Configuration file %s not found. Ignoring request.'
422 warn('Configuration file %s not found. Ignoring request.'
421 % (opts_all.rcfile) )
423 % (opts_all.rcfile) )
422
424
423 # 'profiles' are a shorthand notation for config filenames
425 # 'profiles' are a shorthand notation for config filenames
424 if opts_all.profile:
426 if opts_all.profile:
425
427
426 try:
428 try:
427 opts_all.rcfile = filefind('ipythonrc-' + opts_all.profile
429 opts_all.rcfile = filefind('ipythonrc-' + opts_all.profile
428 + rc_suffix,
430 + rc_suffix,
429 opts_all.ipythondir)
431 opts_all.ipythondir)
430 except IOError:
432 except IOError:
431 if opts_all.debug: IP.InteractiveTB()
433 if opts_all.debug: IP.InteractiveTB()
432 opts.profile = '' # remove profile from options if invalid
434 opts.profile = '' # remove profile from options if invalid
433 # We won't warn anymore, primary method is ipy_profile_PROFNAME
435 # We won't warn anymore, primary method is ipy_profile_PROFNAME
434 # which does trigger a warning.
436 # which does trigger a warning.
435
437
436 # load the config file
438 # load the config file
437 rcfiledata = None
439 rcfiledata = None
438 if opts_all.quick:
440 if opts_all.quick:
439 print 'Launching IPython in quick mode. No config file read.'
441 print 'Launching IPython in quick mode. No config file read.'
440 elif opts_all.rcfile:
442 elif opts_all.rcfile:
441 try:
443 try:
442 cfg_loader = ConfigLoader(conflict)
444 cfg_loader = ConfigLoader(conflict)
443 rcfiledata = cfg_loader.load(opts_all.rcfile,typeconv,
445 rcfiledata = cfg_loader.load(opts_all.rcfile,typeconv,
444 'include',opts_all.ipythondir,
446 'include',opts_all.ipythondir,
445 purge = 1,
447 purge = 1,
446 unique = conflict['preserve'])
448 unique = conflict['preserve'])
447 except:
449 except:
448 IP.InteractiveTB()
450 IP.InteractiveTB()
449 warn('Problems loading configuration file '+
451 warn('Problems loading configuration file '+
450 `opts_all.rcfile`+
452 `opts_all.rcfile`+
451 '\nStarting with default -bare bones- configuration.')
453 '\nStarting with default -bare bones- configuration.')
452 else:
454 else:
453 warn('No valid configuration file found in either currrent directory\n'+
455 warn('No valid configuration file found in either currrent directory\n'+
454 'or in the IPython config. directory: '+`opts_all.ipythondir`+
456 'or in the IPython config. directory: '+`opts_all.ipythondir`+
455 '\nProceeding with internal defaults.')
457 '\nProceeding with internal defaults.')
456
458
457 #------------------------------------------------------------------------
459 #------------------------------------------------------------------------
458 # Set exception handlers in mode requested by user.
460 # Set exception handlers in mode requested by user.
459 otrap = OutputTrap(trap_out=1) # trap messages from magic_xmode
461 otrap = OutputTrap(trap_out=1) # trap messages from magic_xmode
460 IP.magic_xmode(opts_all.xmode)
462 IP.magic_xmode(opts_all.xmode)
461 otrap.release_out()
463 otrap.release_out()
462
464
463 #------------------------------------------------------------------------
465 #------------------------------------------------------------------------
464 # Execute user config
466 # Execute user config
465
467
466 # Create a valid config structure with the right precedence order:
468 # Create a valid config structure with the right precedence order:
467 # defaults < rcfile < command line. This needs to be in the instance, so
469 # defaults < rcfile < command line. This needs to be in the instance, so
468 # that method calls below that rely on it find it.
470 # that method calls below that rely on it find it.
469 IP.rc = rc_def.copy()
471 IP.rc = rc_def.copy()
470
472
471 # Work with a local alias inside this routine to avoid unnecessary
473 # Work with a local alias inside this routine to avoid unnecessary
472 # attribute lookups.
474 # attribute lookups.
473 IP_rc = IP.rc
475 IP_rc = IP.rc
474
476
475 IP_rc.update(opts_def)
477 IP_rc.update(opts_def)
476 if rcfiledata:
478 if rcfiledata:
477 # now we can update
479 # now we can update
478 IP_rc.update(rcfiledata)
480 IP_rc.update(rcfiledata)
479 IP_rc.update(opts)
481 IP_rc.update(opts)
480 IP_rc.update(rc_override)
482 IP_rc.update(rc_override)
481
483
482 # Store the original cmd line for reference:
484 # Store the original cmd line for reference:
483 IP_rc.opts = opts
485 IP_rc.opts = opts
484 IP_rc.args = args
486 IP_rc.args = args
485
487
486 # create a *runtime* Struct like rc for holding parameters which may be
488 # create a *runtime* Struct like rc for holding parameters which may be
487 # created and/or modified by runtime user extensions.
489 # created and/or modified by runtime user extensions.
488 IP.runtime_rc = Struct()
490 IP.runtime_rc = Struct()
489
491
490 # from this point on, all config should be handled through IP_rc,
492 # from this point on, all config should be handled through IP_rc,
491 # opts* shouldn't be used anymore.
493 # opts* shouldn't be used anymore.
492
494
493
495
494 # update IP_rc with some special things that need manual
496 # update IP_rc with some special things that need manual
495 # tweaks. Basically options which affect other options. I guess this
497 # tweaks. Basically options which affect other options. I guess this
496 # should just be written so that options are fully orthogonal and we
498 # should just be written so that options are fully orthogonal and we
497 # wouldn't worry about this stuff!
499 # wouldn't worry about this stuff!
498
500
499 if IP_rc.classic:
501 if IP_rc.classic:
500 IP_rc.quick = 1
502 IP_rc.quick = 1
501 IP_rc.cache_size = 0
503 IP_rc.cache_size = 0
502 IP_rc.pprint = 0
504 IP_rc.pprint = 0
503 IP_rc.prompt_in1 = '>>> '
505 IP_rc.prompt_in1 = '>>> '
504 IP_rc.prompt_in2 = '... '
506 IP_rc.prompt_in2 = '... '
505 IP_rc.prompt_out = ''
507 IP_rc.prompt_out = ''
506 IP_rc.separate_in = IP_rc.separate_out = IP_rc.separate_out2 = '0'
508 IP_rc.separate_in = IP_rc.separate_out = IP_rc.separate_out2 = '0'
507 IP_rc.colors = 'NoColor'
509 IP_rc.colors = 'NoColor'
508 IP_rc.xmode = 'Plain'
510 IP_rc.xmode = 'Plain'
509
511
510 IP.pre_config_initialization()
512 IP.pre_config_initialization()
511 # configure readline
513 # configure readline
512 # Define the history file for saving commands in between sessions
514 # Define the history file for saving commands in between sessions
513 if IP_rc.profile:
515 if IP_rc.profile:
514 histfname = 'history-%s' % IP_rc.profile
516 histfname = 'history-%s' % IP_rc.profile
515 else:
517 else:
516 histfname = 'history'
518 histfname = 'history'
517 IP.histfile = os.path.join(opts_all.ipythondir,histfname)
519 IP.histfile = os.path.join(opts_all.ipythondir,histfname)
518
520
519 # update exception handlers with rc file status
521 # update exception handlers with rc file status
520 otrap.trap_out() # I don't want these messages ever.
522 otrap.trap_out() # I don't want these messages ever.
521 IP.magic_xmode(IP_rc.xmode)
523 IP.magic_xmode(IP_rc.xmode)
522 otrap.release_out()
524 otrap.release_out()
523
525
524 # activate logging if requested and not reloading a log
526 # activate logging if requested and not reloading a log
525 if IP_rc.logplay:
527 if IP_rc.logplay:
526 IP.magic_logstart(IP_rc.logplay + ' append')
528 IP.magic_logstart(IP_rc.logplay + ' append')
527 elif IP_rc.logfile:
529 elif IP_rc.logfile:
528 IP.magic_logstart(IP_rc.logfile)
530 IP.magic_logstart(IP_rc.logfile)
529 elif IP_rc.log:
531 elif IP_rc.log:
530 IP.magic_logstart()
532 IP.magic_logstart()
531
533
532 # find user editor so that it we don't have to look it up constantly
534 # find user editor so that it we don't have to look it up constantly
533 if IP_rc.editor.strip()=='0':
535 if IP_rc.editor.strip()=='0':
534 try:
536 try:
535 ed = os.environ['EDITOR']
537 ed = os.environ['EDITOR']
536 except KeyError:
538 except KeyError:
537 if os.name == 'posix':
539 if os.name == 'posix':
538 ed = 'vi' # the only one guaranteed to be there!
540 ed = 'vi' # the only one guaranteed to be there!
539 else:
541 else:
540 ed = 'notepad' # same in Windows!
542 ed = 'notepad' # same in Windows!
541 IP_rc.editor = ed
543 IP_rc.editor = ed
542
544
543 # Keep track of whether this is an embedded instance or not (useful for
545 # Keep track of whether this is an embedded instance or not (useful for
544 # post-mortems).
546 # post-mortems).
545 IP_rc.embedded = IP.embedded
547 IP_rc.embedded = IP.embedded
546
548
547 # Recursive reload
549 # Recursive reload
548 try:
550 try:
549 from IPython import deep_reload
551 from IPython import deep_reload
550 if IP_rc.deep_reload:
552 if IP_rc.deep_reload:
551 __builtin__.reload = deep_reload.reload
553 __builtin__.reload = deep_reload.reload
552 else:
554 else:
553 __builtin__.dreload = deep_reload.reload
555 __builtin__.dreload = deep_reload.reload
554 del deep_reload
556 del deep_reload
555 except ImportError:
557 except ImportError:
556 pass
558 pass
557
559
558 # Save the current state of our namespace so that the interactive shell
560 # Save the current state of our namespace so that the interactive shell
559 # can later know which variables have been created by us from config files
561 # can later know which variables have been created by us from config files
560 # and loading. This way, loading a file (in any way) is treated just like
562 # and loading. This way, loading a file (in any way) is treated just like
561 # defining things on the command line, and %who works as expected.
563 # defining things on the command line, and %who works as expected.
562
564
563 # DON'T do anything that affects the namespace beyond this point!
565 # DON'T do anything that affects the namespace beyond this point!
564 IP.internal_ns.update(__main__.__dict__)
566 IP.internal_ns.update(__main__.__dict__)
565
567
566 #IP.internal_ns.update(locals()) # so our stuff doesn't show up in %who
568 #IP.internal_ns.update(locals()) # so our stuff doesn't show up in %who
567
569
568 # Now run through the different sections of the users's config
570 # Now run through the different sections of the users's config
569 if IP_rc.debug:
571 if IP_rc.debug:
570 print 'Trying to execute the following configuration structure:'
572 print 'Trying to execute the following configuration structure:'
571 print '(Things listed first are deeper in the inclusion tree and get'
573 print '(Things listed first are deeper in the inclusion tree and get'
572 print 'loaded first).\n'
574 print 'loaded first).\n'
573 pprint(IP_rc.__dict__)
575 pprint(IP_rc.__dict__)
574
576
575 for mod in IP_rc.import_mod:
577 for mod in IP_rc.import_mod:
576 try:
578 try:
577 exec 'import '+mod in IP.user_ns
579 exec 'import '+mod in IP.user_ns
578 except :
580 except :
579 IP.InteractiveTB()
581 IP.InteractiveTB()
580 import_fail_info(mod)
582 import_fail_info(mod)
581
583
582 for mod_fn in IP_rc.import_some:
584 for mod_fn in IP_rc.import_some:
583 if not mod_fn == []:
585 if not mod_fn == []:
584 mod,fn = mod_fn[0],','.join(mod_fn[1:])
586 mod,fn = mod_fn[0],','.join(mod_fn[1:])
585 try:
587 try:
586 exec 'from '+mod+' import '+fn in IP.user_ns
588 exec 'from '+mod+' import '+fn in IP.user_ns
587 except :
589 except :
588 IP.InteractiveTB()
590 IP.InteractiveTB()
589 import_fail_info(mod,fn)
591 import_fail_info(mod,fn)
590
592
591 for mod in IP_rc.import_all:
593 for mod in IP_rc.import_all:
592 try:
594 try:
593 exec 'from '+mod+' import *' in IP.user_ns
595 exec 'from '+mod+' import *' in IP.user_ns
594 except :
596 except :
595 IP.InteractiveTB()
597 IP.InteractiveTB()
596 import_fail_info(mod)
598 import_fail_info(mod)
597
599
598 for code in IP_rc.execute:
600 for code in IP_rc.execute:
599 try:
601 try:
600 exec code in IP.user_ns
602 exec code in IP.user_ns
601 except:
603 except:
602 IP.InteractiveTB()
604 IP.InteractiveTB()
603 warn('Failure executing code: ' + `code`)
605 warn('Failure executing code: ' + `code`)
604
606
605 # Execute the files the user wants in ipythonrc
607 # Execute the files the user wants in ipythonrc
606 for file in IP_rc.execfile:
608 for file in IP_rc.execfile:
607 try:
609 try:
608 file = filefind(file,sys.path+[IPython_dir])
610 file = filefind(file,sys.path+[IPython_dir])
609 except IOError:
611 except IOError:
610 warn(itpl('File $file not found. Skipping it.'))
612 warn(itpl('File $file not found. Skipping it.'))
611 else:
613 else:
612 IP.safe_execfile(os.path.expanduser(file),IP.user_ns)
614 IP.safe_execfile(os.path.expanduser(file),IP.user_ns)
613
615
614 # finally, try importing ipy_*_conf for final configuration
616 # finally, try importing ipy_*_conf for final configuration
615 try:
617 try:
616 import ipy_system_conf
618 import ipy_system_conf
617 except ImportError:
619 except ImportError:
618 if opts_all.debug: IP.InteractiveTB()
620 if opts_all.debug: IP.InteractiveTB()
619 warn("Could not import 'ipy_system_conf'")
621 warn("Could not import 'ipy_system_conf'")
620 except:
622 except:
621 IP.InteractiveTB()
623 IP.InteractiveTB()
622 import_fail_info('ipy_system_conf')
624 import_fail_info('ipy_system_conf')
623
625
624 if opts_all.profile:
626 if opts_all.profile:
625 profmodname = 'ipy_profile_' + opts_all.profile
627 profmodname = 'ipy_profile_' + opts_all.profile
626 try:
628 try:
627 __import__(profmodname)
629 __import__(profmodname)
628 except ImportError:
630 except ImportError:
629 # only warn if ipythonrc-PROFNAME didn't exist
631 # only warn if ipythonrc-PROFNAME didn't exist
630 if opts.profile =='':
632 if opts.profile =='':
631 warn("Could not start with profile '%s'!\n"
633 warn("Could not start with profile '%s'!\n"
632 "('%s/%s.py' does not exist? run '%%upgrade')" %
634 "('%s/%s.py' does not exist? run '%%upgrade')" %
633 (opts_all.profile, opts_all.ipythondir, profmodname) )
635 (opts_all.profile, opts_all.ipythondir, profmodname) )
634 except:
636 except:
635 print "Error importing",profmodname,"- perhaps you should run %upgrade?"
637 print "Error importing",profmodname,"- perhaps you should run %upgrade?"
636 IP.InteractiveTB()
638 IP.InteractiveTB()
637 import_fail_info(profmodname)
639 import_fail_info(profmodname)
638
640
639 try:
641 try:
640 import ipy_user_conf
642 import ipy_user_conf
641 except ImportError:
643 except ImportError:
642 if opts_all.debug: IP.InteractiveTB()
644 if opts_all.debug: IP.InteractiveTB()
643 warn("Could not import user config!\n "
645 warn("Could not import user config!\n "
644 "('%s/ipy_user_conf.py' does not exist? Please run '%%upgrade')\n"
646 "('%s/ipy_user_conf.py' does not exist? Please run '%%upgrade')\n"
645 % opts_all.ipythondir)
647 % opts_all.ipythondir)
646 except:
648 except:
647 print "Error importing ipy_user_conf - perhaps you should run %upgrade?"
649 print "Error importing ipy_user_conf - perhaps you should run %upgrade?"
648 IP.InteractiveTB()
650 IP.InteractiveTB()
649 import_fail_info("ipy_user_conf")
651 import_fail_info("ipy_user_conf")
650
652
651 # release stdout and stderr and save config log into a global summary
653 # release stdout and stderr and save config log into a global summary
652 msg.config.release_all()
654 msg.config.release_all()
653 if IP_rc.messages:
655 if IP_rc.messages:
654 msg.summary += msg.config.summary_all()
656 msg.summary += msg.config.summary_all()
655
657
656 #------------------------------------------------------------------------
658 #------------------------------------------------------------------------
657 # Setup interactive session
659 # Setup interactive session
658
660
659 # Now we should be fully configured. We can then execute files or load
661 # Now we should be fully configured. We can then execute files or load
660 # things only needed for interactive use. Then we'll open the shell.
662 # things only needed for interactive use. Then we'll open the shell.
661
663
662 # Take a snapshot of the user namespace before opening the shell. That way
664 # Take a snapshot of the user namespace before opening the shell. That way
663 # we'll be able to identify which things were interactively defined and
665 # we'll be able to identify which things were interactively defined and
664 # which were defined through config files.
666 # which were defined through config files.
665 IP.user_config_ns = IP.user_ns.copy()
667 IP.user_config_ns = IP.user_ns.copy()
666
668
667 # Force reading a file as if it were a session log. Slower but safer.
669 # Force reading a file as if it were a session log. Slower but safer.
668 if load_logplay:
670 if load_logplay:
669 print 'Replaying log...'
671 print 'Replaying log...'
670 try:
672 try:
671 if IP_rc.debug:
673 if IP_rc.debug:
672 logplay_quiet = 0
674 logplay_quiet = 0
673 else:
675 else:
674 logplay_quiet = 1
676 logplay_quiet = 1
675
677
676 msg.logplay.trap_all()
678 msg.logplay.trap_all()
677 IP.safe_execfile(load_logplay,IP.user_ns,
679 IP.safe_execfile(load_logplay,IP.user_ns,
678 islog = 1, quiet = logplay_quiet)
680 islog = 1, quiet = logplay_quiet)
679 msg.logplay.release_all()
681 msg.logplay.release_all()
680 if IP_rc.messages:
682 if IP_rc.messages:
681 msg.summary += msg.logplay.summary_all()
683 msg.summary += msg.logplay.summary_all()
682 except:
684 except:
683 warn('Problems replaying logfile %s.' % load_logplay)
685 warn('Problems replaying logfile %s.' % load_logplay)
684 IP.InteractiveTB()
686 IP.InteractiveTB()
685
687
686 # Load remaining files in command line
688 # Load remaining files in command line
687 msg.user_exec.trap_all()
689 msg.user_exec.trap_all()
688
690
689 # Do NOT execute files named in the command line as scripts to be loaded
691 # Do NOT execute files named in the command line as scripts to be loaded
690 # by embedded instances. Doing so has the potential for an infinite
692 # by embedded instances. Doing so has the potential for an infinite
691 # recursion if there are exceptions thrown in the process.
693 # recursion if there are exceptions thrown in the process.
692
694
693 # XXX FIXME: the execution of user files should be moved out to after
695 # XXX FIXME: the execution of user files should be moved out to after
694 # ipython is fully initialized, just as if they were run via %run at the
696 # ipython is fully initialized, just as if they were run via %run at the
695 # ipython prompt. This would also give them the benefit of ipython's
697 # ipython prompt. This would also give them the benefit of ipython's
696 # nice tracebacks.
698 # nice tracebacks.
697
699
698 if (not embedded and IP_rc.args and
700 if (not embedded and IP_rc.args and
699 not IP_rc.args[0].lower().endswith('.ipy')):
701 not IP_rc.args[0].lower().endswith('.ipy')):
700 name_save = IP.user_ns['__name__']
702 name_save = IP.user_ns['__name__']
701 IP.user_ns['__name__'] = '__main__'
703 IP.user_ns['__name__'] = '__main__'
702 # Set our own excepthook in case the user code tries to call it
704 # Set our own excepthook in case the user code tries to call it
703 # directly. This prevents triggering the IPython crash handler.
705 # directly. This prevents triggering the IPython crash handler.
704 old_excepthook,sys.excepthook = sys.excepthook, IP.excepthook
706 old_excepthook,sys.excepthook = sys.excepthook, IP.excepthook
705
707
706 save_argv = sys.argv[1:] # save it for later restoring
708 save_argv = sys.argv[1:] # save it for later restoring
707
709
708 sys.argv = args
710 sys.argv = args
709
711
710 try:
712 try:
711 IP.safe_execfile(args[0], IP.user_ns)
713 IP.safe_execfile(args[0], IP.user_ns)
712 finally:
714 finally:
713 # Reset our crash handler in place
715 # Reset our crash handler in place
714 sys.excepthook = old_excepthook
716 sys.excepthook = old_excepthook
715 sys.argv[:] = save_argv
717 sys.argv[:] = save_argv
716 IP.user_ns['__name__'] = name_save
718 IP.user_ns['__name__'] = name_save
717
719
718 msg.user_exec.release_all()
720 msg.user_exec.release_all()
719
721
720 if IP_rc.messages:
722 if IP_rc.messages:
721 msg.summary += msg.user_exec.summary_all()
723 msg.summary += msg.user_exec.summary_all()
722
724
723 # since we can't specify a null string on the cmd line, 0 is the equivalent:
725 # since we can't specify a null string on the cmd line, 0 is the equivalent:
724 if IP_rc.nosep:
726 if IP_rc.nosep:
725 IP_rc.separate_in = IP_rc.separate_out = IP_rc.separate_out2 = '0'
727 IP_rc.separate_in = IP_rc.separate_out = IP_rc.separate_out2 = '0'
726 if IP_rc.separate_in == '0': IP_rc.separate_in = ''
728 if IP_rc.separate_in == '0': IP_rc.separate_in = ''
727 if IP_rc.separate_out == '0': IP_rc.separate_out = ''
729 if IP_rc.separate_out == '0': IP_rc.separate_out = ''
728 if IP_rc.separate_out2 == '0': IP_rc.separate_out2 = ''
730 if IP_rc.separate_out2 == '0': IP_rc.separate_out2 = ''
729 IP_rc.separate_in = IP_rc.separate_in.replace('\\n','\n')
731 IP_rc.separate_in = IP_rc.separate_in.replace('\\n','\n')
730 IP_rc.separate_out = IP_rc.separate_out.replace('\\n','\n')
732 IP_rc.separate_out = IP_rc.separate_out.replace('\\n','\n')
731 IP_rc.separate_out2 = IP_rc.separate_out2.replace('\\n','\n')
733 IP_rc.separate_out2 = IP_rc.separate_out2.replace('\\n','\n')
732
734
733 # Determine how many lines at the bottom of the screen are needed for
735 # Determine how many lines at the bottom of the screen are needed for
734 # showing prompts, so we can know wheter long strings are to be printed or
736 # showing prompts, so we can know wheter long strings are to be printed or
735 # paged:
737 # paged:
736 num_lines_bot = IP_rc.separate_in.count('\n')+1
738 num_lines_bot = IP_rc.separate_in.count('\n')+1
737 IP_rc.screen_length = IP_rc.screen_length - num_lines_bot
739 IP_rc.screen_length = IP_rc.screen_length - num_lines_bot
738
740
739 # configure startup banner
741 # configure startup banner
740 if IP_rc.c: # regular python doesn't print the banner with -c
742 if IP_rc.c: # regular python doesn't print the banner with -c
741 IP_rc.banner = 0
743 IP_rc.banner = 0
742 if IP_rc.banner:
744 if IP_rc.banner:
743 BANN_P = IP.BANNER_PARTS
745 BANN_P = IP.BANNER_PARTS
744 else:
746 else:
745 BANN_P = []
747 BANN_P = []
746
748
747 if IP_rc.profile: BANN_P.append('IPython profile: %s\n' % IP_rc.profile)
749 if IP_rc.profile: BANN_P.append('IPython profile: %s\n' % IP_rc.profile)
748
750
749 # add message log (possibly empty)
751 # add message log (possibly empty)
750 if msg.summary: BANN_P.append(msg.summary)
752 if msg.summary: BANN_P.append(msg.summary)
751 # Final banner is a string
753 # Final banner is a string
752 IP.BANNER = '\n'.join(BANN_P)
754 IP.BANNER = '\n'.join(BANN_P)
753
755
754 # Finalize the IPython instance. This assumes the rc structure is fully
756 # Finalize the IPython instance. This assumes the rc structure is fully
755 # in place.
757 # in place.
756 IP.post_config_initialization()
758 IP.post_config_initialization()
757
759
758 return IP
760 return IP
759 #************************ end of file <ipmaker.py> **************************
761 #************************ end of file <ipmaker.py> **************************
@@ -1,924 +1,927 b''
1 # -*- coding: utf-8 -*-
1 # -*- coding: utf-8 -*-
2 """
2 """
3 ultraTB.py -- Spice up your tracebacks!
3 ultraTB.py -- Spice up your tracebacks!
4
4
5 * ColorTB
5 * ColorTB
6 I've always found it a bit hard to visually parse tracebacks in Python. The
6 I've always found it a bit hard to visually parse tracebacks in Python. The
7 ColorTB class is a solution to that problem. It colors the different parts of a
7 ColorTB class is a solution to that problem. It colors the different parts of a
8 traceback in a manner similar to what you would expect from a syntax-highlighting
8 traceback in a manner similar to what you would expect from a syntax-highlighting
9 text editor.
9 text editor.
10
10
11 Installation instructions for ColorTB:
11 Installation instructions for ColorTB:
12 import sys,ultraTB
12 import sys,ultraTB
13 sys.excepthook = ultraTB.ColorTB()
13 sys.excepthook = ultraTB.ColorTB()
14
14
15 * VerboseTB
15 * VerboseTB
16 I've also included a port of Ka-Ping Yee's "cgitb.py" that produces all kinds
16 I've also included a port of Ka-Ping Yee's "cgitb.py" that produces all kinds
17 of useful info when a traceback occurs. Ping originally had it spit out HTML
17 of useful info when a traceback occurs. Ping originally had it spit out HTML
18 and intended it for CGI programmers, but why should they have all the fun? I
18 and intended it for CGI programmers, but why should they have all the fun? I
19 altered it to spit out colored text to the terminal. It's a bit overwhelming,
19 altered it to spit out colored text to the terminal. It's a bit overwhelming,
20 but kind of neat, and maybe useful for long-running programs that you believe
20 but kind of neat, and maybe useful for long-running programs that you believe
21 are bug-free. If a crash *does* occur in that type of program you want details.
21 are bug-free. If a crash *does* occur in that type of program you want details.
22 Give it a shot--you'll love it or you'll hate it.
22 Give it a shot--you'll love it or you'll hate it.
23
23
24 Note:
24 Note:
25
25
26 The Verbose mode prints the variables currently visible where the exception
26 The Verbose mode prints the variables currently visible where the exception
27 happened (shortening their strings if too long). This can potentially be
27 happened (shortening their strings if too long). This can potentially be
28 very slow, if you happen to have a huge data structure whose string
28 very slow, if you happen to have a huge data structure whose string
29 representation is complex to compute. Your computer may appear to freeze for
29 representation is complex to compute. Your computer may appear to freeze for
30 a while with cpu usage at 100%. If this occurs, you can cancel the traceback
30 a while with cpu usage at 100%. If this occurs, you can cancel the traceback
31 with Ctrl-C (maybe hitting it more than once).
31 with Ctrl-C (maybe hitting it more than once).
32
32
33 If you encounter this kind of situation often, you may want to use the
33 If you encounter this kind of situation often, you may want to use the
34 Verbose_novars mode instead of the regular Verbose, which avoids formatting
34 Verbose_novars mode instead of the regular Verbose, which avoids formatting
35 variables (but otherwise includes the information and context given by
35 variables (but otherwise includes the information and context given by
36 Verbose).
36 Verbose).
37
37
38
38
39 Installation instructions for ColorTB:
39 Installation instructions for ColorTB:
40 import sys,ultraTB
40 import sys,ultraTB
41 sys.excepthook = ultraTB.VerboseTB()
41 sys.excepthook = ultraTB.VerboseTB()
42
42
43 Note: Much of the code in this module was lifted verbatim from the standard
43 Note: Much of the code in this module was lifted verbatim from the standard
44 library module 'traceback.py' and Ka-Ping Yee's 'cgitb.py'.
44 library module 'traceback.py' and Ka-Ping Yee's 'cgitb.py'.
45
45
46 * Color schemes
46 * Color schemes
47 The colors are defined in the class TBTools through the use of the
47 The colors are defined in the class TBTools through the use of the
48 ColorSchemeTable class. Currently the following exist:
48 ColorSchemeTable class. Currently the following exist:
49
49
50 - NoColor: allows all of this module to be used in any terminal (the color
50 - NoColor: allows all of this module to be used in any terminal (the color
51 escapes are just dummy blank strings).
51 escapes are just dummy blank strings).
52
52
53 - Linux: is meant to look good in a terminal like the Linux console (black
53 - Linux: is meant to look good in a terminal like the Linux console (black
54 or very dark background).
54 or very dark background).
55
55
56 - LightBG: similar to Linux but swaps dark/light colors to be more readable
56 - LightBG: similar to Linux but swaps dark/light colors to be more readable
57 in light background terminals.
57 in light background terminals.
58
58
59 You can implement other color schemes easily, the syntax is fairly
59 You can implement other color schemes easily, the syntax is fairly
60 self-explanatory. Please send back new schemes you develop to the author for
60 self-explanatory. Please send back new schemes you develop to the author for
61 possible inclusion in future releases.
61 possible inclusion in future releases.
62
62
63 $Id: ultraTB.py 2155 2007-03-19 00:45:51Z fperez $"""
63 $Id: ultraTB.py 2156 2007-03-19 02:32:19Z fperez $"""
64
64
65 #*****************************************************************************
65 #*****************************************************************************
66 # Copyright (C) 2001 Nathaniel Gray <n8gray@caltech.edu>
66 # Copyright (C) 2001 Nathaniel Gray <n8gray@caltech.edu>
67 # Copyright (C) 2001-2004 Fernando Perez <fperez@colorado.edu>
67 # Copyright (C) 2001-2004 Fernando Perez <fperez@colorado.edu>
68 #
68 #
69 # Distributed under the terms of the BSD License. The full license is in
69 # Distributed under the terms of the BSD License. The full license is in
70 # the file COPYING, distributed as part of this software.
70 # the file COPYING, distributed as part of this software.
71 #*****************************************************************************
71 #*****************************************************************************
72
72
73 from IPython import Release
73 from IPython import Release
74 __author__ = '%s <%s>\n%s <%s>' % (Release.authors['Nathan']+
74 __author__ = '%s <%s>\n%s <%s>' % (Release.authors['Nathan']+
75 Release.authors['Fernando'])
75 Release.authors['Fernando'])
76 __license__ = Release.license
76 __license__ = Release.license
77
77
78 # Required modules
78 # Required modules
79 import inspect
79 import inspect
80 import keyword
80 import keyword
81 import linecache
81 import linecache
82 import os
82 import os
83 import pydoc
83 import pydoc
84 import string
84 import string
85 import sys
85 import sys
86 import time
86 import time
87 import tokenize
87 import tokenize
88 import traceback
88 import traceback
89 import types
89 import types
90
90
91 # IPython's own modules
91 # IPython's own modules
92 # Modified pdb which doesn't damage IPython's readline handling
92 # Modified pdb which doesn't damage IPython's readline handling
93 from IPython import Debugger, PyColorize
93 from IPython import Debugger, PyColorize
94 from IPython.ipstruct import Struct
94 from IPython.ipstruct import Struct
95 from IPython.excolors import ExceptionColors
95 from IPython.excolors import ExceptionColors
96 from IPython.genutils import Term,uniq_stable,error,info
96 from IPython.genutils import Term,uniq_stable,error,info
97
97
98 # Globals
98 # Globals
99 # amount of space to put line numbers before verbose tracebacks
99 # amount of space to put line numbers before verbose tracebacks
100 INDENT_SIZE = 8
100 INDENT_SIZE = 8
101
101
102 # Default color scheme. This is used, for example, by the traceback
102 # Default color scheme. This is used, for example, by the traceback
103 # formatter. When running in an actual IPython instance, the user's rc.colors
103 # formatter. When running in an actual IPython instance, the user's rc.colors
104 # value is used, but havinga module global makes this functionality available
104 # value is used, but havinga module global makes this functionality available
105 # to users of ultraTB who are NOT running inside ipython.
105 # to users of ultraTB who are NOT running inside ipython.
106 DEFAULT_SCHEME = 'NoColors'
106 DEFAULT_SCHEME = 'NoColor'
107
107
108 #---------------------------------------------------------------------------
108 #---------------------------------------------------------------------------
109 # Code begins
109 # Code begins
110
110
111 # Utility functions
111 # Utility functions
112 def inspect_error():
112 def inspect_error():
113 """Print a message about internal inspect errors.
113 """Print a message about internal inspect errors.
114
114
115 These are unfortunately quite common."""
115 These are unfortunately quite common."""
116
116
117 error('Internal Python error in the inspect module.\n'
117 error('Internal Python error in the inspect module.\n'
118 'Below is the traceback from this internal error.\n')
118 'Below is the traceback from this internal error.\n')
119
119
120 def _fixed_getinnerframes(etb, context=1,tb_offset=0):
120 def _fixed_getinnerframes(etb, context=1,tb_offset=0):
121 import linecache
121 import linecache
122 LNUM_POS, LINES_POS, INDEX_POS = 2, 4, 5
122 LNUM_POS, LINES_POS, INDEX_POS = 2, 4, 5
123
123
124 records = inspect.getinnerframes(etb, context)
124 records = inspect.getinnerframes(etb, context)
125
125
126 # If the error is at the console, don't build any context, since it would
126 # If the error is at the console, don't build any context, since it would
127 # otherwise produce 5 blank lines printed out (there is no file at the
127 # otherwise produce 5 blank lines printed out (there is no file at the
128 # console)
128 # console)
129 rec_check = records[tb_offset:]
129 rec_check = records[tb_offset:]
130 try:
130 try:
131 rname = rec_check[0][1]
131 rname = rec_check[0][1]
132 if rname == '<ipython console>' or rname.endswith('<string>'):
132 if rname == '<ipython console>' or rname.endswith('<string>'):
133 return rec_check
133 return rec_check
134 except IndexError:
134 except IndexError:
135 pass
135 pass
136
136
137 aux = traceback.extract_tb(etb)
137 aux = traceback.extract_tb(etb)
138 assert len(records) == len(aux)
138 assert len(records) == len(aux)
139 for i, (file, lnum, _, _) in zip(range(len(records)), aux):
139 for i, (file, lnum, _, _) in zip(range(len(records)), aux):
140 maybeStart = lnum-1 - context//2
140 maybeStart = lnum-1 - context//2
141 start = max(maybeStart, 0)
141 start = max(maybeStart, 0)
142 end = start + context
142 end = start + context
143 lines = linecache.getlines(file)[start:end]
143 lines = linecache.getlines(file)[start:end]
144 # pad with empty lines if necessary
144 # pad with empty lines if necessary
145 if maybeStart < 0:
145 if maybeStart < 0:
146 lines = (['\n'] * -maybeStart) + lines
146 lines = (['\n'] * -maybeStart) + lines
147 if len(lines) < context:
147 if len(lines) < context:
148 lines += ['\n'] * (context - len(lines))
148 lines += ['\n'] * (context - len(lines))
149 buf = list(records[i])
149 buf = list(records[i])
150 buf[LNUM_POS] = lnum
150 buf[LNUM_POS] = lnum
151 buf[INDEX_POS] = lnum - 1 - start
151 buf[INDEX_POS] = lnum - 1 - start
152 buf[LINES_POS] = lines
152 buf[LINES_POS] = lines
153 records[i] = tuple(buf)
153 records[i] = tuple(buf)
154 return records[tb_offset:]
154 return records[tb_offset:]
155
155
156 # Helper function -- largely belongs to VerboseTB, but we need the same
156 # Helper function -- largely belongs to VerboseTB, but we need the same
157 # functionality to produce a pseudo verbose TB for SyntaxErrors, so that they
157 # functionality to produce a pseudo verbose TB for SyntaxErrors, so that they
158 # can be recognized properly by ipython.el's py-traceback-line-re
158 # can be recognized properly by ipython.el's py-traceback-line-re
159 # (SyntaxErrors have to be treated specially because they have no traceback)
159 # (SyntaxErrors have to be treated specially because they have no traceback)
160
160
161 _parser = PyColorize.Parser()
161 _parser = PyColorize.Parser()
162
162
163 def _formatTracebackLines(lnum, index, lines, Colors, lvals=None):
163 def _formatTracebackLines(lnum, index, lines, Colors, lvals=None,scheme=None):
164 numbers_width = INDENT_SIZE - 1
164 numbers_width = INDENT_SIZE - 1
165 res = []
165 res = []
166 i = lnum - index
166 i = lnum - index
167
167
168 # This lets us get fully syntax-highlighted tracebacks.
168 # This lets us get fully syntax-highlighted tracebacks.
169 try:
169 if scheme is None:
170 scheme = __IPYTHON__.rc.colors
170 try:
171 except:
171 scheme = __IPYTHON__.rc.colors
172 scheme = DEFAULT_SCHEME
172 except:
173 scheme = DEFAULT_SCHEME
173 _line_format = _parser.format2
174 _line_format = _parser.format2
174
175
175 for line in lines:
176 for line in lines:
176 new_line, err = _line_format(line,'str',scheme)
177 new_line, err = _line_format(line,'str',scheme)
177 if not err: line = new_line
178 if not err: line = new_line
178
179
179 if i == lnum:
180 if i == lnum:
180 # This is the line with the error
181 # This is the line with the error
181 pad = numbers_width - len(str(i))
182 pad = numbers_width - len(str(i))
182 if pad >= 3:
183 if pad >= 3:
183 marker = '-'*(pad-3) + '-> '
184 marker = '-'*(pad-3) + '-> '
184 elif pad == 2:
185 elif pad == 2:
185 marker = '> '
186 marker = '> '
186 elif pad == 1:
187 elif pad == 1:
187 marker = '>'
188 marker = '>'
188 else:
189 else:
189 marker = ''
190 marker = ''
190 num = marker + str(i)
191 num = marker + str(i)
191 line = '%s%s%s %s%s' %(Colors.linenoEm, num,
192 line = '%s%s%s %s%s' %(Colors.linenoEm, num,
192 Colors.line, line, Colors.Normal)
193 Colors.line, line, Colors.Normal)
193 else:
194 else:
194 num = '%*s' % (numbers_width,i)
195 num = '%*s' % (numbers_width,i)
195 line = '%s%s%s %s' %(Colors.lineno, num,
196 line = '%s%s%s %s' %(Colors.lineno, num,
196 Colors.Normal, line)
197 Colors.Normal, line)
197
198
198 res.append(line)
199 res.append(line)
199 if lvals and i == lnum:
200 if lvals and i == lnum:
200 res.append(lvals + '\n')
201 res.append(lvals + '\n')
201 i = i + 1
202 i = i + 1
202 return res
203 return res
203
204
204
205
205 #---------------------------------------------------------------------------
206 #---------------------------------------------------------------------------
206 # Module classes
207 # Module classes
207 class TBTools:
208 class TBTools:
208 """Basic tools used by all traceback printer classes."""
209 """Basic tools used by all traceback printer classes."""
209
210
210 def __init__(self,color_scheme = 'NoColor',call_pdb=False):
211 def __init__(self,color_scheme = 'NoColor',call_pdb=False):
211 # Whether to call the interactive pdb debugger after printing
212 # Whether to call the interactive pdb debugger after printing
212 # tracebacks or not
213 # tracebacks or not
213 self.call_pdb = call_pdb
214 self.call_pdb = call_pdb
214
215
215 # Create color table
216 # Create color table
216 self.color_scheme_table = ExceptionColors
217 self.color_scheme_table = ExceptionColors
217
218
218 self.set_colors(color_scheme)
219 self.set_colors(color_scheme)
219 self.old_scheme = color_scheme # save initial value for toggles
220 self.old_scheme = color_scheme # save initial value for toggles
220
221
221 if call_pdb:
222 if call_pdb:
222 self.pdb = Debugger.Pdb(self.color_scheme_table.active_scheme_name)
223 self.pdb = Debugger.Pdb(self.color_scheme_table.active_scheme_name)
223 else:
224 else:
224 self.pdb = None
225 self.pdb = None
225
226
226 def set_colors(self,*args,**kw):
227 def set_colors(self,*args,**kw):
227 """Shorthand access to the color table scheme selector method."""
228 """Shorthand access to the color table scheme selector method."""
228
229
229 # Set own color table
230 # Set own color table
230 self.color_scheme_table.set_active_scheme(*args,**kw)
231 self.color_scheme_table.set_active_scheme(*args,**kw)
231 # for convenience, set Colors to the active scheme
232 # for convenience, set Colors to the active scheme
232 self.Colors = self.color_scheme_table.active_colors
233 self.Colors = self.color_scheme_table.active_colors
233 # Also set colors of debugger
234 # Also set colors of debugger
234 if hasattr(self,'pdb') and self.pdb is not None:
235 if hasattr(self,'pdb') and self.pdb is not None:
235 self.pdb.set_colors(*args,**kw)
236 self.pdb.set_colors(*args,**kw)
236
237
237 def color_toggle(self):
238 def color_toggle(self):
238 """Toggle between the currently active color scheme and NoColor."""
239 """Toggle between the currently active color scheme and NoColor."""
239
240
240 if self.color_scheme_table.active_scheme_name == 'NoColor':
241 if self.color_scheme_table.active_scheme_name == 'NoColor':
241 self.color_scheme_table.set_active_scheme(self.old_scheme)
242 self.color_scheme_table.set_active_scheme(self.old_scheme)
242 self.Colors = self.color_scheme_table.active_colors
243 self.Colors = self.color_scheme_table.active_colors
243 else:
244 else:
244 self.old_scheme = self.color_scheme_table.active_scheme_name
245 self.old_scheme = self.color_scheme_table.active_scheme_name
245 self.color_scheme_table.set_active_scheme('NoColor')
246 self.color_scheme_table.set_active_scheme('NoColor')
246 self.Colors = self.color_scheme_table.active_colors
247 self.Colors = self.color_scheme_table.active_colors
247
248
248 #---------------------------------------------------------------------------
249 #---------------------------------------------------------------------------
249 class ListTB(TBTools):
250 class ListTB(TBTools):
250 """Print traceback information from a traceback list, with optional color.
251 """Print traceback information from a traceback list, with optional color.
251
252
252 Calling: requires 3 arguments:
253 Calling: requires 3 arguments:
253 (etype, evalue, elist)
254 (etype, evalue, elist)
254 as would be obtained by:
255 as would be obtained by:
255 etype, evalue, tb = sys.exc_info()
256 etype, evalue, tb = sys.exc_info()
256 if tb:
257 if tb:
257 elist = traceback.extract_tb(tb)
258 elist = traceback.extract_tb(tb)
258 else:
259 else:
259 elist = None
260 elist = None
260
261
261 It can thus be used by programs which need to process the traceback before
262 It can thus be used by programs which need to process the traceback before
262 printing (such as console replacements based on the code module from the
263 printing (such as console replacements based on the code module from the
263 standard library).
264 standard library).
264
265
265 Because they are meant to be called without a full traceback (only a
266 Because they are meant to be called without a full traceback (only a
266 list), instances of this class can't call the interactive pdb debugger."""
267 list), instances of this class can't call the interactive pdb debugger."""
267
268
268 def __init__(self,color_scheme = 'NoColor'):
269 def __init__(self,color_scheme = 'NoColor'):
269 TBTools.__init__(self,color_scheme = color_scheme,call_pdb=0)
270 TBTools.__init__(self,color_scheme = color_scheme,call_pdb=0)
270
271
271 def __call__(self, etype, value, elist):
272 def __call__(self, etype, value, elist):
272 Term.cout.flush()
273 Term.cout.flush()
273 Term.cerr.flush()
274 Term.cerr.flush()
274 print >> Term.cerr, self.text(etype,value,elist)
275 print >> Term.cerr, self.text(etype,value,elist)
275
276
276 def text(self,etype, value, elist,context=5):
277 def text(self,etype, value, elist,context=5):
277 """Return a color formatted string with the traceback info."""
278 """Return a color formatted string with the traceback info."""
278
279
279 Colors = self.Colors
280 Colors = self.Colors
280 out_string = ['%s%s%s\n' % (Colors.topline,'-'*60,Colors.Normal)]
281 out_string = ['%s%s%s\n' % (Colors.topline,'-'*60,Colors.Normal)]
281 if elist:
282 if elist:
282 out_string.append('Traceback %s(most recent call last)%s:' % \
283 out_string.append('Traceback %s(most recent call last)%s:' % \
283 (Colors.normalEm, Colors.Normal) + '\n')
284 (Colors.normalEm, Colors.Normal) + '\n')
284 out_string.extend(self._format_list(elist))
285 out_string.extend(self._format_list(elist))
285 lines = self._format_exception_only(etype, value)
286 lines = self._format_exception_only(etype, value)
286 for line in lines[:-1]:
287 for line in lines[:-1]:
287 out_string.append(" "+line)
288 out_string.append(" "+line)
288 out_string.append(lines[-1])
289 out_string.append(lines[-1])
289 return ''.join(out_string)
290 return ''.join(out_string)
290
291
291 def _format_list(self, extracted_list):
292 def _format_list(self, extracted_list):
292 """Format a list of traceback entry tuples for printing.
293 """Format a list of traceback entry tuples for printing.
293
294
294 Given a list of tuples as returned by extract_tb() or
295 Given a list of tuples as returned by extract_tb() or
295 extract_stack(), return a list of strings ready for printing.
296 extract_stack(), return a list of strings ready for printing.
296 Each string in the resulting list corresponds to the item with the
297 Each string in the resulting list corresponds to the item with the
297 same index in the argument list. Each string ends in a newline;
298 same index in the argument list. Each string ends in a newline;
298 the strings may contain internal newlines as well, for those items
299 the strings may contain internal newlines as well, for those items
299 whose source text line is not None.
300 whose source text line is not None.
300
301
301 Lifted almost verbatim from traceback.py
302 Lifted almost verbatim from traceback.py
302 """
303 """
303
304
304 Colors = self.Colors
305 Colors = self.Colors
305 list = []
306 list = []
306 for filename, lineno, name, line in extracted_list[:-1]:
307 for filename, lineno, name, line in extracted_list[:-1]:
307 item = ' File %s"%s"%s, line %s%d%s, in %s%s%s\n' % \
308 item = ' File %s"%s"%s, line %s%d%s, in %s%s%s\n' % \
308 (Colors.filename, filename, Colors.Normal,
309 (Colors.filename, filename, Colors.Normal,
309 Colors.lineno, lineno, Colors.Normal,
310 Colors.lineno, lineno, Colors.Normal,
310 Colors.name, name, Colors.Normal)
311 Colors.name, name, Colors.Normal)
311 if line:
312 if line:
312 item = item + ' %s\n' % line.strip()
313 item = item + ' %s\n' % line.strip()
313 list.append(item)
314 list.append(item)
314 # Emphasize the last entry
315 # Emphasize the last entry
315 filename, lineno, name, line = extracted_list[-1]
316 filename, lineno, name, line = extracted_list[-1]
316 item = '%s File %s"%s"%s, line %s%d%s, in %s%s%s%s\n' % \
317 item = '%s File %s"%s"%s, line %s%d%s, in %s%s%s%s\n' % \
317 (Colors.normalEm,
318 (Colors.normalEm,
318 Colors.filenameEm, filename, Colors.normalEm,
319 Colors.filenameEm, filename, Colors.normalEm,
319 Colors.linenoEm, lineno, Colors.normalEm,
320 Colors.linenoEm, lineno, Colors.normalEm,
320 Colors.nameEm, name, Colors.normalEm,
321 Colors.nameEm, name, Colors.normalEm,
321 Colors.Normal)
322 Colors.Normal)
322 if line:
323 if line:
323 item = item + '%s %s%s\n' % (Colors.line, line.strip(),
324 item = item + '%s %s%s\n' % (Colors.line, line.strip(),
324 Colors.Normal)
325 Colors.Normal)
325 list.append(item)
326 list.append(item)
326 return list
327 return list
327
328
328 def _format_exception_only(self, etype, value):
329 def _format_exception_only(self, etype, value):
329 """Format the exception part of a traceback.
330 """Format the exception part of a traceback.
330
331
331 The arguments are the exception type and value such as given by
332 The arguments are the exception type and value such as given by
332 sys.exc_info()[:2]. The return value is a list of strings, each ending
333 sys.exc_info()[:2]. The return value is a list of strings, each ending
333 in a newline. Normally, the list contains a single string; however,
334 in a newline. Normally, the list contains a single string; however,
334 for SyntaxError exceptions, it contains several lines that (when
335 for SyntaxError exceptions, it contains several lines that (when
335 printed) display detailed information about where the syntax error
336 printed) display detailed information about where the syntax error
336 occurred. The message indicating which exception occurred is the
337 occurred. The message indicating which exception occurred is the
337 always last string in the list.
338 always last string in the list.
338
339
339 Also lifted nearly verbatim from traceback.py
340 Also lifted nearly verbatim from traceback.py
340 """
341 """
341
342
342 Colors = self.Colors
343 Colors = self.Colors
343 list = []
344 list = []
344 if type(etype) == types.ClassType:
345 if type(etype) == types.ClassType:
345 stype = Colors.excName + etype.__name__ + Colors.Normal
346 stype = Colors.excName + etype.__name__ + Colors.Normal
346 else:
347 else:
347 stype = etype # String exceptions don't get special coloring
348 stype = etype # String exceptions don't get special coloring
348 if value is None:
349 if value is None:
349 list.append( str(stype) + '\n')
350 list.append( str(stype) + '\n')
350 else:
351 else:
351 if etype is SyntaxError:
352 if etype is SyntaxError:
352 try:
353 try:
353 msg, (filename, lineno, offset, line) = value
354 msg, (filename, lineno, offset, line) = value
354 except:
355 except:
355 pass
356 pass
356 else:
357 else:
357 #print 'filename is',filename # dbg
358 #print 'filename is',filename # dbg
358 if not filename: filename = "<string>"
359 if not filename: filename = "<string>"
359 list.append('%s File %s"%s"%s, line %s%d%s\n' % \
360 list.append('%s File %s"%s"%s, line %s%d%s\n' % \
360 (Colors.normalEm,
361 (Colors.normalEm,
361 Colors.filenameEm, filename, Colors.normalEm,
362 Colors.filenameEm, filename, Colors.normalEm,
362 Colors.linenoEm, lineno, Colors.Normal ))
363 Colors.linenoEm, lineno, Colors.Normal ))
363 if line is not None:
364 if line is not None:
364 i = 0
365 i = 0
365 while i < len(line) and line[i].isspace():
366 while i < len(line) and line[i].isspace():
366 i = i+1
367 i = i+1
367 list.append('%s %s%s\n' % (Colors.line,
368 list.append('%s %s%s\n' % (Colors.line,
368 line.strip(),
369 line.strip(),
369 Colors.Normal))
370 Colors.Normal))
370 if offset is not None:
371 if offset is not None:
371 s = ' '
372 s = ' '
372 for c in line[i:offset-1]:
373 for c in line[i:offset-1]:
373 if c.isspace():
374 if c.isspace():
374 s = s + c
375 s = s + c
375 else:
376 else:
376 s = s + ' '
377 s = s + ' '
377 list.append('%s%s^%s\n' % (Colors.caret, s,
378 list.append('%s%s^%s\n' % (Colors.caret, s,
378 Colors.Normal) )
379 Colors.Normal) )
379 value = msg
380 value = msg
380 s = self._some_str(value)
381 s = self._some_str(value)
381 if s:
382 if s:
382 list.append('%s%s:%s %s\n' % (str(stype), Colors.excName,
383 list.append('%s%s:%s %s\n' % (str(stype), Colors.excName,
383 Colors.Normal, s))
384 Colors.Normal, s))
384 else:
385 else:
385 list.append('%s\n' % str(stype))
386 list.append('%s\n' % str(stype))
386 return list
387 return list
387
388
388 def _some_str(self, value):
389 def _some_str(self, value):
389 # Lifted from traceback.py
390 # Lifted from traceback.py
390 try:
391 try:
391 return str(value)
392 return str(value)
392 except:
393 except:
393 return '<unprintable %s object>' % type(value).__name__
394 return '<unprintable %s object>' % type(value).__name__
394
395
395 #----------------------------------------------------------------------------
396 #----------------------------------------------------------------------------
396 class VerboseTB(TBTools):
397 class VerboseTB(TBTools):
397 """A port of Ka-Ping Yee's cgitb.py module that outputs color text instead
398 """A port of Ka-Ping Yee's cgitb.py module that outputs color text instead
398 of HTML. Requires inspect and pydoc. Crazy, man.
399 of HTML. Requires inspect and pydoc. Crazy, man.
399
400
400 Modified version which optionally strips the topmost entries from the
401 Modified version which optionally strips the topmost entries from the
401 traceback, to be used with alternate interpreters (because their own code
402 traceback, to be used with alternate interpreters (because their own code
402 would appear in the traceback)."""
403 would appear in the traceback)."""
403
404
404 def __init__(self,color_scheme = 'Linux',tb_offset=0,long_header=0,
405 def __init__(self,color_scheme = 'Linux',tb_offset=0,long_header=0,
405 call_pdb = 0, include_vars=1):
406 call_pdb = 0, include_vars=1):
406 """Specify traceback offset, headers and color scheme.
407 """Specify traceback offset, headers and color scheme.
407
408
408 Define how many frames to drop from the tracebacks. Calling it with
409 Define how many frames to drop from the tracebacks. Calling it with
409 tb_offset=1 allows use of this handler in interpreters which will have
410 tb_offset=1 allows use of this handler in interpreters which will have
410 their own code at the top of the traceback (VerboseTB will first
411 their own code at the top of the traceback (VerboseTB will first
411 remove that frame before printing the traceback info)."""
412 remove that frame before printing the traceback info)."""
412 TBTools.__init__(self,color_scheme=color_scheme,call_pdb=call_pdb)
413 TBTools.__init__(self,color_scheme=color_scheme,call_pdb=call_pdb)
413 self.tb_offset = tb_offset
414 self.tb_offset = tb_offset
414 self.long_header = long_header
415 self.long_header = long_header
415 self.include_vars = include_vars
416 self.include_vars = include_vars
416
417
417 def text(self, etype, evalue, etb, context=5):
418 def text(self, etype, evalue, etb, context=5):
418 """Return a nice text document describing the traceback."""
419 """Return a nice text document describing the traceback."""
419
420
420 # some locals
421 # some locals
421 Colors = self.Colors # just a shorthand + quicker name lookup
422 Colors = self.Colors # just a shorthand + quicker name lookup
422 ColorsNormal = Colors.Normal # used a lot
423 ColorsNormal = Colors.Normal # used a lot
424 col_scheme = self.color_scheme_table.active_scheme_name
423 indent = ' '*INDENT_SIZE
425 indent = ' '*INDENT_SIZE
424 exc = '%s%s%s' % (Colors.excName, str(etype), ColorsNormal)
426 exc = '%s%s%s' % (Colors.excName, str(etype), ColorsNormal)
425 em_normal = '%s\n%s%s' % (Colors.valEm, indent,ColorsNormal)
427 em_normal = '%s\n%s%s' % (Colors.valEm, indent,ColorsNormal)
426 undefined = '%sundefined%s' % (Colors.em, ColorsNormal)
428 undefined = '%sundefined%s' % (Colors.em, ColorsNormal)
427
429
428 # some internal-use functions
430 # some internal-use functions
429 def text_repr(value):
431 def text_repr(value):
430 """Hopefully pretty robust repr equivalent."""
432 """Hopefully pretty robust repr equivalent."""
431 # this is pretty horrible but should always return *something*
433 # this is pretty horrible but should always return *something*
432 try:
434 try:
433 return pydoc.text.repr(value)
435 return pydoc.text.repr(value)
434 except KeyboardInterrupt:
436 except KeyboardInterrupt:
435 raise
437 raise
436 except:
438 except:
437 try:
439 try:
438 return repr(value)
440 return repr(value)
439 except KeyboardInterrupt:
441 except KeyboardInterrupt:
440 raise
442 raise
441 except:
443 except:
442 try:
444 try:
443 # all still in an except block so we catch
445 # all still in an except block so we catch
444 # getattr raising
446 # getattr raising
445 name = getattr(value, '__name__', None)
447 name = getattr(value, '__name__', None)
446 if name:
448 if name:
447 # ick, recursion
449 # ick, recursion
448 return text_repr(name)
450 return text_repr(name)
449 klass = getattr(value, '__class__', None)
451 klass = getattr(value, '__class__', None)
450 if klass:
452 if klass:
451 return '%s instance' % text_repr(klass)
453 return '%s instance' % text_repr(klass)
452 except KeyboardInterrupt:
454 except KeyboardInterrupt:
453 raise
455 raise
454 except:
456 except:
455 return 'UNRECOVERABLE REPR FAILURE'
457 return 'UNRECOVERABLE REPR FAILURE'
456 def eqrepr(value, repr=text_repr): return '=%s' % repr(value)
458 def eqrepr(value, repr=text_repr): return '=%s' % repr(value)
457 def nullrepr(value, repr=text_repr): return ''
459 def nullrepr(value, repr=text_repr): return ''
458
460
459 # meat of the code begins
461 # meat of the code begins
460 if type(etype) is types.ClassType:
462 if type(etype) is types.ClassType:
461 etype = etype.__name__
463 etype = etype.__name__
462
464
463 if self.long_header:
465 if self.long_header:
464 # Header with the exception type, python version, and date
466 # Header with the exception type, python version, and date
465 pyver = 'Python ' + string.split(sys.version)[0] + ': ' + sys.executable
467 pyver = 'Python ' + string.split(sys.version)[0] + ': ' + sys.executable
466 date = time.ctime(time.time())
468 date = time.ctime(time.time())
467
469
468 head = '%s%s%s\n%s%s%s\n%s' % (Colors.topline, '-'*75, ColorsNormal,
470 head = '%s%s%s\n%s%s%s\n%s' % (Colors.topline, '-'*75, ColorsNormal,
469 exc, ' '*(75-len(str(etype))-len(pyver)),
471 exc, ' '*(75-len(str(etype))-len(pyver)),
470 pyver, string.rjust(date, 75) )
472 pyver, string.rjust(date, 75) )
471 head += "\nA problem occured executing Python code. Here is the sequence of function"\
473 head += "\nA problem occured executing Python code. Here is the sequence of function"\
472 "\ncalls leading up to the error, with the most recent (innermost) call last."
474 "\ncalls leading up to the error, with the most recent (innermost) call last."
473 else:
475 else:
474 # Simplified header
476 # Simplified header
475 head = '%s%s%s\n%s%s' % (Colors.topline, '-'*75, ColorsNormal,exc,
477 head = '%s%s%s\n%s%s' % (Colors.topline, '-'*75, ColorsNormal,exc,
476 string.rjust('Traceback (most recent call last)',
478 string.rjust('Traceback (most recent call last)',
477 75 - len(str(etype)) ) )
479 75 - len(str(etype)) ) )
478 frames = []
480 frames = []
479 # Flush cache before calling inspect. This helps alleviate some of the
481 # Flush cache before calling inspect. This helps alleviate some of the
480 # problems with python 2.3's inspect.py.
482 # problems with python 2.3's inspect.py.
481 linecache.checkcache()
483 linecache.checkcache()
482 # Drop topmost frames if requested
484 # Drop topmost frames if requested
483 try:
485 try:
484 # Try the default getinnerframes and Alex's: Alex's fixes some
486 # Try the default getinnerframes and Alex's: Alex's fixes some
485 # problems, but it generates empty tracebacks for console errors
487 # problems, but it generates empty tracebacks for console errors
486 # (5 blanks lines) where none should be returned.
488 # (5 blanks lines) where none should be returned.
487 #records = inspect.getinnerframes(etb, context)[self.tb_offset:]
489 #records = inspect.getinnerframes(etb, context)[self.tb_offset:]
488 #print 'python records:', records # dbg
490 #print 'python records:', records # dbg
489 records = _fixed_getinnerframes(etb, context,self.tb_offset)
491 records = _fixed_getinnerframes(etb, context,self.tb_offset)
490 #print 'alex records:', records # dbg
492 #print 'alex records:', records # dbg
491 except:
493 except:
492
494
493 # FIXME: I've been getting many crash reports from python 2.3
495 # FIXME: I've been getting many crash reports from python 2.3
494 # users, traceable to inspect.py. If I can find a small test-case
496 # users, traceable to inspect.py. If I can find a small test-case
495 # to reproduce this, I should either write a better workaround or
497 # to reproduce this, I should either write a better workaround or
496 # file a bug report against inspect (if that's the real problem).
498 # file a bug report against inspect (if that's the real problem).
497 # So far, I haven't been able to find an isolated example to
499 # So far, I haven't been able to find an isolated example to
498 # reproduce the problem.
500 # reproduce the problem.
499 inspect_error()
501 inspect_error()
500 traceback.print_exc(file=Term.cerr)
502 traceback.print_exc(file=Term.cerr)
501 info('\nUnfortunately, your original traceback can not be constructed.\n')
503 info('\nUnfortunately, your original traceback can not be constructed.\n')
502 return ''
504 return ''
503
505
504 # build some color string templates outside these nested loops
506 # build some color string templates outside these nested loops
505 tpl_link = '%s%%s%s' % (Colors.filenameEm,ColorsNormal)
507 tpl_link = '%s%%s%s' % (Colors.filenameEm,ColorsNormal)
506 tpl_call = 'in %s%%s%s%%s%s' % (Colors.vName, Colors.valEm,
508 tpl_call = 'in %s%%s%s%%s%s' % (Colors.vName, Colors.valEm,
507 ColorsNormal)
509 ColorsNormal)
508 tpl_call_fail = 'in %s%%s%s(***failed resolving arguments***)%s' % \
510 tpl_call_fail = 'in %s%%s%s(***failed resolving arguments***)%s' % \
509 (Colors.vName, Colors.valEm, ColorsNormal)
511 (Colors.vName, Colors.valEm, ColorsNormal)
510 tpl_local_var = '%s%%s%s' % (Colors.vName, ColorsNormal)
512 tpl_local_var = '%s%%s%s' % (Colors.vName, ColorsNormal)
511 tpl_global_var = '%sglobal%s %s%%s%s' % (Colors.em, ColorsNormal,
513 tpl_global_var = '%sglobal%s %s%%s%s' % (Colors.em, ColorsNormal,
512 Colors.vName, ColorsNormal)
514 Colors.vName, ColorsNormal)
513 tpl_name_val = '%%s %s= %%s%s' % (Colors.valEm, ColorsNormal)
515 tpl_name_val = '%%s %s= %%s%s' % (Colors.valEm, ColorsNormal)
514 tpl_line = '%s%%s%s %%s' % (Colors.lineno, ColorsNormal)
516 tpl_line = '%s%%s%s %%s' % (Colors.lineno, ColorsNormal)
515 tpl_line_em = '%s%%s%s %%s%s' % (Colors.linenoEm,Colors.line,
517 tpl_line_em = '%s%%s%s %%s%s' % (Colors.linenoEm,Colors.line,
516 ColorsNormal)
518 ColorsNormal)
517
519
518 # now, loop over all records printing context and info
520 # now, loop over all records printing context and info
519 abspath = os.path.abspath
521 abspath = os.path.abspath
520 for frame, file, lnum, func, lines, index in records:
522 for frame, file, lnum, func, lines, index in records:
521 #print '*** record:',file,lnum,func,lines,index # dbg
523 #print '*** record:',file,lnum,func,lines,index # dbg
522 try:
524 try:
523 file = file and abspath(file) or '?'
525 file = file and abspath(file) or '?'
524 except OSError:
526 except OSError:
525 # if file is '<console>' or something not in the filesystem,
527 # if file is '<console>' or something not in the filesystem,
526 # the abspath call will throw an OSError. Just ignore it and
528 # the abspath call will throw an OSError. Just ignore it and
527 # keep the original file string.
529 # keep the original file string.
528 pass
530 pass
529 link = tpl_link % file
531 link = tpl_link % file
530 try:
532 try:
531 args, varargs, varkw, locals = inspect.getargvalues(frame)
533 args, varargs, varkw, locals = inspect.getargvalues(frame)
532 except:
534 except:
533 # This can happen due to a bug in python2.3. We should be
535 # This can happen due to a bug in python2.3. We should be
534 # able to remove this try/except when 2.4 becomes a
536 # able to remove this try/except when 2.4 becomes a
535 # requirement. Bug details at http://python.org/sf/1005466
537 # requirement. Bug details at http://python.org/sf/1005466
536 inspect_error()
538 inspect_error()
537 traceback.print_exc(file=Term.cerr)
539 traceback.print_exc(file=Term.cerr)
538 info("\nIPython's exception reporting continues...\n")
540 info("\nIPython's exception reporting continues...\n")
539
541
540 if func == '?':
542 if func == '?':
541 call = ''
543 call = ''
542 else:
544 else:
543 # Decide whether to include variable details or not
545 # Decide whether to include variable details or not
544 var_repr = self.include_vars and eqrepr or nullrepr
546 var_repr = self.include_vars and eqrepr or nullrepr
545 try:
547 try:
546 call = tpl_call % (func,inspect.formatargvalues(args,
548 call = tpl_call % (func,inspect.formatargvalues(args,
547 varargs, varkw,
549 varargs, varkw,
548 locals,formatvalue=var_repr))
550 locals,formatvalue=var_repr))
549 except KeyError:
551 except KeyError:
550 # Very odd crash from inspect.formatargvalues(). The
552 # Very odd crash from inspect.formatargvalues(). The
551 # scenario under which it appeared was a call to
553 # scenario under which it appeared was a call to
552 # view(array,scale) in NumTut.view.view(), where scale had
554 # view(array,scale) in NumTut.view.view(), where scale had
553 # been defined as a scalar (it should be a tuple). Somehow
555 # been defined as a scalar (it should be a tuple). Somehow
554 # inspect messes up resolving the argument list of view()
556 # inspect messes up resolving the argument list of view()
555 # and barfs out. At some point I should dig into this one
557 # and barfs out. At some point I should dig into this one
556 # and file a bug report about it.
558 # and file a bug report about it.
557 inspect_error()
559 inspect_error()
558 traceback.print_exc(file=Term.cerr)
560 traceback.print_exc(file=Term.cerr)
559 info("\nIPython's exception reporting continues...\n")
561 info("\nIPython's exception reporting continues...\n")
560 call = tpl_call_fail % func
562 call = tpl_call_fail % func
561
563
562 # Initialize a list of names on the current line, which the
564 # Initialize a list of names on the current line, which the
563 # tokenizer below will populate.
565 # tokenizer below will populate.
564 names = []
566 names = []
565
567
566 def tokeneater(token_type, token, start, end, line):
568 def tokeneater(token_type, token, start, end, line):
567 """Stateful tokeneater which builds dotted names.
569 """Stateful tokeneater which builds dotted names.
568
570
569 The list of names it appends to (from the enclosing scope) can
571 The list of names it appends to (from the enclosing scope) can
570 contain repeated composite names. This is unavoidable, since
572 contain repeated composite names. This is unavoidable, since
571 there is no way to disambguate partial dotted structures until
573 there is no way to disambguate partial dotted structures until
572 the full list is known. The caller is responsible for pruning
574 the full list is known. The caller is responsible for pruning
573 the final list of duplicates before using it."""
575 the final list of duplicates before using it."""
574
576
575 # build composite names
577 # build composite names
576 if token == '.':
578 if token == '.':
577 try:
579 try:
578 names[-1] += '.'
580 names[-1] += '.'
579 # store state so the next token is added for x.y.z names
581 # store state so the next token is added for x.y.z names
580 tokeneater.name_cont = True
582 tokeneater.name_cont = True
581 return
583 return
582 except IndexError:
584 except IndexError:
583 pass
585 pass
584 if token_type == tokenize.NAME and token not in keyword.kwlist:
586 if token_type == tokenize.NAME and token not in keyword.kwlist:
585 if tokeneater.name_cont:
587 if tokeneater.name_cont:
586 # Dotted names
588 # Dotted names
587 names[-1] += token
589 names[-1] += token
588 tokeneater.name_cont = False
590 tokeneater.name_cont = False
589 else:
591 else:
590 # Regular new names. We append everything, the caller
592 # Regular new names. We append everything, the caller
591 # will be responsible for pruning the list later. It's
593 # will be responsible for pruning the list later. It's
592 # very tricky to try to prune as we go, b/c composite
594 # very tricky to try to prune as we go, b/c composite
593 # names can fool us. The pruning at the end is easy
595 # names can fool us. The pruning at the end is easy
594 # to do (or the caller can print a list with repeated
596 # to do (or the caller can print a list with repeated
595 # names if so desired.
597 # names if so desired.
596 names.append(token)
598 names.append(token)
597 elif token_type == tokenize.NEWLINE:
599 elif token_type == tokenize.NEWLINE:
598 raise IndexError
600 raise IndexError
599 # we need to store a bit of state in the tokenizer to build
601 # we need to store a bit of state in the tokenizer to build
600 # dotted names
602 # dotted names
601 tokeneater.name_cont = False
603 tokeneater.name_cont = False
602
604
603 def linereader(file=file, lnum=[lnum], getline=linecache.getline):
605 def linereader(file=file, lnum=[lnum], getline=linecache.getline):
604 line = getline(file, lnum[0])
606 line = getline(file, lnum[0])
605 lnum[0] += 1
607 lnum[0] += 1
606 return line
608 return line
607
609
608 # Build the list of names on this line of code where the exception
610 # Build the list of names on this line of code where the exception
609 # occurred.
611 # occurred.
610 try:
612 try:
611 # This builds the names list in-place by capturing it from the
613 # This builds the names list in-place by capturing it from the
612 # enclosing scope.
614 # enclosing scope.
613 tokenize.tokenize(linereader, tokeneater)
615 tokenize.tokenize(linereader, tokeneater)
614 except IndexError:
616 except IndexError:
615 # signals exit of tokenizer
617 # signals exit of tokenizer
616 pass
618 pass
617 except tokenize.TokenError,msg:
619 except tokenize.TokenError,msg:
618 _m = ("An unexpected error occurred while tokenizing input\n"
620 _m = ("An unexpected error occurred while tokenizing input\n"
619 "The following traceback may be corrupted or invalid\n"
621 "The following traceback may be corrupted or invalid\n"
620 "The error message is: %s\n" % msg)
622 "The error message is: %s\n" % msg)
621 error(_m)
623 error(_m)
622
624
623 # prune names list of duplicates, but keep the right order
625 # prune names list of duplicates, but keep the right order
624 unique_names = uniq_stable(names)
626 unique_names = uniq_stable(names)
625
627
626 # Start loop over vars
628 # Start loop over vars
627 lvals = []
629 lvals = []
628 if self.include_vars:
630 if self.include_vars:
629 for name_full in unique_names:
631 for name_full in unique_names:
630 name_base = name_full.split('.',1)[0]
632 name_base = name_full.split('.',1)[0]
631 if name_base in frame.f_code.co_varnames:
633 if name_base in frame.f_code.co_varnames:
632 if locals.has_key(name_base):
634 if locals.has_key(name_base):
633 try:
635 try:
634 value = repr(eval(name_full,locals))
636 value = repr(eval(name_full,locals))
635 except:
637 except:
636 value = undefined
638 value = undefined
637 else:
639 else:
638 value = undefined
640 value = undefined
639 name = tpl_local_var % name_full
641 name = tpl_local_var % name_full
640 else:
642 else:
641 if frame.f_globals.has_key(name_base):
643 if frame.f_globals.has_key(name_base):
642 try:
644 try:
643 value = repr(eval(name_full,frame.f_globals))
645 value = repr(eval(name_full,frame.f_globals))
644 except:
646 except:
645 value = undefined
647 value = undefined
646 else:
648 else:
647 value = undefined
649 value = undefined
648 name = tpl_global_var % name_full
650 name = tpl_global_var % name_full
649 lvals.append(tpl_name_val % (name,value))
651 lvals.append(tpl_name_val % (name,value))
650 if lvals:
652 if lvals:
651 lvals = '%s%s' % (indent,em_normal.join(lvals))
653 lvals = '%s%s' % (indent,em_normal.join(lvals))
652 else:
654 else:
653 lvals = ''
655 lvals = ''
654
656
655 level = '%s %s\n' % (link,call)
657 level = '%s %s\n' % (link,call)
656
658
657 if index is None:
659 if index is None:
658 frames.append(level)
660 frames.append(level)
659 else:
661 else:
660 frames.append('%s%s' % (level,''.join(
662 frames.append('%s%s' % (level,''.join(
661 _formatTracebackLines(lnum,index,lines,self.Colors,lvals))))
663 _formatTracebackLines(lnum,index,lines,Colors,lvals,
664 col_scheme))))
662
665
663 # Get (safely) a string form of the exception info
666 # Get (safely) a string form of the exception info
664 try:
667 try:
665 etype_str,evalue_str = map(str,(etype,evalue))
668 etype_str,evalue_str = map(str,(etype,evalue))
666 except:
669 except:
667 # User exception is improperly defined.
670 # User exception is improperly defined.
668 etype,evalue = str,sys.exc_info()[:2]
671 etype,evalue = str,sys.exc_info()[:2]
669 etype_str,evalue_str = map(str,(etype,evalue))
672 etype_str,evalue_str = map(str,(etype,evalue))
670 # ... and format it
673 # ... and format it
671 exception = ['%s%s%s: %s' % (Colors.excName, etype_str,
674 exception = ['%s%s%s: %s' % (Colors.excName, etype_str,
672 ColorsNormal, evalue_str)]
675 ColorsNormal, evalue_str)]
673 if type(evalue) is types.InstanceType:
676 if type(evalue) is types.InstanceType:
674 try:
677 try:
675 names = [w for w in dir(evalue) if isinstance(w, basestring)]
678 names = [w for w in dir(evalue) if isinstance(w, basestring)]
676 except:
679 except:
677 # Every now and then, an object with funny inernals blows up
680 # Every now and then, an object with funny inernals blows up
678 # when dir() is called on it. We do the best we can to report
681 # when dir() is called on it. We do the best we can to report
679 # the problem and continue
682 # the problem and continue
680 _m = '%sException reporting error (object with broken dir())%s:'
683 _m = '%sException reporting error (object with broken dir())%s:'
681 exception.append(_m % (Colors.excName,ColorsNormal))
684 exception.append(_m % (Colors.excName,ColorsNormal))
682 etype_str,evalue_str = map(str,sys.exc_info()[:2])
685 etype_str,evalue_str = map(str,sys.exc_info()[:2])
683 exception.append('%s%s%s: %s' % (Colors.excName,etype_str,
686 exception.append('%s%s%s: %s' % (Colors.excName,etype_str,
684 ColorsNormal, evalue_str))
687 ColorsNormal, evalue_str))
685 names = []
688 names = []
686 for name in names:
689 for name in names:
687 value = text_repr(getattr(evalue, name))
690 value = text_repr(getattr(evalue, name))
688 exception.append('\n%s%s = %s' % (indent, name, value))
691 exception.append('\n%s%s = %s' % (indent, name, value))
689 # return all our info assembled as a single string
692 # return all our info assembled as a single string
690 return '%s\n\n%s\n%s' % (head,'\n'.join(frames),''.join(exception[0]) )
693 return '%s\n\n%s\n%s' % (head,'\n'.join(frames),''.join(exception[0]) )
691
694
692 def debugger(self,force=False):
695 def debugger(self,force=False):
693 """Call up the pdb debugger if desired, always clean up the tb
696 """Call up the pdb debugger if desired, always clean up the tb
694 reference.
697 reference.
695
698
696 Keywords:
699 Keywords:
697
700
698 - force(False): by default, this routine checks the instance call_pdb
701 - force(False): by default, this routine checks the instance call_pdb
699 flag and does not actually invoke the debugger if the flag is false.
702 flag and does not actually invoke the debugger if the flag is false.
700 The 'force' option forces the debugger to activate even if the flag
703 The 'force' option forces the debugger to activate even if the flag
701 is false.
704 is false.
702
705
703 If the call_pdb flag is set, the pdb interactive debugger is
706 If the call_pdb flag is set, the pdb interactive debugger is
704 invoked. In all cases, the self.tb reference to the current traceback
707 invoked. In all cases, the self.tb reference to the current traceback
705 is deleted to prevent lingering references which hamper memory
708 is deleted to prevent lingering references which hamper memory
706 management.
709 management.
707
710
708 Note that each call to pdb() does an 'import readline', so if your app
711 Note that each call to pdb() does an 'import readline', so if your app
709 requires a special setup for the readline completers, you'll have to
712 requires a special setup for the readline completers, you'll have to
710 fix that by hand after invoking the exception handler."""
713 fix that by hand after invoking the exception handler."""
711
714
712 if force or self.call_pdb:
715 if force or self.call_pdb:
713 if self.pdb is None:
716 if self.pdb is None:
714 self.pdb = Debugger.Pdb(
717 self.pdb = Debugger.Pdb(
715 self.color_scheme_table.active_scheme_name)
718 self.color_scheme_table.active_scheme_name)
716 # the system displayhook may have changed, restore the original
719 # the system displayhook may have changed, restore the original
717 # for pdb
720 # for pdb
718 dhook = sys.displayhook
721 dhook = sys.displayhook
719 sys.displayhook = sys.__displayhook__
722 sys.displayhook = sys.__displayhook__
720 self.pdb.reset()
723 self.pdb.reset()
721 # Find the right frame so we don't pop up inside ipython itself
724 # Find the right frame so we don't pop up inside ipython itself
722 if hasattr(self,'tb'):
725 if hasattr(self,'tb'):
723 etb = self.tb
726 etb = self.tb
724 else:
727 else:
725 etb = self.tb = sys.last_traceback
728 etb = self.tb = sys.last_traceback
726 while self.tb.tb_next is not None:
729 while self.tb.tb_next is not None:
727 self.tb = self.tb.tb_next
730 self.tb = self.tb.tb_next
728 try:
731 try:
729 if etb and etb.tb_next:
732 if etb and etb.tb_next:
730 etb = etb.tb_next
733 etb = etb.tb_next
731 self.pdb.botframe = etb.tb_frame
734 self.pdb.botframe = etb.tb_frame
732 self.pdb.interaction(self.tb.tb_frame, self.tb)
735 self.pdb.interaction(self.tb.tb_frame, self.tb)
733 finally:
736 finally:
734 sys.displayhook = dhook
737 sys.displayhook = dhook
735
738
736 if hasattr(self,'tb'):
739 if hasattr(self,'tb'):
737 del self.tb
740 del self.tb
738
741
739 def handler(self, info=None):
742 def handler(self, info=None):
740 (etype, evalue, etb) = info or sys.exc_info()
743 (etype, evalue, etb) = info or sys.exc_info()
741 self.tb = etb
744 self.tb = etb
742 Term.cout.flush()
745 Term.cout.flush()
743 Term.cerr.flush()
746 Term.cerr.flush()
744 print >> Term.cerr, self.text(etype, evalue, etb)
747 print >> Term.cerr, self.text(etype, evalue, etb)
745
748
746 # Changed so an instance can just be called as VerboseTB_inst() and print
749 # Changed so an instance can just be called as VerboseTB_inst() and print
747 # out the right info on its own.
750 # out the right info on its own.
748 def __call__(self, etype=None, evalue=None, etb=None):
751 def __call__(self, etype=None, evalue=None, etb=None):
749 """This hook can replace sys.excepthook (for Python 2.1 or higher)."""
752 """This hook can replace sys.excepthook (for Python 2.1 or higher)."""
750 if etb is None:
753 if etb is None:
751 self.handler()
754 self.handler()
752 else:
755 else:
753 self.handler((etype, evalue, etb))
756 self.handler((etype, evalue, etb))
754 self.debugger()
757 self.debugger()
755
758
756 #----------------------------------------------------------------------------
759 #----------------------------------------------------------------------------
757 class FormattedTB(VerboseTB,ListTB):
760 class FormattedTB(VerboseTB,ListTB):
758 """Subclass ListTB but allow calling with a traceback.
761 """Subclass ListTB but allow calling with a traceback.
759
762
760 It can thus be used as a sys.excepthook for Python > 2.1.
763 It can thus be used as a sys.excepthook for Python > 2.1.
761
764
762 Also adds 'Context' and 'Verbose' modes, not available in ListTB.
765 Also adds 'Context' and 'Verbose' modes, not available in ListTB.
763
766
764 Allows a tb_offset to be specified. This is useful for situations where
767 Allows a tb_offset to be specified. This is useful for situations where
765 one needs to remove a number of topmost frames from the traceback (such as
768 one needs to remove a number of topmost frames from the traceback (such as
766 occurs with python programs that themselves execute other python code,
769 occurs with python programs that themselves execute other python code,
767 like Python shells). """
770 like Python shells). """
768
771
769 def __init__(self, mode = 'Plain', color_scheme='Linux',
772 def __init__(self, mode = 'Plain', color_scheme='Linux',
770 tb_offset = 0,long_header=0,call_pdb=0,include_vars=0):
773 tb_offset = 0,long_header=0,call_pdb=0,include_vars=0):
771
774
772 # NEVER change the order of this list. Put new modes at the end:
775 # NEVER change the order of this list. Put new modes at the end:
773 self.valid_modes = ['Plain','Context','Verbose']
776 self.valid_modes = ['Plain','Context','Verbose']
774 self.verbose_modes = self.valid_modes[1:3]
777 self.verbose_modes = self.valid_modes[1:3]
775
778
776 VerboseTB.__init__(self,color_scheme,tb_offset,long_header,
779 VerboseTB.__init__(self,color_scheme,tb_offset,long_header,
777 call_pdb=call_pdb,include_vars=include_vars)
780 call_pdb=call_pdb,include_vars=include_vars)
778 self.set_mode(mode)
781 self.set_mode(mode)
779
782
780 def _extract_tb(self,tb):
783 def _extract_tb(self,tb):
781 if tb:
784 if tb:
782 return traceback.extract_tb(tb)
785 return traceback.extract_tb(tb)
783 else:
786 else:
784 return None
787 return None
785
788
786 def text(self, etype, value, tb,context=5,mode=None):
789 def text(self, etype, value, tb,context=5,mode=None):
787 """Return formatted traceback.
790 """Return formatted traceback.
788
791
789 If the optional mode parameter is given, it overrides the current
792 If the optional mode parameter is given, it overrides the current
790 mode."""
793 mode."""
791
794
792 if mode is None:
795 if mode is None:
793 mode = self.mode
796 mode = self.mode
794 if mode in self.verbose_modes:
797 if mode in self.verbose_modes:
795 # verbose modes need a full traceback
798 # verbose modes need a full traceback
796 return VerboseTB.text(self,etype, value, tb,context=5)
799 return VerboseTB.text(self,etype, value, tb,context=5)
797 else:
800 else:
798 # We must check the source cache because otherwise we can print
801 # We must check the source cache because otherwise we can print
799 # out-of-date source code.
802 # out-of-date source code.
800 linecache.checkcache()
803 linecache.checkcache()
801 # Now we can extract and format the exception
804 # Now we can extract and format the exception
802 elist = self._extract_tb(tb)
805 elist = self._extract_tb(tb)
803 if len(elist) > self.tb_offset:
806 if len(elist) > self.tb_offset:
804 del elist[:self.tb_offset]
807 del elist[:self.tb_offset]
805 return ListTB.text(self,etype,value,elist)
808 return ListTB.text(self,etype,value,elist)
806
809
807 def set_mode(self,mode=None):
810 def set_mode(self,mode=None):
808 """Switch to the desired mode.
811 """Switch to the desired mode.
809
812
810 If mode is not specified, cycles through the available modes."""
813 If mode is not specified, cycles through the available modes."""
811
814
812 if not mode:
815 if not mode:
813 new_idx = ( self.valid_modes.index(self.mode) + 1 ) % \
816 new_idx = ( self.valid_modes.index(self.mode) + 1 ) % \
814 len(self.valid_modes)
817 len(self.valid_modes)
815 self.mode = self.valid_modes[new_idx]
818 self.mode = self.valid_modes[new_idx]
816 elif mode not in self.valid_modes:
819 elif mode not in self.valid_modes:
817 raise ValueError, 'Unrecognized mode in FormattedTB: <'+mode+'>\n'\
820 raise ValueError, 'Unrecognized mode in FormattedTB: <'+mode+'>\n'\
818 'Valid modes: '+str(self.valid_modes)
821 'Valid modes: '+str(self.valid_modes)
819 else:
822 else:
820 self.mode = mode
823 self.mode = mode
821 # include variable details only in 'Verbose' mode
824 # include variable details only in 'Verbose' mode
822 self.include_vars = (self.mode == self.valid_modes[2])
825 self.include_vars = (self.mode == self.valid_modes[2])
823
826
824 # some convenient shorcuts
827 # some convenient shorcuts
825 def plain(self):
828 def plain(self):
826 self.set_mode(self.valid_modes[0])
829 self.set_mode(self.valid_modes[0])
827
830
828 def context(self):
831 def context(self):
829 self.set_mode(self.valid_modes[1])
832 self.set_mode(self.valid_modes[1])
830
833
831 def verbose(self):
834 def verbose(self):
832 self.set_mode(self.valid_modes[2])
835 self.set_mode(self.valid_modes[2])
833
836
834 #----------------------------------------------------------------------------
837 #----------------------------------------------------------------------------
835 class AutoFormattedTB(FormattedTB):
838 class AutoFormattedTB(FormattedTB):
836 """A traceback printer which can be called on the fly.
839 """A traceback printer which can be called on the fly.
837
840
838 It will find out about exceptions by itself.
841 It will find out about exceptions by itself.
839
842
840 A brief example:
843 A brief example:
841
844
842 AutoTB = AutoFormattedTB(mode = 'Verbose',color_scheme='Linux')
845 AutoTB = AutoFormattedTB(mode = 'Verbose',color_scheme='Linux')
843 try:
846 try:
844 ...
847 ...
845 except:
848 except:
846 AutoTB() # or AutoTB(out=logfile) where logfile is an open file object
849 AutoTB() # or AutoTB(out=logfile) where logfile is an open file object
847 """
850 """
848 def __call__(self,etype=None,evalue=None,etb=None,
851 def __call__(self,etype=None,evalue=None,etb=None,
849 out=None,tb_offset=None):
852 out=None,tb_offset=None):
850 """Print out a formatted exception traceback.
853 """Print out a formatted exception traceback.
851
854
852 Optional arguments:
855 Optional arguments:
853 - out: an open file-like object to direct output to.
856 - out: an open file-like object to direct output to.
854
857
855 - tb_offset: the number of frames to skip over in the stack, on a
858 - tb_offset: the number of frames to skip over in the stack, on a
856 per-call basis (this overrides temporarily the instance's tb_offset
859 per-call basis (this overrides temporarily the instance's tb_offset
857 given at initialization time. """
860 given at initialization time. """
858
861
859 if out is None:
862 if out is None:
860 out = Term.cerr
863 out = Term.cerr
861 Term.cout.flush()
864 Term.cout.flush()
862 out.flush()
865 out.flush()
863 if tb_offset is not None:
866 if tb_offset is not None:
864 tb_offset, self.tb_offset = self.tb_offset, tb_offset
867 tb_offset, self.tb_offset = self.tb_offset, tb_offset
865 print >> out, self.text(etype, evalue, etb)
868 print >> out, self.text(etype, evalue, etb)
866 self.tb_offset = tb_offset
869 self.tb_offset = tb_offset
867 else:
870 else:
868 print >> out, self.text(etype, evalue, etb)
871 print >> out, self.text(etype, evalue, etb)
869 self.debugger()
872 self.debugger()
870
873
871 def text(self,etype=None,value=None,tb=None,context=5,mode=None):
874 def text(self,etype=None,value=None,tb=None,context=5,mode=None):
872 if etype is None:
875 if etype is None:
873 etype,value,tb = sys.exc_info()
876 etype,value,tb = sys.exc_info()
874 self.tb = tb
877 self.tb = tb
875 return FormattedTB.text(self,etype,value,tb,context=5,mode=mode)
878 return FormattedTB.text(self,etype,value,tb,context=5,mode=mode)
876
879
877 #---------------------------------------------------------------------------
880 #---------------------------------------------------------------------------
878 # A simple class to preserve Nathan's original functionality.
881 # A simple class to preserve Nathan's original functionality.
879 class ColorTB(FormattedTB):
882 class ColorTB(FormattedTB):
880 """Shorthand to initialize a FormattedTB in Linux colors mode."""
883 """Shorthand to initialize a FormattedTB in Linux colors mode."""
881 def __init__(self,color_scheme='Linux',call_pdb=0):
884 def __init__(self,color_scheme='Linux',call_pdb=0):
882 FormattedTB.__init__(self,color_scheme=color_scheme,
885 FormattedTB.__init__(self,color_scheme=color_scheme,
883 call_pdb=call_pdb)
886 call_pdb=call_pdb)
884
887
885 #----------------------------------------------------------------------------
888 #----------------------------------------------------------------------------
886 # module testing (minimal)
889 # module testing (minimal)
887 if __name__ == "__main__":
890 if __name__ == "__main__":
888 def spam(c, (d, e)):
891 def spam(c, (d, e)):
889 x = c + d
892 x = c + d
890 y = c * d
893 y = c * d
891 foo(x, y)
894 foo(x, y)
892
895
893 def foo(a, b, bar=1):
896 def foo(a, b, bar=1):
894 eggs(a, b + bar)
897 eggs(a, b + bar)
895
898
896 def eggs(f, g, z=globals()):
899 def eggs(f, g, z=globals()):
897 h = f + g
900 h = f + g
898 i = f - g
901 i = f - g
899 return h / i
902 return h / i
900
903
901 print ''
904 print ''
902 print '*** Before ***'
905 print '*** Before ***'
903 try:
906 try:
904 print spam(1, (2, 3))
907 print spam(1, (2, 3))
905 except:
908 except:
906 traceback.print_exc()
909 traceback.print_exc()
907 print ''
910 print ''
908
911
909 handler = ColorTB()
912 handler = ColorTB()
910 print '*** ColorTB ***'
913 print '*** ColorTB ***'
911 try:
914 try:
912 print spam(1, (2, 3))
915 print spam(1, (2, 3))
913 except:
916 except:
914 apply(handler, sys.exc_info() )
917 apply(handler, sys.exc_info() )
915 print ''
918 print ''
916
919
917 handler = VerboseTB()
920 handler = VerboseTB()
918 print '*** VerboseTB ***'
921 print '*** VerboseTB ***'
919 try:
922 try:
920 print spam(1, (2, 3))
923 print spam(1, (2, 3))
921 except:
924 except:
922 apply(handler, sys.exc_info() )
925 apply(handler, sys.exc_info() )
923 print ''
926 print ''
924
927
@@ -1,6351 +1,6356 b''
1 2007-03-18 Fernando Perez <Fernando.Perez@colorado.edu>
1 2007-03-18 Fernando Perez <Fernando.Perez@colorado.edu>
2
2
3 * IPython/Shell.py (_load_pylab): Make the execution of 'from
4 pylab import *' when -pylab is given be optional. A new flag,
5 pylab_import_all controls this behavior, the default is True for
6 backwards compatibility.
7
3 * IPython/ultraTB.py (_formatTracebackLines): Added (slightly
8 * IPython/ultraTB.py (_formatTracebackLines): Added (slightly
4 modified) R. Bernstein's patch for fully syntax highlighted
9 modified) R. Bernstein's patch for fully syntax highlighted
5 tracebacks. The functionality is also available under ultraTB for
10 tracebacks. The functionality is also available under ultraTB for
6 non-ipython users (someone using ultraTB but outside an ipython
11 non-ipython users (someone using ultraTB but outside an ipython
7 session). They can select the color scheme by setting the
12 session). They can select the color scheme by setting the
8 module-level global DEFAULT_SCHEME. The highlight functionality
13 module-level global DEFAULT_SCHEME. The highlight functionality
9 also works when debugging.
14 also works when debugging.
10
15
11 * IPython/genutils.py (IOStream.close): small patch by
16 * IPython/genutils.py (IOStream.close): small patch by
12 R. Bernstein for improved pydb support.
17 R. Bernstein for improved pydb support.
13
18
14 * IPython/Debugger.py (Pdb.format_stack_entry): Added patch by
19 * IPython/Debugger.py (Pdb.format_stack_entry): Added patch by
15 DaveS <davls@telus.net> to improve support of debugging under
20 DaveS <davls@telus.net> to improve support of debugging under
16 NTEmacs, including improved pydb behavior.
21 NTEmacs, including improved pydb behavior.
17
22
18 * IPython/Magic.py (magic_prun): Fix saving of profile info for
23 * IPython/Magic.py (magic_prun): Fix saving of profile info for
19 Python 2.5, where the stats object API changed a little. Thanks
24 Python 2.5, where the stats object API changed a little. Thanks
20 to a bug report by Paul Smith <paul.smith-AT-catugmt.com>.
25 to a bug report by Paul Smith <paul.smith-AT-catugmt.com>.
21
26
22 * IPython/ColorANSI.py (InputTermColors.Normal): applied Nicolas
27 * IPython/ColorANSI.py (InputTermColors.Normal): applied Nicolas
23 Pernetty's patch to improve support for (X)Emacs under Win32.
28 Pernetty's patch to improve support for (X)Emacs under Win32.
24
29
25 2007-03-17 Fernando Perez <Fernando.Perez@colorado.edu>
30 2007-03-17 Fernando Perez <Fernando.Perez@colorado.edu>
26
31
27 * IPython/Shell.py (hijack_wx): ipmort WX with current semantics
32 * IPython/Shell.py (hijack_wx): ipmort WX with current semantics
28 to quiet a deprecation warning that fires with Wx 2.8. Thanks to
33 to quiet a deprecation warning that fires with Wx 2.8. Thanks to
29 a report by Nik Tautenhahn.
34 a report by Nik Tautenhahn.
30
35
31 2007-03-16 Walter Doerwald <walter@livinglogic.de>
36 2007-03-16 Walter Doerwald <walter@livinglogic.de>
32
37
33 * setup.py: Add the igrid help files to the list of data files
38 * setup.py: Add the igrid help files to the list of data files
34 to be installed alongside igrid.
39 to be installed alongside igrid.
35 * IPython/Extensions/igrid.py: (Patch by Nik Tautenhahn)
40 * IPython/Extensions/igrid.py: (Patch by Nik Tautenhahn)
36 Show the input object of the igrid browser as the window tile.
41 Show the input object of the igrid browser as the window tile.
37 Show the object the cursor is on in the statusbar.
42 Show the object the cursor is on in the statusbar.
38
43
39 2007-03-15 Ville Vainio <vivainio@gmail.com>
44 2007-03-15 Ville Vainio <vivainio@gmail.com>
40
45
41 * Extensions/ipy_stock_completers.py: Fixed exception
46 * Extensions/ipy_stock_completers.py: Fixed exception
42 on mismatching quotes in %run completer. Patch by
47 on mismatching quotes in %run completer. Patch by
43 JοΏ½rgen Stenarson. Closes #127.
48 JοΏ½rgen Stenarson. Closes #127.
44
49
45 2007-03-14 Ville Vainio <vivainio@gmail.com>
50 2007-03-14 Ville Vainio <vivainio@gmail.com>
46
51
47 * Extensions/ext_rehashdir.py: Do not do auto_alias
52 * Extensions/ext_rehashdir.py: Do not do auto_alias
48 in %rehashdir, it clobbers %store'd aliases.
53 in %rehashdir, it clobbers %store'd aliases.
49
54
50 * UserConfig/ipy_profile_sh.py: envpersist.py extension
55 * UserConfig/ipy_profile_sh.py: envpersist.py extension
51 (beefed up %env) imported for sh profile.
56 (beefed up %env) imported for sh profile.
52
57
53 2007-03-10 Walter Doerwald <walter@livinglogic.de>
58 2007-03-10 Walter Doerwald <walter@livinglogic.de>
54
59
55 * IPython/Extensions/ipipe.py: Prefer ibrowse over igrid
60 * IPython/Extensions/ipipe.py: Prefer ibrowse over igrid
56 as the default browser.
61 as the default browser.
57 * IPython/Extensions/igrid.py: Make a few igrid attributes private.
62 * IPython/Extensions/igrid.py: Make a few igrid attributes private.
58 As igrid displays all attributes it ever encounters, fetch() (which has
63 As igrid displays all attributes it ever encounters, fetch() (which has
59 been renamed to _fetch()) doesn't have to recalculate the display attributes
64 been renamed to _fetch()) doesn't have to recalculate the display attributes
60 every time a new item is fetched. This should speed up scrolling.
65 every time a new item is fetched. This should speed up scrolling.
61
66
62 2007-03-10 Fernando Perez <Fernando.Perez@colorado.edu>
67 2007-03-10 Fernando Perez <Fernando.Perez@colorado.edu>
63
68
64 * IPython/iplib.py (InteractiveShell.__init__): fix for Alex
69 * IPython/iplib.py (InteractiveShell.__init__): fix for Alex
65 Schmolck's recently reported tab-completion bug (my previous one
70 Schmolck's recently reported tab-completion bug (my previous one
66 had a problem). Patch by Dan Milstein <danmil-AT-comcast.net>.
71 had a problem). Patch by Dan Milstein <danmil-AT-comcast.net>.
67
72
68 2007-03-09 Walter Doerwald <walter@livinglogic.de>
73 2007-03-09 Walter Doerwald <walter@livinglogic.de>
69
74
70 * IPython/Extensions/igrid.py: Patch by Nik Tautenhahn:
75 * IPython/Extensions/igrid.py: Patch by Nik Tautenhahn:
71 Close help window if exiting igrid.
76 Close help window if exiting igrid.
72
77
73 2007-03-02 JοΏ½rgen Stenarson <jorgen.stenarson@bostream.nu>
78 2007-03-02 JοΏ½rgen Stenarson <jorgen.stenarson@bostream.nu>
74
79
75 * IPython/Extensions/ipy_defaults.py: Check if readline is available
80 * IPython/Extensions/ipy_defaults.py: Check if readline is available
76 before calling functions from readline.
81 before calling functions from readline.
77
82
78 2007-03-02 Walter Doerwald <walter@livinglogic.de>
83 2007-03-02 Walter Doerwald <walter@livinglogic.de>
79
84
80 * IPython/Extensions/igrid.py: Add Nik Tautenhahns igrid extension.
85 * IPython/Extensions/igrid.py: Add Nik Tautenhahns igrid extension.
81 igrid is a wxPython-based display object for ipipe. If your system has
86 igrid is a wxPython-based display object for ipipe. If your system has
82 wx installed igrid will be the default display. Without wx ipipe falls
87 wx installed igrid will be the default display. Without wx ipipe falls
83 back to ibrowse (which needs curses). If no curses is installed ipipe
88 back to ibrowse (which needs curses). If no curses is installed ipipe
84 falls back to idump.
89 falls back to idump.
85
90
86 2007-03-01 Fernando Perez <Fernando.Perez@colorado.edu>
91 2007-03-01 Fernando Perez <Fernando.Perez@colorado.edu>
87
92
88 * IPython/iplib.py (split_user_inputBROKEN): temporarily disable
93 * IPython/iplib.py (split_user_inputBROKEN): temporarily disable
89 my changes from yesterday, they introduced bugs. Will reactivate
94 my changes from yesterday, they introduced bugs. Will reactivate
90 once I get a correct solution, which will be much easier thanks to
95 once I get a correct solution, which will be much easier thanks to
91 Dan Milstein's new prefilter test suite.
96 Dan Milstein's new prefilter test suite.
92
97
93 2007-02-28 Fernando Perez <Fernando.Perez@colorado.edu>
98 2007-02-28 Fernando Perez <Fernando.Perez@colorado.edu>
94
99
95 * IPython/iplib.py (split_user_input): fix input splitting so we
100 * IPython/iplib.py (split_user_input): fix input splitting so we
96 don't attempt attribute accesses on things that can't possibly be
101 don't attempt attribute accesses on things that can't possibly be
97 valid Python attributes. After a bug report by Alex Schmolck.
102 valid Python attributes. After a bug report by Alex Schmolck.
98 (InteractiveShell.__init__): brown-paper bag fix; regexp broke
103 (InteractiveShell.__init__): brown-paper bag fix; regexp broke
99 %magic with explicit % prefix.
104 %magic with explicit % prefix.
100
105
101 2007-02-27 Fernando Perez <Fernando.Perez@colorado.edu>
106 2007-02-27 Fernando Perez <Fernando.Perez@colorado.edu>
102
107
103 * IPython/Shell.py (IPShellGTK.mainloop): update threads calls to
108 * IPython/Shell.py (IPShellGTK.mainloop): update threads calls to
104 avoid a DeprecationWarning from GTK.
109 avoid a DeprecationWarning from GTK.
105
110
106 2007-02-22 Fernando Perez <Fernando.Perez@colorado.edu>
111 2007-02-22 Fernando Perez <Fernando.Perez@colorado.edu>
107
112
108 * IPython/genutils.py (clock): I modified clock() to return total
113 * IPython/genutils.py (clock): I modified clock() to return total
109 time, user+system. This is a more commonly needed metric. I also
114 time, user+system. This is a more commonly needed metric. I also
110 introduced the new clocku/clocks to get only user/system time if
115 introduced the new clocku/clocks to get only user/system time if
111 one wants those instead.
116 one wants those instead.
112
117
113 ***WARNING: API CHANGE*** clock() used to return only user time,
118 ***WARNING: API CHANGE*** clock() used to return only user time,
114 so if you want exactly the same results as before, use clocku
119 so if you want exactly the same results as before, use clocku
115 instead.
120 instead.
116
121
117 2007-02-22 Ville Vainio <vivainio@gmail.com>
122 2007-02-22 Ville Vainio <vivainio@gmail.com>
118
123
119 * IPython/Extensions/ipy_p4.py: Extension for improved
124 * IPython/Extensions/ipy_p4.py: Extension for improved
120 p4 (perforce version control system) experience.
125 p4 (perforce version control system) experience.
121 Adds %p4 magic with p4 command completion and
126 Adds %p4 magic with p4 command completion and
122 automatic -G argument (marshall output as python dict)
127 automatic -G argument (marshall output as python dict)
123
128
124 2007-02-19 Fernando Perez <Fernando.Perez@colorado.edu>
129 2007-02-19 Fernando Perez <Fernando.Perez@colorado.edu>
125
130
126 * IPython/demo.py (Demo.re_stop): make dashes optional in demo
131 * IPython/demo.py (Demo.re_stop): make dashes optional in demo
127 stop marks.
132 stop marks.
128 (ClearingMixin): a simple mixin to easily make a Demo class clear
133 (ClearingMixin): a simple mixin to easily make a Demo class clear
129 the screen in between blocks and have empty marquees. The
134 the screen in between blocks and have empty marquees. The
130 ClearDemo and ClearIPDemo classes that use it are included.
135 ClearDemo and ClearIPDemo classes that use it are included.
131
136
132 2007-02-18 Fernando Perez <Fernando.Perez@colorado.edu>
137 2007-02-18 Fernando Perez <Fernando.Perez@colorado.edu>
133
138
134 * IPython/irunner.py (pexpect_monkeypatch): patch pexpect to
139 * IPython/irunner.py (pexpect_monkeypatch): patch pexpect to
135 protect against exceptions at Python shutdown time. Patch
140 protect against exceptions at Python shutdown time. Patch
136 sumbmitted to upstream.
141 sumbmitted to upstream.
137
142
138 2007-02-14 Walter Doerwald <walter@livinglogic.de>
143 2007-02-14 Walter Doerwald <walter@livinglogic.de>
139
144
140 * IPython/Extensions/ibrowse.py: If entering the first object level
145 * IPython/Extensions/ibrowse.py: If entering the first object level
141 (i.e. the object for which the browser has been started) fails,
146 (i.e. the object for which the browser has been started) fails,
142 now the error is raised directly (aborting the browser) instead of
147 now the error is raised directly (aborting the browser) instead of
143 running into an empty levels list later.
148 running into an empty levels list later.
144
149
145 2007-02-03 Walter Doerwald <walter@livinglogic.de>
150 2007-02-03 Walter Doerwald <walter@livinglogic.de>
146
151
147 * IPython/Extensions/ipipe.py: Add an xrepr implementation
152 * IPython/Extensions/ipipe.py: Add an xrepr implementation
148 for the noitem object.
153 for the noitem object.
149
154
150 2007-01-31 Fernando Perez <Fernando.Perez@colorado.edu>
155 2007-01-31 Fernando Perez <Fernando.Perez@colorado.edu>
151
156
152 * IPython/completer.py (Completer.attr_matches): Fix small
157 * IPython/completer.py (Completer.attr_matches): Fix small
153 tab-completion bug with Enthought Traits objects with units.
158 tab-completion bug with Enthought Traits objects with units.
154 Thanks to a bug report by Tom Denniston
159 Thanks to a bug report by Tom Denniston
155 <tom.denniston-AT-alum.dartmouth.org>.
160 <tom.denniston-AT-alum.dartmouth.org>.
156
161
157 2007-01-27 Fernando Perez <Fernando.Perez@colorado.edu>
162 2007-01-27 Fernando Perez <Fernando.Perez@colorado.edu>
158
163
159 * IPython/Extensions/ipy_stock_completers.py (runlistpy): fix a
164 * IPython/Extensions/ipy_stock_completers.py (runlistpy): fix a
160 bug where only .ipy or .py would be completed. Once the first
165 bug where only .ipy or .py would be completed. Once the first
161 argument to %run has been given, all completions are valid because
166 argument to %run has been given, all completions are valid because
162 they are the arguments to the script, which may well be non-python
167 they are the arguments to the script, which may well be non-python
163 filenames.
168 filenames.
164
169
165 * IPython/irunner.py (InteractiveRunner.run_source): major updates
170 * IPython/irunner.py (InteractiveRunner.run_source): major updates
166 to irunner to allow it to correctly support real doctesting of
171 to irunner to allow it to correctly support real doctesting of
167 out-of-process ipython code.
172 out-of-process ipython code.
168
173
169 * IPython/Magic.py (magic_cd): Make the setting of the terminal
174 * IPython/Magic.py (magic_cd): Make the setting of the terminal
170 title an option (-noterm_title) because it completely breaks
175 title an option (-noterm_title) because it completely breaks
171 doctesting.
176 doctesting.
172
177
173 * IPython/demo.py: fix IPythonDemo class that was not actually working.
178 * IPython/demo.py: fix IPythonDemo class that was not actually working.
174
179
175 2007-01-24 Fernando Perez <Fernando.Perez@colorado.edu>
180 2007-01-24 Fernando Perez <Fernando.Perez@colorado.edu>
176
181
177 * IPython/irunner.py (main): fix small bug where extensions were
182 * IPython/irunner.py (main): fix small bug where extensions were
178 not being correctly recognized.
183 not being correctly recognized.
179
184
180 2007-01-23 Walter Doerwald <walter@livinglogic.de>
185 2007-01-23 Walter Doerwald <walter@livinglogic.de>
181
186
182 * IPython/Extensions/ipipe.py (xiter): Make sure that iterating
187 * IPython/Extensions/ipipe.py (xiter): Make sure that iterating
183 a string containing a single line yields the string itself as the
188 a string containing a single line yields the string itself as the
184 only item.
189 only item.
185
190
186 * IPython/Extensions/ibrowse.py (ibrowse): Avoid entering an
191 * IPython/Extensions/ibrowse.py (ibrowse): Avoid entering an
187 object if it's the same as the one on the last level (This avoids
192 object if it's the same as the one on the last level (This avoids
188 infinite recursion for one line strings).
193 infinite recursion for one line strings).
189
194
190 2007-01-17 Fernando Perez <Fernando.Perez@colorado.edu>
195 2007-01-17 Fernando Perez <Fernando.Perez@colorado.edu>
191
196
192 * IPython/ultraTB.py (AutoFormattedTB.__call__): properly flush
197 * IPython/ultraTB.py (AutoFormattedTB.__call__): properly flush
193 all output streams before printing tracebacks. This ensures that
198 all output streams before printing tracebacks. This ensures that
194 user output doesn't end up interleaved with traceback output.
199 user output doesn't end up interleaved with traceback output.
195
200
196 2007-01-10 Ville Vainio <vivainio@gmail.com>
201 2007-01-10 Ville Vainio <vivainio@gmail.com>
197
202
198 * Extensions/envpersist.py: Turbocharged %env that remembers
203 * Extensions/envpersist.py: Turbocharged %env that remembers
199 env vars across sessions; e.g. "%env PATH+=;/opt/scripts" or
204 env vars across sessions; e.g. "%env PATH+=;/opt/scripts" or
200 "%env VISUAL=jed".
205 "%env VISUAL=jed".
201
206
202 2007-01-05 Fernando Perez <Fernando.Perez@colorado.edu>
207 2007-01-05 Fernando Perez <Fernando.Perez@colorado.edu>
203
208
204 * IPython/iplib.py (showtraceback): ensure that we correctly call
209 * IPython/iplib.py (showtraceback): ensure that we correctly call
205 custom handlers in all cases (some with pdb were slipping through,
210 custom handlers in all cases (some with pdb were slipping through,
206 but I'm not exactly sure why).
211 but I'm not exactly sure why).
207
212
208 * IPython/Debugger.py (Tracer.__init__): added new class to
213 * IPython/Debugger.py (Tracer.__init__): added new class to
209 support set_trace-like usage of IPython's enhanced debugger.
214 support set_trace-like usage of IPython's enhanced debugger.
210
215
211 2006-12-24 Ville Vainio <vivainio@gmail.com>
216 2006-12-24 Ville Vainio <vivainio@gmail.com>
212
217
213 * ipmaker.py: more informative message when ipy_user_conf
218 * ipmaker.py: more informative message when ipy_user_conf
214 import fails (suggest running %upgrade).
219 import fails (suggest running %upgrade).
215
220
216 * tools/run_ipy_in_profiler.py: Utility to see where
221 * tools/run_ipy_in_profiler.py: Utility to see where
217 the time during IPython startup is spent.
222 the time during IPython startup is spent.
218
223
219 2006-12-20 Ville Vainio <vivainio@gmail.com>
224 2006-12-20 Ville Vainio <vivainio@gmail.com>
220
225
221 * 0.7.3 is out - merge all from 0.7.3 branch to trunk
226 * 0.7.3 is out - merge all from 0.7.3 branch to trunk
222
227
223 * ipapi.py: Add new ipapi method, expand_alias.
228 * ipapi.py: Add new ipapi method, expand_alias.
224
229
225 * Release.py: Bump up version to 0.7.4.svn
230 * Release.py: Bump up version to 0.7.4.svn
226
231
227 2006-12-17 Ville Vainio <vivainio@gmail.com>
232 2006-12-17 Ville Vainio <vivainio@gmail.com>
228
233
229 * Extensions/jobctrl.py: Fixed &cmd arg arg...
234 * Extensions/jobctrl.py: Fixed &cmd arg arg...
230 to work properly on posix too
235 to work properly on posix too
231
236
232 * Release.py: Update revnum (version is still just 0.7.3).
237 * Release.py: Update revnum (version is still just 0.7.3).
233
238
234 2006-12-15 Ville Vainio <vivainio@gmail.com>
239 2006-12-15 Ville Vainio <vivainio@gmail.com>
235
240
236 * scripts/ipython_win_post_install: create ipython.py in
241 * scripts/ipython_win_post_install: create ipython.py in
237 prefix + "/scripts".
242 prefix + "/scripts".
238
243
239 * Release.py: Update version to 0.7.3.
244 * Release.py: Update version to 0.7.3.
240
245
241 2006-12-14 Ville Vainio <vivainio@gmail.com>
246 2006-12-14 Ville Vainio <vivainio@gmail.com>
242
247
243 * scripts/ipython_win_post_install: Overwrite old shortcuts
248 * scripts/ipython_win_post_install: Overwrite old shortcuts
244 if they already exist
249 if they already exist
245
250
246 * Release.py: release 0.7.3rc2
251 * Release.py: release 0.7.3rc2
247
252
248 2006-12-13 Ville Vainio <vivainio@gmail.com>
253 2006-12-13 Ville Vainio <vivainio@gmail.com>
249
254
250 * Branch and update Release.py for 0.7.3rc1
255 * Branch and update Release.py for 0.7.3rc1
251
256
252 2006-12-13 Fernando Perez <Fernando.Perez@colorado.edu>
257 2006-12-13 Fernando Perez <Fernando.Perez@colorado.edu>
253
258
254 * IPython/Shell.py (IPShellWX): update for current WX naming
259 * IPython/Shell.py (IPShellWX): update for current WX naming
255 conventions, to avoid a deprecation warning with current WX
260 conventions, to avoid a deprecation warning with current WX
256 versions. Thanks to a report by Danny Shevitz.
261 versions. Thanks to a report by Danny Shevitz.
257
262
258 2006-12-12 Ville Vainio <vivainio@gmail.com>
263 2006-12-12 Ville Vainio <vivainio@gmail.com>
259
264
260 * ipmaker.py: apply david cournapeau's patch to make
265 * ipmaker.py: apply david cournapeau's patch to make
261 import_some work properly even when ipythonrc does
266 import_some work properly even when ipythonrc does
262 import_some on empty list (it was an old bug!).
267 import_some on empty list (it was an old bug!).
263
268
264 * UserConfig/ipy_user_conf.py, UserConfig/ipythonrc:
269 * UserConfig/ipy_user_conf.py, UserConfig/ipythonrc:
265 Add deprecation note to ipythonrc and a url to wiki
270 Add deprecation note to ipythonrc and a url to wiki
266 in ipy_user_conf.py
271 in ipy_user_conf.py
267
272
268
273
269 * Magic.py (%run): %run myscript.ipy now runs myscript.ipy
274 * Magic.py (%run): %run myscript.ipy now runs myscript.ipy
270 as if it was typed on IPython command prompt, i.e.
275 as if it was typed on IPython command prompt, i.e.
271 as IPython script.
276 as IPython script.
272
277
273 * example-magic.py, magic_grepl.py: remove outdated examples
278 * example-magic.py, magic_grepl.py: remove outdated examples
274
279
275 2006-12-11 Fernando Perez <Fernando.Perez@colorado.edu>
280 2006-12-11 Fernando Perez <Fernando.Perez@colorado.edu>
276
281
277 * IPython/iplib.py (debugger): prevent a nasty traceback if %debug
282 * IPython/iplib.py (debugger): prevent a nasty traceback if %debug
278 is called before any exception has occurred.
283 is called before any exception has occurred.
279
284
280 2006-12-08 Ville Vainio <vivainio@gmail.com>
285 2006-12-08 Ville Vainio <vivainio@gmail.com>
281
286
282 * Extensions/ipy_stock_completers.py: fix cd completer
287 * Extensions/ipy_stock_completers.py: fix cd completer
283 to translate /'s to \'s again.
288 to translate /'s to \'s again.
284
289
285 * completer.py: prevent traceback on file completions w/
290 * completer.py: prevent traceback on file completions w/
286 backslash.
291 backslash.
287
292
288 * Release.py: Update release number to 0.7.3b3 for release
293 * Release.py: Update release number to 0.7.3b3 for release
289
294
290 2006-12-07 Ville Vainio <vivainio@gmail.com>
295 2006-12-07 Ville Vainio <vivainio@gmail.com>
291
296
292 * Extensions/ipy_signals.py: Ignore ctrl+C in IPython process
297 * Extensions/ipy_signals.py: Ignore ctrl+C in IPython process
293 while executing external code. Provides more shell-like behaviour
298 while executing external code. Provides more shell-like behaviour
294 and overall better response to ctrl + C / ctrl + break.
299 and overall better response to ctrl + C / ctrl + break.
295
300
296 * tools/make_tarball.py: new script to create tarball straight from svn
301 * tools/make_tarball.py: new script to create tarball straight from svn
297 (setup.py sdist doesn't work on win32).
302 (setup.py sdist doesn't work on win32).
298
303
299 * Extensions/ipy_stock_completers.py: fix cd completer to give up
304 * Extensions/ipy_stock_completers.py: fix cd completer to give up
300 on dirnames with spaces and use the default completer instead.
305 on dirnames with spaces and use the default completer instead.
301
306
302 * Revision.py: Change version to 0.7.3b2 for release.
307 * Revision.py: Change version to 0.7.3b2 for release.
303
308
304 2006-12-05 Ville Vainio <vivainio@gmail.com>
309 2006-12-05 Ville Vainio <vivainio@gmail.com>
305
310
306 * Magic.py, iplib.py, completer.py: Apply R. Bernstein's
311 * Magic.py, iplib.py, completer.py: Apply R. Bernstein's
307 pydb patch 4 (rm debug printing, py 2.5 checking)
312 pydb patch 4 (rm debug printing, py 2.5 checking)
308
313
309 2006-11-30 Walter Doerwald <walter@livinglogic.de>
314 2006-11-30 Walter Doerwald <walter@livinglogic.de>
310 * IPython/Extensions/ibrowse.py: Add two new commands to ibrowse:
315 * IPython/Extensions/ibrowse.py: Add two new commands to ibrowse:
311 "refresh" (mapped to "r") refreshes the screen by restarting the iterator.
316 "refresh" (mapped to "r") refreshes the screen by restarting the iterator.
312 "refreshfind" (mapped to "R") does the same but tries to go back to the same
317 "refreshfind" (mapped to "R") does the same but tries to go back to the same
313 object the cursor was on before the refresh. The command "markrange" is
318 object the cursor was on before the refresh. The command "markrange" is
314 mapped to "%" now.
319 mapped to "%" now.
315 * IPython/Extensions/ibrowse.py: Make igrpentry and ipwdentry comparable.
320 * IPython/Extensions/ibrowse.py: Make igrpentry and ipwdentry comparable.
316
321
317 2006-11-29 Fernando Perez <Fernando.Perez@colorado.edu>
322 2006-11-29 Fernando Perez <Fernando.Perez@colorado.edu>
318
323
319 * IPython/Magic.py (magic_debug): new %debug magic to activate the
324 * IPython/Magic.py (magic_debug): new %debug magic to activate the
320 interactive debugger on the last traceback, without having to call
325 interactive debugger on the last traceback, without having to call
321 %pdb and rerun your code. Made minor changes in various modules,
326 %pdb and rerun your code. Made minor changes in various modules,
322 should automatically recognize pydb if available.
327 should automatically recognize pydb if available.
323
328
324 2006-11-28 Ville Vainio <vivainio@gmail.com>
329 2006-11-28 Ville Vainio <vivainio@gmail.com>
325
330
326 * completer.py: If the text start with !, show file completions
331 * completer.py: If the text start with !, show file completions
327 properly. This helps when trying to complete command name
332 properly. This helps when trying to complete command name
328 for shell escapes.
333 for shell escapes.
329
334
330 2006-11-27 Ville Vainio <vivainio@gmail.com>
335 2006-11-27 Ville Vainio <vivainio@gmail.com>
331
336
332 * ipy_stock_completers.py: bzr completer submitted by Stefan van
337 * ipy_stock_completers.py: bzr completer submitted by Stefan van
333 der Walt. Clean up svn and hg completers by using a common
338 der Walt. Clean up svn and hg completers by using a common
334 vcs_completer.
339 vcs_completer.
335
340
336 2006-11-26 Ville Vainio <vivainio@gmail.com>
341 2006-11-26 Ville Vainio <vivainio@gmail.com>
337
342
338 * Remove ipconfig and %config; you should use _ip.options structure
343 * Remove ipconfig and %config; you should use _ip.options structure
339 directly instead!
344 directly instead!
340
345
341 * genutils.py: add wrap_deprecated function for deprecating callables
346 * genutils.py: add wrap_deprecated function for deprecating callables
342
347
343 * iplib.py: deprecate ipmagic, ipsystem, ipalias. Use _ip.magic and
348 * iplib.py: deprecate ipmagic, ipsystem, ipalias. Use _ip.magic and
344 _ip.system instead. ipalias is redundant.
349 _ip.system instead. ipalias is redundant.
345
350
346 * Magic.py: %rehashdir no longer aliases 'cmdname' to 'cmdname.exe' on
351 * Magic.py: %rehashdir no longer aliases 'cmdname' to 'cmdname.exe' on
347 win32, but just 'cmdname'. Other extensions (non-'exe') are still made
352 win32, but just 'cmdname'. Other extensions (non-'exe') are still made
348 explicit.
353 explicit.
349
354
350 * ipy_stock_completers.py: 'hg' (mercurial VCS) now has a custom
355 * ipy_stock_completers.py: 'hg' (mercurial VCS) now has a custom
351 completer. Try it by entering 'hg ' and pressing tab.
356 completer. Try it by entering 'hg ' and pressing tab.
352
357
353 * macro.py: Give Macro a useful __repr__ method
358 * macro.py: Give Macro a useful __repr__ method
354
359
355 * Magic.py: %whos abbreviates the typename of Macro for brevity.
360 * Magic.py: %whos abbreviates the typename of Macro for brevity.
356
361
357 2006-11-24 Walter Doerwald <walter@livinglogic.de>
362 2006-11-24 Walter Doerwald <walter@livinglogic.de>
358 * IPython/Extensions/astyle.py: Do a relative import of ipipe, so that
363 * IPython/Extensions/astyle.py: Do a relative import of ipipe, so that
359 we don't get a duplicate ipipe module, where registration of the xrepr
364 we don't get a duplicate ipipe module, where registration of the xrepr
360 implementation for Text is useless.
365 implementation for Text is useless.
361
366
362 * IPython/Extensions/ipipe.py: Fix __xrepr__() implementation for ils.
367 * IPython/Extensions/ipipe.py: Fix __xrepr__() implementation for ils.
363
368
364 * IPython/Extensions/ibrowse.py: Fix keymapping for the enter command.
369 * IPython/Extensions/ibrowse.py: Fix keymapping for the enter command.
365
370
366 2006-11-24 Ville Vainio <vivainio@gmail.com>
371 2006-11-24 Ville Vainio <vivainio@gmail.com>
367
372
368 * Magic.py, manual_base.lyx: Kirill Smelkov patch:
373 * Magic.py, manual_base.lyx: Kirill Smelkov patch:
369 try to use "cProfile" instead of the slower pure python
374 try to use "cProfile" instead of the slower pure python
370 "profile"
375 "profile"
371
376
372 2006-11-23 Ville Vainio <vivainio@gmail.com>
377 2006-11-23 Ville Vainio <vivainio@gmail.com>
373
378
374 * manual_base.lyx: Kirill Smelkov patch: Fix wrong
379 * manual_base.lyx: Kirill Smelkov patch: Fix wrong
375 Qt+IPython+Designer link in documentation.
380 Qt+IPython+Designer link in documentation.
376
381
377 * Extensions/ipy_pydb.py: R. Bernstein's patch for passing
382 * Extensions/ipy_pydb.py: R. Bernstein's patch for passing
378 correct Pdb object to %pydb.
383 correct Pdb object to %pydb.
379
384
380
385
381 2006-11-22 Walter Doerwald <walter@livinglogic.de>
386 2006-11-22 Walter Doerwald <walter@livinglogic.de>
382 * IPython/Extensions/astyle.py: Text needs it's own implemenation of the
387 * IPython/Extensions/astyle.py: Text needs it's own implemenation of the
383 generic xrepr(), otherwise the list implementation would kick in.
388 generic xrepr(), otherwise the list implementation would kick in.
384
389
385 2006-11-21 Ville Vainio <vivainio@gmail.com>
390 2006-11-21 Ville Vainio <vivainio@gmail.com>
386
391
387 * upgrade_dir.py: Now actually overwrites a nonmodified user file
392 * upgrade_dir.py: Now actually overwrites a nonmodified user file
388 with one from UserConfig.
393 with one from UserConfig.
389
394
390 * ipy_profile_sh.py: Add dummy "depth" to var_expand lambda,
395 * ipy_profile_sh.py: Add dummy "depth" to var_expand lambda,
391 it was missing which broke the sh profile.
396 it was missing which broke the sh profile.
392
397
393 * completer.py: file completer now uses explicit '/' instead
398 * completer.py: file completer now uses explicit '/' instead
394 of os.path.join, expansion of 'foo' was broken on win32
399 of os.path.join, expansion of 'foo' was broken on win32
395 if there was one directory with name 'foobar'.
400 if there was one directory with name 'foobar'.
396
401
397 * A bunch of patches from Kirill Smelkov:
402 * A bunch of patches from Kirill Smelkov:
398
403
399 * [patch 9/9] doc: point bug-tracker URL to IPythons trac-tickets.
404 * [patch 9/9] doc: point bug-tracker URL to IPythons trac-tickets.
400
405
401 * [patch 7/9] Implement %page -r (page in raw mode) -
406 * [patch 7/9] Implement %page -r (page in raw mode) -
402
407
403 * [patch 5/9] ScientificPython webpage has moved
408 * [patch 5/9] ScientificPython webpage has moved
404
409
405 * [patch 4/9] The manual mentions %ds, should be %dhist
410 * [patch 4/9] The manual mentions %ds, should be %dhist
406
411
407 * [patch 3/9] Kill old bits from %prun doc.
412 * [patch 3/9] Kill old bits from %prun doc.
408
413
409 * [patch 1/9] Fix typos here and there.
414 * [patch 1/9] Fix typos here and there.
410
415
411 2006-11-08 Ville Vainio <vivainio@gmail.com>
416 2006-11-08 Ville Vainio <vivainio@gmail.com>
412
417
413 * completer.py (attr_matches): catch all exceptions raised
418 * completer.py (attr_matches): catch all exceptions raised
414 by eval of expr with dots.
419 by eval of expr with dots.
415
420
416 2006-11-07 Fernando Perez <Fernando.Perez@colorado.edu>
421 2006-11-07 Fernando Perez <Fernando.Perez@colorado.edu>
417
422
418 * IPython/iplib.py (runsource): Prepend an 'if 1:' to the user
423 * IPython/iplib.py (runsource): Prepend an 'if 1:' to the user
419 input if it starts with whitespace. This allows you to paste
424 input if it starts with whitespace. This allows you to paste
420 indented input from any editor without manually having to type in
425 indented input from any editor without manually having to type in
421 the 'if 1:', which is convenient when working interactively.
426 the 'if 1:', which is convenient when working interactively.
422 Slightly modifed version of a patch by Bo Peng
427 Slightly modifed version of a patch by Bo Peng
423 <bpeng-AT-rice.edu>.
428 <bpeng-AT-rice.edu>.
424
429
425 2006-11-03 Fernando Perez <Fernando.Perez@colorado.edu>
430 2006-11-03 Fernando Perez <Fernando.Perez@colorado.edu>
426
431
427 * IPython/irunner.py (main): modified irunner so it automatically
432 * IPython/irunner.py (main): modified irunner so it automatically
428 recognizes the right runner to use based on the extension (.py for
433 recognizes the right runner to use based on the extension (.py for
429 python, .ipy for ipython and .sage for sage).
434 python, .ipy for ipython and .sage for sage).
430
435
431 * IPython/iplib.py (InteractiveShell.ipconfig): new builtin, also
436 * IPython/iplib.py (InteractiveShell.ipconfig): new builtin, also
432 visible in ipapi as ip.config(), to programatically control the
437 visible in ipapi as ip.config(), to programatically control the
433 internal rc object. There's an accompanying %config magic for
438 internal rc object. There's an accompanying %config magic for
434 interactive use, which has been enhanced to match the
439 interactive use, which has been enhanced to match the
435 funtionality in ipconfig.
440 funtionality in ipconfig.
436
441
437 * IPython/Magic.py (magic_system_verbose): Change %system_verbose
442 * IPython/Magic.py (magic_system_verbose): Change %system_verbose
438 so it's not just a toggle, it now takes an argument. Add support
443 so it's not just a toggle, it now takes an argument. Add support
439 for a customizable header when making system calls, as the new
444 for a customizable header when making system calls, as the new
440 system_header variable in the ipythonrc file.
445 system_header variable in the ipythonrc file.
441
446
442 2006-11-03 Walter Doerwald <walter@livinglogic.de>
447 2006-11-03 Walter Doerwald <walter@livinglogic.de>
443
448
444 * IPython/Extensions/ipipe.py: xrepr(), xiter() and xattrs() are now
449 * IPython/Extensions/ipipe.py: xrepr(), xiter() and xattrs() are now
445 generic functions (using Philip J. Eby's simplegeneric package).
450 generic functions (using Philip J. Eby's simplegeneric package).
446 This makes it possible to customize the display of third-party classes
451 This makes it possible to customize the display of third-party classes
447 without having to monkeypatch them. xiter() no longer supports a mode
452 without having to monkeypatch them. xiter() no longer supports a mode
448 argument and the XMode class has been removed. The same functionality can
453 argument and the XMode class has been removed. The same functionality can
449 be implemented via IterAttributeDescriptor and IterMethodDescriptor.
454 be implemented via IterAttributeDescriptor and IterMethodDescriptor.
450 One consequence of the switch to generic functions is that xrepr() and
455 One consequence of the switch to generic functions is that xrepr() and
451 xattrs() implementation must define the default value for the mode
456 xattrs() implementation must define the default value for the mode
452 argument themselves and xattrs() implementations must return real
457 argument themselves and xattrs() implementations must return real
453 descriptors.
458 descriptors.
454
459
455 * IPython/external: This new subpackage will contain all third-party
460 * IPython/external: This new subpackage will contain all third-party
456 packages that are bundled with IPython. (The first one is simplegeneric).
461 packages that are bundled with IPython. (The first one is simplegeneric).
457
462
458 * IPython/Extensions/ipipe.py (ifile/ils): Readd output of the parent
463 * IPython/Extensions/ipipe.py (ifile/ils): Readd output of the parent
459 directory which as been dropped in r1703.
464 directory which as been dropped in r1703.
460
465
461 * IPython/Extensions/ipipe.py (iless): Fixed.
466 * IPython/Extensions/ipipe.py (iless): Fixed.
462
467
463 * IPython/Extensions/ibrowse: Fixed sorting under Python 2.3.
468 * IPython/Extensions/ibrowse: Fixed sorting under Python 2.3.
464
469
465 2006-11-03 Fernando Perez <Fernando.Perez@colorado.edu>
470 2006-11-03 Fernando Perez <Fernando.Perez@colorado.edu>
466
471
467 * IPython/iplib.py (InteractiveShell.var_expand): fix stack
472 * IPython/iplib.py (InteractiveShell.var_expand): fix stack
468 handling in variable expansion so that shells and magics recognize
473 handling in variable expansion so that shells and magics recognize
469 function local scopes correctly. Bug reported by Brian.
474 function local scopes correctly. Bug reported by Brian.
470
475
471 * scripts/ipython: remove the very first entry in sys.path which
476 * scripts/ipython: remove the very first entry in sys.path which
472 Python auto-inserts for scripts, so that sys.path under IPython is
477 Python auto-inserts for scripts, so that sys.path under IPython is
473 as similar as possible to that under plain Python.
478 as similar as possible to that under plain Python.
474
479
475 * IPython/completer.py (IPCompleter.file_matches): Fix
480 * IPython/completer.py (IPCompleter.file_matches): Fix
476 tab-completion so that quotes are not closed unless the completion
481 tab-completion so that quotes are not closed unless the completion
477 is unambiguous. After a request by Stefan. Minor cleanups in
482 is unambiguous. After a request by Stefan. Minor cleanups in
478 ipy_stock_completers.
483 ipy_stock_completers.
479
484
480 2006-11-02 Ville Vainio <vivainio@gmail.com>
485 2006-11-02 Ville Vainio <vivainio@gmail.com>
481
486
482 * ipy_stock_completers.py: Add %run and %cd completers.
487 * ipy_stock_completers.py: Add %run and %cd completers.
483
488
484 * completer.py: Try running custom completer for both
489 * completer.py: Try running custom completer for both
485 "foo" and "%foo" if the command is just "foo". Ignore case
490 "foo" and "%foo" if the command is just "foo". Ignore case
486 when filtering possible completions.
491 when filtering possible completions.
487
492
488 * UserConfig/ipy_user_conf.py: install stock completers as default
493 * UserConfig/ipy_user_conf.py: install stock completers as default
489
494
490 * iplib.py (history_saving_wrapper), debugger(), ipy_pydb.py:
495 * iplib.py (history_saving_wrapper), debugger(), ipy_pydb.py:
491 simplified readline history save / restore through a wrapper
496 simplified readline history save / restore through a wrapper
492 function
497 function
493
498
494
499
495 2006-10-31 Ville Vainio <vivainio@gmail.com>
500 2006-10-31 Ville Vainio <vivainio@gmail.com>
496
501
497 * strdispatch.py, completer.py, ipy_stock_completers.py:
502 * strdispatch.py, completer.py, ipy_stock_completers.py:
498 Allow str_key ("command") in completer hooks. Implement
503 Allow str_key ("command") in completer hooks. Implement
499 trivial completer for 'import' (stdlib modules only). Rename
504 trivial completer for 'import' (stdlib modules only). Rename
500 ipy_linux_package_managers.py to ipy_stock_completers.py.
505 ipy_linux_package_managers.py to ipy_stock_completers.py.
501 SVN completer.
506 SVN completer.
502
507
503 * Extensions/ledit.py: %magic line editor for easily and
508 * Extensions/ledit.py: %magic line editor for easily and
504 incrementally manipulating lists of strings. The magic command
509 incrementally manipulating lists of strings. The magic command
505 name is %led.
510 name is %led.
506
511
507 2006-10-30 Ville Vainio <vivainio@gmail.com>
512 2006-10-30 Ville Vainio <vivainio@gmail.com>
508
513
509 * Debugger.py, iplib.py (debugger()): Add last set of Rocky
514 * Debugger.py, iplib.py (debugger()): Add last set of Rocky
510 Bernsteins's patches for pydb integration.
515 Bernsteins's patches for pydb integration.
511 http://bashdb.sourceforge.net/pydb/
516 http://bashdb.sourceforge.net/pydb/
512
517
513 * strdispatch.py, iplib.py, completer.py, IPython/__init__.py,
518 * strdispatch.py, iplib.py, completer.py, IPython/__init__.py,
514 Extensions/ipy_linux_package_managers.py, hooks.py: Implement
519 Extensions/ipy_linux_package_managers.py, hooks.py: Implement
515 custom completer hook to allow the users to implement their own
520 custom completer hook to allow the users to implement their own
516 completers. See ipy_linux_package_managers.py for example. The
521 completers. See ipy_linux_package_managers.py for example. The
517 hook name is 'complete_command'.
522 hook name is 'complete_command'.
518
523
519 2006-10-28 Fernando Perez <Fernando.Perez@colorado.edu>
524 2006-10-28 Fernando Perez <Fernando.Perez@colorado.edu>
520
525
521 * IPython/UserConfig/ipythonrc-scipy: minor cleanups to remove old
526 * IPython/UserConfig/ipythonrc-scipy: minor cleanups to remove old
522 Numeric leftovers.
527 Numeric leftovers.
523
528
524 * ipython.el (py-execute-region): apply Stefan's patch to fix
529 * ipython.el (py-execute-region): apply Stefan's patch to fix
525 garbled results if the python shell hasn't been previously started.
530 garbled results if the python shell hasn't been previously started.
526
531
527 * IPython/genutils.py (arg_split): moved to genutils, since it's a
532 * IPython/genutils.py (arg_split): moved to genutils, since it's a
528 pretty generic function and useful for other things.
533 pretty generic function and useful for other things.
529
534
530 * IPython/OInspect.py (getsource): Add customizable source
535 * IPython/OInspect.py (getsource): Add customizable source
531 extractor. After a request/patch form W. Stein (SAGE).
536 extractor. After a request/patch form W. Stein (SAGE).
532
537
533 * IPython/irunner.py (InteractiveRunner.run_source): reset tty
538 * IPython/irunner.py (InteractiveRunner.run_source): reset tty
534 window size to a more reasonable value from what pexpect does,
539 window size to a more reasonable value from what pexpect does,
535 since their choice causes wrapping bugs with long input lines.
540 since their choice causes wrapping bugs with long input lines.
536
541
537 2006-10-28 Ville Vainio <vivainio@gmail.com>
542 2006-10-28 Ville Vainio <vivainio@gmail.com>
538
543
539 * Magic.py (%run): Save and restore the readline history from
544 * Magic.py (%run): Save and restore the readline history from
540 file around %run commands to prevent side effects from
545 file around %run commands to prevent side effects from
541 %runned programs that might use readline (e.g. pydb).
546 %runned programs that might use readline (e.g. pydb).
542
547
543 * extensions/ipy_pydb.py: Adds %pydb magic when imported, for
548 * extensions/ipy_pydb.py: Adds %pydb magic when imported, for
544 invoking the pydb enhanced debugger.
549 invoking the pydb enhanced debugger.
545
550
546 2006-10-23 Walter Doerwald <walter@livinglogic.de>
551 2006-10-23 Walter Doerwald <walter@livinglogic.de>
547
552
548 * IPython/Extensions/ipipe.py (ifile): Remove all methods that
553 * IPython/Extensions/ipipe.py (ifile): Remove all methods that
549 call the base class method and propagate the return value to
554 call the base class method and propagate the return value to
550 ifile. This is now done by path itself.
555 ifile. This is now done by path itself.
551
556
552 2006-10-15 Fernando Perez <Fernando.Perez@colorado.edu>
557 2006-10-15 Fernando Perez <Fernando.Perez@colorado.edu>
553
558
554 * IPython/ipapi.py (IPApi.__init__): Added new entry to public
559 * IPython/ipapi.py (IPApi.__init__): Added new entry to public
555 api: set_crash_handler(), to expose the ability to change the
560 api: set_crash_handler(), to expose the ability to change the
556 internal crash handler.
561 internal crash handler.
557
562
558 * IPython/CrashHandler.py (CrashHandler.__init__): abstract out
563 * IPython/CrashHandler.py (CrashHandler.__init__): abstract out
559 the various parameters of the crash handler so that apps using
564 the various parameters of the crash handler so that apps using
560 IPython as their engine can customize crash handling. Ipmlemented
565 IPython as their engine can customize crash handling. Ipmlemented
561 at the request of SAGE.
566 at the request of SAGE.
562
567
563 2006-10-14 Ville Vainio <vivainio@gmail.com>
568 2006-10-14 Ville Vainio <vivainio@gmail.com>
564
569
565 * Magic.py, ipython.el: applied first "safe" part of Rocky
570 * Magic.py, ipython.el: applied first "safe" part of Rocky
566 Bernstein's patch set for pydb integration.
571 Bernstein's patch set for pydb integration.
567
572
568 * Magic.py (%unalias, %alias): %store'd aliases can now be
573 * Magic.py (%unalias, %alias): %store'd aliases can now be
569 removed with '%unalias'. %alias w/o args now shows most
574 removed with '%unalias'. %alias w/o args now shows most
570 interesting (stored / manually defined) aliases last
575 interesting (stored / manually defined) aliases last
571 where they catch the eye w/o scrolling.
576 where they catch the eye w/o scrolling.
572
577
573 * Magic.py (%rehashx), ext_rehashdir.py: files with
578 * Magic.py (%rehashx), ext_rehashdir.py: files with
574 'py' extension are always considered executable, even
579 'py' extension are always considered executable, even
575 when not in PATHEXT environment variable.
580 when not in PATHEXT environment variable.
576
581
577 2006-10-12 Ville Vainio <vivainio@gmail.com>
582 2006-10-12 Ville Vainio <vivainio@gmail.com>
578
583
579 * jobctrl.py: Add new "jobctrl" extension for spawning background
584 * jobctrl.py: Add new "jobctrl" extension for spawning background
580 processes with "&find /". 'import jobctrl' to try it out. Requires
585 processes with "&find /". 'import jobctrl' to try it out. Requires
581 'subprocess' module, standard in python 2.4+.
586 'subprocess' module, standard in python 2.4+.
582
587
583 * iplib.py (expand_aliases, handle_alias): Aliases expand transitively,
588 * iplib.py (expand_aliases, handle_alias): Aliases expand transitively,
584 so if foo -> bar and bar -> baz, then foo -> baz.
589 so if foo -> bar and bar -> baz, then foo -> baz.
585
590
586 2006-10-09 Fernando Perez <Fernando.Perez@colorado.edu>
591 2006-10-09 Fernando Perez <Fernando.Perez@colorado.edu>
587
592
588 * IPython/Magic.py (Magic.parse_options): add a new posix option
593 * IPython/Magic.py (Magic.parse_options): add a new posix option
589 to allow parsing of input args in magics that doesn't strip quotes
594 to allow parsing of input args in magics that doesn't strip quotes
590 (if posix=False). This also closes %timeit bug reported by
595 (if posix=False). This also closes %timeit bug reported by
591 Stefan.
596 Stefan.
592
597
593 2006-10-03 Ville Vainio <vivainio@gmail.com>
598 2006-10-03 Ville Vainio <vivainio@gmail.com>
594
599
595 * iplib.py (raw_input, interact): Return ValueError catching for
600 * iplib.py (raw_input, interact): Return ValueError catching for
596 raw_input. Fixes infinite loop for sys.stdin.close() or
601 raw_input. Fixes infinite loop for sys.stdin.close() or
597 sys.stdout.close().
602 sys.stdout.close().
598
603
599 2006-09-27 Fernando Perez <Fernando.Perez@colorado.edu>
604 2006-09-27 Fernando Perez <Fernando.Perez@colorado.edu>
600
605
601 * IPython/irunner.py (InteractiveRunner.run_source): small fixes
606 * IPython/irunner.py (InteractiveRunner.run_source): small fixes
602 to help in handling doctests. irunner is now pretty useful for
607 to help in handling doctests. irunner is now pretty useful for
603 running standalone scripts and simulate a full interactive session
608 running standalone scripts and simulate a full interactive session
604 in a format that can be then pasted as a doctest.
609 in a format that can be then pasted as a doctest.
605
610
606 * IPython/iplib.py (InteractiveShell.__init__): Install exit/quit
611 * IPython/iplib.py (InteractiveShell.__init__): Install exit/quit
607 on top of the default (useless) ones. This also fixes the nasty
612 on top of the default (useless) ones. This also fixes the nasty
608 way in which 2.5's Quitter() exits (reverted [1785]).
613 way in which 2.5's Quitter() exits (reverted [1785]).
609
614
610 * IPython/Debugger.py (Pdb.__init__): Fix ipdb to work with python
615 * IPython/Debugger.py (Pdb.__init__): Fix ipdb to work with python
611 2.5.
616 2.5.
612
617
613 * IPython/ultraTB.py (TBTools.set_colors): Make sure that ipdb
618 * IPython/ultraTB.py (TBTools.set_colors): Make sure that ipdb
614 color scheme is updated as well when color scheme is changed
619 color scheme is updated as well when color scheme is changed
615 interactively.
620 interactively.
616
621
617 2006-09-27 Ville Vainio <vivainio@gmail.com>
622 2006-09-27 Ville Vainio <vivainio@gmail.com>
618
623
619 * iplib.py (raw_input): python 2.5 closes stdin on quit -> avoid
624 * iplib.py (raw_input): python 2.5 closes stdin on quit -> avoid
620 infinite loop and just exit. It's a hack, but will do for a while.
625 infinite loop and just exit. It's a hack, but will do for a while.
621
626
622 2006-08-25 Walter Doerwald <walter@livinglogic.de>
627 2006-08-25 Walter Doerwald <walter@livinglogic.de>
623
628
624 * IPython/Extensions/ipipe.py (ils): Add arguments dirs and files to
629 * IPython/Extensions/ipipe.py (ils): Add arguments dirs and files to
625 the constructor, this makes it possible to get a list of only directories
630 the constructor, this makes it possible to get a list of only directories
626 or only files.
631 or only files.
627
632
628 2006-08-12 Ville Vainio <vivainio@gmail.com>
633 2006-08-12 Ville Vainio <vivainio@gmail.com>
629
634
630 * Fakemodule.py, OInspect.py: Reverted 2006-08-11 mods,
635 * Fakemodule.py, OInspect.py: Reverted 2006-08-11 mods,
631 they broke unittest
636 they broke unittest
632
637
633 2006-08-11 Ville Vainio <vivainio@gmail.com>
638 2006-08-11 Ville Vainio <vivainio@gmail.com>
634
639
635 * Fakemodule.py, OInspect.py: remove 2006-08-09 monkepatch
640 * Fakemodule.py, OInspect.py: remove 2006-08-09 monkepatch
636 by resolving issue properly, i.e. by inheriting FakeModule
641 by resolving issue properly, i.e. by inheriting FakeModule
637 from types.ModuleType. Pickling ipython interactive data
642 from types.ModuleType. Pickling ipython interactive data
638 should still work as usual (testing appreciated).
643 should still work as usual (testing appreciated).
639
644
640 2006-08-09 Fernando Perez <Fernando.Perez@colorado.edu>
645 2006-08-09 Fernando Perez <Fernando.Perez@colorado.edu>
641
646
642 * IPython/OInspect.py: monkeypatch inspect from the stdlib if
647 * IPython/OInspect.py: monkeypatch inspect from the stdlib if
643 running under python 2.3 with code from 2.4 to fix a bug with
648 running under python 2.3 with code from 2.4 to fix a bug with
644 help(). Reported by the Debian maintainers, Norbert Tretkowski
649 help(). Reported by the Debian maintainers, Norbert Tretkowski
645 <norbert-AT-tretkowski.de> and Alexandre Fayolle
650 <norbert-AT-tretkowski.de> and Alexandre Fayolle
646 <afayolle-AT-debian.org>.
651 <afayolle-AT-debian.org>.
647
652
648 2006-08-04 Walter Doerwald <walter@livinglogic.de>
653 2006-08-04 Walter Doerwald <walter@livinglogic.de>
649
654
650 * IPython/Extensions/ibrowse.py: Fixed the help message in the footer
655 * IPython/Extensions/ibrowse.py: Fixed the help message in the footer
651 (which was displaying "quit" twice).
656 (which was displaying "quit" twice).
652
657
653 2006-07-28 Walter Doerwald <walter@livinglogic.de>
658 2006-07-28 Walter Doerwald <walter@livinglogic.de>
654
659
655 * IPython/Extensions/ipipe.py: Fix isort.__iter__() (was still using
660 * IPython/Extensions/ipipe.py: Fix isort.__iter__() (was still using
656 the mode argument).
661 the mode argument).
657
662
658 2006-07-27 Walter Doerwald <walter@livinglogic.de>
663 2006-07-27 Walter Doerwald <walter@livinglogic.de>
659
664
660 * IPython/Extensions/ipipe.py: Fix getglobals() if we're
665 * IPython/Extensions/ipipe.py: Fix getglobals() if we're
661 not running under IPython.
666 not running under IPython.
662
667
663 * IPython/Extensions/ipipe.py: Rename XAttr to AttributeDetail
668 * IPython/Extensions/ipipe.py: Rename XAttr to AttributeDetail
664 and make it iterable (iterating over the attribute itself). Add two new
669 and make it iterable (iterating over the attribute itself). Add two new
665 magic strings for __xattrs__(): If the string starts with "-", the attribute
670 magic strings for __xattrs__(): If the string starts with "-", the attribute
666 will not be displayed in ibrowse's detail view (but it can still be
671 will not be displayed in ibrowse's detail view (but it can still be
667 iterated over). This makes it possible to add attributes that are large
672 iterated over). This makes it possible to add attributes that are large
668 lists or generator methods to the detail view. Replace magic attribute names
673 lists or generator methods to the detail view. Replace magic attribute names
669 and _attrname() and _getattr() with "descriptors": For each type of magic
674 and _attrname() and _getattr() with "descriptors": For each type of magic
670 attribute name there's a subclass of Descriptor: None -> SelfDescriptor();
675 attribute name there's a subclass of Descriptor: None -> SelfDescriptor();
671 "foo" -> AttributeDescriptor("foo"); "foo()" -> MethodDescriptor("foo");
676 "foo" -> AttributeDescriptor("foo"); "foo()" -> MethodDescriptor("foo");
672 "-foo" -> IterAttributeDescriptor("foo"); "-foo()" -> IterMethodDescriptor("foo");
677 "-foo" -> IterAttributeDescriptor("foo"); "-foo()" -> IterMethodDescriptor("foo");
673 foo() -> FunctionDescriptor(foo). Magic strings returned from __xattrs__()
678 foo() -> FunctionDescriptor(foo). Magic strings returned from __xattrs__()
674 are still supported.
679 are still supported.
675
680
676 * IPython/Extensions/ibrowse.py: If fetching the next row from the input
681 * IPython/Extensions/ibrowse.py: If fetching the next row from the input
677 fails in ibrowse.fetch(), the exception object is added as the last item
682 fails in ibrowse.fetch(), the exception object is added as the last item
678 and item fetching is canceled. This prevents ibrowse from aborting if e.g.
683 and item fetching is canceled. This prevents ibrowse from aborting if e.g.
679 a generator throws an exception midway through execution.
684 a generator throws an exception midway through execution.
680
685
681 * IPython/Extensions/ipipe.py: Turn ifile's properties mimetype and
686 * IPython/Extensions/ipipe.py: Turn ifile's properties mimetype and
682 encoding into methods.
687 encoding into methods.
683
688
684 2006-07-26 Ville Vainio <vivainio@gmail.com>
689 2006-07-26 Ville Vainio <vivainio@gmail.com>
685
690
686 * iplib.py: history now stores multiline input as single
691 * iplib.py: history now stores multiline input as single
687 history entries. Patch by Jorgen Cederlof.
692 history entries. Patch by Jorgen Cederlof.
688
693
689 2006-07-18 Walter Doerwald <walter@livinglogic.de>
694 2006-07-18 Walter Doerwald <walter@livinglogic.de>
690
695
691 * IPython/Extensions/ibrowse.py: Make cursor visible over
696 * IPython/Extensions/ibrowse.py: Make cursor visible over
692 non existing attributes.
697 non existing attributes.
693
698
694 2006-07-14 Walter Doerwald <walter@livinglogic.de>
699 2006-07-14 Walter Doerwald <walter@livinglogic.de>
695
700
696 * IPython/Extensions/ipipe.py (ix): Use os.popen4() so that the
701 * IPython/Extensions/ipipe.py (ix): Use os.popen4() so that the
697 error output of the running command doesn't mess up the screen.
702 error output of the running command doesn't mess up the screen.
698
703
699 2006-07-13 Walter Doerwald <walter@livinglogic.de>
704 2006-07-13 Walter Doerwald <walter@livinglogic.de>
700
705
701 * IPython/Extensions/ipipe.py (isort): Make isort usable without
706 * IPython/Extensions/ipipe.py (isort): Make isort usable without
702 argument. This sorts the items themselves.
707 argument. This sorts the items themselves.
703
708
704 2006-07-12 Walter Doerwald <walter@livinglogic.de>
709 2006-07-12 Walter Doerwald <walter@livinglogic.de>
705
710
706 * IPython/Extensions/ipipe.py (eval, ifilter, isort, ieval):
711 * IPython/Extensions/ipipe.py (eval, ifilter, isort, ieval):
707 Compile expression strings into code objects. This should speed
712 Compile expression strings into code objects. This should speed
708 up ifilter and friends somewhat.
713 up ifilter and friends somewhat.
709
714
710 2006-07-08 Ville Vainio <vivainio@gmail.com>
715 2006-07-08 Ville Vainio <vivainio@gmail.com>
711
716
712 * Magic.py: %cpaste now strips > from the beginning of lines
717 * Magic.py: %cpaste now strips > from the beginning of lines
713 to ease pasting quoted code from emails. Contributed by
718 to ease pasting quoted code from emails. Contributed by
714 Stefan van der Walt.
719 Stefan van der Walt.
715
720
716 2006-06-29 Ville Vainio <vivainio@gmail.com>
721 2006-06-29 Ville Vainio <vivainio@gmail.com>
717
722
718 * ipmaker.py, Shell.py: qt4agg matplotlib backend support for pylab
723 * ipmaker.py, Shell.py: qt4agg matplotlib backend support for pylab
719 mode, patch contributed by Darren Dale. NEEDS TESTING!
724 mode, patch contributed by Darren Dale. NEEDS TESTING!
720
725
721 2006-06-28 Walter Doerwald <walter@livinglogic.de>
726 2006-06-28 Walter Doerwald <walter@livinglogic.de>
722
727
723 * IPython/Extensions/ibrowse.py: Give the ibrowse cursor row
728 * IPython/Extensions/ibrowse.py: Give the ibrowse cursor row
724 a blue background. Fix fetching new display rows when the browser
729 a blue background. Fix fetching new display rows when the browser
725 scrolls more than a screenful (e.g. by using the goto command).
730 scrolls more than a screenful (e.g. by using the goto command).
726
731
727 2006-06-27 Ville Vainio <vivainio@gmail.com>
732 2006-06-27 Ville Vainio <vivainio@gmail.com>
728
733
729 * Magic.py (_inspect, _ofind) Apply David Huard's
734 * Magic.py (_inspect, _ofind) Apply David Huard's
730 patch for displaying the correct docstring for 'property'
735 patch for displaying the correct docstring for 'property'
731 attributes.
736 attributes.
732
737
733 2006-06-23 Walter Doerwald <walter@livinglogic.de>
738 2006-06-23 Walter Doerwald <walter@livinglogic.de>
734
739
735 * IPython/Extensions/ibrowse.py: Put the documentation of the keyboard
740 * IPython/Extensions/ibrowse.py: Put the documentation of the keyboard
736 commands into the methods implementing them.
741 commands into the methods implementing them.
737
742
738 2006-06-22 Fernando Perez <Fernando.Perez@colorado.edu>
743 2006-06-22 Fernando Perez <Fernando.Perez@colorado.edu>
739
744
740 * ipython.el (ipython-indentation-hook): cleanup patch, submitted
745 * ipython.el (ipython-indentation-hook): cleanup patch, submitted
741 by Kov Chai <tchaikov-AT-gmail.com>. He notes that the original
746 by Kov Chai <tchaikov-AT-gmail.com>. He notes that the original
742 autoindent support was authored by Jin Liu.
747 autoindent support was authored by Jin Liu.
743
748
744 2006-06-22 Walter Doerwald <walter@livinglogic.de>
749 2006-06-22 Walter Doerwald <walter@livinglogic.de>
745
750
746 * IPython/Extensions/ibrowse.py: Replace the plain dictionaries used
751 * IPython/Extensions/ibrowse.py: Replace the plain dictionaries used
747 for keymaps with a custom class that simplifies handling.
752 for keymaps with a custom class that simplifies handling.
748
753
749 2006-06-19 Walter Doerwald <walter@livinglogic.de>
754 2006-06-19 Walter Doerwald <walter@livinglogic.de>
750
755
751 * IPython/Extensions/ibrowse.py: ibrowse now properly handles terminal
756 * IPython/Extensions/ibrowse.py: ibrowse now properly handles terminal
752 resizing. This requires Python 2.5 to work.
757 resizing. This requires Python 2.5 to work.
753
758
754 2006-06-16 Walter Doerwald <walter@livinglogic.de>
759 2006-06-16 Walter Doerwald <walter@livinglogic.de>
755
760
756 * IPython/Extensions/ibrowse.py: Add two new commands to
761 * IPython/Extensions/ibrowse.py: Add two new commands to
757 ibrowse: "hideattr" (mapped to "h") hides the attribute under
762 ibrowse: "hideattr" (mapped to "h") hides the attribute under
758 the cursor. "unhiderattrs" (mapped to "H") reveals all hidden
763 the cursor. "unhiderattrs" (mapped to "H") reveals all hidden
759 attributes again. Remapped the help command to "?". Display
764 attributes again. Remapped the help command to "?". Display
760 keycodes in the range 0x01-0x1F as CTRL-xx. Add CTRL-a and CTRL-e
765 keycodes in the range 0x01-0x1F as CTRL-xx. Add CTRL-a and CTRL-e
761 as keys for the "home" and "end" commands. Add three new commands
766 as keys for the "home" and "end" commands. Add three new commands
762 to the input mode for "find" and friends: "delend" (CTRL-K)
767 to the input mode for "find" and friends: "delend" (CTRL-K)
763 deletes to the end of line. "incsearchup" searches upwards in the
768 deletes to the end of line. "incsearchup" searches upwards in the
764 command history for an input that starts with the text before the cursor.
769 command history for an input that starts with the text before the cursor.
765 "incsearchdown" does the same downwards. Removed a bogus mapping of
770 "incsearchdown" does the same downwards. Removed a bogus mapping of
766 the x key to "delete".
771 the x key to "delete".
767
772
768 2006-06-15 Ville Vainio <vivainio@gmail.com>
773 2006-06-15 Ville Vainio <vivainio@gmail.com>
769
774
770 * iplib.py, hooks.py: Added new generate_prompt hook that can be
775 * iplib.py, hooks.py: Added new generate_prompt hook that can be
771 used to create prompts dynamically, instead of the "old" way of
776 used to create prompts dynamically, instead of the "old" way of
772 assigning "magic" strings to prompt_in1 and prompt_in2. The old
777 assigning "magic" strings to prompt_in1 and prompt_in2. The old
773 way still works (it's invoked by the default hook), of course.
778 way still works (it's invoked by the default hook), of course.
774
779
775 * Prompts.py: added generate_output_prompt hook for altering output
780 * Prompts.py: added generate_output_prompt hook for altering output
776 prompt
781 prompt
777
782
778 * Release.py: Changed version string to 0.7.3.svn.
783 * Release.py: Changed version string to 0.7.3.svn.
779
784
780 2006-06-15 Walter Doerwald <walter@livinglogic.de>
785 2006-06-15 Walter Doerwald <walter@livinglogic.de>
781
786
782 * IPython/Extensions/ibrowse.py: Change _BrowserLevel.moveto() so that
787 * IPython/Extensions/ibrowse.py: Change _BrowserLevel.moveto() so that
783 the call to fetch() always tries to fetch enough data for at least one
788 the call to fetch() always tries to fetch enough data for at least one
784 full screen. This makes it possible to simply call moveto(0,0,True) in
789 full screen. This makes it possible to simply call moveto(0,0,True) in
785 the constructor. Fix typos and removed the obsolete goto attribute.
790 the constructor. Fix typos and removed the obsolete goto attribute.
786
791
787 2006-06-12 Ville Vainio <vivainio@gmail.com>
792 2006-06-12 Ville Vainio <vivainio@gmail.com>
788
793
789 * ipy_profile_sh.py: applied Krisha Mohan Gundu's patch for
794 * ipy_profile_sh.py: applied Krisha Mohan Gundu's patch for
790 allowing $variable interpolation within multiline statements,
795 allowing $variable interpolation within multiline statements,
791 though so far only with "sh" profile for a testing period.
796 though so far only with "sh" profile for a testing period.
792 The patch also enables splitting long commands with \ but it
797 The patch also enables splitting long commands with \ but it
793 doesn't work properly yet.
798 doesn't work properly yet.
794
799
795 2006-06-12 Walter Doerwald <walter@livinglogic.de>
800 2006-06-12 Walter Doerwald <walter@livinglogic.de>
796
801
797 * IPython/Extensions/ibrowse.py (_dodisplay): Display the length of the
802 * IPython/Extensions/ibrowse.py (_dodisplay): Display the length of the
798 input history and the position of the cursor in the input history for
803 input history and the position of the cursor in the input history for
799 the find, findbackwards and goto command.
804 the find, findbackwards and goto command.
800
805
801 2006-06-10 Walter Doerwald <walter@livinglogic.de>
806 2006-06-10 Walter Doerwald <walter@livinglogic.de>
802
807
803 * IPython/Extensions/ibrowse.py: Add a class _CommandInput that
808 * IPython/Extensions/ibrowse.py: Add a class _CommandInput that
804 implements the basic functionality of browser commands that require
809 implements the basic functionality of browser commands that require
805 input. Reimplement the goto, find and findbackwards commands as
810 input. Reimplement the goto, find and findbackwards commands as
806 subclasses of _CommandInput. Add an input history and keymaps to those
811 subclasses of _CommandInput. Add an input history and keymaps to those
807 commands. Add "\r" as a keyboard shortcut for the enterdefault and
812 commands. Add "\r" as a keyboard shortcut for the enterdefault and
808 execute commands.
813 execute commands.
809
814
810 2006-06-07 Ville Vainio <vivainio@gmail.com>
815 2006-06-07 Ville Vainio <vivainio@gmail.com>
811
816
812 * iplib.py: ipython mybatch.ipy exits ipython immediately after
817 * iplib.py: ipython mybatch.ipy exits ipython immediately after
813 running the batch files instead of leaving the session open.
818 running the batch files instead of leaving the session open.
814
819
815 2006-06-07 Fernando Perez <Fernando.Perez@colorado.edu>
820 2006-06-07 Fernando Perez <Fernando.Perez@colorado.edu>
816
821
817 * IPython/iplib.py (InteractiveShell.__init__): update BSD fix, as
822 * IPython/iplib.py (InteractiveShell.__init__): update BSD fix, as
818 the original fix was incomplete. Patch submitted by W. Maier.
823 the original fix was incomplete. Patch submitted by W. Maier.
819
824
820 2006-06-07 Ville Vainio <vivainio@gmail.com>
825 2006-06-07 Ville Vainio <vivainio@gmail.com>
821
826
822 * iplib.py,Magic.py, ipmaker.py (magic_rehashx):
827 * iplib.py,Magic.py, ipmaker.py (magic_rehashx):
823 Confirmation prompts can be supressed by 'quiet' option.
828 Confirmation prompts can be supressed by 'quiet' option.
824 _ip.options.quiet = 1 means "assume yes for all yes/no queries".
829 _ip.options.quiet = 1 means "assume yes for all yes/no queries".
825
830
826 2006-06-06 *** Released version 0.7.2
831 2006-06-06 *** Released version 0.7.2
827
832
828 2006-06-06 Fernando Perez <Fernando.Perez@colorado.edu>
833 2006-06-06 Fernando Perez <Fernando.Perez@colorado.edu>
829
834
830 * IPython/Release.py (version): Made 0.7.2 final for release.
835 * IPython/Release.py (version): Made 0.7.2 final for release.
831 Repo tagged and release cut.
836 Repo tagged and release cut.
832
837
833 2006-06-05 Ville Vainio <vivainio@gmail.com>
838 2006-06-05 Ville Vainio <vivainio@gmail.com>
834
839
835 * Magic.py (magic_rehashx): Honor no_alias list earlier in
840 * Magic.py (magic_rehashx): Honor no_alias list earlier in
836 %rehashx, to avoid clobbering builtins in ipy_profile_sh.py
841 %rehashx, to avoid clobbering builtins in ipy_profile_sh.py
837
842
838 * upgrade_dir.py: try import 'path' module a bit harder
843 * upgrade_dir.py: try import 'path' module a bit harder
839 (for %upgrade)
844 (for %upgrade)
840
845
841 2006-06-03 Fernando Perez <Fernando.Perez@colorado.edu>
846 2006-06-03 Fernando Perez <Fernando.Perez@colorado.edu>
842
847
843 * IPython/genutils.py (ask_yes_no): treat EOF as a default answer
848 * IPython/genutils.py (ask_yes_no): treat EOF as a default answer
844 instead of looping 20 times.
849 instead of looping 20 times.
845
850
846 * IPython/ipmaker.py (make_IPython): honor -ipythondir flag
851 * IPython/ipmaker.py (make_IPython): honor -ipythondir flag
847 correctly at initialization time. Bug reported by Krishna Mohan
852 correctly at initialization time. Bug reported by Krishna Mohan
848 Gundu <gkmohan-AT-gmail.com> on the user list.
853 Gundu <gkmohan-AT-gmail.com> on the user list.
849
854
850 * IPython/Release.py (version): Mark 0.7.2 version to start
855 * IPython/Release.py (version): Mark 0.7.2 version to start
851 testing for release on 06/06.
856 testing for release on 06/06.
852
857
853 2006-05-31 Fernando Perez <Fernando.Perez@colorado.edu>
858 2006-05-31 Fernando Perez <Fernando.Perez@colorado.edu>
854
859
855 * scripts/irunner: thin script interface so users don't have to
860 * scripts/irunner: thin script interface so users don't have to
856 find the module and call it as an executable, since modules rarely
861 find the module and call it as an executable, since modules rarely
857 live in people's PATH.
862 live in people's PATH.
858
863
859 * IPython/irunner.py (InteractiveRunner.__init__): added
864 * IPython/irunner.py (InteractiveRunner.__init__): added
860 delaybeforesend attribute to control delays with newer versions of
865 delaybeforesend attribute to control delays with newer versions of
861 pexpect. Thanks to detailed help from pexpect's author, Noah
866 pexpect. Thanks to detailed help from pexpect's author, Noah
862 Spurrier <noah-AT-noah.org>. Noted how to use the SAGE runner
867 Spurrier <noah-AT-noah.org>. Noted how to use the SAGE runner
863 correctly (it works in NoColor mode).
868 correctly (it works in NoColor mode).
864
869
865 * IPython/iplib.py (handle_normal): fix nasty crash reported on
870 * IPython/iplib.py (handle_normal): fix nasty crash reported on
866 SAGE list, from improper log() calls.
871 SAGE list, from improper log() calls.
867
872
868 2006-05-31 Ville Vainio <vivainio@gmail.com>
873 2006-05-31 Ville Vainio <vivainio@gmail.com>
869
874
870 * upgrade_dir.py, Magic.py (magic_upgrade): call upgrade_dir
875 * upgrade_dir.py, Magic.py (magic_upgrade): call upgrade_dir
871 with args in parens to work correctly with dirs that have spaces.
876 with args in parens to work correctly with dirs that have spaces.
872
877
873 2006-05-30 Fernando Perez <Fernando.Perez@colorado.edu>
878 2006-05-30 Fernando Perez <Fernando.Perez@colorado.edu>
874
879
875 * IPython/Logger.py (Logger.logstart): add option to log raw input
880 * IPython/Logger.py (Logger.logstart): add option to log raw input
876 instead of the processed one. A -r flag was added to the
881 instead of the processed one. A -r flag was added to the
877 %logstart magic used for controlling logging.
882 %logstart magic used for controlling logging.
878
883
879 2006-05-29 Fernando Perez <Fernando.Perez@colorado.edu>
884 2006-05-29 Fernando Perez <Fernando.Perez@colorado.edu>
880
885
881 * IPython/iplib.py (InteractiveShell.__init__): add check for the
886 * IPython/iplib.py (InteractiveShell.__init__): add check for the
882 *BSDs to omit --color from all 'ls' aliases, since *BSD ls doesn't
887 *BSDs to omit --color from all 'ls' aliases, since *BSD ls doesn't
883 recognize the option. After a bug report by Will Maier. This
888 recognize the option. After a bug report by Will Maier. This
884 closes #64 (will do it after confirmation from W. Maier).
889 closes #64 (will do it after confirmation from W. Maier).
885
890
886 * IPython/irunner.py: New module to run scripts as if manually
891 * IPython/irunner.py: New module to run scripts as if manually
887 typed into an interactive environment, based on pexpect. After a
892 typed into an interactive environment, based on pexpect. After a
888 submission by Ken Schutte <kschutte-AT-csail.mit.edu> on the
893 submission by Ken Schutte <kschutte-AT-csail.mit.edu> on the
889 ipython-user list. Simple unittests in the tests/ directory.
894 ipython-user list. Simple unittests in the tests/ directory.
890
895
891 * tools/release: add Will Maier, OpenBSD port maintainer, to
896 * tools/release: add Will Maier, OpenBSD port maintainer, to
892 recepients list. We are now officially part of the OpenBSD ports:
897 recepients list. We are now officially part of the OpenBSD ports:
893 http://www.openbsd.org/ports.html ! Many thanks to Will for the
898 http://www.openbsd.org/ports.html ! Many thanks to Will for the
894 work.
899 work.
895
900
896 2006-05-26 Fernando Perez <Fernando.Perez@colorado.edu>
901 2006-05-26 Fernando Perez <Fernando.Perez@colorado.edu>
897
902
898 * IPython/ipmaker.py (make_IPython): modify sys.argv fix (below)
903 * IPython/ipmaker.py (make_IPython): modify sys.argv fix (below)
899 so that it doesn't break tkinter apps.
904 so that it doesn't break tkinter apps.
900
905
901 * IPython/iplib.py (_prefilter): fix bug where aliases would
906 * IPython/iplib.py (_prefilter): fix bug where aliases would
902 shadow variables when autocall was fully off. Reported by SAGE
907 shadow variables when autocall was fully off. Reported by SAGE
903 author William Stein.
908 author William Stein.
904
909
905 * IPython/OInspect.py (Inspector.__init__): add a flag to control
910 * IPython/OInspect.py (Inspector.__init__): add a flag to control
906 at what detail level strings are computed when foo? is requested.
911 at what detail level strings are computed when foo? is requested.
907 This allows users to ask for example that the string form of an
912 This allows users to ask for example that the string form of an
908 object is only computed when foo?? is called, or even never, by
913 object is only computed when foo?? is called, or even never, by
909 setting the object_info_string_level >= 2 in the configuration
914 setting the object_info_string_level >= 2 in the configuration
910 file. This new option has been added and documented. After a
915 file. This new option has been added and documented. After a
911 request by SAGE to be able to control the printing of very large
916 request by SAGE to be able to control the printing of very large
912 objects more easily.
917 objects more easily.
913
918
914 2006-05-25 Fernando Perez <Fernando.Perez@colorado.edu>
919 2006-05-25 Fernando Perez <Fernando.Perez@colorado.edu>
915
920
916 * IPython/ipmaker.py (make_IPython): remove the ipython call path
921 * IPython/ipmaker.py (make_IPython): remove the ipython call path
917 from sys.argv, to be 100% consistent with how Python itself works
922 from sys.argv, to be 100% consistent with how Python itself works
918 (as seen for example with python -i file.py). After a bug report
923 (as seen for example with python -i file.py). After a bug report
919 by Jeffrey Collins.
924 by Jeffrey Collins.
920
925
921 * IPython/Shell.py (MatplotlibShellBase._matplotlib_config): Fix
926 * IPython/Shell.py (MatplotlibShellBase._matplotlib_config): Fix
922 nasty bug which was preventing custom namespaces with -pylab,
927 nasty bug which was preventing custom namespaces with -pylab,
923 reported by M. Foord. Minor cleanup, remove old matplotlib.matlab
928 reported by M. Foord. Minor cleanup, remove old matplotlib.matlab
924 compatibility (long gone from mpl).
929 compatibility (long gone from mpl).
925
930
926 * IPython/ipapi.py (make_session): name change: create->make. We
931 * IPython/ipapi.py (make_session): name change: create->make. We
927 use make in other places (ipmaker,...), it's shorter and easier to
932 use make in other places (ipmaker,...), it's shorter and easier to
928 type and say, etc. I'm trying to clean things before 0.7.2 so
933 type and say, etc. I'm trying to clean things before 0.7.2 so
929 that I can keep things stable wrt to ipapi in the chainsaw branch.
934 that I can keep things stable wrt to ipapi in the chainsaw branch.
930
935
931 * ipython.el: fix the py-pdbtrack-input-prompt variable so that
936 * ipython.el: fix the py-pdbtrack-input-prompt variable so that
932 python-mode recognizes our debugger mode. Add support for
937 python-mode recognizes our debugger mode. Add support for
933 autoindent inside (X)emacs. After a patch sent in by Jin Liu
938 autoindent inside (X)emacs. After a patch sent in by Jin Liu
934 <m.liu.jin-AT-gmail.com> originally written by
939 <m.liu.jin-AT-gmail.com> originally written by
935 doxgen-AT-newsmth.net (with minor modifications for xemacs
940 doxgen-AT-newsmth.net (with minor modifications for xemacs
936 compatibility)
941 compatibility)
937
942
938 * IPython/Debugger.py (Pdb.format_stack_entry): fix formatting of
943 * IPython/Debugger.py (Pdb.format_stack_entry): fix formatting of
939 tracebacks when walking the stack so that the stack tracking system
944 tracebacks when walking the stack so that the stack tracking system
940 in emacs' python-mode can identify the frames correctly.
945 in emacs' python-mode can identify the frames correctly.
941
946
942 * IPython/ipmaker.py (make_IPython): make the internal (and
947 * IPython/ipmaker.py (make_IPython): make the internal (and
943 default config) autoedit_syntax value false by default. Too many
948 default config) autoedit_syntax value false by default. Too many
944 users have complained to me (both on and off-list) about problems
949 users have complained to me (both on and off-list) about problems
945 with this option being on by default, so I'm making it default to
950 with this option being on by default, so I'm making it default to
946 off. It can still be enabled by anyone via the usual mechanisms.
951 off. It can still be enabled by anyone via the usual mechanisms.
947
952
948 * IPython/completer.py (Completer.attr_matches): add support for
953 * IPython/completer.py (Completer.attr_matches): add support for
949 PyCrust-style _getAttributeNames magic method. Patch contributed
954 PyCrust-style _getAttributeNames magic method. Patch contributed
950 by <mscott-AT-goldenspud.com>. Closes #50.
955 by <mscott-AT-goldenspud.com>. Closes #50.
951
956
952 * IPython/iplib.py (InteractiveShell.__init__): remove the
957 * IPython/iplib.py (InteractiveShell.__init__): remove the
953 deletion of exit/quit from __builtin__, which can break
958 deletion of exit/quit from __builtin__, which can break
954 third-party tools like the Zope debugging console. The
959 third-party tools like the Zope debugging console. The
955 %exit/%quit magics remain. In general, it's probably a good idea
960 %exit/%quit magics remain. In general, it's probably a good idea
956 not to delete anything from __builtin__, since we never know what
961 not to delete anything from __builtin__, since we never know what
957 that will break. In any case, python now (for 2.5) will support
962 that will break. In any case, python now (for 2.5) will support
958 'real' exit/quit, so this issue is moot. Closes #55.
963 'real' exit/quit, so this issue is moot. Closes #55.
959
964
960 * IPython/genutils.py (with_obj): rename the 'with' function to
965 * IPython/genutils.py (with_obj): rename the 'with' function to
961 'withobj' to avoid incompatibilities with Python 2.5, where 'with'
966 'withobj' to avoid incompatibilities with Python 2.5, where 'with'
962 becomes a language keyword. Closes #53.
967 becomes a language keyword. Closes #53.
963
968
964 * IPython/FakeModule.py (FakeModule.__init__): add a proper
969 * IPython/FakeModule.py (FakeModule.__init__): add a proper
965 __file__ attribute to this so it fools more things into thinking
970 __file__ attribute to this so it fools more things into thinking
966 it is a real module. Closes #59.
971 it is a real module. Closes #59.
967
972
968 * IPython/Magic.py (magic_edit): add -n option to open the editor
973 * IPython/Magic.py (magic_edit): add -n option to open the editor
969 at a specific line number. After a patch by Stefan van der Walt.
974 at a specific line number. After a patch by Stefan van der Walt.
970
975
971 2006-05-23 Fernando Perez <Fernando.Perez@colorado.edu>
976 2006-05-23 Fernando Perez <Fernando.Perez@colorado.edu>
972
977
973 * IPython/iplib.py (edit_syntax_error): fix crash when for some
978 * IPython/iplib.py (edit_syntax_error): fix crash when for some
974 reason the file could not be opened. After automatic crash
979 reason the file could not be opened. After automatic crash
975 reports sent by James Graham <jgraham-AT-ast.cam.ac.uk> and
980 reports sent by James Graham <jgraham-AT-ast.cam.ac.uk> and
976 Charles Dolan <charlespatrickdolan-AT-yahoo.com>.
981 Charles Dolan <charlespatrickdolan-AT-yahoo.com>.
977 (_should_recompile): Don't fire editor if using %bg, since there
982 (_should_recompile): Don't fire editor if using %bg, since there
978 is no file in the first place. From the same report as above.
983 is no file in the first place. From the same report as above.
979 (raw_input): protect against faulty third-party prefilters. After
984 (raw_input): protect against faulty third-party prefilters. After
980 an automatic crash report sent by Dirk Laurie <dirk-AT-sun.ac.za>
985 an automatic crash report sent by Dirk Laurie <dirk-AT-sun.ac.za>
981 while running under SAGE.
986 while running under SAGE.
982
987
983 2006-05-23 Ville Vainio <vivainio@gmail.com>
988 2006-05-23 Ville Vainio <vivainio@gmail.com>
984
989
985 * ipapi.py: Stripped down ip.to_user_ns() to work only as
990 * ipapi.py: Stripped down ip.to_user_ns() to work only as
986 ip.to_user_ns("x1 y1"), which exposes vars x1 and y1. ipapi.get()
991 ip.to_user_ns("x1 y1"), which exposes vars x1 and y1. ipapi.get()
987 now returns None (again), unless dummy is specifically allowed by
992 now returns None (again), unless dummy is specifically allowed by
988 ipapi.get(allow_dummy=True).
993 ipapi.get(allow_dummy=True).
989
994
990 2006-05-18 Fernando Perez <Fernando.Perez@colorado.edu>
995 2006-05-18 Fernando Perez <Fernando.Perez@colorado.edu>
991
996
992 * IPython: remove all 2.2-compatibility objects and hacks from
997 * IPython: remove all 2.2-compatibility objects and hacks from
993 everywhere, since we only support 2.3 at this point. Docs
998 everywhere, since we only support 2.3 at this point. Docs
994 updated.
999 updated.
995
1000
996 * IPython/ipapi.py (IPApi.__init__): Cleanup of all getters.
1001 * IPython/ipapi.py (IPApi.__init__): Cleanup of all getters.
997 Anything requiring extra validation can be turned into a Python
1002 Anything requiring extra validation can be turned into a Python
998 property in the future. I used a property for the db one b/c
1003 property in the future. I used a property for the db one b/c
999 there was a nasty circularity problem with the initialization
1004 there was a nasty circularity problem with the initialization
1000 order, which right now I don't have time to clean up.
1005 order, which right now I don't have time to clean up.
1001
1006
1002 * IPython/Shell.py (MTInteractiveShell.runcode): Fix, I think,
1007 * IPython/Shell.py (MTInteractiveShell.runcode): Fix, I think,
1003 another locking bug reported by Jorgen. I'm not 100% sure though,
1008 another locking bug reported by Jorgen. I'm not 100% sure though,
1004 so more testing is needed...
1009 so more testing is needed...
1005
1010
1006 2006-05-17 Fernando Perez <Fernando.Perez@colorado.edu>
1011 2006-05-17 Fernando Perez <Fernando.Perez@colorado.edu>
1007
1012
1008 * IPython/ipapi.py (IPApi.to_user_ns): New function to inject
1013 * IPython/ipapi.py (IPApi.to_user_ns): New function to inject
1009 local variables from any routine in user code (typically executed
1014 local variables from any routine in user code (typically executed
1010 with %run) directly into the interactive namespace. Very useful
1015 with %run) directly into the interactive namespace. Very useful
1011 when doing complex debugging.
1016 when doing complex debugging.
1012 (IPythonNotRunning): Changed the default None object to a dummy
1017 (IPythonNotRunning): Changed the default None object to a dummy
1013 whose attributes can be queried as well as called without
1018 whose attributes can be queried as well as called without
1014 exploding, to ease writing code which works transparently both in
1019 exploding, to ease writing code which works transparently both in
1015 and out of ipython and uses some of this API.
1020 and out of ipython and uses some of this API.
1016
1021
1017 2006-05-16 Fernando Perez <Fernando.Perez@colorado.edu>
1022 2006-05-16 Fernando Perez <Fernando.Perez@colorado.edu>
1018
1023
1019 * IPython/hooks.py (result_display): Fix the fact that our display
1024 * IPython/hooks.py (result_display): Fix the fact that our display
1020 hook was using str() instead of repr(), as the default python
1025 hook was using str() instead of repr(), as the default python
1021 console does. This had gone unnoticed b/c it only happened if
1026 console does. This had gone unnoticed b/c it only happened if
1022 %Pprint was off, but the inconsistency was there.
1027 %Pprint was off, but the inconsistency was there.
1023
1028
1024 2006-05-15 Ville Vainio <vivainio@gmail.com>
1029 2006-05-15 Ville Vainio <vivainio@gmail.com>
1025
1030
1026 * Oinspect.py: Only show docstring for nonexisting/binary files
1031 * Oinspect.py: Only show docstring for nonexisting/binary files
1027 when doing object??, closing ticket #62
1032 when doing object??, closing ticket #62
1028
1033
1029 2006-05-13 Fernando Perez <Fernando.Perez@colorado.edu>
1034 2006-05-13 Fernando Perez <Fernando.Perez@colorado.edu>
1030
1035
1031 * IPython/Shell.py (MTInteractiveShell.runsource): Fix threading
1036 * IPython/Shell.py (MTInteractiveShell.runsource): Fix threading
1032 bug, closes http://www.scipy.net/roundup/ipython/issue55. A lock
1037 bug, closes http://www.scipy.net/roundup/ipython/issue55. A lock
1033 was being released in a routine which hadn't checked if it had
1038 was being released in a routine which hadn't checked if it had
1034 been the one to acquire it.
1039 been the one to acquire it.
1035
1040
1036 2006-05-07 Fernando Perez <Fernando.Perez@colorado.edu>
1041 2006-05-07 Fernando Perez <Fernando.Perez@colorado.edu>
1037
1042
1038 * IPython/Release.py (version): put out 0.7.2.rc1 for testing.
1043 * IPython/Release.py (version): put out 0.7.2.rc1 for testing.
1039
1044
1040 2006-04-11 Ville Vainio <vivainio@gmail.com>
1045 2006-04-11 Ville Vainio <vivainio@gmail.com>
1041
1046
1042 * iplib.py, ipmaker.py: .ipy extension now means "ipython batch file"
1047 * iplib.py, ipmaker.py: .ipy extension now means "ipython batch file"
1043 in command line. E.g. "ipython test.ipy" runs test.ipy with ipython
1048 in command line. E.g. "ipython test.ipy" runs test.ipy with ipython
1044 prefilters, allowing stuff like magics and aliases in the file.
1049 prefilters, allowing stuff like magics and aliases in the file.
1045
1050
1046 * Prompts.py, Extensions/clearcmd.py, ipy_system_conf.py: %clear magic
1051 * Prompts.py, Extensions/clearcmd.py, ipy_system_conf.py: %clear magic
1047 added. Supported now are "%clear in" and "%clear out" (clear input and
1052 added. Supported now are "%clear in" and "%clear out" (clear input and
1048 output history, respectively). Also fixed CachedOutput.flush to
1053 output history, respectively). Also fixed CachedOutput.flush to
1049 properly flush the output cache.
1054 properly flush the output cache.
1050
1055
1051 * Extensions/pspersistence.py: Fix %store to avoid "%store obj.attr"
1056 * Extensions/pspersistence.py: Fix %store to avoid "%store obj.attr"
1052 half-success (and fail explicitly).
1057 half-success (and fail explicitly).
1053
1058
1054 2006-03-28 Ville Vainio <vivainio@gmail.com>
1059 2006-03-28 Ville Vainio <vivainio@gmail.com>
1055
1060
1056 * iplib.py: Fix quoting of aliases so that only argless ones
1061 * iplib.py: Fix quoting of aliases so that only argless ones
1057 are quoted
1062 are quoted
1058
1063
1059 2006-03-28 Ville Vainio <vivainio@gmail.com>
1064 2006-03-28 Ville Vainio <vivainio@gmail.com>
1060
1065
1061 * iplib.py: Quote aliases with spaces in the name.
1066 * iplib.py: Quote aliases with spaces in the name.
1062 "c:\program files\blah\bin" is now legal alias target.
1067 "c:\program files\blah\bin" is now legal alias target.
1063
1068
1064 * ext_rehashdir.py: Space no longer allowed as arg
1069 * ext_rehashdir.py: Space no longer allowed as arg
1065 separator, since space is legal in path names.
1070 separator, since space is legal in path names.
1066
1071
1067 2006-03-16 Ville Vainio <vivainio@gmail.com>
1072 2006-03-16 Ville Vainio <vivainio@gmail.com>
1068
1073
1069 * upgrade_dir.py: Take path.py from Extensions, correcting
1074 * upgrade_dir.py: Take path.py from Extensions, correcting
1070 %upgrade magic
1075 %upgrade magic
1071
1076
1072 * ipmaker.py: Suggest using %upgrade if ipy_user_conf.py isn't found.
1077 * ipmaker.py: Suggest using %upgrade if ipy_user_conf.py isn't found.
1073
1078
1074 * hooks.py: Only enclose editor binary in quotes if legal and
1079 * hooks.py: Only enclose editor binary in quotes if legal and
1075 necessary (space in the name, and is an existing file). Fixes a bug
1080 necessary (space in the name, and is an existing file). Fixes a bug
1076 reported by Zachary Pincus.
1081 reported by Zachary Pincus.
1077
1082
1078 2006-03-13 Fernando Perez <Fernando.Perez@colorado.edu>
1083 2006-03-13 Fernando Perez <Fernando.Perez@colorado.edu>
1079
1084
1080 * Manual: thanks to a tip on proper color handling for Emacs, by
1085 * Manual: thanks to a tip on proper color handling for Emacs, by
1081 Eric J Haywiser <ejh1-AT-MIT.EDU>.
1086 Eric J Haywiser <ejh1-AT-MIT.EDU>.
1082
1087
1083 * ipython.el: close http://www.scipy.net/roundup/ipython/issue57
1088 * ipython.el: close http://www.scipy.net/roundup/ipython/issue57
1084 by applying the provided patch. Thanks to Liu Jin
1089 by applying the provided patch. Thanks to Liu Jin
1085 <m.liu.jin-AT-gmail.com> for the contribution. No problems under
1090 <m.liu.jin-AT-gmail.com> for the contribution. No problems under
1086 XEmacs/Linux, I'm trusting the submitter that it actually helps
1091 XEmacs/Linux, I'm trusting the submitter that it actually helps
1087 under win32/GNU Emacs. Will revisit if any problems are reported.
1092 under win32/GNU Emacs. Will revisit if any problems are reported.
1088
1093
1089 2006-03-12 Fernando Perez <Fernando.Perez@colorado.edu>
1094 2006-03-12 Fernando Perez <Fernando.Perez@colorado.edu>
1090
1095
1091 * IPython/Gnuplot2.py (_FileClass): update for current Gnuplot.py
1096 * IPython/Gnuplot2.py (_FileClass): update for current Gnuplot.py
1092 from SVN, thanks to a patch by Ryan Woodard <rywo@bas.ac.uk>.
1097 from SVN, thanks to a patch by Ryan Woodard <rywo@bas.ac.uk>.
1093
1098
1094 2006-03-12 Ville Vainio <vivainio@gmail.com>
1099 2006-03-12 Ville Vainio <vivainio@gmail.com>
1095
1100
1096 * Magic.py (magic_timeit): Added %timeit magic, contributed by
1101 * Magic.py (magic_timeit): Added %timeit magic, contributed by
1097 Torsten Marek.
1102 Torsten Marek.
1098
1103
1099 2006-03-12 Fernando Perez <Fernando.Perez@colorado.edu>
1104 2006-03-12 Fernando Perez <Fernando.Perez@colorado.edu>
1100
1105
1101 * IPython/Magic.py (magic_macro): fix so that the n1-n2 syntax for
1106 * IPython/Magic.py (magic_macro): fix so that the n1-n2 syntax for
1102 line ranges works again.
1107 line ranges works again.
1103
1108
1104 2006-03-11 Fernando Perez <Fernando.Perez@colorado.edu>
1109 2006-03-11 Fernando Perez <Fernando.Perez@colorado.edu>
1105
1110
1106 * IPython/iplib.py (showtraceback): add back sys.last_traceback
1111 * IPython/iplib.py (showtraceback): add back sys.last_traceback
1107 and friends, after a discussion with Zach Pincus on ipython-user.
1112 and friends, after a discussion with Zach Pincus on ipython-user.
1108 I'm not 100% sure, but after thinking about it quite a bit, it may
1113 I'm not 100% sure, but after thinking about it quite a bit, it may
1109 be OK. Testing with the multithreaded shells didn't reveal any
1114 be OK. Testing with the multithreaded shells didn't reveal any
1110 problems, but let's keep an eye out.
1115 problems, but let's keep an eye out.
1111
1116
1112 In the process, I fixed a few things which were calling
1117 In the process, I fixed a few things which were calling
1113 self.InteractiveTB() directly (like safe_execfile), which is a
1118 self.InteractiveTB() directly (like safe_execfile), which is a
1114 mistake: ALL exception reporting should be done by calling
1119 mistake: ALL exception reporting should be done by calling
1115 self.showtraceback(), which handles state and tab-completion and
1120 self.showtraceback(), which handles state and tab-completion and
1116 more.
1121 more.
1117
1122
1118 2006-03-01 Ville Vainio <vivainio@gmail.com>
1123 2006-03-01 Ville Vainio <vivainio@gmail.com>
1119
1124
1120 * Extensions/ipipe.py: Added Walter Doerwald's "ipipe" module.
1125 * Extensions/ipipe.py: Added Walter Doerwald's "ipipe" module.
1121 To use, do "from ipipe import *".
1126 To use, do "from ipipe import *".
1122
1127
1123 2006-02-24 Ville Vainio <vivainio@gmail.com>
1128 2006-02-24 Ville Vainio <vivainio@gmail.com>
1124
1129
1125 * Magic.py, upgrade_dir.py: %upgrade magic added. Does things more
1130 * Magic.py, upgrade_dir.py: %upgrade magic added. Does things more
1126 "cleanly" and safely than the older upgrade mechanism.
1131 "cleanly" and safely than the older upgrade mechanism.
1127
1132
1128 2006-02-21 Ville Vainio <vivainio@gmail.com>
1133 2006-02-21 Ville Vainio <vivainio@gmail.com>
1129
1134
1130 * Magic.py: %save works again.
1135 * Magic.py: %save works again.
1131
1136
1132 2006-02-15 Ville Vainio <vivainio@gmail.com>
1137 2006-02-15 Ville Vainio <vivainio@gmail.com>
1133
1138
1134 * Magic.py: %Pprint works again
1139 * Magic.py: %Pprint works again
1135
1140
1136 * Extensions/ipy_sane_defaults.py: Provide everything provided
1141 * Extensions/ipy_sane_defaults.py: Provide everything provided
1137 in default ipythonrc, to make it possible to have a completely empty
1142 in default ipythonrc, to make it possible to have a completely empty
1138 ipythonrc (and thus completely rc-file free configuration)
1143 ipythonrc (and thus completely rc-file free configuration)
1139
1144
1140 2006-02-11 Fernando Perez <Fernando.Perez@colorado.edu>
1145 2006-02-11 Fernando Perez <Fernando.Perez@colorado.edu>
1141
1146
1142 * IPython/hooks.py (editor): quote the call to the editor command,
1147 * IPython/hooks.py (editor): quote the call to the editor command,
1143 to allow commands with spaces in them. Problem noted by watching
1148 to allow commands with spaces in them. Problem noted by watching
1144 Ian Oswald's video about textpad under win32 at
1149 Ian Oswald's video about textpad under win32 at
1145 http://showmedo.com/videoListPage?listKey=PythonIPythonSeries
1150 http://showmedo.com/videoListPage?listKey=PythonIPythonSeries
1146
1151
1147 * IPython/UserConfig/ipythonrc: Replace @ signs with % when
1152 * IPython/UserConfig/ipythonrc: Replace @ signs with % when
1148 describing magics (we haven't used @ for a loong time).
1153 describing magics (we haven't used @ for a loong time).
1149
1154
1150 * IPython/ultraTB.py (VerboseTB.text.text_repr): Added patch
1155 * IPython/ultraTB.py (VerboseTB.text.text_repr): Added patch
1151 contributed by marienz to close
1156 contributed by marienz to close
1152 http://www.scipy.net/roundup/ipython/issue53.
1157 http://www.scipy.net/roundup/ipython/issue53.
1153
1158
1154 2006-02-10 Ville Vainio <vivainio@gmail.com>
1159 2006-02-10 Ville Vainio <vivainio@gmail.com>
1155
1160
1156 * genutils.py: getoutput now works in win32 too
1161 * genutils.py: getoutput now works in win32 too
1157
1162
1158 * completer.py: alias and magic completion only invoked
1163 * completer.py: alias and magic completion only invoked
1159 at the first "item" in the line, to avoid "cd %store"
1164 at the first "item" in the line, to avoid "cd %store"
1160 nonsense.
1165 nonsense.
1161
1166
1162 2006-02-09 Ville Vainio <vivainio@gmail.com>
1167 2006-02-09 Ville Vainio <vivainio@gmail.com>
1163
1168
1164 * test/*: Added a unit testing framework (finally).
1169 * test/*: Added a unit testing framework (finally).
1165 '%run runtests.py' to run test_*.
1170 '%run runtests.py' to run test_*.
1166
1171
1167 * ipapi.py: Exposed runlines and set_custom_exc
1172 * ipapi.py: Exposed runlines and set_custom_exc
1168
1173
1169 2006-02-07 Ville Vainio <vivainio@gmail.com>
1174 2006-02-07 Ville Vainio <vivainio@gmail.com>
1170
1175
1171 * iplib.py: don't split "f 1 2" to "f(1,2)" in autocall,
1176 * iplib.py: don't split "f 1 2" to "f(1,2)" in autocall,
1172 instead use "f(1 2)" as before.
1177 instead use "f(1 2)" as before.
1173
1178
1174 2006-02-05 Fernando Perez <Fernando.Perez@colorado.edu>
1179 2006-02-05 Fernando Perez <Fernando.Perez@colorado.edu>
1175
1180
1176 * IPython/demo.py (IPythonDemo): Add new classes to the demo
1181 * IPython/demo.py (IPythonDemo): Add new classes to the demo
1177 facilities, for demos processed by the IPython input filter
1182 facilities, for demos processed by the IPython input filter
1178 (IPythonDemo), and for running a script one-line-at-a-time as a
1183 (IPythonDemo), and for running a script one-line-at-a-time as a
1179 demo, both for pure Python (LineDemo) and for IPython-processed
1184 demo, both for pure Python (LineDemo) and for IPython-processed
1180 input (IPythonLineDemo). After a request by Dave Kohel, from the
1185 input (IPythonLineDemo). After a request by Dave Kohel, from the
1181 SAGE team.
1186 SAGE team.
1182 (Demo.edit): added an edit() method to the demo objects, to edit
1187 (Demo.edit): added an edit() method to the demo objects, to edit
1183 the in-memory copy of the last executed block.
1188 the in-memory copy of the last executed block.
1184
1189
1185 * IPython/Magic.py (magic_edit): add '-r' option for 'raw'
1190 * IPython/Magic.py (magic_edit): add '-r' option for 'raw'
1186 processing to %edit, %macro and %save. These commands can now be
1191 processing to %edit, %macro and %save. These commands can now be
1187 invoked on the unprocessed input as it was typed by the user
1192 invoked on the unprocessed input as it was typed by the user
1188 (without any prefilters applied). After requests by the SAGE team
1193 (without any prefilters applied). After requests by the SAGE team
1189 at SAGE days 2006: http://modular.ucsd.edu/sage/days1/schedule.html.
1194 at SAGE days 2006: http://modular.ucsd.edu/sage/days1/schedule.html.
1190
1195
1191 2006-02-01 Ville Vainio <vivainio@gmail.com>
1196 2006-02-01 Ville Vainio <vivainio@gmail.com>
1192
1197
1193 * setup.py, eggsetup.py: easy_install ipython==dev works
1198 * setup.py, eggsetup.py: easy_install ipython==dev works
1194 correctly now (on Linux)
1199 correctly now (on Linux)
1195
1200
1196 * ipy_user_conf,ipmaker: user config changes, removed spurious
1201 * ipy_user_conf,ipmaker: user config changes, removed spurious
1197 warnings
1202 warnings
1198
1203
1199 * iplib: if rc.banner is string, use it as is.
1204 * iplib: if rc.banner is string, use it as is.
1200
1205
1201 * Magic: %pycat accepts a string argument and pages it's contents.
1206 * Magic: %pycat accepts a string argument and pages it's contents.
1202
1207
1203
1208
1204 2006-01-30 Ville Vainio <vivainio@gmail.com>
1209 2006-01-30 Ville Vainio <vivainio@gmail.com>
1205
1210
1206 * pickleshare,pspersistence,ipapi,Magic: persistence overhaul.
1211 * pickleshare,pspersistence,ipapi,Magic: persistence overhaul.
1207 Now %store and bookmarks work through PickleShare, meaning that
1212 Now %store and bookmarks work through PickleShare, meaning that
1208 concurrent access is possible and all ipython sessions see the
1213 concurrent access is possible and all ipython sessions see the
1209 same database situation all the time, instead of snapshot of
1214 same database situation all the time, instead of snapshot of
1210 the situation when the session was started. Hence, %bookmark
1215 the situation when the session was started. Hence, %bookmark
1211 results are immediately accessible from othes sessions. The database
1216 results are immediately accessible from othes sessions. The database
1212 is also available for use by user extensions. See:
1217 is also available for use by user extensions. See:
1213 http://www.python.org/pypi/pickleshare
1218 http://www.python.org/pypi/pickleshare
1214
1219
1215 * hooks.py: Two new hooks, 'shutdown_hook' and 'late_startup_hook'.
1220 * hooks.py: Two new hooks, 'shutdown_hook' and 'late_startup_hook'.
1216
1221
1217 * aliases can now be %store'd
1222 * aliases can now be %store'd
1218
1223
1219 * path.py moved to Extensions so that pickleshare does not need
1224 * path.py moved to Extensions so that pickleshare does not need
1220 IPython-specific import. Extensions added to pythonpath right
1225 IPython-specific import. Extensions added to pythonpath right
1221 at __init__.
1226 at __init__.
1222
1227
1223 * iplib.py: ipalias deprecated/redundant; aliases are converted and
1228 * iplib.py: ipalias deprecated/redundant; aliases are converted and
1224 called with _ip.system and the pre-transformed command string.
1229 called with _ip.system and the pre-transformed command string.
1225
1230
1226 2006-01-29 Fernando Perez <Fernando.Perez@colorado.edu>
1231 2006-01-29 Fernando Perez <Fernando.Perez@colorado.edu>
1227
1232
1228 * IPython/iplib.py (interact): Fix that we were not catching
1233 * IPython/iplib.py (interact): Fix that we were not catching
1229 KeyboardInterrupt exceptions properly. I'm not quite sure why the
1234 KeyboardInterrupt exceptions properly. I'm not quite sure why the
1230 logic here had to change, but it's fixed now.
1235 logic here had to change, but it's fixed now.
1231
1236
1232 2006-01-29 Ville Vainio <vivainio@gmail.com>
1237 2006-01-29 Ville Vainio <vivainio@gmail.com>
1233
1238
1234 * iplib.py: Try to import pyreadline on Windows.
1239 * iplib.py: Try to import pyreadline on Windows.
1235
1240
1236 2006-01-27 Ville Vainio <vivainio@gmail.com>
1241 2006-01-27 Ville Vainio <vivainio@gmail.com>
1237
1242
1238 * iplib.py: Expose ipapi as _ip in builtin namespace.
1243 * iplib.py: Expose ipapi as _ip in builtin namespace.
1239 Makes ipmagic (-> _ip.magic), ipsystem (-> _ip.system)
1244 Makes ipmagic (-> _ip.magic), ipsystem (-> _ip.system)
1240 and ip_set_hook (-> _ip.set_hook) redundant. % and !
1245 and ip_set_hook (-> _ip.set_hook) redundant. % and !
1241 syntax now produce _ip.* variant of the commands.
1246 syntax now produce _ip.* variant of the commands.
1242
1247
1243 * "_ip.options().autoedit_syntax = 2" automatically throws
1248 * "_ip.options().autoedit_syntax = 2" automatically throws
1244 user to editor for syntax error correction without prompting.
1249 user to editor for syntax error correction without prompting.
1245
1250
1246 2006-01-27 Ville Vainio <vivainio@gmail.com>
1251 2006-01-27 Ville Vainio <vivainio@gmail.com>
1247
1252
1248 * ipmaker.py: Give "realistic" sys.argv for scripts (without
1253 * ipmaker.py: Give "realistic" sys.argv for scripts (without
1249 'ipython' at argv[0]) executed through command line.
1254 'ipython' at argv[0]) executed through command line.
1250 NOTE: this DEPRECATES calling ipython with multiple scripts
1255 NOTE: this DEPRECATES calling ipython with multiple scripts
1251 ("ipython a.py b.py c.py")
1256 ("ipython a.py b.py c.py")
1252
1257
1253 * iplib.py, hooks.py: Added configurable input prefilter,
1258 * iplib.py, hooks.py: Added configurable input prefilter,
1254 named 'input_prefilter'. See ext_rescapture.py for example
1259 named 'input_prefilter'. See ext_rescapture.py for example
1255 usage.
1260 usage.
1256
1261
1257 * ext_rescapture.py, Magic.py: Better system command output capture
1262 * ext_rescapture.py, Magic.py: Better system command output capture
1258 through 'var = !ls' (deprecates user-visible %sc). Same notation
1263 through 'var = !ls' (deprecates user-visible %sc). Same notation
1259 applies for magics, 'var = %alias' assigns alias list to var.
1264 applies for magics, 'var = %alias' assigns alias list to var.
1260
1265
1261 * ipapi.py: added meta() for accessing extension-usable data store.
1266 * ipapi.py: added meta() for accessing extension-usable data store.
1262
1267
1263 * iplib.py: added InteractiveShell.getapi(). New magics should be
1268 * iplib.py: added InteractiveShell.getapi(). New magics should be
1264 written doing self.getapi() instead of using the shell directly.
1269 written doing self.getapi() instead of using the shell directly.
1265
1270
1266 * Magic.py: %store now allows doing %store foo > ~/myfoo.txt and
1271 * Magic.py: %store now allows doing %store foo > ~/myfoo.txt and
1267 %store foo >> ~/myfoo.txt to store variables to files (in clean
1272 %store foo >> ~/myfoo.txt to store variables to files (in clean
1268 textual form, not a restorable pickle).
1273 textual form, not a restorable pickle).
1269
1274
1270 * ipmaker.py: now import ipy_profile_PROFILENAME automatically
1275 * ipmaker.py: now import ipy_profile_PROFILENAME automatically
1271
1276
1272 * usage.py, Magic.py: added %quickref
1277 * usage.py, Magic.py: added %quickref
1273
1278
1274 * iplib.py: ESC_PAREN fixes: /f 1 2 -> f(1,2), not f(1 2).
1279 * iplib.py: ESC_PAREN fixes: /f 1 2 -> f(1,2), not f(1 2).
1275
1280
1276 * GetoptErrors when invoking magics etc. with wrong args
1281 * GetoptErrors when invoking magics etc. with wrong args
1277 are now more helpful:
1282 are now more helpful:
1278 GetoptError: option -l not recognized (allowed: "qb" )
1283 GetoptError: option -l not recognized (allowed: "qb" )
1279
1284
1280 2006-01-25 Fernando Perez <Fernando.Perez@colorado.edu>
1285 2006-01-25 Fernando Perez <Fernando.Perez@colorado.edu>
1281
1286
1282 * IPython/demo.py (Demo.show): Flush stdout after each block, so
1287 * IPython/demo.py (Demo.show): Flush stdout after each block, so
1283 computationally intensive blocks don't appear to stall the demo.
1288 computationally intensive blocks don't appear to stall the demo.
1284
1289
1285 2006-01-24 Ville Vainio <vivainio@gmail.com>
1290 2006-01-24 Ville Vainio <vivainio@gmail.com>
1286
1291
1287 * iplib.py, hooks.py: 'result_display' hook can return a non-None
1292 * iplib.py, hooks.py: 'result_display' hook can return a non-None
1288 value to manipulate resulting history entry.
1293 value to manipulate resulting history entry.
1289
1294
1290 * ipapi.py: Moved TryNext here from hooks.py. Moved functions
1295 * ipapi.py: Moved TryNext here from hooks.py. Moved functions
1291 to instance methods of IPApi class, to make extending an embedded
1296 to instance methods of IPApi class, to make extending an embedded
1292 IPython feasible. See ext_rehashdir.py for example usage.
1297 IPython feasible. See ext_rehashdir.py for example usage.
1293
1298
1294 * Merged 1071-1076 from branches/0.7.1
1299 * Merged 1071-1076 from branches/0.7.1
1295
1300
1296
1301
1297 2006-01-23 Fernando Perez <Fernando.Perez@colorado.edu>
1302 2006-01-23 Fernando Perez <Fernando.Perez@colorado.edu>
1298
1303
1299 * tools/release (daystamp): Fix build tools to use the new
1304 * tools/release (daystamp): Fix build tools to use the new
1300 eggsetup.py script to build lightweight eggs.
1305 eggsetup.py script to build lightweight eggs.
1301
1306
1302 * Applied changesets 1062 and 1064 before 0.7.1 release.
1307 * Applied changesets 1062 and 1064 before 0.7.1 release.
1303
1308
1304 * IPython/Magic.py (magic_history): Add '-r' option to %hist, to
1309 * IPython/Magic.py (magic_history): Add '-r' option to %hist, to
1305 see the raw input history (without conversions like %ls ->
1310 see the raw input history (without conversions like %ls ->
1306 ipmagic("ls")). After a request from W. Stein, SAGE
1311 ipmagic("ls")). After a request from W. Stein, SAGE
1307 (http://modular.ucsd.edu/sage) developer. This information is
1312 (http://modular.ucsd.edu/sage) developer. This information is
1308 stored in the input_hist_raw attribute of the IPython instance, so
1313 stored in the input_hist_raw attribute of the IPython instance, so
1309 developers can access it if needed (it's an InputList instance).
1314 developers can access it if needed (it's an InputList instance).
1310
1315
1311 * Versionstring = 0.7.2.svn
1316 * Versionstring = 0.7.2.svn
1312
1317
1313 * eggsetup.py: A separate script for constructing eggs, creates
1318 * eggsetup.py: A separate script for constructing eggs, creates
1314 proper launch scripts even on Windows (an .exe file in
1319 proper launch scripts even on Windows (an .exe file in
1315 \python24\scripts).
1320 \python24\scripts).
1316
1321
1317 * ipapi.py: launch_new_instance, launch entry point needed for the
1322 * ipapi.py: launch_new_instance, launch entry point needed for the
1318 egg.
1323 egg.
1319
1324
1320 2006-01-23 Ville Vainio <vivainio@gmail.com>
1325 2006-01-23 Ville Vainio <vivainio@gmail.com>
1321
1326
1322 * Added %cpaste magic for pasting python code
1327 * Added %cpaste magic for pasting python code
1323
1328
1324 2006-01-22 Ville Vainio <vivainio@gmail.com>
1329 2006-01-22 Ville Vainio <vivainio@gmail.com>
1325
1330
1326 * Merge from branches/0.7.1 into trunk, revs 1052-1057
1331 * Merge from branches/0.7.1 into trunk, revs 1052-1057
1327
1332
1328 * Versionstring = 0.7.2.svn
1333 * Versionstring = 0.7.2.svn
1329
1334
1330 * eggsetup.py: A separate script for constructing eggs, creates
1335 * eggsetup.py: A separate script for constructing eggs, creates
1331 proper launch scripts even on Windows (an .exe file in
1336 proper launch scripts even on Windows (an .exe file in
1332 \python24\scripts).
1337 \python24\scripts).
1333
1338
1334 * ipapi.py: launch_new_instance, launch entry point needed for the
1339 * ipapi.py: launch_new_instance, launch entry point needed for the
1335 egg.
1340 egg.
1336
1341
1337 2006-01-22 Fernando Perez <Fernando.Perez@colorado.edu>
1342 2006-01-22 Fernando Perez <Fernando.Perez@colorado.edu>
1338
1343
1339 * IPython/OInspect.py (Inspector.pinfo): fix bug where foo?? or
1344 * IPython/OInspect.py (Inspector.pinfo): fix bug where foo?? or
1340 %pfile foo would print the file for foo even if it was a binary.
1345 %pfile foo would print the file for foo even if it was a binary.
1341 Now, extensions '.so' and '.dll' are skipped.
1346 Now, extensions '.so' and '.dll' are skipped.
1342
1347
1343 * IPython/Shell.py (MTInteractiveShell.__init__): Fix threading
1348 * IPython/Shell.py (MTInteractiveShell.__init__): Fix threading
1344 bug, where macros would fail in all threaded modes. I'm not 100%
1349 bug, where macros would fail in all threaded modes. I'm not 100%
1345 sure, so I'm going to put out an rc instead of making a release
1350 sure, so I'm going to put out an rc instead of making a release
1346 today, and wait for feedback for at least a few days.
1351 today, and wait for feedback for at least a few days.
1347
1352
1348 * IPython/iplib.py (handle_normal): fix (finally? somehow I doubt
1353 * IPython/iplib.py (handle_normal): fix (finally? somehow I doubt
1349 it...) the handling of pasting external code with autoindent on.
1354 it...) the handling of pasting external code with autoindent on.
1350 To get out of a multiline input, the rule will appear for most
1355 To get out of a multiline input, the rule will appear for most
1351 users unchanged: two blank lines or change the indent level
1356 users unchanged: two blank lines or change the indent level
1352 proposed by IPython. But there is a twist now: you can
1357 proposed by IPython. But there is a twist now: you can
1353 add/subtract only *one or two spaces*. If you add/subtract three
1358 add/subtract only *one or two spaces*. If you add/subtract three
1354 or more (unless you completely delete the line), IPython will
1359 or more (unless you completely delete the line), IPython will
1355 accept that line, and you'll need to enter a second one of pure
1360 accept that line, and you'll need to enter a second one of pure
1356 whitespace. I know it sounds complicated, but I can't find a
1361 whitespace. I know it sounds complicated, but I can't find a
1357 different solution that covers all the cases, with the right
1362 different solution that covers all the cases, with the right
1358 heuristics. Hopefully in actual use, nobody will really notice
1363 heuristics. Hopefully in actual use, nobody will really notice
1359 all these strange rules and things will 'just work'.
1364 all these strange rules and things will 'just work'.
1360
1365
1361 2006-01-21 Fernando Perez <Fernando.Perez@colorado.edu>
1366 2006-01-21 Fernando Perez <Fernando.Perez@colorado.edu>
1362
1367
1363 * IPython/iplib.py (interact): catch exceptions which can be
1368 * IPython/iplib.py (interact): catch exceptions which can be
1364 triggered asynchronously by signal handlers. Thanks to an
1369 triggered asynchronously by signal handlers. Thanks to an
1365 automatic crash report, submitted by Colin Kingsley
1370 automatic crash report, submitted by Colin Kingsley
1366 <tercel-AT-gentoo.org>.
1371 <tercel-AT-gentoo.org>.
1367
1372
1368 2006-01-20 Ville Vainio <vivainio@gmail.com>
1373 2006-01-20 Ville Vainio <vivainio@gmail.com>
1369
1374
1370 * Ipython/Extensions/ext_rehashdir.py: Created a usable example
1375 * Ipython/Extensions/ext_rehashdir.py: Created a usable example
1371 (%rehashdir, very useful, try it out) of how to extend ipython
1376 (%rehashdir, very useful, try it out) of how to extend ipython
1372 with new magics. Also added Extensions dir to pythonpath to make
1377 with new magics. Also added Extensions dir to pythonpath to make
1373 importing extensions easy.
1378 importing extensions easy.
1374
1379
1375 * %store now complains when trying to store interactively declared
1380 * %store now complains when trying to store interactively declared
1376 classes / instances of those classes.
1381 classes / instances of those classes.
1377
1382
1378 * Extensions/ipy_system_conf.py, UserConfig/ipy_user_conf.py,
1383 * Extensions/ipy_system_conf.py, UserConfig/ipy_user_conf.py,
1379 ipmaker.py: Config rehaul. Now ipy_..._conf.py are always imported
1384 ipmaker.py: Config rehaul. Now ipy_..._conf.py are always imported
1380 if they exist, and ipy_user_conf.py with some defaults is created for
1385 if they exist, and ipy_user_conf.py with some defaults is created for
1381 the user.
1386 the user.
1382
1387
1383 * Startup rehashing done by the config file, not InterpreterExec.
1388 * Startup rehashing done by the config file, not InterpreterExec.
1384 This means system commands are available even without selecting the
1389 This means system commands are available even without selecting the
1385 pysh profile. It's the sensible default after all.
1390 pysh profile. It's the sensible default after all.
1386
1391
1387 2006-01-20 Fernando Perez <Fernando.Perez@colorado.edu>
1392 2006-01-20 Fernando Perez <Fernando.Perez@colorado.edu>
1388
1393
1389 * IPython/iplib.py (raw_input): I _think_ I got the pasting of
1394 * IPython/iplib.py (raw_input): I _think_ I got the pasting of
1390 multiline code with autoindent on working. But I am really not
1395 multiline code with autoindent on working. But I am really not
1391 sure, so this needs more testing. Will commit a debug-enabled
1396 sure, so this needs more testing. Will commit a debug-enabled
1392 version for now, while I test it some more, so that Ville and
1397 version for now, while I test it some more, so that Ville and
1393 others may also catch any problems. Also made
1398 others may also catch any problems. Also made
1394 self.indent_current_str() a method, to ensure that there's no
1399 self.indent_current_str() a method, to ensure that there's no
1395 chance of the indent space count and the corresponding string
1400 chance of the indent space count and the corresponding string
1396 falling out of sync. All code needing the string should just call
1401 falling out of sync. All code needing the string should just call
1397 the method.
1402 the method.
1398
1403
1399 2006-01-18 Fernando Perez <Fernando.Perez@colorado.edu>
1404 2006-01-18 Fernando Perez <Fernando.Perez@colorado.edu>
1400
1405
1401 * IPython/Magic.py (magic_edit): fix check for when users don't
1406 * IPython/Magic.py (magic_edit): fix check for when users don't
1402 save their output files, the try/except was in the wrong section.
1407 save their output files, the try/except was in the wrong section.
1403
1408
1404 2006-01-17 Fernando Perez <Fernando.Perez@colorado.edu>
1409 2006-01-17 Fernando Perez <Fernando.Perez@colorado.edu>
1405
1410
1406 * IPython/Magic.py (magic_run): fix __file__ global missing from
1411 * IPython/Magic.py (magic_run): fix __file__ global missing from
1407 script's namespace when executed via %run. After a report by
1412 script's namespace when executed via %run. After a report by
1408 Vivian.
1413 Vivian.
1409
1414
1410 * IPython/Debugger.py (Pdb.__init__): Fix breakage with '%run -d'
1415 * IPython/Debugger.py (Pdb.__init__): Fix breakage with '%run -d'
1411 when using python 2.4. The parent constructor changed in 2.4, and
1416 when using python 2.4. The parent constructor changed in 2.4, and
1412 we need to track it directly (we can't call it, as it messes up
1417 we need to track it directly (we can't call it, as it messes up
1413 readline and tab-completion inside our pdb would stop working).
1418 readline and tab-completion inside our pdb would stop working).
1414 After a bug report by R. Bernstein <rocky-AT-panix.com>.
1419 After a bug report by R. Bernstein <rocky-AT-panix.com>.
1415
1420
1416 2006-01-16 Ville Vainio <vivainio@gmail.com>
1421 2006-01-16 Ville Vainio <vivainio@gmail.com>
1417
1422
1418 * Ipython/magic.py: Reverted back to old %edit functionality
1423 * Ipython/magic.py: Reverted back to old %edit functionality
1419 that returns file contents on exit.
1424 that returns file contents on exit.
1420
1425
1421 * IPython/path.py: Added Jason Orendorff's "path" module to
1426 * IPython/path.py: Added Jason Orendorff's "path" module to
1422 IPython tree, http://www.jorendorff.com/articles/python/path/.
1427 IPython tree, http://www.jorendorff.com/articles/python/path/.
1423 You can get path objects conveniently through %sc, and !!, e.g.:
1428 You can get path objects conveniently through %sc, and !!, e.g.:
1424 sc files=ls
1429 sc files=ls
1425 for p in files.paths: # or files.p
1430 for p in files.paths: # or files.p
1426 print p,p.mtime
1431 print p,p.mtime
1427
1432
1428 * Ipython/iplib.py:"," and ";" autoquoting-upon-autocall
1433 * Ipython/iplib.py:"," and ";" autoquoting-upon-autocall
1429 now work again without considering the exclusion regexp -
1434 now work again without considering the exclusion regexp -
1430 hence, things like ',foo my/path' turn to 'foo("my/path")'
1435 hence, things like ',foo my/path' turn to 'foo("my/path")'
1431 instead of syntax error.
1436 instead of syntax error.
1432
1437
1433
1438
1434 2006-01-14 Ville Vainio <vivainio@gmail.com>
1439 2006-01-14 Ville Vainio <vivainio@gmail.com>
1435
1440
1436 * IPython/ipapi.py (ashook, asmagic, options): Added convenience
1441 * IPython/ipapi.py (ashook, asmagic, options): Added convenience
1437 ipapi decorators for python 2.4 users, options() provides access to rc
1442 ipapi decorators for python 2.4 users, options() provides access to rc
1438 data.
1443 data.
1439
1444
1440 * IPython/Magic.py (magic_cd): %cd now accepts backslashes
1445 * IPython/Magic.py (magic_cd): %cd now accepts backslashes
1441 as path separators (even on Linux ;-). Space character after
1446 as path separators (even on Linux ;-). Space character after
1442 backslash (as yielded by tab completer) is still space;
1447 backslash (as yielded by tab completer) is still space;
1443 "%cd long\ name" works as expected.
1448 "%cd long\ name" works as expected.
1444
1449
1445 * IPython/ipapi.py,hooks.py,iplib.py: Hooks now implemented
1450 * IPython/ipapi.py,hooks.py,iplib.py: Hooks now implemented
1446 as "chain of command", with priority. API stays the same,
1451 as "chain of command", with priority. API stays the same,
1447 TryNext exception raised by a hook function signals that
1452 TryNext exception raised by a hook function signals that
1448 current hook failed and next hook should try handling it, as
1453 current hook failed and next hook should try handling it, as
1449 suggested by Walter DΓΆrwald <walter@livinglogic.de>. Walter also
1454 suggested by Walter DΓΆrwald <walter@livinglogic.de>. Walter also
1450 requested configurable display hook, which is now implemented.
1455 requested configurable display hook, which is now implemented.
1451
1456
1452 2006-01-13 Ville Vainio <vivainio@gmail.com>
1457 2006-01-13 Ville Vainio <vivainio@gmail.com>
1453
1458
1454 * IPython/platutils*.py: platform specific utility functions,
1459 * IPython/platutils*.py: platform specific utility functions,
1455 so far only set_term_title is implemented (change terminal
1460 so far only set_term_title is implemented (change terminal
1456 label in windowing systems). %cd now changes the title to
1461 label in windowing systems). %cd now changes the title to
1457 current dir.
1462 current dir.
1458
1463
1459 * IPython/Release.py: Added myself to "authors" list,
1464 * IPython/Release.py: Added myself to "authors" list,
1460 had to create new files.
1465 had to create new files.
1461
1466
1462 * IPython/iplib.py (handle_shell_escape): fixed logical flaw in
1467 * IPython/iplib.py (handle_shell_escape): fixed logical flaw in
1463 shell escape; not a known bug but had potential to be one in the
1468 shell escape; not a known bug but had potential to be one in the
1464 future.
1469 future.
1465
1470
1466 * IPython/ipapi.py (added),OInspect.py,iplib.py: "Public"
1471 * IPython/ipapi.py (added),OInspect.py,iplib.py: "Public"
1467 extension API for IPython! See the module for usage example. Fix
1472 extension API for IPython! See the module for usage example. Fix
1468 OInspect for docstring-less magic functions.
1473 OInspect for docstring-less magic functions.
1469
1474
1470
1475
1471 2006-01-13 Fernando Perez <Fernando.Perez@colorado.edu>
1476 2006-01-13 Fernando Perez <Fernando.Perez@colorado.edu>
1472
1477
1473 * IPython/iplib.py (raw_input): temporarily deactivate all
1478 * IPython/iplib.py (raw_input): temporarily deactivate all
1474 attempts at allowing pasting of code with autoindent on. It
1479 attempts at allowing pasting of code with autoindent on. It
1475 introduced bugs (reported by Prabhu) and I can't seem to find a
1480 introduced bugs (reported by Prabhu) and I can't seem to find a
1476 robust combination which works in all cases. Will have to revisit
1481 robust combination which works in all cases. Will have to revisit
1477 later.
1482 later.
1478
1483
1479 * IPython/genutils.py: remove isspace() function. We've dropped
1484 * IPython/genutils.py: remove isspace() function. We've dropped
1480 2.2 compatibility, so it's OK to use the string method.
1485 2.2 compatibility, so it's OK to use the string method.
1481
1486
1482 2006-01-12 Fernando Perez <Fernando.Perez@colorado.edu>
1487 2006-01-12 Fernando Perez <Fernando.Perez@colorado.edu>
1483
1488
1484 * IPython/iplib.py (InteractiveShell.__init__): fix regexp
1489 * IPython/iplib.py (InteractiveShell.__init__): fix regexp
1485 matching what NOT to autocall on, to include all python binary
1490 matching what NOT to autocall on, to include all python binary
1486 operators (including things like 'and', 'or', 'is' and 'in').
1491 operators (including things like 'and', 'or', 'is' and 'in').
1487 Prompted by a bug report on 'foo & bar', but I realized we had
1492 Prompted by a bug report on 'foo & bar', but I realized we had
1488 many more potential bug cases with other operators. The regexp is
1493 many more potential bug cases with other operators. The regexp is
1489 self.re_exclude_auto, it's fairly commented.
1494 self.re_exclude_auto, it's fairly commented.
1490
1495
1491 2006-01-12 Ville Vainio <vivainio@gmail.com>
1496 2006-01-12 Ville Vainio <vivainio@gmail.com>
1492
1497
1493 * IPython/iplib.py (make_quoted_expr,handle_shell_escape):
1498 * IPython/iplib.py (make_quoted_expr,handle_shell_escape):
1494 Prettified and hardened string/backslash quoting with ipsystem(),
1499 Prettified and hardened string/backslash quoting with ipsystem(),
1495 ipalias() and ipmagic(). Now even \ characters are passed to
1500 ipalias() and ipmagic(). Now even \ characters are passed to
1496 %magics, !shell escapes and aliases exactly as they are in the
1501 %magics, !shell escapes and aliases exactly as they are in the
1497 ipython command line. Should improve backslash experience,
1502 ipython command line. Should improve backslash experience,
1498 particularly in Windows (path delimiter for some commands that
1503 particularly in Windows (path delimiter for some commands that
1499 won't understand '/'), but Unix benefits as well (regexps). %cd
1504 won't understand '/'), but Unix benefits as well (regexps). %cd
1500 magic still doesn't support backslash path delimiters, though. Also
1505 magic still doesn't support backslash path delimiters, though. Also
1501 deleted all pretense of supporting multiline command strings in
1506 deleted all pretense of supporting multiline command strings in
1502 !system or %magic commands. Thanks to Jerry McRae for suggestions.
1507 !system or %magic commands. Thanks to Jerry McRae for suggestions.
1503
1508
1504 * doc/build_doc_instructions.txt added. Documentation on how to
1509 * doc/build_doc_instructions.txt added. Documentation on how to
1505 use doc/update_manual.py, added yesterday. Both files contributed
1510 use doc/update_manual.py, added yesterday. Both files contributed
1506 by JΓΆrgen Stenarson <jorgen.stenarson-AT-bostream.nu>. This slates
1511 by JΓΆrgen Stenarson <jorgen.stenarson-AT-bostream.nu>. This slates
1507 doc/*.sh for deprecation at a later date.
1512 doc/*.sh for deprecation at a later date.
1508
1513
1509 * /ipython.py Added ipython.py to root directory for
1514 * /ipython.py Added ipython.py to root directory for
1510 zero-installation (tar xzvf ipython.tgz; cd ipython; python
1515 zero-installation (tar xzvf ipython.tgz; cd ipython; python
1511 ipython.py) and development convenience (no need to keep doing
1516 ipython.py) and development convenience (no need to keep doing
1512 "setup.py install" between changes).
1517 "setup.py install" between changes).
1513
1518
1514 * Made ! and !! shell escapes work (again) in multiline expressions:
1519 * Made ! and !! shell escapes work (again) in multiline expressions:
1515 if 1:
1520 if 1:
1516 !ls
1521 !ls
1517 !!ls
1522 !!ls
1518
1523
1519 2006-01-12 Fernando Perez <Fernando.Perez@colorado.edu>
1524 2006-01-12 Fernando Perez <Fernando.Perez@colorado.edu>
1520
1525
1521 * IPython/ipstruct.py (Struct): Rename IPython.Struct to
1526 * IPython/ipstruct.py (Struct): Rename IPython.Struct to
1522 IPython.ipstruct, to avoid local shadowing of the stdlib 'struct'
1527 IPython.ipstruct, to avoid local shadowing of the stdlib 'struct'
1523 module in case-insensitive installation. Was causing crashes
1528 module in case-insensitive installation. Was causing crashes
1524 under win32. Closes http://www.scipy.net/roundup/ipython/issue49.
1529 under win32. Closes http://www.scipy.net/roundup/ipython/issue49.
1525
1530
1526 * IPython/Magic.py (magic_pycat): Fix pycat, patch by Marien Zwart
1531 * IPython/Magic.py (magic_pycat): Fix pycat, patch by Marien Zwart
1527 <marienz-AT-gentoo.org>, closes
1532 <marienz-AT-gentoo.org>, closes
1528 http://www.scipy.net/roundup/ipython/issue51.
1533 http://www.scipy.net/roundup/ipython/issue51.
1529
1534
1530 2006-01-11 Fernando Perez <Fernando.Perez@colorado.edu>
1535 2006-01-11 Fernando Perez <Fernando.Perez@colorado.edu>
1531
1536
1532 * IPython/Shell.py (IPShellGTK.on_timer): Finally fix the
1537 * IPython/Shell.py (IPShellGTK.on_timer): Finally fix the
1533 problem of excessive CPU usage under *nix and keyboard lag under
1538 problem of excessive CPU usage under *nix and keyboard lag under
1534 win32.
1539 win32.
1535
1540
1536 2006-01-10 *** Released version 0.7.0
1541 2006-01-10 *** Released version 0.7.0
1537
1542
1538 2006-01-10 Fernando Perez <Fernando.Perez@colorado.edu>
1543 2006-01-10 Fernando Perez <Fernando.Perez@colorado.edu>
1539
1544
1540 * IPython/Release.py (revision): tag version number to 0.7.0,
1545 * IPython/Release.py (revision): tag version number to 0.7.0,
1541 ready for release.
1546 ready for release.
1542
1547
1543 * IPython/Magic.py (magic_edit): Add print statement to %edit so
1548 * IPython/Magic.py (magic_edit): Add print statement to %edit so
1544 it informs the user of the name of the temp. file used. This can
1549 it informs the user of the name of the temp. file used. This can
1545 help if you decide later to reuse that same file, so you know
1550 help if you decide later to reuse that same file, so you know
1546 where to copy the info from.
1551 where to copy the info from.
1547
1552
1548 2006-01-09 Fernando Perez <Fernando.Perez@colorado.edu>
1553 2006-01-09 Fernando Perez <Fernando.Perez@colorado.edu>
1549
1554
1550 * setup_bdist_egg.py: little script to build an egg. Added
1555 * setup_bdist_egg.py: little script to build an egg. Added
1551 support in the release tools as well.
1556 support in the release tools as well.
1552
1557
1553 2006-01-08 Fernando Perez <Fernando.Perez@colorado.edu>
1558 2006-01-08 Fernando Perez <Fernando.Perez@colorado.edu>
1554
1559
1555 * IPython/Shell.py (IPShellWX.__init__): add support for WXPython
1560 * IPython/Shell.py (IPShellWX.__init__): add support for WXPython
1556 version selection (new -wxversion command line and ipythonrc
1561 version selection (new -wxversion command line and ipythonrc
1557 parameter). Patch contributed by Arnd Baecker
1562 parameter). Patch contributed by Arnd Baecker
1558 <arnd.baecker-AT-web.de>.
1563 <arnd.baecker-AT-web.de>.
1559
1564
1560 * IPython/iplib.py (embed_mainloop): fix tab-completion in
1565 * IPython/iplib.py (embed_mainloop): fix tab-completion in
1561 embedded instances, for variables defined at the interactive
1566 embedded instances, for variables defined at the interactive
1562 prompt of the embedded ipython. Reported by Arnd.
1567 prompt of the embedded ipython. Reported by Arnd.
1563
1568
1564 * IPython/Magic.py (magic_autocall): Fix %autocall magic. Now
1569 * IPython/Magic.py (magic_autocall): Fix %autocall magic. Now
1565 it can be used as a (stateful) toggle, or with a direct parameter.
1570 it can be used as a (stateful) toggle, or with a direct parameter.
1566
1571
1567 * IPython/ultraTB.py (_fixed_getinnerframes): remove debug assert which
1572 * IPython/ultraTB.py (_fixed_getinnerframes): remove debug assert which
1568 could be triggered in certain cases and cause the traceback
1573 could be triggered in certain cases and cause the traceback
1569 printer not to work.
1574 printer not to work.
1570
1575
1571 2006-01-07 Fernando Perez <Fernando.Perez@colorado.edu>
1576 2006-01-07 Fernando Perez <Fernando.Perez@colorado.edu>
1572
1577
1573 * IPython/iplib.py (_should_recompile): Small fix, closes
1578 * IPython/iplib.py (_should_recompile): Small fix, closes
1574 http://www.scipy.net/roundup/ipython/issue48. Patch by Scott.
1579 http://www.scipy.net/roundup/ipython/issue48. Patch by Scott.
1575
1580
1576 2006-01-04 Fernando Perez <Fernando.Perez@colorado.edu>
1581 2006-01-04 Fernando Perez <Fernando.Perez@colorado.edu>
1577
1582
1578 * IPython/Shell.py (IPShellGTK.mainloop): fix bug in the GTK
1583 * IPython/Shell.py (IPShellGTK.mainloop): fix bug in the GTK
1579 backend for matplotlib (100% cpu utiliziation). Thanks to Charlie
1584 backend for matplotlib (100% cpu utiliziation). Thanks to Charlie
1580 Moad for help with tracking it down.
1585 Moad for help with tracking it down.
1581
1586
1582 * IPython/iplib.py (handle_auto): fix autocall handling for
1587 * IPython/iplib.py (handle_auto): fix autocall handling for
1583 objects which support BOTH __getitem__ and __call__ (so that f [x]
1588 objects which support BOTH __getitem__ and __call__ (so that f [x]
1584 is left alone, instead of becoming f([x]) automatically).
1589 is left alone, instead of becoming f([x]) automatically).
1585
1590
1586 * IPython/Magic.py (magic_cd): fix crash when cd -b was used.
1591 * IPython/Magic.py (magic_cd): fix crash when cd -b was used.
1587 Ville's patch.
1592 Ville's patch.
1588
1593
1589 2006-01-03 Fernando Perez <Fernando.Perez@colorado.edu>
1594 2006-01-03 Fernando Perez <Fernando.Perez@colorado.edu>
1590
1595
1591 * IPython/iplib.py (handle_auto): changed autocall semantics to
1596 * IPython/iplib.py (handle_auto): changed autocall semantics to
1592 include 'smart' mode, where the autocall transformation is NOT
1597 include 'smart' mode, where the autocall transformation is NOT
1593 applied if there are no arguments on the line. This allows you to
1598 applied if there are no arguments on the line. This allows you to
1594 just type 'foo' if foo is a callable to see its internal form,
1599 just type 'foo' if foo is a callable to see its internal form,
1595 instead of having it called with no arguments (typically a
1600 instead of having it called with no arguments (typically a
1596 mistake). The old 'full' autocall still exists: for that, you
1601 mistake). The old 'full' autocall still exists: for that, you
1597 need to set the 'autocall' parameter to 2 in your ipythonrc file.
1602 need to set the 'autocall' parameter to 2 in your ipythonrc file.
1598
1603
1599 * IPython/completer.py (Completer.attr_matches): add
1604 * IPython/completer.py (Completer.attr_matches): add
1600 tab-completion support for Enthoughts' traits. After a report by
1605 tab-completion support for Enthoughts' traits. After a report by
1601 Arnd and a patch by Prabhu.
1606 Arnd and a patch by Prabhu.
1602
1607
1603 2006-01-02 Fernando Perez <Fernando.Perez@colorado.edu>
1608 2006-01-02 Fernando Perez <Fernando.Perez@colorado.edu>
1604
1609
1605 * IPython/ultraTB.py (_fixed_getinnerframes): added Alex
1610 * IPython/ultraTB.py (_fixed_getinnerframes): added Alex
1606 Schmolck's patch to fix inspect.getinnerframes().
1611 Schmolck's patch to fix inspect.getinnerframes().
1607
1612
1608 * IPython/iplib.py (InteractiveShell.__init__): significant fixes
1613 * IPython/iplib.py (InteractiveShell.__init__): significant fixes
1609 for embedded instances, regarding handling of namespaces and items
1614 for embedded instances, regarding handling of namespaces and items
1610 added to the __builtin__ one. Multiple embedded instances and
1615 added to the __builtin__ one. Multiple embedded instances and
1611 recursive embeddings should work better now (though I'm not sure
1616 recursive embeddings should work better now (though I'm not sure
1612 I've got all the corner cases fixed, that code is a bit of a brain
1617 I've got all the corner cases fixed, that code is a bit of a brain
1613 twister).
1618 twister).
1614
1619
1615 * IPython/Magic.py (magic_edit): added support to edit in-memory
1620 * IPython/Magic.py (magic_edit): added support to edit in-memory
1616 macros (automatically creates the necessary temp files). %edit
1621 macros (automatically creates the necessary temp files). %edit
1617 also doesn't return the file contents anymore, it's just noise.
1622 also doesn't return the file contents anymore, it's just noise.
1618
1623
1619 * IPython/completer.py (Completer.attr_matches): revert change to
1624 * IPython/completer.py (Completer.attr_matches): revert change to
1620 complete only on attributes listed in __all__. I realized it
1625 complete only on attributes listed in __all__. I realized it
1621 cripples the tab-completion system as a tool for exploring the
1626 cripples the tab-completion system as a tool for exploring the
1622 internals of unknown libraries (it renders any non-__all__
1627 internals of unknown libraries (it renders any non-__all__
1623 attribute off-limits). I got bit by this when trying to see
1628 attribute off-limits). I got bit by this when trying to see
1624 something inside the dis module.
1629 something inside the dis module.
1625
1630
1626 2005-12-31 Fernando Perez <Fernando.Perez@colorado.edu>
1631 2005-12-31 Fernando Perez <Fernando.Perez@colorado.edu>
1627
1632
1628 * IPython/iplib.py (InteractiveShell.__init__): add .meta
1633 * IPython/iplib.py (InteractiveShell.__init__): add .meta
1629 namespace for users and extension writers to hold data in. This
1634 namespace for users and extension writers to hold data in. This
1630 follows the discussion in
1635 follows the discussion in
1631 http://projects.scipy.org/ipython/ipython/wiki/RefactoringIPython.
1636 http://projects.scipy.org/ipython/ipython/wiki/RefactoringIPython.
1632
1637
1633 * IPython/completer.py (IPCompleter.complete): small patch to help
1638 * IPython/completer.py (IPCompleter.complete): small patch to help
1634 tab-completion under Emacs, after a suggestion by John Barnard
1639 tab-completion under Emacs, after a suggestion by John Barnard
1635 <barnarj-AT-ccf.org>.
1640 <barnarj-AT-ccf.org>.
1636
1641
1637 * IPython/Magic.py (Magic.extract_input_slices): added support for
1642 * IPython/Magic.py (Magic.extract_input_slices): added support for
1638 the slice notation in magics to use N-M to represent numbers N...M
1643 the slice notation in magics to use N-M to represent numbers N...M
1639 (closed endpoints). This is used by %macro and %save.
1644 (closed endpoints). This is used by %macro and %save.
1640
1645
1641 * IPython/completer.py (Completer.attr_matches): for modules which
1646 * IPython/completer.py (Completer.attr_matches): for modules which
1642 define __all__, complete only on those. After a patch by Jeffrey
1647 define __all__, complete only on those. After a patch by Jeffrey
1643 Collins <jcollins_boulder-AT-earthlink.net>. Also, clean up and
1648 Collins <jcollins_boulder-AT-earthlink.net>. Also, clean up and
1644 speed up this routine.
1649 speed up this routine.
1645
1650
1646 * IPython/Logger.py (Logger.log): fix a history handling bug. I
1651 * IPython/Logger.py (Logger.log): fix a history handling bug. I
1647 don't know if this is the end of it, but the behavior now is
1652 don't know if this is the end of it, but the behavior now is
1648 certainly much more correct. Note that coupled with macros,
1653 certainly much more correct. Note that coupled with macros,
1649 slightly surprising (at first) behavior may occur: a macro will in
1654 slightly surprising (at first) behavior may occur: a macro will in
1650 general expand to multiple lines of input, so upon exiting, the
1655 general expand to multiple lines of input, so upon exiting, the
1651 in/out counters will both be bumped by the corresponding amount
1656 in/out counters will both be bumped by the corresponding amount
1652 (as if the macro's contents had been typed interactively). Typing
1657 (as if the macro's contents had been typed interactively). Typing
1653 %hist will reveal the intermediate (silently processed) lines.
1658 %hist will reveal the intermediate (silently processed) lines.
1654
1659
1655 * IPython/Magic.py (magic_run): fix a subtle bug which could cause
1660 * IPython/Magic.py (magic_run): fix a subtle bug which could cause
1656 pickle to fail (%run was overwriting __main__ and not restoring
1661 pickle to fail (%run was overwriting __main__ and not restoring
1657 it, but pickle relies on __main__ to operate).
1662 it, but pickle relies on __main__ to operate).
1658
1663
1659 * IPython/iplib.py (InteractiveShell): fix pdb calling: I'm now
1664 * IPython/iplib.py (InteractiveShell): fix pdb calling: I'm now
1660 using properties, but forgot to make the main InteractiveShell
1665 using properties, but forgot to make the main InteractiveShell
1661 class a new-style class. Properties fail silently, and
1666 class a new-style class. Properties fail silently, and
1662 mysteriously, with old-style class (getters work, but
1667 mysteriously, with old-style class (getters work, but
1663 setters don't do anything).
1668 setters don't do anything).
1664
1669
1665 2005-12-30 Fernando Perez <Fernando.Perez@colorado.edu>
1670 2005-12-30 Fernando Perez <Fernando.Perez@colorado.edu>
1666
1671
1667 * IPython/Magic.py (magic_history): fix history reporting bug (I
1672 * IPython/Magic.py (magic_history): fix history reporting bug (I
1668 know some nasties are still there, I just can't seem to find a
1673 know some nasties are still there, I just can't seem to find a
1669 reproducible test case to track them down; the input history is
1674 reproducible test case to track them down; the input history is
1670 falling out of sync...)
1675 falling out of sync...)
1671
1676
1672 * IPython/iplib.py (handle_shell_escape): fix bug where both
1677 * IPython/iplib.py (handle_shell_escape): fix bug where both
1673 aliases and system accesses where broken for indented code (such
1678 aliases and system accesses where broken for indented code (such
1674 as loops).
1679 as loops).
1675
1680
1676 * IPython/genutils.py (shell): fix small but critical bug for
1681 * IPython/genutils.py (shell): fix small but critical bug for
1677 win32 system access.
1682 win32 system access.
1678
1683
1679 2005-12-29 Fernando Perez <Fernando.Perez@colorado.edu>
1684 2005-12-29 Fernando Perez <Fernando.Perez@colorado.edu>
1680
1685
1681 * IPython/iplib.py (showtraceback): remove use of the
1686 * IPython/iplib.py (showtraceback): remove use of the
1682 sys.last_{type/value/traceback} structures, which are non
1687 sys.last_{type/value/traceback} structures, which are non
1683 thread-safe.
1688 thread-safe.
1684 (_prefilter): change control flow to ensure that we NEVER
1689 (_prefilter): change control flow to ensure that we NEVER
1685 introspect objects when autocall is off. This will guarantee that
1690 introspect objects when autocall is off. This will guarantee that
1686 having an input line of the form 'x.y', where access to attribute
1691 having an input line of the form 'x.y', where access to attribute
1687 'y' has side effects, doesn't trigger the side effect TWICE. It
1692 'y' has side effects, doesn't trigger the side effect TWICE. It
1688 is important to note that, with autocall on, these side effects
1693 is important to note that, with autocall on, these side effects
1689 can still happen.
1694 can still happen.
1690 (ipsystem): new builtin, to complete the ip{magic/alias/system}
1695 (ipsystem): new builtin, to complete the ip{magic/alias/system}
1691 trio. IPython offers these three kinds of special calls which are
1696 trio. IPython offers these three kinds of special calls which are
1692 not python code, and it's a good thing to have their call method
1697 not python code, and it's a good thing to have their call method
1693 be accessible as pure python functions (not just special syntax at
1698 be accessible as pure python functions (not just special syntax at
1694 the command line). It gives us a better internal implementation
1699 the command line). It gives us a better internal implementation
1695 structure, as well as exposing these for user scripting more
1700 structure, as well as exposing these for user scripting more
1696 cleanly.
1701 cleanly.
1697
1702
1698 * IPython/macro.py (Macro.__init__): moved macros to a standalone
1703 * IPython/macro.py (Macro.__init__): moved macros to a standalone
1699 file. Now that they'll be more likely to be used with the
1704 file. Now that they'll be more likely to be used with the
1700 persistance system (%store), I want to make sure their module path
1705 persistance system (%store), I want to make sure their module path
1701 doesn't change in the future, so that we don't break things for
1706 doesn't change in the future, so that we don't break things for
1702 users' persisted data.
1707 users' persisted data.
1703
1708
1704 * IPython/iplib.py (autoindent_update): move indentation
1709 * IPython/iplib.py (autoindent_update): move indentation
1705 management into the _text_ processing loop, not the keyboard
1710 management into the _text_ processing loop, not the keyboard
1706 interactive one. This is necessary to correctly process non-typed
1711 interactive one. This is necessary to correctly process non-typed
1707 multiline input (such as macros).
1712 multiline input (such as macros).
1708
1713
1709 * IPython/Magic.py (Magic.format_latex): patch by Stefan van der
1714 * IPython/Magic.py (Magic.format_latex): patch by Stefan van der
1710 Walt <stefan-AT-sun.ac.za> to fix latex formatting of docstrings,
1715 Walt <stefan-AT-sun.ac.za> to fix latex formatting of docstrings,
1711 which was producing problems in the resulting manual.
1716 which was producing problems in the resulting manual.
1712 (magic_whos): improve reporting of instances (show their class,
1717 (magic_whos): improve reporting of instances (show their class,
1713 instead of simply printing 'instance' which isn't terribly
1718 instead of simply printing 'instance' which isn't terribly
1714 informative).
1719 informative).
1715
1720
1716 * IPython/genutils.py (shell): commit Jorgen Stenarson's patch
1721 * IPython/genutils.py (shell): commit Jorgen Stenarson's patch
1717 (minor mods) to support network shares under win32.
1722 (minor mods) to support network shares under win32.
1718
1723
1719 * IPython/winconsole.py (get_console_size): add new winconsole
1724 * IPython/winconsole.py (get_console_size): add new winconsole
1720 module and fixes to page_dumb() to improve its behavior under
1725 module and fixes to page_dumb() to improve its behavior under
1721 win32. Contributed by Alexander Belchenko <bialix-AT-ukr.net>.
1726 win32. Contributed by Alexander Belchenko <bialix-AT-ukr.net>.
1722
1727
1723 * IPython/Magic.py (Macro): simplified Macro class to just
1728 * IPython/Magic.py (Macro): simplified Macro class to just
1724 subclass list. We've had only 2.2 compatibility for a very long
1729 subclass list. We've had only 2.2 compatibility for a very long
1725 time, yet I was still avoiding subclassing the builtin types. No
1730 time, yet I was still avoiding subclassing the builtin types. No
1726 more (I'm also starting to use properties, though I won't shift to
1731 more (I'm also starting to use properties, though I won't shift to
1727 2.3-specific features quite yet).
1732 2.3-specific features quite yet).
1728 (magic_store): added Ville's patch for lightweight variable
1733 (magic_store): added Ville's patch for lightweight variable
1729 persistence, after a request on the user list by Matt Wilkie
1734 persistence, after a request on the user list by Matt Wilkie
1730 <maphew-AT-gmail.com>. The new %store magic's docstring has full
1735 <maphew-AT-gmail.com>. The new %store magic's docstring has full
1731 details.
1736 details.
1732
1737
1733 * IPython/iplib.py (InteractiveShell.post_config_initialization):
1738 * IPython/iplib.py (InteractiveShell.post_config_initialization):
1734 changed the default logfile name from 'ipython.log' to
1739 changed the default logfile name from 'ipython.log' to
1735 'ipython_log.py'. These logs are real python files, and now that
1740 'ipython_log.py'. These logs are real python files, and now that
1736 we have much better multiline support, people are more likely to
1741 we have much better multiline support, people are more likely to
1737 want to use them as such. Might as well name them correctly.
1742 want to use them as such. Might as well name them correctly.
1738
1743
1739 * IPython/Magic.py: substantial cleanup. While we can't stop
1744 * IPython/Magic.py: substantial cleanup. While we can't stop
1740 using magics as mixins, due to the existing customizations 'out
1745 using magics as mixins, due to the existing customizations 'out
1741 there' which rely on the mixin naming conventions, at least I
1746 there' which rely on the mixin naming conventions, at least I
1742 cleaned out all cross-class name usage. So once we are OK with
1747 cleaned out all cross-class name usage. So once we are OK with
1743 breaking compatibility, the two systems can be separated.
1748 breaking compatibility, the two systems can be separated.
1744
1749
1745 * IPython/Logger.py: major cleanup. This one is NOT a mixin
1750 * IPython/Logger.py: major cleanup. This one is NOT a mixin
1746 anymore, and the class is a fair bit less hideous as well. New
1751 anymore, and the class is a fair bit less hideous as well. New
1747 features were also introduced: timestamping of input, and logging
1752 features were also introduced: timestamping of input, and logging
1748 of output results. These are user-visible with the -t and -o
1753 of output results. These are user-visible with the -t and -o
1749 options to %logstart. Closes
1754 options to %logstart. Closes
1750 http://www.scipy.net/roundup/ipython/issue11 and a request by
1755 http://www.scipy.net/roundup/ipython/issue11 and a request by
1751 William Stein (SAGE developer - http://modular.ucsd.edu/sage).
1756 William Stein (SAGE developer - http://modular.ucsd.edu/sage).
1752
1757
1753 2005-12-28 Fernando Perez <Fernando.Perez@colorado.edu>
1758 2005-12-28 Fernando Perez <Fernando.Perez@colorado.edu>
1754
1759
1755 * IPython/iplib.py (handle_shell_escape): add Ville's patch to
1760 * IPython/iplib.py (handle_shell_escape): add Ville's patch to
1756 better handle backslashes in paths. See the thread 'More Windows
1761 better handle backslashes in paths. See the thread 'More Windows
1757 questions part 2 - \/ characters revisited' on the iypthon user
1762 questions part 2 - \/ characters revisited' on the iypthon user
1758 list:
1763 list:
1759 http://scipy.net/pipermail/ipython-user/2005-June/000907.html
1764 http://scipy.net/pipermail/ipython-user/2005-June/000907.html
1760
1765
1761 (InteractiveShell.__init__): fix tab-completion bug in threaded shells.
1766 (InteractiveShell.__init__): fix tab-completion bug in threaded shells.
1762
1767
1763 (InteractiveShell.__init__): change threaded shells to not use the
1768 (InteractiveShell.__init__): change threaded shells to not use the
1764 ipython crash handler. This was causing more problems than not,
1769 ipython crash handler. This was causing more problems than not,
1765 as exceptions in the main thread (GUI code, typically) would
1770 as exceptions in the main thread (GUI code, typically) would
1766 always show up as a 'crash', when they really weren't.
1771 always show up as a 'crash', when they really weren't.
1767
1772
1768 The colors and exception mode commands (%colors/%xmode) have been
1773 The colors and exception mode commands (%colors/%xmode) have been
1769 synchronized to also take this into account, so users can get
1774 synchronized to also take this into account, so users can get
1770 verbose exceptions for their threaded code as well. I also added
1775 verbose exceptions for their threaded code as well. I also added
1771 support for activating pdb inside this exception handler as well,
1776 support for activating pdb inside this exception handler as well,
1772 so now GUI authors can use IPython's enhanced pdb at runtime.
1777 so now GUI authors can use IPython's enhanced pdb at runtime.
1773
1778
1774 * IPython/ipmaker.py (make_IPython): make the autoedit_syntax flag
1779 * IPython/ipmaker.py (make_IPython): make the autoedit_syntax flag
1775 true by default, and add it to the shipped ipythonrc file. Since
1780 true by default, and add it to the shipped ipythonrc file. Since
1776 this asks the user before proceeding, I think it's OK to make it
1781 this asks the user before proceeding, I think it's OK to make it
1777 true by default.
1782 true by default.
1778
1783
1779 * IPython/Magic.py (magic_exit): make new exit/quit magics instead
1784 * IPython/Magic.py (magic_exit): make new exit/quit magics instead
1780 of the previous special-casing of input in the eval loop. I think
1785 of the previous special-casing of input in the eval loop. I think
1781 this is cleaner, as they really are commands and shouldn't have
1786 this is cleaner, as they really are commands and shouldn't have
1782 a special role in the middle of the core code.
1787 a special role in the middle of the core code.
1783
1788
1784 2005-12-27 Fernando Perez <Fernando.Perez@colorado.edu>
1789 2005-12-27 Fernando Perez <Fernando.Perez@colorado.edu>
1785
1790
1786 * IPython/iplib.py (edit_syntax_error): added support for
1791 * IPython/iplib.py (edit_syntax_error): added support for
1787 automatically reopening the editor if the file had a syntax error
1792 automatically reopening the editor if the file had a syntax error
1788 in it. Thanks to scottt who provided the patch at:
1793 in it. Thanks to scottt who provided the patch at:
1789 http://www.scipy.net/roundup/ipython/issue36 (slightly modified
1794 http://www.scipy.net/roundup/ipython/issue36 (slightly modified
1790 version committed).
1795 version committed).
1791
1796
1792 * IPython/iplib.py (handle_normal): add suport for multi-line
1797 * IPython/iplib.py (handle_normal): add suport for multi-line
1793 input with emtpy lines. This fixes
1798 input with emtpy lines. This fixes
1794 http://www.scipy.net/roundup/ipython/issue43 and a similar
1799 http://www.scipy.net/roundup/ipython/issue43 and a similar
1795 discussion on the user list.
1800 discussion on the user list.
1796
1801
1797 WARNING: a behavior change is necessarily introduced to support
1802 WARNING: a behavior change is necessarily introduced to support
1798 blank lines: now a single blank line with whitespace does NOT
1803 blank lines: now a single blank line with whitespace does NOT
1799 break the input loop, which means that when autoindent is on, by
1804 break the input loop, which means that when autoindent is on, by
1800 default hitting return on the next (indented) line does NOT exit.
1805 default hitting return on the next (indented) line does NOT exit.
1801
1806
1802 Instead, to exit a multiline input you can either have:
1807 Instead, to exit a multiline input you can either have:
1803
1808
1804 - TWO whitespace lines (just hit return again), or
1809 - TWO whitespace lines (just hit return again), or
1805 - a single whitespace line of a different length than provided
1810 - a single whitespace line of a different length than provided
1806 by the autoindent (add or remove a space).
1811 by the autoindent (add or remove a space).
1807
1812
1808 * IPython/completer.py (MagicCompleter.__init__): new 'completer'
1813 * IPython/completer.py (MagicCompleter.__init__): new 'completer'
1809 module to better organize all readline-related functionality.
1814 module to better organize all readline-related functionality.
1810 I've deleted FlexCompleter and put all completion clases here.
1815 I've deleted FlexCompleter and put all completion clases here.
1811
1816
1812 * IPython/iplib.py (raw_input): improve indentation management.
1817 * IPython/iplib.py (raw_input): improve indentation management.
1813 It is now possible to paste indented code with autoindent on, and
1818 It is now possible to paste indented code with autoindent on, and
1814 the code is interpreted correctly (though it still looks bad on
1819 the code is interpreted correctly (though it still looks bad on
1815 screen, due to the line-oriented nature of ipython).
1820 screen, due to the line-oriented nature of ipython).
1816 (MagicCompleter.complete): change behavior so that a TAB key on an
1821 (MagicCompleter.complete): change behavior so that a TAB key on an
1817 otherwise empty line actually inserts a tab, instead of completing
1822 otherwise empty line actually inserts a tab, instead of completing
1818 on the entire global namespace. This makes it easier to use the
1823 on the entire global namespace. This makes it easier to use the
1819 TAB key for indentation. After a request by Hans Meine
1824 TAB key for indentation. After a request by Hans Meine
1820 <hans_meine-AT-gmx.net>
1825 <hans_meine-AT-gmx.net>
1821 (_prefilter): add support so that typing plain 'exit' or 'quit'
1826 (_prefilter): add support so that typing plain 'exit' or 'quit'
1822 does a sensible thing. Originally I tried to deviate as little as
1827 does a sensible thing. Originally I tried to deviate as little as
1823 possible from the default python behavior, but even that one may
1828 possible from the default python behavior, but even that one may
1824 change in this direction (thread on python-dev to that effect).
1829 change in this direction (thread on python-dev to that effect).
1825 Regardless, ipython should do the right thing even if CPython's
1830 Regardless, ipython should do the right thing even if CPython's
1826 '>>>' prompt doesn't.
1831 '>>>' prompt doesn't.
1827 (InteractiveShell): removed subclassing code.InteractiveConsole
1832 (InteractiveShell): removed subclassing code.InteractiveConsole
1828 class. By now we'd overridden just about all of its methods: I've
1833 class. By now we'd overridden just about all of its methods: I've
1829 copied the remaining two over, and now ipython is a standalone
1834 copied the remaining two over, and now ipython is a standalone
1830 class. This will provide a clearer picture for the chainsaw
1835 class. This will provide a clearer picture for the chainsaw
1831 branch refactoring.
1836 branch refactoring.
1832
1837
1833 2005-12-26 Fernando Perez <Fernando.Perez@colorado.edu>
1838 2005-12-26 Fernando Perez <Fernando.Perez@colorado.edu>
1834
1839
1835 * IPython/ultraTB.py (VerboseTB.text): harden reporting against
1840 * IPython/ultraTB.py (VerboseTB.text): harden reporting against
1836 failures for objects which break when dir() is called on them.
1841 failures for objects which break when dir() is called on them.
1837
1842
1838 * IPython/FlexCompleter.py (Completer.__init__): Added support for
1843 * IPython/FlexCompleter.py (Completer.__init__): Added support for
1839 distinct local and global namespaces in the completer API. This
1844 distinct local and global namespaces in the completer API. This
1840 change allows us to properly handle completion with distinct
1845 change allows us to properly handle completion with distinct
1841 scopes, including in embedded instances (this had never really
1846 scopes, including in embedded instances (this had never really
1842 worked correctly).
1847 worked correctly).
1843
1848
1844 Note: this introduces a change in the constructor for
1849 Note: this introduces a change in the constructor for
1845 MagicCompleter, as a new global_namespace parameter is now the
1850 MagicCompleter, as a new global_namespace parameter is now the
1846 second argument (the others were bumped one position).
1851 second argument (the others were bumped one position).
1847
1852
1848 2005-12-25 Fernando Perez <Fernando.Perez@colorado.edu>
1853 2005-12-25 Fernando Perez <Fernando.Perez@colorado.edu>
1849
1854
1850 * IPython/iplib.py (embed_mainloop): fix tab-completion in
1855 * IPython/iplib.py (embed_mainloop): fix tab-completion in
1851 embedded instances (which can be done now thanks to Vivian's
1856 embedded instances (which can be done now thanks to Vivian's
1852 frame-handling fixes for pdb).
1857 frame-handling fixes for pdb).
1853 (InteractiveShell.__init__): Fix namespace handling problem in
1858 (InteractiveShell.__init__): Fix namespace handling problem in
1854 embedded instances. We were overwriting __main__ unconditionally,
1859 embedded instances. We were overwriting __main__ unconditionally,
1855 and this should only be done for 'full' (non-embedded) IPython;
1860 and this should only be done for 'full' (non-embedded) IPython;
1856 embedded instances must respect the caller's __main__. Thanks to
1861 embedded instances must respect the caller's __main__. Thanks to
1857 a bug report by Yaroslav Bulatov <yaroslavvb-AT-gmail.com>
1862 a bug report by Yaroslav Bulatov <yaroslavvb-AT-gmail.com>
1858
1863
1859 2005-12-24 Fernando Perez <Fernando.Perez@colorado.edu>
1864 2005-12-24 Fernando Perez <Fernando.Perez@colorado.edu>
1860
1865
1861 * setup.py: added download_url to setup(). This registers the
1866 * setup.py: added download_url to setup(). This registers the
1862 download address at PyPI, which is not only useful to humans
1867 download address at PyPI, which is not only useful to humans
1863 browsing the site, but is also picked up by setuptools (the Eggs
1868 browsing the site, but is also picked up by setuptools (the Eggs
1864 machinery). Thanks to Ville and R. Kern for the info/discussion
1869 machinery). Thanks to Ville and R. Kern for the info/discussion
1865 on this.
1870 on this.
1866
1871
1867 2005-12-23 Fernando Perez <Fernando.Perez@colorado.edu>
1872 2005-12-23 Fernando Perez <Fernando.Perez@colorado.edu>
1868
1873
1869 * IPython/Debugger.py (Pdb.__init__): Major pdb mode enhancements.
1874 * IPython/Debugger.py (Pdb.__init__): Major pdb mode enhancements.
1870 This brings a lot of nice functionality to the pdb mode, which now
1875 This brings a lot of nice functionality to the pdb mode, which now
1871 has tab-completion, syntax highlighting, and better stack handling
1876 has tab-completion, syntax highlighting, and better stack handling
1872 than before. Many thanks to Vivian De Smedt
1877 than before. Many thanks to Vivian De Smedt
1873 <vivian-AT-vdesmedt.com> for the original patches.
1878 <vivian-AT-vdesmedt.com> for the original patches.
1874
1879
1875 2005-12-08 Fernando Perez <Fernando.Perez@colorado.edu>
1880 2005-12-08 Fernando Perez <Fernando.Perez@colorado.edu>
1876
1881
1877 * IPython/Shell.py (IPShellGTK.mainloop): fix mainloop() calling
1882 * IPython/Shell.py (IPShellGTK.mainloop): fix mainloop() calling
1878 sequence to consistently accept the banner argument. The
1883 sequence to consistently accept the banner argument. The
1879 inconsistency was tripping SAGE, thanks to Gary Zablackis
1884 inconsistency was tripping SAGE, thanks to Gary Zablackis
1880 <gzabl-AT-yahoo.com> for the report.
1885 <gzabl-AT-yahoo.com> for the report.
1881
1886
1882 2005-11-15 Fernando Perez <Fernando.Perez@colorado.edu>
1887 2005-11-15 Fernando Perez <Fernando.Perez@colorado.edu>
1883
1888
1884 * IPython/iplib.py (InteractiveShell.post_config_initialization):
1889 * IPython/iplib.py (InteractiveShell.post_config_initialization):
1885 Fix bug where a naked 'alias' call in the ipythonrc file would
1890 Fix bug where a naked 'alias' call in the ipythonrc file would
1886 cause a crash. Bug reported by Jorgen Stenarson.
1891 cause a crash. Bug reported by Jorgen Stenarson.
1887
1892
1888 2005-11-15 Fernando Perez <Fernando.Perez@colorado.edu>
1893 2005-11-15 Fernando Perez <Fernando.Perez@colorado.edu>
1889
1894
1890 * IPython/ipmaker.py (make_IPython): cleanups which should improve
1895 * IPython/ipmaker.py (make_IPython): cleanups which should improve
1891 startup time.
1896 startup time.
1892
1897
1893 * IPython/iplib.py (runcode): my globals 'fix' for embedded
1898 * IPython/iplib.py (runcode): my globals 'fix' for embedded
1894 instances had introduced a bug with globals in normal code. Now
1899 instances had introduced a bug with globals in normal code. Now
1895 it's working in all cases.
1900 it's working in all cases.
1896
1901
1897 * IPython/Magic.py (magic_psearch): Finish wildcard cleanup and
1902 * IPython/Magic.py (magic_psearch): Finish wildcard cleanup and
1898 API changes. A new ipytonrc option, 'wildcards_case_sensitive'
1903 API changes. A new ipytonrc option, 'wildcards_case_sensitive'
1899 has been introduced to set the default case sensitivity of the
1904 has been introduced to set the default case sensitivity of the
1900 searches. Users can still select either mode at runtime on a
1905 searches. Users can still select either mode at runtime on a
1901 per-search basis.
1906 per-search basis.
1902
1907
1903 2005-11-13 Fernando Perez <Fernando.Perez@colorado.edu>
1908 2005-11-13 Fernando Perez <Fernando.Perez@colorado.edu>
1904
1909
1905 * IPython/wildcard.py (NameSpace.__init__): fix resolution of
1910 * IPython/wildcard.py (NameSpace.__init__): fix resolution of
1906 attributes in wildcard searches for subclasses. Modified version
1911 attributes in wildcard searches for subclasses. Modified version
1907 of a patch by Jorgen.
1912 of a patch by Jorgen.
1908
1913
1909 2005-11-12 Fernando Perez <Fernando.Perez@colorado.edu>
1914 2005-11-12 Fernando Perez <Fernando.Perez@colorado.edu>
1910
1915
1911 * IPython/iplib.py (embed_mainloop): Fix handling of globals for
1916 * IPython/iplib.py (embed_mainloop): Fix handling of globals for
1912 embedded instances. I added a user_global_ns attribute to the
1917 embedded instances. I added a user_global_ns attribute to the
1913 InteractiveShell class to handle this.
1918 InteractiveShell class to handle this.
1914
1919
1915 2005-10-31 Fernando Perez <Fernando.Perez@colorado.edu>
1920 2005-10-31 Fernando Perez <Fernando.Perez@colorado.edu>
1916
1921
1917 * IPython/Shell.py (IPShellGTK.mainloop): Change timeout_add to
1922 * IPython/Shell.py (IPShellGTK.mainloop): Change timeout_add to
1918 idle_add, which fixes horrible keyboard lag problems under gtk 2.6
1923 idle_add, which fixes horrible keyboard lag problems under gtk 2.6
1919 (reported under win32, but may happen also in other platforms).
1924 (reported under win32, but may happen also in other platforms).
1920 Bug report and fix courtesy of Sean Moore <smm-AT-logic.bm>
1925 Bug report and fix courtesy of Sean Moore <smm-AT-logic.bm>
1921
1926
1922 2005-10-15 Fernando Perez <Fernando.Perez@colorado.edu>
1927 2005-10-15 Fernando Perez <Fernando.Perez@colorado.edu>
1923
1928
1924 * IPython/Magic.py (magic_psearch): new support for wildcard
1929 * IPython/Magic.py (magic_psearch): new support for wildcard
1925 patterns. Now, typing ?a*b will list all names which begin with a
1930 patterns. Now, typing ?a*b will list all names which begin with a
1926 and end in b, for example. The %psearch magic has full
1931 and end in b, for example. The %psearch magic has full
1927 docstrings. Many thanks to JΓΆrgen Stenarson
1932 docstrings. Many thanks to JΓΆrgen Stenarson
1928 <jorgen.stenarson-AT-bostream.nu>, author of the patches
1933 <jorgen.stenarson-AT-bostream.nu>, author of the patches
1929 implementing this functionality.
1934 implementing this functionality.
1930
1935
1931 2005-09-27 Fernando Perez <Fernando.Perez@colorado.edu>
1936 2005-09-27 Fernando Perez <Fernando.Perez@colorado.edu>
1932
1937
1933 * Manual: fixed long-standing annoyance of double-dashes (as in
1938 * Manual: fixed long-standing annoyance of double-dashes (as in
1934 --prefix=~, for example) being stripped in the HTML version. This
1939 --prefix=~, for example) being stripped in the HTML version. This
1935 is a latex2html bug, but a workaround was provided. Many thanks
1940 is a latex2html bug, but a workaround was provided. Many thanks
1936 to George K. Thiruvathukal <gthiruv-AT-luc.edu> for the detailed
1941 to George K. Thiruvathukal <gthiruv-AT-luc.edu> for the detailed
1937 help, and Michael Tobis <mtobis-AT-gmail.com> for getting the ball
1942 help, and Michael Tobis <mtobis-AT-gmail.com> for getting the ball
1938 rolling. This seemingly small issue had tripped a number of users
1943 rolling. This seemingly small issue had tripped a number of users
1939 when first installing, so I'm glad to see it gone.
1944 when first installing, so I'm glad to see it gone.
1940
1945
1941 2005-09-27 Fernando Perez <Fernando.Perez@colorado.edu>
1946 2005-09-27 Fernando Perez <Fernando.Perez@colorado.edu>
1942
1947
1943 * IPython/Extensions/numeric_formats.py: fix missing import,
1948 * IPython/Extensions/numeric_formats.py: fix missing import,
1944 reported by Stephen Walton.
1949 reported by Stephen Walton.
1945
1950
1946 2005-09-24 Fernando Perez <Fernando.Perez@colorado.edu>
1951 2005-09-24 Fernando Perez <Fernando.Perez@colorado.edu>
1947
1952
1948 * IPython/demo.py: finish demo module, fully documented now.
1953 * IPython/demo.py: finish demo module, fully documented now.
1949
1954
1950 * IPython/genutils.py (file_read): simple little utility to read a
1955 * IPython/genutils.py (file_read): simple little utility to read a
1951 file and ensure it's closed afterwards.
1956 file and ensure it's closed afterwards.
1952
1957
1953 2005-09-23 Fernando Perez <Fernando.Perez@colorado.edu>
1958 2005-09-23 Fernando Perez <Fernando.Perez@colorado.edu>
1954
1959
1955 * IPython/demo.py (Demo.__init__): added support for individually
1960 * IPython/demo.py (Demo.__init__): added support for individually
1956 tagging blocks for automatic execution.
1961 tagging blocks for automatic execution.
1957
1962
1958 * IPython/Magic.py (magic_pycat): new %pycat magic for showing
1963 * IPython/Magic.py (magic_pycat): new %pycat magic for showing
1959 syntax-highlighted python sources, requested by John.
1964 syntax-highlighted python sources, requested by John.
1960
1965
1961 2005-09-22 Fernando Perez <Fernando.Perez@colorado.edu>
1966 2005-09-22 Fernando Perez <Fernando.Perez@colorado.edu>
1962
1967
1963 * IPython/demo.py (Demo.again): fix bug where again() blocks after
1968 * IPython/demo.py (Demo.again): fix bug where again() blocks after
1964 finishing.
1969 finishing.
1965
1970
1966 * IPython/genutils.py (shlex_split): moved from Magic to here,
1971 * IPython/genutils.py (shlex_split): moved from Magic to here,
1967 where all 2.2 compatibility stuff lives. I needed it for demo.py.
1972 where all 2.2 compatibility stuff lives. I needed it for demo.py.
1968
1973
1969 * IPython/demo.py (Demo.__init__): added support for silent
1974 * IPython/demo.py (Demo.__init__): added support for silent
1970 blocks, improved marks as regexps, docstrings written.
1975 blocks, improved marks as regexps, docstrings written.
1971 (Demo.__init__): better docstring, added support for sys.argv.
1976 (Demo.__init__): better docstring, added support for sys.argv.
1972
1977
1973 * IPython/genutils.py (marquee): little utility used by the demo
1978 * IPython/genutils.py (marquee): little utility used by the demo
1974 code, handy in general.
1979 code, handy in general.
1975
1980
1976 * IPython/demo.py (Demo.__init__): new class for interactive
1981 * IPython/demo.py (Demo.__init__): new class for interactive
1977 demos. Not documented yet, I just wrote it in a hurry for
1982 demos. Not documented yet, I just wrote it in a hurry for
1978 scipy'05. Will docstring later.
1983 scipy'05. Will docstring later.
1979
1984
1980 2005-09-20 Fernando Perez <Fernando.Perez@colorado.edu>
1985 2005-09-20 Fernando Perez <Fernando.Perez@colorado.edu>
1981
1986
1982 * IPython/Shell.py (sigint_handler): Drastic simplification which
1987 * IPython/Shell.py (sigint_handler): Drastic simplification which
1983 also seems to make Ctrl-C work correctly across threads! This is
1988 also seems to make Ctrl-C work correctly across threads! This is
1984 so simple, that I can't beleive I'd missed it before. Needs more
1989 so simple, that I can't beleive I'd missed it before. Needs more
1985 testing, though.
1990 testing, though.
1986 (KBINT): Never mind, revert changes. I'm sure I'd tried something
1991 (KBINT): Never mind, revert changes. I'm sure I'd tried something
1987 like this before...
1992 like this before...
1988
1993
1989 * IPython/genutils.py (get_home_dir): add protection against
1994 * IPython/genutils.py (get_home_dir): add protection against
1990 non-dirs in win32 registry.
1995 non-dirs in win32 registry.
1991
1996
1992 * IPython/iplib.py (InteractiveShell.alias_table_validate): fix
1997 * IPython/iplib.py (InteractiveShell.alias_table_validate): fix
1993 bug where dict was mutated while iterating (pysh crash).
1998 bug where dict was mutated while iterating (pysh crash).
1994
1999
1995 2005-09-06 Fernando Perez <Fernando.Perez@colorado.edu>
2000 2005-09-06 Fernando Perez <Fernando.Perez@colorado.edu>
1996
2001
1997 * IPython/iplib.py (handle_auto): Fix inconsistency arising from
2002 * IPython/iplib.py (handle_auto): Fix inconsistency arising from
1998 spurious newlines added by this routine. After a report by
2003 spurious newlines added by this routine. After a report by
1999 F. Mantegazza.
2004 F. Mantegazza.
2000
2005
2001 2005-09-05 Fernando Perez <Fernando.Perez@colorado.edu>
2006 2005-09-05 Fernando Perez <Fernando.Perez@colorado.edu>
2002
2007
2003 * IPython/Shell.py (hijack_gtk): remove pygtk.require("2.0")
2008 * IPython/Shell.py (hijack_gtk): remove pygtk.require("2.0")
2004 calls. These were a leftover from the GTK 1.x days, and can cause
2009 calls. These were a leftover from the GTK 1.x days, and can cause
2005 problems in certain cases (after a report by John Hunter).
2010 problems in certain cases (after a report by John Hunter).
2006
2011
2007 * IPython/iplib.py (InteractiveShell.__init__): Trap exception if
2012 * IPython/iplib.py (InteractiveShell.__init__): Trap exception if
2008 os.getcwd() fails at init time. Thanks to patch from David Remahl
2013 os.getcwd() fails at init time. Thanks to patch from David Remahl
2009 <chmod007-AT-mac.com>.
2014 <chmod007-AT-mac.com>.
2010 (InteractiveShell.__init__): prevent certain special magics from
2015 (InteractiveShell.__init__): prevent certain special magics from
2011 being shadowed by aliases. Closes
2016 being shadowed by aliases. Closes
2012 http://www.scipy.net/roundup/ipython/issue41.
2017 http://www.scipy.net/roundup/ipython/issue41.
2013
2018
2014 2005-08-31 Fernando Perez <Fernando.Perez@colorado.edu>
2019 2005-08-31 Fernando Perez <Fernando.Perez@colorado.edu>
2015
2020
2016 * IPython/iplib.py (InteractiveShell.complete): Added new
2021 * IPython/iplib.py (InteractiveShell.complete): Added new
2017 top-level completion method to expose the completion mechanism
2022 top-level completion method to expose the completion mechanism
2018 beyond readline-based environments.
2023 beyond readline-based environments.
2019
2024
2020 2005-08-19 Fernando Perez <Fernando.Perez@colorado.edu>
2025 2005-08-19 Fernando Perez <Fernando.Perez@colorado.edu>
2021
2026
2022 * tools/ipsvnc (svnversion): fix svnversion capture.
2027 * tools/ipsvnc (svnversion): fix svnversion capture.
2023
2028
2024 * IPython/iplib.py (InteractiveShell.__init__): Add has_readline
2029 * IPython/iplib.py (InteractiveShell.__init__): Add has_readline
2025 attribute to self, which was missing. Before, it was set by a
2030 attribute to self, which was missing. Before, it was set by a
2026 routine which in certain cases wasn't being called, so the
2031 routine which in certain cases wasn't being called, so the
2027 instance could end up missing the attribute. This caused a crash.
2032 instance could end up missing the attribute. This caused a crash.
2028 Closes http://www.scipy.net/roundup/ipython/issue40.
2033 Closes http://www.scipy.net/roundup/ipython/issue40.
2029
2034
2030 2005-08-16 Fernando Perez <fperez@colorado.edu>
2035 2005-08-16 Fernando Perez <fperez@colorado.edu>
2031
2036
2032 * IPython/ultraTB.py (VerboseTB.text): don't crash if object
2037 * IPython/ultraTB.py (VerboseTB.text): don't crash if object
2033 contains non-string attribute. Closes
2038 contains non-string attribute. Closes
2034 http://www.scipy.net/roundup/ipython/issue38.
2039 http://www.scipy.net/roundup/ipython/issue38.
2035
2040
2036 2005-08-14 Fernando Perez <fperez@colorado.edu>
2041 2005-08-14 Fernando Perez <fperez@colorado.edu>
2037
2042
2038 * tools/ipsvnc: Minor improvements, to add changeset info.
2043 * tools/ipsvnc: Minor improvements, to add changeset info.
2039
2044
2040 2005-08-12 Fernando Perez <fperez@colorado.edu>
2045 2005-08-12 Fernando Perez <fperez@colorado.edu>
2041
2046
2042 * IPython/iplib.py (runsource): remove self.code_to_run_src
2047 * IPython/iplib.py (runsource): remove self.code_to_run_src
2043 attribute. I realized this is nothing more than
2048 attribute. I realized this is nothing more than
2044 '\n'.join(self.buffer), and having the same data in two different
2049 '\n'.join(self.buffer), and having the same data in two different
2045 places is just asking for synchronization bugs. This may impact
2050 places is just asking for synchronization bugs. This may impact
2046 people who have custom exception handlers, so I need to warn
2051 people who have custom exception handlers, so I need to warn
2047 ipython-dev about it (F. Mantegazza may use them).
2052 ipython-dev about it (F. Mantegazza may use them).
2048
2053
2049 2005-07-29 Fernando Perez <Fernando.Perez@colorado.edu>
2054 2005-07-29 Fernando Perez <Fernando.Perez@colorado.edu>
2050
2055
2051 * IPython/genutils.py: fix 2.2 compatibility (generators)
2056 * IPython/genutils.py: fix 2.2 compatibility (generators)
2052
2057
2053 2005-07-18 Fernando Perez <fperez@colorado.edu>
2058 2005-07-18 Fernando Perez <fperez@colorado.edu>
2054
2059
2055 * IPython/genutils.py (get_home_dir): fix to help users with
2060 * IPython/genutils.py (get_home_dir): fix to help users with
2056 invalid $HOME under win32.
2061 invalid $HOME under win32.
2057
2062
2058 2005-07-17 Fernando Perez <fperez@colorado.edu>
2063 2005-07-17 Fernando Perez <fperez@colorado.edu>
2059
2064
2060 * IPython/Prompts.py (str_safe): Make unicode-safe. Also remove
2065 * IPython/Prompts.py (str_safe): Make unicode-safe. Also remove
2061 some old hacks and clean up a bit other routines; code should be
2066 some old hacks and clean up a bit other routines; code should be
2062 simpler and a bit faster.
2067 simpler and a bit faster.
2063
2068
2064 * IPython/iplib.py (interact): removed some last-resort attempts
2069 * IPython/iplib.py (interact): removed some last-resort attempts
2065 to survive broken stdout/stderr. That code was only making it
2070 to survive broken stdout/stderr. That code was only making it
2066 harder to abstract out the i/o (necessary for gui integration),
2071 harder to abstract out the i/o (necessary for gui integration),
2067 and the crashes it could prevent were extremely rare in practice
2072 and the crashes it could prevent were extremely rare in practice
2068 (besides being fully user-induced in a pretty violent manner).
2073 (besides being fully user-induced in a pretty violent manner).
2069
2074
2070 * IPython/genutils.py (IOStream.__init__): Simplify the i/o stuff.
2075 * IPython/genutils.py (IOStream.__init__): Simplify the i/o stuff.
2071 Nothing major yet, but the code is simpler to read; this should
2076 Nothing major yet, but the code is simpler to read; this should
2072 make it easier to do more serious modifications in the future.
2077 make it easier to do more serious modifications in the future.
2073
2078
2074 * IPython/Extensions/InterpreterExec.py: Fix auto-quoting in pysh,
2079 * IPython/Extensions/InterpreterExec.py: Fix auto-quoting in pysh,
2075 which broke in .15 (thanks to a report by Ville).
2080 which broke in .15 (thanks to a report by Ville).
2076
2081
2077 * IPython/Itpl.py (Itpl.__init__): add unicode support (it may not
2082 * IPython/Itpl.py (Itpl.__init__): add unicode support (it may not
2078 be quite correct, I know next to nothing about unicode). This
2083 be quite correct, I know next to nothing about unicode). This
2079 will allow unicode strings to be used in prompts, amongst other
2084 will allow unicode strings to be used in prompts, amongst other
2080 cases. It also will prevent ipython from crashing when unicode
2085 cases. It also will prevent ipython from crashing when unicode
2081 shows up unexpectedly in many places. If ascii encoding fails, we
2086 shows up unexpectedly in many places. If ascii encoding fails, we
2082 assume utf_8. Currently the encoding is not a user-visible
2087 assume utf_8. Currently the encoding is not a user-visible
2083 setting, though it could be made so if there is demand for it.
2088 setting, though it could be made so if there is demand for it.
2084
2089
2085 * IPython/ipmaker.py (make_IPython): remove old 2.1-specific hack.
2090 * IPython/ipmaker.py (make_IPython): remove old 2.1-specific hack.
2086
2091
2087 * IPython/Struct.py (Struct.merge): switch keys() to iterator.
2092 * IPython/Struct.py (Struct.merge): switch keys() to iterator.
2088
2093
2089 * IPython/background_jobs.py: moved 2.2 compatibility to genutils.
2094 * IPython/background_jobs.py: moved 2.2 compatibility to genutils.
2090
2095
2091 * IPython/genutils.py: Add 2.2 compatibility here, so all other
2096 * IPython/genutils.py: Add 2.2 compatibility here, so all other
2092 code can work transparently for 2.2/2.3.
2097 code can work transparently for 2.2/2.3.
2093
2098
2094 2005-07-16 Fernando Perez <fperez@colorado.edu>
2099 2005-07-16 Fernando Perez <fperez@colorado.edu>
2095
2100
2096 * IPython/ultraTB.py (ExceptionColors): Make a global variable
2101 * IPython/ultraTB.py (ExceptionColors): Make a global variable
2097 out of the color scheme table used for coloring exception
2102 out of the color scheme table used for coloring exception
2098 tracebacks. This allows user code to add new schemes at runtime.
2103 tracebacks. This allows user code to add new schemes at runtime.
2099 This is a minimally modified version of the patch at
2104 This is a minimally modified version of the patch at
2100 http://www.scipy.net/roundup/ipython/issue35, many thanks to pabw
2105 http://www.scipy.net/roundup/ipython/issue35, many thanks to pabw
2101 for the contribution.
2106 for the contribution.
2102
2107
2103 * IPython/FlexCompleter.py (Completer.attr_matches): Add a
2108 * IPython/FlexCompleter.py (Completer.attr_matches): Add a
2104 slightly modified version of the patch in
2109 slightly modified version of the patch in
2105 http://www.scipy.net/roundup/ipython/issue34, which also allows me
2110 http://www.scipy.net/roundup/ipython/issue34, which also allows me
2106 to remove the previous try/except solution (which was costlier).
2111 to remove the previous try/except solution (which was costlier).
2107 Thanks to Gaetan Lehmann <gaetan.lehmann-AT-jouy.inra.fr> for the fix.
2112 Thanks to Gaetan Lehmann <gaetan.lehmann-AT-jouy.inra.fr> for the fix.
2108
2113
2109 2005-06-08 Fernando Perez <fperez@colorado.edu>
2114 2005-06-08 Fernando Perez <fperez@colorado.edu>
2110
2115
2111 * IPython/iplib.py (write/write_err): Add methods to abstract all
2116 * IPython/iplib.py (write/write_err): Add methods to abstract all
2112 I/O a bit more.
2117 I/O a bit more.
2113
2118
2114 * IPython/Shell.py (IPShellGTK.mainloop): Fix GTK deprecation
2119 * IPython/Shell.py (IPShellGTK.mainloop): Fix GTK deprecation
2115 warning, reported by Aric Hagberg, fix by JD Hunter.
2120 warning, reported by Aric Hagberg, fix by JD Hunter.
2116
2121
2117 2005-06-02 *** Released version 0.6.15
2122 2005-06-02 *** Released version 0.6.15
2118
2123
2119 2005-06-01 Fernando Perez <fperez@colorado.edu>
2124 2005-06-01 Fernando Perez <fperez@colorado.edu>
2120
2125
2121 * IPython/iplib.py (MagicCompleter.file_matches): Fix
2126 * IPython/iplib.py (MagicCompleter.file_matches): Fix
2122 tab-completion of filenames within open-quoted strings. Note that
2127 tab-completion of filenames within open-quoted strings. Note that
2123 this requires that in ~/.ipython/ipythonrc, users change the
2128 this requires that in ~/.ipython/ipythonrc, users change the
2124 readline delimiters configuration to read:
2129 readline delimiters configuration to read:
2125
2130
2126 readline_remove_delims -/~
2131 readline_remove_delims -/~
2127
2132
2128
2133
2129 2005-05-31 *** Released version 0.6.14
2134 2005-05-31 *** Released version 0.6.14
2130
2135
2131 2005-05-29 Fernando Perez <fperez@colorado.edu>
2136 2005-05-29 Fernando Perez <fperez@colorado.edu>
2132
2137
2133 * IPython/ultraTB.py (VerboseTB.text): Fix crash for tracebacks
2138 * IPython/ultraTB.py (VerboseTB.text): Fix crash for tracebacks
2134 with files not on the filesystem. Reported by Eliyahu Sandler
2139 with files not on the filesystem. Reported by Eliyahu Sandler
2135 <eli@gondolin.net>
2140 <eli@gondolin.net>
2136
2141
2137 2005-05-22 Fernando Perez <fperez@colorado.edu>
2142 2005-05-22 Fernando Perez <fperez@colorado.edu>
2138
2143
2139 * IPython/iplib.py: Fix a few crashes in the --upgrade option.
2144 * IPython/iplib.py: Fix a few crashes in the --upgrade option.
2140 After an initial report by LUK ShunTim <shuntim.luk@polyu.edu.hk>.
2145 After an initial report by LUK ShunTim <shuntim.luk@polyu.edu.hk>.
2141
2146
2142 2005-05-19 Fernando Perez <fperez@colorado.edu>
2147 2005-05-19 Fernando Perez <fperez@colorado.edu>
2143
2148
2144 * IPython/iplib.py (safe_execfile): close a file which could be
2149 * IPython/iplib.py (safe_execfile): close a file which could be
2145 left open (causing problems in win32, which locks open files).
2150 left open (causing problems in win32, which locks open files).
2146 Thanks to a bug report by D Brown <dbrown2@yahoo.com>.
2151 Thanks to a bug report by D Brown <dbrown2@yahoo.com>.
2147
2152
2148 2005-05-18 Fernando Perez <fperez@colorado.edu>
2153 2005-05-18 Fernando Perez <fperez@colorado.edu>
2149
2154
2150 * IPython/Shell.py (MatplotlibShellBase.mplot_exec): pass all
2155 * IPython/Shell.py (MatplotlibShellBase.mplot_exec): pass all
2151 keyword arguments correctly to safe_execfile().
2156 keyword arguments correctly to safe_execfile().
2152
2157
2153 2005-05-13 Fernando Perez <fperez@colorado.edu>
2158 2005-05-13 Fernando Perez <fperez@colorado.edu>
2154
2159
2155 * ipython.1: Added info about Qt to manpage, and threads warning
2160 * ipython.1: Added info about Qt to manpage, and threads warning
2156 to usage page (invoked with --help).
2161 to usage page (invoked with --help).
2157
2162
2158 * IPython/iplib.py (MagicCompleter.python_func_kw_matches): Added
2163 * IPython/iplib.py (MagicCompleter.python_func_kw_matches): Added
2159 new matcher (it goes at the end of the priority list) to do
2164 new matcher (it goes at the end of the priority list) to do
2160 tab-completion on named function arguments. Submitted by George
2165 tab-completion on named function arguments. Submitted by George
2161 Sakkis <gsakkis-AT-eden.rutgers.edu>. See the thread at
2166 Sakkis <gsakkis-AT-eden.rutgers.edu>. See the thread at
2162 http://www.scipy.net/pipermail/ipython-dev/2005-April/000436.html
2167 http://www.scipy.net/pipermail/ipython-dev/2005-April/000436.html
2163 for more details.
2168 for more details.
2164
2169
2165 * IPython/Magic.py (magic_run): Added new -e flag to ignore
2170 * IPython/Magic.py (magic_run): Added new -e flag to ignore
2166 SystemExit exceptions in the script being run. Thanks to a report
2171 SystemExit exceptions in the script being run. Thanks to a report
2167 by danny shevitz <danny_shevitz-AT-yahoo.com>, about this
2172 by danny shevitz <danny_shevitz-AT-yahoo.com>, about this
2168 producing very annoying behavior when running unit tests.
2173 producing very annoying behavior when running unit tests.
2169
2174
2170 2005-05-12 Fernando Perez <fperez@colorado.edu>
2175 2005-05-12 Fernando Perez <fperez@colorado.edu>
2171
2176
2172 * IPython/iplib.py (handle_auto): fixed auto-quoting and parens,
2177 * IPython/iplib.py (handle_auto): fixed auto-quoting and parens,
2173 which I'd broken (again) due to a changed regexp. In the process,
2178 which I'd broken (again) due to a changed regexp. In the process,
2174 added ';' as an escape to auto-quote the whole line without
2179 added ';' as an escape to auto-quote the whole line without
2175 splitting its arguments. Thanks to a report by Jerry McRae
2180 splitting its arguments. Thanks to a report by Jerry McRae
2176 <qrs0xyc02-AT-sneakemail.com>.
2181 <qrs0xyc02-AT-sneakemail.com>.
2177
2182
2178 * IPython/ultraTB.py (VerboseTB.text): protect against rare but
2183 * IPython/ultraTB.py (VerboseTB.text): protect against rare but
2179 possible crashes caused by a TokenError. Reported by Ed Schofield
2184 possible crashes caused by a TokenError. Reported by Ed Schofield
2180 <schofield-AT-ftw.at>.
2185 <schofield-AT-ftw.at>.
2181
2186
2182 2005-05-06 Fernando Perez <fperez@colorado.edu>
2187 2005-05-06 Fernando Perez <fperez@colorado.edu>
2183
2188
2184 * IPython/Shell.py (hijack_wx): Fix to work with WX v.2.6.
2189 * IPython/Shell.py (hijack_wx): Fix to work with WX v.2.6.
2185
2190
2186 2005-04-29 Fernando Perez <fperez@colorado.edu>
2191 2005-04-29 Fernando Perez <fperez@colorado.edu>
2187
2192
2188 * IPython/Shell.py (IPShellQt): Thanks to Denis Rivière
2193 * IPython/Shell.py (IPShellQt): Thanks to Denis Rivière
2189 <nudz-AT-free.fr>, Yann Cointepas <yann-AT-sapetnioc.org> and Benjamin
2194 <nudz-AT-free.fr>, Yann Cointepas <yann-AT-sapetnioc.org> and Benjamin
2190 Thyreau <Benji2-AT-decideur.info>, we now have a -qthread option
2195 Thyreau <Benji2-AT-decideur.info>, we now have a -qthread option
2191 which provides support for Qt interactive usage (similar to the
2196 which provides support for Qt interactive usage (similar to the
2192 existing one for WX and GTK). This had been often requested.
2197 existing one for WX and GTK). This had been often requested.
2193
2198
2194 2005-04-14 *** Released version 0.6.13
2199 2005-04-14 *** Released version 0.6.13
2195
2200
2196 2005-04-08 Fernando Perez <fperez@colorado.edu>
2201 2005-04-08 Fernando Perez <fperez@colorado.edu>
2197
2202
2198 * IPython/Magic.py (Magic._ofind): remove docstring evaluation
2203 * IPython/Magic.py (Magic._ofind): remove docstring evaluation
2199 from _ofind, which gets called on almost every input line. Now,
2204 from _ofind, which gets called on almost every input line. Now,
2200 we only try to get docstrings if they are actually going to be
2205 we only try to get docstrings if they are actually going to be
2201 used (the overhead of fetching unnecessary docstrings can be
2206 used (the overhead of fetching unnecessary docstrings can be
2202 noticeable for certain objects, such as Pyro proxies).
2207 noticeable for certain objects, such as Pyro proxies).
2203
2208
2204 * IPython/iplib.py (MagicCompleter.python_matches): Change the API
2209 * IPython/iplib.py (MagicCompleter.python_matches): Change the API
2205 for completers. For some reason I had been passing them the state
2210 for completers. For some reason I had been passing them the state
2206 variable, which completers never actually need, and was in
2211 variable, which completers never actually need, and was in
2207 conflict with the rlcompleter API. Custom completers ONLY need to
2212 conflict with the rlcompleter API. Custom completers ONLY need to
2208 take the text parameter.
2213 take the text parameter.
2209
2214
2210 * IPython/Extensions/InterpreterExec.py: Fix regexp so that magics
2215 * IPython/Extensions/InterpreterExec.py: Fix regexp so that magics
2211 work correctly in pysh. I've also moved all the logic which used
2216 work correctly in pysh. I've also moved all the logic which used
2212 to be in pysh.py here, which will prevent problems with future
2217 to be in pysh.py here, which will prevent problems with future
2213 upgrades. However, this time I must warn users to update their
2218 upgrades. However, this time I must warn users to update their
2214 pysh profile to include the line
2219 pysh profile to include the line
2215
2220
2216 import_all IPython.Extensions.InterpreterExec
2221 import_all IPython.Extensions.InterpreterExec
2217
2222
2218 because otherwise things won't work for them. They MUST also
2223 because otherwise things won't work for them. They MUST also
2219 delete pysh.py and the line
2224 delete pysh.py and the line
2220
2225
2221 execfile pysh.py
2226 execfile pysh.py
2222
2227
2223 from their ipythonrc-pysh.
2228 from their ipythonrc-pysh.
2224
2229
2225 * IPython/FlexCompleter.py (Completer.attr_matches): Make more
2230 * IPython/FlexCompleter.py (Completer.attr_matches): Make more
2226 robust in the face of objects whose dir() returns non-strings
2231 robust in the face of objects whose dir() returns non-strings
2227 (which it shouldn't, but some broken libs like ITK do). Thanks to
2232 (which it shouldn't, but some broken libs like ITK do). Thanks to
2228 a patch by John Hunter (implemented differently, though). Also
2233 a patch by John Hunter (implemented differently, though). Also
2229 minor improvements by using .extend instead of + on lists.
2234 minor improvements by using .extend instead of + on lists.
2230
2235
2231 * pysh.py:
2236 * pysh.py:
2232
2237
2233 2005-04-06 Fernando Perez <fperez@colorado.edu>
2238 2005-04-06 Fernando Perez <fperez@colorado.edu>
2234
2239
2235 * IPython/ipmaker.py (make_IPython): Make multi_line_specials on
2240 * IPython/ipmaker.py (make_IPython): Make multi_line_specials on
2236 by default, so that all users benefit from it. Those who don't
2241 by default, so that all users benefit from it. Those who don't
2237 want it can still turn it off.
2242 want it can still turn it off.
2238
2243
2239 * IPython/UserConfig/ipythonrc: Add multi_line_specials to the
2244 * IPython/UserConfig/ipythonrc: Add multi_line_specials to the
2240 config file, I'd forgotten about this, so users were getting it
2245 config file, I'd forgotten about this, so users were getting it
2241 off by default.
2246 off by default.
2242
2247
2243 * IPython/iplib.py (ipmagic): big overhaul of the magic system for
2248 * IPython/iplib.py (ipmagic): big overhaul of the magic system for
2244 consistency. Now magics can be called in multiline statements,
2249 consistency. Now magics can be called in multiline statements,
2245 and python variables can be expanded in magic calls via $var.
2250 and python variables can be expanded in magic calls via $var.
2246 This makes the magic system behave just like aliases or !system
2251 This makes the magic system behave just like aliases or !system
2247 calls.
2252 calls.
2248
2253
2249 2005-03-28 Fernando Perez <fperez@colorado.edu>
2254 2005-03-28 Fernando Perez <fperez@colorado.edu>
2250
2255
2251 * IPython/iplib.py (handle_auto): cleanup to use %s instead of
2256 * IPython/iplib.py (handle_auto): cleanup to use %s instead of
2252 expensive string additions for building command. Add support for
2257 expensive string additions for building command. Add support for
2253 trailing ';' when autocall is used.
2258 trailing ';' when autocall is used.
2254
2259
2255 2005-03-26 Fernando Perez <fperez@colorado.edu>
2260 2005-03-26 Fernando Perez <fperez@colorado.edu>
2256
2261
2257 * ipython.el: Fix http://www.scipy.net/roundup/ipython/issue31.
2262 * ipython.el: Fix http://www.scipy.net/roundup/ipython/issue31.
2258 Bugfix by A. Schmolck, the ipython.el maintainer. Also make
2263 Bugfix by A. Schmolck, the ipython.el maintainer. Also make
2259 ipython.el robust against prompts with any number of spaces
2264 ipython.el robust against prompts with any number of spaces
2260 (including 0) after the ':' character.
2265 (including 0) after the ':' character.
2261
2266
2262 * IPython/Prompts.py (Prompt2.set_p_str): Fix spurious space in
2267 * IPython/Prompts.py (Prompt2.set_p_str): Fix spurious space in
2263 continuation prompt, which misled users to think the line was
2268 continuation prompt, which misled users to think the line was
2264 already indented. Closes debian Bug#300847, reported to me by
2269 already indented. Closes debian Bug#300847, reported to me by
2265 Norbert Tretkowski <tretkowski-AT-inittab.de>.
2270 Norbert Tretkowski <tretkowski-AT-inittab.de>.
2266
2271
2267 2005-03-23 Fernando Perez <fperez@colorado.edu>
2272 2005-03-23 Fernando Perez <fperez@colorado.edu>
2268
2273
2269 * IPython/Prompts.py (Prompt1.__str__): Make sure that prompts are
2274 * IPython/Prompts.py (Prompt1.__str__): Make sure that prompts are
2270 properly aligned if they have embedded newlines.
2275 properly aligned if they have embedded newlines.
2271
2276
2272 * IPython/iplib.py (runlines): Add a public method to expose
2277 * IPython/iplib.py (runlines): Add a public method to expose
2273 IPython's code execution machinery, so that users can run strings
2278 IPython's code execution machinery, so that users can run strings
2274 as if they had been typed at the prompt interactively.
2279 as if they had been typed at the prompt interactively.
2275 (InteractiveShell.__init__): Added getoutput() to the __IPYTHON__
2280 (InteractiveShell.__init__): Added getoutput() to the __IPYTHON__
2276 methods which can call the system shell, but with python variable
2281 methods which can call the system shell, but with python variable
2277 expansion. The three such methods are: __IPYTHON__.system,
2282 expansion. The three such methods are: __IPYTHON__.system,
2278 .getoutput and .getoutputerror. These need to be documented in a
2283 .getoutput and .getoutputerror. These need to be documented in a
2279 'public API' section (to be written) of the manual.
2284 'public API' section (to be written) of the manual.
2280
2285
2281 2005-03-20 Fernando Perez <fperez@colorado.edu>
2286 2005-03-20 Fernando Perez <fperez@colorado.edu>
2282
2287
2283 * IPython/iplib.py (InteractiveShell.set_custom_exc): new system
2288 * IPython/iplib.py (InteractiveShell.set_custom_exc): new system
2284 for custom exception handling. This is quite powerful, and it
2289 for custom exception handling. This is quite powerful, and it
2285 allows for user-installable exception handlers which can trap
2290 allows for user-installable exception handlers which can trap
2286 custom exceptions at runtime and treat them separately from
2291 custom exceptions at runtime and treat them separately from
2287 IPython's default mechanisms. At the request of FrΓ©dΓ©ric
2292 IPython's default mechanisms. At the request of FrΓ©dΓ©ric
2288 Mantegazza <mantegazza-AT-ill.fr>.
2293 Mantegazza <mantegazza-AT-ill.fr>.
2289 (InteractiveShell.set_custom_completer): public API function to
2294 (InteractiveShell.set_custom_completer): public API function to
2290 add new completers at runtime.
2295 add new completers at runtime.
2291
2296
2292 2005-03-19 Fernando Perez <fperez@colorado.edu>
2297 2005-03-19 Fernando Perez <fperez@colorado.edu>
2293
2298
2294 * IPython/OInspect.py (getdoc): Add a call to obj.getdoc(), to
2299 * IPython/OInspect.py (getdoc): Add a call to obj.getdoc(), to
2295 allow objects which provide their docstrings via non-standard
2300 allow objects which provide their docstrings via non-standard
2296 mechanisms (like Pyro proxies) to still be inspected by ipython's
2301 mechanisms (like Pyro proxies) to still be inspected by ipython's
2297 ? system.
2302 ? system.
2298
2303
2299 * IPython/iplib.py (InteractiveShell.__init__): back off the _o/_e
2304 * IPython/iplib.py (InteractiveShell.__init__): back off the _o/_e
2300 automatic capture system. I tried quite hard to make it work
2305 automatic capture system. I tried quite hard to make it work
2301 reliably, and simply failed. I tried many combinations with the
2306 reliably, and simply failed. I tried many combinations with the
2302 subprocess module, but eventually nothing worked in all needed
2307 subprocess module, but eventually nothing worked in all needed
2303 cases (not blocking stdin for the child, duplicating stdout
2308 cases (not blocking stdin for the child, duplicating stdout
2304 without blocking, etc). The new %sc/%sx still do capture to these
2309 without blocking, etc). The new %sc/%sx still do capture to these
2305 magical list/string objects which make shell use much more
2310 magical list/string objects which make shell use much more
2306 conveninent, so not all is lost.
2311 conveninent, so not all is lost.
2307
2312
2308 XXX - FIX MANUAL for the change above!
2313 XXX - FIX MANUAL for the change above!
2309
2314
2310 (runsource): I copied code.py's runsource() into ipython to modify
2315 (runsource): I copied code.py's runsource() into ipython to modify
2311 it a bit. Now the code object and source to be executed are
2316 it a bit. Now the code object and source to be executed are
2312 stored in ipython. This makes this info accessible to third-party
2317 stored in ipython. This makes this info accessible to third-party
2313 tools, like custom exception handlers. After a request by FrΓ©dΓ©ric
2318 tools, like custom exception handlers. After a request by FrΓ©dΓ©ric
2314 Mantegazza <mantegazza-AT-ill.fr>.
2319 Mantegazza <mantegazza-AT-ill.fr>.
2315
2320
2316 * IPython/UserConfig/ipythonrc: Add up/down arrow keys to
2321 * IPython/UserConfig/ipythonrc: Add up/down arrow keys to
2317 history-search via readline (like C-p/C-n). I'd wanted this for a
2322 history-search via readline (like C-p/C-n). I'd wanted this for a
2318 long time, but only recently found out how to do it. For users
2323 long time, but only recently found out how to do it. For users
2319 who already have their ipythonrc files made and want this, just
2324 who already have their ipythonrc files made and want this, just
2320 add:
2325 add:
2321
2326
2322 readline_parse_and_bind "\e[A": history-search-backward
2327 readline_parse_and_bind "\e[A": history-search-backward
2323 readline_parse_and_bind "\e[B": history-search-forward
2328 readline_parse_and_bind "\e[B": history-search-forward
2324
2329
2325 2005-03-18 Fernando Perez <fperez@colorado.edu>
2330 2005-03-18 Fernando Perez <fperez@colorado.edu>
2326
2331
2327 * IPython/Magic.py (magic_sc): %sc and %sx now use the fancy
2332 * IPython/Magic.py (magic_sc): %sc and %sx now use the fancy
2328 LSString and SList classes which allow transparent conversions
2333 LSString and SList classes which allow transparent conversions
2329 between list mode and whitespace-separated string.
2334 between list mode and whitespace-separated string.
2330 (magic_r): Fix recursion problem in %r.
2335 (magic_r): Fix recursion problem in %r.
2331
2336
2332 * IPython/genutils.py (LSString): New class to be used for
2337 * IPython/genutils.py (LSString): New class to be used for
2333 automatic storage of the results of all alias/system calls in _o
2338 automatic storage of the results of all alias/system calls in _o
2334 and _e (stdout/err). These provide a .l/.list attribute which
2339 and _e (stdout/err). These provide a .l/.list attribute which
2335 does automatic splitting on newlines. This means that for most
2340 does automatic splitting on newlines. This means that for most
2336 uses, you'll never need to do capturing of output with %sc/%sx
2341 uses, you'll never need to do capturing of output with %sc/%sx
2337 anymore, since ipython keeps this always done for you. Note that
2342 anymore, since ipython keeps this always done for you. Note that
2338 only the LAST results are stored, the _o/e variables are
2343 only the LAST results are stored, the _o/e variables are
2339 overwritten on each call. If you need to save their contents
2344 overwritten on each call. If you need to save their contents
2340 further, simply bind them to any other name.
2345 further, simply bind them to any other name.
2341
2346
2342 2005-03-17 Fernando Perez <fperez@colorado.edu>
2347 2005-03-17 Fernando Perez <fperez@colorado.edu>
2343
2348
2344 * IPython/Prompts.py (BasePrompt.cwd_filt): a few more fixes for
2349 * IPython/Prompts.py (BasePrompt.cwd_filt): a few more fixes for
2345 prompt namespace handling.
2350 prompt namespace handling.
2346
2351
2347 2005-03-16 Fernando Perez <fperez@colorado.edu>
2352 2005-03-16 Fernando Perez <fperez@colorado.edu>
2348
2353
2349 * IPython/Prompts.py (CachedOutput.__init__): Fix default and
2354 * IPython/Prompts.py (CachedOutput.__init__): Fix default and
2350 classic prompts to be '>>> ' (final space was missing, and it
2355 classic prompts to be '>>> ' (final space was missing, and it
2351 trips the emacs python mode).
2356 trips the emacs python mode).
2352 (BasePrompt.__str__): Added safe support for dynamic prompt
2357 (BasePrompt.__str__): Added safe support for dynamic prompt
2353 strings. Now you can set your prompt string to be '$x', and the
2358 strings. Now you can set your prompt string to be '$x', and the
2354 value of x will be printed from your interactive namespace. The
2359 value of x will be printed from your interactive namespace. The
2355 interpolation syntax includes the full Itpl support, so
2360 interpolation syntax includes the full Itpl support, so
2356 ${foo()+x+bar()} is a valid prompt string now, and the function
2361 ${foo()+x+bar()} is a valid prompt string now, and the function
2357 calls will be made at runtime.
2362 calls will be made at runtime.
2358
2363
2359 2005-03-15 Fernando Perez <fperez@colorado.edu>
2364 2005-03-15 Fernando Perez <fperez@colorado.edu>
2360
2365
2361 * IPython/Magic.py (magic_history): renamed %hist to %history, to
2366 * IPython/Magic.py (magic_history): renamed %hist to %history, to
2362 avoid name clashes in pylab. %hist still works, it just forwards
2367 avoid name clashes in pylab. %hist still works, it just forwards
2363 the call to %history.
2368 the call to %history.
2364
2369
2365 2005-03-02 *** Released version 0.6.12
2370 2005-03-02 *** Released version 0.6.12
2366
2371
2367 2005-03-02 Fernando Perez <fperez@colorado.edu>
2372 2005-03-02 Fernando Perez <fperez@colorado.edu>
2368
2373
2369 * IPython/iplib.py (handle_magic): log magic calls properly as
2374 * IPython/iplib.py (handle_magic): log magic calls properly as
2370 ipmagic() function calls.
2375 ipmagic() function calls.
2371
2376
2372 * IPython/Magic.py (magic_time): Improved %time to support
2377 * IPython/Magic.py (magic_time): Improved %time to support
2373 statements and provide wall-clock as well as CPU time.
2378 statements and provide wall-clock as well as CPU time.
2374
2379
2375 2005-02-27 Fernando Perez <fperez@colorado.edu>
2380 2005-02-27 Fernando Perez <fperez@colorado.edu>
2376
2381
2377 * IPython/hooks.py: New hooks module, to expose user-modifiable
2382 * IPython/hooks.py: New hooks module, to expose user-modifiable
2378 IPython functionality in a clean manner. For now only the editor
2383 IPython functionality in a clean manner. For now only the editor
2379 hook is actually written, and other thigns which I intend to turn
2384 hook is actually written, and other thigns which I intend to turn
2380 into proper hooks aren't yet there. The display and prefilter
2385 into proper hooks aren't yet there. The display and prefilter
2381 stuff, for example, should be hooks. But at least now the
2386 stuff, for example, should be hooks. But at least now the
2382 framework is in place, and the rest can be moved here with more
2387 framework is in place, and the rest can be moved here with more
2383 time later. IPython had had a .hooks variable for a long time for
2388 time later. IPython had had a .hooks variable for a long time for
2384 this purpose, but I'd never actually used it for anything.
2389 this purpose, but I'd never actually used it for anything.
2385
2390
2386 2005-02-26 Fernando Perez <fperez@colorado.edu>
2391 2005-02-26 Fernando Perez <fperez@colorado.edu>
2387
2392
2388 * IPython/ipmaker.py (make_IPython): make the default ipython
2393 * IPython/ipmaker.py (make_IPython): make the default ipython
2389 directory be called _ipython under win32, to follow more the
2394 directory be called _ipython under win32, to follow more the
2390 naming peculiarities of that platform (where buggy software like
2395 naming peculiarities of that platform (where buggy software like
2391 Visual Sourcesafe breaks with .named directories). Reported by
2396 Visual Sourcesafe breaks with .named directories). Reported by
2392 Ville Vainio.
2397 Ville Vainio.
2393
2398
2394 2005-02-23 Fernando Perez <fperez@colorado.edu>
2399 2005-02-23 Fernando Perez <fperez@colorado.edu>
2395
2400
2396 * IPython/iplib.py (InteractiveShell.__init__): removed a few
2401 * IPython/iplib.py (InteractiveShell.__init__): removed a few
2397 auto_aliases for win32 which were causing problems. Users can
2402 auto_aliases for win32 which were causing problems. Users can
2398 define the ones they personally like.
2403 define the ones they personally like.
2399
2404
2400 2005-02-21 Fernando Perez <fperez@colorado.edu>
2405 2005-02-21 Fernando Perez <fperez@colorado.edu>
2401
2406
2402 * IPython/Magic.py (magic_time): new magic to time execution of
2407 * IPython/Magic.py (magic_time): new magic to time execution of
2403 expressions. After a request by Charles Moad <cmoad-AT-indiana.edu>.
2408 expressions. After a request by Charles Moad <cmoad-AT-indiana.edu>.
2404
2409
2405 2005-02-19 Fernando Perez <fperez@colorado.edu>
2410 2005-02-19 Fernando Perez <fperez@colorado.edu>
2406
2411
2407 * IPython/ConfigLoader.py (ConfigLoader.load): Allow empty strings
2412 * IPython/ConfigLoader.py (ConfigLoader.load): Allow empty strings
2408 into keys (for prompts, for example).
2413 into keys (for prompts, for example).
2409
2414
2410 * IPython/Prompts.py (BasePrompt.set_p_str): Fix to allow empty
2415 * IPython/Prompts.py (BasePrompt.set_p_str): Fix to allow empty
2411 prompts in case users want them. This introduces a small behavior
2416 prompts in case users want them. This introduces a small behavior
2412 change: ipython does not automatically add a space to all prompts
2417 change: ipython does not automatically add a space to all prompts
2413 anymore. To get the old prompts with a space, users should add it
2418 anymore. To get the old prompts with a space, users should add it
2414 manually to their ipythonrc file, so for example prompt_in1 should
2419 manually to their ipythonrc file, so for example prompt_in1 should
2415 now read 'In [\#]: ' instead of 'In [\#]:'.
2420 now read 'In [\#]: ' instead of 'In [\#]:'.
2416 (BasePrompt.__init__): New option prompts_pad_left (only in rc
2421 (BasePrompt.__init__): New option prompts_pad_left (only in rc
2417 file) to control left-padding of secondary prompts.
2422 file) to control left-padding of secondary prompts.
2418
2423
2419 * IPython/Magic.py (Magic.profile_missing_notice): Don't crash if
2424 * IPython/Magic.py (Magic.profile_missing_notice): Don't crash if
2420 the profiler can't be imported. Fix for Debian, which removed
2425 the profiler can't be imported. Fix for Debian, which removed
2421 profile.py because of License issues. I applied a slightly
2426 profile.py because of License issues. I applied a slightly
2422 modified version of the original Debian patch at
2427 modified version of the original Debian patch at
2423 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=294500.
2428 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=294500.
2424
2429
2425 2005-02-17 Fernando Perez <fperez@colorado.edu>
2430 2005-02-17 Fernando Perez <fperez@colorado.edu>
2426
2431
2427 * IPython/genutils.py (native_line_ends): Fix bug which would
2432 * IPython/genutils.py (native_line_ends): Fix bug which would
2428 cause improper line-ends under win32 b/c I was not opening files
2433 cause improper line-ends under win32 b/c I was not opening files
2429 in binary mode. Bug report and fix thanks to Ville.
2434 in binary mode. Bug report and fix thanks to Ville.
2430
2435
2431 * IPython/iplib.py (handle_auto): Fix bug which I introduced when
2436 * IPython/iplib.py (handle_auto): Fix bug which I introduced when
2432 trying to catch spurious foo[1] autocalls. My fix actually broke
2437 trying to catch spurious foo[1] autocalls. My fix actually broke
2433 ',/' autoquote/call with explicit escape (bad regexp).
2438 ',/' autoquote/call with explicit escape (bad regexp).
2434
2439
2435 2005-02-15 *** Released version 0.6.11
2440 2005-02-15 *** Released version 0.6.11
2436
2441
2437 2005-02-14 Fernando Perez <fperez@colorado.edu>
2442 2005-02-14 Fernando Perez <fperez@colorado.edu>
2438
2443
2439 * IPython/background_jobs.py: New background job management
2444 * IPython/background_jobs.py: New background job management
2440 subsystem. This is implemented via a new set of classes, and
2445 subsystem. This is implemented via a new set of classes, and
2441 IPython now provides a builtin 'jobs' object for background job
2446 IPython now provides a builtin 'jobs' object for background job
2442 execution. A convenience %bg magic serves as a lightweight
2447 execution. A convenience %bg magic serves as a lightweight
2443 frontend for starting the more common type of calls. This was
2448 frontend for starting the more common type of calls. This was
2444 inspired by discussions with B. Granger and the BackgroundCommand
2449 inspired by discussions with B. Granger and the BackgroundCommand
2445 class described in the book Python Scripting for Computational
2450 class described in the book Python Scripting for Computational
2446 Science, by H. P. Langtangen: http://folk.uio.no/hpl/scripting
2451 Science, by H. P. Langtangen: http://folk.uio.no/hpl/scripting
2447 (although ultimately no code from this text was used, as IPython's
2452 (although ultimately no code from this text was used, as IPython's
2448 system is a separate implementation).
2453 system is a separate implementation).
2449
2454
2450 * IPython/iplib.py (MagicCompleter.python_matches): add new option
2455 * IPython/iplib.py (MagicCompleter.python_matches): add new option
2451 to control the completion of single/double underscore names
2456 to control the completion of single/double underscore names
2452 separately. As documented in the example ipytonrc file, the
2457 separately. As documented in the example ipytonrc file, the
2453 readline_omit__names variable can now be set to 2, to omit even
2458 readline_omit__names variable can now be set to 2, to omit even
2454 single underscore names. Thanks to a patch by Brian Wong
2459 single underscore names. Thanks to a patch by Brian Wong
2455 <BrianWong-AT-AirgoNetworks.Com>.
2460 <BrianWong-AT-AirgoNetworks.Com>.
2456 (InteractiveShell.__init__): Fix bug which would cause foo[1] to
2461 (InteractiveShell.__init__): Fix bug which would cause foo[1] to
2457 be autocalled as foo([1]) if foo were callable. A problem for
2462 be autocalled as foo([1]) if foo were callable. A problem for
2458 things which are both callable and implement __getitem__.
2463 things which are both callable and implement __getitem__.
2459 (init_readline): Fix autoindentation for win32. Thanks to a patch
2464 (init_readline): Fix autoindentation for win32. Thanks to a patch
2460 by Vivian De Smedt <vivian-AT-vdesmedt.com>.
2465 by Vivian De Smedt <vivian-AT-vdesmedt.com>.
2461
2466
2462 2005-02-12 Fernando Perez <fperez@colorado.edu>
2467 2005-02-12 Fernando Perez <fperez@colorado.edu>
2463
2468
2464 * IPython/ipmaker.py (make_IPython): Disabled the stout traps
2469 * IPython/ipmaker.py (make_IPython): Disabled the stout traps
2465 which I had written long ago to sort out user error messages which
2470 which I had written long ago to sort out user error messages which
2466 may occur during startup. This seemed like a good idea initially,
2471 may occur during startup. This seemed like a good idea initially,
2467 but it has proven a disaster in retrospect. I don't want to
2472 but it has proven a disaster in retrospect. I don't want to
2468 change much code for now, so my fix is to set the internal 'debug'
2473 change much code for now, so my fix is to set the internal 'debug'
2469 flag to true everywhere, whose only job was precisely to control
2474 flag to true everywhere, whose only job was precisely to control
2470 this subsystem. This closes issue 28 (as well as avoiding all
2475 this subsystem. This closes issue 28 (as well as avoiding all
2471 sorts of strange hangups which occur from time to time).
2476 sorts of strange hangups which occur from time to time).
2472
2477
2473 2005-02-07 Fernando Perez <fperez@colorado.edu>
2478 2005-02-07 Fernando Perez <fperez@colorado.edu>
2474
2479
2475 * IPython/Magic.py (magic_edit): Fix 'ed -p' not working when the
2480 * IPython/Magic.py (magic_edit): Fix 'ed -p' not working when the
2476 previous call produced a syntax error.
2481 previous call produced a syntax error.
2477
2482
2478 * IPython/OInspect.py (Inspector.pinfo): Fix crash when inspecting
2483 * IPython/OInspect.py (Inspector.pinfo): Fix crash when inspecting
2479 classes without constructor.
2484 classes without constructor.
2480
2485
2481 2005-02-06 Fernando Perez <fperez@colorado.edu>
2486 2005-02-06 Fernando Perez <fperez@colorado.edu>
2482
2487
2483 * IPython/iplib.py (MagicCompleter.complete): Extend the list of
2488 * IPython/iplib.py (MagicCompleter.complete): Extend the list of
2484 completions with the results of each matcher, so we return results
2489 completions with the results of each matcher, so we return results
2485 to the user from all namespaces. This breaks with ipython
2490 to the user from all namespaces. This breaks with ipython
2486 tradition, but I think it's a nicer behavior. Now you get all
2491 tradition, but I think it's a nicer behavior. Now you get all
2487 possible completions listed, from all possible namespaces (python,
2492 possible completions listed, from all possible namespaces (python,
2488 filesystem, magics...) After a request by John Hunter
2493 filesystem, magics...) After a request by John Hunter
2489 <jdhunter-AT-nitace.bsd.uchicago.edu>.
2494 <jdhunter-AT-nitace.bsd.uchicago.edu>.
2490
2495
2491 2005-02-05 Fernando Perez <fperez@colorado.edu>
2496 2005-02-05 Fernando Perez <fperez@colorado.edu>
2492
2497
2493 * IPython/Magic.py (magic_prun): Fix bug where prun would fail if
2498 * IPython/Magic.py (magic_prun): Fix bug where prun would fail if
2494 the call had quote characters in it (the quotes were stripped).
2499 the call had quote characters in it (the quotes were stripped).
2495
2500
2496 2005-01-31 Fernando Perez <fperez@colorado.edu>
2501 2005-01-31 Fernando Perez <fperez@colorado.edu>
2497
2502
2498 * IPython/iplib.py (InteractiveShell.__init__): reduce reliance on
2503 * IPython/iplib.py (InteractiveShell.__init__): reduce reliance on
2499 Itpl.itpl() to make the code more robust against psyco
2504 Itpl.itpl() to make the code more robust against psyco
2500 optimizations.
2505 optimizations.
2501
2506
2502 * IPython/Itpl.py (Itpl.__str__): Use a _getframe() call instead
2507 * IPython/Itpl.py (Itpl.__str__): Use a _getframe() call instead
2503 of causing an exception. Quicker, cleaner.
2508 of causing an exception. Quicker, cleaner.
2504
2509
2505 2005-01-28 Fernando Perez <fperez@colorado.edu>
2510 2005-01-28 Fernando Perez <fperez@colorado.edu>
2506
2511
2507 * scripts/ipython_win_post_install.py (install): hardcode
2512 * scripts/ipython_win_post_install.py (install): hardcode
2508 sys.prefix+'python.exe' as the executable path. It turns out that
2513 sys.prefix+'python.exe' as the executable path. It turns out that
2509 during the post-installation run, sys.executable resolves to the
2514 during the post-installation run, sys.executable resolves to the
2510 name of the binary installer! I should report this as a distutils
2515 name of the binary installer! I should report this as a distutils
2511 bug, I think. I updated the .10 release with this tiny fix, to
2516 bug, I think. I updated the .10 release with this tiny fix, to
2512 avoid annoying the lists further.
2517 avoid annoying the lists further.
2513
2518
2514 2005-01-27 *** Released version 0.6.10
2519 2005-01-27 *** Released version 0.6.10
2515
2520
2516 2005-01-27 Fernando Perez <fperez@colorado.edu>
2521 2005-01-27 Fernando Perez <fperez@colorado.edu>
2517
2522
2518 * IPython/numutils.py (norm): Added 'inf' as optional name for
2523 * IPython/numutils.py (norm): Added 'inf' as optional name for
2519 L-infinity norm, included references to mathworld.com for vector
2524 L-infinity norm, included references to mathworld.com for vector
2520 norm definitions.
2525 norm definitions.
2521 (amin/amax): added amin/amax for array min/max. Similar to what
2526 (amin/amax): added amin/amax for array min/max. Similar to what
2522 pylab ships with after the recent reorganization of names.
2527 pylab ships with after the recent reorganization of names.
2523 (spike/spike_odd): removed deprecated spike/spike_odd functions.
2528 (spike/spike_odd): removed deprecated spike/spike_odd functions.
2524
2529
2525 * ipython.el: committed Alex's recent fixes and improvements.
2530 * ipython.el: committed Alex's recent fixes and improvements.
2526 Tested with python-mode from CVS, and it looks excellent. Since
2531 Tested with python-mode from CVS, and it looks excellent. Since
2527 python-mode hasn't released anything in a while, I'm temporarily
2532 python-mode hasn't released anything in a while, I'm temporarily
2528 putting a copy of today's CVS (v 4.70) of python-mode in:
2533 putting a copy of today's CVS (v 4.70) of python-mode in:
2529 http://ipython.scipy.org/tmp/python-mode.el
2534 http://ipython.scipy.org/tmp/python-mode.el
2530
2535
2531 * scripts/ipython_win_post_install.py (install): Win32 fix to use
2536 * scripts/ipython_win_post_install.py (install): Win32 fix to use
2532 sys.executable for the executable name, instead of assuming it's
2537 sys.executable for the executable name, instead of assuming it's
2533 called 'python.exe' (the post-installer would have produced broken
2538 called 'python.exe' (the post-installer would have produced broken
2534 setups on systems with a differently named python binary).
2539 setups on systems with a differently named python binary).
2535
2540
2536 * IPython/PyColorize.py (Parser.__call__): change explicit '\n'
2541 * IPython/PyColorize.py (Parser.__call__): change explicit '\n'
2537 references to os.linesep, to make the code more
2542 references to os.linesep, to make the code more
2538 platform-independent. This is also part of the win32 coloring
2543 platform-independent. This is also part of the win32 coloring
2539 fixes.
2544 fixes.
2540
2545
2541 * IPython/genutils.py (page_dumb): Remove attempts to chop long
2546 * IPython/genutils.py (page_dumb): Remove attempts to chop long
2542 lines, which actually cause coloring bugs because the length of
2547 lines, which actually cause coloring bugs because the length of
2543 the line is very difficult to correctly compute with embedded
2548 the line is very difficult to correctly compute with embedded
2544 escapes. This was the source of all the coloring problems under
2549 escapes. This was the source of all the coloring problems under
2545 Win32. I think that _finally_, Win32 users have a properly
2550 Win32. I think that _finally_, Win32 users have a properly
2546 working ipython in all respects. This would never have happened
2551 working ipython in all respects. This would never have happened
2547 if not for Gary Bishop and Viktor Ransmayr's great help and work.
2552 if not for Gary Bishop and Viktor Ransmayr's great help and work.
2548
2553
2549 2005-01-26 *** Released version 0.6.9
2554 2005-01-26 *** Released version 0.6.9
2550
2555
2551 2005-01-25 Fernando Perez <fperez@colorado.edu>
2556 2005-01-25 Fernando Perez <fperez@colorado.edu>
2552
2557
2553 * setup.py: finally, we have a true Windows installer, thanks to
2558 * setup.py: finally, we have a true Windows installer, thanks to
2554 the excellent work of Viktor Ransmayr
2559 the excellent work of Viktor Ransmayr
2555 <viktor.ransmayr-AT-t-online.de>. The docs have been updated for
2560 <viktor.ransmayr-AT-t-online.de>. The docs have been updated for
2556 Windows users. The setup routine is quite a bit cleaner thanks to
2561 Windows users. The setup routine is quite a bit cleaner thanks to
2557 this, and the post-install script uses the proper functions to
2562 this, and the post-install script uses the proper functions to
2558 allow a clean de-installation using the standard Windows Control
2563 allow a clean de-installation using the standard Windows Control
2559 Panel.
2564 Panel.
2560
2565
2561 * IPython/genutils.py (get_home_dir): changed to use the $HOME
2566 * IPython/genutils.py (get_home_dir): changed to use the $HOME
2562 environment variable under all OSes (including win32) if
2567 environment variable under all OSes (including win32) if
2563 available. This will give consistency to win32 users who have set
2568 available. This will give consistency to win32 users who have set
2564 this variable for any reason. If os.environ['HOME'] fails, the
2569 this variable for any reason. If os.environ['HOME'] fails, the
2565 previous policy of using HOMEDRIVE\HOMEPATH kicks in.
2570 previous policy of using HOMEDRIVE\HOMEPATH kicks in.
2566
2571
2567 2005-01-24 Fernando Perez <fperez@colorado.edu>
2572 2005-01-24 Fernando Perez <fperez@colorado.edu>
2568
2573
2569 * IPython/numutils.py (empty_like): add empty_like(), similar to
2574 * IPython/numutils.py (empty_like): add empty_like(), similar to
2570 zeros_like() but taking advantage of the new empty() Numeric routine.
2575 zeros_like() but taking advantage of the new empty() Numeric routine.
2571
2576
2572 2005-01-23 *** Released version 0.6.8
2577 2005-01-23 *** Released version 0.6.8
2573
2578
2574 2005-01-22 Fernando Perez <fperez@colorado.edu>
2579 2005-01-22 Fernando Perez <fperez@colorado.edu>
2575
2580
2576 * IPython/Shell.py (MatplotlibShellBase.mplot_exec): I removed the
2581 * IPython/Shell.py (MatplotlibShellBase.mplot_exec): I removed the
2577 automatic show() calls. After discussing things with JDH, it
2582 automatic show() calls. After discussing things with JDH, it
2578 turns out there are too many corner cases where this can go wrong.
2583 turns out there are too many corner cases where this can go wrong.
2579 It's best not to try to be 'too smart', and simply have ipython
2584 It's best not to try to be 'too smart', and simply have ipython
2580 reproduce as much as possible the default behavior of a normal
2585 reproduce as much as possible the default behavior of a normal
2581 python shell.
2586 python shell.
2582
2587
2583 * IPython/iplib.py (InteractiveShell.__init__): Modified the
2588 * IPython/iplib.py (InteractiveShell.__init__): Modified the
2584 line-splitting regexp and _prefilter() to avoid calling getattr()
2589 line-splitting regexp and _prefilter() to avoid calling getattr()
2585 on assignments. This closes
2590 on assignments. This closes
2586 http://www.scipy.net/roundup/ipython/issue24. Note that Python's
2591 http://www.scipy.net/roundup/ipython/issue24. Note that Python's
2587 readline uses getattr(), so a simple <TAB> keypress is still
2592 readline uses getattr(), so a simple <TAB> keypress is still
2588 enough to trigger getattr() calls on an object.
2593 enough to trigger getattr() calls on an object.
2589
2594
2590 2005-01-21 Fernando Perez <fperez@colorado.edu>
2595 2005-01-21 Fernando Perez <fperez@colorado.edu>
2591
2596
2592 * IPython/Shell.py (MatplotlibShellBase.magic_run): Fix the %run
2597 * IPython/Shell.py (MatplotlibShellBase.magic_run): Fix the %run
2593 docstring under pylab so it doesn't mask the original.
2598 docstring under pylab so it doesn't mask the original.
2594
2599
2595 2005-01-21 *** Released version 0.6.7
2600 2005-01-21 *** Released version 0.6.7
2596
2601
2597 2005-01-21 Fernando Perez <fperez@colorado.edu>
2602 2005-01-21 Fernando Perez <fperez@colorado.edu>
2598
2603
2599 * IPython/Shell.py (MTInteractiveShell.runcode): Trap a crash with
2604 * IPython/Shell.py (MTInteractiveShell.runcode): Trap a crash with
2600 signal handling for win32 users in multithreaded mode.
2605 signal handling for win32 users in multithreaded mode.
2601
2606
2602 2005-01-17 Fernando Perez <fperez@colorado.edu>
2607 2005-01-17 Fernando Perez <fperez@colorado.edu>
2603
2608
2604 * IPython/OInspect.py (Inspector.pinfo): Fix crash when inspecting
2609 * IPython/OInspect.py (Inspector.pinfo): Fix crash when inspecting
2605 instances with no __init__. After a crash report by Norbert Nemec
2610 instances with no __init__. After a crash report by Norbert Nemec
2606 <Norbert-AT-nemec-online.de>.
2611 <Norbert-AT-nemec-online.de>.
2607
2612
2608 2005-01-14 Fernando Perez <fperez@colorado.edu>
2613 2005-01-14 Fernando Perez <fperez@colorado.edu>
2609
2614
2610 * IPython/ultraTB.py (VerboseTB.text): Fix bug in reporting of
2615 * IPython/ultraTB.py (VerboseTB.text): Fix bug in reporting of
2611 names for verbose exceptions, when multiple dotted names and the
2616 names for verbose exceptions, when multiple dotted names and the
2612 'parent' object were present on the same line.
2617 'parent' object were present on the same line.
2613
2618
2614 2005-01-11 Fernando Perez <fperez@colorado.edu>
2619 2005-01-11 Fernando Perez <fperez@colorado.edu>
2615
2620
2616 * IPython/genutils.py (flag_calls): new utility to trap and flag
2621 * IPython/genutils.py (flag_calls): new utility to trap and flag
2617 calls in functions. I need it to clean up matplotlib support.
2622 calls in functions. I need it to clean up matplotlib support.
2618 Also removed some deprecated code in genutils.
2623 Also removed some deprecated code in genutils.
2619
2624
2620 * IPython/Shell.py (MatplotlibShellBase.mplot_exec): small fix so
2625 * IPython/Shell.py (MatplotlibShellBase.mplot_exec): small fix so
2621 that matplotlib scripts called with %run, which don't call show()
2626 that matplotlib scripts called with %run, which don't call show()
2622 themselves, still have their plotting windows open.
2627 themselves, still have their plotting windows open.
2623
2628
2624 2005-01-05 Fernando Perez <fperez@colorado.edu>
2629 2005-01-05 Fernando Perez <fperez@colorado.edu>
2625
2630
2626 * IPython/Shell.py (IPShellGTK.__init__): Patch by Andrew Straw
2631 * IPython/Shell.py (IPShellGTK.__init__): Patch by Andrew Straw
2627 <astraw-AT-caltech.edu>, to fix gtk deprecation warnings.
2632 <astraw-AT-caltech.edu>, to fix gtk deprecation warnings.
2628
2633
2629 2004-12-19 Fernando Perez <fperez@colorado.edu>
2634 2004-12-19 Fernando Perez <fperez@colorado.edu>
2630
2635
2631 * IPython/Shell.py (MTInteractiveShell.runcode): Get rid of
2636 * IPython/Shell.py (MTInteractiveShell.runcode): Get rid of
2632 parent_runcode, which was an eyesore. The same result can be
2637 parent_runcode, which was an eyesore. The same result can be
2633 obtained with Python's regular superclass mechanisms.
2638 obtained with Python's regular superclass mechanisms.
2634
2639
2635 2004-12-17 Fernando Perez <fperez@colorado.edu>
2640 2004-12-17 Fernando Perez <fperez@colorado.edu>
2636
2641
2637 * IPython/Magic.py (Magic.magic_sc): Fix quote stripping problem
2642 * IPython/Magic.py (Magic.magic_sc): Fix quote stripping problem
2638 reported by Prabhu.
2643 reported by Prabhu.
2639 (Magic.magic_sx): direct all errors to Term.cerr (defaults to
2644 (Magic.magic_sx): direct all errors to Term.cerr (defaults to
2640 sys.stderr) instead of explicitly calling sys.stderr. This helps
2645 sys.stderr) instead of explicitly calling sys.stderr. This helps
2641 maintain our I/O abstractions clean, for future GUI embeddings.
2646 maintain our I/O abstractions clean, for future GUI embeddings.
2642
2647
2643 * IPython/genutils.py (info): added new utility for sys.stderr
2648 * IPython/genutils.py (info): added new utility for sys.stderr
2644 unified info message handling (thin wrapper around warn()).
2649 unified info message handling (thin wrapper around warn()).
2645
2650
2646 * IPython/ultraTB.py (VerboseTB.text): Fix misreported global
2651 * IPython/ultraTB.py (VerboseTB.text): Fix misreported global
2647 composite (dotted) names on verbose exceptions.
2652 composite (dotted) names on verbose exceptions.
2648 (VerboseTB.nullrepr): harden against another kind of errors which
2653 (VerboseTB.nullrepr): harden against another kind of errors which
2649 Python's inspect module can trigger, and which were crashing
2654 Python's inspect module can trigger, and which were crashing
2650 IPython. Thanks to a report by Marco Lombardi
2655 IPython. Thanks to a report by Marco Lombardi
2651 <mlombard-AT-ma010192.hq.eso.org>.
2656 <mlombard-AT-ma010192.hq.eso.org>.
2652
2657
2653 2004-12-13 *** Released version 0.6.6
2658 2004-12-13 *** Released version 0.6.6
2654
2659
2655 2004-12-12 Fernando Perez <fperez@colorado.edu>
2660 2004-12-12 Fernando Perez <fperez@colorado.edu>
2656
2661
2657 * IPython/Shell.py (IPShellGTK.mainloop): catch RuntimeErrors
2662 * IPython/Shell.py (IPShellGTK.mainloop): catch RuntimeErrors
2658 generated by pygtk upon initialization if it was built without
2663 generated by pygtk upon initialization if it was built without
2659 threads (for matplotlib users). After a crash reported by
2664 threads (for matplotlib users). After a crash reported by
2660 Leguijt, Jaap J SIEP-EPT-RES <Jaap.Leguijt-AT-shell.com>.
2665 Leguijt, Jaap J SIEP-EPT-RES <Jaap.Leguijt-AT-shell.com>.
2661
2666
2662 * IPython/ipmaker.py (make_IPython): fix small bug in the
2667 * IPython/ipmaker.py (make_IPython): fix small bug in the
2663 import_some parameter for multiple imports.
2668 import_some parameter for multiple imports.
2664
2669
2665 * IPython/iplib.py (ipmagic): simplified the interface of
2670 * IPython/iplib.py (ipmagic): simplified the interface of
2666 ipmagic() to take a single string argument, just as it would be
2671 ipmagic() to take a single string argument, just as it would be
2667 typed at the IPython cmd line.
2672 typed at the IPython cmd line.
2668 (ipalias): Added new ipalias() with an interface identical to
2673 (ipalias): Added new ipalias() with an interface identical to
2669 ipmagic(). This completes exposing a pure python interface to the
2674 ipmagic(). This completes exposing a pure python interface to the
2670 alias and magic system, which can be used in loops or more complex
2675 alias and magic system, which can be used in loops or more complex
2671 code where IPython's automatic line mangling is not active.
2676 code where IPython's automatic line mangling is not active.
2672
2677
2673 * IPython/genutils.py (timing): changed interface of timing to
2678 * IPython/genutils.py (timing): changed interface of timing to
2674 simply run code once, which is the most common case. timings()
2679 simply run code once, which is the most common case. timings()
2675 remains unchanged, for the cases where you want multiple runs.
2680 remains unchanged, for the cases where you want multiple runs.
2676
2681
2677 * IPython/Shell.py (MatplotlibShellBase._matplotlib_config): Fix a
2682 * IPython/Shell.py (MatplotlibShellBase._matplotlib_config): Fix a
2678 bug where Python2.2 crashes with exec'ing code which does not end
2683 bug where Python2.2 crashes with exec'ing code which does not end
2679 in a single newline. Python 2.3 is OK, so I hadn't noticed this
2684 in a single newline. Python 2.3 is OK, so I hadn't noticed this
2680 before.
2685 before.
2681
2686
2682 2004-12-10 Fernando Perez <fperez@colorado.edu>
2687 2004-12-10 Fernando Perez <fperez@colorado.edu>
2683
2688
2684 * IPython/Magic.py (Magic.magic_prun): changed name of option from
2689 * IPython/Magic.py (Magic.magic_prun): changed name of option from
2685 -t to -T, to accomodate the new -t flag in %run (the %run and
2690 -t to -T, to accomodate the new -t flag in %run (the %run and
2686 %prun options are kind of intermixed, and it's not easy to change
2691 %prun options are kind of intermixed, and it's not easy to change
2687 this with the limitations of python's getopt).
2692 this with the limitations of python's getopt).
2688
2693
2689 * IPython/Magic.py (Magic.magic_run): Added new -t option to time
2694 * IPython/Magic.py (Magic.magic_run): Added new -t option to time
2690 the execution of scripts. It's not as fine-tuned as timeit.py,
2695 the execution of scripts. It's not as fine-tuned as timeit.py,
2691 but it works from inside ipython (and under 2.2, which lacks
2696 but it works from inside ipython (and under 2.2, which lacks
2692 timeit.py). Optionally a number of runs > 1 can be given for
2697 timeit.py). Optionally a number of runs > 1 can be given for
2693 timing very short-running code.
2698 timing very short-running code.
2694
2699
2695 * IPython/genutils.py (uniq_stable): new routine which returns a
2700 * IPython/genutils.py (uniq_stable): new routine which returns a
2696 list of unique elements in any iterable, but in stable order of
2701 list of unique elements in any iterable, but in stable order of
2697 appearance. I needed this for the ultraTB fixes, and it's a handy
2702 appearance. I needed this for the ultraTB fixes, and it's a handy
2698 utility.
2703 utility.
2699
2704
2700 * IPython/ultraTB.py (VerboseTB.text): Fix proper reporting of
2705 * IPython/ultraTB.py (VerboseTB.text): Fix proper reporting of
2701 dotted names in Verbose exceptions. This had been broken since
2706 dotted names in Verbose exceptions. This had been broken since
2702 the very start, now x.y will properly be printed in a Verbose
2707 the very start, now x.y will properly be printed in a Verbose
2703 traceback, instead of x being shown and y appearing always as an
2708 traceback, instead of x being shown and y appearing always as an
2704 'undefined global'. Getting this to work was a bit tricky,
2709 'undefined global'. Getting this to work was a bit tricky,
2705 because by default python tokenizers are stateless. Saved by
2710 because by default python tokenizers are stateless. Saved by
2706 python's ability to easily add a bit of state to an arbitrary
2711 python's ability to easily add a bit of state to an arbitrary
2707 function (without needing to build a full-blown callable object).
2712 function (without needing to build a full-blown callable object).
2708
2713
2709 Also big cleanup of this code, which had horrendous runtime
2714 Also big cleanup of this code, which had horrendous runtime
2710 lookups of zillions of attributes for colorization. Moved all
2715 lookups of zillions of attributes for colorization. Moved all
2711 this code into a few templates, which make it cleaner and quicker.
2716 this code into a few templates, which make it cleaner and quicker.
2712
2717
2713 Printout quality was also improved for Verbose exceptions: one
2718 Printout quality was also improved for Verbose exceptions: one
2714 variable per line, and memory addresses are printed (this can be
2719 variable per line, and memory addresses are printed (this can be
2715 quite handy in nasty debugging situations, which is what Verbose
2720 quite handy in nasty debugging situations, which is what Verbose
2716 is for).
2721 is for).
2717
2722
2718 * IPython/ipmaker.py (make_IPython): Do NOT execute files named in
2723 * IPython/ipmaker.py (make_IPython): Do NOT execute files named in
2719 the command line as scripts to be loaded by embedded instances.
2724 the command line as scripts to be loaded by embedded instances.
2720 Doing so has the potential for an infinite recursion if there are
2725 Doing so has the potential for an infinite recursion if there are
2721 exceptions thrown in the process. This fixes a strange crash
2726 exceptions thrown in the process. This fixes a strange crash
2722 reported by Philippe MULLER <muller-AT-irit.fr>.
2727 reported by Philippe MULLER <muller-AT-irit.fr>.
2723
2728
2724 2004-12-09 Fernando Perez <fperez@colorado.edu>
2729 2004-12-09 Fernando Perez <fperez@colorado.edu>
2725
2730
2726 * IPython/Shell.py (MatplotlibShellBase.use): Change pylab support
2731 * IPython/Shell.py (MatplotlibShellBase.use): Change pylab support
2727 to reflect new names in matplotlib, which now expose the
2732 to reflect new names in matplotlib, which now expose the
2728 matlab-compatible interface via a pylab module instead of the
2733 matlab-compatible interface via a pylab module instead of the
2729 'matlab' name. The new code is backwards compatible, so users of
2734 'matlab' name. The new code is backwards compatible, so users of
2730 all matplotlib versions are OK. Patch by J. Hunter.
2735 all matplotlib versions are OK. Patch by J. Hunter.
2731
2736
2732 * IPython/OInspect.py (Inspector.pinfo): Add to object? printing
2737 * IPython/OInspect.py (Inspector.pinfo): Add to object? printing
2733 of __init__ docstrings for instances (class docstrings are already
2738 of __init__ docstrings for instances (class docstrings are already
2734 automatically printed). Instances with customized docstrings
2739 automatically printed). Instances with customized docstrings
2735 (indep. of the class) are also recognized and all 3 separate
2740 (indep. of the class) are also recognized and all 3 separate
2736 docstrings are printed (instance, class, constructor). After some
2741 docstrings are printed (instance, class, constructor). After some
2737 comments/suggestions by J. Hunter.
2742 comments/suggestions by J. Hunter.
2738
2743
2739 2004-12-05 Fernando Perez <fperez@colorado.edu>
2744 2004-12-05 Fernando Perez <fperez@colorado.edu>
2740
2745
2741 * IPython/iplib.py (MagicCompleter.complete): Remove annoying
2746 * IPython/iplib.py (MagicCompleter.complete): Remove annoying
2742 warnings when tab-completion fails and triggers an exception.
2747 warnings when tab-completion fails and triggers an exception.
2743
2748
2744 2004-12-03 Fernando Perez <fperez@colorado.edu>
2749 2004-12-03 Fernando Perez <fperez@colorado.edu>
2745
2750
2746 * IPython/Magic.py (magic_prun): Fix bug where an exception would
2751 * IPython/Magic.py (magic_prun): Fix bug where an exception would
2747 be triggered when using 'run -p'. An incorrect option flag was
2752 be triggered when using 'run -p'. An incorrect option flag was
2748 being set ('d' instead of 'D').
2753 being set ('d' instead of 'D').
2749 (manpage): fix missing escaped \- sign.
2754 (manpage): fix missing escaped \- sign.
2750
2755
2751 2004-11-30 *** Released version 0.6.5
2756 2004-11-30 *** Released version 0.6.5
2752
2757
2753 2004-11-30 Fernando Perez <fperez@colorado.edu>
2758 2004-11-30 Fernando Perez <fperez@colorado.edu>
2754
2759
2755 * IPython/Magic.py (Magic.magic_run): Fix bug in breakpoint
2760 * IPython/Magic.py (Magic.magic_run): Fix bug in breakpoint
2756 setting with -d option.
2761 setting with -d option.
2757
2762
2758 * setup.py (docfiles): Fix problem where the doc glob I was using
2763 * setup.py (docfiles): Fix problem where the doc glob I was using
2759 was COMPLETELY BROKEN. It was giving the right files by pure
2764 was COMPLETELY BROKEN. It was giving the right files by pure
2760 accident, but failed once I tried to include ipython.el. Note:
2765 accident, but failed once I tried to include ipython.el. Note:
2761 glob() does NOT allow you to do exclusion on multiple endings!
2766 glob() does NOT allow you to do exclusion on multiple endings!
2762
2767
2763 2004-11-29 Fernando Perez <fperez@colorado.edu>
2768 2004-11-29 Fernando Perez <fperez@colorado.edu>
2764
2769
2765 * IPython/usage.py (__doc__): cleaned up usage docstring, by using
2770 * IPython/usage.py (__doc__): cleaned up usage docstring, by using
2766 the manpage as the source. Better formatting & consistency.
2771 the manpage as the source. Better formatting & consistency.
2767
2772
2768 * IPython/Magic.py (magic_run): Added new -d option, to run
2773 * IPython/Magic.py (magic_run): Added new -d option, to run
2769 scripts under the control of the python pdb debugger. Note that
2774 scripts under the control of the python pdb debugger. Note that
2770 this required changing the %prun option -d to -D, to avoid a clash
2775 this required changing the %prun option -d to -D, to avoid a clash
2771 (since %run must pass options to %prun, and getopt is too dumb to
2776 (since %run must pass options to %prun, and getopt is too dumb to
2772 handle options with string values with embedded spaces). Thanks
2777 handle options with string values with embedded spaces). Thanks
2773 to a suggestion by Matthew Arnison <maffew-AT-cat.org.au>.
2778 to a suggestion by Matthew Arnison <maffew-AT-cat.org.au>.
2774 (magic_who_ls): added type matching to %who and %whos, so that one
2779 (magic_who_ls): added type matching to %who and %whos, so that one
2775 can filter their output to only include variables of certain
2780 can filter their output to only include variables of certain
2776 types. Another suggestion by Matthew.
2781 types. Another suggestion by Matthew.
2777 (magic_whos): Added memory summaries in kb and Mb for arrays.
2782 (magic_whos): Added memory summaries in kb and Mb for arrays.
2778 (magic_who): Improve formatting (break lines every 9 vars).
2783 (magic_who): Improve formatting (break lines every 9 vars).
2779
2784
2780 2004-11-28 Fernando Perez <fperez@colorado.edu>
2785 2004-11-28 Fernando Perez <fperez@colorado.edu>
2781
2786
2782 * IPython/Logger.py (Logger.log): Fix bug in syncing the input
2787 * IPython/Logger.py (Logger.log): Fix bug in syncing the input
2783 cache when empty lines were present.
2788 cache when empty lines were present.
2784
2789
2785 2004-11-24 Fernando Perez <fperez@colorado.edu>
2790 2004-11-24 Fernando Perez <fperez@colorado.edu>
2786
2791
2787 * IPython/usage.py (__doc__): document the re-activated threading
2792 * IPython/usage.py (__doc__): document the re-activated threading
2788 options for WX and GTK.
2793 options for WX and GTK.
2789
2794
2790 2004-11-23 Fernando Perez <fperez@colorado.edu>
2795 2004-11-23 Fernando Perez <fperez@colorado.edu>
2791
2796
2792 * IPython/Shell.py (start): Added Prabhu's big patch to reactivate
2797 * IPython/Shell.py (start): Added Prabhu's big patch to reactivate
2793 the -wthread and -gthread options, along with a new -tk one to try
2798 the -wthread and -gthread options, along with a new -tk one to try
2794 and coordinate Tk threading with wx/gtk. The tk support is very
2799 and coordinate Tk threading with wx/gtk. The tk support is very
2795 platform dependent, since it seems to require Tcl and Tk to be
2800 platform dependent, since it seems to require Tcl and Tk to be
2796 built with threads (Fedora1/2 appears NOT to have it, but in
2801 built with threads (Fedora1/2 appears NOT to have it, but in
2797 Prabhu's Debian boxes it works OK). But even with some Tk
2802 Prabhu's Debian boxes it works OK). But even with some Tk
2798 limitations, this is a great improvement.
2803 limitations, this is a great improvement.
2799
2804
2800 * IPython/Prompts.py (prompt_specials_color): Added \t for time
2805 * IPython/Prompts.py (prompt_specials_color): Added \t for time
2801 info in user prompts. Patch by Prabhu.
2806 info in user prompts. Patch by Prabhu.
2802
2807
2803 2004-11-18 Fernando Perez <fperez@colorado.edu>
2808 2004-11-18 Fernando Perez <fperez@colorado.edu>
2804
2809
2805 * IPython/genutils.py (ask_yes_no): Add check for a max of 20
2810 * IPython/genutils.py (ask_yes_no): Add check for a max of 20
2806 EOFErrors and bail, to avoid infinite loops if a non-terminating
2811 EOFErrors and bail, to avoid infinite loops if a non-terminating
2807 file is fed into ipython. Patch submitted in issue 19 by user,
2812 file is fed into ipython. Patch submitted in issue 19 by user,
2808 many thanks.
2813 many thanks.
2809
2814
2810 * IPython/iplib.py (InteractiveShell.handle_auto): do NOT trigger
2815 * IPython/iplib.py (InteractiveShell.handle_auto): do NOT trigger
2811 autoquote/parens in continuation prompts, which can cause lots of
2816 autoquote/parens in continuation prompts, which can cause lots of
2812 problems. Closes roundup issue 20.
2817 problems. Closes roundup issue 20.
2813
2818
2814 2004-11-17 Fernando Perez <fperez@colorado.edu>
2819 2004-11-17 Fernando Perez <fperez@colorado.edu>
2815
2820
2816 * debian/control (Build-Depends-Indep): Fix dpatch dependency,
2821 * debian/control (Build-Depends-Indep): Fix dpatch dependency,
2817 reported as debian bug #280505. I'm not sure my local changelog
2822 reported as debian bug #280505. I'm not sure my local changelog
2818 entry has the proper debian format (Jack?).
2823 entry has the proper debian format (Jack?).
2819
2824
2820 2004-11-08 *** Released version 0.6.4
2825 2004-11-08 *** Released version 0.6.4
2821
2826
2822 2004-11-08 Fernando Perez <fperez@colorado.edu>
2827 2004-11-08 Fernando Perez <fperez@colorado.edu>
2823
2828
2824 * IPython/iplib.py (init_readline): Fix exit message for Windows
2829 * IPython/iplib.py (init_readline): Fix exit message for Windows
2825 when readline is active. Thanks to a report by Eric Jones
2830 when readline is active. Thanks to a report by Eric Jones
2826 <eric-AT-enthought.com>.
2831 <eric-AT-enthought.com>.
2827
2832
2828 2004-11-07 Fernando Perez <fperez@colorado.edu>
2833 2004-11-07 Fernando Perez <fperez@colorado.edu>
2829
2834
2830 * IPython/genutils.py (page): Add a trap for OSError exceptions,
2835 * IPython/genutils.py (page): Add a trap for OSError exceptions,
2831 sometimes seen by win2k/cygwin users.
2836 sometimes seen by win2k/cygwin users.
2832
2837
2833 2004-11-06 Fernando Perez <fperez@colorado.edu>
2838 2004-11-06 Fernando Perez <fperez@colorado.edu>
2834
2839
2835 * IPython/iplib.py (interact): Change the handling of %Exit from
2840 * IPython/iplib.py (interact): Change the handling of %Exit from
2836 trying to propagate a SystemExit to an internal ipython flag.
2841 trying to propagate a SystemExit to an internal ipython flag.
2837 This is less elegant than using Python's exception mechanism, but
2842 This is less elegant than using Python's exception mechanism, but
2838 I can't get that to work reliably with threads, so under -pylab
2843 I can't get that to work reliably with threads, so under -pylab
2839 %Exit was hanging IPython. Cross-thread exception handling is
2844 %Exit was hanging IPython. Cross-thread exception handling is
2840 really a bitch. Thaks to a bug report by Stephen Walton
2845 really a bitch. Thaks to a bug report by Stephen Walton
2841 <stephen.walton-AT-csun.edu>.
2846 <stephen.walton-AT-csun.edu>.
2842
2847
2843 2004-11-04 Fernando Perez <fperez@colorado.edu>
2848 2004-11-04 Fernando Perez <fperez@colorado.edu>
2844
2849
2845 * IPython/iplib.py (raw_input_original): store a pointer to the
2850 * IPython/iplib.py (raw_input_original): store a pointer to the
2846 true raw_input to harden against code which can modify it
2851 true raw_input to harden against code which can modify it
2847 (wx.py.PyShell does this and would otherwise crash ipython).
2852 (wx.py.PyShell does this and would otherwise crash ipython).
2848 Thanks to a bug report by Jim Flowers <james.flowers-AT-lgx.com>.
2853 Thanks to a bug report by Jim Flowers <james.flowers-AT-lgx.com>.
2849
2854
2850 * IPython/Shell.py (MTInteractiveShell.runsource): Cleaner fix for
2855 * IPython/Shell.py (MTInteractiveShell.runsource): Cleaner fix for
2851 Ctrl-C problem, which does not mess up the input line.
2856 Ctrl-C problem, which does not mess up the input line.
2852
2857
2853 2004-11-03 Fernando Perez <fperez@colorado.edu>
2858 2004-11-03 Fernando Perez <fperez@colorado.edu>
2854
2859
2855 * IPython/Release.py: Changed licensing to BSD, in all files.
2860 * IPython/Release.py: Changed licensing to BSD, in all files.
2856 (name): lowercase name for tarball/RPM release.
2861 (name): lowercase name for tarball/RPM release.
2857
2862
2858 * IPython/OInspect.py (getdoc): wrap inspect.getdoc() safely for
2863 * IPython/OInspect.py (getdoc): wrap inspect.getdoc() safely for
2859 use throughout ipython.
2864 use throughout ipython.
2860
2865
2861 * IPython/Magic.py (Magic._ofind): Switch to using the new
2866 * IPython/Magic.py (Magic._ofind): Switch to using the new
2862 OInspect.getdoc() function.
2867 OInspect.getdoc() function.
2863
2868
2864 * IPython/Shell.py (sigint_handler): Hack to ignore the execution
2869 * IPython/Shell.py (sigint_handler): Hack to ignore the execution
2865 of the line currently being canceled via Ctrl-C. It's extremely
2870 of the line currently being canceled via Ctrl-C. It's extremely
2866 ugly, but I don't know how to do it better (the problem is one of
2871 ugly, but I don't know how to do it better (the problem is one of
2867 handling cross-thread exceptions).
2872 handling cross-thread exceptions).
2868
2873
2869 2004-10-28 Fernando Perez <fperez@colorado.edu>
2874 2004-10-28 Fernando Perez <fperez@colorado.edu>
2870
2875
2871 * IPython/Shell.py (signal_handler): add signal handlers to trap
2876 * IPython/Shell.py (signal_handler): add signal handlers to trap
2872 SIGINT and SIGSEGV in threaded code properly. Thanks to a bug
2877 SIGINT and SIGSEGV in threaded code properly. Thanks to a bug
2873 report by Francesc Alted.
2878 report by Francesc Alted.
2874
2879
2875 2004-10-21 Fernando Perez <fperez@colorado.edu>
2880 2004-10-21 Fernando Perez <fperez@colorado.edu>
2876
2881
2877 * IPython/Extensions/InterpreterExec.py (prefilter_shell): Fix @
2882 * IPython/Extensions/InterpreterExec.py (prefilter_shell): Fix @
2878 to % for pysh syntax extensions.
2883 to % for pysh syntax extensions.
2879
2884
2880 2004-10-09 Fernando Perez <fperez@colorado.edu>
2885 2004-10-09 Fernando Perez <fperez@colorado.edu>
2881
2886
2882 * IPython/Magic.py (Magic.magic_whos): modify output of Numeric
2887 * IPython/Magic.py (Magic.magic_whos): modify output of Numeric
2883 arrays to print a more useful summary, without calling str(arr).
2888 arrays to print a more useful summary, without calling str(arr).
2884 This avoids the problem of extremely lengthy computations which
2889 This avoids the problem of extremely lengthy computations which
2885 occur if arr is large, and appear to the user as a system lockup
2890 occur if arr is large, and appear to the user as a system lockup
2886 with 100% cpu activity. After a suggestion by Kristian Sandberg
2891 with 100% cpu activity. After a suggestion by Kristian Sandberg
2887 <Kristian.Sandberg@colorado.edu>.
2892 <Kristian.Sandberg@colorado.edu>.
2888 (Magic.__init__): fix bug in global magic escapes not being
2893 (Magic.__init__): fix bug in global magic escapes not being
2889 correctly set.
2894 correctly set.
2890
2895
2891 2004-10-08 Fernando Perez <fperez@colorado.edu>
2896 2004-10-08 Fernando Perez <fperez@colorado.edu>
2892
2897
2893 * IPython/Magic.py (__license__): change to absolute imports of
2898 * IPython/Magic.py (__license__): change to absolute imports of
2894 ipython's own internal packages, to start adapting to the absolute
2899 ipython's own internal packages, to start adapting to the absolute
2895 import requirement of PEP-328.
2900 import requirement of PEP-328.
2896
2901
2897 * IPython/genutils.py (__author__): Fix coding to utf-8 on all
2902 * IPython/genutils.py (__author__): Fix coding to utf-8 on all
2898 files, and standardize author/license marks through the Release
2903 files, and standardize author/license marks through the Release
2899 module instead of having per/file stuff (except for files with
2904 module instead of having per/file stuff (except for files with
2900 particular licenses, like the MIT/PSF-licensed codes).
2905 particular licenses, like the MIT/PSF-licensed codes).
2901
2906
2902 * IPython/Debugger.py: remove dead code for python 2.1
2907 * IPython/Debugger.py: remove dead code for python 2.1
2903
2908
2904 2004-10-04 Fernando Perez <fperez@colorado.edu>
2909 2004-10-04 Fernando Perez <fperez@colorado.edu>
2905
2910
2906 * IPython/iplib.py (ipmagic): New function for accessing magics
2911 * IPython/iplib.py (ipmagic): New function for accessing magics
2907 via a normal python function call.
2912 via a normal python function call.
2908
2913
2909 * IPython/Magic.py (Magic.magic_magic): Change the magic escape
2914 * IPython/Magic.py (Magic.magic_magic): Change the magic escape
2910 from '@' to '%', to accomodate the new @decorator syntax of python
2915 from '@' to '%', to accomodate the new @decorator syntax of python
2911 2.4.
2916 2.4.
2912
2917
2913 2004-09-29 Fernando Perez <fperez@colorado.edu>
2918 2004-09-29 Fernando Perez <fperez@colorado.edu>
2914
2919
2915 * IPython/Shell.py (MatplotlibShellBase.use): Added a wrapper to
2920 * IPython/Shell.py (MatplotlibShellBase.use): Added a wrapper to
2916 matplotlib.use to prevent running scripts which try to switch
2921 matplotlib.use to prevent running scripts which try to switch
2917 interactive backends from within ipython. This will just crash
2922 interactive backends from within ipython. This will just crash
2918 the python interpreter, so we can't allow it (but a detailed error
2923 the python interpreter, so we can't allow it (but a detailed error
2919 is given to the user).
2924 is given to the user).
2920
2925
2921 2004-09-28 Fernando Perez <fperez@colorado.edu>
2926 2004-09-28 Fernando Perez <fperez@colorado.edu>
2922
2927
2923 * IPython/Shell.py (MatplotlibShellBase.mplot_exec):
2928 * IPython/Shell.py (MatplotlibShellBase.mplot_exec):
2924 matplotlib-related fixes so that using @run with non-matplotlib
2929 matplotlib-related fixes so that using @run with non-matplotlib
2925 scripts doesn't pop up spurious plot windows. This requires
2930 scripts doesn't pop up spurious plot windows. This requires
2926 matplotlib >= 0.63, where I had to make some changes as well.
2931 matplotlib >= 0.63, where I had to make some changes as well.
2927
2932
2928 * IPython/ipmaker.py (make_IPython): update version requirement to
2933 * IPython/ipmaker.py (make_IPython): update version requirement to
2929 python 2.2.
2934 python 2.2.
2930
2935
2931 * IPython/iplib.py (InteractiveShell.mainloop): Add an optional
2936 * IPython/iplib.py (InteractiveShell.mainloop): Add an optional
2932 banner arg for embedded customization.
2937 banner arg for embedded customization.
2933
2938
2934 * IPython/Magic.py (Magic.__init__): big cleanup to remove all
2939 * IPython/Magic.py (Magic.__init__): big cleanup to remove all
2935 explicit uses of __IP as the IPython's instance name. Now things
2940 explicit uses of __IP as the IPython's instance name. Now things
2936 are properly handled via the shell.name value. The actual code
2941 are properly handled via the shell.name value. The actual code
2937 is a bit ugly b/c I'm doing it via a global in Magic.py, but this
2942 is a bit ugly b/c I'm doing it via a global in Magic.py, but this
2938 is much better than before. I'll clean things completely when the
2943 is much better than before. I'll clean things completely when the
2939 magic stuff gets a real overhaul.
2944 magic stuff gets a real overhaul.
2940
2945
2941 * ipython.1: small fixes, sent in by Jack Moffit. He also sent in
2946 * ipython.1: small fixes, sent in by Jack Moffit. He also sent in
2942 minor changes to debian dir.
2947 minor changes to debian dir.
2943
2948
2944 * IPython/iplib.py (InteractiveShell.__init__): Fix adding a
2949 * IPython/iplib.py (InteractiveShell.__init__): Fix adding a
2945 pointer to the shell itself in the interactive namespace even when
2950 pointer to the shell itself in the interactive namespace even when
2946 a user-supplied dict is provided. This is needed for embedding
2951 a user-supplied dict is provided. This is needed for embedding
2947 purposes (found by tests with Michel Sanner).
2952 purposes (found by tests with Michel Sanner).
2948
2953
2949 2004-09-27 Fernando Perez <fperez@colorado.edu>
2954 2004-09-27 Fernando Perez <fperez@colorado.edu>
2950
2955
2951 * IPython/UserConfig/ipythonrc: remove []{} from
2956 * IPython/UserConfig/ipythonrc: remove []{} from
2952 readline_remove_delims, so that things like [modname.<TAB> do
2957 readline_remove_delims, so that things like [modname.<TAB> do
2953 proper completion. This disables [].TAB, but that's a less common
2958 proper completion. This disables [].TAB, but that's a less common
2954 case than module names in list comprehensions, for example.
2959 case than module names in list comprehensions, for example.
2955 Thanks to a report by Andrea Riciputi.
2960 Thanks to a report by Andrea Riciputi.
2956
2961
2957 2004-09-09 Fernando Perez <fperez@colorado.edu>
2962 2004-09-09 Fernando Perez <fperez@colorado.edu>
2958
2963
2959 * IPython/Shell.py (IPShellGTK.mainloop): reorder to avoid
2964 * IPython/Shell.py (IPShellGTK.mainloop): reorder to avoid
2960 blocking problems in win32 and osx. Fix by John.
2965 blocking problems in win32 and osx. Fix by John.
2961
2966
2962 2004-09-08 Fernando Perez <fperez@colorado.edu>
2967 2004-09-08 Fernando Perez <fperez@colorado.edu>
2963
2968
2964 * IPython/Shell.py (IPShellWX.OnInit): Fix output redirection bug
2969 * IPython/Shell.py (IPShellWX.OnInit): Fix output redirection bug
2965 for Win32 and OSX. Fix by John Hunter.
2970 for Win32 and OSX. Fix by John Hunter.
2966
2971
2967 2004-08-30 *** Released version 0.6.3
2972 2004-08-30 *** Released version 0.6.3
2968
2973
2969 2004-08-30 Fernando Perez <fperez@colorado.edu>
2974 2004-08-30 Fernando Perez <fperez@colorado.edu>
2970
2975
2971 * setup.py (isfile): Add manpages to list of dependent files to be
2976 * setup.py (isfile): Add manpages to list of dependent files to be
2972 updated.
2977 updated.
2973
2978
2974 2004-08-27 Fernando Perez <fperez@colorado.edu>
2979 2004-08-27 Fernando Perez <fperez@colorado.edu>
2975
2980
2976 * IPython/Shell.py (start): I've disabled -wthread and -gthread
2981 * IPython/Shell.py (start): I've disabled -wthread and -gthread
2977 for now. They don't really work with standalone WX/GTK code
2982 for now. They don't really work with standalone WX/GTK code
2978 (though matplotlib IS working fine with both of those backends).
2983 (though matplotlib IS working fine with both of those backends).
2979 This will neeed much more testing. I disabled most things with
2984 This will neeed much more testing. I disabled most things with
2980 comments, so turning it back on later should be pretty easy.
2985 comments, so turning it back on later should be pretty easy.
2981
2986
2982 * IPython/iplib.py (InteractiveShell.__init__): Fix accidental
2987 * IPython/iplib.py (InteractiveShell.__init__): Fix accidental
2983 autocalling of expressions like r'foo', by modifying the line
2988 autocalling of expressions like r'foo', by modifying the line
2984 split regexp. Closes
2989 split regexp. Closes
2985 http://www.scipy.net/roundup/ipython/issue18, reported by Nicholas
2990 http://www.scipy.net/roundup/ipython/issue18, reported by Nicholas
2986 Riley <ipythonbugs-AT-sabi.net>.
2991 Riley <ipythonbugs-AT-sabi.net>.
2987 (InteractiveShell.mainloop): honor --nobanner with banner
2992 (InteractiveShell.mainloop): honor --nobanner with banner
2988 extensions.
2993 extensions.
2989
2994
2990 * IPython/Shell.py: Significant refactoring of all classes, so
2995 * IPython/Shell.py: Significant refactoring of all classes, so
2991 that we can really support ALL matplotlib backends and threading
2996 that we can really support ALL matplotlib backends and threading
2992 models (John spotted a bug with Tk which required this). Now we
2997 models (John spotted a bug with Tk which required this). Now we
2993 should support single-threaded, WX-threads and GTK-threads, both
2998 should support single-threaded, WX-threads and GTK-threads, both
2994 for generic code and for matplotlib.
2999 for generic code and for matplotlib.
2995
3000
2996 * IPython/ipmaker.py (__call__): Changed -mpthread option to
3001 * IPython/ipmaker.py (__call__): Changed -mpthread option to
2997 -pylab, to simplify things for users. Will also remove the pylab
3002 -pylab, to simplify things for users. Will also remove the pylab
2998 profile, since now all of matplotlib configuration is directly
3003 profile, since now all of matplotlib configuration is directly
2999 handled here. This also reduces startup time.
3004 handled here. This also reduces startup time.
3000
3005
3001 * IPython/Shell.py (IPShellGTK.run): Fixed bug where mainloop() of
3006 * IPython/Shell.py (IPShellGTK.run): Fixed bug where mainloop() of
3002 shell wasn't being correctly called. Also in IPShellWX.
3007 shell wasn't being correctly called. Also in IPShellWX.
3003
3008
3004 * IPython/iplib.py (InteractiveShell.__init__): Added option to
3009 * IPython/iplib.py (InteractiveShell.__init__): Added option to
3005 fine-tune banner.
3010 fine-tune banner.
3006
3011
3007 * IPython/numutils.py (spike): Deprecate these spike functions,
3012 * IPython/numutils.py (spike): Deprecate these spike functions,
3008 delete (long deprecated) gnuplot_exec handler.
3013 delete (long deprecated) gnuplot_exec handler.
3009
3014
3010 2004-08-26 Fernando Perez <fperez@colorado.edu>
3015 2004-08-26 Fernando Perez <fperez@colorado.edu>
3011
3016
3012 * ipython.1: Update for threading options, plus some others which
3017 * ipython.1: Update for threading options, plus some others which
3013 were missing.
3018 were missing.
3014
3019
3015 * IPython/ipmaker.py (__call__): Added -wthread option for
3020 * IPython/ipmaker.py (__call__): Added -wthread option for
3016 wxpython thread handling. Make sure threading options are only
3021 wxpython thread handling. Make sure threading options are only
3017 valid at the command line.
3022 valid at the command line.
3018
3023
3019 * scripts/ipython: moved shell selection into a factory function
3024 * scripts/ipython: moved shell selection into a factory function
3020 in Shell.py, to keep the starter script to a minimum.
3025 in Shell.py, to keep the starter script to a minimum.
3021
3026
3022 2004-08-25 Fernando Perez <fperez@colorado.edu>
3027 2004-08-25 Fernando Perez <fperez@colorado.edu>
3023
3028
3024 * IPython/Shell.py (IPShellWX.wxexit): fixes to WX threading, by
3029 * IPython/Shell.py (IPShellWX.wxexit): fixes to WX threading, by
3025 John. Along with some recent changes he made to matplotlib, the
3030 John. Along with some recent changes he made to matplotlib, the
3026 next versions of both systems should work very well together.
3031 next versions of both systems should work very well together.
3027
3032
3028 2004-08-24 Fernando Perez <fperez@colorado.edu>
3033 2004-08-24 Fernando Perez <fperez@colorado.edu>
3029
3034
3030 * IPython/Magic.py (Magic.magic_prun): cleanup some dead code. I
3035 * IPython/Magic.py (Magic.magic_prun): cleanup some dead code. I
3031 tried to switch the profiling to using hotshot, but I'm getting
3036 tried to switch the profiling to using hotshot, but I'm getting
3032 strange errors from prof.runctx() there. I may be misreading the
3037 strange errors from prof.runctx() there. I may be misreading the
3033 docs, but it looks weird. For now the profiling code will
3038 docs, but it looks weird. For now the profiling code will
3034 continue to use the standard profiler.
3039 continue to use the standard profiler.
3035
3040
3036 2004-08-23 Fernando Perez <fperez@colorado.edu>
3041 2004-08-23 Fernando Perez <fperez@colorado.edu>
3037
3042
3038 * IPython/Shell.py (IPShellWX.__init__): Improvements to the WX
3043 * IPython/Shell.py (IPShellWX.__init__): Improvements to the WX
3039 threaded shell, by John Hunter. It's not quite ready yet, but
3044 threaded shell, by John Hunter. It's not quite ready yet, but
3040 close.
3045 close.
3041
3046
3042 2004-08-22 Fernando Perez <fperez@colorado.edu>
3047 2004-08-22 Fernando Perez <fperez@colorado.edu>
3043
3048
3044 * IPython/iplib.py (InteractiveShell.interact): tab cleanups, also
3049 * IPython/iplib.py (InteractiveShell.interact): tab cleanups, also
3045 in Magic and ultraTB.
3050 in Magic and ultraTB.
3046
3051
3047 * ipython.1: document threading options in manpage.
3052 * ipython.1: document threading options in manpage.
3048
3053
3049 * scripts/ipython: Changed name of -thread option to -gthread,
3054 * scripts/ipython: Changed name of -thread option to -gthread,
3050 since this is GTK specific. I want to leave the door open for a
3055 since this is GTK specific. I want to leave the door open for a
3051 -wthread option for WX, which will most likely be necessary. This
3056 -wthread option for WX, which will most likely be necessary. This
3052 change affects usage and ipmaker as well.
3057 change affects usage and ipmaker as well.
3053
3058
3054 * IPython/Shell.py (matplotlib_shell): Add a factory function to
3059 * IPython/Shell.py (matplotlib_shell): Add a factory function to
3055 handle the matplotlib shell issues. Code by John Hunter
3060 handle the matplotlib shell issues. Code by John Hunter
3056 <jdhunter-AT-nitace.bsd.uchicago.edu>.
3061 <jdhunter-AT-nitace.bsd.uchicago.edu>.
3057 (IPShellMatplotlibWX.__init__): Rudimentary WX support. It's
3062 (IPShellMatplotlibWX.__init__): Rudimentary WX support. It's
3058 broken (and disabled for end users) for now, but it puts the
3063 broken (and disabled for end users) for now, but it puts the
3059 infrastructure in place.
3064 infrastructure in place.
3060
3065
3061 2004-08-21 Fernando Perez <fperez@colorado.edu>
3066 2004-08-21 Fernando Perez <fperez@colorado.edu>
3062
3067
3063 * ipythonrc-pylab: Add matplotlib support.
3068 * ipythonrc-pylab: Add matplotlib support.
3064
3069
3065 * matplotlib_config.py: new files for matplotlib support, part of
3070 * matplotlib_config.py: new files for matplotlib support, part of
3066 the pylab profile.
3071 the pylab profile.
3067
3072
3068 * IPython/usage.py (__doc__): documented the threading options.
3073 * IPython/usage.py (__doc__): documented the threading options.
3069
3074
3070 2004-08-20 Fernando Perez <fperez@colorado.edu>
3075 2004-08-20 Fernando Perez <fperez@colorado.edu>
3071
3076
3072 * ipython: Modified the main calling routine to handle the -thread
3077 * ipython: Modified the main calling routine to handle the -thread
3073 and -mpthread options. This needs to be done as a top-level hack,
3078 and -mpthread options. This needs to be done as a top-level hack,
3074 because it determines which class to instantiate for IPython
3079 because it determines which class to instantiate for IPython
3075 itself.
3080 itself.
3076
3081
3077 * IPython/Shell.py (MTInteractiveShell.__init__): New set of
3082 * IPython/Shell.py (MTInteractiveShell.__init__): New set of
3078 classes to support multithreaded GTK operation without blocking,
3083 classes to support multithreaded GTK operation without blocking,
3079 and matplotlib with all backends. This is a lot of still very
3084 and matplotlib with all backends. This is a lot of still very
3080 experimental code, and threads are tricky. So it may still have a
3085 experimental code, and threads are tricky. So it may still have a
3081 few rough edges... This code owes a lot to
3086 few rough edges... This code owes a lot to
3082 http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/65109, by
3087 http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/65109, by
3083 Brian # McErlean and John Finlay, to Antoon Pardon for fixes, and
3088 Brian # McErlean and John Finlay, to Antoon Pardon for fixes, and
3084 to John Hunter for all the matplotlib work.
3089 to John Hunter for all the matplotlib work.
3085
3090
3086 * IPython/ipmaker.py (__call__): Added -thread and -mpthread
3091 * IPython/ipmaker.py (__call__): Added -thread and -mpthread
3087 options for gtk thread and matplotlib support.
3092 options for gtk thread and matplotlib support.
3088
3093
3089 2004-08-16 Fernando Perez <fperez@colorado.edu>
3094 2004-08-16 Fernando Perez <fperez@colorado.edu>
3090
3095
3091 * IPython/iplib.py (InteractiveShell.__init__): don't trigger
3096 * IPython/iplib.py (InteractiveShell.__init__): don't trigger
3092 autocall for things like p*q,p/q,p+q,p-q, when p is callable. Bug
3097 autocall for things like p*q,p/q,p+q,p-q, when p is callable. Bug
3093 reported by Stephen Walton <stephen.walton-AT-csun.edu>.
3098 reported by Stephen Walton <stephen.walton-AT-csun.edu>.
3094
3099
3095 2004-08-11 Fernando Perez <fperez@colorado.edu>
3100 2004-08-11 Fernando Perez <fperez@colorado.edu>
3096
3101
3097 * setup.py (isfile): Fix build so documentation gets updated for
3102 * setup.py (isfile): Fix build so documentation gets updated for
3098 rpms (it was only done for .tgz builds).
3103 rpms (it was only done for .tgz builds).
3099
3104
3100 2004-08-10 Fernando Perez <fperez@colorado.edu>
3105 2004-08-10 Fernando Perez <fperez@colorado.edu>
3101
3106
3102 * genutils.py (Term): Fix misspell of stdin stream (sin->cin).
3107 * genutils.py (Term): Fix misspell of stdin stream (sin->cin).
3103
3108
3104 * iplib.py : Silence syntax error exceptions in tab-completion.
3109 * iplib.py : Silence syntax error exceptions in tab-completion.
3105
3110
3106 2004-08-05 Fernando Perez <fperez@colorado.edu>
3111 2004-08-05 Fernando Perez <fperez@colorado.edu>
3107
3112
3108 * IPython/Prompts.py (Prompt2.set_colors): Fix incorrectly set
3113 * IPython/Prompts.py (Prompt2.set_colors): Fix incorrectly set
3109 'color off' mark for continuation prompts. This was causing long
3114 'color off' mark for continuation prompts. This was causing long
3110 continuation lines to mis-wrap.
3115 continuation lines to mis-wrap.
3111
3116
3112 2004-08-01 Fernando Perez <fperez@colorado.edu>
3117 2004-08-01 Fernando Perez <fperez@colorado.edu>
3113
3118
3114 * IPython/ipmaker.py (make_IPython): Allow the shell class used
3119 * IPython/ipmaker.py (make_IPython): Allow the shell class used
3115 for building ipython to be a parameter. All this is necessary
3120 for building ipython to be a parameter. All this is necessary
3116 right now to have a multithreaded version, but this insane
3121 right now to have a multithreaded version, but this insane
3117 non-design will be cleaned up soon. For now, it's a hack that
3122 non-design will be cleaned up soon. For now, it's a hack that
3118 works.
3123 works.
3119
3124
3120 * IPython/Shell.py (IPShell.__init__): Stop using mutable default
3125 * IPython/Shell.py (IPShell.__init__): Stop using mutable default
3121 args in various places. No bugs so far, but it's a dangerous
3126 args in various places. No bugs so far, but it's a dangerous
3122 practice.
3127 practice.
3123
3128
3124 2004-07-31 Fernando Perez <fperez@colorado.edu>
3129 2004-07-31 Fernando Perez <fperez@colorado.edu>
3125
3130
3126 * IPython/iplib.py (complete): ignore SyntaxError exceptions to
3131 * IPython/iplib.py (complete): ignore SyntaxError exceptions to
3127 fix completion of files with dots in their names under most
3132 fix completion of files with dots in their names under most
3128 profiles (pysh was OK because the completion order is different).
3133 profiles (pysh was OK because the completion order is different).
3129
3134
3130 2004-07-27 Fernando Perez <fperez@colorado.edu>
3135 2004-07-27 Fernando Perez <fperez@colorado.edu>
3131
3136
3132 * IPython/iplib.py (InteractiveShell.__init__): build dict of
3137 * IPython/iplib.py (InteractiveShell.__init__): build dict of
3133 keywords manually, b/c the one in keyword.py was removed in python
3138 keywords manually, b/c the one in keyword.py was removed in python
3134 2.4. Patch by Anakim Border <aborder-AT-users.sourceforge.net>.
3139 2.4. Patch by Anakim Border <aborder-AT-users.sourceforge.net>.
3135 This is NOT a bug under python 2.3 and earlier.
3140 This is NOT a bug under python 2.3 and earlier.
3136
3141
3137 2004-07-26 Fernando Perez <fperez@colorado.edu>
3142 2004-07-26 Fernando Perez <fperez@colorado.edu>
3138
3143
3139 * IPython/ultraTB.py (VerboseTB.text): Add another
3144 * IPython/ultraTB.py (VerboseTB.text): Add another
3140 linecache.checkcache() call to try to prevent inspect.py from
3145 linecache.checkcache() call to try to prevent inspect.py from
3141 crashing under python 2.3. I think this fixes
3146 crashing under python 2.3. I think this fixes
3142 http://www.scipy.net/roundup/ipython/issue17.
3147 http://www.scipy.net/roundup/ipython/issue17.
3143
3148
3144 2004-07-26 *** Released version 0.6.2
3149 2004-07-26 *** Released version 0.6.2
3145
3150
3146 2004-07-26 Fernando Perez <fperez@colorado.edu>
3151 2004-07-26 Fernando Perez <fperez@colorado.edu>
3147
3152
3148 * IPython/Magic.py (Magic.magic_cd): Fix bug where 'cd -N' would
3153 * IPython/Magic.py (Magic.magic_cd): Fix bug where 'cd -N' would
3149 fail for any number.
3154 fail for any number.
3150 (Magic.magic_bookmark): Fix bug where 'bookmark -l' would fail for
3155 (Magic.magic_bookmark): Fix bug where 'bookmark -l' would fail for
3151 empty bookmarks.
3156 empty bookmarks.
3152
3157
3153 2004-07-26 *** Released version 0.6.1
3158 2004-07-26 *** Released version 0.6.1
3154
3159
3155 2004-07-26 Fernando Perez <fperez@colorado.edu>
3160 2004-07-26 Fernando Perez <fperez@colorado.edu>
3156
3161
3157 * ipython_win_post_install.py (run): Added pysh shortcut for Windows.
3162 * ipython_win_post_install.py (run): Added pysh shortcut for Windows.
3158
3163
3159 * IPython/iplib.py (protect_filename): Applied Ville's patch for
3164 * IPython/iplib.py (protect_filename): Applied Ville's patch for
3160 escaping '()[]{}' in filenames.
3165 escaping '()[]{}' in filenames.
3161
3166
3162 * IPython/Magic.py (shlex_split): Fix handling of '*' and '?' for
3167 * IPython/Magic.py (shlex_split): Fix handling of '*' and '?' for
3163 Python 2.2 users who lack a proper shlex.split.
3168 Python 2.2 users who lack a proper shlex.split.
3164
3169
3165 2004-07-19 Fernando Perez <fperez@colorado.edu>
3170 2004-07-19 Fernando Perez <fperez@colorado.edu>
3166
3171
3167 * IPython/iplib.py (InteractiveShell.init_readline): Add support
3172 * IPython/iplib.py (InteractiveShell.init_readline): Add support
3168 for reading readline's init file. I follow the normal chain:
3173 for reading readline's init file. I follow the normal chain:
3169 $INPUTRC is honored, otherwise ~/.inputrc is used. Thanks to a
3174 $INPUTRC is honored, otherwise ~/.inputrc is used. Thanks to a
3170 report by Mike Heeter. This closes
3175 report by Mike Heeter. This closes
3171 http://www.scipy.net/roundup/ipython/issue16.
3176 http://www.scipy.net/roundup/ipython/issue16.
3172
3177
3173 2004-07-18 Fernando Perez <fperez@colorado.edu>
3178 2004-07-18 Fernando Perez <fperez@colorado.edu>
3174
3179
3175 * IPython/iplib.py (__init__): Add better handling of '\' under
3180 * IPython/iplib.py (__init__): Add better handling of '\' under
3176 Win32 for filenames. After a patch by Ville.
3181 Win32 for filenames. After a patch by Ville.
3177
3182
3178 2004-07-17 Fernando Perez <fperez@colorado.edu>
3183 2004-07-17 Fernando Perez <fperez@colorado.edu>
3179
3184
3180 * IPython/iplib.py (InteractiveShell._prefilter): fix bug where
3185 * IPython/iplib.py (InteractiveShell._prefilter): fix bug where
3181 autocalling would be triggered for 'foo is bar' if foo is
3186 autocalling would be triggered for 'foo is bar' if foo is
3182 callable. I also cleaned up the autocall detection code to use a
3187 callable. I also cleaned up the autocall detection code to use a
3183 regexp, which is faster. Bug reported by Alexander Schmolck.
3188 regexp, which is faster. Bug reported by Alexander Schmolck.
3184
3189
3185 * IPython/Magic.py (Magic.magic_pinfo): Fix bug where strings with
3190 * IPython/Magic.py (Magic.magic_pinfo): Fix bug where strings with
3186 '?' in them would confuse the help system. Reported by Alex
3191 '?' in them would confuse the help system. Reported by Alex
3187 Schmolck.
3192 Schmolck.
3188
3193
3189 2004-07-16 Fernando Perez <fperez@colorado.edu>
3194 2004-07-16 Fernando Perez <fperez@colorado.edu>
3190
3195
3191 * IPython/GnuplotInteractive.py (__all__): added plot2.
3196 * IPython/GnuplotInteractive.py (__all__): added plot2.
3192
3197
3193 * IPython/Gnuplot2.py (Gnuplot.plot2): added new function for
3198 * IPython/Gnuplot2.py (Gnuplot.plot2): added new function for
3194 plotting dictionaries, lists or tuples of 1d arrays.
3199 plotting dictionaries, lists or tuples of 1d arrays.
3195
3200
3196 * IPython/Magic.py (Magic.magic_hist): small clenaups and
3201 * IPython/Magic.py (Magic.magic_hist): small clenaups and
3197 optimizations.
3202 optimizations.
3198
3203
3199 * IPython/iplib.py:Remove old Changelog info for cleanup. This is
3204 * IPython/iplib.py:Remove old Changelog info for cleanup. This is
3200 the information which was there from Janko's original IPP code:
3205 the information which was there from Janko's original IPP code:
3201
3206
3202 03.05.99 20:53 porto.ifm.uni-kiel.de
3207 03.05.99 20:53 porto.ifm.uni-kiel.de
3203 --Started changelog.
3208 --Started changelog.
3204 --make clear do what it say it does
3209 --make clear do what it say it does
3205 --added pretty output of lines from inputcache
3210 --added pretty output of lines from inputcache
3206 --Made Logger a mixin class, simplifies handling of switches
3211 --Made Logger a mixin class, simplifies handling of switches
3207 --Added own completer class. .string<TAB> expands to last history
3212 --Added own completer class. .string<TAB> expands to last history
3208 line which starts with string. The new expansion is also present
3213 line which starts with string. The new expansion is also present
3209 with Ctrl-r from the readline library. But this shows, who this
3214 with Ctrl-r from the readline library. But this shows, who this
3210 can be done for other cases.
3215 can be done for other cases.
3211 --Added convention that all shell functions should accept a
3216 --Added convention that all shell functions should accept a
3212 parameter_string This opens the door for different behaviour for
3217 parameter_string This opens the door for different behaviour for
3213 each function. @cd is a good example of this.
3218 each function. @cd is a good example of this.
3214
3219
3215 04.05.99 12:12 porto.ifm.uni-kiel.de
3220 04.05.99 12:12 porto.ifm.uni-kiel.de
3216 --added logfile rotation
3221 --added logfile rotation
3217 --added new mainloop method which freezes first the namespace
3222 --added new mainloop method which freezes first the namespace
3218
3223
3219 07.05.99 21:24 porto.ifm.uni-kiel.de
3224 07.05.99 21:24 porto.ifm.uni-kiel.de
3220 --added the docreader classes. Now there is a help system.
3225 --added the docreader classes. Now there is a help system.
3221 -This is only a first try. Currently it's not easy to put new
3226 -This is only a first try. Currently it's not easy to put new
3222 stuff in the indices. But this is the way to go. Info would be
3227 stuff in the indices. But this is the way to go. Info would be
3223 better, but HTML is every where and not everybody has an info
3228 better, but HTML is every where and not everybody has an info
3224 system installed and it's not so easy to change html-docs to info.
3229 system installed and it's not so easy to change html-docs to info.
3225 --added global logfile option
3230 --added global logfile option
3226 --there is now a hook for object inspection method pinfo needs to
3231 --there is now a hook for object inspection method pinfo needs to
3227 be provided for this. Can be reached by two '??'.
3232 be provided for this. Can be reached by two '??'.
3228
3233
3229 08.05.99 20:51 porto.ifm.uni-kiel.de
3234 08.05.99 20:51 porto.ifm.uni-kiel.de
3230 --added a README
3235 --added a README
3231 --bug in rc file. Something has changed so functions in the rc
3236 --bug in rc file. Something has changed so functions in the rc
3232 file need to reference the shell and not self. Not clear if it's a
3237 file need to reference the shell and not self. Not clear if it's a
3233 bug or feature.
3238 bug or feature.
3234 --changed rc file for new behavior
3239 --changed rc file for new behavior
3235
3240
3236 2004-07-15 Fernando Perez <fperez@colorado.edu>
3241 2004-07-15 Fernando Perez <fperez@colorado.edu>
3237
3242
3238 * IPython/Logger.py (Logger.log): fixed recent bug where the input
3243 * IPython/Logger.py (Logger.log): fixed recent bug where the input
3239 cache was falling out of sync in bizarre manners when multi-line
3244 cache was falling out of sync in bizarre manners when multi-line
3240 input was present. Minor optimizations and cleanup.
3245 input was present. Minor optimizations and cleanup.
3241
3246
3242 (Logger): Remove old Changelog info for cleanup. This is the
3247 (Logger): Remove old Changelog info for cleanup. This is the
3243 information which was there from Janko's original code:
3248 information which was there from Janko's original code:
3244
3249
3245 Changes to Logger: - made the default log filename a parameter
3250 Changes to Logger: - made the default log filename a parameter
3246
3251
3247 - put a check for lines beginning with !@? in log(). Needed
3252 - put a check for lines beginning with !@? in log(). Needed
3248 (even if the handlers properly log their lines) for mid-session
3253 (even if the handlers properly log their lines) for mid-session
3249 logging activation to work properly. Without this, lines logged
3254 logging activation to work properly. Without this, lines logged
3250 in mid session, which get read from the cache, would end up
3255 in mid session, which get read from the cache, would end up
3251 'bare' (with !@? in the open) in the log. Now they are caught
3256 'bare' (with !@? in the open) in the log. Now they are caught
3252 and prepended with a #.
3257 and prepended with a #.
3253
3258
3254 * IPython/iplib.py (InteractiveShell.init_readline): added check
3259 * IPython/iplib.py (InteractiveShell.init_readline): added check
3255 in case MagicCompleter fails to be defined, so we don't crash.
3260 in case MagicCompleter fails to be defined, so we don't crash.
3256
3261
3257 2004-07-13 Fernando Perez <fperez@colorado.edu>
3262 2004-07-13 Fernando Perez <fperez@colorado.edu>
3258
3263
3259 * IPython/Gnuplot2.py (Gnuplot.hardcopy): add automatic generation
3264 * IPython/Gnuplot2.py (Gnuplot.hardcopy): add automatic generation
3260 of EPS if the requested filename ends in '.eps'.
3265 of EPS if the requested filename ends in '.eps'.
3261
3266
3262 2004-07-04 Fernando Perez <fperez@colorado.edu>
3267 2004-07-04 Fernando Perez <fperez@colorado.edu>
3263
3268
3264 * IPython/iplib.py (InteractiveShell.handle_shell_escape): Fix
3269 * IPython/iplib.py (InteractiveShell.handle_shell_escape): Fix
3265 escaping of quotes when calling the shell.
3270 escaping of quotes when calling the shell.
3266
3271
3267 2004-07-02 Fernando Perez <fperez@colorado.edu>
3272 2004-07-02 Fernando Perez <fperez@colorado.edu>
3268
3273
3269 * IPython/Prompts.py (CachedOutput.update): Fix problem with
3274 * IPython/Prompts.py (CachedOutput.update): Fix problem with
3270 gettext not working because we were clobbering '_'. Fixes
3275 gettext not working because we were clobbering '_'. Fixes
3271 http://www.scipy.net/roundup/ipython/issue6.
3276 http://www.scipy.net/roundup/ipython/issue6.
3272
3277
3273 2004-07-01 Fernando Perez <fperez@colorado.edu>
3278 2004-07-01 Fernando Perez <fperez@colorado.edu>
3274
3279
3275 * IPython/Magic.py (Magic.magic_cd): integrated bookmark handling
3280 * IPython/Magic.py (Magic.magic_cd): integrated bookmark handling
3276 into @cd. Patch by Ville.
3281 into @cd. Patch by Ville.
3277
3282
3278 * IPython/iplib.py (InteractiveShell.post_config_initialization):
3283 * IPython/iplib.py (InteractiveShell.post_config_initialization):
3279 new function to store things after ipmaker runs. Patch by Ville.
3284 new function to store things after ipmaker runs. Patch by Ville.
3280 Eventually this will go away once ipmaker is removed and the class
3285 Eventually this will go away once ipmaker is removed and the class
3281 gets cleaned up, but for now it's ok. Key functionality here is
3286 gets cleaned up, but for now it's ok. Key functionality here is
3282 the addition of the persistent storage mechanism, a dict for
3287 the addition of the persistent storage mechanism, a dict for
3283 keeping data across sessions (for now just bookmarks, but more can
3288 keeping data across sessions (for now just bookmarks, but more can
3284 be implemented later).
3289 be implemented later).
3285
3290
3286 * IPython/Magic.py (Magic.magic_bookmark): New bookmark system,
3291 * IPython/Magic.py (Magic.magic_bookmark): New bookmark system,
3287 persistent across sections. Patch by Ville, I modified it
3292 persistent across sections. Patch by Ville, I modified it
3288 soemwhat to allow bookmarking arbitrary dirs other than CWD. Also
3293 soemwhat to allow bookmarking arbitrary dirs other than CWD. Also
3289 added a '-l' option to list all bookmarks.
3294 added a '-l' option to list all bookmarks.
3290
3295
3291 * IPython/iplib.py (InteractiveShell.atexit_operations): new
3296 * IPython/iplib.py (InteractiveShell.atexit_operations): new
3292 center for cleanup. Registered with atexit.register(). I moved
3297 center for cleanup. Registered with atexit.register(). I moved
3293 here the old exit_cleanup(). After a patch by Ville.
3298 here the old exit_cleanup(). After a patch by Ville.
3294
3299
3295 * IPython/Magic.py (get_py_filename): added '~' to the accepted
3300 * IPython/Magic.py (get_py_filename): added '~' to the accepted
3296 characters in the hacked shlex_split for python 2.2.
3301 characters in the hacked shlex_split for python 2.2.
3297
3302
3298 * IPython/iplib.py (file_matches): more fixes to filenames with
3303 * IPython/iplib.py (file_matches): more fixes to filenames with
3299 whitespace in them. It's not perfect, but limitations in python's
3304 whitespace in them. It's not perfect, but limitations in python's
3300 readline make it impossible to go further.
3305 readline make it impossible to go further.
3301
3306
3302 2004-06-29 Fernando Perez <fperez@colorado.edu>
3307 2004-06-29 Fernando Perez <fperez@colorado.edu>
3303
3308
3304 * IPython/iplib.py (file_matches): escape whitespace correctly in
3309 * IPython/iplib.py (file_matches): escape whitespace correctly in
3305 filename completions. Bug reported by Ville.
3310 filename completions. Bug reported by Ville.
3306
3311
3307 2004-06-28 Fernando Perez <fperez@colorado.edu>
3312 2004-06-28 Fernando Perez <fperez@colorado.edu>
3308
3313
3309 * IPython/ipmaker.py (__call__): Added per-profile histories. Now
3314 * IPython/ipmaker.py (__call__): Added per-profile histories. Now
3310 the history file will be called 'history-PROFNAME' (or just
3315 the history file will be called 'history-PROFNAME' (or just
3311 'history' if no profile is loaded). I was getting annoyed at
3316 'history' if no profile is loaded). I was getting annoyed at
3312 getting my Numerical work history clobbered by pysh sessions.
3317 getting my Numerical work history clobbered by pysh sessions.
3313
3318
3314 * IPython/iplib.py (InteractiveShell.__init__): Internal
3319 * IPython/iplib.py (InteractiveShell.__init__): Internal
3315 getoutputerror() function so that we can honor the system_verbose
3320 getoutputerror() function so that we can honor the system_verbose
3316 flag for _all_ system calls. I also added escaping of #
3321 flag for _all_ system calls. I also added escaping of #
3317 characters here to avoid confusing Itpl.
3322 characters here to avoid confusing Itpl.
3318
3323
3319 * IPython/Magic.py (shlex_split): removed call to shell in
3324 * IPython/Magic.py (shlex_split): removed call to shell in
3320 parse_options and replaced it with shlex.split(). The annoying
3325 parse_options and replaced it with shlex.split(). The annoying
3321 part was that in Python 2.2, shlex.split() doesn't exist, so I had
3326 part was that in Python 2.2, shlex.split() doesn't exist, so I had
3322 to backport it from 2.3, with several frail hacks (the shlex
3327 to backport it from 2.3, with several frail hacks (the shlex
3323 module is rather limited in 2.2). Thanks to a suggestion by Ville
3328 module is rather limited in 2.2). Thanks to a suggestion by Ville
3324 Vainio <vivainio@kolumbus.fi>. For Python 2.3 there should be no
3329 Vainio <vivainio@kolumbus.fi>. For Python 2.3 there should be no
3325 problem.
3330 problem.
3326
3331
3327 (Magic.magic_system_verbose): new toggle to print the actual
3332 (Magic.magic_system_verbose): new toggle to print the actual
3328 system calls made by ipython. Mainly for debugging purposes.
3333 system calls made by ipython. Mainly for debugging purposes.
3329
3334
3330 * IPython/GnuplotRuntime.py (gnu_out): fix bug for cygwin, which
3335 * IPython/GnuplotRuntime.py (gnu_out): fix bug for cygwin, which
3331 doesn't support persistence. Reported (and fix suggested) by
3336 doesn't support persistence. Reported (and fix suggested) by
3332 Travis Caldwell <travis_caldwell2000@yahoo.com>.
3337 Travis Caldwell <travis_caldwell2000@yahoo.com>.
3333
3338
3334 2004-06-26 Fernando Perez <fperez@colorado.edu>
3339 2004-06-26 Fernando Perez <fperez@colorado.edu>
3335
3340
3336 * IPython/Logger.py (Logger.log): fix to handle correctly empty
3341 * IPython/Logger.py (Logger.log): fix to handle correctly empty
3337 continue prompts.
3342 continue prompts.
3338
3343
3339 * IPython/Extensions/InterpreterExec.py (pysh): moved the pysh()
3344 * IPython/Extensions/InterpreterExec.py (pysh): moved the pysh()
3340 function (basically a big docstring) and a few more things here to
3345 function (basically a big docstring) and a few more things here to
3341 speedup startup. pysh.py is now very lightweight. We want because
3346 speedup startup. pysh.py is now very lightweight. We want because
3342 it gets execfile'd, while InterpreterExec gets imported, so
3347 it gets execfile'd, while InterpreterExec gets imported, so
3343 byte-compilation saves time.
3348 byte-compilation saves time.
3344
3349
3345 2004-06-25 Fernando Perez <fperez@colorado.edu>
3350 2004-06-25 Fernando Perez <fperez@colorado.edu>
3346
3351
3347 * IPython/Magic.py (Magic.magic_cd): Fixed to restore usage of 'cd
3352 * IPython/Magic.py (Magic.magic_cd): Fixed to restore usage of 'cd
3348 -NUM', which was recently broken.
3353 -NUM', which was recently broken.
3349
3354
3350 * IPython/iplib.py (InteractiveShell.handle_shell_escape): allow !
3355 * IPython/iplib.py (InteractiveShell.handle_shell_escape): allow !
3351 in multi-line input (but not !!, which doesn't make sense there).
3356 in multi-line input (but not !!, which doesn't make sense there).
3352
3357
3353 * IPython/UserConfig/ipythonrc: made autoindent on by default.
3358 * IPython/UserConfig/ipythonrc: made autoindent on by default.
3354 It's just too useful, and people can turn it off in the less
3359 It's just too useful, and people can turn it off in the less
3355 common cases where it's a problem.
3360 common cases where it's a problem.
3356
3361
3357 2004-06-24 Fernando Perez <fperez@colorado.edu>
3362 2004-06-24 Fernando Perez <fperez@colorado.edu>
3358
3363
3359 * IPython/iplib.py (InteractiveShell._prefilter): big change -
3364 * IPython/iplib.py (InteractiveShell._prefilter): big change -
3360 special syntaxes (like alias calling) is now allied in multi-line
3365 special syntaxes (like alias calling) is now allied in multi-line
3361 input. This is still _very_ experimental, but it's necessary for
3366 input. This is still _very_ experimental, but it's necessary for
3362 efficient shell usage combining python looping syntax with system
3367 efficient shell usage combining python looping syntax with system
3363 calls. For now it's restricted to aliases, I don't think it
3368 calls. For now it's restricted to aliases, I don't think it
3364 really even makes sense to have this for magics.
3369 really even makes sense to have this for magics.
3365
3370
3366 2004-06-23 Fernando Perez <fperez@colorado.edu>
3371 2004-06-23 Fernando Perez <fperez@colorado.edu>
3367
3372
3368 * IPython/Extensions/InterpreterExec.py (prefilter_shell): Added
3373 * IPython/Extensions/InterpreterExec.py (prefilter_shell): Added
3369 $var=cmd <=> @sc var=cmd and $$var=cmd <=> @sc -l var=cmd.
3374 $var=cmd <=> @sc var=cmd and $$var=cmd <=> @sc -l var=cmd.
3370
3375
3371 * IPython/Magic.py (Magic.magic_rehashx): modified to handle
3376 * IPython/Magic.py (Magic.magic_rehashx): modified to handle
3372 extensions under Windows (after code sent by Gary Bishop). The
3377 extensions under Windows (after code sent by Gary Bishop). The
3373 extensions considered 'executable' are stored in IPython's rc
3378 extensions considered 'executable' are stored in IPython's rc
3374 structure as win_exec_ext.
3379 structure as win_exec_ext.
3375
3380
3376 * IPython/genutils.py (shell): new function, like system() but
3381 * IPython/genutils.py (shell): new function, like system() but
3377 without return value. Very useful for interactive shell work.
3382 without return value. Very useful for interactive shell work.
3378
3383
3379 * IPython/Magic.py (Magic.magic_unalias): New @unalias function to
3384 * IPython/Magic.py (Magic.magic_unalias): New @unalias function to
3380 delete aliases.
3385 delete aliases.
3381
3386
3382 * IPython/iplib.py (InteractiveShell.alias_table_update): make
3387 * IPython/iplib.py (InteractiveShell.alias_table_update): make
3383 sure that the alias table doesn't contain python keywords.
3388 sure that the alias table doesn't contain python keywords.
3384
3389
3385 2004-06-21 Fernando Perez <fperez@colorado.edu>
3390 2004-06-21 Fernando Perez <fperez@colorado.edu>
3386
3391
3387 * IPython/Magic.py (Magic.magic_rehash): Fix crash when
3392 * IPython/Magic.py (Magic.magic_rehash): Fix crash when
3388 non-existent items are found in $PATH. Reported by Thorsten.
3393 non-existent items are found in $PATH. Reported by Thorsten.
3389
3394
3390 2004-06-20 Fernando Perez <fperez@colorado.edu>
3395 2004-06-20 Fernando Perez <fperez@colorado.edu>
3391
3396
3392 * IPython/iplib.py (complete): modified the completer so that the
3397 * IPython/iplib.py (complete): modified the completer so that the
3393 order of priorities can be easily changed at runtime.
3398 order of priorities can be easily changed at runtime.
3394
3399
3395 * IPython/Extensions/InterpreterExec.py (prefilter_shell):
3400 * IPython/Extensions/InterpreterExec.py (prefilter_shell):
3396 Modified to auto-execute all lines beginning with '~', '/' or '.'.
3401 Modified to auto-execute all lines beginning with '~', '/' or '.'.
3397
3402
3398 * IPython/Magic.py (Magic.magic_sx): modified @sc and @sx to
3403 * IPython/Magic.py (Magic.magic_sx): modified @sc and @sx to
3399 expand Python variables prepended with $ in all system calls. The
3404 expand Python variables prepended with $ in all system calls. The
3400 same was done to InteractiveShell.handle_shell_escape. Now all
3405 same was done to InteractiveShell.handle_shell_escape. Now all
3401 system access mechanisms (!, !!, @sc, @sx and aliases) allow the
3406 system access mechanisms (!, !!, @sc, @sx and aliases) allow the
3402 expansion of python variables and expressions according to the
3407 expansion of python variables and expressions according to the
3403 syntax of PEP-215 - http://www.python.org/peps/pep-0215.html.
3408 syntax of PEP-215 - http://www.python.org/peps/pep-0215.html.
3404
3409
3405 Though PEP-215 has been rejected, a similar (but simpler) one
3410 Though PEP-215 has been rejected, a similar (but simpler) one
3406 seems like it will go into Python 2.4, PEP-292 -
3411 seems like it will go into Python 2.4, PEP-292 -
3407 http://www.python.org/peps/pep-0292.html.
3412 http://www.python.org/peps/pep-0292.html.
3408
3413
3409 I'll keep the full syntax of PEP-215, since IPython has since the
3414 I'll keep the full syntax of PEP-215, since IPython has since the
3410 start used Ka-Ping Yee's reference implementation discussed there
3415 start used Ka-Ping Yee's reference implementation discussed there
3411 (Itpl), and I actually like the powerful semantics it offers.
3416 (Itpl), and I actually like the powerful semantics it offers.
3412
3417
3413 In order to access normal shell variables, the $ has to be escaped
3418 In order to access normal shell variables, the $ has to be escaped
3414 via an extra $. For example:
3419 via an extra $. For example:
3415
3420
3416 In [7]: PATH='a python variable'
3421 In [7]: PATH='a python variable'
3417
3422
3418 In [8]: !echo $PATH
3423 In [8]: !echo $PATH
3419 a python variable
3424 a python variable
3420
3425
3421 In [9]: !echo $$PATH
3426 In [9]: !echo $$PATH
3422 /usr/local/lf9560/bin:/usr/local/intel/compiler70/ia32/bin:...
3427 /usr/local/lf9560/bin:/usr/local/intel/compiler70/ia32/bin:...
3423
3428
3424 (Magic.parse_options): escape $ so the shell doesn't evaluate
3429 (Magic.parse_options): escape $ so the shell doesn't evaluate
3425 things prematurely.
3430 things prematurely.
3426
3431
3427 * IPython/iplib.py (InteractiveShell.call_alias): added the
3432 * IPython/iplib.py (InteractiveShell.call_alias): added the
3428 ability for aliases to expand python variables via $.
3433 ability for aliases to expand python variables via $.
3429
3434
3430 * IPython/Magic.py (Magic.magic_rehash): based on the new alias
3435 * IPython/Magic.py (Magic.magic_rehash): based on the new alias
3431 system, now there's a @rehash/@rehashx pair of magics. These work
3436 system, now there's a @rehash/@rehashx pair of magics. These work
3432 like the csh rehash command, and can be invoked at any time. They
3437 like the csh rehash command, and can be invoked at any time. They
3433 build a table of aliases to everything in the user's $PATH
3438 build a table of aliases to everything in the user's $PATH
3434 (@rehash uses everything, @rehashx is slower but only adds
3439 (@rehash uses everything, @rehashx is slower but only adds
3435 executable files). With this, the pysh.py-based shell profile can
3440 executable files). With this, the pysh.py-based shell profile can
3436 now simply call rehash upon startup, and full access to all
3441 now simply call rehash upon startup, and full access to all
3437 programs in the user's path is obtained.
3442 programs in the user's path is obtained.
3438
3443
3439 * IPython/iplib.py (InteractiveShell.call_alias): The new alias
3444 * IPython/iplib.py (InteractiveShell.call_alias): The new alias
3440 functionality is now fully in place. I removed the old dynamic
3445 functionality is now fully in place. I removed the old dynamic
3441 code generation based approach, in favor of a much lighter one
3446 code generation based approach, in favor of a much lighter one
3442 based on a simple dict. The advantage is that this allows me to
3447 based on a simple dict. The advantage is that this allows me to
3443 now have thousands of aliases with negligible cost (unthinkable
3448 now have thousands of aliases with negligible cost (unthinkable
3444 with the old system).
3449 with the old system).
3445
3450
3446 2004-06-19 Fernando Perez <fperez@colorado.edu>
3451 2004-06-19 Fernando Perez <fperez@colorado.edu>
3447
3452
3448 * IPython/iplib.py (__init__): extended MagicCompleter class to
3453 * IPython/iplib.py (__init__): extended MagicCompleter class to
3449 also complete (last in priority) on user aliases.
3454 also complete (last in priority) on user aliases.
3450
3455
3451 * IPython/Itpl.py (Itpl.__str__): fixed order of globals/locals in
3456 * IPython/Itpl.py (Itpl.__str__): fixed order of globals/locals in
3452 call to eval.
3457 call to eval.
3453 (ItplNS.__init__): Added a new class which functions like Itpl,
3458 (ItplNS.__init__): Added a new class which functions like Itpl,
3454 but allows configuring the namespace for the evaluation to occur
3459 but allows configuring the namespace for the evaluation to occur
3455 in.
3460 in.
3456
3461
3457 2004-06-18 Fernando Perez <fperez@colorado.edu>
3462 2004-06-18 Fernando Perez <fperez@colorado.edu>
3458
3463
3459 * IPython/iplib.py (InteractiveShell.runcode): modify to print a
3464 * IPython/iplib.py (InteractiveShell.runcode): modify to print a
3460 better message when 'exit' or 'quit' are typed (a common newbie
3465 better message when 'exit' or 'quit' are typed (a common newbie
3461 confusion).
3466 confusion).
3462
3467
3463 * IPython/Magic.py (Magic.magic_colors): Added the runtime color
3468 * IPython/Magic.py (Magic.magic_colors): Added the runtime color
3464 check for Windows users.
3469 check for Windows users.
3465
3470
3466 * IPython/iplib.py (InteractiveShell.user_setup): removed
3471 * IPython/iplib.py (InteractiveShell.user_setup): removed
3467 disabling of colors for Windows. I'll test at runtime and issue a
3472 disabling of colors for Windows. I'll test at runtime and issue a
3468 warning if Gary's readline isn't found, as to nudge users to
3473 warning if Gary's readline isn't found, as to nudge users to
3469 download it.
3474 download it.
3470
3475
3471 2004-06-16 Fernando Perez <fperez@colorado.edu>
3476 2004-06-16 Fernando Perez <fperez@colorado.edu>
3472
3477
3473 * IPython/genutils.py (Stream.__init__): changed to print errors
3478 * IPython/genutils.py (Stream.__init__): changed to print errors
3474 to sys.stderr. I had a circular dependency here. Now it's
3479 to sys.stderr. I had a circular dependency here. Now it's
3475 possible to run ipython as IDLE's shell (consider this pre-alpha,
3480 possible to run ipython as IDLE's shell (consider this pre-alpha,
3476 since true stdout things end up in the starting terminal instead
3481 since true stdout things end up in the starting terminal instead
3477 of IDLE's out).
3482 of IDLE's out).
3478
3483
3479 * IPython/Prompts.py (Prompt2.set_colors): prevent crashes for
3484 * IPython/Prompts.py (Prompt2.set_colors): prevent crashes for
3480 users who haven't # updated their prompt_in2 definitions. Remove
3485 users who haven't # updated their prompt_in2 definitions. Remove
3481 eventually.
3486 eventually.
3482 (multiple_replace): added credit to original ASPN recipe.
3487 (multiple_replace): added credit to original ASPN recipe.
3483
3488
3484 2004-06-15 Fernando Perez <fperez@colorado.edu>
3489 2004-06-15 Fernando Perez <fperez@colorado.edu>
3485
3490
3486 * IPython/iplib.py (InteractiveShell.__init__): add 'cp' to the
3491 * IPython/iplib.py (InteractiveShell.__init__): add 'cp' to the
3487 list of auto-defined aliases.
3492 list of auto-defined aliases.
3488
3493
3489 2004-06-13 Fernando Perez <fperez@colorado.edu>
3494 2004-06-13 Fernando Perez <fperez@colorado.edu>
3490
3495
3491 * setup.py (scriptfiles): Don't trigger win_post_install unless an
3496 * setup.py (scriptfiles): Don't trigger win_post_install unless an
3492 install was really requested (so setup.py can be used for other
3497 install was really requested (so setup.py can be used for other
3493 things under Windows).
3498 things under Windows).
3494
3499
3495 2004-06-10 Fernando Perez <fperez@colorado.edu>
3500 2004-06-10 Fernando Perez <fperez@colorado.edu>
3496
3501
3497 * IPython/Logger.py (Logger.create_log): Manually remove any old
3502 * IPython/Logger.py (Logger.create_log): Manually remove any old
3498 backup, since os.remove may fail under Windows. Fixes bug
3503 backup, since os.remove may fail under Windows. Fixes bug
3499 reported by Thorsten.
3504 reported by Thorsten.
3500
3505
3501 2004-06-09 Fernando Perez <fperez@colorado.edu>
3506 2004-06-09 Fernando Perez <fperez@colorado.edu>
3502
3507
3503 * examples/example-embed.py: fixed all references to %n (replaced
3508 * examples/example-embed.py: fixed all references to %n (replaced
3504 with \\# for ps1/out prompts and with \\D for ps2 prompts). Done
3509 with \\# for ps1/out prompts and with \\D for ps2 prompts). Done
3505 for all examples and the manual as well.
3510 for all examples and the manual as well.
3506
3511
3507 2004-06-08 Fernando Perez <fperez@colorado.edu>
3512 2004-06-08 Fernando Perez <fperez@colorado.edu>
3508
3513
3509 * IPython/Prompts.py (Prompt2.set_p_str): fixed all prompt
3514 * IPython/Prompts.py (Prompt2.set_p_str): fixed all prompt
3510 alignment and color management. All 3 prompt subsystems now
3515 alignment and color management. All 3 prompt subsystems now
3511 inherit from BasePrompt.
3516 inherit from BasePrompt.
3512
3517
3513 * tools/release: updates for windows installer build and tag rpms
3518 * tools/release: updates for windows installer build and tag rpms
3514 with python version (since paths are fixed).
3519 with python version (since paths are fixed).
3515
3520
3516 * IPython/UserConfig/ipythonrc: modified to use \# instead of %n,
3521 * IPython/UserConfig/ipythonrc: modified to use \# instead of %n,
3517 which will become eventually obsolete. Also fixed the default
3522 which will become eventually obsolete. Also fixed the default
3518 prompt_in2 to use \D, so at least new users start with the correct
3523 prompt_in2 to use \D, so at least new users start with the correct
3519 defaults.
3524 defaults.
3520 WARNING: Users with existing ipythonrc files will need to apply
3525 WARNING: Users with existing ipythonrc files will need to apply
3521 this fix manually!
3526 this fix manually!
3522
3527
3523 * setup.py: make windows installer (.exe). This is finally the
3528 * setup.py: make windows installer (.exe). This is finally the
3524 integration of an old patch by Cory Dodt <dodt-AT-fcoe.k12.ca.us>,
3529 integration of an old patch by Cory Dodt <dodt-AT-fcoe.k12.ca.us>,
3525 which I hadn't included because it required Python 2.3 (or recent
3530 which I hadn't included because it required Python 2.3 (or recent
3526 distutils).
3531 distutils).
3527
3532
3528 * IPython/usage.py (__doc__): update docs (and manpage) to reflect
3533 * IPython/usage.py (__doc__): update docs (and manpage) to reflect
3529 usage of new '\D' escape.
3534 usage of new '\D' escape.
3530
3535
3531 * IPython/Prompts.py (ROOT_SYMBOL): Small fix for Windows (which
3536 * IPython/Prompts.py (ROOT_SYMBOL): Small fix for Windows (which
3532 lacks os.getuid())
3537 lacks os.getuid())
3533 (CachedOutput.set_colors): Added the ability to turn coloring
3538 (CachedOutput.set_colors): Added the ability to turn coloring
3534 on/off with @colors even for manually defined prompt colors. It
3539 on/off with @colors even for manually defined prompt colors. It
3535 uses a nasty global, but it works safely and via the generic color
3540 uses a nasty global, but it works safely and via the generic color
3536 handling mechanism.
3541 handling mechanism.
3537 (Prompt2.__init__): Introduced new escape '\D' for continuation
3542 (Prompt2.__init__): Introduced new escape '\D' for continuation
3538 prompts. It represents the counter ('\#') as dots.
3543 prompts. It represents the counter ('\#') as dots.
3539 *** NOTE *** THIS IS A BACKWARDS-INCOMPATIBLE CHANGE. Users will
3544 *** NOTE *** THIS IS A BACKWARDS-INCOMPATIBLE CHANGE. Users will
3540 need to update their ipythonrc files and replace '%n' with '\D' in
3545 need to update their ipythonrc files and replace '%n' with '\D' in
3541 their prompt_in2 settings everywhere. Sorry, but there's
3546 their prompt_in2 settings everywhere. Sorry, but there's
3542 otherwise no clean way to get all prompts to properly align. The
3547 otherwise no clean way to get all prompts to properly align. The
3543 ipythonrc shipped with IPython has been updated.
3548 ipythonrc shipped with IPython has been updated.
3544
3549
3545 2004-06-07 Fernando Perez <fperez@colorado.edu>
3550 2004-06-07 Fernando Perez <fperez@colorado.edu>
3546
3551
3547 * setup.py (isfile): Pass local_icons option to latex2html, so the
3552 * setup.py (isfile): Pass local_icons option to latex2html, so the
3548 resulting HTML file is self-contained. Thanks to
3553 resulting HTML file is self-contained. Thanks to
3549 dryice-AT-liu.com.cn for the tip.
3554 dryice-AT-liu.com.cn for the tip.
3550
3555
3551 * pysh.py: I created a new profile 'shell', which implements a
3556 * pysh.py: I created a new profile 'shell', which implements a
3552 _rudimentary_ IPython-based shell. This is in NO WAY a realy
3557 _rudimentary_ IPython-based shell. This is in NO WAY a realy
3553 system shell, nor will it become one anytime soon. It's mainly
3558 system shell, nor will it become one anytime soon. It's mainly
3554 meant to illustrate the use of the new flexible bash-like prompts.
3559 meant to illustrate the use of the new flexible bash-like prompts.
3555 I guess it could be used by hardy souls for true shell management,
3560 I guess it could be used by hardy souls for true shell management,
3556 but it's no tcsh/bash... pysh.py is loaded by the 'shell'
3561 but it's no tcsh/bash... pysh.py is loaded by the 'shell'
3557 profile. This uses the InterpreterExec extension provided by
3562 profile. This uses the InterpreterExec extension provided by
3558 W.J. van der Laan <gnufnork-AT-hetdigitalegat.nl>
3563 W.J. van der Laan <gnufnork-AT-hetdigitalegat.nl>
3559
3564
3560 * IPython/Prompts.py (PromptOut.__str__): now it will correctly
3565 * IPython/Prompts.py (PromptOut.__str__): now it will correctly
3561 auto-align itself with the length of the previous input prompt
3566 auto-align itself with the length of the previous input prompt
3562 (taking into account the invisible color escapes).
3567 (taking into account the invisible color escapes).
3563 (CachedOutput.__init__): Large restructuring of this class. Now
3568 (CachedOutput.__init__): Large restructuring of this class. Now
3564 all three prompts (primary1, primary2, output) are proper objects,
3569 all three prompts (primary1, primary2, output) are proper objects,
3565 managed by the 'parent' CachedOutput class. The code is still a
3570 managed by the 'parent' CachedOutput class. The code is still a
3566 bit hackish (all prompts share state via a pointer to the cache),
3571 bit hackish (all prompts share state via a pointer to the cache),
3567 but it's overall far cleaner than before.
3572 but it's overall far cleaner than before.
3568
3573
3569 * IPython/genutils.py (getoutputerror): modified to add verbose,
3574 * IPython/genutils.py (getoutputerror): modified to add verbose,
3570 debug and header options. This makes the interface of all getout*
3575 debug and header options. This makes the interface of all getout*
3571 functions uniform.
3576 functions uniform.
3572 (SystemExec.getoutputerror): added getoutputerror to SystemExec.
3577 (SystemExec.getoutputerror): added getoutputerror to SystemExec.
3573
3578
3574 * IPython/Magic.py (Magic.default_option): added a function to
3579 * IPython/Magic.py (Magic.default_option): added a function to
3575 allow registering default options for any magic command. This
3580 allow registering default options for any magic command. This
3576 makes it easy to have profiles which customize the magics globally
3581 makes it easy to have profiles which customize the magics globally
3577 for a certain use. The values set through this function are
3582 for a certain use. The values set through this function are
3578 picked up by the parse_options() method, which all magics should
3583 picked up by the parse_options() method, which all magics should
3579 use to parse their options.
3584 use to parse their options.
3580
3585
3581 * IPython/genutils.py (warn): modified the warnings framework to
3586 * IPython/genutils.py (warn): modified the warnings framework to
3582 use the Term I/O class. I'm trying to slowly unify all of
3587 use the Term I/O class. I'm trying to slowly unify all of
3583 IPython's I/O operations to pass through Term.
3588 IPython's I/O operations to pass through Term.
3584
3589
3585 * IPython/Prompts.py (Prompt2._str_other): Added functionality in
3590 * IPython/Prompts.py (Prompt2._str_other): Added functionality in
3586 the secondary prompt to correctly match the length of the primary
3591 the secondary prompt to correctly match the length of the primary
3587 one for any prompt. Now multi-line code will properly line up
3592 one for any prompt. Now multi-line code will properly line up
3588 even for path dependent prompts, such as the new ones available
3593 even for path dependent prompts, such as the new ones available
3589 via the prompt_specials.
3594 via the prompt_specials.
3590
3595
3591 2004-06-06 Fernando Perez <fperez@colorado.edu>
3596 2004-06-06 Fernando Perez <fperez@colorado.edu>
3592
3597
3593 * IPython/Prompts.py (prompt_specials): Added the ability to have
3598 * IPython/Prompts.py (prompt_specials): Added the ability to have
3594 bash-like special sequences in the prompts, which get
3599 bash-like special sequences in the prompts, which get
3595 automatically expanded. Things like hostname, current working
3600 automatically expanded. Things like hostname, current working
3596 directory and username are implemented already, but it's easy to
3601 directory and username are implemented already, but it's easy to
3597 add more in the future. Thanks to a patch by W.J. van der Laan
3602 add more in the future. Thanks to a patch by W.J. van der Laan
3598 <gnufnork-AT-hetdigitalegat.nl>
3603 <gnufnork-AT-hetdigitalegat.nl>
3599 (prompt_specials): Added color support for prompt strings, so
3604 (prompt_specials): Added color support for prompt strings, so
3600 users can define arbitrary color setups for their prompts.
3605 users can define arbitrary color setups for their prompts.
3601
3606
3602 2004-06-05 Fernando Perez <fperez@colorado.edu>
3607 2004-06-05 Fernando Perez <fperez@colorado.edu>
3603
3608
3604 * IPython/genutils.py (Term.reopen_all): Added Windows-specific
3609 * IPython/genutils.py (Term.reopen_all): Added Windows-specific
3605 code to load Gary Bishop's readline and configure it
3610 code to load Gary Bishop's readline and configure it
3606 automatically. Thanks to Gary for help on this.
3611 automatically. Thanks to Gary for help on this.
3607
3612
3608 2004-06-01 Fernando Perez <fperez@colorado.edu>
3613 2004-06-01 Fernando Perez <fperez@colorado.edu>
3609
3614
3610 * IPython/Logger.py (Logger.create_log): fix bug for logging
3615 * IPython/Logger.py (Logger.create_log): fix bug for logging
3611 with no filename (previous fix was incomplete).
3616 with no filename (previous fix was incomplete).
3612
3617
3613 2004-05-25 Fernando Perez <fperez@colorado.edu>
3618 2004-05-25 Fernando Perez <fperez@colorado.edu>
3614
3619
3615 * IPython/Magic.py (Magic.parse_options): fix bug where naked
3620 * IPython/Magic.py (Magic.parse_options): fix bug where naked
3616 parens would get passed to the shell.
3621 parens would get passed to the shell.
3617
3622
3618 2004-05-20 Fernando Perez <fperez@colorado.edu>
3623 2004-05-20 Fernando Perez <fperez@colorado.edu>
3619
3624
3620 * IPython/Magic.py (Magic.magic_prun): changed default profile
3625 * IPython/Magic.py (Magic.magic_prun): changed default profile
3621 sort order to 'time' (the more common profiling need).
3626 sort order to 'time' (the more common profiling need).
3622
3627
3623 * IPython/OInspect.py (Inspector.pinfo): flush the inspect cache
3628 * IPython/OInspect.py (Inspector.pinfo): flush the inspect cache
3624 so that source code shown is guaranteed in sync with the file on
3629 so that source code shown is guaranteed in sync with the file on
3625 disk (also changed in psource). Similar fix to the one for
3630 disk (also changed in psource). Similar fix to the one for
3626 ultraTB on 2004-05-06. Thanks to a bug report by Yann Le Du
3631 ultraTB on 2004-05-06. Thanks to a bug report by Yann Le Du
3627 <yann.ledu-AT-noos.fr>.
3632 <yann.ledu-AT-noos.fr>.
3628
3633
3629 * IPython/Magic.py (Magic.parse_options): Fixed bug where commands
3634 * IPython/Magic.py (Magic.parse_options): Fixed bug where commands
3630 with a single option would not be correctly parsed. Closes
3635 with a single option would not be correctly parsed. Closes
3631 http://www.scipy.net/roundup/ipython/issue14. This bug had been
3636 http://www.scipy.net/roundup/ipython/issue14. This bug had been
3632 introduced in 0.6.0 (on 2004-05-06).
3637 introduced in 0.6.0 (on 2004-05-06).
3633
3638
3634 2004-05-13 *** Released version 0.6.0
3639 2004-05-13 *** Released version 0.6.0
3635
3640
3636 2004-05-13 Fernando Perez <fperez@colorado.edu>
3641 2004-05-13 Fernando Perez <fperez@colorado.edu>
3637
3642
3638 * debian/: Added debian/ directory to CVS, so that debian support
3643 * debian/: Added debian/ directory to CVS, so that debian support
3639 is publicly accessible. The debian package is maintained by Jack
3644 is publicly accessible. The debian package is maintained by Jack
3640 Moffit <jack-AT-xiph.org>.
3645 Moffit <jack-AT-xiph.org>.
3641
3646
3642 * Documentation: included the notes about an ipython-based system
3647 * Documentation: included the notes about an ipython-based system
3643 shell (the hypothetical 'pysh') into the new_design.pdf document,
3648 shell (the hypothetical 'pysh') into the new_design.pdf document,
3644 so that these ideas get distributed to users along with the
3649 so that these ideas get distributed to users along with the
3645 official documentation.
3650 official documentation.
3646
3651
3647 2004-05-10 Fernando Perez <fperez@colorado.edu>
3652 2004-05-10 Fernando Perez <fperez@colorado.edu>
3648
3653
3649 * IPython/Logger.py (Logger.create_log): fix recently introduced
3654 * IPython/Logger.py (Logger.create_log): fix recently introduced
3650 bug (misindented line) where logstart would fail when not given an
3655 bug (misindented line) where logstart would fail when not given an
3651 explicit filename.
3656 explicit filename.
3652
3657
3653 2004-05-09 Fernando Perez <fperez@colorado.edu>
3658 2004-05-09 Fernando Perez <fperez@colorado.edu>
3654
3659
3655 * IPython/Magic.py (Magic.parse_options): skip system call when
3660 * IPython/Magic.py (Magic.parse_options): skip system call when
3656 there are no options to look for. Faster, cleaner for the common
3661 there are no options to look for. Faster, cleaner for the common
3657 case.
3662 case.
3658
3663
3659 * Documentation: many updates to the manual: describing Windows
3664 * Documentation: many updates to the manual: describing Windows
3660 support better, Gnuplot updates, credits, misc small stuff. Also
3665 support better, Gnuplot updates, credits, misc small stuff. Also
3661 updated the new_design doc a bit.
3666 updated the new_design doc a bit.
3662
3667
3663 2004-05-06 *** Released version 0.6.0.rc1
3668 2004-05-06 *** Released version 0.6.0.rc1
3664
3669
3665 2004-05-06 Fernando Perez <fperez@colorado.edu>
3670 2004-05-06 Fernando Perez <fperez@colorado.edu>
3666
3671
3667 * IPython/ultraTB.py (ListTB.text): modified a ton of string +=
3672 * IPython/ultraTB.py (ListTB.text): modified a ton of string +=
3668 operations to use the vastly more efficient list/''.join() method.
3673 operations to use the vastly more efficient list/''.join() method.
3669 (FormattedTB.text): Fix
3674 (FormattedTB.text): Fix
3670 http://www.scipy.net/roundup/ipython/issue12 - exception source
3675 http://www.scipy.net/roundup/ipython/issue12 - exception source
3671 extract not updated after reload. Thanks to Mike Salib
3676 extract not updated after reload. Thanks to Mike Salib
3672 <msalib-AT-mit.edu> for pinning the source of the problem.
3677 <msalib-AT-mit.edu> for pinning the source of the problem.
3673 Fortunately, the solution works inside ipython and doesn't require
3678 Fortunately, the solution works inside ipython and doesn't require
3674 any changes to python proper.
3679 any changes to python proper.
3675
3680
3676 * IPython/Magic.py (Magic.parse_options): Improved to process the
3681 * IPython/Magic.py (Magic.parse_options): Improved to process the
3677 argument list as a true shell would (by actually using the
3682 argument list as a true shell would (by actually using the
3678 underlying system shell). This way, all @magics automatically get
3683 underlying system shell). This way, all @magics automatically get
3679 shell expansion for variables. Thanks to a comment by Alex
3684 shell expansion for variables. Thanks to a comment by Alex
3680 Schmolck.
3685 Schmolck.
3681
3686
3682 2004-04-04 Fernando Perez <fperez@colorado.edu>
3687 2004-04-04 Fernando Perez <fperez@colorado.edu>
3683
3688
3684 * IPython/iplib.py (InteractiveShell.interact): Added a special
3689 * IPython/iplib.py (InteractiveShell.interact): Added a special
3685 trap for a debugger quit exception, which is basically impossible
3690 trap for a debugger quit exception, which is basically impossible
3686 to handle by normal mechanisms, given what pdb does to the stack.
3691 to handle by normal mechanisms, given what pdb does to the stack.
3687 This fixes a crash reported by <fgibbons-AT-llama.med.harvard.edu>.
3692 This fixes a crash reported by <fgibbons-AT-llama.med.harvard.edu>.
3688
3693
3689 2004-04-03 Fernando Perez <fperez@colorado.edu>
3694 2004-04-03 Fernando Perez <fperez@colorado.edu>
3690
3695
3691 * IPython/genutils.py (Term): Standardized the names of the Term
3696 * IPython/genutils.py (Term): Standardized the names of the Term
3692 class streams to cin/cout/cerr, following C++ naming conventions
3697 class streams to cin/cout/cerr, following C++ naming conventions
3693 (I can't use in/out/err because 'in' is not a valid attribute
3698 (I can't use in/out/err because 'in' is not a valid attribute
3694 name).
3699 name).
3695
3700
3696 * IPython/iplib.py (InteractiveShell.interact): don't increment
3701 * IPython/iplib.py (InteractiveShell.interact): don't increment
3697 the prompt if there's no user input. By Daniel 'Dang' Griffith
3702 the prompt if there's no user input. By Daniel 'Dang' Griffith
3698 <pythondev-dang-AT-lazytwinacres.net>, after a suggestion from
3703 <pythondev-dang-AT-lazytwinacres.net>, after a suggestion from
3699 Francois Pinard.
3704 Francois Pinard.
3700
3705
3701 2004-04-02 Fernando Perez <fperez@colorado.edu>
3706 2004-04-02 Fernando Perez <fperez@colorado.edu>
3702
3707
3703 * IPython/genutils.py (Stream.__init__): Modified to survive at
3708 * IPython/genutils.py (Stream.__init__): Modified to survive at
3704 least importing in contexts where stdin/out/err aren't true file
3709 least importing in contexts where stdin/out/err aren't true file
3705 objects, such as PyCrust (they lack fileno() and mode). However,
3710 objects, such as PyCrust (they lack fileno() and mode). However,
3706 the recovery facilities which rely on these things existing will
3711 the recovery facilities which rely on these things existing will
3707 not work.
3712 not work.
3708
3713
3709 2004-04-01 Fernando Perez <fperez@colorado.edu>
3714 2004-04-01 Fernando Perez <fperez@colorado.edu>
3710
3715
3711 * IPython/Magic.py (Magic.magic_sx): modified (as well as @sc) to
3716 * IPython/Magic.py (Magic.magic_sx): modified (as well as @sc) to
3712 use the new getoutputerror() function, so it properly
3717 use the new getoutputerror() function, so it properly
3713 distinguishes stdout/err.
3718 distinguishes stdout/err.
3714
3719
3715 * IPython/genutils.py (getoutputerror): added a function to
3720 * IPython/genutils.py (getoutputerror): added a function to
3716 capture separately the standard output and error of a command.
3721 capture separately the standard output and error of a command.
3717 After a comment from dang on the mailing lists. This code is
3722 After a comment from dang on the mailing lists. This code is
3718 basically a modified version of commands.getstatusoutput(), from
3723 basically a modified version of commands.getstatusoutput(), from
3719 the standard library.
3724 the standard library.
3720
3725
3721 * IPython/iplib.py (InteractiveShell.handle_shell_escape): added
3726 * IPython/iplib.py (InteractiveShell.handle_shell_escape): added
3722 '!!' as a special syntax (shorthand) to access @sx.
3727 '!!' as a special syntax (shorthand) to access @sx.
3723
3728
3724 * IPython/Magic.py (Magic.magic_sx): new magic, to execute a shell
3729 * IPython/Magic.py (Magic.magic_sx): new magic, to execute a shell
3725 command and return its output as a list split on '\n'.
3730 command and return its output as a list split on '\n'.
3726
3731
3727 2004-03-31 Fernando Perez <fperez@colorado.edu>
3732 2004-03-31 Fernando Perez <fperez@colorado.edu>
3728
3733
3729 * IPython/FakeModule.py (FakeModule.__init__): added __nonzero__
3734 * IPython/FakeModule.py (FakeModule.__init__): added __nonzero__
3730 method to dictionaries used as FakeModule instances if they lack
3735 method to dictionaries used as FakeModule instances if they lack
3731 it. At least pydoc in python2.3 breaks for runtime-defined
3736 it. At least pydoc in python2.3 breaks for runtime-defined
3732 functions without this hack. At some point I need to _really_
3737 functions without this hack. At some point I need to _really_
3733 understand what FakeModule is doing, because it's a gross hack.
3738 understand what FakeModule is doing, because it's a gross hack.
3734 But it solves Arnd's problem for now...
3739 But it solves Arnd's problem for now...
3735
3740
3736 2004-02-27 Fernando Perez <fperez@colorado.edu>
3741 2004-02-27 Fernando Perez <fperez@colorado.edu>
3737
3742
3738 * IPython/Logger.py (Logger.create_log): Fix bug where 'rotate'
3743 * IPython/Logger.py (Logger.create_log): Fix bug where 'rotate'
3739 mode would behave erratically. Also increased the number of
3744 mode would behave erratically. Also increased the number of
3740 possible logs in rotate mod to 999. Thanks to Rod Holland
3745 possible logs in rotate mod to 999. Thanks to Rod Holland
3741 <rhh@StructureLABS.com> for the report and fixes.
3746 <rhh@StructureLABS.com> for the report and fixes.
3742
3747
3743 2004-02-26 Fernando Perez <fperez@colorado.edu>
3748 2004-02-26 Fernando Perez <fperez@colorado.edu>
3744
3749
3745 * IPython/genutils.py (page): Check that the curses module really
3750 * IPython/genutils.py (page): Check that the curses module really
3746 has the initscr attribute before trying to use it. For some
3751 has the initscr attribute before trying to use it. For some
3747 reason, the Solaris curses module is missing this. I think this
3752 reason, the Solaris curses module is missing this. I think this
3748 should be considered a Solaris python bug, but I'm not sure.
3753 should be considered a Solaris python bug, but I'm not sure.
3749
3754
3750 2004-01-17 Fernando Perez <fperez@colorado.edu>
3755 2004-01-17 Fernando Perez <fperez@colorado.edu>
3751
3756
3752 * IPython/genutils.py (Stream.__init__): Changes to try to make
3757 * IPython/genutils.py (Stream.__init__): Changes to try to make
3753 ipython robust against stdin/out/err being closed by the user.
3758 ipython robust against stdin/out/err being closed by the user.
3754 This is 'user error' (and blocks a normal python session, at least
3759 This is 'user error' (and blocks a normal python session, at least
3755 the stdout case). However, Ipython should be able to survive such
3760 the stdout case). However, Ipython should be able to survive such
3756 instances of abuse as gracefully as possible. To simplify the
3761 instances of abuse as gracefully as possible. To simplify the
3757 coding and maintain compatibility with Gary Bishop's Term
3762 coding and maintain compatibility with Gary Bishop's Term
3758 contributions, I've made use of classmethods for this. I think
3763 contributions, I've made use of classmethods for this. I think
3759 this introduces a dependency on python 2.2.
3764 this introduces a dependency on python 2.2.
3760
3765
3761 2004-01-13 Fernando Perez <fperez@colorado.edu>
3766 2004-01-13 Fernando Perez <fperez@colorado.edu>
3762
3767
3763 * IPython/numutils.py (exp_safe): simplified the code a bit and
3768 * IPython/numutils.py (exp_safe): simplified the code a bit and
3764 removed the need for importing the kinds module altogether.
3769 removed the need for importing the kinds module altogether.
3765
3770
3766 2004-01-06 Fernando Perez <fperez@colorado.edu>
3771 2004-01-06 Fernando Perez <fperez@colorado.edu>
3767
3772
3768 * IPython/Magic.py (Magic.magic_sc): Made the shell capture system
3773 * IPython/Magic.py (Magic.magic_sc): Made the shell capture system
3769 a magic function instead, after some community feedback. No
3774 a magic function instead, after some community feedback. No
3770 special syntax will exist for it, but its name is deliberately
3775 special syntax will exist for it, but its name is deliberately
3771 very short.
3776 very short.
3772
3777
3773 2003-12-20 Fernando Perez <fperez@colorado.edu>
3778 2003-12-20 Fernando Perez <fperez@colorado.edu>
3774
3779
3775 * IPython/iplib.py (InteractiveShell.handle_shell_assign): Added
3780 * IPython/iplib.py (InteractiveShell.handle_shell_assign): Added
3776 new functionality, to automagically assign the result of a shell
3781 new functionality, to automagically assign the result of a shell
3777 command to a variable. I'll solicit some community feedback on
3782 command to a variable. I'll solicit some community feedback on
3778 this before making it permanent.
3783 this before making it permanent.
3779
3784
3780 * IPython/OInspect.py (Inspector.pinfo): Fix crash when info was
3785 * IPython/OInspect.py (Inspector.pinfo): Fix crash when info was
3781 requested about callables for which inspect couldn't obtain a
3786 requested about callables for which inspect couldn't obtain a
3782 proper argspec. Thanks to a crash report sent by Etienne
3787 proper argspec. Thanks to a crash report sent by Etienne
3783 Posthumus <etienne-AT-apple01.cs.vu.nl>.
3788 Posthumus <etienne-AT-apple01.cs.vu.nl>.
3784
3789
3785 2003-12-09 Fernando Perez <fperez@colorado.edu>
3790 2003-12-09 Fernando Perez <fperez@colorado.edu>
3786
3791
3787 * IPython/genutils.py (page): patch for the pager to work across
3792 * IPython/genutils.py (page): patch for the pager to work across
3788 various versions of Windows. By Gary Bishop.
3793 various versions of Windows. By Gary Bishop.
3789
3794
3790 2003-12-04 Fernando Perez <fperez@colorado.edu>
3795 2003-12-04 Fernando Perez <fperez@colorado.edu>
3791
3796
3792 * IPython/Gnuplot2.py (PlotItems): Fixes for working with
3797 * IPython/Gnuplot2.py (PlotItems): Fixes for working with
3793 Gnuplot.py version 1.7, whose internal names changed quite a bit.
3798 Gnuplot.py version 1.7, whose internal names changed quite a bit.
3794 While I tested this and it looks ok, there may still be corner
3799 While I tested this and it looks ok, there may still be corner
3795 cases I've missed.
3800 cases I've missed.
3796
3801
3797 2003-12-01 Fernando Perez <fperez@colorado.edu>
3802 2003-12-01 Fernando Perez <fperez@colorado.edu>
3798
3803
3799 * IPython/iplib.py (InteractiveShell._prefilter): Fixed a bug
3804 * IPython/iplib.py (InteractiveShell._prefilter): Fixed a bug
3800 where a line like 'p,q=1,2' would fail because the automagic
3805 where a line like 'p,q=1,2' would fail because the automagic
3801 system would be triggered for @p.
3806 system would be triggered for @p.
3802
3807
3803 * IPython/DPyGetOpt.py (DPyGetOpt.processArguments): Tab-related
3808 * IPython/DPyGetOpt.py (DPyGetOpt.processArguments): Tab-related
3804 cleanups, code unmodified.
3809 cleanups, code unmodified.
3805
3810
3806 * IPython/genutils.py (Term): added a class for IPython to handle
3811 * IPython/genutils.py (Term): added a class for IPython to handle
3807 output. In most cases it will just be a proxy for stdout/err, but
3812 output. In most cases it will just be a proxy for stdout/err, but
3808 having this allows modifications to be made for some platforms,
3813 having this allows modifications to be made for some platforms,
3809 such as handling color escapes under Windows. All of this code
3814 such as handling color escapes under Windows. All of this code
3810 was contributed by Gary Bishop, with minor modifications by me.
3815 was contributed by Gary Bishop, with minor modifications by me.
3811 The actual changes affect many files.
3816 The actual changes affect many files.
3812
3817
3813 2003-11-30 Fernando Perez <fperez@colorado.edu>
3818 2003-11-30 Fernando Perez <fperez@colorado.edu>
3814
3819
3815 * IPython/iplib.py (file_matches): new completion code, courtesy
3820 * IPython/iplib.py (file_matches): new completion code, courtesy
3816 of Jeff Collins. This enables filename completion again under
3821 of Jeff Collins. This enables filename completion again under
3817 python 2.3, which disabled it at the C level.
3822 python 2.3, which disabled it at the C level.
3818
3823
3819 2003-11-11 Fernando Perez <fperez@colorado.edu>
3824 2003-11-11 Fernando Perez <fperez@colorado.edu>
3820
3825
3821 * IPython/numutils.py (amap): Added amap() fn. Simple shorthand
3826 * IPython/numutils.py (amap): Added amap() fn. Simple shorthand
3822 for Numeric.array(map(...)), but often convenient.
3827 for Numeric.array(map(...)), but often convenient.
3823
3828
3824 2003-11-05 Fernando Perez <fperez@colorado.edu>
3829 2003-11-05 Fernando Perez <fperez@colorado.edu>
3825
3830
3826 * IPython/numutils.py (frange): Changed a call from int() to
3831 * IPython/numutils.py (frange): Changed a call from int() to
3827 int(round()) to prevent a problem reported with arange() in the
3832 int(round()) to prevent a problem reported with arange() in the
3828 numpy list.
3833 numpy list.
3829
3834
3830 2003-10-06 Fernando Perez <fperez@colorado.edu>
3835 2003-10-06 Fernando Perez <fperez@colorado.edu>
3831
3836
3832 * IPython/DPyGetOpt.py (DPyGetOpt.processArguments): changed to
3837 * IPython/DPyGetOpt.py (DPyGetOpt.processArguments): changed to
3833 prevent crashes if sys lacks an argv attribute (it happens with
3838 prevent crashes if sys lacks an argv attribute (it happens with
3834 embedded interpreters which build a bare-bones sys module).
3839 embedded interpreters which build a bare-bones sys module).
3835 Thanks to a report/bugfix by Adam Hupp <hupp-AT-cs.wisc.edu>.
3840 Thanks to a report/bugfix by Adam Hupp <hupp-AT-cs.wisc.edu>.
3836
3841
3837 2003-09-24 Fernando Perez <fperez@colorado.edu>
3842 2003-09-24 Fernando Perez <fperez@colorado.edu>
3838
3843
3839 * IPython/Magic.py (Magic._ofind): blanket except around getattr()
3844 * IPython/Magic.py (Magic._ofind): blanket except around getattr()
3840 to protect against poorly written user objects where __getattr__
3845 to protect against poorly written user objects where __getattr__
3841 raises exceptions other than AttributeError. Thanks to a bug
3846 raises exceptions other than AttributeError. Thanks to a bug
3842 report by Oliver Sander <osander-AT-gmx.de>.
3847 report by Oliver Sander <osander-AT-gmx.de>.
3843
3848
3844 * IPython/FakeModule.py (FakeModule.__repr__): this method was
3849 * IPython/FakeModule.py (FakeModule.__repr__): this method was
3845 missing. Thanks to bug report by Ralf Schmitt <ralf-AT-brainbot.com>.
3850 missing. Thanks to bug report by Ralf Schmitt <ralf-AT-brainbot.com>.
3846
3851
3847 2003-09-09 Fernando Perez <fperez@colorado.edu>
3852 2003-09-09 Fernando Perez <fperez@colorado.edu>
3848
3853
3849 * IPython/iplib.py (InteractiveShell._prefilter): fix bug where
3854 * IPython/iplib.py (InteractiveShell._prefilter): fix bug where
3850 unpacking a list whith a callable as first element would
3855 unpacking a list whith a callable as first element would
3851 mistakenly trigger autocalling. Thanks to a bug report by Jeffery
3856 mistakenly trigger autocalling. Thanks to a bug report by Jeffery
3852 Collins.
3857 Collins.
3853
3858
3854 2003-08-25 *** Released version 0.5.0
3859 2003-08-25 *** Released version 0.5.0
3855
3860
3856 2003-08-22 Fernando Perez <fperez@colorado.edu>
3861 2003-08-22 Fernando Perez <fperez@colorado.edu>
3857
3862
3858 * IPython/ultraTB.py (VerboseTB.linereader): Improved handling of
3863 * IPython/ultraTB.py (VerboseTB.linereader): Improved handling of
3859 improperly defined user exceptions. Thanks to feedback from Mark
3864 improperly defined user exceptions. Thanks to feedback from Mark
3860 Russell <mrussell-AT-verio.net>.
3865 Russell <mrussell-AT-verio.net>.
3861
3866
3862 2003-08-20 Fernando Perez <fperez@colorado.edu>
3867 2003-08-20 Fernando Perez <fperez@colorado.edu>
3863
3868
3864 * IPython/OInspect.py (Inspector.pinfo): changed String Form
3869 * IPython/OInspect.py (Inspector.pinfo): changed String Form
3865 printing so that it would print multi-line string forms starting
3870 printing so that it would print multi-line string forms starting
3866 with a new line. This way the formatting is better respected for
3871 with a new line. This way the formatting is better respected for
3867 objects which work hard to make nice string forms.
3872 objects which work hard to make nice string forms.
3868
3873
3869 * IPython/iplib.py (InteractiveShell.handle_auto): Fix bug where
3874 * IPython/iplib.py (InteractiveShell.handle_auto): Fix bug where
3870 autocall would overtake data access for objects with both
3875 autocall would overtake data access for objects with both
3871 __getitem__ and __call__.
3876 __getitem__ and __call__.
3872
3877
3873 2003-08-19 *** Released version 0.5.0-rc1
3878 2003-08-19 *** Released version 0.5.0-rc1
3874
3879
3875 2003-08-19 Fernando Perez <fperez@colorado.edu>
3880 2003-08-19 Fernando Perez <fperez@colorado.edu>
3876
3881
3877 * IPython/deep_reload.py (load_tail): single tiny change here
3882 * IPython/deep_reload.py (load_tail): single tiny change here
3878 seems to fix the long-standing bug of dreload() failing to work
3883 seems to fix the long-standing bug of dreload() failing to work
3879 for dotted names. But this module is pretty tricky, so I may have
3884 for dotted names. But this module is pretty tricky, so I may have
3880 missed some subtlety. Needs more testing!.
3885 missed some subtlety. Needs more testing!.
3881
3886
3882 * IPython/ultraTB.py (VerboseTB.linereader): harden against user
3887 * IPython/ultraTB.py (VerboseTB.linereader): harden against user
3883 exceptions which have badly implemented __str__ methods.
3888 exceptions which have badly implemented __str__ methods.
3884 (VerboseTB.text): harden against inspect.getinnerframes crashing,
3889 (VerboseTB.text): harden against inspect.getinnerframes crashing,
3885 which I've been getting reports about from Python 2.3 users. I
3890 which I've been getting reports about from Python 2.3 users. I
3886 wish I had a simple test case to reproduce the problem, so I could
3891 wish I had a simple test case to reproduce the problem, so I could
3887 either write a cleaner workaround or file a bug report if
3892 either write a cleaner workaround or file a bug report if
3888 necessary.
3893 necessary.
3889
3894
3890 * IPython/Magic.py (Magic.magic_edit): fixed bug where after
3895 * IPython/Magic.py (Magic.magic_edit): fixed bug where after
3891 making a class 'foo', file 'foo.py' couldn't be edited. Thanks to
3896 making a class 'foo', file 'foo.py' couldn't be edited. Thanks to
3892 a bug report by Tjabo Kloppenburg.
3897 a bug report by Tjabo Kloppenburg.
3893
3898
3894 * IPython/ultraTB.py (VerboseTB.debugger): hardened against pdb
3899 * IPython/ultraTB.py (VerboseTB.debugger): hardened against pdb
3895 crashes. Wrapped the pdb call in a blanket try/except, since pdb
3900 crashes. Wrapped the pdb call in a blanket try/except, since pdb
3896 seems rather unstable. Thanks to a bug report by Tjabo
3901 seems rather unstable. Thanks to a bug report by Tjabo
3897 Kloppenburg <tjabo.kloppenburg-AT-unix-ag.uni-siegen.de>.
3902 Kloppenburg <tjabo.kloppenburg-AT-unix-ag.uni-siegen.de>.
3898
3903
3899 * IPython/Release.py (version): release 0.5.0-rc1. I want to put
3904 * IPython/Release.py (version): release 0.5.0-rc1. I want to put
3900 this out soon because of the critical fixes in the inner loop for
3905 this out soon because of the critical fixes in the inner loop for
3901 generators.
3906 generators.
3902
3907
3903 * IPython/Magic.py (Magic.getargspec): removed. This (and
3908 * IPython/Magic.py (Magic.getargspec): removed. This (and
3904 _get_def) have been obsoleted by OInspect for a long time, I
3909 _get_def) have been obsoleted by OInspect for a long time, I
3905 hadn't noticed that they were dead code.
3910 hadn't noticed that they were dead code.
3906 (Magic._ofind): restored _ofind functionality for a few literals
3911 (Magic._ofind): restored _ofind functionality for a few literals
3907 (those in ["''",'""','[]','{}','()']). But it won't work anymore
3912 (those in ["''",'""','[]','{}','()']). But it won't work anymore
3908 for things like "hello".capitalize?, since that would require a
3913 for things like "hello".capitalize?, since that would require a
3909 potentially dangerous eval() again.
3914 potentially dangerous eval() again.
3910
3915
3911 * IPython/iplib.py (InteractiveShell._prefilter): reorganized the
3916 * IPython/iplib.py (InteractiveShell._prefilter): reorganized the
3912 logic a bit more to clean up the escapes handling and minimize the
3917 logic a bit more to clean up the escapes handling and minimize the
3913 use of _ofind to only necessary cases. The interactive 'feel' of
3918 use of _ofind to only necessary cases. The interactive 'feel' of
3914 IPython should have improved quite a bit with the changes in
3919 IPython should have improved quite a bit with the changes in
3915 _prefilter and _ofind (besides being far safer than before).
3920 _prefilter and _ofind (besides being far safer than before).
3916
3921
3917 * IPython/Magic.py (Magic.magic_edit): Fixed old bug (but rather
3922 * IPython/Magic.py (Magic.magic_edit): Fixed old bug (but rather
3918 obscure, never reported). Edit would fail to find the object to
3923 obscure, never reported). Edit would fail to find the object to
3919 edit under some circumstances.
3924 edit under some circumstances.
3920 (Magic._ofind): CRITICAL FIX. Finally removed the eval() calls
3925 (Magic._ofind): CRITICAL FIX. Finally removed the eval() calls
3921 which were causing double-calling of generators. Those eval calls
3926 which were causing double-calling of generators. Those eval calls
3922 were _very_ dangerous, since code with side effects could be
3927 were _very_ dangerous, since code with side effects could be
3923 triggered. As they say, 'eval is evil'... These were the
3928 triggered. As they say, 'eval is evil'... These were the
3924 nastiest evals in IPython. Besides, _ofind is now far simpler,
3929 nastiest evals in IPython. Besides, _ofind is now far simpler,
3925 and it should also be quite a bit faster. Its use of inspect is
3930 and it should also be quite a bit faster. Its use of inspect is
3926 also safer, so perhaps some of the inspect-related crashes I've
3931 also safer, so perhaps some of the inspect-related crashes I've
3927 seen lately with Python 2.3 might be taken care of. That will
3932 seen lately with Python 2.3 might be taken care of. That will
3928 need more testing.
3933 need more testing.
3929
3934
3930 2003-08-17 Fernando Perez <fperez@colorado.edu>
3935 2003-08-17 Fernando Perez <fperez@colorado.edu>
3931
3936
3932 * IPython/iplib.py (InteractiveShell._prefilter): significant
3937 * IPython/iplib.py (InteractiveShell._prefilter): significant
3933 simplifications to the logic for handling user escapes. Faster
3938 simplifications to the logic for handling user escapes. Faster
3934 and simpler code.
3939 and simpler code.
3935
3940
3936 2003-08-14 Fernando Perez <fperez@colorado.edu>
3941 2003-08-14 Fernando Perez <fperez@colorado.edu>
3937
3942
3938 * IPython/numutils.py (sum_flat): rewrote to be non-recursive.
3943 * IPython/numutils.py (sum_flat): rewrote to be non-recursive.
3939 Now it requires O(N) storage (N=size(a)) for non-contiguous input,
3944 Now it requires O(N) storage (N=size(a)) for non-contiguous input,
3940 but it should be quite a bit faster. And the recursive version
3945 but it should be quite a bit faster. And the recursive version
3941 generated O(log N) intermediate storage for all rank>1 arrays,
3946 generated O(log N) intermediate storage for all rank>1 arrays,
3942 even if they were contiguous.
3947 even if they were contiguous.
3943 (l1norm): Added this function.
3948 (l1norm): Added this function.
3944 (norm): Added this function for arbitrary norms (including
3949 (norm): Added this function for arbitrary norms (including
3945 l-infinity). l1 and l2 are still special cases for convenience
3950 l-infinity). l1 and l2 are still special cases for convenience
3946 and speed.
3951 and speed.
3947
3952
3948 2003-08-03 Fernando Perez <fperez@colorado.edu>
3953 2003-08-03 Fernando Perez <fperez@colorado.edu>
3949
3954
3950 * IPython/Magic.py (Magic.magic_edit): Removed all remaining string
3955 * IPython/Magic.py (Magic.magic_edit): Removed all remaining string
3951 exceptions, which now raise PendingDeprecationWarnings in Python
3956 exceptions, which now raise PendingDeprecationWarnings in Python
3952 2.3. There were some in Magic and some in Gnuplot2.
3957 2.3. There were some in Magic and some in Gnuplot2.
3953
3958
3954 2003-06-30 Fernando Perez <fperez@colorado.edu>
3959 2003-06-30 Fernando Perez <fperez@colorado.edu>
3955
3960
3956 * IPython/genutils.py (page): modified to call curses only for
3961 * IPython/genutils.py (page): modified to call curses only for
3957 terminals where TERM=='xterm'. After problems under many other
3962 terminals where TERM=='xterm'. After problems under many other
3958 terminals were reported by Keith Beattie <KSBeattie-AT-lbl.gov>.
3963 terminals were reported by Keith Beattie <KSBeattie-AT-lbl.gov>.
3959
3964
3960 * IPython/iplib.py (complete): removed spurious 'print "IE"' which
3965 * IPython/iplib.py (complete): removed spurious 'print "IE"' which
3961 would be triggered when readline was absent. This was just an old
3966 would be triggered when readline was absent. This was just an old
3962 debugging statement I'd forgotten to take out.
3967 debugging statement I'd forgotten to take out.
3963
3968
3964 2003-06-20 Fernando Perez <fperez@colorado.edu>
3969 2003-06-20 Fernando Perez <fperez@colorado.edu>
3965
3970
3966 * IPython/genutils.py (clock): modified to return only user time
3971 * IPython/genutils.py (clock): modified to return only user time
3967 (not counting system time), after a discussion on scipy. While
3972 (not counting system time), after a discussion on scipy. While
3968 system time may be a useful quantity occasionally, it may much
3973 system time may be a useful quantity occasionally, it may much
3969 more easily be skewed by occasional swapping or other similar
3974 more easily be skewed by occasional swapping or other similar
3970 activity.
3975 activity.
3971
3976
3972 2003-06-05 Fernando Perez <fperez@colorado.edu>
3977 2003-06-05 Fernando Perez <fperez@colorado.edu>
3973
3978
3974 * IPython/numutils.py (identity): new function, for building
3979 * IPython/numutils.py (identity): new function, for building
3975 arbitrary rank Kronecker deltas (mostly backwards compatible with
3980 arbitrary rank Kronecker deltas (mostly backwards compatible with
3976 Numeric.identity)
3981 Numeric.identity)
3977
3982
3978 2003-06-03 Fernando Perez <fperez@colorado.edu>
3983 2003-06-03 Fernando Perez <fperez@colorado.edu>
3979
3984
3980 * IPython/iplib.py (InteractiveShell.handle_magic): protect
3985 * IPython/iplib.py (InteractiveShell.handle_magic): protect
3981 arguments passed to magics with spaces, to allow trailing '\' to
3986 arguments passed to magics with spaces, to allow trailing '\' to
3982 work normally (mainly for Windows users).
3987 work normally (mainly for Windows users).
3983
3988
3984 2003-05-29 Fernando Perez <fperez@colorado.edu>
3989 2003-05-29 Fernando Perez <fperez@colorado.edu>
3985
3990
3986 * IPython/ipmaker.py (make_IPython): Load site._Helper() as help
3991 * IPython/ipmaker.py (make_IPython): Load site._Helper() as help
3987 instead of pydoc.help. This fixes a bizarre behavior where
3992 instead of pydoc.help. This fixes a bizarre behavior where
3988 printing '%s' % locals() would trigger the help system. Now
3993 printing '%s' % locals() would trigger the help system. Now
3989 ipython behaves like normal python does.
3994 ipython behaves like normal python does.
3990
3995
3991 Note that if one does 'from pydoc import help', the bizarre
3996 Note that if one does 'from pydoc import help', the bizarre
3992 behavior returns, but this will also happen in normal python, so
3997 behavior returns, but this will also happen in normal python, so
3993 it's not an ipython bug anymore (it has to do with how pydoc.help
3998 it's not an ipython bug anymore (it has to do with how pydoc.help
3994 is implemented).
3999 is implemented).
3995
4000
3996 2003-05-22 Fernando Perez <fperez@colorado.edu>
4001 2003-05-22 Fernando Perez <fperez@colorado.edu>
3997
4002
3998 * IPython/FlexCompleter.py (Completer.attr_matches): fixed to
4003 * IPython/FlexCompleter.py (Completer.attr_matches): fixed to
3999 return [] instead of None when nothing matches, also match to end
4004 return [] instead of None when nothing matches, also match to end
4000 of line. Patch by Gary Bishop.
4005 of line. Patch by Gary Bishop.
4001
4006
4002 * IPython/ipmaker.py (make_IPython): Added same sys.excepthook
4007 * IPython/ipmaker.py (make_IPython): Added same sys.excepthook
4003 protection as before, for files passed on the command line. This
4008 protection as before, for files passed on the command line. This
4004 prevents the CrashHandler from kicking in if user files call into
4009 prevents the CrashHandler from kicking in if user files call into
4005 sys.excepthook (such as PyQt and WxWindows have a nasty habit of
4010 sys.excepthook (such as PyQt and WxWindows have a nasty habit of
4006 doing). After a report by Kasper Souren <Kasper.Souren-AT-ircam.fr>
4011 doing). After a report by Kasper Souren <Kasper.Souren-AT-ircam.fr>
4007
4012
4008 2003-05-20 *** Released version 0.4.0
4013 2003-05-20 *** Released version 0.4.0
4009
4014
4010 2003-05-20 Fernando Perez <fperez@colorado.edu>
4015 2003-05-20 Fernando Perez <fperez@colorado.edu>
4011
4016
4012 * setup.py: added support for manpages. It's a bit hackish b/c of
4017 * setup.py: added support for manpages. It's a bit hackish b/c of
4013 a bug in the way the bdist_rpm distutils target handles gzipped
4018 a bug in the way the bdist_rpm distutils target handles gzipped
4014 manpages, but it works. After a patch by Jack.
4019 manpages, but it works. After a patch by Jack.
4015
4020
4016 2003-05-19 Fernando Perez <fperez@colorado.edu>
4021 2003-05-19 Fernando Perez <fperez@colorado.edu>
4017
4022
4018 * IPython/numutils.py: added a mockup of the kinds module, since
4023 * IPython/numutils.py: added a mockup of the kinds module, since
4019 it was recently removed from Numeric. This way, numutils will
4024 it was recently removed from Numeric. This way, numutils will
4020 work for all users even if they are missing kinds.
4025 work for all users even if they are missing kinds.
4021
4026
4022 * IPython/Magic.py (Magic._ofind): Harden against an inspect
4027 * IPython/Magic.py (Magic._ofind): Harden against an inspect
4023 failure, which can occur with SWIG-wrapped extensions. After a
4028 failure, which can occur with SWIG-wrapped extensions. After a
4024 crash report from Prabhu.
4029 crash report from Prabhu.
4025
4030
4026 2003-05-16 Fernando Perez <fperez@colorado.edu>
4031 2003-05-16 Fernando Perez <fperez@colorado.edu>
4027
4032
4028 * IPython/iplib.py (InteractiveShell.excepthook): New method to
4033 * IPython/iplib.py (InteractiveShell.excepthook): New method to
4029 protect ipython from user code which may call directly
4034 protect ipython from user code which may call directly
4030 sys.excepthook (this looks like an ipython crash to the user, even
4035 sys.excepthook (this looks like an ipython crash to the user, even
4031 when it isn't). After a patch by Gary Bishop <gb-AT-cs.unc.edu>.
4036 when it isn't). After a patch by Gary Bishop <gb-AT-cs.unc.edu>.
4032 This is especially important to help users of WxWindows, but may
4037 This is especially important to help users of WxWindows, but may
4033 also be useful in other cases.
4038 also be useful in other cases.
4034
4039
4035 * IPython/ultraTB.py (AutoFormattedTB.__call__): Changed to allow
4040 * IPython/ultraTB.py (AutoFormattedTB.__call__): Changed to allow
4036 an optional tb_offset to be specified, and to preserve exception
4041 an optional tb_offset to be specified, and to preserve exception
4037 info if given. After a patch by Gary Bishop <gb-AT-cs.unc.edu>.
4042 info if given. After a patch by Gary Bishop <gb-AT-cs.unc.edu>.
4038
4043
4039 * ipython.1 (Default): Thanks to Jack's work, we now have manpages!
4044 * ipython.1 (Default): Thanks to Jack's work, we now have manpages!
4040
4045
4041 2003-05-15 Fernando Perez <fperez@colorado.edu>
4046 2003-05-15 Fernando Perez <fperez@colorado.edu>
4042
4047
4043 * IPython/iplib.py (InteractiveShell.user_setup): Fix crash when
4048 * IPython/iplib.py (InteractiveShell.user_setup): Fix crash when
4044 installing for a new user under Windows.
4049 installing for a new user under Windows.
4045
4050
4046 2003-05-12 Fernando Perez <fperez@colorado.edu>
4051 2003-05-12 Fernando Perez <fperez@colorado.edu>
4047
4052
4048 * IPython/iplib.py (InteractiveShell.handle_emacs): New line
4053 * IPython/iplib.py (InteractiveShell.handle_emacs): New line
4049 handler for Emacs comint-based lines. Currently it doesn't do
4054 handler for Emacs comint-based lines. Currently it doesn't do
4050 much (but importantly, it doesn't update the history cache). In
4055 much (but importantly, it doesn't update the history cache). In
4051 the future it may be expanded if Alex needs more functionality
4056 the future it may be expanded if Alex needs more functionality
4052 there.
4057 there.
4053
4058
4054 * IPython/CrashHandler.py (CrashHandler.__call__): Added platform
4059 * IPython/CrashHandler.py (CrashHandler.__call__): Added platform
4055 info to crash reports.
4060 info to crash reports.
4056
4061
4057 * IPython/iplib.py (InteractiveShell.mainloop): Added -c option,
4062 * IPython/iplib.py (InteractiveShell.mainloop): Added -c option,
4058 just like Python's -c. Also fixed crash with invalid -color
4063 just like Python's -c. Also fixed crash with invalid -color
4059 option value at startup. Thanks to Will French
4064 option value at startup. Thanks to Will French
4060 <wfrench-AT-bestweb.net> for the bug report.
4065 <wfrench-AT-bestweb.net> for the bug report.
4061
4066
4062 2003-05-09 Fernando Perez <fperez@colorado.edu>
4067 2003-05-09 Fernando Perez <fperez@colorado.edu>
4063
4068
4064 * IPython/genutils.py (EvalDict.__getitem__): Renamed EvalString
4069 * IPython/genutils.py (EvalDict.__getitem__): Renamed EvalString
4065 to EvalDict (it's a mapping, after all) and simplified its code
4070 to EvalDict (it's a mapping, after all) and simplified its code
4066 quite a bit, after a nice discussion on c.l.py where Gustavo
4071 quite a bit, after a nice discussion on c.l.py where Gustavo
4067 CΓ³rdova <gcordova-AT-sismex.com> suggested the new version.
4072 CΓ³rdova <gcordova-AT-sismex.com> suggested the new version.
4068
4073
4069 2003-04-30 Fernando Perez <fperez@colorado.edu>
4074 2003-04-30 Fernando Perez <fperez@colorado.edu>
4070
4075
4071 * IPython/genutils.py (timings_out): modified it to reduce its
4076 * IPython/genutils.py (timings_out): modified it to reduce its
4072 overhead in the common reps==1 case.
4077 overhead in the common reps==1 case.
4073
4078
4074 2003-04-29 Fernando Perez <fperez@colorado.edu>
4079 2003-04-29 Fernando Perez <fperez@colorado.edu>
4075
4080
4076 * IPython/genutils.py (timings_out): Modified to use the resource
4081 * IPython/genutils.py (timings_out): Modified to use the resource
4077 module, which avoids the wraparound problems of time.clock().
4082 module, which avoids the wraparound problems of time.clock().
4078
4083
4079 2003-04-17 *** Released version 0.2.15pre4
4084 2003-04-17 *** Released version 0.2.15pre4
4080
4085
4081 2003-04-17 Fernando Perez <fperez@colorado.edu>
4086 2003-04-17 Fernando Perez <fperez@colorado.edu>
4082
4087
4083 * setup.py (scriptfiles): Split windows-specific stuff over to a
4088 * setup.py (scriptfiles): Split windows-specific stuff over to a
4084 separate file, in an attempt to have a Windows GUI installer.
4089 separate file, in an attempt to have a Windows GUI installer.
4085 That didn't work, but part of the groundwork is done.
4090 That didn't work, but part of the groundwork is done.
4086
4091
4087 * IPython/UserConfig/ipythonrc: Added M-i, M-o and M-I for
4092 * IPython/UserConfig/ipythonrc: Added M-i, M-o and M-I for
4088 indent/unindent with 4 spaces. Particularly useful in combination
4093 indent/unindent with 4 spaces. Particularly useful in combination
4089 with the new auto-indent option.
4094 with the new auto-indent option.
4090
4095
4091 2003-04-16 Fernando Perez <fperez@colorado.edu>
4096 2003-04-16 Fernando Perez <fperez@colorado.edu>
4092
4097
4093 * IPython/Magic.py: various replacements of self.rc for
4098 * IPython/Magic.py: various replacements of self.rc for
4094 self.shell.rc. A lot more remains to be done to fully disentangle
4099 self.shell.rc. A lot more remains to be done to fully disentangle
4095 this class from the main Shell class.
4100 this class from the main Shell class.
4096
4101
4097 * IPython/GnuplotRuntime.py: added checks for mouse support so
4102 * IPython/GnuplotRuntime.py: added checks for mouse support so
4098 that we don't try to enable it if the current gnuplot doesn't
4103 that we don't try to enable it if the current gnuplot doesn't
4099 really support it. Also added checks so that we don't try to
4104 really support it. Also added checks so that we don't try to
4100 enable persist under Windows (where Gnuplot doesn't recognize the
4105 enable persist under Windows (where Gnuplot doesn't recognize the
4101 option).
4106 option).
4102
4107
4103 * IPython/iplib.py (InteractiveShell.interact): Added optional
4108 * IPython/iplib.py (InteractiveShell.interact): Added optional
4104 auto-indenting code, after a patch by King C. Shu
4109 auto-indenting code, after a patch by King C. Shu
4105 <kingshu-AT-myrealbox.com>. It's off by default because it doesn't
4110 <kingshu-AT-myrealbox.com>. It's off by default because it doesn't
4106 get along well with pasting indented code. If I ever figure out
4111 get along well with pasting indented code. If I ever figure out
4107 how to make that part go well, it will become on by default.
4112 how to make that part go well, it will become on by default.
4108
4113
4109 * IPython/Prompts.py (Prompt1.auto_rewrite): Fixed bug which would
4114 * IPython/Prompts.py (Prompt1.auto_rewrite): Fixed bug which would
4110 crash ipython if there was an unmatched '%' in the user's prompt
4115 crash ipython if there was an unmatched '%' in the user's prompt
4111 string. Reported by Thorsten Kampe <thorsten-AT-thorstenkampe.de>.
4116 string. Reported by Thorsten Kampe <thorsten-AT-thorstenkampe.de>.
4112
4117
4113 * IPython/iplib.py (InteractiveShell.interact): removed the
4118 * IPython/iplib.py (InteractiveShell.interact): removed the
4114 ability to ask the user whether he wants to crash or not at the
4119 ability to ask the user whether he wants to crash or not at the
4115 'last line' exception handler. Calling functions at that point
4120 'last line' exception handler. Calling functions at that point
4116 changes the stack, and the error reports would have incorrect
4121 changes the stack, and the error reports would have incorrect
4117 tracebacks.
4122 tracebacks.
4118
4123
4119 * IPython/Magic.py (Magic.magic_page): Added new @page magic, to
4124 * IPython/Magic.py (Magic.magic_page): Added new @page magic, to
4120 pass through a peger a pretty-printed form of any object. After a
4125 pass through a peger a pretty-printed form of any object. After a
4121 contribution by Olivier Aubert <oaubert-AT-bat710.univ-lyon1.fr>
4126 contribution by Olivier Aubert <oaubert-AT-bat710.univ-lyon1.fr>
4122
4127
4123 2003-04-14 Fernando Perez <fperez@colorado.edu>
4128 2003-04-14 Fernando Perez <fperez@colorado.edu>
4124
4129
4125 * IPython/iplib.py (InteractiveShell.user_setup): Fixed bug where
4130 * IPython/iplib.py (InteractiveShell.user_setup): Fixed bug where
4126 all files in ~ would be modified at first install (instead of
4131 all files in ~ would be modified at first install (instead of
4127 ~/.ipython). This could be potentially disastrous, as the
4132 ~/.ipython). This could be potentially disastrous, as the
4128 modification (make line-endings native) could damage binary files.
4133 modification (make line-endings native) could damage binary files.
4129
4134
4130 2003-04-10 Fernando Perez <fperez@colorado.edu>
4135 2003-04-10 Fernando Perez <fperez@colorado.edu>
4131
4136
4132 * IPython/iplib.py (InteractiveShell.handle_help): Modified to
4137 * IPython/iplib.py (InteractiveShell.handle_help): Modified to
4133 handle only lines which are invalid python. This now means that
4138 handle only lines which are invalid python. This now means that
4134 lines like 'x=1 #?' execute properly. Thanks to Jeffery Collins
4139 lines like 'x=1 #?' execute properly. Thanks to Jeffery Collins
4135 for the bug report.
4140 for the bug report.
4136
4141
4137 2003-04-01 Fernando Perez <fperez@colorado.edu>
4142 2003-04-01 Fernando Perez <fperez@colorado.edu>
4138
4143
4139 * IPython/iplib.py (InteractiveShell.showtraceback): Fixed bug
4144 * IPython/iplib.py (InteractiveShell.showtraceback): Fixed bug
4140 where failing to set sys.last_traceback would crash pdb.pm().
4145 where failing to set sys.last_traceback would crash pdb.pm().
4141 Thanks to Jeffery D. Collins <Jeff.Collins-AT-vexcel.com> for the bug
4146 Thanks to Jeffery D. Collins <Jeff.Collins-AT-vexcel.com> for the bug
4142 report.
4147 report.
4143
4148
4144 2003-03-25 Fernando Perez <fperez@colorado.edu>
4149 2003-03-25 Fernando Perez <fperez@colorado.edu>
4145
4150
4146 * IPython/Magic.py (Magic.magic_prun): rstrip() output of profiler
4151 * IPython/Magic.py (Magic.magic_prun): rstrip() output of profiler
4147 before printing it (it had a lot of spurious blank lines at the
4152 before printing it (it had a lot of spurious blank lines at the
4148 end).
4153 end).
4149
4154
4150 * IPython/Gnuplot2.py (Gnuplot.hardcopy): fixed bug where lpr
4155 * IPython/Gnuplot2.py (Gnuplot.hardcopy): fixed bug where lpr
4151 output would be sent 21 times! Obviously people don't use this
4156 output would be sent 21 times! Obviously people don't use this
4152 too often, or I would have heard about it.
4157 too often, or I would have heard about it.
4153
4158
4154 2003-03-24 Fernando Perez <fperez@colorado.edu>
4159 2003-03-24 Fernando Perez <fperez@colorado.edu>
4155
4160
4156 * setup.py (scriptfiles): renamed the data_files parameter from
4161 * setup.py (scriptfiles): renamed the data_files parameter from
4157 'base' to 'data' to fix rpm build issues. Thanks to Ralf Ahlbrink
4162 'base' to 'data' to fix rpm build issues. Thanks to Ralf Ahlbrink
4158 for the patch.
4163 for the patch.
4159
4164
4160 2003-03-20 Fernando Perez <fperez@colorado.edu>
4165 2003-03-20 Fernando Perez <fperez@colorado.edu>
4161
4166
4162 * IPython/genutils.py (error): added error() and fatal()
4167 * IPython/genutils.py (error): added error() and fatal()
4163 functions.
4168 functions.
4164
4169
4165 2003-03-18 *** Released version 0.2.15pre3
4170 2003-03-18 *** Released version 0.2.15pre3
4166
4171
4167 2003-03-18 Fernando Perez <fperez@colorado.edu>
4172 2003-03-18 Fernando Perez <fperez@colorado.edu>
4168
4173
4169 * setupext/install_data_ext.py
4174 * setupext/install_data_ext.py
4170 (install_data_ext.initialize_options): Class contributed by Jack
4175 (install_data_ext.initialize_options): Class contributed by Jack
4171 Moffit for fixing the old distutils hack. He is sending this to
4176 Moffit for fixing the old distutils hack. He is sending this to
4172 the distutils folks so in the future we may not need it as a
4177 the distutils folks so in the future we may not need it as a
4173 private fix.
4178 private fix.
4174
4179
4175 * MANIFEST.in: Extensive reorganization, based on Jack Moffit's
4180 * MANIFEST.in: Extensive reorganization, based on Jack Moffit's
4176 changes for Debian packaging. See his patch for full details.
4181 changes for Debian packaging. See his patch for full details.
4177 The old distutils hack of making the ipythonrc* files carry a
4182 The old distutils hack of making the ipythonrc* files carry a
4178 bogus .py extension is gone, at last. Examples were moved to a
4183 bogus .py extension is gone, at last. Examples were moved to a
4179 separate subdir under doc/, and the separate executable scripts
4184 separate subdir under doc/, and the separate executable scripts
4180 now live in their own directory. Overall a great cleanup. The
4185 now live in their own directory. Overall a great cleanup. The
4181 manual was updated to use the new files, and setup.py has been
4186 manual was updated to use the new files, and setup.py has been
4182 fixed for this setup.
4187 fixed for this setup.
4183
4188
4184 * IPython/PyColorize.py (Parser.usage): made non-executable and
4189 * IPython/PyColorize.py (Parser.usage): made non-executable and
4185 created a pycolor wrapper around it to be included as a script.
4190 created a pycolor wrapper around it to be included as a script.
4186
4191
4187 2003-03-12 *** Released version 0.2.15pre2
4192 2003-03-12 *** Released version 0.2.15pre2
4188
4193
4189 2003-03-12 Fernando Perez <fperez@colorado.edu>
4194 2003-03-12 Fernando Perez <fperez@colorado.edu>
4190
4195
4191 * IPython/ColorANSI.py (make_color_table): Finally fixed the
4196 * IPython/ColorANSI.py (make_color_table): Finally fixed the
4192 long-standing problem with garbage characters in some terminals.
4197 long-standing problem with garbage characters in some terminals.
4193 The issue was really that the \001 and \002 escapes must _only_ be
4198 The issue was really that the \001 and \002 escapes must _only_ be
4194 passed to input prompts (which call readline), but _never_ to
4199 passed to input prompts (which call readline), but _never_ to
4195 normal text to be printed on screen. I changed ColorANSI to have
4200 normal text to be printed on screen. I changed ColorANSI to have
4196 two classes: TermColors and InputTermColors, each with the
4201 two classes: TermColors and InputTermColors, each with the
4197 appropriate escapes for input prompts or normal text. The code in
4202 appropriate escapes for input prompts or normal text. The code in
4198 Prompts.py got slightly more complicated, but this very old and
4203 Prompts.py got slightly more complicated, but this very old and
4199 annoying bug is finally fixed.
4204 annoying bug is finally fixed.
4200
4205
4201 All the credit for nailing down the real origin of this problem
4206 All the credit for nailing down the real origin of this problem
4202 and the correct solution goes to Jack Moffit <jack-AT-xiph.org>.
4207 and the correct solution goes to Jack Moffit <jack-AT-xiph.org>.
4203 *Many* thanks to him for spending quite a bit of effort on this.
4208 *Many* thanks to him for spending quite a bit of effort on this.
4204
4209
4205 2003-03-05 *** Released version 0.2.15pre1
4210 2003-03-05 *** Released version 0.2.15pre1
4206
4211
4207 2003-03-03 Fernando Perez <fperez@colorado.edu>
4212 2003-03-03 Fernando Perez <fperez@colorado.edu>
4208
4213
4209 * IPython/FakeModule.py: Moved the former _FakeModule to a
4214 * IPython/FakeModule.py: Moved the former _FakeModule to a
4210 separate file, because it's also needed by Magic (to fix a similar
4215 separate file, because it's also needed by Magic (to fix a similar
4211 pickle-related issue in @run).
4216 pickle-related issue in @run).
4212
4217
4213 2003-03-02 Fernando Perez <fperez@colorado.edu>
4218 2003-03-02 Fernando Perez <fperez@colorado.edu>
4214
4219
4215 * IPython/Magic.py (Magic.magic_autocall): new magic to control
4220 * IPython/Magic.py (Magic.magic_autocall): new magic to control
4216 the autocall option at runtime.
4221 the autocall option at runtime.
4217 (Magic.magic_dhist): changed self.user_ns to self.shell.user_ns
4222 (Magic.magic_dhist): changed self.user_ns to self.shell.user_ns
4218 across Magic.py to start separating Magic from InteractiveShell.
4223 across Magic.py to start separating Magic from InteractiveShell.
4219 (Magic._ofind): Fixed to return proper namespace for dotted
4224 (Magic._ofind): Fixed to return proper namespace for dotted
4220 names. Before, a dotted name would always return 'not currently
4225 names. Before, a dotted name would always return 'not currently
4221 defined', because it would find the 'parent'. s.x would be found,
4226 defined', because it would find the 'parent'. s.x would be found,
4222 but since 'x' isn't defined by itself, it would get confused.
4227 but since 'x' isn't defined by itself, it would get confused.
4223 (Magic.magic_run): Fixed pickling problems reported by Ralf
4228 (Magic.magic_run): Fixed pickling problems reported by Ralf
4224 Ahlbrink <RAhlbrink-AT-RosenInspection.net>. The fix was similar to
4229 Ahlbrink <RAhlbrink-AT-RosenInspection.net>. The fix was similar to
4225 that I'd used when Mike Heeter reported similar issues at the
4230 that I'd used when Mike Heeter reported similar issues at the
4226 top-level, but now for @run. It boils down to injecting the
4231 top-level, but now for @run. It boils down to injecting the
4227 namespace where code is being executed with something that looks
4232 namespace where code is being executed with something that looks
4228 enough like a module to fool pickle.dump(). Since a pickle stores
4233 enough like a module to fool pickle.dump(). Since a pickle stores
4229 a named reference to the importing module, we need this for
4234 a named reference to the importing module, we need this for
4230 pickles to save something sensible.
4235 pickles to save something sensible.
4231
4236
4232 * IPython/ipmaker.py (make_IPython): added an autocall option.
4237 * IPython/ipmaker.py (make_IPython): added an autocall option.
4233
4238
4234 * IPython/iplib.py (InteractiveShell._prefilter): reordered all of
4239 * IPython/iplib.py (InteractiveShell._prefilter): reordered all of
4235 the auto-eval code. Now autocalling is an option, and the code is
4240 the auto-eval code. Now autocalling is an option, and the code is
4236 also vastly safer. There is no more eval() involved at all.
4241 also vastly safer. There is no more eval() involved at all.
4237
4242
4238 2003-03-01 Fernando Perez <fperez@colorado.edu>
4243 2003-03-01 Fernando Perez <fperez@colorado.edu>
4239
4244
4240 * IPython/Magic.py (Magic._ofind): Changed interface to return a
4245 * IPython/Magic.py (Magic._ofind): Changed interface to return a
4241 dict with named keys instead of a tuple.
4246 dict with named keys instead of a tuple.
4242
4247
4243 * IPython: Started using CVS for IPython as of 0.2.15pre1.
4248 * IPython: Started using CVS for IPython as of 0.2.15pre1.
4244
4249
4245 * setup.py (make_shortcut): Fixed message about directories
4250 * setup.py (make_shortcut): Fixed message about directories
4246 created during Windows installation (the directories were ok, just
4251 created during Windows installation (the directories were ok, just
4247 the printed message was misleading). Thanks to Chris Liechti
4252 the printed message was misleading). Thanks to Chris Liechti
4248 <cliechti-AT-gmx.net> for the heads up.
4253 <cliechti-AT-gmx.net> for the heads up.
4249
4254
4250 2003-02-21 Fernando Perez <fperez@colorado.edu>
4255 2003-02-21 Fernando Perez <fperez@colorado.edu>
4251
4256
4252 * IPython/iplib.py (InteractiveShell._prefilter): Fixed catching
4257 * IPython/iplib.py (InteractiveShell._prefilter): Fixed catching
4253 of ValueError exception when checking for auto-execution. This
4258 of ValueError exception when checking for auto-execution. This
4254 one is raised by things like Numeric arrays arr.flat when the
4259 one is raised by things like Numeric arrays arr.flat when the
4255 array is non-contiguous.
4260 array is non-contiguous.
4256
4261
4257 2003-01-31 Fernando Perez <fperez@colorado.edu>
4262 2003-01-31 Fernando Perez <fperez@colorado.edu>
4258
4263
4259 * IPython/genutils.py (SystemExec.bq): Fixed bug where bq would
4264 * IPython/genutils.py (SystemExec.bq): Fixed bug where bq would
4260 not return any value at all (even though the command would get
4265 not return any value at all (even though the command would get
4261 executed).
4266 executed).
4262 (xsys): Flush stdout right after printing the command to ensure
4267 (xsys): Flush stdout right after printing the command to ensure
4263 proper ordering of commands and command output in the total
4268 proper ordering of commands and command output in the total
4264 output.
4269 output.
4265 (SystemExec/xsys/bq): Switched the names of xsys/bq and
4270 (SystemExec/xsys/bq): Switched the names of xsys/bq and
4266 system/getoutput as defaults. The old ones are kept for
4271 system/getoutput as defaults. The old ones are kept for
4267 compatibility reasons, so no code which uses this library needs
4272 compatibility reasons, so no code which uses this library needs
4268 changing.
4273 changing.
4269
4274
4270 2003-01-27 *** Released version 0.2.14
4275 2003-01-27 *** Released version 0.2.14
4271
4276
4272 2003-01-25 Fernando Perez <fperez@colorado.edu>
4277 2003-01-25 Fernando Perez <fperez@colorado.edu>
4273
4278
4274 * IPython/Magic.py (Magic.magic_edit): Fixed problem where
4279 * IPython/Magic.py (Magic.magic_edit): Fixed problem where
4275 functions defined in previous edit sessions could not be re-edited
4280 functions defined in previous edit sessions could not be re-edited
4276 (because the temp files were immediately removed). Now temp files
4281 (because the temp files were immediately removed). Now temp files
4277 are removed only at IPython's exit.
4282 are removed only at IPython's exit.
4278 (Magic.magic_run): Improved @run to perform shell-like expansions
4283 (Magic.magic_run): Improved @run to perform shell-like expansions
4279 on its arguments (~users and $VARS). With this, @run becomes more
4284 on its arguments (~users and $VARS). With this, @run becomes more
4280 like a normal command-line.
4285 like a normal command-line.
4281
4286
4282 * IPython/Shell.py (IPShellEmbed.__call__): Fixed a bunch of small
4287 * IPython/Shell.py (IPShellEmbed.__call__): Fixed a bunch of small
4283 bugs related to embedding and cleaned up that code. A fairly
4288 bugs related to embedding and cleaned up that code. A fairly
4284 important one was the impossibility to access the global namespace
4289 important one was the impossibility to access the global namespace
4285 through the embedded IPython (only local variables were visible).
4290 through the embedded IPython (only local variables were visible).
4286
4291
4287 2003-01-14 Fernando Perez <fperez@colorado.edu>
4292 2003-01-14 Fernando Perez <fperez@colorado.edu>
4288
4293
4289 * IPython/iplib.py (InteractiveShell._prefilter): Fixed
4294 * IPython/iplib.py (InteractiveShell._prefilter): Fixed
4290 auto-calling to be a bit more conservative. Now it doesn't get
4295 auto-calling to be a bit more conservative. Now it doesn't get
4291 triggered if any of '!=()<>' are in the rest of the input line, to
4296 triggered if any of '!=()<>' are in the rest of the input line, to
4292 allow comparing callables. Thanks to Alex for the heads up.
4297 allow comparing callables. Thanks to Alex for the heads up.
4293
4298
4294 2003-01-07 Fernando Perez <fperez@colorado.edu>
4299 2003-01-07 Fernando Perez <fperez@colorado.edu>
4295
4300
4296 * IPython/genutils.py (page): fixed estimation of the number of
4301 * IPython/genutils.py (page): fixed estimation of the number of
4297 lines in a string to be paged to simply count newlines. This
4302 lines in a string to be paged to simply count newlines. This
4298 prevents over-guessing due to embedded escape sequences. A better
4303 prevents over-guessing due to embedded escape sequences. A better
4299 long-term solution would involve stripping out the control chars
4304 long-term solution would involve stripping out the control chars
4300 for the count, but it's potentially so expensive I just don't
4305 for the count, but it's potentially so expensive I just don't
4301 think it's worth doing.
4306 think it's worth doing.
4302
4307
4303 2002-12-19 *** Released version 0.2.14pre50
4308 2002-12-19 *** Released version 0.2.14pre50
4304
4309
4305 2002-12-19 Fernando Perez <fperez@colorado.edu>
4310 2002-12-19 Fernando Perez <fperez@colorado.edu>
4306
4311
4307 * tools/release (version): Changed release scripts to inform
4312 * tools/release (version): Changed release scripts to inform
4308 Andrea and build a NEWS file with a list of recent changes.
4313 Andrea and build a NEWS file with a list of recent changes.
4309
4314
4310 * IPython/ColorANSI.py (__all__): changed terminal detection
4315 * IPython/ColorANSI.py (__all__): changed terminal detection
4311 code. Seems to work better for xterms without breaking
4316 code. Seems to work better for xterms without breaking
4312 konsole. Will need more testing to determine if WinXP and Mac OSX
4317 konsole. Will need more testing to determine if WinXP and Mac OSX
4313 also work ok.
4318 also work ok.
4314
4319
4315 2002-12-18 *** Released version 0.2.14pre49
4320 2002-12-18 *** Released version 0.2.14pre49
4316
4321
4317 2002-12-18 Fernando Perez <fperez@colorado.edu>
4322 2002-12-18 Fernando Perez <fperez@colorado.edu>
4318
4323
4319 * Docs: added new info about Mac OSX, from Andrea.
4324 * Docs: added new info about Mac OSX, from Andrea.
4320
4325
4321 * IPython/Gnuplot2.py (String): Added a String PlotItem class to
4326 * IPython/Gnuplot2.py (String): Added a String PlotItem class to
4322 allow direct plotting of python strings whose format is the same
4327 allow direct plotting of python strings whose format is the same
4323 of gnuplot data files.
4328 of gnuplot data files.
4324
4329
4325 2002-12-16 Fernando Perez <fperez@colorado.edu>
4330 2002-12-16 Fernando Perez <fperez@colorado.edu>
4326
4331
4327 * IPython/iplib.py (InteractiveShell.interact): fixed default (y)
4332 * IPython/iplib.py (InteractiveShell.interact): fixed default (y)
4328 value of exit question to be acknowledged.
4333 value of exit question to be acknowledged.
4329
4334
4330 2002-12-03 Fernando Perez <fperez@colorado.edu>
4335 2002-12-03 Fernando Perez <fperez@colorado.edu>
4331
4336
4332 * IPython/ipmaker.py: removed generators, which had been added
4337 * IPython/ipmaker.py: removed generators, which had been added
4333 by mistake in an earlier debugging run. This was causing trouble
4338 by mistake in an earlier debugging run. This was causing trouble
4334 to users of python 2.1.x. Thanks to Abel Daniel <abli-AT-freemail.hu>
4339 to users of python 2.1.x. Thanks to Abel Daniel <abli-AT-freemail.hu>
4335 for pointing this out.
4340 for pointing this out.
4336
4341
4337 2002-11-17 Fernando Perez <fperez@colorado.edu>
4342 2002-11-17 Fernando Perez <fperez@colorado.edu>
4338
4343
4339 * Manual: updated the Gnuplot section.
4344 * Manual: updated the Gnuplot section.
4340
4345
4341 * IPython/GnuplotRuntime.py: refactored a lot all this code, with
4346 * IPython/GnuplotRuntime.py: refactored a lot all this code, with
4342 a much better split of what goes in Runtime and what goes in
4347 a much better split of what goes in Runtime and what goes in
4343 Interactive.
4348 Interactive.
4344
4349
4345 * IPython/ipmaker.py: fixed bug where import_fail_info wasn't
4350 * IPython/ipmaker.py: fixed bug where import_fail_info wasn't
4346 being imported from iplib.
4351 being imported from iplib.
4347
4352
4348 * IPython/GnuplotInteractive.py (magic_gpc): renamed @gp to @gpc
4353 * IPython/GnuplotInteractive.py (magic_gpc): renamed @gp to @gpc
4349 for command-passing. Now the global Gnuplot instance is called
4354 for command-passing. Now the global Gnuplot instance is called
4350 'gp' instead of 'g', which was really a far too fragile and
4355 'gp' instead of 'g', which was really a far too fragile and
4351 common name.
4356 common name.
4352
4357
4353 * IPython/Gnuplot2.py (eps_fix_bbox): added this to fix broken
4358 * IPython/Gnuplot2.py (eps_fix_bbox): added this to fix broken
4354 bounding boxes generated by Gnuplot for square plots.
4359 bounding boxes generated by Gnuplot for square plots.
4355
4360
4356 * IPython/genutils.py (popkey): new function added. I should
4361 * IPython/genutils.py (popkey): new function added. I should
4357 suggest this on c.l.py as a dict method, it seems useful.
4362 suggest this on c.l.py as a dict method, it seems useful.
4358
4363
4359 * IPython/Gnuplot2.py (Gnuplot.plot): Overhauled plot and replot
4364 * IPython/Gnuplot2.py (Gnuplot.plot): Overhauled plot and replot
4360 to transparently handle PostScript generation. MUCH better than
4365 to transparently handle PostScript generation. MUCH better than
4361 the previous plot_eps/replot_eps (which I removed now). The code
4366 the previous plot_eps/replot_eps (which I removed now). The code
4362 is also fairly clean and well documented now (including
4367 is also fairly clean and well documented now (including
4363 docstrings).
4368 docstrings).
4364
4369
4365 2002-11-13 Fernando Perez <fperez@colorado.edu>
4370 2002-11-13 Fernando Perez <fperez@colorado.edu>
4366
4371
4367 * IPython/Magic.py (Magic.magic_edit): fixed docstring
4372 * IPython/Magic.py (Magic.magic_edit): fixed docstring
4368 (inconsistent with options).
4373 (inconsistent with options).
4369
4374
4370 * IPython/Gnuplot2.py (Gnuplot.hardcopy): hardcopy had been
4375 * IPython/Gnuplot2.py (Gnuplot.hardcopy): hardcopy had been
4371 manually disabled, I don't know why. Fixed it.
4376 manually disabled, I don't know why. Fixed it.
4372 (Gnuplot._plot_eps): added new plot_eps/replot_eps to get directly
4377 (Gnuplot._plot_eps): added new plot_eps/replot_eps to get directly
4373 eps output.
4378 eps output.
4374
4379
4375 2002-11-12 Fernando Perez <fperez@colorado.edu>
4380 2002-11-12 Fernando Perez <fperez@colorado.edu>
4376
4381
4377 * IPython/genutils.py (ask_yes_no): trap EOF and ^C so that they
4382 * IPython/genutils.py (ask_yes_no): trap EOF and ^C so that they
4378 don't propagate up to caller. Fixes crash reported by François
4383 don't propagate up to caller. Fixes crash reported by François
4379 Pinard.
4384 Pinard.
4380
4385
4381 2002-11-09 Fernando Perez <fperez@colorado.edu>
4386 2002-11-09 Fernando Perez <fperez@colorado.edu>
4382
4387
4383 * IPython/ipmaker.py (make_IPython): fixed problem with writing
4388 * IPython/ipmaker.py (make_IPython): fixed problem with writing
4384 history file for new users.
4389 history file for new users.
4385 (make_IPython): fixed bug where initial install would leave the
4390 (make_IPython): fixed bug where initial install would leave the
4386 user running in the .ipython dir.
4391 user running in the .ipython dir.
4387 (make_IPython): fixed bug where config dir .ipython would be
4392 (make_IPython): fixed bug where config dir .ipython would be
4388 created regardless of the given -ipythondir option. Thanks to Cory
4393 created regardless of the given -ipythondir option. Thanks to Cory
4389 Dodt <cdodt-AT-fcoe.k12.ca.us> for the bug report.
4394 Dodt <cdodt-AT-fcoe.k12.ca.us> for the bug report.
4390
4395
4391 * IPython/genutils.py (ask_yes_no): new function for asking yes/no
4396 * IPython/genutils.py (ask_yes_no): new function for asking yes/no
4392 type confirmations. Will need to use it in all of IPython's code
4397 type confirmations. Will need to use it in all of IPython's code
4393 consistently.
4398 consistently.
4394
4399
4395 * IPython/CrashHandler.py (CrashHandler.__call__): changed the
4400 * IPython/CrashHandler.py (CrashHandler.__call__): changed the
4396 context to print 31 lines instead of the default 5. This will make
4401 context to print 31 lines instead of the default 5. This will make
4397 the crash reports extremely detailed in case the problem is in
4402 the crash reports extremely detailed in case the problem is in
4398 libraries I don't have access to.
4403 libraries I don't have access to.
4399
4404
4400 * IPython/iplib.py (InteractiveShell.interact): changed the 'last
4405 * IPython/iplib.py (InteractiveShell.interact): changed the 'last
4401 line of defense' code to still crash, but giving users fair
4406 line of defense' code to still crash, but giving users fair
4402 warning. I don't want internal errors to go unreported: if there's
4407 warning. I don't want internal errors to go unreported: if there's
4403 an internal problem, IPython should crash and generate a full
4408 an internal problem, IPython should crash and generate a full
4404 report.
4409 report.
4405
4410
4406 2002-11-08 Fernando Perez <fperez@colorado.edu>
4411 2002-11-08 Fernando Perez <fperez@colorado.edu>
4407
4412
4408 * IPython/iplib.py (InteractiveShell.interact): added code to trap
4413 * IPython/iplib.py (InteractiveShell.interact): added code to trap
4409 otherwise uncaught exceptions which can appear if people set
4414 otherwise uncaught exceptions which can appear if people set
4410 sys.stdout to something badly broken. Thanks to a crash report
4415 sys.stdout to something badly broken. Thanks to a crash report
4411 from henni-AT-mail.brainbot.com.
4416 from henni-AT-mail.brainbot.com.
4412
4417
4413 2002-11-04 Fernando Perez <fperez@colorado.edu>
4418 2002-11-04 Fernando Perez <fperez@colorado.edu>
4414
4419
4415 * IPython/iplib.py (InteractiveShell.interact): added
4420 * IPython/iplib.py (InteractiveShell.interact): added
4416 __IPYTHON__active to the builtins. It's a flag which goes on when
4421 __IPYTHON__active to the builtins. It's a flag which goes on when
4417 the interaction starts and goes off again when it stops. This
4422 the interaction starts and goes off again when it stops. This
4418 allows embedding code to detect being inside IPython. Before this
4423 allows embedding code to detect being inside IPython. Before this
4419 was done via __IPYTHON__, but that only shows that an IPython
4424 was done via __IPYTHON__, but that only shows that an IPython
4420 instance has been created.
4425 instance has been created.
4421
4426
4422 * IPython/Magic.py (Magic.magic_env): I realized that in a
4427 * IPython/Magic.py (Magic.magic_env): I realized that in a
4423 UserDict, instance.data holds the data as a normal dict. So I
4428 UserDict, instance.data holds the data as a normal dict. So I
4424 modified @env to return os.environ.data instead of rebuilding a
4429 modified @env to return os.environ.data instead of rebuilding a
4425 dict by hand.
4430 dict by hand.
4426
4431
4427 2002-11-02 Fernando Perez <fperez@colorado.edu>
4432 2002-11-02 Fernando Perez <fperez@colorado.edu>
4428
4433
4429 * IPython/genutils.py (warn): changed so that level 1 prints no
4434 * IPython/genutils.py (warn): changed so that level 1 prints no
4430 header. Level 2 is now the default (with 'WARNING' header, as
4435 header. Level 2 is now the default (with 'WARNING' header, as
4431 before). I think I tracked all places where changes were needed in
4436 before). I think I tracked all places where changes were needed in
4432 IPython, but outside code using the old level numbering may have
4437 IPython, but outside code using the old level numbering may have
4433 broken.
4438 broken.
4434
4439
4435 * IPython/iplib.py (InteractiveShell.runcode): added this to
4440 * IPython/iplib.py (InteractiveShell.runcode): added this to
4436 handle the tracebacks in SystemExit traps correctly. The previous
4441 handle the tracebacks in SystemExit traps correctly. The previous
4437 code (through interact) was printing more of the stack than
4442 code (through interact) was printing more of the stack than
4438 necessary, showing IPython internal code to the user.
4443 necessary, showing IPython internal code to the user.
4439
4444
4440 * IPython/UserConfig/ipythonrc.py: Made confirm_exit 1 by
4445 * IPython/UserConfig/ipythonrc.py: Made confirm_exit 1 by
4441 default. Now that the default at the confirmation prompt is yes,
4446 default. Now that the default at the confirmation prompt is yes,
4442 it's not so intrusive. François' argument that ipython sessions
4447 it's not so intrusive. François' argument that ipython sessions
4443 tend to be complex enough not to lose them from an accidental C-d,
4448 tend to be complex enough not to lose them from an accidental C-d,
4444 is a valid one.
4449 is a valid one.
4445
4450
4446 * IPython/iplib.py (InteractiveShell.interact): added a
4451 * IPython/iplib.py (InteractiveShell.interact): added a
4447 showtraceback() call to the SystemExit trap, and modified the exit
4452 showtraceback() call to the SystemExit trap, and modified the exit
4448 confirmation to have yes as the default.
4453 confirmation to have yes as the default.
4449
4454
4450 * IPython/UserConfig/ipythonrc.py: removed 'session' option from
4455 * IPython/UserConfig/ipythonrc.py: removed 'session' option from
4451 this file. It's been gone from the code for a long time, this was
4456 this file. It's been gone from the code for a long time, this was
4452 simply leftover junk.
4457 simply leftover junk.
4453
4458
4454 2002-11-01 Fernando Perez <fperez@colorado.edu>
4459 2002-11-01 Fernando Perez <fperez@colorado.edu>
4455
4460
4456 * IPython/UserConfig/ipythonrc.py: new confirm_exit option
4461 * IPython/UserConfig/ipythonrc.py: new confirm_exit option
4457 added. If set, IPython now traps EOF and asks for
4462 added. If set, IPython now traps EOF and asks for
4458 confirmation. After a request by François Pinard.
4463 confirmation. After a request by François Pinard.
4459
4464
4460 * IPython/Magic.py (Magic.magic_Exit): New @Exit and @Quit instead
4465 * IPython/Magic.py (Magic.magic_Exit): New @Exit and @Quit instead
4461 of @abort, and with a new (better) mechanism for handling the
4466 of @abort, and with a new (better) mechanism for handling the
4462 exceptions.
4467 exceptions.
4463
4468
4464 2002-10-27 Fernando Perez <fperez@colorado.edu>
4469 2002-10-27 Fernando Perez <fperez@colorado.edu>
4465
4470
4466 * IPython/usage.py (__doc__): updated the --help information and
4471 * IPython/usage.py (__doc__): updated the --help information and
4467 the ipythonrc file to indicate that -log generates
4472 the ipythonrc file to indicate that -log generates
4468 ./ipython.log. Also fixed the corresponding info in @logstart.
4473 ./ipython.log. Also fixed the corresponding info in @logstart.
4469 This and several other fixes in the manuals thanks to reports by
4474 This and several other fixes in the manuals thanks to reports by
4470 François Pinard <pinard-AT-iro.umontreal.ca>.
4475 François Pinard <pinard-AT-iro.umontreal.ca>.
4471
4476
4472 * IPython/Logger.py (Logger.switch_log): Fixed error message to
4477 * IPython/Logger.py (Logger.switch_log): Fixed error message to
4473 refer to @logstart (instead of @log, which doesn't exist).
4478 refer to @logstart (instead of @log, which doesn't exist).
4474
4479
4475 * IPython/iplib.py (InteractiveShell._prefilter): fixed
4480 * IPython/iplib.py (InteractiveShell._prefilter): fixed
4476 AttributeError crash. Thanks to Christopher Armstrong
4481 AttributeError crash. Thanks to Christopher Armstrong
4477 <radix-AT-twistedmatrix.com> for the report/fix. This bug had been
4482 <radix-AT-twistedmatrix.com> for the report/fix. This bug had been
4478 introduced recently (in 0.2.14pre37) with the fix to the eval
4483 introduced recently (in 0.2.14pre37) with the fix to the eval
4479 problem mentioned below.
4484 problem mentioned below.
4480
4485
4481 2002-10-17 Fernando Perez <fperez@colorado.edu>
4486 2002-10-17 Fernando Perez <fperez@colorado.edu>
4482
4487
4483 * IPython/ConfigLoader.py (ConfigLoader.load): Fixes for Windows
4488 * IPython/ConfigLoader.py (ConfigLoader.load): Fixes for Windows
4484 installation. Thanks to Leonardo Santagada <retype-AT-terra.com.br>.
4489 installation. Thanks to Leonardo Santagada <retype-AT-terra.com.br>.
4485
4490
4486 * IPython/iplib.py (InteractiveShell._prefilter): Many changes to
4491 * IPython/iplib.py (InteractiveShell._prefilter): Many changes to
4487 this function to fix a problem reported by Alex Schmolck. He saw
4492 this function to fix a problem reported by Alex Schmolck. He saw
4488 it with list comprehensions and generators, which were getting
4493 it with list comprehensions and generators, which were getting
4489 called twice. The real problem was an 'eval' call in testing for
4494 called twice. The real problem was an 'eval' call in testing for
4490 automagic which was evaluating the input line silently.
4495 automagic which was evaluating the input line silently.
4491
4496
4492 This is a potentially very nasty bug, if the input has side
4497 This is a potentially very nasty bug, if the input has side
4493 effects which must not be repeated. The code is much cleaner now,
4498 effects which must not be repeated. The code is much cleaner now,
4494 without any blanket 'except' left and with a regexp test for
4499 without any blanket 'except' left and with a regexp test for
4495 actual function names.
4500 actual function names.
4496
4501
4497 But an eval remains, which I'm not fully comfortable with. I just
4502 But an eval remains, which I'm not fully comfortable with. I just
4498 don't know how to find out if an expression could be a callable in
4503 don't know how to find out if an expression could be a callable in
4499 the user's namespace without doing an eval on the string. However
4504 the user's namespace without doing an eval on the string. However
4500 that string is now much more strictly checked so that no code
4505 that string is now much more strictly checked so that no code
4501 slips by, so the eval should only happen for things that can
4506 slips by, so the eval should only happen for things that can
4502 really be only function/method names.
4507 really be only function/method names.
4503
4508
4504 2002-10-15 Fernando Perez <fperez@colorado.edu>
4509 2002-10-15 Fernando Perez <fperez@colorado.edu>
4505
4510
4506 * Updated LyX to 1.2.1 so I can work on the docs again. Added Mac
4511 * Updated LyX to 1.2.1 so I can work on the docs again. Added Mac
4507 OSX information to main manual, removed README_Mac_OSX file from
4512 OSX information to main manual, removed README_Mac_OSX file from
4508 distribution. Also updated credits for recent additions.
4513 distribution. Also updated credits for recent additions.
4509
4514
4510 2002-10-10 Fernando Perez <fperez@colorado.edu>
4515 2002-10-10 Fernando Perez <fperez@colorado.edu>
4511
4516
4512 * README_Mac_OSX: Added a README for Mac OSX users for fixing
4517 * README_Mac_OSX: Added a README for Mac OSX users for fixing
4513 terminal-related issues. Many thanks to Andrea Riciputi
4518 terminal-related issues. Many thanks to Andrea Riciputi
4514 <andrea.riciputi-AT-libero.it> for writing it.
4519 <andrea.riciputi-AT-libero.it> for writing it.
4515
4520
4516 * IPython/UserConfig/ipythonrc.py: Fixes to various small issues,
4521 * IPython/UserConfig/ipythonrc.py: Fixes to various small issues,
4517 thanks to Thorsten Kampe <thorsten-AT-thorstenkampe.de>.
4522 thanks to Thorsten Kampe <thorsten-AT-thorstenkampe.de>.
4518
4523
4519 * setup.py (make_shortcut): Fixes for Windows installation. Thanks
4524 * setup.py (make_shortcut): Fixes for Windows installation. Thanks
4520 to Fredrik Kant <fredrik.kant-AT-front.com> and Syver Enstad
4525 to Fredrik Kant <fredrik.kant-AT-front.com> and Syver Enstad
4521 <syver-en-AT-online.no> who both submitted patches for this problem.
4526 <syver-en-AT-online.no> who both submitted patches for this problem.
4522
4527
4523 * IPython/iplib.py (InteractiveShell.embed_mainloop): Patch for
4528 * IPython/iplib.py (InteractiveShell.embed_mainloop): Patch for
4524 global embedding to make sure that things don't overwrite user
4529 global embedding to make sure that things don't overwrite user
4525 globals accidentally. Thanks to Richard <rxe-AT-renre-europe.com>
4530 globals accidentally. Thanks to Richard <rxe-AT-renre-europe.com>
4526
4531
4527 * IPython/Gnuplot2.py (gp): Patch for Gnuplot.py 1.6
4532 * IPython/Gnuplot2.py (gp): Patch for Gnuplot.py 1.6
4528 compatibility. Thanks to Hayden Callow
4533 compatibility. Thanks to Hayden Callow
4529 <h.callow-AT-elec.canterbury.ac.nz>
4534 <h.callow-AT-elec.canterbury.ac.nz>
4530
4535
4531 2002-10-04 Fernando Perez <fperez@colorado.edu>
4536 2002-10-04 Fernando Perez <fperez@colorado.edu>
4532
4537
4533 * IPython/Gnuplot2.py (PlotItem): Added 'index' option for
4538 * IPython/Gnuplot2.py (PlotItem): Added 'index' option for
4534 Gnuplot.File objects.
4539 Gnuplot.File objects.
4535
4540
4536 2002-07-23 Fernando Perez <fperez@colorado.edu>
4541 2002-07-23 Fernando Perez <fperez@colorado.edu>
4537
4542
4538 * IPython/genutils.py (timing): Added timings() and timing() for
4543 * IPython/genutils.py (timing): Added timings() and timing() for
4539 quick access to the most commonly needed data, the execution
4544 quick access to the most commonly needed data, the execution
4540 times. Old timing() renamed to timings_out().
4545 times. Old timing() renamed to timings_out().
4541
4546
4542 2002-07-18 Fernando Perez <fperez@colorado.edu>
4547 2002-07-18 Fernando Perez <fperez@colorado.edu>
4543
4548
4544 * IPython/Shell.py (IPShellEmbed.restore_system_completer): fixed
4549 * IPython/Shell.py (IPShellEmbed.restore_system_completer): fixed
4545 bug with nested instances disrupting the parent's tab completion.
4550 bug with nested instances disrupting the parent's tab completion.
4546
4551
4547 * IPython/iplib.py (all_completions): Added Alex Schmolck's
4552 * IPython/iplib.py (all_completions): Added Alex Schmolck's
4548 all_completions code to begin the emacs integration.
4553 all_completions code to begin the emacs integration.
4549
4554
4550 * IPython/Gnuplot2.py (zip_items): Added optional 'titles'
4555 * IPython/Gnuplot2.py (zip_items): Added optional 'titles'
4551 argument to allow titling individual arrays when plotting.
4556 argument to allow titling individual arrays when plotting.
4552
4557
4553 2002-07-15 Fernando Perez <fperez@colorado.edu>
4558 2002-07-15 Fernando Perez <fperez@colorado.edu>
4554
4559
4555 * setup.py (make_shortcut): changed to retrieve the value of
4560 * setup.py (make_shortcut): changed to retrieve the value of
4556 'Program Files' directory from the registry (this value changes in
4561 'Program Files' directory from the registry (this value changes in
4557 non-english versions of Windows). Thanks to Thomas Fanslau
4562 non-english versions of Windows). Thanks to Thomas Fanslau
4558 <tfanslau-AT-gmx.de> for the report.
4563 <tfanslau-AT-gmx.de> for the report.
4559
4564
4560 2002-07-10 Fernando Perez <fperez@colorado.edu>
4565 2002-07-10 Fernando Perez <fperez@colorado.edu>
4561
4566
4562 * IPython/ultraTB.py (VerboseTB.debugger): enabled workaround for
4567 * IPython/ultraTB.py (VerboseTB.debugger): enabled workaround for
4563 a bug in pdb, which crashes if a line with only whitespace is
4568 a bug in pdb, which crashes if a line with only whitespace is
4564 entered. Bug report submitted to sourceforge.
4569 entered. Bug report submitted to sourceforge.
4565
4570
4566 2002-07-09 Fernando Perez <fperez@colorado.edu>
4571 2002-07-09 Fernando Perez <fperez@colorado.edu>
4567
4572
4568 * IPython/ultraTB.py (VerboseTB.nullrepr): fixed rare crash when
4573 * IPython/ultraTB.py (VerboseTB.nullrepr): fixed rare crash when
4569 reporting exceptions (it's a bug in inspect.py, I just set a
4574 reporting exceptions (it's a bug in inspect.py, I just set a
4570 workaround).
4575 workaround).
4571
4576
4572 2002-07-08 Fernando Perez <fperez@colorado.edu>
4577 2002-07-08 Fernando Perez <fperez@colorado.edu>
4573
4578
4574 * IPython/iplib.py (InteractiveShell.__init__): fixed reference to
4579 * IPython/iplib.py (InteractiveShell.__init__): fixed reference to
4575 __IPYTHON__ in __builtins__ to show up in user_ns.
4580 __IPYTHON__ in __builtins__ to show up in user_ns.
4576
4581
4577 2002-07-03 Fernando Perez <fperez@colorado.edu>
4582 2002-07-03 Fernando Perez <fperez@colorado.edu>
4578
4583
4579 * IPython/GnuplotInteractive.py (magic_gp_set_default): changed
4584 * IPython/GnuplotInteractive.py (magic_gp_set_default): changed
4580 name from @gp_set_instance to @gp_set_default.
4585 name from @gp_set_instance to @gp_set_default.
4581
4586
4582 * IPython/ipmaker.py (make_IPython): default editor value set to
4587 * IPython/ipmaker.py (make_IPython): default editor value set to
4583 '0' (a string), to match the rc file. Otherwise will crash when
4588 '0' (a string), to match the rc file. Otherwise will crash when
4584 .strip() is called on it.
4589 .strip() is called on it.
4585
4590
4586
4591
4587 2002-06-28 Fernando Perez <fperez@colorado.edu>
4592 2002-06-28 Fernando Perez <fperez@colorado.edu>
4588
4593
4589 * IPython/iplib.py (InteractiveShell.safe_execfile): fix importing
4594 * IPython/iplib.py (InteractiveShell.safe_execfile): fix importing
4590 of files in current directory when a file is executed via
4595 of files in current directory when a file is executed via
4591 @run. Patch also by RA <ralf_ahlbrink-AT-web.de>.
4596 @run. Patch also by RA <ralf_ahlbrink-AT-web.de>.
4592
4597
4593 * setup.py (manfiles): fix for rpm builds, submitted by RA
4598 * setup.py (manfiles): fix for rpm builds, submitted by RA
4594 <ralf_ahlbrink-AT-web.de>. Now we have RPMs!
4599 <ralf_ahlbrink-AT-web.de>. Now we have RPMs!
4595
4600
4596 * IPython/ipmaker.py (make_IPython): fixed lookup of default
4601 * IPython/ipmaker.py (make_IPython): fixed lookup of default
4597 editor when set to '0'. Problem was, '0' evaluates to True (it's a
4602 editor when set to '0'. Problem was, '0' evaluates to True (it's a
4598 string!). A. Schmolck caught this one.
4603 string!). A. Schmolck caught this one.
4599
4604
4600 2002-06-27 Fernando Perez <fperez@colorado.edu>
4605 2002-06-27 Fernando Perez <fperez@colorado.edu>
4601
4606
4602 * IPython/ipmaker.py (make_IPython): fixed bug when running user
4607 * IPython/ipmaker.py (make_IPython): fixed bug when running user
4603 defined files at the cmd line. __name__ wasn't being set to
4608 defined files at the cmd line. __name__ wasn't being set to
4604 __main__.
4609 __main__.
4605
4610
4606 * IPython/Gnuplot2.py (zip_items): improved it so it can plot also
4611 * IPython/Gnuplot2.py (zip_items): improved it so it can plot also
4607 regular lists and tuples besides Numeric arrays.
4612 regular lists and tuples besides Numeric arrays.
4608
4613
4609 * IPython/Prompts.py (CachedOutput.__call__): Added output
4614 * IPython/Prompts.py (CachedOutput.__call__): Added output
4610 supression for input ending with ';'. Similar to Mathematica and
4615 supression for input ending with ';'. Similar to Mathematica and
4611 Matlab. The _* vars and Out[] list are still updated, just like
4616 Matlab. The _* vars and Out[] list are still updated, just like
4612 Mathematica behaves.
4617 Mathematica behaves.
4613
4618
4614 2002-06-25 Fernando Perez <fperez@colorado.edu>
4619 2002-06-25 Fernando Perez <fperez@colorado.edu>
4615
4620
4616 * IPython/ConfigLoader.py (ConfigLoader.load): fixed checking of
4621 * IPython/ConfigLoader.py (ConfigLoader.load): fixed checking of
4617 .ini extensions for profiels under Windows.
4622 .ini extensions for profiels under Windows.
4618
4623
4619 * IPython/OInspect.py (Inspector.pinfo): improved alignment of
4624 * IPython/OInspect.py (Inspector.pinfo): improved alignment of
4620 string form. Fix contributed by Alexander Schmolck
4625 string form. Fix contributed by Alexander Schmolck
4621 <a.schmolck-AT-gmx.net>
4626 <a.schmolck-AT-gmx.net>
4622
4627
4623 * IPython/GnuplotRuntime.py (gp_new): new function. Returns a
4628 * IPython/GnuplotRuntime.py (gp_new): new function. Returns a
4624 pre-configured Gnuplot instance.
4629 pre-configured Gnuplot instance.
4625
4630
4626 2002-06-21 Fernando Perez <fperez@colorado.edu>
4631 2002-06-21 Fernando Perez <fperez@colorado.edu>
4627
4632
4628 * IPython/numutils.py (exp_safe): new function, works around the
4633 * IPython/numutils.py (exp_safe): new function, works around the
4629 underflow problems in Numeric.
4634 underflow problems in Numeric.
4630 (log2): New fn. Safe log in base 2: returns exact integer answer
4635 (log2): New fn. Safe log in base 2: returns exact integer answer
4631 for exact integer powers of 2.
4636 for exact integer powers of 2.
4632
4637
4633 * IPython/Magic.py (get_py_filename): fixed it not expanding '~'
4638 * IPython/Magic.py (get_py_filename): fixed it not expanding '~'
4634 properly.
4639 properly.
4635
4640
4636 2002-06-20 Fernando Perez <fperez@colorado.edu>
4641 2002-06-20 Fernando Perez <fperez@colorado.edu>
4637
4642
4638 * IPython/genutils.py (timing): new function like
4643 * IPython/genutils.py (timing): new function like
4639 Mathematica's. Similar to time_test, but returns more info.
4644 Mathematica's. Similar to time_test, but returns more info.
4640
4645
4641 2002-06-18 Fernando Perez <fperez@colorado.edu>
4646 2002-06-18 Fernando Perez <fperez@colorado.edu>
4642
4647
4643 * IPython/Magic.py (Magic.magic_save): modified @save and @r
4648 * IPython/Magic.py (Magic.magic_save): modified @save and @r
4644 according to Mike Heeter's suggestions.
4649 according to Mike Heeter's suggestions.
4645
4650
4646 2002-06-16 Fernando Perez <fperez@colorado.edu>
4651 2002-06-16 Fernando Perez <fperez@colorado.edu>
4647
4652
4648 * IPython/GnuplotRuntime.py: Massive overhaul to the Gnuplot
4653 * IPython/GnuplotRuntime.py: Massive overhaul to the Gnuplot
4649 system. GnuplotMagic is gone as a user-directory option. New files
4654 system. GnuplotMagic is gone as a user-directory option. New files
4650 make it easier to use all the gnuplot stuff both from external
4655 make it easier to use all the gnuplot stuff both from external
4651 programs as well as from IPython. Had to rewrite part of
4656 programs as well as from IPython. Had to rewrite part of
4652 hardcopy() b/c of a strange bug: often the ps files simply don't
4657 hardcopy() b/c of a strange bug: often the ps files simply don't
4653 get created, and require a repeat of the command (often several
4658 get created, and require a repeat of the command (often several
4654 times).
4659 times).
4655
4660
4656 * IPython/ultraTB.py (AutoFormattedTB.__call__): changed to
4661 * IPython/ultraTB.py (AutoFormattedTB.__call__): changed to
4657 resolve output channel at call time, so that if sys.stderr has
4662 resolve output channel at call time, so that if sys.stderr has
4658 been redirected by user this gets honored.
4663 been redirected by user this gets honored.
4659
4664
4660 2002-06-13 Fernando Perez <fperez@colorado.edu>
4665 2002-06-13 Fernando Perez <fperez@colorado.edu>
4661
4666
4662 * IPython/Shell.py (IPShell.__init__): Changed IPythonShell to
4667 * IPython/Shell.py (IPShell.__init__): Changed IPythonShell to
4663 IPShell. Kept a copy with the old names to avoid breaking people's
4668 IPShell. Kept a copy with the old names to avoid breaking people's
4664 embedded code.
4669 embedded code.
4665
4670
4666 * IPython/ipython: simplified it to the bare minimum after
4671 * IPython/ipython: simplified it to the bare minimum after
4667 Holger's suggestions. Added info about how to use it in
4672 Holger's suggestions. Added info about how to use it in
4668 PYTHONSTARTUP.
4673 PYTHONSTARTUP.
4669
4674
4670 * IPython/Shell.py (IPythonShell): changed the options passing
4675 * IPython/Shell.py (IPythonShell): changed the options passing
4671 from a string with funky %s replacements to a straight list. Maybe
4676 from a string with funky %s replacements to a straight list. Maybe
4672 a bit more typing, but it follows sys.argv conventions, so there's
4677 a bit more typing, but it follows sys.argv conventions, so there's
4673 less special-casing to remember.
4678 less special-casing to remember.
4674
4679
4675 2002-06-12 Fernando Perez <fperez@colorado.edu>
4680 2002-06-12 Fernando Perez <fperez@colorado.edu>
4676
4681
4677 * IPython/Magic.py (Magic.magic_r): new magic auto-repeat
4682 * IPython/Magic.py (Magic.magic_r): new magic auto-repeat
4678 command. Thanks to a suggestion by Mike Heeter.
4683 command. Thanks to a suggestion by Mike Heeter.
4679 (Magic.magic_pfile): added behavior to look at filenames if given
4684 (Magic.magic_pfile): added behavior to look at filenames if given
4680 arg is not a defined object.
4685 arg is not a defined object.
4681 (Magic.magic_save): New @save function to save code snippets. Also
4686 (Magic.magic_save): New @save function to save code snippets. Also
4682 a Mike Heeter idea.
4687 a Mike Heeter idea.
4683
4688
4684 * IPython/UserConfig/GnuplotMagic.py (plot): Improvements to
4689 * IPython/UserConfig/GnuplotMagic.py (plot): Improvements to
4685 plot() and replot(). Much more convenient now, especially for
4690 plot() and replot(). Much more convenient now, especially for
4686 interactive use.
4691 interactive use.
4687
4692
4688 * IPython/Magic.py (Magic.magic_run): Added .py automatically to
4693 * IPython/Magic.py (Magic.magic_run): Added .py automatically to
4689 filenames.
4694 filenames.
4690
4695
4691 2002-06-02 Fernando Perez <fperez@colorado.edu>
4696 2002-06-02 Fernando Perez <fperez@colorado.edu>
4692
4697
4693 * IPython/Struct.py (Struct.__init__): modified to admit
4698 * IPython/Struct.py (Struct.__init__): modified to admit
4694 initialization via another struct.
4699 initialization via another struct.
4695
4700
4696 * IPython/genutils.py (SystemExec.__init__): New stateful
4701 * IPython/genutils.py (SystemExec.__init__): New stateful
4697 interface to xsys and bq. Useful for writing system scripts.
4702 interface to xsys and bq. Useful for writing system scripts.
4698
4703
4699 2002-05-30 Fernando Perez <fperez@colorado.edu>
4704 2002-05-30 Fernando Perez <fperez@colorado.edu>
4700
4705
4701 * MANIFEST.in: Changed docfile selection to exclude all the lyx
4706 * MANIFEST.in: Changed docfile selection to exclude all the lyx
4702 documents. This will make the user download smaller (it's getting
4707 documents. This will make the user download smaller (it's getting
4703 too big).
4708 too big).
4704
4709
4705 2002-05-29 Fernando Perez <fperez@colorado.edu>
4710 2002-05-29 Fernando Perez <fperez@colorado.edu>
4706
4711
4707 * IPython/iplib.py (_FakeModule.__init__): New class introduced to
4712 * IPython/iplib.py (_FakeModule.__init__): New class introduced to
4708 fix problems with shelve and pickle. Seems to work, but I don't
4713 fix problems with shelve and pickle. Seems to work, but I don't
4709 know if corner cases break it. Thanks to Mike Heeter
4714 know if corner cases break it. Thanks to Mike Heeter
4710 <korora-AT-SDF.LONESTAR.ORG> for the bug reports and test cases.
4715 <korora-AT-SDF.LONESTAR.ORG> for the bug reports and test cases.
4711
4716
4712 2002-05-24 Fernando Perez <fperez@colorado.edu>
4717 2002-05-24 Fernando Perez <fperez@colorado.edu>
4713
4718
4714 * IPython/Magic.py (Macro.__init__): fixed magics embedded in
4719 * IPython/Magic.py (Macro.__init__): fixed magics embedded in
4715 macros having broken.
4720 macros having broken.
4716
4721
4717 2002-05-21 Fernando Perez <fperez@colorado.edu>
4722 2002-05-21 Fernando Perez <fperez@colorado.edu>
4718
4723
4719 * IPython/Magic.py (Magic.magic_logstart): fixed recently
4724 * IPython/Magic.py (Magic.magic_logstart): fixed recently
4720 introduced logging bug: all history before logging started was
4725 introduced logging bug: all history before logging started was
4721 being written one character per line! This came from the redesign
4726 being written one character per line! This came from the redesign
4722 of the input history as a special list which slices to strings,
4727 of the input history as a special list which slices to strings,
4723 not to lists.
4728 not to lists.
4724
4729
4725 2002-05-20 Fernando Perez <fperez@colorado.edu>
4730 2002-05-20 Fernando Perez <fperez@colorado.edu>
4726
4731
4727 * IPython/Prompts.py (CachedOutput.__init__): made the color table
4732 * IPython/Prompts.py (CachedOutput.__init__): made the color table
4728 be an attribute of all classes in this module. The design of these
4733 be an attribute of all classes in this module. The design of these
4729 classes needs some serious overhauling.
4734 classes needs some serious overhauling.
4730
4735
4731 * IPython/DPyGetOpt.py (DPyGetOpt.setPosixCompliance): fixed bug
4736 * IPython/DPyGetOpt.py (DPyGetOpt.setPosixCompliance): fixed bug
4732 which was ignoring '_' in option names.
4737 which was ignoring '_' in option names.
4733
4738
4734 * IPython/ultraTB.py (FormattedTB.__init__): Changed
4739 * IPython/ultraTB.py (FormattedTB.__init__): Changed
4735 'Verbose_novars' to 'Context' and made it the new default. It's a
4740 'Verbose_novars' to 'Context' and made it the new default. It's a
4736 bit more readable and also safer than verbose.
4741 bit more readable and also safer than verbose.
4737
4742
4738 * IPython/PyColorize.py (Parser.__call__): Fixed coloring of
4743 * IPython/PyColorize.py (Parser.__call__): Fixed coloring of
4739 triple-quoted strings.
4744 triple-quoted strings.
4740
4745
4741 * IPython/OInspect.py (__all__): new module exposing the object
4746 * IPython/OInspect.py (__all__): new module exposing the object
4742 introspection facilities. Now the corresponding magics are dummy
4747 introspection facilities. Now the corresponding magics are dummy
4743 wrappers around this. Having this module will make it much easier
4748 wrappers around this. Having this module will make it much easier
4744 to put these functions into our modified pdb.
4749 to put these functions into our modified pdb.
4745 This new object inspector system uses the new colorizing module,
4750 This new object inspector system uses the new colorizing module,
4746 so source code and other things are nicely syntax highlighted.
4751 so source code and other things are nicely syntax highlighted.
4747
4752
4748 2002-05-18 Fernando Perez <fperez@colorado.edu>
4753 2002-05-18 Fernando Perez <fperez@colorado.edu>
4749
4754
4750 * IPython/ColorANSI.py: Split the coloring tools into a separate
4755 * IPython/ColorANSI.py: Split the coloring tools into a separate
4751 module so I can use them in other code easier (they were part of
4756 module so I can use them in other code easier (they were part of
4752 ultraTB).
4757 ultraTB).
4753
4758
4754 2002-05-17 Fernando Perez <fperez@colorado.edu>
4759 2002-05-17 Fernando Perez <fperez@colorado.edu>
4755
4760
4756 * IPython/UserConfig/GnuplotMagic.py (magic_gp_set_instance):
4761 * IPython/UserConfig/GnuplotMagic.py (magic_gp_set_instance):
4757 fixed it to set the global 'g' also to the called instance, as
4762 fixed it to set the global 'g' also to the called instance, as
4758 long as 'g' was still a gnuplot instance (so it doesn't overwrite
4763 long as 'g' was still a gnuplot instance (so it doesn't overwrite
4759 user's 'g' variables).
4764 user's 'g' variables).
4760
4765
4761 * IPython/iplib.py (InteractiveShell.__init__): Added In/Out
4766 * IPython/iplib.py (InteractiveShell.__init__): Added In/Out
4762 global variables (aliases to _ih,_oh) so that users which expect
4767 global variables (aliases to _ih,_oh) so that users which expect
4763 In[5] or Out[7] to work aren't unpleasantly surprised.
4768 In[5] or Out[7] to work aren't unpleasantly surprised.
4764 (InputList.__getslice__): new class to allow executing slices of
4769 (InputList.__getslice__): new class to allow executing slices of
4765 input history directly. Very simple class, complements the use of
4770 input history directly. Very simple class, complements the use of
4766 macros.
4771 macros.
4767
4772
4768 2002-05-16 Fernando Perez <fperez@colorado.edu>
4773 2002-05-16 Fernando Perez <fperez@colorado.edu>
4769
4774
4770 * setup.py (docdirbase): make doc directory be just doc/IPython
4775 * setup.py (docdirbase): make doc directory be just doc/IPython
4771 without version numbers, it will reduce clutter for users.
4776 without version numbers, it will reduce clutter for users.
4772
4777
4773 * IPython/Magic.py (Magic.magic_run): Add explicit local dict to
4778 * IPython/Magic.py (Magic.magic_run): Add explicit local dict to
4774 execfile call to prevent possible memory leak. See for details:
4779 execfile call to prevent possible memory leak. See for details:
4775 http://mail.python.org/pipermail/python-list/2002-February/088476.html
4780 http://mail.python.org/pipermail/python-list/2002-February/088476.html
4776
4781
4777 2002-05-15 Fernando Perez <fperez@colorado.edu>
4782 2002-05-15 Fernando Perez <fperez@colorado.edu>
4778
4783
4779 * IPython/Magic.py (Magic.magic_psource): made the object
4784 * IPython/Magic.py (Magic.magic_psource): made the object
4780 introspection names be more standard: pdoc, pdef, pfile and
4785 introspection names be more standard: pdoc, pdef, pfile and
4781 psource. They all print/page their output, and it makes
4786 psource. They all print/page their output, and it makes
4782 remembering them easier. Kept old names for compatibility as
4787 remembering them easier. Kept old names for compatibility as
4783 aliases.
4788 aliases.
4784
4789
4785 2002-05-14 Fernando Perez <fperez@colorado.edu>
4790 2002-05-14 Fernando Perez <fperez@colorado.edu>
4786
4791
4787 * IPython/UserConfig/GnuplotMagic.py: I think I finally understood
4792 * IPython/UserConfig/GnuplotMagic.py: I think I finally understood
4788 what the mouse problem was. The trick is to use gnuplot with temp
4793 what the mouse problem was. The trick is to use gnuplot with temp
4789 files and NOT with pipes (for data communication), because having
4794 files and NOT with pipes (for data communication), because having
4790 both pipes and the mouse on is bad news.
4795 both pipes and the mouse on is bad news.
4791
4796
4792 2002-05-13 Fernando Perez <fperez@colorado.edu>
4797 2002-05-13 Fernando Perez <fperez@colorado.edu>
4793
4798
4794 * IPython/Magic.py (Magic._ofind): fixed namespace order search
4799 * IPython/Magic.py (Magic._ofind): fixed namespace order search
4795 bug. Information would be reported about builtins even when
4800 bug. Information would be reported about builtins even when
4796 user-defined functions overrode them.
4801 user-defined functions overrode them.
4797
4802
4798 2002-05-11 Fernando Perez <fperez@colorado.edu>
4803 2002-05-11 Fernando Perez <fperez@colorado.edu>
4799
4804
4800 * IPython/__init__.py (__all__): removed FlexCompleter from
4805 * IPython/__init__.py (__all__): removed FlexCompleter from
4801 __all__ so that things don't fail in platforms without readline.
4806 __all__ so that things don't fail in platforms without readline.
4802
4807
4803 2002-05-10 Fernando Perez <fperez@colorado.edu>
4808 2002-05-10 Fernando Perez <fperez@colorado.edu>
4804
4809
4805 * IPython/__init__.py (__all__): removed numutils from __all__ b/c
4810 * IPython/__init__.py (__all__): removed numutils from __all__ b/c
4806 it requires Numeric, effectively making Numeric a dependency for
4811 it requires Numeric, effectively making Numeric a dependency for
4807 IPython.
4812 IPython.
4808
4813
4809 * Released 0.2.13
4814 * Released 0.2.13
4810
4815
4811 * IPython/Magic.py (Magic.magic_prun): big overhaul to the
4816 * IPython/Magic.py (Magic.magic_prun): big overhaul to the
4812 profiler interface. Now all the major options from the profiler
4817 profiler interface. Now all the major options from the profiler
4813 module are directly supported in IPython, both for single
4818 module are directly supported in IPython, both for single
4814 expressions (@prun) and for full programs (@run -p).
4819 expressions (@prun) and for full programs (@run -p).
4815
4820
4816 2002-05-09 Fernando Perez <fperez@colorado.edu>
4821 2002-05-09 Fernando Perez <fperez@colorado.edu>
4817
4822
4818 * IPython/Magic.py (Magic.magic_doc): fixed to show docstrings of
4823 * IPython/Magic.py (Magic.magic_doc): fixed to show docstrings of
4819 magic properly formatted for screen.
4824 magic properly formatted for screen.
4820
4825
4821 * setup.py (make_shortcut): Changed things to put pdf version in
4826 * setup.py (make_shortcut): Changed things to put pdf version in
4822 doc/ instead of doc/manual (had to change lyxport a bit).
4827 doc/ instead of doc/manual (had to change lyxport a bit).
4823
4828
4824 * IPython/Magic.py (Profile.string_stats): made profile runs go
4829 * IPython/Magic.py (Profile.string_stats): made profile runs go
4825 through pager (they are long and a pager allows searching, saving,
4830 through pager (they are long and a pager allows searching, saving,
4826 etc.)
4831 etc.)
4827
4832
4828 2002-05-08 Fernando Perez <fperez@colorado.edu>
4833 2002-05-08 Fernando Perez <fperez@colorado.edu>
4829
4834
4830 * Released 0.2.12
4835 * Released 0.2.12
4831
4836
4832 2002-05-06 Fernando Perez <fperez@colorado.edu>
4837 2002-05-06 Fernando Perez <fperez@colorado.edu>
4833
4838
4834 * IPython/Magic.py (Magic.magic_hist): small bug fixed (recently
4839 * IPython/Magic.py (Magic.magic_hist): small bug fixed (recently
4835 introduced); 'hist n1 n2' was broken.
4840 introduced); 'hist n1 n2' was broken.
4836 (Magic.magic_pdb): added optional on/off arguments to @pdb
4841 (Magic.magic_pdb): added optional on/off arguments to @pdb
4837 (Magic.magic_run): added option -i to @run, which executes code in
4842 (Magic.magic_run): added option -i to @run, which executes code in
4838 the IPython namespace instead of a clean one. Also added @irun as
4843 the IPython namespace instead of a clean one. Also added @irun as
4839 an alias to @run -i.
4844 an alias to @run -i.
4840
4845
4841 * IPython/UserConfig/GnuplotMagic.py (magic_gp_set_instance):
4846 * IPython/UserConfig/GnuplotMagic.py (magic_gp_set_instance):
4842 fixed (it didn't really do anything, the namespaces were wrong).
4847 fixed (it didn't really do anything, the namespaces were wrong).
4843
4848
4844 * IPython/Debugger.py (__init__): Added workaround for python 2.1
4849 * IPython/Debugger.py (__init__): Added workaround for python 2.1
4845
4850
4846 * IPython/__init__.py (__all__): Fixed package namespace, now
4851 * IPython/__init__.py (__all__): Fixed package namespace, now
4847 'import IPython' does give access to IPython.<all> as
4852 'import IPython' does give access to IPython.<all> as
4848 expected. Also renamed __release__ to Release.
4853 expected. Also renamed __release__ to Release.
4849
4854
4850 * IPython/Debugger.py (__license__): created new Pdb class which
4855 * IPython/Debugger.py (__license__): created new Pdb class which
4851 functions like a drop-in for the normal pdb.Pdb but does NOT
4856 functions like a drop-in for the normal pdb.Pdb but does NOT
4852 import readline by default. This way it doesn't muck up IPython's
4857 import readline by default. This way it doesn't muck up IPython's
4853 readline handling, and now tab-completion finally works in the
4858 readline handling, and now tab-completion finally works in the
4854 debugger -- sort of. It completes things globally visible, but the
4859 debugger -- sort of. It completes things globally visible, but the
4855 completer doesn't track the stack as pdb walks it. That's a bit
4860 completer doesn't track the stack as pdb walks it. That's a bit
4856 tricky, and I'll have to implement it later.
4861 tricky, and I'll have to implement it later.
4857
4862
4858 2002-05-05 Fernando Perez <fperez@colorado.edu>
4863 2002-05-05 Fernando Perez <fperez@colorado.edu>
4859
4864
4860 * IPython/Magic.py (Magic.magic_oinfo): fixed formatting bug for
4865 * IPython/Magic.py (Magic.magic_oinfo): fixed formatting bug for
4861 magic docstrings when printed via ? (explicit \'s were being
4866 magic docstrings when printed via ? (explicit \'s were being
4862 printed).
4867 printed).
4863
4868
4864 * IPython/ipmaker.py (make_IPython): fixed namespace
4869 * IPython/ipmaker.py (make_IPython): fixed namespace
4865 identification bug. Now variables loaded via logs or command-line
4870 identification bug. Now variables loaded via logs or command-line
4866 files are recognized in the interactive namespace by @who.
4871 files are recognized in the interactive namespace by @who.
4867
4872
4868 * IPython/iplib.py (InteractiveShell.safe_execfile): Fixed bug in
4873 * IPython/iplib.py (InteractiveShell.safe_execfile): Fixed bug in
4869 log replay system stemming from the string form of Structs.
4874 log replay system stemming from the string form of Structs.
4870
4875
4871 * IPython/Magic.py (Macro.__init__): improved macros to properly
4876 * IPython/Magic.py (Macro.__init__): improved macros to properly
4872 handle magic commands in them.
4877 handle magic commands in them.
4873 (Magic.magic_logstart): usernames are now expanded so 'logstart
4878 (Magic.magic_logstart): usernames are now expanded so 'logstart
4874 ~/mylog' now works.
4879 ~/mylog' now works.
4875
4880
4876 * IPython/iplib.py (complete): fixed bug where paths starting with
4881 * IPython/iplib.py (complete): fixed bug where paths starting with
4877 '/' would be completed as magic names.
4882 '/' would be completed as magic names.
4878
4883
4879 2002-05-04 Fernando Perez <fperez@colorado.edu>
4884 2002-05-04 Fernando Perez <fperez@colorado.edu>
4880
4885
4881 * IPython/Magic.py (Magic.magic_run): added options -p and -f to
4886 * IPython/Magic.py (Magic.magic_run): added options -p and -f to
4882 allow running full programs under the profiler's control.
4887 allow running full programs under the profiler's control.
4883
4888
4884 * IPython/ultraTB.py (FormattedTB.__init__): Added Verbose_novars
4889 * IPython/ultraTB.py (FormattedTB.__init__): Added Verbose_novars
4885 mode to report exceptions verbosely but without formatting
4890 mode to report exceptions verbosely but without formatting
4886 variables. This addresses the issue of ipython 'freezing' (it's
4891 variables. This addresses the issue of ipython 'freezing' (it's
4887 not frozen, but caught in an expensive formatting loop) when huge
4892 not frozen, but caught in an expensive formatting loop) when huge
4888 variables are in the context of an exception.
4893 variables are in the context of an exception.
4889 (VerboseTB.text): Added '--->' markers at line where exception was
4894 (VerboseTB.text): Added '--->' markers at line where exception was
4890 triggered. Much clearer to read, especially in NoColor modes.
4895 triggered. Much clearer to read, especially in NoColor modes.
4891
4896
4892 * IPython/Magic.py (Magic.magic_run): bugfix: -n option had been
4897 * IPython/Magic.py (Magic.magic_run): bugfix: -n option had been
4893 implemented in reverse when changing to the new parse_options().
4898 implemented in reverse when changing to the new parse_options().
4894
4899
4895 2002-05-03 Fernando Perez <fperez@colorado.edu>
4900 2002-05-03 Fernando Perez <fperez@colorado.edu>
4896
4901
4897 * IPython/Magic.py (Magic.parse_options): new function so that
4902 * IPython/Magic.py (Magic.parse_options): new function so that
4898 magics can parse options easier.
4903 magics can parse options easier.
4899 (Magic.magic_prun): new function similar to profile.run(),
4904 (Magic.magic_prun): new function similar to profile.run(),
4900 suggested by Chris Hart.
4905 suggested by Chris Hart.
4901 (Magic.magic_cd): fixed behavior so that it only changes if
4906 (Magic.magic_cd): fixed behavior so that it only changes if
4902 directory actually is in history.
4907 directory actually is in history.
4903
4908
4904 * IPython/usage.py (__doc__): added information about potential
4909 * IPython/usage.py (__doc__): added information about potential
4905 slowness of Verbose exception mode when there are huge data
4910 slowness of Verbose exception mode when there are huge data
4906 structures to be formatted (thanks to Archie Paulson).
4911 structures to be formatted (thanks to Archie Paulson).
4907
4912
4908 * IPython/ipmaker.py (make_IPython): Changed default logging
4913 * IPython/ipmaker.py (make_IPython): Changed default logging
4909 (when simply called with -log) to use curr_dir/ipython.log in
4914 (when simply called with -log) to use curr_dir/ipython.log in
4910 rotate mode. Fixed crash which was occuring with -log before
4915 rotate mode. Fixed crash which was occuring with -log before
4911 (thanks to Jim Boyle).
4916 (thanks to Jim Boyle).
4912
4917
4913 2002-05-01 Fernando Perez <fperez@colorado.edu>
4918 2002-05-01 Fernando Perez <fperez@colorado.edu>
4914
4919
4915 * Released 0.2.11 for these fixes (mainly the ultraTB one which
4920 * Released 0.2.11 for these fixes (mainly the ultraTB one which
4916 was nasty -- though somewhat of a corner case).
4921 was nasty -- though somewhat of a corner case).
4917
4922
4918 * IPython/ultraTB.py (AutoFormattedTB.text): renamed __text to
4923 * IPython/ultraTB.py (AutoFormattedTB.text): renamed __text to
4919 text (was a bug).
4924 text (was a bug).
4920
4925
4921 2002-04-30 Fernando Perez <fperez@colorado.edu>
4926 2002-04-30 Fernando Perez <fperez@colorado.edu>
4922
4927
4923 * IPython/UserConfig/GnuplotMagic.py (magic_gp): Minor fix to add
4928 * IPython/UserConfig/GnuplotMagic.py (magic_gp): Minor fix to add
4924 a print after ^D or ^C from the user so that the In[] prompt
4929 a print after ^D or ^C from the user so that the In[] prompt
4925 doesn't over-run the gnuplot one.
4930 doesn't over-run the gnuplot one.
4926
4931
4927 2002-04-29 Fernando Perez <fperez@colorado.edu>
4932 2002-04-29 Fernando Perez <fperez@colorado.edu>
4928
4933
4929 * Released 0.2.10
4934 * Released 0.2.10
4930
4935
4931 * IPython/__release__.py (version): get date dynamically.
4936 * IPython/__release__.py (version): get date dynamically.
4932
4937
4933 * Misc. documentation updates thanks to Arnd's comments. Also ran
4938 * Misc. documentation updates thanks to Arnd's comments. Also ran
4934 a full spellcheck on the manual (hadn't been done in a while).
4939 a full spellcheck on the manual (hadn't been done in a while).
4935
4940
4936 2002-04-27 Fernando Perez <fperez@colorado.edu>
4941 2002-04-27 Fernando Perez <fperez@colorado.edu>
4937
4942
4938 * IPython/Magic.py (Magic.magic_logstart): Fixed bug where
4943 * IPython/Magic.py (Magic.magic_logstart): Fixed bug where
4939 starting a log in mid-session would reset the input history list.
4944 starting a log in mid-session would reset the input history list.
4940
4945
4941 2002-04-26 Fernando Perez <fperez@colorado.edu>
4946 2002-04-26 Fernando Perez <fperez@colorado.edu>
4942
4947
4943 * IPython/iplib.py (InteractiveShell.wait): Fixed bug where not
4948 * IPython/iplib.py (InteractiveShell.wait): Fixed bug where not
4944 all files were being included in an update. Now anything in
4949 all files were being included in an update. Now anything in
4945 UserConfig that matches [A-Za-z]*.py will go (this excludes
4950 UserConfig that matches [A-Za-z]*.py will go (this excludes
4946 __init__.py)
4951 __init__.py)
4947
4952
4948 2002-04-25 Fernando Perez <fperez@colorado.edu>
4953 2002-04-25 Fernando Perez <fperez@colorado.edu>
4949
4954
4950 * IPython/iplib.py (InteractiveShell.__init__): Added __IPYTHON__
4955 * IPython/iplib.py (InteractiveShell.__init__): Added __IPYTHON__
4951 to __builtins__ so that any form of embedded or imported code can
4956 to __builtins__ so that any form of embedded or imported code can
4952 test for being inside IPython.
4957 test for being inside IPython.
4953
4958
4954 * IPython/UserConfig/GnuplotMagic.py: (magic_gp_set_instance):
4959 * IPython/UserConfig/GnuplotMagic.py: (magic_gp_set_instance):
4955 changed to GnuplotMagic because it's now an importable module,
4960 changed to GnuplotMagic because it's now an importable module,
4956 this makes the name follow that of the standard Gnuplot module.
4961 this makes the name follow that of the standard Gnuplot module.
4957 GnuplotMagic can now be loaded at any time in mid-session.
4962 GnuplotMagic can now be loaded at any time in mid-session.
4958
4963
4959 2002-04-24 Fernando Perez <fperez@colorado.edu>
4964 2002-04-24 Fernando Perez <fperez@colorado.edu>
4960
4965
4961 * IPython/numutils.py: removed SIUnits. It doesn't properly set
4966 * IPython/numutils.py: removed SIUnits. It doesn't properly set
4962 the globals (IPython has its own namespace) and the
4967 the globals (IPython has its own namespace) and the
4963 PhysicalQuantity stuff is much better anyway.
4968 PhysicalQuantity stuff is much better anyway.
4964
4969
4965 * IPython/UserConfig/example-gnuplot.py (g2): Added gnuplot
4970 * IPython/UserConfig/example-gnuplot.py (g2): Added gnuplot
4966 embedding example to standard user directory for
4971 embedding example to standard user directory for
4967 distribution. Also put it in the manual.
4972 distribution. Also put it in the manual.
4968
4973
4969 * IPython/numutils.py (gnuplot_exec): Changed to take a gnuplot
4974 * IPython/numutils.py (gnuplot_exec): Changed to take a gnuplot
4970 instance as first argument (so it doesn't rely on some obscure
4975 instance as first argument (so it doesn't rely on some obscure
4971 hidden global).
4976 hidden global).
4972
4977
4973 * IPython/UserConfig/ipythonrc.py: put () back in accepted
4978 * IPython/UserConfig/ipythonrc.py: put () back in accepted
4974 delimiters. While it prevents ().TAB from working, it allows
4979 delimiters. While it prevents ().TAB from working, it allows
4975 completions in open (... expressions. This is by far a more common
4980 completions in open (... expressions. This is by far a more common
4976 case.
4981 case.
4977
4982
4978 2002-04-23 Fernando Perez <fperez@colorado.edu>
4983 2002-04-23 Fernando Perez <fperez@colorado.edu>
4979
4984
4980 * IPython/Extensions/InterpreterPasteInput.py: new
4985 * IPython/Extensions/InterpreterPasteInput.py: new
4981 syntax-processing module for pasting lines with >>> or ... at the
4986 syntax-processing module for pasting lines with >>> or ... at the
4982 start.
4987 start.
4983
4988
4984 * IPython/Extensions/PhysicalQ_Interactive.py
4989 * IPython/Extensions/PhysicalQ_Interactive.py
4985 (PhysicalQuantityInteractive.__int__): fixed to work with either
4990 (PhysicalQuantityInteractive.__int__): fixed to work with either
4986 Numeric or math.
4991 Numeric or math.
4987
4992
4988 * IPython/UserConfig/ipythonrc-numeric.py: reorganized the
4993 * IPython/UserConfig/ipythonrc-numeric.py: reorganized the
4989 provided profiles. Now we have:
4994 provided profiles. Now we have:
4990 -math -> math module as * and cmath with its own namespace.
4995 -math -> math module as * and cmath with its own namespace.
4991 -numeric -> Numeric as *, plus gnuplot & grace
4996 -numeric -> Numeric as *, plus gnuplot & grace
4992 -physics -> same as before
4997 -physics -> same as before
4993
4998
4994 * IPython/Magic.py (Magic.magic_magic): Fixed bug where
4999 * IPython/Magic.py (Magic.magic_magic): Fixed bug where
4995 user-defined magics wouldn't be found by @magic if they were
5000 user-defined magics wouldn't be found by @magic if they were
4996 defined as class methods. Also cleaned up the namespace search
5001 defined as class methods. Also cleaned up the namespace search
4997 logic and the string building (to use %s instead of many repeated
5002 logic and the string building (to use %s instead of many repeated
4998 string adds).
5003 string adds).
4999
5004
5000 * IPython/UserConfig/example-magic.py (magic_foo): updated example
5005 * IPython/UserConfig/example-magic.py (magic_foo): updated example
5001 of user-defined magics to operate with class methods (cleaner, in
5006 of user-defined magics to operate with class methods (cleaner, in
5002 line with the gnuplot code).
5007 line with the gnuplot code).
5003
5008
5004 2002-04-22 Fernando Perez <fperez@colorado.edu>
5009 2002-04-22 Fernando Perez <fperez@colorado.edu>
5005
5010
5006 * setup.py: updated dependency list so that manual is updated when
5011 * setup.py: updated dependency list so that manual is updated when
5007 all included files change.
5012 all included files change.
5008
5013
5009 * IPython/ipmaker.py (make_IPython): Fixed bug which was ignoring
5014 * IPython/ipmaker.py (make_IPython): Fixed bug which was ignoring
5010 the delimiter removal option (the fix is ugly right now).
5015 the delimiter removal option (the fix is ugly right now).
5011
5016
5012 * IPython/UserConfig/ipythonrc-physics.py: simplified not to load
5017 * IPython/UserConfig/ipythonrc-physics.py: simplified not to load
5013 all of the math profile (quicker loading, no conflict between
5018 all of the math profile (quicker loading, no conflict between
5014 g-9.8 and g-gnuplot).
5019 g-9.8 and g-gnuplot).
5015
5020
5016 * IPython/CrashHandler.py (CrashHandler.__call__): changed default
5021 * IPython/CrashHandler.py (CrashHandler.__call__): changed default
5017 name of post-mortem files to IPython_crash_report.txt.
5022 name of post-mortem files to IPython_crash_report.txt.
5018
5023
5019 * Cleanup/update of the docs. Added all the new readline info and
5024 * Cleanup/update of the docs. Added all the new readline info and
5020 formatted all lists as 'real lists'.
5025 formatted all lists as 'real lists'.
5021
5026
5022 * IPython/ipmaker.py (make_IPython): removed now-obsolete
5027 * IPython/ipmaker.py (make_IPython): removed now-obsolete
5023 tab-completion options, since the full readline parse_and_bind is
5028 tab-completion options, since the full readline parse_and_bind is
5024 now accessible.
5029 now accessible.
5025
5030
5026 * IPython/iplib.py (InteractiveShell.init_readline): Changed
5031 * IPython/iplib.py (InteractiveShell.init_readline): Changed
5027 handling of readline options. Now users can specify any string to
5032 handling of readline options. Now users can specify any string to
5028 be passed to parse_and_bind(), as well as the delimiters to be
5033 be passed to parse_and_bind(), as well as the delimiters to be
5029 removed.
5034 removed.
5030 (InteractiveShell.__init__): Added __name__ to the global
5035 (InteractiveShell.__init__): Added __name__ to the global
5031 namespace so that things like Itpl which rely on its existence
5036 namespace so that things like Itpl which rely on its existence
5032 don't crash.
5037 don't crash.
5033 (InteractiveShell._prefilter): Defined the default with a _ so
5038 (InteractiveShell._prefilter): Defined the default with a _ so
5034 that prefilter() is easier to override, while the default one
5039 that prefilter() is easier to override, while the default one
5035 remains available.
5040 remains available.
5036
5041
5037 2002-04-18 Fernando Perez <fperez@colorado.edu>
5042 2002-04-18 Fernando Perez <fperez@colorado.edu>
5038
5043
5039 * Added information about pdb in the docs.
5044 * Added information about pdb in the docs.
5040
5045
5041 2002-04-17 Fernando Perez <fperez@colorado.edu>
5046 2002-04-17 Fernando Perez <fperez@colorado.edu>
5042
5047
5043 * IPython/ipmaker.py (make_IPython): added rc_override option to
5048 * IPython/ipmaker.py (make_IPython): added rc_override option to
5044 allow passing config options at creation time which may override
5049 allow passing config options at creation time which may override
5045 anything set in the config files or command line. This is
5050 anything set in the config files or command line. This is
5046 particularly useful for configuring embedded instances.
5051 particularly useful for configuring embedded instances.
5047
5052
5048 2002-04-15 Fernando Perez <fperez@colorado.edu>
5053 2002-04-15 Fernando Perez <fperez@colorado.edu>
5049
5054
5050 * IPython/Logger.py (Logger.log): Fixed a nasty bug which could
5055 * IPython/Logger.py (Logger.log): Fixed a nasty bug which could
5051 crash embedded instances because of the input cache falling out of
5056 crash embedded instances because of the input cache falling out of
5052 sync with the output counter.
5057 sync with the output counter.
5053
5058
5054 * IPython/Shell.py (IPythonShellEmbed.__init__): added a debug
5059 * IPython/Shell.py (IPythonShellEmbed.__init__): added a debug
5055 mode which calls pdb after an uncaught exception in IPython itself.
5060 mode which calls pdb after an uncaught exception in IPython itself.
5056
5061
5057 2002-04-14 Fernando Perez <fperez@colorado.edu>
5062 2002-04-14 Fernando Perez <fperez@colorado.edu>
5058
5063
5059 * IPython/iplib.py (InteractiveShell.showtraceback): pdb mucks up
5064 * IPython/iplib.py (InteractiveShell.showtraceback): pdb mucks up
5060 readline, fix it back after each call.
5065 readline, fix it back after each call.
5061
5066
5062 * IPython/ultraTB.py (AutoFormattedTB.__text): made text a private
5067 * IPython/ultraTB.py (AutoFormattedTB.__text): made text a private
5063 method to force all access via __call__(), which guarantees that
5068 method to force all access via __call__(), which guarantees that
5064 traceback references are properly deleted.
5069 traceback references are properly deleted.
5065
5070
5066 * IPython/Prompts.py (CachedOutput._display): minor fixes to
5071 * IPython/Prompts.py (CachedOutput._display): minor fixes to
5067 improve printing when pprint is in use.
5072 improve printing when pprint is in use.
5068
5073
5069 2002-04-13 Fernando Perez <fperez@colorado.edu>
5074 2002-04-13 Fernando Perez <fperez@colorado.edu>
5070
5075
5071 * IPython/Shell.py (IPythonShellEmbed.__call__): SystemExit
5076 * IPython/Shell.py (IPythonShellEmbed.__call__): SystemExit
5072 exceptions aren't caught anymore. If the user triggers one, he
5077 exceptions aren't caught anymore. If the user triggers one, he
5073 should know why he's doing it and it should go all the way up,
5078 should know why he's doing it and it should go all the way up,
5074 just like any other exception. So now @abort will fully kill the
5079 just like any other exception. So now @abort will fully kill the
5075 embedded interpreter and the embedding code (unless that happens
5080 embedded interpreter and the embedding code (unless that happens
5076 to catch SystemExit).
5081 to catch SystemExit).
5077
5082
5078 * IPython/ultraTB.py (VerboseTB.__init__): added a call_pdb flag
5083 * IPython/ultraTB.py (VerboseTB.__init__): added a call_pdb flag
5079 and a debugger() method to invoke the interactive pdb debugger
5084 and a debugger() method to invoke the interactive pdb debugger
5080 after printing exception information. Also added the corresponding
5085 after printing exception information. Also added the corresponding
5081 -pdb option and @pdb magic to control this feature, and updated
5086 -pdb option and @pdb magic to control this feature, and updated
5082 the docs. After a suggestion from Christopher Hart
5087 the docs. After a suggestion from Christopher Hart
5083 (hart-AT-caltech.edu).
5088 (hart-AT-caltech.edu).
5084
5089
5085 2002-04-12 Fernando Perez <fperez@colorado.edu>
5090 2002-04-12 Fernando Perez <fperez@colorado.edu>
5086
5091
5087 * IPython/Shell.py (IPythonShellEmbed.__init__): modified to use
5092 * IPython/Shell.py (IPythonShellEmbed.__init__): modified to use
5088 the exception handlers defined by the user (not the CrashHandler)
5093 the exception handlers defined by the user (not the CrashHandler)
5089 so that user exceptions don't trigger an ipython bug report.
5094 so that user exceptions don't trigger an ipython bug report.
5090
5095
5091 * IPython/ultraTB.py (ColorTB.__init__): made the color scheme
5096 * IPython/ultraTB.py (ColorTB.__init__): made the color scheme
5092 configurable (it should have always been so).
5097 configurable (it should have always been so).
5093
5098
5094 2002-03-26 Fernando Perez <fperez@colorado.edu>
5099 2002-03-26 Fernando Perez <fperez@colorado.edu>
5095
5100
5096 * IPython/Shell.py (IPythonShellEmbed.__call__): many changes here
5101 * IPython/Shell.py (IPythonShellEmbed.__call__): many changes here
5097 and there to fix embedding namespace issues. This should all be
5102 and there to fix embedding namespace issues. This should all be
5098 done in a more elegant way.
5103 done in a more elegant way.
5099
5104
5100 2002-03-25 Fernando Perez <fperez@colorado.edu>
5105 2002-03-25 Fernando Perez <fperez@colorado.edu>
5101
5106
5102 * IPython/genutils.py (get_home_dir): Try to make it work under
5107 * IPython/genutils.py (get_home_dir): Try to make it work under
5103 win9x also.
5108 win9x also.
5104
5109
5105 2002-03-20 Fernando Perez <fperez@colorado.edu>
5110 2002-03-20 Fernando Perez <fperez@colorado.edu>
5106
5111
5107 * IPython/Shell.py (IPythonShellEmbed.__init__): leave
5112 * IPython/Shell.py (IPythonShellEmbed.__init__): leave
5108 sys.displayhook untouched upon __init__.
5113 sys.displayhook untouched upon __init__.
5109
5114
5110 2002-03-19 Fernando Perez <fperez@colorado.edu>
5115 2002-03-19 Fernando Perez <fperez@colorado.edu>
5111
5116
5112 * Released 0.2.9 (for embedding bug, basically).
5117 * Released 0.2.9 (for embedding bug, basically).
5113
5118
5114 * IPython/Shell.py (IPythonShellEmbed.__call__): Trap SystemExit
5119 * IPython/Shell.py (IPythonShellEmbed.__call__): Trap SystemExit
5115 exceptions so that enclosing shell's state can be restored.
5120 exceptions so that enclosing shell's state can be restored.
5116
5121
5117 * Changed magic_gnuplot.py to magic-gnuplot.py to standardize
5122 * Changed magic_gnuplot.py to magic-gnuplot.py to standardize
5118 naming conventions in the .ipython/ dir.
5123 naming conventions in the .ipython/ dir.
5119
5124
5120 * IPython/iplib.py (InteractiveShell.init_readline): removed '-'
5125 * IPython/iplib.py (InteractiveShell.init_readline): removed '-'
5121 from delimiters list so filenames with - in them get expanded.
5126 from delimiters list so filenames with - in them get expanded.
5122
5127
5123 * IPython/Shell.py (IPythonShellEmbed.__call__): fixed bug with
5128 * IPython/Shell.py (IPythonShellEmbed.__call__): fixed bug with
5124 sys.displayhook not being properly restored after an embedded call.
5129 sys.displayhook not being properly restored after an embedded call.
5125
5130
5126 2002-03-18 Fernando Perez <fperez@colorado.edu>
5131 2002-03-18 Fernando Perez <fperez@colorado.edu>
5127
5132
5128 * Released 0.2.8
5133 * Released 0.2.8
5129
5134
5130 * IPython/iplib.py (InteractiveShell.user_setup): fixed bug where
5135 * IPython/iplib.py (InteractiveShell.user_setup): fixed bug where
5131 some files weren't being included in a -upgrade.
5136 some files weren't being included in a -upgrade.
5132 (InteractiveShell.init_readline): Added 'set show-all-if-ambiguous
5137 (InteractiveShell.init_readline): Added 'set show-all-if-ambiguous
5133 on' so that the first tab completes.
5138 on' so that the first tab completes.
5134 (InteractiveShell.handle_magic): fixed bug with spaces around
5139 (InteractiveShell.handle_magic): fixed bug with spaces around
5135 quotes breaking many magic commands.
5140 quotes breaking many magic commands.
5136
5141
5137 * setup.py: added note about ignoring the syntax error messages at
5142 * setup.py: added note about ignoring the syntax error messages at
5138 installation.
5143 installation.
5139
5144
5140 * IPython/UserConfig/magic_gnuplot.py (magic_gp): finished
5145 * IPython/UserConfig/magic_gnuplot.py (magic_gp): finished
5141 streamlining the gnuplot interface, now there's only one magic @gp.
5146 streamlining the gnuplot interface, now there's only one magic @gp.
5142
5147
5143 2002-03-17 Fernando Perez <fperez@colorado.edu>
5148 2002-03-17 Fernando Perez <fperez@colorado.edu>
5144
5149
5145 * IPython/UserConfig/magic_gnuplot.py: new name for the
5150 * IPython/UserConfig/magic_gnuplot.py: new name for the
5146 example-magic_pm.py file. Much enhanced system, now with a shell
5151 example-magic_pm.py file. Much enhanced system, now with a shell
5147 for communicating directly with gnuplot, one command at a time.
5152 for communicating directly with gnuplot, one command at a time.
5148
5153
5149 * IPython/Magic.py (Magic.magic_run): added option -n to prevent
5154 * IPython/Magic.py (Magic.magic_run): added option -n to prevent
5150 setting __name__=='__main__'.
5155 setting __name__=='__main__'.
5151
5156
5152 * IPython/UserConfig/example-magic_pm.py (magic_pm): Added
5157 * IPython/UserConfig/example-magic_pm.py (magic_pm): Added
5153 mini-shell for accessing gnuplot from inside ipython. Should
5158 mini-shell for accessing gnuplot from inside ipython. Should
5154 extend it later for grace access too. Inspired by Arnd's
5159 extend it later for grace access too. Inspired by Arnd's
5155 suggestion.
5160 suggestion.
5156
5161
5157 * IPython/iplib.py (InteractiveShell.handle_magic): fixed bug when
5162 * IPython/iplib.py (InteractiveShell.handle_magic): fixed bug when
5158 calling magic functions with () in their arguments. Thanks to Arnd
5163 calling magic functions with () in their arguments. Thanks to Arnd
5159 Baecker for pointing this to me.
5164 Baecker for pointing this to me.
5160
5165
5161 * IPython/numutils.py (sum_flat): fixed bug. Would recurse
5166 * IPython/numutils.py (sum_flat): fixed bug. Would recurse
5162 infinitely for integer or complex arrays (only worked with floats).
5167 infinitely for integer or complex arrays (only worked with floats).
5163
5168
5164 2002-03-16 Fernando Perez <fperez@colorado.edu>
5169 2002-03-16 Fernando Perez <fperez@colorado.edu>
5165
5170
5166 * setup.py: Merged setup and setup_windows into a single script
5171 * setup.py: Merged setup and setup_windows into a single script
5167 which properly handles things for windows users.
5172 which properly handles things for windows users.
5168
5173
5169 2002-03-15 Fernando Perez <fperez@colorado.edu>
5174 2002-03-15 Fernando Perez <fperez@colorado.edu>
5170
5175
5171 * Big change to the manual: now the magics are all automatically
5176 * Big change to the manual: now the magics are all automatically
5172 documented. This information is generated from their docstrings
5177 documented. This information is generated from their docstrings
5173 and put in a latex file included by the manual lyx file. This way
5178 and put in a latex file included by the manual lyx file. This way
5174 we get always up to date information for the magics. The manual
5179 we get always up to date information for the magics. The manual
5175 now also has proper version information, also auto-synced.
5180 now also has proper version information, also auto-synced.
5176
5181
5177 For this to work, an undocumented --magic_docstrings option was added.
5182 For this to work, an undocumented --magic_docstrings option was added.
5178
5183
5179 2002-03-13 Fernando Perez <fperez@colorado.edu>
5184 2002-03-13 Fernando Perez <fperez@colorado.edu>
5180
5185
5181 * IPython/ultraTB.py (TermColors): fixed problem with dark colors
5186 * IPython/ultraTB.py (TermColors): fixed problem with dark colors
5182 under CDE terminals. An explicit ;2 color reset is needed in the escapes.
5187 under CDE terminals. An explicit ;2 color reset is needed in the escapes.
5183
5188
5184 2002-03-12 Fernando Perez <fperez@colorado.edu>
5189 2002-03-12 Fernando Perez <fperez@colorado.edu>
5185
5190
5186 * IPython/ultraTB.py (TermColors): changed color escapes again to
5191 * IPython/ultraTB.py (TermColors): changed color escapes again to
5187 fix the (old, reintroduced) line-wrapping bug. Basically, if
5192 fix the (old, reintroduced) line-wrapping bug. Basically, if
5188 \001..\002 aren't given in the color escapes, lines get wrapped
5193 \001..\002 aren't given in the color escapes, lines get wrapped
5189 weirdly. But giving those screws up old xterms and emacs terms. So
5194 weirdly. But giving those screws up old xterms and emacs terms. So
5190 I added some logic for emacs terms to be ok, but I can't identify old
5195 I added some logic for emacs terms to be ok, but I can't identify old
5191 xterms separately ($TERM=='xterm' for many terminals, like konsole).
5196 xterms separately ($TERM=='xterm' for many terminals, like konsole).
5192
5197
5193 2002-03-10 Fernando Perez <fperez@colorado.edu>
5198 2002-03-10 Fernando Perez <fperez@colorado.edu>
5194
5199
5195 * IPython/usage.py (__doc__): Various documentation cleanups and
5200 * IPython/usage.py (__doc__): Various documentation cleanups and
5196 updates, both in usage docstrings and in the manual.
5201 updates, both in usage docstrings and in the manual.
5197
5202
5198 * IPython/Prompts.py (CachedOutput.set_colors): cleanups for
5203 * IPython/Prompts.py (CachedOutput.set_colors): cleanups for
5199 handling of caching. Set minimum acceptabe value for having a
5204 handling of caching. Set minimum acceptabe value for having a
5200 cache at 20 values.
5205 cache at 20 values.
5201
5206
5202 * IPython/iplib.py (InteractiveShell.user_setup): moved the
5207 * IPython/iplib.py (InteractiveShell.user_setup): moved the
5203 install_first_time function to a method, renamed it and added an
5208 install_first_time function to a method, renamed it and added an
5204 'upgrade' mode. Now people can update their config directory with
5209 'upgrade' mode. Now people can update their config directory with
5205 a simple command line switch (-upgrade, also new).
5210 a simple command line switch (-upgrade, also new).
5206
5211
5207 * IPython/Magic.py (Magic.magic_pfile): Made @pfile an alias to
5212 * IPython/Magic.py (Magic.magic_pfile): Made @pfile an alias to
5208 @file (convenient for automagic users under Python >= 2.2).
5213 @file (convenient for automagic users under Python >= 2.2).
5209 Removed @files (it seemed more like a plural than an abbrev. of
5214 Removed @files (it seemed more like a plural than an abbrev. of
5210 'file show').
5215 'file show').
5211
5216
5212 * IPython/iplib.py (install_first_time): Fixed crash if there were
5217 * IPython/iplib.py (install_first_time): Fixed crash if there were
5213 backup files ('~') in .ipython/ install directory.
5218 backup files ('~') in .ipython/ install directory.
5214
5219
5215 * IPython/ipmaker.py (make_IPython): fixes for new prompt
5220 * IPython/ipmaker.py (make_IPython): fixes for new prompt
5216 system. Things look fine, but these changes are fairly
5221 system. Things look fine, but these changes are fairly
5217 intrusive. Test them for a few days.
5222 intrusive. Test them for a few days.
5218
5223
5219 * IPython/Prompts.py (CachedOutput.__init__): Massive rewrite of
5224 * IPython/Prompts.py (CachedOutput.__init__): Massive rewrite of
5220 the prompts system. Now all in/out prompt strings are user
5225 the prompts system. Now all in/out prompt strings are user
5221 controllable. This is particularly useful for embedding, as one
5226 controllable. This is particularly useful for embedding, as one
5222 can tag embedded instances with particular prompts.
5227 can tag embedded instances with particular prompts.
5223
5228
5224 Also removed global use of sys.ps1/2, which now allows nested
5229 Also removed global use of sys.ps1/2, which now allows nested
5225 embeddings without any problems. Added command-line options for
5230 embeddings without any problems. Added command-line options for
5226 the prompt strings.
5231 the prompt strings.
5227
5232
5228 2002-03-08 Fernando Perez <fperez@colorado.edu>
5233 2002-03-08 Fernando Perez <fperez@colorado.edu>
5229
5234
5230 * IPython/UserConfig/example-embed-short.py (ipshell): added
5235 * IPython/UserConfig/example-embed-short.py (ipshell): added
5231 example file with the bare minimum code for embedding.
5236 example file with the bare minimum code for embedding.
5232
5237
5233 * IPython/Shell.py (IPythonShellEmbed.set_dummy_mode): added
5238 * IPython/Shell.py (IPythonShellEmbed.set_dummy_mode): added
5234 functionality for the embeddable shell to be activated/deactivated
5239 functionality for the embeddable shell to be activated/deactivated
5235 either globally or at each call.
5240 either globally or at each call.
5236
5241
5237 * IPython/Prompts.py (Prompt1.auto_rewrite): Fixes the problem of
5242 * IPython/Prompts.py (Prompt1.auto_rewrite): Fixes the problem of
5238 rewriting the prompt with '--->' for auto-inputs with proper
5243 rewriting the prompt with '--->' for auto-inputs with proper
5239 coloring. Now the previous UGLY hack in handle_auto() is gone, and
5244 coloring. Now the previous UGLY hack in handle_auto() is gone, and
5240 this is handled by the prompts class itself, as it should.
5245 this is handled by the prompts class itself, as it should.
5241
5246
5242 2002-03-05 Fernando Perez <fperez@colorado.edu>
5247 2002-03-05 Fernando Perez <fperez@colorado.edu>
5243
5248
5244 * IPython/Magic.py (Magic.magic_logstart): Changed @log to
5249 * IPython/Magic.py (Magic.magic_logstart): Changed @log to
5245 @logstart to avoid name clashes with the math log function.
5250 @logstart to avoid name clashes with the math log function.
5246
5251
5247 * Big updates to X/Emacs section of the manual.
5252 * Big updates to X/Emacs section of the manual.
5248
5253
5249 * Removed ipython_emacs. Milan explained to me how to pass
5254 * Removed ipython_emacs. Milan explained to me how to pass
5250 arguments to ipython through Emacs. Some day I'm going to end up
5255 arguments to ipython through Emacs. Some day I'm going to end up
5251 learning some lisp...
5256 learning some lisp...
5252
5257
5253 2002-03-04 Fernando Perez <fperez@colorado.edu>
5258 2002-03-04 Fernando Perez <fperez@colorado.edu>
5254
5259
5255 * IPython/ipython_emacs: Created script to be used as the
5260 * IPython/ipython_emacs: Created script to be used as the
5256 py-python-command Emacs variable so we can pass IPython
5261 py-python-command Emacs variable so we can pass IPython
5257 parameters. I can't figure out how to tell Emacs directly to pass
5262 parameters. I can't figure out how to tell Emacs directly to pass
5258 parameters to IPython, so a dummy shell script will do it.
5263 parameters to IPython, so a dummy shell script will do it.
5259
5264
5260 Other enhancements made for things to work better under Emacs'
5265 Other enhancements made for things to work better under Emacs'
5261 various types of terminals. Many thanks to Milan Zamazal
5266 various types of terminals. Many thanks to Milan Zamazal
5262 <pdm-AT-zamazal.org> for all the suggestions and pointers.
5267 <pdm-AT-zamazal.org> for all the suggestions and pointers.
5263
5268
5264 2002-03-01 Fernando Perez <fperez@colorado.edu>
5269 2002-03-01 Fernando Perez <fperez@colorado.edu>
5265
5270
5266 * IPython/ipmaker.py (make_IPython): added a --readline! option so
5271 * IPython/ipmaker.py (make_IPython): added a --readline! option so
5267 that loading of readline is now optional. This gives better
5272 that loading of readline is now optional. This gives better
5268 control to emacs users.
5273 control to emacs users.
5269
5274
5270 * IPython/ultraTB.py (__date__): Modified color escape sequences
5275 * IPython/ultraTB.py (__date__): Modified color escape sequences
5271 and now things work fine under xterm and in Emacs' term buffers
5276 and now things work fine under xterm and in Emacs' term buffers
5272 (though not shell ones). Well, in emacs you get colors, but all
5277 (though not shell ones). Well, in emacs you get colors, but all
5273 seem to be 'light' colors (no difference between dark and light
5278 seem to be 'light' colors (no difference between dark and light
5274 ones). But the garbage chars are gone, and also in xterms. It
5279 ones). But the garbage chars are gone, and also in xterms. It
5275 seems that now I'm using 'cleaner' ansi sequences.
5280 seems that now I'm using 'cleaner' ansi sequences.
5276
5281
5277 2002-02-21 Fernando Perez <fperez@colorado.edu>
5282 2002-02-21 Fernando Perez <fperez@colorado.edu>
5278
5283
5279 * Released 0.2.7 (mainly to publish the scoping fix).
5284 * Released 0.2.7 (mainly to publish the scoping fix).
5280
5285
5281 * IPython/Logger.py (Logger.logstate): added. A corresponding
5286 * IPython/Logger.py (Logger.logstate): added. A corresponding
5282 @logstate magic was created.
5287 @logstate magic was created.
5283
5288
5284 * IPython/Magic.py: fixed nested scoping problem under Python
5289 * IPython/Magic.py: fixed nested scoping problem under Python
5285 2.1.x (automagic wasn't working).
5290 2.1.x (automagic wasn't working).
5286
5291
5287 2002-02-20 Fernando Perez <fperez@colorado.edu>
5292 2002-02-20 Fernando Perez <fperez@colorado.edu>
5288
5293
5289 * Released 0.2.6.
5294 * Released 0.2.6.
5290
5295
5291 * IPython/OutputTrap.py (OutputTrap.__init__): added a 'quiet'
5296 * IPython/OutputTrap.py (OutputTrap.__init__): added a 'quiet'
5292 option so that logs can come out without any headers at all.
5297 option so that logs can come out without any headers at all.
5293
5298
5294 * IPython/UserConfig/ipythonrc-scipy.py: created a profile for
5299 * IPython/UserConfig/ipythonrc-scipy.py: created a profile for
5295 SciPy.
5300 SciPy.
5296
5301
5297 * IPython/iplib.py (InteractiveShell.embed_mainloop): Changed so
5302 * IPython/iplib.py (InteractiveShell.embed_mainloop): Changed so
5298 that embedded IPython calls don't require vars() to be explicitly
5303 that embedded IPython calls don't require vars() to be explicitly
5299 passed. Now they are extracted from the caller's frame (code
5304 passed. Now they are extracted from the caller's frame (code
5300 snatched from Eric Jones' weave). Added better documentation to
5305 snatched from Eric Jones' weave). Added better documentation to
5301 the section on embedding and the example file.
5306 the section on embedding and the example file.
5302
5307
5303 * IPython/genutils.py (page): Changed so that under emacs, it just
5308 * IPython/genutils.py (page): Changed so that under emacs, it just
5304 prints the string. You can then page up and down in the emacs
5309 prints the string. You can then page up and down in the emacs
5305 buffer itself. This is how the builtin help() works.
5310 buffer itself. This is how the builtin help() works.
5306
5311
5307 * IPython/Prompts.py (CachedOutput.__call__): Fixed issue with
5312 * IPython/Prompts.py (CachedOutput.__call__): Fixed issue with
5308 macro scoping: macros need to be executed in the user's namespace
5313 macro scoping: macros need to be executed in the user's namespace
5309 to work as if they had been typed by the user.
5314 to work as if they had been typed by the user.
5310
5315
5311 * IPython/Magic.py (Magic.magic_macro): Changed macros so they
5316 * IPython/Magic.py (Magic.magic_macro): Changed macros so they
5312 execute automatically (no need to type 'exec...'). They then
5317 execute automatically (no need to type 'exec...'). They then
5313 behave like 'true macros'. The printing system was also modified
5318 behave like 'true macros'. The printing system was also modified
5314 for this to work.
5319 for this to work.
5315
5320
5316 2002-02-19 Fernando Perez <fperez@colorado.edu>
5321 2002-02-19 Fernando Perez <fperez@colorado.edu>
5317
5322
5318 * IPython/genutils.py (page_file): new function for paging files
5323 * IPython/genutils.py (page_file): new function for paging files
5319 in an OS-independent way. Also necessary for file viewing to work
5324 in an OS-independent way. Also necessary for file viewing to work
5320 well inside Emacs buffers.
5325 well inside Emacs buffers.
5321 (page): Added checks for being in an emacs buffer.
5326 (page): Added checks for being in an emacs buffer.
5322 (page): fixed bug for Windows ($TERM isn't set in Windows). Fixed
5327 (page): fixed bug for Windows ($TERM isn't set in Windows). Fixed
5323 same bug in iplib.
5328 same bug in iplib.
5324
5329
5325 2002-02-18 Fernando Perez <fperez@colorado.edu>
5330 2002-02-18 Fernando Perez <fperez@colorado.edu>
5326
5331
5327 * IPython/iplib.py (InteractiveShell.init_readline): modified use
5332 * IPython/iplib.py (InteractiveShell.init_readline): modified use
5328 of readline so that IPython can work inside an Emacs buffer.
5333 of readline so that IPython can work inside an Emacs buffer.
5329
5334
5330 * IPython/ultraTB.py (AutoFormattedTB.__call__): some fixes to
5335 * IPython/ultraTB.py (AutoFormattedTB.__call__): some fixes to
5331 method signatures (they weren't really bugs, but it looks cleaner
5336 method signatures (they weren't really bugs, but it looks cleaner
5332 and keeps PyChecker happy).
5337 and keeps PyChecker happy).
5333
5338
5334 * IPython/ipmaker.py (make_IPython): added hooks Struct to __IP
5339 * IPython/ipmaker.py (make_IPython): added hooks Struct to __IP
5335 for implementing various user-defined hooks. Currently only
5340 for implementing various user-defined hooks. Currently only
5336 display is done.
5341 display is done.
5337
5342
5338 * IPython/Prompts.py (CachedOutput._display): changed display
5343 * IPython/Prompts.py (CachedOutput._display): changed display
5339 functions so that they can be dynamically changed by users easily.
5344 functions so that they can be dynamically changed by users easily.
5340
5345
5341 * IPython/Extensions/numeric_formats.py (num_display): added an
5346 * IPython/Extensions/numeric_formats.py (num_display): added an
5342 extension for printing NumPy arrays in flexible manners. It
5347 extension for printing NumPy arrays in flexible manners. It
5343 doesn't do anything yet, but all the structure is in
5348 doesn't do anything yet, but all the structure is in
5344 place. Ultimately the plan is to implement output format control
5349 place. Ultimately the plan is to implement output format control
5345 like in Octave.
5350 like in Octave.
5346
5351
5347 * IPython/Magic.py (Magic.lsmagic): changed so that bound magic
5352 * IPython/Magic.py (Magic.lsmagic): changed so that bound magic
5348 methods are found at run-time by all the automatic machinery.
5353 methods are found at run-time by all the automatic machinery.
5349
5354
5350 2002-02-17 Fernando Perez <fperez@colorado.edu>
5355 2002-02-17 Fernando Perez <fperez@colorado.edu>
5351
5356
5352 * setup_Windows.py (make_shortcut): documented. Cleaned up the
5357 * setup_Windows.py (make_shortcut): documented. Cleaned up the
5353 whole file a little.
5358 whole file a little.
5354
5359
5355 * ToDo: closed this document. Now there's a new_design.lyx
5360 * ToDo: closed this document. Now there's a new_design.lyx
5356 document for all new ideas. Added making a pdf of it for the
5361 document for all new ideas. Added making a pdf of it for the
5357 end-user distro.
5362 end-user distro.
5358
5363
5359 * IPython/Logger.py (Logger.switch_log): Created this to replace
5364 * IPython/Logger.py (Logger.switch_log): Created this to replace
5360 logon() and logoff(). It also fixes a nasty crash reported by
5365 logon() and logoff(). It also fixes a nasty crash reported by
5361 Philip Hisley <compsys-AT-starpower.net>. Many thanks to him.
5366 Philip Hisley <compsys-AT-starpower.net>. Many thanks to him.
5362
5367
5363 * IPython/iplib.py (complete): got auto-completion to work with
5368 * IPython/iplib.py (complete): got auto-completion to work with
5364 automagic (I had wanted this for a long time).
5369 automagic (I had wanted this for a long time).
5365
5370
5366 * IPython/Magic.py (Magic.magic_files): Added @files as an alias
5371 * IPython/Magic.py (Magic.magic_files): Added @files as an alias
5367 to @file, since file() is now a builtin and clashes with automagic
5372 to @file, since file() is now a builtin and clashes with automagic
5368 for @file.
5373 for @file.
5369
5374
5370 * Made some new files: Prompts, CrashHandler, Magic, Logger. All
5375 * Made some new files: Prompts, CrashHandler, Magic, Logger. All
5371 of this was previously in iplib, which had grown to more than 2000
5376 of this was previously in iplib, which had grown to more than 2000
5372 lines, way too long. No new functionality, but it makes managing
5377 lines, way too long. No new functionality, but it makes managing
5373 the code a bit easier.
5378 the code a bit easier.
5374
5379
5375 * IPython/iplib.py (IPythonCrashHandler.__call__): Added version
5380 * IPython/iplib.py (IPythonCrashHandler.__call__): Added version
5376 information to crash reports.
5381 information to crash reports.
5377
5382
5378 2002-02-12 Fernando Perez <fperez@colorado.edu>
5383 2002-02-12 Fernando Perez <fperez@colorado.edu>
5379
5384
5380 * Released 0.2.5.
5385 * Released 0.2.5.
5381
5386
5382 2002-02-11 Fernando Perez <fperez@colorado.edu>
5387 2002-02-11 Fernando Perez <fperez@colorado.edu>
5383
5388
5384 * Wrote a relatively complete Windows installer. It puts
5389 * Wrote a relatively complete Windows installer. It puts
5385 everything in place, creates Start Menu entries and fixes the
5390 everything in place, creates Start Menu entries and fixes the
5386 color issues. Nothing fancy, but it works.
5391 color issues. Nothing fancy, but it works.
5387
5392
5388 2002-02-10 Fernando Perez <fperez@colorado.edu>
5393 2002-02-10 Fernando Perez <fperez@colorado.edu>
5389
5394
5390 * IPython/iplib.py (InteractiveShell.safe_execfile): added an
5395 * IPython/iplib.py (InteractiveShell.safe_execfile): added an
5391 os.path.expanduser() call so that we can type @run ~/myfile.py and
5396 os.path.expanduser() call so that we can type @run ~/myfile.py and
5392 have thigs work as expected.
5397 have thigs work as expected.
5393
5398
5394 * IPython/genutils.py (page): fixed exception handling so things
5399 * IPython/genutils.py (page): fixed exception handling so things
5395 work both in Unix and Windows correctly. Quitting a pager triggers
5400 work both in Unix and Windows correctly. Quitting a pager triggers
5396 an IOError/broken pipe in Unix, and in windows not finding a pager
5401 an IOError/broken pipe in Unix, and in windows not finding a pager
5397 is also an IOError, so I had to actually look at the return value
5402 is also an IOError, so I had to actually look at the return value
5398 of the exception, not just the exception itself. Should be ok now.
5403 of the exception, not just the exception itself. Should be ok now.
5399
5404
5400 * IPython/ultraTB.py (ColorSchemeTable.set_active_scheme):
5405 * IPython/ultraTB.py (ColorSchemeTable.set_active_scheme):
5401 modified to allow case-insensitive color scheme changes.
5406 modified to allow case-insensitive color scheme changes.
5402
5407
5403 2002-02-09 Fernando Perez <fperez@colorado.edu>
5408 2002-02-09 Fernando Perez <fperez@colorado.edu>
5404
5409
5405 * IPython/genutils.py (native_line_ends): new function to leave
5410 * IPython/genutils.py (native_line_ends): new function to leave
5406 user config files with os-native line-endings.
5411 user config files with os-native line-endings.
5407
5412
5408 * README and manual updates.
5413 * README and manual updates.
5409
5414
5410 * IPython/genutils.py: fixed unicode bug: use types.StringTypes
5415 * IPython/genutils.py: fixed unicode bug: use types.StringTypes
5411 instead of StringType to catch Unicode strings.
5416 instead of StringType to catch Unicode strings.
5412
5417
5413 * IPython/genutils.py (filefind): fixed bug for paths with
5418 * IPython/genutils.py (filefind): fixed bug for paths with
5414 embedded spaces (very common in Windows).
5419 embedded spaces (very common in Windows).
5415
5420
5416 * IPython/ipmaker.py (make_IPython): added a '.ini' to the rc
5421 * IPython/ipmaker.py (make_IPython): added a '.ini' to the rc
5417 files under Windows, so that they get automatically associated
5422 files under Windows, so that they get automatically associated
5418 with a text editor. Windows makes it a pain to handle
5423 with a text editor. Windows makes it a pain to handle
5419 extension-less files.
5424 extension-less files.
5420
5425
5421 * IPython/iplib.py (InteractiveShell.init_readline): Made the
5426 * IPython/iplib.py (InteractiveShell.init_readline): Made the
5422 warning about readline only occur for Posix. In Windows there's no
5427 warning about readline only occur for Posix. In Windows there's no
5423 way to get readline, so why bother with the warning.
5428 way to get readline, so why bother with the warning.
5424
5429
5425 * IPython/Struct.py (Struct.__str__): fixed to use self.__dict__
5430 * IPython/Struct.py (Struct.__str__): fixed to use self.__dict__
5426 for __str__ instead of dir(self), since dir() changed in 2.2.
5431 for __str__ instead of dir(self), since dir() changed in 2.2.
5427
5432
5428 * Ported to Windows! Tested on XP, I suspect it should work fine
5433 * Ported to Windows! Tested on XP, I suspect it should work fine
5429 on NT/2000, but I don't think it will work on 98 et al. That
5434 on NT/2000, but I don't think it will work on 98 et al. That
5430 series of Windows is such a piece of junk anyway that I won't try
5435 series of Windows is such a piece of junk anyway that I won't try
5431 porting it there. The XP port was straightforward, showed a few
5436 porting it there. The XP port was straightforward, showed a few
5432 bugs here and there (fixed all), in particular some string
5437 bugs here and there (fixed all), in particular some string
5433 handling stuff which required considering Unicode strings (which
5438 handling stuff which required considering Unicode strings (which
5434 Windows uses). This is good, but hasn't been too tested :) No
5439 Windows uses). This is good, but hasn't been too tested :) No
5435 fancy installer yet, I'll put a note in the manual so people at
5440 fancy installer yet, I'll put a note in the manual so people at
5436 least make manually a shortcut.
5441 least make manually a shortcut.
5437
5442
5438 * IPython/iplib.py (Magic.magic_colors): Unified the color options
5443 * IPython/iplib.py (Magic.magic_colors): Unified the color options
5439 into a single one, "colors". This now controls both prompt and
5444 into a single one, "colors". This now controls both prompt and
5440 exception color schemes, and can be changed both at startup
5445 exception color schemes, and can be changed both at startup
5441 (either via command-line switches or via ipythonrc files) and at
5446 (either via command-line switches or via ipythonrc files) and at
5442 runtime, with @colors.
5447 runtime, with @colors.
5443 (Magic.magic_run): renamed @prun to @run and removed the old
5448 (Magic.magic_run): renamed @prun to @run and removed the old
5444 @run. The two were too similar to warrant keeping both.
5449 @run. The two were too similar to warrant keeping both.
5445
5450
5446 2002-02-03 Fernando Perez <fperez@colorado.edu>
5451 2002-02-03 Fernando Perez <fperez@colorado.edu>
5447
5452
5448 * IPython/iplib.py (install_first_time): Added comment on how to
5453 * IPython/iplib.py (install_first_time): Added comment on how to
5449 configure the color options for first-time users. Put a <return>
5454 configure the color options for first-time users. Put a <return>
5450 request at the end so that small-terminal users get a chance to
5455 request at the end so that small-terminal users get a chance to
5451 read the startup info.
5456 read the startup info.
5452
5457
5453 2002-01-23 Fernando Perez <fperez@colorado.edu>
5458 2002-01-23 Fernando Perez <fperez@colorado.edu>
5454
5459
5455 * IPython/iplib.py (CachedOutput.update): Changed output memory
5460 * IPython/iplib.py (CachedOutput.update): Changed output memory
5456 variable names from _o,_oo,_ooo,_o<n> to simply _,__,___,_<n>. For
5461 variable names from _o,_oo,_ooo,_o<n> to simply _,__,___,_<n>. For
5457 input history we still use _i. Did this b/c these variable are
5462 input history we still use _i. Did this b/c these variable are
5458 very commonly used in interactive work, so the less we need to
5463 very commonly used in interactive work, so the less we need to
5459 type the better off we are.
5464 type the better off we are.
5460 (Magic.magic_prun): updated @prun to better handle the namespaces
5465 (Magic.magic_prun): updated @prun to better handle the namespaces
5461 the file will run in, including a fix for __name__ not being set
5466 the file will run in, including a fix for __name__ not being set
5462 before.
5467 before.
5463
5468
5464 2002-01-20 Fernando Perez <fperez@colorado.edu>
5469 2002-01-20 Fernando Perez <fperez@colorado.edu>
5465
5470
5466 * IPython/ultraTB.py (VerboseTB.linereader): Fixed printing of
5471 * IPython/ultraTB.py (VerboseTB.linereader): Fixed printing of
5467 extra garbage for Python 2.2. Need to look more carefully into
5472 extra garbage for Python 2.2. Need to look more carefully into
5468 this later.
5473 this later.
5469
5474
5470 2002-01-19 Fernando Perez <fperez@colorado.edu>
5475 2002-01-19 Fernando Perez <fperez@colorado.edu>
5471
5476
5472 * IPython/iplib.py (InteractiveShell.showtraceback): fixed to
5477 * IPython/iplib.py (InteractiveShell.showtraceback): fixed to
5473 display SyntaxError exceptions properly formatted when they occur
5478 display SyntaxError exceptions properly formatted when they occur
5474 (they can be triggered by imported code).
5479 (they can be triggered by imported code).
5475
5480
5476 2002-01-18 Fernando Perez <fperez@colorado.edu>
5481 2002-01-18 Fernando Perez <fperez@colorado.edu>
5477
5482
5478 * IPython/iplib.py (InteractiveShell.safe_execfile): now
5483 * IPython/iplib.py (InteractiveShell.safe_execfile): now
5479 SyntaxError exceptions are reported nicely formatted, instead of
5484 SyntaxError exceptions are reported nicely formatted, instead of
5480 spitting out only offset information as before.
5485 spitting out only offset information as before.
5481 (Magic.magic_prun): Added the @prun function for executing
5486 (Magic.magic_prun): Added the @prun function for executing
5482 programs with command line args inside IPython.
5487 programs with command line args inside IPython.
5483
5488
5484 2002-01-16 Fernando Perez <fperez@colorado.edu>
5489 2002-01-16 Fernando Perez <fperez@colorado.edu>
5485
5490
5486 * IPython/iplib.py (Magic.magic_hist): Changed @hist and @dhist
5491 * IPython/iplib.py (Magic.magic_hist): Changed @hist and @dhist
5487 to *not* include the last item given in a range. This brings their
5492 to *not* include the last item given in a range. This brings their
5488 behavior in line with Python's slicing:
5493 behavior in line with Python's slicing:
5489 a[n1:n2] -> a[n1]...a[n2-1]
5494 a[n1:n2] -> a[n1]...a[n2-1]
5490 It may be a bit less convenient, but I prefer to stick to Python's
5495 It may be a bit less convenient, but I prefer to stick to Python's
5491 conventions *everywhere*, so users never have to wonder.
5496 conventions *everywhere*, so users never have to wonder.
5492 (Magic.magic_macro): Added @macro function to ease the creation of
5497 (Magic.magic_macro): Added @macro function to ease the creation of
5493 macros.
5498 macros.
5494
5499
5495 2002-01-05 Fernando Perez <fperez@colorado.edu>
5500 2002-01-05 Fernando Perez <fperez@colorado.edu>
5496
5501
5497 * Released 0.2.4.
5502 * Released 0.2.4.
5498
5503
5499 * IPython/iplib.py (Magic.magic_pdef):
5504 * IPython/iplib.py (Magic.magic_pdef):
5500 (InteractiveShell.safe_execfile): report magic lines and error
5505 (InteractiveShell.safe_execfile): report magic lines and error
5501 lines without line numbers so one can easily copy/paste them for
5506 lines without line numbers so one can easily copy/paste them for
5502 re-execution.
5507 re-execution.
5503
5508
5504 * Updated manual with recent changes.
5509 * Updated manual with recent changes.
5505
5510
5506 * IPython/iplib.py (Magic.magic_oinfo): added constructor
5511 * IPython/iplib.py (Magic.magic_oinfo): added constructor
5507 docstring printing when class? is called. Very handy for knowing
5512 docstring printing when class? is called. Very handy for knowing
5508 how to create class instances (as long as __init__ is well
5513 how to create class instances (as long as __init__ is well
5509 documented, of course :)
5514 documented, of course :)
5510 (Magic.magic_doc): print both class and constructor docstrings.
5515 (Magic.magic_doc): print both class and constructor docstrings.
5511 (Magic.magic_pdef): give constructor info if passed a class and
5516 (Magic.magic_pdef): give constructor info if passed a class and
5512 __call__ info for callable object instances.
5517 __call__ info for callable object instances.
5513
5518
5514 2002-01-04 Fernando Perez <fperez@colorado.edu>
5519 2002-01-04 Fernando Perez <fperez@colorado.edu>
5515
5520
5516 * Made deep_reload() off by default. It doesn't always work
5521 * Made deep_reload() off by default. It doesn't always work
5517 exactly as intended, so it's probably safer to have it off. It's
5522 exactly as intended, so it's probably safer to have it off. It's
5518 still available as dreload() anyway, so nothing is lost.
5523 still available as dreload() anyway, so nothing is lost.
5519
5524
5520 2002-01-02 Fernando Perez <fperez@colorado.edu>
5525 2002-01-02 Fernando Perez <fperez@colorado.edu>
5521
5526
5522 * Released 0.2.3 (contacted R.Singh at CU about biopython course,
5527 * Released 0.2.3 (contacted R.Singh at CU about biopython course,
5523 so I wanted an updated release).
5528 so I wanted an updated release).
5524
5529
5525 2001-12-27 Fernando Perez <fperez@colorado.edu>
5530 2001-12-27 Fernando Perez <fperez@colorado.edu>
5526
5531
5527 * IPython/iplib.py (InteractiveShell.interact): Added the original
5532 * IPython/iplib.py (InteractiveShell.interact): Added the original
5528 code from 'code.py' for this module in order to change the
5533 code from 'code.py' for this module in order to change the
5529 handling of a KeyboardInterrupt. This was necessary b/c otherwise
5534 handling of a KeyboardInterrupt. This was necessary b/c otherwise
5530 the history cache would break when the user hit Ctrl-C, and
5535 the history cache would break when the user hit Ctrl-C, and
5531 interact() offers no way to add any hooks to it.
5536 interact() offers no way to add any hooks to it.
5532
5537
5533 2001-12-23 Fernando Perez <fperez@colorado.edu>
5538 2001-12-23 Fernando Perez <fperez@colorado.edu>
5534
5539
5535 * setup.py: added check for 'MANIFEST' before trying to remove
5540 * setup.py: added check for 'MANIFEST' before trying to remove
5536 it. Thanks to Sean Reifschneider.
5541 it. Thanks to Sean Reifschneider.
5537
5542
5538 2001-12-22 Fernando Perez <fperez@colorado.edu>
5543 2001-12-22 Fernando Perez <fperez@colorado.edu>
5539
5544
5540 * Released 0.2.2.
5545 * Released 0.2.2.
5541
5546
5542 * Finished (reasonably) writing the manual. Later will add the
5547 * Finished (reasonably) writing the manual. Later will add the
5543 python-standard navigation stylesheets, but for the time being
5548 python-standard navigation stylesheets, but for the time being
5544 it's fairly complete. Distribution will include html and pdf
5549 it's fairly complete. Distribution will include html and pdf
5545 versions.
5550 versions.
5546
5551
5547 * Bugfix: '.' wasn't being added to sys.path. Thanks to Prabhu
5552 * Bugfix: '.' wasn't being added to sys.path. Thanks to Prabhu
5548 (MayaVi author).
5553 (MayaVi author).
5549
5554
5550 2001-12-21 Fernando Perez <fperez@colorado.edu>
5555 2001-12-21 Fernando Perez <fperez@colorado.edu>
5551
5556
5552 * Released 0.2.1. Barring any nasty bugs, this is it as far as a
5557 * Released 0.2.1. Barring any nasty bugs, this is it as far as a
5553 good public release, I think (with the manual and the distutils
5558 good public release, I think (with the manual and the distutils
5554 installer). The manual can use some work, but that can go
5559 installer). The manual can use some work, but that can go
5555 slowly. Otherwise I think it's quite nice for end users. Next
5560 slowly. Otherwise I think it's quite nice for end users. Next
5556 summer, rewrite the guts of it...
5561 summer, rewrite the guts of it...
5557
5562
5558 * Changed format of ipythonrc files to use whitespace as the
5563 * Changed format of ipythonrc files to use whitespace as the
5559 separator instead of an explicit '='. Cleaner.
5564 separator instead of an explicit '='. Cleaner.
5560
5565
5561 2001-12-20 Fernando Perez <fperez@colorado.edu>
5566 2001-12-20 Fernando Perez <fperez@colorado.edu>
5562
5567
5563 * Started a manual in LyX. For now it's just a quick merge of the
5568 * Started a manual in LyX. For now it's just a quick merge of the
5564 various internal docstrings and READMEs. Later it may grow into a
5569 various internal docstrings and READMEs. Later it may grow into a
5565 nice, full-blown manual.
5570 nice, full-blown manual.
5566
5571
5567 * Set up a distutils based installer. Installation should now be
5572 * Set up a distutils based installer. Installation should now be
5568 trivially simple for end-users.
5573 trivially simple for end-users.
5569
5574
5570 2001-12-11 Fernando Perez <fperez@colorado.edu>
5575 2001-12-11 Fernando Perez <fperez@colorado.edu>
5571
5576
5572 * Released 0.2.0. First public release, announced it at
5577 * Released 0.2.0. First public release, announced it at
5573 comp.lang.python. From now on, just bugfixes...
5578 comp.lang.python. From now on, just bugfixes...
5574
5579
5575 * Went through all the files, set copyright/license notices and
5580 * Went through all the files, set copyright/license notices and
5576 cleaned up things. Ready for release.
5581 cleaned up things. Ready for release.
5577
5582
5578 2001-12-10 Fernando Perez <fperez@colorado.edu>
5583 2001-12-10 Fernando Perez <fperez@colorado.edu>
5579
5584
5580 * Changed the first-time installer not to use tarfiles. It's more
5585 * Changed the first-time installer not to use tarfiles. It's more
5581 robust now and less unix-dependent. Also makes it easier for
5586 robust now and less unix-dependent. Also makes it easier for
5582 people to later upgrade versions.
5587 people to later upgrade versions.
5583
5588
5584 * Changed @exit to @abort to reflect the fact that it's pretty
5589 * Changed @exit to @abort to reflect the fact that it's pretty
5585 brutal (a sys.exit()). The difference between @abort and Ctrl-D
5590 brutal (a sys.exit()). The difference between @abort and Ctrl-D
5586 becomes significant only when IPyhton is embedded: in that case,
5591 becomes significant only when IPyhton is embedded: in that case,
5587 C-D closes IPython only, but @abort kills the enclosing program
5592 C-D closes IPython only, but @abort kills the enclosing program
5588 too (unless it had called IPython inside a try catching
5593 too (unless it had called IPython inside a try catching
5589 SystemExit).
5594 SystemExit).
5590
5595
5591 * Created Shell module which exposes the actuall IPython Shell
5596 * Created Shell module which exposes the actuall IPython Shell
5592 classes, currently the normal and the embeddable one. This at
5597 classes, currently the normal and the embeddable one. This at
5593 least offers a stable interface we won't need to change when
5598 least offers a stable interface we won't need to change when
5594 (later) the internals are rewritten. That rewrite will be confined
5599 (later) the internals are rewritten. That rewrite will be confined
5595 to iplib and ipmaker, but the Shell interface should remain as is.
5600 to iplib and ipmaker, but the Shell interface should remain as is.
5596
5601
5597 * Added embed module which offers an embeddable IPShell object,
5602 * Added embed module which offers an embeddable IPShell object,
5598 useful to fire up IPython *inside* a running program. Great for
5603 useful to fire up IPython *inside* a running program. Great for
5599 debugging or dynamical data analysis.
5604 debugging or dynamical data analysis.
5600
5605
5601 2001-12-08 Fernando Perez <fperez@colorado.edu>
5606 2001-12-08 Fernando Perez <fperez@colorado.edu>
5602
5607
5603 * Fixed small bug preventing seeing info from methods of defined
5608 * Fixed small bug preventing seeing info from methods of defined
5604 objects (incorrect namespace in _ofind()).
5609 objects (incorrect namespace in _ofind()).
5605
5610
5606 * Documentation cleanup. Moved the main usage docstrings to a
5611 * Documentation cleanup. Moved the main usage docstrings to a
5607 separate file, usage.py (cleaner to maintain, and hopefully in the
5612 separate file, usage.py (cleaner to maintain, and hopefully in the
5608 future some perlpod-like way of producing interactive, man and
5613 future some perlpod-like way of producing interactive, man and
5609 html docs out of it will be found).
5614 html docs out of it will be found).
5610
5615
5611 * Added @profile to see your profile at any time.
5616 * Added @profile to see your profile at any time.
5612
5617
5613 * Added @p as an alias for 'print'. It's especially convenient if
5618 * Added @p as an alias for 'print'. It's especially convenient if
5614 using automagic ('p x' prints x).
5619 using automagic ('p x' prints x).
5615
5620
5616 * Small cleanups and fixes after a pychecker run.
5621 * Small cleanups and fixes after a pychecker run.
5617
5622
5618 * Changed the @cd command to handle @cd - and @cd -<n> for
5623 * Changed the @cd command to handle @cd - and @cd -<n> for
5619 visiting any directory in _dh.
5624 visiting any directory in _dh.
5620
5625
5621 * Introduced _dh, a history of visited directories. @dhist prints
5626 * Introduced _dh, a history of visited directories. @dhist prints
5622 it out with numbers.
5627 it out with numbers.
5623
5628
5624 2001-12-07 Fernando Perez <fperez@colorado.edu>
5629 2001-12-07 Fernando Perez <fperez@colorado.edu>
5625
5630
5626 * Released 0.1.22
5631 * Released 0.1.22
5627
5632
5628 * Made initialization a bit more robust against invalid color
5633 * Made initialization a bit more robust against invalid color
5629 options in user input (exit, not traceback-crash).
5634 options in user input (exit, not traceback-crash).
5630
5635
5631 * Changed the bug crash reporter to write the report only in the
5636 * Changed the bug crash reporter to write the report only in the
5632 user's .ipython directory. That way IPython won't litter people's
5637 user's .ipython directory. That way IPython won't litter people's
5633 hard disks with crash files all over the place. Also print on
5638 hard disks with crash files all over the place. Also print on
5634 screen the necessary mail command.
5639 screen the necessary mail command.
5635
5640
5636 * With the new ultraTB, implemented LightBG color scheme for light
5641 * With the new ultraTB, implemented LightBG color scheme for light
5637 background terminals. A lot of people like white backgrounds, so I
5642 background terminals. A lot of people like white backgrounds, so I
5638 guess we should at least give them something readable.
5643 guess we should at least give them something readable.
5639
5644
5640 2001-12-06 Fernando Perez <fperez@colorado.edu>
5645 2001-12-06 Fernando Perez <fperez@colorado.edu>
5641
5646
5642 * Modified the structure of ultraTB. Now there's a proper class
5647 * Modified the structure of ultraTB. Now there's a proper class
5643 for tables of color schemes which allow adding schemes easily and
5648 for tables of color schemes which allow adding schemes easily and
5644 switching the active scheme without creating a new instance every
5649 switching the active scheme without creating a new instance every
5645 time (which was ridiculous). The syntax for creating new schemes
5650 time (which was ridiculous). The syntax for creating new schemes
5646 is also cleaner. I think ultraTB is finally done, with a clean
5651 is also cleaner. I think ultraTB is finally done, with a clean
5647 class structure. Names are also much cleaner (now there's proper
5652 class structure. Names are also much cleaner (now there's proper
5648 color tables, no need for every variable to also have 'color' in
5653 color tables, no need for every variable to also have 'color' in
5649 its name).
5654 its name).
5650
5655
5651 * Broke down genutils into separate files. Now genutils only
5656 * Broke down genutils into separate files. Now genutils only
5652 contains utility functions, and classes have been moved to their
5657 contains utility functions, and classes have been moved to their
5653 own files (they had enough independent functionality to warrant
5658 own files (they had enough independent functionality to warrant
5654 it): ConfigLoader, OutputTrap, Struct.
5659 it): ConfigLoader, OutputTrap, Struct.
5655
5660
5656 2001-12-05 Fernando Perez <fperez@colorado.edu>
5661 2001-12-05 Fernando Perez <fperez@colorado.edu>
5657
5662
5658 * IPython turns 21! Released version 0.1.21, as a candidate for
5663 * IPython turns 21! Released version 0.1.21, as a candidate for
5659 public consumption. If all goes well, release in a few days.
5664 public consumption. If all goes well, release in a few days.
5660
5665
5661 * Fixed path bug (files in Extensions/ directory wouldn't be found
5666 * Fixed path bug (files in Extensions/ directory wouldn't be found
5662 unless IPython/ was explicitly in sys.path).
5667 unless IPython/ was explicitly in sys.path).
5663
5668
5664 * Extended the FlexCompleter class as MagicCompleter to allow
5669 * Extended the FlexCompleter class as MagicCompleter to allow
5665 completion of @-starting lines.
5670 completion of @-starting lines.
5666
5671
5667 * Created __release__.py file as a central repository for release
5672 * Created __release__.py file as a central repository for release
5668 info that other files can read from.
5673 info that other files can read from.
5669
5674
5670 * Fixed small bug in logging: when logging was turned on in
5675 * Fixed small bug in logging: when logging was turned on in
5671 mid-session, old lines with special meanings (!@?) were being
5676 mid-session, old lines with special meanings (!@?) were being
5672 logged without the prepended comment, which is necessary since
5677 logged without the prepended comment, which is necessary since
5673 they are not truly valid python syntax. This should make session
5678 they are not truly valid python syntax. This should make session
5674 restores produce less errors.
5679 restores produce less errors.
5675
5680
5676 * The namespace cleanup forced me to make a FlexCompleter class
5681 * The namespace cleanup forced me to make a FlexCompleter class
5677 which is nothing but a ripoff of rlcompleter, but with selectable
5682 which is nothing but a ripoff of rlcompleter, but with selectable
5678 namespace (rlcompleter only works in __main__.__dict__). I'll try
5683 namespace (rlcompleter only works in __main__.__dict__). I'll try
5679 to submit a note to the authors to see if this change can be
5684 to submit a note to the authors to see if this change can be
5680 incorporated in future rlcompleter releases (Dec.6: done)
5685 incorporated in future rlcompleter releases (Dec.6: done)
5681
5686
5682 * More fixes to namespace handling. It was a mess! Now all
5687 * More fixes to namespace handling. It was a mess! Now all
5683 explicit references to __main__.__dict__ are gone (except when
5688 explicit references to __main__.__dict__ are gone (except when
5684 really needed) and everything is handled through the namespace
5689 really needed) and everything is handled through the namespace
5685 dicts in the IPython instance. We seem to be getting somewhere
5690 dicts in the IPython instance. We seem to be getting somewhere
5686 with this, finally...
5691 with this, finally...
5687
5692
5688 * Small documentation updates.
5693 * Small documentation updates.
5689
5694
5690 * Created the Extensions directory under IPython (with an
5695 * Created the Extensions directory under IPython (with an
5691 __init__.py). Put the PhysicalQ stuff there. This directory should
5696 __init__.py). Put the PhysicalQ stuff there. This directory should
5692 be used for all special-purpose extensions.
5697 be used for all special-purpose extensions.
5693
5698
5694 * File renaming:
5699 * File renaming:
5695 ipythonlib --> ipmaker
5700 ipythonlib --> ipmaker
5696 ipplib --> iplib
5701 ipplib --> iplib
5697 This makes a bit more sense in terms of what these files actually do.
5702 This makes a bit more sense in terms of what these files actually do.
5698
5703
5699 * Moved all the classes and functions in ipythonlib to ipplib, so
5704 * Moved all the classes and functions in ipythonlib to ipplib, so
5700 now ipythonlib only has make_IPython(). This will ease up its
5705 now ipythonlib only has make_IPython(). This will ease up its
5701 splitting in smaller functional chunks later.
5706 splitting in smaller functional chunks later.
5702
5707
5703 * Cleaned up (done, I think) output of @whos. Better column
5708 * Cleaned up (done, I think) output of @whos. Better column
5704 formatting, and now shows str(var) for as much as it can, which is
5709 formatting, and now shows str(var) for as much as it can, which is
5705 typically what one gets with a 'print var'.
5710 typically what one gets with a 'print var'.
5706
5711
5707 2001-12-04 Fernando Perez <fperez@colorado.edu>
5712 2001-12-04 Fernando Perez <fperez@colorado.edu>
5708
5713
5709 * Fixed namespace problems. Now builtin/IPyhton/user names get
5714 * Fixed namespace problems. Now builtin/IPyhton/user names get
5710 properly reported in their namespace. Internal namespace handling
5715 properly reported in their namespace. Internal namespace handling
5711 is finally getting decent (not perfect yet, but much better than
5716 is finally getting decent (not perfect yet, but much better than
5712 the ad-hoc mess we had).
5717 the ad-hoc mess we had).
5713
5718
5714 * Removed -exit option. If people just want to run a python
5719 * Removed -exit option. If people just want to run a python
5715 script, that's what the normal interpreter is for. Less
5720 script, that's what the normal interpreter is for. Less
5716 unnecessary options, less chances for bugs.
5721 unnecessary options, less chances for bugs.
5717
5722
5718 * Added a crash handler which generates a complete post-mortem if
5723 * Added a crash handler which generates a complete post-mortem if
5719 IPython crashes. This will help a lot in tracking bugs down the
5724 IPython crashes. This will help a lot in tracking bugs down the
5720 road.
5725 road.
5721
5726
5722 * Fixed nasty bug in auto-evaluation part of prefilter(). Names
5727 * Fixed nasty bug in auto-evaluation part of prefilter(). Names
5723 which were boud to functions being reassigned would bypass the
5728 which were boud to functions being reassigned would bypass the
5724 logger, breaking the sync of _il with the prompt counter. This
5729 logger, breaking the sync of _il with the prompt counter. This
5725 would then crash IPython later when a new line was logged.
5730 would then crash IPython later when a new line was logged.
5726
5731
5727 2001-12-02 Fernando Perez <fperez@colorado.edu>
5732 2001-12-02 Fernando Perez <fperez@colorado.edu>
5728
5733
5729 * Made IPython a package. This means people don't have to clutter
5734 * Made IPython a package. This means people don't have to clutter
5730 their sys.path with yet another directory. Changed the INSTALL
5735 their sys.path with yet another directory. Changed the INSTALL
5731 file accordingly.
5736 file accordingly.
5732
5737
5733 * Cleaned up the output of @who_ls, @who and @whos. @who_ls now
5738 * Cleaned up the output of @who_ls, @who and @whos. @who_ls now
5734 sorts its output (so @who shows it sorted) and @whos formats the
5739 sorts its output (so @who shows it sorted) and @whos formats the
5735 table according to the width of the first column. Nicer, easier to
5740 table according to the width of the first column. Nicer, easier to
5736 read. Todo: write a generic table_format() which takes a list of
5741 read. Todo: write a generic table_format() which takes a list of
5737 lists and prints it nicely formatted, with optional row/column
5742 lists and prints it nicely formatted, with optional row/column
5738 separators and proper padding and justification.
5743 separators and proper padding and justification.
5739
5744
5740 * Released 0.1.20
5745 * Released 0.1.20
5741
5746
5742 * Fixed bug in @log which would reverse the inputcache list (a
5747 * Fixed bug in @log which would reverse the inputcache list (a
5743 copy operation was missing).
5748 copy operation was missing).
5744
5749
5745 * Code cleanup. @config was changed to use page(). Better, since
5750 * Code cleanup. @config was changed to use page(). Better, since
5746 its output is always quite long.
5751 its output is always quite long.
5747
5752
5748 * Itpl is back as a dependency. I was having too many problems
5753 * Itpl is back as a dependency. I was having too many problems
5749 getting the parametric aliases to work reliably, and it's just
5754 getting the parametric aliases to work reliably, and it's just
5750 easier to code weird string operations with it than playing %()s
5755 easier to code weird string operations with it than playing %()s
5751 games. It's only ~6k, so I don't think it's too big a deal.
5756 games. It's only ~6k, so I don't think it's too big a deal.
5752
5757
5753 * Found (and fixed) a very nasty bug with history. !lines weren't
5758 * Found (and fixed) a very nasty bug with history. !lines weren't
5754 getting cached, and the out of sync caches would crash
5759 getting cached, and the out of sync caches would crash
5755 IPython. Fixed it by reorganizing the prefilter/handlers/logger
5760 IPython. Fixed it by reorganizing the prefilter/handlers/logger
5756 division of labor a bit better. Bug fixed, cleaner structure.
5761 division of labor a bit better. Bug fixed, cleaner structure.
5757
5762
5758 2001-12-01 Fernando Perez <fperez@colorado.edu>
5763 2001-12-01 Fernando Perez <fperez@colorado.edu>
5759
5764
5760 * Released 0.1.19
5765 * Released 0.1.19
5761
5766
5762 * Added option -n to @hist to prevent line number printing. Much
5767 * Added option -n to @hist to prevent line number printing. Much
5763 easier to copy/paste code this way.
5768 easier to copy/paste code this way.
5764
5769
5765 * Created global _il to hold the input list. Allows easy
5770 * Created global _il to hold the input list. Allows easy
5766 re-execution of blocks of code by slicing it (inspired by Janko's
5771 re-execution of blocks of code by slicing it (inspired by Janko's
5767 comment on 'macros').
5772 comment on 'macros').
5768
5773
5769 * Small fixes and doc updates.
5774 * Small fixes and doc updates.
5770
5775
5771 * Rewrote @history function (was @h). Renamed it to @hist, @h is
5776 * Rewrote @history function (was @h). Renamed it to @hist, @h is
5772 much too fragile with automagic. Handles properly multi-line
5777 much too fragile with automagic. Handles properly multi-line
5773 statements and takes parameters.
5778 statements and takes parameters.
5774
5779
5775 2001-11-30 Fernando Perez <fperez@colorado.edu>
5780 2001-11-30 Fernando Perez <fperez@colorado.edu>
5776
5781
5777 * Version 0.1.18 released.
5782 * Version 0.1.18 released.
5778
5783
5779 * Fixed nasty namespace bug in initial module imports.
5784 * Fixed nasty namespace bug in initial module imports.
5780
5785
5781 * Added copyright/license notes to all code files (except
5786 * Added copyright/license notes to all code files (except
5782 DPyGetOpt). For the time being, LGPL. That could change.
5787 DPyGetOpt). For the time being, LGPL. That could change.
5783
5788
5784 * Rewrote a much nicer README, updated INSTALL, cleaned up
5789 * Rewrote a much nicer README, updated INSTALL, cleaned up
5785 ipythonrc-* samples.
5790 ipythonrc-* samples.
5786
5791
5787 * Overall code/documentation cleanup. Basically ready for
5792 * Overall code/documentation cleanup. Basically ready for
5788 release. Only remaining thing: licence decision (LGPL?).
5793 release. Only remaining thing: licence decision (LGPL?).
5789
5794
5790 * Converted load_config to a class, ConfigLoader. Now recursion
5795 * Converted load_config to a class, ConfigLoader. Now recursion
5791 control is better organized. Doesn't include the same file twice.
5796 control is better organized. Doesn't include the same file twice.
5792
5797
5793 2001-11-29 Fernando Perez <fperez@colorado.edu>
5798 2001-11-29 Fernando Perez <fperez@colorado.edu>
5794
5799
5795 * Got input history working. Changed output history variables from
5800 * Got input history working. Changed output history variables from
5796 _p to _o so that _i is for input and _o for output. Just cleaner
5801 _p to _o so that _i is for input and _o for output. Just cleaner
5797 convention.
5802 convention.
5798
5803
5799 * Implemented parametric aliases. This pretty much allows the
5804 * Implemented parametric aliases. This pretty much allows the
5800 alias system to offer full-blown shell convenience, I think.
5805 alias system to offer full-blown shell convenience, I think.
5801
5806
5802 * Version 0.1.17 released, 0.1.18 opened.
5807 * Version 0.1.17 released, 0.1.18 opened.
5803
5808
5804 * dot_ipython/ipythonrc (alias): added documentation.
5809 * dot_ipython/ipythonrc (alias): added documentation.
5805 (xcolor): Fixed small bug (xcolors -> xcolor)
5810 (xcolor): Fixed small bug (xcolors -> xcolor)
5806
5811
5807 * Changed the alias system. Now alias is a magic command to define
5812 * Changed the alias system. Now alias is a magic command to define
5808 aliases just like the shell. Rationale: the builtin magics should
5813 aliases just like the shell. Rationale: the builtin magics should
5809 be there for things deeply connected to IPython's
5814 be there for things deeply connected to IPython's
5810 architecture. And this is a much lighter system for what I think
5815 architecture. And this is a much lighter system for what I think
5811 is the really important feature: allowing users to define quickly
5816 is the really important feature: allowing users to define quickly
5812 magics that will do shell things for them, so they can customize
5817 magics that will do shell things for them, so they can customize
5813 IPython easily to match their work habits. If someone is really
5818 IPython easily to match their work habits. If someone is really
5814 desperate to have another name for a builtin alias, they can
5819 desperate to have another name for a builtin alias, they can
5815 always use __IP.magic_newname = __IP.magic_oldname. Hackish but
5820 always use __IP.magic_newname = __IP.magic_oldname. Hackish but
5816 works.
5821 works.
5817
5822
5818 2001-11-28 Fernando Perez <fperez@colorado.edu>
5823 2001-11-28 Fernando Perez <fperez@colorado.edu>
5819
5824
5820 * Changed @file so that it opens the source file at the proper
5825 * Changed @file so that it opens the source file at the proper
5821 line. Since it uses less, if your EDITOR environment is
5826 line. Since it uses less, if your EDITOR environment is
5822 configured, typing v will immediately open your editor of choice
5827 configured, typing v will immediately open your editor of choice
5823 right at the line where the object is defined. Not as quick as
5828 right at the line where the object is defined. Not as quick as
5824 having a direct @edit command, but for all intents and purposes it
5829 having a direct @edit command, but for all intents and purposes it
5825 works. And I don't have to worry about writing @edit to deal with
5830 works. And I don't have to worry about writing @edit to deal with
5826 all the editors, less does that.
5831 all the editors, less does that.
5827
5832
5828 * Version 0.1.16 released, 0.1.17 opened.
5833 * Version 0.1.16 released, 0.1.17 opened.
5829
5834
5830 * Fixed some nasty bugs in the page/page_dumb combo that could
5835 * Fixed some nasty bugs in the page/page_dumb combo that could
5831 crash IPython.
5836 crash IPython.
5832
5837
5833 2001-11-27 Fernando Perez <fperez@colorado.edu>
5838 2001-11-27 Fernando Perez <fperez@colorado.edu>
5834
5839
5835 * Version 0.1.15 released, 0.1.16 opened.
5840 * Version 0.1.15 released, 0.1.16 opened.
5836
5841
5837 * Finally got ? and ?? to work for undefined things: now it's
5842 * Finally got ? and ?? to work for undefined things: now it's
5838 possible to type {}.get? and get information about the get method
5843 possible to type {}.get? and get information about the get method
5839 of dicts, or os.path? even if only os is defined (so technically
5844 of dicts, or os.path? even if only os is defined (so technically
5840 os.path isn't). Works at any level. For example, after import os,
5845 os.path isn't). Works at any level. For example, after import os,
5841 os?, os.path?, os.path.abspath? all work. This is great, took some
5846 os?, os.path?, os.path.abspath? all work. This is great, took some
5842 work in _ofind.
5847 work in _ofind.
5843
5848
5844 * Fixed more bugs with logging. The sanest way to do it was to add
5849 * Fixed more bugs with logging. The sanest way to do it was to add
5845 to @log a 'mode' parameter. Killed two in one shot (this mode
5850 to @log a 'mode' parameter. Killed two in one shot (this mode
5846 option was a request of Janko's). I think it's finally clean
5851 option was a request of Janko's). I think it's finally clean
5847 (famous last words).
5852 (famous last words).
5848
5853
5849 * Added a page_dumb() pager which does a decent job of paging on
5854 * Added a page_dumb() pager which does a decent job of paging on
5850 screen, if better things (like less) aren't available. One less
5855 screen, if better things (like less) aren't available. One less
5851 unix dependency (someday maybe somebody will port this to
5856 unix dependency (someday maybe somebody will port this to
5852 windows).
5857 windows).
5853
5858
5854 * Fixed problem in magic_log: would lock of logging out if log
5859 * Fixed problem in magic_log: would lock of logging out if log
5855 creation failed (because it would still think it had succeeded).
5860 creation failed (because it would still think it had succeeded).
5856
5861
5857 * Improved the page() function using curses to auto-detect screen
5862 * Improved the page() function using curses to auto-detect screen
5858 size. Now it can make a much better decision on whether to print
5863 size. Now it can make a much better decision on whether to print
5859 or page a string. Option screen_length was modified: a value 0
5864 or page a string. Option screen_length was modified: a value 0
5860 means auto-detect, and that's the default now.
5865 means auto-detect, and that's the default now.
5861
5866
5862 * Version 0.1.14 released, 0.1.15 opened. I think this is ready to
5867 * Version 0.1.14 released, 0.1.15 opened. I think this is ready to
5863 go out. I'll test it for a few days, then talk to Janko about
5868 go out. I'll test it for a few days, then talk to Janko about
5864 licences and announce it.
5869 licences and announce it.
5865
5870
5866 * Fixed the length of the auto-generated ---> prompt which appears
5871 * Fixed the length of the auto-generated ---> prompt which appears
5867 for auto-parens and auto-quotes. Getting this right isn't trivial,
5872 for auto-parens and auto-quotes. Getting this right isn't trivial,
5868 with all the color escapes, different prompt types and optional
5873 with all the color escapes, different prompt types and optional
5869 separators. But it seems to be working in all the combinations.
5874 separators. But it seems to be working in all the combinations.
5870
5875
5871 2001-11-26 Fernando Perez <fperez@colorado.edu>
5876 2001-11-26 Fernando Perez <fperez@colorado.edu>
5872
5877
5873 * Wrote a regexp filter to get option types from the option names
5878 * Wrote a regexp filter to get option types from the option names
5874 string. This eliminates the need to manually keep two duplicate
5879 string. This eliminates the need to manually keep two duplicate
5875 lists.
5880 lists.
5876
5881
5877 * Removed the unneeded check_option_names. Now options are handled
5882 * Removed the unneeded check_option_names. Now options are handled
5878 in a much saner manner and it's easy to visually check that things
5883 in a much saner manner and it's easy to visually check that things
5879 are ok.
5884 are ok.
5880
5885
5881 * Updated version numbers on all files I modified to carry a
5886 * Updated version numbers on all files I modified to carry a
5882 notice so Janko and Nathan have clear version markers.
5887 notice so Janko and Nathan have clear version markers.
5883
5888
5884 * Updated docstring for ultraTB with my changes. I should send
5889 * Updated docstring for ultraTB with my changes. I should send
5885 this to Nathan.
5890 this to Nathan.
5886
5891
5887 * Lots of small fixes. Ran everything through pychecker again.
5892 * Lots of small fixes. Ran everything through pychecker again.
5888
5893
5889 * Made loading of deep_reload an cmd line option. If it's not too
5894 * Made loading of deep_reload an cmd line option. If it's not too
5890 kosher, now people can just disable it. With -nodeep_reload it's
5895 kosher, now people can just disable it. With -nodeep_reload it's
5891 still available as dreload(), it just won't overwrite reload().
5896 still available as dreload(), it just won't overwrite reload().
5892
5897
5893 * Moved many options to the no| form (-opt and -noopt
5898 * Moved many options to the no| form (-opt and -noopt
5894 accepted). Cleaner.
5899 accepted). Cleaner.
5895
5900
5896 * Changed magic_log so that if called with no parameters, it uses
5901 * Changed magic_log so that if called with no parameters, it uses
5897 'rotate' mode. That way auto-generated logs aren't automatically
5902 'rotate' mode. That way auto-generated logs aren't automatically
5898 over-written. For normal logs, now a backup is made if it exists
5903 over-written. For normal logs, now a backup is made if it exists
5899 (only 1 level of backups). A new 'backup' mode was added to the
5904 (only 1 level of backups). A new 'backup' mode was added to the
5900 Logger class to support this. This was a request by Janko.
5905 Logger class to support this. This was a request by Janko.
5901
5906
5902 * Added @logoff/@logon to stop/restart an active log.
5907 * Added @logoff/@logon to stop/restart an active log.
5903
5908
5904 * Fixed a lot of bugs in log saving/replay. It was pretty
5909 * Fixed a lot of bugs in log saving/replay. It was pretty
5905 broken. Now special lines (!@,/) appear properly in the command
5910 broken. Now special lines (!@,/) appear properly in the command
5906 history after a log replay.
5911 history after a log replay.
5907
5912
5908 * Tried and failed to implement full session saving via pickle. My
5913 * Tried and failed to implement full session saving via pickle. My
5909 idea was to pickle __main__.__dict__, but modules can't be
5914 idea was to pickle __main__.__dict__, but modules can't be
5910 pickled. This would be a better alternative to replaying logs, but
5915 pickled. This would be a better alternative to replaying logs, but
5911 seems quite tricky to get to work. Changed -session to be called
5916 seems quite tricky to get to work. Changed -session to be called
5912 -logplay, which more accurately reflects what it does. And if we
5917 -logplay, which more accurately reflects what it does. And if we
5913 ever get real session saving working, -session is now available.
5918 ever get real session saving working, -session is now available.
5914
5919
5915 * Implemented color schemes for prompts also. As for tracebacks,
5920 * Implemented color schemes for prompts also. As for tracebacks,
5916 currently only NoColor and Linux are supported. But now the
5921 currently only NoColor and Linux are supported. But now the
5917 infrastructure is in place, based on a generic ColorScheme
5922 infrastructure is in place, based on a generic ColorScheme
5918 class. So writing and activating new schemes both for the prompts
5923 class. So writing and activating new schemes both for the prompts
5919 and the tracebacks should be straightforward.
5924 and the tracebacks should be straightforward.
5920
5925
5921 * Version 0.1.13 released, 0.1.14 opened.
5926 * Version 0.1.13 released, 0.1.14 opened.
5922
5927
5923 * Changed handling of options for output cache. Now counter is
5928 * Changed handling of options for output cache. Now counter is
5924 hardwired starting at 1 and one specifies the maximum number of
5929 hardwired starting at 1 and one specifies the maximum number of
5925 entries *in the outcache* (not the max prompt counter). This is
5930 entries *in the outcache* (not the max prompt counter). This is
5926 much better, since many statements won't increase the cache
5931 much better, since many statements won't increase the cache
5927 count. It also eliminated some confusing options, now there's only
5932 count. It also eliminated some confusing options, now there's only
5928 one: cache_size.
5933 one: cache_size.
5929
5934
5930 * Added 'alias' magic function and magic_alias option in the
5935 * Added 'alias' magic function and magic_alias option in the
5931 ipythonrc file. Now the user can easily define whatever names he
5936 ipythonrc file. Now the user can easily define whatever names he
5932 wants for the magic functions without having to play weird
5937 wants for the magic functions without having to play weird
5933 namespace games. This gives IPython a real shell-like feel.
5938 namespace games. This gives IPython a real shell-like feel.
5934
5939
5935 * Fixed doc/?/?? for magics. Now all work, in all forms (explicit
5940 * Fixed doc/?/?? for magics. Now all work, in all forms (explicit
5936 @ or not).
5941 @ or not).
5937
5942
5938 This was one of the last remaining 'visible' bugs (that I know
5943 This was one of the last remaining 'visible' bugs (that I know
5939 of). I think if I can clean up the session loading so it works
5944 of). I think if I can clean up the session loading so it works
5940 100% I'll release a 0.2.0 version on c.p.l (talk to Janko first
5945 100% I'll release a 0.2.0 version on c.p.l (talk to Janko first
5941 about licensing).
5946 about licensing).
5942
5947
5943 2001-11-25 Fernando Perez <fperez@colorado.edu>
5948 2001-11-25 Fernando Perez <fperez@colorado.edu>
5944
5949
5945 * Rewrote somewhat oinfo (?/??). Nicer, now uses page() and
5950 * Rewrote somewhat oinfo (?/??). Nicer, now uses page() and
5946 there's a cleaner distinction between what ? and ?? show.
5951 there's a cleaner distinction between what ? and ?? show.
5947
5952
5948 * Added screen_length option. Now the user can define his own
5953 * Added screen_length option. Now the user can define his own
5949 screen size for page() operations.
5954 screen size for page() operations.
5950
5955
5951 * Implemented magic shell-like functions with automatic code
5956 * Implemented magic shell-like functions with automatic code
5952 generation. Now adding another function is just a matter of adding
5957 generation. Now adding another function is just a matter of adding
5953 an entry to a dict, and the function is dynamically generated at
5958 an entry to a dict, and the function is dynamically generated at
5954 run-time. Python has some really cool features!
5959 run-time. Python has some really cool features!
5955
5960
5956 * Renamed many options to cleanup conventions a little. Now all
5961 * Renamed many options to cleanup conventions a little. Now all
5957 are lowercase, and only underscores where needed. Also in the code
5962 are lowercase, and only underscores where needed. Also in the code
5958 option name tables are clearer.
5963 option name tables are clearer.
5959
5964
5960 * Changed prompts a little. Now input is 'In [n]:' instead of
5965 * Changed prompts a little. Now input is 'In [n]:' instead of
5961 'In[n]:='. This allows it the numbers to be aligned with the
5966 'In[n]:='. This allows it the numbers to be aligned with the
5962 Out[n] numbers, and removes usage of ':=' which doesn't exist in
5967 Out[n] numbers, and removes usage of ':=' which doesn't exist in
5963 Python (it was a Mathematica thing). The '...' continuation prompt
5968 Python (it was a Mathematica thing). The '...' continuation prompt
5964 was also changed a little to align better.
5969 was also changed a little to align better.
5965
5970
5966 * Fixed bug when flushing output cache. Not all _p<n> variables
5971 * Fixed bug when flushing output cache. Not all _p<n> variables
5967 exist, so their deletion needs to be wrapped in a try:
5972 exist, so their deletion needs to be wrapped in a try:
5968
5973
5969 * Figured out how to properly use inspect.formatargspec() (it
5974 * Figured out how to properly use inspect.formatargspec() (it
5970 requires the args preceded by *). So I removed all the code from
5975 requires the args preceded by *). So I removed all the code from
5971 _get_pdef in Magic, which was just replicating that.
5976 _get_pdef in Magic, which was just replicating that.
5972
5977
5973 * Added test to prefilter to allow redefining magic function names
5978 * Added test to prefilter to allow redefining magic function names
5974 as variables. This is ok, since the @ form is always available,
5979 as variables. This is ok, since the @ form is always available,
5975 but whe should allow the user to define a variable called 'ls' if
5980 but whe should allow the user to define a variable called 'ls' if
5976 he needs it.
5981 he needs it.
5977
5982
5978 * Moved the ToDo information from README into a separate ToDo.
5983 * Moved the ToDo information from README into a separate ToDo.
5979
5984
5980 * General code cleanup and small bugfixes. I think it's close to a
5985 * General code cleanup and small bugfixes. I think it's close to a
5981 state where it can be released, obviously with a big 'beta'
5986 state where it can be released, obviously with a big 'beta'
5982 warning on it.
5987 warning on it.
5983
5988
5984 * Got the magic function split to work. Now all magics are defined
5989 * Got the magic function split to work. Now all magics are defined
5985 in a separate class. It just organizes things a bit, and now
5990 in a separate class. It just organizes things a bit, and now
5986 Xemacs behaves nicer (it was choking on InteractiveShell b/c it
5991 Xemacs behaves nicer (it was choking on InteractiveShell b/c it
5987 was too long).
5992 was too long).
5988
5993
5989 * Changed @clear to @reset to avoid potential confusions with
5994 * Changed @clear to @reset to avoid potential confusions with
5990 the shell command clear. Also renamed @cl to @clear, which does
5995 the shell command clear. Also renamed @cl to @clear, which does
5991 exactly what people expect it to from their shell experience.
5996 exactly what people expect it to from their shell experience.
5992
5997
5993 Added a check to the @reset command (since it's so
5998 Added a check to the @reset command (since it's so
5994 destructive, it's probably a good idea to ask for confirmation).
5999 destructive, it's probably a good idea to ask for confirmation).
5995 But now reset only works for full namespace resetting. Since the
6000 But now reset only works for full namespace resetting. Since the
5996 del keyword is already there for deleting a few specific
6001 del keyword is already there for deleting a few specific
5997 variables, I don't see the point of having a redundant magic
6002 variables, I don't see the point of having a redundant magic
5998 function for the same task.
6003 function for the same task.
5999
6004
6000 2001-11-24 Fernando Perez <fperez@colorado.edu>
6005 2001-11-24 Fernando Perez <fperez@colorado.edu>
6001
6006
6002 * Updated the builtin docs (esp. the ? ones).
6007 * Updated the builtin docs (esp. the ? ones).
6003
6008
6004 * Ran all the code through pychecker. Not terribly impressed with
6009 * Ran all the code through pychecker. Not terribly impressed with
6005 it: lots of spurious warnings and didn't really find anything of
6010 it: lots of spurious warnings and didn't really find anything of
6006 substance (just a few modules being imported and not used).
6011 substance (just a few modules being imported and not used).
6007
6012
6008 * Implemented the new ultraTB functionality into IPython. New
6013 * Implemented the new ultraTB functionality into IPython. New
6009 option: xcolors. This chooses color scheme. xmode now only selects
6014 option: xcolors. This chooses color scheme. xmode now only selects
6010 between Plain and Verbose. Better orthogonality.
6015 between Plain and Verbose. Better orthogonality.
6011
6016
6012 * Large rewrite of ultraTB. Much cleaner now, with a separation of
6017 * Large rewrite of ultraTB. Much cleaner now, with a separation of
6013 mode and color scheme for the exception handlers. Now it's
6018 mode and color scheme for the exception handlers. Now it's
6014 possible to have the verbose traceback with no coloring.
6019 possible to have the verbose traceback with no coloring.
6015
6020
6016 2001-11-23 Fernando Perez <fperez@colorado.edu>
6021 2001-11-23 Fernando Perez <fperez@colorado.edu>
6017
6022
6018 * Version 0.1.12 released, 0.1.13 opened.
6023 * Version 0.1.12 released, 0.1.13 opened.
6019
6024
6020 * Removed option to set auto-quote and auto-paren escapes by
6025 * Removed option to set auto-quote and auto-paren escapes by
6021 user. The chances of breaking valid syntax are just too high. If
6026 user. The chances of breaking valid syntax are just too high. If
6022 someone *really* wants, they can always dig into the code.
6027 someone *really* wants, they can always dig into the code.
6023
6028
6024 * Made prompt separators configurable.
6029 * Made prompt separators configurable.
6025
6030
6026 2001-11-22 Fernando Perez <fperez@colorado.edu>
6031 2001-11-22 Fernando Perez <fperez@colorado.edu>
6027
6032
6028 * Small bugfixes in many places.
6033 * Small bugfixes in many places.
6029
6034
6030 * Removed the MyCompleter class from ipplib. It seemed redundant
6035 * Removed the MyCompleter class from ipplib. It seemed redundant
6031 with the C-p,C-n history search functionality. Less code to
6036 with the C-p,C-n history search functionality. Less code to
6032 maintain.
6037 maintain.
6033
6038
6034 * Moved all the original ipython.py code into ipythonlib.py. Right
6039 * Moved all the original ipython.py code into ipythonlib.py. Right
6035 now it's just one big dump into a function called make_IPython, so
6040 now it's just one big dump into a function called make_IPython, so
6036 no real modularity has been gained. But at least it makes the
6041 no real modularity has been gained. But at least it makes the
6037 wrapper script tiny, and since ipythonlib is a module, it gets
6042 wrapper script tiny, and since ipythonlib is a module, it gets
6038 compiled and startup is much faster.
6043 compiled and startup is much faster.
6039
6044
6040 This is a reasobably 'deep' change, so we should test it for a
6045 This is a reasobably 'deep' change, so we should test it for a
6041 while without messing too much more with the code.
6046 while without messing too much more with the code.
6042
6047
6043 2001-11-21 Fernando Perez <fperez@colorado.edu>
6048 2001-11-21 Fernando Perez <fperez@colorado.edu>
6044
6049
6045 * Version 0.1.11 released, 0.1.12 opened for further work.
6050 * Version 0.1.11 released, 0.1.12 opened for further work.
6046
6051
6047 * Removed dependency on Itpl. It was only needed in one place. It
6052 * Removed dependency on Itpl. It was only needed in one place. It
6048 would be nice if this became part of python, though. It makes life
6053 would be nice if this became part of python, though. It makes life
6049 *a lot* easier in some cases.
6054 *a lot* easier in some cases.
6050
6055
6051 * Simplified the prefilter code a bit. Now all handlers are
6056 * Simplified the prefilter code a bit. Now all handlers are
6052 expected to explicitly return a value (at least a blank string).
6057 expected to explicitly return a value (at least a blank string).
6053
6058
6054 * Heavy edits in ipplib. Removed the help system altogether. Now
6059 * Heavy edits in ipplib. Removed the help system altogether. Now
6055 obj?/?? is used for inspecting objects, a magic @doc prints
6060 obj?/?? is used for inspecting objects, a magic @doc prints
6056 docstrings, and full-blown Python help is accessed via the 'help'
6061 docstrings, and full-blown Python help is accessed via the 'help'
6057 keyword. This cleans up a lot of code (less to maintain) and does
6062 keyword. This cleans up a lot of code (less to maintain) and does
6058 the job. Since 'help' is now a standard Python component, might as
6063 the job. Since 'help' is now a standard Python component, might as
6059 well use it and remove duplicate functionality.
6064 well use it and remove duplicate functionality.
6060
6065
6061 Also removed the option to use ipplib as a standalone program. By
6066 Also removed the option to use ipplib as a standalone program. By
6062 now it's too dependent on other parts of IPython to function alone.
6067 now it's too dependent on other parts of IPython to function alone.
6063
6068
6064 * Fixed bug in genutils.pager. It would crash if the pager was
6069 * Fixed bug in genutils.pager. It would crash if the pager was
6065 exited immediately after opening (broken pipe).
6070 exited immediately after opening (broken pipe).
6066
6071
6067 * Trimmed down the VerboseTB reporting a little. The header is
6072 * Trimmed down the VerboseTB reporting a little. The header is
6068 much shorter now and the repeated exception arguments at the end
6073 much shorter now and the repeated exception arguments at the end
6069 have been removed. For interactive use the old header seemed a bit
6074 have been removed. For interactive use the old header seemed a bit
6070 excessive.
6075 excessive.
6071
6076
6072 * Fixed small bug in output of @whos for variables with multi-word
6077 * Fixed small bug in output of @whos for variables with multi-word
6073 types (only first word was displayed).
6078 types (only first word was displayed).
6074
6079
6075 2001-11-17 Fernando Perez <fperez@colorado.edu>
6080 2001-11-17 Fernando Perez <fperez@colorado.edu>
6076
6081
6077 * Version 0.1.10 released, 0.1.11 opened for further work.
6082 * Version 0.1.10 released, 0.1.11 opened for further work.
6078
6083
6079 * Modified dirs and friends. dirs now *returns* the stack (not
6084 * Modified dirs and friends. dirs now *returns* the stack (not
6080 prints), so one can manipulate it as a variable. Convenient to
6085 prints), so one can manipulate it as a variable. Convenient to
6081 travel along many directories.
6086 travel along many directories.
6082
6087
6083 * Fixed bug in magic_pdef: would only work with functions with
6088 * Fixed bug in magic_pdef: would only work with functions with
6084 arguments with default values.
6089 arguments with default values.
6085
6090
6086 2001-11-14 Fernando Perez <fperez@colorado.edu>
6091 2001-11-14 Fernando Perez <fperez@colorado.edu>
6087
6092
6088 * Added the PhysicsInput stuff to dot_ipython so it ships as an
6093 * Added the PhysicsInput stuff to dot_ipython so it ships as an
6089 example with IPython. Various other minor fixes and cleanups.
6094 example with IPython. Various other minor fixes and cleanups.
6090
6095
6091 * Version 0.1.9 released, 0.1.10 opened for further work.
6096 * Version 0.1.9 released, 0.1.10 opened for further work.
6092
6097
6093 * Added sys.path to the list of directories searched in the
6098 * Added sys.path to the list of directories searched in the
6094 execfile= option. It used to be the current directory and the
6099 execfile= option. It used to be the current directory and the
6095 user's IPYTHONDIR only.
6100 user's IPYTHONDIR only.
6096
6101
6097 2001-11-13 Fernando Perez <fperez@colorado.edu>
6102 2001-11-13 Fernando Perez <fperez@colorado.edu>
6098
6103
6099 * Reinstated the raw_input/prefilter separation that Janko had
6104 * Reinstated the raw_input/prefilter separation that Janko had
6100 initially. This gives a more convenient setup for extending the
6105 initially. This gives a more convenient setup for extending the
6101 pre-processor from the outside: raw_input always gets a string,
6106 pre-processor from the outside: raw_input always gets a string,
6102 and prefilter has to process it. We can then redefine prefilter
6107 and prefilter has to process it. We can then redefine prefilter
6103 from the outside and implement extensions for special
6108 from the outside and implement extensions for special
6104 purposes.
6109 purposes.
6105
6110
6106 Today I got one for inputting PhysicalQuantity objects
6111 Today I got one for inputting PhysicalQuantity objects
6107 (from Scientific) without needing any function calls at
6112 (from Scientific) without needing any function calls at
6108 all. Extremely convenient, and it's all done as a user-level
6113 all. Extremely convenient, and it's all done as a user-level
6109 extension (no IPython code was touched). Now instead of:
6114 extension (no IPython code was touched). Now instead of:
6110 a = PhysicalQuantity(4.2,'m/s**2')
6115 a = PhysicalQuantity(4.2,'m/s**2')
6111 one can simply say
6116 one can simply say
6112 a = 4.2 m/s**2
6117 a = 4.2 m/s**2
6113 or even
6118 or even
6114 a = 4.2 m/s^2
6119 a = 4.2 m/s^2
6115
6120
6116 I use this, but it's also a proof of concept: IPython really is
6121 I use this, but it's also a proof of concept: IPython really is
6117 fully user-extensible, even at the level of the parsing of the
6122 fully user-extensible, even at the level of the parsing of the
6118 command line. It's not trivial, but it's perfectly doable.
6123 command line. It's not trivial, but it's perfectly doable.
6119
6124
6120 * Added 'add_flip' method to inclusion conflict resolver. Fixes
6125 * Added 'add_flip' method to inclusion conflict resolver. Fixes
6121 the problem of modules being loaded in the inverse order in which
6126 the problem of modules being loaded in the inverse order in which
6122 they were defined in
6127 they were defined in
6123
6128
6124 * Version 0.1.8 released, 0.1.9 opened for further work.
6129 * Version 0.1.8 released, 0.1.9 opened for further work.
6125
6130
6126 * Added magics pdef, source and file. They respectively show the
6131 * Added magics pdef, source and file. They respectively show the
6127 definition line ('prototype' in C), source code and full python
6132 definition line ('prototype' in C), source code and full python
6128 file for any callable object. The object inspector oinfo uses
6133 file for any callable object. The object inspector oinfo uses
6129 these to show the same information.
6134 these to show the same information.
6130
6135
6131 * Version 0.1.7 released, 0.1.8 opened for further work.
6136 * Version 0.1.7 released, 0.1.8 opened for further work.
6132
6137
6133 * Separated all the magic functions into a class called Magic. The
6138 * Separated all the magic functions into a class called Magic. The
6134 InteractiveShell class was becoming too big for Xemacs to handle
6139 InteractiveShell class was becoming too big for Xemacs to handle
6135 (de-indenting a line would lock it up for 10 seconds while it
6140 (de-indenting a line would lock it up for 10 seconds while it
6136 backtracked on the whole class!)
6141 backtracked on the whole class!)
6137
6142
6138 FIXME: didn't work. It can be done, but right now namespaces are
6143 FIXME: didn't work. It can be done, but right now namespaces are
6139 all messed up. Do it later (reverted it for now, so at least
6144 all messed up. Do it later (reverted it for now, so at least
6140 everything works as before).
6145 everything works as before).
6141
6146
6142 * Got the object introspection system (magic_oinfo) working! I
6147 * Got the object introspection system (magic_oinfo) working! I
6143 think this is pretty much ready for release to Janko, so he can
6148 think this is pretty much ready for release to Janko, so he can
6144 test it for a while and then announce it. Pretty much 100% of what
6149 test it for a while and then announce it. Pretty much 100% of what
6145 I wanted for the 'phase 1' release is ready. Happy, tired.
6150 I wanted for the 'phase 1' release is ready. Happy, tired.
6146
6151
6147 2001-11-12 Fernando Perez <fperez@colorado.edu>
6152 2001-11-12 Fernando Perez <fperez@colorado.edu>
6148
6153
6149 * Version 0.1.6 released, 0.1.7 opened for further work.
6154 * Version 0.1.6 released, 0.1.7 opened for further work.
6150
6155
6151 * Fixed bug in printing: it used to test for truth before
6156 * Fixed bug in printing: it used to test for truth before
6152 printing, so 0 wouldn't print. Now checks for None.
6157 printing, so 0 wouldn't print. Now checks for None.
6153
6158
6154 * Fixed bug where auto-execs increase the prompt counter by 2 (b/c
6159 * Fixed bug where auto-execs increase the prompt counter by 2 (b/c
6155 they have to call len(str(sys.ps1)) ). But the fix is ugly, it
6160 they have to call len(str(sys.ps1)) ). But the fix is ugly, it
6156 reaches by hand into the outputcache. Think of a better way to do
6161 reaches by hand into the outputcache. Think of a better way to do
6157 this later.
6162 this later.
6158
6163
6159 * Various small fixes thanks to Nathan's comments.
6164 * Various small fixes thanks to Nathan's comments.
6160
6165
6161 * Changed magic_pprint to magic_Pprint. This way it doesn't
6166 * Changed magic_pprint to magic_Pprint. This way it doesn't
6162 collide with pprint() and the name is consistent with the command
6167 collide with pprint() and the name is consistent with the command
6163 line option.
6168 line option.
6164
6169
6165 * Changed prompt counter behavior to be fully like
6170 * Changed prompt counter behavior to be fully like
6166 Mathematica's. That is, even input that doesn't return a result
6171 Mathematica's. That is, even input that doesn't return a result
6167 raises the prompt counter. The old behavior was kind of confusing
6172 raises the prompt counter. The old behavior was kind of confusing
6168 (getting the same prompt number several times if the operation
6173 (getting the same prompt number several times if the operation
6169 didn't return a result).
6174 didn't return a result).
6170
6175
6171 * Fixed Nathan's last name in a couple of places (Gray, not Graham).
6176 * Fixed Nathan's last name in a couple of places (Gray, not Graham).
6172
6177
6173 * Fixed -Classic mode (wasn't working anymore).
6178 * Fixed -Classic mode (wasn't working anymore).
6174
6179
6175 * Added colored prompts using Nathan's new code. Colors are
6180 * Added colored prompts using Nathan's new code. Colors are
6176 currently hardwired, they can be user-configurable. For
6181 currently hardwired, they can be user-configurable. For
6177 developers, they can be chosen in file ipythonlib.py, at the
6182 developers, they can be chosen in file ipythonlib.py, at the
6178 beginning of the CachedOutput class def.
6183 beginning of the CachedOutput class def.
6179
6184
6180 2001-11-11 Fernando Perez <fperez@colorado.edu>
6185 2001-11-11 Fernando Perez <fperez@colorado.edu>
6181
6186
6182 * Version 0.1.5 released, 0.1.6 opened for further work.
6187 * Version 0.1.5 released, 0.1.6 opened for further work.
6183
6188
6184 * Changed magic_env to *return* the environment as a dict (not to
6189 * Changed magic_env to *return* the environment as a dict (not to
6185 print it). This way it prints, but it can also be processed.
6190 print it). This way it prints, but it can also be processed.
6186
6191
6187 * Added Verbose exception reporting to interactive
6192 * Added Verbose exception reporting to interactive
6188 exceptions. Very nice, now even 1/0 at the prompt gives a verbose
6193 exceptions. Very nice, now even 1/0 at the prompt gives a verbose
6189 traceback. Had to make some changes to the ultraTB file. This is
6194 traceback. Had to make some changes to the ultraTB file. This is
6190 probably the last 'big' thing in my mental todo list. This ties
6195 probably the last 'big' thing in my mental todo list. This ties
6191 in with the next entry:
6196 in with the next entry:
6192
6197
6193 * Changed -Xi and -Xf to a single -xmode option. Now all the user
6198 * Changed -Xi and -Xf to a single -xmode option. Now all the user
6194 has to specify is Plain, Color or Verbose for all exception
6199 has to specify is Plain, Color or Verbose for all exception
6195 handling.
6200 handling.
6196
6201
6197 * Removed ShellServices option. All this can really be done via
6202 * Removed ShellServices option. All this can really be done via
6198 the magic system. It's easier to extend, cleaner and has automatic
6203 the magic system. It's easier to extend, cleaner and has automatic
6199 namespace protection and documentation.
6204 namespace protection and documentation.
6200
6205
6201 2001-11-09 Fernando Perez <fperez@colorado.edu>
6206 2001-11-09 Fernando Perez <fperez@colorado.edu>
6202
6207
6203 * Fixed bug in output cache flushing (missing parameter to
6208 * Fixed bug in output cache flushing (missing parameter to
6204 __init__). Other small bugs fixed (found using pychecker).
6209 __init__). Other small bugs fixed (found using pychecker).
6205
6210
6206 * Version 0.1.4 opened for bugfixing.
6211 * Version 0.1.4 opened for bugfixing.
6207
6212
6208 2001-11-07 Fernando Perez <fperez@colorado.edu>
6213 2001-11-07 Fernando Perez <fperez@colorado.edu>
6209
6214
6210 * Version 0.1.3 released, mainly because of the raw_input bug.
6215 * Version 0.1.3 released, mainly because of the raw_input bug.
6211
6216
6212 * Fixed NASTY bug in raw_input: input line wasn't properly parsed
6217 * Fixed NASTY bug in raw_input: input line wasn't properly parsed
6213 and when testing for whether things were callable, a call could
6218 and when testing for whether things were callable, a call could
6214 actually be made to certain functions. They would get called again
6219 actually be made to certain functions. They would get called again
6215 once 'really' executed, with a resulting double call. A disaster
6220 once 'really' executed, with a resulting double call. A disaster
6216 in many cases (list.reverse() would never work!).
6221 in many cases (list.reverse() would never work!).
6217
6222
6218 * Removed prefilter() function, moved its code to raw_input (which
6223 * Removed prefilter() function, moved its code to raw_input (which
6219 after all was just a near-empty caller for prefilter). This saves
6224 after all was just a near-empty caller for prefilter). This saves
6220 a function call on every prompt, and simplifies the class a tiny bit.
6225 a function call on every prompt, and simplifies the class a tiny bit.
6221
6226
6222 * Fix _ip to __ip name in magic example file.
6227 * Fix _ip to __ip name in magic example file.
6223
6228
6224 * Changed 'tar -x -f' to 'tar xvf' in auto-installer. This should
6229 * Changed 'tar -x -f' to 'tar xvf' in auto-installer. This should
6225 work with non-gnu versions of tar.
6230 work with non-gnu versions of tar.
6226
6231
6227 2001-11-06 Fernando Perez <fperez@colorado.edu>
6232 2001-11-06 Fernando Perez <fperez@colorado.edu>
6228
6233
6229 * Version 0.1.2. Just to keep track of the recent changes.
6234 * Version 0.1.2. Just to keep track of the recent changes.
6230
6235
6231 * Fixed nasty bug in output prompt routine. It used to check 'if
6236 * Fixed nasty bug in output prompt routine. It used to check 'if
6232 arg != None...'. Problem is, this fails if arg implements a
6237 arg != None...'. Problem is, this fails if arg implements a
6233 special comparison (__cmp__) which disallows comparing to
6238 special comparison (__cmp__) which disallows comparing to
6234 None. Found it when trying to use the PhysicalQuantity module from
6239 None. Found it when trying to use the PhysicalQuantity module from
6235 ScientificPython.
6240 ScientificPython.
6236
6241
6237 2001-11-05 Fernando Perez <fperez@colorado.edu>
6242 2001-11-05 Fernando Perez <fperez@colorado.edu>
6238
6243
6239 * Also added dirs. Now the pushd/popd/dirs family functions
6244 * Also added dirs. Now the pushd/popd/dirs family functions
6240 basically like the shell, with the added convenience of going home
6245 basically like the shell, with the added convenience of going home
6241 when called with no args.
6246 when called with no args.
6242
6247
6243 * pushd/popd slightly modified to mimic shell behavior more
6248 * pushd/popd slightly modified to mimic shell behavior more
6244 closely.
6249 closely.
6245
6250
6246 * Added env,pushd,popd from ShellServices as magic functions. I
6251 * Added env,pushd,popd from ShellServices as magic functions. I
6247 think the cleanest will be to port all desired functions from
6252 think the cleanest will be to port all desired functions from
6248 ShellServices as magics and remove ShellServices altogether. This
6253 ShellServices as magics and remove ShellServices altogether. This
6249 will provide a single, clean way of adding functionality
6254 will provide a single, clean way of adding functionality
6250 (shell-type or otherwise) to IP.
6255 (shell-type or otherwise) to IP.
6251
6256
6252 2001-11-04 Fernando Perez <fperez@colorado.edu>
6257 2001-11-04 Fernando Perez <fperez@colorado.edu>
6253
6258
6254 * Added .ipython/ directory to sys.path. This way users can keep
6259 * Added .ipython/ directory to sys.path. This way users can keep
6255 customizations there and access them via import.
6260 customizations there and access them via import.
6256
6261
6257 2001-11-03 Fernando Perez <fperez@colorado.edu>
6262 2001-11-03 Fernando Perez <fperez@colorado.edu>
6258
6263
6259 * Opened version 0.1.1 for new changes.
6264 * Opened version 0.1.1 for new changes.
6260
6265
6261 * Changed version number to 0.1.0: first 'public' release, sent to
6266 * Changed version number to 0.1.0: first 'public' release, sent to
6262 Nathan and Janko.
6267 Nathan and Janko.
6263
6268
6264 * Lots of small fixes and tweaks.
6269 * Lots of small fixes and tweaks.
6265
6270
6266 * Minor changes to whos format. Now strings are shown, snipped if
6271 * Minor changes to whos format. Now strings are shown, snipped if
6267 too long.
6272 too long.
6268
6273
6269 * Changed ShellServices to work on __main__ so they show up in @who
6274 * Changed ShellServices to work on __main__ so they show up in @who
6270
6275
6271 * Help also works with ? at the end of a line:
6276 * Help also works with ? at the end of a line:
6272 ?sin and sin?
6277 ?sin and sin?
6273 both produce the same effect. This is nice, as often I use the
6278 both produce the same effect. This is nice, as often I use the
6274 tab-complete to find the name of a method, but I used to then have
6279 tab-complete to find the name of a method, but I used to then have
6275 to go to the beginning of the line to put a ? if I wanted more
6280 to go to the beginning of the line to put a ? if I wanted more
6276 info. Now I can just add the ? and hit return. Convenient.
6281 info. Now I can just add the ? and hit return. Convenient.
6277
6282
6278 2001-11-02 Fernando Perez <fperez@colorado.edu>
6283 2001-11-02 Fernando Perez <fperez@colorado.edu>
6279
6284
6280 * Python version check (>=2.1) added.
6285 * Python version check (>=2.1) added.
6281
6286
6282 * Added LazyPython documentation. At this point the docs are quite
6287 * Added LazyPython documentation. At this point the docs are quite
6283 a mess. A cleanup is in order.
6288 a mess. A cleanup is in order.
6284
6289
6285 * Auto-installer created. For some bizarre reason, the zipfiles
6290 * Auto-installer created. For some bizarre reason, the zipfiles
6286 module isn't working on my system. So I made a tar version
6291 module isn't working on my system. So I made a tar version
6287 (hopefully the command line options in various systems won't kill
6292 (hopefully the command line options in various systems won't kill
6288 me).
6293 me).
6289
6294
6290 * Fixes to Struct in genutils. Now all dictionary-like methods are
6295 * Fixes to Struct in genutils. Now all dictionary-like methods are
6291 protected (reasonably).
6296 protected (reasonably).
6292
6297
6293 * Added pager function to genutils and changed ? to print usage
6298 * Added pager function to genutils and changed ? to print usage
6294 note through it (it was too long).
6299 note through it (it was too long).
6295
6300
6296 * Added the LazyPython functionality. Works great! I changed the
6301 * Added the LazyPython functionality. Works great! I changed the
6297 auto-quote escape to ';', it's on home row and next to '. But
6302 auto-quote escape to ';', it's on home row and next to '. But
6298 both auto-quote and auto-paren (still /) escapes are command-line
6303 both auto-quote and auto-paren (still /) escapes are command-line
6299 parameters.
6304 parameters.
6300
6305
6301
6306
6302 2001-11-01 Fernando Perez <fperez@colorado.edu>
6307 2001-11-01 Fernando Perez <fperez@colorado.edu>
6303
6308
6304 * Version changed to 0.0.7. Fairly large change: configuration now
6309 * Version changed to 0.0.7. Fairly large change: configuration now
6305 is all stored in a directory, by default .ipython. There, all
6310 is all stored in a directory, by default .ipython. There, all
6306 config files have normal looking names (not .names)
6311 config files have normal looking names (not .names)
6307
6312
6308 * Version 0.0.6 Released first to Lucas and Archie as a test
6313 * Version 0.0.6 Released first to Lucas and Archie as a test
6309 run. Since it's the first 'semi-public' release, change version to
6314 run. Since it's the first 'semi-public' release, change version to
6310 > 0.0.6 for any changes now.
6315 > 0.0.6 for any changes now.
6311
6316
6312 * Stuff I had put in the ipplib.py changelog:
6317 * Stuff I had put in the ipplib.py changelog:
6313
6318
6314 Changes to InteractiveShell:
6319 Changes to InteractiveShell:
6315
6320
6316 - Made the usage message a parameter.
6321 - Made the usage message a parameter.
6317
6322
6318 - Require the name of the shell variable to be given. It's a bit
6323 - Require the name of the shell variable to be given. It's a bit
6319 of a hack, but allows the name 'shell' not to be hardwired in the
6324 of a hack, but allows the name 'shell' not to be hardwired in the
6320 magic (@) handler, which is problematic b/c it requires
6325 magic (@) handler, which is problematic b/c it requires
6321 polluting the global namespace with 'shell'. This in turn is
6326 polluting the global namespace with 'shell'. This in turn is
6322 fragile: if a user redefines a variable called shell, things
6327 fragile: if a user redefines a variable called shell, things
6323 break.
6328 break.
6324
6329
6325 - magic @: all functions available through @ need to be defined
6330 - magic @: all functions available through @ need to be defined
6326 as magic_<name>, even though they can be called simply as
6331 as magic_<name>, even though they can be called simply as
6327 @<name>. This allows the special command @magic to gather
6332 @<name>. This allows the special command @magic to gather
6328 information automatically about all existing magic functions,
6333 information automatically about all existing magic functions,
6329 even if they are run-time user extensions, by parsing the shell
6334 even if they are run-time user extensions, by parsing the shell
6330 instance __dict__ looking for special magic_ names.
6335 instance __dict__ looking for special magic_ names.
6331
6336
6332 - mainloop: added *two* local namespace parameters. This allows
6337 - mainloop: added *two* local namespace parameters. This allows
6333 the class to differentiate between parameters which were there
6338 the class to differentiate between parameters which were there
6334 before and after command line initialization was processed. This
6339 before and after command line initialization was processed. This
6335 way, later @who can show things loaded at startup by the
6340 way, later @who can show things loaded at startup by the
6336 user. This trick was necessary to make session saving/reloading
6341 user. This trick was necessary to make session saving/reloading
6337 really work: ideally after saving/exiting/reloading a session,
6342 really work: ideally after saving/exiting/reloading a session,
6338 *everything* should look the same, including the output of @who. I
6343 *everything* should look the same, including the output of @who. I
6339 was only able to make this work with this double namespace
6344 was only able to make this work with this double namespace
6340 trick.
6345 trick.
6341
6346
6342 - added a header to the logfile which allows (almost) full
6347 - added a header to the logfile which allows (almost) full
6343 session restoring.
6348 session restoring.
6344
6349
6345 - prepend lines beginning with @ or !, with a and log
6350 - prepend lines beginning with @ or !, with a and log
6346 them. Why? !lines: may be useful to know what you did @lines:
6351 them. Why? !lines: may be useful to know what you did @lines:
6347 they may affect session state. So when restoring a session, at
6352 they may affect session state. So when restoring a session, at
6348 least inform the user of their presence. I couldn't quite get
6353 least inform the user of their presence. I couldn't quite get
6349 them to properly re-execute, but at least the user is warned.
6354 them to properly re-execute, but at least the user is warned.
6350
6355
6351 * Started ChangeLog.
6356 * Started ChangeLog.
General Comments 0
You need to be logged in to leave comments. Login now