##// END OF EJS Templates
Fix GTK timer/idle problems, finally.
fperez -
Show More

The requested changes are too big and content was truncated. Show full diff

@@ -1,76 +1,76 b''
1 # -*- coding: utf-8 -*-
1 # -*- coding: utf-8 -*-
2 """Release data for the IPython project.
2 """Release data for the IPython project.
3
3
4 $Id: Release.py 1000 2006-01-10 08:06:04Z fperez $"""
4 $Id: Release.py 1002 2006-01-11 22:18:29Z fperez $"""
5
5
6 #*****************************************************************************
6 #*****************************************************************************
7 # Copyright (C) 2001-2006 Fernando Perez <fperez@colorado.edu>
7 # Copyright (C) 2001-2006 Fernando Perez <fperez@colorado.edu>
8 #
8 #
9 # Copyright (c) 2001 Janko Hauser <jhauser@zscout.de> and Nathaniel Gray
9 # Copyright (c) 2001 Janko Hauser <jhauser@zscout.de> and Nathaniel Gray
10 # <n8gray@caltech.edu>
10 # <n8gray@caltech.edu>
11 #
11 #
12 # Distributed under the terms of the BSD License. The full license is in
12 # Distributed under the terms of the BSD License. The full license is in
13 # the file COPYING, distributed as part of this software.
13 # the file COPYING, distributed as part of this software.
14 #*****************************************************************************
14 #*****************************************************************************
15
15
16 # Name of the package for release purposes. This is the name which labels
16 # Name of the package for release purposes. This is the name which labels
17 # the tarballs and RPMs made by distutils, so it's best to lowercase it.
17 # the tarballs and RPMs made by distutils, so it's best to lowercase it.
18 name = 'ipython'
18 name = 'ipython'
19
19
20 # For versions with substrings (like 0.6.16.svn), use an extra . to separate
20 # For versions with substrings (like 0.6.16.svn), use an extra . to separate
21 # the new substring. We have to avoid using either dashes or underscores,
21 # the new substring. We have to avoid using either dashes or underscores,
22 # because bdist_rpm does not accept dashes (an RPM) convention, and
22 # because bdist_rpm does not accept dashes (an RPM) convention, and
23 # bdist_deb does not accept underscores (a Debian convention).
23 # bdist_deb does not accept underscores (a Debian convention).
24
24
25 version = '0.7.0'
25 version = '0.7.1.svn'
26
26
27 revision = '$Revision: 1000 $'
27 revision = '$Revision: 1002 $'
28
28
29 description = "An enhanced interactive Python shell."
29 description = "An enhanced interactive Python shell."
30
30
31 long_description = \
31 long_description = \
32 """
32 """
33 IPython provides a replacement for the interactive Python interpreter with
33 IPython provides a replacement for the interactive Python interpreter with
34 extra functionality.
34 extra functionality.
35
35
36 Main features:
36 Main features:
37
37
38 * Comprehensive object introspection.
38 * Comprehensive object introspection.
39
39
40 * Input history, persistent across sessions.
40 * Input history, persistent across sessions.
41
41
42 * Caching of output results during a session with automatically generated
42 * Caching of output results during a session with automatically generated
43 references.
43 references.
44
44
45 * Readline based name completion.
45 * Readline based name completion.
46
46
47 * Extensible system of 'magic' commands for controlling the environment and
47 * Extensible system of 'magic' commands for controlling the environment and
48 performing many tasks related either to IPython or the operating system.
48 performing many tasks related either to IPython or the operating system.
49
49
50 * Configuration system with easy switching between different setups (simpler
50 * Configuration system with easy switching between different setups (simpler
51 than changing $PYTHONSTARTUP environment variables every time).
51 than changing $PYTHONSTARTUP environment variables every time).
52
52
53 * Session logging and reloading.
53 * Session logging and reloading.
54
54
55 * Extensible syntax processing for special purpose situations.
55 * Extensible syntax processing for special purpose situations.
56
56
57 * Access to the system shell with user-extensible alias system.
57 * Access to the system shell with user-extensible alias system.
58
58
59 * Easily embeddable in other Python programs.
59 * Easily embeddable in other Python programs.
60
60
61 * Integrated access to the pdb debugger and the Python profiler. """
61 * Integrated access to the pdb debugger and the Python profiler. """
62
62
63 license = 'BSD'
63 license = 'BSD'
64
64
65 authors = {'Fernando' : ('Fernando Perez','fperez@colorado.edu'),
65 authors = {'Fernando' : ('Fernando Perez','fperez@colorado.edu'),
66 'Janko' : ('Janko Hauser','jhauser@zscout.de'),
66 'Janko' : ('Janko Hauser','jhauser@zscout.de'),
67 'Nathan' : ('Nathaniel Gray','n8gray@caltech.edu')
67 'Nathan' : ('Nathaniel Gray','n8gray@caltech.edu')
68 }
68 }
69
69
70 url = 'http://ipython.scipy.org'
70 url = 'http://ipython.scipy.org'
71
71
72 download_url = 'http://ipython.scipy.org/dist'
72 download_url = 'http://ipython.scipy.org/dist'
73
73
74 platforms = ['Linux','Mac OSX','Windows XP/2000/NT','Windows 95/98/ME']
74 platforms = ['Linux','Mac OSX','Windows XP/2000/NT','Windows 95/98/ME']
75
75
76 keywords = ['Interactive','Interpreter','Shell']
76 keywords = ['Interactive','Interpreter','Shell']
@@ -1,933 +1,939 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 998 2006-01-09 06:57:40Z fperez $"""
7 $Id: Shell.py 1002 2006-01-11 22:18:29Z 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 __main__
21 import __main__
22 import __builtin__
22 import __builtin__
23 import os
23 import os
24 import sys
24 import sys
25 import signal
25 import signal
26 import time
26 import threading
27 import threading
27
28
28 import IPython
29 import IPython
29 from IPython import ultraTB
30 from IPython import ultraTB
30 from IPython.genutils import Term,warn,error,flag_calls
31 from IPython.genutils import Term,warn,error,flag_calls
31 from IPython.iplib import InteractiveShell
32 from IPython.iplib import InteractiveShell
32 from IPython.ipmaker import make_IPython
33 from IPython.ipmaker import make_IPython
33 from IPython.Magic import Magic
34 from IPython.Magic import Magic
34 from IPython.Struct import Struct
35 from IPython.Struct import Struct
35
36
36 # global flag to pass around information about Ctrl-C without exceptions
37 # global flag to pass around information about Ctrl-C without exceptions
37 KBINT = False
38 KBINT = False
38
39
39 # global flag to turn on/off Tk support.
40 # global flag to turn on/off Tk support.
40 USE_TK = False
41 USE_TK = False
41
42
42 #-----------------------------------------------------------------------------
43 #-----------------------------------------------------------------------------
43 # This class is trivial now, but I want to have it in to publish a clean
44 # This class is trivial now, but I want to have it in to publish a clean
44 # interface. Later when the internals are reorganized, code that uses this
45 # interface. Later when the internals are reorganized, code that uses this
45 # shouldn't have to change.
46 # shouldn't have to change.
46
47
47 class IPShell:
48 class IPShell:
48 """Create an IPython instance."""
49 """Create an IPython instance."""
49
50
50 def __init__(self,argv=None,user_ns=None,user_global_ns=None,
51 def __init__(self,argv=None,user_ns=None,user_global_ns=None,
51 debug=1,shell_class=InteractiveShell):
52 debug=1,shell_class=InteractiveShell):
52 self.IP = make_IPython(argv,user_ns=user_ns,user_global_ns=user_global_ns,
53 self.IP = make_IPython(argv,user_ns=user_ns,user_global_ns=user_global_ns,
53 debug=debug,shell_class=shell_class)
54 debug=debug,shell_class=shell_class)
54
55
55 def mainloop(self,sys_exit=0,banner=None):
56 def mainloop(self,sys_exit=0,banner=None):
56 self.IP.mainloop(banner)
57 self.IP.mainloop(banner)
57 if sys_exit:
58 if sys_exit:
58 sys.exit()
59 sys.exit()
59
60
60 #-----------------------------------------------------------------------------
61 #-----------------------------------------------------------------------------
61 class IPShellEmbed:
62 class IPShellEmbed:
62 """Allow embedding an IPython shell into a running program.
63 """Allow embedding an IPython shell into a running program.
63
64
64 Instances of this class are callable, with the __call__ method being an
65 Instances of this class are callable, with the __call__ method being an
65 alias to the embed() method of an InteractiveShell instance.
66 alias to the embed() method of an InteractiveShell instance.
66
67
67 Usage (see also the example-embed.py file for a running example):
68 Usage (see also the example-embed.py file for a running example):
68
69
69 ipshell = IPShellEmbed([argv,banner,exit_msg,rc_override])
70 ipshell = IPShellEmbed([argv,banner,exit_msg,rc_override])
70
71
71 - argv: list containing valid command-line options for IPython, as they
72 - argv: list containing valid command-line options for IPython, as they
72 would appear in sys.argv[1:].
73 would appear in sys.argv[1:].
73
74
74 For example, the following command-line options:
75 For example, the following command-line options:
75
76
76 $ ipython -prompt_in1 'Input <\\#>' -colors LightBG
77 $ ipython -prompt_in1 'Input <\\#>' -colors LightBG
77
78
78 would be passed in the argv list as:
79 would be passed in the argv list as:
79
80
80 ['-prompt_in1','Input <\\#>','-colors','LightBG']
81 ['-prompt_in1','Input <\\#>','-colors','LightBG']
81
82
82 - banner: string which gets printed every time the interpreter starts.
83 - banner: string which gets printed every time the interpreter starts.
83
84
84 - exit_msg: string which gets printed every time the interpreter exits.
85 - exit_msg: string which gets printed every time the interpreter exits.
85
86
86 - rc_override: a dict or Struct of configuration options such as those
87 - rc_override: a dict or Struct of configuration options such as those
87 used by IPython. These options are read from your ~/.ipython/ipythonrc
88 used by IPython. These options are read from your ~/.ipython/ipythonrc
88 file when the Shell object is created. Passing an explicit rc_override
89 file when the Shell object is created. Passing an explicit rc_override
89 dict with any options you want allows you to override those values at
90 dict with any options you want allows you to override those values at
90 creation time without having to modify the file. This way you can create
91 creation time without having to modify the file. This way you can create
91 embeddable instances configured in any way you want without editing any
92 embeddable instances configured in any way you want without editing any
92 global files (thus keeping your interactive IPython configuration
93 global files (thus keeping your interactive IPython configuration
93 unchanged).
94 unchanged).
94
95
95 Then the ipshell instance can be called anywhere inside your code:
96 Then the ipshell instance can be called anywhere inside your code:
96
97
97 ipshell(header='') -> Opens up an IPython shell.
98 ipshell(header='') -> Opens up an IPython shell.
98
99
99 - header: string printed by the IPython shell upon startup. This can let
100 - header: string printed by the IPython shell upon startup. This can let
100 you know where in your code you are when dropping into the shell. Note
101 you know where in your code you are when dropping into the shell. Note
101 that 'banner' gets prepended to all calls, so header is used for
102 that 'banner' gets prepended to all calls, so header is used for
102 location-specific information.
103 location-specific information.
103
104
104 For more details, see the __call__ method below.
105 For more details, see the __call__ method below.
105
106
106 When the IPython shell is exited with Ctrl-D, normal program execution
107 When the IPython shell is exited with Ctrl-D, normal program execution
107 resumes.
108 resumes.
108
109
109 This functionality was inspired by a posting on comp.lang.python by cmkl
110 This functionality was inspired by a posting on comp.lang.python by cmkl
110 <cmkleffner@gmx.de> on Dec. 06/01 concerning similar uses of pyrepl, and
111 <cmkleffner@gmx.de> on Dec. 06/01 concerning similar uses of pyrepl, and
111 by the IDL stop/continue commands."""
112 by the IDL stop/continue commands."""
112
113
113 def __init__(self,argv=None,banner='',exit_msg=None,rc_override=None):
114 def __init__(self,argv=None,banner='',exit_msg=None,rc_override=None):
114 """Note that argv here is a string, NOT a list."""
115 """Note that argv here is a string, NOT a list."""
115 self.set_banner(banner)
116 self.set_banner(banner)
116 self.set_exit_msg(exit_msg)
117 self.set_exit_msg(exit_msg)
117 self.set_dummy_mode(0)
118 self.set_dummy_mode(0)
118
119
119 # sys.displayhook is a global, we need to save the user's original
120 # sys.displayhook is a global, we need to save the user's original
120 # Don't rely on __displayhook__, as the user may have changed that.
121 # Don't rely on __displayhook__, as the user may have changed that.
121 self.sys_displayhook_ori = sys.displayhook
122 self.sys_displayhook_ori = sys.displayhook
122
123
123 # save readline completer status
124 # save readline completer status
124 try:
125 try:
125 #print 'Save completer',sys.ipcompleter # dbg
126 #print 'Save completer',sys.ipcompleter # dbg
126 self.sys_ipcompleter_ori = sys.ipcompleter
127 self.sys_ipcompleter_ori = sys.ipcompleter
127 except:
128 except:
128 pass # not nested with IPython
129 pass # not nested with IPython
129
130
130 # FIXME. Passing user_ns breaks namespace handling.
131 # FIXME. Passing user_ns breaks namespace handling.
131 #self.IP = make_IPython(argv,user_ns=__main__.__dict__)
132 #self.IP = make_IPython(argv,user_ns=__main__.__dict__)
132 self.IP = make_IPython(argv,rc_override=rc_override,embedded=True)
133 self.IP = make_IPython(argv,rc_override=rc_override,embedded=True)
133
134
134 # copy our own displayhook also
135 # copy our own displayhook also
135 self.sys_displayhook_embed = sys.displayhook
136 self.sys_displayhook_embed = sys.displayhook
136 # and leave the system's display hook clean
137 # and leave the system's display hook clean
137 sys.displayhook = self.sys_displayhook_ori
138 sys.displayhook = self.sys_displayhook_ori
138 # don't use the ipython crash handler so that user exceptions aren't
139 # don't use the ipython crash handler so that user exceptions aren't
139 # trapped
140 # trapped
140 sys.excepthook = ultraTB.FormattedTB(color_scheme = self.IP.rc.colors,
141 sys.excepthook = ultraTB.FormattedTB(color_scheme = self.IP.rc.colors,
141 mode = self.IP.rc.xmode,
142 mode = self.IP.rc.xmode,
142 call_pdb = self.IP.rc.pdb)
143 call_pdb = self.IP.rc.pdb)
143 self.restore_system_completer()
144 self.restore_system_completer()
144
145
145 def restore_system_completer(self):
146 def restore_system_completer(self):
146 """Restores the readline completer which was in place.
147 """Restores the readline completer which was in place.
147
148
148 This allows embedded IPython within IPython not to disrupt the
149 This allows embedded IPython within IPython not to disrupt the
149 parent's completion.
150 parent's completion.
150 """
151 """
151
152
152 try:
153 try:
153 self.IP.readline.set_completer(self.sys_ipcompleter_ori)
154 self.IP.readline.set_completer(self.sys_ipcompleter_ori)
154 sys.ipcompleter = self.sys_ipcompleter_ori
155 sys.ipcompleter = self.sys_ipcompleter_ori
155 except:
156 except:
156 pass
157 pass
157
158
158 def __call__(self,header='',local_ns=None,global_ns=None,dummy=None):
159 def __call__(self,header='',local_ns=None,global_ns=None,dummy=None):
159 """Activate the interactive interpreter.
160 """Activate the interactive interpreter.
160
161
161 __call__(self,header='',local_ns=None,global_ns,dummy=None) -> Start
162 __call__(self,header='',local_ns=None,global_ns,dummy=None) -> Start
162 the interpreter shell with the given local and global namespaces, and
163 the interpreter shell with the given local and global namespaces, and
163 optionally print a header string at startup.
164 optionally print a header string at startup.
164
165
165 The shell can be globally activated/deactivated using the
166 The shell can be globally activated/deactivated using the
166 set/get_dummy_mode methods. This allows you to turn off a shell used
167 set/get_dummy_mode methods. This allows you to turn off a shell used
167 for debugging globally.
168 for debugging globally.
168
169
169 However, *each* time you call the shell you can override the current
170 However, *each* time you call the shell you can override the current
170 state of dummy_mode with the optional keyword parameter 'dummy'. For
171 state of dummy_mode with the optional keyword parameter 'dummy'. For
171 example, if you set dummy mode on with IPShell.set_dummy_mode(1), you
172 example, if you set dummy mode on with IPShell.set_dummy_mode(1), you
172 can still have a specific call work by making it as IPShell(dummy=0).
173 can still have a specific call work by making it as IPShell(dummy=0).
173
174
174 The optional keyword parameter dummy controls whether the call
175 The optional keyword parameter dummy controls whether the call
175 actually does anything. """
176 actually does anything. """
176
177
177 # Allow the dummy parameter to override the global __dummy_mode
178 # Allow the dummy parameter to override the global __dummy_mode
178 if dummy or (dummy != 0 and self.__dummy_mode):
179 if dummy or (dummy != 0 and self.__dummy_mode):
179 return
180 return
180
181
181 # Set global subsystems (display,completions) to our values
182 # Set global subsystems (display,completions) to our values
182 sys.displayhook = self.sys_displayhook_embed
183 sys.displayhook = self.sys_displayhook_embed
183 if self.IP.has_readline:
184 if self.IP.has_readline:
184 self.IP.readline.set_completer(self.IP.Completer.complete)
185 self.IP.readline.set_completer(self.IP.Completer.complete)
185
186
186 if self.banner and header:
187 if self.banner and header:
187 format = '%s\n%s\n'
188 format = '%s\n%s\n'
188 else:
189 else:
189 format = '%s%s\n'
190 format = '%s%s\n'
190 banner = format % (self.banner,header)
191 banner = format % (self.banner,header)
191
192
192 # Call the embedding code with a stack depth of 1 so it can skip over
193 # Call the embedding code with a stack depth of 1 so it can skip over
193 # our call and get the original caller's namespaces.
194 # our call and get the original caller's namespaces.
194 self.IP.embed_mainloop(banner,local_ns,global_ns,stack_depth=1)
195 self.IP.embed_mainloop(banner,local_ns,global_ns,stack_depth=1)
195
196
196 if self.exit_msg:
197 if self.exit_msg:
197 print self.exit_msg
198 print self.exit_msg
198
199
199 # Restore global systems (display, completion)
200 # Restore global systems (display, completion)
200 sys.displayhook = self.sys_displayhook_ori
201 sys.displayhook = self.sys_displayhook_ori
201 self.restore_system_completer()
202 self.restore_system_completer()
202
203
203 def set_dummy_mode(self,dummy):
204 def set_dummy_mode(self,dummy):
204 """Sets the embeddable shell's dummy mode parameter.
205 """Sets the embeddable shell's dummy mode parameter.
205
206
206 set_dummy_mode(dummy): dummy = 0 or 1.
207 set_dummy_mode(dummy): dummy = 0 or 1.
207
208
208 This parameter is persistent and makes calls to the embeddable shell
209 This parameter is persistent and makes calls to the embeddable shell
209 silently return without performing any action. This allows you to
210 silently return without performing any action. This allows you to
210 globally activate or deactivate a shell you're using with a single call.
211 globally activate or deactivate a shell you're using with a single call.
211
212
212 If you need to manually"""
213 If you need to manually"""
213
214
214 if dummy not in [0,1,False,True]:
215 if dummy not in [0,1,False,True]:
215 raise ValueError,'dummy parameter must be boolean'
216 raise ValueError,'dummy parameter must be boolean'
216 self.__dummy_mode = dummy
217 self.__dummy_mode = dummy
217
218
218 def get_dummy_mode(self):
219 def get_dummy_mode(self):
219 """Return the current value of the dummy mode parameter.
220 """Return the current value of the dummy mode parameter.
220 """
221 """
221 return self.__dummy_mode
222 return self.__dummy_mode
222
223
223 def set_banner(self,banner):
224 def set_banner(self,banner):
224 """Sets the global banner.
225 """Sets the global banner.
225
226
226 This banner gets prepended to every header printed when the shell
227 This banner gets prepended to every header printed when the shell
227 instance is called."""
228 instance is called."""
228
229
229 self.banner = banner
230 self.banner = banner
230
231
231 def set_exit_msg(self,exit_msg):
232 def set_exit_msg(self,exit_msg):
232 """Sets the global exit_msg.
233 """Sets the global exit_msg.
233
234
234 This exit message gets printed upon exiting every time the embedded
235 This exit message gets printed upon exiting every time the embedded
235 shell is called. It is None by default. """
236 shell is called. It is None by default. """
236
237
237 self.exit_msg = exit_msg
238 self.exit_msg = exit_msg
238
239
239 #-----------------------------------------------------------------------------
240 #-----------------------------------------------------------------------------
240 def sigint_handler (signum,stack_frame):
241 def sigint_handler (signum,stack_frame):
241 """Sigint handler for threaded apps.
242 """Sigint handler for threaded apps.
242
243
243 This is a horrible hack to pass information about SIGINT _without_ using
244 This is a horrible hack to pass information about SIGINT _without_ using
244 exceptions, since I haven't been able to properly manage cross-thread
245 exceptions, since I haven't been able to properly manage cross-thread
245 exceptions in GTK/WX. In fact, I don't think it can be done (or at least
246 exceptions in GTK/WX. In fact, I don't think it can be done (or at least
246 that's my understanding from a c.l.py thread where this was discussed)."""
247 that's my understanding from a c.l.py thread where this was discussed)."""
247
248
248 global KBINT
249 global KBINT
249
250
250 print '\nKeyboardInterrupt - Press <Enter> to continue.',
251 print '\nKeyboardInterrupt - Press <Enter> to continue.',
251 Term.cout.flush()
252 Term.cout.flush()
252 # Set global flag so that runsource can know that Ctrl-C was hit
253 # Set global flag so that runsource can know that Ctrl-C was hit
253 KBINT = True
254 KBINT = True
254
255
255 class MTInteractiveShell(InteractiveShell):
256 class MTInteractiveShell(InteractiveShell):
256 """Simple multi-threaded shell."""
257 """Simple multi-threaded shell."""
257
258
258 # Threading strategy taken from:
259 # Threading strategy taken from:
259 # http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/65109, by Brian
260 # http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/65109, by Brian
260 # McErlean and John Finlay. Modified with corrections by Antoon Pardon,
261 # McErlean and John Finlay. Modified with corrections by Antoon Pardon,
261 # from the pygtk mailing list, to avoid lockups with system calls.
262 # from the pygtk mailing list, to avoid lockups with system calls.
262
263
263 # class attribute to indicate whether the class supports threads or not.
264 # class attribute to indicate whether the class supports threads or not.
264 # Subclasses with thread support should override this as needed.
265 # Subclasses with thread support should override this as needed.
265 isthreaded = True
266 isthreaded = True
266
267
267 def __init__(self,name,usage=None,rc=Struct(opts=None,args=None),
268 def __init__(self,name,usage=None,rc=Struct(opts=None,args=None),
268 user_ns=None,user_global_ns=None,banner2='',**kw):
269 user_ns=None,user_global_ns=None,banner2='',**kw):
269 """Similar to the normal InteractiveShell, but with threading control"""
270 """Similar to the normal InteractiveShell, but with threading control"""
270
271
271 InteractiveShell.__init__(self,name,usage,rc,user_ns,
272 InteractiveShell.__init__(self,name,usage,rc,user_ns,
272 user_global_ns,banner2)
273 user_global_ns,banner2)
273
274
274 # Locking control variable
275 # Locking control variable
275 self.thread_ready = threading.Condition()
276 self.thread_ready = threading.Condition()
276
277
277 # Stuff to do at closing time
278 # Stuff to do at closing time
278 self._kill = False
279 self._kill = False
279 on_kill = kw.get('on_kill')
280 on_kill = kw.get('on_kill')
280 if on_kill is None:
281 if on_kill is None:
281 on_kill = []
282 on_kill = []
282 # Check that all things to kill are callable:
283 # Check that all things to kill are callable:
283 for t in on_kill:
284 for t in on_kill:
284 if not callable(t):
285 if not callable(t):
285 raise TypeError,'on_kill must be a list of callables'
286 raise TypeError,'on_kill must be a list of callables'
286 self.on_kill = on_kill
287 self.on_kill = on_kill
287
288
288 def runsource(self, source, filename="<input>", symbol="single"):
289 def runsource(self, source, filename="<input>", symbol="single"):
289 """Compile and run some source in the interpreter.
290 """Compile and run some source in the interpreter.
290
291
291 Modified version of code.py's runsource(), to handle threading issues.
292 Modified version of code.py's runsource(), to handle threading issues.
292 See the original for full docstring details."""
293 See the original for full docstring details."""
293
294
294 global KBINT
295 global KBINT
295
296
296 # If Ctrl-C was typed, we reset the flag and return right away
297 # If Ctrl-C was typed, we reset the flag and return right away
297 if KBINT:
298 if KBINT:
298 KBINT = False
299 KBINT = False
299 return False
300 return False
300
301
301 try:
302 try:
302 code = self.compile(source, filename, symbol)
303 code = self.compile(source, filename, symbol)
303 except (OverflowError, SyntaxError, ValueError):
304 except (OverflowError, SyntaxError, ValueError):
304 # Case 1
305 # Case 1
305 self.showsyntaxerror(filename)
306 self.showsyntaxerror(filename)
306 return False
307 return False
307
308
308 if code is None:
309 if code is None:
309 # Case 2
310 # Case 2
310 return True
311 return True
311
312
312 # Case 3
313 # Case 3
313 # Store code in self, so the execution thread can handle it
314 # Store code in self, so the execution thread can handle it
314 self.thread_ready.acquire()
315 self.thread_ready.acquire()
315 self.code_to_run = code
316 self.code_to_run = code
316 self.thread_ready.wait() # Wait until processed in timeout interval
317 self.thread_ready.wait() # Wait until processed in timeout interval
317 self.thread_ready.release()
318 self.thread_ready.release()
318
319
319 return False
320 return False
320
321
321 def runcode(self):
322 def runcode(self):
322 """Execute a code object.
323 """Execute a code object.
323
324
324 Multithreaded wrapper around IPython's runcode()."""
325 Multithreaded wrapper around IPython's runcode()."""
325
326
326 # lock thread-protected stuff
327 # lock thread-protected stuff
327 self.thread_ready.acquire()
328 self.thread_ready.acquire()
328
329
329 # Install sigint handler
330 # Install sigint handler
330 try:
331 try:
331 signal.signal(signal.SIGINT, sigint_handler)
332 signal.signal(signal.SIGINT, sigint_handler)
332 except SystemError:
333 except SystemError:
333 # This happens under Windows, which seems to have all sorts
334 # This happens under Windows, which seems to have all sorts
334 # of problems with signal handling. Oh well...
335 # of problems with signal handling. Oh well...
335 pass
336 pass
336
337
337 if self._kill:
338 if self._kill:
338 print >>Term.cout, 'Closing threads...',
339 print >>Term.cout, 'Closing threads...',
339 Term.cout.flush()
340 Term.cout.flush()
340 for tokill in self.on_kill:
341 for tokill in self.on_kill:
341 tokill()
342 tokill()
342 print >>Term.cout, 'Done.'
343 print >>Term.cout, 'Done.'
343
344
344 # Run pending code by calling parent class
345 # Run pending code by calling parent class
345 if self.code_to_run is not None:
346 if self.code_to_run is not None:
346 self.thread_ready.notify()
347 self.thread_ready.notify()
347 InteractiveShell.runcode(self,self.code_to_run)
348 InteractiveShell.runcode(self,self.code_to_run)
348
349
349 # We're done with thread-protected variables
350 # We're done with thread-protected variables
350 self.thread_ready.release()
351 self.thread_ready.release()
351 # This MUST return true for gtk threading to work
352 # This MUST return true for gtk threading to work
352 return True
353 return True
353
354
354 def kill (self):
355 def kill (self):
355 """Kill the thread, returning when it has been shut down."""
356 """Kill the thread, returning when it has been shut down."""
356 self.thread_ready.acquire()
357 self.thread_ready.acquire()
357 self._kill = True
358 self._kill = True
358 self.thread_ready.release()
359 self.thread_ready.release()
359
360
360 class MatplotlibShellBase:
361 class MatplotlibShellBase:
361 """Mixin class to provide the necessary modifications to regular IPython
362 """Mixin class to provide the necessary modifications to regular IPython
362 shell classes for matplotlib support.
363 shell classes for matplotlib support.
363
364
364 Given Python's MRO, this should be used as the FIRST class in the
365 Given Python's MRO, this should be used as the FIRST class in the
365 inheritance hierarchy, so that it overrides the relevant methods."""
366 inheritance hierarchy, so that it overrides the relevant methods."""
366
367
367 def _matplotlib_config(self,name):
368 def _matplotlib_config(self,name):
368 """Return various items needed to setup the user's shell with matplotlib"""
369 """Return various items needed to setup the user's shell with matplotlib"""
369
370
370 # Initialize matplotlib to interactive mode always
371 # Initialize matplotlib to interactive mode always
371 import matplotlib
372 import matplotlib
372 from matplotlib import backends
373 from matplotlib import backends
373 matplotlib.interactive(True)
374 matplotlib.interactive(True)
374
375
375 def use(arg):
376 def use(arg):
376 """IPython wrapper for matplotlib's backend switcher.
377 """IPython wrapper for matplotlib's backend switcher.
377
378
378 In interactive use, we can not allow switching to a different
379 In interactive use, we can not allow switching to a different
379 interactive backend, since thread conflicts will most likely crash
380 interactive backend, since thread conflicts will most likely crash
380 the python interpreter. This routine does a safety check first,
381 the python interpreter. This routine does a safety check first,
381 and refuses to perform a dangerous switch. It still allows
382 and refuses to perform a dangerous switch. It still allows
382 switching to non-interactive backends."""
383 switching to non-interactive backends."""
383
384
384 if arg in backends.interactive_bk and arg != self.mpl_backend:
385 if arg in backends.interactive_bk and arg != self.mpl_backend:
385 m=('invalid matplotlib backend switch.\n'
386 m=('invalid matplotlib backend switch.\n'
386 'This script attempted to switch to the interactive '
387 'This script attempted to switch to the interactive '
387 'backend: `%s`\n'
388 'backend: `%s`\n'
388 'Your current choice of interactive backend is: `%s`\n\n'
389 'Your current choice of interactive backend is: `%s`\n\n'
389 'Switching interactive matplotlib backends at runtime\n'
390 'Switching interactive matplotlib backends at runtime\n'
390 'would crash the python interpreter, '
391 'would crash the python interpreter, '
391 'and IPython has blocked it.\n\n'
392 'and IPython has blocked it.\n\n'
392 'You need to either change your choice of matplotlib backend\n'
393 'You need to either change your choice of matplotlib backend\n'
393 'by editing your .matplotlibrc file, or run this script as a \n'
394 'by editing your .matplotlibrc file, or run this script as a \n'
394 'standalone file from the command line, not using IPython.\n' %
395 'standalone file from the command line, not using IPython.\n' %
395 (arg,self.mpl_backend) )
396 (arg,self.mpl_backend) )
396 raise RuntimeError, m
397 raise RuntimeError, m
397 else:
398 else:
398 self.mpl_use(arg)
399 self.mpl_use(arg)
399 self.mpl_use._called = True
400 self.mpl_use._called = True
400
401
401 self.matplotlib = matplotlib
402 self.matplotlib = matplotlib
402 self.mpl_backend = matplotlib.rcParams['backend']
403 self.mpl_backend = matplotlib.rcParams['backend']
403
404
404 # we also need to block switching of interactive backends by use()
405 # we also need to block switching of interactive backends by use()
405 self.mpl_use = matplotlib.use
406 self.mpl_use = matplotlib.use
406 self.mpl_use._called = False
407 self.mpl_use._called = False
407 # overwrite the original matplotlib.use with our wrapper
408 # overwrite the original matplotlib.use with our wrapper
408 matplotlib.use = use
409 matplotlib.use = use
409
410
410
411
411 # This must be imported last in the matplotlib series, after
412 # This must be imported last in the matplotlib series, after
412 # backend/interactivity choices have been made
413 # backend/interactivity choices have been made
413 try:
414 try:
414 import matplotlib.pylab as pylab
415 import matplotlib.pylab as pylab
415 self.pylab = pylab
416 self.pylab = pylab
416 self.pylab_name = 'pylab'
417 self.pylab_name = 'pylab'
417 except ImportError:
418 except ImportError:
418 import matplotlib.matlab as matlab
419 import matplotlib.matlab as matlab
419 self.pylab = matlab
420 self.pylab = matlab
420 self.pylab_name = 'matlab'
421 self.pylab_name = 'matlab'
421
422
422 self.pylab.show._needmain = False
423 self.pylab.show._needmain = False
423 # We need to detect at runtime whether show() is called by the user.
424 # We need to detect at runtime whether show() is called by the user.
424 # For this, we wrap it into a decorator which adds a 'called' flag.
425 # For this, we wrap it into a decorator which adds a 'called' flag.
425 self.pylab.draw_if_interactive = flag_calls(self.pylab.draw_if_interactive)
426 self.pylab.draw_if_interactive = flag_calls(self.pylab.draw_if_interactive)
426
427
427 # Build a user namespace initialized with matplotlib/matlab features.
428 # Build a user namespace initialized with matplotlib/matlab features.
428 user_ns = {'__name__':'__main__',
429 user_ns = {'__name__':'__main__',
429 '__builtins__' : __builtin__ }
430 '__builtins__' : __builtin__ }
430
431
431 # Be careful not to remove the final \n in the code string below, or
432 # Be careful not to remove the final \n in the code string below, or
432 # things will break badly with py22 (I think it's a python bug, 2.3 is
433 # things will break badly with py22 (I think it's a python bug, 2.3 is
433 # OK).
434 # OK).
434 pname = self.pylab_name # Python can't interpolate dotted var names
435 pname = self.pylab_name # Python can't interpolate dotted var names
435 exec ("import matplotlib\n"
436 exec ("import matplotlib\n"
436 "import matplotlib.%(pname)s as %(pname)s\n"
437 "import matplotlib.%(pname)s as %(pname)s\n"
437 "from matplotlib.%(pname)s import *\n" % locals()) in user_ns
438 "from matplotlib.%(pname)s import *\n" % locals()) in user_ns
438
439
439 # Build matplotlib info banner
440 # Build matplotlib info banner
440 b="""
441 b="""
441 Welcome to pylab, a matplotlib-based Python environment.
442 Welcome to pylab, a matplotlib-based Python environment.
442 For more information, type 'help(pylab)'.
443 For more information, type 'help(pylab)'.
443 """
444 """
444 return user_ns,b
445 return user_ns,b
445
446
446 def mplot_exec(self,fname,*where,**kw):
447 def mplot_exec(self,fname,*where,**kw):
447 """Execute a matplotlib script.
448 """Execute a matplotlib script.
448
449
449 This is a call to execfile(), but wrapped in safeties to properly
450 This is a call to execfile(), but wrapped in safeties to properly
450 handle interactive rendering and backend switching."""
451 handle interactive rendering and backend switching."""
451
452
452 #print '*** Matplotlib runner ***' # dbg
453 #print '*** Matplotlib runner ***' # dbg
453 # turn off rendering until end of script
454 # turn off rendering until end of script
454 isInteractive = self.matplotlib.rcParams['interactive']
455 isInteractive = self.matplotlib.rcParams['interactive']
455 self.matplotlib.interactive(False)
456 self.matplotlib.interactive(False)
456 self.safe_execfile(fname,*where,**kw)
457 self.safe_execfile(fname,*where,**kw)
457 self.matplotlib.interactive(isInteractive)
458 self.matplotlib.interactive(isInteractive)
458 # make rendering call now, if the user tried to do it
459 # make rendering call now, if the user tried to do it
459 if self.pylab.draw_if_interactive.called:
460 if self.pylab.draw_if_interactive.called:
460 self.pylab.draw()
461 self.pylab.draw()
461 self.pylab.draw_if_interactive.called = False
462 self.pylab.draw_if_interactive.called = False
462
463
463 # if a backend switch was performed, reverse it now
464 # if a backend switch was performed, reverse it now
464 if self.mpl_use._called:
465 if self.mpl_use._called:
465 self.matplotlib.rcParams['backend'] = self.mpl_backend
466 self.matplotlib.rcParams['backend'] = self.mpl_backend
466
467
467 def magic_run(self,parameter_s=''):
468 def magic_run(self,parameter_s=''):
468 Magic.magic_run(self,parameter_s,runner=self.mplot_exec)
469 Magic.magic_run(self,parameter_s,runner=self.mplot_exec)
469
470
470 # Fix the docstring so users see the original as well
471 # Fix the docstring so users see the original as well
471 magic_run.__doc__ = "%s\n%s" % (Magic.magic_run.__doc__,
472 magic_run.__doc__ = "%s\n%s" % (Magic.magic_run.__doc__,
472 "\n *** Modified %run for Matplotlib,"
473 "\n *** Modified %run for Matplotlib,"
473 " with proper interactive handling ***")
474 " with proper interactive handling ***")
474
475
475 # Now we provide 2 versions of a matplotlib-aware IPython base shells, single
476 # Now we provide 2 versions of a matplotlib-aware IPython base shells, single
476 # and multithreaded. Note that these are meant for internal use, the IPShell*
477 # and multithreaded. Note that these are meant for internal use, the IPShell*
477 # classes below are the ones meant for public consumption.
478 # classes below are the ones meant for public consumption.
478
479
479 class MatplotlibShell(MatplotlibShellBase,InteractiveShell):
480 class MatplotlibShell(MatplotlibShellBase,InteractiveShell):
480 """Single-threaded shell with matplotlib support."""
481 """Single-threaded shell with matplotlib support."""
481
482
482 def __init__(self,name,usage=None,rc=Struct(opts=None,args=None),
483 def __init__(self,name,usage=None,rc=Struct(opts=None,args=None),
483 user_ns=None,user_global_ns=None,**kw):
484 user_ns=None,user_global_ns=None,**kw):
484 user_ns,b2 = self._matplotlib_config(name)
485 user_ns,b2 = self._matplotlib_config(name)
485 InteractiveShell.__init__(self,name,usage,rc,user_ns,user_global_ns,
486 InteractiveShell.__init__(self,name,usage,rc,user_ns,user_global_ns,
486 banner2=b2,**kw)
487 banner2=b2,**kw)
487
488
488 class MatplotlibMTShell(MatplotlibShellBase,MTInteractiveShell):
489 class MatplotlibMTShell(MatplotlibShellBase,MTInteractiveShell):
489 """Multi-threaded shell with matplotlib support."""
490 """Multi-threaded shell with matplotlib support."""
490
491
491 def __init__(self,name,usage=None,rc=Struct(opts=None,args=None),
492 def __init__(self,name,usage=None,rc=Struct(opts=None,args=None),
492 user_ns=None,user_global_ns=None, **kw):
493 user_ns=None,user_global_ns=None, **kw):
493 user_ns,b2 = self._matplotlib_config(name)
494 user_ns,b2 = self._matplotlib_config(name)
494 MTInteractiveShell.__init__(self,name,usage,rc,user_ns,user_global_ns,
495 MTInteractiveShell.__init__(self,name,usage,rc,user_ns,user_global_ns,
495 banner2=b2,**kw)
496 banner2=b2,**kw)
496
497
497 #-----------------------------------------------------------------------------
498 #-----------------------------------------------------------------------------
498 # Utility functions for the different GUI enabled IPShell* classes.
499 # Utility functions for the different GUI enabled IPShell* classes.
499
500
500 def get_tk():
501 def get_tk():
501 """Tries to import Tkinter and returns a withdrawn Tkinter root
502 """Tries to import Tkinter and returns a withdrawn Tkinter root
502 window. If Tkinter is already imported or not available, this
503 window. If Tkinter is already imported or not available, this
503 returns None. This function calls `hijack_tk` underneath.
504 returns None. This function calls `hijack_tk` underneath.
504 """
505 """
505 if not USE_TK or sys.modules.has_key('Tkinter'):
506 if not USE_TK or sys.modules.has_key('Tkinter'):
506 return None
507 return None
507 else:
508 else:
508 try:
509 try:
509 import Tkinter
510 import Tkinter
510 except ImportError:
511 except ImportError:
511 return None
512 return None
512 else:
513 else:
513 hijack_tk()
514 hijack_tk()
514 r = Tkinter.Tk()
515 r = Tkinter.Tk()
515 r.withdraw()
516 r.withdraw()
516 return r
517 return r
517
518
518 def hijack_tk():
519 def hijack_tk():
519 """Modifies Tkinter's mainloop with a dummy so when a module calls
520 """Modifies Tkinter's mainloop with a dummy so when a module calls
520 mainloop, it does not block.
521 mainloop, it does not block.
521
522
522 """
523 """
523 def misc_mainloop(self, n=0):
524 def misc_mainloop(self, n=0):
524 pass
525 pass
525 def tkinter_mainloop(n=0):
526 def tkinter_mainloop(n=0):
526 pass
527 pass
527
528
528 import Tkinter
529 import Tkinter
529 Tkinter.Misc.mainloop = misc_mainloop
530 Tkinter.Misc.mainloop = misc_mainloop
530 Tkinter.mainloop = tkinter_mainloop
531 Tkinter.mainloop = tkinter_mainloop
531
532
532 def update_tk(tk):
533 def update_tk(tk):
533 """Updates the Tkinter event loop. This is typically called from
534 """Updates the Tkinter event loop. This is typically called from
534 the respective WX or GTK mainloops.
535 the respective WX or GTK mainloops.
535 """
536 """
536 if tk:
537 if tk:
537 tk.update()
538 tk.update()
538
539
539 def hijack_wx():
540 def hijack_wx():
540 """Modifies wxPython's MainLoop with a dummy so user code does not
541 """Modifies wxPython's MainLoop with a dummy so user code does not
541 block IPython. The hijacked mainloop function is returned.
542 block IPython. The hijacked mainloop function is returned.
542 """
543 """
543 def dummy_mainloop(*args, **kw):
544 def dummy_mainloop(*args, **kw):
544 pass
545 pass
545 import wxPython
546 import wxPython
546 ver = wxPython.__version__
547 ver = wxPython.__version__
547 orig_mainloop = None
548 orig_mainloop = None
548 if ver[:3] >= '2.5':
549 if ver[:3] >= '2.5':
549 import wx
550 import wx
550 if hasattr(wx, '_core_'): core = getattr(wx, '_core_')
551 if hasattr(wx, '_core_'): core = getattr(wx, '_core_')
551 elif hasattr(wx, '_core'): core = getattr(wx, '_core')
552 elif hasattr(wx, '_core'): core = getattr(wx, '_core')
552 else: raise AttributeError('Could not find wx core module')
553 else: raise AttributeError('Could not find wx core module')
553 orig_mainloop = core.PyApp_MainLoop
554 orig_mainloop = core.PyApp_MainLoop
554 core.PyApp_MainLoop = dummy_mainloop
555 core.PyApp_MainLoop = dummy_mainloop
555 elif ver[:3] == '2.4':
556 elif ver[:3] == '2.4':
556 orig_mainloop = wxPython.wxc.wxPyApp_MainLoop
557 orig_mainloop = wxPython.wxc.wxPyApp_MainLoop
557 wxPython.wxc.wxPyApp_MainLoop = dummy_mainloop
558 wxPython.wxc.wxPyApp_MainLoop = dummy_mainloop
558 else:
559 else:
559 warn("Unable to find either wxPython version 2.4 or >= 2.5.")
560 warn("Unable to find either wxPython version 2.4 or >= 2.5.")
560 return orig_mainloop
561 return orig_mainloop
561
562
562 def hijack_gtk():
563 def hijack_gtk():
563 """Modifies pyGTK's mainloop with a dummy so user code does not
564 """Modifies pyGTK's mainloop with a dummy so user code does not
564 block IPython. This function returns the original `gtk.mainloop`
565 block IPython. This function returns the original `gtk.mainloop`
565 function that has been hijacked.
566 function that has been hijacked.
566 """
567 """
567 def dummy_mainloop(*args, **kw):
568 def dummy_mainloop(*args, **kw):
568 pass
569 pass
569 import gtk
570 import gtk
570 if gtk.pygtk_version >= (2,4,0): orig_mainloop = gtk.main
571 if gtk.pygtk_version >= (2,4,0): orig_mainloop = gtk.main
571 else: orig_mainloop = gtk.mainloop
572 else: orig_mainloop = gtk.mainloop
572 gtk.mainloop = dummy_mainloop
573 gtk.mainloop = dummy_mainloop
573 gtk.main = dummy_mainloop
574 gtk.main = dummy_mainloop
574 return orig_mainloop
575 return orig_mainloop
575
576
576 #-----------------------------------------------------------------------------
577 #-----------------------------------------------------------------------------
577 # The IPShell* classes below are the ones meant to be run by external code as
578 # The IPShell* classes below are the ones meant to be run by external code as
578 # IPython instances. Note that unless a specific threading strategy is
579 # IPython instances. Note that unless a specific threading strategy is
579 # desired, the factory function start() below should be used instead (it
580 # desired, the factory function start() below should be used instead (it
580 # selects the proper threaded class).
581 # selects the proper threaded class).
581
582
582 class IPShellGTK(threading.Thread):
583 class IPShellGTK(threading.Thread):
583 """Run a gtk mainloop() in a separate thread.
584 """Run a gtk mainloop() in a separate thread.
584
585
585 Python commands can be passed to the thread where they will be executed.
586 Python commands can be passed to the thread where they will be executed.
586 This is implemented by periodically checking for passed code using a
587 This is implemented by periodically checking for passed code using a
587 GTK timeout callback."""
588 GTK timeout callback."""
588
589
589 TIMEOUT = 100 # Millisecond interval between timeouts.
590 TIMEOUT = 100 # Millisecond interval between timeouts.
590
591
591 def __init__(self,argv=None,user_ns=None,user_global_ns=None,
592 def __init__(self,argv=None,user_ns=None,user_global_ns=None,
592 debug=1,shell_class=MTInteractiveShell):
593 debug=1,shell_class=MTInteractiveShell):
593
594
594 import gtk
595 import gtk
595
596
596 self.gtk = gtk
597 self.gtk = gtk
597 self.gtk_mainloop = hijack_gtk()
598 self.gtk_mainloop = hijack_gtk()
598
599
599 # Allows us to use both Tk and GTK.
600 # Allows us to use both Tk and GTK.
600 self.tk = get_tk()
601 self.tk = get_tk()
601
602
602 if gtk.pygtk_version >= (2,4,0): mainquit = self.gtk.main_quit
603 if gtk.pygtk_version >= (2,4,0): mainquit = self.gtk.main_quit
603 else: mainquit = self.gtk.mainquit
604 else: mainquit = self.gtk.mainquit
604
605
605 self.IP = make_IPython(argv,user_ns=user_ns,
606 self.IP = make_IPython(argv,user_ns=user_ns,
606 user_global_ns=user_global_ns,
607 user_global_ns=user_global_ns,
607 debug=debug,
608 debug=debug,
608 shell_class=shell_class,
609 shell_class=shell_class,
609 on_kill=[mainquit])
610 on_kill=[mainquit])
610
611
611 # HACK: slot for banner in self; it will be passed to the mainloop
612 # HACK: slot for banner in self; it will be passed to the mainloop
612 # method only and .run() needs it. The actual value will be set by
613 # method only and .run() needs it. The actual value will be set by
613 # .mainloop().
614 # .mainloop().
614 self._banner = None
615 self._banner = None
615
616
616 threading.Thread.__init__(self)
617 threading.Thread.__init__(self)
617
618
618 def run(self):
619 def run(self):
619 self.IP.mainloop(self._banner)
620 self.IP.mainloop(self._banner)
620 self.IP.kill()
621 self.IP.kill()
621
622
622 def mainloop(self,sys_exit=0,banner=None):
623 def mainloop(self,sys_exit=0,banner=None):
623
624
624 self._banner = banner
625 self._banner = banner
625
626
626 if self.gtk.pygtk_version >= (2,4,0):
627 if self.gtk.pygtk_version >= (2,4,0):
627 import gobject
628 import gobject
628 gobject.timeout_add(self.TIMEOUT, self.on_timer)
629 gobject.idle_add(self.on_timer)
629 else:
630 else:
630 self.gtk.timeout_add(self.TIMEOUT, self.on_timer)
631 self.gtk.idle_add(self.on_timer)
631
632
632 if sys.platform != 'win32':
633 if sys.platform != 'win32':
633 try:
634 try:
634 if self.gtk.gtk_version[0] >= 2:
635 if self.gtk.gtk_version[0] >= 2:
635 self.gtk.threads_init()
636 self.gtk.threads_init()
636 except AttributeError:
637 except AttributeError:
637 pass
638 pass
638 except RuntimeError:
639 except RuntimeError:
639 error('Your pyGTK likely has not been compiled with '
640 error('Your pyGTK likely has not been compiled with '
640 'threading support.\n'
641 'threading support.\n'
641 'The exception printout is below.\n'
642 'The exception printout is below.\n'
642 'You can either rebuild pyGTK with threads, or '
643 'You can either rebuild pyGTK with threads, or '
643 'try using \n'
644 'try using \n'
644 'matplotlib with a different backend (like Tk or WX).\n'
645 'matplotlib with a different backend (like Tk or WX).\n'
645 'Note that matplotlib will most likely not work in its '
646 'Note that matplotlib will most likely not work in its '
646 'current state!')
647 'current state!')
647 self.IP.InteractiveTB()
648 self.IP.InteractiveTB()
648 self.start()
649 self.start()
649 self.gtk.threads_enter()
650 self.gtk.threads_enter()
650 self.gtk_mainloop()
651 self.gtk_mainloop()
651 self.gtk.threads_leave()
652 self.gtk.threads_leave()
652 self.join()
653 self.join()
653
654
654 def on_timer(self):
655 def on_timer(self):
655 update_tk(self.tk)
656 """Called when GTK is idle.
656 return self.IP.runcode()
657
658 Must return True always, otherwise GTK stops calling it"""
657
659
660 update_tk(self.tk)
661 self.IP.runcode()
662 time.sleep(0.01)
663 return True
658
664
659 class IPShellWX(threading.Thread):
665 class IPShellWX(threading.Thread):
660 """Run a wx mainloop() in a separate thread.
666 """Run a wx mainloop() in a separate thread.
661
667
662 Python commands can be passed to the thread where they will be executed.
668 Python commands can be passed to the thread where they will be executed.
663 This is implemented by periodically checking for passed code using a
669 This is implemented by periodically checking for passed code using a
664 GTK timeout callback."""
670 GTK timeout callback."""
665
671
666 TIMEOUT = 100 # Millisecond interval between timeouts.
672 TIMEOUT = 100 # Millisecond interval between timeouts.
667
673
668 def __init__(self,argv=None,user_ns=None,user_global_ns=None,
674 def __init__(self,argv=None,user_ns=None,user_global_ns=None,
669 debug=1,shell_class=MTInteractiveShell):
675 debug=1,shell_class=MTInteractiveShell):
670
676
671 self.IP = make_IPython(argv,user_ns=user_ns,
677 self.IP = make_IPython(argv,user_ns=user_ns,
672 user_global_ns=user_global_ns,
678 user_global_ns=user_global_ns,
673 debug=debug,
679 debug=debug,
674 shell_class=shell_class,
680 shell_class=shell_class,
675 on_kill=[self.wxexit])
681 on_kill=[self.wxexit])
676
682
677 wantedwxversion=self.IP.rc.wxversion
683 wantedwxversion=self.IP.rc.wxversion
678 if wantedwxversion!="0":
684 if wantedwxversion!="0":
679 try:
685 try:
680 import wxversion
686 import wxversion
681 except ImportError:
687 except ImportError:
682 error('The wxversion module is needed for WX version selection')
688 error('The wxversion module is needed for WX version selection')
683 else:
689 else:
684 try:
690 try:
685 wxversion.select(wantedwxversion)
691 wxversion.select(wantedwxversion)
686 except:
692 except:
687 self.IP.InteractiveTB()
693 self.IP.InteractiveTB()
688 error('Requested wxPython version %s could not be loaded' %
694 error('Requested wxPython version %s could not be loaded' %
689 wantedwxversion)
695 wantedwxversion)
690
696
691 import wxPython.wx as wx
697 import wxPython.wx as wx
692
698
693 threading.Thread.__init__(self)
699 threading.Thread.__init__(self)
694 self.wx = wx
700 self.wx = wx
695 self.wx_mainloop = hijack_wx()
701 self.wx_mainloop = hijack_wx()
696
702
697 # Allows us to use both Tk and GTK.
703 # Allows us to use both Tk and GTK.
698 self.tk = get_tk()
704 self.tk = get_tk()
699
705
700
706
701 # HACK: slot for banner in self; it will be passed to the mainloop
707 # HACK: slot for banner in self; it will be passed to the mainloop
702 # method only and .run() needs it. The actual value will be set by
708 # method only and .run() needs it. The actual value will be set by
703 # .mainloop().
709 # .mainloop().
704 self._banner = None
710 self._banner = None
705
711
706 self.app = None
712 self.app = None
707
713
708 def wxexit(self, *args):
714 def wxexit(self, *args):
709 if self.app is not None:
715 if self.app is not None:
710 self.app.agent.timer.Stop()
716 self.app.agent.timer.Stop()
711 self.app.ExitMainLoop()
717 self.app.ExitMainLoop()
712
718
713 def run(self):
719 def run(self):
714 self.IP.mainloop(self._banner)
720 self.IP.mainloop(self._banner)
715 self.IP.kill()
721 self.IP.kill()
716
722
717 def mainloop(self,sys_exit=0,banner=None):
723 def mainloop(self,sys_exit=0,banner=None):
718
724
719 self._banner = banner
725 self._banner = banner
720
726
721 self.start()
727 self.start()
722
728
723 class TimerAgent(self.wx.wxMiniFrame):
729 class TimerAgent(self.wx.wxMiniFrame):
724 wx = self.wx
730 wx = self.wx
725 IP = self.IP
731 IP = self.IP
726 tk = self.tk
732 tk = self.tk
727 def __init__(self, parent, interval):
733 def __init__(self, parent, interval):
728 style = self.wx.wxDEFAULT_FRAME_STYLE | self.wx.wxTINY_CAPTION_HORIZ
734 style = self.wx.wxDEFAULT_FRAME_STYLE | self.wx.wxTINY_CAPTION_HORIZ
729 self.wx.wxMiniFrame.__init__(self, parent, -1, ' ', pos=(200, 200),
735 self.wx.wxMiniFrame.__init__(self, parent, -1, ' ', pos=(200, 200),
730 size=(100, 100),style=style)
736 size=(100, 100),style=style)
731 self.Show(False)
737 self.Show(False)
732 self.interval = interval
738 self.interval = interval
733 self.timerId = self.wx.wxNewId()
739 self.timerId = self.wx.wxNewId()
734
740
735 def StartWork(self):
741 def StartWork(self):
736 self.timer = self.wx.wxTimer(self, self.timerId)
742 self.timer = self.wx.wxTimer(self, self.timerId)
737 self.wx.EVT_TIMER(self, self.timerId, self.OnTimer)
743 self.wx.EVT_TIMER(self, self.timerId, self.OnTimer)
738 self.timer.Start(self.interval)
744 self.timer.Start(self.interval)
739
745
740 def OnTimer(self, event):
746 def OnTimer(self, event):
741 update_tk(self.tk)
747 update_tk(self.tk)
742 self.IP.runcode()
748 self.IP.runcode()
743
749
744 class App(self.wx.wxApp):
750 class App(self.wx.wxApp):
745 wx = self.wx
751 wx = self.wx
746 TIMEOUT = self.TIMEOUT
752 TIMEOUT = self.TIMEOUT
747 def OnInit(self):
753 def OnInit(self):
748 'Create the main window and insert the custom frame'
754 'Create the main window and insert the custom frame'
749 self.agent = TimerAgent(None, self.TIMEOUT)
755 self.agent = TimerAgent(None, self.TIMEOUT)
750 self.agent.Show(self.wx.false)
756 self.agent.Show(self.wx.false)
751 self.agent.StartWork()
757 self.agent.StartWork()
752 return self.wx.true
758 return self.wx.true
753
759
754 self.app = App(redirect=False)
760 self.app = App(redirect=False)
755 self.wx_mainloop(self.app)
761 self.wx_mainloop(self.app)
756 self.join()
762 self.join()
757
763
758
764
759 class IPShellQt(threading.Thread):
765 class IPShellQt(threading.Thread):
760 """Run a Qt event loop in a separate thread.
766 """Run a Qt event loop in a separate thread.
761
767
762 Python commands can be passed to the thread where they will be executed.
768 Python commands can be passed to the thread where they will be executed.
763 This is implemented by periodically checking for passed code using a
769 This is implemented by periodically checking for passed code using a
764 Qt timer / slot."""
770 Qt timer / slot."""
765
771
766 TIMEOUT = 100 # Millisecond interval between timeouts.
772 TIMEOUT = 100 # Millisecond interval between timeouts.
767
773
768 def __init__(self,argv=None,user_ns=None,user_global_ns=None,
774 def __init__(self,argv=None,user_ns=None,user_global_ns=None,
769 debug=0,shell_class=MTInteractiveShell):
775 debug=0,shell_class=MTInteractiveShell):
770
776
771 import qt
777 import qt
772
778
773 class newQApplication:
779 class newQApplication:
774 def __init__( self ):
780 def __init__( self ):
775 self.QApplication = qt.QApplication
781 self.QApplication = qt.QApplication
776
782
777 def __call__( *args, **kwargs ):
783 def __call__( *args, **kwargs ):
778 return qt.qApp
784 return qt.qApp
779
785
780 def exec_loop( *args, **kwargs ):
786 def exec_loop( *args, **kwargs ):
781 pass
787 pass
782
788
783 def __getattr__( self, name ):
789 def __getattr__( self, name ):
784 return getattr( self.QApplication, name )
790 return getattr( self.QApplication, name )
785
791
786 qt.QApplication = newQApplication()
792 qt.QApplication = newQApplication()
787
793
788 # Allows us to use both Tk and QT.
794 # Allows us to use both Tk and QT.
789 self.tk = get_tk()
795 self.tk = get_tk()
790
796
791 self.IP = make_IPython(argv,user_ns=user_ns,
797 self.IP = make_IPython(argv,user_ns=user_ns,
792 user_global_ns=user_global_ns,
798 user_global_ns=user_global_ns,
793 debug=debug,
799 debug=debug,
794 shell_class=shell_class,
800 shell_class=shell_class,
795 on_kill=[qt.qApp.exit])
801 on_kill=[qt.qApp.exit])
796
802
797 # HACK: slot for banner in self; it will be passed to the mainloop
803 # HACK: slot for banner in self; it will be passed to the mainloop
798 # method only and .run() needs it. The actual value will be set by
804 # method only and .run() needs it. The actual value will be set by
799 # .mainloop().
805 # .mainloop().
800 self._banner = None
806 self._banner = None
801
807
802 threading.Thread.__init__(self)
808 threading.Thread.__init__(self)
803
809
804 def run(self):
810 def run(self):
805 self.IP.mainloop(self._banner)
811 self.IP.mainloop(self._banner)
806 self.IP.kill()
812 self.IP.kill()
807
813
808 def mainloop(self,sys_exit=0,banner=None):
814 def mainloop(self,sys_exit=0,banner=None):
809
815
810 import qt
816 import qt
811
817
812 self._banner = banner
818 self._banner = banner
813
819
814 if qt.QApplication.startingUp():
820 if qt.QApplication.startingUp():
815 a = qt.QApplication.QApplication(sys.argv)
821 a = qt.QApplication.QApplication(sys.argv)
816 self.timer = qt.QTimer()
822 self.timer = qt.QTimer()
817 qt.QObject.connect( self.timer, qt.SIGNAL( 'timeout()' ), self.on_timer )
823 qt.QObject.connect( self.timer, qt.SIGNAL( 'timeout()' ), self.on_timer )
818
824
819 self.start()
825 self.start()
820 self.timer.start( self.TIMEOUT, True )
826 self.timer.start( self.TIMEOUT, True )
821 while True:
827 while True:
822 if self.IP._kill: break
828 if self.IP._kill: break
823 qt.qApp.exec_loop()
829 qt.qApp.exec_loop()
824 self.join()
830 self.join()
825
831
826 def on_timer(self):
832 def on_timer(self):
827 update_tk(self.tk)
833 update_tk(self.tk)
828 result = self.IP.runcode()
834 result = self.IP.runcode()
829 self.timer.start( self.TIMEOUT, True )
835 self.timer.start( self.TIMEOUT, True )
830 return result
836 return result
831
837
832 # A set of matplotlib public IPython shell classes, for single-threaded
838 # A set of matplotlib public IPython shell classes, for single-threaded
833 # (Tk* and FLTK* backends) and multithreaded (GTK* and WX* backends) use.
839 # (Tk* and FLTK* backends) and multithreaded (GTK* and WX* backends) use.
834 class IPShellMatplotlib(IPShell):
840 class IPShellMatplotlib(IPShell):
835 """Subclass IPShell with MatplotlibShell as the internal shell.
841 """Subclass IPShell with MatplotlibShell as the internal shell.
836
842
837 Single-threaded class, meant for the Tk* and FLTK* backends.
843 Single-threaded class, meant for the Tk* and FLTK* backends.
838
844
839 Having this on a separate class simplifies the external driver code."""
845 Having this on a separate class simplifies the external driver code."""
840
846
841 def __init__(self,argv=None,user_ns=None,user_global_ns=None,debug=1):
847 def __init__(self,argv=None,user_ns=None,user_global_ns=None,debug=1):
842 IPShell.__init__(self,argv,user_ns,user_global_ns,debug,
848 IPShell.__init__(self,argv,user_ns,user_global_ns,debug,
843 shell_class=MatplotlibShell)
849 shell_class=MatplotlibShell)
844
850
845 class IPShellMatplotlibGTK(IPShellGTK):
851 class IPShellMatplotlibGTK(IPShellGTK):
846 """Subclass IPShellGTK with MatplotlibMTShell as the internal shell.
852 """Subclass IPShellGTK with MatplotlibMTShell as the internal shell.
847
853
848 Multi-threaded class, meant for the GTK* backends."""
854 Multi-threaded class, meant for the GTK* backends."""
849
855
850 def __init__(self,argv=None,user_ns=None,user_global_ns=None,debug=1):
856 def __init__(self,argv=None,user_ns=None,user_global_ns=None,debug=1):
851 IPShellGTK.__init__(self,argv,user_ns,user_global_ns,debug,
857 IPShellGTK.__init__(self,argv,user_ns,user_global_ns,debug,
852 shell_class=MatplotlibMTShell)
858 shell_class=MatplotlibMTShell)
853
859
854 class IPShellMatplotlibWX(IPShellWX):
860 class IPShellMatplotlibWX(IPShellWX):
855 """Subclass IPShellWX with MatplotlibMTShell as the internal shell.
861 """Subclass IPShellWX with MatplotlibMTShell as the internal shell.
856
862
857 Multi-threaded class, meant for the WX* backends."""
863 Multi-threaded class, meant for the WX* backends."""
858
864
859 def __init__(self,argv=None,user_ns=None,user_global_ns=None,debug=1):
865 def __init__(self,argv=None,user_ns=None,user_global_ns=None,debug=1):
860 IPShellWX.__init__(self,argv,user_ns,user_global_ns,debug,
866 IPShellWX.__init__(self,argv,user_ns,user_global_ns,debug,
861 shell_class=MatplotlibMTShell)
867 shell_class=MatplotlibMTShell)
862
868
863 class IPShellMatplotlibQt(IPShellQt):
869 class IPShellMatplotlibQt(IPShellQt):
864 """Subclass IPShellQt with MatplotlibMTShell as the internal shell.
870 """Subclass IPShellQt with MatplotlibMTShell as the internal shell.
865
871
866 Multi-threaded class, meant for the Qt* backends."""
872 Multi-threaded class, meant for the Qt* backends."""
867
873
868 def __init__(self,argv=None,user_ns=None,user_global_ns=None,debug=1):
874 def __init__(self,argv=None,user_ns=None,user_global_ns=None,debug=1):
869 IPShellQt.__init__(self,argv,user_ns,user_global_ns,debug,
875 IPShellQt.__init__(self,argv,user_ns,user_global_ns,debug,
870 shell_class=MatplotlibMTShell)
876 shell_class=MatplotlibMTShell)
871
877
872 #-----------------------------------------------------------------------------
878 #-----------------------------------------------------------------------------
873 # Factory functions to actually start the proper thread-aware shell
879 # Factory functions to actually start the proper thread-aware shell
874
880
875 def _matplotlib_shell_class():
881 def _matplotlib_shell_class():
876 """Factory function to handle shell class selection for matplotlib.
882 """Factory function to handle shell class selection for matplotlib.
877
883
878 The proper shell class to use depends on the matplotlib backend, since
884 The proper shell class to use depends on the matplotlib backend, since
879 each backend requires a different threading strategy."""
885 each backend requires a different threading strategy."""
880
886
881 try:
887 try:
882 import matplotlib
888 import matplotlib
883 except ImportError:
889 except ImportError:
884 error('matplotlib could NOT be imported! Starting normal IPython.')
890 error('matplotlib could NOT be imported! Starting normal IPython.')
885 sh_class = IPShell
891 sh_class = IPShell
886 else:
892 else:
887 backend = matplotlib.rcParams['backend']
893 backend = matplotlib.rcParams['backend']
888 if backend.startswith('GTK'):
894 if backend.startswith('GTK'):
889 sh_class = IPShellMatplotlibGTK
895 sh_class = IPShellMatplotlibGTK
890 elif backend.startswith('WX'):
896 elif backend.startswith('WX'):
891 sh_class = IPShellMatplotlibWX
897 sh_class = IPShellMatplotlibWX
892 elif backend.startswith('Qt'):
898 elif backend.startswith('Qt'):
893 sh_class = IPShellMatplotlibQt
899 sh_class = IPShellMatplotlibQt
894 else:
900 else:
895 sh_class = IPShellMatplotlib
901 sh_class = IPShellMatplotlib
896 #print 'Using %s with the %s backend.' % (sh_class,backend) # dbg
902 #print 'Using %s with the %s backend.' % (sh_class,backend) # dbg
897 return sh_class
903 return sh_class
898
904
899 # This is the one which should be called by external code.
905 # This is the one which should be called by external code.
900 def start():
906 def start():
901 """Return a running shell instance, dealing with threading options.
907 """Return a running shell instance, dealing with threading options.
902
908
903 This is a factory function which will instantiate the proper IPython shell
909 This is a factory function which will instantiate the proper IPython shell
904 based on the user's threading choice. Such a selector is needed because
910 based on the user's threading choice. Such a selector is needed because
905 different GUI toolkits require different thread handling details."""
911 different GUI toolkits require different thread handling details."""
906
912
907 global USE_TK
913 global USE_TK
908 # Crude sys.argv hack to extract the threading options.
914 # Crude sys.argv hack to extract the threading options.
909 argv = sys.argv
915 argv = sys.argv
910 if len(argv) > 1:
916 if len(argv) > 1:
911 if len(argv) > 2:
917 if len(argv) > 2:
912 arg2 = argv[2]
918 arg2 = argv[2]
913 if arg2.endswith('-tk'):
919 if arg2.endswith('-tk'):
914 USE_TK = True
920 USE_TK = True
915 arg1 = argv[1]
921 arg1 = argv[1]
916 if arg1.endswith('-gthread'):
922 if arg1.endswith('-gthread'):
917 shell = IPShellGTK
923 shell = IPShellGTK
918 elif arg1.endswith( '-qthread' ):
924 elif arg1.endswith( '-qthread' ):
919 shell = IPShellQt
925 shell = IPShellQt
920 elif arg1.endswith('-wthread'):
926 elif arg1.endswith('-wthread'):
921 shell = IPShellWX
927 shell = IPShellWX
922 elif arg1.endswith('-pylab'):
928 elif arg1.endswith('-pylab'):
923 shell = _matplotlib_shell_class()
929 shell = _matplotlib_shell_class()
924 else:
930 else:
925 shell = IPShell
931 shell = IPShell
926 else:
932 else:
927 shell = IPShell
933 shell = IPShell
928 return shell()
934 return shell()
929
935
930 # Some aliases for backwards compatibility
936 # Some aliases for backwards compatibility
931 IPythonShell = IPShell
937 IPythonShell = IPShell
932 IPythonShellEmbed = IPShellEmbed
938 IPythonShellEmbed = IPShellEmbed
933 #************************ End of file <Shell.py> ***************************
939 #************************ End of file <Shell.py> ***************************
@@ -1,2165 +1,2165 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 newer.
5 Requires Python 2.1 or newer.
6
6
7 This file contains all the classes and helper functions specific to IPython.
7 This file contains all the classes and helper functions specific to IPython.
8
8
9 $Id: iplib.py 1000 2006-01-10 08:06:04Z fperez $
9 $Id: iplib.py 1002 2006-01-11 22:18:29Z fperez $
10 """
10 """
11
11
12 #*****************************************************************************
12 #*****************************************************************************
13 # Copyright (C) 2001 Janko Hauser <jhauser@zscout.de> and
13 # Copyright (C) 2001 Janko Hauser <jhauser@zscout.de> and
14 # Copyright (C) 2001-2006 Fernando Perez. <fperez@colorado.edu>
14 # Copyright (C) 2001-2006 Fernando Perez. <fperez@colorado.edu>
15 #
15 #
16 # Distributed under the terms of the BSD License. The full license is in
16 # Distributed under the terms of the BSD License. The full license is in
17 # the file COPYING, distributed as part of this software.
17 # the file COPYING, distributed as part of this software.
18 #
18 #
19 # Note: this code originally subclassed code.InteractiveConsole from the
19 # Note: this code originally subclassed code.InteractiveConsole from the
20 # Python standard library. Over time, all of that class has been copied
20 # Python standard library. Over time, all of that class has been copied
21 # verbatim here for modifications which could not be accomplished by
21 # verbatim here for modifications which could not be accomplished by
22 # subclassing. At this point, there are no dependencies at all on the code
22 # subclassing. At this point, there are no dependencies at all on the code
23 # module anymore (it is not even imported). The Python License (sec. 2)
23 # module anymore (it is not even imported). The Python License (sec. 2)
24 # allows for this, but it's always nice to acknowledge credit where credit is
24 # allows for this, but it's always nice to acknowledge credit where credit is
25 # due.
25 # due.
26 #*****************************************************************************
26 #*****************************************************************************
27
27
28 #****************************************************************************
28 #****************************************************************************
29 # Modules and globals
29 # Modules and globals
30
30
31 from __future__ import generators # for 2.2 backwards-compatibility
31 from __future__ import generators # for 2.2 backwards-compatibility
32
32
33 from IPython import Release
33 from IPython import Release
34 __author__ = '%s <%s>\n%s <%s>' % \
34 __author__ = '%s <%s>\n%s <%s>' % \
35 ( Release.authors['Janko'] + Release.authors['Fernando'] )
35 ( Release.authors['Janko'] + Release.authors['Fernando'] )
36 __license__ = Release.license
36 __license__ = Release.license
37 __version__ = Release.version
37 __version__ = Release.version
38
38
39 # Python standard modules
39 # Python standard modules
40 import __main__
40 import __main__
41 import __builtin__
41 import __builtin__
42 import StringIO
42 import StringIO
43 import bdb
43 import bdb
44 import cPickle as pickle
44 import cPickle as pickle
45 import codeop
45 import codeop
46 import exceptions
46 import exceptions
47 import glob
47 import glob
48 import inspect
48 import inspect
49 import keyword
49 import keyword
50 import new
50 import new
51 import os
51 import os
52 import pdb
52 import pdb
53 import pydoc
53 import pydoc
54 import re
54 import re
55 import shutil
55 import shutil
56 import string
56 import string
57 import sys
57 import sys
58 import tempfile
58 import tempfile
59 import traceback
59 import traceback
60 import types
60 import types
61
61
62 from pprint import pprint, pformat
62 from pprint import pprint, pformat
63
63
64 # IPython's own modules
64 # IPython's own modules
65 import IPython
65 import IPython
66 from IPython import OInspect,PyColorize,ultraTB
66 from IPython import OInspect,PyColorize,ultraTB
67 from IPython.ColorANSI import ColorScheme,ColorSchemeTable # too long names
67 from IPython.ColorANSI import ColorScheme,ColorSchemeTable # too long names
68 from IPython.FakeModule import FakeModule
68 from IPython.FakeModule import FakeModule
69 from IPython.Itpl import Itpl,itpl,printpl,ItplNS,itplns
69 from IPython.Itpl import Itpl,itpl,printpl,ItplNS,itplns
70 from IPython.Logger import Logger
70 from IPython.Logger import Logger
71 from IPython.Magic import Magic
71 from IPython.Magic import Magic
72 from IPython.Prompts import CachedOutput
72 from IPython.Prompts import CachedOutput
73 from IPython.Struct import Struct
73 from IPython.Struct import Struct
74 from IPython.background_jobs import BackgroundJobManager
74 from IPython.background_jobs import BackgroundJobManager
75 from IPython.usage import cmd_line_usage,interactive_usage
75 from IPython.usage import cmd_line_usage,interactive_usage
76 from IPython.genutils import *
76 from IPython.genutils import *
77
77
78 # Globals
78 # Globals
79
79
80 # store the builtin raw_input globally, and use this always, in case user code
80 # store the builtin raw_input globally, and use this always, in case user code
81 # overwrites it (like wx.py.PyShell does)
81 # overwrites it (like wx.py.PyShell does)
82 raw_input_original = raw_input
82 raw_input_original = raw_input
83
83
84 # compiled regexps for autoindent management
84 # compiled regexps for autoindent management
85 ini_spaces_re = re.compile(r'^(\s+)')
85 ini_spaces_re = re.compile(r'^(\s+)')
86 dedent_re = re.compile(r'^\s+raise|^\s+return|^\s+pass')
86 dedent_re = re.compile(r'^\s+raise|^\s+return|^\s+pass')
87
87
88
88
89 #****************************************************************************
89 #****************************************************************************
90 # Some utility function definitions
90 # Some utility function definitions
91
91
92 def softspace(file, newvalue):
92 def softspace(file, newvalue):
93 """Copied from code.py, to remove the dependency"""
93 """Copied from code.py, to remove the dependency"""
94 oldvalue = 0
94 oldvalue = 0
95 try:
95 try:
96 oldvalue = file.softspace
96 oldvalue = file.softspace
97 except AttributeError:
97 except AttributeError:
98 pass
98 pass
99 try:
99 try:
100 file.softspace = newvalue
100 file.softspace = newvalue
101 except (AttributeError, TypeError):
101 except (AttributeError, TypeError):
102 # "attribute-less object" or "read-only attributes"
102 # "attribute-less object" or "read-only attributes"
103 pass
103 pass
104 return oldvalue
104 return oldvalue
105
105
106
106
107 #****************************************************************************
107 #****************************************************************************
108 # Local use exceptions
108 # Local use exceptions
109 class SpaceInInput(exceptions.Exception): pass
109 class SpaceInInput(exceptions.Exception): pass
110
110
111
111
112 #****************************************************************************
112 #****************************************************************************
113 # Local use classes
113 # Local use classes
114 class Bunch: pass
114 class Bunch: pass
115
115
116 class Undefined: pass
116 class Undefined: pass
117
117
118 class InputList(list):
118 class InputList(list):
119 """Class to store user input.
119 """Class to store user input.
120
120
121 It's basically a list, but slices return a string instead of a list, thus
121 It's basically a list, but slices return a string instead of a list, thus
122 allowing things like (assuming 'In' is an instance):
122 allowing things like (assuming 'In' is an instance):
123
123
124 exec In[4:7]
124 exec In[4:7]
125
125
126 or
126 or
127
127
128 exec In[5:9] + In[14] + In[21:25]"""
128 exec In[5:9] + In[14] + In[21:25]"""
129
129
130 def __getslice__(self,i,j):
130 def __getslice__(self,i,j):
131 return ''.join(list.__getslice__(self,i,j))
131 return ''.join(list.__getslice__(self,i,j))
132
132
133 class SyntaxTB(ultraTB.ListTB):
133 class SyntaxTB(ultraTB.ListTB):
134 """Extension which holds some state: the last exception value"""
134 """Extension which holds some state: the last exception value"""
135
135
136 def __init__(self,color_scheme = 'NoColor'):
136 def __init__(self,color_scheme = 'NoColor'):
137 ultraTB.ListTB.__init__(self,color_scheme)
137 ultraTB.ListTB.__init__(self,color_scheme)
138 self.last_syntax_error = None
138 self.last_syntax_error = None
139
139
140 def __call__(self, etype, value, elist):
140 def __call__(self, etype, value, elist):
141 self.last_syntax_error = value
141 self.last_syntax_error = value
142 ultraTB.ListTB.__call__(self,etype,value,elist)
142 ultraTB.ListTB.__call__(self,etype,value,elist)
143
143
144 def clear_err_state(self):
144 def clear_err_state(self):
145 """Return the current error state and clear it"""
145 """Return the current error state and clear it"""
146 e = self.last_syntax_error
146 e = self.last_syntax_error
147 self.last_syntax_error = None
147 self.last_syntax_error = None
148 return e
148 return e
149
149
150 #****************************************************************************
150 #****************************************************************************
151 # Main IPython class
151 # Main IPython class
152
152
153 # FIXME: the Magic class is a mixin for now, and will unfortunately remain so
153 # FIXME: the Magic class is a mixin for now, and will unfortunately remain so
154 # until a full rewrite is made. I've cleaned all cross-class uses of
154 # until a full rewrite is made. I've cleaned all cross-class uses of
155 # attributes and methods, but too much user code out there relies on the
155 # attributes and methods, but too much user code out there relies on the
156 # equlity %foo == __IP.magic_foo, so I can't actually remove the mixin usage.
156 # equlity %foo == __IP.magic_foo, so I can't actually remove the mixin usage.
157 #
157 #
158 # But at least now, all the pieces have been separated and we could, in
158 # But at least now, all the pieces have been separated and we could, in
159 # principle, stop using the mixin. This will ease the transition to the
159 # principle, stop using the mixin. This will ease the transition to the
160 # chainsaw branch.
160 # chainsaw branch.
161
161
162 # For reference, the following is the list of 'self.foo' uses in the Magic
162 # For reference, the following is the list of 'self.foo' uses in the Magic
163 # class as of 2005-12-28. These are names we CAN'T use in the main ipython
163 # class as of 2005-12-28. These are names we CAN'T use in the main ipython
164 # class, to prevent clashes.
164 # class, to prevent clashes.
165
165
166 # ['self.__class__', 'self.__dict__', 'self._inspect', 'self._ofind',
166 # ['self.__class__', 'self.__dict__', 'self._inspect', 'self._ofind',
167 # 'self.arg_err', 'self.extract_input', 'self.format_', 'self.lsmagic',
167 # 'self.arg_err', 'self.extract_input', 'self.format_', 'self.lsmagic',
168 # 'self.magic_', 'self.options_table', 'self.parse', 'self.shell',
168 # 'self.magic_', 'self.options_table', 'self.parse', 'self.shell',
169 # 'self.value']
169 # 'self.value']
170
170
171 class InteractiveShell(object,Magic):
171 class InteractiveShell(object,Magic):
172 """An enhanced console for Python."""
172 """An enhanced console for Python."""
173
173
174 # class attribute to indicate whether the class supports threads or not.
174 # class attribute to indicate whether the class supports threads or not.
175 # Subclasses with thread support should override this as needed.
175 # Subclasses with thread support should override this as needed.
176 isthreaded = False
176 isthreaded = False
177
177
178 def __init__(self,name,usage=None,rc=Struct(opts=None,args=None),
178 def __init__(self,name,usage=None,rc=Struct(opts=None,args=None),
179 user_ns = None,user_global_ns=None,banner2='',
179 user_ns = None,user_global_ns=None,banner2='',
180 custom_exceptions=((),None),embedded=False):
180 custom_exceptions=((),None),embedded=False):
181
181
182 # some minimal strict typechecks. For some core data structures, I
182 # some minimal strict typechecks. For some core data structures, I
183 # want actual basic python types, not just anything that looks like
183 # want actual basic python types, not just anything that looks like
184 # one. This is especially true for namespaces.
184 # one. This is especially true for namespaces.
185 for ns in (user_ns,user_global_ns):
185 for ns in (user_ns,user_global_ns):
186 if ns is not None and type(ns) != types.DictType:
186 if ns is not None and type(ns) != types.DictType:
187 raise TypeError,'namespace must be a dictionary'
187 raise TypeError,'namespace must be a dictionary'
188
188
189 # Job manager (for jobs run as background threads)
189 # Job manager (for jobs run as background threads)
190 self.jobs = BackgroundJobManager()
190 self.jobs = BackgroundJobManager()
191
191
192 # track which builtins we add, so we can clean up later
192 # track which builtins we add, so we can clean up later
193 self.builtins_added = {}
193 self.builtins_added = {}
194 # This method will add the necessary builtins for operation, but
194 # This method will add the necessary builtins for operation, but
195 # tracking what it did via the builtins_added dict.
195 # tracking what it did via the builtins_added dict.
196 self.add_builtins()
196 self.add_builtins()
197
197
198 # Do the intuitively correct thing for quit/exit: we remove the
198 # Do the intuitively correct thing for quit/exit: we remove the
199 # builtins if they exist, and our own magics will deal with this
199 # builtins if they exist, and our own magics will deal with this
200 try:
200 try:
201 del __builtin__.exit, __builtin__.quit
201 del __builtin__.exit, __builtin__.quit
202 except AttributeError:
202 except AttributeError:
203 pass
203 pass
204
204
205 # Store the actual shell's name
205 # Store the actual shell's name
206 self.name = name
206 self.name = name
207
207
208 # We need to know whether the instance is meant for embedding, since
208 # We need to know whether the instance is meant for embedding, since
209 # global/local namespaces need to be handled differently in that case
209 # global/local namespaces need to be handled differently in that case
210 self.embedded = embedded
210 self.embedded = embedded
211
211
212 # command compiler
212 # command compiler
213 self.compile = codeop.CommandCompiler()
213 self.compile = codeop.CommandCompiler()
214
214
215 # User input buffer
215 # User input buffer
216 self.buffer = []
216 self.buffer = []
217
217
218 # Default name given in compilation of code
218 # Default name given in compilation of code
219 self.filename = '<ipython console>'
219 self.filename = '<ipython console>'
220
220
221 # Make an empty namespace, which extension writers can rely on both
221 # Make an empty namespace, which extension writers can rely on both
222 # existing and NEVER being used by ipython itself. This gives them a
222 # existing and NEVER being used by ipython itself. This gives them a
223 # convenient location for storing additional information and state
223 # convenient location for storing additional information and state
224 # their extensions may require, without fear of collisions with other
224 # their extensions may require, without fear of collisions with other
225 # ipython names that may develop later.
225 # ipython names that may develop later.
226 self.meta = Bunch()
226 self.meta = Bunch()
227
227
228 # Create the namespace where the user will operate. user_ns is
228 # Create the namespace where the user will operate. user_ns is
229 # normally the only one used, and it is passed to the exec calls as
229 # normally the only one used, and it is passed to the exec calls as
230 # the locals argument. But we do carry a user_global_ns namespace
230 # the locals argument. But we do carry a user_global_ns namespace
231 # given as the exec 'globals' argument, This is useful in embedding
231 # given as the exec 'globals' argument, This is useful in embedding
232 # situations where the ipython shell opens in a context where the
232 # situations where the ipython shell opens in a context where the
233 # distinction between locals and globals is meaningful.
233 # distinction between locals and globals is meaningful.
234
234
235 # FIXME. For some strange reason, __builtins__ is showing up at user
235 # FIXME. For some strange reason, __builtins__ is showing up at user
236 # level as a dict instead of a module. This is a manual fix, but I
236 # level as a dict instead of a module. This is a manual fix, but I
237 # should really track down where the problem is coming from. Alex
237 # should really track down where the problem is coming from. Alex
238 # Schmolck reported this problem first.
238 # Schmolck reported this problem first.
239
239
240 # A useful post by Alex Martelli on this topic:
240 # A useful post by Alex Martelli on this topic:
241 # Re: inconsistent value from __builtins__
241 # Re: inconsistent value from __builtins__
242 # Von: Alex Martelli <aleaxit@yahoo.com>
242 # Von: Alex Martelli <aleaxit@yahoo.com>
243 # Datum: Freitag 01 Oktober 2004 04:45:34 nachmittags/abends
243 # Datum: Freitag 01 Oktober 2004 04:45:34 nachmittags/abends
244 # Gruppen: comp.lang.python
244 # Gruppen: comp.lang.python
245
245
246 # Michael Hohn <hohn@hooknose.lbl.gov> wrote:
246 # Michael Hohn <hohn@hooknose.lbl.gov> wrote:
247 # > >>> print type(builtin_check.get_global_binding('__builtins__'))
247 # > >>> print type(builtin_check.get_global_binding('__builtins__'))
248 # > <type 'dict'>
248 # > <type 'dict'>
249 # > >>> print type(__builtins__)
249 # > >>> print type(__builtins__)
250 # > <type 'module'>
250 # > <type 'module'>
251 # > Is this difference in return value intentional?
251 # > Is this difference in return value intentional?
252
252
253 # Well, it's documented that '__builtins__' can be either a dictionary
253 # Well, it's documented that '__builtins__' can be either a dictionary
254 # or a module, and it's been that way for a long time. Whether it's
254 # or a module, and it's been that way for a long time. Whether it's
255 # intentional (or sensible), I don't know. In any case, the idea is
255 # intentional (or sensible), I don't know. In any case, the idea is
256 # that if you need to access the built-in namespace directly, you
256 # that if you need to access the built-in namespace directly, you
257 # should start with "import __builtin__" (note, no 's') which will
257 # should start with "import __builtin__" (note, no 's') which will
258 # definitely give you a module. Yeah, it's somewhat confusing:-(.
258 # definitely give you a module. Yeah, it's somewhat confusing:-(.
259
259
260 if user_ns is None:
260 if user_ns is None:
261 # Set __name__ to __main__ to better match the behavior of the
261 # Set __name__ to __main__ to better match the behavior of the
262 # normal interpreter.
262 # normal interpreter.
263 user_ns = {'__name__' :'__main__',
263 user_ns = {'__name__' :'__main__',
264 '__builtins__' : __builtin__,
264 '__builtins__' : __builtin__,
265 }
265 }
266
266
267 if user_global_ns is None:
267 if user_global_ns is None:
268 user_global_ns = {}
268 user_global_ns = {}
269
269
270 # Assign namespaces
270 # Assign namespaces
271 # This is the namespace where all normal user variables live
271 # This is the namespace where all normal user variables live
272 self.user_ns = user_ns
272 self.user_ns = user_ns
273 # Embedded instances require a separate namespace for globals.
273 # Embedded instances require a separate namespace for globals.
274 # Normally this one is unused by non-embedded instances.
274 # Normally this one is unused by non-embedded instances.
275 self.user_global_ns = user_global_ns
275 self.user_global_ns = user_global_ns
276 # A namespace to keep track of internal data structures to prevent
276 # A namespace to keep track of internal data structures to prevent
277 # them from cluttering user-visible stuff. Will be updated later
277 # them from cluttering user-visible stuff. Will be updated later
278 self.internal_ns = {}
278 self.internal_ns = {}
279
279
280 # Namespace of system aliases. Each entry in the alias
280 # Namespace of system aliases. Each entry in the alias
281 # table must be a 2-tuple of the form (N,name), where N is the number
281 # table must be a 2-tuple of the form (N,name), where N is the number
282 # of positional arguments of the alias.
282 # of positional arguments of the alias.
283 self.alias_table = {}
283 self.alias_table = {}
284
284
285 # A table holding all the namespaces IPython deals with, so that
285 # A table holding all the namespaces IPython deals with, so that
286 # introspection facilities can search easily.
286 # introspection facilities can search easily.
287 self.ns_table = {'user':user_ns,
287 self.ns_table = {'user':user_ns,
288 'user_global':user_global_ns,
288 'user_global':user_global_ns,
289 'alias':self.alias_table,
289 'alias':self.alias_table,
290 'internal':self.internal_ns,
290 'internal':self.internal_ns,
291 'builtin':__builtin__.__dict__
291 'builtin':__builtin__.__dict__
292 }
292 }
293
293
294 # The user namespace MUST have a pointer to the shell itself.
294 # The user namespace MUST have a pointer to the shell itself.
295 self.user_ns[name] = self
295 self.user_ns[name] = self
296
296
297 # We need to insert into sys.modules something that looks like a
297 # We need to insert into sys.modules something that looks like a
298 # module but which accesses the IPython namespace, for shelve and
298 # module but which accesses the IPython namespace, for shelve and
299 # pickle to work interactively. Normally they rely on getting
299 # pickle to work interactively. Normally they rely on getting
300 # everything out of __main__, but for embedding purposes each IPython
300 # everything out of __main__, but for embedding purposes each IPython
301 # instance has its own private namespace, so we can't go shoving
301 # instance has its own private namespace, so we can't go shoving
302 # everything into __main__.
302 # everything into __main__.
303
303
304 # note, however, that we should only do this for non-embedded
304 # note, however, that we should only do this for non-embedded
305 # ipythons, which really mimic the __main__.__dict__ with their own
305 # ipythons, which really mimic the __main__.__dict__ with their own
306 # namespace. Embedded instances, on the other hand, should not do
306 # namespace. Embedded instances, on the other hand, should not do
307 # this because they need to manage the user local/global namespaces
307 # this because they need to manage the user local/global namespaces
308 # only, but they live within a 'normal' __main__ (meaning, they
308 # only, but they live within a 'normal' __main__ (meaning, they
309 # shouldn't overtake the execution environment of the script they're
309 # shouldn't overtake the execution environment of the script they're
310 # embedded in).
310 # embedded in).
311
311
312 if not embedded:
312 if not embedded:
313 try:
313 try:
314 main_name = self.user_ns['__name__']
314 main_name = self.user_ns['__name__']
315 except KeyError:
315 except KeyError:
316 raise KeyError,'user_ns dictionary MUST have a "__name__" key'
316 raise KeyError,'user_ns dictionary MUST have a "__name__" key'
317 else:
317 else:
318 #print "pickle hack in place" # dbg
318 #print "pickle hack in place" # dbg
319 #print 'main_name:',main_name # dbg
319 #print 'main_name:',main_name # dbg
320 sys.modules[main_name] = FakeModule(self.user_ns)
320 sys.modules[main_name] = FakeModule(self.user_ns)
321
321
322 # List of input with multi-line handling.
322 # List of input with multi-line handling.
323 # Fill its zero entry, user counter starts at 1
323 # Fill its zero entry, user counter starts at 1
324 self.input_hist = InputList(['\n'])
324 self.input_hist = InputList(['\n'])
325
325
326 # list of visited directories
326 # list of visited directories
327 try:
327 try:
328 self.dir_hist = [os.getcwd()]
328 self.dir_hist = [os.getcwd()]
329 except IOError, e:
329 except IOError, e:
330 self.dir_hist = []
330 self.dir_hist = []
331
331
332 # dict of output history
332 # dict of output history
333 self.output_hist = {}
333 self.output_hist = {}
334
334
335 # dict of things NOT to alias (keywords, builtins and some magics)
335 # dict of things NOT to alias (keywords, builtins and some magics)
336 no_alias = {}
336 no_alias = {}
337 no_alias_magics = ['cd','popd','pushd','dhist','alias','unalias']
337 no_alias_magics = ['cd','popd','pushd','dhist','alias','unalias']
338 for key in keyword.kwlist + no_alias_magics:
338 for key in keyword.kwlist + no_alias_magics:
339 no_alias[key] = 1
339 no_alias[key] = 1
340 no_alias.update(__builtin__.__dict__)
340 no_alias.update(__builtin__.__dict__)
341 self.no_alias = no_alias
341 self.no_alias = no_alias
342
342
343 # make global variables for user access to these
343 # make global variables for user access to these
344 self.user_ns['_ih'] = self.input_hist
344 self.user_ns['_ih'] = self.input_hist
345 self.user_ns['_oh'] = self.output_hist
345 self.user_ns['_oh'] = self.output_hist
346 self.user_ns['_dh'] = self.dir_hist
346 self.user_ns['_dh'] = self.dir_hist
347
347
348 # user aliases to input and output histories
348 # user aliases to input and output histories
349 self.user_ns['In'] = self.input_hist
349 self.user_ns['In'] = self.input_hist
350 self.user_ns['Out'] = self.output_hist
350 self.user_ns['Out'] = self.output_hist
351
351
352 # Object variable to store code object waiting execution. This is
352 # Object variable to store code object waiting execution. This is
353 # used mainly by the multithreaded shells, but it can come in handy in
353 # used mainly by the multithreaded shells, but it can come in handy in
354 # other situations. No need to use a Queue here, since it's a single
354 # other situations. No need to use a Queue here, since it's a single
355 # item which gets cleared once run.
355 # item which gets cleared once run.
356 self.code_to_run = None
356 self.code_to_run = None
357
357
358 # escapes for automatic behavior on the command line
358 # escapes for automatic behavior on the command line
359 self.ESC_SHELL = '!'
359 self.ESC_SHELL = '!'
360 self.ESC_HELP = '?'
360 self.ESC_HELP = '?'
361 self.ESC_MAGIC = '%'
361 self.ESC_MAGIC = '%'
362 self.ESC_QUOTE = ','
362 self.ESC_QUOTE = ','
363 self.ESC_QUOTE2 = ';'
363 self.ESC_QUOTE2 = ';'
364 self.ESC_PAREN = '/'
364 self.ESC_PAREN = '/'
365
365
366 # And their associated handlers
366 # And their associated handlers
367 self.esc_handlers = {self.ESC_PAREN : self.handle_auto,
367 self.esc_handlers = {self.ESC_PAREN : self.handle_auto,
368 self.ESC_QUOTE : self.handle_auto,
368 self.ESC_QUOTE : self.handle_auto,
369 self.ESC_QUOTE2 : self.handle_auto,
369 self.ESC_QUOTE2 : self.handle_auto,
370 self.ESC_MAGIC : self.handle_magic,
370 self.ESC_MAGIC : self.handle_magic,
371 self.ESC_HELP : self.handle_help,
371 self.ESC_HELP : self.handle_help,
372 self.ESC_SHELL : self.handle_shell_escape,
372 self.ESC_SHELL : self.handle_shell_escape,
373 }
373 }
374
374
375 # class initializations
375 # class initializations
376 Magic.__init__(self,self)
376 Magic.__init__(self,self)
377
377
378 # Python source parser/formatter for syntax highlighting
378 # Python source parser/formatter for syntax highlighting
379 pyformat = PyColorize.Parser().format
379 pyformat = PyColorize.Parser().format
380 self.pycolorize = lambda src: pyformat(src,'str',self.rc['colors'])
380 self.pycolorize = lambda src: pyformat(src,'str',self.rc['colors'])
381
381
382 # hooks holds pointers used for user-side customizations
382 # hooks holds pointers used for user-side customizations
383 self.hooks = Struct()
383 self.hooks = Struct()
384
384
385 # Set all default hooks, defined in the IPython.hooks module.
385 # Set all default hooks, defined in the IPython.hooks module.
386 hooks = IPython.hooks
386 hooks = IPython.hooks
387 for hook_name in hooks.__all__:
387 for hook_name in hooks.__all__:
388 self.set_hook(hook_name,getattr(hooks,hook_name))
388 self.set_hook(hook_name,getattr(hooks,hook_name))
389
389
390 # Flag to mark unconditional exit
390 # Flag to mark unconditional exit
391 self.exit_now = False
391 self.exit_now = False
392
392
393 self.usage_min = """\
393 self.usage_min = """\
394 An enhanced console for Python.
394 An enhanced console for Python.
395 Some of its features are:
395 Some of its features are:
396 - Readline support if the readline library is present.
396 - Readline support if the readline library is present.
397 - Tab completion in the local namespace.
397 - Tab completion in the local namespace.
398 - Logging of input, see command-line options.
398 - Logging of input, see command-line options.
399 - System shell escape via ! , eg !ls.
399 - System shell escape via ! , eg !ls.
400 - Magic commands, starting with a % (like %ls, %pwd, %cd, etc.)
400 - Magic commands, starting with a % (like %ls, %pwd, %cd, etc.)
401 - Keeps track of locally defined variables via %who, %whos.
401 - Keeps track of locally defined variables via %who, %whos.
402 - Show object information with a ? eg ?x or x? (use ?? for more info).
402 - Show object information with a ? eg ?x or x? (use ?? for more info).
403 """
403 """
404 if usage: self.usage = usage
404 if usage: self.usage = usage
405 else: self.usage = self.usage_min
405 else: self.usage = self.usage_min
406
406
407 # Storage
407 # Storage
408 self.rc = rc # This will hold all configuration information
408 self.rc = rc # This will hold all configuration information
409 self.pager = 'less'
409 self.pager = 'less'
410 # temporary files used for various purposes. Deleted at exit.
410 # temporary files used for various purposes. Deleted at exit.
411 self.tempfiles = []
411 self.tempfiles = []
412
412
413 # Keep track of readline usage (later set by init_readline)
413 # Keep track of readline usage (later set by init_readline)
414 self.has_readline = False
414 self.has_readline = False
415
415
416 # template for logfile headers. It gets resolved at runtime by the
416 # template for logfile headers. It gets resolved at runtime by the
417 # logstart method.
417 # logstart method.
418 self.loghead_tpl = \
418 self.loghead_tpl = \
419 """#log# Automatic Logger file. *** THIS MUST BE THE FIRST LINE ***
419 """#log# Automatic Logger file. *** THIS MUST BE THE FIRST LINE ***
420 #log# DO NOT CHANGE THIS LINE OR THE TWO BELOW
420 #log# DO NOT CHANGE THIS LINE OR THE TWO BELOW
421 #log# opts = %s
421 #log# opts = %s
422 #log# args = %s
422 #log# args = %s
423 #log# It is safe to make manual edits below here.
423 #log# It is safe to make manual edits below here.
424 #log#-----------------------------------------------------------------------
424 #log#-----------------------------------------------------------------------
425 """
425 """
426 # for pushd/popd management
426 # for pushd/popd management
427 try:
427 try:
428 self.home_dir = get_home_dir()
428 self.home_dir = get_home_dir()
429 except HomeDirError,msg:
429 except HomeDirError,msg:
430 fatal(msg)
430 fatal(msg)
431
431
432 self.dir_stack = [os.getcwd().replace(self.home_dir,'~')]
432 self.dir_stack = [os.getcwd().replace(self.home_dir,'~')]
433
433
434 # Functions to call the underlying shell.
434 # Functions to call the underlying shell.
435
435
436 # utility to expand user variables via Itpl
436 # utility to expand user variables via Itpl
437 self.var_expand = lambda cmd: str(ItplNS(cmd.replace('#','\#'),
437 self.var_expand = lambda cmd: str(ItplNS(cmd.replace('#','\#'),
438 self.user_ns))
438 self.user_ns))
439 # The first is similar to os.system, but it doesn't return a value,
439 # The first is similar to os.system, but it doesn't return a value,
440 # and it allows interpolation of variables in the user's namespace.
440 # and it allows interpolation of variables in the user's namespace.
441 self.system = lambda cmd: shell(self.var_expand(cmd),
441 self.system = lambda cmd: shell(self.var_expand(cmd),
442 header='IPython system call: ',
442 header='IPython system call: ',
443 verbose=self.rc.system_verbose)
443 verbose=self.rc.system_verbose)
444 # These are for getoutput and getoutputerror:
444 # These are for getoutput and getoutputerror:
445 self.getoutput = lambda cmd: \
445 self.getoutput = lambda cmd: \
446 getoutput(self.var_expand(cmd),
446 getoutput(self.var_expand(cmd),
447 header='IPython system call: ',
447 header='IPython system call: ',
448 verbose=self.rc.system_verbose)
448 verbose=self.rc.system_verbose)
449 self.getoutputerror = lambda cmd: \
449 self.getoutputerror = lambda cmd: \
450 getoutputerror(str(ItplNS(cmd.replace('#','\#'),
450 getoutputerror(str(ItplNS(cmd.replace('#','\#'),
451 self.user_ns)),
451 self.user_ns)),
452 header='IPython system call: ',
452 header='IPython system call: ',
453 verbose=self.rc.system_verbose)
453 verbose=self.rc.system_verbose)
454
454
455 # RegExp for splitting line contents into pre-char//first
455 # RegExp for splitting line contents into pre-char//first
456 # word-method//rest. For clarity, each group in on one line.
456 # word-method//rest. For clarity, each group in on one line.
457
457
458 # WARNING: update the regexp if the above escapes are changed, as they
458 # WARNING: update the regexp if the above escapes are changed, as they
459 # are hardwired in.
459 # are hardwired in.
460
460
461 # Don't get carried away with trying to make the autocalling catch too
461 # Don't get carried away with trying to make the autocalling catch too
462 # much: it's better to be conservative rather than to trigger hidden
462 # much: it's better to be conservative rather than to trigger hidden
463 # evals() somewhere and end up causing side effects.
463 # evals() somewhere and end up causing side effects.
464
464
465 self.line_split = re.compile(r'^([\s*,;/])'
465 self.line_split = re.compile(r'^([\s*,;/])'
466 r'([\?\w\.]+\w*\s*)'
466 r'([\?\w\.]+\w*\s*)'
467 r'(\(?.*$)')
467 r'(\(?.*$)')
468
468
469 # Original re, keep around for a while in case changes break something
469 # Original re, keep around for a while in case changes break something
470 #self.line_split = re.compile(r'(^[\s*!\?%,/]?)'
470 #self.line_split = re.compile(r'(^[\s*!\?%,/]?)'
471 # r'(\s*[\?\w\.]+\w*\s*)'
471 # r'(\s*[\?\w\.]+\w*\s*)'
472 # r'(\(?.*$)')
472 # r'(\(?.*$)')
473
473
474 # RegExp to identify potential function names
474 # RegExp to identify potential function names
475 self.re_fun_name = re.compile(r'[a-zA-Z_]([a-zA-Z0-9_.]*) *$')
475 self.re_fun_name = re.compile(r'[a-zA-Z_]([a-zA-Z0-9_.]*) *$')
476 # RegExp to exclude strings with this start from autocalling
476 # RegExp to exclude strings with this start from autocalling
477 self.re_exclude_auto = re.compile('^[!=()<>,\*/\+-]|^is ')
477 self.re_exclude_auto = re.compile('^[!=()<>,\*/\+-]|^is ')
478
478
479 # try to catch also methods for stuff in lists/tuples/dicts: off
479 # try to catch also methods for stuff in lists/tuples/dicts: off
480 # (experimental). For this to work, the line_split regexp would need
480 # (experimental). For this to work, the line_split regexp would need
481 # to be modified so it wouldn't break things at '['. That line is
481 # to be modified so it wouldn't break things at '['. That line is
482 # nasty enough that I shouldn't change it until I can test it _well_.
482 # nasty enough that I shouldn't change it until I can test it _well_.
483 #self.re_fun_name = re.compile (r'[a-zA-Z_]([a-zA-Z0-9_.\[\]]*) ?$')
483 #self.re_fun_name = re.compile (r'[a-zA-Z_]([a-zA-Z0-9_.\[\]]*) ?$')
484
484
485 # keep track of where we started running (mainly for crash post-mortem)
485 # keep track of where we started running (mainly for crash post-mortem)
486 self.starting_dir = os.getcwd()
486 self.starting_dir = os.getcwd()
487
487
488 # Various switches which can be set
488 # Various switches which can be set
489 self.CACHELENGTH = 5000 # this is cheap, it's just text
489 self.CACHELENGTH = 5000 # this is cheap, it's just text
490 self.BANNER = "Python %(version)s on %(platform)s\n" % sys.__dict__
490 self.BANNER = "Python %(version)s on %(platform)s\n" % sys.__dict__
491 self.banner2 = banner2
491 self.banner2 = banner2
492
492
493 # TraceBack handlers:
493 # TraceBack handlers:
494
494
495 # Syntax error handler.
495 # Syntax error handler.
496 self.SyntaxTB = SyntaxTB(color_scheme='NoColor')
496 self.SyntaxTB = SyntaxTB(color_scheme='NoColor')
497
497
498 # The interactive one is initialized with an offset, meaning we always
498 # The interactive one is initialized with an offset, meaning we always
499 # want to remove the topmost item in the traceback, which is our own
499 # want to remove the topmost item in the traceback, which is our own
500 # internal code. Valid modes: ['Plain','Context','Verbose']
500 # internal code. Valid modes: ['Plain','Context','Verbose']
501 self.InteractiveTB = ultraTB.AutoFormattedTB(mode = 'Plain',
501 self.InteractiveTB = ultraTB.AutoFormattedTB(mode = 'Plain',
502 color_scheme='NoColor',
502 color_scheme='NoColor',
503 tb_offset = 1)
503 tb_offset = 1)
504
504
505 # IPython itself shouldn't crash. This will produce a detailed
505 # IPython itself shouldn't crash. This will produce a detailed
506 # post-mortem if it does. But we only install the crash handler for
506 # post-mortem if it does. But we only install the crash handler for
507 # non-threaded shells, the threaded ones use a normal verbose reporter
507 # non-threaded shells, the threaded ones use a normal verbose reporter
508 # and lose the crash handler. This is because exceptions in the main
508 # and lose the crash handler. This is because exceptions in the main
509 # thread (such as in GUI code) propagate directly to sys.excepthook,
509 # thread (such as in GUI code) propagate directly to sys.excepthook,
510 # and there's no point in printing crash dumps for every user exception.
510 # and there's no point in printing crash dumps for every user exception.
511 if self.isthreaded:
511 if self.isthreaded:
512 sys.excepthook = ultraTB.FormattedTB()
512 sys.excepthook = ultraTB.FormattedTB()
513 else:
513 else:
514 from IPython import CrashHandler
514 from IPython import CrashHandler
515 sys.excepthook = CrashHandler.CrashHandler(self)
515 sys.excepthook = CrashHandler.CrashHandler(self)
516
516
517 # The instance will store a pointer to this, so that runtime code
517 # The instance will store a pointer to this, so that runtime code
518 # (such as magics) can access it. This is because during the
518 # (such as magics) can access it. This is because during the
519 # read-eval loop, it gets temporarily overwritten (to deal with GUI
519 # read-eval loop, it gets temporarily overwritten (to deal with GUI
520 # frameworks).
520 # frameworks).
521 self.sys_excepthook = sys.excepthook
521 self.sys_excepthook = sys.excepthook
522
522
523 # and add any custom exception handlers the user may have specified
523 # and add any custom exception handlers the user may have specified
524 self.set_custom_exc(*custom_exceptions)
524 self.set_custom_exc(*custom_exceptions)
525
525
526 # Object inspector
526 # Object inspector
527 self.inspector = OInspect.Inspector(OInspect.InspectColors,
527 self.inspector = OInspect.Inspector(OInspect.InspectColors,
528 PyColorize.ANSICodeColors,
528 PyColorize.ANSICodeColors,
529 'NoColor')
529 'NoColor')
530 # indentation management
530 # indentation management
531 self.autoindent = False
531 self.autoindent = False
532 self.indent_current_nsp = 0
532 self.indent_current_nsp = 0
533 self.indent_current = '' # actual indent string
533 self.indent_current = '' # actual indent string
534
534
535 # Make some aliases automatically
535 # Make some aliases automatically
536 # Prepare list of shell aliases to auto-define
536 # Prepare list of shell aliases to auto-define
537 if os.name == 'posix':
537 if os.name == 'posix':
538 auto_alias = ('mkdir mkdir', 'rmdir rmdir',
538 auto_alias = ('mkdir mkdir', 'rmdir rmdir',
539 'mv mv -i','rm rm -i','cp cp -i',
539 'mv mv -i','rm rm -i','cp cp -i',
540 'cat cat','less less','clear clear',
540 'cat cat','less less','clear clear',
541 # a better ls
541 # a better ls
542 'ls ls -F',
542 'ls ls -F',
543 # long ls
543 # long ls
544 'll ls -lF',
544 'll ls -lF',
545 # color ls
545 # color ls
546 'lc ls -F -o --color',
546 'lc ls -F -o --color',
547 # ls normal files only
547 # ls normal files only
548 'lf ls -F -o --color %l | grep ^-',
548 'lf ls -F -o --color %l | grep ^-',
549 # ls symbolic links
549 # ls symbolic links
550 'lk ls -F -o --color %l | grep ^l',
550 'lk ls -F -o --color %l | grep ^l',
551 # directories or links to directories,
551 # directories or links to directories,
552 'ldir ls -F -o --color %l | grep /$',
552 'ldir ls -F -o --color %l | grep /$',
553 # things which are executable
553 # things which are executable
554 'lx ls -F -o --color %l | grep ^-..x',
554 'lx ls -F -o --color %l | grep ^-..x',
555 )
555 )
556 elif os.name in ['nt','dos']:
556 elif os.name in ['nt','dos']:
557 auto_alias = ('dir dir /on', 'ls dir /on',
557 auto_alias = ('dir dir /on', 'ls dir /on',
558 'ddir dir /ad /on', 'ldir dir /ad /on',
558 'ddir dir /ad /on', 'ldir dir /ad /on',
559 'mkdir mkdir','rmdir rmdir','echo echo',
559 'mkdir mkdir','rmdir rmdir','echo echo',
560 'ren ren','cls cls','copy copy')
560 'ren ren','cls cls','copy copy')
561 else:
561 else:
562 auto_alias = ()
562 auto_alias = ()
563 self.auto_alias = map(lambda s:s.split(None,1),auto_alias)
563 self.auto_alias = map(lambda s:s.split(None,1),auto_alias)
564 # Call the actual (public) initializer
564 # Call the actual (public) initializer
565 self.init_auto_alias()
565 self.init_auto_alias()
566 # end __init__
566 # end __init__
567
567
568 def post_config_initialization(self):
568 def post_config_initialization(self):
569 """Post configuration init method
569 """Post configuration init method
570
570
571 This is called after the configuration files have been processed to
571 This is called after the configuration files have been processed to
572 'finalize' the initialization."""
572 'finalize' the initialization."""
573
573
574 rc = self.rc
574 rc = self.rc
575
575
576 # Load readline proper
576 # Load readline proper
577 if rc.readline:
577 if rc.readline:
578 self.init_readline()
578 self.init_readline()
579
579
580 # log system
580 # log system
581 self.logger = Logger(self,logfname='ipython_log.py',logmode='rotate')
581 self.logger = Logger(self,logfname='ipython_log.py',logmode='rotate')
582 # local shortcut, this is used a LOT
582 # local shortcut, this is used a LOT
583 self.log = self.logger.log
583 self.log = self.logger.log
584
584
585 # Initialize cache, set in/out prompts and printing system
585 # Initialize cache, set in/out prompts and printing system
586 self.outputcache = CachedOutput(self,
586 self.outputcache = CachedOutput(self,
587 rc.cache_size,
587 rc.cache_size,
588 rc.pprint,
588 rc.pprint,
589 input_sep = rc.separate_in,
589 input_sep = rc.separate_in,
590 output_sep = rc.separate_out,
590 output_sep = rc.separate_out,
591 output_sep2 = rc.separate_out2,
591 output_sep2 = rc.separate_out2,
592 ps1 = rc.prompt_in1,
592 ps1 = rc.prompt_in1,
593 ps2 = rc.prompt_in2,
593 ps2 = rc.prompt_in2,
594 ps_out = rc.prompt_out,
594 ps_out = rc.prompt_out,
595 pad_left = rc.prompts_pad_left)
595 pad_left = rc.prompts_pad_left)
596
596
597 # user may have over-ridden the default print hook:
597 # user may have over-ridden the default print hook:
598 try:
598 try:
599 self.outputcache.__class__.display = self.hooks.display
599 self.outputcache.__class__.display = self.hooks.display
600 except AttributeError:
600 except AttributeError:
601 pass
601 pass
602
602
603 # I don't like assigning globally to sys, because it means when embedding
603 # I don't like assigning globally to sys, because it means when embedding
604 # instances, each embedded instance overrides the previous choice. But
604 # instances, each embedded instance overrides the previous choice. But
605 # sys.displayhook seems to be called internally by exec, so I don't see a
605 # sys.displayhook seems to be called internally by exec, so I don't see a
606 # way around it.
606 # way around it.
607 sys.displayhook = self.outputcache
607 sys.displayhook = self.outputcache
608
608
609 # Set user colors (don't do it in the constructor above so that it
609 # Set user colors (don't do it in the constructor above so that it
610 # doesn't crash if colors option is invalid)
610 # doesn't crash if colors option is invalid)
611 self.magic_colors(rc.colors)
611 self.magic_colors(rc.colors)
612
612
613 # Set calling of pdb on exceptions
613 # Set calling of pdb on exceptions
614 self.call_pdb = rc.pdb
614 self.call_pdb = rc.pdb
615
615
616 # Load user aliases
616 # Load user aliases
617 for alias in rc.alias:
617 for alias in rc.alias:
618 self.magic_alias(alias)
618 self.magic_alias(alias)
619
619
620 # dynamic data that survives through sessions
620 # dynamic data that survives through sessions
621 # XXX make the filename a config option?
621 # XXX make the filename a config option?
622 persist_base = 'persist'
622 persist_base = 'persist'
623 if rc.profile:
623 if rc.profile:
624 persist_base += '_%s' % rc.profile
624 persist_base += '_%s' % rc.profile
625 self.persist_fname = os.path.join(rc.ipythondir,persist_base)
625 self.persist_fname = os.path.join(rc.ipythondir,persist_base)
626
626
627 try:
627 try:
628 self.persist = pickle.load(file(self.persist_fname))
628 self.persist = pickle.load(file(self.persist_fname))
629 except:
629 except:
630 self.persist = {}
630 self.persist = {}
631
631
632
632
633 for (key, value) in [(k[2:],v) for (k,v) in self.persist.items() if k.startswith('S:')]:
633 for (key, value) in [(k[2:],v) for (k,v) in self.persist.items() if k.startswith('S:')]:
634 try:
634 try:
635 obj = pickle.loads(value)
635 obj = pickle.loads(value)
636 except:
636 except:
637
637
638 print "Unable to restore variable '%s', ignoring (use %%store -d to forget!)" % key
638 print "Unable to restore variable '%s', ignoring (use %%store -d to forget!)" % key
639 print "The error was:",sys.exc_info()[0]
639 print "The error was:",sys.exc_info()[0]
640 continue
640 continue
641
641
642
642
643 self.user_ns[key] = obj
643 self.user_ns[key] = obj
644
644
645 def add_builtins(self):
645 def add_builtins(self):
646 """Store ipython references into the builtin namespace.
646 """Store ipython references into the builtin namespace.
647
647
648 Some parts of ipython operate via builtins injected here, which hold a
648 Some parts of ipython operate via builtins injected here, which hold a
649 reference to IPython itself."""
649 reference to IPython itself."""
650
650
651 builtins_new = dict(__IPYTHON__ = self,
651 builtins_new = dict(__IPYTHON__ = self,
652 ip_set_hook = self.set_hook,
652 ip_set_hook = self.set_hook,
653 jobs = self.jobs,
653 jobs = self.jobs,
654 ipmagic = self.ipmagic,
654 ipmagic = self.ipmagic,
655 ipalias = self.ipalias,
655 ipalias = self.ipalias,
656 ipsystem = self.ipsystem,
656 ipsystem = self.ipsystem,
657 )
657 )
658 for biname,bival in builtins_new.items():
658 for biname,bival in builtins_new.items():
659 try:
659 try:
660 # store the orignal value so we can restore it
660 # store the orignal value so we can restore it
661 self.builtins_added[biname] = __builtin__.__dict__[biname]
661 self.builtins_added[biname] = __builtin__.__dict__[biname]
662 except KeyError:
662 except KeyError:
663 # or mark that it wasn't defined, and we'll just delete it at
663 # or mark that it wasn't defined, and we'll just delete it at
664 # cleanup
664 # cleanup
665 self.builtins_added[biname] = Undefined
665 self.builtins_added[biname] = Undefined
666 __builtin__.__dict__[biname] = bival
666 __builtin__.__dict__[biname] = bival
667
667
668 # Keep in the builtins a flag for when IPython is active. We set it
668 # Keep in the builtins a flag for when IPython is active. We set it
669 # with setdefault so that multiple nested IPythons don't clobber one
669 # with setdefault so that multiple nested IPythons don't clobber one
670 # another. Each will increase its value by one upon being activated,
670 # another. Each will increase its value by one upon being activated,
671 # which also gives us a way to determine the nesting level.
671 # which also gives us a way to determine the nesting level.
672 __builtin__.__dict__.setdefault('__IPYTHON__active',0)
672 __builtin__.__dict__.setdefault('__IPYTHON__active',0)
673
673
674 def clean_builtins(self):
674 def clean_builtins(self):
675 """Remove any builtins which might have been added by add_builtins, or
675 """Remove any builtins which might have been added by add_builtins, or
676 restore overwritten ones to their previous values."""
676 restore overwritten ones to their previous values."""
677 for biname,bival in self.builtins_added.items():
677 for biname,bival in self.builtins_added.items():
678 if bival is Undefined:
678 if bival is Undefined:
679 del __builtin__.__dict__[biname]
679 del __builtin__.__dict__[biname]
680 else:
680 else:
681 __builtin__.__dict__[biname] = bival
681 __builtin__.__dict__[biname] = bival
682 self.builtins_added.clear()
682 self.builtins_added.clear()
683
683
684 def set_hook(self,name,hook):
684 def set_hook(self,name,hook):
685 """set_hook(name,hook) -> sets an internal IPython hook.
685 """set_hook(name,hook) -> sets an internal IPython hook.
686
686
687 IPython exposes some of its internal API as user-modifiable hooks. By
687 IPython exposes some of its internal API as user-modifiable hooks. By
688 resetting one of these hooks, you can modify IPython's behavior to
688 resetting one of these hooks, you can modify IPython's behavior to
689 call at runtime your own routines."""
689 call at runtime your own routines."""
690
690
691 # At some point in the future, this should validate the hook before it
691 # At some point in the future, this should validate the hook before it
692 # accepts it. Probably at least check that the hook takes the number
692 # accepts it. Probably at least check that the hook takes the number
693 # of args it's supposed to.
693 # of args it's supposed to.
694 setattr(self.hooks,name,new.instancemethod(hook,self,self.__class__))
694 setattr(self.hooks,name,new.instancemethod(hook,self,self.__class__))
695
695
696 def set_custom_exc(self,exc_tuple,handler):
696 def set_custom_exc(self,exc_tuple,handler):
697 """set_custom_exc(exc_tuple,handler)
697 """set_custom_exc(exc_tuple,handler)
698
698
699 Set a custom exception handler, which will be called if any of the
699 Set a custom exception handler, which will be called if any of the
700 exceptions in exc_tuple occur in the mainloop (specifically, in the
700 exceptions in exc_tuple occur in the mainloop (specifically, in the
701 runcode() method.
701 runcode() method.
702
702
703 Inputs:
703 Inputs:
704
704
705 - exc_tuple: a *tuple* of valid exceptions to call the defined
705 - exc_tuple: a *tuple* of valid exceptions to call the defined
706 handler for. It is very important that you use a tuple, and NOT A
706 handler for. It is very important that you use a tuple, and NOT A
707 LIST here, because of the way Python's except statement works. If
707 LIST here, because of the way Python's except statement works. If
708 you only want to trap a single exception, use a singleton tuple:
708 you only want to trap a single exception, use a singleton tuple:
709
709
710 exc_tuple == (MyCustomException,)
710 exc_tuple == (MyCustomException,)
711
711
712 - handler: this must be defined as a function with the following
712 - handler: this must be defined as a function with the following
713 basic interface: def my_handler(self,etype,value,tb).
713 basic interface: def my_handler(self,etype,value,tb).
714
714
715 This will be made into an instance method (via new.instancemethod)
715 This will be made into an instance method (via new.instancemethod)
716 of IPython itself, and it will be called if any of the exceptions
716 of IPython itself, and it will be called if any of the exceptions
717 listed in the exc_tuple are caught. If the handler is None, an
717 listed in the exc_tuple are caught. If the handler is None, an
718 internal basic one is used, which just prints basic info.
718 internal basic one is used, which just prints basic info.
719
719
720 WARNING: by putting in your own exception handler into IPython's main
720 WARNING: by putting in your own exception handler into IPython's main
721 execution loop, you run a very good chance of nasty crashes. This
721 execution loop, you run a very good chance of nasty crashes. This
722 facility should only be used if you really know what you are doing."""
722 facility should only be used if you really know what you are doing."""
723
723
724 assert type(exc_tuple)==type(()) , \
724 assert type(exc_tuple)==type(()) , \
725 "The custom exceptions must be given AS A TUPLE."
725 "The custom exceptions must be given AS A TUPLE."
726
726
727 def dummy_handler(self,etype,value,tb):
727 def dummy_handler(self,etype,value,tb):
728 print '*** Simple custom exception handler ***'
728 print '*** Simple custom exception handler ***'
729 print 'Exception type :',etype
729 print 'Exception type :',etype
730 print 'Exception value:',value
730 print 'Exception value:',value
731 print 'Traceback :',tb
731 print 'Traceback :',tb
732 print 'Source code :','\n'.join(self.buffer)
732 print 'Source code :','\n'.join(self.buffer)
733
733
734 if handler is None: handler = dummy_handler
734 if handler is None: handler = dummy_handler
735
735
736 self.CustomTB = new.instancemethod(handler,self,self.__class__)
736 self.CustomTB = new.instancemethod(handler,self,self.__class__)
737 self.custom_exceptions = exc_tuple
737 self.custom_exceptions = exc_tuple
738
738
739 def set_custom_completer(self,completer,pos=0):
739 def set_custom_completer(self,completer,pos=0):
740 """set_custom_completer(completer,pos=0)
740 """set_custom_completer(completer,pos=0)
741
741
742 Adds a new custom completer function.
742 Adds a new custom completer function.
743
743
744 The position argument (defaults to 0) is the index in the completers
744 The position argument (defaults to 0) is the index in the completers
745 list where you want the completer to be inserted."""
745 list where you want the completer to be inserted."""
746
746
747 newcomp = new.instancemethod(completer,self.Completer,
747 newcomp = new.instancemethod(completer,self.Completer,
748 self.Completer.__class__)
748 self.Completer.__class__)
749 self.Completer.matchers.insert(pos,newcomp)
749 self.Completer.matchers.insert(pos,newcomp)
750
750
751 def _get_call_pdb(self):
751 def _get_call_pdb(self):
752 return self._call_pdb
752 return self._call_pdb
753
753
754 def _set_call_pdb(self,val):
754 def _set_call_pdb(self,val):
755
755
756 if val not in (0,1,False,True):
756 if val not in (0,1,False,True):
757 raise ValueError,'new call_pdb value must be boolean'
757 raise ValueError,'new call_pdb value must be boolean'
758
758
759 # store value in instance
759 # store value in instance
760 self._call_pdb = val
760 self._call_pdb = val
761
761
762 # notify the actual exception handlers
762 # notify the actual exception handlers
763 self.InteractiveTB.call_pdb = val
763 self.InteractiveTB.call_pdb = val
764 if self.isthreaded:
764 if self.isthreaded:
765 try:
765 try:
766 self.sys_excepthook.call_pdb = val
766 self.sys_excepthook.call_pdb = val
767 except:
767 except:
768 warn('Failed to activate pdb for threaded exception handler')
768 warn('Failed to activate pdb for threaded exception handler')
769
769
770 call_pdb = property(_get_call_pdb,_set_call_pdb,None,
770 call_pdb = property(_get_call_pdb,_set_call_pdb,None,
771 'Control auto-activation of pdb at exceptions')
771 'Control auto-activation of pdb at exceptions')
772
772
773
773
774 # These special functions get installed in the builtin namespace, to
774 # These special functions get installed in the builtin namespace, to
775 # provide programmatic (pure python) access to magics, aliases and system
775 # provide programmatic (pure python) access to magics, aliases and system
776 # calls. This is important for logging, user scripting, and more.
776 # calls. This is important for logging, user scripting, and more.
777
777
778 # We are basically exposing, via normal python functions, the three
778 # We are basically exposing, via normal python functions, the three
779 # mechanisms in which ipython offers special call modes (magics for
779 # mechanisms in which ipython offers special call modes (magics for
780 # internal control, aliases for direct system access via pre-selected
780 # internal control, aliases for direct system access via pre-selected
781 # names, and !cmd for calling arbitrary system commands).
781 # names, and !cmd for calling arbitrary system commands).
782
782
783 def ipmagic(self,arg_s):
783 def ipmagic(self,arg_s):
784 """Call a magic function by name.
784 """Call a magic function by name.
785
785
786 Input: a string containing the name of the magic function to call and any
786 Input: a string containing the name of the magic function to call and any
787 additional arguments to be passed to the magic.
787 additional arguments to be passed to the magic.
788
788
789 ipmagic('name -opt foo bar') is equivalent to typing at the ipython
789 ipmagic('name -opt foo bar') is equivalent to typing at the ipython
790 prompt:
790 prompt:
791
791
792 In[1]: %name -opt foo bar
792 In[1]: %name -opt foo bar
793
793
794 To call a magic without arguments, simply use ipmagic('name').
794 To call a magic without arguments, simply use ipmagic('name').
795
795
796 This provides a proper Python function to call IPython's magics in any
796 This provides a proper Python function to call IPython's magics in any
797 valid Python code you can type at the interpreter, including loops and
797 valid Python code you can type at the interpreter, including loops and
798 compound statements. It is added by IPython to the Python builtin
798 compound statements. It is added by IPython to the Python builtin
799 namespace upon initialization."""
799 namespace upon initialization."""
800
800
801 args = arg_s.split(' ',1)
801 args = arg_s.split(' ',1)
802 magic_name = args[0]
802 magic_name = args[0]
803 if magic_name.startswith(self.ESC_MAGIC):
803 if magic_name.startswith(self.ESC_MAGIC):
804 magic_name = magic_name[1:]
804 magic_name = magic_name[1:]
805 try:
805 try:
806 magic_args = args[1]
806 magic_args = args[1]
807 except IndexError:
807 except IndexError:
808 magic_args = ''
808 magic_args = ''
809 fn = getattr(self,'magic_'+magic_name,None)
809 fn = getattr(self,'magic_'+magic_name,None)
810 if fn is None:
810 if fn is None:
811 error("Magic function `%s` not found." % magic_name)
811 error("Magic function `%s` not found." % magic_name)
812 else:
812 else:
813 magic_args = self.var_expand(magic_args)
813 magic_args = self.var_expand(magic_args)
814 return fn(magic_args)
814 return fn(magic_args)
815
815
816 def ipalias(self,arg_s):
816 def ipalias(self,arg_s):
817 """Call an alias by name.
817 """Call an alias by name.
818
818
819 Input: a string containing the name of the alias to call and any
819 Input: a string containing the name of the alias to call and any
820 additional arguments to be passed to the magic.
820 additional arguments to be passed to the magic.
821
821
822 ipalias('name -opt foo bar') is equivalent to typing at the ipython
822 ipalias('name -opt foo bar') is equivalent to typing at the ipython
823 prompt:
823 prompt:
824
824
825 In[1]: name -opt foo bar
825 In[1]: name -opt foo bar
826
826
827 To call an alias without arguments, simply use ipalias('name').
827 To call an alias without arguments, simply use ipalias('name').
828
828
829 This provides a proper Python function to call IPython's aliases in any
829 This provides a proper Python function to call IPython's aliases in any
830 valid Python code you can type at the interpreter, including loops and
830 valid Python code you can type at the interpreter, including loops and
831 compound statements. It is added by IPython to the Python builtin
831 compound statements. It is added by IPython to the Python builtin
832 namespace upon initialization."""
832 namespace upon initialization."""
833
833
834 args = arg_s.split(' ',1)
834 args = arg_s.split(' ',1)
835 alias_name = args[0]
835 alias_name = args[0]
836 try:
836 try:
837 alias_args = args[1]
837 alias_args = args[1]
838 except IndexError:
838 except IndexError:
839 alias_args = ''
839 alias_args = ''
840 if alias_name in self.alias_table:
840 if alias_name in self.alias_table:
841 self.call_alias(alias_name,alias_args)
841 self.call_alias(alias_name,alias_args)
842 else:
842 else:
843 error("Alias `%s` not found." % alias_name)
843 error("Alias `%s` not found." % alias_name)
844
844
845 def ipsystem(self,arg_s):
845 def ipsystem(self,arg_s):
846 """Make a system call, using IPython."""
846 """Make a system call, using IPython."""
847
847
848 self.system(arg_s)
848 self.system(arg_s)
849
849
850 def complete(self,text):
850 def complete(self,text):
851 """Return a sorted list of all possible completions on text.
851 """Return a sorted list of all possible completions on text.
852
852
853 Inputs:
853 Inputs:
854
854
855 - text: a string of text to be completed on.
855 - text: a string of text to be completed on.
856
856
857 This is a wrapper around the completion mechanism, similar to what
857 This is a wrapper around the completion mechanism, similar to what
858 readline does at the command line when the TAB key is hit. By
858 readline does at the command line when the TAB key is hit. By
859 exposing it as a method, it can be used by other non-readline
859 exposing it as a method, it can be used by other non-readline
860 environments (such as GUIs) for text completion.
860 environments (such as GUIs) for text completion.
861
861
862 Simple usage example:
862 Simple usage example:
863
863
864 In [1]: x = 'hello'
864 In [1]: x = 'hello'
865
865
866 In [2]: __IP.complete('x.l')
866 In [2]: __IP.complete('x.l')
867 Out[2]: ['x.ljust', 'x.lower', 'x.lstrip']"""
867 Out[2]: ['x.ljust', 'x.lower', 'x.lstrip']"""
868
868
869 complete = self.Completer.complete
869 complete = self.Completer.complete
870 state = 0
870 state = 0
871 # use a dict so we get unique keys, since ipyhton's multiple
871 # use a dict so we get unique keys, since ipyhton's multiple
872 # completers can return duplicates.
872 # completers can return duplicates.
873 comps = {}
873 comps = {}
874 while True:
874 while True:
875 newcomp = complete(text,state)
875 newcomp = complete(text,state)
876 if newcomp is None:
876 if newcomp is None:
877 break
877 break
878 comps[newcomp] = 1
878 comps[newcomp] = 1
879 state += 1
879 state += 1
880 outcomps = comps.keys()
880 outcomps = comps.keys()
881 outcomps.sort()
881 outcomps.sort()
882 return outcomps
882 return outcomps
883
883
884 def set_completer_frame(self, frame=None):
884 def set_completer_frame(self, frame=None):
885 if frame:
885 if frame:
886 self.Completer.namespace = frame.f_locals
886 self.Completer.namespace = frame.f_locals
887 self.Completer.global_namespace = frame.f_globals
887 self.Completer.global_namespace = frame.f_globals
888 else:
888 else:
889 self.Completer.namespace = self.user_ns
889 self.Completer.namespace = self.user_ns
890 self.Completer.global_namespace = self.user_global_ns
890 self.Completer.global_namespace = self.user_global_ns
891
891
892 def init_auto_alias(self):
892 def init_auto_alias(self):
893 """Define some aliases automatically.
893 """Define some aliases automatically.
894
894
895 These are ALL parameter-less aliases"""
895 These are ALL parameter-less aliases"""
896
896
897 for alias,cmd in self.auto_alias:
897 for alias,cmd in self.auto_alias:
898 self.alias_table[alias] = (0,cmd)
898 self.alias_table[alias] = (0,cmd)
899
899
900 def alias_table_validate(self,verbose=0):
900 def alias_table_validate(self,verbose=0):
901 """Update information about the alias table.
901 """Update information about the alias table.
902
902
903 In particular, make sure no Python keywords/builtins are in it."""
903 In particular, make sure no Python keywords/builtins are in it."""
904
904
905 no_alias = self.no_alias
905 no_alias = self.no_alias
906 for k in self.alias_table.keys():
906 for k in self.alias_table.keys():
907 if k in no_alias:
907 if k in no_alias:
908 del self.alias_table[k]
908 del self.alias_table[k]
909 if verbose:
909 if verbose:
910 print ("Deleting alias <%s>, it's a Python "
910 print ("Deleting alias <%s>, it's a Python "
911 "keyword or builtin." % k)
911 "keyword or builtin." % k)
912
912
913 def set_autoindent(self,value=None):
913 def set_autoindent(self,value=None):
914 """Set the autoindent flag, checking for readline support.
914 """Set the autoindent flag, checking for readline support.
915
915
916 If called with no arguments, it acts as a toggle."""
916 If called with no arguments, it acts as a toggle."""
917
917
918 if not self.has_readline:
918 if not self.has_readline:
919 if os.name == 'posix':
919 if os.name == 'posix':
920 warn("The auto-indent feature requires the readline library")
920 warn("The auto-indent feature requires the readline library")
921 self.autoindent = 0
921 self.autoindent = 0
922 return
922 return
923 if value is None:
923 if value is None:
924 self.autoindent = not self.autoindent
924 self.autoindent = not self.autoindent
925 else:
925 else:
926 self.autoindent = value
926 self.autoindent = value
927
927
928 def rc_set_toggle(self,rc_field,value=None):
928 def rc_set_toggle(self,rc_field,value=None):
929 """Set or toggle a field in IPython's rc config. structure.
929 """Set or toggle a field in IPython's rc config. structure.
930
930
931 If called with no arguments, it acts as a toggle.
931 If called with no arguments, it acts as a toggle.
932
932
933 If called with a non-existent field, the resulting AttributeError
933 If called with a non-existent field, the resulting AttributeError
934 exception will propagate out."""
934 exception will propagate out."""
935
935
936 rc_val = getattr(self.rc,rc_field)
936 rc_val = getattr(self.rc,rc_field)
937 if value is None:
937 if value is None:
938 value = not rc_val
938 value = not rc_val
939 setattr(self.rc,rc_field,value)
939 setattr(self.rc,rc_field,value)
940
940
941 def user_setup(self,ipythondir,rc_suffix,mode='install'):
941 def user_setup(self,ipythondir,rc_suffix,mode='install'):
942 """Install the user configuration directory.
942 """Install the user configuration directory.
943
943
944 Can be called when running for the first time or to upgrade the user's
944 Can be called when running for the first time or to upgrade the user's
945 .ipython/ directory with the mode parameter. Valid modes are 'install'
945 .ipython/ directory with the mode parameter. Valid modes are 'install'
946 and 'upgrade'."""
946 and 'upgrade'."""
947
947
948 def wait():
948 def wait():
949 try:
949 try:
950 raw_input("Please press <RETURN> to start IPython.")
950 raw_input("Please press <RETURN> to start IPython.")
951 except EOFError:
951 except EOFError:
952 print >> Term.cout
952 print >> Term.cout
953 print '*'*70
953 print '*'*70
954
954
955 cwd = os.getcwd() # remember where we started
955 cwd = os.getcwd() # remember where we started
956 glb = glob.glob
956 glb = glob.glob
957 print '*'*70
957 print '*'*70
958 if mode == 'install':
958 if mode == 'install':
959 print \
959 print \
960 """Welcome to IPython. I will try to create a personal configuration directory
960 """Welcome to IPython. I will try to create a personal configuration directory
961 where you can customize many aspects of IPython's functionality in:\n"""
961 where you can customize many aspects of IPython's functionality in:\n"""
962 else:
962 else:
963 print 'I am going to upgrade your configuration in:'
963 print 'I am going to upgrade your configuration in:'
964
964
965 print ipythondir
965 print ipythondir
966
966
967 rcdirend = os.path.join('IPython','UserConfig')
967 rcdirend = os.path.join('IPython','UserConfig')
968 cfg = lambda d: os.path.join(d,rcdirend)
968 cfg = lambda d: os.path.join(d,rcdirend)
969 try:
969 try:
970 rcdir = filter(os.path.isdir,map(cfg,sys.path))[0]
970 rcdir = filter(os.path.isdir,map(cfg,sys.path))[0]
971 except IOError:
971 except IOError:
972 warning = """
972 warning = """
973 Installation error. IPython's directory was not found.
973 Installation error. IPython's directory was not found.
974
974
975 Check the following:
975 Check the following:
976
976
977 The ipython/IPython directory should be in a directory belonging to your
977 The ipython/IPython directory should be in a directory belonging to your
978 PYTHONPATH environment variable (that is, it should be in a directory
978 PYTHONPATH environment variable (that is, it should be in a directory
979 belonging to sys.path). You can copy it explicitly there or just link to it.
979 belonging to sys.path). You can copy it explicitly there or just link to it.
980
980
981 IPython will proceed with builtin defaults.
981 IPython will proceed with builtin defaults.
982 """
982 """
983 warn(warning)
983 warn(warning)
984 wait()
984 wait()
985 return
985 return
986
986
987 if mode == 'install':
987 if mode == 'install':
988 try:
988 try:
989 shutil.copytree(rcdir,ipythondir)
989 shutil.copytree(rcdir,ipythondir)
990 os.chdir(ipythondir)
990 os.chdir(ipythondir)
991 rc_files = glb("ipythonrc*")
991 rc_files = glb("ipythonrc*")
992 for rc_file in rc_files:
992 for rc_file in rc_files:
993 os.rename(rc_file,rc_file+rc_suffix)
993 os.rename(rc_file,rc_file+rc_suffix)
994 except:
994 except:
995 warning = """
995 warning = """
996
996
997 There was a problem with the installation:
997 There was a problem with the installation:
998 %s
998 %s
999 Try to correct it or contact the developers if you think it's a bug.
999 Try to correct it or contact the developers if you think it's a bug.
1000 IPython will proceed with builtin defaults.""" % sys.exc_info()[1]
1000 IPython will proceed with builtin defaults.""" % sys.exc_info()[1]
1001 warn(warning)
1001 warn(warning)
1002 wait()
1002 wait()
1003 return
1003 return
1004
1004
1005 elif mode == 'upgrade':
1005 elif mode == 'upgrade':
1006 try:
1006 try:
1007 os.chdir(ipythondir)
1007 os.chdir(ipythondir)
1008 except:
1008 except:
1009 print """
1009 print """
1010 Can not upgrade: changing to directory %s failed. Details:
1010 Can not upgrade: changing to directory %s failed. Details:
1011 %s
1011 %s
1012 """ % (ipythondir,sys.exc_info()[1])
1012 """ % (ipythondir,sys.exc_info()[1])
1013 wait()
1013 wait()
1014 return
1014 return
1015 else:
1015 else:
1016 sources = glb(os.path.join(rcdir,'[A-Za-z]*'))
1016 sources = glb(os.path.join(rcdir,'[A-Za-z]*'))
1017 for new_full_path in sources:
1017 for new_full_path in sources:
1018 new_filename = os.path.basename(new_full_path)
1018 new_filename = os.path.basename(new_full_path)
1019 if new_filename.startswith('ipythonrc'):
1019 if new_filename.startswith('ipythonrc'):
1020 new_filename = new_filename + rc_suffix
1020 new_filename = new_filename + rc_suffix
1021 # The config directory should only contain files, skip any
1021 # The config directory should only contain files, skip any
1022 # directories which may be there (like CVS)
1022 # directories which may be there (like CVS)
1023 if os.path.isdir(new_full_path):
1023 if os.path.isdir(new_full_path):
1024 continue
1024 continue
1025 if os.path.exists(new_filename):
1025 if os.path.exists(new_filename):
1026 old_file = new_filename+'.old'
1026 old_file = new_filename+'.old'
1027 if os.path.exists(old_file):
1027 if os.path.exists(old_file):
1028 os.remove(old_file)
1028 os.remove(old_file)
1029 os.rename(new_filename,old_file)
1029 os.rename(new_filename,old_file)
1030 shutil.copy(new_full_path,new_filename)
1030 shutil.copy(new_full_path,new_filename)
1031 else:
1031 else:
1032 raise ValueError,'unrecognized mode for install:',`mode`
1032 raise ValueError,'unrecognized mode for install:',`mode`
1033
1033
1034 # Fix line-endings to those native to each platform in the config
1034 # Fix line-endings to those native to each platform in the config
1035 # directory.
1035 # directory.
1036 try:
1036 try:
1037 os.chdir(ipythondir)
1037 os.chdir(ipythondir)
1038 except:
1038 except:
1039 print """
1039 print """
1040 Problem: changing to directory %s failed.
1040 Problem: changing to directory %s failed.
1041 Details:
1041 Details:
1042 %s
1042 %s
1043
1043
1044 Some configuration files may have incorrect line endings. This should not
1044 Some configuration files may have incorrect line endings. This should not
1045 cause any problems during execution. """ % (ipythondir,sys.exc_info()[1])
1045 cause any problems during execution. """ % (ipythondir,sys.exc_info()[1])
1046 wait()
1046 wait()
1047 else:
1047 else:
1048 for fname in glb('ipythonrc*'):
1048 for fname in glb('ipythonrc*'):
1049 try:
1049 try:
1050 native_line_ends(fname,backup=0)
1050 native_line_ends(fname,backup=0)
1051 except IOError:
1051 except IOError:
1052 pass
1052 pass
1053
1053
1054 if mode == 'install':
1054 if mode == 'install':
1055 print """
1055 print """
1056 Successful installation!
1056 Successful installation!
1057
1057
1058 Please read the sections 'Initial Configuration' and 'Quick Tips' in the
1058 Please read the sections 'Initial Configuration' and 'Quick Tips' in the
1059 IPython manual (there are both HTML and PDF versions supplied with the
1059 IPython manual (there are both HTML and PDF versions supplied with the
1060 distribution) to make sure that your system environment is properly configured
1060 distribution) to make sure that your system environment is properly configured
1061 to take advantage of IPython's features."""
1061 to take advantage of IPython's features."""
1062 else:
1062 else:
1063 print """
1063 print """
1064 Successful upgrade!
1064 Successful upgrade!
1065
1065
1066 All files in your directory:
1066 All files in your directory:
1067 %(ipythondir)s
1067 %(ipythondir)s
1068 which would have been overwritten by the upgrade were backed up with a .old
1068 which would have been overwritten by the upgrade were backed up with a .old
1069 extension. If you had made particular customizations in those files you may
1069 extension. If you had made particular customizations in those files you may
1070 want to merge them back into the new files.""" % locals()
1070 want to merge them back into the new files.""" % locals()
1071 wait()
1071 wait()
1072 os.chdir(cwd)
1072 os.chdir(cwd)
1073 # end user_setup()
1073 # end user_setup()
1074
1074
1075 def atexit_operations(self):
1075 def atexit_operations(self):
1076 """This will be executed at the time of exit.
1076 """This will be executed at the time of exit.
1077
1077
1078 Saving of persistent data should be performed here. """
1078 Saving of persistent data should be performed here. """
1079
1079
1080 # input history
1080 # input history
1081 self.savehist()
1081 self.savehist()
1082
1082
1083 # Cleanup all tempfiles left around
1083 # Cleanup all tempfiles left around
1084 for tfile in self.tempfiles:
1084 for tfile in self.tempfiles:
1085 try:
1085 try:
1086 os.unlink(tfile)
1086 os.unlink(tfile)
1087 except OSError:
1087 except OSError:
1088 pass
1088 pass
1089
1089
1090 # save the "persistent data" catch-all dictionary
1090 # save the "persistent data" catch-all dictionary
1091 try:
1091 try:
1092 pickle.dump(self.persist, open(self.persist_fname,"w"))
1092 pickle.dump(self.persist, open(self.persist_fname,"w"))
1093 except:
1093 except:
1094 print "*** ERROR *** persistent data saving failed."
1094 print "*** ERROR *** persistent data saving failed."
1095
1095
1096 def savehist(self):
1096 def savehist(self):
1097 """Save input history to a file (via readline library)."""
1097 """Save input history to a file (via readline library)."""
1098 try:
1098 try:
1099 self.readline.write_history_file(self.histfile)
1099 self.readline.write_history_file(self.histfile)
1100 except:
1100 except:
1101 print 'Unable to save IPython command history to file: ' + \
1101 print 'Unable to save IPython command history to file: ' + \
1102 `self.histfile`
1102 `self.histfile`
1103
1103
1104 def pre_readline(self):
1104 def pre_readline(self):
1105 """readline hook to be used at the start of each line.
1105 """readline hook to be used at the start of each line.
1106
1106
1107 Currently it handles auto-indent only."""
1107 Currently it handles auto-indent only."""
1108
1108
1109 self.readline.insert_text(self.indent_current)
1109 self.readline.insert_text(self.indent_current)
1110
1110
1111 def init_readline(self):
1111 def init_readline(self):
1112 """Command history completion/saving/reloading."""
1112 """Command history completion/saving/reloading."""
1113 try:
1113 try:
1114 import readline
1114 import readline
1115 except ImportError:
1115 except ImportError:
1116 self.has_readline = 0
1116 self.has_readline = 0
1117 self.readline = None
1117 self.readline = None
1118 # no point in bugging windows users with this every time:
1118 # no point in bugging windows users with this every time:
1119 if os.name == 'posix':
1119 if os.name == 'posix':
1120 warn('Readline services not available on this platform.')
1120 warn('Readline services not available on this platform.')
1121 else:
1121 else:
1122 import atexit
1122 import atexit
1123 from IPython.completer import IPCompleter
1123 from IPython.completer import IPCompleter
1124 self.Completer = IPCompleter(self,
1124 self.Completer = IPCompleter(self,
1125 self.user_ns,
1125 self.user_ns,
1126 self.user_global_ns,
1126 self.user_global_ns,
1127 self.rc.readline_omit__names,
1127 self.rc.readline_omit__names,
1128 self.alias_table)
1128 self.alias_table)
1129
1129
1130 # Platform-specific configuration
1130 # Platform-specific configuration
1131 if os.name == 'nt':
1131 if os.name == 'nt':
1132 self.readline_startup_hook = readline.set_pre_input_hook
1132 self.readline_startup_hook = readline.set_pre_input_hook
1133 else:
1133 else:
1134 self.readline_startup_hook = readline.set_startup_hook
1134 self.readline_startup_hook = readline.set_startup_hook
1135
1135
1136 # Load user's initrc file (readline config)
1136 # Load user's initrc file (readline config)
1137 inputrc_name = os.environ.get('INPUTRC')
1137 inputrc_name = os.environ.get('INPUTRC')
1138 if inputrc_name is None:
1138 if inputrc_name is None:
1139 home_dir = get_home_dir()
1139 home_dir = get_home_dir()
1140 if home_dir is not None:
1140 if home_dir is not None:
1141 inputrc_name = os.path.join(home_dir,'.inputrc')
1141 inputrc_name = os.path.join(home_dir,'.inputrc')
1142 if os.path.isfile(inputrc_name):
1142 if os.path.isfile(inputrc_name):
1143 try:
1143 try:
1144 readline.read_init_file(inputrc_name)
1144 readline.read_init_file(inputrc_name)
1145 except:
1145 except:
1146 warn('Problems reading readline initialization file <%s>'
1146 warn('Problems reading readline initialization file <%s>'
1147 % inputrc_name)
1147 % inputrc_name)
1148
1148
1149 self.has_readline = 1
1149 self.has_readline = 1
1150 self.readline = readline
1150 self.readline = readline
1151 # save this in sys so embedded copies can restore it properly
1151 # save this in sys so embedded copies can restore it properly
1152 sys.ipcompleter = self.Completer.complete
1152 sys.ipcompleter = self.Completer.complete
1153 readline.set_completer(self.Completer.complete)
1153 readline.set_completer(self.Completer.complete)
1154
1154
1155 # Configure readline according to user's prefs
1155 # Configure readline according to user's prefs
1156 for rlcommand in self.rc.readline_parse_and_bind:
1156 for rlcommand in self.rc.readline_parse_and_bind:
1157 readline.parse_and_bind(rlcommand)
1157 readline.parse_and_bind(rlcommand)
1158
1158
1159 # remove some chars from the delimiters list
1159 # remove some chars from the delimiters list
1160 delims = readline.get_completer_delims()
1160 delims = readline.get_completer_delims()
1161 delims = delims.translate(string._idmap,
1161 delims = delims.translate(string._idmap,
1162 self.rc.readline_remove_delims)
1162 self.rc.readline_remove_delims)
1163 readline.set_completer_delims(delims)
1163 readline.set_completer_delims(delims)
1164 # otherwise we end up with a monster history after a while:
1164 # otherwise we end up with a monster history after a while:
1165 readline.set_history_length(1000)
1165 readline.set_history_length(1000)
1166 try:
1166 try:
1167 #print '*** Reading readline history' # dbg
1167 #print '*** Reading readline history' # dbg
1168 readline.read_history_file(self.histfile)
1168 readline.read_history_file(self.histfile)
1169 except IOError:
1169 except IOError:
1170 pass # It doesn't exist yet.
1170 pass # It doesn't exist yet.
1171
1171
1172 atexit.register(self.atexit_operations)
1172 atexit.register(self.atexit_operations)
1173 del atexit
1173 del atexit
1174
1174
1175 # Configure auto-indent for all platforms
1175 # Configure auto-indent for all platforms
1176 self.set_autoindent(self.rc.autoindent)
1176 self.set_autoindent(self.rc.autoindent)
1177
1177
1178 def _should_recompile(self,e):
1178 def _should_recompile(self,e):
1179 """Utility routine for edit_syntax_error"""
1179 """Utility routine for edit_syntax_error"""
1180
1180
1181 if e.filename in ('<ipython console>','<input>','<string>',
1181 if e.filename in ('<ipython console>','<input>','<string>',
1182 '<console>'):
1182 '<console>',None):
1183 return False
1183 return False
1184 try:
1184 try:
1185 if not ask_yes_no('Return to editor to correct syntax error? '
1185 if not ask_yes_no('Return to editor to correct syntax error? '
1186 '[Y/n] ','y'):
1186 '[Y/n] ','y'):
1187 return False
1187 return False
1188 except EOFError:
1188 except EOFError:
1189 return False
1189 return False
1190
1190
1191 def int0(x):
1191 def int0(x):
1192 try:
1192 try:
1193 return int(x)
1193 return int(x)
1194 except TypeError:
1194 except TypeError:
1195 return 0
1195 return 0
1196 # always pass integer line and offset values to editor hook
1196 # always pass integer line and offset values to editor hook
1197 self.hooks.fix_error_editor(e.filename,
1197 self.hooks.fix_error_editor(e.filename,
1198 int0(e.lineno),int0(e.offset),e.msg)
1198 int0(e.lineno),int0(e.offset),e.msg)
1199 return True
1199 return True
1200
1200
1201 def edit_syntax_error(self):
1201 def edit_syntax_error(self):
1202 """The bottom half of the syntax error handler called in the main loop.
1202 """The bottom half of the syntax error handler called in the main loop.
1203
1203
1204 Loop until syntax error is fixed or user cancels.
1204 Loop until syntax error is fixed or user cancels.
1205 """
1205 """
1206
1206
1207 while self.SyntaxTB.last_syntax_error:
1207 while self.SyntaxTB.last_syntax_error:
1208 # copy and clear last_syntax_error
1208 # copy and clear last_syntax_error
1209 err = self.SyntaxTB.clear_err_state()
1209 err = self.SyntaxTB.clear_err_state()
1210 if not self._should_recompile(err):
1210 if not self._should_recompile(err):
1211 return
1211 return
1212 try:
1212 try:
1213 # may set last_syntax_error again if a SyntaxError is raised
1213 # may set last_syntax_error again if a SyntaxError is raised
1214 self.safe_execfile(err.filename,self.shell.user_ns)
1214 self.safe_execfile(err.filename,self.shell.user_ns)
1215 except:
1215 except:
1216 self.showtraceback()
1216 self.showtraceback()
1217 else:
1217 else:
1218 f = file(err.filename)
1218 f = file(err.filename)
1219 try:
1219 try:
1220 sys.displayhook(f.read())
1220 sys.displayhook(f.read())
1221 finally:
1221 finally:
1222 f.close()
1222 f.close()
1223
1223
1224 def showsyntaxerror(self, filename=None):
1224 def showsyntaxerror(self, filename=None):
1225 """Display the syntax error that just occurred.
1225 """Display the syntax error that just occurred.
1226
1226
1227 This doesn't display a stack trace because there isn't one.
1227 This doesn't display a stack trace because there isn't one.
1228
1228
1229 If a filename is given, it is stuffed in the exception instead
1229 If a filename is given, it is stuffed in the exception instead
1230 of what was there before (because Python's parser always uses
1230 of what was there before (because Python's parser always uses
1231 "<string>" when reading from a string).
1231 "<string>" when reading from a string).
1232 """
1232 """
1233 etype, value, last_traceback = sys.exc_info()
1233 etype, value, last_traceback = sys.exc_info()
1234 if filename and etype is SyntaxError:
1234 if filename and etype is SyntaxError:
1235 # Work hard to stuff the correct filename in the exception
1235 # Work hard to stuff the correct filename in the exception
1236 try:
1236 try:
1237 msg, (dummy_filename, lineno, offset, line) = value
1237 msg, (dummy_filename, lineno, offset, line) = value
1238 except:
1238 except:
1239 # Not the format we expect; leave it alone
1239 # Not the format we expect; leave it alone
1240 pass
1240 pass
1241 else:
1241 else:
1242 # Stuff in the right filename
1242 # Stuff in the right filename
1243 try:
1243 try:
1244 # Assume SyntaxError is a class exception
1244 # Assume SyntaxError is a class exception
1245 value = SyntaxError(msg, (filename, lineno, offset, line))
1245 value = SyntaxError(msg, (filename, lineno, offset, line))
1246 except:
1246 except:
1247 # If that failed, assume SyntaxError is a string
1247 # If that failed, assume SyntaxError is a string
1248 value = msg, (filename, lineno, offset, line)
1248 value = msg, (filename, lineno, offset, line)
1249 self.SyntaxTB(etype,value,[])
1249 self.SyntaxTB(etype,value,[])
1250
1250
1251 def debugger(self):
1251 def debugger(self):
1252 """Call the pdb debugger."""
1252 """Call the pdb debugger."""
1253
1253
1254 if not self.rc.pdb:
1254 if not self.rc.pdb:
1255 return
1255 return
1256 pdb.pm()
1256 pdb.pm()
1257
1257
1258 def showtraceback(self,exc_tuple = None,filename=None):
1258 def showtraceback(self,exc_tuple = None,filename=None):
1259 """Display the exception that just occurred."""
1259 """Display the exception that just occurred."""
1260
1260
1261 # Though this won't be called by syntax errors in the input line,
1261 # Though this won't be called by syntax errors in the input line,
1262 # there may be SyntaxError cases whith imported code.
1262 # there may be SyntaxError cases whith imported code.
1263 if exc_tuple is None:
1263 if exc_tuple is None:
1264 type, value, tb = sys.exc_info()
1264 type, value, tb = sys.exc_info()
1265 else:
1265 else:
1266 type, value, tb = exc_tuple
1266 type, value, tb = exc_tuple
1267 if type is SyntaxError:
1267 if type is SyntaxError:
1268 self.showsyntaxerror(filename)
1268 self.showsyntaxerror(filename)
1269 else:
1269 else:
1270 self.InteractiveTB()
1270 self.InteractiveTB()
1271 if self.InteractiveTB.call_pdb and self.has_readline:
1271 if self.InteractiveTB.call_pdb and self.has_readline:
1272 # pdb mucks up readline, fix it back
1272 # pdb mucks up readline, fix it back
1273 self.readline.set_completer(self.Completer.complete)
1273 self.readline.set_completer(self.Completer.complete)
1274
1274
1275 def mainloop(self,banner=None):
1275 def mainloop(self,banner=None):
1276 """Creates the local namespace and starts the mainloop.
1276 """Creates the local namespace and starts the mainloop.
1277
1277
1278 If an optional banner argument is given, it will override the
1278 If an optional banner argument is given, it will override the
1279 internally created default banner."""
1279 internally created default banner."""
1280
1280
1281 if self.rc.c: # Emulate Python's -c option
1281 if self.rc.c: # Emulate Python's -c option
1282 self.exec_init_cmd()
1282 self.exec_init_cmd()
1283 if banner is None:
1283 if banner is None:
1284 if self.rc.banner:
1284 if self.rc.banner:
1285 banner = self.BANNER+self.banner2
1285 banner = self.BANNER+self.banner2
1286 else:
1286 else:
1287 banner = ''
1287 banner = ''
1288 self.interact(banner)
1288 self.interact(banner)
1289
1289
1290 def exec_init_cmd(self):
1290 def exec_init_cmd(self):
1291 """Execute a command given at the command line.
1291 """Execute a command given at the command line.
1292
1292
1293 This emulates Python's -c option."""
1293 This emulates Python's -c option."""
1294
1294
1295 sys.argv = ['-c']
1295 sys.argv = ['-c']
1296 self.push(self.rc.c)
1296 self.push(self.rc.c)
1297
1297
1298 def embed_mainloop(self,header='',local_ns=None,global_ns=None,stack_depth=0):
1298 def embed_mainloop(self,header='',local_ns=None,global_ns=None,stack_depth=0):
1299 """Embeds IPython into a running python program.
1299 """Embeds IPython into a running python program.
1300
1300
1301 Input:
1301 Input:
1302
1302
1303 - header: An optional header message can be specified.
1303 - header: An optional header message can be specified.
1304
1304
1305 - local_ns, global_ns: working namespaces. If given as None, the
1305 - local_ns, global_ns: working namespaces. If given as None, the
1306 IPython-initialized one is updated with __main__.__dict__, so that
1306 IPython-initialized one is updated with __main__.__dict__, so that
1307 program variables become visible but user-specific configuration
1307 program variables become visible but user-specific configuration
1308 remains possible.
1308 remains possible.
1309
1309
1310 - stack_depth: specifies how many levels in the stack to go to
1310 - stack_depth: specifies how many levels in the stack to go to
1311 looking for namespaces (when local_ns and global_ns are None). This
1311 looking for namespaces (when local_ns and global_ns are None). This
1312 allows an intermediate caller to make sure that this function gets
1312 allows an intermediate caller to make sure that this function gets
1313 the namespace from the intended level in the stack. By default (0)
1313 the namespace from the intended level in the stack. By default (0)
1314 it will get its locals and globals from the immediate caller.
1314 it will get its locals and globals from the immediate caller.
1315
1315
1316 Warning: it's possible to use this in a program which is being run by
1316 Warning: it's possible to use this in a program which is being run by
1317 IPython itself (via %run), but some funny things will happen (a few
1317 IPython itself (via %run), but some funny things will happen (a few
1318 globals get overwritten). In the future this will be cleaned up, as
1318 globals get overwritten). In the future this will be cleaned up, as
1319 there is no fundamental reason why it can't work perfectly."""
1319 there is no fundamental reason why it can't work perfectly."""
1320
1320
1321 # Get locals and globals from caller
1321 # Get locals and globals from caller
1322 if local_ns is None or global_ns is None:
1322 if local_ns is None or global_ns is None:
1323 call_frame = sys._getframe(stack_depth).f_back
1323 call_frame = sys._getframe(stack_depth).f_back
1324
1324
1325 if local_ns is None:
1325 if local_ns is None:
1326 local_ns = call_frame.f_locals
1326 local_ns = call_frame.f_locals
1327 if global_ns is None:
1327 if global_ns is None:
1328 global_ns = call_frame.f_globals
1328 global_ns = call_frame.f_globals
1329
1329
1330 # Update namespaces and fire up interpreter
1330 # Update namespaces and fire up interpreter
1331
1331
1332 # The global one is easy, we can just throw it in
1332 # The global one is easy, we can just throw it in
1333 self.user_global_ns = global_ns
1333 self.user_global_ns = global_ns
1334
1334
1335 # but the user/local one is tricky: ipython needs it to store internal
1335 # but the user/local one is tricky: ipython needs it to store internal
1336 # data, but we also need the locals. We'll copy locals in the user
1336 # data, but we also need the locals. We'll copy locals in the user
1337 # one, but will track what got copied so we can delete them at exit.
1337 # one, but will track what got copied so we can delete them at exit.
1338 # This is so that a later embedded call doesn't see locals from a
1338 # This is so that a later embedded call doesn't see locals from a
1339 # previous call (which most likely existed in a separate scope).
1339 # previous call (which most likely existed in a separate scope).
1340 local_varnames = local_ns.keys()
1340 local_varnames = local_ns.keys()
1341 self.user_ns.update(local_ns)
1341 self.user_ns.update(local_ns)
1342
1342
1343 # Patch for global embedding to make sure that things don't overwrite
1343 # Patch for global embedding to make sure that things don't overwrite
1344 # user globals accidentally. Thanks to Richard <rxe@renre-europe.com>
1344 # user globals accidentally. Thanks to Richard <rxe@renre-europe.com>
1345 # FIXME. Test this a bit more carefully (the if.. is new)
1345 # FIXME. Test this a bit more carefully (the if.. is new)
1346 if local_ns is None and global_ns is None:
1346 if local_ns is None and global_ns is None:
1347 self.user_global_ns.update(__main__.__dict__)
1347 self.user_global_ns.update(__main__.__dict__)
1348
1348
1349 # make sure the tab-completer has the correct frame information, so it
1349 # make sure the tab-completer has the correct frame information, so it
1350 # actually completes using the frame's locals/globals
1350 # actually completes using the frame's locals/globals
1351 self.set_completer_frame()
1351 self.set_completer_frame()
1352
1352
1353 # before activating the interactive mode, we need to make sure that
1353 # before activating the interactive mode, we need to make sure that
1354 # all names in the builtin namespace needed by ipython point to
1354 # all names in the builtin namespace needed by ipython point to
1355 # ourselves, and not to other instances.
1355 # ourselves, and not to other instances.
1356 self.add_builtins()
1356 self.add_builtins()
1357
1357
1358 self.interact(header)
1358 self.interact(header)
1359
1359
1360 # now, purge out the user namespace from anything we might have added
1360 # now, purge out the user namespace from anything we might have added
1361 # from the caller's local namespace
1361 # from the caller's local namespace
1362 delvar = self.user_ns.pop
1362 delvar = self.user_ns.pop
1363 for var in local_varnames:
1363 for var in local_varnames:
1364 delvar(var,None)
1364 delvar(var,None)
1365 # and clean builtins we may have overridden
1365 # and clean builtins we may have overridden
1366 self.clean_builtins()
1366 self.clean_builtins()
1367
1367
1368 def interact(self, banner=None):
1368 def interact(self, banner=None):
1369 """Closely emulate the interactive Python console.
1369 """Closely emulate the interactive Python console.
1370
1370
1371 The optional banner argument specify the banner to print
1371 The optional banner argument specify the banner to print
1372 before the first interaction; by default it prints a banner
1372 before the first interaction; by default it prints a banner
1373 similar to the one printed by the real Python interpreter,
1373 similar to the one printed by the real Python interpreter,
1374 followed by the current class name in parentheses (so as not
1374 followed by the current class name in parentheses (so as not
1375 to confuse this with the real interpreter -- since it's so
1375 to confuse this with the real interpreter -- since it's so
1376 close!).
1376 close!).
1377
1377
1378 """
1378 """
1379 cprt = 'Type "copyright", "credits" or "license" for more information.'
1379 cprt = 'Type "copyright", "credits" or "license" for more information.'
1380 if banner is None:
1380 if banner is None:
1381 self.write("Python %s on %s\n%s\n(%s)\n" %
1381 self.write("Python %s on %s\n%s\n(%s)\n" %
1382 (sys.version, sys.platform, cprt,
1382 (sys.version, sys.platform, cprt,
1383 self.__class__.__name__))
1383 self.__class__.__name__))
1384 else:
1384 else:
1385 self.write(banner)
1385 self.write(banner)
1386
1386
1387 more = 0
1387 more = 0
1388
1388
1389 # Mark activity in the builtins
1389 # Mark activity in the builtins
1390 __builtin__.__dict__['__IPYTHON__active'] += 1
1390 __builtin__.__dict__['__IPYTHON__active'] += 1
1391
1391
1392 # exit_now is set by a call to %Exit or %Quit
1392 # exit_now is set by a call to %Exit or %Quit
1393 self.exit_now = False
1393 self.exit_now = False
1394 while not self.exit_now:
1394 while not self.exit_now:
1395
1395
1396 try:
1396 try:
1397 if more:
1397 if more:
1398 prompt = self.outputcache.prompt2
1398 prompt = self.outputcache.prompt2
1399 if self.autoindent:
1399 if self.autoindent:
1400 self.readline_startup_hook(self.pre_readline)
1400 self.readline_startup_hook(self.pre_readline)
1401 else:
1401 else:
1402 prompt = self.outputcache.prompt1
1402 prompt = self.outputcache.prompt1
1403 try:
1403 try:
1404 line = self.raw_input(prompt,more)
1404 line = self.raw_input(prompt,more)
1405 if self.autoindent:
1405 if self.autoindent:
1406 self.readline_startup_hook(None)
1406 self.readline_startup_hook(None)
1407 except EOFError:
1407 except EOFError:
1408 if self.autoindent:
1408 if self.autoindent:
1409 self.readline_startup_hook(None)
1409 self.readline_startup_hook(None)
1410 self.write("\n")
1410 self.write("\n")
1411 self.exit()
1411 self.exit()
1412 else:
1412 else:
1413 more = self.push(line)
1413 more = self.push(line)
1414
1414
1415 if (self.SyntaxTB.last_syntax_error and
1415 if (self.SyntaxTB.last_syntax_error and
1416 self.rc.autoedit_syntax):
1416 self.rc.autoedit_syntax):
1417 self.edit_syntax_error()
1417 self.edit_syntax_error()
1418
1418
1419 except KeyboardInterrupt:
1419 except KeyboardInterrupt:
1420 self.write("\nKeyboardInterrupt\n")
1420 self.write("\nKeyboardInterrupt\n")
1421 self.resetbuffer()
1421 self.resetbuffer()
1422 more = 0
1422 more = 0
1423 # keep cache in sync with the prompt counter:
1423 # keep cache in sync with the prompt counter:
1424 self.outputcache.prompt_count -= 1
1424 self.outputcache.prompt_count -= 1
1425
1425
1426 if self.autoindent:
1426 if self.autoindent:
1427 self.indent_current_nsp = 0
1427 self.indent_current_nsp = 0
1428 self.indent_current = ' '* self.indent_current_nsp
1428 self.indent_current = ' '* self.indent_current_nsp
1429
1429
1430 except bdb.BdbQuit:
1430 except bdb.BdbQuit:
1431 warn("The Python debugger has exited with a BdbQuit exception.\n"
1431 warn("The Python debugger has exited with a BdbQuit exception.\n"
1432 "Because of how pdb handles the stack, it is impossible\n"
1432 "Because of how pdb handles the stack, it is impossible\n"
1433 "for IPython to properly format this particular exception.\n"
1433 "for IPython to properly format this particular exception.\n"
1434 "IPython will resume normal operation.")
1434 "IPython will resume normal operation.")
1435
1435
1436 # We are off again...
1436 # We are off again...
1437 __builtin__.__dict__['__IPYTHON__active'] -= 1
1437 __builtin__.__dict__['__IPYTHON__active'] -= 1
1438
1438
1439 def excepthook(self, type, value, tb):
1439 def excepthook(self, type, value, tb):
1440 """One more defense for GUI apps that call sys.excepthook.
1440 """One more defense for GUI apps that call sys.excepthook.
1441
1441
1442 GUI frameworks like wxPython trap exceptions and call
1442 GUI frameworks like wxPython trap exceptions and call
1443 sys.excepthook themselves. I guess this is a feature that
1443 sys.excepthook themselves. I guess this is a feature that
1444 enables them to keep running after exceptions that would
1444 enables them to keep running after exceptions that would
1445 otherwise kill their mainloop. This is a bother for IPython
1445 otherwise kill their mainloop. This is a bother for IPython
1446 which excepts to catch all of the program exceptions with a try:
1446 which excepts to catch all of the program exceptions with a try:
1447 except: statement.
1447 except: statement.
1448
1448
1449 Normally, IPython sets sys.excepthook to a CrashHandler instance, so if
1449 Normally, IPython sets sys.excepthook to a CrashHandler instance, so if
1450 any app directly invokes sys.excepthook, it will look to the user like
1450 any app directly invokes sys.excepthook, it will look to the user like
1451 IPython crashed. In order to work around this, we can disable the
1451 IPython crashed. In order to work around this, we can disable the
1452 CrashHandler and replace it with this excepthook instead, which prints a
1452 CrashHandler and replace it with this excepthook instead, which prints a
1453 regular traceback using our InteractiveTB. In this fashion, apps which
1453 regular traceback using our InteractiveTB. In this fashion, apps which
1454 call sys.excepthook will generate a regular-looking exception from
1454 call sys.excepthook will generate a regular-looking exception from
1455 IPython, and the CrashHandler will only be triggered by real IPython
1455 IPython, and the CrashHandler will only be triggered by real IPython
1456 crashes.
1456 crashes.
1457
1457
1458 This hook should be used sparingly, only in places which are not likely
1458 This hook should be used sparingly, only in places which are not likely
1459 to be true IPython errors.
1459 to be true IPython errors.
1460 """
1460 """
1461
1461
1462 self.InteractiveTB(type, value, tb, tb_offset=0)
1462 self.InteractiveTB(type, value, tb, tb_offset=0)
1463 if self.InteractiveTB.call_pdb and self.has_readline:
1463 if self.InteractiveTB.call_pdb and self.has_readline:
1464 self.readline.set_completer(self.Completer.complete)
1464 self.readline.set_completer(self.Completer.complete)
1465
1465
1466 def call_alias(self,alias,rest=''):
1466 def call_alias(self,alias,rest=''):
1467 """Call an alias given its name and the rest of the line.
1467 """Call an alias given its name and the rest of the line.
1468
1468
1469 This function MUST be given a proper alias, because it doesn't make
1469 This function MUST be given a proper alias, because it doesn't make
1470 any checks when looking up into the alias table. The caller is
1470 any checks when looking up into the alias table. The caller is
1471 responsible for invoking it only with a valid alias."""
1471 responsible for invoking it only with a valid alias."""
1472
1472
1473 #print 'ALIAS: <%s>+<%s>' % (alias,rest) # dbg
1473 #print 'ALIAS: <%s>+<%s>' % (alias,rest) # dbg
1474 nargs,cmd = self.alias_table[alias]
1474 nargs,cmd = self.alias_table[alias]
1475 # Expand the %l special to be the user's input line
1475 # Expand the %l special to be the user's input line
1476 if cmd.find('%l') >= 0:
1476 if cmd.find('%l') >= 0:
1477 cmd = cmd.replace('%l',rest)
1477 cmd = cmd.replace('%l',rest)
1478 rest = ''
1478 rest = ''
1479 if nargs==0:
1479 if nargs==0:
1480 # Simple, argument-less aliases
1480 # Simple, argument-less aliases
1481 cmd = '%s %s' % (cmd,rest)
1481 cmd = '%s %s' % (cmd,rest)
1482 else:
1482 else:
1483 # Handle aliases with positional arguments
1483 # Handle aliases with positional arguments
1484 args = rest.split(None,nargs)
1484 args = rest.split(None,nargs)
1485 if len(args)< nargs:
1485 if len(args)< nargs:
1486 error('Alias <%s> requires %s arguments, %s given.' %
1486 error('Alias <%s> requires %s arguments, %s given.' %
1487 (alias,nargs,len(args)))
1487 (alias,nargs,len(args)))
1488 return
1488 return
1489 cmd = '%s %s' % (cmd % tuple(args[:nargs]),' '.join(args[nargs:]))
1489 cmd = '%s %s' % (cmd % tuple(args[:nargs]),' '.join(args[nargs:]))
1490 # Now call the macro, evaluating in the user's namespace
1490 # Now call the macro, evaluating in the user's namespace
1491 try:
1491 try:
1492 self.system(cmd)
1492 self.system(cmd)
1493 except:
1493 except:
1494 self.showtraceback()
1494 self.showtraceback()
1495
1495
1496 def autoindent_update(self,line):
1496 def autoindent_update(self,line):
1497 """Keep track of the indent level."""
1497 """Keep track of the indent level."""
1498 if self.autoindent:
1498 if self.autoindent:
1499 if line:
1499 if line:
1500 ini_spaces = ini_spaces_re.match(line)
1500 ini_spaces = ini_spaces_re.match(line)
1501 if ini_spaces:
1501 if ini_spaces:
1502 nspaces = ini_spaces.end()
1502 nspaces = ini_spaces.end()
1503 else:
1503 else:
1504 nspaces = 0
1504 nspaces = 0
1505 self.indent_current_nsp = nspaces
1505 self.indent_current_nsp = nspaces
1506
1506
1507 if line[-1] == ':':
1507 if line[-1] == ':':
1508 self.indent_current_nsp += 4
1508 self.indent_current_nsp += 4
1509 elif dedent_re.match(line):
1509 elif dedent_re.match(line):
1510 self.indent_current_nsp -= 4
1510 self.indent_current_nsp -= 4
1511 else:
1511 else:
1512 self.indent_current_nsp = 0
1512 self.indent_current_nsp = 0
1513
1513
1514 # indent_current is the actual string to be inserted
1514 # indent_current is the actual string to be inserted
1515 # by the readline hooks for indentation
1515 # by the readline hooks for indentation
1516 self.indent_current = ' '* self.indent_current_nsp
1516 self.indent_current = ' '* self.indent_current_nsp
1517
1517
1518 def runlines(self,lines):
1518 def runlines(self,lines):
1519 """Run a string of one or more lines of source.
1519 """Run a string of one or more lines of source.
1520
1520
1521 This method is capable of running a string containing multiple source
1521 This method is capable of running a string containing multiple source
1522 lines, as if they had been entered at the IPython prompt. Since it
1522 lines, as if they had been entered at the IPython prompt. Since it
1523 exposes IPython's processing machinery, the given strings can contain
1523 exposes IPython's processing machinery, the given strings can contain
1524 magic calls (%magic), special shell access (!cmd), etc."""
1524 magic calls (%magic), special shell access (!cmd), etc."""
1525
1525
1526 # We must start with a clean buffer, in case this is run from an
1526 # We must start with a clean buffer, in case this is run from an
1527 # interactive IPython session (via a magic, for example).
1527 # interactive IPython session (via a magic, for example).
1528 self.resetbuffer()
1528 self.resetbuffer()
1529 lines = lines.split('\n')
1529 lines = lines.split('\n')
1530 more = 0
1530 more = 0
1531 for line in lines:
1531 for line in lines:
1532 # skip blank lines so we don't mess up the prompt counter, but do
1532 # skip blank lines so we don't mess up the prompt counter, but do
1533 # NOT skip even a blank line if we are in a code block (more is
1533 # NOT skip even a blank line if we are in a code block (more is
1534 # true)
1534 # true)
1535 if line or more:
1535 if line or more:
1536 more = self.push(self.prefilter(line,more))
1536 more = self.push(self.prefilter(line,more))
1537 # IPython's runsource returns None if there was an error
1537 # IPython's runsource returns None if there was an error
1538 # compiling the code. This allows us to stop processing right
1538 # compiling the code. This allows us to stop processing right
1539 # away, so the user gets the error message at the right place.
1539 # away, so the user gets the error message at the right place.
1540 if more is None:
1540 if more is None:
1541 break
1541 break
1542 # final newline in case the input didn't have it, so that the code
1542 # final newline in case the input didn't have it, so that the code
1543 # actually does get executed
1543 # actually does get executed
1544 if more:
1544 if more:
1545 self.push('\n')
1545 self.push('\n')
1546
1546
1547 def runsource(self, source, filename='<input>', symbol='single'):
1547 def runsource(self, source, filename='<input>', symbol='single'):
1548 """Compile and run some source in the interpreter.
1548 """Compile and run some source in the interpreter.
1549
1549
1550 Arguments are as for compile_command().
1550 Arguments are as for compile_command().
1551
1551
1552 One several things can happen:
1552 One several things can happen:
1553
1553
1554 1) The input is incorrect; compile_command() raised an
1554 1) The input is incorrect; compile_command() raised an
1555 exception (SyntaxError or OverflowError). A syntax traceback
1555 exception (SyntaxError or OverflowError). A syntax traceback
1556 will be printed by calling the showsyntaxerror() method.
1556 will be printed by calling the showsyntaxerror() method.
1557
1557
1558 2) The input is incomplete, and more input is required;
1558 2) The input is incomplete, and more input is required;
1559 compile_command() returned None. Nothing happens.
1559 compile_command() returned None. Nothing happens.
1560
1560
1561 3) The input is complete; compile_command() returned a code
1561 3) The input is complete; compile_command() returned a code
1562 object. The code is executed by calling self.runcode() (which
1562 object. The code is executed by calling self.runcode() (which
1563 also handles run-time exceptions, except for SystemExit).
1563 also handles run-time exceptions, except for SystemExit).
1564
1564
1565 The return value is:
1565 The return value is:
1566
1566
1567 - True in case 2
1567 - True in case 2
1568
1568
1569 - False in the other cases, unless an exception is raised, where
1569 - False in the other cases, unless an exception is raised, where
1570 None is returned instead. This can be used by external callers to
1570 None is returned instead. This can be used by external callers to
1571 know whether to continue feeding input or not.
1571 know whether to continue feeding input or not.
1572
1572
1573 The return value can be used to decide whether to use sys.ps1 or
1573 The return value can be used to decide whether to use sys.ps1 or
1574 sys.ps2 to prompt the next line."""
1574 sys.ps2 to prompt the next line."""
1575
1575
1576 try:
1576 try:
1577 code = self.compile(source,filename,symbol)
1577 code = self.compile(source,filename,symbol)
1578 except (OverflowError, SyntaxError, ValueError):
1578 except (OverflowError, SyntaxError, ValueError):
1579 # Case 1
1579 # Case 1
1580 self.showsyntaxerror(filename)
1580 self.showsyntaxerror(filename)
1581 return None
1581 return None
1582
1582
1583 if code is None:
1583 if code is None:
1584 # Case 2
1584 # Case 2
1585 return True
1585 return True
1586
1586
1587 # Case 3
1587 # Case 3
1588 # We store the code object so that threaded shells and
1588 # We store the code object so that threaded shells and
1589 # custom exception handlers can access all this info if needed.
1589 # custom exception handlers can access all this info if needed.
1590 # The source corresponding to this can be obtained from the
1590 # The source corresponding to this can be obtained from the
1591 # buffer attribute as '\n'.join(self.buffer).
1591 # buffer attribute as '\n'.join(self.buffer).
1592 self.code_to_run = code
1592 self.code_to_run = code
1593 # now actually execute the code object
1593 # now actually execute the code object
1594 if self.runcode(code) == 0:
1594 if self.runcode(code) == 0:
1595 return False
1595 return False
1596 else:
1596 else:
1597 return None
1597 return None
1598
1598
1599 def runcode(self,code_obj):
1599 def runcode(self,code_obj):
1600 """Execute a code object.
1600 """Execute a code object.
1601
1601
1602 When an exception occurs, self.showtraceback() is called to display a
1602 When an exception occurs, self.showtraceback() is called to display a
1603 traceback.
1603 traceback.
1604
1604
1605 Return value: a flag indicating whether the code to be run completed
1605 Return value: a flag indicating whether the code to be run completed
1606 successfully:
1606 successfully:
1607
1607
1608 - 0: successful execution.
1608 - 0: successful execution.
1609 - 1: an error occurred.
1609 - 1: an error occurred.
1610 """
1610 """
1611
1611
1612 # Set our own excepthook in case the user code tries to call it
1612 # Set our own excepthook in case the user code tries to call it
1613 # directly, so that the IPython crash handler doesn't get triggered
1613 # directly, so that the IPython crash handler doesn't get triggered
1614 old_excepthook,sys.excepthook = sys.excepthook, self.excepthook
1614 old_excepthook,sys.excepthook = sys.excepthook, self.excepthook
1615
1615
1616 # we save the original sys.excepthook in the instance, in case config
1616 # we save the original sys.excepthook in the instance, in case config
1617 # code (such as magics) needs access to it.
1617 # code (such as magics) needs access to it.
1618 self.sys_excepthook = old_excepthook
1618 self.sys_excepthook = old_excepthook
1619 outflag = 1 # happens in more places, so it's easier as default
1619 outflag = 1 # happens in more places, so it's easier as default
1620 try:
1620 try:
1621 try:
1621 try:
1622 # Embedded instances require separate global/local namespaces
1622 # Embedded instances require separate global/local namespaces
1623 # so they can see both the surrounding (local) namespace and
1623 # so they can see both the surrounding (local) namespace and
1624 # the module-level globals when called inside another function.
1624 # the module-level globals when called inside another function.
1625 if self.embedded:
1625 if self.embedded:
1626 exec code_obj in self.user_global_ns, self.user_ns
1626 exec code_obj in self.user_global_ns, self.user_ns
1627 # Normal (non-embedded) instances should only have a single
1627 # Normal (non-embedded) instances should only have a single
1628 # namespace for user code execution, otherwise functions won't
1628 # namespace for user code execution, otherwise functions won't
1629 # see interactive top-level globals.
1629 # see interactive top-level globals.
1630 else:
1630 else:
1631 exec code_obj in self.user_ns
1631 exec code_obj in self.user_ns
1632 finally:
1632 finally:
1633 # Reset our crash handler in place
1633 # Reset our crash handler in place
1634 sys.excepthook = old_excepthook
1634 sys.excepthook = old_excepthook
1635 except SystemExit:
1635 except SystemExit:
1636 self.resetbuffer()
1636 self.resetbuffer()
1637 self.showtraceback()
1637 self.showtraceback()
1638 warn("Type exit or quit to exit IPython "
1638 warn("Type exit or quit to exit IPython "
1639 "(%Exit or %Quit do so unconditionally).",level=1)
1639 "(%Exit or %Quit do so unconditionally).",level=1)
1640 except self.custom_exceptions:
1640 except self.custom_exceptions:
1641 etype,value,tb = sys.exc_info()
1641 etype,value,tb = sys.exc_info()
1642 self.CustomTB(etype,value,tb)
1642 self.CustomTB(etype,value,tb)
1643 except:
1643 except:
1644 self.showtraceback()
1644 self.showtraceback()
1645 else:
1645 else:
1646 outflag = 0
1646 outflag = 0
1647 if softspace(sys.stdout, 0):
1647 if softspace(sys.stdout, 0):
1648 print
1648 print
1649 # Flush out code object which has been run (and source)
1649 # Flush out code object which has been run (and source)
1650 self.code_to_run = None
1650 self.code_to_run = None
1651 return outflag
1651 return outflag
1652
1652
1653 def push(self, line):
1653 def push(self, line):
1654 """Push a line to the interpreter.
1654 """Push a line to the interpreter.
1655
1655
1656 The line should not have a trailing newline; it may have
1656 The line should not have a trailing newline; it may have
1657 internal newlines. The line is appended to a buffer and the
1657 internal newlines. The line is appended to a buffer and the
1658 interpreter's runsource() method is called with the
1658 interpreter's runsource() method is called with the
1659 concatenated contents of the buffer as source. If this
1659 concatenated contents of the buffer as source. If this
1660 indicates that the command was executed or invalid, the buffer
1660 indicates that the command was executed or invalid, the buffer
1661 is reset; otherwise, the command is incomplete, and the buffer
1661 is reset; otherwise, the command is incomplete, and the buffer
1662 is left as it was after the line was appended. The return
1662 is left as it was after the line was appended. The return
1663 value is 1 if more input is required, 0 if the line was dealt
1663 value is 1 if more input is required, 0 if the line was dealt
1664 with in some way (this is the same as runsource()).
1664 with in some way (this is the same as runsource()).
1665 """
1665 """
1666
1666
1667 # autoindent management should be done here, and not in the
1667 # autoindent management should be done here, and not in the
1668 # interactive loop, since that one is only seen by keyboard input. We
1668 # interactive loop, since that one is only seen by keyboard input. We
1669 # need this done correctly even for code run via runlines (which uses
1669 # need this done correctly even for code run via runlines (which uses
1670 # push).
1670 # push).
1671
1671
1672 #print 'push line: <%s>' % line # dbg
1672 #print 'push line: <%s>' % line # dbg
1673 self.autoindent_update(line)
1673 self.autoindent_update(line)
1674
1674
1675 self.buffer.append(line)
1675 self.buffer.append(line)
1676 more = self.runsource('\n'.join(self.buffer), self.filename)
1676 more = self.runsource('\n'.join(self.buffer), self.filename)
1677 if not more:
1677 if not more:
1678 self.resetbuffer()
1678 self.resetbuffer()
1679 return more
1679 return more
1680
1680
1681 def resetbuffer(self):
1681 def resetbuffer(self):
1682 """Reset the input buffer."""
1682 """Reset the input buffer."""
1683 self.buffer[:] = []
1683 self.buffer[:] = []
1684
1684
1685 def raw_input(self,prompt='',continue_prompt=False):
1685 def raw_input(self,prompt='',continue_prompt=False):
1686 """Write a prompt and read a line.
1686 """Write a prompt and read a line.
1687
1687
1688 The returned line does not include the trailing newline.
1688 The returned line does not include the trailing newline.
1689 When the user enters the EOF key sequence, EOFError is raised.
1689 When the user enters the EOF key sequence, EOFError is raised.
1690
1690
1691 Optional inputs:
1691 Optional inputs:
1692
1692
1693 - prompt(''): a string to be printed to prompt the user.
1693 - prompt(''): a string to be printed to prompt the user.
1694
1694
1695 - continue_prompt(False): whether this line is the first one or a
1695 - continue_prompt(False): whether this line is the first one or a
1696 continuation in a sequence of inputs.
1696 continuation in a sequence of inputs.
1697 """
1697 """
1698
1698
1699 line = raw_input_original(prompt)
1699 line = raw_input_original(prompt)
1700 # Try to be reasonably smart about not re-indenting pasted input more
1700 # Try to be reasonably smart about not re-indenting pasted input more
1701 # than necessary. We do this by trimming out the auto-indent initial
1701 # than necessary. We do this by trimming out the auto-indent initial
1702 # spaces, if the user's actual input started itself with whitespace.
1702 # spaces, if the user's actual input started itself with whitespace.
1703 if self.autoindent:
1703 if self.autoindent:
1704 line2 = line[self.indent_current_nsp:]
1704 line2 = line[self.indent_current_nsp:]
1705 if line2[0:1] in (' ','\t'):
1705 if line2[0:1] in (' ','\t'):
1706 line = line2
1706 line = line2
1707 return self.prefilter(line,continue_prompt)
1707 return self.prefilter(line,continue_prompt)
1708
1708
1709 def split_user_input(self,line):
1709 def split_user_input(self,line):
1710 """Split user input into pre-char, function part and rest."""
1710 """Split user input into pre-char, function part and rest."""
1711
1711
1712 lsplit = self.line_split.match(line)
1712 lsplit = self.line_split.match(line)
1713 if lsplit is None: # no regexp match returns None
1713 if lsplit is None: # no regexp match returns None
1714 try:
1714 try:
1715 iFun,theRest = line.split(None,1)
1715 iFun,theRest = line.split(None,1)
1716 except ValueError:
1716 except ValueError:
1717 iFun,theRest = line,''
1717 iFun,theRest = line,''
1718 pre = re.match('^(\s*)(.*)',line).groups()[0]
1718 pre = re.match('^(\s*)(.*)',line).groups()[0]
1719 else:
1719 else:
1720 pre,iFun,theRest = lsplit.groups()
1720 pre,iFun,theRest = lsplit.groups()
1721
1721
1722 #print 'line:<%s>' % line # dbg
1722 #print 'line:<%s>' % line # dbg
1723 #print 'pre <%s> iFun <%s> rest <%s>' % (pre,iFun.strip(),theRest) # dbg
1723 #print 'pre <%s> iFun <%s> rest <%s>' % (pre,iFun.strip(),theRest) # dbg
1724 return pre,iFun.strip(),theRest
1724 return pre,iFun.strip(),theRest
1725
1725
1726 def _prefilter(self, line, continue_prompt):
1726 def _prefilter(self, line, continue_prompt):
1727 """Calls different preprocessors, depending on the form of line."""
1727 """Calls different preprocessors, depending on the form of line."""
1728
1728
1729 # All handlers *must* return a value, even if it's blank ('').
1729 # All handlers *must* return a value, even if it's blank ('').
1730
1730
1731 # Lines are NOT logged here. Handlers should process the line as
1731 # Lines are NOT logged here. Handlers should process the line as
1732 # needed, update the cache AND log it (so that the input cache array
1732 # needed, update the cache AND log it (so that the input cache array
1733 # stays synced).
1733 # stays synced).
1734
1734
1735 # This function is _very_ delicate, and since it's also the one which
1735 # This function is _very_ delicate, and since it's also the one which
1736 # determines IPython's response to user input, it must be as efficient
1736 # determines IPython's response to user input, it must be as efficient
1737 # as possible. For this reason it has _many_ returns in it, trying
1737 # as possible. For this reason it has _many_ returns in it, trying
1738 # always to exit as quickly as it can figure out what it needs to do.
1738 # always to exit as quickly as it can figure out what it needs to do.
1739
1739
1740 # This function is the main responsible for maintaining IPython's
1740 # This function is the main responsible for maintaining IPython's
1741 # behavior respectful of Python's semantics. So be _very_ careful if
1741 # behavior respectful of Python's semantics. So be _very_ careful if
1742 # making changes to anything here.
1742 # making changes to anything here.
1743
1743
1744 #.....................................................................
1744 #.....................................................................
1745 # Code begins
1745 # Code begins
1746
1746
1747 #if line.startswith('%crash'): raise RuntimeError,'Crash now!' # dbg
1747 #if line.startswith('%crash'): raise RuntimeError,'Crash now!' # dbg
1748
1748
1749 # save the line away in case we crash, so the post-mortem handler can
1749 # save the line away in case we crash, so the post-mortem handler can
1750 # record it
1750 # record it
1751 self._last_input_line = line
1751 self._last_input_line = line
1752
1752
1753 #print '***line: <%s>' % line # dbg
1753 #print '***line: <%s>' % line # dbg
1754
1754
1755 # the input history needs to track even empty lines
1755 # the input history needs to track even empty lines
1756 if not line.strip():
1756 if not line.strip():
1757 if not continue_prompt:
1757 if not continue_prompt:
1758 self.outputcache.prompt_count -= 1
1758 self.outputcache.prompt_count -= 1
1759 return self.handle_normal(line,continue_prompt)
1759 return self.handle_normal(line,continue_prompt)
1760 #return self.handle_normal('',continue_prompt)
1760 #return self.handle_normal('',continue_prompt)
1761
1761
1762 # print '***cont',continue_prompt # dbg
1762 # print '***cont',continue_prompt # dbg
1763 # special handlers are only allowed for single line statements
1763 # special handlers are only allowed for single line statements
1764 if continue_prompt and not self.rc.multi_line_specials:
1764 if continue_prompt and not self.rc.multi_line_specials:
1765 return self.handle_normal(line,continue_prompt)
1765 return self.handle_normal(line,continue_prompt)
1766
1766
1767 # For the rest, we need the structure of the input
1767 # For the rest, we need the structure of the input
1768 pre,iFun,theRest = self.split_user_input(line)
1768 pre,iFun,theRest = self.split_user_input(line)
1769 #print 'pre <%s> iFun <%s> rest <%s>' % (pre,iFun,theRest) # dbg
1769 #print 'pre <%s> iFun <%s> rest <%s>' % (pre,iFun,theRest) # dbg
1770
1770
1771 # First check for explicit escapes in the last/first character
1771 # First check for explicit escapes in the last/first character
1772 handler = None
1772 handler = None
1773 if line[-1] == self.ESC_HELP:
1773 if line[-1] == self.ESC_HELP:
1774 handler = self.esc_handlers.get(line[-1]) # the ? can be at the end
1774 handler = self.esc_handlers.get(line[-1]) # the ? can be at the end
1775 if handler is None:
1775 if handler is None:
1776 # look at the first character of iFun, NOT of line, so we skip
1776 # look at the first character of iFun, NOT of line, so we skip
1777 # leading whitespace in multiline input
1777 # leading whitespace in multiline input
1778 handler = self.esc_handlers.get(iFun[0:1])
1778 handler = self.esc_handlers.get(iFun[0:1])
1779 if handler is not None:
1779 if handler is not None:
1780 return handler(line,continue_prompt,pre,iFun,theRest)
1780 return handler(line,continue_prompt,pre,iFun,theRest)
1781 # Emacs ipython-mode tags certain input lines
1781 # Emacs ipython-mode tags certain input lines
1782 if line.endswith('# PYTHON-MODE'):
1782 if line.endswith('# PYTHON-MODE'):
1783 return self.handle_emacs(line,continue_prompt)
1783 return self.handle_emacs(line,continue_prompt)
1784
1784
1785 # Next, check if we can automatically execute this thing
1785 # Next, check if we can automatically execute this thing
1786
1786
1787 # Allow ! in multi-line statements if multi_line_specials is on:
1787 # Allow ! in multi-line statements if multi_line_specials is on:
1788 if continue_prompt and self.rc.multi_line_specials and \
1788 if continue_prompt and self.rc.multi_line_specials and \
1789 iFun.startswith(self.ESC_SHELL):
1789 iFun.startswith(self.ESC_SHELL):
1790 return self.handle_shell_escape(line,continue_prompt,
1790 return self.handle_shell_escape(line,continue_prompt,
1791 pre=pre,iFun=iFun,
1791 pre=pre,iFun=iFun,
1792 theRest=theRest)
1792 theRest=theRest)
1793
1793
1794 # Let's try to find if the input line is a magic fn
1794 # Let's try to find if the input line is a magic fn
1795 oinfo = None
1795 oinfo = None
1796 if hasattr(self,'magic_'+iFun):
1796 if hasattr(self,'magic_'+iFun):
1797 # WARNING: _ofind uses getattr(), so it can consume generators and
1797 # WARNING: _ofind uses getattr(), so it can consume generators and
1798 # cause other side effects.
1798 # cause other side effects.
1799 oinfo = self._ofind(iFun) # FIXME - _ofind is part of Magic
1799 oinfo = self._ofind(iFun) # FIXME - _ofind is part of Magic
1800 if oinfo['ismagic']:
1800 if oinfo['ismagic']:
1801 # Be careful not to call magics when a variable assignment is
1801 # Be careful not to call magics when a variable assignment is
1802 # being made (ls='hi', for example)
1802 # being made (ls='hi', for example)
1803 if self.rc.automagic and \
1803 if self.rc.automagic and \
1804 (len(theRest)==0 or theRest[0] not in '!=()<>,') and \
1804 (len(theRest)==0 or theRest[0] not in '!=()<>,') and \
1805 (self.rc.multi_line_specials or not continue_prompt):
1805 (self.rc.multi_line_specials or not continue_prompt):
1806 return self.handle_magic(line,continue_prompt,
1806 return self.handle_magic(line,continue_prompt,
1807 pre,iFun,theRest)
1807 pre,iFun,theRest)
1808 else:
1808 else:
1809 return self.handle_normal(line,continue_prompt)
1809 return self.handle_normal(line,continue_prompt)
1810
1810
1811 # If the rest of the line begins with an (in)equality, assginment or
1811 # If the rest of the line begins with an (in)equality, assginment or
1812 # function call, we should not call _ofind but simply execute it.
1812 # function call, we should not call _ofind but simply execute it.
1813 # This avoids spurious geattr() accesses on objects upon assignment.
1813 # This avoids spurious geattr() accesses on objects upon assignment.
1814 #
1814 #
1815 # It also allows users to assign to either alias or magic names true
1815 # It also allows users to assign to either alias or magic names true
1816 # python variables (the magic/alias systems always take second seat to
1816 # python variables (the magic/alias systems always take second seat to
1817 # true python code).
1817 # true python code).
1818 if theRest and theRest[0] in '!=()':
1818 if theRest and theRest[0] in '!=()':
1819 return self.handle_normal(line,continue_prompt)
1819 return self.handle_normal(line,continue_prompt)
1820
1820
1821 if oinfo is None:
1821 if oinfo is None:
1822 # let's try to ensure that _oinfo is ONLY called when autocall is
1822 # let's try to ensure that _oinfo is ONLY called when autocall is
1823 # on. Since it has inevitable potential side effects, at least
1823 # on. Since it has inevitable potential side effects, at least
1824 # having autocall off should be a guarantee to the user that no
1824 # having autocall off should be a guarantee to the user that no
1825 # weird things will happen.
1825 # weird things will happen.
1826
1826
1827 if self.rc.autocall:
1827 if self.rc.autocall:
1828 oinfo = self._ofind(iFun) # FIXME - _ofind is part of Magic
1828 oinfo = self._ofind(iFun) # FIXME - _ofind is part of Magic
1829 else:
1829 else:
1830 # in this case, all that's left is either an alias or
1830 # in this case, all that's left is either an alias or
1831 # processing the line normally.
1831 # processing the line normally.
1832 if iFun in self.alias_table:
1832 if iFun in self.alias_table:
1833 return self.handle_alias(line,continue_prompt,
1833 return self.handle_alias(line,continue_prompt,
1834 pre,iFun,theRest)
1834 pre,iFun,theRest)
1835 else:
1835 else:
1836 return self.handle_normal(line,continue_prompt)
1836 return self.handle_normal(line,continue_prompt)
1837
1837
1838 if not oinfo['found']:
1838 if not oinfo['found']:
1839 return self.handle_normal(line,continue_prompt)
1839 return self.handle_normal(line,continue_prompt)
1840 else:
1840 else:
1841 #print 'iFun <%s> rest <%s>' % (iFun,theRest) # dbg
1841 #print 'iFun <%s> rest <%s>' % (iFun,theRest) # dbg
1842 if oinfo['isalias']:
1842 if oinfo['isalias']:
1843 return self.handle_alias(line,continue_prompt,
1843 return self.handle_alias(line,continue_prompt,
1844 pre,iFun,theRest)
1844 pre,iFun,theRest)
1845
1845
1846 if self.rc.autocall and \
1846 if self.rc.autocall and \
1847 not self.re_exclude_auto.match(theRest) and \
1847 not self.re_exclude_auto.match(theRest) and \
1848 self.re_fun_name.match(iFun) and \
1848 self.re_fun_name.match(iFun) and \
1849 callable(oinfo['obj']) :
1849 callable(oinfo['obj']) :
1850 #print 'going auto' # dbg
1850 #print 'going auto' # dbg
1851 return self.handle_auto(line,continue_prompt,
1851 return self.handle_auto(line,continue_prompt,
1852 pre,iFun,theRest,oinfo['obj'])
1852 pre,iFun,theRest,oinfo['obj'])
1853 else:
1853 else:
1854 #print 'was callable?', callable(oinfo['obj']) # dbg
1854 #print 'was callable?', callable(oinfo['obj']) # dbg
1855 return self.handle_normal(line,continue_prompt)
1855 return self.handle_normal(line,continue_prompt)
1856
1856
1857 # If we get here, we have a normal Python line. Log and return.
1857 # If we get here, we have a normal Python line. Log and return.
1858 return self.handle_normal(line,continue_prompt)
1858 return self.handle_normal(line,continue_prompt)
1859
1859
1860 def _prefilter_dumb(self, line, continue_prompt):
1860 def _prefilter_dumb(self, line, continue_prompt):
1861 """simple prefilter function, for debugging"""
1861 """simple prefilter function, for debugging"""
1862 return self.handle_normal(line,continue_prompt)
1862 return self.handle_normal(line,continue_prompt)
1863
1863
1864 # Set the default prefilter() function (this can be user-overridden)
1864 # Set the default prefilter() function (this can be user-overridden)
1865 prefilter = _prefilter
1865 prefilter = _prefilter
1866
1866
1867 def handle_normal(self,line,continue_prompt=None,
1867 def handle_normal(self,line,continue_prompt=None,
1868 pre=None,iFun=None,theRest=None):
1868 pre=None,iFun=None,theRest=None):
1869 """Handle normal input lines. Use as a template for handlers."""
1869 """Handle normal input lines. Use as a template for handlers."""
1870
1870
1871 # With autoindent on, we need some way to exit the input loop, and I
1871 # With autoindent on, we need some way to exit the input loop, and I
1872 # don't want to force the user to have to backspace all the way to
1872 # don't want to force the user to have to backspace all the way to
1873 # clear the line. The rule will be in this case, that either two
1873 # clear the line. The rule will be in this case, that either two
1874 # lines of pure whitespace in a row, or a line of pure whitespace but
1874 # lines of pure whitespace in a row, or a line of pure whitespace but
1875 # of a size different to the indent level, will exit the input loop.
1875 # of a size different to the indent level, will exit the input loop.
1876
1876
1877 if (continue_prompt and self.autoindent and isspace(line) and
1877 if (continue_prompt and self.autoindent and isspace(line) and
1878 (line != self.indent_current or isspace(self.buffer[-1]))):
1878 (line != self.indent_current or isspace(self.buffer[-1]))):
1879 line = ''
1879 line = ''
1880
1880
1881 self.log(line,continue_prompt)
1881 self.log(line,continue_prompt)
1882 return line
1882 return line
1883
1883
1884 def handle_alias(self,line,continue_prompt=None,
1884 def handle_alias(self,line,continue_prompt=None,
1885 pre=None,iFun=None,theRest=None):
1885 pre=None,iFun=None,theRest=None):
1886 """Handle alias input lines. """
1886 """Handle alias input lines. """
1887
1887
1888 # pre is needed, because it carries the leading whitespace. Otherwise
1888 # pre is needed, because it carries the leading whitespace. Otherwise
1889 # aliases won't work in indented sections.
1889 # aliases won't work in indented sections.
1890 line_out = '%sipalias("%s %s")' % (pre,iFun,esc_quotes(theRest))
1890 line_out = '%sipalias("%s %s")' % (pre,iFun,esc_quotes(theRest))
1891 self.log(line_out,continue_prompt)
1891 self.log(line_out,continue_prompt)
1892 return line_out
1892 return line_out
1893
1893
1894 def handle_shell_escape(self, line, continue_prompt=None,
1894 def handle_shell_escape(self, line, continue_prompt=None,
1895 pre=None,iFun=None,theRest=None):
1895 pre=None,iFun=None,theRest=None):
1896 """Execute the line in a shell, empty return value"""
1896 """Execute the line in a shell, empty return value"""
1897
1897
1898 #print 'line in :', `line` # dbg
1898 #print 'line in :', `line` # dbg
1899 # Example of a special handler. Others follow a similar pattern.
1899 # Example of a special handler. Others follow a similar pattern.
1900 if continue_prompt: # multi-line statements
1900 if continue_prompt: # multi-line statements
1901 if iFun.startswith('!!'):
1901 if iFun.startswith('!!'):
1902 print 'SyntaxError: !! is not allowed in multiline statements'
1902 print 'SyntaxError: !! is not allowed in multiline statements'
1903 return pre
1903 return pre
1904 else:
1904 else:
1905 cmd = ("%s %s" % (iFun[1:],theRest))
1905 cmd = ("%s %s" % (iFun[1:],theRest))
1906 line_out = '%sipsystem(r"""%s"""[:-1])' % (pre,cmd + "_")
1906 line_out = '%sipsystem(r"""%s"""[:-1])' % (pre,cmd + "_")
1907 else: # single-line input
1907 else: # single-line input
1908 if line.startswith('!!'):
1908 if line.startswith('!!'):
1909 # rewrite iFun/theRest to properly hold the call to %sx and
1909 # rewrite iFun/theRest to properly hold the call to %sx and
1910 # the actual command to be executed, so handle_magic can work
1910 # the actual command to be executed, so handle_magic can work
1911 # correctly
1911 # correctly
1912 theRest = '%s %s' % (iFun[2:],theRest)
1912 theRest = '%s %s' % (iFun[2:],theRest)
1913 iFun = 'sx'
1913 iFun = 'sx'
1914 return self.handle_magic('%ssx %s' % (self.ESC_MAGIC,line[2:]),
1914 return self.handle_magic('%ssx %s' % (self.ESC_MAGIC,line[2:]),
1915 continue_prompt,pre,iFun,theRest)
1915 continue_prompt,pre,iFun,theRest)
1916 else:
1916 else:
1917 cmd=line[1:]
1917 cmd=line[1:]
1918 line_out = '%sipsystem(r"""%s"""[:-1])' % (pre,cmd +"_")
1918 line_out = '%sipsystem(r"""%s"""[:-1])' % (pre,cmd +"_")
1919 # update cache/log and return
1919 # update cache/log and return
1920 self.log(line_out,continue_prompt)
1920 self.log(line_out,continue_prompt)
1921 return line_out
1921 return line_out
1922
1922
1923 def handle_magic(self, line, continue_prompt=None,
1923 def handle_magic(self, line, continue_prompt=None,
1924 pre=None,iFun=None,theRest=None):
1924 pre=None,iFun=None,theRest=None):
1925 """Execute magic functions.
1925 """Execute magic functions.
1926
1926
1927 Also log them with a prepended # so the log is clean Python."""
1927 Also log them with a prepended # so the log is clean Python."""
1928
1928
1929 cmd = '%sipmagic("%s")' % (pre,esc_quotes('%s %s' % (iFun,theRest)))
1929 cmd = '%sipmagic("%s")' % (pre,esc_quotes('%s %s' % (iFun,theRest)))
1930 self.log(cmd,continue_prompt)
1930 self.log(cmd,continue_prompt)
1931 #print 'in handle_magic, cmd=<%s>' % cmd # dbg
1931 #print 'in handle_magic, cmd=<%s>' % cmd # dbg
1932 return cmd
1932 return cmd
1933
1933
1934 def handle_auto(self, line, continue_prompt=None,
1934 def handle_auto(self, line, continue_prompt=None,
1935 pre=None,iFun=None,theRest=None,obj=None):
1935 pre=None,iFun=None,theRest=None,obj=None):
1936 """Hande lines which can be auto-executed, quoting if requested."""
1936 """Hande lines which can be auto-executed, quoting if requested."""
1937
1937
1938 #print 'pre <%s> iFun <%s> rest <%s>' % (pre,iFun,theRest) # dbg
1938 #print 'pre <%s> iFun <%s> rest <%s>' % (pre,iFun,theRest) # dbg
1939
1939
1940 # This should only be active for single-line input!
1940 # This should only be active for single-line input!
1941 if continue_prompt:
1941 if continue_prompt:
1942 self.log(line,continue_prompt)
1942 self.log(line,continue_prompt)
1943 return line
1943 return line
1944
1944
1945 auto_rewrite = True
1945 auto_rewrite = True
1946 if pre == self.ESC_QUOTE:
1946 if pre == self.ESC_QUOTE:
1947 # Auto-quote splitting on whitespace
1947 # Auto-quote splitting on whitespace
1948 newcmd = '%s("%s")' % (iFun,'", "'.join(theRest.split()) )
1948 newcmd = '%s("%s")' % (iFun,'", "'.join(theRest.split()) )
1949 elif pre == self.ESC_QUOTE2:
1949 elif pre == self.ESC_QUOTE2:
1950 # Auto-quote whole string
1950 # Auto-quote whole string
1951 newcmd = '%s("%s")' % (iFun,theRest)
1951 newcmd = '%s("%s")' % (iFun,theRest)
1952 else:
1952 else:
1953 # Auto-paren.
1953 # Auto-paren.
1954 # We only apply it to argument-less calls if the autocall
1954 # We only apply it to argument-less calls if the autocall
1955 # parameter is set to 2. We only need to check that autocall is <
1955 # parameter is set to 2. We only need to check that autocall is <
1956 # 2, since this function isn't called unless it's at least 1.
1956 # 2, since this function isn't called unless it's at least 1.
1957 if not theRest and (self.rc.autocall < 2):
1957 if not theRest and (self.rc.autocall < 2):
1958 newcmd = '%s %s' % (iFun,theRest)
1958 newcmd = '%s %s' % (iFun,theRest)
1959 auto_rewrite = False
1959 auto_rewrite = False
1960 else:
1960 else:
1961 if theRest.startswith('['):
1961 if theRest.startswith('['):
1962 if hasattr(obj,'__getitem__'):
1962 if hasattr(obj,'__getitem__'):
1963 # Don't autocall in this case: item access for an object
1963 # Don't autocall in this case: item access for an object
1964 # which is BOTH callable and implements __getitem__.
1964 # which is BOTH callable and implements __getitem__.
1965 newcmd = '%s %s' % (iFun,theRest)
1965 newcmd = '%s %s' % (iFun,theRest)
1966 auto_rewrite = False
1966 auto_rewrite = False
1967 else:
1967 else:
1968 # if the object doesn't support [] access, go ahead and
1968 # if the object doesn't support [] access, go ahead and
1969 # autocall
1969 # autocall
1970 newcmd = '%s(%s)' % (iFun.rstrip(),theRest)
1970 newcmd = '%s(%s)' % (iFun.rstrip(),theRest)
1971 elif theRest.endswith(';'):
1971 elif theRest.endswith(';'):
1972 newcmd = '%s(%s);' % (iFun.rstrip(),theRest[:-1])
1972 newcmd = '%s(%s);' % (iFun.rstrip(),theRest[:-1])
1973 else:
1973 else:
1974 newcmd = '%s(%s)' % (iFun.rstrip(),theRest)
1974 newcmd = '%s(%s)' % (iFun.rstrip(),theRest)
1975
1975
1976 if auto_rewrite:
1976 if auto_rewrite:
1977 print >>Term.cout, self.outputcache.prompt1.auto_rewrite() + newcmd
1977 print >>Term.cout, self.outputcache.prompt1.auto_rewrite() + newcmd
1978 # log what is now valid Python, not the actual user input (without the
1978 # log what is now valid Python, not the actual user input (without the
1979 # final newline)
1979 # final newline)
1980 self.log(newcmd,continue_prompt)
1980 self.log(newcmd,continue_prompt)
1981 return newcmd
1981 return newcmd
1982
1982
1983 def handle_help(self, line, continue_prompt=None,
1983 def handle_help(self, line, continue_prompt=None,
1984 pre=None,iFun=None,theRest=None):
1984 pre=None,iFun=None,theRest=None):
1985 """Try to get some help for the object.
1985 """Try to get some help for the object.
1986
1986
1987 obj? or ?obj -> basic information.
1987 obj? or ?obj -> basic information.
1988 obj?? or ??obj -> more details.
1988 obj?? or ??obj -> more details.
1989 """
1989 """
1990
1990
1991 # We need to make sure that we don't process lines which would be
1991 # We need to make sure that we don't process lines which would be
1992 # otherwise valid python, such as "x=1 # what?"
1992 # otherwise valid python, such as "x=1 # what?"
1993 try:
1993 try:
1994 codeop.compile_command(line)
1994 codeop.compile_command(line)
1995 except SyntaxError:
1995 except SyntaxError:
1996 # We should only handle as help stuff which is NOT valid syntax
1996 # We should only handle as help stuff which is NOT valid syntax
1997 if line[0]==self.ESC_HELP:
1997 if line[0]==self.ESC_HELP:
1998 line = line[1:]
1998 line = line[1:]
1999 elif line[-1]==self.ESC_HELP:
1999 elif line[-1]==self.ESC_HELP:
2000 line = line[:-1]
2000 line = line[:-1]
2001 self.log('#?'+line)
2001 self.log('#?'+line)
2002 if line:
2002 if line:
2003 self.magic_pinfo(line)
2003 self.magic_pinfo(line)
2004 else:
2004 else:
2005 page(self.usage,screen_lines=self.rc.screen_length)
2005 page(self.usage,screen_lines=self.rc.screen_length)
2006 return '' # Empty string is needed here!
2006 return '' # Empty string is needed here!
2007 except:
2007 except:
2008 # Pass any other exceptions through to the normal handler
2008 # Pass any other exceptions through to the normal handler
2009 return self.handle_normal(line,continue_prompt)
2009 return self.handle_normal(line,continue_prompt)
2010 else:
2010 else:
2011 # If the code compiles ok, we should handle it normally
2011 # If the code compiles ok, we should handle it normally
2012 return self.handle_normal(line,continue_prompt)
2012 return self.handle_normal(line,continue_prompt)
2013
2013
2014 def handle_emacs(self,line,continue_prompt=None,
2014 def handle_emacs(self,line,continue_prompt=None,
2015 pre=None,iFun=None,theRest=None):
2015 pre=None,iFun=None,theRest=None):
2016 """Handle input lines marked by python-mode."""
2016 """Handle input lines marked by python-mode."""
2017
2017
2018 # Currently, nothing is done. Later more functionality can be added
2018 # Currently, nothing is done. Later more functionality can be added
2019 # here if needed.
2019 # here if needed.
2020
2020
2021 # The input cache shouldn't be updated
2021 # The input cache shouldn't be updated
2022
2022
2023 return line
2023 return line
2024
2024
2025 def mktempfile(self,data=None):
2025 def mktempfile(self,data=None):
2026 """Make a new tempfile and return its filename.
2026 """Make a new tempfile and return its filename.
2027
2027
2028 This makes a call to tempfile.mktemp, but it registers the created
2028 This makes a call to tempfile.mktemp, but it registers the created
2029 filename internally so ipython cleans it up at exit time.
2029 filename internally so ipython cleans it up at exit time.
2030
2030
2031 Optional inputs:
2031 Optional inputs:
2032
2032
2033 - data(None): if data is given, it gets written out to the temp file
2033 - data(None): if data is given, it gets written out to the temp file
2034 immediately, and the file is closed again."""
2034 immediately, and the file is closed again."""
2035
2035
2036 filename = tempfile.mktemp('.py','ipython_edit_')
2036 filename = tempfile.mktemp('.py','ipython_edit_')
2037 self.tempfiles.append(filename)
2037 self.tempfiles.append(filename)
2038
2038
2039 if data:
2039 if data:
2040 tmp_file = open(filename,'w')
2040 tmp_file = open(filename,'w')
2041 tmp_file.write(data)
2041 tmp_file.write(data)
2042 tmp_file.close()
2042 tmp_file.close()
2043 return filename
2043 return filename
2044
2044
2045 def write(self,data):
2045 def write(self,data):
2046 """Write a string to the default output"""
2046 """Write a string to the default output"""
2047 Term.cout.write(data)
2047 Term.cout.write(data)
2048
2048
2049 def write_err(self,data):
2049 def write_err(self,data):
2050 """Write a string to the default error output"""
2050 """Write a string to the default error output"""
2051 Term.cerr.write(data)
2051 Term.cerr.write(data)
2052
2052
2053 def exit(self):
2053 def exit(self):
2054 """Handle interactive exit.
2054 """Handle interactive exit.
2055
2055
2056 This method sets the exit_now attribute."""
2056 This method sets the exit_now attribute."""
2057
2057
2058 if self.rc.confirm_exit:
2058 if self.rc.confirm_exit:
2059 if ask_yes_no('Do you really want to exit ([y]/n)?','y'):
2059 if ask_yes_no('Do you really want to exit ([y]/n)?','y'):
2060 self.exit_now = True
2060 self.exit_now = True
2061 else:
2061 else:
2062 self.exit_now = True
2062 self.exit_now = True
2063 return self.exit_now
2063 return self.exit_now
2064
2064
2065 def safe_execfile(self,fname,*where,**kw):
2065 def safe_execfile(self,fname,*where,**kw):
2066 fname = os.path.expanduser(fname)
2066 fname = os.path.expanduser(fname)
2067
2067
2068 # find things also in current directory
2068 # find things also in current directory
2069 dname = os.path.dirname(fname)
2069 dname = os.path.dirname(fname)
2070 if not sys.path.count(dname):
2070 if not sys.path.count(dname):
2071 sys.path.append(dname)
2071 sys.path.append(dname)
2072
2072
2073 try:
2073 try:
2074 xfile = open(fname)
2074 xfile = open(fname)
2075 except:
2075 except:
2076 print >> Term.cerr, \
2076 print >> Term.cerr, \
2077 'Could not open file <%s> for safe execution.' % fname
2077 'Could not open file <%s> for safe execution.' % fname
2078 return None
2078 return None
2079
2079
2080 kw.setdefault('islog',0)
2080 kw.setdefault('islog',0)
2081 kw.setdefault('quiet',1)
2081 kw.setdefault('quiet',1)
2082 kw.setdefault('exit_ignore',0)
2082 kw.setdefault('exit_ignore',0)
2083 first = xfile.readline()
2083 first = xfile.readline()
2084 loghead = str(self.loghead_tpl).split('\n',1)[0].strip()
2084 loghead = str(self.loghead_tpl).split('\n',1)[0].strip()
2085 xfile.close()
2085 xfile.close()
2086 # line by line execution
2086 # line by line execution
2087 if first.startswith(loghead) or kw['islog']:
2087 if first.startswith(loghead) or kw['islog']:
2088 print 'Loading log file <%s> one line at a time...' % fname
2088 print 'Loading log file <%s> one line at a time...' % fname
2089 if kw['quiet']:
2089 if kw['quiet']:
2090 stdout_save = sys.stdout
2090 stdout_save = sys.stdout
2091 sys.stdout = StringIO.StringIO()
2091 sys.stdout = StringIO.StringIO()
2092 try:
2092 try:
2093 globs,locs = where[0:2]
2093 globs,locs = where[0:2]
2094 except:
2094 except:
2095 try:
2095 try:
2096 globs = locs = where[0]
2096 globs = locs = where[0]
2097 except:
2097 except:
2098 globs = locs = globals()
2098 globs = locs = globals()
2099 badblocks = []
2099 badblocks = []
2100
2100
2101 # we also need to identify indented blocks of code when replaying
2101 # we also need to identify indented blocks of code when replaying
2102 # logs and put them together before passing them to an exec
2102 # logs and put them together before passing them to an exec
2103 # statement. This takes a bit of regexp and look-ahead work in the
2103 # statement. This takes a bit of regexp and look-ahead work in the
2104 # file. It's easiest if we swallow the whole thing in memory
2104 # file. It's easiest if we swallow the whole thing in memory
2105 # first, and manually walk through the lines list moving the
2105 # first, and manually walk through the lines list moving the
2106 # counter ourselves.
2106 # counter ourselves.
2107 indent_re = re.compile('\s+\S')
2107 indent_re = re.compile('\s+\S')
2108 xfile = open(fname)
2108 xfile = open(fname)
2109 filelines = xfile.readlines()
2109 filelines = xfile.readlines()
2110 xfile.close()
2110 xfile.close()
2111 nlines = len(filelines)
2111 nlines = len(filelines)
2112 lnum = 0
2112 lnum = 0
2113 while lnum < nlines:
2113 while lnum < nlines:
2114 line = filelines[lnum]
2114 line = filelines[lnum]
2115 lnum += 1
2115 lnum += 1
2116 # don't re-insert logger status info into cache
2116 # don't re-insert logger status info into cache
2117 if line.startswith('#log#'):
2117 if line.startswith('#log#'):
2118 continue
2118 continue
2119 else:
2119 else:
2120 # build a block of code (maybe a single line) for execution
2120 # build a block of code (maybe a single line) for execution
2121 block = line
2121 block = line
2122 try:
2122 try:
2123 next = filelines[lnum] # lnum has already incremented
2123 next = filelines[lnum] # lnum has already incremented
2124 except:
2124 except:
2125 next = None
2125 next = None
2126 while next and indent_re.match(next):
2126 while next and indent_re.match(next):
2127 block += next
2127 block += next
2128 lnum += 1
2128 lnum += 1
2129 try:
2129 try:
2130 next = filelines[lnum]
2130 next = filelines[lnum]
2131 except:
2131 except:
2132 next = None
2132 next = None
2133 # now execute the block of one or more lines
2133 # now execute the block of one or more lines
2134 try:
2134 try:
2135 exec block in globs,locs
2135 exec block in globs,locs
2136 except SystemExit:
2136 except SystemExit:
2137 pass
2137 pass
2138 except:
2138 except:
2139 badblocks.append(block.rstrip())
2139 badblocks.append(block.rstrip())
2140 if kw['quiet']: # restore stdout
2140 if kw['quiet']: # restore stdout
2141 sys.stdout.close()
2141 sys.stdout.close()
2142 sys.stdout = stdout_save
2142 sys.stdout = stdout_save
2143 print 'Finished replaying log file <%s>' % fname
2143 print 'Finished replaying log file <%s>' % fname
2144 if badblocks:
2144 if badblocks:
2145 print >> sys.stderr, ('\nThe following lines/blocks in file '
2145 print >> sys.stderr, ('\nThe following lines/blocks in file '
2146 '<%s> reported errors:' % fname)
2146 '<%s> reported errors:' % fname)
2147
2147
2148 for badline in badblocks:
2148 for badline in badblocks:
2149 print >> sys.stderr, badline
2149 print >> sys.stderr, badline
2150 else: # regular file execution
2150 else: # regular file execution
2151 try:
2151 try:
2152 execfile(fname,*where)
2152 execfile(fname,*where)
2153 except SyntaxError:
2153 except SyntaxError:
2154 etype,evalue = sys.exc_info()[:2]
2154 etype,evalue = sys.exc_info()[:2]
2155 self.SyntaxTB(etype,evalue,[])
2155 self.SyntaxTB(etype,evalue,[])
2156 warn('Failure executing file: <%s>' % fname)
2156 warn('Failure executing file: <%s>' % fname)
2157 except SystemExit,status:
2157 except SystemExit,status:
2158 if not kw['exit_ignore']:
2158 if not kw['exit_ignore']:
2159 self.InteractiveTB()
2159 self.InteractiveTB()
2160 warn('Failure executing file: <%s>' % fname)
2160 warn('Failure executing file: <%s>' % fname)
2161 except:
2161 except:
2162 self.InteractiveTB()
2162 self.InteractiveTB()
2163 warn('Failure executing file: <%s>' % fname)
2163 warn('Failure executing file: <%s>' % fname)
2164
2164
2165 #************************* end of file <iplib.py> *****************************
2165 #************************* end of file <iplib.py> *****************************
@@ -1,4814 +1,4822 b''
1 2006-01-11 Fernando Perez <Fernando.Perez@colorado.edu>
2
3 * IPython/Shell.py (IPShellGTK.on_timer): Finally fix the the
4 problem of excessive CPU usage under *nix and keyboard lag under
5 win32.
6
7 2006-01-10 *** Released version 0.7.0
8
1 2006-01-10 Fernando Perez <Fernando.Perez@colorado.edu>
9 2006-01-10 Fernando Perez <Fernando.Perez@colorado.edu>
2
10
3 * IPython/Release.py (revision): tag version number to 0.7.0,
11 * IPython/Release.py (revision): tag version number to 0.7.0,
4 ready for release.
12 ready for release.
5
13
6 * IPython/Magic.py (magic_edit): Add print statement to %edit so
14 * IPython/Magic.py (magic_edit): Add print statement to %edit so
7 it informs the user of the name of the temp. file used. This can
15 it informs the user of the name of the temp. file used. This can
8 help if you decide later to reuse that same file, so you know
16 help if you decide later to reuse that same file, so you know
9 where to copy the info from.
17 where to copy the info from.
10
18
11 2006-01-09 Fernando Perez <Fernando.Perez@colorado.edu>
19 2006-01-09 Fernando Perez <Fernando.Perez@colorado.edu>
12
20
13 * setup_bdist_egg.py: little script to build an egg. Added
21 * setup_bdist_egg.py: little script to build an egg. Added
14 support in the release tools as well.
22 support in the release tools as well.
15
23
16 2006-01-08 Fernando Perez <Fernando.Perez@colorado.edu>
24 2006-01-08 Fernando Perez <Fernando.Perez@colorado.edu>
17
25
18 * IPython/Shell.py (IPShellWX.__init__): add support for WXPython
26 * IPython/Shell.py (IPShellWX.__init__): add support for WXPython
19 version selection (new -wxversion command line and ipythonrc
27 version selection (new -wxversion command line and ipythonrc
20 parameter). Patch contributed by Arnd Baecker
28 parameter). Patch contributed by Arnd Baecker
21 <arnd.baecker-AT-web.de>.
29 <arnd.baecker-AT-web.de>.
22
30
23 * IPython/iplib.py (embed_mainloop): fix tab-completion in
31 * IPython/iplib.py (embed_mainloop): fix tab-completion in
24 embedded instances, for variables defined at the interactive
32 embedded instances, for variables defined at the interactive
25 prompt of the embedded ipython. Reported by Arnd.
33 prompt of the embedded ipython. Reported by Arnd.
26
34
27 * IPython/Magic.py (magic_autocall): Fix %autocall magic. Now
35 * IPython/Magic.py (magic_autocall): Fix %autocall magic. Now
28 it can be used as a (stateful) toggle, or with a direct parameter.
36 it can be used as a (stateful) toggle, or with a direct parameter.
29
37
30 * IPython/ultraTB.py (_fixed_getinnerframes): remove debug assert which
38 * IPython/ultraTB.py (_fixed_getinnerframes): remove debug assert which
31 could be triggered in certain cases and cause the traceback
39 could be triggered in certain cases and cause the traceback
32 printer not to work.
40 printer not to work.
33
41
34 2006-01-07 Fernando Perez <Fernando.Perez@colorado.edu>
42 2006-01-07 Fernando Perez <Fernando.Perez@colorado.edu>
35
43
36 * IPython/iplib.py (_should_recompile): Small fix, closes
44 * IPython/iplib.py (_should_recompile): Small fix, closes
37 http://www.scipy.net/roundup/ipython/issue48. Patch by Scott.
45 http://www.scipy.net/roundup/ipython/issue48. Patch by Scott.
38
46
39 2006-01-04 Fernando Perez <Fernando.Perez@colorado.edu>
47 2006-01-04 Fernando Perez <Fernando.Perez@colorado.edu>
40
48
41 * IPython/Shell.py (IPShellGTK.mainloop): fix bug in the GTK
49 * IPython/Shell.py (IPShellGTK.mainloop): fix bug in the GTK
42 backend for matplotlib (100% cpu utiliziation). Thanks to Charlie
50 backend for matplotlib (100% cpu utiliziation). Thanks to Charlie
43 Moad for help with tracking it down.
51 Moad for help with tracking it down.
44
52
45 * IPython/iplib.py (handle_auto): fix autocall handling for
53 * IPython/iplib.py (handle_auto): fix autocall handling for
46 objects which support BOTH __getitem__ and __call__ (so that f [x]
54 objects which support BOTH __getitem__ and __call__ (so that f [x]
47 is left alone, instead of becoming f([x]) automatically).
55 is left alone, instead of becoming f([x]) automatically).
48
56
49 * IPython/Magic.py (magic_cd): fix crash when cd -b was used.
57 * IPython/Magic.py (magic_cd): fix crash when cd -b was used.
50 Ville's patch.
58 Ville's patch.
51
59
52 2006-01-03 Fernando Perez <Fernando.Perez@colorado.edu>
60 2006-01-03 Fernando Perez <Fernando.Perez@colorado.edu>
53
61
54 * IPython/iplib.py (handle_auto): changed autocall semantics to
62 * IPython/iplib.py (handle_auto): changed autocall semantics to
55 include 'smart' mode, where the autocall transformation is NOT
63 include 'smart' mode, where the autocall transformation is NOT
56 applied if there are no arguments on the line. This allows you to
64 applied if there are no arguments on the line. This allows you to
57 just type 'foo' if foo is a callable to see its internal form,
65 just type 'foo' if foo is a callable to see its internal form,
58 instead of having it called with no arguments (typically a
66 instead of having it called with no arguments (typically a
59 mistake). The old 'full' autocall still exists: for that, you
67 mistake). The old 'full' autocall still exists: for that, you
60 need to set the 'autocall' parameter to 2 in your ipythonrc file.
68 need to set the 'autocall' parameter to 2 in your ipythonrc file.
61
69
62 * IPython/completer.py (Completer.attr_matches): add
70 * IPython/completer.py (Completer.attr_matches): add
63 tab-completion support for Enthoughts' traits. After a report by
71 tab-completion support for Enthoughts' traits. After a report by
64 Arnd and a patch by Prabhu.
72 Arnd and a patch by Prabhu.
65
73
66 2006-01-02 Fernando Perez <Fernando.Perez@colorado.edu>
74 2006-01-02 Fernando Perez <Fernando.Perez@colorado.edu>
67
75
68 * IPython/ultraTB.py (_fixed_getinnerframes): added Alex
76 * IPython/ultraTB.py (_fixed_getinnerframes): added Alex
69 Schmolck's patch to fix inspect.getinnerframes().
77 Schmolck's patch to fix inspect.getinnerframes().
70
78
71 * IPython/iplib.py (InteractiveShell.__init__): significant fixes
79 * IPython/iplib.py (InteractiveShell.__init__): significant fixes
72 for embedded instances, regarding handling of namespaces and items
80 for embedded instances, regarding handling of namespaces and items
73 added to the __builtin__ one. Multiple embedded instances and
81 added to the __builtin__ one. Multiple embedded instances and
74 recursive embeddings should work better now (though I'm not sure
82 recursive embeddings should work better now (though I'm not sure
75 I've got all the corner cases fixed, that code is a bit of a brain
83 I've got all the corner cases fixed, that code is a bit of a brain
76 twister).
84 twister).
77
85
78 * IPython/Magic.py (magic_edit): added support to edit in-memory
86 * IPython/Magic.py (magic_edit): added support to edit in-memory
79 macros (automatically creates the necessary temp files). %edit
87 macros (automatically creates the necessary temp files). %edit
80 also doesn't return the file contents anymore, it's just noise.
88 also doesn't return the file contents anymore, it's just noise.
81
89
82 * IPython/completer.py (Completer.attr_matches): revert change to
90 * IPython/completer.py (Completer.attr_matches): revert change to
83 complete only on attributes listed in __all__. I realized it
91 complete only on attributes listed in __all__. I realized it
84 cripples the tab-completion system as a tool for exploring the
92 cripples the tab-completion system as a tool for exploring the
85 internals of unknown libraries (it renders any non-__all__
93 internals of unknown libraries (it renders any non-__all__
86 attribute off-limits). I got bit by this when trying to see
94 attribute off-limits). I got bit by this when trying to see
87 something inside the dis module.
95 something inside the dis module.
88
96
89 2005-12-31 Fernando Perez <Fernando.Perez@colorado.edu>
97 2005-12-31 Fernando Perez <Fernando.Perez@colorado.edu>
90
98
91 * IPython/iplib.py (InteractiveShell.__init__): add .meta
99 * IPython/iplib.py (InteractiveShell.__init__): add .meta
92 namespace for users and extension writers to hold data in. This
100 namespace for users and extension writers to hold data in. This
93 follows the discussion in
101 follows the discussion in
94 http://projects.scipy.org/ipython/ipython/wiki/RefactoringIPython.
102 http://projects.scipy.org/ipython/ipython/wiki/RefactoringIPython.
95
103
96 * IPython/completer.py (IPCompleter.complete): small patch to help
104 * IPython/completer.py (IPCompleter.complete): small patch to help
97 tab-completion under Emacs, after a suggestion by John Barnard
105 tab-completion under Emacs, after a suggestion by John Barnard
98 <barnarj-AT-ccf.org>.
106 <barnarj-AT-ccf.org>.
99
107
100 * IPython/Magic.py (Magic.extract_input_slices): added support for
108 * IPython/Magic.py (Magic.extract_input_slices): added support for
101 the slice notation in magics to use N-M to represent numbers N...M
109 the slice notation in magics to use N-M to represent numbers N...M
102 (closed endpoints). This is used by %macro and %save.
110 (closed endpoints). This is used by %macro and %save.
103
111
104 * IPython/completer.py (Completer.attr_matches): for modules which
112 * IPython/completer.py (Completer.attr_matches): for modules which
105 define __all__, complete only on those. After a patch by Jeffrey
113 define __all__, complete only on those. After a patch by Jeffrey
106 Collins <jcollins_boulder-AT-earthlink.net>. Also, clean up and
114 Collins <jcollins_boulder-AT-earthlink.net>. Also, clean up and
107 speed up this routine.
115 speed up this routine.
108
116
109 * IPython/Logger.py (Logger.log): fix a history handling bug. I
117 * IPython/Logger.py (Logger.log): fix a history handling bug. I
110 don't know if this is the end of it, but the behavior now is
118 don't know if this is the end of it, but the behavior now is
111 certainly much more correct. Note that coupled with macros,
119 certainly much more correct. Note that coupled with macros,
112 slightly surprising (at first) behavior may occur: a macro will in
120 slightly surprising (at first) behavior may occur: a macro will in
113 general expand to multiple lines of input, so upon exiting, the
121 general expand to multiple lines of input, so upon exiting, the
114 in/out counters will both be bumped by the corresponding amount
122 in/out counters will both be bumped by the corresponding amount
115 (as if the macro's contents had been typed interactively). Typing
123 (as if the macro's contents had been typed interactively). Typing
116 %hist will reveal the intermediate (silently processed) lines.
124 %hist will reveal the intermediate (silently processed) lines.
117
125
118 * IPython/Magic.py (magic_run): fix a subtle bug which could cause
126 * IPython/Magic.py (magic_run): fix a subtle bug which could cause
119 pickle to fail (%run was overwriting __main__ and not restoring
127 pickle to fail (%run was overwriting __main__ and not restoring
120 it, but pickle relies on __main__ to operate).
128 it, but pickle relies on __main__ to operate).
121
129
122 * IPython/iplib.py (InteractiveShell): fix pdb calling: I'm now
130 * IPython/iplib.py (InteractiveShell): fix pdb calling: I'm now
123 using properties, but forgot to make the main InteractiveShell
131 using properties, but forgot to make the main InteractiveShell
124 class a new-style class. Properties fail silently, and
132 class a new-style class. Properties fail silently, and
125 misteriously, with old-style class (getters work, but
133 misteriously, with old-style class (getters work, but
126 setters don't do anything).
134 setters don't do anything).
127
135
128 2005-12-30 Fernando Perez <Fernando.Perez@colorado.edu>
136 2005-12-30 Fernando Perez <Fernando.Perez@colorado.edu>
129
137
130 * IPython/Magic.py (magic_history): fix history reporting bug (I
138 * IPython/Magic.py (magic_history): fix history reporting bug (I
131 know some nasties are still there, I just can't seem to find a
139 know some nasties are still there, I just can't seem to find a
132 reproducible test case to track them down; the input history is
140 reproducible test case to track them down; the input history is
133 falling out of sync...)
141 falling out of sync...)
134
142
135 * IPython/iplib.py (handle_shell_escape): fix bug where both
143 * IPython/iplib.py (handle_shell_escape): fix bug where both
136 aliases and system accesses where broken for indented code (such
144 aliases and system accesses where broken for indented code (such
137 as loops).
145 as loops).
138
146
139 * IPython/genutils.py (shell): fix small but critical bug for
147 * IPython/genutils.py (shell): fix small but critical bug for
140 win32 system access.
148 win32 system access.
141
149
142 2005-12-29 Fernando Perez <Fernando.Perez@colorado.edu>
150 2005-12-29 Fernando Perez <Fernando.Perez@colorado.edu>
143
151
144 * IPython/iplib.py (showtraceback): remove use of the
152 * IPython/iplib.py (showtraceback): remove use of the
145 sys.last_{type/value/traceback} structures, which are non
153 sys.last_{type/value/traceback} structures, which are non
146 thread-safe.
154 thread-safe.
147 (_prefilter): change control flow to ensure that we NEVER
155 (_prefilter): change control flow to ensure that we NEVER
148 introspect objects when autocall is off. This will guarantee that
156 introspect objects when autocall is off. This will guarantee that
149 having an input line of the form 'x.y', where access to attribute
157 having an input line of the form 'x.y', where access to attribute
150 'y' has side effects, doesn't trigger the side effect TWICE. It
158 'y' has side effects, doesn't trigger the side effect TWICE. It
151 is important to note that, with autocall on, these side effects
159 is important to note that, with autocall on, these side effects
152 can still happen.
160 can still happen.
153 (ipsystem): new builtin, to complete the ip{magic/alias/system}
161 (ipsystem): new builtin, to complete the ip{magic/alias/system}
154 trio. IPython offers these three kinds of special calls which are
162 trio. IPython offers these three kinds of special calls which are
155 not python code, and it's a good thing to have their call method
163 not python code, and it's a good thing to have their call method
156 be accessible as pure python functions (not just special syntax at
164 be accessible as pure python functions (not just special syntax at
157 the command line). It gives us a better internal implementation
165 the command line). It gives us a better internal implementation
158 structure, as well as exposing these for user scripting more
166 structure, as well as exposing these for user scripting more
159 cleanly.
167 cleanly.
160
168
161 * IPython/macro.py (Macro.__init__): moved macros to a standalone
169 * IPython/macro.py (Macro.__init__): moved macros to a standalone
162 file. Now that they'll be more likely to be used with the
170 file. Now that they'll be more likely to be used with the
163 persistance system (%store), I want to make sure their module path
171 persistance system (%store), I want to make sure their module path
164 doesn't change in the future, so that we don't break things for
172 doesn't change in the future, so that we don't break things for
165 users' persisted data.
173 users' persisted data.
166
174
167 * IPython/iplib.py (autoindent_update): move indentation
175 * IPython/iplib.py (autoindent_update): move indentation
168 management into the _text_ processing loop, not the keyboard
176 management into the _text_ processing loop, not the keyboard
169 interactive one. This is necessary to correctly process non-typed
177 interactive one. This is necessary to correctly process non-typed
170 multiline input (such as macros).
178 multiline input (such as macros).
171
179
172 * IPython/Magic.py (Magic.format_latex): patch by Stefan van der
180 * IPython/Magic.py (Magic.format_latex): patch by Stefan van der
173 Walt <stefan-AT-sun.ac.za> to fix latex formatting of docstrings,
181 Walt <stefan-AT-sun.ac.za> to fix latex formatting of docstrings,
174 which was producing problems in the resulting manual.
182 which was producing problems in the resulting manual.
175 (magic_whos): improve reporting of instances (show their class,
183 (magic_whos): improve reporting of instances (show their class,
176 instead of simply printing 'instance' which isn't terribly
184 instead of simply printing 'instance' which isn't terribly
177 informative).
185 informative).
178
186
179 * IPython/genutils.py (shell): commit Jorgen Stenarson's patch
187 * IPython/genutils.py (shell): commit Jorgen Stenarson's patch
180 (minor mods) to support network shares under win32.
188 (minor mods) to support network shares under win32.
181
189
182 * IPython/winconsole.py (get_console_size): add new winconsole
190 * IPython/winconsole.py (get_console_size): add new winconsole
183 module and fixes to page_dumb() to improve its behavior under
191 module and fixes to page_dumb() to improve its behavior under
184 win32. Contributed by Alexander Belchenko <bialix-AT-ukr.net>.
192 win32. Contributed by Alexander Belchenko <bialix-AT-ukr.net>.
185
193
186 * IPython/Magic.py (Macro): simplified Macro class to just
194 * IPython/Magic.py (Macro): simplified Macro class to just
187 subclass list. We've had only 2.2 compatibility for a very long
195 subclass list. We've had only 2.2 compatibility for a very long
188 time, yet I was still avoiding subclassing the builtin types. No
196 time, yet I was still avoiding subclassing the builtin types. No
189 more (I'm also starting to use properties, though I won't shift to
197 more (I'm also starting to use properties, though I won't shift to
190 2.3-specific features quite yet).
198 2.3-specific features quite yet).
191 (magic_store): added Ville's patch for lightweight variable
199 (magic_store): added Ville's patch for lightweight variable
192 persistence, after a request on the user list by Matt Wilkie
200 persistence, after a request on the user list by Matt Wilkie
193 <maphew-AT-gmail.com>. The new %store magic's docstring has full
201 <maphew-AT-gmail.com>. The new %store magic's docstring has full
194 details.
202 details.
195
203
196 * IPython/iplib.py (InteractiveShell.post_config_initialization):
204 * IPython/iplib.py (InteractiveShell.post_config_initialization):
197 changed the default logfile name from 'ipython.log' to
205 changed the default logfile name from 'ipython.log' to
198 'ipython_log.py'. These logs are real python files, and now that
206 'ipython_log.py'. These logs are real python files, and now that
199 we have much better multiline support, people are more likely to
207 we have much better multiline support, people are more likely to
200 want to use them as such. Might as well name them correctly.
208 want to use them as such. Might as well name them correctly.
201
209
202 * IPython/Magic.py: substantial cleanup. While we can't stop
210 * IPython/Magic.py: substantial cleanup. While we can't stop
203 using magics as mixins, due to the existing customizations 'out
211 using magics as mixins, due to the existing customizations 'out
204 there' which rely on the mixin naming conventions, at least I
212 there' which rely on the mixin naming conventions, at least I
205 cleaned out all cross-class name usage. So once we are OK with
213 cleaned out all cross-class name usage. So once we are OK with
206 breaking compatibility, the two systems can be separated.
214 breaking compatibility, the two systems can be separated.
207
215
208 * IPython/Logger.py: major cleanup. This one is NOT a mixin
216 * IPython/Logger.py: major cleanup. This one is NOT a mixin
209 anymore, and the class is a fair bit less hideous as well. New
217 anymore, and the class is a fair bit less hideous as well. New
210 features were also introduced: timestamping of input, and logging
218 features were also introduced: timestamping of input, and logging
211 of output results. These are user-visible with the -t and -o
219 of output results. These are user-visible with the -t and -o
212 options to %logstart. Closes
220 options to %logstart. Closes
213 http://www.scipy.net/roundup/ipython/issue11 and a request by
221 http://www.scipy.net/roundup/ipython/issue11 and a request by
214 William Stein (SAGE developer - http://modular.ucsd.edu/sage).
222 William Stein (SAGE developer - http://modular.ucsd.edu/sage).
215
223
216 2005-12-28 Fernando Perez <Fernando.Perez@colorado.edu>
224 2005-12-28 Fernando Perez <Fernando.Perez@colorado.edu>
217
225
218 * IPython/iplib.py (handle_shell_escape): add Ville's patch to
226 * IPython/iplib.py (handle_shell_escape): add Ville's patch to
219 better hadnle backslashes in paths. See the thread 'More Windows
227 better hadnle backslashes in paths. See the thread 'More Windows
220 questions part 2 - \/ characters revisited' on the iypthon user
228 questions part 2 - \/ characters revisited' on the iypthon user
221 list:
229 list:
222 http://scipy.net/pipermail/ipython-user/2005-June/000907.html
230 http://scipy.net/pipermail/ipython-user/2005-June/000907.html
223
231
224 (InteractiveShell.__init__): fix tab-completion bug in threaded shells.
232 (InteractiveShell.__init__): fix tab-completion bug in threaded shells.
225
233
226 (InteractiveShell.__init__): change threaded shells to not use the
234 (InteractiveShell.__init__): change threaded shells to not use the
227 ipython crash handler. This was causing more problems than not,
235 ipython crash handler. This was causing more problems than not,
228 as exceptions in the main thread (GUI code, typically) would
236 as exceptions in the main thread (GUI code, typically) would
229 always show up as a 'crash', when they really weren't.
237 always show up as a 'crash', when they really weren't.
230
238
231 The colors and exception mode commands (%colors/%xmode) have been
239 The colors and exception mode commands (%colors/%xmode) have been
232 synchronized to also take this into account, so users can get
240 synchronized to also take this into account, so users can get
233 verbose exceptions for their threaded code as well. I also added
241 verbose exceptions for their threaded code as well. I also added
234 support for activating pdb inside this exception handler as well,
242 support for activating pdb inside this exception handler as well,
235 so now GUI authors can use IPython's enhanced pdb at runtime.
243 so now GUI authors can use IPython's enhanced pdb at runtime.
236
244
237 * IPython/ipmaker.py (make_IPython): make the autoedit_syntax flag
245 * IPython/ipmaker.py (make_IPython): make the autoedit_syntax flag
238 true by default, and add it to the shipped ipythonrc file. Since
246 true by default, and add it to the shipped ipythonrc file. Since
239 this asks the user before proceeding, I think it's OK to make it
247 this asks the user before proceeding, I think it's OK to make it
240 true by default.
248 true by default.
241
249
242 * IPython/Magic.py (magic_exit): make new exit/quit magics instead
250 * IPython/Magic.py (magic_exit): make new exit/quit magics instead
243 of the previous special-casing of input in the eval loop. I think
251 of the previous special-casing of input in the eval loop. I think
244 this is cleaner, as they really are commands and shouldn't have
252 this is cleaner, as they really are commands and shouldn't have
245 a special role in the middle of the core code.
253 a special role in the middle of the core code.
246
254
247 2005-12-27 Fernando Perez <Fernando.Perez@colorado.edu>
255 2005-12-27 Fernando Perez <Fernando.Perez@colorado.edu>
248
256
249 * IPython/iplib.py (edit_syntax_error): added support for
257 * IPython/iplib.py (edit_syntax_error): added support for
250 automatically reopening the editor if the file had a syntax error
258 automatically reopening the editor if the file had a syntax error
251 in it. Thanks to scottt who provided the patch at:
259 in it. Thanks to scottt who provided the patch at:
252 http://www.scipy.net/roundup/ipython/issue36 (slightly modified
260 http://www.scipy.net/roundup/ipython/issue36 (slightly modified
253 version committed).
261 version committed).
254
262
255 * IPython/iplib.py (handle_normal): add suport for multi-line
263 * IPython/iplib.py (handle_normal): add suport for multi-line
256 input with emtpy lines. This fixes
264 input with emtpy lines. This fixes
257 http://www.scipy.net/roundup/ipython/issue43 and a similar
265 http://www.scipy.net/roundup/ipython/issue43 and a similar
258 discussion on the user list.
266 discussion on the user list.
259
267
260 WARNING: a behavior change is necessarily introduced to support
268 WARNING: a behavior change is necessarily introduced to support
261 blank lines: now a single blank line with whitespace does NOT
269 blank lines: now a single blank line with whitespace does NOT
262 break the input loop, which means that when autoindent is on, by
270 break the input loop, which means that when autoindent is on, by
263 default hitting return on the next (indented) line does NOT exit.
271 default hitting return on the next (indented) line does NOT exit.
264
272
265 Instead, to exit a multiline input you can either have:
273 Instead, to exit a multiline input you can either have:
266
274
267 - TWO whitespace lines (just hit return again), or
275 - TWO whitespace lines (just hit return again), or
268 - a single whitespace line of a different length than provided
276 - a single whitespace line of a different length than provided
269 by the autoindent (add or remove a space).
277 by the autoindent (add or remove a space).
270
278
271 * IPython/completer.py (MagicCompleter.__init__): new 'completer'
279 * IPython/completer.py (MagicCompleter.__init__): new 'completer'
272 module to better organize all readline-related functionality.
280 module to better organize all readline-related functionality.
273 I've deleted FlexCompleter and put all completion clases here.
281 I've deleted FlexCompleter and put all completion clases here.
274
282
275 * IPython/iplib.py (raw_input): improve indentation management.
283 * IPython/iplib.py (raw_input): improve indentation management.
276 It is now possible to paste indented code with autoindent on, and
284 It is now possible to paste indented code with autoindent on, and
277 the code is interpreted correctly (though it still looks bad on
285 the code is interpreted correctly (though it still looks bad on
278 screen, due to the line-oriented nature of ipython).
286 screen, due to the line-oriented nature of ipython).
279 (MagicCompleter.complete): change behavior so that a TAB key on an
287 (MagicCompleter.complete): change behavior so that a TAB key on an
280 otherwise empty line actually inserts a tab, instead of completing
288 otherwise empty line actually inserts a tab, instead of completing
281 on the entire global namespace. This makes it easier to use the
289 on the entire global namespace. This makes it easier to use the
282 TAB key for indentation. After a request by Hans Meine
290 TAB key for indentation. After a request by Hans Meine
283 <hans_meine-AT-gmx.net>
291 <hans_meine-AT-gmx.net>
284 (_prefilter): add support so that typing plain 'exit' or 'quit'
292 (_prefilter): add support so that typing plain 'exit' or 'quit'
285 does a sensible thing. Originally I tried to deviate as little as
293 does a sensible thing. Originally I tried to deviate as little as
286 possible from the default python behavior, but even that one may
294 possible from the default python behavior, but even that one may
287 change in this direction (thread on python-dev to that effect).
295 change in this direction (thread on python-dev to that effect).
288 Regardless, ipython should do the right thing even if CPython's
296 Regardless, ipython should do the right thing even if CPython's
289 '>>>' prompt doesn't.
297 '>>>' prompt doesn't.
290 (InteractiveShell): removed subclassing code.InteractiveConsole
298 (InteractiveShell): removed subclassing code.InteractiveConsole
291 class. By now we'd overridden just about all of its methods: I've
299 class. By now we'd overridden just about all of its methods: I've
292 copied the remaining two over, and now ipython is a standalone
300 copied the remaining two over, and now ipython is a standalone
293 class. This will provide a clearer picture for the chainsaw
301 class. This will provide a clearer picture for the chainsaw
294 branch refactoring.
302 branch refactoring.
295
303
296 2005-12-26 Fernando Perez <Fernando.Perez@colorado.edu>
304 2005-12-26 Fernando Perez <Fernando.Perez@colorado.edu>
297
305
298 * IPython/ultraTB.py (VerboseTB.text): harden reporting against
306 * IPython/ultraTB.py (VerboseTB.text): harden reporting against
299 failures for objects which break when dir() is called on them.
307 failures for objects which break when dir() is called on them.
300
308
301 * IPython/FlexCompleter.py (Completer.__init__): Added support for
309 * IPython/FlexCompleter.py (Completer.__init__): Added support for
302 distinct local and global namespaces in the completer API. This
310 distinct local and global namespaces in the completer API. This
303 change allows us top properly handle completion with distinct
311 change allows us top properly handle completion with distinct
304 scopes, including in embedded instances (this had never really
312 scopes, including in embedded instances (this had never really
305 worked correctly).
313 worked correctly).
306
314
307 Note: this introduces a change in the constructor for
315 Note: this introduces a change in the constructor for
308 MagicCompleter, as a new global_namespace parameter is now the
316 MagicCompleter, as a new global_namespace parameter is now the
309 second argument (the others were bumped one position).
317 second argument (the others were bumped one position).
310
318
311 2005-12-25 Fernando Perez <Fernando.Perez@colorado.edu>
319 2005-12-25 Fernando Perez <Fernando.Perez@colorado.edu>
312
320
313 * IPython/iplib.py (embed_mainloop): fix tab-completion in
321 * IPython/iplib.py (embed_mainloop): fix tab-completion in
314 embedded instances (which can be done now thanks to Vivian's
322 embedded instances (which can be done now thanks to Vivian's
315 frame-handling fixes for pdb).
323 frame-handling fixes for pdb).
316 (InteractiveShell.__init__): Fix namespace handling problem in
324 (InteractiveShell.__init__): Fix namespace handling problem in
317 embedded instances. We were overwriting __main__ unconditionally,
325 embedded instances. We were overwriting __main__ unconditionally,
318 and this should only be done for 'full' (non-embedded) IPython;
326 and this should only be done for 'full' (non-embedded) IPython;
319 embedded instances must respect the caller's __main__. Thanks to
327 embedded instances must respect the caller's __main__. Thanks to
320 a bug report by Yaroslav Bulatov <yaroslavvb-AT-gmail.com>
328 a bug report by Yaroslav Bulatov <yaroslavvb-AT-gmail.com>
321
329
322 2005-12-24 Fernando Perez <Fernando.Perez@colorado.edu>
330 2005-12-24 Fernando Perez <Fernando.Perez@colorado.edu>
323
331
324 * setup.py: added download_url to setup(). This registers the
332 * setup.py: added download_url to setup(). This registers the
325 download address at PyPI, which is not only useful to humans
333 download address at PyPI, which is not only useful to humans
326 browsing the site, but is also picked up by setuptools (the Eggs
334 browsing the site, but is also picked up by setuptools (the Eggs
327 machinery). Thanks to Ville and R. Kern for the info/discussion
335 machinery). Thanks to Ville and R. Kern for the info/discussion
328 on this.
336 on this.
329
337
330 2005-12-23 Fernando Perez <Fernando.Perez@colorado.edu>
338 2005-12-23 Fernando Perez <Fernando.Perez@colorado.edu>
331
339
332 * IPython/Debugger.py (Pdb.__init__): Major pdb mode enhancements.
340 * IPython/Debugger.py (Pdb.__init__): Major pdb mode enhancements.
333 This brings a lot of nice functionality to the pdb mode, which now
341 This brings a lot of nice functionality to the pdb mode, which now
334 has tab-completion, syntax highlighting, and better stack handling
342 has tab-completion, syntax highlighting, and better stack handling
335 than before. Many thanks to Vivian De Smedt
343 than before. Many thanks to Vivian De Smedt
336 <vivian-AT-vdesmedt.com> for the original patches.
344 <vivian-AT-vdesmedt.com> for the original patches.
337
345
338 2005-12-08 Fernando Perez <Fernando.Perez@colorado.edu>
346 2005-12-08 Fernando Perez <Fernando.Perez@colorado.edu>
339
347
340 * IPython/Shell.py (IPShellGTK.mainloop): fix mainloop() calling
348 * IPython/Shell.py (IPShellGTK.mainloop): fix mainloop() calling
341 sequence to consistently accept the banner argument. The
349 sequence to consistently accept the banner argument. The
342 inconsistency was tripping SAGE, thanks to Gary Zablackis
350 inconsistency was tripping SAGE, thanks to Gary Zablackis
343 <gzabl-AT-yahoo.com> for the report.
351 <gzabl-AT-yahoo.com> for the report.
344
352
345 2005-11-15 Fernando Perez <Fernando.Perez@colorado.edu>
353 2005-11-15 Fernando Perez <Fernando.Perez@colorado.edu>
346
354
347 * IPython/iplib.py (InteractiveShell.post_config_initialization):
355 * IPython/iplib.py (InteractiveShell.post_config_initialization):
348 Fix bug where a naked 'alias' call in the ipythonrc file would
356 Fix bug where a naked 'alias' call in the ipythonrc file would
349 cause a crash. Bug reported by Jorgen Stenarson.
357 cause a crash. Bug reported by Jorgen Stenarson.
350
358
351 2005-11-15 Fernando Perez <Fernando.Perez@colorado.edu>
359 2005-11-15 Fernando Perez <Fernando.Perez@colorado.edu>
352
360
353 * IPython/ipmaker.py (make_IPython): cleanups which should improve
361 * IPython/ipmaker.py (make_IPython): cleanups which should improve
354 startup time.
362 startup time.
355
363
356 * IPython/iplib.py (runcode): my globals 'fix' for embedded
364 * IPython/iplib.py (runcode): my globals 'fix' for embedded
357 instances had introduced a bug with globals in normal code. Now
365 instances had introduced a bug with globals in normal code. Now
358 it's working in all cases.
366 it's working in all cases.
359
367
360 * IPython/Magic.py (magic_psearch): Finish wildcard cleanup and
368 * IPython/Magic.py (magic_psearch): Finish wildcard cleanup and
361 API changes. A new ipytonrc option, 'wildcards_case_sensitive'
369 API changes. A new ipytonrc option, 'wildcards_case_sensitive'
362 has been introduced to set the default case sensitivity of the
370 has been introduced to set the default case sensitivity of the
363 searches. Users can still select either mode at runtime on a
371 searches. Users can still select either mode at runtime on a
364 per-search basis.
372 per-search basis.
365
373
366 2005-11-13 Fernando Perez <Fernando.Perez@colorado.edu>
374 2005-11-13 Fernando Perez <Fernando.Perez@colorado.edu>
367
375
368 * IPython/wildcard.py (NameSpace.__init__): fix resolution of
376 * IPython/wildcard.py (NameSpace.__init__): fix resolution of
369 attributes in wildcard searches for subclasses. Modified version
377 attributes in wildcard searches for subclasses. Modified version
370 of a patch by Jorgen.
378 of a patch by Jorgen.
371
379
372 2005-11-12 Fernando Perez <Fernando.Perez@colorado.edu>
380 2005-11-12 Fernando Perez <Fernando.Perez@colorado.edu>
373
381
374 * IPython/iplib.py (embed_mainloop): Fix handling of globals for
382 * IPython/iplib.py (embed_mainloop): Fix handling of globals for
375 embedded instances. I added a user_global_ns attribute to the
383 embedded instances. I added a user_global_ns attribute to the
376 InteractiveShell class to handle this.
384 InteractiveShell class to handle this.
377
385
378 2005-10-31 Fernando Perez <Fernando.Perez@colorado.edu>
386 2005-10-31 Fernando Perez <Fernando.Perez@colorado.edu>
379
387
380 * IPython/Shell.py (IPShellGTK.mainloop): Change timeout_add to
388 * IPython/Shell.py (IPShellGTK.mainloop): Change timeout_add to
381 idle_add, which fixes horrible keyboard lag problems under gtk 2.6
389 idle_add, which fixes horrible keyboard lag problems under gtk 2.6
382 (reported under win32, but may happen also in other platforms).
390 (reported under win32, but may happen also in other platforms).
383 Bug report and fix courtesy of Sean Moore <smm-AT-logic.bm>
391 Bug report and fix courtesy of Sean Moore <smm-AT-logic.bm>
384
392
385 2005-10-15 Fernando Perez <Fernando.Perez@colorado.edu>
393 2005-10-15 Fernando Perez <Fernando.Perez@colorado.edu>
386
394
387 * IPython/Magic.py (magic_psearch): new support for wildcard
395 * IPython/Magic.py (magic_psearch): new support for wildcard
388 patterns. Now, typing ?a*b will list all names which begin with a
396 patterns. Now, typing ?a*b will list all names which begin with a
389 and end in b, for example. The %psearch magic has full
397 and end in b, for example. The %psearch magic has full
390 docstrings. Many thanks to Jörgen Stenarson
398 docstrings. Many thanks to Jörgen Stenarson
391 <jorgen.stenarson-AT-bostream.nu>, author of the patches
399 <jorgen.stenarson-AT-bostream.nu>, author of the patches
392 implementing this functionality.
400 implementing this functionality.
393
401
394 2005-09-27 Fernando Perez <Fernando.Perez@colorado.edu>
402 2005-09-27 Fernando Perez <Fernando.Perez@colorado.edu>
395
403
396 * Manual: fixed long-standing annoyance of double-dashes (as in
404 * Manual: fixed long-standing annoyance of double-dashes (as in
397 --prefix=~, for example) being stripped in the HTML version. This
405 --prefix=~, for example) being stripped in the HTML version. This
398 is a latex2html bug, but a workaround was provided. Many thanks
406 is a latex2html bug, but a workaround was provided. Many thanks
399 to George K. Thiruvathukal <gthiruv-AT-luc.edu> for the detailed
407 to George K. Thiruvathukal <gthiruv-AT-luc.edu> for the detailed
400 help, and Michael Tobis <mtobis-AT-gmail.com> for getting the ball
408 help, and Michael Tobis <mtobis-AT-gmail.com> for getting the ball
401 rolling. This seemingly small issue had tripped a number of users
409 rolling. This seemingly small issue had tripped a number of users
402 when first installing, so I'm glad to see it gone.
410 when first installing, so I'm glad to see it gone.
403
411
404 2005-09-27 Fernando Perez <Fernando.Perez@colorado.edu>
412 2005-09-27 Fernando Perez <Fernando.Perez@colorado.edu>
405
413
406 * IPython/Extensions/numeric_formats.py: fix missing import,
414 * IPython/Extensions/numeric_formats.py: fix missing import,
407 reported by Stephen Walton.
415 reported by Stephen Walton.
408
416
409 2005-09-24 Fernando Perez <Fernando.Perez@colorado.edu>
417 2005-09-24 Fernando Perez <Fernando.Perez@colorado.edu>
410
418
411 * IPython/demo.py: finish demo module, fully documented now.
419 * IPython/demo.py: finish demo module, fully documented now.
412
420
413 * IPython/genutils.py (file_read): simple little utility to read a
421 * IPython/genutils.py (file_read): simple little utility to read a
414 file and ensure it's closed afterwards.
422 file and ensure it's closed afterwards.
415
423
416 2005-09-23 Fernando Perez <Fernando.Perez@colorado.edu>
424 2005-09-23 Fernando Perez <Fernando.Perez@colorado.edu>
417
425
418 * IPython/demo.py (Demo.__init__): added support for individually
426 * IPython/demo.py (Demo.__init__): added support for individually
419 tagging blocks for automatic execution.
427 tagging blocks for automatic execution.
420
428
421 * IPython/Magic.py (magic_pycat): new %pycat magic for showing
429 * IPython/Magic.py (magic_pycat): new %pycat magic for showing
422 syntax-highlighted python sources, requested by John.
430 syntax-highlighted python sources, requested by John.
423
431
424 2005-09-22 Fernando Perez <Fernando.Perez@colorado.edu>
432 2005-09-22 Fernando Perez <Fernando.Perez@colorado.edu>
425
433
426 * IPython/demo.py (Demo.again): fix bug where again() blocks after
434 * IPython/demo.py (Demo.again): fix bug where again() blocks after
427 finishing.
435 finishing.
428
436
429 * IPython/genutils.py (shlex_split): moved from Magic to here,
437 * IPython/genutils.py (shlex_split): moved from Magic to here,
430 where all 2.2 compatibility stuff lives. I needed it for demo.py.
438 where all 2.2 compatibility stuff lives. I needed it for demo.py.
431
439
432 * IPython/demo.py (Demo.__init__): added support for silent
440 * IPython/demo.py (Demo.__init__): added support for silent
433 blocks, improved marks as regexps, docstrings written.
441 blocks, improved marks as regexps, docstrings written.
434 (Demo.__init__): better docstring, added support for sys.argv.
442 (Demo.__init__): better docstring, added support for sys.argv.
435
443
436 * IPython/genutils.py (marquee): little utility used by the demo
444 * IPython/genutils.py (marquee): little utility used by the demo
437 code, handy in general.
445 code, handy in general.
438
446
439 * IPython/demo.py (Demo.__init__): new class for interactive
447 * IPython/demo.py (Demo.__init__): new class for interactive
440 demos. Not documented yet, I just wrote it in a hurry for
448 demos. Not documented yet, I just wrote it in a hurry for
441 scipy'05. Will docstring later.
449 scipy'05. Will docstring later.
442
450
443 2005-09-20 Fernando Perez <Fernando.Perez@colorado.edu>
451 2005-09-20 Fernando Perez <Fernando.Perez@colorado.edu>
444
452
445 * IPython/Shell.py (sigint_handler): Drastic simplification which
453 * IPython/Shell.py (sigint_handler): Drastic simplification which
446 also seems to make Ctrl-C work correctly across threads! This is
454 also seems to make Ctrl-C work correctly across threads! This is
447 so simple, that I can't beleive I'd missed it before. Needs more
455 so simple, that I can't beleive I'd missed it before. Needs more
448 testing, though.
456 testing, though.
449 (KBINT): Never mind, revert changes. I'm sure I'd tried something
457 (KBINT): Never mind, revert changes. I'm sure I'd tried something
450 like this before...
458 like this before...
451
459
452 * IPython/genutils.py (get_home_dir): add protection against
460 * IPython/genutils.py (get_home_dir): add protection against
453 non-dirs in win32 registry.
461 non-dirs in win32 registry.
454
462
455 * IPython/iplib.py (InteractiveShell.alias_table_validate): fix
463 * IPython/iplib.py (InteractiveShell.alias_table_validate): fix
456 bug where dict was mutated while iterating (pysh crash).
464 bug where dict was mutated while iterating (pysh crash).
457
465
458 2005-09-06 Fernando Perez <Fernando.Perez@colorado.edu>
466 2005-09-06 Fernando Perez <Fernando.Perez@colorado.edu>
459
467
460 * IPython/iplib.py (handle_auto): Fix inconsistency arising from
468 * IPython/iplib.py (handle_auto): Fix inconsistency arising from
461 spurious newlines added by this routine. After a report by
469 spurious newlines added by this routine. After a report by
462 F. Mantegazza.
470 F. Mantegazza.
463
471
464 2005-09-05 Fernando Perez <Fernando.Perez@colorado.edu>
472 2005-09-05 Fernando Perez <Fernando.Perez@colorado.edu>
465
473
466 * IPython/Shell.py (hijack_gtk): remove pygtk.require("2.0")
474 * IPython/Shell.py (hijack_gtk): remove pygtk.require("2.0")
467 calls. These were a leftover from the GTK 1.x days, and can cause
475 calls. These were a leftover from the GTK 1.x days, and can cause
468 problems in certain cases (after a report by John Hunter).
476 problems in certain cases (after a report by John Hunter).
469
477
470 * IPython/iplib.py (InteractiveShell.__init__): Trap exception if
478 * IPython/iplib.py (InteractiveShell.__init__): Trap exception if
471 os.getcwd() fails at init time. Thanks to patch from David Remahl
479 os.getcwd() fails at init time. Thanks to patch from David Remahl
472 <chmod007-AT-mac.com>.
480 <chmod007-AT-mac.com>.
473 (InteractiveShell.__init__): prevent certain special magics from
481 (InteractiveShell.__init__): prevent certain special magics from
474 being shadowed by aliases. Closes
482 being shadowed by aliases. Closes
475 http://www.scipy.net/roundup/ipython/issue41.
483 http://www.scipy.net/roundup/ipython/issue41.
476
484
477 2005-08-31 Fernando Perez <Fernando.Perez@colorado.edu>
485 2005-08-31 Fernando Perez <Fernando.Perez@colorado.edu>
478
486
479 * IPython/iplib.py (InteractiveShell.complete): Added new
487 * IPython/iplib.py (InteractiveShell.complete): Added new
480 top-level completion method to expose the completion mechanism
488 top-level completion method to expose the completion mechanism
481 beyond readline-based environments.
489 beyond readline-based environments.
482
490
483 2005-08-19 Fernando Perez <Fernando.Perez@colorado.edu>
491 2005-08-19 Fernando Perez <Fernando.Perez@colorado.edu>
484
492
485 * tools/ipsvnc (svnversion): fix svnversion capture.
493 * tools/ipsvnc (svnversion): fix svnversion capture.
486
494
487 * IPython/iplib.py (InteractiveShell.__init__): Add has_readline
495 * IPython/iplib.py (InteractiveShell.__init__): Add has_readline
488 attribute to self, which was missing. Before, it was set by a
496 attribute to self, which was missing. Before, it was set by a
489 routine which in certain cases wasn't being called, so the
497 routine which in certain cases wasn't being called, so the
490 instance could end up missing the attribute. This caused a crash.
498 instance could end up missing the attribute. This caused a crash.
491 Closes http://www.scipy.net/roundup/ipython/issue40.
499 Closes http://www.scipy.net/roundup/ipython/issue40.
492
500
493 2005-08-16 Fernando Perez <fperez@colorado.edu>
501 2005-08-16 Fernando Perez <fperez@colorado.edu>
494
502
495 * IPython/ultraTB.py (VerboseTB.text): don't crash if object
503 * IPython/ultraTB.py (VerboseTB.text): don't crash if object
496 contains non-string attribute. Closes
504 contains non-string attribute. Closes
497 http://www.scipy.net/roundup/ipython/issue38.
505 http://www.scipy.net/roundup/ipython/issue38.
498
506
499 2005-08-14 Fernando Perez <fperez@colorado.edu>
507 2005-08-14 Fernando Perez <fperez@colorado.edu>
500
508
501 * tools/ipsvnc: Minor improvements, to add changeset info.
509 * tools/ipsvnc: Minor improvements, to add changeset info.
502
510
503 2005-08-12 Fernando Perez <fperez@colorado.edu>
511 2005-08-12 Fernando Perez <fperez@colorado.edu>
504
512
505 * IPython/iplib.py (runsource): remove self.code_to_run_src
513 * IPython/iplib.py (runsource): remove self.code_to_run_src
506 attribute. I realized this is nothing more than
514 attribute. I realized this is nothing more than
507 '\n'.join(self.buffer), and having the same data in two different
515 '\n'.join(self.buffer), and having the same data in two different
508 places is just asking for synchronization bugs. This may impact
516 places is just asking for synchronization bugs. This may impact
509 people who have custom exception handlers, so I need to warn
517 people who have custom exception handlers, so I need to warn
510 ipython-dev about it (F. Mantegazza may use them).
518 ipython-dev about it (F. Mantegazza may use them).
511
519
512 2005-07-29 Fernando Perez <Fernando.Perez@colorado.edu>
520 2005-07-29 Fernando Perez <Fernando.Perez@colorado.edu>
513
521
514 * IPython/genutils.py: fix 2.2 compatibility (generators)
522 * IPython/genutils.py: fix 2.2 compatibility (generators)
515
523
516 2005-07-18 Fernando Perez <fperez@colorado.edu>
524 2005-07-18 Fernando Perez <fperez@colorado.edu>
517
525
518 * IPython/genutils.py (get_home_dir): fix to help users with
526 * IPython/genutils.py (get_home_dir): fix to help users with
519 invalid $HOME under win32.
527 invalid $HOME under win32.
520
528
521 2005-07-17 Fernando Perez <fperez@colorado.edu>
529 2005-07-17 Fernando Perez <fperez@colorado.edu>
522
530
523 * IPython/Prompts.py (str_safe): Make unicode-safe. Also remove
531 * IPython/Prompts.py (str_safe): Make unicode-safe. Also remove
524 some old hacks and clean up a bit other routines; code should be
532 some old hacks and clean up a bit other routines; code should be
525 simpler and a bit faster.
533 simpler and a bit faster.
526
534
527 * IPython/iplib.py (interact): removed some last-resort attempts
535 * IPython/iplib.py (interact): removed some last-resort attempts
528 to survive broken stdout/stderr. That code was only making it
536 to survive broken stdout/stderr. That code was only making it
529 harder to abstract out the i/o (necessary for gui integration),
537 harder to abstract out the i/o (necessary for gui integration),
530 and the crashes it could prevent were extremely rare in practice
538 and the crashes it could prevent were extremely rare in practice
531 (besides being fully user-induced in a pretty violent manner).
539 (besides being fully user-induced in a pretty violent manner).
532
540
533 * IPython/genutils.py (IOStream.__init__): Simplify the i/o stuff.
541 * IPython/genutils.py (IOStream.__init__): Simplify the i/o stuff.
534 Nothing major yet, but the code is simpler to read; this should
542 Nothing major yet, but the code is simpler to read; this should
535 make it easier to do more serious modifications in the future.
543 make it easier to do more serious modifications in the future.
536
544
537 * IPython/Extensions/InterpreterExec.py: Fix auto-quoting in pysh,
545 * IPython/Extensions/InterpreterExec.py: Fix auto-quoting in pysh,
538 which broke in .15 (thanks to a report by Ville).
546 which broke in .15 (thanks to a report by Ville).
539
547
540 * IPython/Itpl.py (Itpl.__init__): add unicode support (it may not
548 * IPython/Itpl.py (Itpl.__init__): add unicode support (it may not
541 be quite correct, I know next to nothing about unicode). This
549 be quite correct, I know next to nothing about unicode). This
542 will allow unicode strings to be used in prompts, amongst other
550 will allow unicode strings to be used in prompts, amongst other
543 cases. It also will prevent ipython from crashing when unicode
551 cases. It also will prevent ipython from crashing when unicode
544 shows up unexpectedly in many places. If ascii encoding fails, we
552 shows up unexpectedly in many places. If ascii encoding fails, we
545 assume utf_8. Currently the encoding is not a user-visible
553 assume utf_8. Currently the encoding is not a user-visible
546 setting, though it could be made so if there is demand for it.
554 setting, though it could be made so if there is demand for it.
547
555
548 * IPython/ipmaker.py (make_IPython): remove old 2.1-specific hack.
556 * IPython/ipmaker.py (make_IPython): remove old 2.1-specific hack.
549
557
550 * IPython/Struct.py (Struct.merge): switch keys() to iterator.
558 * IPython/Struct.py (Struct.merge): switch keys() to iterator.
551
559
552 * IPython/background_jobs.py: moved 2.2 compatibility to genutils.
560 * IPython/background_jobs.py: moved 2.2 compatibility to genutils.
553
561
554 * IPython/genutils.py: Add 2.2 compatibility here, so all other
562 * IPython/genutils.py: Add 2.2 compatibility here, so all other
555 code can work transparently for 2.2/2.3.
563 code can work transparently for 2.2/2.3.
556
564
557 2005-07-16 Fernando Perez <fperez@colorado.edu>
565 2005-07-16 Fernando Perez <fperez@colorado.edu>
558
566
559 * IPython/ultraTB.py (ExceptionColors): Make a global variable
567 * IPython/ultraTB.py (ExceptionColors): Make a global variable
560 out of the color scheme table used for coloring exception
568 out of the color scheme table used for coloring exception
561 tracebacks. This allows user code to add new schemes at runtime.
569 tracebacks. This allows user code to add new schemes at runtime.
562 This is a minimally modified version of the patch at
570 This is a minimally modified version of the patch at
563 http://www.scipy.net/roundup/ipython/issue35, many thanks to pabw
571 http://www.scipy.net/roundup/ipython/issue35, many thanks to pabw
564 for the contribution.
572 for the contribution.
565
573
566 * IPython/FlexCompleter.py (Completer.attr_matches): Add a
574 * IPython/FlexCompleter.py (Completer.attr_matches): Add a
567 slightly modified version of the patch in
575 slightly modified version of the patch in
568 http://www.scipy.net/roundup/ipython/issue34, which also allows me
576 http://www.scipy.net/roundup/ipython/issue34, which also allows me
569 to remove the previous try/except solution (which was costlier).
577 to remove the previous try/except solution (which was costlier).
570 Thanks to Gaetan Lehmann <gaetan.lehmann-AT-jouy.inra.fr> for the fix.
578 Thanks to Gaetan Lehmann <gaetan.lehmann-AT-jouy.inra.fr> for the fix.
571
579
572 2005-06-08 Fernando Perez <fperez@colorado.edu>
580 2005-06-08 Fernando Perez <fperez@colorado.edu>
573
581
574 * IPython/iplib.py (write/write_err): Add methods to abstract all
582 * IPython/iplib.py (write/write_err): Add methods to abstract all
575 I/O a bit more.
583 I/O a bit more.
576
584
577 * IPython/Shell.py (IPShellGTK.mainloop): Fix GTK deprecation
585 * IPython/Shell.py (IPShellGTK.mainloop): Fix GTK deprecation
578 warning, reported by Aric Hagberg, fix by JD Hunter.
586 warning, reported by Aric Hagberg, fix by JD Hunter.
579
587
580 2005-06-02 *** Released version 0.6.15
588 2005-06-02 *** Released version 0.6.15
581
589
582 2005-06-01 Fernando Perez <fperez@colorado.edu>
590 2005-06-01 Fernando Perez <fperez@colorado.edu>
583
591
584 * IPython/iplib.py (MagicCompleter.file_matches): Fix
592 * IPython/iplib.py (MagicCompleter.file_matches): Fix
585 tab-completion of filenames within open-quoted strings. Note that
593 tab-completion of filenames within open-quoted strings. Note that
586 this requires that in ~/.ipython/ipythonrc, users change the
594 this requires that in ~/.ipython/ipythonrc, users change the
587 readline delimiters configuration to read:
595 readline delimiters configuration to read:
588
596
589 readline_remove_delims -/~
597 readline_remove_delims -/~
590
598
591
599
592 2005-05-31 *** Released version 0.6.14
600 2005-05-31 *** Released version 0.6.14
593
601
594 2005-05-29 Fernando Perez <fperez@colorado.edu>
602 2005-05-29 Fernando Perez <fperez@colorado.edu>
595
603
596 * IPython/ultraTB.py (VerboseTB.text): Fix crash for tracebacks
604 * IPython/ultraTB.py (VerboseTB.text): Fix crash for tracebacks
597 with files not on the filesystem. Reported by Eliyahu Sandler
605 with files not on the filesystem. Reported by Eliyahu Sandler
598 <eli@gondolin.net>
606 <eli@gondolin.net>
599
607
600 2005-05-22 Fernando Perez <fperez@colorado.edu>
608 2005-05-22 Fernando Perez <fperez@colorado.edu>
601
609
602 * IPython/iplib.py: Fix a few crashes in the --upgrade option.
610 * IPython/iplib.py: Fix a few crashes in the --upgrade option.
603 After an initial report by LUK ShunTim <shuntim.luk@polyu.edu.hk>.
611 After an initial report by LUK ShunTim <shuntim.luk@polyu.edu.hk>.
604
612
605 2005-05-19 Fernando Perez <fperez@colorado.edu>
613 2005-05-19 Fernando Perez <fperez@colorado.edu>
606
614
607 * IPython/iplib.py (safe_execfile): close a file which could be
615 * IPython/iplib.py (safe_execfile): close a file which could be
608 left open (causing problems in win32, which locks open files).
616 left open (causing problems in win32, which locks open files).
609 Thanks to a bug report by D Brown <dbrown2@yahoo.com>.
617 Thanks to a bug report by D Brown <dbrown2@yahoo.com>.
610
618
611 2005-05-18 Fernando Perez <fperez@colorado.edu>
619 2005-05-18 Fernando Perez <fperez@colorado.edu>
612
620
613 * IPython/Shell.py (MatplotlibShellBase.mplot_exec): pass all
621 * IPython/Shell.py (MatplotlibShellBase.mplot_exec): pass all
614 keyword arguments correctly to safe_execfile().
622 keyword arguments correctly to safe_execfile().
615
623
616 2005-05-13 Fernando Perez <fperez@colorado.edu>
624 2005-05-13 Fernando Perez <fperez@colorado.edu>
617
625
618 * ipython.1: Added info about Qt to manpage, and threads warning
626 * ipython.1: Added info about Qt to manpage, and threads warning
619 to usage page (invoked with --help).
627 to usage page (invoked with --help).
620
628
621 * IPython/iplib.py (MagicCompleter.python_func_kw_matches): Added
629 * IPython/iplib.py (MagicCompleter.python_func_kw_matches): Added
622 new matcher (it goes at the end of the priority list) to do
630 new matcher (it goes at the end of the priority list) to do
623 tab-completion on named function arguments. Submitted by George
631 tab-completion on named function arguments. Submitted by George
624 Sakkis <gsakkis-AT-eden.rutgers.edu>. See the thread at
632 Sakkis <gsakkis-AT-eden.rutgers.edu>. See the thread at
625 http://www.scipy.net/pipermail/ipython-dev/2005-April/000436.html
633 http://www.scipy.net/pipermail/ipython-dev/2005-April/000436.html
626 for more details.
634 for more details.
627
635
628 * IPython/Magic.py (magic_run): Added new -e flag to ignore
636 * IPython/Magic.py (magic_run): Added new -e flag to ignore
629 SystemExit exceptions in the script being run. Thanks to a report
637 SystemExit exceptions in the script being run. Thanks to a report
630 by danny shevitz <danny_shevitz-AT-yahoo.com>, about this
638 by danny shevitz <danny_shevitz-AT-yahoo.com>, about this
631 producing very annoying behavior when running unit tests.
639 producing very annoying behavior when running unit tests.
632
640
633 2005-05-12 Fernando Perez <fperez@colorado.edu>
641 2005-05-12 Fernando Perez <fperez@colorado.edu>
634
642
635 * IPython/iplib.py (handle_auto): fixed auto-quoting and parens,
643 * IPython/iplib.py (handle_auto): fixed auto-quoting and parens,
636 which I'd broken (again) due to a changed regexp. In the process,
644 which I'd broken (again) due to a changed regexp. In the process,
637 added ';' as an escape to auto-quote the whole line without
645 added ';' as an escape to auto-quote the whole line without
638 splitting its arguments. Thanks to a report by Jerry McRae
646 splitting its arguments. Thanks to a report by Jerry McRae
639 <qrs0xyc02-AT-sneakemail.com>.
647 <qrs0xyc02-AT-sneakemail.com>.
640
648
641 * IPython/ultraTB.py (VerboseTB.text): protect against rare but
649 * IPython/ultraTB.py (VerboseTB.text): protect against rare but
642 possible crashes caused by a TokenError. Reported by Ed Schofield
650 possible crashes caused by a TokenError. Reported by Ed Schofield
643 <schofield-AT-ftw.at>.
651 <schofield-AT-ftw.at>.
644
652
645 2005-05-06 Fernando Perez <fperez@colorado.edu>
653 2005-05-06 Fernando Perez <fperez@colorado.edu>
646
654
647 * IPython/Shell.py (hijack_wx): Fix to work with WX v.2.6.
655 * IPython/Shell.py (hijack_wx): Fix to work with WX v.2.6.
648
656
649 2005-04-29 Fernando Perez <fperez@colorado.edu>
657 2005-04-29 Fernando Perez <fperez@colorado.edu>
650
658
651 * IPython/Shell.py (IPShellQt): Thanks to Denis Rivière
659 * IPython/Shell.py (IPShellQt): Thanks to Denis Rivière
652 <nudz-AT-free.fr>, Yann Cointepas <yann-AT-sapetnioc.org> and Benjamin
660 <nudz-AT-free.fr>, Yann Cointepas <yann-AT-sapetnioc.org> and Benjamin
653 Thyreau <Benji2-AT-decideur.info>, we now have a -qthread option
661 Thyreau <Benji2-AT-decideur.info>, we now have a -qthread option
654 which provides support for Qt interactive usage (similar to the
662 which provides support for Qt interactive usage (similar to the
655 existing one for WX and GTK). This had been often requested.
663 existing one for WX and GTK). This had been often requested.
656
664
657 2005-04-14 *** Released version 0.6.13
665 2005-04-14 *** Released version 0.6.13
658
666
659 2005-04-08 Fernando Perez <fperez@colorado.edu>
667 2005-04-08 Fernando Perez <fperez@colorado.edu>
660
668
661 * IPython/Magic.py (Magic._ofind): remove docstring evaluation
669 * IPython/Magic.py (Magic._ofind): remove docstring evaluation
662 from _ofind, which gets called on almost every input line. Now,
670 from _ofind, which gets called on almost every input line. Now,
663 we only try to get docstrings if they are actually going to be
671 we only try to get docstrings if they are actually going to be
664 used (the overhead of fetching unnecessary docstrings can be
672 used (the overhead of fetching unnecessary docstrings can be
665 noticeable for certain objects, such as Pyro proxies).
673 noticeable for certain objects, such as Pyro proxies).
666
674
667 * IPython/iplib.py (MagicCompleter.python_matches): Change the API
675 * IPython/iplib.py (MagicCompleter.python_matches): Change the API
668 for completers. For some reason I had been passing them the state
676 for completers. For some reason I had been passing them the state
669 variable, which completers never actually need, and was in
677 variable, which completers never actually need, and was in
670 conflict with the rlcompleter API. Custom completers ONLY need to
678 conflict with the rlcompleter API. Custom completers ONLY need to
671 take the text parameter.
679 take the text parameter.
672
680
673 * IPython/Extensions/InterpreterExec.py: Fix regexp so that magics
681 * IPython/Extensions/InterpreterExec.py: Fix regexp so that magics
674 work correctly in pysh. I've also moved all the logic which used
682 work correctly in pysh. I've also moved all the logic which used
675 to be in pysh.py here, which will prevent problems with future
683 to be in pysh.py here, which will prevent problems with future
676 upgrades. However, this time I must warn users to update their
684 upgrades. However, this time I must warn users to update their
677 pysh profile to include the line
685 pysh profile to include the line
678
686
679 import_all IPython.Extensions.InterpreterExec
687 import_all IPython.Extensions.InterpreterExec
680
688
681 because otherwise things won't work for them. They MUST also
689 because otherwise things won't work for them. They MUST also
682 delete pysh.py and the line
690 delete pysh.py and the line
683
691
684 execfile pysh.py
692 execfile pysh.py
685
693
686 from their ipythonrc-pysh.
694 from their ipythonrc-pysh.
687
695
688 * IPython/FlexCompleter.py (Completer.attr_matches): Make more
696 * IPython/FlexCompleter.py (Completer.attr_matches): Make more
689 robust in the face of objects whose dir() returns non-strings
697 robust in the face of objects whose dir() returns non-strings
690 (which it shouldn't, but some broken libs like ITK do). Thanks to
698 (which it shouldn't, but some broken libs like ITK do). Thanks to
691 a patch by John Hunter (implemented differently, though). Also
699 a patch by John Hunter (implemented differently, though). Also
692 minor improvements by using .extend instead of + on lists.
700 minor improvements by using .extend instead of + on lists.
693
701
694 * pysh.py:
702 * pysh.py:
695
703
696 2005-04-06 Fernando Perez <fperez@colorado.edu>
704 2005-04-06 Fernando Perez <fperez@colorado.edu>
697
705
698 * IPython/ipmaker.py (make_IPython): Make multi_line_specials on
706 * IPython/ipmaker.py (make_IPython): Make multi_line_specials on
699 by default, so that all users benefit from it. Those who don't
707 by default, so that all users benefit from it. Those who don't
700 want it can still turn it off.
708 want it can still turn it off.
701
709
702 * IPython/UserConfig/ipythonrc: Add multi_line_specials to the
710 * IPython/UserConfig/ipythonrc: Add multi_line_specials to the
703 config file, I'd forgotten about this, so users were getting it
711 config file, I'd forgotten about this, so users were getting it
704 off by default.
712 off by default.
705
713
706 * IPython/iplib.py (ipmagic): big overhaul of the magic system for
714 * IPython/iplib.py (ipmagic): big overhaul of the magic system for
707 consistency. Now magics can be called in multiline statements,
715 consistency. Now magics can be called in multiline statements,
708 and python variables can be expanded in magic calls via $var.
716 and python variables can be expanded in magic calls via $var.
709 This makes the magic system behave just like aliases or !system
717 This makes the magic system behave just like aliases or !system
710 calls.
718 calls.
711
719
712 2005-03-28 Fernando Perez <fperez@colorado.edu>
720 2005-03-28 Fernando Perez <fperez@colorado.edu>
713
721
714 * IPython/iplib.py (handle_auto): cleanup to use %s instead of
722 * IPython/iplib.py (handle_auto): cleanup to use %s instead of
715 expensive string additions for building command. Add support for
723 expensive string additions for building command. Add support for
716 trailing ';' when autocall is used.
724 trailing ';' when autocall is used.
717
725
718 2005-03-26 Fernando Perez <fperez@colorado.edu>
726 2005-03-26 Fernando Perez <fperez@colorado.edu>
719
727
720 * ipython.el: Fix http://www.scipy.net/roundup/ipython/issue31.
728 * ipython.el: Fix http://www.scipy.net/roundup/ipython/issue31.
721 Bugfix by A. Schmolck, the ipython.el maintainer. Also make
729 Bugfix by A. Schmolck, the ipython.el maintainer. Also make
722 ipython.el robust against prompts with any number of spaces
730 ipython.el robust against prompts with any number of spaces
723 (including 0) after the ':' character.
731 (including 0) after the ':' character.
724
732
725 * IPython/Prompts.py (Prompt2.set_p_str): Fix spurious space in
733 * IPython/Prompts.py (Prompt2.set_p_str): Fix spurious space in
726 continuation prompt, which misled users to think the line was
734 continuation prompt, which misled users to think the line was
727 already indented. Closes debian Bug#300847, reported to me by
735 already indented. Closes debian Bug#300847, reported to me by
728 Norbert Tretkowski <tretkowski-AT-inittab.de>.
736 Norbert Tretkowski <tretkowski-AT-inittab.de>.
729
737
730 2005-03-23 Fernando Perez <fperez@colorado.edu>
738 2005-03-23 Fernando Perez <fperez@colorado.edu>
731
739
732 * IPython/Prompts.py (Prompt1.__str__): Make sure that prompts are
740 * IPython/Prompts.py (Prompt1.__str__): Make sure that prompts are
733 properly aligned if they have embedded newlines.
741 properly aligned if they have embedded newlines.
734
742
735 * IPython/iplib.py (runlines): Add a public method to expose
743 * IPython/iplib.py (runlines): Add a public method to expose
736 IPython's code execution machinery, so that users can run strings
744 IPython's code execution machinery, so that users can run strings
737 as if they had been typed at the prompt interactively.
745 as if they had been typed at the prompt interactively.
738 (InteractiveShell.__init__): Added getoutput() to the __IPYTHON__
746 (InteractiveShell.__init__): Added getoutput() to the __IPYTHON__
739 methods which can call the system shell, but with python variable
747 methods which can call the system shell, but with python variable
740 expansion. The three such methods are: __IPYTHON__.system,
748 expansion. The three such methods are: __IPYTHON__.system,
741 .getoutput and .getoutputerror. These need to be documented in a
749 .getoutput and .getoutputerror. These need to be documented in a
742 'public API' section (to be written) of the manual.
750 'public API' section (to be written) of the manual.
743
751
744 2005-03-20 Fernando Perez <fperez@colorado.edu>
752 2005-03-20 Fernando Perez <fperez@colorado.edu>
745
753
746 * IPython/iplib.py (InteractiveShell.set_custom_exc): new system
754 * IPython/iplib.py (InteractiveShell.set_custom_exc): new system
747 for custom exception handling. This is quite powerful, and it
755 for custom exception handling. This is quite powerful, and it
748 allows for user-installable exception handlers which can trap
756 allows for user-installable exception handlers which can trap
749 custom exceptions at runtime and treat them separately from
757 custom exceptions at runtime and treat them separately from
750 IPython's default mechanisms. At the request of Frédéric
758 IPython's default mechanisms. At the request of Frédéric
751 Mantegazza <mantegazza-AT-ill.fr>.
759 Mantegazza <mantegazza-AT-ill.fr>.
752 (InteractiveShell.set_custom_completer): public API function to
760 (InteractiveShell.set_custom_completer): public API function to
753 add new completers at runtime.
761 add new completers at runtime.
754
762
755 2005-03-19 Fernando Perez <fperez@colorado.edu>
763 2005-03-19 Fernando Perez <fperez@colorado.edu>
756
764
757 * IPython/OInspect.py (getdoc): Add a call to obj.getdoc(), to
765 * IPython/OInspect.py (getdoc): Add a call to obj.getdoc(), to
758 allow objects which provide their docstrings via non-standard
766 allow objects which provide their docstrings via non-standard
759 mechanisms (like Pyro proxies) to still be inspected by ipython's
767 mechanisms (like Pyro proxies) to still be inspected by ipython's
760 ? system.
768 ? system.
761
769
762 * IPython/iplib.py (InteractiveShell.__init__): back off the _o/_e
770 * IPython/iplib.py (InteractiveShell.__init__): back off the _o/_e
763 automatic capture system. I tried quite hard to make it work
771 automatic capture system. I tried quite hard to make it work
764 reliably, and simply failed. I tried many combinations with the
772 reliably, and simply failed. I tried many combinations with the
765 subprocess module, but eventually nothing worked in all needed
773 subprocess module, but eventually nothing worked in all needed
766 cases (not blocking stdin for the child, duplicating stdout
774 cases (not blocking stdin for the child, duplicating stdout
767 without blocking, etc). The new %sc/%sx still do capture to these
775 without blocking, etc). The new %sc/%sx still do capture to these
768 magical list/string objects which make shell use much more
776 magical list/string objects which make shell use much more
769 conveninent, so not all is lost.
777 conveninent, so not all is lost.
770
778
771 XXX - FIX MANUAL for the change above!
779 XXX - FIX MANUAL for the change above!
772
780
773 (runsource): I copied code.py's runsource() into ipython to modify
781 (runsource): I copied code.py's runsource() into ipython to modify
774 it a bit. Now the code object and source to be executed are
782 it a bit. Now the code object and source to be executed are
775 stored in ipython. This makes this info accessible to third-party
783 stored in ipython. This makes this info accessible to third-party
776 tools, like custom exception handlers. After a request by Frédéric
784 tools, like custom exception handlers. After a request by Frédéric
777 Mantegazza <mantegazza-AT-ill.fr>.
785 Mantegazza <mantegazza-AT-ill.fr>.
778
786
779 * IPython/UserConfig/ipythonrc: Add up/down arrow keys to
787 * IPython/UserConfig/ipythonrc: Add up/down arrow keys to
780 history-search via readline (like C-p/C-n). I'd wanted this for a
788 history-search via readline (like C-p/C-n). I'd wanted this for a
781 long time, but only recently found out how to do it. For users
789 long time, but only recently found out how to do it. For users
782 who already have their ipythonrc files made and want this, just
790 who already have their ipythonrc files made and want this, just
783 add:
791 add:
784
792
785 readline_parse_and_bind "\e[A": history-search-backward
793 readline_parse_and_bind "\e[A": history-search-backward
786 readline_parse_and_bind "\e[B": history-search-forward
794 readline_parse_and_bind "\e[B": history-search-forward
787
795
788 2005-03-18 Fernando Perez <fperez@colorado.edu>
796 2005-03-18 Fernando Perez <fperez@colorado.edu>
789
797
790 * IPython/Magic.py (magic_sc): %sc and %sx now use the fancy
798 * IPython/Magic.py (magic_sc): %sc and %sx now use the fancy
791 LSString and SList classes which allow transparent conversions
799 LSString and SList classes which allow transparent conversions
792 between list mode and whitespace-separated string.
800 between list mode and whitespace-separated string.
793 (magic_r): Fix recursion problem in %r.
801 (magic_r): Fix recursion problem in %r.
794
802
795 * IPython/genutils.py (LSString): New class to be used for
803 * IPython/genutils.py (LSString): New class to be used for
796 automatic storage of the results of all alias/system calls in _o
804 automatic storage of the results of all alias/system calls in _o
797 and _e (stdout/err). These provide a .l/.list attribute which
805 and _e (stdout/err). These provide a .l/.list attribute which
798 does automatic splitting on newlines. This means that for most
806 does automatic splitting on newlines. This means that for most
799 uses, you'll never need to do capturing of output with %sc/%sx
807 uses, you'll never need to do capturing of output with %sc/%sx
800 anymore, since ipython keeps this always done for you. Note that
808 anymore, since ipython keeps this always done for you. Note that
801 only the LAST results are stored, the _o/e variables are
809 only the LAST results are stored, the _o/e variables are
802 overwritten on each call. If you need to save their contents
810 overwritten on each call. If you need to save their contents
803 further, simply bind them to any other name.
811 further, simply bind them to any other name.
804
812
805 2005-03-17 Fernando Perez <fperez@colorado.edu>
813 2005-03-17 Fernando Perez <fperez@colorado.edu>
806
814
807 * IPython/Prompts.py (BasePrompt.cwd_filt): a few more fixes for
815 * IPython/Prompts.py (BasePrompt.cwd_filt): a few more fixes for
808 prompt namespace handling.
816 prompt namespace handling.
809
817
810 2005-03-16 Fernando Perez <fperez@colorado.edu>
818 2005-03-16 Fernando Perez <fperez@colorado.edu>
811
819
812 * IPython/Prompts.py (CachedOutput.__init__): Fix default and
820 * IPython/Prompts.py (CachedOutput.__init__): Fix default and
813 classic prompts to be '>>> ' (final space was missing, and it
821 classic prompts to be '>>> ' (final space was missing, and it
814 trips the emacs python mode).
822 trips the emacs python mode).
815 (BasePrompt.__str__): Added safe support for dynamic prompt
823 (BasePrompt.__str__): Added safe support for dynamic prompt
816 strings. Now you can set your prompt string to be '$x', and the
824 strings. Now you can set your prompt string to be '$x', and the
817 value of x will be printed from your interactive namespace. The
825 value of x will be printed from your interactive namespace. The
818 interpolation syntax includes the full Itpl support, so
826 interpolation syntax includes the full Itpl support, so
819 ${foo()+x+bar()} is a valid prompt string now, and the function
827 ${foo()+x+bar()} is a valid prompt string now, and the function
820 calls will be made at runtime.
828 calls will be made at runtime.
821
829
822 2005-03-15 Fernando Perez <fperez@colorado.edu>
830 2005-03-15 Fernando Perez <fperez@colorado.edu>
823
831
824 * IPython/Magic.py (magic_history): renamed %hist to %history, to
832 * IPython/Magic.py (magic_history): renamed %hist to %history, to
825 avoid name clashes in pylab. %hist still works, it just forwards
833 avoid name clashes in pylab. %hist still works, it just forwards
826 the call to %history.
834 the call to %history.
827
835
828 2005-03-02 *** Released version 0.6.12
836 2005-03-02 *** Released version 0.6.12
829
837
830 2005-03-02 Fernando Perez <fperez@colorado.edu>
838 2005-03-02 Fernando Perez <fperez@colorado.edu>
831
839
832 * IPython/iplib.py (handle_magic): log magic calls properly as
840 * IPython/iplib.py (handle_magic): log magic calls properly as
833 ipmagic() function calls.
841 ipmagic() function calls.
834
842
835 * IPython/Magic.py (magic_time): Improved %time to support
843 * IPython/Magic.py (magic_time): Improved %time to support
836 statements and provide wall-clock as well as CPU time.
844 statements and provide wall-clock as well as CPU time.
837
845
838 2005-02-27 Fernando Perez <fperez@colorado.edu>
846 2005-02-27 Fernando Perez <fperez@colorado.edu>
839
847
840 * IPython/hooks.py: New hooks module, to expose user-modifiable
848 * IPython/hooks.py: New hooks module, to expose user-modifiable
841 IPython functionality in a clean manner. For now only the editor
849 IPython functionality in a clean manner. For now only the editor
842 hook is actually written, and other thigns which I intend to turn
850 hook is actually written, and other thigns which I intend to turn
843 into proper hooks aren't yet there. The display and prefilter
851 into proper hooks aren't yet there. The display and prefilter
844 stuff, for example, should be hooks. But at least now the
852 stuff, for example, should be hooks. But at least now the
845 framework is in place, and the rest can be moved here with more
853 framework is in place, and the rest can be moved here with more
846 time later. IPython had had a .hooks variable for a long time for
854 time later. IPython had had a .hooks variable for a long time for
847 this purpose, but I'd never actually used it for anything.
855 this purpose, but I'd never actually used it for anything.
848
856
849 2005-02-26 Fernando Perez <fperez@colorado.edu>
857 2005-02-26 Fernando Perez <fperez@colorado.edu>
850
858
851 * IPython/ipmaker.py (make_IPython): make the default ipython
859 * IPython/ipmaker.py (make_IPython): make the default ipython
852 directory be called _ipython under win32, to follow more the
860 directory be called _ipython under win32, to follow more the
853 naming peculiarities of that platform (where buggy software like
861 naming peculiarities of that platform (where buggy software like
854 Visual Sourcesafe breaks with .named directories). Reported by
862 Visual Sourcesafe breaks with .named directories). Reported by
855 Ville Vainio.
863 Ville Vainio.
856
864
857 2005-02-23 Fernando Perez <fperez@colorado.edu>
865 2005-02-23 Fernando Perez <fperez@colorado.edu>
858
866
859 * IPython/iplib.py (InteractiveShell.__init__): removed a few
867 * IPython/iplib.py (InteractiveShell.__init__): removed a few
860 auto_aliases for win32 which were causing problems. Users can
868 auto_aliases for win32 which were causing problems. Users can
861 define the ones they personally like.
869 define the ones they personally like.
862
870
863 2005-02-21 Fernando Perez <fperez@colorado.edu>
871 2005-02-21 Fernando Perez <fperez@colorado.edu>
864
872
865 * IPython/Magic.py (magic_time): new magic to time execution of
873 * IPython/Magic.py (magic_time): new magic to time execution of
866 expressions. After a request by Charles Moad <cmoad-AT-indiana.edu>.
874 expressions. After a request by Charles Moad <cmoad-AT-indiana.edu>.
867
875
868 2005-02-19 Fernando Perez <fperez@colorado.edu>
876 2005-02-19 Fernando Perez <fperez@colorado.edu>
869
877
870 * IPython/ConfigLoader.py (ConfigLoader.load): Allow empty strings
878 * IPython/ConfigLoader.py (ConfigLoader.load): Allow empty strings
871 into keys (for prompts, for example).
879 into keys (for prompts, for example).
872
880
873 * IPython/Prompts.py (BasePrompt.set_p_str): Fix to allow empty
881 * IPython/Prompts.py (BasePrompt.set_p_str): Fix to allow empty
874 prompts in case users want them. This introduces a small behavior
882 prompts in case users want them. This introduces a small behavior
875 change: ipython does not automatically add a space to all prompts
883 change: ipython does not automatically add a space to all prompts
876 anymore. To get the old prompts with a space, users should add it
884 anymore. To get the old prompts with a space, users should add it
877 manually to their ipythonrc file, so for example prompt_in1 should
885 manually to their ipythonrc file, so for example prompt_in1 should
878 now read 'In [\#]: ' instead of 'In [\#]:'.
886 now read 'In [\#]: ' instead of 'In [\#]:'.
879 (BasePrompt.__init__): New option prompts_pad_left (only in rc
887 (BasePrompt.__init__): New option prompts_pad_left (only in rc
880 file) to control left-padding of secondary prompts.
888 file) to control left-padding of secondary prompts.
881
889
882 * IPython/Magic.py (Magic.profile_missing_notice): Don't crash if
890 * IPython/Magic.py (Magic.profile_missing_notice): Don't crash if
883 the profiler can't be imported. Fix for Debian, which removed
891 the profiler can't be imported. Fix for Debian, which removed
884 profile.py because of License issues. I applied a slightly
892 profile.py because of License issues. I applied a slightly
885 modified version of the original Debian patch at
893 modified version of the original Debian patch at
886 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=294500.
894 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=294500.
887
895
888 2005-02-17 Fernando Perez <fperez@colorado.edu>
896 2005-02-17 Fernando Perez <fperez@colorado.edu>
889
897
890 * IPython/genutils.py (native_line_ends): Fix bug which would
898 * IPython/genutils.py (native_line_ends): Fix bug which would
891 cause improper line-ends under win32 b/c I was not opening files
899 cause improper line-ends under win32 b/c I was not opening files
892 in binary mode. Bug report and fix thanks to Ville.
900 in binary mode. Bug report and fix thanks to Ville.
893
901
894 * IPython/iplib.py (handle_auto): Fix bug which I introduced when
902 * IPython/iplib.py (handle_auto): Fix bug which I introduced when
895 trying to catch spurious foo[1] autocalls. My fix actually broke
903 trying to catch spurious foo[1] autocalls. My fix actually broke
896 ',/' autoquote/call with explicit escape (bad regexp).
904 ',/' autoquote/call with explicit escape (bad regexp).
897
905
898 2005-02-15 *** Released version 0.6.11
906 2005-02-15 *** Released version 0.6.11
899
907
900 2005-02-14 Fernando Perez <fperez@colorado.edu>
908 2005-02-14 Fernando Perez <fperez@colorado.edu>
901
909
902 * IPython/background_jobs.py: New background job management
910 * IPython/background_jobs.py: New background job management
903 subsystem. This is implemented via a new set of classes, and
911 subsystem. This is implemented via a new set of classes, and
904 IPython now provides a builtin 'jobs' object for background job
912 IPython now provides a builtin 'jobs' object for background job
905 execution. A convenience %bg magic serves as a lightweight
913 execution. A convenience %bg magic serves as a lightweight
906 frontend for starting the more common type of calls. This was
914 frontend for starting the more common type of calls. This was
907 inspired by discussions with B. Granger and the BackgroundCommand
915 inspired by discussions with B. Granger and the BackgroundCommand
908 class described in the book Python Scripting for Computational
916 class described in the book Python Scripting for Computational
909 Science, by H. P. Langtangen: http://folk.uio.no/hpl/scripting
917 Science, by H. P. Langtangen: http://folk.uio.no/hpl/scripting
910 (although ultimately no code from this text was used, as IPython's
918 (although ultimately no code from this text was used, as IPython's
911 system is a separate implementation).
919 system is a separate implementation).
912
920
913 * IPython/iplib.py (MagicCompleter.python_matches): add new option
921 * IPython/iplib.py (MagicCompleter.python_matches): add new option
914 to control the completion of single/double underscore names
922 to control the completion of single/double underscore names
915 separately. As documented in the example ipytonrc file, the
923 separately. As documented in the example ipytonrc file, the
916 readline_omit__names variable can now be set to 2, to omit even
924 readline_omit__names variable can now be set to 2, to omit even
917 single underscore names. Thanks to a patch by Brian Wong
925 single underscore names. Thanks to a patch by Brian Wong
918 <BrianWong-AT-AirgoNetworks.Com>.
926 <BrianWong-AT-AirgoNetworks.Com>.
919 (InteractiveShell.__init__): Fix bug which would cause foo[1] to
927 (InteractiveShell.__init__): Fix bug which would cause foo[1] to
920 be autocalled as foo([1]) if foo were callable. A problem for
928 be autocalled as foo([1]) if foo were callable. A problem for
921 things which are both callable and implement __getitem__.
929 things which are both callable and implement __getitem__.
922 (init_readline): Fix autoindentation for win32. Thanks to a patch
930 (init_readline): Fix autoindentation for win32. Thanks to a patch
923 by Vivian De Smedt <vivian-AT-vdesmedt.com>.
931 by Vivian De Smedt <vivian-AT-vdesmedt.com>.
924
932
925 2005-02-12 Fernando Perez <fperez@colorado.edu>
933 2005-02-12 Fernando Perez <fperez@colorado.edu>
926
934
927 * IPython/ipmaker.py (make_IPython): Disabled the stout traps
935 * IPython/ipmaker.py (make_IPython): Disabled the stout traps
928 which I had written long ago to sort out user error messages which
936 which I had written long ago to sort out user error messages which
929 may occur during startup. This seemed like a good idea initially,
937 may occur during startup. This seemed like a good idea initially,
930 but it has proven a disaster in retrospect. I don't want to
938 but it has proven a disaster in retrospect. I don't want to
931 change much code for now, so my fix is to set the internal 'debug'
939 change much code for now, so my fix is to set the internal 'debug'
932 flag to true everywhere, whose only job was precisely to control
940 flag to true everywhere, whose only job was precisely to control
933 this subsystem. This closes issue 28 (as well as avoiding all
941 this subsystem. This closes issue 28 (as well as avoiding all
934 sorts of strange hangups which occur from time to time).
942 sorts of strange hangups which occur from time to time).
935
943
936 2005-02-07 Fernando Perez <fperez@colorado.edu>
944 2005-02-07 Fernando Perez <fperez@colorado.edu>
937
945
938 * IPython/Magic.py (magic_edit): Fix 'ed -p' not working when the
946 * IPython/Magic.py (magic_edit): Fix 'ed -p' not working when the
939 previous call produced a syntax error.
947 previous call produced a syntax error.
940
948
941 * IPython/OInspect.py (Inspector.pinfo): Fix crash when inspecting
949 * IPython/OInspect.py (Inspector.pinfo): Fix crash when inspecting
942 classes without constructor.
950 classes without constructor.
943
951
944 2005-02-06 Fernando Perez <fperez@colorado.edu>
952 2005-02-06 Fernando Perez <fperez@colorado.edu>
945
953
946 * IPython/iplib.py (MagicCompleter.complete): Extend the list of
954 * IPython/iplib.py (MagicCompleter.complete): Extend the list of
947 completions with the results of each matcher, so we return results
955 completions with the results of each matcher, so we return results
948 to the user from all namespaces. This breaks with ipython
956 to the user from all namespaces. This breaks with ipython
949 tradition, but I think it's a nicer behavior. Now you get all
957 tradition, but I think it's a nicer behavior. Now you get all
950 possible completions listed, from all possible namespaces (python,
958 possible completions listed, from all possible namespaces (python,
951 filesystem, magics...) After a request by John Hunter
959 filesystem, magics...) After a request by John Hunter
952 <jdhunter-AT-nitace.bsd.uchicago.edu>.
960 <jdhunter-AT-nitace.bsd.uchicago.edu>.
953
961
954 2005-02-05 Fernando Perez <fperez@colorado.edu>
962 2005-02-05 Fernando Perez <fperez@colorado.edu>
955
963
956 * IPython/Magic.py (magic_prun): Fix bug where prun would fail if
964 * IPython/Magic.py (magic_prun): Fix bug where prun would fail if
957 the call had quote characters in it (the quotes were stripped).
965 the call had quote characters in it (the quotes were stripped).
958
966
959 2005-01-31 Fernando Perez <fperez@colorado.edu>
967 2005-01-31 Fernando Perez <fperez@colorado.edu>
960
968
961 * IPython/iplib.py (InteractiveShell.__init__): reduce reliance on
969 * IPython/iplib.py (InteractiveShell.__init__): reduce reliance on
962 Itpl.itpl() to make the code more robust against psyco
970 Itpl.itpl() to make the code more robust against psyco
963 optimizations.
971 optimizations.
964
972
965 * IPython/Itpl.py (Itpl.__str__): Use a _getframe() call instead
973 * IPython/Itpl.py (Itpl.__str__): Use a _getframe() call instead
966 of causing an exception. Quicker, cleaner.
974 of causing an exception. Quicker, cleaner.
967
975
968 2005-01-28 Fernando Perez <fperez@colorado.edu>
976 2005-01-28 Fernando Perez <fperez@colorado.edu>
969
977
970 * scripts/ipython_win_post_install.py (install): hardcode
978 * scripts/ipython_win_post_install.py (install): hardcode
971 sys.prefix+'python.exe' as the executable path. It turns out that
979 sys.prefix+'python.exe' as the executable path. It turns out that
972 during the post-installation run, sys.executable resolves to the
980 during the post-installation run, sys.executable resolves to the
973 name of the binary installer! I should report this as a distutils
981 name of the binary installer! I should report this as a distutils
974 bug, I think. I updated the .10 release with this tiny fix, to
982 bug, I think. I updated the .10 release with this tiny fix, to
975 avoid annoying the lists further.
983 avoid annoying the lists further.
976
984
977 2005-01-27 *** Released version 0.6.10
985 2005-01-27 *** Released version 0.6.10
978
986
979 2005-01-27 Fernando Perez <fperez@colorado.edu>
987 2005-01-27 Fernando Perez <fperez@colorado.edu>
980
988
981 * IPython/numutils.py (norm): Added 'inf' as optional name for
989 * IPython/numutils.py (norm): Added 'inf' as optional name for
982 L-infinity norm, included references to mathworld.com for vector
990 L-infinity norm, included references to mathworld.com for vector
983 norm definitions.
991 norm definitions.
984 (amin/amax): added amin/amax for array min/max. Similar to what
992 (amin/amax): added amin/amax for array min/max. Similar to what
985 pylab ships with after the recent reorganization of names.
993 pylab ships with after the recent reorganization of names.
986 (spike/spike_odd): removed deprecated spike/spike_odd functions.
994 (spike/spike_odd): removed deprecated spike/spike_odd functions.
987
995
988 * ipython.el: committed Alex's recent fixes and improvements.
996 * ipython.el: committed Alex's recent fixes and improvements.
989 Tested with python-mode from CVS, and it looks excellent. Since
997 Tested with python-mode from CVS, and it looks excellent. Since
990 python-mode hasn't released anything in a while, I'm temporarily
998 python-mode hasn't released anything in a while, I'm temporarily
991 putting a copy of today's CVS (v 4.70) of python-mode in:
999 putting a copy of today's CVS (v 4.70) of python-mode in:
992 http://ipython.scipy.org/tmp/python-mode.el
1000 http://ipython.scipy.org/tmp/python-mode.el
993
1001
994 * scripts/ipython_win_post_install.py (install): Win32 fix to use
1002 * scripts/ipython_win_post_install.py (install): Win32 fix to use
995 sys.executable for the executable name, instead of assuming it's
1003 sys.executable for the executable name, instead of assuming it's
996 called 'python.exe' (the post-installer would have produced broken
1004 called 'python.exe' (the post-installer would have produced broken
997 setups on systems with a differently named python binary).
1005 setups on systems with a differently named python binary).
998
1006
999 * IPython/PyColorize.py (Parser.__call__): change explicit '\n'
1007 * IPython/PyColorize.py (Parser.__call__): change explicit '\n'
1000 references to os.linesep, to make the code more
1008 references to os.linesep, to make the code more
1001 platform-independent. This is also part of the win32 coloring
1009 platform-independent. This is also part of the win32 coloring
1002 fixes.
1010 fixes.
1003
1011
1004 * IPython/genutils.py (page_dumb): Remove attempts to chop long
1012 * IPython/genutils.py (page_dumb): Remove attempts to chop long
1005 lines, which actually cause coloring bugs because the length of
1013 lines, which actually cause coloring bugs because the length of
1006 the line is very difficult to correctly compute with embedded
1014 the line is very difficult to correctly compute with embedded
1007 escapes. This was the source of all the coloring problems under
1015 escapes. This was the source of all the coloring problems under
1008 Win32. I think that _finally_, Win32 users have a properly
1016 Win32. I think that _finally_, Win32 users have a properly
1009 working ipython in all respects. This would never have happened
1017 working ipython in all respects. This would never have happened
1010 if not for Gary Bishop and Viktor Ransmayr's great help and work.
1018 if not for Gary Bishop and Viktor Ransmayr's great help and work.
1011
1019
1012 2005-01-26 *** Released version 0.6.9
1020 2005-01-26 *** Released version 0.6.9
1013
1021
1014 2005-01-25 Fernando Perez <fperez@colorado.edu>
1022 2005-01-25 Fernando Perez <fperez@colorado.edu>
1015
1023
1016 * setup.py: finally, we have a true Windows installer, thanks to
1024 * setup.py: finally, we have a true Windows installer, thanks to
1017 the excellent work of Viktor Ransmayr
1025 the excellent work of Viktor Ransmayr
1018 <viktor.ransmayr-AT-t-online.de>. The docs have been updated for
1026 <viktor.ransmayr-AT-t-online.de>. The docs have been updated for
1019 Windows users. The setup routine is quite a bit cleaner thanks to
1027 Windows users. The setup routine is quite a bit cleaner thanks to
1020 this, and the post-install script uses the proper functions to
1028 this, and the post-install script uses the proper functions to
1021 allow a clean de-installation using the standard Windows Control
1029 allow a clean de-installation using the standard Windows Control
1022 Panel.
1030 Panel.
1023
1031
1024 * IPython/genutils.py (get_home_dir): changed to use the $HOME
1032 * IPython/genutils.py (get_home_dir): changed to use the $HOME
1025 environment variable under all OSes (including win32) if
1033 environment variable under all OSes (including win32) if
1026 available. This will give consistency to win32 users who have set
1034 available. This will give consistency to win32 users who have set
1027 this variable for any reason. If os.environ['HOME'] fails, the
1035 this variable for any reason. If os.environ['HOME'] fails, the
1028 previous policy of using HOMEDRIVE\HOMEPATH kicks in.
1036 previous policy of using HOMEDRIVE\HOMEPATH kicks in.
1029
1037
1030 2005-01-24 Fernando Perez <fperez@colorado.edu>
1038 2005-01-24 Fernando Perez <fperez@colorado.edu>
1031
1039
1032 * IPython/numutils.py (empty_like): add empty_like(), similar to
1040 * IPython/numutils.py (empty_like): add empty_like(), similar to
1033 zeros_like() but taking advantage of the new empty() Numeric routine.
1041 zeros_like() but taking advantage of the new empty() Numeric routine.
1034
1042
1035 2005-01-23 *** Released version 0.6.8
1043 2005-01-23 *** Released version 0.6.8
1036
1044
1037 2005-01-22 Fernando Perez <fperez@colorado.edu>
1045 2005-01-22 Fernando Perez <fperez@colorado.edu>
1038
1046
1039 * IPython/Shell.py (MatplotlibShellBase.mplot_exec): I removed the
1047 * IPython/Shell.py (MatplotlibShellBase.mplot_exec): I removed the
1040 automatic show() calls. After discussing things with JDH, it
1048 automatic show() calls. After discussing things with JDH, it
1041 turns out there are too many corner cases where this can go wrong.
1049 turns out there are too many corner cases where this can go wrong.
1042 It's best not to try to be 'too smart', and simply have ipython
1050 It's best not to try to be 'too smart', and simply have ipython
1043 reproduce as much as possible the default behavior of a normal
1051 reproduce as much as possible the default behavior of a normal
1044 python shell.
1052 python shell.
1045
1053
1046 * IPython/iplib.py (InteractiveShell.__init__): Modified the
1054 * IPython/iplib.py (InteractiveShell.__init__): Modified the
1047 line-splitting regexp and _prefilter() to avoid calling getattr()
1055 line-splitting regexp and _prefilter() to avoid calling getattr()
1048 on assignments. This closes
1056 on assignments. This closes
1049 http://www.scipy.net/roundup/ipython/issue24. Note that Python's
1057 http://www.scipy.net/roundup/ipython/issue24. Note that Python's
1050 readline uses getattr(), so a simple <TAB> keypress is still
1058 readline uses getattr(), so a simple <TAB> keypress is still
1051 enough to trigger getattr() calls on an object.
1059 enough to trigger getattr() calls on an object.
1052
1060
1053 2005-01-21 Fernando Perez <fperez@colorado.edu>
1061 2005-01-21 Fernando Perez <fperez@colorado.edu>
1054
1062
1055 * IPython/Shell.py (MatplotlibShellBase.magic_run): Fix the %run
1063 * IPython/Shell.py (MatplotlibShellBase.magic_run): Fix the %run
1056 docstring under pylab so it doesn't mask the original.
1064 docstring under pylab so it doesn't mask the original.
1057
1065
1058 2005-01-21 *** Released version 0.6.7
1066 2005-01-21 *** Released version 0.6.7
1059
1067
1060 2005-01-21 Fernando Perez <fperez@colorado.edu>
1068 2005-01-21 Fernando Perez <fperez@colorado.edu>
1061
1069
1062 * IPython/Shell.py (MTInteractiveShell.runcode): Trap a crash with
1070 * IPython/Shell.py (MTInteractiveShell.runcode): Trap a crash with
1063 signal handling for win32 users in multithreaded mode.
1071 signal handling for win32 users in multithreaded mode.
1064
1072
1065 2005-01-17 Fernando Perez <fperez@colorado.edu>
1073 2005-01-17 Fernando Perez <fperez@colorado.edu>
1066
1074
1067 * IPython/OInspect.py (Inspector.pinfo): Fix crash when inspecting
1075 * IPython/OInspect.py (Inspector.pinfo): Fix crash when inspecting
1068 instances with no __init__. After a crash report by Norbert Nemec
1076 instances with no __init__. After a crash report by Norbert Nemec
1069 <Norbert-AT-nemec-online.de>.
1077 <Norbert-AT-nemec-online.de>.
1070
1078
1071 2005-01-14 Fernando Perez <fperez@colorado.edu>
1079 2005-01-14 Fernando Perez <fperez@colorado.edu>
1072
1080
1073 * IPython/ultraTB.py (VerboseTB.text): Fix bug in reporting of
1081 * IPython/ultraTB.py (VerboseTB.text): Fix bug in reporting of
1074 names for verbose exceptions, when multiple dotted names and the
1082 names for verbose exceptions, when multiple dotted names and the
1075 'parent' object were present on the same line.
1083 'parent' object were present on the same line.
1076
1084
1077 2005-01-11 Fernando Perez <fperez@colorado.edu>
1085 2005-01-11 Fernando Perez <fperez@colorado.edu>
1078
1086
1079 * IPython/genutils.py (flag_calls): new utility to trap and flag
1087 * IPython/genutils.py (flag_calls): new utility to trap and flag
1080 calls in functions. I need it to clean up matplotlib support.
1088 calls in functions. I need it to clean up matplotlib support.
1081 Also removed some deprecated code in genutils.
1089 Also removed some deprecated code in genutils.
1082
1090
1083 * IPython/Shell.py (MatplotlibShellBase.mplot_exec): small fix so
1091 * IPython/Shell.py (MatplotlibShellBase.mplot_exec): small fix so
1084 that matplotlib scripts called with %run, which don't call show()
1092 that matplotlib scripts called with %run, which don't call show()
1085 themselves, still have their plotting windows open.
1093 themselves, still have their plotting windows open.
1086
1094
1087 2005-01-05 Fernando Perez <fperez@colorado.edu>
1095 2005-01-05 Fernando Perez <fperez@colorado.edu>
1088
1096
1089 * IPython/Shell.py (IPShellGTK.__init__): Patch by Andrew Straw
1097 * IPython/Shell.py (IPShellGTK.__init__): Patch by Andrew Straw
1090 <astraw-AT-caltech.edu>, to fix gtk deprecation warnings.
1098 <astraw-AT-caltech.edu>, to fix gtk deprecation warnings.
1091
1099
1092 2004-12-19 Fernando Perez <fperez@colorado.edu>
1100 2004-12-19 Fernando Perez <fperez@colorado.edu>
1093
1101
1094 * IPython/Shell.py (MTInteractiveShell.runcode): Get rid of
1102 * IPython/Shell.py (MTInteractiveShell.runcode): Get rid of
1095 parent_runcode, which was an eyesore. The same result can be
1103 parent_runcode, which was an eyesore. The same result can be
1096 obtained with Python's regular superclass mechanisms.
1104 obtained with Python's regular superclass mechanisms.
1097
1105
1098 2004-12-17 Fernando Perez <fperez@colorado.edu>
1106 2004-12-17 Fernando Perez <fperez@colorado.edu>
1099
1107
1100 * IPython/Magic.py (Magic.magic_sc): Fix quote stripping problem
1108 * IPython/Magic.py (Magic.magic_sc): Fix quote stripping problem
1101 reported by Prabhu.
1109 reported by Prabhu.
1102 (Magic.magic_sx): direct all errors to Term.cerr (defaults to
1110 (Magic.magic_sx): direct all errors to Term.cerr (defaults to
1103 sys.stderr) instead of explicitly calling sys.stderr. This helps
1111 sys.stderr) instead of explicitly calling sys.stderr. This helps
1104 maintain our I/O abstractions clean, for future GUI embeddings.
1112 maintain our I/O abstractions clean, for future GUI embeddings.
1105
1113
1106 * IPython/genutils.py (info): added new utility for sys.stderr
1114 * IPython/genutils.py (info): added new utility for sys.stderr
1107 unified info message handling (thin wrapper around warn()).
1115 unified info message handling (thin wrapper around warn()).
1108
1116
1109 * IPython/ultraTB.py (VerboseTB.text): Fix misreported global
1117 * IPython/ultraTB.py (VerboseTB.text): Fix misreported global
1110 composite (dotted) names on verbose exceptions.
1118 composite (dotted) names on verbose exceptions.
1111 (VerboseTB.nullrepr): harden against another kind of errors which
1119 (VerboseTB.nullrepr): harden against another kind of errors which
1112 Python's inspect module can trigger, and which were crashing
1120 Python's inspect module can trigger, and which were crashing
1113 IPython. Thanks to a report by Marco Lombardi
1121 IPython. Thanks to a report by Marco Lombardi
1114 <mlombard-AT-ma010192.hq.eso.org>.
1122 <mlombard-AT-ma010192.hq.eso.org>.
1115
1123
1116 2004-12-13 *** Released version 0.6.6
1124 2004-12-13 *** Released version 0.6.6
1117
1125
1118 2004-12-12 Fernando Perez <fperez@colorado.edu>
1126 2004-12-12 Fernando Perez <fperez@colorado.edu>
1119
1127
1120 * IPython/Shell.py (IPShellGTK.mainloop): catch RuntimeErrors
1128 * IPython/Shell.py (IPShellGTK.mainloop): catch RuntimeErrors
1121 generated by pygtk upon initialization if it was built without
1129 generated by pygtk upon initialization if it was built without
1122 threads (for matplotlib users). After a crash reported by
1130 threads (for matplotlib users). After a crash reported by
1123 Leguijt, Jaap J SIEP-EPT-RES <Jaap.Leguijt-AT-shell.com>.
1131 Leguijt, Jaap J SIEP-EPT-RES <Jaap.Leguijt-AT-shell.com>.
1124
1132
1125 * IPython/ipmaker.py (make_IPython): fix small bug in the
1133 * IPython/ipmaker.py (make_IPython): fix small bug in the
1126 import_some parameter for multiple imports.
1134 import_some parameter for multiple imports.
1127
1135
1128 * IPython/iplib.py (ipmagic): simplified the interface of
1136 * IPython/iplib.py (ipmagic): simplified the interface of
1129 ipmagic() to take a single string argument, just as it would be
1137 ipmagic() to take a single string argument, just as it would be
1130 typed at the IPython cmd line.
1138 typed at the IPython cmd line.
1131 (ipalias): Added new ipalias() with an interface identical to
1139 (ipalias): Added new ipalias() with an interface identical to
1132 ipmagic(). This completes exposing a pure python interface to the
1140 ipmagic(). This completes exposing a pure python interface to the
1133 alias and magic system, which can be used in loops or more complex
1141 alias and magic system, which can be used in loops or more complex
1134 code where IPython's automatic line mangling is not active.
1142 code where IPython's automatic line mangling is not active.
1135
1143
1136 * IPython/genutils.py (timing): changed interface of timing to
1144 * IPython/genutils.py (timing): changed interface of timing to
1137 simply run code once, which is the most common case. timings()
1145 simply run code once, which is the most common case. timings()
1138 remains unchanged, for the cases where you want multiple runs.
1146 remains unchanged, for the cases where you want multiple runs.
1139
1147
1140 * IPython/Shell.py (MatplotlibShellBase._matplotlib_config): Fix a
1148 * IPython/Shell.py (MatplotlibShellBase._matplotlib_config): Fix a
1141 bug where Python2.2 crashes with exec'ing code which does not end
1149 bug where Python2.2 crashes with exec'ing code which does not end
1142 in a single newline. Python 2.3 is OK, so I hadn't noticed this
1150 in a single newline. Python 2.3 is OK, so I hadn't noticed this
1143 before.
1151 before.
1144
1152
1145 2004-12-10 Fernando Perez <fperez@colorado.edu>
1153 2004-12-10 Fernando Perez <fperez@colorado.edu>
1146
1154
1147 * IPython/Magic.py (Magic.magic_prun): changed name of option from
1155 * IPython/Magic.py (Magic.magic_prun): changed name of option from
1148 -t to -T, to accomodate the new -t flag in %run (the %run and
1156 -t to -T, to accomodate the new -t flag in %run (the %run and
1149 %prun options are kind of intermixed, and it's not easy to change
1157 %prun options are kind of intermixed, and it's not easy to change
1150 this with the limitations of python's getopt).
1158 this with the limitations of python's getopt).
1151
1159
1152 * IPython/Magic.py (Magic.magic_run): Added new -t option to time
1160 * IPython/Magic.py (Magic.magic_run): Added new -t option to time
1153 the execution of scripts. It's not as fine-tuned as timeit.py,
1161 the execution of scripts. It's not as fine-tuned as timeit.py,
1154 but it works from inside ipython (and under 2.2, which lacks
1162 but it works from inside ipython (and under 2.2, which lacks
1155 timeit.py). Optionally a number of runs > 1 can be given for
1163 timeit.py). Optionally a number of runs > 1 can be given for
1156 timing very short-running code.
1164 timing very short-running code.
1157
1165
1158 * IPython/genutils.py (uniq_stable): new routine which returns a
1166 * IPython/genutils.py (uniq_stable): new routine which returns a
1159 list of unique elements in any iterable, but in stable order of
1167 list of unique elements in any iterable, but in stable order of
1160 appearance. I needed this for the ultraTB fixes, and it's a handy
1168 appearance. I needed this for the ultraTB fixes, and it's a handy
1161 utility.
1169 utility.
1162
1170
1163 * IPython/ultraTB.py (VerboseTB.text): Fix proper reporting of
1171 * IPython/ultraTB.py (VerboseTB.text): Fix proper reporting of
1164 dotted names in Verbose exceptions. This had been broken since
1172 dotted names in Verbose exceptions. This had been broken since
1165 the very start, now x.y will properly be printed in a Verbose
1173 the very start, now x.y will properly be printed in a Verbose
1166 traceback, instead of x being shown and y appearing always as an
1174 traceback, instead of x being shown and y appearing always as an
1167 'undefined global'. Getting this to work was a bit tricky,
1175 'undefined global'. Getting this to work was a bit tricky,
1168 because by default python tokenizers are stateless. Saved by
1176 because by default python tokenizers are stateless. Saved by
1169 python's ability to easily add a bit of state to an arbitrary
1177 python's ability to easily add a bit of state to an arbitrary
1170 function (without needing to build a full-blown callable object).
1178 function (without needing to build a full-blown callable object).
1171
1179
1172 Also big cleanup of this code, which had horrendous runtime
1180 Also big cleanup of this code, which had horrendous runtime
1173 lookups of zillions of attributes for colorization. Moved all
1181 lookups of zillions of attributes for colorization. Moved all
1174 this code into a few templates, which make it cleaner and quicker.
1182 this code into a few templates, which make it cleaner and quicker.
1175
1183
1176 Printout quality was also improved for Verbose exceptions: one
1184 Printout quality was also improved for Verbose exceptions: one
1177 variable per line, and memory addresses are printed (this can be
1185 variable per line, and memory addresses are printed (this can be
1178 quite handy in nasty debugging situations, which is what Verbose
1186 quite handy in nasty debugging situations, which is what Verbose
1179 is for).
1187 is for).
1180
1188
1181 * IPython/ipmaker.py (make_IPython): Do NOT execute files named in
1189 * IPython/ipmaker.py (make_IPython): Do NOT execute files named in
1182 the command line as scripts to be loaded by embedded instances.
1190 the command line as scripts to be loaded by embedded instances.
1183 Doing so has the potential for an infinite recursion if there are
1191 Doing so has the potential for an infinite recursion if there are
1184 exceptions thrown in the process. This fixes a strange crash
1192 exceptions thrown in the process. This fixes a strange crash
1185 reported by Philippe MULLER <muller-AT-irit.fr>.
1193 reported by Philippe MULLER <muller-AT-irit.fr>.
1186
1194
1187 2004-12-09 Fernando Perez <fperez@colorado.edu>
1195 2004-12-09 Fernando Perez <fperez@colorado.edu>
1188
1196
1189 * IPython/Shell.py (MatplotlibShellBase.use): Change pylab support
1197 * IPython/Shell.py (MatplotlibShellBase.use): Change pylab support
1190 to reflect new names in matplotlib, which now expose the
1198 to reflect new names in matplotlib, which now expose the
1191 matlab-compatible interface via a pylab module instead of the
1199 matlab-compatible interface via a pylab module instead of the
1192 'matlab' name. The new code is backwards compatible, so users of
1200 'matlab' name. The new code is backwards compatible, so users of
1193 all matplotlib versions are OK. Patch by J. Hunter.
1201 all matplotlib versions are OK. Patch by J. Hunter.
1194
1202
1195 * IPython/OInspect.py (Inspector.pinfo): Add to object? printing
1203 * IPython/OInspect.py (Inspector.pinfo): Add to object? printing
1196 of __init__ docstrings for instances (class docstrings are already
1204 of __init__ docstrings for instances (class docstrings are already
1197 automatically printed). Instances with customized docstrings
1205 automatically printed). Instances with customized docstrings
1198 (indep. of the class) are also recognized and all 3 separate
1206 (indep. of the class) are also recognized and all 3 separate
1199 docstrings are printed (instance, class, constructor). After some
1207 docstrings are printed (instance, class, constructor). After some
1200 comments/suggestions by J. Hunter.
1208 comments/suggestions by J. Hunter.
1201
1209
1202 2004-12-05 Fernando Perez <fperez@colorado.edu>
1210 2004-12-05 Fernando Perez <fperez@colorado.edu>
1203
1211
1204 * IPython/iplib.py (MagicCompleter.complete): Remove annoying
1212 * IPython/iplib.py (MagicCompleter.complete): Remove annoying
1205 warnings when tab-completion fails and triggers an exception.
1213 warnings when tab-completion fails and triggers an exception.
1206
1214
1207 2004-12-03 Fernando Perez <fperez@colorado.edu>
1215 2004-12-03 Fernando Perez <fperez@colorado.edu>
1208
1216
1209 * IPython/Magic.py (magic_prun): Fix bug where an exception would
1217 * IPython/Magic.py (magic_prun): Fix bug where an exception would
1210 be triggered when using 'run -p'. An incorrect option flag was
1218 be triggered when using 'run -p'. An incorrect option flag was
1211 being set ('d' instead of 'D').
1219 being set ('d' instead of 'D').
1212 (manpage): fix missing escaped \- sign.
1220 (manpage): fix missing escaped \- sign.
1213
1221
1214 2004-11-30 *** Released version 0.6.5
1222 2004-11-30 *** Released version 0.6.5
1215
1223
1216 2004-11-30 Fernando Perez <fperez@colorado.edu>
1224 2004-11-30 Fernando Perez <fperez@colorado.edu>
1217
1225
1218 * IPython/Magic.py (Magic.magic_run): Fix bug in breakpoint
1226 * IPython/Magic.py (Magic.magic_run): Fix bug in breakpoint
1219 setting with -d option.
1227 setting with -d option.
1220
1228
1221 * setup.py (docfiles): Fix problem where the doc glob I was using
1229 * setup.py (docfiles): Fix problem where the doc glob I was using
1222 was COMPLETELY BROKEN. It was giving the right files by pure
1230 was COMPLETELY BROKEN. It was giving the right files by pure
1223 accident, but failed once I tried to include ipython.el. Note:
1231 accident, but failed once I tried to include ipython.el. Note:
1224 glob() does NOT allow you to do exclusion on multiple endings!
1232 glob() does NOT allow you to do exclusion on multiple endings!
1225
1233
1226 2004-11-29 Fernando Perez <fperez@colorado.edu>
1234 2004-11-29 Fernando Perez <fperez@colorado.edu>
1227
1235
1228 * IPython/usage.py (__doc__): cleaned up usage docstring, by using
1236 * IPython/usage.py (__doc__): cleaned up usage docstring, by using
1229 the manpage as the source. Better formatting & consistency.
1237 the manpage as the source. Better formatting & consistency.
1230
1238
1231 * IPython/Magic.py (magic_run): Added new -d option, to run
1239 * IPython/Magic.py (magic_run): Added new -d option, to run
1232 scripts under the control of the python pdb debugger. Note that
1240 scripts under the control of the python pdb debugger. Note that
1233 this required changing the %prun option -d to -D, to avoid a clash
1241 this required changing the %prun option -d to -D, to avoid a clash
1234 (since %run must pass options to %prun, and getopt is too dumb to
1242 (since %run must pass options to %prun, and getopt is too dumb to
1235 handle options with string values with embedded spaces). Thanks
1243 handle options with string values with embedded spaces). Thanks
1236 to a suggestion by Matthew Arnison <maffew-AT-cat.org.au>.
1244 to a suggestion by Matthew Arnison <maffew-AT-cat.org.au>.
1237 (magic_who_ls): added type matching to %who and %whos, so that one
1245 (magic_who_ls): added type matching to %who and %whos, so that one
1238 can filter their output to only include variables of certain
1246 can filter their output to only include variables of certain
1239 types. Another suggestion by Matthew.
1247 types. Another suggestion by Matthew.
1240 (magic_whos): Added memory summaries in kb and Mb for arrays.
1248 (magic_whos): Added memory summaries in kb and Mb for arrays.
1241 (magic_who): Improve formatting (break lines every 9 vars).
1249 (magic_who): Improve formatting (break lines every 9 vars).
1242
1250
1243 2004-11-28 Fernando Perez <fperez@colorado.edu>
1251 2004-11-28 Fernando Perez <fperez@colorado.edu>
1244
1252
1245 * IPython/Logger.py (Logger.log): Fix bug in syncing the input
1253 * IPython/Logger.py (Logger.log): Fix bug in syncing the input
1246 cache when empty lines were present.
1254 cache when empty lines were present.
1247
1255
1248 2004-11-24 Fernando Perez <fperez@colorado.edu>
1256 2004-11-24 Fernando Perez <fperez@colorado.edu>
1249
1257
1250 * IPython/usage.py (__doc__): document the re-activated threading
1258 * IPython/usage.py (__doc__): document the re-activated threading
1251 options for WX and GTK.
1259 options for WX and GTK.
1252
1260
1253 2004-11-23 Fernando Perez <fperez@colorado.edu>
1261 2004-11-23 Fernando Perez <fperez@colorado.edu>
1254
1262
1255 * IPython/Shell.py (start): Added Prabhu's big patch to reactivate
1263 * IPython/Shell.py (start): Added Prabhu's big patch to reactivate
1256 the -wthread and -gthread options, along with a new -tk one to try
1264 the -wthread and -gthread options, along with a new -tk one to try
1257 and coordinate Tk threading with wx/gtk. The tk support is very
1265 and coordinate Tk threading with wx/gtk. The tk support is very
1258 platform dependent, since it seems to require Tcl and Tk to be
1266 platform dependent, since it seems to require Tcl and Tk to be
1259 built with threads (Fedora1/2 appears NOT to have it, but in
1267 built with threads (Fedora1/2 appears NOT to have it, but in
1260 Prabhu's Debian boxes it works OK). But even with some Tk
1268 Prabhu's Debian boxes it works OK). But even with some Tk
1261 limitations, this is a great improvement.
1269 limitations, this is a great improvement.
1262
1270
1263 * IPython/Prompts.py (prompt_specials_color): Added \t for time
1271 * IPython/Prompts.py (prompt_specials_color): Added \t for time
1264 info in user prompts. Patch by Prabhu.
1272 info in user prompts. Patch by Prabhu.
1265
1273
1266 2004-11-18 Fernando Perez <fperez@colorado.edu>
1274 2004-11-18 Fernando Perez <fperez@colorado.edu>
1267
1275
1268 * IPython/genutils.py (ask_yes_no): Add check for a max of 20
1276 * IPython/genutils.py (ask_yes_no): Add check for a max of 20
1269 EOFErrors and bail, to avoid infinite loops if a non-terminating
1277 EOFErrors and bail, to avoid infinite loops if a non-terminating
1270 file is fed into ipython. Patch submitted in issue 19 by user,
1278 file is fed into ipython. Patch submitted in issue 19 by user,
1271 many thanks.
1279 many thanks.
1272
1280
1273 * IPython/iplib.py (InteractiveShell.handle_auto): do NOT trigger
1281 * IPython/iplib.py (InteractiveShell.handle_auto): do NOT trigger
1274 autoquote/parens in continuation prompts, which can cause lots of
1282 autoquote/parens in continuation prompts, which can cause lots of
1275 problems. Closes roundup issue 20.
1283 problems. Closes roundup issue 20.
1276
1284
1277 2004-11-17 Fernando Perez <fperez@colorado.edu>
1285 2004-11-17 Fernando Perez <fperez@colorado.edu>
1278
1286
1279 * debian/control (Build-Depends-Indep): Fix dpatch dependency,
1287 * debian/control (Build-Depends-Indep): Fix dpatch dependency,
1280 reported as debian bug #280505. I'm not sure my local changelog
1288 reported as debian bug #280505. I'm not sure my local changelog
1281 entry has the proper debian format (Jack?).
1289 entry has the proper debian format (Jack?).
1282
1290
1283 2004-11-08 *** Released version 0.6.4
1291 2004-11-08 *** Released version 0.6.4
1284
1292
1285 2004-11-08 Fernando Perez <fperez@colorado.edu>
1293 2004-11-08 Fernando Perez <fperez@colorado.edu>
1286
1294
1287 * IPython/iplib.py (init_readline): Fix exit message for Windows
1295 * IPython/iplib.py (init_readline): Fix exit message for Windows
1288 when readline is active. Thanks to a report by Eric Jones
1296 when readline is active. Thanks to a report by Eric Jones
1289 <eric-AT-enthought.com>.
1297 <eric-AT-enthought.com>.
1290
1298
1291 2004-11-07 Fernando Perez <fperez@colorado.edu>
1299 2004-11-07 Fernando Perez <fperez@colorado.edu>
1292
1300
1293 * IPython/genutils.py (page): Add a trap for OSError exceptions,
1301 * IPython/genutils.py (page): Add a trap for OSError exceptions,
1294 sometimes seen by win2k/cygwin users.
1302 sometimes seen by win2k/cygwin users.
1295
1303
1296 2004-11-06 Fernando Perez <fperez@colorado.edu>
1304 2004-11-06 Fernando Perez <fperez@colorado.edu>
1297
1305
1298 * IPython/iplib.py (interact): Change the handling of %Exit from
1306 * IPython/iplib.py (interact): Change the handling of %Exit from
1299 trying to propagate a SystemExit to an internal ipython flag.
1307 trying to propagate a SystemExit to an internal ipython flag.
1300 This is less elegant than using Python's exception mechanism, but
1308 This is less elegant than using Python's exception mechanism, but
1301 I can't get that to work reliably with threads, so under -pylab
1309 I can't get that to work reliably with threads, so under -pylab
1302 %Exit was hanging IPython. Cross-thread exception handling is
1310 %Exit was hanging IPython. Cross-thread exception handling is
1303 really a bitch. Thaks to a bug report by Stephen Walton
1311 really a bitch. Thaks to a bug report by Stephen Walton
1304 <stephen.walton-AT-csun.edu>.
1312 <stephen.walton-AT-csun.edu>.
1305
1313
1306 2004-11-04 Fernando Perez <fperez@colorado.edu>
1314 2004-11-04 Fernando Perez <fperez@colorado.edu>
1307
1315
1308 * IPython/iplib.py (raw_input_original): store a pointer to the
1316 * IPython/iplib.py (raw_input_original): store a pointer to the
1309 true raw_input to harden against code which can modify it
1317 true raw_input to harden against code which can modify it
1310 (wx.py.PyShell does this and would otherwise crash ipython).
1318 (wx.py.PyShell does this and would otherwise crash ipython).
1311 Thanks to a bug report by Jim Flowers <james.flowers-AT-lgx.com>.
1319 Thanks to a bug report by Jim Flowers <james.flowers-AT-lgx.com>.
1312
1320
1313 * IPython/Shell.py (MTInteractiveShell.runsource): Cleaner fix for
1321 * IPython/Shell.py (MTInteractiveShell.runsource): Cleaner fix for
1314 Ctrl-C problem, which does not mess up the input line.
1322 Ctrl-C problem, which does not mess up the input line.
1315
1323
1316 2004-11-03 Fernando Perez <fperez@colorado.edu>
1324 2004-11-03 Fernando Perez <fperez@colorado.edu>
1317
1325
1318 * IPython/Release.py: Changed licensing to BSD, in all files.
1326 * IPython/Release.py: Changed licensing to BSD, in all files.
1319 (name): lowercase name for tarball/RPM release.
1327 (name): lowercase name for tarball/RPM release.
1320
1328
1321 * IPython/OInspect.py (getdoc): wrap inspect.getdoc() safely for
1329 * IPython/OInspect.py (getdoc): wrap inspect.getdoc() safely for
1322 use throughout ipython.
1330 use throughout ipython.
1323
1331
1324 * IPython/Magic.py (Magic._ofind): Switch to using the new
1332 * IPython/Magic.py (Magic._ofind): Switch to using the new
1325 OInspect.getdoc() function.
1333 OInspect.getdoc() function.
1326
1334
1327 * IPython/Shell.py (sigint_handler): Hack to ignore the execution
1335 * IPython/Shell.py (sigint_handler): Hack to ignore the execution
1328 of the line currently being canceled via Ctrl-C. It's extremely
1336 of the line currently being canceled via Ctrl-C. It's extremely
1329 ugly, but I don't know how to do it better (the problem is one of
1337 ugly, but I don't know how to do it better (the problem is one of
1330 handling cross-thread exceptions).
1338 handling cross-thread exceptions).
1331
1339
1332 2004-10-28 Fernando Perez <fperez@colorado.edu>
1340 2004-10-28 Fernando Perez <fperez@colorado.edu>
1333
1341
1334 * IPython/Shell.py (signal_handler): add signal handlers to trap
1342 * IPython/Shell.py (signal_handler): add signal handlers to trap
1335 SIGINT and SIGSEGV in threaded code properly. Thanks to a bug
1343 SIGINT and SIGSEGV in threaded code properly. Thanks to a bug
1336 report by Francesc Alted.
1344 report by Francesc Alted.
1337
1345
1338 2004-10-21 Fernando Perez <fperez@colorado.edu>
1346 2004-10-21 Fernando Perez <fperez@colorado.edu>
1339
1347
1340 * IPython/Extensions/InterpreterExec.py (prefilter_shell): Fix @
1348 * IPython/Extensions/InterpreterExec.py (prefilter_shell): Fix @
1341 to % for pysh syntax extensions.
1349 to % for pysh syntax extensions.
1342
1350
1343 2004-10-09 Fernando Perez <fperez@colorado.edu>
1351 2004-10-09 Fernando Perez <fperez@colorado.edu>
1344
1352
1345 * IPython/Magic.py (Magic.magic_whos): modify output of Numeric
1353 * IPython/Magic.py (Magic.magic_whos): modify output of Numeric
1346 arrays to print a more useful summary, without calling str(arr).
1354 arrays to print a more useful summary, without calling str(arr).
1347 This avoids the problem of extremely lengthy computations which
1355 This avoids the problem of extremely lengthy computations which
1348 occur if arr is large, and appear to the user as a system lockup
1356 occur if arr is large, and appear to the user as a system lockup
1349 with 100% cpu activity. After a suggestion by Kristian Sandberg
1357 with 100% cpu activity. After a suggestion by Kristian Sandberg
1350 <Kristian.Sandberg@colorado.edu>.
1358 <Kristian.Sandberg@colorado.edu>.
1351 (Magic.__init__): fix bug in global magic escapes not being
1359 (Magic.__init__): fix bug in global magic escapes not being
1352 correctly set.
1360 correctly set.
1353
1361
1354 2004-10-08 Fernando Perez <fperez@colorado.edu>
1362 2004-10-08 Fernando Perez <fperez@colorado.edu>
1355
1363
1356 * IPython/Magic.py (__license__): change to absolute imports of
1364 * IPython/Magic.py (__license__): change to absolute imports of
1357 ipython's own internal packages, to start adapting to the absolute
1365 ipython's own internal packages, to start adapting to the absolute
1358 import requirement of PEP-328.
1366 import requirement of PEP-328.
1359
1367
1360 * IPython/genutils.py (__author__): Fix coding to utf-8 on all
1368 * IPython/genutils.py (__author__): Fix coding to utf-8 on all
1361 files, and standardize author/license marks through the Release
1369 files, and standardize author/license marks through the Release
1362 module instead of having per/file stuff (except for files with
1370 module instead of having per/file stuff (except for files with
1363 particular licenses, like the MIT/PSF-licensed codes).
1371 particular licenses, like the MIT/PSF-licensed codes).
1364
1372
1365 * IPython/Debugger.py: remove dead code for python 2.1
1373 * IPython/Debugger.py: remove dead code for python 2.1
1366
1374
1367 2004-10-04 Fernando Perez <fperez@colorado.edu>
1375 2004-10-04 Fernando Perez <fperez@colorado.edu>
1368
1376
1369 * IPython/iplib.py (ipmagic): New function for accessing magics
1377 * IPython/iplib.py (ipmagic): New function for accessing magics
1370 via a normal python function call.
1378 via a normal python function call.
1371
1379
1372 * IPython/Magic.py (Magic.magic_magic): Change the magic escape
1380 * IPython/Magic.py (Magic.magic_magic): Change the magic escape
1373 from '@' to '%', to accomodate the new @decorator syntax of python
1381 from '@' to '%', to accomodate the new @decorator syntax of python
1374 2.4.
1382 2.4.
1375
1383
1376 2004-09-29 Fernando Perez <fperez@colorado.edu>
1384 2004-09-29 Fernando Perez <fperez@colorado.edu>
1377
1385
1378 * IPython/Shell.py (MatplotlibShellBase.use): Added a wrapper to
1386 * IPython/Shell.py (MatplotlibShellBase.use): Added a wrapper to
1379 matplotlib.use to prevent running scripts which try to switch
1387 matplotlib.use to prevent running scripts which try to switch
1380 interactive backends from within ipython. This will just crash
1388 interactive backends from within ipython. This will just crash
1381 the python interpreter, so we can't allow it (but a detailed error
1389 the python interpreter, so we can't allow it (but a detailed error
1382 is given to the user).
1390 is given to the user).
1383
1391
1384 2004-09-28 Fernando Perez <fperez@colorado.edu>
1392 2004-09-28 Fernando Perez <fperez@colorado.edu>
1385
1393
1386 * IPython/Shell.py (MatplotlibShellBase.mplot_exec):
1394 * IPython/Shell.py (MatplotlibShellBase.mplot_exec):
1387 matplotlib-related fixes so that using @run with non-matplotlib
1395 matplotlib-related fixes so that using @run with non-matplotlib
1388 scripts doesn't pop up spurious plot windows. This requires
1396 scripts doesn't pop up spurious plot windows. This requires
1389 matplotlib >= 0.63, where I had to make some changes as well.
1397 matplotlib >= 0.63, where I had to make some changes as well.
1390
1398
1391 * IPython/ipmaker.py (make_IPython): update version requirement to
1399 * IPython/ipmaker.py (make_IPython): update version requirement to
1392 python 2.2.
1400 python 2.2.
1393
1401
1394 * IPython/iplib.py (InteractiveShell.mainloop): Add an optional
1402 * IPython/iplib.py (InteractiveShell.mainloop): Add an optional
1395 banner arg for embedded customization.
1403 banner arg for embedded customization.
1396
1404
1397 * IPython/Magic.py (Magic.__init__): big cleanup to remove all
1405 * IPython/Magic.py (Magic.__init__): big cleanup to remove all
1398 explicit uses of __IP as the IPython's instance name. Now things
1406 explicit uses of __IP as the IPython's instance name. Now things
1399 are properly handled via the shell.name value. The actual code
1407 are properly handled via the shell.name value. The actual code
1400 is a bit ugly b/c I'm doing it via a global in Magic.py, but this
1408 is a bit ugly b/c I'm doing it via a global in Magic.py, but this
1401 is much better than before. I'll clean things completely when the
1409 is much better than before. I'll clean things completely when the
1402 magic stuff gets a real overhaul.
1410 magic stuff gets a real overhaul.
1403
1411
1404 * ipython.1: small fixes, sent in by Jack Moffit. He also sent in
1412 * ipython.1: small fixes, sent in by Jack Moffit. He also sent in
1405 minor changes to debian dir.
1413 minor changes to debian dir.
1406
1414
1407 * IPython/iplib.py (InteractiveShell.__init__): Fix adding a
1415 * IPython/iplib.py (InteractiveShell.__init__): Fix adding a
1408 pointer to the shell itself in the interactive namespace even when
1416 pointer to the shell itself in the interactive namespace even when
1409 a user-supplied dict is provided. This is needed for embedding
1417 a user-supplied dict is provided. This is needed for embedding
1410 purposes (found by tests with Michel Sanner).
1418 purposes (found by tests with Michel Sanner).
1411
1419
1412 2004-09-27 Fernando Perez <fperez@colorado.edu>
1420 2004-09-27 Fernando Perez <fperez@colorado.edu>
1413
1421
1414 * IPython/UserConfig/ipythonrc: remove []{} from
1422 * IPython/UserConfig/ipythonrc: remove []{} from
1415 readline_remove_delims, so that things like [modname.<TAB> do
1423 readline_remove_delims, so that things like [modname.<TAB> do
1416 proper completion. This disables [].TAB, but that's a less common
1424 proper completion. This disables [].TAB, but that's a less common
1417 case than module names in list comprehensions, for example.
1425 case than module names in list comprehensions, for example.
1418 Thanks to a report by Andrea Riciputi.
1426 Thanks to a report by Andrea Riciputi.
1419
1427
1420 2004-09-09 Fernando Perez <fperez@colorado.edu>
1428 2004-09-09 Fernando Perez <fperez@colorado.edu>
1421
1429
1422 * IPython/Shell.py (IPShellGTK.mainloop): reorder to avoid
1430 * IPython/Shell.py (IPShellGTK.mainloop): reorder to avoid
1423 blocking problems in win32 and osx. Fix by John.
1431 blocking problems in win32 and osx. Fix by John.
1424
1432
1425 2004-09-08 Fernando Perez <fperez@colorado.edu>
1433 2004-09-08 Fernando Perez <fperez@colorado.edu>
1426
1434
1427 * IPython/Shell.py (IPShellWX.OnInit): Fix output redirection bug
1435 * IPython/Shell.py (IPShellWX.OnInit): Fix output redirection bug
1428 for Win32 and OSX. Fix by John Hunter.
1436 for Win32 and OSX. Fix by John Hunter.
1429
1437
1430 2004-08-30 *** Released version 0.6.3
1438 2004-08-30 *** Released version 0.6.3
1431
1439
1432 2004-08-30 Fernando Perez <fperez@colorado.edu>
1440 2004-08-30 Fernando Perez <fperez@colorado.edu>
1433
1441
1434 * setup.py (isfile): Add manpages to list of dependent files to be
1442 * setup.py (isfile): Add manpages to list of dependent files to be
1435 updated.
1443 updated.
1436
1444
1437 2004-08-27 Fernando Perez <fperez@colorado.edu>
1445 2004-08-27 Fernando Perez <fperez@colorado.edu>
1438
1446
1439 * IPython/Shell.py (start): I've disabled -wthread and -gthread
1447 * IPython/Shell.py (start): I've disabled -wthread and -gthread
1440 for now. They don't really work with standalone WX/GTK code
1448 for now. They don't really work with standalone WX/GTK code
1441 (though matplotlib IS working fine with both of those backends).
1449 (though matplotlib IS working fine with both of those backends).
1442 This will neeed much more testing. I disabled most things with
1450 This will neeed much more testing. I disabled most things with
1443 comments, so turning it back on later should be pretty easy.
1451 comments, so turning it back on later should be pretty easy.
1444
1452
1445 * IPython/iplib.py (InteractiveShell.__init__): Fix accidental
1453 * IPython/iplib.py (InteractiveShell.__init__): Fix accidental
1446 autocalling of expressions like r'foo', by modifying the line
1454 autocalling of expressions like r'foo', by modifying the line
1447 split regexp. Closes
1455 split regexp. Closes
1448 http://www.scipy.net/roundup/ipython/issue18, reported by Nicholas
1456 http://www.scipy.net/roundup/ipython/issue18, reported by Nicholas
1449 Riley <ipythonbugs-AT-sabi.net>.
1457 Riley <ipythonbugs-AT-sabi.net>.
1450 (InteractiveShell.mainloop): honor --nobanner with banner
1458 (InteractiveShell.mainloop): honor --nobanner with banner
1451 extensions.
1459 extensions.
1452
1460
1453 * IPython/Shell.py: Significant refactoring of all classes, so
1461 * IPython/Shell.py: Significant refactoring of all classes, so
1454 that we can really support ALL matplotlib backends and threading
1462 that we can really support ALL matplotlib backends and threading
1455 models (John spotted a bug with Tk which required this). Now we
1463 models (John spotted a bug with Tk which required this). Now we
1456 should support single-threaded, WX-threads and GTK-threads, both
1464 should support single-threaded, WX-threads and GTK-threads, both
1457 for generic code and for matplotlib.
1465 for generic code and for matplotlib.
1458
1466
1459 * IPython/ipmaker.py (__call__): Changed -mpthread option to
1467 * IPython/ipmaker.py (__call__): Changed -mpthread option to
1460 -pylab, to simplify things for users. Will also remove the pylab
1468 -pylab, to simplify things for users. Will also remove the pylab
1461 profile, since now all of matplotlib configuration is directly
1469 profile, since now all of matplotlib configuration is directly
1462 handled here. This also reduces startup time.
1470 handled here. This also reduces startup time.
1463
1471
1464 * IPython/Shell.py (IPShellGTK.run): Fixed bug where mainloop() of
1472 * IPython/Shell.py (IPShellGTK.run): Fixed bug where mainloop() of
1465 shell wasn't being correctly called. Also in IPShellWX.
1473 shell wasn't being correctly called. Also in IPShellWX.
1466
1474
1467 * IPython/iplib.py (InteractiveShell.__init__): Added option to
1475 * IPython/iplib.py (InteractiveShell.__init__): Added option to
1468 fine-tune banner.
1476 fine-tune banner.
1469
1477
1470 * IPython/numutils.py (spike): Deprecate these spike functions,
1478 * IPython/numutils.py (spike): Deprecate these spike functions,
1471 delete (long deprecated) gnuplot_exec handler.
1479 delete (long deprecated) gnuplot_exec handler.
1472
1480
1473 2004-08-26 Fernando Perez <fperez@colorado.edu>
1481 2004-08-26 Fernando Perez <fperez@colorado.edu>
1474
1482
1475 * ipython.1: Update for threading options, plus some others which
1483 * ipython.1: Update for threading options, plus some others which
1476 were missing.
1484 were missing.
1477
1485
1478 * IPython/ipmaker.py (__call__): Added -wthread option for
1486 * IPython/ipmaker.py (__call__): Added -wthread option for
1479 wxpython thread handling. Make sure threading options are only
1487 wxpython thread handling. Make sure threading options are only
1480 valid at the command line.
1488 valid at the command line.
1481
1489
1482 * scripts/ipython: moved shell selection into a factory function
1490 * scripts/ipython: moved shell selection into a factory function
1483 in Shell.py, to keep the starter script to a minimum.
1491 in Shell.py, to keep the starter script to a minimum.
1484
1492
1485 2004-08-25 Fernando Perez <fperez@colorado.edu>
1493 2004-08-25 Fernando Perez <fperez@colorado.edu>
1486
1494
1487 * IPython/Shell.py (IPShellWX.wxexit): fixes to WX threading, by
1495 * IPython/Shell.py (IPShellWX.wxexit): fixes to WX threading, by
1488 John. Along with some recent changes he made to matplotlib, the
1496 John. Along with some recent changes he made to matplotlib, the
1489 next versions of both systems should work very well together.
1497 next versions of both systems should work very well together.
1490
1498
1491 2004-08-24 Fernando Perez <fperez@colorado.edu>
1499 2004-08-24 Fernando Perez <fperez@colorado.edu>
1492
1500
1493 * IPython/Magic.py (Magic.magic_prun): cleanup some dead code. I
1501 * IPython/Magic.py (Magic.magic_prun): cleanup some dead code. I
1494 tried to switch the profiling to using hotshot, but I'm getting
1502 tried to switch the profiling to using hotshot, but I'm getting
1495 strange errors from prof.runctx() there. I may be misreading the
1503 strange errors from prof.runctx() there. I may be misreading the
1496 docs, but it looks weird. For now the profiling code will
1504 docs, but it looks weird. For now the profiling code will
1497 continue to use the standard profiler.
1505 continue to use the standard profiler.
1498
1506
1499 2004-08-23 Fernando Perez <fperez@colorado.edu>
1507 2004-08-23 Fernando Perez <fperez@colorado.edu>
1500
1508
1501 * IPython/Shell.py (IPShellWX.__init__): Improvements to the WX
1509 * IPython/Shell.py (IPShellWX.__init__): Improvements to the WX
1502 threaded shell, by John Hunter. It's not quite ready yet, but
1510 threaded shell, by John Hunter. It's not quite ready yet, but
1503 close.
1511 close.
1504
1512
1505 2004-08-22 Fernando Perez <fperez@colorado.edu>
1513 2004-08-22 Fernando Perez <fperez@colorado.edu>
1506
1514
1507 * IPython/iplib.py (InteractiveShell.interact): tab cleanups, also
1515 * IPython/iplib.py (InteractiveShell.interact): tab cleanups, also
1508 in Magic and ultraTB.
1516 in Magic and ultraTB.
1509
1517
1510 * ipython.1: document threading options in manpage.
1518 * ipython.1: document threading options in manpage.
1511
1519
1512 * scripts/ipython: Changed name of -thread option to -gthread,
1520 * scripts/ipython: Changed name of -thread option to -gthread,
1513 since this is GTK specific. I want to leave the door open for a
1521 since this is GTK specific. I want to leave the door open for a
1514 -wthread option for WX, which will most likely be necessary. This
1522 -wthread option for WX, which will most likely be necessary. This
1515 change affects usage and ipmaker as well.
1523 change affects usage and ipmaker as well.
1516
1524
1517 * IPython/Shell.py (matplotlib_shell): Add a factory function to
1525 * IPython/Shell.py (matplotlib_shell): Add a factory function to
1518 handle the matplotlib shell issues. Code by John Hunter
1526 handle the matplotlib shell issues. Code by John Hunter
1519 <jdhunter-AT-nitace.bsd.uchicago.edu>.
1527 <jdhunter-AT-nitace.bsd.uchicago.edu>.
1520 (IPShellMatplotlibWX.__init__): Rudimentary WX support. It's
1528 (IPShellMatplotlibWX.__init__): Rudimentary WX support. It's
1521 broken (and disabled for end users) for now, but it puts the
1529 broken (and disabled for end users) for now, but it puts the
1522 infrastructure in place.
1530 infrastructure in place.
1523
1531
1524 2004-08-21 Fernando Perez <fperez@colorado.edu>
1532 2004-08-21 Fernando Perez <fperez@colorado.edu>
1525
1533
1526 * ipythonrc-pylab: Add matplotlib support.
1534 * ipythonrc-pylab: Add matplotlib support.
1527
1535
1528 * matplotlib_config.py: new files for matplotlib support, part of
1536 * matplotlib_config.py: new files for matplotlib support, part of
1529 the pylab profile.
1537 the pylab profile.
1530
1538
1531 * IPython/usage.py (__doc__): documented the threading options.
1539 * IPython/usage.py (__doc__): documented the threading options.
1532
1540
1533 2004-08-20 Fernando Perez <fperez@colorado.edu>
1541 2004-08-20 Fernando Perez <fperez@colorado.edu>
1534
1542
1535 * ipython: Modified the main calling routine to handle the -thread
1543 * ipython: Modified the main calling routine to handle the -thread
1536 and -mpthread options. This needs to be done as a top-level hack,
1544 and -mpthread options. This needs to be done as a top-level hack,
1537 because it determines which class to instantiate for IPython
1545 because it determines which class to instantiate for IPython
1538 itself.
1546 itself.
1539
1547
1540 * IPython/Shell.py (MTInteractiveShell.__init__): New set of
1548 * IPython/Shell.py (MTInteractiveShell.__init__): New set of
1541 classes to support multithreaded GTK operation without blocking,
1549 classes to support multithreaded GTK operation without blocking,
1542 and matplotlib with all backends. This is a lot of still very
1550 and matplotlib with all backends. This is a lot of still very
1543 experimental code, and threads are tricky. So it may still have a
1551 experimental code, and threads are tricky. So it may still have a
1544 few rough edges... This code owes a lot to
1552 few rough edges... This code owes a lot to
1545 http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/65109, by
1553 http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/65109, by
1546 Brian # McErlean and John Finlay, to Antoon Pardon for fixes, and
1554 Brian # McErlean and John Finlay, to Antoon Pardon for fixes, and
1547 to John Hunter for all the matplotlib work.
1555 to John Hunter for all the matplotlib work.
1548
1556
1549 * IPython/ipmaker.py (__call__): Added -thread and -mpthread
1557 * IPython/ipmaker.py (__call__): Added -thread and -mpthread
1550 options for gtk thread and matplotlib support.
1558 options for gtk thread and matplotlib support.
1551
1559
1552 2004-08-16 Fernando Perez <fperez@colorado.edu>
1560 2004-08-16 Fernando Perez <fperez@colorado.edu>
1553
1561
1554 * IPython/iplib.py (InteractiveShell.__init__): don't trigger
1562 * IPython/iplib.py (InteractiveShell.__init__): don't trigger
1555 autocall for things like p*q,p/q,p+q,p-q, when p is callable. Bug
1563 autocall for things like p*q,p/q,p+q,p-q, when p is callable. Bug
1556 reported by Stephen Walton <stephen.walton-AT-csun.edu>.
1564 reported by Stephen Walton <stephen.walton-AT-csun.edu>.
1557
1565
1558 2004-08-11 Fernando Perez <fperez@colorado.edu>
1566 2004-08-11 Fernando Perez <fperez@colorado.edu>
1559
1567
1560 * setup.py (isfile): Fix build so documentation gets updated for
1568 * setup.py (isfile): Fix build so documentation gets updated for
1561 rpms (it was only done for .tgz builds).
1569 rpms (it was only done for .tgz builds).
1562
1570
1563 2004-08-10 Fernando Perez <fperez@colorado.edu>
1571 2004-08-10 Fernando Perez <fperez@colorado.edu>
1564
1572
1565 * genutils.py (Term): Fix misspell of stdin stream (sin->cin).
1573 * genutils.py (Term): Fix misspell of stdin stream (sin->cin).
1566
1574
1567 * iplib.py : Silence syntax error exceptions in tab-completion.
1575 * iplib.py : Silence syntax error exceptions in tab-completion.
1568
1576
1569 2004-08-05 Fernando Perez <fperez@colorado.edu>
1577 2004-08-05 Fernando Perez <fperez@colorado.edu>
1570
1578
1571 * IPython/Prompts.py (Prompt2.set_colors): Fix incorrectly set
1579 * IPython/Prompts.py (Prompt2.set_colors): Fix incorrectly set
1572 'color off' mark for continuation prompts. This was causing long
1580 'color off' mark for continuation prompts. This was causing long
1573 continuation lines to mis-wrap.
1581 continuation lines to mis-wrap.
1574
1582
1575 2004-08-01 Fernando Perez <fperez@colorado.edu>
1583 2004-08-01 Fernando Perez <fperez@colorado.edu>
1576
1584
1577 * IPython/ipmaker.py (make_IPython): Allow the shell class used
1585 * IPython/ipmaker.py (make_IPython): Allow the shell class used
1578 for building ipython to be a parameter. All this is necessary
1586 for building ipython to be a parameter. All this is necessary
1579 right now to have a multithreaded version, but this insane
1587 right now to have a multithreaded version, but this insane
1580 non-design will be cleaned up soon. For now, it's a hack that
1588 non-design will be cleaned up soon. For now, it's a hack that
1581 works.
1589 works.
1582
1590
1583 * IPython/Shell.py (IPShell.__init__): Stop using mutable default
1591 * IPython/Shell.py (IPShell.__init__): Stop using mutable default
1584 args in various places. No bugs so far, but it's a dangerous
1592 args in various places. No bugs so far, but it's a dangerous
1585 practice.
1593 practice.
1586
1594
1587 2004-07-31 Fernando Perez <fperez@colorado.edu>
1595 2004-07-31 Fernando Perez <fperez@colorado.edu>
1588
1596
1589 * IPython/iplib.py (complete): ignore SyntaxError exceptions to
1597 * IPython/iplib.py (complete): ignore SyntaxError exceptions to
1590 fix completion of files with dots in their names under most
1598 fix completion of files with dots in their names under most
1591 profiles (pysh was OK because the completion order is different).
1599 profiles (pysh was OK because the completion order is different).
1592
1600
1593 2004-07-27 Fernando Perez <fperez@colorado.edu>
1601 2004-07-27 Fernando Perez <fperez@colorado.edu>
1594
1602
1595 * IPython/iplib.py (InteractiveShell.__init__): build dict of
1603 * IPython/iplib.py (InteractiveShell.__init__): build dict of
1596 keywords manually, b/c the one in keyword.py was removed in python
1604 keywords manually, b/c the one in keyword.py was removed in python
1597 2.4. Patch by Anakim Border <aborder-AT-users.sourceforge.net>.
1605 2.4. Patch by Anakim Border <aborder-AT-users.sourceforge.net>.
1598 This is NOT a bug under python 2.3 and earlier.
1606 This is NOT a bug under python 2.3 and earlier.
1599
1607
1600 2004-07-26 Fernando Perez <fperez@colorado.edu>
1608 2004-07-26 Fernando Perez <fperez@colorado.edu>
1601
1609
1602 * IPython/ultraTB.py (VerboseTB.text): Add another
1610 * IPython/ultraTB.py (VerboseTB.text): Add another
1603 linecache.checkcache() call to try to prevent inspect.py from
1611 linecache.checkcache() call to try to prevent inspect.py from
1604 crashing under python 2.3. I think this fixes
1612 crashing under python 2.3. I think this fixes
1605 http://www.scipy.net/roundup/ipython/issue17.
1613 http://www.scipy.net/roundup/ipython/issue17.
1606
1614
1607 2004-07-26 *** Released version 0.6.2
1615 2004-07-26 *** Released version 0.6.2
1608
1616
1609 2004-07-26 Fernando Perez <fperez@colorado.edu>
1617 2004-07-26 Fernando Perez <fperez@colorado.edu>
1610
1618
1611 * IPython/Magic.py (Magic.magic_cd): Fix bug where 'cd -N' would
1619 * IPython/Magic.py (Magic.magic_cd): Fix bug where 'cd -N' would
1612 fail for any number.
1620 fail for any number.
1613 (Magic.magic_bookmark): Fix bug where 'bookmark -l' would fail for
1621 (Magic.magic_bookmark): Fix bug where 'bookmark -l' would fail for
1614 empty bookmarks.
1622 empty bookmarks.
1615
1623
1616 2004-07-26 *** Released version 0.6.1
1624 2004-07-26 *** Released version 0.6.1
1617
1625
1618 2004-07-26 Fernando Perez <fperez@colorado.edu>
1626 2004-07-26 Fernando Perez <fperez@colorado.edu>
1619
1627
1620 * ipython_win_post_install.py (run): Added pysh shortcut for Windows.
1628 * ipython_win_post_install.py (run): Added pysh shortcut for Windows.
1621
1629
1622 * IPython/iplib.py (protect_filename): Applied Ville's patch for
1630 * IPython/iplib.py (protect_filename): Applied Ville's patch for
1623 escaping '()[]{}' in filenames.
1631 escaping '()[]{}' in filenames.
1624
1632
1625 * IPython/Magic.py (shlex_split): Fix handling of '*' and '?' for
1633 * IPython/Magic.py (shlex_split): Fix handling of '*' and '?' for
1626 Python 2.2 users who lack a proper shlex.split.
1634 Python 2.2 users who lack a proper shlex.split.
1627
1635
1628 2004-07-19 Fernando Perez <fperez@colorado.edu>
1636 2004-07-19 Fernando Perez <fperez@colorado.edu>
1629
1637
1630 * IPython/iplib.py (InteractiveShell.init_readline): Add support
1638 * IPython/iplib.py (InteractiveShell.init_readline): Add support
1631 for reading readline's init file. I follow the normal chain:
1639 for reading readline's init file. I follow the normal chain:
1632 $INPUTRC is honored, otherwise ~/.inputrc is used. Thanks to a
1640 $INPUTRC is honored, otherwise ~/.inputrc is used. Thanks to a
1633 report by Mike Heeter. This closes
1641 report by Mike Heeter. This closes
1634 http://www.scipy.net/roundup/ipython/issue16.
1642 http://www.scipy.net/roundup/ipython/issue16.
1635
1643
1636 2004-07-18 Fernando Perez <fperez@colorado.edu>
1644 2004-07-18 Fernando Perez <fperez@colorado.edu>
1637
1645
1638 * IPython/iplib.py (__init__): Add better handling of '\' under
1646 * IPython/iplib.py (__init__): Add better handling of '\' under
1639 Win32 for filenames. After a patch by Ville.
1647 Win32 for filenames. After a patch by Ville.
1640
1648
1641 2004-07-17 Fernando Perez <fperez@colorado.edu>
1649 2004-07-17 Fernando Perez <fperez@colorado.edu>
1642
1650
1643 * IPython/iplib.py (InteractiveShell._prefilter): fix bug where
1651 * IPython/iplib.py (InteractiveShell._prefilter): fix bug where
1644 autocalling would be triggered for 'foo is bar' if foo is
1652 autocalling would be triggered for 'foo is bar' if foo is
1645 callable. I also cleaned up the autocall detection code to use a
1653 callable. I also cleaned up the autocall detection code to use a
1646 regexp, which is faster. Bug reported by Alexander Schmolck.
1654 regexp, which is faster. Bug reported by Alexander Schmolck.
1647
1655
1648 * IPython/Magic.py (Magic.magic_pinfo): Fix bug where strings with
1656 * IPython/Magic.py (Magic.magic_pinfo): Fix bug where strings with
1649 '?' in them would confuse the help system. Reported by Alex
1657 '?' in them would confuse the help system. Reported by Alex
1650 Schmolck.
1658 Schmolck.
1651
1659
1652 2004-07-16 Fernando Perez <fperez@colorado.edu>
1660 2004-07-16 Fernando Perez <fperez@colorado.edu>
1653
1661
1654 * IPython/GnuplotInteractive.py (__all__): added plot2.
1662 * IPython/GnuplotInteractive.py (__all__): added plot2.
1655
1663
1656 * IPython/Gnuplot2.py (Gnuplot.plot2): added new function for
1664 * IPython/Gnuplot2.py (Gnuplot.plot2): added new function for
1657 plotting dictionaries, lists or tuples of 1d arrays.
1665 plotting dictionaries, lists or tuples of 1d arrays.
1658
1666
1659 * IPython/Magic.py (Magic.magic_hist): small clenaups and
1667 * IPython/Magic.py (Magic.magic_hist): small clenaups and
1660 optimizations.
1668 optimizations.
1661
1669
1662 * IPython/iplib.py:Remove old Changelog info for cleanup. This is
1670 * IPython/iplib.py:Remove old Changelog info for cleanup. This is
1663 the information which was there from Janko's original IPP code:
1671 the information which was there from Janko's original IPP code:
1664
1672
1665 03.05.99 20:53 porto.ifm.uni-kiel.de
1673 03.05.99 20:53 porto.ifm.uni-kiel.de
1666 --Started changelog.
1674 --Started changelog.
1667 --make clear do what it say it does
1675 --make clear do what it say it does
1668 --added pretty output of lines from inputcache
1676 --added pretty output of lines from inputcache
1669 --Made Logger a mixin class, simplifies handling of switches
1677 --Made Logger a mixin class, simplifies handling of switches
1670 --Added own completer class. .string<TAB> expands to last history
1678 --Added own completer class. .string<TAB> expands to last history
1671 line which starts with string. The new expansion is also present
1679 line which starts with string. The new expansion is also present
1672 with Ctrl-r from the readline library. But this shows, who this
1680 with Ctrl-r from the readline library. But this shows, who this
1673 can be done for other cases.
1681 can be done for other cases.
1674 --Added convention that all shell functions should accept a
1682 --Added convention that all shell functions should accept a
1675 parameter_string This opens the door for different behaviour for
1683 parameter_string This opens the door for different behaviour for
1676 each function. @cd is a good example of this.
1684 each function. @cd is a good example of this.
1677
1685
1678 04.05.99 12:12 porto.ifm.uni-kiel.de
1686 04.05.99 12:12 porto.ifm.uni-kiel.de
1679 --added logfile rotation
1687 --added logfile rotation
1680 --added new mainloop method which freezes first the namespace
1688 --added new mainloop method which freezes first the namespace
1681
1689
1682 07.05.99 21:24 porto.ifm.uni-kiel.de
1690 07.05.99 21:24 porto.ifm.uni-kiel.de
1683 --added the docreader classes. Now there is a help system.
1691 --added the docreader classes. Now there is a help system.
1684 -This is only a first try. Currently it's not easy to put new
1692 -This is only a first try. Currently it's not easy to put new
1685 stuff in the indices. But this is the way to go. Info would be
1693 stuff in the indices. But this is the way to go. Info would be
1686 better, but HTML is every where and not everybody has an info
1694 better, but HTML is every where and not everybody has an info
1687 system installed and it's not so easy to change html-docs to info.
1695 system installed and it's not so easy to change html-docs to info.
1688 --added global logfile option
1696 --added global logfile option
1689 --there is now a hook for object inspection method pinfo needs to
1697 --there is now a hook for object inspection method pinfo needs to
1690 be provided for this. Can be reached by two '??'.
1698 be provided for this. Can be reached by two '??'.
1691
1699
1692 08.05.99 20:51 porto.ifm.uni-kiel.de
1700 08.05.99 20:51 porto.ifm.uni-kiel.de
1693 --added a README
1701 --added a README
1694 --bug in rc file. Something has changed so functions in the rc
1702 --bug in rc file. Something has changed so functions in the rc
1695 file need to reference the shell and not self. Not clear if it's a
1703 file need to reference the shell and not self. Not clear if it's a
1696 bug or feature.
1704 bug or feature.
1697 --changed rc file for new behavior
1705 --changed rc file for new behavior
1698
1706
1699 2004-07-15 Fernando Perez <fperez@colorado.edu>
1707 2004-07-15 Fernando Perez <fperez@colorado.edu>
1700
1708
1701 * IPython/Logger.py (Logger.log): fixed recent bug where the input
1709 * IPython/Logger.py (Logger.log): fixed recent bug where the input
1702 cache was falling out of sync in bizarre manners when multi-line
1710 cache was falling out of sync in bizarre manners when multi-line
1703 input was present. Minor optimizations and cleanup.
1711 input was present. Minor optimizations and cleanup.
1704
1712
1705 (Logger): Remove old Changelog info for cleanup. This is the
1713 (Logger): Remove old Changelog info for cleanup. This is the
1706 information which was there from Janko's original code:
1714 information which was there from Janko's original code:
1707
1715
1708 Changes to Logger: - made the default log filename a parameter
1716 Changes to Logger: - made the default log filename a parameter
1709
1717
1710 - put a check for lines beginning with !@? in log(). Needed
1718 - put a check for lines beginning with !@? in log(). Needed
1711 (even if the handlers properly log their lines) for mid-session
1719 (even if the handlers properly log their lines) for mid-session
1712 logging activation to work properly. Without this, lines logged
1720 logging activation to work properly. Without this, lines logged
1713 in mid session, which get read from the cache, would end up
1721 in mid session, which get read from the cache, would end up
1714 'bare' (with !@? in the open) in the log. Now they are caught
1722 'bare' (with !@? in the open) in the log. Now they are caught
1715 and prepended with a #.
1723 and prepended with a #.
1716
1724
1717 * IPython/iplib.py (InteractiveShell.init_readline): added check
1725 * IPython/iplib.py (InteractiveShell.init_readline): added check
1718 in case MagicCompleter fails to be defined, so we don't crash.
1726 in case MagicCompleter fails to be defined, so we don't crash.
1719
1727
1720 2004-07-13 Fernando Perez <fperez@colorado.edu>
1728 2004-07-13 Fernando Perez <fperez@colorado.edu>
1721
1729
1722 * IPython/Gnuplot2.py (Gnuplot.hardcopy): add automatic generation
1730 * IPython/Gnuplot2.py (Gnuplot.hardcopy): add automatic generation
1723 of EPS if the requested filename ends in '.eps'.
1731 of EPS if the requested filename ends in '.eps'.
1724
1732
1725 2004-07-04 Fernando Perez <fperez@colorado.edu>
1733 2004-07-04 Fernando Perez <fperez@colorado.edu>
1726
1734
1727 * IPython/iplib.py (InteractiveShell.handle_shell_escape): Fix
1735 * IPython/iplib.py (InteractiveShell.handle_shell_escape): Fix
1728 escaping of quotes when calling the shell.
1736 escaping of quotes when calling the shell.
1729
1737
1730 2004-07-02 Fernando Perez <fperez@colorado.edu>
1738 2004-07-02 Fernando Perez <fperez@colorado.edu>
1731
1739
1732 * IPython/Prompts.py (CachedOutput.update): Fix problem with
1740 * IPython/Prompts.py (CachedOutput.update): Fix problem with
1733 gettext not working because we were clobbering '_'. Fixes
1741 gettext not working because we were clobbering '_'. Fixes
1734 http://www.scipy.net/roundup/ipython/issue6.
1742 http://www.scipy.net/roundup/ipython/issue6.
1735
1743
1736 2004-07-01 Fernando Perez <fperez@colorado.edu>
1744 2004-07-01 Fernando Perez <fperez@colorado.edu>
1737
1745
1738 * IPython/Magic.py (Magic.magic_cd): integrated bookmark handling
1746 * IPython/Magic.py (Magic.magic_cd): integrated bookmark handling
1739 into @cd. Patch by Ville.
1747 into @cd. Patch by Ville.
1740
1748
1741 * IPython/iplib.py (InteractiveShell.post_config_initialization):
1749 * IPython/iplib.py (InteractiveShell.post_config_initialization):
1742 new function to store things after ipmaker runs. Patch by Ville.
1750 new function to store things after ipmaker runs. Patch by Ville.
1743 Eventually this will go away once ipmaker is removed and the class
1751 Eventually this will go away once ipmaker is removed and the class
1744 gets cleaned up, but for now it's ok. Key functionality here is
1752 gets cleaned up, but for now it's ok. Key functionality here is
1745 the addition of the persistent storage mechanism, a dict for
1753 the addition of the persistent storage mechanism, a dict for
1746 keeping data across sessions (for now just bookmarks, but more can
1754 keeping data across sessions (for now just bookmarks, but more can
1747 be implemented later).
1755 be implemented later).
1748
1756
1749 * IPython/Magic.py (Magic.magic_bookmark): New bookmark system,
1757 * IPython/Magic.py (Magic.magic_bookmark): New bookmark system,
1750 persistent across sections. Patch by Ville, I modified it
1758 persistent across sections. Patch by Ville, I modified it
1751 soemwhat to allow bookmarking arbitrary dirs other than CWD. Also
1759 soemwhat to allow bookmarking arbitrary dirs other than CWD. Also
1752 added a '-l' option to list all bookmarks.
1760 added a '-l' option to list all bookmarks.
1753
1761
1754 * IPython/iplib.py (InteractiveShell.atexit_operations): new
1762 * IPython/iplib.py (InteractiveShell.atexit_operations): new
1755 center for cleanup. Registered with atexit.register(). I moved
1763 center for cleanup. Registered with atexit.register(). I moved
1756 here the old exit_cleanup(). After a patch by Ville.
1764 here the old exit_cleanup(). After a patch by Ville.
1757
1765
1758 * IPython/Magic.py (get_py_filename): added '~' to the accepted
1766 * IPython/Magic.py (get_py_filename): added '~' to the accepted
1759 characters in the hacked shlex_split for python 2.2.
1767 characters in the hacked shlex_split for python 2.2.
1760
1768
1761 * IPython/iplib.py (file_matches): more fixes to filenames with
1769 * IPython/iplib.py (file_matches): more fixes to filenames with
1762 whitespace in them. It's not perfect, but limitations in python's
1770 whitespace in them. It's not perfect, but limitations in python's
1763 readline make it impossible to go further.
1771 readline make it impossible to go further.
1764
1772
1765 2004-06-29 Fernando Perez <fperez@colorado.edu>
1773 2004-06-29 Fernando Perez <fperez@colorado.edu>
1766
1774
1767 * IPython/iplib.py (file_matches): escape whitespace correctly in
1775 * IPython/iplib.py (file_matches): escape whitespace correctly in
1768 filename completions. Bug reported by Ville.
1776 filename completions. Bug reported by Ville.
1769
1777
1770 2004-06-28 Fernando Perez <fperez@colorado.edu>
1778 2004-06-28 Fernando Perez <fperez@colorado.edu>
1771
1779
1772 * IPython/ipmaker.py (__call__): Added per-profile histories. Now
1780 * IPython/ipmaker.py (__call__): Added per-profile histories. Now
1773 the history file will be called 'history-PROFNAME' (or just
1781 the history file will be called 'history-PROFNAME' (or just
1774 'history' if no profile is loaded). I was getting annoyed at
1782 'history' if no profile is loaded). I was getting annoyed at
1775 getting my Numerical work history clobbered by pysh sessions.
1783 getting my Numerical work history clobbered by pysh sessions.
1776
1784
1777 * IPython/iplib.py (InteractiveShell.__init__): Internal
1785 * IPython/iplib.py (InteractiveShell.__init__): Internal
1778 getoutputerror() function so that we can honor the system_verbose
1786 getoutputerror() function so that we can honor the system_verbose
1779 flag for _all_ system calls. I also added escaping of #
1787 flag for _all_ system calls. I also added escaping of #
1780 characters here to avoid confusing Itpl.
1788 characters here to avoid confusing Itpl.
1781
1789
1782 * IPython/Magic.py (shlex_split): removed call to shell in
1790 * IPython/Magic.py (shlex_split): removed call to shell in
1783 parse_options and replaced it with shlex.split(). The annoying
1791 parse_options and replaced it with shlex.split(). The annoying
1784 part was that in Python 2.2, shlex.split() doesn't exist, so I had
1792 part was that in Python 2.2, shlex.split() doesn't exist, so I had
1785 to backport it from 2.3, with several frail hacks (the shlex
1793 to backport it from 2.3, with several frail hacks (the shlex
1786 module is rather limited in 2.2). Thanks to a suggestion by Ville
1794 module is rather limited in 2.2). Thanks to a suggestion by Ville
1787 Vainio <vivainio@kolumbus.fi>. For Python 2.3 there should be no
1795 Vainio <vivainio@kolumbus.fi>. For Python 2.3 there should be no
1788 problem.
1796 problem.
1789
1797
1790 (Magic.magic_system_verbose): new toggle to print the actual
1798 (Magic.magic_system_verbose): new toggle to print the actual
1791 system calls made by ipython. Mainly for debugging purposes.
1799 system calls made by ipython. Mainly for debugging purposes.
1792
1800
1793 * IPython/GnuplotRuntime.py (gnu_out): fix bug for cygwin, which
1801 * IPython/GnuplotRuntime.py (gnu_out): fix bug for cygwin, which
1794 doesn't support persistence. Reported (and fix suggested) by
1802 doesn't support persistence. Reported (and fix suggested) by
1795 Travis Caldwell <travis_caldwell2000@yahoo.com>.
1803 Travis Caldwell <travis_caldwell2000@yahoo.com>.
1796
1804
1797 2004-06-26 Fernando Perez <fperez@colorado.edu>
1805 2004-06-26 Fernando Perez <fperez@colorado.edu>
1798
1806
1799 * IPython/Logger.py (Logger.log): fix to handle correctly empty
1807 * IPython/Logger.py (Logger.log): fix to handle correctly empty
1800 continue prompts.
1808 continue prompts.
1801
1809
1802 * IPython/Extensions/InterpreterExec.py (pysh): moved the pysh()
1810 * IPython/Extensions/InterpreterExec.py (pysh): moved the pysh()
1803 function (basically a big docstring) and a few more things here to
1811 function (basically a big docstring) and a few more things here to
1804 speedup startup. pysh.py is now very lightweight. We want because
1812 speedup startup. pysh.py is now very lightweight. We want because
1805 it gets execfile'd, while InterpreterExec gets imported, so
1813 it gets execfile'd, while InterpreterExec gets imported, so
1806 byte-compilation saves time.
1814 byte-compilation saves time.
1807
1815
1808 2004-06-25 Fernando Perez <fperez@colorado.edu>
1816 2004-06-25 Fernando Perez <fperez@colorado.edu>
1809
1817
1810 * IPython/Magic.py (Magic.magic_cd): Fixed to restore usage of 'cd
1818 * IPython/Magic.py (Magic.magic_cd): Fixed to restore usage of 'cd
1811 -NUM', which was recently broken.
1819 -NUM', which was recently broken.
1812
1820
1813 * IPython/iplib.py (InteractiveShell.handle_shell_escape): allow !
1821 * IPython/iplib.py (InteractiveShell.handle_shell_escape): allow !
1814 in multi-line input (but not !!, which doesn't make sense there).
1822 in multi-line input (but not !!, which doesn't make sense there).
1815
1823
1816 * IPython/UserConfig/ipythonrc: made autoindent on by default.
1824 * IPython/UserConfig/ipythonrc: made autoindent on by default.
1817 It's just too useful, and people can turn it off in the less
1825 It's just too useful, and people can turn it off in the less
1818 common cases where it's a problem.
1826 common cases where it's a problem.
1819
1827
1820 2004-06-24 Fernando Perez <fperez@colorado.edu>
1828 2004-06-24 Fernando Perez <fperez@colorado.edu>
1821
1829
1822 * IPython/iplib.py (InteractiveShell._prefilter): big change -
1830 * IPython/iplib.py (InteractiveShell._prefilter): big change -
1823 special syntaxes (like alias calling) is now allied in multi-line
1831 special syntaxes (like alias calling) is now allied in multi-line
1824 input. This is still _very_ experimental, but it's necessary for
1832 input. This is still _very_ experimental, but it's necessary for
1825 efficient shell usage combining python looping syntax with system
1833 efficient shell usage combining python looping syntax with system
1826 calls. For now it's restricted to aliases, I don't think it
1834 calls. For now it's restricted to aliases, I don't think it
1827 really even makes sense to have this for magics.
1835 really even makes sense to have this for magics.
1828
1836
1829 2004-06-23 Fernando Perez <fperez@colorado.edu>
1837 2004-06-23 Fernando Perez <fperez@colorado.edu>
1830
1838
1831 * IPython/Extensions/InterpreterExec.py (prefilter_shell): Added
1839 * IPython/Extensions/InterpreterExec.py (prefilter_shell): Added
1832 $var=cmd <=> @sc var=cmd and $$var=cmd <=> @sc -l var=cmd.
1840 $var=cmd <=> @sc var=cmd and $$var=cmd <=> @sc -l var=cmd.
1833
1841
1834 * IPython/Magic.py (Magic.magic_rehashx): modified to handle
1842 * IPython/Magic.py (Magic.magic_rehashx): modified to handle
1835 extensions under Windows (after code sent by Gary Bishop). The
1843 extensions under Windows (after code sent by Gary Bishop). The
1836 extensions considered 'executable' are stored in IPython's rc
1844 extensions considered 'executable' are stored in IPython's rc
1837 structure as win_exec_ext.
1845 structure as win_exec_ext.
1838
1846
1839 * IPython/genutils.py (shell): new function, like system() but
1847 * IPython/genutils.py (shell): new function, like system() but
1840 without return value. Very useful for interactive shell work.
1848 without return value. Very useful for interactive shell work.
1841
1849
1842 * IPython/Magic.py (Magic.magic_unalias): New @unalias function to
1850 * IPython/Magic.py (Magic.magic_unalias): New @unalias function to
1843 delete aliases.
1851 delete aliases.
1844
1852
1845 * IPython/iplib.py (InteractiveShell.alias_table_update): make
1853 * IPython/iplib.py (InteractiveShell.alias_table_update): make
1846 sure that the alias table doesn't contain python keywords.
1854 sure that the alias table doesn't contain python keywords.
1847
1855
1848 2004-06-21 Fernando Perez <fperez@colorado.edu>
1856 2004-06-21 Fernando Perez <fperez@colorado.edu>
1849
1857
1850 * IPython/Magic.py (Magic.magic_rehash): Fix crash when
1858 * IPython/Magic.py (Magic.magic_rehash): Fix crash when
1851 non-existent items are found in $PATH. Reported by Thorsten.
1859 non-existent items are found in $PATH. Reported by Thorsten.
1852
1860
1853 2004-06-20 Fernando Perez <fperez@colorado.edu>
1861 2004-06-20 Fernando Perez <fperez@colorado.edu>
1854
1862
1855 * IPython/iplib.py (complete): modified the completer so that the
1863 * IPython/iplib.py (complete): modified the completer so that the
1856 order of priorities can be easily changed at runtime.
1864 order of priorities can be easily changed at runtime.
1857
1865
1858 * IPython/Extensions/InterpreterExec.py (prefilter_shell):
1866 * IPython/Extensions/InterpreterExec.py (prefilter_shell):
1859 Modified to auto-execute all lines beginning with '~', '/' or '.'.
1867 Modified to auto-execute all lines beginning with '~', '/' or '.'.
1860
1868
1861 * IPython/Magic.py (Magic.magic_sx): modified @sc and @sx to
1869 * IPython/Magic.py (Magic.magic_sx): modified @sc and @sx to
1862 expand Python variables prepended with $ in all system calls. The
1870 expand Python variables prepended with $ in all system calls. The
1863 same was done to InteractiveShell.handle_shell_escape. Now all
1871 same was done to InteractiveShell.handle_shell_escape. Now all
1864 system access mechanisms (!, !!, @sc, @sx and aliases) allow the
1872 system access mechanisms (!, !!, @sc, @sx and aliases) allow the
1865 expansion of python variables and expressions according to the
1873 expansion of python variables and expressions according to the
1866 syntax of PEP-215 - http://www.python.org/peps/pep-0215.html.
1874 syntax of PEP-215 - http://www.python.org/peps/pep-0215.html.
1867
1875
1868 Though PEP-215 has been rejected, a similar (but simpler) one
1876 Though PEP-215 has been rejected, a similar (but simpler) one
1869 seems like it will go into Python 2.4, PEP-292 -
1877 seems like it will go into Python 2.4, PEP-292 -
1870 http://www.python.org/peps/pep-0292.html.
1878 http://www.python.org/peps/pep-0292.html.
1871
1879
1872 I'll keep the full syntax of PEP-215, since IPython has since the
1880 I'll keep the full syntax of PEP-215, since IPython has since the
1873 start used Ka-Ping Yee's reference implementation discussed there
1881 start used Ka-Ping Yee's reference implementation discussed there
1874 (Itpl), and I actually like the powerful semantics it offers.
1882 (Itpl), and I actually like the powerful semantics it offers.
1875
1883
1876 In order to access normal shell variables, the $ has to be escaped
1884 In order to access normal shell variables, the $ has to be escaped
1877 via an extra $. For example:
1885 via an extra $. For example:
1878
1886
1879 In [7]: PATH='a python variable'
1887 In [7]: PATH='a python variable'
1880
1888
1881 In [8]: !echo $PATH
1889 In [8]: !echo $PATH
1882 a python variable
1890 a python variable
1883
1891
1884 In [9]: !echo $$PATH
1892 In [9]: !echo $$PATH
1885 /usr/local/lf9560/bin:/usr/local/intel/compiler70/ia32/bin:...
1893 /usr/local/lf9560/bin:/usr/local/intel/compiler70/ia32/bin:...
1886
1894
1887 (Magic.parse_options): escape $ so the shell doesn't evaluate
1895 (Magic.parse_options): escape $ so the shell doesn't evaluate
1888 things prematurely.
1896 things prematurely.
1889
1897
1890 * IPython/iplib.py (InteractiveShell.call_alias): added the
1898 * IPython/iplib.py (InteractiveShell.call_alias): added the
1891 ability for aliases to expand python variables via $.
1899 ability for aliases to expand python variables via $.
1892
1900
1893 * IPython/Magic.py (Magic.magic_rehash): based on the new alias
1901 * IPython/Magic.py (Magic.magic_rehash): based on the new alias
1894 system, now there's a @rehash/@rehashx pair of magics. These work
1902 system, now there's a @rehash/@rehashx pair of magics. These work
1895 like the csh rehash command, and can be invoked at any time. They
1903 like the csh rehash command, and can be invoked at any time. They
1896 build a table of aliases to everything in the user's $PATH
1904 build a table of aliases to everything in the user's $PATH
1897 (@rehash uses everything, @rehashx is slower but only adds
1905 (@rehash uses everything, @rehashx is slower but only adds
1898 executable files). With this, the pysh.py-based shell profile can
1906 executable files). With this, the pysh.py-based shell profile can
1899 now simply call rehash upon startup, and full access to all
1907 now simply call rehash upon startup, and full access to all
1900 programs in the user's path is obtained.
1908 programs in the user's path is obtained.
1901
1909
1902 * IPython/iplib.py (InteractiveShell.call_alias): The new alias
1910 * IPython/iplib.py (InteractiveShell.call_alias): The new alias
1903 functionality is now fully in place. I removed the old dynamic
1911 functionality is now fully in place. I removed the old dynamic
1904 code generation based approach, in favor of a much lighter one
1912 code generation based approach, in favor of a much lighter one
1905 based on a simple dict. The advantage is that this allows me to
1913 based on a simple dict. The advantage is that this allows me to
1906 now have thousands of aliases with negligible cost (unthinkable
1914 now have thousands of aliases with negligible cost (unthinkable
1907 with the old system).
1915 with the old system).
1908
1916
1909 2004-06-19 Fernando Perez <fperez@colorado.edu>
1917 2004-06-19 Fernando Perez <fperez@colorado.edu>
1910
1918
1911 * IPython/iplib.py (__init__): extended MagicCompleter class to
1919 * IPython/iplib.py (__init__): extended MagicCompleter class to
1912 also complete (last in priority) on user aliases.
1920 also complete (last in priority) on user aliases.
1913
1921
1914 * IPython/Itpl.py (Itpl.__str__): fixed order of globals/locals in
1922 * IPython/Itpl.py (Itpl.__str__): fixed order of globals/locals in
1915 call to eval.
1923 call to eval.
1916 (ItplNS.__init__): Added a new class which functions like Itpl,
1924 (ItplNS.__init__): Added a new class which functions like Itpl,
1917 but allows configuring the namespace for the evaluation to occur
1925 but allows configuring the namespace for the evaluation to occur
1918 in.
1926 in.
1919
1927
1920 2004-06-18 Fernando Perez <fperez@colorado.edu>
1928 2004-06-18 Fernando Perez <fperez@colorado.edu>
1921
1929
1922 * IPython/iplib.py (InteractiveShell.runcode): modify to print a
1930 * IPython/iplib.py (InteractiveShell.runcode): modify to print a
1923 better message when 'exit' or 'quit' are typed (a common newbie
1931 better message when 'exit' or 'quit' are typed (a common newbie
1924 confusion).
1932 confusion).
1925
1933
1926 * IPython/Magic.py (Magic.magic_colors): Added the runtime color
1934 * IPython/Magic.py (Magic.magic_colors): Added the runtime color
1927 check for Windows users.
1935 check for Windows users.
1928
1936
1929 * IPython/iplib.py (InteractiveShell.user_setup): removed
1937 * IPython/iplib.py (InteractiveShell.user_setup): removed
1930 disabling of colors for Windows. I'll test at runtime and issue a
1938 disabling of colors for Windows. I'll test at runtime and issue a
1931 warning if Gary's readline isn't found, as to nudge users to
1939 warning if Gary's readline isn't found, as to nudge users to
1932 download it.
1940 download it.
1933
1941
1934 2004-06-16 Fernando Perez <fperez@colorado.edu>
1942 2004-06-16 Fernando Perez <fperez@colorado.edu>
1935
1943
1936 * IPython/genutils.py (Stream.__init__): changed to print errors
1944 * IPython/genutils.py (Stream.__init__): changed to print errors
1937 to sys.stderr. I had a circular dependency here. Now it's
1945 to sys.stderr. I had a circular dependency here. Now it's
1938 possible to run ipython as IDLE's shell (consider this pre-alpha,
1946 possible to run ipython as IDLE's shell (consider this pre-alpha,
1939 since true stdout things end up in the starting terminal instead
1947 since true stdout things end up in the starting terminal instead
1940 of IDLE's out).
1948 of IDLE's out).
1941
1949
1942 * IPython/Prompts.py (Prompt2.set_colors): prevent crashes for
1950 * IPython/Prompts.py (Prompt2.set_colors): prevent crashes for
1943 users who haven't # updated their prompt_in2 definitions. Remove
1951 users who haven't # updated their prompt_in2 definitions. Remove
1944 eventually.
1952 eventually.
1945 (multiple_replace): added credit to original ASPN recipe.
1953 (multiple_replace): added credit to original ASPN recipe.
1946
1954
1947 2004-06-15 Fernando Perez <fperez@colorado.edu>
1955 2004-06-15 Fernando Perez <fperez@colorado.edu>
1948
1956
1949 * IPython/iplib.py (InteractiveShell.__init__): add 'cp' to the
1957 * IPython/iplib.py (InteractiveShell.__init__): add 'cp' to the
1950 list of auto-defined aliases.
1958 list of auto-defined aliases.
1951
1959
1952 2004-06-13 Fernando Perez <fperez@colorado.edu>
1960 2004-06-13 Fernando Perez <fperez@colorado.edu>
1953
1961
1954 * setup.py (scriptfiles): Don't trigger win_post_install unless an
1962 * setup.py (scriptfiles): Don't trigger win_post_install unless an
1955 install was really requested (so setup.py can be used for other
1963 install was really requested (so setup.py can be used for other
1956 things under Windows).
1964 things under Windows).
1957
1965
1958 2004-06-10 Fernando Perez <fperez@colorado.edu>
1966 2004-06-10 Fernando Perez <fperez@colorado.edu>
1959
1967
1960 * IPython/Logger.py (Logger.create_log): Manually remove any old
1968 * IPython/Logger.py (Logger.create_log): Manually remove any old
1961 backup, since os.remove may fail under Windows. Fixes bug
1969 backup, since os.remove may fail under Windows. Fixes bug
1962 reported by Thorsten.
1970 reported by Thorsten.
1963
1971
1964 2004-06-09 Fernando Perez <fperez@colorado.edu>
1972 2004-06-09 Fernando Perez <fperez@colorado.edu>
1965
1973
1966 * examples/example-embed.py: fixed all references to %n (replaced
1974 * examples/example-embed.py: fixed all references to %n (replaced
1967 with \\# for ps1/out prompts and with \\D for ps2 prompts). Done
1975 with \\# for ps1/out prompts and with \\D for ps2 prompts). Done
1968 for all examples and the manual as well.
1976 for all examples and the manual as well.
1969
1977
1970 2004-06-08 Fernando Perez <fperez@colorado.edu>
1978 2004-06-08 Fernando Perez <fperez@colorado.edu>
1971
1979
1972 * IPython/Prompts.py (Prompt2.set_p_str): fixed all prompt
1980 * IPython/Prompts.py (Prompt2.set_p_str): fixed all prompt
1973 alignment and color management. All 3 prompt subsystems now
1981 alignment and color management. All 3 prompt subsystems now
1974 inherit from BasePrompt.
1982 inherit from BasePrompt.
1975
1983
1976 * tools/release: updates for windows installer build and tag rpms
1984 * tools/release: updates for windows installer build and tag rpms
1977 with python version (since paths are fixed).
1985 with python version (since paths are fixed).
1978
1986
1979 * IPython/UserConfig/ipythonrc: modified to use \# instead of %n,
1987 * IPython/UserConfig/ipythonrc: modified to use \# instead of %n,
1980 which will become eventually obsolete. Also fixed the default
1988 which will become eventually obsolete. Also fixed the default
1981 prompt_in2 to use \D, so at least new users start with the correct
1989 prompt_in2 to use \D, so at least new users start with the correct
1982 defaults.
1990 defaults.
1983 WARNING: Users with existing ipythonrc files will need to apply
1991 WARNING: Users with existing ipythonrc files will need to apply
1984 this fix manually!
1992 this fix manually!
1985
1993
1986 * setup.py: make windows installer (.exe). This is finally the
1994 * setup.py: make windows installer (.exe). This is finally the
1987 integration of an old patch by Cory Dodt <dodt-AT-fcoe.k12.ca.us>,
1995 integration of an old patch by Cory Dodt <dodt-AT-fcoe.k12.ca.us>,
1988 which I hadn't included because it required Python 2.3 (or recent
1996 which I hadn't included because it required Python 2.3 (or recent
1989 distutils).
1997 distutils).
1990
1998
1991 * IPython/usage.py (__doc__): update docs (and manpage) to reflect
1999 * IPython/usage.py (__doc__): update docs (and manpage) to reflect
1992 usage of new '\D' escape.
2000 usage of new '\D' escape.
1993
2001
1994 * IPython/Prompts.py (ROOT_SYMBOL): Small fix for Windows (which
2002 * IPython/Prompts.py (ROOT_SYMBOL): Small fix for Windows (which
1995 lacks os.getuid())
2003 lacks os.getuid())
1996 (CachedOutput.set_colors): Added the ability to turn coloring
2004 (CachedOutput.set_colors): Added the ability to turn coloring
1997 on/off with @colors even for manually defined prompt colors. It
2005 on/off with @colors even for manually defined prompt colors. It
1998 uses a nasty global, but it works safely and via the generic color
2006 uses a nasty global, but it works safely and via the generic color
1999 handling mechanism.
2007 handling mechanism.
2000 (Prompt2.__init__): Introduced new escape '\D' for continuation
2008 (Prompt2.__init__): Introduced new escape '\D' for continuation
2001 prompts. It represents the counter ('\#') as dots.
2009 prompts. It represents the counter ('\#') as dots.
2002 *** NOTE *** THIS IS A BACKWARDS-INCOMPATIBLE CHANGE. Users will
2010 *** NOTE *** THIS IS A BACKWARDS-INCOMPATIBLE CHANGE. Users will
2003 need to update their ipythonrc files and replace '%n' with '\D' in
2011 need to update their ipythonrc files and replace '%n' with '\D' in
2004 their prompt_in2 settings everywhere. Sorry, but there's
2012 their prompt_in2 settings everywhere. Sorry, but there's
2005 otherwise no clean way to get all prompts to properly align. The
2013 otherwise no clean way to get all prompts to properly align. The
2006 ipythonrc shipped with IPython has been updated.
2014 ipythonrc shipped with IPython has been updated.
2007
2015
2008 2004-06-07 Fernando Perez <fperez@colorado.edu>
2016 2004-06-07 Fernando Perez <fperez@colorado.edu>
2009
2017
2010 * setup.py (isfile): Pass local_icons option to latex2html, so the
2018 * setup.py (isfile): Pass local_icons option to latex2html, so the
2011 resulting HTML file is self-contained. Thanks to
2019 resulting HTML file is self-contained. Thanks to
2012 dryice-AT-liu.com.cn for the tip.
2020 dryice-AT-liu.com.cn for the tip.
2013
2021
2014 * pysh.py: I created a new profile 'shell', which implements a
2022 * pysh.py: I created a new profile 'shell', which implements a
2015 _rudimentary_ IPython-based shell. This is in NO WAY a realy
2023 _rudimentary_ IPython-based shell. This is in NO WAY a realy
2016 system shell, nor will it become one anytime soon. It's mainly
2024 system shell, nor will it become one anytime soon. It's mainly
2017 meant to illustrate the use of the new flexible bash-like prompts.
2025 meant to illustrate the use of the new flexible bash-like prompts.
2018 I guess it could be used by hardy souls for true shell management,
2026 I guess it could be used by hardy souls for true shell management,
2019 but it's no tcsh/bash... pysh.py is loaded by the 'shell'
2027 but it's no tcsh/bash... pysh.py is loaded by the 'shell'
2020 profile. This uses the InterpreterExec extension provided by
2028 profile. This uses the InterpreterExec extension provided by
2021 W.J. van der Laan <gnufnork-AT-hetdigitalegat.nl>
2029 W.J. van der Laan <gnufnork-AT-hetdigitalegat.nl>
2022
2030
2023 * IPython/Prompts.py (PromptOut.__str__): now it will correctly
2031 * IPython/Prompts.py (PromptOut.__str__): now it will correctly
2024 auto-align itself with the length of the previous input prompt
2032 auto-align itself with the length of the previous input prompt
2025 (taking into account the invisible color escapes).
2033 (taking into account the invisible color escapes).
2026 (CachedOutput.__init__): Large restructuring of this class. Now
2034 (CachedOutput.__init__): Large restructuring of this class. Now
2027 all three prompts (primary1, primary2, output) are proper objects,
2035 all three prompts (primary1, primary2, output) are proper objects,
2028 managed by the 'parent' CachedOutput class. The code is still a
2036 managed by the 'parent' CachedOutput class. The code is still a
2029 bit hackish (all prompts share state via a pointer to the cache),
2037 bit hackish (all prompts share state via a pointer to the cache),
2030 but it's overall far cleaner than before.
2038 but it's overall far cleaner than before.
2031
2039
2032 * IPython/genutils.py (getoutputerror): modified to add verbose,
2040 * IPython/genutils.py (getoutputerror): modified to add verbose,
2033 debug and header options. This makes the interface of all getout*
2041 debug and header options. This makes the interface of all getout*
2034 functions uniform.
2042 functions uniform.
2035 (SystemExec.getoutputerror): added getoutputerror to SystemExec.
2043 (SystemExec.getoutputerror): added getoutputerror to SystemExec.
2036
2044
2037 * IPython/Magic.py (Magic.default_option): added a function to
2045 * IPython/Magic.py (Magic.default_option): added a function to
2038 allow registering default options for any magic command. This
2046 allow registering default options for any magic command. This
2039 makes it easy to have profiles which customize the magics globally
2047 makes it easy to have profiles which customize the magics globally
2040 for a certain use. The values set through this function are
2048 for a certain use. The values set through this function are
2041 picked up by the parse_options() method, which all magics should
2049 picked up by the parse_options() method, which all magics should
2042 use to parse their options.
2050 use to parse their options.
2043
2051
2044 * IPython/genutils.py (warn): modified the warnings framework to
2052 * IPython/genutils.py (warn): modified the warnings framework to
2045 use the Term I/O class. I'm trying to slowly unify all of
2053 use the Term I/O class. I'm trying to slowly unify all of
2046 IPython's I/O operations to pass through Term.
2054 IPython's I/O operations to pass through Term.
2047
2055
2048 * IPython/Prompts.py (Prompt2._str_other): Added functionality in
2056 * IPython/Prompts.py (Prompt2._str_other): Added functionality in
2049 the secondary prompt to correctly match the length of the primary
2057 the secondary prompt to correctly match the length of the primary
2050 one for any prompt. Now multi-line code will properly line up
2058 one for any prompt. Now multi-line code will properly line up
2051 even for path dependent prompts, such as the new ones available
2059 even for path dependent prompts, such as the new ones available
2052 via the prompt_specials.
2060 via the prompt_specials.
2053
2061
2054 2004-06-06 Fernando Perez <fperez@colorado.edu>
2062 2004-06-06 Fernando Perez <fperez@colorado.edu>
2055
2063
2056 * IPython/Prompts.py (prompt_specials): Added the ability to have
2064 * IPython/Prompts.py (prompt_specials): Added the ability to have
2057 bash-like special sequences in the prompts, which get
2065 bash-like special sequences in the prompts, which get
2058 automatically expanded. Things like hostname, current working
2066 automatically expanded. Things like hostname, current working
2059 directory and username are implemented already, but it's easy to
2067 directory and username are implemented already, but it's easy to
2060 add more in the future. Thanks to a patch by W.J. van der Laan
2068 add more in the future. Thanks to a patch by W.J. van der Laan
2061 <gnufnork-AT-hetdigitalegat.nl>
2069 <gnufnork-AT-hetdigitalegat.nl>
2062 (prompt_specials): Added color support for prompt strings, so
2070 (prompt_specials): Added color support for prompt strings, so
2063 users can define arbitrary color setups for their prompts.
2071 users can define arbitrary color setups for their prompts.
2064
2072
2065 2004-06-05 Fernando Perez <fperez@colorado.edu>
2073 2004-06-05 Fernando Perez <fperez@colorado.edu>
2066
2074
2067 * IPython/genutils.py (Term.reopen_all): Added Windows-specific
2075 * IPython/genutils.py (Term.reopen_all): Added Windows-specific
2068 code to load Gary Bishop's readline and configure it
2076 code to load Gary Bishop's readline and configure it
2069 automatically. Thanks to Gary for help on this.
2077 automatically. Thanks to Gary for help on this.
2070
2078
2071 2004-06-01 Fernando Perez <fperez@colorado.edu>
2079 2004-06-01 Fernando Perez <fperez@colorado.edu>
2072
2080
2073 * IPython/Logger.py (Logger.create_log): fix bug for logging
2081 * IPython/Logger.py (Logger.create_log): fix bug for logging
2074 with no filename (previous fix was incomplete).
2082 with no filename (previous fix was incomplete).
2075
2083
2076 2004-05-25 Fernando Perez <fperez@colorado.edu>
2084 2004-05-25 Fernando Perez <fperez@colorado.edu>
2077
2085
2078 * IPython/Magic.py (Magic.parse_options): fix bug where naked
2086 * IPython/Magic.py (Magic.parse_options): fix bug where naked
2079 parens would get passed to the shell.
2087 parens would get passed to the shell.
2080
2088
2081 2004-05-20 Fernando Perez <fperez@colorado.edu>
2089 2004-05-20 Fernando Perez <fperez@colorado.edu>
2082
2090
2083 * IPython/Magic.py (Magic.magic_prun): changed default profile
2091 * IPython/Magic.py (Magic.magic_prun): changed default profile
2084 sort order to 'time' (the more common profiling need).
2092 sort order to 'time' (the more common profiling need).
2085
2093
2086 * IPython/OInspect.py (Inspector.pinfo): flush the inspect cache
2094 * IPython/OInspect.py (Inspector.pinfo): flush the inspect cache
2087 so that source code shown is guaranteed in sync with the file on
2095 so that source code shown is guaranteed in sync with the file on
2088 disk (also changed in psource). Similar fix to the one for
2096 disk (also changed in psource). Similar fix to the one for
2089 ultraTB on 2004-05-06. Thanks to a bug report by Yann Le Du
2097 ultraTB on 2004-05-06. Thanks to a bug report by Yann Le Du
2090 <yann.ledu-AT-noos.fr>.
2098 <yann.ledu-AT-noos.fr>.
2091
2099
2092 * IPython/Magic.py (Magic.parse_options): Fixed bug where commands
2100 * IPython/Magic.py (Magic.parse_options): Fixed bug where commands
2093 with a single option would not be correctly parsed. Closes
2101 with a single option would not be correctly parsed. Closes
2094 http://www.scipy.net/roundup/ipython/issue14. This bug had been
2102 http://www.scipy.net/roundup/ipython/issue14. This bug had been
2095 introduced in 0.6.0 (on 2004-05-06).
2103 introduced in 0.6.0 (on 2004-05-06).
2096
2104
2097 2004-05-13 *** Released version 0.6.0
2105 2004-05-13 *** Released version 0.6.0
2098
2106
2099 2004-05-13 Fernando Perez <fperez@colorado.edu>
2107 2004-05-13 Fernando Perez <fperez@colorado.edu>
2100
2108
2101 * debian/: Added debian/ directory to CVS, so that debian support
2109 * debian/: Added debian/ directory to CVS, so that debian support
2102 is publicly accessible. The debian package is maintained by Jack
2110 is publicly accessible. The debian package is maintained by Jack
2103 Moffit <jack-AT-xiph.org>.
2111 Moffit <jack-AT-xiph.org>.
2104
2112
2105 * Documentation: included the notes about an ipython-based system
2113 * Documentation: included the notes about an ipython-based system
2106 shell (the hypothetical 'pysh') into the new_design.pdf document,
2114 shell (the hypothetical 'pysh') into the new_design.pdf document,
2107 so that these ideas get distributed to users along with the
2115 so that these ideas get distributed to users along with the
2108 official documentation.
2116 official documentation.
2109
2117
2110 2004-05-10 Fernando Perez <fperez@colorado.edu>
2118 2004-05-10 Fernando Perez <fperez@colorado.edu>
2111
2119
2112 * IPython/Logger.py (Logger.create_log): fix recently introduced
2120 * IPython/Logger.py (Logger.create_log): fix recently introduced
2113 bug (misindented line) where logstart would fail when not given an
2121 bug (misindented line) where logstart would fail when not given an
2114 explicit filename.
2122 explicit filename.
2115
2123
2116 2004-05-09 Fernando Perez <fperez@colorado.edu>
2124 2004-05-09 Fernando Perez <fperez@colorado.edu>
2117
2125
2118 * IPython/Magic.py (Magic.parse_options): skip system call when
2126 * IPython/Magic.py (Magic.parse_options): skip system call when
2119 there are no options to look for. Faster, cleaner for the common
2127 there are no options to look for. Faster, cleaner for the common
2120 case.
2128 case.
2121
2129
2122 * Documentation: many updates to the manual: describing Windows
2130 * Documentation: many updates to the manual: describing Windows
2123 support better, Gnuplot updates, credits, misc small stuff. Also
2131 support better, Gnuplot updates, credits, misc small stuff. Also
2124 updated the new_design doc a bit.
2132 updated the new_design doc a bit.
2125
2133
2126 2004-05-06 *** Released version 0.6.0.rc1
2134 2004-05-06 *** Released version 0.6.0.rc1
2127
2135
2128 2004-05-06 Fernando Perez <fperez@colorado.edu>
2136 2004-05-06 Fernando Perez <fperez@colorado.edu>
2129
2137
2130 * IPython/ultraTB.py (ListTB.text): modified a ton of string +=
2138 * IPython/ultraTB.py (ListTB.text): modified a ton of string +=
2131 operations to use the vastly more efficient list/''.join() method.
2139 operations to use the vastly more efficient list/''.join() method.
2132 (FormattedTB.text): Fix
2140 (FormattedTB.text): Fix
2133 http://www.scipy.net/roundup/ipython/issue12 - exception source
2141 http://www.scipy.net/roundup/ipython/issue12 - exception source
2134 extract not updated after reload. Thanks to Mike Salib
2142 extract not updated after reload. Thanks to Mike Salib
2135 <msalib-AT-mit.edu> for pinning the source of the problem.
2143 <msalib-AT-mit.edu> for pinning the source of the problem.
2136 Fortunately, the solution works inside ipython and doesn't require
2144 Fortunately, the solution works inside ipython and doesn't require
2137 any changes to python proper.
2145 any changes to python proper.
2138
2146
2139 * IPython/Magic.py (Magic.parse_options): Improved to process the
2147 * IPython/Magic.py (Magic.parse_options): Improved to process the
2140 argument list as a true shell would (by actually using the
2148 argument list as a true shell would (by actually using the
2141 underlying system shell). This way, all @magics automatically get
2149 underlying system shell). This way, all @magics automatically get
2142 shell expansion for variables. Thanks to a comment by Alex
2150 shell expansion for variables. Thanks to a comment by Alex
2143 Schmolck.
2151 Schmolck.
2144
2152
2145 2004-04-04 Fernando Perez <fperez@colorado.edu>
2153 2004-04-04 Fernando Perez <fperez@colorado.edu>
2146
2154
2147 * IPython/iplib.py (InteractiveShell.interact): Added a special
2155 * IPython/iplib.py (InteractiveShell.interact): Added a special
2148 trap for a debugger quit exception, which is basically impossible
2156 trap for a debugger quit exception, which is basically impossible
2149 to handle by normal mechanisms, given what pdb does to the stack.
2157 to handle by normal mechanisms, given what pdb does to the stack.
2150 This fixes a crash reported by <fgibbons-AT-llama.med.harvard.edu>.
2158 This fixes a crash reported by <fgibbons-AT-llama.med.harvard.edu>.
2151
2159
2152 2004-04-03 Fernando Perez <fperez@colorado.edu>
2160 2004-04-03 Fernando Perez <fperez@colorado.edu>
2153
2161
2154 * IPython/genutils.py (Term): Standardized the names of the Term
2162 * IPython/genutils.py (Term): Standardized the names of the Term
2155 class streams to cin/cout/cerr, following C++ naming conventions
2163 class streams to cin/cout/cerr, following C++ naming conventions
2156 (I can't use in/out/err because 'in' is not a valid attribute
2164 (I can't use in/out/err because 'in' is not a valid attribute
2157 name).
2165 name).
2158
2166
2159 * IPython/iplib.py (InteractiveShell.interact): don't increment
2167 * IPython/iplib.py (InteractiveShell.interact): don't increment
2160 the prompt if there's no user input. By Daniel 'Dang' Griffith
2168 the prompt if there's no user input. By Daniel 'Dang' Griffith
2161 <pythondev-dang-AT-lazytwinacres.net>, after a suggestion from
2169 <pythondev-dang-AT-lazytwinacres.net>, after a suggestion from
2162 Francois Pinard.
2170 Francois Pinard.
2163
2171
2164 2004-04-02 Fernando Perez <fperez@colorado.edu>
2172 2004-04-02 Fernando Perez <fperez@colorado.edu>
2165
2173
2166 * IPython/genutils.py (Stream.__init__): Modified to survive at
2174 * IPython/genutils.py (Stream.__init__): Modified to survive at
2167 least importing in contexts where stdin/out/err aren't true file
2175 least importing in contexts where stdin/out/err aren't true file
2168 objects, such as PyCrust (they lack fileno() and mode). However,
2176 objects, such as PyCrust (they lack fileno() and mode). However,
2169 the recovery facilities which rely on these things existing will
2177 the recovery facilities which rely on these things existing will
2170 not work.
2178 not work.
2171
2179
2172 2004-04-01 Fernando Perez <fperez@colorado.edu>
2180 2004-04-01 Fernando Perez <fperez@colorado.edu>
2173
2181
2174 * IPython/Magic.py (Magic.magic_sx): modified (as well as @sc) to
2182 * IPython/Magic.py (Magic.magic_sx): modified (as well as @sc) to
2175 use the new getoutputerror() function, so it properly
2183 use the new getoutputerror() function, so it properly
2176 distinguishes stdout/err.
2184 distinguishes stdout/err.
2177
2185
2178 * IPython/genutils.py (getoutputerror): added a function to
2186 * IPython/genutils.py (getoutputerror): added a function to
2179 capture separately the standard output and error of a command.
2187 capture separately the standard output and error of a command.
2180 After a comment from dang on the mailing lists. This code is
2188 After a comment from dang on the mailing lists. This code is
2181 basically a modified version of commands.getstatusoutput(), from
2189 basically a modified version of commands.getstatusoutput(), from
2182 the standard library.
2190 the standard library.
2183
2191
2184 * IPython/iplib.py (InteractiveShell.handle_shell_escape): added
2192 * IPython/iplib.py (InteractiveShell.handle_shell_escape): added
2185 '!!' as a special syntax (shorthand) to access @sx.
2193 '!!' as a special syntax (shorthand) to access @sx.
2186
2194
2187 * IPython/Magic.py (Magic.magic_sx): new magic, to execute a shell
2195 * IPython/Magic.py (Magic.magic_sx): new magic, to execute a shell
2188 command and return its output as a list split on '\n'.
2196 command and return its output as a list split on '\n'.
2189
2197
2190 2004-03-31 Fernando Perez <fperez@colorado.edu>
2198 2004-03-31 Fernando Perez <fperez@colorado.edu>
2191
2199
2192 * IPython/FakeModule.py (FakeModule.__init__): added __nonzero__
2200 * IPython/FakeModule.py (FakeModule.__init__): added __nonzero__
2193 method to dictionaries used as FakeModule instances if they lack
2201 method to dictionaries used as FakeModule instances if they lack
2194 it. At least pydoc in python2.3 breaks for runtime-defined
2202 it. At least pydoc in python2.3 breaks for runtime-defined
2195 functions without this hack. At some point I need to _really_
2203 functions without this hack. At some point I need to _really_
2196 understand what FakeModule is doing, because it's a gross hack.
2204 understand what FakeModule is doing, because it's a gross hack.
2197 But it solves Arnd's problem for now...
2205 But it solves Arnd's problem for now...
2198
2206
2199 2004-02-27 Fernando Perez <fperez@colorado.edu>
2207 2004-02-27 Fernando Perez <fperez@colorado.edu>
2200
2208
2201 * IPython/Logger.py (Logger.create_log): Fix bug where 'rotate'
2209 * IPython/Logger.py (Logger.create_log): Fix bug where 'rotate'
2202 mode would behave erratically. Also increased the number of
2210 mode would behave erratically. Also increased the number of
2203 possible logs in rotate mod to 999. Thanks to Rod Holland
2211 possible logs in rotate mod to 999. Thanks to Rod Holland
2204 <rhh@StructureLABS.com> for the report and fixes.
2212 <rhh@StructureLABS.com> for the report and fixes.
2205
2213
2206 2004-02-26 Fernando Perez <fperez@colorado.edu>
2214 2004-02-26 Fernando Perez <fperez@colorado.edu>
2207
2215
2208 * IPython/genutils.py (page): Check that the curses module really
2216 * IPython/genutils.py (page): Check that the curses module really
2209 has the initscr attribute before trying to use it. For some
2217 has the initscr attribute before trying to use it. For some
2210 reason, the Solaris curses module is missing this. I think this
2218 reason, the Solaris curses module is missing this. I think this
2211 should be considered a Solaris python bug, but I'm not sure.
2219 should be considered a Solaris python bug, but I'm not sure.
2212
2220
2213 2004-01-17 Fernando Perez <fperez@colorado.edu>
2221 2004-01-17 Fernando Perez <fperez@colorado.edu>
2214
2222
2215 * IPython/genutils.py (Stream.__init__): Changes to try to make
2223 * IPython/genutils.py (Stream.__init__): Changes to try to make
2216 ipython robust against stdin/out/err being closed by the user.
2224 ipython robust against stdin/out/err being closed by the user.
2217 This is 'user error' (and blocks a normal python session, at least
2225 This is 'user error' (and blocks a normal python session, at least
2218 the stdout case). However, Ipython should be able to survive such
2226 the stdout case). However, Ipython should be able to survive such
2219 instances of abuse as gracefully as possible. To simplify the
2227 instances of abuse as gracefully as possible. To simplify the
2220 coding and maintain compatibility with Gary Bishop's Term
2228 coding and maintain compatibility with Gary Bishop's Term
2221 contributions, I've made use of classmethods for this. I think
2229 contributions, I've made use of classmethods for this. I think
2222 this introduces a dependency on python 2.2.
2230 this introduces a dependency on python 2.2.
2223
2231
2224 2004-01-13 Fernando Perez <fperez@colorado.edu>
2232 2004-01-13 Fernando Perez <fperez@colorado.edu>
2225
2233
2226 * IPython/numutils.py (exp_safe): simplified the code a bit and
2234 * IPython/numutils.py (exp_safe): simplified the code a bit and
2227 removed the need for importing the kinds module altogether.
2235 removed the need for importing the kinds module altogether.
2228
2236
2229 2004-01-06 Fernando Perez <fperez@colorado.edu>
2237 2004-01-06 Fernando Perez <fperez@colorado.edu>
2230
2238
2231 * IPython/Magic.py (Magic.magic_sc): Made the shell capture system
2239 * IPython/Magic.py (Magic.magic_sc): Made the shell capture system
2232 a magic function instead, after some community feedback. No
2240 a magic function instead, after some community feedback. No
2233 special syntax will exist for it, but its name is deliberately
2241 special syntax will exist for it, but its name is deliberately
2234 very short.
2242 very short.
2235
2243
2236 2003-12-20 Fernando Perez <fperez@colorado.edu>
2244 2003-12-20 Fernando Perez <fperez@colorado.edu>
2237
2245
2238 * IPython/iplib.py (InteractiveShell.handle_shell_assign): Added
2246 * IPython/iplib.py (InteractiveShell.handle_shell_assign): Added
2239 new functionality, to automagically assign the result of a shell
2247 new functionality, to automagically assign the result of a shell
2240 command to a variable. I'll solicit some community feedback on
2248 command to a variable. I'll solicit some community feedback on
2241 this before making it permanent.
2249 this before making it permanent.
2242
2250
2243 * IPython/OInspect.py (Inspector.pinfo): Fix crash when info was
2251 * IPython/OInspect.py (Inspector.pinfo): Fix crash when info was
2244 requested about callables for which inspect couldn't obtain a
2252 requested about callables for which inspect couldn't obtain a
2245 proper argspec. Thanks to a crash report sent by Etienne
2253 proper argspec. Thanks to a crash report sent by Etienne
2246 Posthumus <etienne-AT-apple01.cs.vu.nl>.
2254 Posthumus <etienne-AT-apple01.cs.vu.nl>.
2247
2255
2248 2003-12-09 Fernando Perez <fperez@colorado.edu>
2256 2003-12-09 Fernando Perez <fperez@colorado.edu>
2249
2257
2250 * IPython/genutils.py (page): patch for the pager to work across
2258 * IPython/genutils.py (page): patch for the pager to work across
2251 various versions of Windows. By Gary Bishop.
2259 various versions of Windows. By Gary Bishop.
2252
2260
2253 2003-12-04 Fernando Perez <fperez@colorado.edu>
2261 2003-12-04 Fernando Perez <fperez@colorado.edu>
2254
2262
2255 * IPython/Gnuplot2.py (PlotItems): Fixes for working with
2263 * IPython/Gnuplot2.py (PlotItems): Fixes for working with
2256 Gnuplot.py version 1.7, whose internal names changed quite a bit.
2264 Gnuplot.py version 1.7, whose internal names changed quite a bit.
2257 While I tested this and it looks ok, there may still be corner
2265 While I tested this and it looks ok, there may still be corner
2258 cases I've missed.
2266 cases I've missed.
2259
2267
2260 2003-12-01 Fernando Perez <fperez@colorado.edu>
2268 2003-12-01 Fernando Perez <fperez@colorado.edu>
2261
2269
2262 * IPython/iplib.py (InteractiveShell._prefilter): Fixed a bug
2270 * IPython/iplib.py (InteractiveShell._prefilter): Fixed a bug
2263 where a line like 'p,q=1,2' would fail because the automagic
2271 where a line like 'p,q=1,2' would fail because the automagic
2264 system would be triggered for @p.
2272 system would be triggered for @p.
2265
2273
2266 * IPython/DPyGetOpt.py (DPyGetOpt.processArguments): Tab-related
2274 * IPython/DPyGetOpt.py (DPyGetOpt.processArguments): Tab-related
2267 cleanups, code unmodified.
2275 cleanups, code unmodified.
2268
2276
2269 * IPython/genutils.py (Term): added a class for IPython to handle
2277 * IPython/genutils.py (Term): added a class for IPython to handle
2270 output. In most cases it will just be a proxy for stdout/err, but
2278 output. In most cases it will just be a proxy for stdout/err, but
2271 having this allows modifications to be made for some platforms,
2279 having this allows modifications to be made for some platforms,
2272 such as handling color escapes under Windows. All of this code
2280 such as handling color escapes under Windows. All of this code
2273 was contributed by Gary Bishop, with minor modifications by me.
2281 was contributed by Gary Bishop, with minor modifications by me.
2274 The actual changes affect many files.
2282 The actual changes affect many files.
2275
2283
2276 2003-11-30 Fernando Perez <fperez@colorado.edu>
2284 2003-11-30 Fernando Perez <fperez@colorado.edu>
2277
2285
2278 * IPython/iplib.py (file_matches): new completion code, courtesy
2286 * IPython/iplib.py (file_matches): new completion code, courtesy
2279 of Jeff Collins. This enables filename completion again under
2287 of Jeff Collins. This enables filename completion again under
2280 python 2.3, which disabled it at the C level.
2288 python 2.3, which disabled it at the C level.
2281
2289
2282 2003-11-11 Fernando Perez <fperez@colorado.edu>
2290 2003-11-11 Fernando Perez <fperez@colorado.edu>
2283
2291
2284 * IPython/numutils.py (amap): Added amap() fn. Simple shorthand
2292 * IPython/numutils.py (amap): Added amap() fn. Simple shorthand
2285 for Numeric.array(map(...)), but often convenient.
2293 for Numeric.array(map(...)), but often convenient.
2286
2294
2287 2003-11-05 Fernando Perez <fperez@colorado.edu>
2295 2003-11-05 Fernando Perez <fperez@colorado.edu>
2288
2296
2289 * IPython/numutils.py (frange): Changed a call from int() to
2297 * IPython/numutils.py (frange): Changed a call from int() to
2290 int(round()) to prevent a problem reported with arange() in the
2298 int(round()) to prevent a problem reported with arange() in the
2291 numpy list.
2299 numpy list.
2292
2300
2293 2003-10-06 Fernando Perez <fperez@colorado.edu>
2301 2003-10-06 Fernando Perez <fperez@colorado.edu>
2294
2302
2295 * IPython/DPyGetOpt.py (DPyGetOpt.processArguments): changed to
2303 * IPython/DPyGetOpt.py (DPyGetOpt.processArguments): changed to
2296 prevent crashes if sys lacks an argv attribute (it happens with
2304 prevent crashes if sys lacks an argv attribute (it happens with
2297 embedded interpreters which build a bare-bones sys module).
2305 embedded interpreters which build a bare-bones sys module).
2298 Thanks to a report/bugfix by Adam Hupp <hupp-AT-cs.wisc.edu>.
2306 Thanks to a report/bugfix by Adam Hupp <hupp-AT-cs.wisc.edu>.
2299
2307
2300 2003-09-24 Fernando Perez <fperez@colorado.edu>
2308 2003-09-24 Fernando Perez <fperez@colorado.edu>
2301
2309
2302 * IPython/Magic.py (Magic._ofind): blanket except around getattr()
2310 * IPython/Magic.py (Magic._ofind): blanket except around getattr()
2303 to protect against poorly written user objects where __getattr__
2311 to protect against poorly written user objects where __getattr__
2304 raises exceptions other than AttributeError. Thanks to a bug
2312 raises exceptions other than AttributeError. Thanks to a bug
2305 report by Oliver Sander <osander-AT-gmx.de>.
2313 report by Oliver Sander <osander-AT-gmx.de>.
2306
2314
2307 * IPython/FakeModule.py (FakeModule.__repr__): this method was
2315 * IPython/FakeModule.py (FakeModule.__repr__): this method was
2308 missing. Thanks to bug report by Ralf Schmitt <ralf-AT-brainbot.com>.
2316 missing. Thanks to bug report by Ralf Schmitt <ralf-AT-brainbot.com>.
2309
2317
2310 2003-09-09 Fernando Perez <fperez@colorado.edu>
2318 2003-09-09 Fernando Perez <fperez@colorado.edu>
2311
2319
2312 * IPython/iplib.py (InteractiveShell._prefilter): fix bug where
2320 * IPython/iplib.py (InteractiveShell._prefilter): fix bug where
2313 unpacking a list whith a callable as first element would
2321 unpacking a list whith a callable as first element would
2314 mistakenly trigger autocalling. Thanks to a bug report by Jeffery
2322 mistakenly trigger autocalling. Thanks to a bug report by Jeffery
2315 Collins.
2323 Collins.
2316
2324
2317 2003-08-25 *** Released version 0.5.0
2325 2003-08-25 *** Released version 0.5.0
2318
2326
2319 2003-08-22 Fernando Perez <fperez@colorado.edu>
2327 2003-08-22 Fernando Perez <fperez@colorado.edu>
2320
2328
2321 * IPython/ultraTB.py (VerboseTB.linereader): Improved handling of
2329 * IPython/ultraTB.py (VerboseTB.linereader): Improved handling of
2322 improperly defined user exceptions. Thanks to feedback from Mark
2330 improperly defined user exceptions. Thanks to feedback from Mark
2323 Russell <mrussell-AT-verio.net>.
2331 Russell <mrussell-AT-verio.net>.
2324
2332
2325 2003-08-20 Fernando Perez <fperez@colorado.edu>
2333 2003-08-20 Fernando Perez <fperez@colorado.edu>
2326
2334
2327 * IPython/OInspect.py (Inspector.pinfo): changed String Form
2335 * IPython/OInspect.py (Inspector.pinfo): changed String Form
2328 printing so that it would print multi-line string forms starting
2336 printing so that it would print multi-line string forms starting
2329 with a new line. This way the formatting is better respected for
2337 with a new line. This way the formatting is better respected for
2330 objects which work hard to make nice string forms.
2338 objects which work hard to make nice string forms.
2331
2339
2332 * IPython/iplib.py (InteractiveShell.handle_auto): Fix bug where
2340 * IPython/iplib.py (InteractiveShell.handle_auto): Fix bug where
2333 autocall would overtake data access for objects with both
2341 autocall would overtake data access for objects with both
2334 __getitem__ and __call__.
2342 __getitem__ and __call__.
2335
2343
2336 2003-08-19 *** Released version 0.5.0-rc1
2344 2003-08-19 *** Released version 0.5.0-rc1
2337
2345
2338 2003-08-19 Fernando Perez <fperez@colorado.edu>
2346 2003-08-19 Fernando Perez <fperez@colorado.edu>
2339
2347
2340 * IPython/deep_reload.py (load_tail): single tiny change here
2348 * IPython/deep_reload.py (load_tail): single tiny change here
2341 seems to fix the long-standing bug of dreload() failing to work
2349 seems to fix the long-standing bug of dreload() failing to work
2342 for dotted names. But this module is pretty tricky, so I may have
2350 for dotted names. But this module is pretty tricky, so I may have
2343 missed some subtlety. Needs more testing!.
2351 missed some subtlety. Needs more testing!.
2344
2352
2345 * IPython/ultraTB.py (VerboseTB.linereader): harden against user
2353 * IPython/ultraTB.py (VerboseTB.linereader): harden against user
2346 exceptions which have badly implemented __str__ methods.
2354 exceptions which have badly implemented __str__ methods.
2347 (VerboseTB.text): harden against inspect.getinnerframes crashing,
2355 (VerboseTB.text): harden against inspect.getinnerframes crashing,
2348 which I've been getting reports about from Python 2.3 users. I
2356 which I've been getting reports about from Python 2.3 users. I
2349 wish I had a simple test case to reproduce the problem, so I could
2357 wish I had a simple test case to reproduce the problem, so I could
2350 either write a cleaner workaround or file a bug report if
2358 either write a cleaner workaround or file a bug report if
2351 necessary.
2359 necessary.
2352
2360
2353 * IPython/Magic.py (Magic.magic_edit): fixed bug where after
2361 * IPython/Magic.py (Magic.magic_edit): fixed bug where after
2354 making a class 'foo', file 'foo.py' couldn't be edited. Thanks to
2362 making a class 'foo', file 'foo.py' couldn't be edited. Thanks to
2355 a bug report by Tjabo Kloppenburg.
2363 a bug report by Tjabo Kloppenburg.
2356
2364
2357 * IPython/ultraTB.py (VerboseTB.debugger): hardened against pdb
2365 * IPython/ultraTB.py (VerboseTB.debugger): hardened against pdb
2358 crashes. Wrapped the pdb call in a blanket try/except, since pdb
2366 crashes. Wrapped the pdb call in a blanket try/except, since pdb
2359 seems rather unstable. Thanks to a bug report by Tjabo
2367 seems rather unstable. Thanks to a bug report by Tjabo
2360 Kloppenburg <tjabo.kloppenburg-AT-unix-ag.uni-siegen.de>.
2368 Kloppenburg <tjabo.kloppenburg-AT-unix-ag.uni-siegen.de>.
2361
2369
2362 * IPython/Release.py (version): release 0.5.0-rc1. I want to put
2370 * IPython/Release.py (version): release 0.5.0-rc1. I want to put
2363 this out soon because of the critical fixes in the inner loop for
2371 this out soon because of the critical fixes in the inner loop for
2364 generators.
2372 generators.
2365
2373
2366 * IPython/Magic.py (Magic.getargspec): removed. This (and
2374 * IPython/Magic.py (Magic.getargspec): removed. This (and
2367 _get_def) have been obsoleted by OInspect for a long time, I
2375 _get_def) have been obsoleted by OInspect for a long time, I
2368 hadn't noticed that they were dead code.
2376 hadn't noticed that they were dead code.
2369 (Magic._ofind): restored _ofind functionality for a few literals
2377 (Magic._ofind): restored _ofind functionality for a few literals
2370 (those in ["''",'""','[]','{}','()']). But it won't work anymore
2378 (those in ["''",'""','[]','{}','()']). But it won't work anymore
2371 for things like "hello".capitalize?, since that would require a
2379 for things like "hello".capitalize?, since that would require a
2372 potentially dangerous eval() again.
2380 potentially dangerous eval() again.
2373
2381
2374 * IPython/iplib.py (InteractiveShell._prefilter): reorganized the
2382 * IPython/iplib.py (InteractiveShell._prefilter): reorganized the
2375 logic a bit more to clean up the escapes handling and minimize the
2383 logic a bit more to clean up the escapes handling and minimize the
2376 use of _ofind to only necessary cases. The interactive 'feel' of
2384 use of _ofind to only necessary cases. The interactive 'feel' of
2377 IPython should have improved quite a bit with the changes in
2385 IPython should have improved quite a bit with the changes in
2378 _prefilter and _ofind (besides being far safer than before).
2386 _prefilter and _ofind (besides being far safer than before).
2379
2387
2380 * IPython/Magic.py (Magic.magic_edit): Fixed old bug (but rather
2388 * IPython/Magic.py (Magic.magic_edit): Fixed old bug (but rather
2381 obscure, never reported). Edit would fail to find the object to
2389 obscure, never reported). Edit would fail to find the object to
2382 edit under some circumstances.
2390 edit under some circumstances.
2383 (Magic._ofind): CRITICAL FIX. Finally removed the eval() calls
2391 (Magic._ofind): CRITICAL FIX. Finally removed the eval() calls
2384 which were causing double-calling of generators. Those eval calls
2392 which were causing double-calling of generators. Those eval calls
2385 were _very_ dangerous, since code with side effects could be
2393 were _very_ dangerous, since code with side effects could be
2386 triggered. As they say, 'eval is evil'... These were the
2394 triggered. As they say, 'eval is evil'... These were the
2387 nastiest evals in IPython. Besides, _ofind is now far simpler,
2395 nastiest evals in IPython. Besides, _ofind is now far simpler,
2388 and it should also be quite a bit faster. Its use of inspect is
2396 and it should also be quite a bit faster. Its use of inspect is
2389 also safer, so perhaps some of the inspect-related crashes I've
2397 also safer, so perhaps some of the inspect-related crashes I've
2390 seen lately with Python 2.3 might be taken care of. That will
2398 seen lately with Python 2.3 might be taken care of. That will
2391 need more testing.
2399 need more testing.
2392
2400
2393 2003-08-17 Fernando Perez <fperez@colorado.edu>
2401 2003-08-17 Fernando Perez <fperez@colorado.edu>
2394
2402
2395 * IPython/iplib.py (InteractiveShell._prefilter): significant
2403 * IPython/iplib.py (InteractiveShell._prefilter): significant
2396 simplifications to the logic for handling user escapes. Faster
2404 simplifications to the logic for handling user escapes. Faster
2397 and simpler code.
2405 and simpler code.
2398
2406
2399 2003-08-14 Fernando Perez <fperez@colorado.edu>
2407 2003-08-14 Fernando Perez <fperez@colorado.edu>
2400
2408
2401 * IPython/numutils.py (sum_flat): rewrote to be non-recursive.
2409 * IPython/numutils.py (sum_flat): rewrote to be non-recursive.
2402 Now it requires O(N) storage (N=size(a)) for non-contiguous input,
2410 Now it requires O(N) storage (N=size(a)) for non-contiguous input,
2403 but it should be quite a bit faster. And the recursive version
2411 but it should be quite a bit faster. And the recursive version
2404 generated O(log N) intermediate storage for all rank>1 arrays,
2412 generated O(log N) intermediate storage for all rank>1 arrays,
2405 even if they were contiguous.
2413 even if they were contiguous.
2406 (l1norm): Added this function.
2414 (l1norm): Added this function.
2407 (norm): Added this function for arbitrary norms (including
2415 (norm): Added this function for arbitrary norms (including
2408 l-infinity). l1 and l2 are still special cases for convenience
2416 l-infinity). l1 and l2 are still special cases for convenience
2409 and speed.
2417 and speed.
2410
2418
2411 2003-08-03 Fernando Perez <fperez@colorado.edu>
2419 2003-08-03 Fernando Perez <fperez@colorado.edu>
2412
2420
2413 * IPython/Magic.py (Magic.magic_edit): Removed all remaining string
2421 * IPython/Magic.py (Magic.magic_edit): Removed all remaining string
2414 exceptions, which now raise PendingDeprecationWarnings in Python
2422 exceptions, which now raise PendingDeprecationWarnings in Python
2415 2.3. There were some in Magic and some in Gnuplot2.
2423 2.3. There were some in Magic and some in Gnuplot2.
2416
2424
2417 2003-06-30 Fernando Perez <fperez@colorado.edu>
2425 2003-06-30 Fernando Perez <fperez@colorado.edu>
2418
2426
2419 * IPython/genutils.py (page): modified to call curses only for
2427 * IPython/genutils.py (page): modified to call curses only for
2420 terminals where TERM=='xterm'. After problems under many other
2428 terminals where TERM=='xterm'. After problems under many other
2421 terminals were reported by Keith Beattie <KSBeattie-AT-lbl.gov>.
2429 terminals were reported by Keith Beattie <KSBeattie-AT-lbl.gov>.
2422
2430
2423 * IPython/iplib.py (complete): removed spurious 'print "IE"' which
2431 * IPython/iplib.py (complete): removed spurious 'print "IE"' which
2424 would be triggered when readline was absent. This was just an old
2432 would be triggered when readline was absent. This was just an old
2425 debugging statement I'd forgotten to take out.
2433 debugging statement I'd forgotten to take out.
2426
2434
2427 2003-06-20 Fernando Perez <fperez@colorado.edu>
2435 2003-06-20 Fernando Perez <fperez@colorado.edu>
2428
2436
2429 * IPython/genutils.py (clock): modified to return only user time
2437 * IPython/genutils.py (clock): modified to return only user time
2430 (not counting system time), after a discussion on scipy. While
2438 (not counting system time), after a discussion on scipy. While
2431 system time may be a useful quantity occasionally, it may much
2439 system time may be a useful quantity occasionally, it may much
2432 more easily be skewed by occasional swapping or other similar
2440 more easily be skewed by occasional swapping or other similar
2433 activity.
2441 activity.
2434
2442
2435 2003-06-05 Fernando Perez <fperez@colorado.edu>
2443 2003-06-05 Fernando Perez <fperez@colorado.edu>
2436
2444
2437 * IPython/numutils.py (identity): new function, for building
2445 * IPython/numutils.py (identity): new function, for building
2438 arbitrary rank Kronecker deltas (mostly backwards compatible with
2446 arbitrary rank Kronecker deltas (mostly backwards compatible with
2439 Numeric.identity)
2447 Numeric.identity)
2440
2448
2441 2003-06-03 Fernando Perez <fperez@colorado.edu>
2449 2003-06-03 Fernando Perez <fperez@colorado.edu>
2442
2450
2443 * IPython/iplib.py (InteractiveShell.handle_magic): protect
2451 * IPython/iplib.py (InteractiveShell.handle_magic): protect
2444 arguments passed to magics with spaces, to allow trailing '\' to
2452 arguments passed to magics with spaces, to allow trailing '\' to
2445 work normally (mainly for Windows users).
2453 work normally (mainly for Windows users).
2446
2454
2447 2003-05-29 Fernando Perez <fperez@colorado.edu>
2455 2003-05-29 Fernando Perez <fperez@colorado.edu>
2448
2456
2449 * IPython/ipmaker.py (make_IPython): Load site._Helper() as help
2457 * IPython/ipmaker.py (make_IPython): Load site._Helper() as help
2450 instead of pydoc.help. This fixes a bizarre behavior where
2458 instead of pydoc.help. This fixes a bizarre behavior where
2451 printing '%s' % locals() would trigger the help system. Now
2459 printing '%s' % locals() would trigger the help system. Now
2452 ipython behaves like normal python does.
2460 ipython behaves like normal python does.
2453
2461
2454 Note that if one does 'from pydoc import help', the bizarre
2462 Note that if one does 'from pydoc import help', the bizarre
2455 behavior returns, but this will also happen in normal python, so
2463 behavior returns, but this will also happen in normal python, so
2456 it's not an ipython bug anymore (it has to do with how pydoc.help
2464 it's not an ipython bug anymore (it has to do with how pydoc.help
2457 is implemented).
2465 is implemented).
2458
2466
2459 2003-05-22 Fernando Perez <fperez@colorado.edu>
2467 2003-05-22 Fernando Perez <fperez@colorado.edu>
2460
2468
2461 * IPython/FlexCompleter.py (Completer.attr_matches): fixed to
2469 * IPython/FlexCompleter.py (Completer.attr_matches): fixed to
2462 return [] instead of None when nothing matches, also match to end
2470 return [] instead of None when nothing matches, also match to end
2463 of line. Patch by Gary Bishop.
2471 of line. Patch by Gary Bishop.
2464
2472
2465 * IPython/ipmaker.py (make_IPython): Added same sys.excepthook
2473 * IPython/ipmaker.py (make_IPython): Added same sys.excepthook
2466 protection as before, for files passed on the command line. This
2474 protection as before, for files passed on the command line. This
2467 prevents the CrashHandler from kicking in if user files call into
2475 prevents the CrashHandler from kicking in if user files call into
2468 sys.excepthook (such as PyQt and WxWindows have a nasty habit of
2476 sys.excepthook (such as PyQt and WxWindows have a nasty habit of
2469 doing). After a report by Kasper Souren <Kasper.Souren-AT-ircam.fr>
2477 doing). After a report by Kasper Souren <Kasper.Souren-AT-ircam.fr>
2470
2478
2471 2003-05-20 *** Released version 0.4.0
2479 2003-05-20 *** Released version 0.4.0
2472
2480
2473 2003-05-20 Fernando Perez <fperez@colorado.edu>
2481 2003-05-20 Fernando Perez <fperez@colorado.edu>
2474
2482
2475 * setup.py: added support for manpages. It's a bit hackish b/c of
2483 * setup.py: added support for manpages. It's a bit hackish b/c of
2476 a bug in the way the bdist_rpm distutils target handles gzipped
2484 a bug in the way the bdist_rpm distutils target handles gzipped
2477 manpages, but it works. After a patch by Jack.
2485 manpages, but it works. After a patch by Jack.
2478
2486
2479 2003-05-19 Fernando Perez <fperez@colorado.edu>
2487 2003-05-19 Fernando Perez <fperez@colorado.edu>
2480
2488
2481 * IPython/numutils.py: added a mockup of the kinds module, since
2489 * IPython/numutils.py: added a mockup of the kinds module, since
2482 it was recently removed from Numeric. This way, numutils will
2490 it was recently removed from Numeric. This way, numutils will
2483 work for all users even if they are missing kinds.
2491 work for all users even if they are missing kinds.
2484
2492
2485 * IPython/Magic.py (Magic._ofind): Harden against an inspect
2493 * IPython/Magic.py (Magic._ofind): Harden against an inspect
2486 failure, which can occur with SWIG-wrapped extensions. After a
2494 failure, which can occur with SWIG-wrapped extensions. After a
2487 crash report from Prabhu.
2495 crash report from Prabhu.
2488
2496
2489 2003-05-16 Fernando Perez <fperez@colorado.edu>
2497 2003-05-16 Fernando Perez <fperez@colorado.edu>
2490
2498
2491 * IPython/iplib.py (InteractiveShell.excepthook): New method to
2499 * IPython/iplib.py (InteractiveShell.excepthook): New method to
2492 protect ipython from user code which may call directly
2500 protect ipython from user code which may call directly
2493 sys.excepthook (this looks like an ipython crash to the user, even
2501 sys.excepthook (this looks like an ipython crash to the user, even
2494 when it isn't). After a patch by Gary Bishop <gb-AT-cs.unc.edu>.
2502 when it isn't). After a patch by Gary Bishop <gb-AT-cs.unc.edu>.
2495 This is especially important to help users of WxWindows, but may
2503 This is especially important to help users of WxWindows, but may
2496 also be useful in other cases.
2504 also be useful in other cases.
2497
2505
2498 * IPython/ultraTB.py (AutoFormattedTB.__call__): Changed to allow
2506 * IPython/ultraTB.py (AutoFormattedTB.__call__): Changed to allow
2499 an optional tb_offset to be specified, and to preserve exception
2507 an optional tb_offset to be specified, and to preserve exception
2500 info if given. After a patch by Gary Bishop <gb-AT-cs.unc.edu>.
2508 info if given. After a patch by Gary Bishop <gb-AT-cs.unc.edu>.
2501
2509
2502 * ipython.1 (Default): Thanks to Jack's work, we now have manpages!
2510 * ipython.1 (Default): Thanks to Jack's work, we now have manpages!
2503
2511
2504 2003-05-15 Fernando Perez <fperez@colorado.edu>
2512 2003-05-15 Fernando Perez <fperez@colorado.edu>
2505
2513
2506 * IPython/iplib.py (InteractiveShell.user_setup): Fix crash when
2514 * IPython/iplib.py (InteractiveShell.user_setup): Fix crash when
2507 installing for a new user under Windows.
2515 installing for a new user under Windows.
2508
2516
2509 2003-05-12 Fernando Perez <fperez@colorado.edu>
2517 2003-05-12 Fernando Perez <fperez@colorado.edu>
2510
2518
2511 * IPython/iplib.py (InteractiveShell.handle_emacs): New line
2519 * IPython/iplib.py (InteractiveShell.handle_emacs): New line
2512 handler for Emacs comint-based lines. Currently it doesn't do
2520 handler for Emacs comint-based lines. Currently it doesn't do
2513 much (but importantly, it doesn't update the history cache). In
2521 much (but importantly, it doesn't update the history cache). In
2514 the future it may be expanded if Alex needs more functionality
2522 the future it may be expanded if Alex needs more functionality
2515 there.
2523 there.
2516
2524
2517 * IPython/CrashHandler.py (CrashHandler.__call__): Added platform
2525 * IPython/CrashHandler.py (CrashHandler.__call__): Added platform
2518 info to crash reports.
2526 info to crash reports.
2519
2527
2520 * IPython/iplib.py (InteractiveShell.mainloop): Added -c option,
2528 * IPython/iplib.py (InteractiveShell.mainloop): Added -c option,
2521 just like Python's -c. Also fixed crash with invalid -color
2529 just like Python's -c. Also fixed crash with invalid -color
2522 option value at startup. Thanks to Will French
2530 option value at startup. Thanks to Will French
2523 <wfrench-AT-bestweb.net> for the bug report.
2531 <wfrench-AT-bestweb.net> for the bug report.
2524
2532
2525 2003-05-09 Fernando Perez <fperez@colorado.edu>
2533 2003-05-09 Fernando Perez <fperez@colorado.edu>
2526
2534
2527 * IPython/genutils.py (EvalDict.__getitem__): Renamed EvalString
2535 * IPython/genutils.py (EvalDict.__getitem__): Renamed EvalString
2528 to EvalDict (it's a mapping, after all) and simplified its code
2536 to EvalDict (it's a mapping, after all) and simplified its code
2529 quite a bit, after a nice discussion on c.l.py where Gustavo
2537 quite a bit, after a nice discussion on c.l.py where Gustavo
2530 Córdova <gcordova-AT-sismex.com> suggested the new version.
2538 Córdova <gcordova-AT-sismex.com> suggested the new version.
2531
2539
2532 2003-04-30 Fernando Perez <fperez@colorado.edu>
2540 2003-04-30 Fernando Perez <fperez@colorado.edu>
2533
2541
2534 * IPython/genutils.py (timings_out): modified it to reduce its
2542 * IPython/genutils.py (timings_out): modified it to reduce its
2535 overhead in the common reps==1 case.
2543 overhead in the common reps==1 case.
2536
2544
2537 2003-04-29 Fernando Perez <fperez@colorado.edu>
2545 2003-04-29 Fernando Perez <fperez@colorado.edu>
2538
2546
2539 * IPython/genutils.py (timings_out): Modified to use the resource
2547 * IPython/genutils.py (timings_out): Modified to use the resource
2540 module, which avoids the wraparound problems of time.clock().
2548 module, which avoids the wraparound problems of time.clock().
2541
2549
2542 2003-04-17 *** Released version 0.2.15pre4
2550 2003-04-17 *** Released version 0.2.15pre4
2543
2551
2544 2003-04-17 Fernando Perez <fperez@colorado.edu>
2552 2003-04-17 Fernando Perez <fperez@colorado.edu>
2545
2553
2546 * setup.py (scriptfiles): Split windows-specific stuff over to a
2554 * setup.py (scriptfiles): Split windows-specific stuff over to a
2547 separate file, in an attempt to have a Windows GUI installer.
2555 separate file, in an attempt to have a Windows GUI installer.
2548 That didn't work, but part of the groundwork is done.
2556 That didn't work, but part of the groundwork is done.
2549
2557
2550 * IPython/UserConfig/ipythonrc: Added M-i, M-o and M-I for
2558 * IPython/UserConfig/ipythonrc: Added M-i, M-o and M-I for
2551 indent/unindent with 4 spaces. Particularly useful in combination
2559 indent/unindent with 4 spaces. Particularly useful in combination
2552 with the new auto-indent option.
2560 with the new auto-indent option.
2553
2561
2554 2003-04-16 Fernando Perez <fperez@colorado.edu>
2562 2003-04-16 Fernando Perez <fperez@colorado.edu>
2555
2563
2556 * IPython/Magic.py: various replacements of self.rc for
2564 * IPython/Magic.py: various replacements of self.rc for
2557 self.shell.rc. A lot more remains to be done to fully disentangle
2565 self.shell.rc. A lot more remains to be done to fully disentangle
2558 this class from the main Shell class.
2566 this class from the main Shell class.
2559
2567
2560 * IPython/GnuplotRuntime.py: added checks for mouse support so
2568 * IPython/GnuplotRuntime.py: added checks for mouse support so
2561 that we don't try to enable it if the current gnuplot doesn't
2569 that we don't try to enable it if the current gnuplot doesn't
2562 really support it. Also added checks so that we don't try to
2570 really support it. Also added checks so that we don't try to
2563 enable persist under Windows (where Gnuplot doesn't recognize the
2571 enable persist under Windows (where Gnuplot doesn't recognize the
2564 option).
2572 option).
2565
2573
2566 * IPython/iplib.py (InteractiveShell.interact): Added optional
2574 * IPython/iplib.py (InteractiveShell.interact): Added optional
2567 auto-indenting code, after a patch by King C. Shu
2575 auto-indenting code, after a patch by King C. Shu
2568 <kingshu-AT-myrealbox.com>. It's off by default because it doesn't
2576 <kingshu-AT-myrealbox.com>. It's off by default because it doesn't
2569 get along well with pasting indented code. If I ever figure out
2577 get along well with pasting indented code. If I ever figure out
2570 how to make that part go well, it will become on by default.
2578 how to make that part go well, it will become on by default.
2571
2579
2572 * IPython/Prompts.py (Prompt1.auto_rewrite): Fixed bug which would
2580 * IPython/Prompts.py (Prompt1.auto_rewrite): Fixed bug which would
2573 crash ipython if there was an unmatched '%' in the user's prompt
2581 crash ipython if there was an unmatched '%' in the user's prompt
2574 string. Reported by Thorsten Kampe <thorsten-AT-thorstenkampe.de>.
2582 string. Reported by Thorsten Kampe <thorsten-AT-thorstenkampe.de>.
2575
2583
2576 * IPython/iplib.py (InteractiveShell.interact): removed the
2584 * IPython/iplib.py (InteractiveShell.interact): removed the
2577 ability to ask the user whether he wants to crash or not at the
2585 ability to ask the user whether he wants to crash or not at the
2578 'last line' exception handler. Calling functions at that point
2586 'last line' exception handler. Calling functions at that point
2579 changes the stack, and the error reports would have incorrect
2587 changes the stack, and the error reports would have incorrect
2580 tracebacks.
2588 tracebacks.
2581
2589
2582 * IPython/Magic.py (Magic.magic_page): Added new @page magic, to
2590 * IPython/Magic.py (Magic.magic_page): Added new @page magic, to
2583 pass through a peger a pretty-printed form of any object. After a
2591 pass through a peger a pretty-printed form of any object. After a
2584 contribution by Olivier Aubert <oaubert-AT-bat710.univ-lyon1.fr>
2592 contribution by Olivier Aubert <oaubert-AT-bat710.univ-lyon1.fr>
2585
2593
2586 2003-04-14 Fernando Perez <fperez@colorado.edu>
2594 2003-04-14 Fernando Perez <fperez@colorado.edu>
2587
2595
2588 * IPython/iplib.py (InteractiveShell.user_setup): Fixed bug where
2596 * IPython/iplib.py (InteractiveShell.user_setup): Fixed bug where
2589 all files in ~ would be modified at first install (instead of
2597 all files in ~ would be modified at first install (instead of
2590 ~/.ipython). This could be potentially disastrous, as the
2598 ~/.ipython). This could be potentially disastrous, as the
2591 modification (make line-endings native) could damage binary files.
2599 modification (make line-endings native) could damage binary files.
2592
2600
2593 2003-04-10 Fernando Perez <fperez@colorado.edu>
2601 2003-04-10 Fernando Perez <fperez@colorado.edu>
2594
2602
2595 * IPython/iplib.py (InteractiveShell.handle_help): Modified to
2603 * IPython/iplib.py (InteractiveShell.handle_help): Modified to
2596 handle only lines which are invalid python. This now means that
2604 handle only lines which are invalid python. This now means that
2597 lines like 'x=1 #?' execute properly. Thanks to Jeffery Collins
2605 lines like 'x=1 #?' execute properly. Thanks to Jeffery Collins
2598 for the bug report.
2606 for the bug report.
2599
2607
2600 2003-04-01 Fernando Perez <fperez@colorado.edu>
2608 2003-04-01 Fernando Perez <fperez@colorado.edu>
2601
2609
2602 * IPython/iplib.py (InteractiveShell.showtraceback): Fixed bug
2610 * IPython/iplib.py (InteractiveShell.showtraceback): Fixed bug
2603 where failing to set sys.last_traceback would crash pdb.pm().
2611 where failing to set sys.last_traceback would crash pdb.pm().
2604 Thanks to Jeffery D. Collins <Jeff.Collins-AT-vexcel.com> for the bug
2612 Thanks to Jeffery D. Collins <Jeff.Collins-AT-vexcel.com> for the bug
2605 report.
2613 report.
2606
2614
2607 2003-03-25 Fernando Perez <fperez@colorado.edu>
2615 2003-03-25 Fernando Perez <fperez@colorado.edu>
2608
2616
2609 * IPython/Magic.py (Magic.magic_prun): rstrip() output of profiler
2617 * IPython/Magic.py (Magic.magic_prun): rstrip() output of profiler
2610 before printing it (it had a lot of spurious blank lines at the
2618 before printing it (it had a lot of spurious blank lines at the
2611 end).
2619 end).
2612
2620
2613 * IPython/Gnuplot2.py (Gnuplot.hardcopy): fixed bug where lpr
2621 * IPython/Gnuplot2.py (Gnuplot.hardcopy): fixed bug where lpr
2614 output would be sent 21 times! Obviously people don't use this
2622 output would be sent 21 times! Obviously people don't use this
2615 too often, or I would have heard about it.
2623 too often, or I would have heard about it.
2616
2624
2617 2003-03-24 Fernando Perez <fperez@colorado.edu>
2625 2003-03-24 Fernando Perez <fperez@colorado.edu>
2618
2626
2619 * setup.py (scriptfiles): renamed the data_files parameter from
2627 * setup.py (scriptfiles): renamed the data_files parameter from
2620 'base' to 'data' to fix rpm build issues. Thanks to Ralf Ahlbrink
2628 'base' to 'data' to fix rpm build issues. Thanks to Ralf Ahlbrink
2621 for the patch.
2629 for the patch.
2622
2630
2623 2003-03-20 Fernando Perez <fperez@colorado.edu>
2631 2003-03-20 Fernando Perez <fperez@colorado.edu>
2624
2632
2625 * IPython/genutils.py (error): added error() and fatal()
2633 * IPython/genutils.py (error): added error() and fatal()
2626 functions.
2634 functions.
2627
2635
2628 2003-03-18 *** Released version 0.2.15pre3
2636 2003-03-18 *** Released version 0.2.15pre3
2629
2637
2630 2003-03-18 Fernando Perez <fperez@colorado.edu>
2638 2003-03-18 Fernando Perez <fperez@colorado.edu>
2631
2639
2632 * setupext/install_data_ext.py
2640 * setupext/install_data_ext.py
2633 (install_data_ext.initialize_options): Class contributed by Jack
2641 (install_data_ext.initialize_options): Class contributed by Jack
2634 Moffit for fixing the old distutils hack. He is sending this to
2642 Moffit for fixing the old distutils hack. He is sending this to
2635 the distutils folks so in the future we may not need it as a
2643 the distutils folks so in the future we may not need it as a
2636 private fix.
2644 private fix.
2637
2645
2638 * MANIFEST.in: Extensive reorganization, based on Jack Moffit's
2646 * MANIFEST.in: Extensive reorganization, based on Jack Moffit's
2639 changes for Debian packaging. See his patch for full details.
2647 changes for Debian packaging. See his patch for full details.
2640 The old distutils hack of making the ipythonrc* files carry a
2648 The old distutils hack of making the ipythonrc* files carry a
2641 bogus .py extension is gone, at last. Examples were moved to a
2649 bogus .py extension is gone, at last. Examples were moved to a
2642 separate subdir under doc/, and the separate executable scripts
2650 separate subdir under doc/, and the separate executable scripts
2643 now live in their own directory. Overall a great cleanup. The
2651 now live in their own directory. Overall a great cleanup. The
2644 manual was updated to use the new files, and setup.py has been
2652 manual was updated to use the new files, and setup.py has been
2645 fixed for this setup.
2653 fixed for this setup.
2646
2654
2647 * IPython/PyColorize.py (Parser.usage): made non-executable and
2655 * IPython/PyColorize.py (Parser.usage): made non-executable and
2648 created a pycolor wrapper around it to be included as a script.
2656 created a pycolor wrapper around it to be included as a script.
2649
2657
2650 2003-03-12 *** Released version 0.2.15pre2
2658 2003-03-12 *** Released version 0.2.15pre2
2651
2659
2652 2003-03-12 Fernando Perez <fperez@colorado.edu>
2660 2003-03-12 Fernando Perez <fperez@colorado.edu>
2653
2661
2654 * IPython/ColorANSI.py (make_color_table): Finally fixed the
2662 * IPython/ColorANSI.py (make_color_table): Finally fixed the
2655 long-standing problem with garbage characters in some terminals.
2663 long-standing problem with garbage characters in some terminals.
2656 The issue was really that the \001 and \002 escapes must _only_ be
2664 The issue was really that the \001 and \002 escapes must _only_ be
2657 passed to input prompts (which call readline), but _never_ to
2665 passed to input prompts (which call readline), but _never_ to
2658 normal text to be printed on screen. I changed ColorANSI to have
2666 normal text to be printed on screen. I changed ColorANSI to have
2659 two classes: TermColors and InputTermColors, each with the
2667 two classes: TermColors and InputTermColors, each with the
2660 appropriate escapes for input prompts or normal text. The code in
2668 appropriate escapes for input prompts or normal text. The code in
2661 Prompts.py got slightly more complicated, but this very old and
2669 Prompts.py got slightly more complicated, but this very old and
2662 annoying bug is finally fixed.
2670 annoying bug is finally fixed.
2663
2671
2664 All the credit for nailing down the real origin of this problem
2672 All the credit for nailing down the real origin of this problem
2665 and the correct solution goes to Jack Moffit <jack-AT-xiph.org>.
2673 and the correct solution goes to Jack Moffit <jack-AT-xiph.org>.
2666 *Many* thanks to him for spending quite a bit of effort on this.
2674 *Many* thanks to him for spending quite a bit of effort on this.
2667
2675
2668 2003-03-05 *** Released version 0.2.15pre1
2676 2003-03-05 *** Released version 0.2.15pre1
2669
2677
2670 2003-03-03 Fernando Perez <fperez@colorado.edu>
2678 2003-03-03 Fernando Perez <fperez@colorado.edu>
2671
2679
2672 * IPython/FakeModule.py: Moved the former _FakeModule to a
2680 * IPython/FakeModule.py: Moved the former _FakeModule to a
2673 separate file, because it's also needed by Magic (to fix a similar
2681 separate file, because it's also needed by Magic (to fix a similar
2674 pickle-related issue in @run).
2682 pickle-related issue in @run).
2675
2683
2676 2003-03-02 Fernando Perez <fperez@colorado.edu>
2684 2003-03-02 Fernando Perez <fperez@colorado.edu>
2677
2685
2678 * IPython/Magic.py (Magic.magic_autocall): new magic to control
2686 * IPython/Magic.py (Magic.magic_autocall): new magic to control
2679 the autocall option at runtime.
2687 the autocall option at runtime.
2680 (Magic.magic_dhist): changed self.user_ns to self.shell.user_ns
2688 (Magic.magic_dhist): changed self.user_ns to self.shell.user_ns
2681 across Magic.py to start separating Magic from InteractiveShell.
2689 across Magic.py to start separating Magic from InteractiveShell.
2682 (Magic._ofind): Fixed to return proper namespace for dotted
2690 (Magic._ofind): Fixed to return proper namespace for dotted
2683 names. Before, a dotted name would always return 'not currently
2691 names. Before, a dotted name would always return 'not currently
2684 defined', because it would find the 'parent'. s.x would be found,
2692 defined', because it would find the 'parent'. s.x would be found,
2685 but since 'x' isn't defined by itself, it would get confused.
2693 but since 'x' isn't defined by itself, it would get confused.
2686 (Magic.magic_run): Fixed pickling problems reported by Ralf
2694 (Magic.magic_run): Fixed pickling problems reported by Ralf
2687 Ahlbrink <RAhlbrink-AT-RosenInspection.net>. The fix was similar to
2695 Ahlbrink <RAhlbrink-AT-RosenInspection.net>. The fix was similar to
2688 that I'd used when Mike Heeter reported similar issues at the
2696 that I'd used when Mike Heeter reported similar issues at the
2689 top-level, but now for @run. It boils down to injecting the
2697 top-level, but now for @run. It boils down to injecting the
2690 namespace where code is being executed with something that looks
2698 namespace where code is being executed with something that looks
2691 enough like a module to fool pickle.dump(). Since a pickle stores
2699 enough like a module to fool pickle.dump(). Since a pickle stores
2692 a named reference to the importing module, we need this for
2700 a named reference to the importing module, we need this for
2693 pickles to save something sensible.
2701 pickles to save something sensible.
2694
2702
2695 * IPython/ipmaker.py (make_IPython): added an autocall option.
2703 * IPython/ipmaker.py (make_IPython): added an autocall option.
2696
2704
2697 * IPython/iplib.py (InteractiveShell._prefilter): reordered all of
2705 * IPython/iplib.py (InteractiveShell._prefilter): reordered all of
2698 the auto-eval code. Now autocalling is an option, and the code is
2706 the auto-eval code. Now autocalling is an option, and the code is
2699 also vastly safer. There is no more eval() involved at all.
2707 also vastly safer. There is no more eval() involved at all.
2700
2708
2701 2003-03-01 Fernando Perez <fperez@colorado.edu>
2709 2003-03-01 Fernando Perez <fperez@colorado.edu>
2702
2710
2703 * IPython/Magic.py (Magic._ofind): Changed interface to return a
2711 * IPython/Magic.py (Magic._ofind): Changed interface to return a
2704 dict with named keys instead of a tuple.
2712 dict with named keys instead of a tuple.
2705
2713
2706 * IPython: Started using CVS for IPython as of 0.2.15pre1.
2714 * IPython: Started using CVS for IPython as of 0.2.15pre1.
2707
2715
2708 * setup.py (make_shortcut): Fixed message about directories
2716 * setup.py (make_shortcut): Fixed message about directories
2709 created during Windows installation (the directories were ok, just
2717 created during Windows installation (the directories were ok, just
2710 the printed message was misleading). Thanks to Chris Liechti
2718 the printed message was misleading). Thanks to Chris Liechti
2711 <cliechti-AT-gmx.net> for the heads up.
2719 <cliechti-AT-gmx.net> for the heads up.
2712
2720
2713 2003-02-21 Fernando Perez <fperez@colorado.edu>
2721 2003-02-21 Fernando Perez <fperez@colorado.edu>
2714
2722
2715 * IPython/iplib.py (InteractiveShell._prefilter): Fixed catching
2723 * IPython/iplib.py (InteractiveShell._prefilter): Fixed catching
2716 of ValueError exception when checking for auto-execution. This
2724 of ValueError exception when checking for auto-execution. This
2717 one is raised by things like Numeric arrays arr.flat when the
2725 one is raised by things like Numeric arrays arr.flat when the
2718 array is non-contiguous.
2726 array is non-contiguous.
2719
2727
2720 2003-01-31 Fernando Perez <fperez@colorado.edu>
2728 2003-01-31 Fernando Perez <fperez@colorado.edu>
2721
2729
2722 * IPython/genutils.py (SystemExec.bq): Fixed bug where bq would
2730 * IPython/genutils.py (SystemExec.bq): Fixed bug where bq would
2723 not return any value at all (even though the command would get
2731 not return any value at all (even though the command would get
2724 executed).
2732 executed).
2725 (xsys): Flush stdout right after printing the command to ensure
2733 (xsys): Flush stdout right after printing the command to ensure
2726 proper ordering of commands and command output in the total
2734 proper ordering of commands and command output in the total
2727 output.
2735 output.
2728 (SystemExec/xsys/bq): Switched the names of xsys/bq and
2736 (SystemExec/xsys/bq): Switched the names of xsys/bq and
2729 system/getoutput as defaults. The old ones are kept for
2737 system/getoutput as defaults. The old ones are kept for
2730 compatibility reasons, so no code which uses this library needs
2738 compatibility reasons, so no code which uses this library needs
2731 changing.
2739 changing.
2732
2740
2733 2003-01-27 *** Released version 0.2.14
2741 2003-01-27 *** Released version 0.2.14
2734
2742
2735 2003-01-25 Fernando Perez <fperez@colorado.edu>
2743 2003-01-25 Fernando Perez <fperez@colorado.edu>
2736
2744
2737 * IPython/Magic.py (Magic.magic_edit): Fixed problem where
2745 * IPython/Magic.py (Magic.magic_edit): Fixed problem where
2738 functions defined in previous edit sessions could not be re-edited
2746 functions defined in previous edit sessions could not be re-edited
2739 (because the temp files were immediately removed). Now temp files
2747 (because the temp files were immediately removed). Now temp files
2740 are removed only at IPython's exit.
2748 are removed only at IPython's exit.
2741 (Magic.magic_run): Improved @run to perform shell-like expansions
2749 (Magic.magic_run): Improved @run to perform shell-like expansions
2742 on its arguments (~users and $VARS). With this, @run becomes more
2750 on its arguments (~users and $VARS). With this, @run becomes more
2743 like a normal command-line.
2751 like a normal command-line.
2744
2752
2745 * IPython/Shell.py (IPShellEmbed.__call__): Fixed a bunch of small
2753 * IPython/Shell.py (IPShellEmbed.__call__): Fixed a bunch of small
2746 bugs related to embedding and cleaned up that code. A fairly
2754 bugs related to embedding and cleaned up that code. A fairly
2747 important one was the impossibility to access the global namespace
2755 important one was the impossibility to access the global namespace
2748 through the embedded IPython (only local variables were visible).
2756 through the embedded IPython (only local variables were visible).
2749
2757
2750 2003-01-14 Fernando Perez <fperez@colorado.edu>
2758 2003-01-14 Fernando Perez <fperez@colorado.edu>
2751
2759
2752 * IPython/iplib.py (InteractiveShell._prefilter): Fixed
2760 * IPython/iplib.py (InteractiveShell._prefilter): Fixed
2753 auto-calling to be a bit more conservative. Now it doesn't get
2761 auto-calling to be a bit more conservative. Now it doesn't get
2754 triggered if any of '!=()<>' are in the rest of the input line, to
2762 triggered if any of '!=()<>' are in the rest of the input line, to
2755 allow comparing callables. Thanks to Alex for the heads up.
2763 allow comparing callables. Thanks to Alex for the heads up.
2756
2764
2757 2003-01-07 Fernando Perez <fperez@colorado.edu>
2765 2003-01-07 Fernando Perez <fperez@colorado.edu>
2758
2766
2759 * IPython/genutils.py (page): fixed estimation of the number of
2767 * IPython/genutils.py (page): fixed estimation of the number of
2760 lines in a string to be paged to simply count newlines. This
2768 lines in a string to be paged to simply count newlines. This
2761 prevents over-guessing due to embedded escape sequences. A better
2769 prevents over-guessing due to embedded escape sequences. A better
2762 long-term solution would involve stripping out the control chars
2770 long-term solution would involve stripping out the control chars
2763 for the count, but it's potentially so expensive I just don't
2771 for the count, but it's potentially so expensive I just don't
2764 think it's worth doing.
2772 think it's worth doing.
2765
2773
2766 2002-12-19 *** Released version 0.2.14pre50
2774 2002-12-19 *** Released version 0.2.14pre50
2767
2775
2768 2002-12-19 Fernando Perez <fperez@colorado.edu>
2776 2002-12-19 Fernando Perez <fperez@colorado.edu>
2769
2777
2770 * tools/release (version): Changed release scripts to inform
2778 * tools/release (version): Changed release scripts to inform
2771 Andrea and build a NEWS file with a list of recent changes.
2779 Andrea and build a NEWS file with a list of recent changes.
2772
2780
2773 * IPython/ColorANSI.py (__all__): changed terminal detection
2781 * IPython/ColorANSI.py (__all__): changed terminal detection
2774 code. Seems to work better for xterms without breaking
2782 code. Seems to work better for xterms without breaking
2775 konsole. Will need more testing to determine if WinXP and Mac OSX
2783 konsole. Will need more testing to determine if WinXP and Mac OSX
2776 also work ok.
2784 also work ok.
2777
2785
2778 2002-12-18 *** Released version 0.2.14pre49
2786 2002-12-18 *** Released version 0.2.14pre49
2779
2787
2780 2002-12-18 Fernando Perez <fperez@colorado.edu>
2788 2002-12-18 Fernando Perez <fperez@colorado.edu>
2781
2789
2782 * Docs: added new info about Mac OSX, from Andrea.
2790 * Docs: added new info about Mac OSX, from Andrea.
2783
2791
2784 * IPython/Gnuplot2.py (String): Added a String PlotItem class to
2792 * IPython/Gnuplot2.py (String): Added a String PlotItem class to
2785 allow direct plotting of python strings whose format is the same
2793 allow direct plotting of python strings whose format is the same
2786 of gnuplot data files.
2794 of gnuplot data files.
2787
2795
2788 2002-12-16 Fernando Perez <fperez@colorado.edu>
2796 2002-12-16 Fernando Perez <fperez@colorado.edu>
2789
2797
2790 * IPython/iplib.py (InteractiveShell.interact): fixed default (y)
2798 * IPython/iplib.py (InteractiveShell.interact): fixed default (y)
2791 value of exit question to be acknowledged.
2799 value of exit question to be acknowledged.
2792
2800
2793 2002-12-03 Fernando Perez <fperez@colorado.edu>
2801 2002-12-03 Fernando Perez <fperez@colorado.edu>
2794
2802
2795 * IPython/ipmaker.py: removed generators, which had been added
2803 * IPython/ipmaker.py: removed generators, which had been added
2796 by mistake in an earlier debugging run. This was causing trouble
2804 by mistake in an earlier debugging run. This was causing trouble
2797 to users of python 2.1.x. Thanks to Abel Daniel <abli-AT-freemail.hu>
2805 to users of python 2.1.x. Thanks to Abel Daniel <abli-AT-freemail.hu>
2798 for pointing this out.
2806 for pointing this out.
2799
2807
2800 2002-11-17 Fernando Perez <fperez@colorado.edu>
2808 2002-11-17 Fernando Perez <fperez@colorado.edu>
2801
2809
2802 * Manual: updated the Gnuplot section.
2810 * Manual: updated the Gnuplot section.
2803
2811
2804 * IPython/GnuplotRuntime.py: refactored a lot all this code, with
2812 * IPython/GnuplotRuntime.py: refactored a lot all this code, with
2805 a much better split of what goes in Runtime and what goes in
2813 a much better split of what goes in Runtime and what goes in
2806 Interactive.
2814 Interactive.
2807
2815
2808 * IPython/ipmaker.py: fixed bug where import_fail_info wasn't
2816 * IPython/ipmaker.py: fixed bug where import_fail_info wasn't
2809 being imported from iplib.
2817 being imported from iplib.
2810
2818
2811 * IPython/GnuplotInteractive.py (magic_gpc): renamed @gp to @gpc
2819 * IPython/GnuplotInteractive.py (magic_gpc): renamed @gp to @gpc
2812 for command-passing. Now the global Gnuplot instance is called
2820 for command-passing. Now the global Gnuplot instance is called
2813 'gp' instead of 'g', which was really a far too fragile and
2821 'gp' instead of 'g', which was really a far too fragile and
2814 common name.
2822 common name.
2815
2823
2816 * IPython/Gnuplot2.py (eps_fix_bbox): added this to fix broken
2824 * IPython/Gnuplot2.py (eps_fix_bbox): added this to fix broken
2817 bounding boxes generated by Gnuplot for square plots.
2825 bounding boxes generated by Gnuplot for square plots.
2818
2826
2819 * IPython/genutils.py (popkey): new function added. I should
2827 * IPython/genutils.py (popkey): new function added. I should
2820 suggest this on c.l.py as a dict method, it seems useful.
2828 suggest this on c.l.py as a dict method, it seems useful.
2821
2829
2822 * IPython/Gnuplot2.py (Gnuplot.plot): Overhauled plot and replot
2830 * IPython/Gnuplot2.py (Gnuplot.plot): Overhauled plot and replot
2823 to transparently handle PostScript generation. MUCH better than
2831 to transparently handle PostScript generation. MUCH better than
2824 the previous plot_eps/replot_eps (which I removed now). The code
2832 the previous plot_eps/replot_eps (which I removed now). The code
2825 is also fairly clean and well documented now (including
2833 is also fairly clean and well documented now (including
2826 docstrings).
2834 docstrings).
2827
2835
2828 2002-11-13 Fernando Perez <fperez@colorado.edu>
2836 2002-11-13 Fernando Perez <fperez@colorado.edu>
2829
2837
2830 * IPython/Magic.py (Magic.magic_edit): fixed docstring
2838 * IPython/Magic.py (Magic.magic_edit): fixed docstring
2831 (inconsistent with options).
2839 (inconsistent with options).
2832
2840
2833 * IPython/Gnuplot2.py (Gnuplot.hardcopy): hardcopy had been
2841 * IPython/Gnuplot2.py (Gnuplot.hardcopy): hardcopy had been
2834 manually disabled, I don't know why. Fixed it.
2842 manually disabled, I don't know why. Fixed it.
2835 (Gnuplot._plot_eps): added new plot_eps/replot_eps to get directly
2843 (Gnuplot._plot_eps): added new plot_eps/replot_eps to get directly
2836 eps output.
2844 eps output.
2837
2845
2838 2002-11-12 Fernando Perez <fperez@colorado.edu>
2846 2002-11-12 Fernando Perez <fperez@colorado.edu>
2839
2847
2840 * IPython/genutils.py (ask_yes_no): trap EOF and ^C so that they
2848 * IPython/genutils.py (ask_yes_no): trap EOF and ^C so that they
2841 don't propagate up to caller. Fixes crash reported by François
2849 don't propagate up to caller. Fixes crash reported by François
2842 Pinard.
2850 Pinard.
2843
2851
2844 2002-11-09 Fernando Perez <fperez@colorado.edu>
2852 2002-11-09 Fernando Perez <fperez@colorado.edu>
2845
2853
2846 * IPython/ipmaker.py (make_IPython): fixed problem with writing
2854 * IPython/ipmaker.py (make_IPython): fixed problem with writing
2847 history file for new users.
2855 history file for new users.
2848 (make_IPython): fixed bug where initial install would leave the
2856 (make_IPython): fixed bug where initial install would leave the
2849 user running in the .ipython dir.
2857 user running in the .ipython dir.
2850 (make_IPython): fixed bug where config dir .ipython would be
2858 (make_IPython): fixed bug where config dir .ipython would be
2851 created regardless of the given -ipythondir option. Thanks to Cory
2859 created regardless of the given -ipythondir option. Thanks to Cory
2852 Dodt <cdodt-AT-fcoe.k12.ca.us> for the bug report.
2860 Dodt <cdodt-AT-fcoe.k12.ca.us> for the bug report.
2853
2861
2854 * IPython/genutils.py (ask_yes_no): new function for asking yes/no
2862 * IPython/genutils.py (ask_yes_no): new function for asking yes/no
2855 type confirmations. Will need to use it in all of IPython's code
2863 type confirmations. Will need to use it in all of IPython's code
2856 consistently.
2864 consistently.
2857
2865
2858 * IPython/CrashHandler.py (CrashHandler.__call__): changed the
2866 * IPython/CrashHandler.py (CrashHandler.__call__): changed the
2859 context to print 31 lines instead of the default 5. This will make
2867 context to print 31 lines instead of the default 5. This will make
2860 the crash reports extremely detailed in case the problem is in
2868 the crash reports extremely detailed in case the problem is in
2861 libraries I don't have access to.
2869 libraries I don't have access to.
2862
2870
2863 * IPython/iplib.py (InteractiveShell.interact): changed the 'last
2871 * IPython/iplib.py (InteractiveShell.interact): changed the 'last
2864 line of defense' code to still crash, but giving users fair
2872 line of defense' code to still crash, but giving users fair
2865 warning. I don't want internal errors to go unreported: if there's
2873 warning. I don't want internal errors to go unreported: if there's
2866 an internal problem, IPython should crash and generate a full
2874 an internal problem, IPython should crash and generate a full
2867 report.
2875 report.
2868
2876
2869 2002-11-08 Fernando Perez <fperez@colorado.edu>
2877 2002-11-08 Fernando Perez <fperez@colorado.edu>
2870
2878
2871 * IPython/iplib.py (InteractiveShell.interact): added code to trap
2879 * IPython/iplib.py (InteractiveShell.interact): added code to trap
2872 otherwise uncaught exceptions which can appear if people set
2880 otherwise uncaught exceptions which can appear if people set
2873 sys.stdout to something badly broken. Thanks to a crash report
2881 sys.stdout to something badly broken. Thanks to a crash report
2874 from henni-AT-mail.brainbot.com.
2882 from henni-AT-mail.brainbot.com.
2875
2883
2876 2002-11-04 Fernando Perez <fperez@colorado.edu>
2884 2002-11-04 Fernando Perez <fperez@colorado.edu>
2877
2885
2878 * IPython/iplib.py (InteractiveShell.interact): added
2886 * IPython/iplib.py (InteractiveShell.interact): added
2879 __IPYTHON__active to the builtins. It's a flag which goes on when
2887 __IPYTHON__active to the builtins. It's a flag which goes on when
2880 the interaction starts and goes off again when it stops. This
2888 the interaction starts and goes off again when it stops. This
2881 allows embedding code to detect being inside IPython. Before this
2889 allows embedding code to detect being inside IPython. Before this
2882 was done via __IPYTHON__, but that only shows that an IPython
2890 was done via __IPYTHON__, but that only shows that an IPython
2883 instance has been created.
2891 instance has been created.
2884
2892
2885 * IPython/Magic.py (Magic.magic_env): I realized that in a
2893 * IPython/Magic.py (Magic.magic_env): I realized that in a
2886 UserDict, instance.data holds the data as a normal dict. So I
2894 UserDict, instance.data holds the data as a normal dict. So I
2887 modified @env to return os.environ.data instead of rebuilding a
2895 modified @env to return os.environ.data instead of rebuilding a
2888 dict by hand.
2896 dict by hand.
2889
2897
2890 2002-11-02 Fernando Perez <fperez@colorado.edu>
2898 2002-11-02 Fernando Perez <fperez@colorado.edu>
2891
2899
2892 * IPython/genutils.py (warn): changed so that level 1 prints no
2900 * IPython/genutils.py (warn): changed so that level 1 prints no
2893 header. Level 2 is now the default (with 'WARNING' header, as
2901 header. Level 2 is now the default (with 'WARNING' header, as
2894 before). I think I tracked all places where changes were needed in
2902 before). I think I tracked all places where changes were needed in
2895 IPython, but outside code using the old level numbering may have
2903 IPython, but outside code using the old level numbering may have
2896 broken.
2904 broken.
2897
2905
2898 * IPython/iplib.py (InteractiveShell.runcode): added this to
2906 * IPython/iplib.py (InteractiveShell.runcode): added this to
2899 handle the tracebacks in SystemExit traps correctly. The previous
2907 handle the tracebacks in SystemExit traps correctly. The previous
2900 code (through interact) was printing more of the stack than
2908 code (through interact) was printing more of the stack than
2901 necessary, showing IPython internal code to the user.
2909 necessary, showing IPython internal code to the user.
2902
2910
2903 * IPython/UserConfig/ipythonrc.py: Made confirm_exit 1 by
2911 * IPython/UserConfig/ipythonrc.py: Made confirm_exit 1 by
2904 default. Now that the default at the confirmation prompt is yes,
2912 default. Now that the default at the confirmation prompt is yes,
2905 it's not so intrusive. François' argument that ipython sessions
2913 it's not so intrusive. François' argument that ipython sessions
2906 tend to be complex enough not to lose them from an accidental C-d,
2914 tend to be complex enough not to lose them from an accidental C-d,
2907 is a valid one.
2915 is a valid one.
2908
2916
2909 * IPython/iplib.py (InteractiveShell.interact): added a
2917 * IPython/iplib.py (InteractiveShell.interact): added a
2910 showtraceback() call to the SystemExit trap, and modified the exit
2918 showtraceback() call to the SystemExit trap, and modified the exit
2911 confirmation to have yes as the default.
2919 confirmation to have yes as the default.
2912
2920
2913 * IPython/UserConfig/ipythonrc.py: removed 'session' option from
2921 * IPython/UserConfig/ipythonrc.py: removed 'session' option from
2914 this file. It's been gone from the code for a long time, this was
2922 this file. It's been gone from the code for a long time, this was
2915 simply leftover junk.
2923 simply leftover junk.
2916
2924
2917 2002-11-01 Fernando Perez <fperez@colorado.edu>
2925 2002-11-01 Fernando Perez <fperez@colorado.edu>
2918
2926
2919 * IPython/UserConfig/ipythonrc.py: new confirm_exit option
2927 * IPython/UserConfig/ipythonrc.py: new confirm_exit option
2920 added. If set, IPython now traps EOF and asks for
2928 added. If set, IPython now traps EOF and asks for
2921 confirmation. After a request by François Pinard.
2929 confirmation. After a request by François Pinard.
2922
2930
2923 * IPython/Magic.py (Magic.magic_Exit): New @Exit and @Quit instead
2931 * IPython/Magic.py (Magic.magic_Exit): New @Exit and @Quit instead
2924 of @abort, and with a new (better) mechanism for handling the
2932 of @abort, and with a new (better) mechanism for handling the
2925 exceptions.
2933 exceptions.
2926
2934
2927 2002-10-27 Fernando Perez <fperez@colorado.edu>
2935 2002-10-27 Fernando Perez <fperez@colorado.edu>
2928
2936
2929 * IPython/usage.py (__doc__): updated the --help information and
2937 * IPython/usage.py (__doc__): updated the --help information and
2930 the ipythonrc file to indicate that -log generates
2938 the ipythonrc file to indicate that -log generates
2931 ./ipython.log. Also fixed the corresponding info in @logstart.
2939 ./ipython.log. Also fixed the corresponding info in @logstart.
2932 This and several other fixes in the manuals thanks to reports by
2940 This and several other fixes in the manuals thanks to reports by
2933 François Pinard <pinard-AT-iro.umontreal.ca>.
2941 François Pinard <pinard-AT-iro.umontreal.ca>.
2934
2942
2935 * IPython/Logger.py (Logger.switch_log): Fixed error message to
2943 * IPython/Logger.py (Logger.switch_log): Fixed error message to
2936 refer to @logstart (instead of @log, which doesn't exist).
2944 refer to @logstart (instead of @log, which doesn't exist).
2937
2945
2938 * IPython/iplib.py (InteractiveShell._prefilter): fixed
2946 * IPython/iplib.py (InteractiveShell._prefilter): fixed
2939 AttributeError crash. Thanks to Christopher Armstrong
2947 AttributeError crash. Thanks to Christopher Armstrong
2940 <radix-AT-twistedmatrix.com> for the report/fix. This bug had been
2948 <radix-AT-twistedmatrix.com> for the report/fix. This bug had been
2941 introduced recently (in 0.2.14pre37) with the fix to the eval
2949 introduced recently (in 0.2.14pre37) with the fix to the eval
2942 problem mentioned below.
2950 problem mentioned below.
2943
2951
2944 2002-10-17 Fernando Perez <fperez@colorado.edu>
2952 2002-10-17 Fernando Perez <fperez@colorado.edu>
2945
2953
2946 * IPython/ConfigLoader.py (ConfigLoader.load): Fixes for Windows
2954 * IPython/ConfigLoader.py (ConfigLoader.load): Fixes for Windows
2947 installation. Thanks to Leonardo Santagada <retype-AT-terra.com.br>.
2955 installation. Thanks to Leonardo Santagada <retype-AT-terra.com.br>.
2948
2956
2949 * IPython/iplib.py (InteractiveShell._prefilter): Many changes to
2957 * IPython/iplib.py (InteractiveShell._prefilter): Many changes to
2950 this function to fix a problem reported by Alex Schmolck. He saw
2958 this function to fix a problem reported by Alex Schmolck. He saw
2951 it with list comprehensions and generators, which were getting
2959 it with list comprehensions and generators, which were getting
2952 called twice. The real problem was an 'eval' call in testing for
2960 called twice. The real problem was an 'eval' call in testing for
2953 automagic which was evaluating the input line silently.
2961 automagic which was evaluating the input line silently.
2954
2962
2955 This is a potentially very nasty bug, if the input has side
2963 This is a potentially very nasty bug, if the input has side
2956 effects which must not be repeated. The code is much cleaner now,
2964 effects which must not be repeated. The code is much cleaner now,
2957 without any blanket 'except' left and with a regexp test for
2965 without any blanket 'except' left and with a regexp test for
2958 actual function names.
2966 actual function names.
2959
2967
2960 But an eval remains, which I'm not fully comfortable with. I just
2968 But an eval remains, which I'm not fully comfortable with. I just
2961 don't know how to find out if an expression could be a callable in
2969 don't know how to find out if an expression could be a callable in
2962 the user's namespace without doing an eval on the string. However
2970 the user's namespace without doing an eval on the string. However
2963 that string is now much more strictly checked so that no code
2971 that string is now much more strictly checked so that no code
2964 slips by, so the eval should only happen for things that can
2972 slips by, so the eval should only happen for things that can
2965 really be only function/method names.
2973 really be only function/method names.
2966
2974
2967 2002-10-15 Fernando Perez <fperez@colorado.edu>
2975 2002-10-15 Fernando Perez <fperez@colorado.edu>
2968
2976
2969 * Updated LyX to 1.2.1 so I can work on the docs again. Added Mac
2977 * Updated LyX to 1.2.1 so I can work on the docs again. Added Mac
2970 OSX information to main manual, removed README_Mac_OSX file from
2978 OSX information to main manual, removed README_Mac_OSX file from
2971 distribution. Also updated credits for recent additions.
2979 distribution. Also updated credits for recent additions.
2972
2980
2973 2002-10-10 Fernando Perez <fperez@colorado.edu>
2981 2002-10-10 Fernando Perez <fperez@colorado.edu>
2974
2982
2975 * README_Mac_OSX: Added a README for Mac OSX users for fixing
2983 * README_Mac_OSX: Added a README for Mac OSX users for fixing
2976 terminal-related issues. Many thanks to Andrea Riciputi
2984 terminal-related issues. Many thanks to Andrea Riciputi
2977 <andrea.riciputi-AT-libero.it> for writing it.
2985 <andrea.riciputi-AT-libero.it> for writing it.
2978
2986
2979 * IPython/UserConfig/ipythonrc.py: Fixes to various small issues,
2987 * IPython/UserConfig/ipythonrc.py: Fixes to various small issues,
2980 thanks to Thorsten Kampe <thorsten-AT-thorstenkampe.de>.
2988 thanks to Thorsten Kampe <thorsten-AT-thorstenkampe.de>.
2981
2989
2982 * setup.py (make_shortcut): Fixes for Windows installation. Thanks
2990 * setup.py (make_shortcut): Fixes for Windows installation. Thanks
2983 to Fredrik Kant <fredrik.kant-AT-front.com> and Syver Enstad
2991 to Fredrik Kant <fredrik.kant-AT-front.com> and Syver Enstad
2984 <syver-en-AT-online.no> who both submitted patches for this problem.
2992 <syver-en-AT-online.no> who both submitted patches for this problem.
2985
2993
2986 * IPython/iplib.py (InteractiveShell.embed_mainloop): Patch for
2994 * IPython/iplib.py (InteractiveShell.embed_mainloop): Patch for
2987 global embedding to make sure that things don't overwrite user
2995 global embedding to make sure that things don't overwrite user
2988 globals accidentally. Thanks to Richard <rxe-AT-renre-europe.com>
2996 globals accidentally. Thanks to Richard <rxe-AT-renre-europe.com>
2989
2997
2990 * IPython/Gnuplot2.py (gp): Patch for Gnuplot.py 1.6
2998 * IPython/Gnuplot2.py (gp): Patch for Gnuplot.py 1.6
2991 compatibility. Thanks to Hayden Callow
2999 compatibility. Thanks to Hayden Callow
2992 <h.callow-AT-elec.canterbury.ac.nz>
3000 <h.callow-AT-elec.canterbury.ac.nz>
2993
3001
2994 2002-10-04 Fernando Perez <fperez@colorado.edu>
3002 2002-10-04 Fernando Perez <fperez@colorado.edu>
2995
3003
2996 * IPython/Gnuplot2.py (PlotItem): Added 'index' option for
3004 * IPython/Gnuplot2.py (PlotItem): Added 'index' option for
2997 Gnuplot.File objects.
3005 Gnuplot.File objects.
2998
3006
2999 2002-07-23 Fernando Perez <fperez@colorado.edu>
3007 2002-07-23 Fernando Perez <fperez@colorado.edu>
3000
3008
3001 * IPython/genutils.py (timing): Added timings() and timing() for
3009 * IPython/genutils.py (timing): Added timings() and timing() for
3002 quick access to the most commonly needed data, the execution
3010 quick access to the most commonly needed data, the execution
3003 times. Old timing() renamed to timings_out().
3011 times. Old timing() renamed to timings_out().
3004
3012
3005 2002-07-18 Fernando Perez <fperez@colorado.edu>
3013 2002-07-18 Fernando Perez <fperez@colorado.edu>
3006
3014
3007 * IPython/Shell.py (IPShellEmbed.restore_system_completer): fixed
3015 * IPython/Shell.py (IPShellEmbed.restore_system_completer): fixed
3008 bug with nested instances disrupting the parent's tab completion.
3016 bug with nested instances disrupting the parent's tab completion.
3009
3017
3010 * IPython/iplib.py (all_completions): Added Alex Schmolck's
3018 * IPython/iplib.py (all_completions): Added Alex Schmolck's
3011 all_completions code to begin the emacs integration.
3019 all_completions code to begin the emacs integration.
3012
3020
3013 * IPython/Gnuplot2.py (zip_items): Added optional 'titles'
3021 * IPython/Gnuplot2.py (zip_items): Added optional 'titles'
3014 argument to allow titling individual arrays when plotting.
3022 argument to allow titling individual arrays when plotting.
3015
3023
3016 2002-07-15 Fernando Perez <fperez@colorado.edu>
3024 2002-07-15 Fernando Perez <fperez@colorado.edu>
3017
3025
3018 * setup.py (make_shortcut): changed to retrieve the value of
3026 * setup.py (make_shortcut): changed to retrieve the value of
3019 'Program Files' directory from the registry (this value changes in
3027 'Program Files' directory from the registry (this value changes in
3020 non-english versions of Windows). Thanks to Thomas Fanslau
3028 non-english versions of Windows). Thanks to Thomas Fanslau
3021 <tfanslau-AT-gmx.de> for the report.
3029 <tfanslau-AT-gmx.de> for the report.
3022
3030
3023 2002-07-10 Fernando Perez <fperez@colorado.edu>
3031 2002-07-10 Fernando Perez <fperez@colorado.edu>
3024
3032
3025 * IPython/ultraTB.py (VerboseTB.debugger): enabled workaround for
3033 * IPython/ultraTB.py (VerboseTB.debugger): enabled workaround for
3026 a bug in pdb, which crashes if a line with only whitespace is
3034 a bug in pdb, which crashes if a line with only whitespace is
3027 entered. Bug report submitted to sourceforge.
3035 entered. Bug report submitted to sourceforge.
3028
3036
3029 2002-07-09 Fernando Perez <fperez@colorado.edu>
3037 2002-07-09 Fernando Perez <fperez@colorado.edu>
3030
3038
3031 * IPython/ultraTB.py (VerboseTB.nullrepr): fixed rare crash when
3039 * IPython/ultraTB.py (VerboseTB.nullrepr): fixed rare crash when
3032 reporting exceptions (it's a bug in inspect.py, I just set a
3040 reporting exceptions (it's a bug in inspect.py, I just set a
3033 workaround).
3041 workaround).
3034
3042
3035 2002-07-08 Fernando Perez <fperez@colorado.edu>
3043 2002-07-08 Fernando Perez <fperez@colorado.edu>
3036
3044
3037 * IPython/iplib.py (InteractiveShell.__init__): fixed reference to
3045 * IPython/iplib.py (InteractiveShell.__init__): fixed reference to
3038 __IPYTHON__ in __builtins__ to show up in user_ns.
3046 __IPYTHON__ in __builtins__ to show up in user_ns.
3039
3047
3040 2002-07-03 Fernando Perez <fperez@colorado.edu>
3048 2002-07-03 Fernando Perez <fperez@colorado.edu>
3041
3049
3042 * IPython/GnuplotInteractive.py (magic_gp_set_default): changed
3050 * IPython/GnuplotInteractive.py (magic_gp_set_default): changed
3043 name from @gp_set_instance to @gp_set_default.
3051 name from @gp_set_instance to @gp_set_default.
3044
3052
3045 * IPython/ipmaker.py (make_IPython): default editor value set to
3053 * IPython/ipmaker.py (make_IPython): default editor value set to
3046 '0' (a string), to match the rc file. Otherwise will crash when
3054 '0' (a string), to match the rc file. Otherwise will crash when
3047 .strip() is called on it.
3055 .strip() is called on it.
3048
3056
3049
3057
3050 2002-06-28 Fernando Perez <fperez@colorado.edu>
3058 2002-06-28 Fernando Perez <fperez@colorado.edu>
3051
3059
3052 * IPython/iplib.py (InteractiveShell.safe_execfile): fix importing
3060 * IPython/iplib.py (InteractiveShell.safe_execfile): fix importing
3053 of files in current directory when a file is executed via
3061 of files in current directory when a file is executed via
3054 @run. Patch also by RA <ralf_ahlbrink-AT-web.de>.
3062 @run. Patch also by RA <ralf_ahlbrink-AT-web.de>.
3055
3063
3056 * setup.py (manfiles): fix for rpm builds, submitted by RA
3064 * setup.py (manfiles): fix for rpm builds, submitted by RA
3057 <ralf_ahlbrink-AT-web.de>. Now we have RPMs!
3065 <ralf_ahlbrink-AT-web.de>. Now we have RPMs!
3058
3066
3059 * IPython/ipmaker.py (make_IPython): fixed lookup of default
3067 * IPython/ipmaker.py (make_IPython): fixed lookup of default
3060 editor when set to '0'. Problem was, '0' evaluates to True (it's a
3068 editor when set to '0'. Problem was, '0' evaluates to True (it's a
3061 string!). A. Schmolck caught this one.
3069 string!). A. Schmolck caught this one.
3062
3070
3063 2002-06-27 Fernando Perez <fperez@colorado.edu>
3071 2002-06-27 Fernando Perez <fperez@colorado.edu>
3064
3072
3065 * IPython/ipmaker.py (make_IPython): fixed bug when running user
3073 * IPython/ipmaker.py (make_IPython): fixed bug when running user
3066 defined files at the cmd line. __name__ wasn't being set to
3074 defined files at the cmd line. __name__ wasn't being set to
3067 __main__.
3075 __main__.
3068
3076
3069 * IPython/Gnuplot2.py (zip_items): improved it so it can plot also
3077 * IPython/Gnuplot2.py (zip_items): improved it so it can plot also
3070 regular lists and tuples besides Numeric arrays.
3078 regular lists and tuples besides Numeric arrays.
3071
3079
3072 * IPython/Prompts.py (CachedOutput.__call__): Added output
3080 * IPython/Prompts.py (CachedOutput.__call__): Added output
3073 supression for input ending with ';'. Similar to Mathematica and
3081 supression for input ending with ';'. Similar to Mathematica and
3074 Matlab. The _* vars and Out[] list are still updated, just like
3082 Matlab. The _* vars and Out[] list are still updated, just like
3075 Mathematica behaves.
3083 Mathematica behaves.
3076
3084
3077 2002-06-25 Fernando Perez <fperez@colorado.edu>
3085 2002-06-25 Fernando Perez <fperez@colorado.edu>
3078
3086
3079 * IPython/ConfigLoader.py (ConfigLoader.load): fixed checking of
3087 * IPython/ConfigLoader.py (ConfigLoader.load): fixed checking of
3080 .ini extensions for profiels under Windows.
3088 .ini extensions for profiels under Windows.
3081
3089
3082 * IPython/OInspect.py (Inspector.pinfo): improved alignment of
3090 * IPython/OInspect.py (Inspector.pinfo): improved alignment of
3083 string form. Fix contributed by Alexander Schmolck
3091 string form. Fix contributed by Alexander Schmolck
3084 <a.schmolck-AT-gmx.net>
3092 <a.schmolck-AT-gmx.net>
3085
3093
3086 * IPython/GnuplotRuntime.py (gp_new): new function. Returns a
3094 * IPython/GnuplotRuntime.py (gp_new): new function. Returns a
3087 pre-configured Gnuplot instance.
3095 pre-configured Gnuplot instance.
3088
3096
3089 2002-06-21 Fernando Perez <fperez@colorado.edu>
3097 2002-06-21 Fernando Perez <fperez@colorado.edu>
3090
3098
3091 * IPython/numutils.py (exp_safe): new function, works around the
3099 * IPython/numutils.py (exp_safe): new function, works around the
3092 underflow problems in Numeric.
3100 underflow problems in Numeric.
3093 (log2): New fn. Safe log in base 2: returns exact integer answer
3101 (log2): New fn. Safe log in base 2: returns exact integer answer
3094 for exact integer powers of 2.
3102 for exact integer powers of 2.
3095
3103
3096 * IPython/Magic.py (get_py_filename): fixed it not expanding '~'
3104 * IPython/Magic.py (get_py_filename): fixed it not expanding '~'
3097 properly.
3105 properly.
3098
3106
3099 2002-06-20 Fernando Perez <fperez@colorado.edu>
3107 2002-06-20 Fernando Perez <fperez@colorado.edu>
3100
3108
3101 * IPython/genutils.py (timing): new function like
3109 * IPython/genutils.py (timing): new function like
3102 Mathematica's. Similar to time_test, but returns more info.
3110 Mathematica's. Similar to time_test, but returns more info.
3103
3111
3104 2002-06-18 Fernando Perez <fperez@colorado.edu>
3112 2002-06-18 Fernando Perez <fperez@colorado.edu>
3105
3113
3106 * IPython/Magic.py (Magic.magic_save): modified @save and @r
3114 * IPython/Magic.py (Magic.magic_save): modified @save and @r
3107 according to Mike Heeter's suggestions.
3115 according to Mike Heeter's suggestions.
3108
3116
3109 2002-06-16 Fernando Perez <fperez@colorado.edu>
3117 2002-06-16 Fernando Perez <fperez@colorado.edu>
3110
3118
3111 * IPython/GnuplotRuntime.py: Massive overhaul to the Gnuplot
3119 * IPython/GnuplotRuntime.py: Massive overhaul to the Gnuplot
3112 system. GnuplotMagic is gone as a user-directory option. New files
3120 system. GnuplotMagic is gone as a user-directory option. New files
3113 make it easier to use all the gnuplot stuff both from external
3121 make it easier to use all the gnuplot stuff both from external
3114 programs as well as from IPython. Had to rewrite part of
3122 programs as well as from IPython. Had to rewrite part of
3115 hardcopy() b/c of a strange bug: often the ps files simply don't
3123 hardcopy() b/c of a strange bug: often the ps files simply don't
3116 get created, and require a repeat of the command (often several
3124 get created, and require a repeat of the command (often several
3117 times).
3125 times).
3118
3126
3119 * IPython/ultraTB.py (AutoFormattedTB.__call__): changed to
3127 * IPython/ultraTB.py (AutoFormattedTB.__call__): changed to
3120 resolve output channel at call time, so that if sys.stderr has
3128 resolve output channel at call time, so that if sys.stderr has
3121 been redirected by user this gets honored.
3129 been redirected by user this gets honored.
3122
3130
3123 2002-06-13 Fernando Perez <fperez@colorado.edu>
3131 2002-06-13 Fernando Perez <fperez@colorado.edu>
3124
3132
3125 * IPython/Shell.py (IPShell.__init__): Changed IPythonShell to
3133 * IPython/Shell.py (IPShell.__init__): Changed IPythonShell to
3126 IPShell. Kept a copy with the old names to avoid breaking people's
3134 IPShell. Kept a copy with the old names to avoid breaking people's
3127 embedded code.
3135 embedded code.
3128
3136
3129 * IPython/ipython: simplified it to the bare minimum after
3137 * IPython/ipython: simplified it to the bare minimum after
3130 Holger's suggestions. Added info about how to use it in
3138 Holger's suggestions. Added info about how to use it in
3131 PYTHONSTARTUP.
3139 PYTHONSTARTUP.
3132
3140
3133 * IPython/Shell.py (IPythonShell): changed the options passing
3141 * IPython/Shell.py (IPythonShell): changed the options passing
3134 from a string with funky %s replacements to a straight list. Maybe
3142 from a string with funky %s replacements to a straight list. Maybe
3135 a bit more typing, but it follows sys.argv conventions, so there's
3143 a bit more typing, but it follows sys.argv conventions, so there's
3136 less special-casing to remember.
3144 less special-casing to remember.
3137
3145
3138 2002-06-12 Fernando Perez <fperez@colorado.edu>
3146 2002-06-12 Fernando Perez <fperez@colorado.edu>
3139
3147
3140 * IPython/Magic.py (Magic.magic_r): new magic auto-repeat
3148 * IPython/Magic.py (Magic.magic_r): new magic auto-repeat
3141 command. Thanks to a suggestion by Mike Heeter.
3149 command. Thanks to a suggestion by Mike Heeter.
3142 (Magic.magic_pfile): added behavior to look at filenames if given
3150 (Magic.magic_pfile): added behavior to look at filenames if given
3143 arg is not a defined object.
3151 arg is not a defined object.
3144 (Magic.magic_save): New @save function to save code snippets. Also
3152 (Magic.magic_save): New @save function to save code snippets. Also
3145 a Mike Heeter idea.
3153 a Mike Heeter idea.
3146
3154
3147 * IPython/UserConfig/GnuplotMagic.py (plot): Improvements to
3155 * IPython/UserConfig/GnuplotMagic.py (plot): Improvements to
3148 plot() and replot(). Much more convenient now, especially for
3156 plot() and replot(). Much more convenient now, especially for
3149 interactive use.
3157 interactive use.
3150
3158
3151 * IPython/Magic.py (Magic.magic_run): Added .py automatically to
3159 * IPython/Magic.py (Magic.magic_run): Added .py automatically to
3152 filenames.
3160 filenames.
3153
3161
3154 2002-06-02 Fernando Perez <fperez@colorado.edu>
3162 2002-06-02 Fernando Perez <fperez@colorado.edu>
3155
3163
3156 * IPython/Struct.py (Struct.__init__): modified to admit
3164 * IPython/Struct.py (Struct.__init__): modified to admit
3157 initialization via another struct.
3165 initialization via another struct.
3158
3166
3159 * IPython/genutils.py (SystemExec.__init__): New stateful
3167 * IPython/genutils.py (SystemExec.__init__): New stateful
3160 interface to xsys and bq. Useful for writing system scripts.
3168 interface to xsys and bq. Useful for writing system scripts.
3161
3169
3162 2002-05-30 Fernando Perez <fperez@colorado.edu>
3170 2002-05-30 Fernando Perez <fperez@colorado.edu>
3163
3171
3164 * MANIFEST.in: Changed docfile selection to exclude all the lyx
3172 * MANIFEST.in: Changed docfile selection to exclude all the lyx
3165 documents. This will make the user download smaller (it's getting
3173 documents. This will make the user download smaller (it's getting
3166 too big).
3174 too big).
3167
3175
3168 2002-05-29 Fernando Perez <fperez@colorado.edu>
3176 2002-05-29 Fernando Perez <fperez@colorado.edu>
3169
3177
3170 * IPython/iplib.py (_FakeModule.__init__): New class introduced to
3178 * IPython/iplib.py (_FakeModule.__init__): New class introduced to
3171 fix problems with shelve and pickle. Seems to work, but I don't
3179 fix problems with shelve and pickle. Seems to work, but I don't
3172 know if corner cases break it. Thanks to Mike Heeter
3180 know if corner cases break it. Thanks to Mike Heeter
3173 <korora-AT-SDF.LONESTAR.ORG> for the bug reports and test cases.
3181 <korora-AT-SDF.LONESTAR.ORG> for the bug reports and test cases.
3174
3182
3175 2002-05-24 Fernando Perez <fperez@colorado.edu>
3183 2002-05-24 Fernando Perez <fperez@colorado.edu>
3176
3184
3177 * IPython/Magic.py (Macro.__init__): fixed magics embedded in
3185 * IPython/Magic.py (Macro.__init__): fixed magics embedded in
3178 macros having broken.
3186 macros having broken.
3179
3187
3180 2002-05-21 Fernando Perez <fperez@colorado.edu>
3188 2002-05-21 Fernando Perez <fperez@colorado.edu>
3181
3189
3182 * IPython/Magic.py (Magic.magic_logstart): fixed recently
3190 * IPython/Magic.py (Magic.magic_logstart): fixed recently
3183 introduced logging bug: all history before logging started was
3191 introduced logging bug: all history before logging started was
3184 being written one character per line! This came from the redesign
3192 being written one character per line! This came from the redesign
3185 of the input history as a special list which slices to strings,
3193 of the input history as a special list which slices to strings,
3186 not to lists.
3194 not to lists.
3187
3195
3188 2002-05-20 Fernando Perez <fperez@colorado.edu>
3196 2002-05-20 Fernando Perez <fperez@colorado.edu>
3189
3197
3190 * IPython/Prompts.py (CachedOutput.__init__): made the color table
3198 * IPython/Prompts.py (CachedOutput.__init__): made the color table
3191 be an attribute of all classes in this module. The design of these
3199 be an attribute of all classes in this module. The design of these
3192 classes needs some serious overhauling.
3200 classes needs some serious overhauling.
3193
3201
3194 * IPython/DPyGetOpt.py (DPyGetOpt.setPosixCompliance): fixed bug
3202 * IPython/DPyGetOpt.py (DPyGetOpt.setPosixCompliance): fixed bug
3195 which was ignoring '_' in option names.
3203 which was ignoring '_' in option names.
3196
3204
3197 * IPython/ultraTB.py (FormattedTB.__init__): Changed
3205 * IPython/ultraTB.py (FormattedTB.__init__): Changed
3198 'Verbose_novars' to 'Context' and made it the new default. It's a
3206 'Verbose_novars' to 'Context' and made it the new default. It's a
3199 bit more readable and also safer than verbose.
3207 bit more readable and also safer than verbose.
3200
3208
3201 * IPython/PyColorize.py (Parser.__call__): Fixed coloring of
3209 * IPython/PyColorize.py (Parser.__call__): Fixed coloring of
3202 triple-quoted strings.
3210 triple-quoted strings.
3203
3211
3204 * IPython/OInspect.py (__all__): new module exposing the object
3212 * IPython/OInspect.py (__all__): new module exposing the object
3205 introspection facilities. Now the corresponding magics are dummy
3213 introspection facilities. Now the corresponding magics are dummy
3206 wrappers around this. Having this module will make it much easier
3214 wrappers around this. Having this module will make it much easier
3207 to put these functions into our modified pdb.
3215 to put these functions into our modified pdb.
3208 This new object inspector system uses the new colorizing module,
3216 This new object inspector system uses the new colorizing module,
3209 so source code and other things are nicely syntax highlighted.
3217 so source code and other things are nicely syntax highlighted.
3210
3218
3211 2002-05-18 Fernando Perez <fperez@colorado.edu>
3219 2002-05-18 Fernando Perez <fperez@colorado.edu>
3212
3220
3213 * IPython/ColorANSI.py: Split the coloring tools into a separate
3221 * IPython/ColorANSI.py: Split the coloring tools into a separate
3214 module so I can use them in other code easier (they were part of
3222 module so I can use them in other code easier (they were part of
3215 ultraTB).
3223 ultraTB).
3216
3224
3217 2002-05-17 Fernando Perez <fperez@colorado.edu>
3225 2002-05-17 Fernando Perez <fperez@colorado.edu>
3218
3226
3219 * IPython/UserConfig/GnuplotMagic.py (magic_gp_set_instance):
3227 * IPython/UserConfig/GnuplotMagic.py (magic_gp_set_instance):
3220 fixed it to set the global 'g' also to the called instance, as
3228 fixed it to set the global 'g' also to the called instance, as
3221 long as 'g' was still a gnuplot instance (so it doesn't overwrite
3229 long as 'g' was still a gnuplot instance (so it doesn't overwrite
3222 user's 'g' variables).
3230 user's 'g' variables).
3223
3231
3224 * IPython/iplib.py (InteractiveShell.__init__): Added In/Out
3232 * IPython/iplib.py (InteractiveShell.__init__): Added In/Out
3225 global variables (aliases to _ih,_oh) so that users which expect
3233 global variables (aliases to _ih,_oh) so that users which expect
3226 In[5] or Out[7] to work aren't unpleasantly surprised.
3234 In[5] or Out[7] to work aren't unpleasantly surprised.
3227 (InputList.__getslice__): new class to allow executing slices of
3235 (InputList.__getslice__): new class to allow executing slices of
3228 input history directly. Very simple class, complements the use of
3236 input history directly. Very simple class, complements the use of
3229 macros.
3237 macros.
3230
3238
3231 2002-05-16 Fernando Perez <fperez@colorado.edu>
3239 2002-05-16 Fernando Perez <fperez@colorado.edu>
3232
3240
3233 * setup.py (docdirbase): make doc directory be just doc/IPython
3241 * setup.py (docdirbase): make doc directory be just doc/IPython
3234 without version numbers, it will reduce clutter for users.
3242 without version numbers, it will reduce clutter for users.
3235
3243
3236 * IPython/Magic.py (Magic.magic_run): Add explicit local dict to
3244 * IPython/Magic.py (Magic.magic_run): Add explicit local dict to
3237 execfile call to prevent possible memory leak. See for details:
3245 execfile call to prevent possible memory leak. See for details:
3238 http://mail.python.org/pipermail/python-list/2002-February/088476.html
3246 http://mail.python.org/pipermail/python-list/2002-February/088476.html
3239
3247
3240 2002-05-15 Fernando Perez <fperez@colorado.edu>
3248 2002-05-15 Fernando Perez <fperez@colorado.edu>
3241
3249
3242 * IPython/Magic.py (Magic.magic_psource): made the object
3250 * IPython/Magic.py (Magic.magic_psource): made the object
3243 introspection names be more standard: pdoc, pdef, pfile and
3251 introspection names be more standard: pdoc, pdef, pfile and
3244 psource. They all print/page their output, and it makes
3252 psource. They all print/page their output, and it makes
3245 remembering them easier. Kept old names for compatibility as
3253 remembering them easier. Kept old names for compatibility as
3246 aliases.
3254 aliases.
3247
3255
3248 2002-05-14 Fernando Perez <fperez@colorado.edu>
3256 2002-05-14 Fernando Perez <fperez@colorado.edu>
3249
3257
3250 * IPython/UserConfig/GnuplotMagic.py: I think I finally understood
3258 * IPython/UserConfig/GnuplotMagic.py: I think I finally understood
3251 what the mouse problem was. The trick is to use gnuplot with temp
3259 what the mouse problem was. The trick is to use gnuplot with temp
3252 files and NOT with pipes (for data communication), because having
3260 files and NOT with pipes (for data communication), because having
3253 both pipes and the mouse on is bad news.
3261 both pipes and the mouse on is bad news.
3254
3262
3255 2002-05-13 Fernando Perez <fperez@colorado.edu>
3263 2002-05-13 Fernando Perez <fperez@colorado.edu>
3256
3264
3257 * IPython/Magic.py (Magic._ofind): fixed namespace order search
3265 * IPython/Magic.py (Magic._ofind): fixed namespace order search
3258 bug. Information would be reported about builtins even when
3266 bug. Information would be reported about builtins even when
3259 user-defined functions overrode them.
3267 user-defined functions overrode them.
3260
3268
3261 2002-05-11 Fernando Perez <fperez@colorado.edu>
3269 2002-05-11 Fernando Perez <fperez@colorado.edu>
3262
3270
3263 * IPython/__init__.py (__all__): removed FlexCompleter from
3271 * IPython/__init__.py (__all__): removed FlexCompleter from
3264 __all__ so that things don't fail in platforms without readline.
3272 __all__ so that things don't fail in platforms without readline.
3265
3273
3266 2002-05-10 Fernando Perez <fperez@colorado.edu>
3274 2002-05-10 Fernando Perez <fperez@colorado.edu>
3267
3275
3268 * IPython/__init__.py (__all__): removed numutils from __all__ b/c
3276 * IPython/__init__.py (__all__): removed numutils from __all__ b/c
3269 it requires Numeric, effectively making Numeric a dependency for
3277 it requires Numeric, effectively making Numeric a dependency for
3270 IPython.
3278 IPython.
3271
3279
3272 * Released 0.2.13
3280 * Released 0.2.13
3273
3281
3274 * IPython/Magic.py (Magic.magic_prun): big overhaul to the
3282 * IPython/Magic.py (Magic.magic_prun): big overhaul to the
3275 profiler interface. Now all the major options from the profiler
3283 profiler interface. Now all the major options from the profiler
3276 module are directly supported in IPython, both for single
3284 module are directly supported in IPython, both for single
3277 expressions (@prun) and for full programs (@run -p).
3285 expressions (@prun) and for full programs (@run -p).
3278
3286
3279 2002-05-09 Fernando Perez <fperez@colorado.edu>
3287 2002-05-09 Fernando Perez <fperez@colorado.edu>
3280
3288
3281 * IPython/Magic.py (Magic.magic_doc): fixed to show docstrings of
3289 * IPython/Magic.py (Magic.magic_doc): fixed to show docstrings of
3282 magic properly formatted for screen.
3290 magic properly formatted for screen.
3283
3291
3284 * setup.py (make_shortcut): Changed things to put pdf version in
3292 * setup.py (make_shortcut): Changed things to put pdf version in
3285 doc/ instead of doc/manual (had to change lyxport a bit).
3293 doc/ instead of doc/manual (had to change lyxport a bit).
3286
3294
3287 * IPython/Magic.py (Profile.string_stats): made profile runs go
3295 * IPython/Magic.py (Profile.string_stats): made profile runs go
3288 through pager (they are long and a pager allows searching, saving,
3296 through pager (they are long and a pager allows searching, saving,
3289 etc.)
3297 etc.)
3290
3298
3291 2002-05-08 Fernando Perez <fperez@colorado.edu>
3299 2002-05-08 Fernando Perez <fperez@colorado.edu>
3292
3300
3293 * Released 0.2.12
3301 * Released 0.2.12
3294
3302
3295 2002-05-06 Fernando Perez <fperez@colorado.edu>
3303 2002-05-06 Fernando Perez <fperez@colorado.edu>
3296
3304
3297 * IPython/Magic.py (Magic.magic_hist): small bug fixed (recently
3305 * IPython/Magic.py (Magic.magic_hist): small bug fixed (recently
3298 introduced); 'hist n1 n2' was broken.
3306 introduced); 'hist n1 n2' was broken.
3299 (Magic.magic_pdb): added optional on/off arguments to @pdb
3307 (Magic.magic_pdb): added optional on/off arguments to @pdb
3300 (Magic.magic_run): added option -i to @run, which executes code in
3308 (Magic.magic_run): added option -i to @run, which executes code in
3301 the IPython namespace instead of a clean one. Also added @irun as
3309 the IPython namespace instead of a clean one. Also added @irun as
3302 an alias to @run -i.
3310 an alias to @run -i.
3303
3311
3304 * IPython/UserConfig/GnuplotMagic.py (magic_gp_set_instance):
3312 * IPython/UserConfig/GnuplotMagic.py (magic_gp_set_instance):
3305 fixed (it didn't really do anything, the namespaces were wrong).
3313 fixed (it didn't really do anything, the namespaces were wrong).
3306
3314
3307 * IPython/Debugger.py (__init__): Added workaround for python 2.1
3315 * IPython/Debugger.py (__init__): Added workaround for python 2.1
3308
3316
3309 * IPython/__init__.py (__all__): Fixed package namespace, now
3317 * IPython/__init__.py (__all__): Fixed package namespace, now
3310 'import IPython' does give access to IPython.<all> as
3318 'import IPython' does give access to IPython.<all> as
3311 expected. Also renamed __release__ to Release.
3319 expected. Also renamed __release__ to Release.
3312
3320
3313 * IPython/Debugger.py (__license__): created new Pdb class which
3321 * IPython/Debugger.py (__license__): created new Pdb class which
3314 functions like a drop-in for the normal pdb.Pdb but does NOT
3322 functions like a drop-in for the normal pdb.Pdb but does NOT
3315 import readline by default. This way it doesn't muck up IPython's
3323 import readline by default. This way it doesn't muck up IPython's
3316 readline handling, and now tab-completion finally works in the
3324 readline handling, and now tab-completion finally works in the
3317 debugger -- sort of. It completes things globally visible, but the
3325 debugger -- sort of. It completes things globally visible, but the
3318 completer doesn't track the stack as pdb walks it. That's a bit
3326 completer doesn't track the stack as pdb walks it. That's a bit
3319 tricky, and I'll have to implement it later.
3327 tricky, and I'll have to implement it later.
3320
3328
3321 2002-05-05 Fernando Perez <fperez@colorado.edu>
3329 2002-05-05 Fernando Perez <fperez@colorado.edu>
3322
3330
3323 * IPython/Magic.py (Magic.magic_oinfo): fixed formatting bug for
3331 * IPython/Magic.py (Magic.magic_oinfo): fixed formatting bug for
3324 magic docstrings when printed via ? (explicit \'s were being
3332 magic docstrings when printed via ? (explicit \'s were being
3325 printed).
3333 printed).
3326
3334
3327 * IPython/ipmaker.py (make_IPython): fixed namespace
3335 * IPython/ipmaker.py (make_IPython): fixed namespace
3328 identification bug. Now variables loaded via logs or command-line
3336 identification bug. Now variables loaded via logs or command-line
3329 files are recognized in the interactive namespace by @who.
3337 files are recognized in the interactive namespace by @who.
3330
3338
3331 * IPython/iplib.py (InteractiveShell.safe_execfile): Fixed bug in
3339 * IPython/iplib.py (InteractiveShell.safe_execfile): Fixed bug in
3332 log replay system stemming from the string form of Structs.
3340 log replay system stemming from the string form of Structs.
3333
3341
3334 * IPython/Magic.py (Macro.__init__): improved macros to properly
3342 * IPython/Magic.py (Macro.__init__): improved macros to properly
3335 handle magic commands in them.
3343 handle magic commands in them.
3336 (Magic.magic_logstart): usernames are now expanded so 'logstart
3344 (Magic.magic_logstart): usernames are now expanded so 'logstart
3337 ~/mylog' now works.
3345 ~/mylog' now works.
3338
3346
3339 * IPython/iplib.py (complete): fixed bug where paths starting with
3347 * IPython/iplib.py (complete): fixed bug where paths starting with
3340 '/' would be completed as magic names.
3348 '/' would be completed as magic names.
3341
3349
3342 2002-05-04 Fernando Perez <fperez@colorado.edu>
3350 2002-05-04 Fernando Perez <fperez@colorado.edu>
3343
3351
3344 * IPython/Magic.py (Magic.magic_run): added options -p and -f to
3352 * IPython/Magic.py (Magic.magic_run): added options -p and -f to
3345 allow running full programs under the profiler's control.
3353 allow running full programs under the profiler's control.
3346
3354
3347 * IPython/ultraTB.py (FormattedTB.__init__): Added Verbose_novars
3355 * IPython/ultraTB.py (FormattedTB.__init__): Added Verbose_novars
3348 mode to report exceptions verbosely but without formatting
3356 mode to report exceptions verbosely but without formatting
3349 variables. This addresses the issue of ipython 'freezing' (it's
3357 variables. This addresses the issue of ipython 'freezing' (it's
3350 not frozen, but caught in an expensive formatting loop) when huge
3358 not frozen, but caught in an expensive formatting loop) when huge
3351 variables are in the context of an exception.
3359 variables are in the context of an exception.
3352 (VerboseTB.text): Added '--->' markers at line where exception was
3360 (VerboseTB.text): Added '--->' markers at line where exception was
3353 triggered. Much clearer to read, especially in NoColor modes.
3361 triggered. Much clearer to read, especially in NoColor modes.
3354
3362
3355 * IPython/Magic.py (Magic.magic_run): bugfix: -n option had been
3363 * IPython/Magic.py (Magic.magic_run): bugfix: -n option had been
3356 implemented in reverse when changing to the new parse_options().
3364 implemented in reverse when changing to the new parse_options().
3357
3365
3358 2002-05-03 Fernando Perez <fperez@colorado.edu>
3366 2002-05-03 Fernando Perez <fperez@colorado.edu>
3359
3367
3360 * IPython/Magic.py (Magic.parse_options): new function so that
3368 * IPython/Magic.py (Magic.parse_options): new function so that
3361 magics can parse options easier.
3369 magics can parse options easier.
3362 (Magic.magic_prun): new function similar to profile.run(),
3370 (Magic.magic_prun): new function similar to profile.run(),
3363 suggested by Chris Hart.
3371 suggested by Chris Hart.
3364 (Magic.magic_cd): fixed behavior so that it only changes if
3372 (Magic.magic_cd): fixed behavior so that it only changes if
3365 directory actually is in history.
3373 directory actually is in history.
3366
3374
3367 * IPython/usage.py (__doc__): added information about potential
3375 * IPython/usage.py (__doc__): added information about potential
3368 slowness of Verbose exception mode when there are huge data
3376 slowness of Verbose exception mode when there are huge data
3369 structures to be formatted (thanks to Archie Paulson).
3377 structures to be formatted (thanks to Archie Paulson).
3370
3378
3371 * IPython/ipmaker.py (make_IPython): Changed default logging
3379 * IPython/ipmaker.py (make_IPython): Changed default logging
3372 (when simply called with -log) to use curr_dir/ipython.log in
3380 (when simply called with -log) to use curr_dir/ipython.log in
3373 rotate mode. Fixed crash which was occuring with -log before
3381 rotate mode. Fixed crash which was occuring with -log before
3374 (thanks to Jim Boyle).
3382 (thanks to Jim Boyle).
3375
3383
3376 2002-05-01 Fernando Perez <fperez@colorado.edu>
3384 2002-05-01 Fernando Perez <fperez@colorado.edu>
3377
3385
3378 * Released 0.2.11 for these fixes (mainly the ultraTB one which
3386 * Released 0.2.11 for these fixes (mainly the ultraTB one which
3379 was nasty -- though somewhat of a corner case).
3387 was nasty -- though somewhat of a corner case).
3380
3388
3381 * IPython/ultraTB.py (AutoFormattedTB.text): renamed __text to
3389 * IPython/ultraTB.py (AutoFormattedTB.text): renamed __text to
3382 text (was a bug).
3390 text (was a bug).
3383
3391
3384 2002-04-30 Fernando Perez <fperez@colorado.edu>
3392 2002-04-30 Fernando Perez <fperez@colorado.edu>
3385
3393
3386 * IPython/UserConfig/GnuplotMagic.py (magic_gp): Minor fix to add
3394 * IPython/UserConfig/GnuplotMagic.py (magic_gp): Minor fix to add
3387 a print after ^D or ^C from the user so that the In[] prompt
3395 a print after ^D or ^C from the user so that the In[] prompt
3388 doesn't over-run the gnuplot one.
3396 doesn't over-run the gnuplot one.
3389
3397
3390 2002-04-29 Fernando Perez <fperez@colorado.edu>
3398 2002-04-29 Fernando Perez <fperez@colorado.edu>
3391
3399
3392 * Released 0.2.10
3400 * Released 0.2.10
3393
3401
3394 * IPython/__release__.py (version): get date dynamically.
3402 * IPython/__release__.py (version): get date dynamically.
3395
3403
3396 * Misc. documentation updates thanks to Arnd's comments. Also ran
3404 * Misc. documentation updates thanks to Arnd's comments. Also ran
3397 a full spellcheck on the manual (hadn't been done in a while).
3405 a full spellcheck on the manual (hadn't been done in a while).
3398
3406
3399 2002-04-27 Fernando Perez <fperez@colorado.edu>
3407 2002-04-27 Fernando Perez <fperez@colorado.edu>
3400
3408
3401 * IPython/Magic.py (Magic.magic_logstart): Fixed bug where
3409 * IPython/Magic.py (Magic.magic_logstart): Fixed bug where
3402 starting a log in mid-session would reset the input history list.
3410 starting a log in mid-session would reset the input history list.
3403
3411
3404 2002-04-26 Fernando Perez <fperez@colorado.edu>
3412 2002-04-26 Fernando Perez <fperez@colorado.edu>
3405
3413
3406 * IPython/iplib.py (InteractiveShell.wait): Fixed bug where not
3414 * IPython/iplib.py (InteractiveShell.wait): Fixed bug where not
3407 all files were being included in an update. Now anything in
3415 all files were being included in an update. Now anything in
3408 UserConfig that matches [A-Za-z]*.py will go (this excludes
3416 UserConfig that matches [A-Za-z]*.py will go (this excludes
3409 __init__.py)
3417 __init__.py)
3410
3418
3411 2002-04-25 Fernando Perez <fperez@colorado.edu>
3419 2002-04-25 Fernando Perez <fperez@colorado.edu>
3412
3420
3413 * IPython/iplib.py (InteractiveShell.__init__): Added __IPYTHON__
3421 * IPython/iplib.py (InteractiveShell.__init__): Added __IPYTHON__
3414 to __builtins__ so that any form of embedded or imported code can
3422 to __builtins__ so that any form of embedded or imported code can
3415 test for being inside IPython.
3423 test for being inside IPython.
3416
3424
3417 * IPython/UserConfig/GnuplotMagic.py: (magic_gp_set_instance):
3425 * IPython/UserConfig/GnuplotMagic.py: (magic_gp_set_instance):
3418 changed to GnuplotMagic because it's now an importable module,
3426 changed to GnuplotMagic because it's now an importable module,
3419 this makes the name follow that of the standard Gnuplot module.
3427 this makes the name follow that of the standard Gnuplot module.
3420 GnuplotMagic can now be loaded at any time in mid-session.
3428 GnuplotMagic can now be loaded at any time in mid-session.
3421
3429
3422 2002-04-24 Fernando Perez <fperez@colorado.edu>
3430 2002-04-24 Fernando Perez <fperez@colorado.edu>
3423
3431
3424 * IPython/numutils.py: removed SIUnits. It doesn't properly set
3432 * IPython/numutils.py: removed SIUnits. It doesn't properly set
3425 the globals (IPython has its own namespace) and the
3433 the globals (IPython has its own namespace) and the
3426 PhysicalQuantity stuff is much better anyway.
3434 PhysicalQuantity stuff is much better anyway.
3427
3435
3428 * IPython/UserConfig/example-gnuplot.py (g2): Added gnuplot
3436 * IPython/UserConfig/example-gnuplot.py (g2): Added gnuplot
3429 embedding example to standard user directory for
3437 embedding example to standard user directory for
3430 distribution. Also put it in the manual.
3438 distribution. Also put it in the manual.
3431
3439
3432 * IPython/numutils.py (gnuplot_exec): Changed to take a gnuplot
3440 * IPython/numutils.py (gnuplot_exec): Changed to take a gnuplot
3433 instance as first argument (so it doesn't rely on some obscure
3441 instance as first argument (so it doesn't rely on some obscure
3434 hidden global).
3442 hidden global).
3435
3443
3436 * IPython/UserConfig/ipythonrc.py: put () back in accepted
3444 * IPython/UserConfig/ipythonrc.py: put () back in accepted
3437 delimiters. While it prevents ().TAB from working, it allows
3445 delimiters. While it prevents ().TAB from working, it allows
3438 completions in open (... expressions. This is by far a more common
3446 completions in open (... expressions. This is by far a more common
3439 case.
3447 case.
3440
3448
3441 2002-04-23 Fernando Perez <fperez@colorado.edu>
3449 2002-04-23 Fernando Perez <fperez@colorado.edu>
3442
3450
3443 * IPython/Extensions/InterpreterPasteInput.py: new
3451 * IPython/Extensions/InterpreterPasteInput.py: new
3444 syntax-processing module for pasting lines with >>> or ... at the
3452 syntax-processing module for pasting lines with >>> or ... at the
3445 start.
3453 start.
3446
3454
3447 * IPython/Extensions/PhysicalQ_Interactive.py
3455 * IPython/Extensions/PhysicalQ_Interactive.py
3448 (PhysicalQuantityInteractive.__int__): fixed to work with either
3456 (PhysicalQuantityInteractive.__int__): fixed to work with either
3449 Numeric or math.
3457 Numeric or math.
3450
3458
3451 * IPython/UserConfig/ipythonrc-numeric.py: reorganized the
3459 * IPython/UserConfig/ipythonrc-numeric.py: reorganized the
3452 provided profiles. Now we have:
3460 provided profiles. Now we have:
3453 -math -> math module as * and cmath with its own namespace.
3461 -math -> math module as * and cmath with its own namespace.
3454 -numeric -> Numeric as *, plus gnuplot & grace
3462 -numeric -> Numeric as *, plus gnuplot & grace
3455 -physics -> same as before
3463 -physics -> same as before
3456
3464
3457 * IPython/Magic.py (Magic.magic_magic): Fixed bug where
3465 * IPython/Magic.py (Magic.magic_magic): Fixed bug where
3458 user-defined magics wouldn't be found by @magic if they were
3466 user-defined magics wouldn't be found by @magic if they were
3459 defined as class methods. Also cleaned up the namespace search
3467 defined as class methods. Also cleaned up the namespace search
3460 logic and the string building (to use %s instead of many repeated
3468 logic and the string building (to use %s instead of many repeated
3461 string adds).
3469 string adds).
3462
3470
3463 * IPython/UserConfig/example-magic.py (magic_foo): updated example
3471 * IPython/UserConfig/example-magic.py (magic_foo): updated example
3464 of user-defined magics to operate with class methods (cleaner, in
3472 of user-defined magics to operate with class methods (cleaner, in
3465 line with the gnuplot code).
3473 line with the gnuplot code).
3466
3474
3467 2002-04-22 Fernando Perez <fperez@colorado.edu>
3475 2002-04-22 Fernando Perez <fperez@colorado.edu>
3468
3476
3469 * setup.py: updated dependency list so that manual is updated when
3477 * setup.py: updated dependency list so that manual is updated when
3470 all included files change.
3478 all included files change.
3471
3479
3472 * IPython/ipmaker.py (make_IPython): Fixed bug which was ignoring
3480 * IPython/ipmaker.py (make_IPython): Fixed bug which was ignoring
3473 the delimiter removal option (the fix is ugly right now).
3481 the delimiter removal option (the fix is ugly right now).
3474
3482
3475 * IPython/UserConfig/ipythonrc-physics.py: simplified not to load
3483 * IPython/UserConfig/ipythonrc-physics.py: simplified not to load
3476 all of the math profile (quicker loading, no conflict between
3484 all of the math profile (quicker loading, no conflict between
3477 g-9.8 and g-gnuplot).
3485 g-9.8 and g-gnuplot).
3478
3486
3479 * IPython/CrashHandler.py (CrashHandler.__call__): changed default
3487 * IPython/CrashHandler.py (CrashHandler.__call__): changed default
3480 name of post-mortem files to IPython_crash_report.txt.
3488 name of post-mortem files to IPython_crash_report.txt.
3481
3489
3482 * Cleanup/update of the docs. Added all the new readline info and
3490 * Cleanup/update of the docs. Added all the new readline info and
3483 formatted all lists as 'real lists'.
3491 formatted all lists as 'real lists'.
3484
3492
3485 * IPython/ipmaker.py (make_IPython): removed now-obsolete
3493 * IPython/ipmaker.py (make_IPython): removed now-obsolete
3486 tab-completion options, since the full readline parse_and_bind is
3494 tab-completion options, since the full readline parse_and_bind is
3487 now accessible.
3495 now accessible.
3488
3496
3489 * IPython/iplib.py (InteractiveShell.init_readline): Changed
3497 * IPython/iplib.py (InteractiveShell.init_readline): Changed
3490 handling of readline options. Now users can specify any string to
3498 handling of readline options. Now users can specify any string to
3491 be passed to parse_and_bind(), as well as the delimiters to be
3499 be passed to parse_and_bind(), as well as the delimiters to be
3492 removed.
3500 removed.
3493 (InteractiveShell.__init__): Added __name__ to the global
3501 (InteractiveShell.__init__): Added __name__ to the global
3494 namespace so that things like Itpl which rely on its existence
3502 namespace so that things like Itpl which rely on its existence
3495 don't crash.
3503 don't crash.
3496 (InteractiveShell._prefilter): Defined the default with a _ so
3504 (InteractiveShell._prefilter): Defined the default with a _ so
3497 that prefilter() is easier to override, while the default one
3505 that prefilter() is easier to override, while the default one
3498 remains available.
3506 remains available.
3499
3507
3500 2002-04-18 Fernando Perez <fperez@colorado.edu>
3508 2002-04-18 Fernando Perez <fperez@colorado.edu>
3501
3509
3502 * Added information about pdb in the docs.
3510 * Added information about pdb in the docs.
3503
3511
3504 2002-04-17 Fernando Perez <fperez@colorado.edu>
3512 2002-04-17 Fernando Perez <fperez@colorado.edu>
3505
3513
3506 * IPython/ipmaker.py (make_IPython): added rc_override option to
3514 * IPython/ipmaker.py (make_IPython): added rc_override option to
3507 allow passing config options at creation time which may override
3515 allow passing config options at creation time which may override
3508 anything set in the config files or command line. This is
3516 anything set in the config files or command line. This is
3509 particularly useful for configuring embedded instances.
3517 particularly useful for configuring embedded instances.
3510
3518
3511 2002-04-15 Fernando Perez <fperez@colorado.edu>
3519 2002-04-15 Fernando Perez <fperez@colorado.edu>
3512
3520
3513 * IPython/Logger.py (Logger.log): Fixed a nasty bug which could
3521 * IPython/Logger.py (Logger.log): Fixed a nasty bug which could
3514 crash embedded instances because of the input cache falling out of
3522 crash embedded instances because of the input cache falling out of
3515 sync with the output counter.
3523 sync with the output counter.
3516
3524
3517 * IPython/Shell.py (IPythonShellEmbed.__init__): added a debug
3525 * IPython/Shell.py (IPythonShellEmbed.__init__): added a debug
3518 mode which calls pdb after an uncaught exception in IPython itself.
3526 mode which calls pdb after an uncaught exception in IPython itself.
3519
3527
3520 2002-04-14 Fernando Perez <fperez@colorado.edu>
3528 2002-04-14 Fernando Perez <fperez@colorado.edu>
3521
3529
3522 * IPython/iplib.py (InteractiveShell.showtraceback): pdb mucks up
3530 * IPython/iplib.py (InteractiveShell.showtraceback): pdb mucks up
3523 readline, fix it back after each call.
3531 readline, fix it back after each call.
3524
3532
3525 * IPython/ultraTB.py (AutoFormattedTB.__text): made text a private
3533 * IPython/ultraTB.py (AutoFormattedTB.__text): made text a private
3526 method to force all access via __call__(), which guarantees that
3534 method to force all access via __call__(), which guarantees that
3527 traceback references are properly deleted.
3535 traceback references are properly deleted.
3528
3536
3529 * IPython/Prompts.py (CachedOutput._display): minor fixes to
3537 * IPython/Prompts.py (CachedOutput._display): minor fixes to
3530 improve printing when pprint is in use.
3538 improve printing when pprint is in use.
3531
3539
3532 2002-04-13 Fernando Perez <fperez@colorado.edu>
3540 2002-04-13 Fernando Perez <fperez@colorado.edu>
3533
3541
3534 * IPython/Shell.py (IPythonShellEmbed.__call__): SystemExit
3542 * IPython/Shell.py (IPythonShellEmbed.__call__): SystemExit
3535 exceptions aren't caught anymore. If the user triggers one, he
3543 exceptions aren't caught anymore. If the user triggers one, he
3536 should know why he's doing it and it should go all the way up,
3544 should know why he's doing it and it should go all the way up,
3537 just like any other exception. So now @abort will fully kill the
3545 just like any other exception. So now @abort will fully kill the
3538 embedded interpreter and the embedding code (unless that happens
3546 embedded interpreter and the embedding code (unless that happens
3539 to catch SystemExit).
3547 to catch SystemExit).
3540
3548
3541 * IPython/ultraTB.py (VerboseTB.__init__): added a call_pdb flag
3549 * IPython/ultraTB.py (VerboseTB.__init__): added a call_pdb flag
3542 and a debugger() method to invoke the interactive pdb debugger
3550 and a debugger() method to invoke the interactive pdb debugger
3543 after printing exception information. Also added the corresponding
3551 after printing exception information. Also added the corresponding
3544 -pdb option and @pdb magic to control this feature, and updated
3552 -pdb option and @pdb magic to control this feature, and updated
3545 the docs. After a suggestion from Christopher Hart
3553 the docs. After a suggestion from Christopher Hart
3546 (hart-AT-caltech.edu).
3554 (hart-AT-caltech.edu).
3547
3555
3548 2002-04-12 Fernando Perez <fperez@colorado.edu>
3556 2002-04-12 Fernando Perez <fperez@colorado.edu>
3549
3557
3550 * IPython/Shell.py (IPythonShellEmbed.__init__): modified to use
3558 * IPython/Shell.py (IPythonShellEmbed.__init__): modified to use
3551 the exception handlers defined by the user (not the CrashHandler)
3559 the exception handlers defined by the user (not the CrashHandler)
3552 so that user exceptions don't trigger an ipython bug report.
3560 so that user exceptions don't trigger an ipython bug report.
3553
3561
3554 * IPython/ultraTB.py (ColorTB.__init__): made the color scheme
3562 * IPython/ultraTB.py (ColorTB.__init__): made the color scheme
3555 configurable (it should have always been so).
3563 configurable (it should have always been so).
3556
3564
3557 2002-03-26 Fernando Perez <fperez@colorado.edu>
3565 2002-03-26 Fernando Perez <fperez@colorado.edu>
3558
3566
3559 * IPython/Shell.py (IPythonShellEmbed.__call__): many changes here
3567 * IPython/Shell.py (IPythonShellEmbed.__call__): many changes here
3560 and there to fix embedding namespace issues. This should all be
3568 and there to fix embedding namespace issues. This should all be
3561 done in a more elegant way.
3569 done in a more elegant way.
3562
3570
3563 2002-03-25 Fernando Perez <fperez@colorado.edu>
3571 2002-03-25 Fernando Perez <fperez@colorado.edu>
3564
3572
3565 * IPython/genutils.py (get_home_dir): Try to make it work under
3573 * IPython/genutils.py (get_home_dir): Try to make it work under
3566 win9x also.
3574 win9x also.
3567
3575
3568 2002-03-20 Fernando Perez <fperez@colorado.edu>
3576 2002-03-20 Fernando Perez <fperez@colorado.edu>
3569
3577
3570 * IPython/Shell.py (IPythonShellEmbed.__init__): leave
3578 * IPython/Shell.py (IPythonShellEmbed.__init__): leave
3571 sys.displayhook untouched upon __init__.
3579 sys.displayhook untouched upon __init__.
3572
3580
3573 2002-03-19 Fernando Perez <fperez@colorado.edu>
3581 2002-03-19 Fernando Perez <fperez@colorado.edu>
3574
3582
3575 * Released 0.2.9 (for embedding bug, basically).
3583 * Released 0.2.9 (for embedding bug, basically).
3576
3584
3577 * IPython/Shell.py (IPythonShellEmbed.__call__): Trap SystemExit
3585 * IPython/Shell.py (IPythonShellEmbed.__call__): Trap SystemExit
3578 exceptions so that enclosing shell's state can be restored.
3586 exceptions so that enclosing shell's state can be restored.
3579
3587
3580 * Changed magic_gnuplot.py to magic-gnuplot.py to standardize
3588 * Changed magic_gnuplot.py to magic-gnuplot.py to standardize
3581 naming conventions in the .ipython/ dir.
3589 naming conventions in the .ipython/ dir.
3582
3590
3583 * IPython/iplib.py (InteractiveShell.init_readline): removed '-'
3591 * IPython/iplib.py (InteractiveShell.init_readline): removed '-'
3584 from delimiters list so filenames with - in them get expanded.
3592 from delimiters list so filenames with - in them get expanded.
3585
3593
3586 * IPython/Shell.py (IPythonShellEmbed.__call__): fixed bug with
3594 * IPython/Shell.py (IPythonShellEmbed.__call__): fixed bug with
3587 sys.displayhook not being properly restored after an embedded call.
3595 sys.displayhook not being properly restored after an embedded call.
3588
3596
3589 2002-03-18 Fernando Perez <fperez@colorado.edu>
3597 2002-03-18 Fernando Perez <fperez@colorado.edu>
3590
3598
3591 * Released 0.2.8
3599 * Released 0.2.8
3592
3600
3593 * IPython/iplib.py (InteractiveShell.user_setup): fixed bug where
3601 * IPython/iplib.py (InteractiveShell.user_setup): fixed bug where
3594 some files weren't being included in a -upgrade.
3602 some files weren't being included in a -upgrade.
3595 (InteractiveShell.init_readline): Added 'set show-all-if-ambiguous
3603 (InteractiveShell.init_readline): Added 'set show-all-if-ambiguous
3596 on' so that the first tab completes.
3604 on' so that the first tab completes.
3597 (InteractiveShell.handle_magic): fixed bug with spaces around
3605 (InteractiveShell.handle_magic): fixed bug with spaces around
3598 quotes breaking many magic commands.
3606 quotes breaking many magic commands.
3599
3607
3600 * setup.py: added note about ignoring the syntax error messages at
3608 * setup.py: added note about ignoring the syntax error messages at
3601 installation.
3609 installation.
3602
3610
3603 * IPython/UserConfig/magic_gnuplot.py (magic_gp): finished
3611 * IPython/UserConfig/magic_gnuplot.py (magic_gp): finished
3604 streamlining the gnuplot interface, now there's only one magic @gp.
3612 streamlining the gnuplot interface, now there's only one magic @gp.
3605
3613
3606 2002-03-17 Fernando Perez <fperez@colorado.edu>
3614 2002-03-17 Fernando Perez <fperez@colorado.edu>
3607
3615
3608 * IPython/UserConfig/magic_gnuplot.py: new name for the
3616 * IPython/UserConfig/magic_gnuplot.py: new name for the
3609 example-magic_pm.py file. Much enhanced system, now with a shell
3617 example-magic_pm.py file. Much enhanced system, now with a shell
3610 for communicating directly with gnuplot, one command at a time.
3618 for communicating directly with gnuplot, one command at a time.
3611
3619
3612 * IPython/Magic.py (Magic.magic_run): added option -n to prevent
3620 * IPython/Magic.py (Magic.magic_run): added option -n to prevent
3613 setting __name__=='__main__'.
3621 setting __name__=='__main__'.
3614
3622
3615 * IPython/UserConfig/example-magic_pm.py (magic_pm): Added
3623 * IPython/UserConfig/example-magic_pm.py (magic_pm): Added
3616 mini-shell for accessing gnuplot from inside ipython. Should
3624 mini-shell for accessing gnuplot from inside ipython. Should
3617 extend it later for grace access too. Inspired by Arnd's
3625 extend it later for grace access too. Inspired by Arnd's
3618 suggestion.
3626 suggestion.
3619
3627
3620 * IPython/iplib.py (InteractiveShell.handle_magic): fixed bug when
3628 * IPython/iplib.py (InteractiveShell.handle_magic): fixed bug when
3621 calling magic functions with () in their arguments. Thanks to Arnd
3629 calling magic functions with () in their arguments. Thanks to Arnd
3622 Baecker for pointing this to me.
3630 Baecker for pointing this to me.
3623
3631
3624 * IPython/numutils.py (sum_flat): fixed bug. Would recurse
3632 * IPython/numutils.py (sum_flat): fixed bug. Would recurse
3625 infinitely for integer or complex arrays (only worked with floats).
3633 infinitely for integer or complex arrays (only worked with floats).
3626
3634
3627 2002-03-16 Fernando Perez <fperez@colorado.edu>
3635 2002-03-16 Fernando Perez <fperez@colorado.edu>
3628
3636
3629 * setup.py: Merged setup and setup_windows into a single script
3637 * setup.py: Merged setup and setup_windows into a single script
3630 which properly handles things for windows users.
3638 which properly handles things for windows users.
3631
3639
3632 2002-03-15 Fernando Perez <fperez@colorado.edu>
3640 2002-03-15 Fernando Perez <fperez@colorado.edu>
3633
3641
3634 * Big change to the manual: now the magics are all automatically
3642 * Big change to the manual: now the magics are all automatically
3635 documented. This information is generated from their docstrings
3643 documented. This information is generated from their docstrings
3636 and put in a latex file included by the manual lyx file. This way
3644 and put in a latex file included by the manual lyx file. This way
3637 we get always up to date information for the magics. The manual
3645 we get always up to date information for the magics. The manual
3638 now also has proper version information, also auto-synced.
3646 now also has proper version information, also auto-synced.
3639
3647
3640 For this to work, an undocumented --magic_docstrings option was added.
3648 For this to work, an undocumented --magic_docstrings option was added.
3641
3649
3642 2002-03-13 Fernando Perez <fperez@colorado.edu>
3650 2002-03-13 Fernando Perez <fperez@colorado.edu>
3643
3651
3644 * IPython/ultraTB.py (TermColors): fixed problem with dark colors
3652 * IPython/ultraTB.py (TermColors): fixed problem with dark colors
3645 under CDE terminals. An explicit ;2 color reset is needed in the escapes.
3653 under CDE terminals. An explicit ;2 color reset is needed in the escapes.
3646
3654
3647 2002-03-12 Fernando Perez <fperez@colorado.edu>
3655 2002-03-12 Fernando Perez <fperez@colorado.edu>
3648
3656
3649 * IPython/ultraTB.py (TermColors): changed color escapes again to
3657 * IPython/ultraTB.py (TermColors): changed color escapes again to
3650 fix the (old, reintroduced) line-wrapping bug. Basically, if
3658 fix the (old, reintroduced) line-wrapping bug. Basically, if
3651 \001..\002 aren't given in the color escapes, lines get wrapped
3659 \001..\002 aren't given in the color escapes, lines get wrapped
3652 weirdly. But giving those screws up old xterms and emacs terms. So
3660 weirdly. But giving those screws up old xterms and emacs terms. So
3653 I added some logic for emacs terms to be ok, but I can't identify old
3661 I added some logic for emacs terms to be ok, but I can't identify old
3654 xterms separately ($TERM=='xterm' for many terminals, like konsole).
3662 xterms separately ($TERM=='xterm' for many terminals, like konsole).
3655
3663
3656 2002-03-10 Fernando Perez <fperez@colorado.edu>
3664 2002-03-10 Fernando Perez <fperez@colorado.edu>
3657
3665
3658 * IPython/usage.py (__doc__): Various documentation cleanups and
3666 * IPython/usage.py (__doc__): Various documentation cleanups and
3659 updates, both in usage docstrings and in the manual.
3667 updates, both in usage docstrings and in the manual.
3660
3668
3661 * IPython/Prompts.py (CachedOutput.set_colors): cleanups for
3669 * IPython/Prompts.py (CachedOutput.set_colors): cleanups for
3662 handling of caching. Set minimum acceptabe value for having a
3670 handling of caching. Set minimum acceptabe value for having a
3663 cache at 20 values.
3671 cache at 20 values.
3664
3672
3665 * IPython/iplib.py (InteractiveShell.user_setup): moved the
3673 * IPython/iplib.py (InteractiveShell.user_setup): moved the
3666 install_first_time function to a method, renamed it and added an
3674 install_first_time function to a method, renamed it and added an
3667 'upgrade' mode. Now people can update their config directory with
3675 'upgrade' mode. Now people can update their config directory with
3668 a simple command line switch (-upgrade, also new).
3676 a simple command line switch (-upgrade, also new).
3669
3677
3670 * IPython/Magic.py (Magic.magic_pfile): Made @pfile an alias to
3678 * IPython/Magic.py (Magic.magic_pfile): Made @pfile an alias to
3671 @file (convenient for automagic users under Python >= 2.2).
3679 @file (convenient for automagic users under Python >= 2.2).
3672 Removed @files (it seemed more like a plural than an abbrev. of
3680 Removed @files (it seemed more like a plural than an abbrev. of
3673 'file show').
3681 'file show').
3674
3682
3675 * IPython/iplib.py (install_first_time): Fixed crash if there were
3683 * IPython/iplib.py (install_first_time): Fixed crash if there were
3676 backup files ('~') in .ipython/ install directory.
3684 backup files ('~') in .ipython/ install directory.
3677
3685
3678 * IPython/ipmaker.py (make_IPython): fixes for new prompt
3686 * IPython/ipmaker.py (make_IPython): fixes for new prompt
3679 system. Things look fine, but these changes are fairly
3687 system. Things look fine, but these changes are fairly
3680 intrusive. Test them for a few days.
3688 intrusive. Test them for a few days.
3681
3689
3682 * IPython/Prompts.py (CachedOutput.__init__): Massive rewrite of
3690 * IPython/Prompts.py (CachedOutput.__init__): Massive rewrite of
3683 the prompts system. Now all in/out prompt strings are user
3691 the prompts system. Now all in/out prompt strings are user
3684 controllable. This is particularly useful for embedding, as one
3692 controllable. This is particularly useful for embedding, as one
3685 can tag embedded instances with particular prompts.
3693 can tag embedded instances with particular prompts.
3686
3694
3687 Also removed global use of sys.ps1/2, which now allows nested
3695 Also removed global use of sys.ps1/2, which now allows nested
3688 embeddings without any problems. Added command-line options for
3696 embeddings without any problems. Added command-line options for
3689 the prompt strings.
3697 the prompt strings.
3690
3698
3691 2002-03-08 Fernando Perez <fperez@colorado.edu>
3699 2002-03-08 Fernando Perez <fperez@colorado.edu>
3692
3700
3693 * IPython/UserConfig/example-embed-short.py (ipshell): added
3701 * IPython/UserConfig/example-embed-short.py (ipshell): added
3694 example file with the bare minimum code for embedding.
3702 example file with the bare minimum code for embedding.
3695
3703
3696 * IPython/Shell.py (IPythonShellEmbed.set_dummy_mode): added
3704 * IPython/Shell.py (IPythonShellEmbed.set_dummy_mode): added
3697 functionality for the embeddable shell to be activated/deactivated
3705 functionality for the embeddable shell to be activated/deactivated
3698 either globally or at each call.
3706 either globally or at each call.
3699
3707
3700 * IPython/Prompts.py (Prompt1.auto_rewrite): Fixes the problem of
3708 * IPython/Prompts.py (Prompt1.auto_rewrite): Fixes the problem of
3701 rewriting the prompt with '--->' for auto-inputs with proper
3709 rewriting the prompt with '--->' for auto-inputs with proper
3702 coloring. Now the previous UGLY hack in handle_auto() is gone, and
3710 coloring. Now the previous UGLY hack in handle_auto() is gone, and
3703 this is handled by the prompts class itself, as it should.
3711 this is handled by the prompts class itself, as it should.
3704
3712
3705 2002-03-05 Fernando Perez <fperez@colorado.edu>
3713 2002-03-05 Fernando Perez <fperez@colorado.edu>
3706
3714
3707 * IPython/Magic.py (Magic.magic_logstart): Changed @log to
3715 * IPython/Magic.py (Magic.magic_logstart): Changed @log to
3708 @logstart to avoid name clashes with the math log function.
3716 @logstart to avoid name clashes with the math log function.
3709
3717
3710 * Big updates to X/Emacs section of the manual.
3718 * Big updates to X/Emacs section of the manual.
3711
3719
3712 * Removed ipython_emacs. Milan explained to me how to pass
3720 * Removed ipython_emacs. Milan explained to me how to pass
3713 arguments to ipython through Emacs. Some day I'm going to end up
3721 arguments to ipython through Emacs. Some day I'm going to end up
3714 learning some lisp...
3722 learning some lisp...
3715
3723
3716 2002-03-04 Fernando Perez <fperez@colorado.edu>
3724 2002-03-04 Fernando Perez <fperez@colorado.edu>
3717
3725
3718 * IPython/ipython_emacs: Created script to be used as the
3726 * IPython/ipython_emacs: Created script to be used as the
3719 py-python-command Emacs variable so we can pass IPython
3727 py-python-command Emacs variable so we can pass IPython
3720 parameters. I can't figure out how to tell Emacs directly to pass
3728 parameters. I can't figure out how to tell Emacs directly to pass
3721 parameters to IPython, so a dummy shell script will do it.
3729 parameters to IPython, so a dummy shell script will do it.
3722
3730
3723 Other enhancements made for things to work better under Emacs'
3731 Other enhancements made for things to work better under Emacs'
3724 various types of terminals. Many thanks to Milan Zamazal
3732 various types of terminals. Many thanks to Milan Zamazal
3725 <pdm-AT-zamazal.org> for all the suggestions and pointers.
3733 <pdm-AT-zamazal.org> for all the suggestions and pointers.
3726
3734
3727 2002-03-01 Fernando Perez <fperez@colorado.edu>
3735 2002-03-01 Fernando Perez <fperez@colorado.edu>
3728
3736
3729 * IPython/ipmaker.py (make_IPython): added a --readline! option so
3737 * IPython/ipmaker.py (make_IPython): added a --readline! option so
3730 that loading of readline is now optional. This gives better
3738 that loading of readline is now optional. This gives better
3731 control to emacs users.
3739 control to emacs users.
3732
3740
3733 * IPython/ultraTB.py (__date__): Modified color escape sequences
3741 * IPython/ultraTB.py (__date__): Modified color escape sequences
3734 and now things work fine under xterm and in Emacs' term buffers
3742 and now things work fine under xterm and in Emacs' term buffers
3735 (though not shell ones). Well, in emacs you get colors, but all
3743 (though not shell ones). Well, in emacs you get colors, but all
3736 seem to be 'light' colors (no difference between dark and light
3744 seem to be 'light' colors (no difference between dark and light
3737 ones). But the garbage chars are gone, and also in xterms. It
3745 ones). But the garbage chars are gone, and also in xterms. It
3738 seems that now I'm using 'cleaner' ansi sequences.
3746 seems that now I'm using 'cleaner' ansi sequences.
3739
3747
3740 2002-02-21 Fernando Perez <fperez@colorado.edu>
3748 2002-02-21 Fernando Perez <fperez@colorado.edu>
3741
3749
3742 * Released 0.2.7 (mainly to publish the scoping fix).
3750 * Released 0.2.7 (mainly to publish the scoping fix).
3743
3751
3744 * IPython/Logger.py (Logger.logstate): added. A corresponding
3752 * IPython/Logger.py (Logger.logstate): added. A corresponding
3745 @logstate magic was created.
3753 @logstate magic was created.
3746
3754
3747 * IPython/Magic.py: fixed nested scoping problem under Python
3755 * IPython/Magic.py: fixed nested scoping problem under Python
3748 2.1.x (automagic wasn't working).
3756 2.1.x (automagic wasn't working).
3749
3757
3750 2002-02-20 Fernando Perez <fperez@colorado.edu>
3758 2002-02-20 Fernando Perez <fperez@colorado.edu>
3751
3759
3752 * Released 0.2.6.
3760 * Released 0.2.6.
3753
3761
3754 * IPython/OutputTrap.py (OutputTrap.__init__): added a 'quiet'
3762 * IPython/OutputTrap.py (OutputTrap.__init__): added a 'quiet'
3755 option so that logs can come out without any headers at all.
3763 option so that logs can come out without any headers at all.
3756
3764
3757 * IPython/UserConfig/ipythonrc-scipy.py: created a profile for
3765 * IPython/UserConfig/ipythonrc-scipy.py: created a profile for
3758 SciPy.
3766 SciPy.
3759
3767
3760 * IPython/iplib.py (InteractiveShell.embed_mainloop): Changed so
3768 * IPython/iplib.py (InteractiveShell.embed_mainloop): Changed so
3761 that embedded IPython calls don't require vars() to be explicitly
3769 that embedded IPython calls don't require vars() to be explicitly
3762 passed. Now they are extracted from the caller's frame (code
3770 passed. Now they are extracted from the caller's frame (code
3763 snatched from Eric Jones' weave). Added better documentation to
3771 snatched from Eric Jones' weave). Added better documentation to
3764 the section on embedding and the example file.
3772 the section on embedding and the example file.
3765
3773
3766 * IPython/genutils.py (page): Changed so that under emacs, it just
3774 * IPython/genutils.py (page): Changed so that under emacs, it just
3767 prints the string. You can then page up and down in the emacs
3775 prints the string. You can then page up and down in the emacs
3768 buffer itself. This is how the builtin help() works.
3776 buffer itself. This is how the builtin help() works.
3769
3777
3770 * IPython/Prompts.py (CachedOutput.__call__): Fixed issue with
3778 * IPython/Prompts.py (CachedOutput.__call__): Fixed issue with
3771 macro scoping: macros need to be executed in the user's namespace
3779 macro scoping: macros need to be executed in the user's namespace
3772 to work as if they had been typed by the user.
3780 to work as if they had been typed by the user.
3773
3781
3774 * IPython/Magic.py (Magic.magic_macro): Changed macros so they
3782 * IPython/Magic.py (Magic.magic_macro): Changed macros so they
3775 execute automatically (no need to type 'exec...'). They then
3783 execute automatically (no need to type 'exec...'). They then
3776 behave like 'true macros'. The printing system was also modified
3784 behave like 'true macros'. The printing system was also modified
3777 for this to work.
3785 for this to work.
3778
3786
3779 2002-02-19 Fernando Perez <fperez@colorado.edu>
3787 2002-02-19 Fernando Perez <fperez@colorado.edu>
3780
3788
3781 * IPython/genutils.py (page_file): new function for paging files
3789 * IPython/genutils.py (page_file): new function for paging files
3782 in an OS-independent way. Also necessary for file viewing to work
3790 in an OS-independent way. Also necessary for file viewing to work
3783 well inside Emacs buffers.
3791 well inside Emacs buffers.
3784 (page): Added checks for being in an emacs buffer.
3792 (page): Added checks for being in an emacs buffer.
3785 (page): fixed bug for Windows ($TERM isn't set in Windows). Fixed
3793 (page): fixed bug for Windows ($TERM isn't set in Windows). Fixed
3786 same bug in iplib.
3794 same bug in iplib.
3787
3795
3788 2002-02-18 Fernando Perez <fperez@colorado.edu>
3796 2002-02-18 Fernando Perez <fperez@colorado.edu>
3789
3797
3790 * IPython/iplib.py (InteractiveShell.init_readline): modified use
3798 * IPython/iplib.py (InteractiveShell.init_readline): modified use
3791 of readline so that IPython can work inside an Emacs buffer.
3799 of readline so that IPython can work inside an Emacs buffer.
3792
3800
3793 * IPython/ultraTB.py (AutoFormattedTB.__call__): some fixes to
3801 * IPython/ultraTB.py (AutoFormattedTB.__call__): some fixes to
3794 method signatures (they weren't really bugs, but it looks cleaner
3802 method signatures (they weren't really bugs, but it looks cleaner
3795 and keeps PyChecker happy).
3803 and keeps PyChecker happy).
3796
3804
3797 * IPython/ipmaker.py (make_IPython): added hooks Struct to __IP
3805 * IPython/ipmaker.py (make_IPython): added hooks Struct to __IP
3798 for implementing various user-defined hooks. Currently only
3806 for implementing various user-defined hooks. Currently only
3799 display is done.
3807 display is done.
3800
3808
3801 * IPython/Prompts.py (CachedOutput._display): changed display
3809 * IPython/Prompts.py (CachedOutput._display): changed display
3802 functions so that they can be dynamically changed by users easily.
3810 functions so that they can be dynamically changed by users easily.
3803
3811
3804 * IPython/Extensions/numeric_formats.py (num_display): added an
3812 * IPython/Extensions/numeric_formats.py (num_display): added an
3805 extension for printing NumPy arrays in flexible manners. It
3813 extension for printing NumPy arrays in flexible manners. It
3806 doesn't do anything yet, but all the structure is in
3814 doesn't do anything yet, but all the structure is in
3807 place. Ultimately the plan is to implement output format control
3815 place. Ultimately the plan is to implement output format control
3808 like in Octave.
3816 like in Octave.
3809
3817
3810 * IPython/Magic.py (Magic.lsmagic): changed so that bound magic
3818 * IPython/Magic.py (Magic.lsmagic): changed so that bound magic
3811 methods are found at run-time by all the automatic machinery.
3819 methods are found at run-time by all the automatic machinery.
3812
3820
3813 2002-02-17 Fernando Perez <fperez@colorado.edu>
3821 2002-02-17 Fernando Perez <fperez@colorado.edu>
3814
3822
3815 * setup_Windows.py (make_shortcut): documented. Cleaned up the
3823 * setup_Windows.py (make_shortcut): documented. Cleaned up the
3816 whole file a little.
3824 whole file a little.
3817
3825
3818 * ToDo: closed this document. Now there's a new_design.lyx
3826 * ToDo: closed this document. Now there's a new_design.lyx
3819 document for all new ideas. Added making a pdf of it for the
3827 document for all new ideas. Added making a pdf of it for the
3820 end-user distro.
3828 end-user distro.
3821
3829
3822 * IPython/Logger.py (Logger.switch_log): Created this to replace
3830 * IPython/Logger.py (Logger.switch_log): Created this to replace
3823 logon() and logoff(). It also fixes a nasty crash reported by
3831 logon() and logoff(). It also fixes a nasty crash reported by
3824 Philip Hisley <compsys-AT-starpower.net>. Many thanks to him.
3832 Philip Hisley <compsys-AT-starpower.net>. Many thanks to him.
3825
3833
3826 * IPython/iplib.py (complete): got auto-completion to work with
3834 * IPython/iplib.py (complete): got auto-completion to work with
3827 automagic (I had wanted this for a long time).
3835 automagic (I had wanted this for a long time).
3828
3836
3829 * IPython/Magic.py (Magic.magic_files): Added @files as an alias
3837 * IPython/Magic.py (Magic.magic_files): Added @files as an alias
3830 to @file, since file() is now a builtin and clashes with automagic
3838 to @file, since file() is now a builtin and clashes with automagic
3831 for @file.
3839 for @file.
3832
3840
3833 * Made some new files: Prompts, CrashHandler, Magic, Logger. All
3841 * Made some new files: Prompts, CrashHandler, Magic, Logger. All
3834 of this was previously in iplib, which had grown to more than 2000
3842 of this was previously in iplib, which had grown to more than 2000
3835 lines, way too long. No new functionality, but it makes managing
3843 lines, way too long. No new functionality, but it makes managing
3836 the code a bit easier.
3844 the code a bit easier.
3837
3845
3838 * IPython/iplib.py (IPythonCrashHandler.__call__): Added version
3846 * IPython/iplib.py (IPythonCrashHandler.__call__): Added version
3839 information to crash reports.
3847 information to crash reports.
3840
3848
3841 2002-02-12 Fernando Perez <fperez@colorado.edu>
3849 2002-02-12 Fernando Perez <fperez@colorado.edu>
3842
3850
3843 * Released 0.2.5.
3851 * Released 0.2.5.
3844
3852
3845 2002-02-11 Fernando Perez <fperez@colorado.edu>
3853 2002-02-11 Fernando Perez <fperez@colorado.edu>
3846
3854
3847 * Wrote a relatively complete Windows installer. It puts
3855 * Wrote a relatively complete Windows installer. It puts
3848 everything in place, creates Start Menu entries and fixes the
3856 everything in place, creates Start Menu entries and fixes the
3849 color issues. Nothing fancy, but it works.
3857 color issues. Nothing fancy, but it works.
3850
3858
3851 2002-02-10 Fernando Perez <fperez@colorado.edu>
3859 2002-02-10 Fernando Perez <fperez@colorado.edu>
3852
3860
3853 * IPython/iplib.py (InteractiveShell.safe_execfile): added an
3861 * IPython/iplib.py (InteractiveShell.safe_execfile): added an
3854 os.path.expanduser() call so that we can type @run ~/myfile.py and
3862 os.path.expanduser() call so that we can type @run ~/myfile.py and
3855 have thigs work as expected.
3863 have thigs work as expected.
3856
3864
3857 * IPython/genutils.py (page): fixed exception handling so things
3865 * IPython/genutils.py (page): fixed exception handling so things
3858 work both in Unix and Windows correctly. Quitting a pager triggers
3866 work both in Unix and Windows correctly. Quitting a pager triggers
3859 an IOError/broken pipe in Unix, and in windows not finding a pager
3867 an IOError/broken pipe in Unix, and in windows not finding a pager
3860 is also an IOError, so I had to actually look at the return value
3868 is also an IOError, so I had to actually look at the return value
3861 of the exception, not just the exception itself. Should be ok now.
3869 of the exception, not just the exception itself. Should be ok now.
3862
3870
3863 * IPython/ultraTB.py (ColorSchemeTable.set_active_scheme):
3871 * IPython/ultraTB.py (ColorSchemeTable.set_active_scheme):
3864 modified to allow case-insensitive color scheme changes.
3872 modified to allow case-insensitive color scheme changes.
3865
3873
3866 2002-02-09 Fernando Perez <fperez@colorado.edu>
3874 2002-02-09 Fernando Perez <fperez@colorado.edu>
3867
3875
3868 * IPython/genutils.py (native_line_ends): new function to leave
3876 * IPython/genutils.py (native_line_ends): new function to leave
3869 user config files with os-native line-endings.
3877 user config files with os-native line-endings.
3870
3878
3871 * README and manual updates.
3879 * README and manual updates.
3872
3880
3873 * IPython/genutils.py: fixed unicode bug: use types.StringTypes
3881 * IPython/genutils.py: fixed unicode bug: use types.StringTypes
3874 instead of StringType to catch Unicode strings.
3882 instead of StringType to catch Unicode strings.
3875
3883
3876 * IPython/genutils.py (filefind): fixed bug for paths with
3884 * IPython/genutils.py (filefind): fixed bug for paths with
3877 embedded spaces (very common in Windows).
3885 embedded spaces (very common in Windows).
3878
3886
3879 * IPython/ipmaker.py (make_IPython): added a '.ini' to the rc
3887 * IPython/ipmaker.py (make_IPython): added a '.ini' to the rc
3880 files under Windows, so that they get automatically associated
3888 files under Windows, so that they get automatically associated
3881 with a text editor. Windows makes it a pain to handle
3889 with a text editor. Windows makes it a pain to handle
3882 extension-less files.
3890 extension-less files.
3883
3891
3884 * IPython/iplib.py (InteractiveShell.init_readline): Made the
3892 * IPython/iplib.py (InteractiveShell.init_readline): Made the
3885 warning about readline only occur for Posix. In Windows there's no
3893 warning about readline only occur for Posix. In Windows there's no
3886 way to get readline, so why bother with the warning.
3894 way to get readline, so why bother with the warning.
3887
3895
3888 * IPython/Struct.py (Struct.__str__): fixed to use self.__dict__
3896 * IPython/Struct.py (Struct.__str__): fixed to use self.__dict__
3889 for __str__ instead of dir(self), since dir() changed in 2.2.
3897 for __str__ instead of dir(self), since dir() changed in 2.2.
3890
3898
3891 * Ported to Windows! Tested on XP, I suspect it should work fine
3899 * Ported to Windows! Tested on XP, I suspect it should work fine
3892 on NT/2000, but I don't think it will work on 98 et al. That
3900 on NT/2000, but I don't think it will work on 98 et al. That
3893 series of Windows is such a piece of junk anyway that I won't try
3901 series of Windows is such a piece of junk anyway that I won't try
3894 porting it there. The XP port was straightforward, showed a few
3902 porting it there. The XP port was straightforward, showed a few
3895 bugs here and there (fixed all), in particular some string
3903 bugs here and there (fixed all), in particular some string
3896 handling stuff which required considering Unicode strings (which
3904 handling stuff which required considering Unicode strings (which
3897 Windows uses). This is good, but hasn't been too tested :) No
3905 Windows uses). This is good, but hasn't been too tested :) No
3898 fancy installer yet, I'll put a note in the manual so people at
3906 fancy installer yet, I'll put a note in the manual so people at
3899 least make manually a shortcut.
3907 least make manually a shortcut.
3900
3908
3901 * IPython/iplib.py (Magic.magic_colors): Unified the color options
3909 * IPython/iplib.py (Magic.magic_colors): Unified the color options
3902 into a single one, "colors". This now controls both prompt and
3910 into a single one, "colors". This now controls both prompt and
3903 exception color schemes, and can be changed both at startup
3911 exception color schemes, and can be changed both at startup
3904 (either via command-line switches or via ipythonrc files) and at
3912 (either via command-line switches or via ipythonrc files) and at
3905 runtime, with @colors.
3913 runtime, with @colors.
3906 (Magic.magic_run): renamed @prun to @run and removed the old
3914 (Magic.magic_run): renamed @prun to @run and removed the old
3907 @run. The two were too similar to warrant keeping both.
3915 @run. The two were too similar to warrant keeping both.
3908
3916
3909 2002-02-03 Fernando Perez <fperez@colorado.edu>
3917 2002-02-03 Fernando Perez <fperez@colorado.edu>
3910
3918
3911 * IPython/iplib.py (install_first_time): Added comment on how to
3919 * IPython/iplib.py (install_first_time): Added comment on how to
3912 configure the color options for first-time users. Put a <return>
3920 configure the color options for first-time users. Put a <return>
3913 request at the end so that small-terminal users get a chance to
3921 request at the end so that small-terminal users get a chance to
3914 read the startup info.
3922 read the startup info.
3915
3923
3916 2002-01-23 Fernando Perez <fperez@colorado.edu>
3924 2002-01-23 Fernando Perez <fperez@colorado.edu>
3917
3925
3918 * IPython/iplib.py (CachedOutput.update): Changed output memory
3926 * IPython/iplib.py (CachedOutput.update): Changed output memory
3919 variable names from _o,_oo,_ooo,_o<n> to simply _,__,___,_<n>. For
3927 variable names from _o,_oo,_ooo,_o<n> to simply _,__,___,_<n>. For
3920 input history we still use _i. Did this b/c these variable are
3928 input history we still use _i. Did this b/c these variable are
3921 very commonly used in interactive work, so the less we need to
3929 very commonly used in interactive work, so the less we need to
3922 type the better off we are.
3930 type the better off we are.
3923 (Magic.magic_prun): updated @prun to better handle the namespaces
3931 (Magic.magic_prun): updated @prun to better handle the namespaces
3924 the file will run in, including a fix for __name__ not being set
3932 the file will run in, including a fix for __name__ not being set
3925 before.
3933 before.
3926
3934
3927 2002-01-20 Fernando Perez <fperez@colorado.edu>
3935 2002-01-20 Fernando Perez <fperez@colorado.edu>
3928
3936
3929 * IPython/ultraTB.py (VerboseTB.linereader): Fixed printing of
3937 * IPython/ultraTB.py (VerboseTB.linereader): Fixed printing of
3930 extra garbage for Python 2.2. Need to look more carefully into
3938 extra garbage for Python 2.2. Need to look more carefully into
3931 this later.
3939 this later.
3932
3940
3933 2002-01-19 Fernando Perez <fperez@colorado.edu>
3941 2002-01-19 Fernando Perez <fperez@colorado.edu>
3934
3942
3935 * IPython/iplib.py (InteractiveShell.showtraceback): fixed to
3943 * IPython/iplib.py (InteractiveShell.showtraceback): fixed to
3936 display SyntaxError exceptions properly formatted when they occur
3944 display SyntaxError exceptions properly formatted when they occur
3937 (they can be triggered by imported code).
3945 (they can be triggered by imported code).
3938
3946
3939 2002-01-18 Fernando Perez <fperez@colorado.edu>
3947 2002-01-18 Fernando Perez <fperez@colorado.edu>
3940
3948
3941 * IPython/iplib.py (InteractiveShell.safe_execfile): now
3949 * IPython/iplib.py (InteractiveShell.safe_execfile): now
3942 SyntaxError exceptions are reported nicely formatted, instead of
3950 SyntaxError exceptions are reported nicely formatted, instead of
3943 spitting out only offset information as before.
3951 spitting out only offset information as before.
3944 (Magic.magic_prun): Added the @prun function for executing
3952 (Magic.magic_prun): Added the @prun function for executing
3945 programs with command line args inside IPython.
3953 programs with command line args inside IPython.
3946
3954
3947 2002-01-16 Fernando Perez <fperez@colorado.edu>
3955 2002-01-16 Fernando Perez <fperez@colorado.edu>
3948
3956
3949 * IPython/iplib.py (Magic.magic_hist): Changed @hist and @dhist
3957 * IPython/iplib.py (Magic.magic_hist): Changed @hist and @dhist
3950 to *not* include the last item given in a range. This brings their
3958 to *not* include the last item given in a range. This brings their
3951 behavior in line with Python's slicing:
3959 behavior in line with Python's slicing:
3952 a[n1:n2] -> a[n1]...a[n2-1]
3960 a[n1:n2] -> a[n1]...a[n2-1]
3953 It may be a bit less convenient, but I prefer to stick to Python's
3961 It may be a bit less convenient, but I prefer to stick to Python's
3954 conventions *everywhere*, so users never have to wonder.
3962 conventions *everywhere*, so users never have to wonder.
3955 (Magic.magic_macro): Added @macro function to ease the creation of
3963 (Magic.magic_macro): Added @macro function to ease the creation of
3956 macros.
3964 macros.
3957
3965
3958 2002-01-05 Fernando Perez <fperez@colorado.edu>
3966 2002-01-05 Fernando Perez <fperez@colorado.edu>
3959
3967
3960 * Released 0.2.4.
3968 * Released 0.2.4.
3961
3969
3962 * IPython/iplib.py (Magic.magic_pdef):
3970 * IPython/iplib.py (Magic.magic_pdef):
3963 (InteractiveShell.safe_execfile): report magic lines and error
3971 (InteractiveShell.safe_execfile): report magic lines and error
3964 lines without line numbers so one can easily copy/paste them for
3972 lines without line numbers so one can easily copy/paste them for
3965 re-execution.
3973 re-execution.
3966
3974
3967 * Updated manual with recent changes.
3975 * Updated manual with recent changes.
3968
3976
3969 * IPython/iplib.py (Magic.magic_oinfo): added constructor
3977 * IPython/iplib.py (Magic.magic_oinfo): added constructor
3970 docstring printing when class? is called. Very handy for knowing
3978 docstring printing when class? is called. Very handy for knowing
3971 how to create class instances (as long as __init__ is well
3979 how to create class instances (as long as __init__ is well
3972 documented, of course :)
3980 documented, of course :)
3973 (Magic.magic_doc): print both class and constructor docstrings.
3981 (Magic.magic_doc): print both class and constructor docstrings.
3974 (Magic.magic_pdef): give constructor info if passed a class and
3982 (Magic.magic_pdef): give constructor info if passed a class and
3975 __call__ info for callable object instances.
3983 __call__ info for callable object instances.
3976
3984
3977 2002-01-04 Fernando Perez <fperez@colorado.edu>
3985 2002-01-04 Fernando Perez <fperez@colorado.edu>
3978
3986
3979 * Made deep_reload() off by default. It doesn't always work
3987 * Made deep_reload() off by default. It doesn't always work
3980 exactly as intended, so it's probably safer to have it off. It's
3988 exactly as intended, so it's probably safer to have it off. It's
3981 still available as dreload() anyway, so nothing is lost.
3989 still available as dreload() anyway, so nothing is lost.
3982
3990
3983 2002-01-02 Fernando Perez <fperez@colorado.edu>
3991 2002-01-02 Fernando Perez <fperez@colorado.edu>
3984
3992
3985 * Released 0.2.3 (contacted R.Singh at CU about biopython course,
3993 * Released 0.2.3 (contacted R.Singh at CU about biopython course,
3986 so I wanted an updated release).
3994 so I wanted an updated release).
3987
3995
3988 2001-12-27 Fernando Perez <fperez@colorado.edu>
3996 2001-12-27 Fernando Perez <fperez@colorado.edu>
3989
3997
3990 * IPython/iplib.py (InteractiveShell.interact): Added the original
3998 * IPython/iplib.py (InteractiveShell.interact): Added the original
3991 code from 'code.py' for this module in order to change the
3999 code from 'code.py' for this module in order to change the
3992 handling of a KeyboardInterrupt. This was necessary b/c otherwise
4000 handling of a KeyboardInterrupt. This was necessary b/c otherwise
3993 the history cache would break when the user hit Ctrl-C, and
4001 the history cache would break when the user hit Ctrl-C, and
3994 interact() offers no way to add any hooks to it.
4002 interact() offers no way to add any hooks to it.
3995
4003
3996 2001-12-23 Fernando Perez <fperez@colorado.edu>
4004 2001-12-23 Fernando Perez <fperez@colorado.edu>
3997
4005
3998 * setup.py: added check for 'MANIFEST' before trying to remove
4006 * setup.py: added check for 'MANIFEST' before trying to remove
3999 it. Thanks to Sean Reifschneider.
4007 it. Thanks to Sean Reifschneider.
4000
4008
4001 2001-12-22 Fernando Perez <fperez@colorado.edu>
4009 2001-12-22 Fernando Perez <fperez@colorado.edu>
4002
4010
4003 * Released 0.2.2.
4011 * Released 0.2.2.
4004
4012
4005 * Finished (reasonably) writing the manual. Later will add the
4013 * Finished (reasonably) writing the manual. Later will add the
4006 python-standard navigation stylesheets, but for the time being
4014 python-standard navigation stylesheets, but for the time being
4007 it's fairly complete. Distribution will include html and pdf
4015 it's fairly complete. Distribution will include html and pdf
4008 versions.
4016 versions.
4009
4017
4010 * Bugfix: '.' wasn't being added to sys.path. Thanks to Prabhu
4018 * Bugfix: '.' wasn't being added to sys.path. Thanks to Prabhu
4011 (MayaVi author).
4019 (MayaVi author).
4012
4020
4013 2001-12-21 Fernando Perez <fperez@colorado.edu>
4021 2001-12-21 Fernando Perez <fperez@colorado.edu>
4014
4022
4015 * Released 0.2.1. Barring any nasty bugs, this is it as far as a
4023 * Released 0.2.1. Barring any nasty bugs, this is it as far as a
4016 good public release, I think (with the manual and the distutils
4024 good public release, I think (with the manual and the distutils
4017 installer). The manual can use some work, but that can go
4025 installer). The manual can use some work, but that can go
4018 slowly. Otherwise I think it's quite nice for end users. Next
4026 slowly. Otherwise I think it's quite nice for end users. Next
4019 summer, rewrite the guts of it...
4027 summer, rewrite the guts of it...
4020
4028
4021 * Changed format of ipythonrc files to use whitespace as the
4029 * Changed format of ipythonrc files to use whitespace as the
4022 separator instead of an explicit '='. Cleaner.
4030 separator instead of an explicit '='. Cleaner.
4023
4031
4024 2001-12-20 Fernando Perez <fperez@colorado.edu>
4032 2001-12-20 Fernando Perez <fperez@colorado.edu>
4025
4033
4026 * Started a manual in LyX. For now it's just a quick merge of the
4034 * Started a manual in LyX. For now it's just a quick merge of the
4027 various internal docstrings and READMEs. Later it may grow into a
4035 various internal docstrings and READMEs. Later it may grow into a
4028 nice, full-blown manual.
4036 nice, full-blown manual.
4029
4037
4030 * Set up a distutils based installer. Installation should now be
4038 * Set up a distutils based installer. Installation should now be
4031 trivially simple for end-users.
4039 trivially simple for end-users.
4032
4040
4033 2001-12-11 Fernando Perez <fperez@colorado.edu>
4041 2001-12-11 Fernando Perez <fperez@colorado.edu>
4034
4042
4035 * Released 0.2.0. First public release, announced it at
4043 * Released 0.2.0. First public release, announced it at
4036 comp.lang.python. From now on, just bugfixes...
4044 comp.lang.python. From now on, just bugfixes...
4037
4045
4038 * Went through all the files, set copyright/license notices and
4046 * Went through all the files, set copyright/license notices and
4039 cleaned up things. Ready for release.
4047 cleaned up things. Ready for release.
4040
4048
4041 2001-12-10 Fernando Perez <fperez@colorado.edu>
4049 2001-12-10 Fernando Perez <fperez@colorado.edu>
4042
4050
4043 * Changed the first-time installer not to use tarfiles. It's more
4051 * Changed the first-time installer not to use tarfiles. It's more
4044 robust now and less unix-dependent. Also makes it easier for
4052 robust now and less unix-dependent. Also makes it easier for
4045 people to later upgrade versions.
4053 people to later upgrade versions.
4046
4054
4047 * Changed @exit to @abort to reflect the fact that it's pretty
4055 * Changed @exit to @abort to reflect the fact that it's pretty
4048 brutal (a sys.exit()). The difference between @abort and Ctrl-D
4056 brutal (a sys.exit()). The difference between @abort and Ctrl-D
4049 becomes significant only when IPyhton is embedded: in that case,
4057 becomes significant only when IPyhton is embedded: in that case,
4050 C-D closes IPython only, but @abort kills the enclosing program
4058 C-D closes IPython only, but @abort kills the enclosing program
4051 too (unless it had called IPython inside a try catching
4059 too (unless it had called IPython inside a try catching
4052 SystemExit).
4060 SystemExit).
4053
4061
4054 * Created Shell module which exposes the actuall IPython Shell
4062 * Created Shell module which exposes the actuall IPython Shell
4055 classes, currently the normal and the embeddable one. This at
4063 classes, currently the normal and the embeddable one. This at
4056 least offers a stable interface we won't need to change when
4064 least offers a stable interface we won't need to change when
4057 (later) the internals are rewritten. That rewrite will be confined
4065 (later) the internals are rewritten. That rewrite will be confined
4058 to iplib and ipmaker, but the Shell interface should remain as is.
4066 to iplib and ipmaker, but the Shell interface should remain as is.
4059
4067
4060 * Added embed module which offers an embeddable IPShell object,
4068 * Added embed module which offers an embeddable IPShell object,
4061 useful to fire up IPython *inside* a running program. Great for
4069 useful to fire up IPython *inside* a running program. Great for
4062 debugging or dynamical data analysis.
4070 debugging or dynamical data analysis.
4063
4071
4064 2001-12-08 Fernando Perez <fperez@colorado.edu>
4072 2001-12-08 Fernando Perez <fperez@colorado.edu>
4065
4073
4066 * Fixed small bug preventing seeing info from methods of defined
4074 * Fixed small bug preventing seeing info from methods of defined
4067 objects (incorrect namespace in _ofind()).
4075 objects (incorrect namespace in _ofind()).
4068
4076
4069 * Documentation cleanup. Moved the main usage docstrings to a
4077 * Documentation cleanup. Moved the main usage docstrings to a
4070 separate file, usage.py (cleaner to maintain, and hopefully in the
4078 separate file, usage.py (cleaner to maintain, and hopefully in the
4071 future some perlpod-like way of producing interactive, man and
4079 future some perlpod-like way of producing interactive, man and
4072 html docs out of it will be found).
4080 html docs out of it will be found).
4073
4081
4074 * Added @profile to see your profile at any time.
4082 * Added @profile to see your profile at any time.
4075
4083
4076 * Added @p as an alias for 'print'. It's especially convenient if
4084 * Added @p as an alias for 'print'. It's especially convenient if
4077 using automagic ('p x' prints x).
4085 using automagic ('p x' prints x).
4078
4086
4079 * Small cleanups and fixes after a pychecker run.
4087 * Small cleanups and fixes after a pychecker run.
4080
4088
4081 * Changed the @cd command to handle @cd - and @cd -<n> for
4089 * Changed the @cd command to handle @cd - and @cd -<n> for
4082 visiting any directory in _dh.
4090 visiting any directory in _dh.
4083
4091
4084 * Introduced _dh, a history of visited directories. @dhist prints
4092 * Introduced _dh, a history of visited directories. @dhist prints
4085 it out with numbers.
4093 it out with numbers.
4086
4094
4087 2001-12-07 Fernando Perez <fperez@colorado.edu>
4095 2001-12-07 Fernando Perez <fperez@colorado.edu>
4088
4096
4089 * Released 0.1.22
4097 * Released 0.1.22
4090
4098
4091 * Made initialization a bit more robust against invalid color
4099 * Made initialization a bit more robust against invalid color
4092 options in user input (exit, not traceback-crash).
4100 options in user input (exit, not traceback-crash).
4093
4101
4094 * Changed the bug crash reporter to write the report only in the
4102 * Changed the bug crash reporter to write the report only in the
4095 user's .ipython directory. That way IPython won't litter people's
4103 user's .ipython directory. That way IPython won't litter people's
4096 hard disks with crash files all over the place. Also print on
4104 hard disks with crash files all over the place. Also print on
4097 screen the necessary mail command.
4105 screen the necessary mail command.
4098
4106
4099 * With the new ultraTB, implemented LightBG color scheme for light
4107 * With the new ultraTB, implemented LightBG color scheme for light
4100 background terminals. A lot of people like white backgrounds, so I
4108 background terminals. A lot of people like white backgrounds, so I
4101 guess we should at least give them something readable.
4109 guess we should at least give them something readable.
4102
4110
4103 2001-12-06 Fernando Perez <fperez@colorado.edu>
4111 2001-12-06 Fernando Perez <fperez@colorado.edu>
4104
4112
4105 * Modified the structure of ultraTB. Now there's a proper class
4113 * Modified the structure of ultraTB. Now there's a proper class
4106 for tables of color schemes which allow adding schemes easily and
4114 for tables of color schemes which allow adding schemes easily and
4107 switching the active scheme without creating a new instance every
4115 switching the active scheme without creating a new instance every
4108 time (which was ridiculous). The syntax for creating new schemes
4116 time (which was ridiculous). The syntax for creating new schemes
4109 is also cleaner. I think ultraTB is finally done, with a clean
4117 is also cleaner. I think ultraTB is finally done, with a clean
4110 class structure. Names are also much cleaner (now there's proper
4118 class structure. Names are also much cleaner (now there's proper
4111 color tables, no need for every variable to also have 'color' in
4119 color tables, no need for every variable to also have 'color' in
4112 its name).
4120 its name).
4113
4121
4114 * Broke down genutils into separate files. Now genutils only
4122 * Broke down genutils into separate files. Now genutils only
4115 contains utility functions, and classes have been moved to their
4123 contains utility functions, and classes have been moved to their
4116 own files (they had enough independent functionality to warrant
4124 own files (they had enough independent functionality to warrant
4117 it): ConfigLoader, OutputTrap, Struct.
4125 it): ConfigLoader, OutputTrap, Struct.
4118
4126
4119 2001-12-05 Fernando Perez <fperez@colorado.edu>
4127 2001-12-05 Fernando Perez <fperez@colorado.edu>
4120
4128
4121 * IPython turns 21! Released version 0.1.21, as a candidate for
4129 * IPython turns 21! Released version 0.1.21, as a candidate for
4122 public consumption. If all goes well, release in a few days.
4130 public consumption. If all goes well, release in a few days.
4123
4131
4124 * Fixed path bug (files in Extensions/ directory wouldn't be found
4132 * Fixed path bug (files in Extensions/ directory wouldn't be found
4125 unless IPython/ was explicitly in sys.path).
4133 unless IPython/ was explicitly in sys.path).
4126
4134
4127 * Extended the FlexCompleter class as MagicCompleter to allow
4135 * Extended the FlexCompleter class as MagicCompleter to allow
4128 completion of @-starting lines.
4136 completion of @-starting lines.
4129
4137
4130 * Created __release__.py file as a central repository for release
4138 * Created __release__.py file as a central repository for release
4131 info that other files can read from.
4139 info that other files can read from.
4132
4140
4133 * Fixed small bug in logging: when logging was turned on in
4141 * Fixed small bug in logging: when logging was turned on in
4134 mid-session, old lines with special meanings (!@?) were being
4142 mid-session, old lines with special meanings (!@?) were being
4135 logged without the prepended comment, which is necessary since
4143 logged without the prepended comment, which is necessary since
4136 they are not truly valid python syntax. This should make session
4144 they are not truly valid python syntax. This should make session
4137 restores produce less errors.
4145 restores produce less errors.
4138
4146
4139 * The namespace cleanup forced me to make a FlexCompleter class
4147 * The namespace cleanup forced me to make a FlexCompleter class
4140 which is nothing but a ripoff of rlcompleter, but with selectable
4148 which is nothing but a ripoff of rlcompleter, but with selectable
4141 namespace (rlcompleter only works in __main__.__dict__). I'll try
4149 namespace (rlcompleter only works in __main__.__dict__). I'll try
4142 to submit a note to the authors to see if this change can be
4150 to submit a note to the authors to see if this change can be
4143 incorporated in future rlcompleter releases (Dec.6: done)
4151 incorporated in future rlcompleter releases (Dec.6: done)
4144
4152
4145 * More fixes to namespace handling. It was a mess! Now all
4153 * More fixes to namespace handling. It was a mess! Now all
4146 explicit references to __main__.__dict__ are gone (except when
4154 explicit references to __main__.__dict__ are gone (except when
4147 really needed) and everything is handled through the namespace
4155 really needed) and everything is handled through the namespace
4148 dicts in the IPython instance. We seem to be getting somewhere
4156 dicts in the IPython instance. We seem to be getting somewhere
4149 with this, finally...
4157 with this, finally...
4150
4158
4151 * Small documentation updates.
4159 * Small documentation updates.
4152
4160
4153 * Created the Extensions directory under IPython (with an
4161 * Created the Extensions directory under IPython (with an
4154 __init__.py). Put the PhysicalQ stuff there. This directory should
4162 __init__.py). Put the PhysicalQ stuff there. This directory should
4155 be used for all special-purpose extensions.
4163 be used for all special-purpose extensions.
4156
4164
4157 * File renaming:
4165 * File renaming:
4158 ipythonlib --> ipmaker
4166 ipythonlib --> ipmaker
4159 ipplib --> iplib
4167 ipplib --> iplib
4160 This makes a bit more sense in terms of what these files actually do.
4168 This makes a bit more sense in terms of what these files actually do.
4161
4169
4162 * Moved all the classes and functions in ipythonlib to ipplib, so
4170 * Moved all the classes and functions in ipythonlib to ipplib, so
4163 now ipythonlib only has make_IPython(). This will ease up its
4171 now ipythonlib only has make_IPython(). This will ease up its
4164 splitting in smaller functional chunks later.
4172 splitting in smaller functional chunks later.
4165
4173
4166 * Cleaned up (done, I think) output of @whos. Better column
4174 * Cleaned up (done, I think) output of @whos. Better column
4167 formatting, and now shows str(var) for as much as it can, which is
4175 formatting, and now shows str(var) for as much as it can, which is
4168 typically what one gets with a 'print var'.
4176 typically what one gets with a 'print var'.
4169
4177
4170 2001-12-04 Fernando Perez <fperez@colorado.edu>
4178 2001-12-04 Fernando Perez <fperez@colorado.edu>
4171
4179
4172 * Fixed namespace problems. Now builtin/IPyhton/user names get
4180 * Fixed namespace problems. Now builtin/IPyhton/user names get
4173 properly reported in their namespace. Internal namespace handling
4181 properly reported in their namespace. Internal namespace handling
4174 is finally getting decent (not perfect yet, but much better than
4182 is finally getting decent (not perfect yet, but much better than
4175 the ad-hoc mess we had).
4183 the ad-hoc mess we had).
4176
4184
4177 * Removed -exit option. If people just want to run a python
4185 * Removed -exit option. If people just want to run a python
4178 script, that's what the normal interpreter is for. Less
4186 script, that's what the normal interpreter is for. Less
4179 unnecessary options, less chances for bugs.
4187 unnecessary options, less chances for bugs.
4180
4188
4181 * Added a crash handler which generates a complete post-mortem if
4189 * Added a crash handler which generates a complete post-mortem if
4182 IPython crashes. This will help a lot in tracking bugs down the
4190 IPython crashes. This will help a lot in tracking bugs down the
4183 road.
4191 road.
4184
4192
4185 * Fixed nasty bug in auto-evaluation part of prefilter(). Names
4193 * Fixed nasty bug in auto-evaluation part of prefilter(). Names
4186 which were boud to functions being reassigned would bypass the
4194 which were boud to functions being reassigned would bypass the
4187 logger, breaking the sync of _il with the prompt counter. This
4195 logger, breaking the sync of _il with the prompt counter. This
4188 would then crash IPython later when a new line was logged.
4196 would then crash IPython later when a new line was logged.
4189
4197
4190 2001-12-02 Fernando Perez <fperez@colorado.edu>
4198 2001-12-02 Fernando Perez <fperez@colorado.edu>
4191
4199
4192 * Made IPython a package. This means people don't have to clutter
4200 * Made IPython a package. This means people don't have to clutter
4193 their sys.path with yet another directory. Changed the INSTALL
4201 their sys.path with yet another directory. Changed the INSTALL
4194 file accordingly.
4202 file accordingly.
4195
4203
4196 * Cleaned up the output of @who_ls, @who and @whos. @who_ls now
4204 * Cleaned up the output of @who_ls, @who and @whos. @who_ls now
4197 sorts its output (so @who shows it sorted) and @whos formats the
4205 sorts its output (so @who shows it sorted) and @whos formats the
4198 table according to the width of the first column. Nicer, easier to
4206 table according to the width of the first column. Nicer, easier to
4199 read. Todo: write a generic table_format() which takes a list of
4207 read. Todo: write a generic table_format() which takes a list of
4200 lists and prints it nicely formatted, with optional row/column
4208 lists and prints it nicely formatted, with optional row/column
4201 separators and proper padding and justification.
4209 separators and proper padding and justification.
4202
4210
4203 * Released 0.1.20
4211 * Released 0.1.20
4204
4212
4205 * Fixed bug in @log which would reverse the inputcache list (a
4213 * Fixed bug in @log which would reverse the inputcache list (a
4206 copy operation was missing).
4214 copy operation was missing).
4207
4215
4208 * Code cleanup. @config was changed to use page(). Better, since
4216 * Code cleanup. @config was changed to use page(). Better, since
4209 its output is always quite long.
4217 its output is always quite long.
4210
4218
4211 * Itpl is back as a dependency. I was having too many problems
4219 * Itpl is back as a dependency. I was having too many problems
4212 getting the parametric aliases to work reliably, and it's just
4220 getting the parametric aliases to work reliably, and it's just
4213 easier to code weird string operations with it than playing %()s
4221 easier to code weird string operations with it than playing %()s
4214 games. It's only ~6k, so I don't think it's too big a deal.
4222 games. It's only ~6k, so I don't think it's too big a deal.
4215
4223
4216 * Found (and fixed) a very nasty bug with history. !lines weren't
4224 * Found (and fixed) a very nasty bug with history. !lines weren't
4217 getting cached, and the out of sync caches would crash
4225 getting cached, and the out of sync caches would crash
4218 IPython. Fixed it by reorganizing the prefilter/handlers/logger
4226 IPython. Fixed it by reorganizing the prefilter/handlers/logger
4219 division of labor a bit better. Bug fixed, cleaner structure.
4227 division of labor a bit better. Bug fixed, cleaner structure.
4220
4228
4221 2001-12-01 Fernando Perez <fperez@colorado.edu>
4229 2001-12-01 Fernando Perez <fperez@colorado.edu>
4222
4230
4223 * Released 0.1.19
4231 * Released 0.1.19
4224
4232
4225 * Added option -n to @hist to prevent line number printing. Much
4233 * Added option -n to @hist to prevent line number printing. Much
4226 easier to copy/paste code this way.
4234 easier to copy/paste code this way.
4227
4235
4228 * Created global _il to hold the input list. Allows easy
4236 * Created global _il to hold the input list. Allows easy
4229 re-execution of blocks of code by slicing it (inspired by Janko's
4237 re-execution of blocks of code by slicing it (inspired by Janko's
4230 comment on 'macros').
4238 comment on 'macros').
4231
4239
4232 * Small fixes and doc updates.
4240 * Small fixes and doc updates.
4233
4241
4234 * Rewrote @history function (was @h). Renamed it to @hist, @h is
4242 * Rewrote @history function (was @h). Renamed it to @hist, @h is
4235 much too fragile with automagic. Handles properly multi-line
4243 much too fragile with automagic. Handles properly multi-line
4236 statements and takes parameters.
4244 statements and takes parameters.
4237
4245
4238 2001-11-30 Fernando Perez <fperez@colorado.edu>
4246 2001-11-30 Fernando Perez <fperez@colorado.edu>
4239
4247
4240 * Version 0.1.18 released.
4248 * Version 0.1.18 released.
4241
4249
4242 * Fixed nasty namespace bug in initial module imports.
4250 * Fixed nasty namespace bug in initial module imports.
4243
4251
4244 * Added copyright/license notes to all code files (except
4252 * Added copyright/license notes to all code files (except
4245 DPyGetOpt). For the time being, LGPL. That could change.
4253 DPyGetOpt). For the time being, LGPL. That could change.
4246
4254
4247 * Rewrote a much nicer README, updated INSTALL, cleaned up
4255 * Rewrote a much nicer README, updated INSTALL, cleaned up
4248 ipythonrc-* samples.
4256 ipythonrc-* samples.
4249
4257
4250 * Overall code/documentation cleanup. Basically ready for
4258 * Overall code/documentation cleanup. Basically ready for
4251 release. Only remaining thing: licence decision (LGPL?).
4259 release. Only remaining thing: licence decision (LGPL?).
4252
4260
4253 * Converted load_config to a class, ConfigLoader. Now recursion
4261 * Converted load_config to a class, ConfigLoader. Now recursion
4254 control is better organized. Doesn't include the same file twice.
4262 control is better organized. Doesn't include the same file twice.
4255
4263
4256 2001-11-29 Fernando Perez <fperez@colorado.edu>
4264 2001-11-29 Fernando Perez <fperez@colorado.edu>
4257
4265
4258 * Got input history working. Changed output history variables from
4266 * Got input history working. Changed output history variables from
4259 _p to _o so that _i is for input and _o for output. Just cleaner
4267 _p to _o so that _i is for input and _o for output. Just cleaner
4260 convention.
4268 convention.
4261
4269
4262 * Implemented parametric aliases. This pretty much allows the
4270 * Implemented parametric aliases. This pretty much allows the
4263 alias system to offer full-blown shell convenience, I think.
4271 alias system to offer full-blown shell convenience, I think.
4264
4272
4265 * Version 0.1.17 released, 0.1.18 opened.
4273 * Version 0.1.17 released, 0.1.18 opened.
4266
4274
4267 * dot_ipython/ipythonrc (alias): added documentation.
4275 * dot_ipython/ipythonrc (alias): added documentation.
4268 (xcolor): Fixed small bug (xcolors -> xcolor)
4276 (xcolor): Fixed small bug (xcolors -> xcolor)
4269
4277
4270 * Changed the alias system. Now alias is a magic command to define
4278 * Changed the alias system. Now alias is a magic command to define
4271 aliases just like the shell. Rationale: the builtin magics should
4279 aliases just like the shell. Rationale: the builtin magics should
4272 be there for things deeply connected to IPython's
4280 be there for things deeply connected to IPython's
4273 architecture. And this is a much lighter system for what I think
4281 architecture. And this is a much lighter system for what I think
4274 is the really important feature: allowing users to define quickly
4282 is the really important feature: allowing users to define quickly
4275 magics that will do shell things for them, so they can customize
4283 magics that will do shell things for them, so they can customize
4276 IPython easily to match their work habits. If someone is really
4284 IPython easily to match their work habits. If someone is really
4277 desperate to have another name for a builtin alias, they can
4285 desperate to have another name for a builtin alias, they can
4278 always use __IP.magic_newname = __IP.magic_oldname. Hackish but
4286 always use __IP.magic_newname = __IP.magic_oldname. Hackish but
4279 works.
4287 works.
4280
4288
4281 2001-11-28 Fernando Perez <fperez@colorado.edu>
4289 2001-11-28 Fernando Perez <fperez@colorado.edu>
4282
4290
4283 * Changed @file so that it opens the source file at the proper
4291 * Changed @file so that it opens the source file at the proper
4284 line. Since it uses less, if your EDITOR environment is
4292 line. Since it uses less, if your EDITOR environment is
4285 configured, typing v will immediately open your editor of choice
4293 configured, typing v will immediately open your editor of choice
4286 right at the line where the object is defined. Not as quick as
4294 right at the line where the object is defined. Not as quick as
4287 having a direct @edit command, but for all intents and purposes it
4295 having a direct @edit command, but for all intents and purposes it
4288 works. And I don't have to worry about writing @edit to deal with
4296 works. And I don't have to worry about writing @edit to deal with
4289 all the editors, less does that.
4297 all the editors, less does that.
4290
4298
4291 * Version 0.1.16 released, 0.1.17 opened.
4299 * Version 0.1.16 released, 0.1.17 opened.
4292
4300
4293 * Fixed some nasty bugs in the page/page_dumb combo that could
4301 * Fixed some nasty bugs in the page/page_dumb combo that could
4294 crash IPython.
4302 crash IPython.
4295
4303
4296 2001-11-27 Fernando Perez <fperez@colorado.edu>
4304 2001-11-27 Fernando Perez <fperez@colorado.edu>
4297
4305
4298 * Version 0.1.15 released, 0.1.16 opened.
4306 * Version 0.1.15 released, 0.1.16 opened.
4299
4307
4300 * Finally got ? and ?? to work for undefined things: now it's
4308 * Finally got ? and ?? to work for undefined things: now it's
4301 possible to type {}.get? and get information about the get method
4309 possible to type {}.get? and get information about the get method
4302 of dicts, or os.path? even if only os is defined (so technically
4310 of dicts, or os.path? even if only os is defined (so technically
4303 os.path isn't). Works at any level. For example, after import os,
4311 os.path isn't). Works at any level. For example, after import os,
4304 os?, os.path?, os.path.abspath? all work. This is great, took some
4312 os?, os.path?, os.path.abspath? all work. This is great, took some
4305 work in _ofind.
4313 work in _ofind.
4306
4314
4307 * Fixed more bugs with logging. The sanest way to do it was to add
4315 * Fixed more bugs with logging. The sanest way to do it was to add
4308 to @log a 'mode' parameter. Killed two in one shot (this mode
4316 to @log a 'mode' parameter. Killed two in one shot (this mode
4309 option was a request of Janko's). I think it's finally clean
4317 option was a request of Janko's). I think it's finally clean
4310 (famous last words).
4318 (famous last words).
4311
4319
4312 * Added a page_dumb() pager which does a decent job of paging on
4320 * Added a page_dumb() pager which does a decent job of paging on
4313 screen, if better things (like less) aren't available. One less
4321 screen, if better things (like less) aren't available. One less
4314 unix dependency (someday maybe somebody will port this to
4322 unix dependency (someday maybe somebody will port this to
4315 windows).
4323 windows).
4316
4324
4317 * Fixed problem in magic_log: would lock of logging out if log
4325 * Fixed problem in magic_log: would lock of logging out if log
4318 creation failed (because it would still think it had succeeded).
4326 creation failed (because it would still think it had succeeded).
4319
4327
4320 * Improved the page() function using curses to auto-detect screen
4328 * Improved the page() function using curses to auto-detect screen
4321 size. Now it can make a much better decision on whether to print
4329 size. Now it can make a much better decision on whether to print
4322 or page a string. Option screen_length was modified: a value 0
4330 or page a string. Option screen_length was modified: a value 0
4323 means auto-detect, and that's the default now.
4331 means auto-detect, and that's the default now.
4324
4332
4325 * Version 0.1.14 released, 0.1.15 opened. I think this is ready to
4333 * Version 0.1.14 released, 0.1.15 opened. I think this is ready to
4326 go out. I'll test it for a few days, then talk to Janko about
4334 go out. I'll test it for a few days, then talk to Janko about
4327 licences and announce it.
4335 licences and announce it.
4328
4336
4329 * Fixed the length of the auto-generated ---> prompt which appears
4337 * Fixed the length of the auto-generated ---> prompt which appears
4330 for auto-parens and auto-quotes. Getting this right isn't trivial,
4338 for auto-parens and auto-quotes. Getting this right isn't trivial,
4331 with all the color escapes, different prompt types and optional
4339 with all the color escapes, different prompt types and optional
4332 separators. But it seems to be working in all the combinations.
4340 separators. But it seems to be working in all the combinations.
4333
4341
4334 2001-11-26 Fernando Perez <fperez@colorado.edu>
4342 2001-11-26 Fernando Perez <fperez@colorado.edu>
4335
4343
4336 * Wrote a regexp filter to get option types from the option names
4344 * Wrote a regexp filter to get option types from the option names
4337 string. This eliminates the need to manually keep two duplicate
4345 string. This eliminates the need to manually keep two duplicate
4338 lists.
4346 lists.
4339
4347
4340 * Removed the unneeded check_option_names. Now options are handled
4348 * Removed the unneeded check_option_names. Now options are handled
4341 in a much saner manner and it's easy to visually check that things
4349 in a much saner manner and it's easy to visually check that things
4342 are ok.
4350 are ok.
4343
4351
4344 * Updated version numbers on all files I modified to carry a
4352 * Updated version numbers on all files I modified to carry a
4345 notice so Janko and Nathan have clear version markers.
4353 notice so Janko and Nathan have clear version markers.
4346
4354
4347 * Updated docstring for ultraTB with my changes. I should send
4355 * Updated docstring for ultraTB with my changes. I should send
4348 this to Nathan.
4356 this to Nathan.
4349
4357
4350 * Lots of small fixes. Ran everything through pychecker again.
4358 * Lots of small fixes. Ran everything through pychecker again.
4351
4359
4352 * Made loading of deep_reload an cmd line option. If it's not too
4360 * Made loading of deep_reload an cmd line option. If it's not too
4353 kosher, now people can just disable it. With -nodeep_reload it's
4361 kosher, now people can just disable it. With -nodeep_reload it's
4354 still available as dreload(), it just won't overwrite reload().
4362 still available as dreload(), it just won't overwrite reload().
4355
4363
4356 * Moved many options to the no| form (-opt and -noopt
4364 * Moved many options to the no| form (-opt and -noopt
4357 accepted). Cleaner.
4365 accepted). Cleaner.
4358
4366
4359 * Changed magic_log so that if called with no parameters, it uses
4367 * Changed magic_log so that if called with no parameters, it uses
4360 'rotate' mode. That way auto-generated logs aren't automatically
4368 'rotate' mode. That way auto-generated logs aren't automatically
4361 over-written. For normal logs, now a backup is made if it exists
4369 over-written. For normal logs, now a backup is made if it exists
4362 (only 1 level of backups). A new 'backup' mode was added to the
4370 (only 1 level of backups). A new 'backup' mode was added to the
4363 Logger class to support this. This was a request by Janko.
4371 Logger class to support this. This was a request by Janko.
4364
4372
4365 * Added @logoff/@logon to stop/restart an active log.
4373 * Added @logoff/@logon to stop/restart an active log.
4366
4374
4367 * Fixed a lot of bugs in log saving/replay. It was pretty
4375 * Fixed a lot of bugs in log saving/replay. It was pretty
4368 broken. Now special lines (!@,/) appear properly in the command
4376 broken. Now special lines (!@,/) appear properly in the command
4369 history after a log replay.
4377 history after a log replay.
4370
4378
4371 * Tried and failed to implement full session saving via pickle. My
4379 * Tried and failed to implement full session saving via pickle. My
4372 idea was to pickle __main__.__dict__, but modules can't be
4380 idea was to pickle __main__.__dict__, but modules can't be
4373 pickled. This would be a better alternative to replaying logs, but
4381 pickled. This would be a better alternative to replaying logs, but
4374 seems quite tricky to get to work. Changed -session to be called
4382 seems quite tricky to get to work. Changed -session to be called
4375 -logplay, which more accurately reflects what it does. And if we
4383 -logplay, which more accurately reflects what it does. And if we
4376 ever get real session saving working, -session is now available.
4384 ever get real session saving working, -session is now available.
4377
4385
4378 * Implemented color schemes for prompts also. As for tracebacks,
4386 * Implemented color schemes for prompts also. As for tracebacks,
4379 currently only NoColor and Linux are supported. But now the
4387 currently only NoColor and Linux are supported. But now the
4380 infrastructure is in place, based on a generic ColorScheme
4388 infrastructure is in place, based on a generic ColorScheme
4381 class. So writing and activating new schemes both for the prompts
4389 class. So writing and activating new schemes both for the prompts
4382 and the tracebacks should be straightforward.
4390 and the tracebacks should be straightforward.
4383
4391
4384 * Version 0.1.13 released, 0.1.14 opened.
4392 * Version 0.1.13 released, 0.1.14 opened.
4385
4393
4386 * Changed handling of options for output cache. Now counter is
4394 * Changed handling of options for output cache. Now counter is
4387 hardwired starting at 1 and one specifies the maximum number of
4395 hardwired starting at 1 and one specifies the maximum number of
4388 entries *in the outcache* (not the max prompt counter). This is
4396 entries *in the outcache* (not the max prompt counter). This is
4389 much better, since many statements won't increase the cache
4397 much better, since many statements won't increase the cache
4390 count. It also eliminated some confusing options, now there's only
4398 count. It also eliminated some confusing options, now there's only
4391 one: cache_size.
4399 one: cache_size.
4392
4400
4393 * Added 'alias' magic function and magic_alias option in the
4401 * Added 'alias' magic function and magic_alias option in the
4394 ipythonrc file. Now the user can easily define whatever names he
4402 ipythonrc file. Now the user can easily define whatever names he
4395 wants for the magic functions without having to play weird
4403 wants for the magic functions without having to play weird
4396 namespace games. This gives IPython a real shell-like feel.
4404 namespace games. This gives IPython a real shell-like feel.
4397
4405
4398 * Fixed doc/?/?? for magics. Now all work, in all forms (explicit
4406 * Fixed doc/?/?? for magics. Now all work, in all forms (explicit
4399 @ or not).
4407 @ or not).
4400
4408
4401 This was one of the last remaining 'visible' bugs (that I know
4409 This was one of the last remaining 'visible' bugs (that I know
4402 of). I think if I can clean up the session loading so it works
4410 of). I think if I can clean up the session loading so it works
4403 100% I'll release a 0.2.0 version on c.p.l (talk to Janko first
4411 100% I'll release a 0.2.0 version on c.p.l (talk to Janko first
4404 about licensing).
4412 about licensing).
4405
4413
4406 2001-11-25 Fernando Perez <fperez@colorado.edu>
4414 2001-11-25 Fernando Perez <fperez@colorado.edu>
4407
4415
4408 * Rewrote somewhat oinfo (?/??). Nicer, now uses page() and
4416 * Rewrote somewhat oinfo (?/??). Nicer, now uses page() and
4409 there's a cleaner distinction between what ? and ?? show.
4417 there's a cleaner distinction between what ? and ?? show.
4410
4418
4411 * Added screen_length option. Now the user can define his own
4419 * Added screen_length option. Now the user can define his own
4412 screen size for page() operations.
4420 screen size for page() operations.
4413
4421
4414 * Implemented magic shell-like functions with automatic code
4422 * Implemented magic shell-like functions with automatic code
4415 generation. Now adding another function is just a matter of adding
4423 generation. Now adding another function is just a matter of adding
4416 an entry to a dict, and the function is dynamically generated at
4424 an entry to a dict, and the function is dynamically generated at
4417 run-time. Python has some really cool features!
4425 run-time. Python has some really cool features!
4418
4426
4419 * Renamed many options to cleanup conventions a little. Now all
4427 * Renamed many options to cleanup conventions a little. Now all
4420 are lowercase, and only underscores where needed. Also in the code
4428 are lowercase, and only underscores where needed. Also in the code
4421 option name tables are clearer.
4429 option name tables are clearer.
4422
4430
4423 * Changed prompts a little. Now input is 'In [n]:' instead of
4431 * Changed prompts a little. Now input is 'In [n]:' instead of
4424 'In[n]:='. This allows it the numbers to be aligned with the
4432 'In[n]:='. This allows it the numbers to be aligned with the
4425 Out[n] numbers, and removes usage of ':=' which doesn't exist in
4433 Out[n] numbers, and removes usage of ':=' which doesn't exist in
4426 Python (it was a Mathematica thing). The '...' continuation prompt
4434 Python (it was a Mathematica thing). The '...' continuation prompt
4427 was also changed a little to align better.
4435 was also changed a little to align better.
4428
4436
4429 * Fixed bug when flushing output cache. Not all _p<n> variables
4437 * Fixed bug when flushing output cache. Not all _p<n> variables
4430 exist, so their deletion needs to be wrapped in a try:
4438 exist, so their deletion needs to be wrapped in a try:
4431
4439
4432 * Figured out how to properly use inspect.formatargspec() (it
4440 * Figured out how to properly use inspect.formatargspec() (it
4433 requires the args preceded by *). So I removed all the code from
4441 requires the args preceded by *). So I removed all the code from
4434 _get_pdef in Magic, which was just replicating that.
4442 _get_pdef in Magic, which was just replicating that.
4435
4443
4436 * Added test to prefilter to allow redefining magic function names
4444 * Added test to prefilter to allow redefining magic function names
4437 as variables. This is ok, since the @ form is always available,
4445 as variables. This is ok, since the @ form is always available,
4438 but whe should allow the user to define a variable called 'ls' if
4446 but whe should allow the user to define a variable called 'ls' if
4439 he needs it.
4447 he needs it.
4440
4448
4441 * Moved the ToDo information from README into a separate ToDo.
4449 * Moved the ToDo information from README into a separate ToDo.
4442
4450
4443 * General code cleanup and small bugfixes. I think it's close to a
4451 * General code cleanup and small bugfixes. I think it's close to a
4444 state where it can be released, obviously with a big 'beta'
4452 state where it can be released, obviously with a big 'beta'
4445 warning on it.
4453 warning on it.
4446
4454
4447 * Got the magic function split to work. Now all magics are defined
4455 * Got the magic function split to work. Now all magics are defined
4448 in a separate class. It just organizes things a bit, and now
4456 in a separate class. It just organizes things a bit, and now
4449 Xemacs behaves nicer (it was choking on InteractiveShell b/c it
4457 Xemacs behaves nicer (it was choking on InteractiveShell b/c it
4450 was too long).
4458 was too long).
4451
4459
4452 * Changed @clear to @reset to avoid potential confusions with
4460 * Changed @clear to @reset to avoid potential confusions with
4453 the shell command clear. Also renamed @cl to @clear, which does
4461 the shell command clear. Also renamed @cl to @clear, which does
4454 exactly what people expect it to from their shell experience.
4462 exactly what people expect it to from their shell experience.
4455
4463
4456 Added a check to the @reset command (since it's so
4464 Added a check to the @reset command (since it's so
4457 destructive, it's probably a good idea to ask for confirmation).
4465 destructive, it's probably a good idea to ask for confirmation).
4458 But now reset only works for full namespace resetting. Since the
4466 But now reset only works for full namespace resetting. Since the
4459 del keyword is already there for deleting a few specific
4467 del keyword is already there for deleting a few specific
4460 variables, I don't see the point of having a redundant magic
4468 variables, I don't see the point of having a redundant magic
4461 function for the same task.
4469 function for the same task.
4462
4470
4463 2001-11-24 Fernando Perez <fperez@colorado.edu>
4471 2001-11-24 Fernando Perez <fperez@colorado.edu>
4464
4472
4465 * Updated the builtin docs (esp. the ? ones).
4473 * Updated the builtin docs (esp. the ? ones).
4466
4474
4467 * Ran all the code through pychecker. Not terribly impressed with
4475 * Ran all the code through pychecker. Not terribly impressed with
4468 it: lots of spurious warnings and didn't really find anything of
4476 it: lots of spurious warnings and didn't really find anything of
4469 substance (just a few modules being imported and not used).
4477 substance (just a few modules being imported and not used).
4470
4478
4471 * Implemented the new ultraTB functionality into IPython. New
4479 * Implemented the new ultraTB functionality into IPython. New
4472 option: xcolors. This chooses color scheme. xmode now only selects
4480 option: xcolors. This chooses color scheme. xmode now only selects
4473 between Plain and Verbose. Better orthogonality.
4481 between Plain and Verbose. Better orthogonality.
4474
4482
4475 * Large rewrite of ultraTB. Much cleaner now, with a separation of
4483 * Large rewrite of ultraTB. Much cleaner now, with a separation of
4476 mode and color scheme for the exception handlers. Now it's
4484 mode and color scheme for the exception handlers. Now it's
4477 possible to have the verbose traceback with no coloring.
4485 possible to have the verbose traceback with no coloring.
4478
4486
4479 2001-11-23 Fernando Perez <fperez@colorado.edu>
4487 2001-11-23 Fernando Perez <fperez@colorado.edu>
4480
4488
4481 * Version 0.1.12 released, 0.1.13 opened.
4489 * Version 0.1.12 released, 0.1.13 opened.
4482
4490
4483 * Removed option to set auto-quote and auto-paren escapes by
4491 * Removed option to set auto-quote and auto-paren escapes by
4484 user. The chances of breaking valid syntax are just too high. If
4492 user. The chances of breaking valid syntax are just too high. If
4485 someone *really* wants, they can always dig into the code.
4493 someone *really* wants, they can always dig into the code.
4486
4494
4487 * Made prompt separators configurable.
4495 * Made prompt separators configurable.
4488
4496
4489 2001-11-22 Fernando Perez <fperez@colorado.edu>
4497 2001-11-22 Fernando Perez <fperez@colorado.edu>
4490
4498
4491 * Small bugfixes in many places.
4499 * Small bugfixes in many places.
4492
4500
4493 * Removed the MyCompleter class from ipplib. It seemed redundant
4501 * Removed the MyCompleter class from ipplib. It seemed redundant
4494 with the C-p,C-n history search functionality. Less code to
4502 with the C-p,C-n history search functionality. Less code to
4495 maintain.
4503 maintain.
4496
4504
4497 * Moved all the original ipython.py code into ipythonlib.py. Right
4505 * Moved all the original ipython.py code into ipythonlib.py. Right
4498 now it's just one big dump into a function called make_IPython, so
4506 now it's just one big dump into a function called make_IPython, so
4499 no real modularity has been gained. But at least it makes the
4507 no real modularity has been gained. But at least it makes the
4500 wrapper script tiny, and since ipythonlib is a module, it gets
4508 wrapper script tiny, and since ipythonlib is a module, it gets
4501 compiled and startup is much faster.
4509 compiled and startup is much faster.
4502
4510
4503 This is a reasobably 'deep' change, so we should test it for a
4511 This is a reasobably 'deep' change, so we should test it for a
4504 while without messing too much more with the code.
4512 while without messing too much more with the code.
4505
4513
4506 2001-11-21 Fernando Perez <fperez@colorado.edu>
4514 2001-11-21 Fernando Perez <fperez@colorado.edu>
4507
4515
4508 * Version 0.1.11 released, 0.1.12 opened for further work.
4516 * Version 0.1.11 released, 0.1.12 opened for further work.
4509
4517
4510 * Removed dependency on Itpl. It was only needed in one place. It
4518 * Removed dependency on Itpl. It was only needed in one place. It
4511 would be nice if this became part of python, though. It makes life
4519 would be nice if this became part of python, though. It makes life
4512 *a lot* easier in some cases.
4520 *a lot* easier in some cases.
4513
4521
4514 * Simplified the prefilter code a bit. Now all handlers are
4522 * Simplified the prefilter code a bit. Now all handlers are
4515 expected to explicitly return a value (at least a blank string).
4523 expected to explicitly return a value (at least a blank string).
4516
4524
4517 * Heavy edits in ipplib. Removed the help system altogether. Now
4525 * Heavy edits in ipplib. Removed the help system altogether. Now
4518 obj?/?? is used for inspecting objects, a magic @doc prints
4526 obj?/?? is used for inspecting objects, a magic @doc prints
4519 docstrings, and full-blown Python help is accessed via the 'help'
4527 docstrings, and full-blown Python help is accessed via the 'help'
4520 keyword. This cleans up a lot of code (less to maintain) and does
4528 keyword. This cleans up a lot of code (less to maintain) and does
4521 the job. Since 'help' is now a standard Python component, might as
4529 the job. Since 'help' is now a standard Python component, might as
4522 well use it and remove duplicate functionality.
4530 well use it and remove duplicate functionality.
4523
4531
4524 Also removed the option to use ipplib as a standalone program. By
4532 Also removed the option to use ipplib as a standalone program. By
4525 now it's too dependent on other parts of IPython to function alone.
4533 now it's too dependent on other parts of IPython to function alone.
4526
4534
4527 * Fixed bug in genutils.pager. It would crash if the pager was
4535 * Fixed bug in genutils.pager. It would crash if the pager was
4528 exited immediately after opening (broken pipe).
4536 exited immediately after opening (broken pipe).
4529
4537
4530 * Trimmed down the VerboseTB reporting a little. The header is
4538 * Trimmed down the VerboseTB reporting a little. The header is
4531 much shorter now and the repeated exception arguments at the end
4539 much shorter now and the repeated exception arguments at the end
4532 have been removed. For interactive use the old header seemed a bit
4540 have been removed. For interactive use the old header seemed a bit
4533 excessive.
4541 excessive.
4534
4542
4535 * Fixed small bug in output of @whos for variables with multi-word
4543 * Fixed small bug in output of @whos for variables with multi-word
4536 types (only first word was displayed).
4544 types (only first word was displayed).
4537
4545
4538 2001-11-17 Fernando Perez <fperez@colorado.edu>
4546 2001-11-17 Fernando Perez <fperez@colorado.edu>
4539
4547
4540 * Version 0.1.10 released, 0.1.11 opened for further work.
4548 * Version 0.1.10 released, 0.1.11 opened for further work.
4541
4549
4542 * Modified dirs and friends. dirs now *returns* the stack (not
4550 * Modified dirs and friends. dirs now *returns* the stack (not
4543 prints), so one can manipulate it as a variable. Convenient to
4551 prints), so one can manipulate it as a variable. Convenient to
4544 travel along many directories.
4552 travel along many directories.
4545
4553
4546 * Fixed bug in magic_pdef: would only work with functions with
4554 * Fixed bug in magic_pdef: would only work with functions with
4547 arguments with default values.
4555 arguments with default values.
4548
4556
4549 2001-11-14 Fernando Perez <fperez@colorado.edu>
4557 2001-11-14 Fernando Perez <fperez@colorado.edu>
4550
4558
4551 * Added the PhysicsInput stuff to dot_ipython so it ships as an
4559 * Added the PhysicsInput stuff to dot_ipython so it ships as an
4552 example with IPython. Various other minor fixes and cleanups.
4560 example with IPython. Various other minor fixes and cleanups.
4553
4561
4554 * Version 0.1.9 released, 0.1.10 opened for further work.
4562 * Version 0.1.9 released, 0.1.10 opened for further work.
4555
4563
4556 * Added sys.path to the list of directories searched in the
4564 * Added sys.path to the list of directories searched in the
4557 execfile= option. It used to be the current directory and the
4565 execfile= option. It used to be the current directory and the
4558 user's IPYTHONDIR only.
4566 user's IPYTHONDIR only.
4559
4567
4560 2001-11-13 Fernando Perez <fperez@colorado.edu>
4568 2001-11-13 Fernando Perez <fperez@colorado.edu>
4561
4569
4562 * Reinstated the raw_input/prefilter separation that Janko had
4570 * Reinstated the raw_input/prefilter separation that Janko had
4563 initially. This gives a more convenient setup for extending the
4571 initially. This gives a more convenient setup for extending the
4564 pre-processor from the outside: raw_input always gets a string,
4572 pre-processor from the outside: raw_input always gets a string,
4565 and prefilter has to process it. We can then redefine prefilter
4573 and prefilter has to process it. We can then redefine prefilter
4566 from the outside and implement extensions for special
4574 from the outside and implement extensions for special
4567 purposes.
4575 purposes.
4568
4576
4569 Today I got one for inputting PhysicalQuantity objects
4577 Today I got one for inputting PhysicalQuantity objects
4570 (from Scientific) without needing any function calls at
4578 (from Scientific) without needing any function calls at
4571 all. Extremely convenient, and it's all done as a user-level
4579 all. Extremely convenient, and it's all done as a user-level
4572 extension (no IPython code was touched). Now instead of:
4580 extension (no IPython code was touched). Now instead of:
4573 a = PhysicalQuantity(4.2,'m/s**2')
4581 a = PhysicalQuantity(4.2,'m/s**2')
4574 one can simply say
4582 one can simply say
4575 a = 4.2 m/s**2
4583 a = 4.2 m/s**2
4576 or even
4584 or even
4577 a = 4.2 m/s^2
4585 a = 4.2 m/s^2
4578
4586
4579 I use this, but it's also a proof of concept: IPython really is
4587 I use this, but it's also a proof of concept: IPython really is
4580 fully user-extensible, even at the level of the parsing of the
4588 fully user-extensible, even at the level of the parsing of the
4581 command line. It's not trivial, but it's perfectly doable.
4589 command line. It's not trivial, but it's perfectly doable.
4582
4590
4583 * Added 'add_flip' method to inclusion conflict resolver. Fixes
4591 * Added 'add_flip' method to inclusion conflict resolver. Fixes
4584 the problem of modules being loaded in the inverse order in which
4592 the problem of modules being loaded in the inverse order in which
4585 they were defined in
4593 they were defined in
4586
4594
4587 * Version 0.1.8 released, 0.1.9 opened for further work.
4595 * Version 0.1.8 released, 0.1.9 opened for further work.
4588
4596
4589 * Added magics pdef, source and file. They respectively show the
4597 * Added magics pdef, source and file. They respectively show the
4590 definition line ('prototype' in C), source code and full python
4598 definition line ('prototype' in C), source code and full python
4591 file for any callable object. The object inspector oinfo uses
4599 file for any callable object. The object inspector oinfo uses
4592 these to show the same information.
4600 these to show the same information.
4593
4601
4594 * Version 0.1.7 released, 0.1.8 opened for further work.
4602 * Version 0.1.7 released, 0.1.8 opened for further work.
4595
4603
4596 * Separated all the magic functions into a class called Magic. The
4604 * Separated all the magic functions into a class called Magic. The
4597 InteractiveShell class was becoming too big for Xemacs to handle
4605 InteractiveShell class was becoming too big for Xemacs to handle
4598 (de-indenting a line would lock it up for 10 seconds while it
4606 (de-indenting a line would lock it up for 10 seconds while it
4599 backtracked on the whole class!)
4607 backtracked on the whole class!)
4600
4608
4601 FIXME: didn't work. It can be done, but right now namespaces are
4609 FIXME: didn't work. It can be done, but right now namespaces are
4602 all messed up. Do it later (reverted it for now, so at least
4610 all messed up. Do it later (reverted it for now, so at least
4603 everything works as before).
4611 everything works as before).
4604
4612
4605 * Got the object introspection system (magic_oinfo) working! I
4613 * Got the object introspection system (magic_oinfo) working! I
4606 think this is pretty much ready for release to Janko, so he can
4614 think this is pretty much ready for release to Janko, so he can
4607 test it for a while and then announce it. Pretty much 100% of what
4615 test it for a while and then announce it. Pretty much 100% of what
4608 I wanted for the 'phase 1' release is ready. Happy, tired.
4616 I wanted for the 'phase 1' release is ready. Happy, tired.
4609
4617
4610 2001-11-12 Fernando Perez <fperez@colorado.edu>
4618 2001-11-12 Fernando Perez <fperez@colorado.edu>
4611
4619
4612 * Version 0.1.6 released, 0.1.7 opened for further work.
4620 * Version 0.1.6 released, 0.1.7 opened for further work.
4613
4621
4614 * Fixed bug in printing: it used to test for truth before
4622 * Fixed bug in printing: it used to test for truth before
4615 printing, so 0 wouldn't print. Now checks for None.
4623 printing, so 0 wouldn't print. Now checks for None.
4616
4624
4617 * Fixed bug where auto-execs increase the prompt counter by 2 (b/c
4625 * Fixed bug where auto-execs increase the prompt counter by 2 (b/c
4618 they have to call len(str(sys.ps1)) ). But the fix is ugly, it
4626 they have to call len(str(sys.ps1)) ). But the fix is ugly, it
4619 reaches by hand into the outputcache. Think of a better way to do
4627 reaches by hand into the outputcache. Think of a better way to do
4620 this later.
4628 this later.
4621
4629
4622 * Various small fixes thanks to Nathan's comments.
4630 * Various small fixes thanks to Nathan's comments.
4623
4631
4624 * Changed magic_pprint to magic_Pprint. This way it doesn't
4632 * Changed magic_pprint to magic_Pprint. This way it doesn't
4625 collide with pprint() and the name is consistent with the command
4633 collide with pprint() and the name is consistent with the command
4626 line option.
4634 line option.
4627
4635
4628 * Changed prompt counter behavior to be fully like
4636 * Changed prompt counter behavior to be fully like
4629 Mathematica's. That is, even input that doesn't return a result
4637 Mathematica's. That is, even input that doesn't return a result
4630 raises the prompt counter. The old behavior was kind of confusing
4638 raises the prompt counter. The old behavior was kind of confusing
4631 (getting the same prompt number several times if the operation
4639 (getting the same prompt number several times if the operation
4632 didn't return a result).
4640 didn't return a result).
4633
4641
4634 * Fixed Nathan's last name in a couple of places (Gray, not Graham).
4642 * Fixed Nathan's last name in a couple of places (Gray, not Graham).
4635
4643
4636 * Fixed -Classic mode (wasn't working anymore).
4644 * Fixed -Classic mode (wasn't working anymore).
4637
4645
4638 * Added colored prompts using Nathan's new code. Colors are
4646 * Added colored prompts using Nathan's new code. Colors are
4639 currently hardwired, they can be user-configurable. For
4647 currently hardwired, they can be user-configurable. For
4640 developers, they can be chosen in file ipythonlib.py, at the
4648 developers, they can be chosen in file ipythonlib.py, at the
4641 beginning of the CachedOutput class def.
4649 beginning of the CachedOutput class def.
4642
4650
4643 2001-11-11 Fernando Perez <fperez@colorado.edu>
4651 2001-11-11 Fernando Perez <fperez@colorado.edu>
4644
4652
4645 * Version 0.1.5 released, 0.1.6 opened for further work.
4653 * Version 0.1.5 released, 0.1.6 opened for further work.
4646
4654
4647 * Changed magic_env to *return* the environment as a dict (not to
4655 * Changed magic_env to *return* the environment as a dict (not to
4648 print it). This way it prints, but it can also be processed.
4656 print it). This way it prints, but it can also be processed.
4649
4657
4650 * Added Verbose exception reporting to interactive
4658 * Added Verbose exception reporting to interactive
4651 exceptions. Very nice, now even 1/0 at the prompt gives a verbose
4659 exceptions. Very nice, now even 1/0 at the prompt gives a verbose
4652 traceback. Had to make some changes to the ultraTB file. This is
4660 traceback. Had to make some changes to the ultraTB file. This is
4653 probably the last 'big' thing in my mental todo list. This ties
4661 probably the last 'big' thing in my mental todo list. This ties
4654 in with the next entry:
4662 in with the next entry:
4655
4663
4656 * Changed -Xi and -Xf to a single -xmode option. Now all the user
4664 * Changed -Xi and -Xf to a single -xmode option. Now all the user
4657 has to specify is Plain, Color or Verbose for all exception
4665 has to specify is Plain, Color or Verbose for all exception
4658 handling.
4666 handling.
4659
4667
4660 * Removed ShellServices option. All this can really be done via
4668 * Removed ShellServices option. All this can really be done via
4661 the magic system. It's easier to extend, cleaner and has automatic
4669 the magic system. It's easier to extend, cleaner and has automatic
4662 namespace protection and documentation.
4670 namespace protection and documentation.
4663
4671
4664 2001-11-09 Fernando Perez <fperez@colorado.edu>
4672 2001-11-09 Fernando Perez <fperez@colorado.edu>
4665
4673
4666 * Fixed bug in output cache flushing (missing parameter to
4674 * Fixed bug in output cache flushing (missing parameter to
4667 __init__). Other small bugs fixed (found using pychecker).
4675 __init__). Other small bugs fixed (found using pychecker).
4668
4676
4669 * Version 0.1.4 opened for bugfixing.
4677 * Version 0.1.4 opened for bugfixing.
4670
4678
4671 2001-11-07 Fernando Perez <fperez@colorado.edu>
4679 2001-11-07 Fernando Perez <fperez@colorado.edu>
4672
4680
4673 * Version 0.1.3 released, mainly because of the raw_input bug.
4681 * Version 0.1.3 released, mainly because of the raw_input bug.
4674
4682
4675 * Fixed NASTY bug in raw_input: input line wasn't properly parsed
4683 * Fixed NASTY bug in raw_input: input line wasn't properly parsed
4676 and when testing for whether things were callable, a call could
4684 and when testing for whether things were callable, a call could
4677 actually be made to certain functions. They would get called again
4685 actually be made to certain functions. They would get called again
4678 once 'really' executed, with a resulting double call. A disaster
4686 once 'really' executed, with a resulting double call. A disaster
4679 in many cases (list.reverse() would never work!).
4687 in many cases (list.reverse() would never work!).
4680
4688
4681 * Removed prefilter() function, moved its code to raw_input (which
4689 * Removed prefilter() function, moved its code to raw_input (which
4682 after all was just a near-empty caller for prefilter). This saves
4690 after all was just a near-empty caller for prefilter). This saves
4683 a function call on every prompt, and simplifies the class a tiny bit.
4691 a function call on every prompt, and simplifies the class a tiny bit.
4684
4692
4685 * Fix _ip to __ip name in magic example file.
4693 * Fix _ip to __ip name in magic example file.
4686
4694
4687 * Changed 'tar -x -f' to 'tar xvf' in auto-installer. This should
4695 * Changed 'tar -x -f' to 'tar xvf' in auto-installer. This should
4688 work with non-gnu versions of tar.
4696 work with non-gnu versions of tar.
4689
4697
4690 2001-11-06 Fernando Perez <fperez@colorado.edu>
4698 2001-11-06 Fernando Perez <fperez@colorado.edu>
4691
4699
4692 * Version 0.1.2. Just to keep track of the recent changes.
4700 * Version 0.1.2. Just to keep track of the recent changes.
4693
4701
4694 * Fixed nasty bug in output prompt routine. It used to check 'if
4702 * Fixed nasty bug in output prompt routine. It used to check 'if
4695 arg != None...'. Problem is, this fails if arg implements a
4703 arg != None...'. Problem is, this fails if arg implements a
4696 special comparison (__cmp__) which disallows comparing to
4704 special comparison (__cmp__) which disallows comparing to
4697 None. Found it when trying to use the PhysicalQuantity module from
4705 None. Found it when trying to use the PhysicalQuantity module from
4698 ScientificPython.
4706 ScientificPython.
4699
4707
4700 2001-11-05 Fernando Perez <fperez@colorado.edu>
4708 2001-11-05 Fernando Perez <fperez@colorado.edu>
4701
4709
4702 * Also added dirs. Now the pushd/popd/dirs family functions
4710 * Also added dirs. Now the pushd/popd/dirs family functions
4703 basically like the shell, with the added convenience of going home
4711 basically like the shell, with the added convenience of going home
4704 when called with no args.
4712 when called with no args.
4705
4713
4706 * pushd/popd slightly modified to mimic shell behavior more
4714 * pushd/popd slightly modified to mimic shell behavior more
4707 closely.
4715 closely.
4708
4716
4709 * Added env,pushd,popd from ShellServices as magic functions. I
4717 * Added env,pushd,popd from ShellServices as magic functions. I
4710 think the cleanest will be to port all desired functions from
4718 think the cleanest will be to port all desired functions from
4711 ShellServices as magics and remove ShellServices altogether. This
4719 ShellServices as magics and remove ShellServices altogether. This
4712 will provide a single, clean way of adding functionality
4720 will provide a single, clean way of adding functionality
4713 (shell-type or otherwise) to IP.
4721 (shell-type or otherwise) to IP.
4714
4722
4715 2001-11-04 Fernando Perez <fperez@colorado.edu>
4723 2001-11-04 Fernando Perez <fperez@colorado.edu>
4716
4724
4717 * Added .ipython/ directory to sys.path. This way users can keep
4725 * Added .ipython/ directory to sys.path. This way users can keep
4718 customizations there and access them via import.
4726 customizations there and access them via import.
4719
4727
4720 2001-11-03 Fernando Perez <fperez@colorado.edu>
4728 2001-11-03 Fernando Perez <fperez@colorado.edu>
4721
4729
4722 * Opened version 0.1.1 for new changes.
4730 * Opened version 0.1.1 for new changes.
4723
4731
4724 * Changed version number to 0.1.0: first 'public' release, sent to
4732 * Changed version number to 0.1.0: first 'public' release, sent to
4725 Nathan and Janko.
4733 Nathan and Janko.
4726
4734
4727 * Lots of small fixes and tweaks.
4735 * Lots of small fixes and tweaks.
4728
4736
4729 * Minor changes to whos format. Now strings are shown, snipped if
4737 * Minor changes to whos format. Now strings are shown, snipped if
4730 too long.
4738 too long.
4731
4739
4732 * Changed ShellServices to work on __main__ so they show up in @who
4740 * Changed ShellServices to work on __main__ so they show up in @who
4733
4741
4734 * Help also works with ? at the end of a line:
4742 * Help also works with ? at the end of a line:
4735 ?sin and sin?
4743 ?sin and sin?
4736 both produce the same effect. This is nice, as often I use the
4744 both produce the same effect. This is nice, as often I use the
4737 tab-complete to find the name of a method, but I used to then have
4745 tab-complete to find the name of a method, but I used to then have
4738 to go to the beginning of the line to put a ? if I wanted more
4746 to go to the beginning of the line to put a ? if I wanted more
4739 info. Now I can just add the ? and hit return. Convenient.
4747 info. Now I can just add the ? and hit return. Convenient.
4740
4748
4741 2001-11-02 Fernando Perez <fperez@colorado.edu>
4749 2001-11-02 Fernando Perez <fperez@colorado.edu>
4742
4750
4743 * Python version check (>=2.1) added.
4751 * Python version check (>=2.1) added.
4744
4752
4745 * Added LazyPython documentation. At this point the docs are quite
4753 * Added LazyPython documentation. At this point the docs are quite
4746 a mess. A cleanup is in order.
4754 a mess. A cleanup is in order.
4747
4755
4748 * Auto-installer created. For some bizarre reason, the zipfiles
4756 * Auto-installer created. For some bizarre reason, the zipfiles
4749 module isn't working on my system. So I made a tar version
4757 module isn't working on my system. So I made a tar version
4750 (hopefully the command line options in various systems won't kill
4758 (hopefully the command line options in various systems won't kill
4751 me).
4759 me).
4752
4760
4753 * Fixes to Struct in genutils. Now all dictionary-like methods are
4761 * Fixes to Struct in genutils. Now all dictionary-like methods are
4754 protected (reasonably).
4762 protected (reasonably).
4755
4763
4756 * Added pager function to genutils and changed ? to print usage
4764 * Added pager function to genutils and changed ? to print usage
4757 note through it (it was too long).
4765 note through it (it was too long).
4758
4766
4759 * Added the LazyPython functionality. Works great! I changed the
4767 * Added the LazyPython functionality. Works great! I changed the
4760 auto-quote escape to ';', it's on home row and next to '. But
4768 auto-quote escape to ';', it's on home row and next to '. But
4761 both auto-quote and auto-paren (still /) escapes are command-line
4769 both auto-quote and auto-paren (still /) escapes are command-line
4762 parameters.
4770 parameters.
4763
4771
4764
4772
4765 2001-11-01 Fernando Perez <fperez@colorado.edu>
4773 2001-11-01 Fernando Perez <fperez@colorado.edu>
4766
4774
4767 * Version changed to 0.0.7. Fairly large change: configuration now
4775 * Version changed to 0.0.7. Fairly large change: configuration now
4768 is all stored in a directory, by default .ipython. There, all
4776 is all stored in a directory, by default .ipython. There, all
4769 config files have normal looking names (not .names)
4777 config files have normal looking names (not .names)
4770
4778
4771 * Version 0.0.6 Released first to Lucas and Archie as a test
4779 * Version 0.0.6 Released first to Lucas and Archie as a test
4772 run. Since it's the first 'semi-public' release, change version to
4780 run. Since it's the first 'semi-public' release, change version to
4773 > 0.0.6 for any changes now.
4781 > 0.0.6 for any changes now.
4774
4782
4775 * Stuff I had put in the ipplib.py changelog:
4783 * Stuff I had put in the ipplib.py changelog:
4776
4784
4777 Changes to InteractiveShell:
4785 Changes to InteractiveShell:
4778
4786
4779 - Made the usage message a parameter.
4787 - Made the usage message a parameter.
4780
4788
4781 - Require the name of the shell variable to be given. It's a bit
4789 - Require the name of the shell variable to be given. It's a bit
4782 of a hack, but allows the name 'shell' not to be hardwire in the
4790 of a hack, but allows the name 'shell' not to be hardwire in the
4783 magic (@) handler, which is problematic b/c it requires
4791 magic (@) handler, which is problematic b/c it requires
4784 polluting the global namespace with 'shell'. This in turn is
4792 polluting the global namespace with 'shell'. This in turn is
4785 fragile: if a user redefines a variable called shell, things
4793 fragile: if a user redefines a variable called shell, things
4786 break.
4794 break.
4787
4795
4788 - magic @: all functions available through @ need to be defined
4796 - magic @: all functions available through @ need to be defined
4789 as magic_<name>, even though they can be called simply as
4797 as magic_<name>, even though they can be called simply as
4790 @<name>. This allows the special command @magic to gather
4798 @<name>. This allows the special command @magic to gather
4791 information automatically about all existing magic functions,
4799 information automatically about all existing magic functions,
4792 even if they are run-time user extensions, by parsing the shell
4800 even if they are run-time user extensions, by parsing the shell
4793 instance __dict__ looking for special magic_ names.
4801 instance __dict__ looking for special magic_ names.
4794
4802
4795 - mainloop: added *two* local namespace parameters. This allows
4803 - mainloop: added *two* local namespace parameters. This allows
4796 the class to differentiate between parameters which were there
4804 the class to differentiate between parameters which were there
4797 before and after command line initialization was processed. This
4805 before and after command line initialization was processed. This
4798 way, later @who can show things loaded at startup by the
4806 way, later @who can show things loaded at startup by the
4799 user. This trick was necessary to make session saving/reloading
4807 user. This trick was necessary to make session saving/reloading
4800 really work: ideally after saving/exiting/reloading a session,
4808 really work: ideally after saving/exiting/reloading a session,
4801 *everythin* should look the same, including the output of @who. I
4809 *everythin* should look the same, including the output of @who. I
4802 was only able to make this work with this double namespace
4810 was only able to make this work with this double namespace
4803 trick.
4811 trick.
4804
4812
4805 - added a header to the logfile which allows (almost) full
4813 - added a header to the logfile which allows (almost) full
4806 session restoring.
4814 session restoring.
4807
4815
4808 - prepend lines beginning with @ or !, with a and log
4816 - prepend lines beginning with @ or !, with a and log
4809 them. Why? !lines: may be useful to know what you did @lines:
4817 them. Why? !lines: may be useful to know what you did @lines:
4810 they may affect session state. So when restoring a session, at
4818 they may affect session state. So when restoring a session, at
4811 least inform the user of their presence. I couldn't quite get
4819 least inform the user of their presence. I couldn't quite get
4812 them to properly re-execute, but at least the user is warned.
4820 them to properly re-execute, but at least the user is warned.
4813
4821
4814 * Started ChangeLog.
4822 * Started ChangeLog.
1 NO CONTENT: modified file
NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff
1 NO CONTENT: modified file
NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff
General Comments 0
You need to be logged in to leave comments. Login now