##// END OF EJS Templates
Fix crash with a naked 'alias' call in ipythonrc file.
fperez -
Show More
@@ -1,2098 +1,2104 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 923 2005-11-15 08:51:15Z fperez $
9 $Id: iplib.py 924 2005-11-15 20:24:31Z 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-2004 Fernando Perez. <fperez@colorado.edu>
14 # Copyright (C) 2001-2004 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, much of that class has been copied
20 # Python standard library. Over time, much 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. The Python License (sec. 2) allows for this, but it's always
22 # subclassing. The Python License (sec. 2) allows for this, but it's always
23 # nice to acknowledge credit where credit is due.
23 # nice to acknowledge credit where credit is due.
24 #*****************************************************************************
24 #*****************************************************************************
25
25
26 #****************************************************************************
26 #****************************************************************************
27 # Modules and globals
27 # Modules and globals
28
28
29 from __future__ import generators # for 2.2 backwards-compatibility
29 from __future__ import generators # for 2.2 backwards-compatibility
30
30
31 from IPython import Release
31 from IPython import Release
32 __author__ = '%s <%s>\n%s <%s>' % \
32 __author__ = '%s <%s>\n%s <%s>' % \
33 ( Release.authors['Janko'] + Release.authors['Fernando'] )
33 ( Release.authors['Janko'] + Release.authors['Fernando'] )
34 __license__ = Release.license
34 __license__ = Release.license
35 __version__ = Release.version
35 __version__ = Release.version
36
36
37 # Python standard modules
37 # Python standard modules
38 import __main__
38 import __main__
39 import __builtin__
39 import __builtin__
40 import exceptions
40 import exceptions
41 import keyword
41 import keyword
42 import new
42 import new
43 import os, sys, shutil
43 import os, sys, shutil
44 import code, glob, types, re
44 import code, glob, types, re
45 import string, StringIO
45 import string, StringIO
46 import inspect, pydoc
46 import inspect, pydoc
47 import bdb, pdb
47 import bdb, pdb
48 import UserList # don't subclass list so this works with Python2.1
48 import UserList # don't subclass list so this works with Python2.1
49 from pprint import pprint, pformat
49 from pprint import pprint, pformat
50 import cPickle as pickle
50 import cPickle as pickle
51 import traceback
51 import traceback
52 from codeop import CommandCompiler
52 from codeop import CommandCompiler
53
53
54 # IPython's own modules
54 # IPython's own modules
55 import IPython
55 import IPython
56 from IPython import OInspect,PyColorize,ultraTB
56 from IPython import OInspect,PyColorize,ultraTB
57 from IPython.ultraTB import ColorScheme,ColorSchemeTable # too long names
57 from IPython.ultraTB import ColorScheme,ColorSchemeTable # too long names
58 from IPython.Logger import Logger
58 from IPython.Logger import Logger
59 from IPython.Magic import Magic,magic2python,shlex_split
59 from IPython.Magic import Magic,magic2python,shlex_split
60 from IPython.usage import cmd_line_usage,interactive_usage
60 from IPython.usage import cmd_line_usage,interactive_usage
61 from IPython.Struct import Struct
61 from IPython.Struct import Struct
62 from IPython.Itpl import Itpl,itpl,printpl,ItplNS,itplns
62 from IPython.Itpl import Itpl,itpl,printpl,ItplNS,itplns
63 from IPython.FakeModule import FakeModule
63 from IPython.FakeModule import FakeModule
64 from IPython.background_jobs import BackgroundJobManager
64 from IPython.background_jobs import BackgroundJobManager
65 from IPython.PyColorize import Parser
65 from IPython.PyColorize import Parser
66 from IPython.genutils import *
66 from IPython.genutils import *
67
67
68 # Global pointer to the running
68 # Global pointer to the running
69
69
70 # store the builtin raw_input globally, and use this always, in case user code
70 # store the builtin raw_input globally, and use this always, in case user code
71 # overwrites it (like wx.py.PyShell does)
71 # overwrites it (like wx.py.PyShell does)
72 raw_input_original = raw_input
72 raw_input_original = raw_input
73
73
74 #****************************************************************************
74 #****************************************************************************
75 # Some utility function definitions
75 # Some utility function definitions
76
76
77 class Bunch: pass
77 class Bunch: pass
78
78
79 def esc_quotes(strng):
79 def esc_quotes(strng):
80 """Return the input string with single and double quotes escaped out"""
80 """Return the input string with single and double quotes escaped out"""
81
81
82 return strng.replace('"','\\"').replace("'","\\'")
82 return strng.replace('"','\\"').replace("'","\\'")
83
83
84 def import_fail_info(mod_name,fns=None):
84 def import_fail_info(mod_name,fns=None):
85 """Inform load failure for a module."""
85 """Inform load failure for a module."""
86
86
87 if fns == None:
87 if fns == None:
88 warn("Loading of %s failed.\n" % (mod_name,))
88 warn("Loading of %s failed.\n" % (mod_name,))
89 else:
89 else:
90 warn("Loading of %s from %s failed.\n" % (fns,mod_name))
90 warn("Loading of %s from %s failed.\n" % (fns,mod_name))
91
91
92 def qw_lol(indata):
92 def qw_lol(indata):
93 """qw_lol('a b') -> [['a','b']],
93 """qw_lol('a b') -> [['a','b']],
94 otherwise it's just a call to qw().
94 otherwise it's just a call to qw().
95
95
96 We need this to make sure the modules_some keys *always* end up as a
96 We need this to make sure the modules_some keys *always* end up as a
97 list of lists."""
97 list of lists."""
98
98
99 if type(indata) in StringTypes:
99 if type(indata) in StringTypes:
100 return [qw(indata)]
100 return [qw(indata)]
101 else:
101 else:
102 return qw(indata)
102 return qw(indata)
103
103
104 def ipmagic(arg_s):
104 def ipmagic(arg_s):
105 """Call a magic function by name.
105 """Call a magic function by name.
106
106
107 Input: a string containing the name of the magic function to call and any
107 Input: a string containing the name of the magic function to call and any
108 additional arguments to be passed to the magic.
108 additional arguments to be passed to the magic.
109
109
110 ipmagic('name -opt foo bar') is equivalent to typing at the ipython
110 ipmagic('name -opt foo bar') is equivalent to typing at the ipython
111 prompt:
111 prompt:
112
112
113 In[1]: %name -opt foo bar
113 In[1]: %name -opt foo bar
114
114
115 To call a magic without arguments, simply use ipmagic('name').
115 To call a magic without arguments, simply use ipmagic('name').
116
116
117 This provides a proper Python function to call IPython's magics in any
117 This provides a proper Python function to call IPython's magics in any
118 valid Python code you can type at the interpreter, including loops and
118 valid Python code you can type at the interpreter, including loops and
119 compound statements. It is added by IPython to the Python builtin
119 compound statements. It is added by IPython to the Python builtin
120 namespace upon initialization."""
120 namespace upon initialization."""
121
121
122 args = arg_s.split(' ',1)
122 args = arg_s.split(' ',1)
123 magic_name = args[0]
123 magic_name = args[0]
124 if magic_name.startswith(__IPYTHON__.ESC_MAGIC):
124 if magic_name.startswith(__IPYTHON__.ESC_MAGIC):
125 magic_name = magic_name[1:]
125 magic_name = magic_name[1:]
126 try:
126 try:
127 magic_args = args[1]
127 magic_args = args[1]
128 except IndexError:
128 except IndexError:
129 magic_args = ''
129 magic_args = ''
130 fn = getattr(__IPYTHON__,'magic_'+magic_name,None)
130 fn = getattr(__IPYTHON__,'magic_'+magic_name,None)
131 if fn is None:
131 if fn is None:
132 error("Magic function `%s` not found." % magic_name)
132 error("Magic function `%s` not found." % magic_name)
133 else:
133 else:
134 magic_args = __IPYTHON__.var_expand(magic_args)
134 magic_args = __IPYTHON__.var_expand(magic_args)
135 return fn(magic_args)
135 return fn(magic_args)
136
136
137 def ipalias(arg_s):
137 def ipalias(arg_s):
138 """Call an alias by name.
138 """Call an alias by name.
139
139
140 Input: a string containing the name of the alias to call and any
140 Input: a string containing the name of the alias to call and any
141 additional arguments to be passed to the magic.
141 additional arguments to be passed to the magic.
142
142
143 ipalias('name -opt foo bar') is equivalent to typing at the ipython
143 ipalias('name -opt foo bar') is equivalent to typing at the ipython
144 prompt:
144 prompt:
145
145
146 In[1]: name -opt foo bar
146 In[1]: name -opt foo bar
147
147
148 To call an alias without arguments, simply use ipalias('name').
148 To call an alias without arguments, simply use ipalias('name').
149
149
150 This provides a proper Python function to call IPython's aliases in any
150 This provides a proper Python function to call IPython's aliases in any
151 valid Python code you can type at the interpreter, including loops and
151 valid Python code you can type at the interpreter, including loops and
152 compound statements. It is added by IPython to the Python builtin
152 compound statements. It is added by IPython to the Python builtin
153 namespace upon initialization."""
153 namespace upon initialization."""
154
154
155 args = arg_s.split(' ',1)
155 args = arg_s.split(' ',1)
156 alias_name = args[0]
156 alias_name = args[0]
157 try:
157 try:
158 alias_args = args[1]
158 alias_args = args[1]
159 except IndexError:
159 except IndexError:
160 alias_args = ''
160 alias_args = ''
161 if alias_name in __IPYTHON__.alias_table:
161 if alias_name in __IPYTHON__.alias_table:
162 __IPYTHON__.call_alias(alias_name,alias_args)
162 __IPYTHON__.call_alias(alias_name,alias_args)
163 else:
163 else:
164 error("Alias `%s` not found." % alias_name)
164 error("Alias `%s` not found." % alias_name)
165
165
166 #-----------------------------------------------------------------------------
166 #-----------------------------------------------------------------------------
167 # Local use classes
167 # Local use classes
168 try:
168 try:
169 from IPython import FlexCompleter
169 from IPython import FlexCompleter
170
170
171 class MagicCompleter(FlexCompleter.Completer):
171 class MagicCompleter(FlexCompleter.Completer):
172 """Extension of the completer class to work on %-prefixed lines."""
172 """Extension of the completer class to work on %-prefixed lines."""
173
173
174 def __init__(self,shell,namespace=None,omit__names=0,alias_table=None):
174 def __init__(self,shell,namespace=None,omit__names=0,alias_table=None):
175 """MagicCompleter() -> completer
175 """MagicCompleter() -> completer
176
176
177 Return a completer object suitable for use by the readline library
177 Return a completer object suitable for use by the readline library
178 via readline.set_completer().
178 via readline.set_completer().
179
179
180 Inputs:
180 Inputs:
181
181
182 - shell: a pointer to the ipython shell itself. This is needed
182 - shell: a pointer to the ipython shell itself. This is needed
183 because this completer knows about magic functions, and those can
183 because this completer knows about magic functions, and those can
184 only be accessed via the ipython instance.
184 only be accessed via the ipython instance.
185
185
186 - namespace: an optional dict where completions are performed.
186 - namespace: an optional dict where completions are performed.
187
187
188 - The optional omit__names parameter sets the completer to omit the
188 - The optional omit__names parameter sets the completer to omit the
189 'magic' names (__magicname__) for python objects unless the text
189 'magic' names (__magicname__) for python objects unless the text
190 to be completed explicitly starts with one or more underscores.
190 to be completed explicitly starts with one or more underscores.
191
191
192 - If alias_table is supplied, it should be a dictionary of aliases
192 - If alias_table is supplied, it should be a dictionary of aliases
193 to complete. """
193 to complete. """
194
194
195 FlexCompleter.Completer.__init__(self,namespace)
195 FlexCompleter.Completer.__init__(self,namespace)
196 self.magic_prefix = shell.name+'.magic_'
196 self.magic_prefix = shell.name+'.magic_'
197 self.magic_escape = shell.ESC_MAGIC
197 self.magic_escape = shell.ESC_MAGIC
198 self.readline = FlexCompleter.readline
198 self.readline = FlexCompleter.readline
199 delims = self.readline.get_completer_delims()
199 delims = self.readline.get_completer_delims()
200 delims = delims.replace(self.magic_escape,'')
200 delims = delims.replace(self.magic_escape,'')
201 self.readline.set_completer_delims(delims)
201 self.readline.set_completer_delims(delims)
202 self.get_line_buffer = self.readline.get_line_buffer
202 self.get_line_buffer = self.readline.get_line_buffer
203 self.omit__names = omit__names
203 self.omit__names = omit__names
204 self.merge_completions = shell.rc.readline_merge_completions
204 self.merge_completions = shell.rc.readline_merge_completions
205
205
206 if alias_table is None:
206 if alias_table is None:
207 alias_table = {}
207 alias_table = {}
208 self.alias_table = alias_table
208 self.alias_table = alias_table
209 # Regexp to split filenames with spaces in them
209 # Regexp to split filenames with spaces in them
210 self.space_name_re = re.compile(r'([^\\] )')
210 self.space_name_re = re.compile(r'([^\\] )')
211 # Hold a local ref. to glob.glob for speed
211 # Hold a local ref. to glob.glob for speed
212 self.glob = glob.glob
212 self.glob = glob.glob
213 # Special handling of backslashes needed in win32 platforms
213 # Special handling of backslashes needed in win32 platforms
214 if sys.platform == "win32":
214 if sys.platform == "win32":
215 self.clean_glob = self._clean_glob_win32
215 self.clean_glob = self._clean_glob_win32
216 else:
216 else:
217 self.clean_glob = self._clean_glob
217 self.clean_glob = self._clean_glob
218 self.matchers = [self.python_matches,
218 self.matchers = [self.python_matches,
219 self.file_matches,
219 self.file_matches,
220 self.alias_matches,
220 self.alias_matches,
221 self.python_func_kw_matches]
221 self.python_func_kw_matches]
222
222
223 # Code contributed by Alex Schmolck, for ipython/emacs integration
223 # Code contributed by Alex Schmolck, for ipython/emacs integration
224 def all_completions(self, text):
224 def all_completions(self, text):
225 """Return all possible completions for the benefit of emacs."""
225 """Return all possible completions for the benefit of emacs."""
226
226
227 completions = []
227 completions = []
228 try:
228 try:
229 for i in xrange(sys.maxint):
229 for i in xrange(sys.maxint):
230 res = self.complete(text, i)
230 res = self.complete(text, i)
231
231
232 if not res: break
232 if not res: break
233
233
234 completions.append(res)
234 completions.append(res)
235 #XXX workaround for ``notDefined.<tab>``
235 #XXX workaround for ``notDefined.<tab>``
236 except NameError:
236 except NameError:
237 pass
237 pass
238 return completions
238 return completions
239 # /end Alex Schmolck code.
239 # /end Alex Schmolck code.
240
240
241 def _clean_glob(self,text):
241 def _clean_glob(self,text):
242 return self.glob("%s*" % text)
242 return self.glob("%s*" % text)
243
243
244 def _clean_glob_win32(self,text):
244 def _clean_glob_win32(self,text):
245 return [f.replace("\\","/")
245 return [f.replace("\\","/")
246 for f in self.glob("%s*" % text)]
246 for f in self.glob("%s*" % text)]
247
247
248 def file_matches(self, text):
248 def file_matches(self, text):
249 """Match filneames, expanding ~USER type strings.
249 """Match filneames, expanding ~USER type strings.
250
250
251 Most of the seemingly convoluted logic in this completer is an
251 Most of the seemingly convoluted logic in this completer is an
252 attempt to handle filenames with spaces in them. And yet it's not
252 attempt to handle filenames with spaces in them. And yet it's not
253 quite perfect, because Python's readline doesn't expose all of the
253 quite perfect, because Python's readline doesn't expose all of the
254 GNU readline details needed for this to be done correctly.
254 GNU readline details needed for this to be done correctly.
255
255
256 For a filename with a space in it, the printed completions will be
256 For a filename with a space in it, the printed completions will be
257 only the parts after what's already been typed (instead of the
257 only the parts after what's already been typed (instead of the
258 full completions, as is normally done). I don't think with the
258 full completions, as is normally done). I don't think with the
259 current (as of Python 2.3) Python readline it's possible to do
259 current (as of Python 2.3) Python readline it's possible to do
260 better."""
260 better."""
261
261
262 #print 'Completer->file_matches: <%s>' % text # dbg
262 #print 'Completer->file_matches: <%s>' % text # dbg
263
263
264 # chars that require escaping with backslash - i.e. chars
264 # chars that require escaping with backslash - i.e. chars
265 # that readline treats incorrectly as delimiters, but we
265 # that readline treats incorrectly as delimiters, but we
266 # don't want to treat as delimiters in filename matching
266 # don't want to treat as delimiters in filename matching
267 # when escaped with backslash
267 # when escaped with backslash
268
268
269 protectables = ' ()[]{}'
269 protectables = ' ()[]{}'
270
270
271 def protect_filename(s):
271 def protect_filename(s):
272 return "".join([(ch in protectables and '\\' + ch or ch)
272 return "".join([(ch in protectables and '\\' + ch or ch)
273 for ch in s])
273 for ch in s])
274
274
275 lbuf = self.get_line_buffer()[:self.readline.get_endidx()]
275 lbuf = self.get_line_buffer()[:self.readline.get_endidx()]
276 open_quotes = 0 # track strings with open quotes
276 open_quotes = 0 # track strings with open quotes
277 try:
277 try:
278 lsplit = shlex_split(lbuf)[-1]
278 lsplit = shlex_split(lbuf)[-1]
279 except ValueError:
279 except ValueError:
280 # typically an unmatched ", or backslash without escaped char.
280 # typically an unmatched ", or backslash without escaped char.
281 if lbuf.count('"')==1:
281 if lbuf.count('"')==1:
282 open_quotes = 1
282 open_quotes = 1
283 lsplit = lbuf.split('"')[-1]
283 lsplit = lbuf.split('"')[-1]
284 elif lbuf.count("'")==1:
284 elif lbuf.count("'")==1:
285 open_quotes = 1
285 open_quotes = 1
286 lsplit = lbuf.split("'")[-1]
286 lsplit = lbuf.split("'")[-1]
287 else:
287 else:
288 return None
288 return None
289 except IndexError:
289 except IndexError:
290 # tab pressed on empty line
290 # tab pressed on empty line
291 lsplit = ""
291 lsplit = ""
292
292
293 if lsplit != protect_filename(lsplit):
293 if lsplit != protect_filename(lsplit):
294 # if protectables are found, do matching on the whole escaped
294 # if protectables are found, do matching on the whole escaped
295 # name
295 # name
296 has_protectables = 1
296 has_protectables = 1
297 text0,text = text,lsplit
297 text0,text = text,lsplit
298 else:
298 else:
299 has_protectables = 0
299 has_protectables = 0
300 text = os.path.expanduser(text)
300 text = os.path.expanduser(text)
301
301
302 if text == "":
302 if text == "":
303 return [protect_filename(f) for f in self.glob("*")]
303 return [protect_filename(f) for f in self.glob("*")]
304
304
305 m0 = self.clean_glob(text.replace('\\',''))
305 m0 = self.clean_glob(text.replace('\\',''))
306 if has_protectables:
306 if has_protectables:
307 # If we had protectables, we need to revert our changes to the
307 # If we had protectables, we need to revert our changes to the
308 # beginning of filename so that we don't double-write the part
308 # beginning of filename so that we don't double-write the part
309 # of the filename we have so far
309 # of the filename we have so far
310 len_lsplit = len(lsplit)
310 len_lsplit = len(lsplit)
311 matches = [text0 + protect_filename(f[len_lsplit:]) for f in m0]
311 matches = [text0 + protect_filename(f[len_lsplit:]) for f in m0]
312 else:
312 else:
313 if open_quotes:
313 if open_quotes:
314 # if we have a string with an open quote, we don't need to
314 # if we have a string with an open quote, we don't need to
315 # protect the names at all (and we _shouldn't_, as it
315 # protect the names at all (and we _shouldn't_, as it
316 # would cause bugs when the filesystem call is made).
316 # would cause bugs when the filesystem call is made).
317 matches = m0
317 matches = m0
318 else:
318 else:
319 matches = [protect_filename(f) for f in m0]
319 matches = [protect_filename(f) for f in m0]
320 if len(matches) == 1 and os.path.isdir(matches[0]):
320 if len(matches) == 1 and os.path.isdir(matches[0]):
321 # Takes care of links to directories also. Use '/'
321 # Takes care of links to directories also. Use '/'
322 # explicitly, even under Windows, so that name completions
322 # explicitly, even under Windows, so that name completions
323 # don't end up escaped.
323 # don't end up escaped.
324 matches[0] += '/'
324 matches[0] += '/'
325 return matches
325 return matches
326
326
327 def alias_matches(self, text):
327 def alias_matches(self, text):
328 """Match internal system aliases"""
328 """Match internal system aliases"""
329 #print 'Completer->alias_matches:',text # dbg
329 #print 'Completer->alias_matches:',text # dbg
330 text = os.path.expanduser(text)
330 text = os.path.expanduser(text)
331 aliases = self.alias_table.keys()
331 aliases = self.alias_table.keys()
332 if text == "":
332 if text == "":
333 return aliases
333 return aliases
334 else:
334 else:
335 return [alias for alias in aliases if alias.startswith(text)]
335 return [alias for alias in aliases if alias.startswith(text)]
336
336
337 def python_matches(self,text):
337 def python_matches(self,text):
338 """Match attributes or global python names"""
338 """Match attributes or global python names"""
339 #print 'Completer->python_matches' # dbg
339 #print 'Completer->python_matches' # dbg
340 if "." in text:
340 if "." in text:
341 try:
341 try:
342 matches = self.attr_matches(text)
342 matches = self.attr_matches(text)
343 if text.endswith('.') and self.omit__names:
343 if text.endswith('.') and self.omit__names:
344 if self.omit__names == 1:
344 if self.omit__names == 1:
345 # true if txt is _not_ a __ name, false otherwise:
345 # true if txt is _not_ a __ name, false otherwise:
346 no__name = (lambda txt:
346 no__name = (lambda txt:
347 re.match(r'.*\.__.*?__',txt) is None)
347 re.match(r'.*\.__.*?__',txt) is None)
348 else:
348 else:
349 # true if txt is _not_ a _ name, false otherwise:
349 # true if txt is _not_ a _ name, false otherwise:
350 no__name = (lambda txt:
350 no__name = (lambda txt:
351 re.match(r'.*\._.*?',txt) is None)
351 re.match(r'.*\._.*?',txt) is None)
352 matches = filter(no__name, matches)
352 matches = filter(no__name, matches)
353 except NameError:
353 except NameError:
354 # catches <undefined attributes>.<tab>
354 # catches <undefined attributes>.<tab>
355 matches = []
355 matches = []
356 else:
356 else:
357 matches = self.global_matches(text)
357 matches = self.global_matches(text)
358 # this is so completion finds magics when automagic is on:
358 # this is so completion finds magics when automagic is on:
359 if matches == [] and not text.startswith(os.sep):
359 if matches == [] and not text.startswith(os.sep):
360 matches = self.attr_matches(self.magic_prefix+text)
360 matches = self.attr_matches(self.magic_prefix+text)
361 return matches
361 return matches
362
362
363 def _default_arguments(self, obj):
363 def _default_arguments(self, obj):
364 """Return the list of default arguments of obj if it is callable,
364 """Return the list of default arguments of obj if it is callable,
365 or empty list otherwise."""
365 or empty list otherwise."""
366
366
367 if not (inspect.isfunction(obj) or inspect.ismethod(obj)):
367 if not (inspect.isfunction(obj) or inspect.ismethod(obj)):
368 # for classes, check for __init__,__new__
368 # for classes, check for __init__,__new__
369 if inspect.isclass(obj):
369 if inspect.isclass(obj):
370 obj = (getattr(obj,'__init__',None) or
370 obj = (getattr(obj,'__init__',None) or
371 getattr(obj,'__new__',None))
371 getattr(obj,'__new__',None))
372 # for all others, check if they are __call__able
372 # for all others, check if they are __call__able
373 elif hasattr(obj, '__call__'):
373 elif hasattr(obj, '__call__'):
374 obj = obj.__call__
374 obj = obj.__call__
375 # XXX: is there a way to handle the builtins ?
375 # XXX: is there a way to handle the builtins ?
376 try:
376 try:
377 args,_,_1,defaults = inspect.getargspec(obj)
377 args,_,_1,defaults = inspect.getargspec(obj)
378 if defaults:
378 if defaults:
379 return args[-len(defaults):]
379 return args[-len(defaults):]
380 except TypeError: pass
380 except TypeError: pass
381 return []
381 return []
382
382
383 def python_func_kw_matches(self,text):
383 def python_func_kw_matches(self,text):
384 """Match named parameters (kwargs) of the last open function"""
384 """Match named parameters (kwargs) of the last open function"""
385
385
386 if "." in text: # a parameter cannot be dotted
386 if "." in text: # a parameter cannot be dotted
387 return []
387 return []
388 try: regexp = self.__funcParamsRegex
388 try: regexp = self.__funcParamsRegex
389 except AttributeError:
389 except AttributeError:
390 regexp = self.__funcParamsRegex = re.compile(r'''
390 regexp = self.__funcParamsRegex = re.compile(r'''
391 '.*?' | # single quoted strings or
391 '.*?' | # single quoted strings or
392 ".*?" | # double quoted strings or
392 ".*?" | # double quoted strings or
393 \w+ | # identifier
393 \w+ | # identifier
394 \S # other characters
394 \S # other characters
395 ''', re.VERBOSE | re.DOTALL)
395 ''', re.VERBOSE | re.DOTALL)
396 # 1. find the nearest identifier that comes before an unclosed
396 # 1. find the nearest identifier that comes before an unclosed
397 # parenthesis e.g. for "foo (1+bar(x), pa", the candidate is "foo"
397 # parenthesis e.g. for "foo (1+bar(x), pa", the candidate is "foo"
398 tokens = regexp.findall(self.get_line_buffer())
398 tokens = regexp.findall(self.get_line_buffer())
399 tokens.reverse()
399 tokens.reverse()
400 iterTokens = iter(tokens); openPar = 0
400 iterTokens = iter(tokens); openPar = 0
401 for token in iterTokens:
401 for token in iterTokens:
402 if token == ')':
402 if token == ')':
403 openPar -= 1
403 openPar -= 1
404 elif token == '(':
404 elif token == '(':
405 openPar += 1
405 openPar += 1
406 if openPar > 0:
406 if openPar > 0:
407 # found the last unclosed parenthesis
407 # found the last unclosed parenthesis
408 break
408 break
409 else:
409 else:
410 return []
410 return []
411 # 2. Concatenate any dotted names (e.g. "foo.bar" for "foo.bar(x, pa" )
411 # 2. Concatenate any dotted names (e.g. "foo.bar" for "foo.bar(x, pa" )
412 ids = []
412 ids = []
413 isId = re.compile(r'\w+$').match
413 isId = re.compile(r'\w+$').match
414 while True:
414 while True:
415 try:
415 try:
416 ids.append(iterTokens.next())
416 ids.append(iterTokens.next())
417 if not isId(ids[-1]):
417 if not isId(ids[-1]):
418 ids.pop(); break
418 ids.pop(); break
419 if not iterTokens.next() == '.':
419 if not iterTokens.next() == '.':
420 break
420 break
421 except StopIteration:
421 except StopIteration:
422 break
422 break
423 # lookup the candidate callable matches either using global_matches
423 # lookup the candidate callable matches either using global_matches
424 # or attr_matches for dotted names
424 # or attr_matches for dotted names
425 if len(ids) == 1:
425 if len(ids) == 1:
426 callableMatches = self.global_matches(ids[0])
426 callableMatches = self.global_matches(ids[0])
427 else:
427 else:
428 callableMatches = self.attr_matches('.'.join(ids[::-1]))
428 callableMatches = self.attr_matches('.'.join(ids[::-1]))
429 argMatches = []
429 argMatches = []
430 for callableMatch in callableMatches:
430 for callableMatch in callableMatches:
431 try: namedArgs = self._default_arguments(eval(callableMatch,
431 try: namedArgs = self._default_arguments(eval(callableMatch,
432 self.namespace))
432 self.namespace))
433 except: continue
433 except: continue
434 for namedArg in namedArgs:
434 for namedArg in namedArgs:
435 if namedArg.startswith(text):
435 if namedArg.startswith(text):
436 argMatches.append("%s=" %namedArg)
436 argMatches.append("%s=" %namedArg)
437 return argMatches
437 return argMatches
438
438
439 def complete(self, text, state):
439 def complete(self, text, state):
440 """Return the next possible completion for 'text'.
440 """Return the next possible completion for 'text'.
441
441
442 This is called successively with state == 0, 1, 2, ... until it
442 This is called successively with state == 0, 1, 2, ... until it
443 returns None. The completion should begin with 'text'. """
443 returns None. The completion should begin with 'text'. """
444
444
445 #print '\n*** COMPLETE: <%s> (%s)' % (text,state) # dbg
445 #print '\n*** COMPLETE: <%s> (%s)' % (text,state) # dbg
446 magic_escape = self.magic_escape
446 magic_escape = self.magic_escape
447 magic_prefix = self.magic_prefix
447 magic_prefix = self.magic_prefix
448
448
449 try:
449 try:
450 if text.startswith(magic_escape):
450 if text.startswith(magic_escape):
451 text = text.replace(magic_escape,magic_prefix)
451 text = text.replace(magic_escape,magic_prefix)
452 elif text.startswith('~'):
452 elif text.startswith('~'):
453 text = os.path.expanduser(text)
453 text = os.path.expanduser(text)
454 if state == 0:
454 if state == 0:
455 # Extend the list of completions with the results of each
455 # Extend the list of completions with the results of each
456 # matcher, so we return results to the user from all
456 # matcher, so we return results to the user from all
457 # namespaces.
457 # namespaces.
458 if self.merge_completions:
458 if self.merge_completions:
459 self.matches = []
459 self.matches = []
460 for matcher in self.matchers:
460 for matcher in self.matchers:
461 self.matches.extend(matcher(text))
461 self.matches.extend(matcher(text))
462 else:
462 else:
463 for matcher in self.matchers:
463 for matcher in self.matchers:
464 self.matches = matcher(text)
464 self.matches = matcher(text)
465 if self.matches:
465 if self.matches:
466 break
466 break
467
467
468 try:
468 try:
469 return self.matches[state].replace(magic_prefix,magic_escape)
469 return self.matches[state].replace(magic_prefix,magic_escape)
470 except IndexError:
470 except IndexError:
471 return None
471 return None
472 except:
472 except:
473 # If completion fails, don't annoy the user.
473 # If completion fails, don't annoy the user.
474 pass
474 pass
475
475
476 except ImportError:
476 except ImportError:
477 pass # no readline support
477 pass # no readline support
478
478
479 except KeyError:
479 except KeyError:
480 pass # Windows doesn't set TERM, it doesn't matter
480 pass # Windows doesn't set TERM, it doesn't matter
481
481
482
482
483 class InputList(UserList.UserList):
483 class InputList(UserList.UserList):
484 """Class to store user input.
484 """Class to store user input.
485
485
486 It's basically a list, but slices return a string instead of a list, thus
486 It's basically a list, but slices return a string instead of a list, thus
487 allowing things like (assuming 'In' is an instance):
487 allowing things like (assuming 'In' is an instance):
488
488
489 exec In[4:7]
489 exec In[4:7]
490
490
491 or
491 or
492
492
493 exec In[5:9] + In[14] + In[21:25]"""
493 exec In[5:9] + In[14] + In[21:25]"""
494
494
495 def __getslice__(self,i,j):
495 def __getslice__(self,i,j):
496 return ''.join(UserList.UserList.__getslice__(self,i,j))
496 return ''.join(UserList.UserList.__getslice__(self,i,j))
497
497
498 #****************************************************************************
498 #****************************************************************************
499 # Local use exceptions
499 # Local use exceptions
500 class SpaceInInput(exceptions.Exception):
500 class SpaceInInput(exceptions.Exception):
501 pass
501 pass
502
502
503 #****************************************************************************
503 #****************************************************************************
504 # Main IPython class
504 # Main IPython class
505
505
506 class InteractiveShell(code.InteractiveConsole, Logger, Magic):
506 class InteractiveShell(code.InteractiveConsole, Logger, Magic):
507 """An enhanced console for Python."""
507 """An enhanced console for Python."""
508
508
509 def __init__(self,name,usage=None,rc=Struct(opts=None,args=None),
509 def __init__(self,name,usage=None,rc=Struct(opts=None,args=None),
510 user_ns = None,user_global_ns=None,banner2='',
510 user_ns = None,user_global_ns=None,banner2='',
511 custom_exceptions=((),None),embedded=False):
511 custom_exceptions=((),None),embedded=False):
512
512
513 # Put a reference to self in builtins so that any form of embedded or
513 # Put a reference to self in builtins so that any form of embedded or
514 # imported code can test for being inside IPython.
514 # imported code can test for being inside IPython.
515 __builtin__.__IPYTHON__ = self
515 __builtin__.__IPYTHON__ = self
516
516
517 # And load into builtins ipmagic/ipalias as well
517 # And load into builtins ipmagic/ipalias as well
518 __builtin__.ipmagic = ipmagic
518 __builtin__.ipmagic = ipmagic
519 __builtin__.ipalias = ipalias
519 __builtin__.ipalias = ipalias
520
520
521 # Add to __builtin__ other parts of IPython's public API
521 # Add to __builtin__ other parts of IPython's public API
522 __builtin__.ip_set_hook = self.set_hook
522 __builtin__.ip_set_hook = self.set_hook
523
523
524 # Keep in the builtins a flag for when IPython is active. We set it
524 # Keep in the builtins a flag for when IPython is active. We set it
525 # with setdefault so that multiple nested IPythons don't clobber one
525 # with setdefault so that multiple nested IPythons don't clobber one
526 # another. Each will increase its value by one upon being activated,
526 # another. Each will increase its value by one upon being activated,
527 # which also gives us a way to determine the nesting level.
527 # which also gives us a way to determine the nesting level.
528 __builtin__.__dict__.setdefault('__IPYTHON__active',0)
528 __builtin__.__dict__.setdefault('__IPYTHON__active',0)
529
529
530 # Inform the user of ipython's fast exit magics.
530 # Inform the user of ipython's fast exit magics.
531 _exit = ' Use %Exit or %Quit to exit without confirmation.'
531 _exit = ' Use %Exit or %Quit to exit without confirmation.'
532 __builtin__.exit += _exit
532 __builtin__.exit += _exit
533 __builtin__.quit += _exit
533 __builtin__.quit += _exit
534
534
535 # We need to know whether the instance is meant for embedding, since
535 # We need to know whether the instance is meant for embedding, since
536 # global/local namespaces need to be handled differently in that case
536 # global/local namespaces need to be handled differently in that case
537 self.embedded = embedded
537 self.embedded = embedded
538
538
539 # compiler command
539 # compiler command
540 self.compile = CommandCompiler()
540 self.compile = CommandCompiler()
541
541
542 # User input buffer
542 # User input buffer
543 self.buffer = []
543 self.buffer = []
544
544
545 # Default name given in compilation of code
545 # Default name given in compilation of code
546 self.filename = '<ipython console>'
546 self.filename = '<ipython console>'
547
547
548 # Create the namespace where the user will operate. user_ns is
548 # Create the namespace where the user will operate. user_ns is
549 # normally the only one used, and it is passed to the exec calls as
549 # normally the only one used, and it is passed to the exec calls as
550 # the locals argument. But we do carry a user_global_ns namespace
550 # the locals argument. But we do carry a user_global_ns namespace
551 # given as the exec 'globals' argument, This is useful in embedding
551 # given as the exec 'globals' argument, This is useful in embedding
552 # situations where the ipython shell opens in a context where the
552 # situations where the ipython shell opens in a context where the
553 # distinction between locals and globals is meaningful.
553 # distinction between locals and globals is meaningful.
554
554
555 # FIXME. For some strange reason, __builtins__ is showing up at user
555 # FIXME. For some strange reason, __builtins__ is showing up at user
556 # level as a dict instead of a module. This is a manual fix, but I
556 # level as a dict instead of a module. This is a manual fix, but I
557 # should really track down where the problem is coming from. Alex
557 # should really track down where the problem is coming from. Alex
558 # Schmolck reported this problem first.
558 # Schmolck reported this problem first.
559
559
560 # A useful post by Alex Martelli on this topic:
560 # A useful post by Alex Martelli on this topic:
561 # Re: inconsistent value from __builtins__
561 # Re: inconsistent value from __builtins__
562 # Von: Alex Martelli <aleaxit@yahoo.com>
562 # Von: Alex Martelli <aleaxit@yahoo.com>
563 # Datum: Freitag 01 Oktober 2004 04:45:34 nachmittags/abends
563 # Datum: Freitag 01 Oktober 2004 04:45:34 nachmittags/abends
564 # Gruppen: comp.lang.python
564 # Gruppen: comp.lang.python
565 # Referenzen: 1
565 # Referenzen: 1
566
566
567 # Michael Hohn <hohn@hooknose.lbl.gov> wrote:
567 # Michael Hohn <hohn@hooknose.lbl.gov> wrote:
568 # > >>> print type(builtin_check.get_global_binding('__builtins__'))
568 # > >>> print type(builtin_check.get_global_binding('__builtins__'))
569 # > <type 'dict'>
569 # > <type 'dict'>
570 # > >>> print type(__builtins__)
570 # > >>> print type(__builtins__)
571 # > <type 'module'>
571 # > <type 'module'>
572 # > Is this difference in return value intentional?
572 # > Is this difference in return value intentional?
573
573
574 # Well, it's documented that '__builtins__' can be either a dictionary
574 # Well, it's documented that '__builtins__' can be either a dictionary
575 # or a module, and it's been that way for a long time. Whether it's
575 # or a module, and it's been that way for a long time. Whether it's
576 # intentional (or sensible), I don't know. In any case, the idea is that
576 # intentional (or sensible), I don't know. In any case, the idea is that
577 # if you need to access the built-in namespace directly, you should start
577 # if you need to access the built-in namespace directly, you should start
578 # with "import __builtin__" (note, no 's') which will definitely give you
578 # with "import __builtin__" (note, no 's') which will definitely give you
579 # a module. Yeah, it's somewhatΒ confusing:-(.
579 # a module. Yeah, it's somewhatΒ confusing:-(.
580
580
581 if user_ns is None:
581 if user_ns is None:
582 # Set __name__ to __main__ to better match the behavior of the
582 # Set __name__ to __main__ to better match the behavior of the
583 # normal interpreter.
583 # normal interpreter.
584 user_ns = {'__name__' :'__main__',
584 user_ns = {'__name__' :'__main__',
585 '__builtins__' : __builtin__,
585 '__builtins__' : __builtin__,
586 }
586 }
587
587
588 if user_global_ns is None:
588 if user_global_ns is None:
589 user_global_ns = {}
589 user_global_ns = {}
590
590
591 # Assign namespaces
591 # Assign namespaces
592 # This is the namespace where all normal user variables live
592 # This is the namespace where all normal user variables live
593 self.user_ns = user_ns
593 self.user_ns = user_ns
594 # Embedded instances require a separate namespace for globals.
594 # Embedded instances require a separate namespace for globals.
595 # Normally this one is unused by non-embedded instances.
595 # Normally this one is unused by non-embedded instances.
596 self.user_global_ns = user_global_ns
596 self.user_global_ns = user_global_ns
597 # A namespace to keep track of internal data structures to prevent
597 # A namespace to keep track of internal data structures to prevent
598 # them from cluttering user-visible stuff. Will be updated later
598 # them from cluttering user-visible stuff. Will be updated later
599 self.internal_ns = {}
599 self.internal_ns = {}
600
600
601 # Namespace of system aliases. Each entry in the alias
601 # Namespace of system aliases. Each entry in the alias
602 # table must be a 2-tuple of the form (N,name), where N is the number
602 # table must be a 2-tuple of the form (N,name), where N is the number
603 # of positional arguments of the alias.
603 # of positional arguments of the alias.
604 self.alias_table = {}
604 self.alias_table = {}
605
605
606 # A table holding all the namespaces IPython deals with, so that
606 # A table holding all the namespaces IPython deals with, so that
607 # introspection facilities can search easily.
607 # introspection facilities can search easily.
608 self.ns_table = {'user':user_ns,
608 self.ns_table = {'user':user_ns,
609 'user_global':user_global_ns,
609 'user_global':user_global_ns,
610 'alias':self.alias_table,
610 'alias':self.alias_table,
611 'internal':self.internal_ns,
611 'internal':self.internal_ns,
612 'builtin':__builtin__.__dict__
612 'builtin':__builtin__.__dict__
613 }
613 }
614
614
615 # The user namespace MUST have a pointer to the shell itself.
615 # The user namespace MUST have a pointer to the shell itself.
616 self.user_ns[name] = self
616 self.user_ns[name] = self
617
617
618 # We need to insert into sys.modules something that looks like a
618 # We need to insert into sys.modules something that looks like a
619 # module but which accesses the IPython namespace, for shelve and
619 # module but which accesses the IPython namespace, for shelve and
620 # pickle to work interactively. Normally they rely on getting
620 # pickle to work interactively. Normally they rely on getting
621 # everything out of __main__, but for embedding purposes each IPython
621 # everything out of __main__, but for embedding purposes each IPython
622 # instance has its own private namespace, so we can't go shoving
622 # instance has its own private namespace, so we can't go shoving
623 # everything into __main__.
623 # everything into __main__.
624
624
625 try:
625 try:
626 main_name = self.user_ns['__name__']
626 main_name = self.user_ns['__name__']
627 except KeyError:
627 except KeyError:
628 raise KeyError,'user_ns dictionary MUST have a "__name__" key'
628 raise KeyError,'user_ns dictionary MUST have a "__name__" key'
629 else:
629 else:
630 #print "pickle hack in place" # dbg
630 #print "pickle hack in place" # dbg
631 sys.modules[main_name] = FakeModule(self.user_ns)
631 sys.modules[main_name] = FakeModule(self.user_ns)
632
632
633 # List of input with multi-line handling.
633 # List of input with multi-line handling.
634 # Fill its zero entry, user counter starts at 1
634 # Fill its zero entry, user counter starts at 1
635 self.input_hist = InputList(['\n'])
635 self.input_hist = InputList(['\n'])
636
636
637 # list of visited directories
637 # list of visited directories
638 try:
638 try:
639 self.dir_hist = [os.getcwd()]
639 self.dir_hist = [os.getcwd()]
640 except IOError, e:
640 except IOError, e:
641 self.dir_hist = []
641 self.dir_hist = []
642
642
643 # dict of output history
643 # dict of output history
644 self.output_hist = {}
644 self.output_hist = {}
645
645
646 # dict of things NOT to alias (keywords, builtins and some special magics)
646 # dict of things NOT to alias (keywords, builtins and some special magics)
647 no_alias = {}
647 no_alias = {}
648 no_alias_magics = ['cd','popd','pushd','dhist','alias','unalias']
648 no_alias_magics = ['cd','popd','pushd','dhist','alias','unalias']
649 for key in keyword.kwlist + no_alias_magics:
649 for key in keyword.kwlist + no_alias_magics:
650 no_alias[key] = 1
650 no_alias[key] = 1
651 no_alias.update(__builtin__.__dict__)
651 no_alias.update(__builtin__.__dict__)
652 self.no_alias = no_alias
652 self.no_alias = no_alias
653
653
654 # make global variables for user access to these
654 # make global variables for user access to these
655 self.user_ns['_ih'] = self.input_hist
655 self.user_ns['_ih'] = self.input_hist
656 self.user_ns['_oh'] = self.output_hist
656 self.user_ns['_oh'] = self.output_hist
657 self.user_ns['_dh'] = self.dir_hist
657 self.user_ns['_dh'] = self.dir_hist
658
658
659 # user aliases to input and output histories
659 # user aliases to input and output histories
660 self.user_ns['In'] = self.input_hist
660 self.user_ns['In'] = self.input_hist
661 self.user_ns['Out'] = self.output_hist
661 self.user_ns['Out'] = self.output_hist
662
662
663 # Store the actual shell's name
663 # Store the actual shell's name
664 self.name = name
664 self.name = name
665
665
666 # Object variable to store code object waiting execution. This is
666 # Object variable to store code object waiting execution. This is
667 # used mainly by the multithreaded shells, but it can come in handy in
667 # used mainly by the multithreaded shells, but it can come in handy in
668 # other situations. No need to use a Queue here, since it's a single
668 # other situations. No need to use a Queue here, since it's a single
669 # item which gets cleared once run.
669 # item which gets cleared once run.
670 self.code_to_run = None
670 self.code_to_run = None
671
671
672 # Job manager (for jobs run as background threads)
672 # Job manager (for jobs run as background threads)
673 self.jobs = BackgroundJobManager()
673 self.jobs = BackgroundJobManager()
674 # Put the job manager into builtins so it's always there.
674 # Put the job manager into builtins so it's always there.
675 __builtin__.jobs = self.jobs
675 __builtin__.jobs = self.jobs
676
676
677 # escapes for automatic behavior on the command line
677 # escapes for automatic behavior on the command line
678 self.ESC_SHELL = '!'
678 self.ESC_SHELL = '!'
679 self.ESC_HELP = '?'
679 self.ESC_HELP = '?'
680 self.ESC_MAGIC = '%'
680 self.ESC_MAGIC = '%'
681 self.ESC_QUOTE = ','
681 self.ESC_QUOTE = ','
682 self.ESC_QUOTE2 = ';'
682 self.ESC_QUOTE2 = ';'
683 self.ESC_PAREN = '/'
683 self.ESC_PAREN = '/'
684
684
685 # And their associated handlers
685 # And their associated handlers
686 self.esc_handlers = {self.ESC_PAREN:self.handle_auto,
686 self.esc_handlers = {self.ESC_PAREN:self.handle_auto,
687 self.ESC_QUOTE:self.handle_auto,
687 self.ESC_QUOTE:self.handle_auto,
688 self.ESC_QUOTE2:self.handle_auto,
688 self.ESC_QUOTE2:self.handle_auto,
689 self.ESC_MAGIC:self.handle_magic,
689 self.ESC_MAGIC:self.handle_magic,
690 self.ESC_HELP:self.handle_help,
690 self.ESC_HELP:self.handle_help,
691 self.ESC_SHELL:self.handle_shell_escape,
691 self.ESC_SHELL:self.handle_shell_escape,
692 }
692 }
693
693
694 # class initializations
694 # class initializations
695 Logger.__init__(self,log_ns = self.user_ns)
695 Logger.__init__(self,log_ns = self.user_ns)
696 Magic.__init__(self,self)
696 Magic.__init__(self,self)
697
697
698 # an ugly hack to get a pointer to the shell, so I can start writing
698 # an ugly hack to get a pointer to the shell, so I can start writing
699 # magic code via this pointer instead of the current mixin salad.
699 # magic code via this pointer instead of the current mixin salad.
700 Magic.set_shell(self,self)
700 Magic.set_shell(self,self)
701
701
702 # Python source parser/formatter for syntax highlighting
702 # Python source parser/formatter for syntax highlighting
703 pyformat = Parser().format
703 pyformat = Parser().format
704 self.pycolorize = lambda src: pyformat(src,'str',self.rc['colors'])
704 self.pycolorize = lambda src: pyformat(src,'str',self.rc['colors'])
705
705
706 # hooks holds pointers used for user-side customizations
706 # hooks holds pointers used for user-side customizations
707 self.hooks = Struct()
707 self.hooks = Struct()
708
708
709 # Set all default hooks, defined in the IPython.hooks module.
709 # Set all default hooks, defined in the IPython.hooks module.
710 hooks = IPython.hooks
710 hooks = IPython.hooks
711 for hook_name in hooks.__all__:
711 for hook_name in hooks.__all__:
712 self.set_hook(hook_name,getattr(hooks,hook_name))
712 self.set_hook(hook_name,getattr(hooks,hook_name))
713
713
714 # Flag to mark unconditional exit
714 # Flag to mark unconditional exit
715 self.exit_now = False
715 self.exit_now = False
716
716
717 self.usage_min = """\
717 self.usage_min = """\
718 An enhanced console for Python.
718 An enhanced console for Python.
719 Some of its features are:
719 Some of its features are:
720 - Readline support if the readline library is present.
720 - Readline support if the readline library is present.
721 - Tab completion in the local namespace.
721 - Tab completion in the local namespace.
722 - Logging of input, see command-line options.
722 - Logging of input, see command-line options.
723 - System shell escape via ! , eg !ls.
723 - System shell escape via ! , eg !ls.
724 - Magic commands, starting with a % (like %ls, %pwd, %cd, etc.)
724 - Magic commands, starting with a % (like %ls, %pwd, %cd, etc.)
725 - Keeps track of locally defined variables via %who, %whos.
725 - Keeps track of locally defined variables via %who, %whos.
726 - Show object information with a ? eg ?x or x? (use ?? for more info).
726 - Show object information with a ? eg ?x or x? (use ?? for more info).
727 """
727 """
728 if usage: self.usage = usage
728 if usage: self.usage = usage
729 else: self.usage = self.usage_min
729 else: self.usage = self.usage_min
730
730
731 # Storage
731 # Storage
732 self.rc = rc # This will hold all configuration information
732 self.rc = rc # This will hold all configuration information
733 self.inputcache = []
733 self.inputcache = []
734 self._boundcache = []
734 self._boundcache = []
735 self.pager = 'less'
735 self.pager = 'less'
736 # temporary files used for various purposes. Deleted at exit.
736 # temporary files used for various purposes. Deleted at exit.
737 self.tempfiles = []
737 self.tempfiles = []
738
738
739 # Keep track of readline usage (later set by init_readline)
739 # Keep track of readline usage (later set by init_readline)
740 self.has_readline = 0
740 self.has_readline = 0
741
741
742 # for pushd/popd management
742 # for pushd/popd management
743 try:
743 try:
744 self.home_dir = get_home_dir()
744 self.home_dir = get_home_dir()
745 except HomeDirError,msg:
745 except HomeDirError,msg:
746 fatal(msg)
746 fatal(msg)
747
747
748 self.dir_stack = [os.getcwd().replace(self.home_dir,'~')]
748 self.dir_stack = [os.getcwd().replace(self.home_dir,'~')]
749
749
750 # Functions to call the underlying shell.
750 # Functions to call the underlying shell.
751
751
752 # utility to expand user variables via Itpl
752 # utility to expand user variables via Itpl
753 self.var_expand = lambda cmd: str(ItplNS(cmd.replace('#','\#'),
753 self.var_expand = lambda cmd: str(ItplNS(cmd.replace('#','\#'),
754 self.user_ns))
754 self.user_ns))
755 # The first is similar to os.system, but it doesn't return a value,
755 # The first is similar to os.system, but it doesn't return a value,
756 # and it allows interpolation of variables in the user's namespace.
756 # and it allows interpolation of variables in the user's namespace.
757 self.system = lambda cmd: shell(self.var_expand(cmd),
757 self.system = lambda cmd: shell(self.var_expand(cmd),
758 header='IPython system call: ',
758 header='IPython system call: ',
759 verbose=self.rc.system_verbose)
759 verbose=self.rc.system_verbose)
760 # These are for getoutput and getoutputerror:
760 # These are for getoutput and getoutputerror:
761 self.getoutput = lambda cmd: \
761 self.getoutput = lambda cmd: \
762 getoutput(self.var_expand(cmd),
762 getoutput(self.var_expand(cmd),
763 header='IPython system call: ',
763 header='IPython system call: ',
764 verbose=self.rc.system_verbose)
764 verbose=self.rc.system_verbose)
765 self.getoutputerror = lambda cmd: \
765 self.getoutputerror = lambda cmd: \
766 getoutputerror(str(ItplNS(cmd.replace('#','\#'),
766 getoutputerror(str(ItplNS(cmd.replace('#','\#'),
767 self.user_ns)),
767 self.user_ns)),
768 header='IPython system call: ',
768 header='IPython system call: ',
769 verbose=self.rc.system_verbose)
769 verbose=self.rc.system_verbose)
770
770
771 # RegExp for splitting line contents into pre-char//first
771 # RegExp for splitting line contents into pre-char//first
772 # word-method//rest. For clarity, each group in on one line.
772 # word-method//rest. For clarity, each group in on one line.
773
773
774 # WARNING: update the regexp if the above escapes are changed, as they
774 # WARNING: update the regexp if the above escapes are changed, as they
775 # are hardwired in.
775 # are hardwired in.
776
776
777 # Don't get carried away with trying to make the autocalling catch too
777 # Don't get carried away with trying to make the autocalling catch too
778 # much: it's better to be conservative rather than to trigger hidden
778 # much: it's better to be conservative rather than to trigger hidden
779 # evals() somewhere and end up causing side effects.
779 # evals() somewhere and end up causing side effects.
780
780
781 self.line_split = re.compile(r'^([\s*,;/])'
781 self.line_split = re.compile(r'^([\s*,;/])'
782 r'([\?\w\.]+\w*\s*)'
782 r'([\?\w\.]+\w*\s*)'
783 r'(\(?.*$)')
783 r'(\(?.*$)')
784
784
785 # Original re, keep around for a while in case changes break something
785 # Original re, keep around for a while in case changes break something
786 #self.line_split = re.compile(r'(^[\s*!\?%,/]?)'
786 #self.line_split = re.compile(r'(^[\s*!\?%,/]?)'
787 # r'(\s*[\?\w\.]+\w*\s*)'
787 # r'(\s*[\?\w\.]+\w*\s*)'
788 # r'(\(?.*$)')
788 # r'(\(?.*$)')
789
789
790 # RegExp to identify potential function names
790 # RegExp to identify potential function names
791 self.re_fun_name = re.compile(r'[a-zA-Z_]([a-zA-Z0-9_.]*) *$')
791 self.re_fun_name = re.compile(r'[a-zA-Z_]([a-zA-Z0-9_.]*) *$')
792 # RegExp to exclude strings with this start from autocalling
792 # RegExp to exclude strings with this start from autocalling
793 self.re_exclude_auto = re.compile('^[!=()<>,\*/\+-]|^is ')
793 self.re_exclude_auto = re.compile('^[!=()<>,\*/\+-]|^is ')
794 # try to catch also methods for stuff in lists/tuples/dicts: off
794 # try to catch also methods for stuff in lists/tuples/dicts: off
795 # (experimental). For this to work, the line_split regexp would need
795 # (experimental). For this to work, the line_split regexp would need
796 # to be modified so it wouldn't break things at '['. That line is
796 # to be modified so it wouldn't break things at '['. That line is
797 # nasty enough that I shouldn't change it until I can test it _well_.
797 # nasty enough that I shouldn't change it until I can test it _well_.
798 #self.re_fun_name = re.compile (r'[a-zA-Z_]([a-zA-Z0-9_.\[\]]*) ?$')
798 #self.re_fun_name = re.compile (r'[a-zA-Z_]([a-zA-Z0-9_.\[\]]*) ?$')
799
799
800 # keep track of where we started running (mainly for crash post-mortem)
800 # keep track of where we started running (mainly for crash post-mortem)
801 self.starting_dir = os.getcwd()
801 self.starting_dir = os.getcwd()
802
802
803 # Attributes for Logger mixin class, make defaults here
803 # Attributes for Logger mixin class, make defaults here
804 self._dolog = 0
804 self._dolog = 0
805 self.LOG = ''
805 self.LOG = ''
806 self.LOGDEF = '.InteractiveShell.log'
806 self.LOGDEF = '.InteractiveShell.log'
807 self.LOGMODE = 'over'
807 self.LOGMODE = 'over'
808 self.LOGHEAD = Itpl(
808 self.LOGHEAD = Itpl(
809 """#log# Automatic Logger file. *** THIS MUST BE THE FIRST LINE ***
809 """#log# Automatic Logger file. *** THIS MUST BE THE FIRST LINE ***
810 #log# DO NOT CHANGE THIS LINE OR THE TWO BELOW
810 #log# DO NOT CHANGE THIS LINE OR THE TWO BELOW
811 #log# opts = $self.rc.opts
811 #log# opts = $self.rc.opts
812 #log# args = $self.rc.args
812 #log# args = $self.rc.args
813 #log# It is safe to make manual edits below here.
813 #log# It is safe to make manual edits below here.
814 #log#-----------------------------------------------------------------------
814 #log#-----------------------------------------------------------------------
815 """)
815 """)
816 # Various switches which can be set
816 # Various switches which can be set
817 self.CACHELENGTH = 5000 # this is cheap, it's just text
817 self.CACHELENGTH = 5000 # this is cheap, it's just text
818 self.BANNER = "Python %(version)s on %(platform)s\n" % sys.__dict__
818 self.BANNER = "Python %(version)s on %(platform)s\n" % sys.__dict__
819 self.banner2 = banner2
819 self.banner2 = banner2
820
820
821 # TraceBack handlers:
821 # TraceBack handlers:
822 # Need two, one for syntax errors and one for other exceptions.
822 # Need two, one for syntax errors and one for other exceptions.
823 self.SyntaxTB = ultraTB.ListTB(color_scheme='NoColor')
823 self.SyntaxTB = ultraTB.ListTB(color_scheme='NoColor')
824 # This one is initialized with an offset, meaning we always want to
824 # This one is initialized with an offset, meaning we always want to
825 # remove the topmost item in the traceback, which is our own internal
825 # remove the topmost item in the traceback, which is our own internal
826 # code. Valid modes: ['Plain','Context','Verbose']
826 # code. Valid modes: ['Plain','Context','Verbose']
827 self.InteractiveTB = ultraTB.AutoFormattedTB(mode = 'Plain',
827 self.InteractiveTB = ultraTB.AutoFormattedTB(mode = 'Plain',
828 color_scheme='NoColor',
828 color_scheme='NoColor',
829 tb_offset = 1)
829 tb_offset = 1)
830 # and add any custom exception handlers the user may have specified
830 # and add any custom exception handlers the user may have specified
831 self.set_custom_exc(*custom_exceptions)
831 self.set_custom_exc(*custom_exceptions)
832
832
833 # Object inspector
833 # Object inspector
834 ins_colors = OInspect.InspectColors
834 ins_colors = OInspect.InspectColors
835 code_colors = PyColorize.ANSICodeColors
835 code_colors = PyColorize.ANSICodeColors
836 self.inspector = OInspect.Inspector(ins_colors,code_colors,'NoColor')
836 self.inspector = OInspect.Inspector(ins_colors,code_colors,'NoColor')
837 self.autoindent = 0
837 self.autoindent = 0
838
838
839 # Make some aliases automatically
839 # Make some aliases automatically
840 # Prepare list of shell aliases to auto-define
840 # Prepare list of shell aliases to auto-define
841 if os.name == 'posix':
841 if os.name == 'posix':
842 auto_alias = ('mkdir mkdir', 'rmdir rmdir',
842 auto_alias = ('mkdir mkdir', 'rmdir rmdir',
843 'mv mv -i','rm rm -i','cp cp -i',
843 'mv mv -i','rm rm -i','cp cp -i',
844 'cat cat','less less','clear clear',
844 'cat cat','less less','clear clear',
845 # a better ls
845 # a better ls
846 'ls ls -F',
846 'ls ls -F',
847 # long ls
847 # long ls
848 'll ls -lF',
848 'll ls -lF',
849 # color ls
849 # color ls
850 'lc ls -F -o --color',
850 'lc ls -F -o --color',
851 # ls normal files only
851 # ls normal files only
852 'lf ls -F -o --color %l | grep ^-',
852 'lf ls -F -o --color %l | grep ^-',
853 # ls symbolic links
853 # ls symbolic links
854 'lk ls -F -o --color %l | grep ^l',
854 'lk ls -F -o --color %l | grep ^l',
855 # directories or links to directories,
855 # directories or links to directories,
856 'ldir ls -F -o --color %l | grep /$',
856 'ldir ls -F -o --color %l | grep /$',
857 # things which are executable
857 # things which are executable
858 'lx ls -F -o --color %l | grep ^-..x',
858 'lx ls -F -o --color %l | grep ^-..x',
859 )
859 )
860 elif os.name in ['nt','dos']:
860 elif os.name in ['nt','dos']:
861 auto_alias = ('dir dir /on', 'ls dir /on',
861 auto_alias = ('dir dir /on', 'ls dir /on',
862 'ddir dir /ad /on', 'ldir dir /ad /on',
862 'ddir dir /ad /on', 'ldir dir /ad /on',
863 'mkdir mkdir','rmdir rmdir','echo echo',
863 'mkdir mkdir','rmdir rmdir','echo echo',
864 'ren ren','cls cls','copy copy')
864 'ren ren','cls cls','copy copy')
865 else:
865 else:
866 auto_alias = ()
866 auto_alias = ()
867 self.auto_alias = map(lambda s:s.split(None,1),auto_alias)
867 self.auto_alias = map(lambda s:s.split(None,1),auto_alias)
868 # Call the actual (public) initializer
868 # Call the actual (public) initializer
869 self.init_auto_alias()
869 self.init_auto_alias()
870 # end __init__
870 # end __init__
871
871
872 def set_hook(self,name,hook):
872 def set_hook(self,name,hook):
873 """set_hook(name,hook) -> sets an internal IPython hook.
873 """set_hook(name,hook) -> sets an internal IPython hook.
874
874
875 IPython exposes some of its internal API as user-modifiable hooks. By
875 IPython exposes some of its internal API as user-modifiable hooks. By
876 resetting one of these hooks, you can modify IPython's behavior to
876 resetting one of these hooks, you can modify IPython's behavior to
877 call at runtime your own routines."""
877 call at runtime your own routines."""
878
878
879 # At some point in the future, this should validate the hook before it
879 # At some point in the future, this should validate the hook before it
880 # accepts it. Probably at least check that the hook takes the number
880 # accepts it. Probably at least check that the hook takes the number
881 # of args it's supposed to.
881 # of args it's supposed to.
882 setattr(self.hooks,name,new.instancemethod(hook,self,self.__class__))
882 setattr(self.hooks,name,new.instancemethod(hook,self,self.__class__))
883
883
884 def set_custom_exc(self,exc_tuple,handler):
884 def set_custom_exc(self,exc_tuple,handler):
885 """set_custom_exc(exc_tuple,handler)
885 """set_custom_exc(exc_tuple,handler)
886
886
887 Set a custom exception handler, which will be called if any of the
887 Set a custom exception handler, which will be called if any of the
888 exceptions in exc_tuple occur in the mainloop (specifically, in the
888 exceptions in exc_tuple occur in the mainloop (specifically, in the
889 runcode() method.
889 runcode() method.
890
890
891 Inputs:
891 Inputs:
892
892
893 - exc_tuple: a *tuple* of valid exceptions to call the defined
893 - exc_tuple: a *tuple* of valid exceptions to call the defined
894 handler for. It is very important that you use a tuple, and NOT A
894 handler for. It is very important that you use a tuple, and NOT A
895 LIST here, because of the way Python's except statement works. If
895 LIST here, because of the way Python's except statement works. If
896 you only want to trap a single exception, use a singleton tuple:
896 you only want to trap a single exception, use a singleton tuple:
897
897
898 exc_tuple == (MyCustomException,)
898 exc_tuple == (MyCustomException,)
899
899
900 - handler: this must be defined as a function with the following
900 - handler: this must be defined as a function with the following
901 basic interface: def my_handler(self,etype,value,tb).
901 basic interface: def my_handler(self,etype,value,tb).
902
902
903 This will be made into an instance method (via new.instancemethod)
903 This will be made into an instance method (via new.instancemethod)
904 of IPython itself, and it will be called if any of the exceptions
904 of IPython itself, and it will be called if any of the exceptions
905 listed in the exc_tuple are caught. If the handler is None, an
905 listed in the exc_tuple are caught. If the handler is None, an
906 internal basic one is used, which just prints basic info.
906 internal basic one is used, which just prints basic info.
907
907
908 WARNING: by putting in your own exception handler into IPython's main
908 WARNING: by putting in your own exception handler into IPython's main
909 execution loop, you run a very good chance of nasty crashes. This
909 execution loop, you run a very good chance of nasty crashes. This
910 facility should only be used if you really know what you are doing."""
910 facility should only be used if you really know what you are doing."""
911
911
912 assert type(exc_tuple)==type(()) , \
912 assert type(exc_tuple)==type(()) , \
913 "The custom exceptions must be given AS A TUPLE."
913 "The custom exceptions must be given AS A TUPLE."
914
914
915 def dummy_handler(self,etype,value,tb):
915 def dummy_handler(self,etype,value,tb):
916 print '*** Simple custom exception handler ***'
916 print '*** Simple custom exception handler ***'
917 print 'Exception type :',etype
917 print 'Exception type :',etype
918 print 'Exception value:',value
918 print 'Exception value:',value
919 print 'Traceback :',tb
919 print 'Traceback :',tb
920 print 'Source code :','\n'.join(self.buffer)
920 print 'Source code :','\n'.join(self.buffer)
921
921
922 if handler is None: handler = dummy_handler
922 if handler is None: handler = dummy_handler
923
923
924 self.CustomTB = new.instancemethod(handler,self,self.__class__)
924 self.CustomTB = new.instancemethod(handler,self,self.__class__)
925 self.custom_exceptions = exc_tuple
925 self.custom_exceptions = exc_tuple
926
926
927 def set_custom_completer(self,completer,pos=0):
927 def set_custom_completer(self,completer,pos=0):
928 """set_custom_completer(completer,pos=0)
928 """set_custom_completer(completer,pos=0)
929
929
930 Adds a new custom completer function.
930 Adds a new custom completer function.
931
931
932 The position argument (defaults to 0) is the index in the completers
932 The position argument (defaults to 0) is the index in the completers
933 list where you want the completer to be inserted."""
933 list where you want the completer to be inserted."""
934
934
935 newcomp = new.instancemethod(completer,self.Completer,
935 newcomp = new.instancemethod(completer,self.Completer,
936 self.Completer.__class__)
936 self.Completer.__class__)
937 self.Completer.matchers.insert(pos,newcomp)
937 self.Completer.matchers.insert(pos,newcomp)
938
938
939 def complete(self,text):
939 def complete(self,text):
940 """Return a sorted list of all possible completions on text.
940 """Return a sorted list of all possible completions on text.
941
941
942 Inputs:
942 Inputs:
943
943
944 - text: a string of text to be completed on.
944 - text: a string of text to be completed on.
945
945
946 This is a wrapper around the completion mechanism, similar to what
946 This is a wrapper around the completion mechanism, similar to what
947 readline does at the command line when the TAB key is hit. By
947 readline does at the command line when the TAB key is hit. By
948 exposing it as a method, it can be used by other non-readline
948 exposing it as a method, it can be used by other non-readline
949 environments (such as GUIs) for text completion.
949 environments (such as GUIs) for text completion.
950
950
951 Simple usage example:
951 Simple usage example:
952
952
953 In [1]: x = 'hello'
953 In [1]: x = 'hello'
954
954
955 In [2]: __IP.complete('x.l')
955 In [2]: __IP.complete('x.l')
956 Out[2]: ['x.ljust', 'x.lower', 'x.lstrip']"""
956 Out[2]: ['x.ljust', 'x.lower', 'x.lstrip']"""
957
957
958 complete = self.Completer.complete
958 complete = self.Completer.complete
959 state = 0
959 state = 0
960 # use a dict so we get unique keys, since ipyhton's multiple
960 # use a dict so we get unique keys, since ipyhton's multiple
961 # completers can return duplicates.
961 # completers can return duplicates.
962 comps = {}
962 comps = {}
963 while True:
963 while True:
964 newcomp = complete(text,state)
964 newcomp = complete(text,state)
965 if newcomp is None:
965 if newcomp is None:
966 break
966 break
967 comps[newcomp] = 1
967 comps[newcomp] = 1
968 state += 1
968 state += 1
969 outcomps = comps.keys()
969 outcomps = comps.keys()
970 outcomps.sort()
970 outcomps.sort()
971 return outcomps
971 return outcomps
972
972
973 def post_config_initialization(self):
973 def post_config_initialization(self):
974 """Post configuration init method
974 """Post configuration init method
975
975
976 This is called after the configuration files have been processed to
976 This is called after the configuration files have been processed to
977 'finalize' the initialization."""
977 'finalize' the initialization."""
978
978
979 rc = self.rc
980
979 # Load readline proper
981 # Load readline proper
980 if self.rc.readline:
982 if rc.readline:
981 self.init_readline()
983 self.init_readline()
982
984
983 # Set user colors (don't do it in the constructor above so that it doesn't
985 # Set user colors (don't do it in the constructor above so that it doesn't
984 # crash if colors option is invalid)
986 # crash if colors option is invalid)
985 self.magic_colors(self.rc.colors)
987 self.magic_colors(rc.colors)
988
989 # Load user aliases
990 for alias in rc.alias:
991 self.magic_alias(alias)
986
992
987 # dynamic data that survives through sessions
993 # dynamic data that survives through sessions
988 # XXX make the filename a config option?
994 # XXX make the filename a config option?
989 persist_base = 'persist'
995 persist_base = 'persist'
990 if self.rc.profile:
996 if rc.profile:
991 persist_base += '_%s' % self.rc.profile
997 persist_base += '_%s' % rc.profile
992 self.persist_fname = os.path.join(self.rc.ipythondir,persist_base)
998 self.persist_fname = os.path.join(rc.ipythondir,persist_base)
993
999
994 try:
1000 try:
995 self.persist = pickle.load(file(self.persist_fname))
1001 self.persist = pickle.load(file(self.persist_fname))
996 except:
1002 except:
997 self.persist = {}
1003 self.persist = {}
998
1004
999 def init_auto_alias(self):
1005 def init_auto_alias(self):
1000 """Define some aliases automatically.
1006 """Define some aliases automatically.
1001
1007
1002 These are ALL parameter-less aliases"""
1008 These are ALL parameter-less aliases"""
1003 for alias,cmd in self.auto_alias:
1009 for alias,cmd in self.auto_alias:
1004 self.alias_table[alias] = (0,cmd)
1010 self.alias_table[alias] = (0,cmd)
1005
1011
1006 def alias_table_validate(self,verbose=0):
1012 def alias_table_validate(self,verbose=0):
1007 """Update information about the alias table.
1013 """Update information about the alias table.
1008
1014
1009 In particular, make sure no Python keywords/builtins are in it."""
1015 In particular, make sure no Python keywords/builtins are in it."""
1010
1016
1011 no_alias = self.no_alias
1017 no_alias = self.no_alias
1012 for k in self.alias_table.keys():
1018 for k in self.alias_table.keys():
1013 if k in no_alias:
1019 if k in no_alias:
1014 del self.alias_table[k]
1020 del self.alias_table[k]
1015 if verbose:
1021 if verbose:
1016 print ("Deleting alias <%s>, it's a Python "
1022 print ("Deleting alias <%s>, it's a Python "
1017 "keyword or builtin." % k)
1023 "keyword or builtin." % k)
1018
1024
1019 def set_autoindent(self,value=None):
1025 def set_autoindent(self,value=None):
1020 """Set the autoindent flag, checking for readline support.
1026 """Set the autoindent flag, checking for readline support.
1021
1027
1022 If called with no arguments, it acts as a toggle."""
1028 If called with no arguments, it acts as a toggle."""
1023
1029
1024 if not self.has_readline:
1030 if not self.has_readline:
1025 if os.name == 'posix':
1031 if os.name == 'posix':
1026 warn("The auto-indent feature requires the readline library")
1032 warn("The auto-indent feature requires the readline library")
1027 self.autoindent = 0
1033 self.autoindent = 0
1028 return
1034 return
1029 if value is None:
1035 if value is None:
1030 self.autoindent = not self.autoindent
1036 self.autoindent = not self.autoindent
1031 else:
1037 else:
1032 self.autoindent = value
1038 self.autoindent = value
1033
1039
1034 def rc_set_toggle(self,rc_field,value=None):
1040 def rc_set_toggle(self,rc_field,value=None):
1035 """Set or toggle a field in IPython's rc config. structure.
1041 """Set or toggle a field in IPython's rc config. structure.
1036
1042
1037 If called with no arguments, it acts as a toggle.
1043 If called with no arguments, it acts as a toggle.
1038
1044
1039 If called with a non-existent field, the resulting AttributeError
1045 If called with a non-existent field, the resulting AttributeError
1040 exception will propagate out."""
1046 exception will propagate out."""
1041
1047
1042 rc_val = getattr(self.rc,rc_field)
1048 rc_val = getattr(self.rc,rc_field)
1043 if value is None:
1049 if value is None:
1044 value = not rc_val
1050 value = not rc_val
1045 setattr(self.rc,rc_field,value)
1051 setattr(self.rc,rc_field,value)
1046
1052
1047 def user_setup(self,ipythondir,rc_suffix,mode='install'):
1053 def user_setup(self,ipythondir,rc_suffix,mode='install'):
1048 """Install the user configuration directory.
1054 """Install the user configuration directory.
1049
1055
1050 Can be called when running for the first time or to upgrade the user's
1056 Can be called when running for the first time or to upgrade the user's
1051 .ipython/ directory with the mode parameter. Valid modes are 'install'
1057 .ipython/ directory with the mode parameter. Valid modes are 'install'
1052 and 'upgrade'."""
1058 and 'upgrade'."""
1053
1059
1054 def wait():
1060 def wait():
1055 try:
1061 try:
1056 raw_input("Please press <RETURN> to start IPython.")
1062 raw_input("Please press <RETURN> to start IPython.")
1057 except EOFError:
1063 except EOFError:
1058 print >> Term.cout
1064 print >> Term.cout
1059 print '*'*70
1065 print '*'*70
1060
1066
1061 cwd = os.getcwd() # remember where we started
1067 cwd = os.getcwd() # remember where we started
1062 glb = glob.glob
1068 glb = glob.glob
1063 print '*'*70
1069 print '*'*70
1064 if mode == 'install':
1070 if mode == 'install':
1065 print \
1071 print \
1066 """Welcome to IPython. I will try to create a personal configuration directory
1072 """Welcome to IPython. I will try to create a personal configuration directory
1067 where you can customize many aspects of IPython's functionality in:\n"""
1073 where you can customize many aspects of IPython's functionality in:\n"""
1068 else:
1074 else:
1069 print 'I am going to upgrade your configuration in:'
1075 print 'I am going to upgrade your configuration in:'
1070
1076
1071 print ipythondir
1077 print ipythondir
1072
1078
1073 rcdirend = os.path.join('IPython','UserConfig')
1079 rcdirend = os.path.join('IPython','UserConfig')
1074 cfg = lambda d: os.path.join(d,rcdirend)
1080 cfg = lambda d: os.path.join(d,rcdirend)
1075 try:
1081 try:
1076 rcdir = filter(os.path.isdir,map(cfg,sys.path))[0]
1082 rcdir = filter(os.path.isdir,map(cfg,sys.path))[0]
1077 except IOError:
1083 except IOError:
1078 warning = """
1084 warning = """
1079 Installation error. IPython's directory was not found.
1085 Installation error. IPython's directory was not found.
1080
1086
1081 Check the following:
1087 Check the following:
1082
1088
1083 The ipython/IPython directory should be in a directory belonging to your
1089 The ipython/IPython directory should be in a directory belonging to your
1084 PYTHONPATH environment variable (that is, it should be in a directory
1090 PYTHONPATH environment variable (that is, it should be in a directory
1085 belonging to sys.path). You can copy it explicitly there or just link to it.
1091 belonging to sys.path). You can copy it explicitly there or just link to it.
1086
1092
1087 IPython will proceed with builtin defaults.
1093 IPython will proceed with builtin defaults.
1088 """
1094 """
1089 warn(warning)
1095 warn(warning)
1090 wait()
1096 wait()
1091 return
1097 return
1092
1098
1093 if mode == 'install':
1099 if mode == 'install':
1094 try:
1100 try:
1095 shutil.copytree(rcdir,ipythondir)
1101 shutil.copytree(rcdir,ipythondir)
1096 os.chdir(ipythondir)
1102 os.chdir(ipythondir)
1097 rc_files = glb("ipythonrc*")
1103 rc_files = glb("ipythonrc*")
1098 for rc_file in rc_files:
1104 for rc_file in rc_files:
1099 os.rename(rc_file,rc_file+rc_suffix)
1105 os.rename(rc_file,rc_file+rc_suffix)
1100 except:
1106 except:
1101 warning = """
1107 warning = """
1102
1108
1103 There was a problem with the installation:
1109 There was a problem with the installation:
1104 %s
1110 %s
1105 Try to correct it or contact the developers if you think it's a bug.
1111 Try to correct it or contact the developers if you think it's a bug.
1106 IPython will proceed with builtin defaults.""" % sys.exc_info()[1]
1112 IPython will proceed with builtin defaults.""" % sys.exc_info()[1]
1107 warn(warning)
1113 warn(warning)
1108 wait()
1114 wait()
1109 return
1115 return
1110
1116
1111 elif mode == 'upgrade':
1117 elif mode == 'upgrade':
1112 try:
1118 try:
1113 os.chdir(ipythondir)
1119 os.chdir(ipythondir)
1114 except:
1120 except:
1115 print """
1121 print """
1116 Can not upgrade: changing to directory %s failed. Details:
1122 Can not upgrade: changing to directory %s failed. Details:
1117 %s
1123 %s
1118 """ % (ipythondir,sys.exc_info()[1])
1124 """ % (ipythondir,sys.exc_info()[1])
1119 wait()
1125 wait()
1120 return
1126 return
1121 else:
1127 else:
1122 sources = glb(os.path.join(rcdir,'[A-Za-z]*'))
1128 sources = glb(os.path.join(rcdir,'[A-Za-z]*'))
1123 for new_full_path in sources:
1129 for new_full_path in sources:
1124 new_filename = os.path.basename(new_full_path)
1130 new_filename = os.path.basename(new_full_path)
1125 if new_filename.startswith('ipythonrc'):
1131 if new_filename.startswith('ipythonrc'):
1126 new_filename = new_filename + rc_suffix
1132 new_filename = new_filename + rc_suffix
1127 # The config directory should only contain files, skip any
1133 # The config directory should only contain files, skip any
1128 # directories which may be there (like CVS)
1134 # directories which may be there (like CVS)
1129 if os.path.isdir(new_full_path):
1135 if os.path.isdir(new_full_path):
1130 continue
1136 continue
1131 if os.path.exists(new_filename):
1137 if os.path.exists(new_filename):
1132 old_file = new_filename+'.old'
1138 old_file = new_filename+'.old'
1133 if os.path.exists(old_file):
1139 if os.path.exists(old_file):
1134 os.remove(old_file)
1140 os.remove(old_file)
1135 os.rename(new_filename,old_file)
1141 os.rename(new_filename,old_file)
1136 shutil.copy(new_full_path,new_filename)
1142 shutil.copy(new_full_path,new_filename)
1137 else:
1143 else:
1138 raise ValueError,'unrecognized mode for install:',`mode`
1144 raise ValueError,'unrecognized mode for install:',`mode`
1139
1145
1140 # Fix line-endings to those native to each platform in the config
1146 # Fix line-endings to those native to each platform in the config
1141 # directory.
1147 # directory.
1142 try:
1148 try:
1143 os.chdir(ipythondir)
1149 os.chdir(ipythondir)
1144 except:
1150 except:
1145 print """
1151 print """
1146 Problem: changing to directory %s failed.
1152 Problem: changing to directory %s failed.
1147 Details:
1153 Details:
1148 %s
1154 %s
1149
1155
1150 Some configuration files may have incorrect line endings. This should not
1156 Some configuration files may have incorrect line endings. This should not
1151 cause any problems during execution. """ % (ipythondir,sys.exc_info()[1])
1157 cause any problems during execution. """ % (ipythondir,sys.exc_info()[1])
1152 wait()
1158 wait()
1153 else:
1159 else:
1154 for fname in glb('ipythonrc*'):
1160 for fname in glb('ipythonrc*'):
1155 try:
1161 try:
1156 native_line_ends(fname,backup=0)
1162 native_line_ends(fname,backup=0)
1157 except IOError:
1163 except IOError:
1158 pass
1164 pass
1159
1165
1160 if mode == 'install':
1166 if mode == 'install':
1161 print """
1167 print """
1162 Successful installation!
1168 Successful installation!
1163
1169
1164 Please read the sections 'Initial Configuration' and 'Quick Tips' in the
1170 Please read the sections 'Initial Configuration' and 'Quick Tips' in the
1165 IPython manual (there are both HTML and PDF versions supplied with the
1171 IPython manual (there are both HTML and PDF versions supplied with the
1166 distribution) to make sure that your system environment is properly configured
1172 distribution) to make sure that your system environment is properly configured
1167 to take advantage of IPython's features."""
1173 to take advantage of IPython's features."""
1168 else:
1174 else:
1169 print """
1175 print """
1170 Successful upgrade!
1176 Successful upgrade!
1171
1177
1172 All files in your directory:
1178 All files in your directory:
1173 %(ipythondir)s
1179 %(ipythondir)s
1174 which would have been overwritten by the upgrade were backed up with a .old
1180 which would have been overwritten by the upgrade were backed up with a .old
1175 extension. If you had made particular customizations in those files you may
1181 extension. If you had made particular customizations in those files you may
1176 want to merge them back into the new files.""" % locals()
1182 want to merge them back into the new files.""" % locals()
1177 wait()
1183 wait()
1178 os.chdir(cwd)
1184 os.chdir(cwd)
1179 # end user_setup()
1185 # end user_setup()
1180
1186
1181 def atexit_operations(self):
1187 def atexit_operations(self):
1182 """This will be executed at the time of exit.
1188 """This will be executed at the time of exit.
1183
1189
1184 Saving of persistent data should be performed here. """
1190 Saving of persistent data should be performed here. """
1185
1191
1186 # input history
1192 # input history
1187 self.savehist()
1193 self.savehist()
1188
1194
1189 # Cleanup all tempfiles left around
1195 # Cleanup all tempfiles left around
1190 for tfile in self.tempfiles:
1196 for tfile in self.tempfiles:
1191 try:
1197 try:
1192 os.unlink(tfile)
1198 os.unlink(tfile)
1193 except OSError:
1199 except OSError:
1194 pass
1200 pass
1195
1201
1196 # save the "persistent data" catch-all dictionary
1202 # save the "persistent data" catch-all dictionary
1197 try:
1203 try:
1198 pickle.dump(self.persist, open(self.persist_fname,"w"))
1204 pickle.dump(self.persist, open(self.persist_fname,"w"))
1199 except:
1205 except:
1200 print "*** ERROR *** persistent data saving failed."
1206 print "*** ERROR *** persistent data saving failed."
1201
1207
1202 def savehist(self):
1208 def savehist(self):
1203 """Save input history to a file (via readline library)."""
1209 """Save input history to a file (via readline library)."""
1204 try:
1210 try:
1205 self.readline.write_history_file(self.histfile)
1211 self.readline.write_history_file(self.histfile)
1206 except:
1212 except:
1207 print 'Unable to save IPython command history to file: ' + \
1213 print 'Unable to save IPython command history to file: ' + \
1208 `self.histfile`
1214 `self.histfile`
1209
1215
1210 def pre_readline(self):
1216 def pre_readline(self):
1211 """readline hook to be used at the start of each line.
1217 """readline hook to be used at the start of each line.
1212
1218
1213 Currently it handles auto-indent only."""
1219 Currently it handles auto-indent only."""
1214
1220
1215 self.readline.insert_text(' '* self.readline_indent)
1221 self.readline.insert_text(' '* self.readline_indent)
1216
1222
1217 def init_readline(self):
1223 def init_readline(self):
1218 """Command history completion/saving/reloading."""
1224 """Command history completion/saving/reloading."""
1219 try:
1225 try:
1220 import readline
1226 import readline
1221 self.Completer = MagicCompleter(self,
1227 self.Completer = MagicCompleter(self,
1222 self.user_ns,
1228 self.user_ns,
1223 self.rc.readline_omit__names,
1229 self.rc.readline_omit__names,
1224 self.alias_table)
1230 self.alias_table)
1225 except ImportError,NameError:
1231 except ImportError,NameError:
1226 # If FlexCompleter failed to import, MagicCompleter won't be
1232 # If FlexCompleter failed to import, MagicCompleter won't be
1227 # defined. This can happen because of a problem with readline
1233 # defined. This can happen because of a problem with readline
1228 self.has_readline = 0
1234 self.has_readline = 0
1229 # no point in bugging windows users with this every time:
1235 # no point in bugging windows users with this every time:
1230 if os.name == 'posix':
1236 if os.name == 'posix':
1231 warn('Readline services not available on this platform.')
1237 warn('Readline services not available on this platform.')
1232 else:
1238 else:
1233 import atexit
1239 import atexit
1234
1240
1235 # Platform-specific configuration
1241 # Platform-specific configuration
1236 if os.name == 'nt':
1242 if os.name == 'nt':
1237 # readline under Windows modifies the default exit behavior
1243 # readline under Windows modifies the default exit behavior
1238 # from being Ctrl-Z/Return to the Unix Ctrl-D one.
1244 # from being Ctrl-Z/Return to the Unix Ctrl-D one.
1239 __builtin__.exit = __builtin__.quit = \
1245 __builtin__.exit = __builtin__.quit = \
1240 ('Use Ctrl-D (i.e. EOF) to exit. '
1246 ('Use Ctrl-D (i.e. EOF) to exit. '
1241 'Use %Exit or %Quit to exit without confirmation.')
1247 'Use %Exit or %Quit to exit without confirmation.')
1242 self.readline_startup_hook = readline.set_pre_input_hook
1248 self.readline_startup_hook = readline.set_pre_input_hook
1243 else:
1249 else:
1244 self.readline_startup_hook = readline.set_startup_hook
1250 self.readline_startup_hook = readline.set_startup_hook
1245
1251
1246 # Load user's initrc file (readline config)
1252 # Load user's initrc file (readline config)
1247 inputrc_name = os.environ.get('INPUTRC')
1253 inputrc_name = os.environ.get('INPUTRC')
1248 if inputrc_name is None:
1254 if inputrc_name is None:
1249 home_dir = get_home_dir()
1255 home_dir = get_home_dir()
1250 if home_dir is not None:
1256 if home_dir is not None:
1251 inputrc_name = os.path.join(home_dir,'.inputrc')
1257 inputrc_name = os.path.join(home_dir,'.inputrc')
1252 if os.path.isfile(inputrc_name):
1258 if os.path.isfile(inputrc_name):
1253 try:
1259 try:
1254 readline.read_init_file(inputrc_name)
1260 readline.read_init_file(inputrc_name)
1255 except:
1261 except:
1256 warn('Problems reading readline initialization file <%s>'
1262 warn('Problems reading readline initialization file <%s>'
1257 % inputrc_name)
1263 % inputrc_name)
1258
1264
1259 self.has_readline = 1
1265 self.has_readline = 1
1260 self.readline = readline
1266 self.readline = readline
1261 self.readline_indent = 0 # for auto-indenting via readline
1267 self.readline_indent = 0 # for auto-indenting via readline
1262 # save this in sys so embedded copies can restore it properly
1268 # save this in sys so embedded copies can restore it properly
1263 sys.ipcompleter = self.Completer.complete
1269 sys.ipcompleter = self.Completer.complete
1264 readline.set_completer(self.Completer.complete)
1270 readline.set_completer(self.Completer.complete)
1265
1271
1266 # Configure readline according to user's prefs
1272 # Configure readline according to user's prefs
1267 for rlcommand in self.rc.readline_parse_and_bind:
1273 for rlcommand in self.rc.readline_parse_and_bind:
1268 readline.parse_and_bind(rlcommand)
1274 readline.parse_and_bind(rlcommand)
1269
1275
1270 # remove some chars from the delimiters list
1276 # remove some chars from the delimiters list
1271 delims = readline.get_completer_delims()
1277 delims = readline.get_completer_delims()
1272 delims = delims.translate(string._idmap,
1278 delims = delims.translate(string._idmap,
1273 self.rc.readline_remove_delims)
1279 self.rc.readline_remove_delims)
1274 readline.set_completer_delims(delims)
1280 readline.set_completer_delims(delims)
1275 # otherwise we end up with a monster history after a while:
1281 # otherwise we end up with a monster history after a while:
1276 readline.set_history_length(1000)
1282 readline.set_history_length(1000)
1277 try:
1283 try:
1278 #print '*** Reading readline history' # dbg
1284 #print '*** Reading readline history' # dbg
1279 readline.read_history_file(self.histfile)
1285 readline.read_history_file(self.histfile)
1280 except IOError:
1286 except IOError:
1281 pass # It doesn't exist yet.
1287 pass # It doesn't exist yet.
1282
1288
1283 atexit.register(self.atexit_operations)
1289 atexit.register(self.atexit_operations)
1284 del atexit
1290 del atexit
1285
1291
1286 # Configure auto-indent for all platforms
1292 # Configure auto-indent for all platforms
1287 self.set_autoindent(self.rc.autoindent)
1293 self.set_autoindent(self.rc.autoindent)
1288
1294
1289 def showsyntaxerror(self, filename=None):
1295 def showsyntaxerror(self, filename=None):
1290 """Display the syntax error that just occurred.
1296 """Display the syntax error that just occurred.
1291
1297
1292 This doesn't display a stack trace because there isn't one.
1298 This doesn't display a stack trace because there isn't one.
1293
1299
1294 If a filename is given, it is stuffed in the exception instead
1300 If a filename is given, it is stuffed in the exception instead
1295 of what was there before (because Python's parser always uses
1301 of what was there before (because Python's parser always uses
1296 "<string>" when reading from a string).
1302 "<string>" when reading from a string).
1297 """
1303 """
1298 type, value, sys.last_traceback = sys.exc_info()
1304 type, value, sys.last_traceback = sys.exc_info()
1299 sys.last_type = type
1305 sys.last_type = type
1300 sys.last_value = value
1306 sys.last_value = value
1301 if filename and type is SyntaxError:
1307 if filename and type is SyntaxError:
1302 # Work hard to stuff the correct filename in the exception
1308 # Work hard to stuff the correct filename in the exception
1303 try:
1309 try:
1304 msg, (dummy_filename, lineno, offset, line) = value
1310 msg, (dummy_filename, lineno, offset, line) = value
1305 except:
1311 except:
1306 # Not the format we expect; leave it alone
1312 # Not the format we expect; leave it alone
1307 pass
1313 pass
1308 else:
1314 else:
1309 # Stuff in the right filename
1315 # Stuff in the right filename
1310 try:
1316 try:
1311 # Assume SyntaxError is a class exception
1317 # Assume SyntaxError is a class exception
1312 value = SyntaxError(msg, (filename, lineno, offset, line))
1318 value = SyntaxError(msg, (filename, lineno, offset, line))
1313 except:
1319 except:
1314 # If that failed, assume SyntaxError is a string
1320 # If that failed, assume SyntaxError is a string
1315 value = msg, (filename, lineno, offset, line)
1321 value = msg, (filename, lineno, offset, line)
1316 self.SyntaxTB(type,value,[])
1322 self.SyntaxTB(type,value,[])
1317
1323
1318 def debugger(self):
1324 def debugger(self):
1319 """Call the pdb debugger."""
1325 """Call the pdb debugger."""
1320
1326
1321 if not self.rc.pdb:
1327 if not self.rc.pdb:
1322 return
1328 return
1323 pdb.pm()
1329 pdb.pm()
1324
1330
1325 def showtraceback(self,exc_tuple = None,filename=None):
1331 def showtraceback(self,exc_tuple = None,filename=None):
1326 """Display the exception that just occurred."""
1332 """Display the exception that just occurred."""
1327
1333
1328 # Though this won't be called by syntax errors in the input line,
1334 # Though this won't be called by syntax errors in the input line,
1329 # there may be SyntaxError cases whith imported code.
1335 # there may be SyntaxError cases whith imported code.
1330 if exc_tuple is None:
1336 if exc_tuple is None:
1331 type, value, tb = sys.exc_info()
1337 type, value, tb = sys.exc_info()
1332 else:
1338 else:
1333 type, value, tb = exc_tuple
1339 type, value, tb = exc_tuple
1334 if type is SyntaxError:
1340 if type is SyntaxError:
1335 self.showsyntaxerror(filename)
1341 self.showsyntaxerror(filename)
1336 else:
1342 else:
1337 sys.last_type = type
1343 sys.last_type = type
1338 sys.last_value = value
1344 sys.last_value = value
1339 sys.last_traceback = tb
1345 sys.last_traceback = tb
1340 self.InteractiveTB()
1346 self.InteractiveTB()
1341 if self.InteractiveTB.call_pdb and self.has_readline:
1347 if self.InteractiveTB.call_pdb and self.has_readline:
1342 # pdb mucks up readline, fix it back
1348 # pdb mucks up readline, fix it back
1343 self.readline.set_completer(self.Completer.complete)
1349 self.readline.set_completer(self.Completer.complete)
1344
1350
1345 def update_cache(self, line):
1351 def update_cache(self, line):
1346 """puts line into cache"""
1352 """puts line into cache"""
1347 self.inputcache.insert(0, line) # This copies the cache every time ... :-(
1353 self.inputcache.insert(0, line) # This copies the cache every time ... :-(
1348 if len(self.inputcache) >= self.CACHELENGTH:
1354 if len(self.inputcache) >= self.CACHELENGTH:
1349 self.inputcache.pop() # This not :-)
1355 self.inputcache.pop() # This not :-)
1350
1356
1351 def mainloop(self,banner=None):
1357 def mainloop(self,banner=None):
1352 """Creates the local namespace and starts the mainloop.
1358 """Creates the local namespace and starts the mainloop.
1353
1359
1354 If an optional banner argument is given, it will override the
1360 If an optional banner argument is given, it will override the
1355 internally created default banner."""
1361 internally created default banner."""
1356
1362
1357 if self.rc.c: # Emulate Python's -c option
1363 if self.rc.c: # Emulate Python's -c option
1358 self.exec_init_cmd()
1364 self.exec_init_cmd()
1359 if banner is None:
1365 if banner is None:
1360 if self.rc.banner:
1366 if self.rc.banner:
1361 banner = self.BANNER+self.banner2
1367 banner = self.BANNER+self.banner2
1362 else:
1368 else:
1363 banner = ''
1369 banner = ''
1364 self.interact(banner)
1370 self.interact(banner)
1365
1371
1366 def exec_init_cmd(self):
1372 def exec_init_cmd(self):
1367 """Execute a command given at the command line.
1373 """Execute a command given at the command line.
1368
1374
1369 This emulates Python's -c option."""
1375 This emulates Python's -c option."""
1370
1376
1371 sys.argv = ['-c']
1377 sys.argv = ['-c']
1372 self.push(self.rc.c)
1378 self.push(self.rc.c)
1373
1379
1374 def embed_mainloop(self,header='',local_ns=None,global_ns=None,stack_depth=0):
1380 def embed_mainloop(self,header='',local_ns=None,global_ns=None,stack_depth=0):
1375 """Embeds IPython into a running python program.
1381 """Embeds IPython into a running python program.
1376
1382
1377 Input:
1383 Input:
1378
1384
1379 - header: An optional header message can be specified.
1385 - header: An optional header message can be specified.
1380
1386
1381 - local_ns, global_ns: working namespaces. If given as None, the
1387 - local_ns, global_ns: working namespaces. If given as None, the
1382 IPython-initialized one is updated with __main__.__dict__, so that
1388 IPython-initialized one is updated with __main__.__dict__, so that
1383 program variables become visible but user-specific configuration
1389 program variables become visible but user-specific configuration
1384 remains possible.
1390 remains possible.
1385
1391
1386 - stack_depth: specifies how many levels in the stack to go to
1392 - stack_depth: specifies how many levels in the stack to go to
1387 looking for namespaces (when local_ns and global_ns are None). This
1393 looking for namespaces (when local_ns and global_ns are None). This
1388 allows an intermediate caller to make sure that this function gets
1394 allows an intermediate caller to make sure that this function gets
1389 the namespace from the intended level in the stack. By default (0)
1395 the namespace from the intended level in the stack. By default (0)
1390 it will get its locals and globals from the immediate caller.
1396 it will get its locals and globals from the immediate caller.
1391
1397
1392 Warning: it's possible to use this in a program which is being run by
1398 Warning: it's possible to use this in a program which is being run by
1393 IPython itself (via %run), but some funny things will happen (a few
1399 IPython itself (via %run), but some funny things will happen (a few
1394 globals get overwritten). In the future this will be cleaned up, as
1400 globals get overwritten). In the future this will be cleaned up, as
1395 there is no fundamental reason why it can't work perfectly."""
1401 there is no fundamental reason why it can't work perfectly."""
1396
1402
1397 # Get locals and globals from caller
1403 # Get locals and globals from caller
1398 if local_ns is None or global_ns is None:
1404 if local_ns is None or global_ns is None:
1399 call_frame = sys._getframe(stack_depth).f_back
1405 call_frame = sys._getframe(stack_depth).f_back
1400
1406
1401 if local_ns is None:
1407 if local_ns is None:
1402 local_ns = call_frame.f_locals
1408 local_ns = call_frame.f_locals
1403 if global_ns is None:
1409 if global_ns is None:
1404 global_ns = call_frame.f_globals
1410 global_ns = call_frame.f_globals
1405
1411
1406 # Update namespaces and fire up interpreter
1412 # Update namespaces and fire up interpreter
1407 self.user_ns = local_ns
1413 self.user_ns = local_ns
1408 self.user_global_ns = global_ns
1414 self.user_global_ns = global_ns
1409
1415
1410 # Patch for global embedding to make sure that things don't overwrite
1416 # Patch for global embedding to make sure that things don't overwrite
1411 # user globals accidentally. Thanks to Richard <rxe@renre-europe.com>
1417 # user globals accidentally. Thanks to Richard <rxe@renre-europe.com>
1412 # FIXME. Test this a bit more carefully (the if.. is new)
1418 # FIXME. Test this a bit more carefully (the if.. is new)
1413 if local_ns is None and global_ns is None:
1419 if local_ns is None and global_ns is None:
1414 self.user_global_ns.update(__main__.__dict__)
1420 self.user_global_ns.update(__main__.__dict__)
1415
1421
1416 self.interact(header)
1422 self.interact(header)
1417
1423
1418 def interact(self, banner=None):
1424 def interact(self, banner=None):
1419 """Closely emulate the interactive Python console.
1425 """Closely emulate the interactive Python console.
1420
1426
1421 The optional banner argument specify the banner to print
1427 The optional banner argument specify the banner to print
1422 before the first interaction; by default it prints a banner
1428 before the first interaction; by default it prints a banner
1423 similar to the one printed by the real Python interpreter,
1429 similar to the one printed by the real Python interpreter,
1424 followed by the current class name in parentheses (so as not
1430 followed by the current class name in parentheses (so as not
1425 to confuse this with the real interpreter -- since it's so
1431 to confuse this with the real interpreter -- since it's so
1426 close!).
1432 close!).
1427
1433
1428 """
1434 """
1429 cprt = 'Type "copyright", "credits" or "license" for more information.'
1435 cprt = 'Type "copyright", "credits" or "license" for more information.'
1430 if banner is None:
1436 if banner is None:
1431 self.write("Python %s on %s\n%s\n(%s)\n" %
1437 self.write("Python %s on %s\n%s\n(%s)\n" %
1432 (sys.version, sys.platform, cprt,
1438 (sys.version, sys.platform, cprt,
1433 self.__class__.__name__))
1439 self.__class__.__name__))
1434 else:
1440 else:
1435 self.write(banner)
1441 self.write(banner)
1436
1442
1437 more = 0
1443 more = 0
1438
1444
1439 # Mark activity in the builtins
1445 # Mark activity in the builtins
1440 __builtin__.__dict__['__IPYTHON__active'] += 1
1446 __builtin__.__dict__['__IPYTHON__active'] += 1
1441
1447
1442 # exit_now is set by a call to %Exit or %Quit
1448 # exit_now is set by a call to %Exit or %Quit
1443 while not self.exit_now:
1449 while not self.exit_now:
1444 try:
1450 try:
1445 if more:
1451 if more:
1446 prompt = self.outputcache.prompt2
1452 prompt = self.outputcache.prompt2
1447 if self.autoindent:
1453 if self.autoindent:
1448 self.readline_startup_hook(self.pre_readline)
1454 self.readline_startup_hook(self.pre_readline)
1449 else:
1455 else:
1450 prompt = self.outputcache.prompt1
1456 prompt = self.outputcache.prompt1
1451 try:
1457 try:
1452 line = self.raw_input(prompt)
1458 line = self.raw_input(prompt)
1453 if self.autoindent:
1459 if self.autoindent:
1454 self.readline_startup_hook(None)
1460 self.readline_startup_hook(None)
1455 except EOFError:
1461 except EOFError:
1456 if self.autoindent:
1462 if self.autoindent:
1457 self.readline_startup_hook(None)
1463 self.readline_startup_hook(None)
1458 self.write("\n")
1464 self.write("\n")
1459 if self.rc.confirm_exit:
1465 if self.rc.confirm_exit:
1460 if ask_yes_no('Do you really want to exit ([y]/n)?','y'):
1466 if ask_yes_no('Do you really want to exit ([y]/n)?','y'):
1461 break
1467 break
1462 else:
1468 else:
1463 break
1469 break
1464 else:
1470 else:
1465 more = self.push(line)
1471 more = self.push(line)
1466 # Auto-indent management
1472 # Auto-indent management
1467 if self.autoindent:
1473 if self.autoindent:
1468 if line:
1474 if line:
1469 ini_spaces = re.match('^(\s+)',line)
1475 ini_spaces = re.match('^(\s+)',line)
1470 if ini_spaces:
1476 if ini_spaces:
1471 nspaces = ini_spaces.end()
1477 nspaces = ini_spaces.end()
1472 else:
1478 else:
1473 nspaces = 0
1479 nspaces = 0
1474 self.readline_indent = nspaces
1480 self.readline_indent = nspaces
1475
1481
1476 if line[-1] == ':':
1482 if line[-1] == ':':
1477 self.readline_indent += 4
1483 self.readline_indent += 4
1478 elif re.match(r'^\s+raise|^\s+return',line):
1484 elif re.match(r'^\s+raise|^\s+return',line):
1479 self.readline_indent -= 4
1485 self.readline_indent -= 4
1480 else:
1486 else:
1481 self.readline_indent = 0
1487 self.readline_indent = 0
1482
1488
1483 except KeyboardInterrupt:
1489 except KeyboardInterrupt:
1484 self.write("\nKeyboardInterrupt\n")
1490 self.write("\nKeyboardInterrupt\n")
1485 self.resetbuffer()
1491 self.resetbuffer()
1486 more = 0
1492 more = 0
1487 # keep cache in sync with the prompt counter:
1493 # keep cache in sync with the prompt counter:
1488 self.outputcache.prompt_count -= 1
1494 self.outputcache.prompt_count -= 1
1489
1495
1490 if self.autoindent:
1496 if self.autoindent:
1491 self.readline_indent = 0
1497 self.readline_indent = 0
1492
1498
1493 except bdb.BdbQuit:
1499 except bdb.BdbQuit:
1494 warn("The Python debugger has exited with a BdbQuit exception.\n"
1500 warn("The Python debugger has exited with a BdbQuit exception.\n"
1495 "Because of how pdb handles the stack, it is impossible\n"
1501 "Because of how pdb handles the stack, it is impossible\n"
1496 "for IPython to properly format this particular exception.\n"
1502 "for IPython to properly format this particular exception.\n"
1497 "IPython will resume normal operation.")
1503 "IPython will resume normal operation.")
1498
1504
1499 # We are off again...
1505 # We are off again...
1500 __builtin__.__dict__['__IPYTHON__active'] -= 1
1506 __builtin__.__dict__['__IPYTHON__active'] -= 1
1501
1507
1502 def excepthook(self, type, value, tb):
1508 def excepthook(self, type, value, tb):
1503 """One more defense for GUI apps that call sys.excepthook.
1509 """One more defense for GUI apps that call sys.excepthook.
1504
1510
1505 GUI frameworks like wxPython trap exceptions and call
1511 GUI frameworks like wxPython trap exceptions and call
1506 sys.excepthook themselves. I guess this is a feature that
1512 sys.excepthook themselves. I guess this is a feature that
1507 enables them to keep running after exceptions that would
1513 enables them to keep running after exceptions that would
1508 otherwise kill their mainloop. This is a bother for IPython
1514 otherwise kill their mainloop. This is a bother for IPython
1509 which excepts to catch all of the program exceptions with a try:
1515 which excepts to catch all of the program exceptions with a try:
1510 except: statement.
1516 except: statement.
1511
1517
1512 Normally, IPython sets sys.excepthook to a CrashHandler instance, so if
1518 Normally, IPython sets sys.excepthook to a CrashHandler instance, so if
1513 any app directly invokes sys.excepthook, it will look to the user like
1519 any app directly invokes sys.excepthook, it will look to the user like
1514 IPython crashed. In order to work around this, we can disable the
1520 IPython crashed. In order to work around this, we can disable the
1515 CrashHandler and replace it with this excepthook instead, which prints a
1521 CrashHandler and replace it with this excepthook instead, which prints a
1516 regular traceback using our InteractiveTB. In this fashion, apps which
1522 regular traceback using our InteractiveTB. In this fashion, apps which
1517 call sys.excepthook will generate a regular-looking exception from
1523 call sys.excepthook will generate a regular-looking exception from
1518 IPython, and the CrashHandler will only be triggered by real IPython
1524 IPython, and the CrashHandler will only be triggered by real IPython
1519 crashes.
1525 crashes.
1520
1526
1521 This hook should be used sparingly, only in places which are not likely
1527 This hook should be used sparingly, only in places which are not likely
1522 to be true IPython errors.
1528 to be true IPython errors.
1523 """
1529 """
1524
1530
1525 self.InteractiveTB(type, value, tb, tb_offset=0)
1531 self.InteractiveTB(type, value, tb, tb_offset=0)
1526 if self.InteractiveTB.call_pdb and self.has_readline:
1532 if self.InteractiveTB.call_pdb and self.has_readline:
1527 self.readline.set_completer(self.Completer.complete)
1533 self.readline.set_completer(self.Completer.complete)
1528
1534
1529 def call_alias(self,alias,rest=''):
1535 def call_alias(self,alias,rest=''):
1530 """Call an alias given its name and the rest of the line.
1536 """Call an alias given its name and the rest of the line.
1531
1537
1532 This function MUST be given a proper alias, because it doesn't make
1538 This function MUST be given a proper alias, because it doesn't make
1533 any checks when looking up into the alias table. The caller is
1539 any checks when looking up into the alias table. The caller is
1534 responsible for invoking it only with a valid alias."""
1540 responsible for invoking it only with a valid alias."""
1535
1541
1536 #print 'ALIAS: <%s>+<%s>' % (alias,rest) # dbg
1542 #print 'ALIAS: <%s>+<%s>' % (alias,rest) # dbg
1537 nargs,cmd = self.alias_table[alias]
1543 nargs,cmd = self.alias_table[alias]
1538 # Expand the %l special to be the user's input line
1544 # Expand the %l special to be the user's input line
1539 if cmd.find('%l') >= 0:
1545 if cmd.find('%l') >= 0:
1540 cmd = cmd.replace('%l',rest)
1546 cmd = cmd.replace('%l',rest)
1541 rest = ''
1547 rest = ''
1542 if nargs==0:
1548 if nargs==0:
1543 # Simple, argument-less aliases
1549 # Simple, argument-less aliases
1544 cmd = '%s %s' % (cmd,rest)
1550 cmd = '%s %s' % (cmd,rest)
1545 else:
1551 else:
1546 # Handle aliases with positional arguments
1552 # Handle aliases with positional arguments
1547 args = rest.split(None,nargs)
1553 args = rest.split(None,nargs)
1548 if len(args)< nargs:
1554 if len(args)< nargs:
1549 error('Alias <%s> requires %s arguments, %s given.' %
1555 error('Alias <%s> requires %s arguments, %s given.' %
1550 (alias,nargs,len(args)))
1556 (alias,nargs,len(args)))
1551 return
1557 return
1552 cmd = '%s %s' % (cmd % tuple(args[:nargs]),' '.join(args[nargs:]))
1558 cmd = '%s %s' % (cmd % tuple(args[:nargs]),' '.join(args[nargs:]))
1553 # Now call the macro, evaluating in the user's namespace
1559 # Now call the macro, evaluating in the user's namespace
1554 try:
1560 try:
1555 self.system(cmd)
1561 self.system(cmd)
1556 except:
1562 except:
1557 self.showtraceback()
1563 self.showtraceback()
1558
1564
1559 def runlines(self,lines):
1565 def runlines(self,lines):
1560 """Run a string of one or more lines of source.
1566 """Run a string of one or more lines of source.
1561
1567
1562 This method is capable of running a string containing multiple source
1568 This method is capable of running a string containing multiple source
1563 lines, as if they had been entered at the IPython prompt. Since it
1569 lines, as if they had been entered at the IPython prompt. Since it
1564 exposes IPython's processing machinery, the given strings can contain
1570 exposes IPython's processing machinery, the given strings can contain
1565 magic calls (%magic), special shell access (!cmd), etc."""
1571 magic calls (%magic), special shell access (!cmd), etc."""
1566
1572
1567 # We must start with a clean buffer, in case this is run from an
1573 # We must start with a clean buffer, in case this is run from an
1568 # interactive IPython session (via a magic, for example).
1574 # interactive IPython session (via a magic, for example).
1569 self.resetbuffer()
1575 self.resetbuffer()
1570 lines = lines.split('\n')
1576 lines = lines.split('\n')
1571 more = 0
1577 more = 0
1572 for line in lines:
1578 for line in lines:
1573 # skip blank lines so we don't mess up the prompt counter, but do
1579 # skip blank lines so we don't mess up the prompt counter, but do
1574 # NOT skip even a blank line if we are in a code block (more is
1580 # NOT skip even a blank line if we are in a code block (more is
1575 # true)
1581 # true)
1576 if line or more:
1582 if line or more:
1577 more = self.push((self.prefilter(line,more)))
1583 more = self.push((self.prefilter(line,more)))
1578 # IPython's runsource returns None if there was an error
1584 # IPython's runsource returns None if there was an error
1579 # compiling the code. This allows us to stop processing right
1585 # compiling the code. This allows us to stop processing right
1580 # away, so the user gets the error message at the right place.
1586 # away, so the user gets the error message at the right place.
1581 if more is None:
1587 if more is None:
1582 break
1588 break
1583 # final newline in case the input didn't have it, so that the code
1589 # final newline in case the input didn't have it, so that the code
1584 # actually does get executed
1590 # actually does get executed
1585 if more:
1591 if more:
1586 self.push('\n')
1592 self.push('\n')
1587
1593
1588 def runsource(self, source, filename="<input>", symbol="single"):
1594 def runsource(self, source, filename="<input>", symbol="single"):
1589 """Compile and run some source in the interpreter.
1595 """Compile and run some source in the interpreter.
1590
1596
1591 Arguments are as for compile_command().
1597 Arguments are as for compile_command().
1592
1598
1593 One several things can happen:
1599 One several things can happen:
1594
1600
1595 1) The input is incorrect; compile_command() raised an
1601 1) The input is incorrect; compile_command() raised an
1596 exception (SyntaxError or OverflowError). A syntax traceback
1602 exception (SyntaxError or OverflowError). A syntax traceback
1597 will be printed by calling the showsyntaxerror() method.
1603 will be printed by calling the showsyntaxerror() method.
1598
1604
1599 2) The input is incomplete, and more input is required;
1605 2) The input is incomplete, and more input is required;
1600 compile_command() returned None. Nothing happens.
1606 compile_command() returned None. Nothing happens.
1601
1607
1602 3) The input is complete; compile_command() returned a code
1608 3) The input is complete; compile_command() returned a code
1603 object. The code is executed by calling self.runcode() (which
1609 object. The code is executed by calling self.runcode() (which
1604 also handles run-time exceptions, except for SystemExit).
1610 also handles run-time exceptions, except for SystemExit).
1605
1611
1606 The return value is:
1612 The return value is:
1607
1613
1608 - True in case 2
1614 - True in case 2
1609
1615
1610 - False in the other cases, unless an exception is raised, where
1616 - False in the other cases, unless an exception is raised, where
1611 None is returned instead. This can be used by external callers to
1617 None is returned instead. This can be used by external callers to
1612 know whether to continue feeding input or not.
1618 know whether to continue feeding input or not.
1613
1619
1614 The return value can be used to decide whether to use sys.ps1 or
1620 The return value can be used to decide whether to use sys.ps1 or
1615 sys.ps2 to prompt the next line."""
1621 sys.ps2 to prompt the next line."""
1616
1622
1617 try:
1623 try:
1618 code = self.compile(source, filename, symbol)
1624 code = self.compile(source, filename, symbol)
1619 except (OverflowError, SyntaxError, ValueError):
1625 except (OverflowError, SyntaxError, ValueError):
1620 # Case 1
1626 # Case 1
1621 self.showsyntaxerror(filename)
1627 self.showsyntaxerror(filename)
1622 return None
1628 return None
1623
1629
1624 if code is None:
1630 if code is None:
1625 # Case 2
1631 # Case 2
1626 return True
1632 return True
1627
1633
1628 # Case 3
1634 # Case 3
1629 # We store the code object so that threaded shells and
1635 # We store the code object so that threaded shells and
1630 # custom exception handlers can access all this info if needed.
1636 # custom exception handlers can access all this info if needed.
1631 # The source corresponding to this can be obtained from the
1637 # The source corresponding to this can be obtained from the
1632 # buffer attribute as '\n'.join(self.buffer).
1638 # buffer attribute as '\n'.join(self.buffer).
1633 self.code_to_run = code
1639 self.code_to_run = code
1634 # now actually execute the code object
1640 # now actually execute the code object
1635 if self.runcode(code) == 0:
1641 if self.runcode(code) == 0:
1636 return False
1642 return False
1637 else:
1643 else:
1638 return None
1644 return None
1639
1645
1640 def runcode(self,code_obj):
1646 def runcode(self,code_obj):
1641 """Execute a code object.
1647 """Execute a code object.
1642
1648
1643 When an exception occurs, self.showtraceback() is called to display a
1649 When an exception occurs, self.showtraceback() is called to display a
1644 traceback.
1650 traceback.
1645
1651
1646 Return value: a flag indicating whether the code to be run completed
1652 Return value: a flag indicating whether the code to be run completed
1647 successfully:
1653 successfully:
1648
1654
1649 - 0: successful execution.
1655 - 0: successful execution.
1650 - 1: an error occurred.
1656 - 1: an error occurred.
1651 """
1657 """
1652
1658
1653 # Set our own excepthook in case the user code tries to call it
1659 # Set our own excepthook in case the user code tries to call it
1654 # directly, so that the IPython crash handler doesn't get triggered
1660 # directly, so that the IPython crash handler doesn't get triggered
1655 old_excepthook,sys.excepthook = sys.excepthook, self.excepthook
1661 old_excepthook,sys.excepthook = sys.excepthook, self.excepthook
1656 outflag = 1 # happens in more places, so it's easier as default
1662 outflag = 1 # happens in more places, so it's easier as default
1657 try:
1663 try:
1658 try:
1664 try:
1659 # Embedded instances require separate global/local namespaces
1665 # Embedded instances require separate global/local namespaces
1660 # so they can see both the surrounding (local) namespace and
1666 # so they can see both the surrounding (local) namespace and
1661 # the module-level globals when called inside another function.
1667 # the module-level globals when called inside another function.
1662 if self.embedded:
1668 if self.embedded:
1663 exec code_obj in self.user_global_ns, self.user_ns
1669 exec code_obj in self.user_global_ns, self.user_ns
1664 # Normal (non-embedded) instances should only have a single
1670 # Normal (non-embedded) instances should only have a single
1665 # namespace for user code execution, otherwise functions won't
1671 # namespace for user code execution, otherwise functions won't
1666 # see interactive top-level globals.
1672 # see interactive top-level globals.
1667 else:
1673 else:
1668 exec code_obj in self.user_ns
1674 exec code_obj in self.user_ns
1669 finally:
1675 finally:
1670 # Reset our crash handler in place
1676 # Reset our crash handler in place
1671 sys.excepthook = old_excepthook
1677 sys.excepthook = old_excepthook
1672 except SystemExit:
1678 except SystemExit:
1673 self.resetbuffer()
1679 self.resetbuffer()
1674 self.showtraceback()
1680 self.showtraceback()
1675 warn( __builtin__.exit,level=1)
1681 warn( __builtin__.exit,level=1)
1676 except self.custom_exceptions:
1682 except self.custom_exceptions:
1677 etype,value,tb = sys.exc_info()
1683 etype,value,tb = sys.exc_info()
1678 self.CustomTB(etype,value,tb)
1684 self.CustomTB(etype,value,tb)
1679 except:
1685 except:
1680 self.showtraceback()
1686 self.showtraceback()
1681 else:
1687 else:
1682 outflag = 0
1688 outflag = 0
1683 if code.softspace(sys.stdout, 0):
1689 if code.softspace(sys.stdout, 0):
1684 print
1690 print
1685 # Flush out code object which has been run (and source)
1691 # Flush out code object which has been run (and source)
1686 self.code_to_run = None
1692 self.code_to_run = None
1687 return outflag
1693 return outflag
1688
1694
1689 def raw_input(self, prompt=""):
1695 def raw_input(self, prompt=""):
1690 """Write a prompt and read a line.
1696 """Write a prompt and read a line.
1691
1697
1692 The returned line does not include the trailing newline.
1698 The returned line does not include the trailing newline.
1693 When the user enters the EOF key sequence, EOFError is raised.
1699 When the user enters the EOF key sequence, EOFError is raised.
1694
1700
1695 The base implementation uses the built-in function
1701 The base implementation uses the built-in function
1696 raw_input(); a subclass may replace this with a different
1702 raw_input(); a subclass may replace this with a different
1697 implementation.
1703 implementation.
1698 """
1704 """
1699 return self.prefilter(raw_input_original(prompt),
1705 return self.prefilter(raw_input_original(prompt),
1700 prompt==self.outputcache.prompt2)
1706 prompt==self.outputcache.prompt2)
1701
1707
1702 def split_user_input(self,line):
1708 def split_user_input(self,line):
1703 """Split user input into pre-char, function part and rest."""
1709 """Split user input into pre-char, function part and rest."""
1704
1710
1705 lsplit = self.line_split.match(line)
1711 lsplit = self.line_split.match(line)
1706 if lsplit is None: # no regexp match returns None
1712 if lsplit is None: # no regexp match returns None
1707 try:
1713 try:
1708 iFun,theRest = line.split(None,1)
1714 iFun,theRest = line.split(None,1)
1709 except ValueError:
1715 except ValueError:
1710 iFun,theRest = line,''
1716 iFun,theRest = line,''
1711 pre = re.match('^(\s*)(.*)',line).groups()[0]
1717 pre = re.match('^(\s*)(.*)',line).groups()[0]
1712 else:
1718 else:
1713 pre,iFun,theRest = lsplit.groups()
1719 pre,iFun,theRest = lsplit.groups()
1714
1720
1715 #print 'line:<%s>' % line # dbg
1721 #print 'line:<%s>' % line # dbg
1716 #print 'pre <%s> iFun <%s> rest <%s>' % (pre,iFun.strip(),theRest) # dbg
1722 #print 'pre <%s> iFun <%s> rest <%s>' % (pre,iFun.strip(),theRest) # dbg
1717 return pre,iFun.strip(),theRest
1723 return pre,iFun.strip(),theRest
1718
1724
1719 def _prefilter(self, line, continue_prompt):
1725 def _prefilter(self, line, continue_prompt):
1720 """Calls different preprocessors, depending on the form of line."""
1726 """Calls different preprocessors, depending on the form of line."""
1721
1727
1722 # All handlers *must* return a value, even if it's blank ('').
1728 # All handlers *must* return a value, even if it's blank ('').
1723
1729
1724 # Lines are NOT logged here. Handlers should process the line as
1730 # Lines are NOT logged here. Handlers should process the line as
1725 # needed, update the cache AND log it (so that the input cache array
1731 # needed, update the cache AND log it (so that the input cache array
1726 # stays synced).
1732 # stays synced).
1727
1733
1728 # This function is _very_ delicate, and since it's also the one which
1734 # This function is _very_ delicate, and since it's also the one which
1729 # determines IPython's response to user input, it must be as efficient
1735 # determines IPython's response to user input, it must be as efficient
1730 # as possible. For this reason it has _many_ returns in it, trying
1736 # as possible. For this reason it has _many_ returns in it, trying
1731 # always to exit as quickly as it can figure out what it needs to do.
1737 # always to exit as quickly as it can figure out what it needs to do.
1732
1738
1733 # This function is the main responsible for maintaining IPython's
1739 # This function is the main responsible for maintaining IPython's
1734 # behavior respectful of Python's semantics. So be _very_ careful if
1740 # behavior respectful of Python's semantics. So be _very_ careful if
1735 # making changes to anything here.
1741 # making changes to anything here.
1736
1742
1737 #.....................................................................
1743 #.....................................................................
1738 # Code begins
1744 # Code begins
1739
1745
1740 #if line.startswith('%crash'): raise RuntimeError,'Crash now!' # dbg
1746 #if line.startswith('%crash'): raise RuntimeError,'Crash now!' # dbg
1741
1747
1742 # save the line away in case we crash, so the post-mortem handler can
1748 # save the line away in case we crash, so the post-mortem handler can
1743 # record it
1749 # record it
1744 self._last_input_line = line
1750 self._last_input_line = line
1745
1751
1746 #print '***line: <%s>' % line # dbg
1752 #print '***line: <%s>' % line # dbg
1747
1753
1748 # the input history needs to track even empty lines
1754 # the input history needs to track even empty lines
1749 if not line.strip():
1755 if not line.strip():
1750 if not continue_prompt:
1756 if not continue_prompt:
1751 self.outputcache.prompt_count -= 1
1757 self.outputcache.prompt_count -= 1
1752 return self.handle_normal('',continue_prompt)
1758 return self.handle_normal('',continue_prompt)
1753
1759
1754 # print '***cont',continue_prompt # dbg
1760 # print '***cont',continue_prompt # dbg
1755 # special handlers are only allowed for single line statements
1761 # special handlers are only allowed for single line statements
1756 if continue_prompt and not self.rc.multi_line_specials:
1762 if continue_prompt and not self.rc.multi_line_specials:
1757 return self.handle_normal(line,continue_prompt)
1763 return self.handle_normal(line,continue_prompt)
1758
1764
1759 # For the rest, we need the structure of the input
1765 # For the rest, we need the structure of the input
1760 pre,iFun,theRest = self.split_user_input(line)
1766 pre,iFun,theRest = self.split_user_input(line)
1761 #print 'pre <%s> iFun <%s> rest <%s>' % (pre,iFun,theRest) # dbg
1767 #print 'pre <%s> iFun <%s> rest <%s>' % (pre,iFun,theRest) # dbg
1762
1768
1763 # First check for explicit escapes in the last/first character
1769 # First check for explicit escapes in the last/first character
1764 handler = None
1770 handler = None
1765 if line[-1] == self.ESC_HELP:
1771 if line[-1] == self.ESC_HELP:
1766 handler = self.esc_handlers.get(line[-1]) # the ? can be at the end
1772 handler = self.esc_handlers.get(line[-1]) # the ? can be at the end
1767 if handler is None:
1773 if handler is None:
1768 # look at the first character of iFun, NOT of line, so we skip
1774 # look at the first character of iFun, NOT of line, so we skip
1769 # leading whitespace in multiline input
1775 # leading whitespace in multiline input
1770 handler = self.esc_handlers.get(iFun[0:1])
1776 handler = self.esc_handlers.get(iFun[0:1])
1771 if handler is not None:
1777 if handler is not None:
1772 return handler(line,continue_prompt,pre,iFun,theRest)
1778 return handler(line,continue_prompt,pre,iFun,theRest)
1773 # Emacs ipython-mode tags certain input lines
1779 # Emacs ipython-mode tags certain input lines
1774 if line.endswith('# PYTHON-MODE'):
1780 if line.endswith('# PYTHON-MODE'):
1775 return self.handle_emacs(line,continue_prompt)
1781 return self.handle_emacs(line,continue_prompt)
1776
1782
1777 # Next, check if we can automatically execute this thing
1783 # Next, check if we can automatically execute this thing
1778
1784
1779 # Allow ! in multi-line statements if multi_line_specials is on:
1785 # Allow ! in multi-line statements if multi_line_specials is on:
1780 if continue_prompt and self.rc.multi_line_specials and \
1786 if continue_prompt and self.rc.multi_line_specials and \
1781 iFun.startswith(self.ESC_SHELL):
1787 iFun.startswith(self.ESC_SHELL):
1782 return self.handle_shell_escape(line,continue_prompt,
1788 return self.handle_shell_escape(line,continue_prompt,
1783 pre=pre,iFun=iFun,
1789 pre=pre,iFun=iFun,
1784 theRest=theRest)
1790 theRest=theRest)
1785
1791
1786 # Let's try to find if the input line is a magic fn
1792 # Let's try to find if the input line is a magic fn
1787 oinfo = None
1793 oinfo = None
1788 if hasattr(self,'magic_'+iFun):
1794 if hasattr(self,'magic_'+iFun):
1789 oinfo = self._ofind(iFun) # FIXME - _ofind is part of Magic
1795 oinfo = self._ofind(iFun) # FIXME - _ofind is part of Magic
1790 if oinfo['ismagic']:
1796 if oinfo['ismagic']:
1791 # Be careful not to call magics when a variable assignment is
1797 # Be careful not to call magics when a variable assignment is
1792 # being made (ls='hi', for example)
1798 # being made (ls='hi', for example)
1793 if self.rc.automagic and \
1799 if self.rc.automagic and \
1794 (len(theRest)==0 or theRest[0] not in '!=()<>,') and \
1800 (len(theRest)==0 or theRest[0] not in '!=()<>,') and \
1795 (self.rc.multi_line_specials or not continue_prompt):
1801 (self.rc.multi_line_specials or not continue_prompt):
1796 return self.handle_magic(line,continue_prompt,
1802 return self.handle_magic(line,continue_prompt,
1797 pre,iFun,theRest)
1803 pre,iFun,theRest)
1798 else:
1804 else:
1799 return self.handle_normal(line,continue_prompt)
1805 return self.handle_normal(line,continue_prompt)
1800
1806
1801 # If the rest of the line begins with an (in)equality, assginment or
1807 # If the rest of the line begins with an (in)equality, assginment or
1802 # function call, we should not call _ofind but simply execute it.
1808 # function call, we should not call _ofind but simply execute it.
1803 # This avoids spurious geattr() accesses on objects upon assignment.
1809 # This avoids spurious geattr() accesses on objects upon assignment.
1804 #
1810 #
1805 # It also allows users to assign to either alias or magic names true
1811 # It also allows users to assign to either alias or magic names true
1806 # python variables (the magic/alias systems always take second seat to
1812 # python variables (the magic/alias systems always take second seat to
1807 # true python code).
1813 # true python code).
1808 if theRest and theRest[0] in '!=()':
1814 if theRest and theRest[0] in '!=()':
1809 return self.handle_normal(line,continue_prompt)
1815 return self.handle_normal(line,continue_prompt)
1810
1816
1811 if oinfo is None:
1817 if oinfo is None:
1812 oinfo = self._ofind(iFun) # FIXME - _ofind is part of Magic
1818 oinfo = self._ofind(iFun) # FIXME - _ofind is part of Magic
1813
1819
1814 if not oinfo['found']:
1820 if not oinfo['found']:
1815 return self.handle_normal(line,continue_prompt)
1821 return self.handle_normal(line,continue_prompt)
1816 else:
1822 else:
1817 #print 'iFun <%s> rest <%s>' % (iFun,theRest) # dbg
1823 #print 'iFun <%s> rest <%s>' % (iFun,theRest) # dbg
1818 if oinfo['isalias']:
1824 if oinfo['isalias']:
1819 return self.handle_alias(line,continue_prompt,
1825 return self.handle_alias(line,continue_prompt,
1820 pre,iFun,theRest)
1826 pre,iFun,theRest)
1821
1827
1822 if self.rc.autocall and \
1828 if self.rc.autocall and \
1823 not self.re_exclude_auto.match(theRest) and \
1829 not self.re_exclude_auto.match(theRest) and \
1824 self.re_fun_name.match(iFun) and \
1830 self.re_fun_name.match(iFun) and \
1825 callable(oinfo['obj']) :
1831 callable(oinfo['obj']) :
1826 #print 'going auto' # dbg
1832 #print 'going auto' # dbg
1827 return self.handle_auto(line,continue_prompt,pre,iFun,theRest)
1833 return self.handle_auto(line,continue_prompt,pre,iFun,theRest)
1828 else:
1834 else:
1829 #print 'was callable?', callable(oinfo['obj']) # dbg
1835 #print 'was callable?', callable(oinfo['obj']) # dbg
1830 return self.handle_normal(line,continue_prompt)
1836 return self.handle_normal(line,continue_prompt)
1831
1837
1832 # If we get here, we have a normal Python line. Log and return.
1838 # If we get here, we have a normal Python line. Log and return.
1833 return self.handle_normal(line,continue_prompt)
1839 return self.handle_normal(line,continue_prompt)
1834
1840
1835 def _prefilter_dumb(self, line, continue_prompt):
1841 def _prefilter_dumb(self, line, continue_prompt):
1836 """simple prefilter function, for debugging"""
1842 """simple prefilter function, for debugging"""
1837 return self.handle_normal(line,continue_prompt)
1843 return self.handle_normal(line,continue_prompt)
1838
1844
1839 # Set the default prefilter() function (this can be user-overridden)
1845 # Set the default prefilter() function (this can be user-overridden)
1840 prefilter = _prefilter
1846 prefilter = _prefilter
1841
1847
1842 def handle_normal(self,line,continue_prompt=None,
1848 def handle_normal(self,line,continue_prompt=None,
1843 pre=None,iFun=None,theRest=None):
1849 pre=None,iFun=None,theRest=None):
1844 """Handle normal input lines. Use as a template for handlers."""
1850 """Handle normal input lines. Use as a template for handlers."""
1845
1851
1846 self.log(line,continue_prompt)
1852 self.log(line,continue_prompt)
1847 self.update_cache(line)
1853 self.update_cache(line)
1848 return line
1854 return line
1849
1855
1850 def handle_alias(self,line,continue_prompt=None,
1856 def handle_alias(self,line,continue_prompt=None,
1851 pre=None,iFun=None,theRest=None):
1857 pre=None,iFun=None,theRest=None):
1852 """Handle alias input lines. """
1858 """Handle alias input lines. """
1853
1859
1854 theRest = esc_quotes(theRest)
1860 theRest = esc_quotes(theRest)
1855 line_out = "%s%s.call_alias('%s','%s')" % (pre,self.name,iFun,theRest)
1861 line_out = "%s%s.call_alias('%s','%s')" % (pre,self.name,iFun,theRest)
1856 self.log(line_out,continue_prompt)
1862 self.log(line_out,continue_prompt)
1857 self.update_cache(line_out)
1863 self.update_cache(line_out)
1858 return line_out
1864 return line_out
1859
1865
1860 def handle_shell_escape(self, line, continue_prompt=None,
1866 def handle_shell_escape(self, line, continue_prompt=None,
1861 pre=None,iFun=None,theRest=None):
1867 pre=None,iFun=None,theRest=None):
1862 """Execute the line in a shell, empty return value"""
1868 """Execute the line in a shell, empty return value"""
1863
1869
1864 #print 'line in :', `line` # dbg
1870 #print 'line in :', `line` # dbg
1865 # Example of a special handler. Others follow a similar pattern.
1871 # Example of a special handler. Others follow a similar pattern.
1866 if continue_prompt: # multi-line statements
1872 if continue_prompt: # multi-line statements
1867 if iFun.startswith('!!'):
1873 if iFun.startswith('!!'):
1868 print 'SyntaxError: !! is not allowed in multiline statements'
1874 print 'SyntaxError: !! is not allowed in multiline statements'
1869 return pre
1875 return pre
1870 else:
1876 else:
1871 cmd = ("%s %s" % (iFun[1:],theRest)).replace('"','\\"')
1877 cmd = ("%s %s" % (iFun[1:],theRest)).replace('"','\\"')
1872 line_out = '%s%s.system("%s")' % (pre,self.name,cmd)
1878 line_out = '%s%s.system("%s")' % (pre,self.name,cmd)
1873 #line_out = ('%s%s.system(' % (pre,self.name)) + repr(cmd) + ')'
1879 #line_out = ('%s%s.system(' % (pre,self.name)) + repr(cmd) + ')'
1874 else: # single-line input
1880 else: # single-line input
1875 if line.startswith('!!'):
1881 if line.startswith('!!'):
1876 # rewrite iFun/theRest to properly hold the call to %sx and
1882 # rewrite iFun/theRest to properly hold the call to %sx and
1877 # the actual command to be executed, so handle_magic can work
1883 # the actual command to be executed, so handle_magic can work
1878 # correctly
1884 # correctly
1879 theRest = '%s %s' % (iFun[2:],theRest)
1885 theRest = '%s %s' % (iFun[2:],theRest)
1880 iFun = 'sx'
1886 iFun = 'sx'
1881 return self.handle_magic('%ssx %s' % (self.ESC_MAGIC,line[2:]),
1887 return self.handle_magic('%ssx %s' % (self.ESC_MAGIC,line[2:]),
1882 continue_prompt,pre,iFun,theRest)
1888 continue_prompt,pre,iFun,theRest)
1883 else:
1889 else:
1884 cmd = esc_quotes(line[1:])
1890 cmd = esc_quotes(line[1:])
1885 line_out = '%s.system("%s")' % (self.name,cmd)
1891 line_out = '%s.system("%s")' % (self.name,cmd)
1886 #line_out = ('%s.system(' % self.name) + repr(cmd)+ ')'
1892 #line_out = ('%s.system(' % self.name) + repr(cmd)+ ')'
1887 # update cache/log and return
1893 # update cache/log and return
1888 self.log(line_out,continue_prompt)
1894 self.log(line_out,continue_prompt)
1889 self.update_cache(line_out) # readline cache gets normal line
1895 self.update_cache(line_out) # readline cache gets normal line
1890 #print 'line out r:', `line_out` # dbg
1896 #print 'line out r:', `line_out` # dbg
1891 #print 'line out s:', line_out # dbg
1897 #print 'line out s:', line_out # dbg
1892 return line_out
1898 return line_out
1893
1899
1894 def handle_magic(self, line, continue_prompt=None,
1900 def handle_magic(self, line, continue_prompt=None,
1895 pre=None,iFun=None,theRest=None):
1901 pre=None,iFun=None,theRest=None):
1896 """Execute magic functions.
1902 """Execute magic functions.
1897
1903
1898 Also log them with a prepended # so the log is clean Python."""
1904 Also log them with a prepended # so the log is clean Python."""
1899
1905
1900 cmd = '%sipmagic("%s")' % (pre,esc_quotes('%s %s' % (iFun,theRest)))
1906 cmd = '%sipmagic("%s")' % (pre,esc_quotes('%s %s' % (iFun,theRest)))
1901 self.log(cmd,continue_prompt)
1907 self.log(cmd,continue_prompt)
1902 self.update_cache(line)
1908 self.update_cache(line)
1903 #print 'in handle_magic, cmd=<%s>' % cmd # dbg
1909 #print 'in handle_magic, cmd=<%s>' % cmd # dbg
1904 return cmd
1910 return cmd
1905
1911
1906 def handle_auto(self, line, continue_prompt=None,
1912 def handle_auto(self, line, continue_prompt=None,
1907 pre=None,iFun=None,theRest=None):
1913 pre=None,iFun=None,theRest=None):
1908 """Hande lines which can be auto-executed, quoting if requested."""
1914 """Hande lines which can be auto-executed, quoting if requested."""
1909
1915
1910 #print 'pre <%s> iFun <%s> rest <%s>' % (pre,iFun,theRest) # dbg
1916 #print 'pre <%s> iFun <%s> rest <%s>' % (pre,iFun,theRest) # dbg
1911
1917
1912 # This should only be active for single-line input!
1918 # This should only be active for single-line input!
1913 if continue_prompt:
1919 if continue_prompt:
1914 return line
1920 return line
1915
1921
1916 if pre == self.ESC_QUOTE:
1922 if pre == self.ESC_QUOTE:
1917 # Auto-quote splitting on whitespace
1923 # Auto-quote splitting on whitespace
1918 newcmd = '%s("%s")' % (iFun,'", "'.join(theRest.split()) )
1924 newcmd = '%s("%s")' % (iFun,'", "'.join(theRest.split()) )
1919 elif pre == self.ESC_QUOTE2:
1925 elif pre == self.ESC_QUOTE2:
1920 # Auto-quote whole string
1926 # Auto-quote whole string
1921 newcmd = '%s("%s")' % (iFun,theRest)
1927 newcmd = '%s("%s")' % (iFun,theRest)
1922 else:
1928 else:
1923 # Auto-paren
1929 # Auto-paren
1924 if theRest[0:1] in ('=','['):
1930 if theRest[0:1] in ('=','['):
1925 # Don't autocall in these cases. They can be either
1931 # Don't autocall in these cases. They can be either
1926 # rebindings of an existing callable's name, or item access
1932 # rebindings of an existing callable's name, or item access
1927 # for an object which is BOTH callable and implements
1933 # for an object which is BOTH callable and implements
1928 # __getitem__.
1934 # __getitem__.
1929 return '%s %s' % (iFun,theRest)
1935 return '%s %s' % (iFun,theRest)
1930 if theRest.endswith(';'):
1936 if theRest.endswith(';'):
1931 newcmd = '%s(%s);' % (iFun.rstrip(),theRest[:-1])
1937 newcmd = '%s(%s);' % (iFun.rstrip(),theRest[:-1])
1932 else:
1938 else:
1933 newcmd = '%s(%s)' % (iFun.rstrip(),theRest)
1939 newcmd = '%s(%s)' % (iFun.rstrip(),theRest)
1934
1940
1935 print >>Term.cout, self.outputcache.prompt1.auto_rewrite() + newcmd
1941 print >>Term.cout, self.outputcache.prompt1.auto_rewrite() + newcmd
1936 # log what is now valid Python, not the actual user input (without the
1942 # log what is now valid Python, not the actual user input (without the
1937 # final newline)
1943 # final newline)
1938 self.log(newcmd,continue_prompt)
1944 self.log(newcmd,continue_prompt)
1939 return newcmd
1945 return newcmd
1940
1946
1941 def handle_help(self, line, continue_prompt=None,
1947 def handle_help(self, line, continue_prompt=None,
1942 pre=None,iFun=None,theRest=None):
1948 pre=None,iFun=None,theRest=None):
1943 """Try to get some help for the object.
1949 """Try to get some help for the object.
1944
1950
1945 obj? or ?obj -> basic information.
1951 obj? or ?obj -> basic information.
1946 obj?? or ??obj -> more details.
1952 obj?? or ??obj -> more details.
1947 """
1953 """
1948
1954
1949 # We need to make sure that we don't process lines which would be
1955 # We need to make sure that we don't process lines which would be
1950 # otherwise valid python, such as "x=1 # what?"
1956 # otherwise valid python, such as "x=1 # what?"
1951 try:
1957 try:
1952 code.compile_command(line)
1958 code.compile_command(line)
1953 except SyntaxError:
1959 except SyntaxError:
1954 # We should only handle as help stuff which is NOT valid syntax
1960 # We should only handle as help stuff which is NOT valid syntax
1955 if line[0]==self.ESC_HELP:
1961 if line[0]==self.ESC_HELP:
1956 line = line[1:]
1962 line = line[1:]
1957 elif line[-1]==self.ESC_HELP:
1963 elif line[-1]==self.ESC_HELP:
1958 line = line[:-1]
1964 line = line[:-1]
1959 self.log('#?'+line)
1965 self.log('#?'+line)
1960 self.update_cache(line)
1966 self.update_cache(line)
1961 if line:
1967 if line:
1962 self.magic_pinfo(line)
1968 self.magic_pinfo(line)
1963 else:
1969 else:
1964 page(self.usage,screen_lines=self.rc.screen_length)
1970 page(self.usage,screen_lines=self.rc.screen_length)
1965 return '' # Empty string is needed here!
1971 return '' # Empty string is needed here!
1966 except:
1972 except:
1967 # Pass any other exceptions through to the normal handler
1973 # Pass any other exceptions through to the normal handler
1968 return self.handle_normal(line,continue_prompt)
1974 return self.handle_normal(line,continue_prompt)
1969 else:
1975 else:
1970 # If the code compiles ok, we should handle it normally
1976 # If the code compiles ok, we should handle it normally
1971 return self.handle_normal(line,continue_prompt)
1977 return self.handle_normal(line,continue_prompt)
1972
1978
1973 def handle_emacs(self,line,continue_prompt=None,
1979 def handle_emacs(self,line,continue_prompt=None,
1974 pre=None,iFun=None,theRest=None):
1980 pre=None,iFun=None,theRest=None):
1975 """Handle input lines marked by python-mode."""
1981 """Handle input lines marked by python-mode."""
1976
1982
1977 # Currently, nothing is done. Later more functionality can be added
1983 # Currently, nothing is done. Later more functionality can be added
1978 # here if needed.
1984 # here if needed.
1979
1985
1980 # The input cache shouldn't be updated
1986 # The input cache shouldn't be updated
1981
1987
1982 return line
1988 return line
1983
1989
1984 def write(self,data):
1990 def write(self,data):
1985 """Write a string to the default output"""
1991 """Write a string to the default output"""
1986 Term.cout.write(data)
1992 Term.cout.write(data)
1987
1993
1988 def write_err(self,data):
1994 def write_err(self,data):
1989 """Write a string to the default error output"""
1995 """Write a string to the default error output"""
1990 Term.cerr.write(data)
1996 Term.cerr.write(data)
1991
1997
1992 def safe_execfile(self,fname,*where,**kw):
1998 def safe_execfile(self,fname,*where,**kw):
1993 fname = os.path.expanduser(fname)
1999 fname = os.path.expanduser(fname)
1994
2000
1995 # find things also in current directory
2001 # find things also in current directory
1996 dname = os.path.dirname(fname)
2002 dname = os.path.dirname(fname)
1997 if not sys.path.count(dname):
2003 if not sys.path.count(dname):
1998 sys.path.append(dname)
2004 sys.path.append(dname)
1999
2005
2000 try:
2006 try:
2001 xfile = open(fname)
2007 xfile = open(fname)
2002 except:
2008 except:
2003 print >> Term.cerr, \
2009 print >> Term.cerr, \
2004 'Could not open file <%s> for safe execution.' % fname
2010 'Could not open file <%s> for safe execution.' % fname
2005 return None
2011 return None
2006
2012
2007 kw.setdefault('islog',0)
2013 kw.setdefault('islog',0)
2008 kw.setdefault('quiet',1)
2014 kw.setdefault('quiet',1)
2009 kw.setdefault('exit_ignore',0)
2015 kw.setdefault('exit_ignore',0)
2010 first = xfile.readline()
2016 first = xfile.readline()
2011 _LOGHEAD = str(self.LOGHEAD).split('\n',1)[0].strip()
2017 _LOGHEAD = str(self.LOGHEAD).split('\n',1)[0].strip()
2012 xfile.close()
2018 xfile.close()
2013 # line by line execution
2019 # line by line execution
2014 if first.startswith(_LOGHEAD) or kw['islog']:
2020 if first.startswith(_LOGHEAD) or kw['islog']:
2015 print 'Loading log file <%s> one line at a time...' % fname
2021 print 'Loading log file <%s> one line at a time...' % fname
2016 if kw['quiet']:
2022 if kw['quiet']:
2017 stdout_save = sys.stdout
2023 stdout_save = sys.stdout
2018 sys.stdout = StringIO.StringIO()
2024 sys.stdout = StringIO.StringIO()
2019 try:
2025 try:
2020 globs,locs = where[0:2]
2026 globs,locs = where[0:2]
2021 except:
2027 except:
2022 try:
2028 try:
2023 globs = locs = where[0]
2029 globs = locs = where[0]
2024 except:
2030 except:
2025 globs = locs = globals()
2031 globs = locs = globals()
2026 badblocks = []
2032 badblocks = []
2027
2033
2028 # we also need to identify indented blocks of code when replaying
2034 # we also need to identify indented blocks of code when replaying
2029 # logs and put them together before passing them to an exec
2035 # logs and put them together before passing them to an exec
2030 # statement. This takes a bit of regexp and look-ahead work in the
2036 # statement. This takes a bit of regexp and look-ahead work in the
2031 # file. It's easiest if we swallow the whole thing in memory
2037 # file. It's easiest if we swallow the whole thing in memory
2032 # first, and manually walk through the lines list moving the
2038 # first, and manually walk through the lines list moving the
2033 # counter ourselves.
2039 # counter ourselves.
2034 indent_re = re.compile('\s+\S')
2040 indent_re = re.compile('\s+\S')
2035 xfile = open(fname)
2041 xfile = open(fname)
2036 filelines = xfile.readlines()
2042 filelines = xfile.readlines()
2037 xfile.close()
2043 xfile.close()
2038 nlines = len(filelines)
2044 nlines = len(filelines)
2039 lnum = 0
2045 lnum = 0
2040 while lnum < nlines:
2046 while lnum < nlines:
2041 line = filelines[lnum]
2047 line = filelines[lnum]
2042 lnum += 1
2048 lnum += 1
2043 # don't re-insert logger status info into cache
2049 # don't re-insert logger status info into cache
2044 if line.startswith('#log#'):
2050 if line.startswith('#log#'):
2045 continue
2051 continue
2046 elif line.startswith('#%s'% self.ESC_MAGIC):
2052 elif line.startswith('#%s'% self.ESC_MAGIC):
2047 self.update_cache(line[1:])
2053 self.update_cache(line[1:])
2048 line = magic2python(line)
2054 line = magic2python(line)
2049 elif line.startswith('#!'):
2055 elif line.startswith('#!'):
2050 self.update_cache(line[1:])
2056 self.update_cache(line[1:])
2051 else:
2057 else:
2052 # build a block of code (maybe a single line) for execution
2058 # build a block of code (maybe a single line) for execution
2053 block = line
2059 block = line
2054 try:
2060 try:
2055 next = filelines[lnum] # lnum has already incremented
2061 next = filelines[lnum] # lnum has already incremented
2056 except:
2062 except:
2057 next = None
2063 next = None
2058 while next and indent_re.match(next):
2064 while next and indent_re.match(next):
2059 block += next
2065 block += next
2060 lnum += 1
2066 lnum += 1
2061 try:
2067 try:
2062 next = filelines[lnum]
2068 next = filelines[lnum]
2063 except:
2069 except:
2064 next = None
2070 next = None
2065 # now execute the block of one or more lines
2071 # now execute the block of one or more lines
2066 try:
2072 try:
2067 exec block in globs,locs
2073 exec block in globs,locs
2068 self.update_cache(block.rstrip())
2074 self.update_cache(block.rstrip())
2069 except SystemExit:
2075 except SystemExit:
2070 pass
2076 pass
2071 except:
2077 except:
2072 badblocks.append(block.rstrip())
2078 badblocks.append(block.rstrip())
2073 if kw['quiet']: # restore stdout
2079 if kw['quiet']: # restore stdout
2074 sys.stdout.close()
2080 sys.stdout.close()
2075 sys.stdout = stdout_save
2081 sys.stdout = stdout_save
2076 print 'Finished replaying log file <%s>' % fname
2082 print 'Finished replaying log file <%s>' % fname
2077 if badblocks:
2083 if badblocks:
2078 print >> sys.stderr, \
2084 print >> sys.stderr, \
2079 '\nThe following lines/blocks in file <%s> reported errors:' \
2085 '\nThe following lines/blocks in file <%s> reported errors:' \
2080 % fname
2086 % fname
2081 for badline in badblocks:
2087 for badline in badblocks:
2082 print >> sys.stderr, badline
2088 print >> sys.stderr, badline
2083 else: # regular file execution
2089 else: # regular file execution
2084 try:
2090 try:
2085 execfile(fname,*where)
2091 execfile(fname,*where)
2086 except SyntaxError:
2092 except SyntaxError:
2087 etype, evalue = sys.exc_info()[0:2]
2093 etype, evalue = sys.exc_info()[0:2]
2088 self.SyntaxTB(etype,evalue,[])
2094 self.SyntaxTB(etype,evalue,[])
2089 warn('Failure executing file: <%s>' % fname)
2095 warn('Failure executing file: <%s>' % fname)
2090 except SystemExit,status:
2096 except SystemExit,status:
2091 if not kw['exit_ignore']:
2097 if not kw['exit_ignore']:
2092 self.InteractiveTB()
2098 self.InteractiveTB()
2093 warn('Failure executing file: <%s>' % fname)
2099 warn('Failure executing file: <%s>' % fname)
2094 except:
2100 except:
2095 self.InteractiveTB()
2101 self.InteractiveTB()
2096 warn('Failure executing file: <%s>' % fname)
2102 warn('Failure executing file: <%s>' % fname)
2097
2103
2098 #************************* end of file <iplib.py> *****************************
2104 #************************* end of file <iplib.py> *****************************
@@ -1,734 +1,730 b''
1 # -*- coding: utf-8 -*-
1 # -*- coding: utf-8 -*-
2 """
2 """
3 IPython -- An enhanced Interactive Python
3 IPython -- An enhanced Interactive Python
4
4
5 Requires Python 2.1 or better.
5 Requires Python 2.1 or better.
6
6
7 This file contains the main make_IPython() starter function.
7 This file contains the main make_IPython() starter function.
8
8
9 $Id: ipmaker.py 923 2005-11-15 08:51:15Z fperez $"""
9 $Id: ipmaker.py 924 2005-11-15 20:24:31Z fperez $"""
10
10
11 #*****************************************************************************
11 #*****************************************************************************
12 # Copyright (C) 2001-2004 Fernando Perez. <fperez@colorado.edu>
12 # Copyright (C) 2001-2004 Fernando Perez. <fperez@colorado.edu>
13 #
13 #
14 # Distributed under the terms of the BSD License. The full license is in
14 # Distributed under the terms of the BSD License. The full license is in
15 # the file COPYING, distributed as part of this software.
15 # the file COPYING, distributed as part of this software.
16 #*****************************************************************************
16 #*****************************************************************************
17
17
18 from IPython import Release
18 from IPython import Release
19 __author__ = '%s <%s>' % Release.authors['Fernando']
19 __author__ = '%s <%s>' % Release.authors['Fernando']
20 __license__ = Release.license
20 __license__ = Release.license
21 __version__ = Release.version
21 __version__ = Release.version
22
22
23 credits._Printer__data = """
23 credits._Printer__data = """
24 Python: %s
24 Python: %s
25
25
26 IPython: Fernando Perez, Janko Hauser, Nathan Gray, and many users.
26 IPython: Fernando Perez, Janko Hauser, Nathan Gray, and many users.
27 See http://ipython.scipy.org for more information.""" \
27 See http://ipython.scipy.org for more information.""" \
28 % credits._Printer__data
28 % credits._Printer__data
29
29
30 copyright._Printer__data += """
30 copyright._Printer__data += """
31
31
32 Copyright (c) 2001-2004 Fernando Perez, Janko Hauser, Nathan Gray.
32 Copyright (c) 2001-2004 Fernando Perez, Janko Hauser, Nathan Gray.
33 All Rights Reserved."""
33 All Rights Reserved."""
34
34
35 #****************************************************************************
35 #****************************************************************************
36 # Required modules
36 # Required modules
37
37
38 # From the standard library
38 # From the standard library
39 import __main__, __builtin__
39 import __main__, __builtin__
40 import os,sys,types,re
40 import os,sys,types,re
41 from pprint import pprint,pformat
41 from pprint import pprint,pformat
42
42
43 # Our own
43 # Our own
44 from IPython import DPyGetOpt
44 from IPython import DPyGetOpt
45 from IPython.Struct import Struct
45 from IPython.Struct import Struct
46 from IPython.OutputTrap import OutputTrap
46 from IPython.OutputTrap import OutputTrap
47 from IPython.ConfigLoader import ConfigLoader
47 from IPython.ConfigLoader import ConfigLoader
48 from IPython.iplib import InteractiveShell,qw_lol,import_fail_info
48 from IPython.iplib import InteractiveShell,qw_lol,import_fail_info
49 from IPython.usage import cmd_line_usage,interactive_usage
49 from IPython.usage import cmd_line_usage,interactive_usage
50 from IPython.Prompts import CachedOutput
50 from IPython.Prompts import CachedOutput
51 from IPython.genutils import *
51 from IPython.genutils import *
52
52
53 #-----------------------------------------------------------------------------
53 #-----------------------------------------------------------------------------
54 def make_IPython(argv=None,user_ns=None,debug=1,rc_override=None,
54 def make_IPython(argv=None,user_ns=None,debug=1,rc_override=None,
55 shell_class=InteractiveShell,embedded=False,**kw):
55 shell_class=InteractiveShell,embedded=False,**kw):
56 """This is a dump of IPython into a single function.
56 """This is a dump of IPython into a single function.
57
57
58 Later it will have to be broken up in a sensible manner.
58 Later it will have to be broken up in a sensible manner.
59
59
60 Arguments:
60 Arguments:
61
61
62 - argv: a list similar to sys.argv[1:]. It should NOT contain the desired
62 - argv: a list similar to sys.argv[1:]. It should NOT contain the desired
63 script name, b/c DPyGetOpt strips the first argument only for the real
63 script name, b/c DPyGetOpt strips the first argument only for the real
64 sys.argv.
64 sys.argv.
65
65
66 - user_ns: a dict to be used as the user's namespace."""
66 - user_ns: a dict to be used as the user's namespace."""
67
67
68 #----------------------------------------------------------------------
68 #----------------------------------------------------------------------
69 # Defaults and initialization
69 # Defaults and initialization
70
70
71 # For developer debugging, deactivates crash handler and uses pdb.
71 # For developer debugging, deactivates crash handler and uses pdb.
72 DEVDEBUG = False
72 DEVDEBUG = False
73
73
74 if argv is None:
74 if argv is None:
75 argv = sys.argv
75 argv = sys.argv
76
76
77 # __IP is the main global that lives throughout and represents the whole
77 # __IP is the main global that lives throughout and represents the whole
78 # application. If the user redefines it, all bets are off as to what
78 # application. If the user redefines it, all bets are off as to what
79 # happens.
79 # happens.
80
80
81 # __IP is the name of he global which the caller will have accessible as
81 # __IP is the name of he global which the caller will have accessible as
82 # __IP.name. We set its name via the first parameter passed to
82 # __IP.name. We set its name via the first parameter passed to
83 # InteractiveShell:
83 # InteractiveShell:
84
84
85 IP = shell_class('__IP',user_ns=user_ns,embedded=embedded,**kw)
85 IP = shell_class('__IP',user_ns=user_ns,embedded=embedded,**kw)
86
86
87 # Put 'help' in the user namespace
87 # Put 'help' in the user namespace
88 from site import _Helper
88 from site import _Helper
89 IP.user_ns['help'] = _Helper()
89 IP.user_ns['help'] = _Helper()
90
90
91 if DEVDEBUG:
91 if DEVDEBUG:
92 # For developer debugging only (global flag)
92 # For developer debugging only (global flag)
93 from IPython import ultraTB
93 from IPython import ultraTB
94 sys.excepthook = ultraTB.VerboseTB(call_pdb=1)
94 sys.excepthook = ultraTB.VerboseTB(call_pdb=1)
95 else:
95 else:
96 # IPython itself shouldn't crash. This will produce a detailed
96 # IPython itself shouldn't crash. This will produce a detailed
97 # post-mortem if it does
97 # post-mortem if it does
98 from IPython import CrashHandler
98 from IPython import CrashHandler
99 sys.excepthook = CrashHandler.CrashHandler(IP)
99 sys.excepthook = CrashHandler.CrashHandler(IP)
100
100
101 IP.BANNER_PARTS = ['Python %s\n'
101 IP.BANNER_PARTS = ['Python %s\n'
102 'Type "copyright", "credits" or "license" '
102 'Type "copyright", "credits" or "license" '
103 'for more information.\n'
103 'for more information.\n'
104 % (sys.version.split('\n')[0],),
104 % (sys.version.split('\n')[0],),
105 "IPython %s -- An enhanced Interactive Python."
105 "IPython %s -- An enhanced Interactive Python."
106 % (__version__,),
106 % (__version__,),
107 """? -> Introduction to IPython's features.
107 """? -> Introduction to IPython's features.
108 %magic -> Information about IPython's 'magic' % functions.
108 %magic -> Information about IPython's 'magic' % functions.
109 help -> Python's own help system.
109 help -> Python's own help system.
110 object? -> Details about 'object'. ?object also works, ?? prints more.
110 object? -> Details about 'object'. ?object also works, ?? prints more.
111 """ ]
111 """ ]
112
112
113 IP.usage = interactive_usage
113 IP.usage = interactive_usage
114
114
115 # Platform-dependent suffix and directory names. We use _ipython instead
115 # Platform-dependent suffix and directory names. We use _ipython instead
116 # of .ipython under win32 b/c there's software that breaks with .named
116 # of .ipython under win32 b/c there's software that breaks with .named
117 # directories on that platform.
117 # directories on that platform.
118 if os.name == 'posix':
118 if os.name == 'posix':
119 rc_suffix = ''
119 rc_suffix = ''
120 ipdir_def = '.ipython'
120 ipdir_def = '.ipython'
121 else:
121 else:
122 rc_suffix = '.ini'
122 rc_suffix = '.ini'
123 ipdir_def = '_ipython'
123 ipdir_def = '_ipython'
124
124
125 # default directory for configuration
125 # default directory for configuration
126 ipythondir = os.path.abspath(os.environ.get('IPYTHONDIR',
126 ipythondir = os.path.abspath(os.environ.get('IPYTHONDIR',
127 os.path.join(IP.home_dir,ipdir_def)))
127 os.path.join(IP.home_dir,ipdir_def)))
128
128
129 # we need the directory where IPython itself is installed
129 # we need the directory where IPython itself is installed
130 import IPython
130 import IPython
131 IPython_dir = os.path.dirname(IPython.__file__)
131 IPython_dir = os.path.dirname(IPython.__file__)
132 del IPython
132 del IPython
133
133
134 #-------------------------------------------------------------------------
134 #-------------------------------------------------------------------------
135 # Command line handling
135 # Command line handling
136
136
137 # Valid command line options (uses DPyGetOpt syntax, like Perl's
137 # Valid command line options (uses DPyGetOpt syntax, like Perl's
138 # GetOpt::Long)
138 # GetOpt::Long)
139
139
140 # Any key not listed here gets deleted even if in the file (like session
140 # Any key not listed here gets deleted even if in the file (like session
141 # or profile). That's deliberate, to maintain the rc namespace clean.
141 # or profile). That's deliberate, to maintain the rc namespace clean.
142
142
143 # Each set of options appears twice: under _conv only the names are
143 # Each set of options appears twice: under _conv only the names are
144 # listed, indicating which type they must be converted to when reading the
144 # listed, indicating which type they must be converted to when reading the
145 # ipythonrc file. And under DPyGetOpt they are listed with the regular
145 # ipythonrc file. And under DPyGetOpt they are listed with the regular
146 # DPyGetOpt syntax (=s,=i,:f,etc).
146 # DPyGetOpt syntax (=s,=i,:f,etc).
147
147
148 # Make sure there's a space before each end of line (they get auto-joined!)
148 # Make sure there's a space before each end of line (they get auto-joined!)
149 cmdline_opts = ('autocall! autoindent! automagic! banner! cache_size|cs=i '
149 cmdline_opts = ('autocall! autoindent! automagic! banner! cache_size|cs=i '
150 'c=s classic|cl color_info! colors=s confirm_exit! '
150 'c=s classic|cl color_info! colors=s confirm_exit! '
151 'debug! deep_reload! editor=s log|l messages! nosep pdb! '
151 'debug! deep_reload! editor=s log|l messages! nosep pdb! '
152 'pprint! prompt_in1|pi1=s prompt_in2|pi2=s prompt_out|po=s '
152 'pprint! prompt_in1|pi1=s prompt_in2|pi2=s prompt_out|po=s '
153 'quick screen_length|sl=i prompts_pad_left=i '
153 'quick screen_length|sl=i prompts_pad_left=i '
154 'logfile|lf=s logplay|lp=s profile|p=s '
154 'logfile|lf=s logplay|lp=s profile|p=s '
155 'readline! readline_merge_completions! '
155 'readline! readline_merge_completions! '
156 'readline_omit__names! '
156 'readline_omit__names! '
157 'rcfile=s separate_in|si=s separate_out|so=s '
157 'rcfile=s separate_in|si=s separate_out|so=s '
158 'separate_out2|so2=s xmode=s wildcards_case_sensitive! '
158 'separate_out2|so2=s xmode=s wildcards_case_sensitive! '
159 'magic_docstrings system_verbose! '
159 'magic_docstrings system_verbose! '
160 'multi_line_specials!')
160 'multi_line_specials!')
161
161
162 # Options that can *only* appear at the cmd line (not in rcfiles).
162 # Options that can *only* appear at the cmd line (not in rcfiles).
163
163
164 # The "ignore" option is a kludge so that Emacs buffers don't crash, since
164 # The "ignore" option is a kludge so that Emacs buffers don't crash, since
165 # the 'C-c !' command in emacs automatically appends a -i option at the end.
165 # the 'C-c !' command in emacs automatically appends a -i option at the end.
166 cmdline_only = ('help ignore|i ipythondir=s Version upgrade '
166 cmdline_only = ('help ignore|i ipythondir=s Version upgrade '
167 'gthread! qthread! wthread! pylab! tk!')
167 'gthread! qthread! wthread! pylab! tk!')
168
168
169 # Build the actual name list to be used by DPyGetOpt
169 # Build the actual name list to be used by DPyGetOpt
170 opts_names = qw(cmdline_opts) + qw(cmdline_only)
170 opts_names = qw(cmdline_opts) + qw(cmdline_only)
171
171
172 # Set sensible command line defaults.
172 # Set sensible command line defaults.
173 # This should have everything from cmdline_opts and cmdline_only
173 # This should have everything from cmdline_opts and cmdline_only
174 opts_def = Struct(autocall = 1,
174 opts_def = Struct(autocall = 1,
175 autoindent=0,
175 autoindent=0,
176 automagic = 1,
176 automagic = 1,
177 banner = 1,
177 banner = 1,
178 cache_size = 1000,
178 cache_size = 1000,
179 c = '',
179 c = '',
180 classic = 0,
180 classic = 0,
181 colors = 'NoColor',
181 colors = 'NoColor',
182 color_info = 0,
182 color_info = 0,
183 confirm_exit = 1,
183 confirm_exit = 1,
184 debug = 0,
184 debug = 0,
185 deep_reload = 0,
185 deep_reload = 0,
186 editor = '0',
186 editor = '0',
187 help = 0,
187 help = 0,
188 ignore = 0,
188 ignore = 0,
189 ipythondir = ipythondir,
189 ipythondir = ipythondir,
190 log = 0,
190 log = 0,
191 logfile = '',
191 logfile = '',
192 logplay = '',
192 logplay = '',
193 multi_line_specials = 1,
193 multi_line_specials = 1,
194 messages = 1,
194 messages = 1,
195 nosep = 0,
195 nosep = 0,
196 pdb = 0,
196 pdb = 0,
197 pprint = 0,
197 pprint = 0,
198 profile = '',
198 profile = '',
199 prompt_in1 = 'In [\\#]: ',
199 prompt_in1 = 'In [\\#]: ',
200 prompt_in2 = ' .\\D.: ',
200 prompt_in2 = ' .\\D.: ',
201 prompt_out = 'Out[\\#]: ',
201 prompt_out = 'Out[\\#]: ',
202 prompts_pad_left = 1,
202 prompts_pad_left = 1,
203 quick = 0,
203 quick = 0,
204 readline = 1,
204 readline = 1,
205 readline_merge_completions = 1,
205 readline_merge_completions = 1,
206 readline_omit__names = 0,
206 readline_omit__names = 0,
207 rcfile = 'ipythonrc' + rc_suffix,
207 rcfile = 'ipythonrc' + rc_suffix,
208 screen_length = 0,
208 screen_length = 0,
209 separate_in = '\n',
209 separate_in = '\n',
210 separate_out = '\n',
210 separate_out = '\n',
211 separate_out2 = '',
211 separate_out2 = '',
212 system_verbose = 0,
212 system_verbose = 0,
213 gthread = 0,
213 gthread = 0,
214 qthread = 0,
214 qthread = 0,
215 wthread = 0,
215 wthread = 0,
216 pylab = 0,
216 pylab = 0,
217 tk = 0,
217 tk = 0,
218 upgrade = 0,
218 upgrade = 0,
219 Version = 0,
219 Version = 0,
220 xmode = 'Verbose',
220 xmode = 'Verbose',
221 wildcards_case_sensitive = 1,
221 wildcards_case_sensitive = 1,
222 magic_docstrings = 0, # undocumented, for doc generation
222 magic_docstrings = 0, # undocumented, for doc generation
223 )
223 )
224
224
225 # Things that will *only* appear in rcfiles (not at the command line).
225 # Things that will *only* appear in rcfiles (not at the command line).
226 # Make sure there's a space before each end of line (they get auto-joined!)
226 # Make sure there's a space before each end of line (they get auto-joined!)
227 rcfile_opts = { qwflat: 'include import_mod import_all execfile ',
227 rcfile_opts = { qwflat: 'include import_mod import_all execfile ',
228 qw_lol: 'import_some ',
228 qw_lol: 'import_some ',
229 # for things with embedded whitespace:
229 # for things with embedded whitespace:
230 list_strings:'execute alias readline_parse_and_bind ',
230 list_strings:'execute alias readline_parse_and_bind ',
231 # Regular strings need no conversion:
231 # Regular strings need no conversion:
232 None:'readline_remove_delims ',
232 None:'readline_remove_delims ',
233 }
233 }
234 # Default values for these
234 # Default values for these
235 rc_def = Struct(include = [],
235 rc_def = Struct(include = [],
236 import_mod = [],
236 import_mod = [],
237 import_all = [],
237 import_all = [],
238 import_some = [[]],
238 import_some = [[]],
239 execute = [],
239 execute = [],
240 execfile = [],
240 execfile = [],
241 alias = [],
241 alias = [],
242 readline_parse_and_bind = [],
242 readline_parse_and_bind = [],
243 readline_remove_delims = '',
243 readline_remove_delims = '',
244 )
244 )
245
245
246 # Build the type conversion dictionary from the above tables:
246 # Build the type conversion dictionary from the above tables:
247 typeconv = rcfile_opts.copy()
247 typeconv = rcfile_opts.copy()
248 typeconv.update(optstr2types(cmdline_opts))
248 typeconv.update(optstr2types(cmdline_opts))
249
249
250 # FIXME: the None key appears in both, put that back together by hand. Ugly!
250 # FIXME: the None key appears in both, put that back together by hand. Ugly!
251 typeconv[None] += ' ' + rcfile_opts[None]
251 typeconv[None] += ' ' + rcfile_opts[None]
252
252
253 # Remove quotes at ends of all strings (used to protect spaces)
253 # Remove quotes at ends of all strings (used to protect spaces)
254 typeconv[unquote_ends] = typeconv[None]
254 typeconv[unquote_ends] = typeconv[None]
255 del typeconv[None]
255 del typeconv[None]
256
256
257 # Build the list we'll use to make all config decisions with defaults:
257 # Build the list we'll use to make all config decisions with defaults:
258 opts_all = opts_def.copy()
258 opts_all = opts_def.copy()
259 opts_all.update(rc_def)
259 opts_all.update(rc_def)
260
260
261 # Build conflict resolver for recursive loading of config files:
261 # Build conflict resolver for recursive loading of config files:
262 # - preserve means the outermost file maintains the value, it is not
262 # - preserve means the outermost file maintains the value, it is not
263 # overwritten if an included file has the same key.
263 # overwritten if an included file has the same key.
264 # - add_flip applies + to the two values, so it better make sense to add
264 # - add_flip applies + to the two values, so it better make sense to add
265 # those types of keys. But it flips them first so that things loaded
265 # those types of keys. But it flips them first so that things loaded
266 # deeper in the inclusion chain have lower precedence.
266 # deeper in the inclusion chain have lower precedence.
267 conflict = {'preserve': ' '.join([ typeconv[int],
267 conflict = {'preserve': ' '.join([ typeconv[int],
268 typeconv[unquote_ends] ]),
268 typeconv[unquote_ends] ]),
269 'add_flip': ' '.join([ typeconv[qwflat],
269 'add_flip': ' '.join([ typeconv[qwflat],
270 typeconv[qw_lol],
270 typeconv[qw_lol],
271 typeconv[list_strings] ])
271 typeconv[list_strings] ])
272 }
272 }
273
273
274 # Now actually process the command line
274 # Now actually process the command line
275 getopt = DPyGetOpt.DPyGetOpt()
275 getopt = DPyGetOpt.DPyGetOpt()
276 getopt.setIgnoreCase(0)
276 getopt.setIgnoreCase(0)
277
277
278 getopt.parseConfiguration(opts_names)
278 getopt.parseConfiguration(opts_names)
279
279
280 try:
280 try:
281 getopt.processArguments(argv)
281 getopt.processArguments(argv)
282 except:
282 except:
283 print cmd_line_usage
283 print cmd_line_usage
284 warn('\nError in Arguments: ' + `sys.exc_value`)
284 warn('\nError in Arguments: ' + `sys.exc_value`)
285 sys.exit(1)
285 sys.exit(1)
286
286
287 # convert the options dict to a struct for much lighter syntax later
287 # convert the options dict to a struct for much lighter syntax later
288 opts = Struct(getopt.optionValues)
288 opts = Struct(getopt.optionValues)
289 args = getopt.freeValues
289 args = getopt.freeValues
290
290
291 # this is the struct (which has default values at this point) with which
291 # this is the struct (which has default values at this point) with which
292 # we make all decisions:
292 # we make all decisions:
293 opts_all.update(opts)
293 opts_all.update(opts)
294
294
295 # Options that force an immediate exit
295 # Options that force an immediate exit
296 if opts_all.help:
296 if opts_all.help:
297 page(cmd_line_usage)
297 page(cmd_line_usage)
298 sys.exit()
298 sys.exit()
299
299
300 if opts_all.Version:
300 if opts_all.Version:
301 print __version__
301 print __version__
302 sys.exit()
302 sys.exit()
303
303
304 if opts_all.magic_docstrings:
304 if opts_all.magic_docstrings:
305 IP.magic_magic('-latex')
305 IP.magic_magic('-latex')
306 sys.exit()
306 sys.exit()
307
307
308 # Create user config directory if it doesn't exist. This must be done
308 # Create user config directory if it doesn't exist. This must be done
309 # *after* getting the cmd line options.
309 # *after* getting the cmd line options.
310 if not os.path.isdir(opts_all.ipythondir):
310 if not os.path.isdir(opts_all.ipythondir):
311 IP.user_setup(opts_all.ipythondir,rc_suffix,'install')
311 IP.user_setup(opts_all.ipythondir,rc_suffix,'install')
312
312
313 # upgrade user config files while preserving a copy of the originals
313 # upgrade user config files while preserving a copy of the originals
314 if opts_all.upgrade:
314 if opts_all.upgrade:
315 IP.user_setup(opts_all.ipythondir,rc_suffix,'upgrade')
315 IP.user_setup(opts_all.ipythondir,rc_suffix,'upgrade')
316
316
317 # check mutually exclusive options in the *original* command line
317 # check mutually exclusive options in the *original* command line
318 mutex_opts(opts,[qw('log logfile'),qw('rcfile profile'),
318 mutex_opts(opts,[qw('log logfile'),qw('rcfile profile'),
319 qw('classic profile'),qw('classic rcfile')])
319 qw('classic profile'),qw('classic rcfile')])
320
320
321 # default logfilename used when -log is called.
321 # default logfilename used when -log is called.
322 IP.LOGDEF = 'ipython.log'
322 IP.LOGDEF = 'ipython.log'
323
323
324 #---------------------------------------------------------------------------
324 #---------------------------------------------------------------------------
325 # Log replay
325 # Log replay
326
326
327 # if -logplay, we need to 'become' the other session. That basically means
327 # if -logplay, we need to 'become' the other session. That basically means
328 # replacing the current command line environment with that of the old
328 # replacing the current command line environment with that of the old
329 # session and moving on.
329 # session and moving on.
330
330
331 # this is needed so that later we know we're in session reload mode, as
331 # this is needed so that later we know we're in session reload mode, as
332 # opts_all will get overwritten:
332 # opts_all will get overwritten:
333 load_logplay = 0
333 load_logplay = 0
334
334
335 if opts_all.logplay:
335 if opts_all.logplay:
336 load_logplay = opts_all.logplay
336 load_logplay = opts_all.logplay
337 opts_debug_save = opts_all.debug
337 opts_debug_save = opts_all.debug
338 try:
338 try:
339 logplay = open(opts_all.logplay)
339 logplay = open(opts_all.logplay)
340 except IOError:
340 except IOError:
341 if opts_all.debug: IP.InteractiveTB()
341 if opts_all.debug: IP.InteractiveTB()
342 warn('Could not open logplay file '+`opts_all.logplay`)
342 warn('Could not open logplay file '+`opts_all.logplay`)
343 # restore state as if nothing had happened and move on, but make
343 # restore state as if nothing had happened and move on, but make
344 # sure that later we don't try to actually load the session file
344 # sure that later we don't try to actually load the session file
345 logplay = None
345 logplay = None
346 load_logplay = 0
346 load_logplay = 0
347 del opts_all.logplay
347 del opts_all.logplay
348 else:
348 else:
349 try:
349 try:
350 logplay.readline()
350 logplay.readline()
351 logplay.readline();
351 logplay.readline();
352 # this reloads that session's command line
352 # this reloads that session's command line
353 cmd = logplay.readline()[6:]
353 cmd = logplay.readline()[6:]
354 exec cmd
354 exec cmd
355 # restore the true debug flag given so that the process of
355 # restore the true debug flag given so that the process of
356 # session loading itself can be monitored.
356 # session loading itself can be monitored.
357 opts.debug = opts_debug_save
357 opts.debug = opts_debug_save
358 # save the logplay flag so later we don't overwrite the log
358 # save the logplay flag so later we don't overwrite the log
359 opts.logplay = load_logplay
359 opts.logplay = load_logplay
360 # now we must update our own structure with defaults
360 # now we must update our own structure with defaults
361 opts_all.update(opts)
361 opts_all.update(opts)
362 # now load args
362 # now load args
363 cmd = logplay.readline()[6:]
363 cmd = logplay.readline()[6:]
364 exec cmd
364 exec cmd
365 logplay.close()
365 logplay.close()
366 except:
366 except:
367 logplay.close()
367 logplay.close()
368 if opts_all.debug: IP.InteractiveTB()
368 if opts_all.debug: IP.InteractiveTB()
369 warn("Logplay file lacking full configuration information.\n"
369 warn("Logplay file lacking full configuration information.\n"
370 "I'll try to read it, but some things may not work.")
370 "I'll try to read it, but some things may not work.")
371
371
372 #-------------------------------------------------------------------------
372 #-------------------------------------------------------------------------
373 # set up output traps: catch all output from files, being run, modules
373 # set up output traps: catch all output from files, being run, modules
374 # loaded, etc. Then give it to the user in a clean form at the end.
374 # loaded, etc. Then give it to the user in a clean form at the end.
375
375
376 msg_out = 'Output messages. '
376 msg_out = 'Output messages. '
377 msg_err = 'Error messages. '
377 msg_err = 'Error messages. '
378 msg_sep = '\n'
378 msg_sep = '\n'
379 msg = Struct(config = OutputTrap('Configuration Loader',msg_out,
379 msg = Struct(config = OutputTrap('Configuration Loader',msg_out,
380 msg_err,msg_sep,debug,
380 msg_err,msg_sep,debug,
381 quiet_out=1),
381 quiet_out=1),
382 user_exec = OutputTrap('User File Execution',msg_out,
382 user_exec = OutputTrap('User File Execution',msg_out,
383 msg_err,msg_sep,debug),
383 msg_err,msg_sep,debug),
384 logplay = OutputTrap('Log Loader',msg_out,
384 logplay = OutputTrap('Log Loader',msg_out,
385 msg_err,msg_sep,debug),
385 msg_err,msg_sep,debug),
386 summary = ''
386 summary = ''
387 )
387 )
388
388
389 #-------------------------------------------------------------------------
389 #-------------------------------------------------------------------------
390 # Process user ipythonrc-type configuration files
390 # Process user ipythonrc-type configuration files
391
391
392 # turn on output trapping and log to msg.config
392 # turn on output trapping and log to msg.config
393 # remember that with debug on, trapping is actually disabled
393 # remember that with debug on, trapping is actually disabled
394 msg.config.trap_all()
394 msg.config.trap_all()
395
395
396 # look for rcfile in current or default directory
396 # look for rcfile in current or default directory
397 try:
397 try:
398 opts_all.rcfile = filefind(opts_all.rcfile,opts_all.ipythondir)
398 opts_all.rcfile = filefind(opts_all.rcfile,opts_all.ipythondir)
399 except IOError:
399 except IOError:
400 if opts_all.debug: IP.InteractiveTB()
400 if opts_all.debug: IP.InteractiveTB()
401 warn('Configuration file %s not found. Ignoring request.'
401 warn('Configuration file %s not found. Ignoring request.'
402 % (opts_all.rcfile) )
402 % (opts_all.rcfile) )
403
403
404 # 'profiles' are a shorthand notation for config filenames
404 # 'profiles' are a shorthand notation for config filenames
405 if opts_all.profile:
405 if opts_all.profile:
406 try:
406 try:
407 opts_all.rcfile = filefind('ipythonrc-' + opts_all.profile
407 opts_all.rcfile = filefind('ipythonrc-' + opts_all.profile
408 + rc_suffix,
408 + rc_suffix,
409 opts_all.ipythondir)
409 opts_all.ipythondir)
410 except IOError:
410 except IOError:
411 if opts_all.debug: IP.InteractiveTB()
411 if opts_all.debug: IP.InteractiveTB()
412 opts.profile = '' # remove profile from options if invalid
412 opts.profile = '' # remove profile from options if invalid
413 warn('Profile configuration file %s not found. Ignoring request.'
413 warn('Profile configuration file %s not found. Ignoring request.'
414 % (opts_all.profile) )
414 % (opts_all.profile) )
415
415
416 # load the config file
416 # load the config file
417 rcfiledata = None
417 rcfiledata = None
418 if opts_all.quick:
418 if opts_all.quick:
419 print 'Launching IPython in quick mode. No config file read.'
419 print 'Launching IPython in quick mode. No config file read.'
420 elif opts_all.classic:
420 elif opts_all.classic:
421 print 'Launching IPython in classic mode. No config file read.'
421 print 'Launching IPython in classic mode. No config file read.'
422 elif opts_all.rcfile:
422 elif opts_all.rcfile:
423 try:
423 try:
424 cfg_loader = ConfigLoader(conflict)
424 cfg_loader = ConfigLoader(conflict)
425 rcfiledata = cfg_loader.load(opts_all.rcfile,typeconv,
425 rcfiledata = cfg_loader.load(opts_all.rcfile,typeconv,
426 'include',opts_all.ipythondir,
426 'include',opts_all.ipythondir,
427 purge = 1,
427 purge = 1,
428 unique = conflict['preserve'])
428 unique = conflict['preserve'])
429 except:
429 except:
430 IP.InteractiveTB()
430 IP.InteractiveTB()
431 warn('Problems loading configuration file '+
431 warn('Problems loading configuration file '+
432 `opts_all.rcfile`+
432 `opts_all.rcfile`+
433 '\nStarting with default -bare bones- configuration.')
433 '\nStarting with default -bare bones- configuration.')
434 else:
434 else:
435 warn('No valid configuration file found in either currrent directory\n'+
435 warn('No valid configuration file found in either currrent directory\n'+
436 'or in the IPython config. directory: '+`opts_all.ipythondir`+
436 'or in the IPython config. directory: '+`opts_all.ipythondir`+
437 '\nProceeding with internal defaults.')
437 '\nProceeding with internal defaults.')
438
438
439 #------------------------------------------------------------------------
439 #------------------------------------------------------------------------
440 # Set exception handlers in mode requested by user.
440 # Set exception handlers in mode requested by user.
441 otrap = OutputTrap(trap_out=1) # trap messages from magic_xmode
441 otrap = OutputTrap(trap_out=1) # trap messages from magic_xmode
442 IP.magic_xmode(opts_all.xmode)
442 IP.magic_xmode(opts_all.xmode)
443 otrap.release_out()
443 otrap.release_out()
444
444
445 #------------------------------------------------------------------------
445 #------------------------------------------------------------------------
446 # Execute user config
446 # Execute user config
447
447
448 # first, create a valid config structure with the right precedence order:
448 # first, create a valid config structure with the right precedence order:
449 # defaults < rcfile < command line. We make it as a local (IP_rc) to
449 # defaults < rcfile < command line. We make it as a local (IP_rc) to
450 # avoid a zillion attribute accesses. Right before returning, this will
450 # avoid a zillion attribute accesses. Right before returning, this will
451 # be set as IP.rc.
451 # be set as IP.rc.
452 IP_rc = rc_def.copy()
452 IP_rc = rc_def.copy()
453 IP_rc.update(opts_def)
453 IP_rc.update(opts_def)
454 if rcfiledata:
454 if rcfiledata:
455 # now we can update
455 # now we can update
456 IP_rc.update(rcfiledata)
456 IP_rc.update(rcfiledata)
457 IP_rc.update(opts)
457 IP_rc.update(opts)
458 IP_rc.update(rc_override)
458 IP_rc.update(rc_override)
459
459
460 # Store the original cmd line for reference:
460 # Store the original cmd line for reference:
461 IP_rc.opts = opts
461 IP_rc.opts = opts
462 IP_rc.args = args
462 IP_rc.args = args
463
463
464 # create a *runtime* Struct like rc for holding parameters which may be
464 # create a *runtime* Struct like rc for holding parameters which may be
465 # created and/or modified by runtime user extensions.
465 # created and/or modified by runtime user extensions.
466 IP.runtime_rc = Struct()
466 IP.runtime_rc = Struct()
467
467
468 # from this point on, all config should be handled through IP_rc,
468 # from this point on, all config should be handled through IP_rc,
469 # opts* shouldn't be used anymore.
469 # opts* shouldn't be used anymore.
470
470
471 # add personal .ipython dir to sys.path so that users can put things in
471 # add personal .ipython dir to sys.path so that users can put things in
472 # there for customization
472 # there for customization
473 sys.path.append(IP_rc.ipythondir)
473 sys.path.append(IP_rc.ipythondir)
474 sys.path.insert(0, '') # add . to sys.path. Fix from Prabhu Ramachandran
474 sys.path.insert(0, '') # add . to sys.path. Fix from Prabhu Ramachandran
475
475
476 # update IP_rc with some special things that need manual
476 # update IP_rc with some special things that need manual
477 # tweaks. Basically options which affect other options. I guess this
477 # tweaks. Basically options which affect other options. I guess this
478 # should just be written so that options are fully orthogonal and we
478 # should just be written so that options are fully orthogonal and we
479 # wouldn't worry about this stuff!
479 # wouldn't worry about this stuff!
480
480
481 if IP_rc.classic:
481 if IP_rc.classic:
482 IP_rc.quick = 1
482 IP_rc.quick = 1
483 IP_rc.cache_size = 0
483 IP_rc.cache_size = 0
484 IP_rc.pprint = 0
484 IP_rc.pprint = 0
485 IP_rc.prompt_in1 = '>>> '
485 IP_rc.prompt_in1 = '>>> '
486 IP_rc.prompt_in2 = '... '
486 IP_rc.prompt_in2 = '... '
487 IP_rc.prompt_out = ''
487 IP_rc.prompt_out = ''
488 IP_rc.separate_in = IP_rc.separate_out = IP_rc.separate_out2 = '0'
488 IP_rc.separate_in = IP_rc.separate_out = IP_rc.separate_out2 = '0'
489 IP_rc.colors = 'NoColor'
489 IP_rc.colors = 'NoColor'
490 IP_rc.xmode = 'Plain'
490 IP_rc.xmode = 'Plain'
491
491
492 # configure readline
492 # configure readline
493 # Define the history file for saving commands in between sessions
493 # Define the history file for saving commands in between sessions
494 if IP_rc.profile:
494 if IP_rc.profile:
495 histfname = 'history-%s' % IP_rc.profile
495 histfname = 'history-%s' % IP_rc.profile
496 else:
496 else:
497 histfname = 'history'
497 histfname = 'history'
498 IP.histfile = os.path.join(opts_all.ipythondir,histfname)
498 IP.histfile = os.path.join(opts_all.ipythondir,histfname)
499
499
500 # update exception handlers with rc file status
500 # update exception handlers with rc file status
501 otrap.trap_out() # I don't want these messages ever.
501 otrap.trap_out() # I don't want these messages ever.
502 IP.magic_xmode(IP_rc.xmode)
502 IP.magic_xmode(IP_rc.xmode)
503 otrap.release_out()
503 otrap.release_out()
504
504
505 # activate logging if requested and not reloading a log
505 # activate logging if requested and not reloading a log
506 if IP_rc.logplay:
506 if IP_rc.logplay:
507 IP.magic_logstart(IP_rc.logplay + ' append')
507 IP.magic_logstart(IP_rc.logplay + ' append')
508 elif IP_rc.logfile:
508 elif IP_rc.logfile:
509 IP.magic_logstart(IP_rc.logfile)
509 IP.magic_logstart(IP_rc.logfile)
510 elif IP_rc.log:
510 elif IP_rc.log:
511 IP.magic_logstart()
511 IP.magic_logstart()
512
512
513 # find user editor so that it we don't have to look it up constantly
513 # find user editor so that it we don't have to look it up constantly
514 if IP_rc.editor.strip()=='0':
514 if IP_rc.editor.strip()=='0':
515 try:
515 try:
516 ed = os.environ['EDITOR']
516 ed = os.environ['EDITOR']
517 except KeyError:
517 except KeyError:
518 if os.name == 'posix':
518 if os.name == 'posix':
519 ed = 'vi' # the only one guaranteed to be there!
519 ed = 'vi' # the only one guaranteed to be there!
520 else:
520 else:
521 ed = 'notepad' # same in Windows!
521 ed = 'notepad' # same in Windows!
522 IP_rc.editor = ed
522 IP_rc.editor = ed
523
523
524 # Keep track of whether this is an embedded instance or not (useful for
524 # Keep track of whether this is an embedded instance or not (useful for
525 # post-mortems).
525 # post-mortems).
526 IP_rc.embedded = IP.embedded
526 IP_rc.embedded = IP.embedded
527
527
528 # Recursive reload
528 # Recursive reload
529 try:
529 try:
530 from IPython import deep_reload
530 from IPython import deep_reload
531 if IP_rc.deep_reload:
531 if IP_rc.deep_reload:
532 __builtin__.reload = deep_reload.reload
532 __builtin__.reload = deep_reload.reload
533 else:
533 else:
534 __builtin__.dreload = deep_reload.reload
534 __builtin__.dreload = deep_reload.reload
535 del deep_reload
535 del deep_reload
536 except ImportError:
536 except ImportError:
537 pass
537 pass
538
538
539 # Save the current state of our namespace so that the interactive shell
539 # Save the current state of our namespace so that the interactive shell
540 # can later know which variables have been created by us from config files
540 # can later know which variables have been created by us from config files
541 # and loading. This way, loading a file (in any way) is treated just like
541 # and loading. This way, loading a file (in any way) is treated just like
542 # defining things on the command line, and %who works as expected.
542 # defining things on the command line, and %who works as expected.
543
543
544 # DON'T do anything that affects the namespace beyond this point!
544 # DON'T do anything that affects the namespace beyond this point!
545 IP.internal_ns.update(__main__.__dict__)
545 IP.internal_ns.update(__main__.__dict__)
546
546
547 #IP.internal_ns.update(locals()) # so our stuff doesn't show up in %who
547 #IP.internal_ns.update(locals()) # so our stuff doesn't show up in %who
548
548
549 # Now run through the different sections of the users's config
549 # Now run through the different sections of the users's config
550 if IP_rc.debug:
550 if IP_rc.debug:
551 print 'Trying to execute the following configuration structure:'
551 print 'Trying to execute the following configuration structure:'
552 print '(Things listed first are deeper in the inclusion tree and get'
552 print '(Things listed first are deeper in the inclusion tree and get'
553 print 'loaded first).\n'
553 print 'loaded first).\n'
554 pprint(IP_rc.__dict__)
554 pprint(IP_rc.__dict__)
555
555
556 for mod in IP_rc.import_mod:
556 for mod in IP_rc.import_mod:
557 try:
557 try:
558 exec 'import '+mod in IP.user_ns
558 exec 'import '+mod in IP.user_ns
559 except :
559 except :
560 IP.InteractiveTB()
560 IP.InteractiveTB()
561 import_fail_info(mod)
561 import_fail_info(mod)
562
562
563 for mod_fn in IP_rc.import_some:
563 for mod_fn in IP_rc.import_some:
564 if mod_fn == []: break
564 if mod_fn == []: break
565 mod,fn = mod_fn[0],','.join(mod_fn[1:])
565 mod,fn = mod_fn[0],','.join(mod_fn[1:])
566 try:
566 try:
567 exec 'from '+mod+' import '+fn in IP.user_ns
567 exec 'from '+mod+' import '+fn in IP.user_ns
568 except :
568 except :
569 IP.InteractiveTB()
569 IP.InteractiveTB()
570 import_fail_info(mod,fn)
570 import_fail_info(mod,fn)
571
571
572 for mod in IP_rc.import_all:
572 for mod in IP_rc.import_all:
573 try:
573 try:
574 exec 'from '+mod+' import *' in IP.user_ns
574 exec 'from '+mod+' import *' in IP.user_ns
575 except :
575 except :
576 IP.InteractiveTB()
576 IP.InteractiveTB()
577 import_fail_info(mod)
577 import_fail_info(mod)
578
578
579 for code in IP_rc.execute:
579 for code in IP_rc.execute:
580 try:
580 try:
581 exec code in IP.user_ns
581 exec code in IP.user_ns
582 except:
582 except:
583 IP.InteractiveTB()
583 IP.InteractiveTB()
584 warn('Failure executing code: ' + `code`)
584 warn('Failure executing code: ' + `code`)
585
585
586 # Execute the files the user wants in ipythonrc
586 # Execute the files the user wants in ipythonrc
587 for file in IP_rc.execfile:
587 for file in IP_rc.execfile:
588 try:
588 try:
589 file = filefind(file,sys.path+[IPython_dir])
589 file = filefind(file,sys.path+[IPython_dir])
590 except IOError:
590 except IOError:
591 warn(itpl('File $file not found. Skipping it.'))
591 warn(itpl('File $file not found. Skipping it.'))
592 else:
592 else:
593 IP.safe_execfile(os.path.expanduser(file),IP.user_ns)
593 IP.safe_execfile(os.path.expanduser(file),IP.user_ns)
594
594
595 # Load user aliases
596 for alias in IP_rc.alias:
597 IP.magic_alias(alias)
598
599 # release stdout and stderr and save config log into a global summary
595 # release stdout and stderr and save config log into a global summary
600 msg.config.release_all()
596 msg.config.release_all()
601 if IP_rc.messages:
597 if IP_rc.messages:
602 msg.summary += msg.config.summary_all()
598 msg.summary += msg.config.summary_all()
603
599
604 #------------------------------------------------------------------------
600 #------------------------------------------------------------------------
605 # Setup interactive session
601 # Setup interactive session
606
602
607 # Now we should be fully configured. We can then execute files or load
603 # Now we should be fully configured. We can then execute files or load
608 # things only needed for interactive use. Then we'll open the shell.
604 # things only needed for interactive use. Then we'll open the shell.
609
605
610 # Take a snapshot of the user namespace before opening the shell. That way
606 # Take a snapshot of the user namespace before opening the shell. That way
611 # we'll be able to identify which things were interactively defined and
607 # we'll be able to identify which things were interactively defined and
612 # which were defined through config files.
608 # which were defined through config files.
613 IP.user_config_ns = IP.user_ns.copy()
609 IP.user_config_ns = IP.user_ns.copy()
614
610
615 # Force reading a file as if it were a session log. Slower but safer.
611 # Force reading a file as if it were a session log. Slower but safer.
616 if load_logplay:
612 if load_logplay:
617 print 'Replaying log...'
613 print 'Replaying log...'
618 try:
614 try:
619 if IP_rc.debug:
615 if IP_rc.debug:
620 logplay_quiet = 0
616 logplay_quiet = 0
621 else:
617 else:
622 logplay_quiet = 1
618 logplay_quiet = 1
623
619
624 msg.logplay.trap_all()
620 msg.logplay.trap_all()
625 IP.safe_execfile(load_logplay,IP.user_ns,
621 IP.safe_execfile(load_logplay,IP.user_ns,
626 islog = 1, quiet = logplay_quiet)
622 islog = 1, quiet = logplay_quiet)
627 msg.logplay.release_all()
623 msg.logplay.release_all()
628 if IP_rc.messages:
624 if IP_rc.messages:
629 msg.summary += msg.logplay.summary_all()
625 msg.summary += msg.logplay.summary_all()
630 except:
626 except:
631 warn('Problems replaying logfile %s.' % load_logplay)
627 warn('Problems replaying logfile %s.' % load_logplay)
632 IP.InteractiveTB()
628 IP.InteractiveTB()
633
629
634 # Load remaining files in command line
630 # Load remaining files in command line
635 msg.user_exec.trap_all()
631 msg.user_exec.trap_all()
636
632
637 # Do NOT execute files named in the command line as scripts to be loaded
633 # Do NOT execute files named in the command line as scripts to be loaded
638 # by embedded instances. Doing so has the potential for an infinite
634 # by embedded instances. Doing so has the potential for an infinite
639 # recursion if there are exceptions thrown in the process.
635 # recursion if there are exceptions thrown in the process.
640
636
641 # XXX FIXME: the execution of user files should be moved out to after
637 # XXX FIXME: the execution of user files should be moved out to after
642 # ipython is fully initialized, just as if they were run via %run at the
638 # ipython is fully initialized, just as if they were run via %run at the
643 # ipython prompt. This would also give them the benefit of ipython's
639 # ipython prompt. This would also give them the benefit of ipython's
644 # nice tracebacks.
640 # nice tracebacks.
645
641
646 if not embedded and IP_rc.args:
642 if not embedded and IP_rc.args:
647 name_save = IP.user_ns['__name__']
643 name_save = IP.user_ns['__name__']
648 IP.user_ns['__name__'] = '__main__'
644 IP.user_ns['__name__'] = '__main__'
649 try:
645 try:
650 # Set our own excepthook in case the user code tries to call it
646 # Set our own excepthook in case the user code tries to call it
651 # directly. This prevents triggering the IPython crash handler.
647 # directly. This prevents triggering the IPython crash handler.
652 old_excepthook,sys.excepthook = sys.excepthook, IP.excepthook
648 old_excepthook,sys.excepthook = sys.excepthook, IP.excepthook
653 for run in args:
649 for run in args:
654 IP.safe_execfile(run,IP.user_ns)
650 IP.safe_execfile(run,IP.user_ns)
655 finally:
651 finally:
656 # Reset our crash handler in place
652 # Reset our crash handler in place
657 sys.excepthook = old_excepthook
653 sys.excepthook = old_excepthook
658
654
659 IP.user_ns['__name__'] = name_save
655 IP.user_ns['__name__'] = name_save
660
656
661 msg.user_exec.release_all()
657 msg.user_exec.release_all()
662 if IP_rc.messages:
658 if IP_rc.messages:
663 msg.summary += msg.user_exec.summary_all()
659 msg.summary += msg.user_exec.summary_all()
664
660
665 # since we can't specify a null string on the cmd line, 0 is the equivalent:
661 # since we can't specify a null string on the cmd line, 0 is the equivalent:
666 if IP_rc.nosep:
662 if IP_rc.nosep:
667 IP_rc.separate_in = IP_rc.separate_out = IP_rc.separate_out2 = '0'
663 IP_rc.separate_in = IP_rc.separate_out = IP_rc.separate_out2 = '0'
668 if IP_rc.separate_in == '0': IP_rc.separate_in = ''
664 if IP_rc.separate_in == '0': IP_rc.separate_in = ''
669 if IP_rc.separate_out == '0': IP_rc.separate_out = ''
665 if IP_rc.separate_out == '0': IP_rc.separate_out = ''
670 if IP_rc.separate_out2 == '0': IP_rc.separate_out2 = ''
666 if IP_rc.separate_out2 == '0': IP_rc.separate_out2 = ''
671 IP_rc.separate_in = IP_rc.separate_in.replace('\\n','\n')
667 IP_rc.separate_in = IP_rc.separate_in.replace('\\n','\n')
672 IP_rc.separate_out = IP_rc.separate_out.replace('\\n','\n')
668 IP_rc.separate_out = IP_rc.separate_out.replace('\\n','\n')
673 IP_rc.separate_out2 = IP_rc.separate_out2.replace('\\n','\n')
669 IP_rc.separate_out2 = IP_rc.separate_out2.replace('\\n','\n')
674
670
675 # Determine how many lines at the bottom of the screen are needed for
671 # Determine how many lines at the bottom of the screen are needed for
676 # showing prompts, so we can know wheter long strings are to be printed or
672 # showing prompts, so we can know wheter long strings are to be printed or
677 # paged:
673 # paged:
678 num_lines_bot = IP_rc.separate_in.count('\n')+1
674 num_lines_bot = IP_rc.separate_in.count('\n')+1
679 IP_rc.screen_length = IP_rc.screen_length - num_lines_bot
675 IP_rc.screen_length = IP_rc.screen_length - num_lines_bot
680 # Initialize cache, set in/out prompts and printing system
676 # Initialize cache, set in/out prompts and printing system
681 IP.outputcache = CachedOutput(IP_rc.cache_size,
677 IP.outputcache = CachedOutput(IP_rc.cache_size,
682 IP_rc.pprint,
678 IP_rc.pprint,
683 input_sep = IP_rc.separate_in,
679 input_sep = IP_rc.separate_in,
684 output_sep = IP_rc.separate_out,
680 output_sep = IP_rc.separate_out,
685 output_sep2 = IP_rc.separate_out2,
681 output_sep2 = IP_rc.separate_out2,
686 ps1 = IP_rc.prompt_in1,
682 ps1 = IP_rc.prompt_in1,
687 ps2 = IP_rc.prompt_in2,
683 ps2 = IP_rc.prompt_in2,
688 ps_out = IP_rc.prompt_out,
684 ps_out = IP_rc.prompt_out,
689 user_ns = IP.user_ns,
685 user_ns = IP.user_ns,
690 input_hist = IP.input_hist,
686 input_hist = IP.input_hist,
691 pad_left = IP_rc.prompts_pad_left)
687 pad_left = IP_rc.prompts_pad_left)
692
688
693 # user may have over-ridden the default print hook:
689 # user may have over-ridden the default print hook:
694 try:
690 try:
695 IP.outputcache.__class__.display = IP.hooks.display
691 IP.outputcache.__class__.display = IP.hooks.display
696 except AttributeError:
692 except AttributeError:
697 pass
693 pass
698
694
699 # Set calling of pdb on exceptions
695 # Set calling of pdb on exceptions
700 IP.InteractiveTB.call_pdb = IP_rc.pdb
696 IP.InteractiveTB.call_pdb = IP_rc.pdb
701
697
702 # I don't like assigning globally to sys, because it means when embedding
698 # I don't like assigning globally to sys, because it means when embedding
703 # instances, each embedded instance overrides the previous choice. But
699 # instances, each embedded instance overrides the previous choice. But
704 # sys.displayhook seems to be called internally by exec, so I don't see a
700 # sys.displayhook seems to be called internally by exec, so I don't see a
705 # way around it.
701 # way around it.
706 sys.displayhook = IP.outputcache
702 sys.displayhook = IP.outputcache
707
703
708 # we need to know globally if we're caching i/o or not
704 # we need to know globally if we're caching i/o or not
709 IP.do_full_cache = IP.outputcache.do_full_cache
705 IP.do_full_cache = IP.outputcache.do_full_cache
710
706
711 # configure startup banner
707 # configure startup banner
712 if IP_rc.c: # regular python doesn't print the banner with -c
708 if IP_rc.c: # regular python doesn't print the banner with -c
713 IP_rc.banner = 0
709 IP_rc.banner = 0
714 if IP_rc.banner:
710 if IP_rc.banner:
715 BANN_P = IP.BANNER_PARTS
711 BANN_P = IP.BANNER_PARTS
716 else:
712 else:
717 BANN_P = []
713 BANN_P = []
718
714
719 if IP_rc.profile: BANN_P.append('IPython profile: %s\n' % IP_rc.profile)
715 if IP_rc.profile: BANN_P.append('IPython profile: %s\n' % IP_rc.profile)
720
716
721 # add message log (possibly empty)
717 # add message log (possibly empty)
722 if msg.summary: BANN_P.append(msg.summary)
718 if msg.summary: BANN_P.append(msg.summary)
723 # Final banner is a string
719 # Final banner is a string
724 IP.BANNER = '\n'.join(BANN_P)
720 IP.BANNER = '\n'.join(BANN_P)
725
721
726 # Assign the IP_rc object as an attribute of IP
722 # Assign the IP_rc object as an attribute of IP
727 IP.rc = IP_rc
723 IP.rc = IP_rc
728
724
729 # Finalize the IPython instance. This assumes the rc structure is fully
725 # Finalize the IPython instance. This assumes the rc structure is fully
730 # in place.
726 # in place.
731 IP.post_config_initialization()
727 IP.post_config_initialization()
732
728
733 return IP
729 return IP
734 #************************ end of file <ipmaker.py> **************************
730 #************************ end of file <ipmaker.py> **************************
@@ -1,4464 +1,4470 b''
1 2005-11-15 Fernando Perez <Fernando.Perez@colorado.edu>
2
3 * IPython/iplib.py (InteractiveShell.post_config_initialization):
4 Fix bug where a naked 'alias' call in the ipythonrc file would
5 cause a crash. Bug reported by Jorgen Stenarson.
6
1 2005-11-15 <Fernando.Perez@colorado.edu>
7 2005-11-15 <Fernando.Perez@colorado.edu>
2
8
3 * IPython/ipmaker.py (make_IPython): cleanups which should improve
9 * IPython/ipmaker.py (make_IPython): cleanups which should improve
4 startup time.
10 startup time.
5
11
6 * IPython/iplib.py (runcode): my globals 'fix' for embedded
12 * IPython/iplib.py (runcode): my globals 'fix' for embedded
7 instances had introduced a bug with globals in normal code. Now
13 instances had introduced a bug with globals in normal code. Now
8 it's working in all cases.
14 it's working in all cases.
9
15
10 * IPython/Magic.py (magic_psearch): Finish wildcard cleanup and
16 * IPython/Magic.py (magic_psearch): Finish wildcard cleanup and
11 API changes. A new ipytonrc option, 'wildcards_case_sensitive'
17 API changes. A new ipytonrc option, 'wildcards_case_sensitive'
12 has been introduced to set the default case sensitivity of the
18 has been introduced to set the default case sensitivity of the
13 searches. Users can still select either mode at runtime on a
19 searches. Users can still select either mode at runtime on a
14 per-search basis.
20 per-search basis.
15
21
16 2005-11-13 <Fernando.Perez@colorado.edu>
22 2005-11-13 <Fernando.Perez@colorado.edu>
17
23
18 * IPython/wildcard.py (NameSpace.__init__): fix resolution of
24 * IPython/wildcard.py (NameSpace.__init__): fix resolution of
19 attributes in wildcard searches for subclasses. Modified version
25 attributes in wildcard searches for subclasses. Modified version
20 of a patch by Jorgen.
26 of a patch by Jorgen.
21
27
22 2005-11-12 <Fernando.Perez@colorado.edu>
28 2005-11-12 <Fernando.Perez@colorado.edu>
23
29
24 * IPython/iplib.py (embed_mainloop): Fix handling of globals for
30 * IPython/iplib.py (embed_mainloop): Fix handling of globals for
25 embedded instances. I added a user_global_ns attribute to the
31 embedded instances. I added a user_global_ns attribute to the
26 InteractiveShell class to handle this.
32 InteractiveShell class to handle this.
27
33
28 2005-10-31 Fernando Perez <Fernando.Perez@colorado.edu>
34 2005-10-31 Fernando Perez <Fernando.Perez@colorado.edu>
29
35
30 * IPython/Shell.py (IPShellGTK.mainloop): Change timeout_add to
36 * IPython/Shell.py (IPShellGTK.mainloop): Change timeout_add to
31 idle_add, which fixes horrible keyboard lag problems under gtk 2.6
37 idle_add, which fixes horrible keyboard lag problems under gtk 2.6
32 (reported under win32, but may happen also in other platforms).
38 (reported under win32, but may happen also in other platforms).
33 Bug report and fix courtesy of Sean Moore <smm-AT-logic.bm>
39 Bug report and fix courtesy of Sean Moore <smm-AT-logic.bm>
34
40
35 2005-10-15 Fernando Perez <Fernando.Perez@colorado.edu>
41 2005-10-15 Fernando Perez <Fernando.Perez@colorado.edu>
36
42
37 * IPython/Magic.py (magic_psearch): new support for wildcard
43 * IPython/Magic.py (magic_psearch): new support for wildcard
38 patterns. Now, typing ?a*b will list all names which begin with a
44 patterns. Now, typing ?a*b will list all names which begin with a
39 and end in b, for example. The %psearch magic has full
45 and end in b, for example. The %psearch magic has full
40 docstrings. Many thanks to JΓΆrgen Stenarson
46 docstrings. Many thanks to JΓΆrgen Stenarson
41 <jorgen.stenarson-AT-bostream.nu>, author of the patches
47 <jorgen.stenarson-AT-bostream.nu>, author of the patches
42 implementing this functionality.
48 implementing this functionality.
43
49
44 2005-09-27 Fernando Perez <Fernando.Perez@colorado.edu>
50 2005-09-27 Fernando Perez <Fernando.Perez@colorado.edu>
45
51
46 * Manual: fixed long-standing annoyance of double-dashes (as in
52 * Manual: fixed long-standing annoyance of double-dashes (as in
47 --prefix=~, for example) being stripped in the HTML version. This
53 --prefix=~, for example) being stripped in the HTML version. This
48 is a latex2html bug, but a workaround was provided. Many thanks
54 is a latex2html bug, but a workaround was provided. Many thanks
49 to George K. Thiruvathukal <gthiruv-AT-luc.edu> for the detailed
55 to George K. Thiruvathukal <gthiruv-AT-luc.edu> for the detailed
50 help, and Michael Tobis <mtobis-AT-gmail.com> for getting the ball
56 help, and Michael Tobis <mtobis-AT-gmail.com> for getting the ball
51 rolling. This seemingly small issue had tripped a number of users
57 rolling. This seemingly small issue had tripped a number of users
52 when first installing, so I'm glad to see it gone.
58 when first installing, so I'm glad to see it gone.
53
59
54 2005-09-27 Fernando Perez <Fernando.Perez@colorado.edu>
60 2005-09-27 Fernando Perez <Fernando.Perez@colorado.edu>
55
61
56 * IPython/Extensions/numeric_formats.py: fix missing import,
62 * IPython/Extensions/numeric_formats.py: fix missing import,
57 reported by Stephen Walton.
63 reported by Stephen Walton.
58
64
59 2005-09-24 Fernando Perez <Fernando.Perez@colorado.edu>
65 2005-09-24 Fernando Perez <Fernando.Perez@colorado.edu>
60
66
61 * IPython/demo.py: finish demo module, fully documented now.
67 * IPython/demo.py: finish demo module, fully documented now.
62
68
63 * IPython/genutils.py (file_read): simple little utility to read a
69 * IPython/genutils.py (file_read): simple little utility to read a
64 file and ensure it's closed afterwards.
70 file and ensure it's closed afterwards.
65
71
66 2005-09-23 Fernando Perez <Fernando.Perez@colorado.edu>
72 2005-09-23 Fernando Perez <Fernando.Perez@colorado.edu>
67
73
68 * IPython/demo.py (Demo.__init__): added support for individually
74 * IPython/demo.py (Demo.__init__): added support for individually
69 tagging blocks for automatic execution.
75 tagging blocks for automatic execution.
70
76
71 * IPython/Magic.py (magic_pycat): new %pycat magic for showing
77 * IPython/Magic.py (magic_pycat): new %pycat magic for showing
72 syntax-highlighted python sources, requested by John.
78 syntax-highlighted python sources, requested by John.
73
79
74 2005-09-22 Fernando Perez <Fernando.Perez@colorado.edu>
80 2005-09-22 Fernando Perez <Fernando.Perez@colorado.edu>
75
81
76 * IPython/demo.py (Demo.again): fix bug where again() blocks after
82 * IPython/demo.py (Demo.again): fix bug where again() blocks after
77 finishing.
83 finishing.
78
84
79 * IPython/genutils.py (shlex_split): moved from Magic to here,
85 * IPython/genutils.py (shlex_split): moved from Magic to here,
80 where all 2.2 compatibility stuff lives. I needed it for demo.py.
86 where all 2.2 compatibility stuff lives. I needed it for demo.py.
81
87
82 * IPython/demo.py (Demo.__init__): added support for silent
88 * IPython/demo.py (Demo.__init__): added support for silent
83 blocks, improved marks as regexps, docstrings written.
89 blocks, improved marks as regexps, docstrings written.
84 (Demo.__init__): better docstring, added support for sys.argv.
90 (Demo.__init__): better docstring, added support for sys.argv.
85
91
86 * IPython/genutils.py (marquee): little utility used by the demo
92 * IPython/genutils.py (marquee): little utility used by the demo
87 code, handy in general.
93 code, handy in general.
88
94
89 * IPython/demo.py (Demo.__init__): new class for interactive
95 * IPython/demo.py (Demo.__init__): new class for interactive
90 demos. Not documented yet, I just wrote it in a hurry for
96 demos. Not documented yet, I just wrote it in a hurry for
91 scipy'05. Will docstring later.
97 scipy'05. Will docstring later.
92
98
93 2005-09-20 Fernando Perez <Fernando.Perez@colorado.edu>
99 2005-09-20 Fernando Perez <Fernando.Perez@colorado.edu>
94
100
95 * IPython/Shell.py (sigint_handler): Drastic simplification which
101 * IPython/Shell.py (sigint_handler): Drastic simplification which
96 also seems to make Ctrl-C work correctly across threads! This is
102 also seems to make Ctrl-C work correctly across threads! This is
97 so simple, that I can't beleive I'd missed it before. Needs more
103 so simple, that I can't beleive I'd missed it before. Needs more
98 testing, though.
104 testing, though.
99 (KBINT): Never mind, revert changes. I'm sure I'd tried something
105 (KBINT): Never mind, revert changes. I'm sure I'd tried something
100 like this before...
106 like this before...
101
107
102 * IPython/genutils.py (get_home_dir): add protection against
108 * IPython/genutils.py (get_home_dir): add protection against
103 non-dirs in win32 registry.
109 non-dirs in win32 registry.
104
110
105 * IPython/iplib.py (InteractiveShell.alias_table_validate): fix
111 * IPython/iplib.py (InteractiveShell.alias_table_validate): fix
106 bug where dict was mutated while iterating (pysh crash).
112 bug where dict was mutated while iterating (pysh crash).
107
113
108 2005-09-06 Fernando Perez <Fernando.Perez@colorado.edu>
114 2005-09-06 Fernando Perez <Fernando.Perez@colorado.edu>
109
115
110 * IPython/iplib.py (handle_auto): Fix inconsistency arising from
116 * IPython/iplib.py (handle_auto): Fix inconsistency arising from
111 spurious newlines added by this routine. After a report by
117 spurious newlines added by this routine. After a report by
112 F. Mantegazza.
118 F. Mantegazza.
113
119
114 2005-09-05 Fernando Perez <Fernando.Perez@colorado.edu>
120 2005-09-05 Fernando Perez <Fernando.Perez@colorado.edu>
115
121
116 * IPython/Shell.py (hijack_gtk): remove pygtk.require("2.0")
122 * IPython/Shell.py (hijack_gtk): remove pygtk.require("2.0")
117 calls. These were a leftover from the GTK 1.x days, and can cause
123 calls. These were a leftover from the GTK 1.x days, and can cause
118 problems in certain cases (after a report by John Hunter).
124 problems in certain cases (after a report by John Hunter).
119
125
120 * IPython/iplib.py (InteractiveShell.__init__): Trap exception if
126 * IPython/iplib.py (InteractiveShell.__init__): Trap exception if
121 os.getcwd() fails at init time. Thanks to patch from David Remahl
127 os.getcwd() fails at init time. Thanks to patch from David Remahl
122 <chmod007-AT-mac.com>.
128 <chmod007-AT-mac.com>.
123 (InteractiveShell.__init__): prevent certain special magics from
129 (InteractiveShell.__init__): prevent certain special magics from
124 being shadowed by aliases. Closes
130 being shadowed by aliases. Closes
125 http://www.scipy.net/roundup/ipython/issue41.
131 http://www.scipy.net/roundup/ipython/issue41.
126
132
127 2005-08-31 Fernando Perez <Fernando.Perez@colorado.edu>
133 2005-08-31 Fernando Perez <Fernando.Perez@colorado.edu>
128
134
129 * IPython/iplib.py (InteractiveShell.complete): Added new
135 * IPython/iplib.py (InteractiveShell.complete): Added new
130 top-level completion method to expose the completion mechanism
136 top-level completion method to expose the completion mechanism
131 beyond readline-based environments.
137 beyond readline-based environments.
132
138
133 2005-08-19 Fernando Perez <Fernando.Perez@colorado.edu>
139 2005-08-19 Fernando Perez <Fernando.Perez@colorado.edu>
134
140
135 * tools/ipsvnc (svnversion): fix svnversion capture.
141 * tools/ipsvnc (svnversion): fix svnversion capture.
136
142
137 * IPython/iplib.py (InteractiveShell.__init__): Add has_readline
143 * IPython/iplib.py (InteractiveShell.__init__): Add has_readline
138 attribute to self, which was missing. Before, it was set by a
144 attribute to self, which was missing. Before, it was set by a
139 routine which in certain cases wasn't being called, so the
145 routine which in certain cases wasn't being called, so the
140 instance could end up missing the attribute. This caused a crash.
146 instance could end up missing the attribute. This caused a crash.
141 Closes http://www.scipy.net/roundup/ipython/issue40.
147 Closes http://www.scipy.net/roundup/ipython/issue40.
142
148
143 2005-08-16 Fernando Perez <fperez@colorado.edu>
149 2005-08-16 Fernando Perez <fperez@colorado.edu>
144
150
145 * IPython/ultraTB.py (VerboseTB.text): don't crash if object
151 * IPython/ultraTB.py (VerboseTB.text): don't crash if object
146 contains non-string attribute. Closes
152 contains non-string attribute. Closes
147 http://www.scipy.net/roundup/ipython/issue38.
153 http://www.scipy.net/roundup/ipython/issue38.
148
154
149 2005-08-14 Fernando Perez <fperez@colorado.edu>
155 2005-08-14 Fernando Perez <fperez@colorado.edu>
150
156
151 * tools/ipsvnc: Minor improvements, to add changeset info.
157 * tools/ipsvnc: Minor improvements, to add changeset info.
152
158
153 2005-08-12 Fernando Perez <fperez@colorado.edu>
159 2005-08-12 Fernando Perez <fperez@colorado.edu>
154
160
155 * IPython/iplib.py (runsource): remove self.code_to_run_src
161 * IPython/iplib.py (runsource): remove self.code_to_run_src
156 attribute. I realized this is nothing more than
162 attribute. I realized this is nothing more than
157 '\n'.join(self.buffer), and having the same data in two different
163 '\n'.join(self.buffer), and having the same data in two different
158 places is just asking for synchronization bugs. This may impact
164 places is just asking for synchronization bugs. This may impact
159 people who have custom exception handlers, so I need to warn
165 people who have custom exception handlers, so I need to warn
160 ipython-dev about it (F. Mantegazza may use them).
166 ipython-dev about it (F. Mantegazza may use them).
161
167
162 2005-07-29 Fernando Perez <Fernando.Perez@colorado.edu>
168 2005-07-29 Fernando Perez <Fernando.Perez@colorado.edu>
163
169
164 * IPython/genutils.py: fix 2.2 compatibility (generators)
170 * IPython/genutils.py: fix 2.2 compatibility (generators)
165
171
166 2005-07-18 Fernando Perez <fperez@colorado.edu>
172 2005-07-18 Fernando Perez <fperez@colorado.edu>
167
173
168 * IPython/genutils.py (get_home_dir): fix to help users with
174 * IPython/genutils.py (get_home_dir): fix to help users with
169 invalid $HOME under win32.
175 invalid $HOME under win32.
170
176
171 2005-07-17 Fernando Perez <fperez@colorado.edu>
177 2005-07-17 Fernando Perez <fperez@colorado.edu>
172
178
173 * IPython/Prompts.py (str_safe): Make unicode-safe. Also remove
179 * IPython/Prompts.py (str_safe): Make unicode-safe. Also remove
174 some old hacks and clean up a bit other routines; code should be
180 some old hacks and clean up a bit other routines; code should be
175 simpler and a bit faster.
181 simpler and a bit faster.
176
182
177 * IPython/iplib.py (interact): removed some last-resort attempts
183 * IPython/iplib.py (interact): removed some last-resort attempts
178 to survive broken stdout/stderr. That code was only making it
184 to survive broken stdout/stderr. That code was only making it
179 harder to abstract out the i/o (necessary for gui integration),
185 harder to abstract out the i/o (necessary for gui integration),
180 and the crashes it could prevent were extremely rare in practice
186 and the crashes it could prevent were extremely rare in practice
181 (besides being fully user-induced in a pretty violent manner).
187 (besides being fully user-induced in a pretty violent manner).
182
188
183 * IPython/genutils.py (IOStream.__init__): Simplify the i/o stuff.
189 * IPython/genutils.py (IOStream.__init__): Simplify the i/o stuff.
184 Nothing major yet, but the code is simpler to read; this should
190 Nothing major yet, but the code is simpler to read; this should
185 make it easier to do more serious modifications in the future.
191 make it easier to do more serious modifications in the future.
186
192
187 * IPython/Extensions/InterpreterExec.py: Fix auto-quoting in pysh,
193 * IPython/Extensions/InterpreterExec.py: Fix auto-quoting in pysh,
188 which broke in .15 (thanks to a report by Ville).
194 which broke in .15 (thanks to a report by Ville).
189
195
190 * IPython/Itpl.py (Itpl.__init__): add unicode support (it may not
196 * IPython/Itpl.py (Itpl.__init__): add unicode support (it may not
191 be quite correct, I know next to nothing about unicode). This
197 be quite correct, I know next to nothing about unicode). This
192 will allow unicode strings to be used in prompts, amongst other
198 will allow unicode strings to be used in prompts, amongst other
193 cases. It also will prevent ipython from crashing when unicode
199 cases. It also will prevent ipython from crashing when unicode
194 shows up unexpectedly in many places. If ascii encoding fails, we
200 shows up unexpectedly in many places. If ascii encoding fails, we
195 assume utf_8. Currently the encoding is not a user-visible
201 assume utf_8. Currently the encoding is not a user-visible
196 setting, though it could be made so if there is demand for it.
202 setting, though it could be made so if there is demand for it.
197
203
198 * IPython/ipmaker.py (make_IPython): remove old 2.1-specific hack.
204 * IPython/ipmaker.py (make_IPython): remove old 2.1-specific hack.
199
205
200 * IPython/Struct.py (Struct.merge): switch keys() to iterator.
206 * IPython/Struct.py (Struct.merge): switch keys() to iterator.
201
207
202 * IPython/background_jobs.py: moved 2.2 compatibility to genutils.
208 * IPython/background_jobs.py: moved 2.2 compatibility to genutils.
203
209
204 * IPython/genutils.py: Add 2.2 compatibility here, so all other
210 * IPython/genutils.py: Add 2.2 compatibility here, so all other
205 code can work transparently for 2.2/2.3.
211 code can work transparently for 2.2/2.3.
206
212
207 2005-07-16 Fernando Perez <fperez@colorado.edu>
213 2005-07-16 Fernando Perez <fperez@colorado.edu>
208
214
209 * IPython/ultraTB.py (ExceptionColors): Make a global variable
215 * IPython/ultraTB.py (ExceptionColors): Make a global variable
210 out of the color scheme table used for coloring exception
216 out of the color scheme table used for coloring exception
211 tracebacks. This allows user code to add new schemes at runtime.
217 tracebacks. This allows user code to add new schemes at runtime.
212 This is a minimally modified version of the patch at
218 This is a minimally modified version of the patch at
213 http://www.scipy.net/roundup/ipython/issue35, many thanks to pabw
219 http://www.scipy.net/roundup/ipython/issue35, many thanks to pabw
214 for the contribution.
220 for the contribution.
215
221
216 * IPython/FlexCompleter.py (Completer.attr_matches): Add a
222 * IPython/FlexCompleter.py (Completer.attr_matches): Add a
217 slightly modified version of the patch in
223 slightly modified version of the patch in
218 http://www.scipy.net/roundup/ipython/issue34, which also allows me
224 http://www.scipy.net/roundup/ipython/issue34, which also allows me
219 to remove the previous try/except solution (which was costlier).
225 to remove the previous try/except solution (which was costlier).
220 Thanks to Gaetan Lehmann <gaetan.lehmann-AT-jouy.inra.fr> for the fix.
226 Thanks to Gaetan Lehmann <gaetan.lehmann-AT-jouy.inra.fr> for the fix.
221
227
222 2005-06-08 Fernando Perez <fperez@colorado.edu>
228 2005-06-08 Fernando Perez <fperez@colorado.edu>
223
229
224 * IPython/iplib.py (write/write_err): Add methods to abstract all
230 * IPython/iplib.py (write/write_err): Add methods to abstract all
225 I/O a bit more.
231 I/O a bit more.
226
232
227 * IPython/Shell.py (IPShellGTK.mainloop): Fix GTK deprecation
233 * IPython/Shell.py (IPShellGTK.mainloop): Fix GTK deprecation
228 warning, reported by Aric Hagberg, fix by JD Hunter.
234 warning, reported by Aric Hagberg, fix by JD Hunter.
229
235
230 2005-06-02 *** Released version 0.6.15
236 2005-06-02 *** Released version 0.6.15
231
237
232 2005-06-01 Fernando Perez <fperez@colorado.edu>
238 2005-06-01 Fernando Perez <fperez@colorado.edu>
233
239
234 * IPython/iplib.py (MagicCompleter.file_matches): Fix
240 * IPython/iplib.py (MagicCompleter.file_matches): Fix
235 tab-completion of filenames within open-quoted strings. Note that
241 tab-completion of filenames within open-quoted strings. Note that
236 this requires that in ~/.ipython/ipythonrc, users change the
242 this requires that in ~/.ipython/ipythonrc, users change the
237 readline delimiters configuration to read:
243 readline delimiters configuration to read:
238
244
239 readline_remove_delims -/~
245 readline_remove_delims -/~
240
246
241
247
242 2005-05-31 *** Released version 0.6.14
248 2005-05-31 *** Released version 0.6.14
243
249
244 2005-05-29 Fernando Perez <fperez@colorado.edu>
250 2005-05-29 Fernando Perez <fperez@colorado.edu>
245
251
246 * IPython/ultraTB.py (VerboseTB.text): Fix crash for tracebacks
252 * IPython/ultraTB.py (VerboseTB.text): Fix crash for tracebacks
247 with files not on the filesystem. Reported by Eliyahu Sandler
253 with files not on the filesystem. Reported by Eliyahu Sandler
248 <eli@gondolin.net>
254 <eli@gondolin.net>
249
255
250 2005-05-22 Fernando Perez <fperez@colorado.edu>
256 2005-05-22 Fernando Perez <fperez@colorado.edu>
251
257
252 * IPython/iplib.py: Fix a few crashes in the --upgrade option.
258 * IPython/iplib.py: Fix a few crashes in the --upgrade option.
253 After an initial report by LUK ShunTim <shuntim.luk@polyu.edu.hk>.
259 After an initial report by LUK ShunTim <shuntim.luk@polyu.edu.hk>.
254
260
255 2005-05-19 Fernando Perez <fperez@colorado.edu>
261 2005-05-19 Fernando Perez <fperez@colorado.edu>
256
262
257 * IPython/iplib.py (safe_execfile): close a file which could be
263 * IPython/iplib.py (safe_execfile): close a file which could be
258 left open (causing problems in win32, which locks open files).
264 left open (causing problems in win32, which locks open files).
259 Thanks to a bug report by D Brown <dbrown2@yahoo.com>.
265 Thanks to a bug report by D Brown <dbrown2@yahoo.com>.
260
266
261 2005-05-18 Fernando Perez <fperez@colorado.edu>
267 2005-05-18 Fernando Perez <fperez@colorado.edu>
262
268
263 * IPython/Shell.py (MatplotlibShellBase.mplot_exec): pass all
269 * IPython/Shell.py (MatplotlibShellBase.mplot_exec): pass all
264 keyword arguments correctly to safe_execfile().
270 keyword arguments correctly to safe_execfile().
265
271
266 2005-05-13 Fernando Perez <fperez@colorado.edu>
272 2005-05-13 Fernando Perez <fperez@colorado.edu>
267
273
268 * ipython.1: Added info about Qt to manpage, and threads warning
274 * ipython.1: Added info about Qt to manpage, and threads warning
269 to usage page (invoked with --help).
275 to usage page (invoked with --help).
270
276
271 * IPython/iplib.py (MagicCompleter.python_func_kw_matches): Added
277 * IPython/iplib.py (MagicCompleter.python_func_kw_matches): Added
272 new matcher (it goes at the end of the priority list) to do
278 new matcher (it goes at the end of the priority list) to do
273 tab-completion on named function arguments. Submitted by George
279 tab-completion on named function arguments. Submitted by George
274 Sakkis <gsakkis-AT-eden.rutgers.edu>. See the thread at
280 Sakkis <gsakkis-AT-eden.rutgers.edu>. See the thread at
275 http://www.scipy.net/pipermail/ipython-dev/2005-April/000436.html
281 http://www.scipy.net/pipermail/ipython-dev/2005-April/000436.html
276 for more details.
282 for more details.
277
283
278 * IPython/Magic.py (magic_run): Added new -e flag to ignore
284 * IPython/Magic.py (magic_run): Added new -e flag to ignore
279 SystemExit exceptions in the script being run. Thanks to a report
285 SystemExit exceptions in the script being run. Thanks to a report
280 by danny shevitz <danny_shevitz-AT-yahoo.com>, about this
286 by danny shevitz <danny_shevitz-AT-yahoo.com>, about this
281 producing very annoying behavior when running unit tests.
287 producing very annoying behavior when running unit tests.
282
288
283 2005-05-12 Fernando Perez <fperez@colorado.edu>
289 2005-05-12 Fernando Perez <fperez@colorado.edu>
284
290
285 * IPython/iplib.py (handle_auto): fixed auto-quoting and parens,
291 * IPython/iplib.py (handle_auto): fixed auto-quoting and parens,
286 which I'd broken (again) due to a changed regexp. In the process,
292 which I'd broken (again) due to a changed regexp. In the process,
287 added ';' as an escape to auto-quote the whole line without
293 added ';' as an escape to auto-quote the whole line without
288 splitting its arguments. Thanks to a report by Jerry McRae
294 splitting its arguments. Thanks to a report by Jerry McRae
289 <qrs0xyc02-AT-sneakemail.com>.
295 <qrs0xyc02-AT-sneakemail.com>.
290
296
291 * IPython/ultraTB.py (VerboseTB.text): protect against rare but
297 * IPython/ultraTB.py (VerboseTB.text): protect against rare but
292 possible crashes caused by a TokenError. Reported by Ed Schofield
298 possible crashes caused by a TokenError. Reported by Ed Schofield
293 <schofield-AT-ftw.at>.
299 <schofield-AT-ftw.at>.
294
300
295 2005-05-06 Fernando Perez <fperez@colorado.edu>
301 2005-05-06 Fernando Perez <fperez@colorado.edu>
296
302
297 * IPython/Shell.py (hijack_wx): Fix to work with WX v.2.6.
303 * IPython/Shell.py (hijack_wx): Fix to work with WX v.2.6.
298
304
299 2005-04-29 Fernando Perez <fperez@colorado.edu>
305 2005-04-29 Fernando Perez <fperez@colorado.edu>
300
306
301 * IPython/Shell.py (IPShellQt): Thanks to Denis Rivière
307 * IPython/Shell.py (IPShellQt): Thanks to Denis Rivière
302 <nudz-AT-free.fr>, Yann Cointepas <yann-AT-sapetnioc.org> and Benjamin
308 <nudz-AT-free.fr>, Yann Cointepas <yann-AT-sapetnioc.org> and Benjamin
303 Thyreau <Benji2-AT-decideur.info>, we now have a -qthread option
309 Thyreau <Benji2-AT-decideur.info>, we now have a -qthread option
304 which provides support for Qt interactive usage (similar to the
310 which provides support for Qt interactive usage (similar to the
305 existing one for WX and GTK). This had been often requested.
311 existing one for WX and GTK). This had been often requested.
306
312
307 2005-04-14 *** Released version 0.6.13
313 2005-04-14 *** Released version 0.6.13
308
314
309 2005-04-08 Fernando Perez <fperez@colorado.edu>
315 2005-04-08 Fernando Perez <fperez@colorado.edu>
310
316
311 * IPython/Magic.py (Magic._ofind): remove docstring evaluation
317 * IPython/Magic.py (Magic._ofind): remove docstring evaluation
312 from _ofind, which gets called on almost every input line. Now,
318 from _ofind, which gets called on almost every input line. Now,
313 we only try to get docstrings if they are actually going to be
319 we only try to get docstrings if they are actually going to be
314 used (the overhead of fetching unnecessary docstrings can be
320 used (the overhead of fetching unnecessary docstrings can be
315 noticeable for certain objects, such as Pyro proxies).
321 noticeable for certain objects, such as Pyro proxies).
316
322
317 * IPython/iplib.py (MagicCompleter.python_matches): Change the API
323 * IPython/iplib.py (MagicCompleter.python_matches): Change the API
318 for completers. For some reason I had been passing them the state
324 for completers. For some reason I had been passing them the state
319 variable, which completers never actually need, and was in
325 variable, which completers never actually need, and was in
320 conflict with the rlcompleter API. Custom completers ONLY need to
326 conflict with the rlcompleter API. Custom completers ONLY need to
321 take the text parameter.
327 take the text parameter.
322
328
323 * IPython/Extensions/InterpreterExec.py: Fix regexp so that magics
329 * IPython/Extensions/InterpreterExec.py: Fix regexp so that magics
324 work correctly in pysh. I've also moved all the logic which used
330 work correctly in pysh. I've also moved all the logic which used
325 to be in pysh.py here, which will prevent problems with future
331 to be in pysh.py here, which will prevent problems with future
326 upgrades. However, this time I must warn users to update their
332 upgrades. However, this time I must warn users to update their
327 pysh profile to include the line
333 pysh profile to include the line
328
334
329 import_all IPython.Extensions.InterpreterExec
335 import_all IPython.Extensions.InterpreterExec
330
336
331 because otherwise things won't work for them. They MUST also
337 because otherwise things won't work for them. They MUST also
332 delete pysh.py and the line
338 delete pysh.py and the line
333
339
334 execfile pysh.py
340 execfile pysh.py
335
341
336 from their ipythonrc-pysh.
342 from their ipythonrc-pysh.
337
343
338 * IPython/FlexCompleter.py (Completer.attr_matches): Make more
344 * IPython/FlexCompleter.py (Completer.attr_matches): Make more
339 robust in the face of objects whose dir() returns non-strings
345 robust in the face of objects whose dir() returns non-strings
340 (which it shouldn't, but some broken libs like ITK do). Thanks to
346 (which it shouldn't, but some broken libs like ITK do). Thanks to
341 a patch by John Hunter (implemented differently, though). Also
347 a patch by John Hunter (implemented differently, though). Also
342 minor improvements by using .extend instead of + on lists.
348 minor improvements by using .extend instead of + on lists.
343
349
344 * pysh.py:
350 * pysh.py:
345
351
346 2005-04-06 Fernando Perez <fperez@colorado.edu>
352 2005-04-06 Fernando Perez <fperez@colorado.edu>
347
353
348 * IPython/ipmaker.py (make_IPython): Make multi_line_specials on
354 * IPython/ipmaker.py (make_IPython): Make multi_line_specials on
349 by default, so that all users benefit from it. Those who don't
355 by default, so that all users benefit from it. Those who don't
350 want it can still turn it off.
356 want it can still turn it off.
351
357
352 * IPython/UserConfig/ipythonrc: Add multi_line_specials to the
358 * IPython/UserConfig/ipythonrc: Add multi_line_specials to the
353 config file, I'd forgotten about this, so users were getting it
359 config file, I'd forgotten about this, so users were getting it
354 off by default.
360 off by default.
355
361
356 * IPython/iplib.py (ipmagic): big overhaul of the magic system for
362 * IPython/iplib.py (ipmagic): big overhaul of the magic system for
357 consistency. Now magics can be called in multiline statements,
363 consistency. Now magics can be called in multiline statements,
358 and python variables can be expanded in magic calls via $var.
364 and python variables can be expanded in magic calls via $var.
359 This makes the magic system behave just like aliases or !system
365 This makes the magic system behave just like aliases or !system
360 calls.
366 calls.
361
367
362 2005-03-28 Fernando Perez <fperez@colorado.edu>
368 2005-03-28 Fernando Perez <fperez@colorado.edu>
363
369
364 * IPython/iplib.py (handle_auto): cleanup to use %s instead of
370 * IPython/iplib.py (handle_auto): cleanup to use %s instead of
365 expensive string additions for building command. Add support for
371 expensive string additions for building command. Add support for
366 trailing ';' when autocall is used.
372 trailing ';' when autocall is used.
367
373
368 2005-03-26 Fernando Perez <fperez@colorado.edu>
374 2005-03-26 Fernando Perez <fperez@colorado.edu>
369
375
370 * ipython.el: Fix http://www.scipy.net/roundup/ipython/issue31.
376 * ipython.el: Fix http://www.scipy.net/roundup/ipython/issue31.
371 Bugfix by A. Schmolck, the ipython.el maintainer. Also make
377 Bugfix by A. Schmolck, the ipython.el maintainer. Also make
372 ipython.el robust against prompts with any number of spaces
378 ipython.el robust against prompts with any number of spaces
373 (including 0) after the ':' character.
379 (including 0) after the ':' character.
374
380
375 * IPython/Prompts.py (Prompt2.set_p_str): Fix spurious space in
381 * IPython/Prompts.py (Prompt2.set_p_str): Fix spurious space in
376 continuation prompt, which misled users to think the line was
382 continuation prompt, which misled users to think the line was
377 already indented. Closes debian Bug#300847, reported to me by
383 already indented. Closes debian Bug#300847, reported to me by
378 Norbert Tretkowski <tretkowski-AT-inittab.de>.
384 Norbert Tretkowski <tretkowski-AT-inittab.de>.
379
385
380 2005-03-23 Fernando Perez <fperez@colorado.edu>
386 2005-03-23 Fernando Perez <fperez@colorado.edu>
381
387
382 * IPython/Prompts.py (Prompt1.__str__): Make sure that prompts are
388 * IPython/Prompts.py (Prompt1.__str__): Make sure that prompts are
383 properly aligned if they have embedded newlines.
389 properly aligned if they have embedded newlines.
384
390
385 * IPython/iplib.py (runlines): Add a public method to expose
391 * IPython/iplib.py (runlines): Add a public method to expose
386 IPython's code execution machinery, so that users can run strings
392 IPython's code execution machinery, so that users can run strings
387 as if they had been typed at the prompt interactively.
393 as if they had been typed at the prompt interactively.
388 (InteractiveShell.__init__): Added getoutput() to the __IPYTHON__
394 (InteractiveShell.__init__): Added getoutput() to the __IPYTHON__
389 methods which can call the system shell, but with python variable
395 methods which can call the system shell, but with python variable
390 expansion. The three such methods are: __IPYTHON__.system,
396 expansion. The three such methods are: __IPYTHON__.system,
391 .getoutput and .getoutputerror. These need to be documented in a
397 .getoutput and .getoutputerror. These need to be documented in a
392 'public API' section (to be written) of the manual.
398 'public API' section (to be written) of the manual.
393
399
394 2005-03-20 Fernando Perez <fperez@colorado.edu>
400 2005-03-20 Fernando Perez <fperez@colorado.edu>
395
401
396 * IPython/iplib.py (InteractiveShell.set_custom_exc): new system
402 * IPython/iplib.py (InteractiveShell.set_custom_exc): new system
397 for custom exception handling. This is quite powerful, and it
403 for custom exception handling. This is quite powerful, and it
398 allows for user-installable exception handlers which can trap
404 allows for user-installable exception handlers which can trap
399 custom exceptions at runtime and treat them separately from
405 custom exceptions at runtime and treat them separately from
400 IPython's default mechanisms. At the request of FrΓ©dΓ©ric
406 IPython's default mechanisms. At the request of FrΓ©dΓ©ric
401 Mantegazza <mantegazza-AT-ill.fr>.
407 Mantegazza <mantegazza-AT-ill.fr>.
402 (InteractiveShell.set_custom_completer): public API function to
408 (InteractiveShell.set_custom_completer): public API function to
403 add new completers at runtime.
409 add new completers at runtime.
404
410
405 2005-03-19 Fernando Perez <fperez@colorado.edu>
411 2005-03-19 Fernando Perez <fperez@colorado.edu>
406
412
407 * IPython/OInspect.py (getdoc): Add a call to obj.getdoc(), to
413 * IPython/OInspect.py (getdoc): Add a call to obj.getdoc(), to
408 allow objects which provide their docstrings via non-standard
414 allow objects which provide their docstrings via non-standard
409 mechanisms (like Pyro proxies) to still be inspected by ipython's
415 mechanisms (like Pyro proxies) to still be inspected by ipython's
410 ? system.
416 ? system.
411
417
412 * IPython/iplib.py (InteractiveShell.__init__): back off the _o/_e
418 * IPython/iplib.py (InteractiveShell.__init__): back off the _o/_e
413 automatic capture system. I tried quite hard to make it work
419 automatic capture system. I tried quite hard to make it work
414 reliably, and simply failed. I tried many combinations with the
420 reliably, and simply failed. I tried many combinations with the
415 subprocess module, but eventually nothing worked in all needed
421 subprocess module, but eventually nothing worked in all needed
416 cases (not blocking stdin for the child, duplicating stdout
422 cases (not blocking stdin for the child, duplicating stdout
417 without blocking, etc). The new %sc/%sx still do capture to these
423 without blocking, etc). The new %sc/%sx still do capture to these
418 magical list/string objects which make shell use much more
424 magical list/string objects which make shell use much more
419 conveninent, so not all is lost.
425 conveninent, so not all is lost.
420
426
421 XXX - FIX MANUAL for the change above!
427 XXX - FIX MANUAL for the change above!
422
428
423 (runsource): I copied code.py's runsource() into ipython to modify
429 (runsource): I copied code.py's runsource() into ipython to modify
424 it a bit. Now the code object and source to be executed are
430 it a bit. Now the code object and source to be executed are
425 stored in ipython. This makes this info accessible to third-party
431 stored in ipython. This makes this info accessible to third-party
426 tools, like custom exception handlers. After a request by FrΓ©dΓ©ric
432 tools, like custom exception handlers. After a request by FrΓ©dΓ©ric
427 Mantegazza <mantegazza-AT-ill.fr>.
433 Mantegazza <mantegazza-AT-ill.fr>.
428
434
429 * IPython/UserConfig/ipythonrc: Add up/down arrow keys to
435 * IPython/UserConfig/ipythonrc: Add up/down arrow keys to
430 history-search via readline (like C-p/C-n). I'd wanted this for a
436 history-search via readline (like C-p/C-n). I'd wanted this for a
431 long time, but only recently found out how to do it. For users
437 long time, but only recently found out how to do it. For users
432 who already have their ipythonrc files made and want this, just
438 who already have their ipythonrc files made and want this, just
433 add:
439 add:
434
440
435 readline_parse_and_bind "\e[A": history-search-backward
441 readline_parse_and_bind "\e[A": history-search-backward
436 readline_parse_and_bind "\e[B": history-search-forward
442 readline_parse_and_bind "\e[B": history-search-forward
437
443
438 2005-03-18 Fernando Perez <fperez@colorado.edu>
444 2005-03-18 Fernando Perez <fperez@colorado.edu>
439
445
440 * IPython/Magic.py (magic_sc): %sc and %sx now use the fancy
446 * IPython/Magic.py (magic_sc): %sc and %sx now use the fancy
441 LSString and SList classes which allow transparent conversions
447 LSString and SList classes which allow transparent conversions
442 between list mode and whitespace-separated string.
448 between list mode and whitespace-separated string.
443 (magic_r): Fix recursion problem in %r.
449 (magic_r): Fix recursion problem in %r.
444
450
445 * IPython/genutils.py (LSString): New class to be used for
451 * IPython/genutils.py (LSString): New class to be used for
446 automatic storage of the results of all alias/system calls in _o
452 automatic storage of the results of all alias/system calls in _o
447 and _e (stdout/err). These provide a .l/.list attribute which
453 and _e (stdout/err). These provide a .l/.list attribute which
448 does automatic splitting on newlines. This means that for most
454 does automatic splitting on newlines. This means that for most
449 uses, you'll never need to do capturing of output with %sc/%sx
455 uses, you'll never need to do capturing of output with %sc/%sx
450 anymore, since ipython keeps this always done for you. Note that
456 anymore, since ipython keeps this always done for you. Note that
451 only the LAST results are stored, the _o/e variables are
457 only the LAST results are stored, the _o/e variables are
452 overwritten on each call. If you need to save their contents
458 overwritten on each call. If you need to save their contents
453 further, simply bind them to any other name.
459 further, simply bind them to any other name.
454
460
455 2005-03-17 Fernando Perez <fperez@colorado.edu>
461 2005-03-17 Fernando Perez <fperez@colorado.edu>
456
462
457 * IPython/Prompts.py (BasePrompt.cwd_filt): a few more fixes for
463 * IPython/Prompts.py (BasePrompt.cwd_filt): a few more fixes for
458 prompt namespace handling.
464 prompt namespace handling.
459
465
460 2005-03-16 Fernando Perez <fperez@colorado.edu>
466 2005-03-16 Fernando Perez <fperez@colorado.edu>
461
467
462 * IPython/Prompts.py (CachedOutput.__init__): Fix default and
468 * IPython/Prompts.py (CachedOutput.__init__): Fix default and
463 classic prompts to be '>>> ' (final space was missing, and it
469 classic prompts to be '>>> ' (final space was missing, and it
464 trips the emacs python mode).
470 trips the emacs python mode).
465 (BasePrompt.__str__): Added safe support for dynamic prompt
471 (BasePrompt.__str__): Added safe support for dynamic prompt
466 strings. Now you can set your prompt string to be '$x', and the
472 strings. Now you can set your prompt string to be '$x', and the
467 value of x will be printed from your interactive namespace. The
473 value of x will be printed from your interactive namespace. The
468 interpolation syntax includes the full Itpl support, so
474 interpolation syntax includes the full Itpl support, so
469 ${foo()+x+bar()} is a valid prompt string now, and the function
475 ${foo()+x+bar()} is a valid prompt string now, and the function
470 calls will be made at runtime.
476 calls will be made at runtime.
471
477
472 2005-03-15 Fernando Perez <fperez@colorado.edu>
478 2005-03-15 Fernando Perez <fperez@colorado.edu>
473
479
474 * IPython/Magic.py (magic_history): renamed %hist to %history, to
480 * IPython/Magic.py (magic_history): renamed %hist to %history, to
475 avoid name clashes in pylab. %hist still works, it just forwards
481 avoid name clashes in pylab. %hist still works, it just forwards
476 the call to %history.
482 the call to %history.
477
483
478 2005-03-02 *** Released version 0.6.12
484 2005-03-02 *** Released version 0.6.12
479
485
480 2005-03-02 Fernando Perez <fperez@colorado.edu>
486 2005-03-02 Fernando Perez <fperez@colorado.edu>
481
487
482 * IPython/iplib.py (handle_magic): log magic calls properly as
488 * IPython/iplib.py (handle_magic): log magic calls properly as
483 ipmagic() function calls.
489 ipmagic() function calls.
484
490
485 * IPython/Magic.py (magic_time): Improved %time to support
491 * IPython/Magic.py (magic_time): Improved %time to support
486 statements and provide wall-clock as well as CPU time.
492 statements and provide wall-clock as well as CPU time.
487
493
488 2005-02-27 Fernando Perez <fperez@colorado.edu>
494 2005-02-27 Fernando Perez <fperez@colorado.edu>
489
495
490 * IPython/hooks.py: New hooks module, to expose user-modifiable
496 * IPython/hooks.py: New hooks module, to expose user-modifiable
491 IPython functionality in a clean manner. For now only the editor
497 IPython functionality in a clean manner. For now only the editor
492 hook is actually written, and other thigns which I intend to turn
498 hook is actually written, and other thigns which I intend to turn
493 into proper hooks aren't yet there. The display and prefilter
499 into proper hooks aren't yet there. The display and prefilter
494 stuff, for example, should be hooks. But at least now the
500 stuff, for example, should be hooks. But at least now the
495 framework is in place, and the rest can be moved here with more
501 framework is in place, and the rest can be moved here with more
496 time later. IPython had had a .hooks variable for a long time for
502 time later. IPython had had a .hooks variable for a long time for
497 this purpose, but I'd never actually used it for anything.
503 this purpose, but I'd never actually used it for anything.
498
504
499 2005-02-26 Fernando Perez <fperez@colorado.edu>
505 2005-02-26 Fernando Perez <fperez@colorado.edu>
500
506
501 * IPython/ipmaker.py (make_IPython): make the default ipython
507 * IPython/ipmaker.py (make_IPython): make the default ipython
502 directory be called _ipython under win32, to follow more the
508 directory be called _ipython under win32, to follow more the
503 naming peculiarities of that platform (where buggy software like
509 naming peculiarities of that platform (where buggy software like
504 Visual Sourcesafe breaks with .named directories). Reported by
510 Visual Sourcesafe breaks with .named directories). Reported by
505 Ville Vainio.
511 Ville Vainio.
506
512
507 2005-02-23 Fernando Perez <fperez@colorado.edu>
513 2005-02-23 Fernando Perez <fperez@colorado.edu>
508
514
509 * IPython/iplib.py (InteractiveShell.__init__): removed a few
515 * IPython/iplib.py (InteractiveShell.__init__): removed a few
510 auto_aliases for win32 which were causing problems. Users can
516 auto_aliases for win32 which were causing problems. Users can
511 define the ones they personally like.
517 define the ones they personally like.
512
518
513 2005-02-21 Fernando Perez <fperez@colorado.edu>
519 2005-02-21 Fernando Perez <fperez@colorado.edu>
514
520
515 * IPython/Magic.py (magic_time): new magic to time execution of
521 * IPython/Magic.py (magic_time): new magic to time execution of
516 expressions. After a request by Charles Moad <cmoad-AT-indiana.edu>.
522 expressions. After a request by Charles Moad <cmoad-AT-indiana.edu>.
517
523
518 2005-02-19 Fernando Perez <fperez@colorado.edu>
524 2005-02-19 Fernando Perez <fperez@colorado.edu>
519
525
520 * IPython/ConfigLoader.py (ConfigLoader.load): Allow empty strings
526 * IPython/ConfigLoader.py (ConfigLoader.load): Allow empty strings
521 into keys (for prompts, for example).
527 into keys (for prompts, for example).
522
528
523 * IPython/Prompts.py (BasePrompt.set_p_str): Fix to allow empty
529 * IPython/Prompts.py (BasePrompt.set_p_str): Fix to allow empty
524 prompts in case users want them. This introduces a small behavior
530 prompts in case users want them. This introduces a small behavior
525 change: ipython does not automatically add a space to all prompts
531 change: ipython does not automatically add a space to all prompts
526 anymore. To get the old prompts with a space, users should add it
532 anymore. To get the old prompts with a space, users should add it
527 manually to their ipythonrc file, so for example prompt_in1 should
533 manually to their ipythonrc file, so for example prompt_in1 should
528 now read 'In [\#]: ' instead of 'In [\#]:'.
534 now read 'In [\#]: ' instead of 'In [\#]:'.
529 (BasePrompt.__init__): New option prompts_pad_left (only in rc
535 (BasePrompt.__init__): New option prompts_pad_left (only in rc
530 file) to control left-padding of secondary prompts.
536 file) to control left-padding of secondary prompts.
531
537
532 * IPython/Magic.py (Magic.profile_missing_notice): Don't crash if
538 * IPython/Magic.py (Magic.profile_missing_notice): Don't crash if
533 the profiler can't be imported. Fix for Debian, which removed
539 the profiler can't be imported. Fix for Debian, which removed
534 profile.py because of License issues. I applied a slightly
540 profile.py because of License issues. I applied a slightly
535 modified version of the original Debian patch at
541 modified version of the original Debian patch at
536 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=294500.
542 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=294500.
537
543
538 2005-02-17 Fernando Perez <fperez@colorado.edu>
544 2005-02-17 Fernando Perez <fperez@colorado.edu>
539
545
540 * IPython/genutils.py (native_line_ends): Fix bug which would
546 * IPython/genutils.py (native_line_ends): Fix bug which would
541 cause improper line-ends under win32 b/c I was not opening files
547 cause improper line-ends under win32 b/c I was not opening files
542 in binary mode. Bug report and fix thanks to Ville.
548 in binary mode. Bug report and fix thanks to Ville.
543
549
544 * IPython/iplib.py (handle_auto): Fix bug which I introduced when
550 * IPython/iplib.py (handle_auto): Fix bug which I introduced when
545 trying to catch spurious foo[1] autocalls. My fix actually broke
551 trying to catch spurious foo[1] autocalls. My fix actually broke
546 ',/' autoquote/call with explicit escape (bad regexp).
552 ',/' autoquote/call with explicit escape (bad regexp).
547
553
548 2005-02-15 *** Released version 0.6.11
554 2005-02-15 *** Released version 0.6.11
549
555
550 2005-02-14 Fernando Perez <fperez@colorado.edu>
556 2005-02-14 Fernando Perez <fperez@colorado.edu>
551
557
552 * IPython/background_jobs.py: New background job management
558 * IPython/background_jobs.py: New background job management
553 subsystem. This is implemented via a new set of classes, and
559 subsystem. This is implemented via a new set of classes, and
554 IPython now provides a builtin 'jobs' object for background job
560 IPython now provides a builtin 'jobs' object for background job
555 execution. A convenience %bg magic serves as a lightweight
561 execution. A convenience %bg magic serves as a lightweight
556 frontend for starting the more common type of calls. This was
562 frontend for starting the more common type of calls. This was
557 inspired by discussions with B. Granger and the BackgroundCommand
563 inspired by discussions with B. Granger and the BackgroundCommand
558 class described in the book Python Scripting for Computational
564 class described in the book Python Scripting for Computational
559 Science, by H. P. Langtangen: http://folk.uio.no/hpl/scripting
565 Science, by H. P. Langtangen: http://folk.uio.no/hpl/scripting
560 (although ultimately no code from this text was used, as IPython's
566 (although ultimately no code from this text was used, as IPython's
561 system is a separate implementation).
567 system is a separate implementation).
562
568
563 * IPython/iplib.py (MagicCompleter.python_matches): add new option
569 * IPython/iplib.py (MagicCompleter.python_matches): add new option
564 to control the completion of single/double underscore names
570 to control the completion of single/double underscore names
565 separately. As documented in the example ipytonrc file, the
571 separately. As documented in the example ipytonrc file, the
566 readline_omit__names variable can now be set to 2, to omit even
572 readline_omit__names variable can now be set to 2, to omit even
567 single underscore names. Thanks to a patch by Brian Wong
573 single underscore names. Thanks to a patch by Brian Wong
568 <BrianWong-AT-AirgoNetworks.Com>.
574 <BrianWong-AT-AirgoNetworks.Com>.
569 (InteractiveShell.__init__): Fix bug which would cause foo[1] to
575 (InteractiveShell.__init__): Fix bug which would cause foo[1] to
570 be autocalled as foo([1]) if foo were callable. A problem for
576 be autocalled as foo([1]) if foo were callable. A problem for
571 things which are both callable and implement __getitem__.
577 things which are both callable and implement __getitem__.
572 (init_readline): Fix autoindentation for win32. Thanks to a patch
578 (init_readline): Fix autoindentation for win32. Thanks to a patch
573 by Vivian De Smedt <vivian-AT-vdesmedt.com>.
579 by Vivian De Smedt <vivian-AT-vdesmedt.com>.
574
580
575 2005-02-12 Fernando Perez <fperez@colorado.edu>
581 2005-02-12 Fernando Perez <fperez@colorado.edu>
576
582
577 * IPython/ipmaker.py (make_IPython): Disabled the stout traps
583 * IPython/ipmaker.py (make_IPython): Disabled the stout traps
578 which I had written long ago to sort out user error messages which
584 which I had written long ago to sort out user error messages which
579 may occur during startup. This seemed like a good idea initially,
585 may occur during startup. This seemed like a good idea initially,
580 but it has proven a disaster in retrospect. I don't want to
586 but it has proven a disaster in retrospect. I don't want to
581 change much code for now, so my fix is to set the internal 'debug'
587 change much code for now, so my fix is to set the internal 'debug'
582 flag to true everywhere, whose only job was precisely to control
588 flag to true everywhere, whose only job was precisely to control
583 this subsystem. This closes issue 28 (as well as avoiding all
589 this subsystem. This closes issue 28 (as well as avoiding all
584 sorts of strange hangups which occur from time to time).
590 sorts of strange hangups which occur from time to time).
585
591
586 2005-02-07 Fernando Perez <fperez@colorado.edu>
592 2005-02-07 Fernando Perez <fperez@colorado.edu>
587
593
588 * IPython/Magic.py (magic_edit): Fix 'ed -p' not working when the
594 * IPython/Magic.py (magic_edit): Fix 'ed -p' not working when the
589 previous call produced a syntax error.
595 previous call produced a syntax error.
590
596
591 * IPython/OInspect.py (Inspector.pinfo): Fix crash when inspecting
597 * IPython/OInspect.py (Inspector.pinfo): Fix crash when inspecting
592 classes without constructor.
598 classes without constructor.
593
599
594 2005-02-06 Fernando Perez <fperez@colorado.edu>
600 2005-02-06 Fernando Perez <fperez@colorado.edu>
595
601
596 * IPython/iplib.py (MagicCompleter.complete): Extend the list of
602 * IPython/iplib.py (MagicCompleter.complete): Extend the list of
597 completions with the results of each matcher, so we return results
603 completions with the results of each matcher, so we return results
598 to the user from all namespaces. This breaks with ipython
604 to the user from all namespaces. This breaks with ipython
599 tradition, but I think it's a nicer behavior. Now you get all
605 tradition, but I think it's a nicer behavior. Now you get all
600 possible completions listed, from all possible namespaces (python,
606 possible completions listed, from all possible namespaces (python,
601 filesystem, magics...) After a request by John Hunter
607 filesystem, magics...) After a request by John Hunter
602 <jdhunter-AT-nitace.bsd.uchicago.edu>.
608 <jdhunter-AT-nitace.bsd.uchicago.edu>.
603
609
604 2005-02-05 Fernando Perez <fperez@colorado.edu>
610 2005-02-05 Fernando Perez <fperez@colorado.edu>
605
611
606 * IPython/Magic.py (magic_prun): Fix bug where prun would fail if
612 * IPython/Magic.py (magic_prun): Fix bug where prun would fail if
607 the call had quote characters in it (the quotes were stripped).
613 the call had quote characters in it (the quotes were stripped).
608
614
609 2005-01-31 Fernando Perez <fperez@colorado.edu>
615 2005-01-31 Fernando Perez <fperez@colorado.edu>
610
616
611 * IPython/iplib.py (InteractiveShell.__init__): reduce reliance on
617 * IPython/iplib.py (InteractiveShell.__init__): reduce reliance on
612 Itpl.itpl() to make the code more robust against psyco
618 Itpl.itpl() to make the code more robust against psyco
613 optimizations.
619 optimizations.
614
620
615 * IPython/Itpl.py (Itpl.__str__): Use a _getframe() call instead
621 * IPython/Itpl.py (Itpl.__str__): Use a _getframe() call instead
616 of causing an exception. Quicker, cleaner.
622 of causing an exception. Quicker, cleaner.
617
623
618 2005-01-28 Fernando Perez <fperez@colorado.edu>
624 2005-01-28 Fernando Perez <fperez@colorado.edu>
619
625
620 * scripts/ipython_win_post_install.py (install): hardcode
626 * scripts/ipython_win_post_install.py (install): hardcode
621 sys.prefix+'python.exe' as the executable path. It turns out that
627 sys.prefix+'python.exe' as the executable path. It turns out that
622 during the post-installation run, sys.executable resolves to the
628 during the post-installation run, sys.executable resolves to the
623 name of the binary installer! I should report this as a distutils
629 name of the binary installer! I should report this as a distutils
624 bug, I think. I updated the .10 release with this tiny fix, to
630 bug, I think. I updated the .10 release with this tiny fix, to
625 avoid annoying the lists further.
631 avoid annoying the lists further.
626
632
627 2005-01-27 *** Released version 0.6.10
633 2005-01-27 *** Released version 0.6.10
628
634
629 2005-01-27 Fernando Perez <fperez@colorado.edu>
635 2005-01-27 Fernando Perez <fperez@colorado.edu>
630
636
631 * IPython/numutils.py (norm): Added 'inf' as optional name for
637 * IPython/numutils.py (norm): Added 'inf' as optional name for
632 L-infinity norm, included references to mathworld.com for vector
638 L-infinity norm, included references to mathworld.com for vector
633 norm definitions.
639 norm definitions.
634 (amin/amax): added amin/amax for array min/max. Similar to what
640 (amin/amax): added amin/amax for array min/max. Similar to what
635 pylab ships with after the recent reorganization of names.
641 pylab ships with after the recent reorganization of names.
636 (spike/spike_odd): removed deprecated spike/spike_odd functions.
642 (spike/spike_odd): removed deprecated spike/spike_odd functions.
637
643
638 * ipython.el: committed Alex's recent fixes and improvements.
644 * ipython.el: committed Alex's recent fixes and improvements.
639 Tested with python-mode from CVS, and it looks excellent. Since
645 Tested with python-mode from CVS, and it looks excellent. Since
640 python-mode hasn't released anything in a while, I'm temporarily
646 python-mode hasn't released anything in a while, I'm temporarily
641 putting a copy of today's CVS (v 4.70) of python-mode in:
647 putting a copy of today's CVS (v 4.70) of python-mode in:
642 http://ipython.scipy.org/tmp/python-mode.el
648 http://ipython.scipy.org/tmp/python-mode.el
643
649
644 * scripts/ipython_win_post_install.py (install): Win32 fix to use
650 * scripts/ipython_win_post_install.py (install): Win32 fix to use
645 sys.executable for the executable name, instead of assuming it's
651 sys.executable for the executable name, instead of assuming it's
646 called 'python.exe' (the post-installer would have produced broken
652 called 'python.exe' (the post-installer would have produced broken
647 setups on systems with a differently named python binary).
653 setups on systems with a differently named python binary).
648
654
649 * IPython/PyColorize.py (Parser.__call__): change explicit '\n'
655 * IPython/PyColorize.py (Parser.__call__): change explicit '\n'
650 references to os.linesep, to make the code more
656 references to os.linesep, to make the code more
651 platform-independent. This is also part of the win32 coloring
657 platform-independent. This is also part of the win32 coloring
652 fixes.
658 fixes.
653
659
654 * IPython/genutils.py (page_dumb): Remove attempts to chop long
660 * IPython/genutils.py (page_dumb): Remove attempts to chop long
655 lines, which actually cause coloring bugs because the length of
661 lines, which actually cause coloring bugs because the length of
656 the line is very difficult to correctly compute with embedded
662 the line is very difficult to correctly compute with embedded
657 escapes. This was the source of all the coloring problems under
663 escapes. This was the source of all the coloring problems under
658 Win32. I think that _finally_, Win32 users have a properly
664 Win32. I think that _finally_, Win32 users have a properly
659 working ipython in all respects. This would never have happened
665 working ipython in all respects. This would never have happened
660 if not for Gary Bishop and Viktor Ransmayr's great help and work.
666 if not for Gary Bishop and Viktor Ransmayr's great help and work.
661
667
662 2005-01-26 *** Released version 0.6.9
668 2005-01-26 *** Released version 0.6.9
663
669
664 2005-01-25 Fernando Perez <fperez@colorado.edu>
670 2005-01-25 Fernando Perez <fperez@colorado.edu>
665
671
666 * setup.py: finally, we have a true Windows installer, thanks to
672 * setup.py: finally, we have a true Windows installer, thanks to
667 the excellent work of Viktor Ransmayr
673 the excellent work of Viktor Ransmayr
668 <viktor.ransmayr-AT-t-online.de>. The docs have been updated for
674 <viktor.ransmayr-AT-t-online.de>. The docs have been updated for
669 Windows users. The setup routine is quite a bit cleaner thanks to
675 Windows users. The setup routine is quite a bit cleaner thanks to
670 this, and the post-install script uses the proper functions to
676 this, and the post-install script uses the proper functions to
671 allow a clean de-installation using the standard Windows Control
677 allow a clean de-installation using the standard Windows Control
672 Panel.
678 Panel.
673
679
674 * IPython/genutils.py (get_home_dir): changed to use the $HOME
680 * IPython/genutils.py (get_home_dir): changed to use the $HOME
675 environment variable under all OSes (including win32) if
681 environment variable under all OSes (including win32) if
676 available. This will give consistency to win32 users who have set
682 available. This will give consistency to win32 users who have set
677 this variable for any reason. If os.environ['HOME'] fails, the
683 this variable for any reason. If os.environ['HOME'] fails, the
678 previous policy of using HOMEDRIVE\HOMEPATH kicks in.
684 previous policy of using HOMEDRIVE\HOMEPATH kicks in.
679
685
680 2005-01-24 Fernando Perez <fperez@colorado.edu>
686 2005-01-24 Fernando Perez <fperez@colorado.edu>
681
687
682 * IPython/numutils.py (empty_like): add empty_like(), similar to
688 * IPython/numutils.py (empty_like): add empty_like(), similar to
683 zeros_like() but taking advantage of the new empty() Numeric routine.
689 zeros_like() but taking advantage of the new empty() Numeric routine.
684
690
685 2005-01-23 *** Released version 0.6.8
691 2005-01-23 *** Released version 0.6.8
686
692
687 2005-01-22 Fernando Perez <fperez@colorado.edu>
693 2005-01-22 Fernando Perez <fperez@colorado.edu>
688
694
689 * IPython/Shell.py (MatplotlibShellBase.mplot_exec): I removed the
695 * IPython/Shell.py (MatplotlibShellBase.mplot_exec): I removed the
690 automatic show() calls. After discussing things with JDH, it
696 automatic show() calls. After discussing things with JDH, it
691 turns out there are too many corner cases where this can go wrong.
697 turns out there are too many corner cases where this can go wrong.
692 It's best not to try to be 'too smart', and simply have ipython
698 It's best not to try to be 'too smart', and simply have ipython
693 reproduce as much as possible the default behavior of a normal
699 reproduce as much as possible the default behavior of a normal
694 python shell.
700 python shell.
695
701
696 * IPython/iplib.py (InteractiveShell.__init__): Modified the
702 * IPython/iplib.py (InteractiveShell.__init__): Modified the
697 line-splitting regexp and _prefilter() to avoid calling getattr()
703 line-splitting regexp and _prefilter() to avoid calling getattr()
698 on assignments. This closes
704 on assignments. This closes
699 http://www.scipy.net/roundup/ipython/issue24. Note that Python's
705 http://www.scipy.net/roundup/ipython/issue24. Note that Python's
700 readline uses getattr(), so a simple <TAB> keypress is still
706 readline uses getattr(), so a simple <TAB> keypress is still
701 enough to trigger getattr() calls on an object.
707 enough to trigger getattr() calls on an object.
702
708
703 2005-01-21 Fernando Perez <fperez@colorado.edu>
709 2005-01-21 Fernando Perez <fperez@colorado.edu>
704
710
705 * IPython/Shell.py (MatplotlibShellBase.magic_run): Fix the %run
711 * IPython/Shell.py (MatplotlibShellBase.magic_run): Fix the %run
706 docstring under pylab so it doesn't mask the original.
712 docstring under pylab so it doesn't mask the original.
707
713
708 2005-01-21 *** Released version 0.6.7
714 2005-01-21 *** Released version 0.6.7
709
715
710 2005-01-21 Fernando Perez <fperez@colorado.edu>
716 2005-01-21 Fernando Perez <fperez@colorado.edu>
711
717
712 * IPython/Shell.py (MTInteractiveShell.runcode): Trap a crash with
718 * IPython/Shell.py (MTInteractiveShell.runcode): Trap a crash with
713 signal handling for win32 users in multithreaded mode.
719 signal handling for win32 users in multithreaded mode.
714
720
715 2005-01-17 Fernando Perez <fperez@colorado.edu>
721 2005-01-17 Fernando Perez <fperez@colorado.edu>
716
722
717 * IPython/OInspect.py (Inspector.pinfo): Fix crash when inspecting
723 * IPython/OInspect.py (Inspector.pinfo): Fix crash when inspecting
718 instances with no __init__. After a crash report by Norbert Nemec
724 instances with no __init__. After a crash report by Norbert Nemec
719 <Norbert-AT-nemec-online.de>.
725 <Norbert-AT-nemec-online.de>.
720
726
721 2005-01-14 Fernando Perez <fperez@colorado.edu>
727 2005-01-14 Fernando Perez <fperez@colorado.edu>
722
728
723 * IPython/ultraTB.py (VerboseTB.text): Fix bug in reporting of
729 * IPython/ultraTB.py (VerboseTB.text): Fix bug in reporting of
724 names for verbose exceptions, when multiple dotted names and the
730 names for verbose exceptions, when multiple dotted names and the
725 'parent' object were present on the same line.
731 'parent' object were present on the same line.
726
732
727 2005-01-11 Fernando Perez <fperez@colorado.edu>
733 2005-01-11 Fernando Perez <fperez@colorado.edu>
728
734
729 * IPython/genutils.py (flag_calls): new utility to trap and flag
735 * IPython/genutils.py (flag_calls): new utility to trap and flag
730 calls in functions. I need it to clean up matplotlib support.
736 calls in functions. I need it to clean up matplotlib support.
731 Also removed some deprecated code in genutils.
737 Also removed some deprecated code in genutils.
732
738
733 * IPython/Shell.py (MatplotlibShellBase.mplot_exec): small fix so
739 * IPython/Shell.py (MatplotlibShellBase.mplot_exec): small fix so
734 that matplotlib scripts called with %run, which don't call show()
740 that matplotlib scripts called with %run, which don't call show()
735 themselves, still have their plotting windows open.
741 themselves, still have their plotting windows open.
736
742
737 2005-01-05 Fernando Perez <fperez@colorado.edu>
743 2005-01-05 Fernando Perez <fperez@colorado.edu>
738
744
739 * IPython/Shell.py (IPShellGTK.__init__): Patch by Andrew Straw
745 * IPython/Shell.py (IPShellGTK.__init__): Patch by Andrew Straw
740 <astraw-AT-caltech.edu>, to fix gtk deprecation warnings.
746 <astraw-AT-caltech.edu>, to fix gtk deprecation warnings.
741
747
742 2004-12-19 Fernando Perez <fperez@colorado.edu>
748 2004-12-19 Fernando Perez <fperez@colorado.edu>
743
749
744 * IPython/Shell.py (MTInteractiveShell.runcode): Get rid of
750 * IPython/Shell.py (MTInteractiveShell.runcode): Get rid of
745 parent_runcode, which was an eyesore. The same result can be
751 parent_runcode, which was an eyesore. The same result can be
746 obtained with Python's regular superclass mechanisms.
752 obtained with Python's regular superclass mechanisms.
747
753
748 2004-12-17 Fernando Perez <fperez@colorado.edu>
754 2004-12-17 Fernando Perez <fperez@colorado.edu>
749
755
750 * IPython/Magic.py (Magic.magic_sc): Fix quote stripping problem
756 * IPython/Magic.py (Magic.magic_sc): Fix quote stripping problem
751 reported by Prabhu.
757 reported by Prabhu.
752 (Magic.magic_sx): direct all errors to Term.cerr (defaults to
758 (Magic.magic_sx): direct all errors to Term.cerr (defaults to
753 sys.stderr) instead of explicitly calling sys.stderr. This helps
759 sys.stderr) instead of explicitly calling sys.stderr. This helps
754 maintain our I/O abstractions clean, for future GUI embeddings.
760 maintain our I/O abstractions clean, for future GUI embeddings.
755
761
756 * IPython/genutils.py (info): added new utility for sys.stderr
762 * IPython/genutils.py (info): added new utility for sys.stderr
757 unified info message handling (thin wrapper around warn()).
763 unified info message handling (thin wrapper around warn()).
758
764
759 * IPython/ultraTB.py (VerboseTB.text): Fix misreported global
765 * IPython/ultraTB.py (VerboseTB.text): Fix misreported global
760 composite (dotted) names on verbose exceptions.
766 composite (dotted) names on verbose exceptions.
761 (VerboseTB.nullrepr): harden against another kind of errors which
767 (VerboseTB.nullrepr): harden against another kind of errors which
762 Python's inspect module can trigger, and which were crashing
768 Python's inspect module can trigger, and which were crashing
763 IPython. Thanks to a report by Marco Lombardi
769 IPython. Thanks to a report by Marco Lombardi
764 <mlombard-AT-ma010192.hq.eso.org>.
770 <mlombard-AT-ma010192.hq.eso.org>.
765
771
766 2004-12-13 *** Released version 0.6.6
772 2004-12-13 *** Released version 0.6.6
767
773
768 2004-12-12 Fernando Perez <fperez@colorado.edu>
774 2004-12-12 Fernando Perez <fperez@colorado.edu>
769
775
770 * IPython/Shell.py (IPShellGTK.mainloop): catch RuntimeErrors
776 * IPython/Shell.py (IPShellGTK.mainloop): catch RuntimeErrors
771 generated by pygtk upon initialization if it was built without
777 generated by pygtk upon initialization if it was built without
772 threads (for matplotlib users). After a crash reported by
778 threads (for matplotlib users). After a crash reported by
773 Leguijt, Jaap J SIEP-EPT-RES <Jaap.Leguijt-AT-shell.com>.
779 Leguijt, Jaap J SIEP-EPT-RES <Jaap.Leguijt-AT-shell.com>.
774
780
775 * IPython/ipmaker.py (make_IPython): fix small bug in the
781 * IPython/ipmaker.py (make_IPython): fix small bug in the
776 import_some parameter for multiple imports.
782 import_some parameter for multiple imports.
777
783
778 * IPython/iplib.py (ipmagic): simplified the interface of
784 * IPython/iplib.py (ipmagic): simplified the interface of
779 ipmagic() to take a single string argument, just as it would be
785 ipmagic() to take a single string argument, just as it would be
780 typed at the IPython cmd line.
786 typed at the IPython cmd line.
781 (ipalias): Added new ipalias() with an interface identical to
787 (ipalias): Added new ipalias() with an interface identical to
782 ipmagic(). This completes exposing a pure python interface to the
788 ipmagic(). This completes exposing a pure python interface to the
783 alias and magic system, which can be used in loops or more complex
789 alias and magic system, which can be used in loops or more complex
784 code where IPython's automatic line mangling is not active.
790 code where IPython's automatic line mangling is not active.
785
791
786 * IPython/genutils.py (timing): changed interface of timing to
792 * IPython/genutils.py (timing): changed interface of timing to
787 simply run code once, which is the most common case. timings()
793 simply run code once, which is the most common case. timings()
788 remains unchanged, for the cases where you want multiple runs.
794 remains unchanged, for the cases where you want multiple runs.
789
795
790 * IPython/Shell.py (MatplotlibShellBase._matplotlib_config): Fix a
796 * IPython/Shell.py (MatplotlibShellBase._matplotlib_config): Fix a
791 bug where Python2.2 crashes with exec'ing code which does not end
797 bug where Python2.2 crashes with exec'ing code which does not end
792 in a single newline. Python 2.3 is OK, so I hadn't noticed this
798 in a single newline. Python 2.3 is OK, so I hadn't noticed this
793 before.
799 before.
794
800
795 2004-12-10 Fernando Perez <fperez@colorado.edu>
801 2004-12-10 Fernando Perez <fperez@colorado.edu>
796
802
797 * IPython/Magic.py (Magic.magic_prun): changed name of option from
803 * IPython/Magic.py (Magic.magic_prun): changed name of option from
798 -t to -T, to accomodate the new -t flag in %run (the %run and
804 -t to -T, to accomodate the new -t flag in %run (the %run and
799 %prun options are kind of intermixed, and it's not easy to change
805 %prun options are kind of intermixed, and it's not easy to change
800 this with the limitations of python's getopt).
806 this with the limitations of python's getopt).
801
807
802 * IPython/Magic.py (Magic.magic_run): Added new -t option to time
808 * IPython/Magic.py (Magic.magic_run): Added new -t option to time
803 the execution of scripts. It's not as fine-tuned as timeit.py,
809 the execution of scripts. It's not as fine-tuned as timeit.py,
804 but it works from inside ipython (and under 2.2, which lacks
810 but it works from inside ipython (and under 2.2, which lacks
805 timeit.py). Optionally a number of runs > 1 can be given for
811 timeit.py). Optionally a number of runs > 1 can be given for
806 timing very short-running code.
812 timing very short-running code.
807
813
808 * IPython/genutils.py (uniq_stable): new routine which returns a
814 * IPython/genutils.py (uniq_stable): new routine which returns a
809 list of unique elements in any iterable, but in stable order of
815 list of unique elements in any iterable, but in stable order of
810 appearance. I needed this for the ultraTB fixes, and it's a handy
816 appearance. I needed this for the ultraTB fixes, and it's a handy
811 utility.
817 utility.
812
818
813 * IPython/ultraTB.py (VerboseTB.text): Fix proper reporting of
819 * IPython/ultraTB.py (VerboseTB.text): Fix proper reporting of
814 dotted names in Verbose exceptions. This had been broken since
820 dotted names in Verbose exceptions. This had been broken since
815 the very start, now x.y will properly be printed in a Verbose
821 the very start, now x.y will properly be printed in a Verbose
816 traceback, instead of x being shown and y appearing always as an
822 traceback, instead of x being shown and y appearing always as an
817 'undefined global'. Getting this to work was a bit tricky,
823 'undefined global'. Getting this to work was a bit tricky,
818 because by default python tokenizers are stateless. Saved by
824 because by default python tokenizers are stateless. Saved by
819 python's ability to easily add a bit of state to an arbitrary
825 python's ability to easily add a bit of state to an arbitrary
820 function (without needing to build a full-blown callable object).
826 function (without needing to build a full-blown callable object).
821
827
822 Also big cleanup of this code, which had horrendous runtime
828 Also big cleanup of this code, which had horrendous runtime
823 lookups of zillions of attributes for colorization. Moved all
829 lookups of zillions of attributes for colorization. Moved all
824 this code into a few templates, which make it cleaner and quicker.
830 this code into a few templates, which make it cleaner and quicker.
825
831
826 Printout quality was also improved for Verbose exceptions: one
832 Printout quality was also improved for Verbose exceptions: one
827 variable per line, and memory addresses are printed (this can be
833 variable per line, and memory addresses are printed (this can be
828 quite handy in nasty debugging situations, which is what Verbose
834 quite handy in nasty debugging situations, which is what Verbose
829 is for).
835 is for).
830
836
831 * IPython/ipmaker.py (make_IPython): Do NOT execute files named in
837 * IPython/ipmaker.py (make_IPython): Do NOT execute files named in
832 the command line as scripts to be loaded by embedded instances.
838 the command line as scripts to be loaded by embedded instances.
833 Doing so has the potential for an infinite recursion if there are
839 Doing so has the potential for an infinite recursion if there are
834 exceptions thrown in the process. This fixes a strange crash
840 exceptions thrown in the process. This fixes a strange crash
835 reported by Philippe MULLER <muller-AT-irit.fr>.
841 reported by Philippe MULLER <muller-AT-irit.fr>.
836
842
837 2004-12-09 Fernando Perez <fperez@colorado.edu>
843 2004-12-09 Fernando Perez <fperez@colorado.edu>
838
844
839 * IPython/Shell.py (MatplotlibShellBase.use): Change pylab support
845 * IPython/Shell.py (MatplotlibShellBase.use): Change pylab support
840 to reflect new names in matplotlib, which now expose the
846 to reflect new names in matplotlib, which now expose the
841 matlab-compatible interface via a pylab module instead of the
847 matlab-compatible interface via a pylab module instead of the
842 'matlab' name. The new code is backwards compatible, so users of
848 'matlab' name. The new code is backwards compatible, so users of
843 all matplotlib versions are OK. Patch by J. Hunter.
849 all matplotlib versions are OK. Patch by J. Hunter.
844
850
845 * IPython/OInspect.py (Inspector.pinfo): Add to object? printing
851 * IPython/OInspect.py (Inspector.pinfo): Add to object? printing
846 of __init__ docstrings for instances (class docstrings are already
852 of __init__ docstrings for instances (class docstrings are already
847 automatically printed). Instances with customized docstrings
853 automatically printed). Instances with customized docstrings
848 (indep. of the class) are also recognized and all 3 separate
854 (indep. of the class) are also recognized and all 3 separate
849 docstrings are printed (instance, class, constructor). After some
855 docstrings are printed (instance, class, constructor). After some
850 comments/suggestions by J. Hunter.
856 comments/suggestions by J. Hunter.
851
857
852 2004-12-05 Fernando Perez <fperez@colorado.edu>
858 2004-12-05 Fernando Perez <fperez@colorado.edu>
853
859
854 * IPython/iplib.py (MagicCompleter.complete): Remove annoying
860 * IPython/iplib.py (MagicCompleter.complete): Remove annoying
855 warnings when tab-completion fails and triggers an exception.
861 warnings when tab-completion fails and triggers an exception.
856
862
857 2004-12-03 Fernando Perez <fperez@colorado.edu>
863 2004-12-03 Fernando Perez <fperez@colorado.edu>
858
864
859 * IPython/Magic.py (magic_prun): Fix bug where an exception would
865 * IPython/Magic.py (magic_prun): Fix bug where an exception would
860 be triggered when using 'run -p'. An incorrect option flag was
866 be triggered when using 'run -p'. An incorrect option flag was
861 being set ('d' instead of 'D').
867 being set ('d' instead of 'D').
862 (manpage): fix missing escaped \- sign.
868 (manpage): fix missing escaped \- sign.
863
869
864 2004-11-30 *** Released version 0.6.5
870 2004-11-30 *** Released version 0.6.5
865
871
866 2004-11-30 Fernando Perez <fperez@colorado.edu>
872 2004-11-30 Fernando Perez <fperez@colorado.edu>
867
873
868 * IPython/Magic.py (Magic.magic_run): Fix bug in breakpoint
874 * IPython/Magic.py (Magic.magic_run): Fix bug in breakpoint
869 setting with -d option.
875 setting with -d option.
870
876
871 * setup.py (docfiles): Fix problem where the doc glob I was using
877 * setup.py (docfiles): Fix problem where the doc glob I was using
872 was COMPLETELY BROKEN. It was giving the right files by pure
878 was COMPLETELY BROKEN. It was giving the right files by pure
873 accident, but failed once I tried to include ipython.el. Note:
879 accident, but failed once I tried to include ipython.el. Note:
874 glob() does NOT allow you to do exclusion on multiple endings!
880 glob() does NOT allow you to do exclusion on multiple endings!
875
881
876 2004-11-29 Fernando Perez <fperez@colorado.edu>
882 2004-11-29 Fernando Perez <fperez@colorado.edu>
877
883
878 * IPython/usage.py (__doc__): cleaned up usage docstring, by using
884 * IPython/usage.py (__doc__): cleaned up usage docstring, by using
879 the manpage as the source. Better formatting & consistency.
885 the manpage as the source. Better formatting & consistency.
880
886
881 * IPython/Magic.py (magic_run): Added new -d option, to run
887 * IPython/Magic.py (magic_run): Added new -d option, to run
882 scripts under the control of the python pdb debugger. Note that
888 scripts under the control of the python pdb debugger. Note that
883 this required changing the %prun option -d to -D, to avoid a clash
889 this required changing the %prun option -d to -D, to avoid a clash
884 (since %run must pass options to %prun, and getopt is too dumb to
890 (since %run must pass options to %prun, and getopt is too dumb to
885 handle options with string values with embedded spaces). Thanks
891 handle options with string values with embedded spaces). Thanks
886 to a suggestion by Matthew Arnison <maffew-AT-cat.org.au>.
892 to a suggestion by Matthew Arnison <maffew-AT-cat.org.au>.
887 (magic_who_ls): added type matching to %who and %whos, so that one
893 (magic_who_ls): added type matching to %who and %whos, so that one
888 can filter their output to only include variables of certain
894 can filter their output to only include variables of certain
889 types. Another suggestion by Matthew.
895 types. Another suggestion by Matthew.
890 (magic_whos): Added memory summaries in kb and Mb for arrays.
896 (magic_whos): Added memory summaries in kb and Mb for arrays.
891 (magic_who): Improve formatting (break lines every 9 vars).
897 (magic_who): Improve formatting (break lines every 9 vars).
892
898
893 2004-11-28 Fernando Perez <fperez@colorado.edu>
899 2004-11-28 Fernando Perez <fperez@colorado.edu>
894
900
895 * IPython/Logger.py (Logger.log): Fix bug in syncing the input
901 * IPython/Logger.py (Logger.log): Fix bug in syncing the input
896 cache when empty lines were present.
902 cache when empty lines were present.
897
903
898 2004-11-24 Fernando Perez <fperez@colorado.edu>
904 2004-11-24 Fernando Perez <fperez@colorado.edu>
899
905
900 * IPython/usage.py (__doc__): document the re-activated threading
906 * IPython/usage.py (__doc__): document the re-activated threading
901 options for WX and GTK.
907 options for WX and GTK.
902
908
903 2004-11-23 Fernando Perez <fperez@colorado.edu>
909 2004-11-23 Fernando Perez <fperez@colorado.edu>
904
910
905 * IPython/Shell.py (start): Added Prabhu's big patch to reactivate
911 * IPython/Shell.py (start): Added Prabhu's big patch to reactivate
906 the -wthread and -gthread options, along with a new -tk one to try
912 the -wthread and -gthread options, along with a new -tk one to try
907 and coordinate Tk threading with wx/gtk. The tk support is very
913 and coordinate Tk threading with wx/gtk. The tk support is very
908 platform dependent, since it seems to require Tcl and Tk to be
914 platform dependent, since it seems to require Tcl and Tk to be
909 built with threads (Fedora1/2 appears NOT to have it, but in
915 built with threads (Fedora1/2 appears NOT to have it, but in
910 Prabhu's Debian boxes it works OK). But even with some Tk
916 Prabhu's Debian boxes it works OK). But even with some Tk
911 limitations, this is a great improvement.
917 limitations, this is a great improvement.
912
918
913 * IPython/Prompts.py (prompt_specials_color): Added \t for time
919 * IPython/Prompts.py (prompt_specials_color): Added \t for time
914 info in user prompts. Patch by Prabhu.
920 info in user prompts. Patch by Prabhu.
915
921
916 2004-11-18 Fernando Perez <fperez@colorado.edu>
922 2004-11-18 Fernando Perez <fperez@colorado.edu>
917
923
918 * IPython/genutils.py (ask_yes_no): Add check for a max of 20
924 * IPython/genutils.py (ask_yes_no): Add check for a max of 20
919 EOFErrors and bail, to avoid infinite loops if a non-terminating
925 EOFErrors and bail, to avoid infinite loops if a non-terminating
920 file is fed into ipython. Patch submitted in issue 19 by user,
926 file is fed into ipython. Patch submitted in issue 19 by user,
921 many thanks.
927 many thanks.
922
928
923 * IPython/iplib.py (InteractiveShell.handle_auto): do NOT trigger
929 * IPython/iplib.py (InteractiveShell.handle_auto): do NOT trigger
924 autoquote/parens in continuation prompts, which can cause lots of
930 autoquote/parens in continuation prompts, which can cause lots of
925 problems. Closes roundup issue 20.
931 problems. Closes roundup issue 20.
926
932
927 2004-11-17 Fernando Perez <fperez@colorado.edu>
933 2004-11-17 Fernando Perez <fperez@colorado.edu>
928
934
929 * debian/control (Build-Depends-Indep): Fix dpatch dependency,
935 * debian/control (Build-Depends-Indep): Fix dpatch dependency,
930 reported as debian bug #280505. I'm not sure my local changelog
936 reported as debian bug #280505. I'm not sure my local changelog
931 entry has the proper debian format (Jack?).
937 entry has the proper debian format (Jack?).
932
938
933 2004-11-08 *** Released version 0.6.4
939 2004-11-08 *** Released version 0.6.4
934
940
935 2004-11-08 Fernando Perez <fperez@colorado.edu>
941 2004-11-08 Fernando Perez <fperez@colorado.edu>
936
942
937 * IPython/iplib.py (init_readline): Fix exit message for Windows
943 * IPython/iplib.py (init_readline): Fix exit message for Windows
938 when readline is active. Thanks to a report by Eric Jones
944 when readline is active. Thanks to a report by Eric Jones
939 <eric-AT-enthought.com>.
945 <eric-AT-enthought.com>.
940
946
941 2004-11-07 Fernando Perez <fperez@colorado.edu>
947 2004-11-07 Fernando Perez <fperez@colorado.edu>
942
948
943 * IPython/genutils.py (page): Add a trap for OSError exceptions,
949 * IPython/genutils.py (page): Add a trap for OSError exceptions,
944 sometimes seen by win2k/cygwin users.
950 sometimes seen by win2k/cygwin users.
945
951
946 2004-11-06 Fernando Perez <fperez@colorado.edu>
952 2004-11-06 Fernando Perez <fperez@colorado.edu>
947
953
948 * IPython/iplib.py (interact): Change the handling of %Exit from
954 * IPython/iplib.py (interact): Change the handling of %Exit from
949 trying to propagate a SystemExit to an internal ipython flag.
955 trying to propagate a SystemExit to an internal ipython flag.
950 This is less elegant than using Python's exception mechanism, but
956 This is less elegant than using Python's exception mechanism, but
951 I can't get that to work reliably with threads, so under -pylab
957 I can't get that to work reliably with threads, so under -pylab
952 %Exit was hanging IPython. Cross-thread exception handling is
958 %Exit was hanging IPython. Cross-thread exception handling is
953 really a bitch. Thaks to a bug report by Stephen Walton
959 really a bitch. Thaks to a bug report by Stephen Walton
954 <stephen.walton-AT-csun.edu>.
960 <stephen.walton-AT-csun.edu>.
955
961
956 2004-11-04 Fernando Perez <fperez@colorado.edu>
962 2004-11-04 Fernando Perez <fperez@colorado.edu>
957
963
958 * IPython/iplib.py (raw_input_original): store a pointer to the
964 * IPython/iplib.py (raw_input_original): store a pointer to the
959 true raw_input to harden against code which can modify it
965 true raw_input to harden against code which can modify it
960 (wx.py.PyShell does this and would otherwise crash ipython).
966 (wx.py.PyShell does this and would otherwise crash ipython).
961 Thanks to a bug report by Jim Flowers <james.flowers-AT-lgx.com>.
967 Thanks to a bug report by Jim Flowers <james.flowers-AT-lgx.com>.
962
968
963 * IPython/Shell.py (MTInteractiveShell.runsource): Cleaner fix for
969 * IPython/Shell.py (MTInteractiveShell.runsource): Cleaner fix for
964 Ctrl-C problem, which does not mess up the input line.
970 Ctrl-C problem, which does not mess up the input line.
965
971
966 2004-11-03 Fernando Perez <fperez@colorado.edu>
972 2004-11-03 Fernando Perez <fperez@colorado.edu>
967
973
968 * IPython/Release.py: Changed licensing to BSD, in all files.
974 * IPython/Release.py: Changed licensing to BSD, in all files.
969 (name): lowercase name for tarball/RPM release.
975 (name): lowercase name for tarball/RPM release.
970
976
971 * IPython/OInspect.py (getdoc): wrap inspect.getdoc() safely for
977 * IPython/OInspect.py (getdoc): wrap inspect.getdoc() safely for
972 use throughout ipython.
978 use throughout ipython.
973
979
974 * IPython/Magic.py (Magic._ofind): Switch to using the new
980 * IPython/Magic.py (Magic._ofind): Switch to using the new
975 OInspect.getdoc() function.
981 OInspect.getdoc() function.
976
982
977 * IPython/Shell.py (sigint_handler): Hack to ignore the execution
983 * IPython/Shell.py (sigint_handler): Hack to ignore the execution
978 of the line currently being canceled via Ctrl-C. It's extremely
984 of the line currently being canceled via Ctrl-C. It's extremely
979 ugly, but I don't know how to do it better (the problem is one of
985 ugly, but I don't know how to do it better (the problem is one of
980 handling cross-thread exceptions).
986 handling cross-thread exceptions).
981
987
982 2004-10-28 Fernando Perez <fperez@colorado.edu>
988 2004-10-28 Fernando Perez <fperez@colorado.edu>
983
989
984 * IPython/Shell.py (signal_handler): add signal handlers to trap
990 * IPython/Shell.py (signal_handler): add signal handlers to trap
985 SIGINT and SIGSEGV in threaded code properly. Thanks to a bug
991 SIGINT and SIGSEGV in threaded code properly. Thanks to a bug
986 report by Francesc Alted.
992 report by Francesc Alted.
987
993
988 2004-10-21 Fernando Perez <fperez@colorado.edu>
994 2004-10-21 Fernando Perez <fperez@colorado.edu>
989
995
990 * IPython/Extensions/InterpreterExec.py (prefilter_shell): Fix @
996 * IPython/Extensions/InterpreterExec.py (prefilter_shell): Fix @
991 to % for pysh syntax extensions.
997 to % for pysh syntax extensions.
992
998
993 2004-10-09 Fernando Perez <fperez@colorado.edu>
999 2004-10-09 Fernando Perez <fperez@colorado.edu>
994
1000
995 * IPython/Magic.py (Magic.magic_whos): modify output of Numeric
1001 * IPython/Magic.py (Magic.magic_whos): modify output of Numeric
996 arrays to print a more useful summary, without calling str(arr).
1002 arrays to print a more useful summary, without calling str(arr).
997 This avoids the problem of extremely lengthy computations which
1003 This avoids the problem of extremely lengthy computations which
998 occur if arr is large, and appear to the user as a system lockup
1004 occur if arr is large, and appear to the user as a system lockup
999 with 100% cpu activity. After a suggestion by Kristian Sandberg
1005 with 100% cpu activity. After a suggestion by Kristian Sandberg
1000 <Kristian.Sandberg@colorado.edu>.
1006 <Kristian.Sandberg@colorado.edu>.
1001 (Magic.__init__): fix bug in global magic escapes not being
1007 (Magic.__init__): fix bug in global magic escapes not being
1002 correctly set.
1008 correctly set.
1003
1009
1004 2004-10-08 Fernando Perez <fperez@colorado.edu>
1010 2004-10-08 Fernando Perez <fperez@colorado.edu>
1005
1011
1006 * IPython/Magic.py (__license__): change to absolute imports of
1012 * IPython/Magic.py (__license__): change to absolute imports of
1007 ipython's own internal packages, to start adapting to the absolute
1013 ipython's own internal packages, to start adapting to the absolute
1008 import requirement of PEP-328.
1014 import requirement of PEP-328.
1009
1015
1010 * IPython/genutils.py (__author__): Fix coding to utf-8 on all
1016 * IPython/genutils.py (__author__): Fix coding to utf-8 on all
1011 files, and standardize author/license marks through the Release
1017 files, and standardize author/license marks through the Release
1012 module instead of having per/file stuff (except for files with
1018 module instead of having per/file stuff (except for files with
1013 particular licenses, like the MIT/PSF-licensed codes).
1019 particular licenses, like the MIT/PSF-licensed codes).
1014
1020
1015 * IPython/Debugger.py: remove dead code for python 2.1
1021 * IPython/Debugger.py: remove dead code for python 2.1
1016
1022
1017 2004-10-04 Fernando Perez <fperez@colorado.edu>
1023 2004-10-04 Fernando Perez <fperez@colorado.edu>
1018
1024
1019 * IPython/iplib.py (ipmagic): New function for accessing magics
1025 * IPython/iplib.py (ipmagic): New function for accessing magics
1020 via a normal python function call.
1026 via a normal python function call.
1021
1027
1022 * IPython/Magic.py (Magic.magic_magic): Change the magic escape
1028 * IPython/Magic.py (Magic.magic_magic): Change the magic escape
1023 from '@' to '%', to accomodate the new @decorator syntax of python
1029 from '@' to '%', to accomodate the new @decorator syntax of python
1024 2.4.
1030 2.4.
1025
1031
1026 2004-09-29 Fernando Perez <fperez@colorado.edu>
1032 2004-09-29 Fernando Perez <fperez@colorado.edu>
1027
1033
1028 * IPython/Shell.py (MatplotlibShellBase.use): Added a wrapper to
1034 * IPython/Shell.py (MatplotlibShellBase.use): Added a wrapper to
1029 matplotlib.use to prevent running scripts which try to switch
1035 matplotlib.use to prevent running scripts which try to switch
1030 interactive backends from within ipython. This will just crash
1036 interactive backends from within ipython. This will just crash
1031 the python interpreter, so we can't allow it (but a detailed error
1037 the python interpreter, so we can't allow it (but a detailed error
1032 is given to the user).
1038 is given to the user).
1033
1039
1034 2004-09-28 Fernando Perez <fperez@colorado.edu>
1040 2004-09-28 Fernando Perez <fperez@colorado.edu>
1035
1041
1036 * IPython/Shell.py (MatplotlibShellBase.mplot_exec):
1042 * IPython/Shell.py (MatplotlibShellBase.mplot_exec):
1037 matplotlib-related fixes so that using @run with non-matplotlib
1043 matplotlib-related fixes so that using @run with non-matplotlib
1038 scripts doesn't pop up spurious plot windows. This requires
1044 scripts doesn't pop up spurious plot windows. This requires
1039 matplotlib >= 0.63, where I had to make some changes as well.
1045 matplotlib >= 0.63, where I had to make some changes as well.
1040
1046
1041 * IPython/ipmaker.py (make_IPython): update version requirement to
1047 * IPython/ipmaker.py (make_IPython): update version requirement to
1042 python 2.2.
1048 python 2.2.
1043
1049
1044 * IPython/iplib.py (InteractiveShell.mainloop): Add an optional
1050 * IPython/iplib.py (InteractiveShell.mainloop): Add an optional
1045 banner arg for embedded customization.
1051 banner arg for embedded customization.
1046
1052
1047 * IPython/Magic.py (Magic.__init__): big cleanup to remove all
1053 * IPython/Magic.py (Magic.__init__): big cleanup to remove all
1048 explicit uses of __IP as the IPython's instance name. Now things
1054 explicit uses of __IP as the IPython's instance name. Now things
1049 are properly handled via the shell.name value. The actual code
1055 are properly handled via the shell.name value. The actual code
1050 is a bit ugly b/c I'm doing it via a global in Magic.py, but this
1056 is a bit ugly b/c I'm doing it via a global in Magic.py, but this
1051 is much better than before. I'll clean things completely when the
1057 is much better than before. I'll clean things completely when the
1052 magic stuff gets a real overhaul.
1058 magic stuff gets a real overhaul.
1053
1059
1054 * ipython.1: small fixes, sent in by Jack Moffit. He also sent in
1060 * ipython.1: small fixes, sent in by Jack Moffit. He also sent in
1055 minor changes to debian dir.
1061 minor changes to debian dir.
1056
1062
1057 * IPython/iplib.py (InteractiveShell.__init__): Fix adding a
1063 * IPython/iplib.py (InteractiveShell.__init__): Fix adding a
1058 pointer to the shell itself in the interactive namespace even when
1064 pointer to the shell itself in the interactive namespace even when
1059 a user-supplied dict is provided. This is needed for embedding
1065 a user-supplied dict is provided. This is needed for embedding
1060 purposes (found by tests with Michel Sanner).
1066 purposes (found by tests with Michel Sanner).
1061
1067
1062 2004-09-27 Fernando Perez <fperez@colorado.edu>
1068 2004-09-27 Fernando Perez <fperez@colorado.edu>
1063
1069
1064 * IPython/UserConfig/ipythonrc: remove []{} from
1070 * IPython/UserConfig/ipythonrc: remove []{} from
1065 readline_remove_delims, so that things like [modname.<TAB> do
1071 readline_remove_delims, so that things like [modname.<TAB> do
1066 proper completion. This disables [].TAB, but that's a less common
1072 proper completion. This disables [].TAB, but that's a less common
1067 case than module names in list comprehensions, for example.
1073 case than module names in list comprehensions, for example.
1068 Thanks to a report by Andrea Riciputi.
1074 Thanks to a report by Andrea Riciputi.
1069
1075
1070 2004-09-09 Fernando Perez <fperez@colorado.edu>
1076 2004-09-09 Fernando Perez <fperez@colorado.edu>
1071
1077
1072 * IPython/Shell.py (IPShellGTK.mainloop): reorder to avoid
1078 * IPython/Shell.py (IPShellGTK.mainloop): reorder to avoid
1073 blocking problems in win32 and osx. Fix by John.
1079 blocking problems in win32 and osx. Fix by John.
1074
1080
1075 2004-09-08 Fernando Perez <fperez@colorado.edu>
1081 2004-09-08 Fernando Perez <fperez@colorado.edu>
1076
1082
1077 * IPython/Shell.py (IPShellWX.OnInit): Fix output redirection bug
1083 * IPython/Shell.py (IPShellWX.OnInit): Fix output redirection bug
1078 for Win32 and OSX. Fix by John Hunter.
1084 for Win32 and OSX. Fix by John Hunter.
1079
1085
1080 2004-08-30 *** Released version 0.6.3
1086 2004-08-30 *** Released version 0.6.3
1081
1087
1082 2004-08-30 Fernando Perez <fperez@colorado.edu>
1088 2004-08-30 Fernando Perez <fperez@colorado.edu>
1083
1089
1084 * setup.py (isfile): Add manpages to list of dependent files to be
1090 * setup.py (isfile): Add manpages to list of dependent files to be
1085 updated.
1091 updated.
1086
1092
1087 2004-08-27 Fernando Perez <fperez@colorado.edu>
1093 2004-08-27 Fernando Perez <fperez@colorado.edu>
1088
1094
1089 * IPython/Shell.py (start): I've disabled -wthread and -gthread
1095 * IPython/Shell.py (start): I've disabled -wthread and -gthread
1090 for now. They don't really work with standalone WX/GTK code
1096 for now. They don't really work with standalone WX/GTK code
1091 (though matplotlib IS working fine with both of those backends).
1097 (though matplotlib IS working fine with both of those backends).
1092 This will neeed much more testing. I disabled most things with
1098 This will neeed much more testing. I disabled most things with
1093 comments, so turning it back on later should be pretty easy.
1099 comments, so turning it back on later should be pretty easy.
1094
1100
1095 * IPython/iplib.py (InteractiveShell.__init__): Fix accidental
1101 * IPython/iplib.py (InteractiveShell.__init__): Fix accidental
1096 autocalling of expressions like r'foo', by modifying the line
1102 autocalling of expressions like r'foo', by modifying the line
1097 split regexp. Closes
1103 split regexp. Closes
1098 http://www.scipy.net/roundup/ipython/issue18, reported by Nicholas
1104 http://www.scipy.net/roundup/ipython/issue18, reported by Nicholas
1099 Riley <ipythonbugs-AT-sabi.net>.
1105 Riley <ipythonbugs-AT-sabi.net>.
1100 (InteractiveShell.mainloop): honor --nobanner with banner
1106 (InteractiveShell.mainloop): honor --nobanner with banner
1101 extensions.
1107 extensions.
1102
1108
1103 * IPython/Shell.py: Significant refactoring of all classes, so
1109 * IPython/Shell.py: Significant refactoring of all classes, so
1104 that we can really support ALL matplotlib backends and threading
1110 that we can really support ALL matplotlib backends and threading
1105 models (John spotted a bug with Tk which required this). Now we
1111 models (John spotted a bug with Tk which required this). Now we
1106 should support single-threaded, WX-threads and GTK-threads, both
1112 should support single-threaded, WX-threads and GTK-threads, both
1107 for generic code and for matplotlib.
1113 for generic code and for matplotlib.
1108
1114
1109 * IPython/ipmaker.py (__call__): Changed -mpthread option to
1115 * IPython/ipmaker.py (__call__): Changed -mpthread option to
1110 -pylab, to simplify things for users. Will also remove the pylab
1116 -pylab, to simplify things for users. Will also remove the pylab
1111 profile, since now all of matplotlib configuration is directly
1117 profile, since now all of matplotlib configuration is directly
1112 handled here. This also reduces startup time.
1118 handled here. This also reduces startup time.
1113
1119
1114 * IPython/Shell.py (IPShellGTK.run): Fixed bug where mainloop() of
1120 * IPython/Shell.py (IPShellGTK.run): Fixed bug where mainloop() of
1115 shell wasn't being correctly called. Also in IPShellWX.
1121 shell wasn't being correctly called. Also in IPShellWX.
1116
1122
1117 * IPython/iplib.py (InteractiveShell.__init__): Added option to
1123 * IPython/iplib.py (InteractiveShell.__init__): Added option to
1118 fine-tune banner.
1124 fine-tune banner.
1119
1125
1120 * IPython/numutils.py (spike): Deprecate these spike functions,
1126 * IPython/numutils.py (spike): Deprecate these spike functions,
1121 delete (long deprecated) gnuplot_exec handler.
1127 delete (long deprecated) gnuplot_exec handler.
1122
1128
1123 2004-08-26 Fernando Perez <fperez@colorado.edu>
1129 2004-08-26 Fernando Perez <fperez@colorado.edu>
1124
1130
1125 * ipython.1: Update for threading options, plus some others which
1131 * ipython.1: Update for threading options, plus some others which
1126 were missing.
1132 were missing.
1127
1133
1128 * IPython/ipmaker.py (__call__): Added -wthread option for
1134 * IPython/ipmaker.py (__call__): Added -wthread option for
1129 wxpython thread handling. Make sure threading options are only
1135 wxpython thread handling. Make sure threading options are only
1130 valid at the command line.
1136 valid at the command line.
1131
1137
1132 * scripts/ipython: moved shell selection into a factory function
1138 * scripts/ipython: moved shell selection into a factory function
1133 in Shell.py, to keep the starter script to a minimum.
1139 in Shell.py, to keep the starter script to a minimum.
1134
1140
1135 2004-08-25 Fernando Perez <fperez@colorado.edu>
1141 2004-08-25 Fernando Perez <fperez@colorado.edu>
1136
1142
1137 * IPython/Shell.py (IPShellWX.wxexit): fixes to WX threading, by
1143 * IPython/Shell.py (IPShellWX.wxexit): fixes to WX threading, by
1138 John. Along with some recent changes he made to matplotlib, the
1144 John. Along with some recent changes he made to matplotlib, the
1139 next versions of both systems should work very well together.
1145 next versions of both systems should work very well together.
1140
1146
1141 2004-08-24 Fernando Perez <fperez@colorado.edu>
1147 2004-08-24 Fernando Perez <fperez@colorado.edu>
1142
1148
1143 * IPython/Magic.py (Magic.magic_prun): cleanup some dead code. I
1149 * IPython/Magic.py (Magic.magic_prun): cleanup some dead code. I
1144 tried to switch the profiling to using hotshot, but I'm getting
1150 tried to switch the profiling to using hotshot, but I'm getting
1145 strange errors from prof.runctx() there. I may be misreading the
1151 strange errors from prof.runctx() there. I may be misreading the
1146 docs, but it looks weird. For now the profiling code will
1152 docs, but it looks weird. For now the profiling code will
1147 continue to use the standard profiler.
1153 continue to use the standard profiler.
1148
1154
1149 2004-08-23 Fernando Perez <fperez@colorado.edu>
1155 2004-08-23 Fernando Perez <fperez@colorado.edu>
1150
1156
1151 * IPython/Shell.py (IPShellWX.__init__): Improvements to the WX
1157 * IPython/Shell.py (IPShellWX.__init__): Improvements to the WX
1152 threaded shell, by John Hunter. It's not quite ready yet, but
1158 threaded shell, by John Hunter. It's not quite ready yet, but
1153 close.
1159 close.
1154
1160
1155 2004-08-22 Fernando Perez <fperez@colorado.edu>
1161 2004-08-22 Fernando Perez <fperez@colorado.edu>
1156
1162
1157 * IPython/iplib.py (InteractiveShell.interact): tab cleanups, also
1163 * IPython/iplib.py (InteractiveShell.interact): tab cleanups, also
1158 in Magic and ultraTB.
1164 in Magic and ultraTB.
1159
1165
1160 * ipython.1: document threading options in manpage.
1166 * ipython.1: document threading options in manpage.
1161
1167
1162 * scripts/ipython: Changed name of -thread option to -gthread,
1168 * scripts/ipython: Changed name of -thread option to -gthread,
1163 since this is GTK specific. I want to leave the door open for a
1169 since this is GTK specific. I want to leave the door open for a
1164 -wthread option for WX, which will most likely be necessary. This
1170 -wthread option for WX, which will most likely be necessary. This
1165 change affects usage and ipmaker as well.
1171 change affects usage and ipmaker as well.
1166
1172
1167 * IPython/Shell.py (matplotlib_shell): Add a factory function to
1173 * IPython/Shell.py (matplotlib_shell): Add a factory function to
1168 handle the matplotlib shell issues. Code by John Hunter
1174 handle the matplotlib shell issues. Code by John Hunter
1169 <jdhunter-AT-nitace.bsd.uchicago.edu>.
1175 <jdhunter-AT-nitace.bsd.uchicago.edu>.
1170 (IPShellMatplotlibWX.__init__): Rudimentary WX support. It's
1176 (IPShellMatplotlibWX.__init__): Rudimentary WX support. It's
1171 broken (and disabled for end users) for now, but it puts the
1177 broken (and disabled for end users) for now, but it puts the
1172 infrastructure in place.
1178 infrastructure in place.
1173
1179
1174 2004-08-21 Fernando Perez <fperez@colorado.edu>
1180 2004-08-21 Fernando Perez <fperez@colorado.edu>
1175
1181
1176 * ipythonrc-pylab: Add matplotlib support.
1182 * ipythonrc-pylab: Add matplotlib support.
1177
1183
1178 * matplotlib_config.py: new files for matplotlib support, part of
1184 * matplotlib_config.py: new files for matplotlib support, part of
1179 the pylab profile.
1185 the pylab profile.
1180
1186
1181 * IPython/usage.py (__doc__): documented the threading options.
1187 * IPython/usage.py (__doc__): documented the threading options.
1182
1188
1183 2004-08-20 Fernando Perez <fperez@colorado.edu>
1189 2004-08-20 Fernando Perez <fperez@colorado.edu>
1184
1190
1185 * ipython: Modified the main calling routine to handle the -thread
1191 * ipython: Modified the main calling routine to handle the -thread
1186 and -mpthread options. This needs to be done as a top-level hack,
1192 and -mpthread options. This needs to be done as a top-level hack,
1187 because it determines which class to instantiate for IPython
1193 because it determines which class to instantiate for IPython
1188 itself.
1194 itself.
1189
1195
1190 * IPython/Shell.py (MTInteractiveShell.__init__): New set of
1196 * IPython/Shell.py (MTInteractiveShell.__init__): New set of
1191 classes to support multithreaded GTK operation without blocking,
1197 classes to support multithreaded GTK operation without blocking,
1192 and matplotlib with all backends. This is a lot of still very
1198 and matplotlib with all backends. This is a lot of still very
1193 experimental code, and threads are tricky. So it may still have a
1199 experimental code, and threads are tricky. So it may still have a
1194 few rough edges... This code owes a lot to
1200 few rough edges... This code owes a lot to
1195 http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/65109, by
1201 http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/65109, by
1196 Brian # McErlean and John Finlay, to Antoon Pardon for fixes, and
1202 Brian # McErlean and John Finlay, to Antoon Pardon for fixes, and
1197 to John Hunter for all the matplotlib work.
1203 to John Hunter for all the matplotlib work.
1198
1204
1199 * IPython/ipmaker.py (__call__): Added -thread and -mpthread
1205 * IPython/ipmaker.py (__call__): Added -thread and -mpthread
1200 options for gtk thread and matplotlib support.
1206 options for gtk thread and matplotlib support.
1201
1207
1202 2004-08-16 Fernando Perez <fperez@colorado.edu>
1208 2004-08-16 Fernando Perez <fperez@colorado.edu>
1203
1209
1204 * IPython/iplib.py (InteractiveShell.__init__): don't trigger
1210 * IPython/iplib.py (InteractiveShell.__init__): don't trigger
1205 autocall for things like p*q,p/q,p+q,p-q, when p is callable. Bug
1211 autocall for things like p*q,p/q,p+q,p-q, when p is callable. Bug
1206 reported by Stephen Walton <stephen.walton-AT-csun.edu>.
1212 reported by Stephen Walton <stephen.walton-AT-csun.edu>.
1207
1213
1208 2004-08-11 Fernando Perez <fperez@colorado.edu>
1214 2004-08-11 Fernando Perez <fperez@colorado.edu>
1209
1215
1210 * setup.py (isfile): Fix build so documentation gets updated for
1216 * setup.py (isfile): Fix build so documentation gets updated for
1211 rpms (it was only done for .tgz builds).
1217 rpms (it was only done for .tgz builds).
1212
1218
1213 2004-08-10 Fernando Perez <fperez@colorado.edu>
1219 2004-08-10 Fernando Perez <fperez@colorado.edu>
1214
1220
1215 * genutils.py (Term): Fix misspell of stdin stream (sin->cin).
1221 * genutils.py (Term): Fix misspell of stdin stream (sin->cin).
1216
1222
1217 * iplib.py : Silence syntax error exceptions in tab-completion.
1223 * iplib.py : Silence syntax error exceptions in tab-completion.
1218
1224
1219 2004-08-05 Fernando Perez <fperez@colorado.edu>
1225 2004-08-05 Fernando Perez <fperez@colorado.edu>
1220
1226
1221 * IPython/Prompts.py (Prompt2.set_colors): Fix incorrectly set
1227 * IPython/Prompts.py (Prompt2.set_colors): Fix incorrectly set
1222 'color off' mark for continuation prompts. This was causing long
1228 'color off' mark for continuation prompts. This was causing long
1223 continuation lines to mis-wrap.
1229 continuation lines to mis-wrap.
1224
1230
1225 2004-08-01 Fernando Perez <fperez@colorado.edu>
1231 2004-08-01 Fernando Perez <fperez@colorado.edu>
1226
1232
1227 * IPython/ipmaker.py (make_IPython): Allow the shell class used
1233 * IPython/ipmaker.py (make_IPython): Allow the shell class used
1228 for building ipython to be a parameter. All this is necessary
1234 for building ipython to be a parameter. All this is necessary
1229 right now to have a multithreaded version, but this insane
1235 right now to have a multithreaded version, but this insane
1230 non-design will be cleaned up soon. For now, it's a hack that
1236 non-design will be cleaned up soon. For now, it's a hack that
1231 works.
1237 works.
1232
1238
1233 * IPython/Shell.py (IPShell.__init__): Stop using mutable default
1239 * IPython/Shell.py (IPShell.__init__): Stop using mutable default
1234 args in various places. No bugs so far, but it's a dangerous
1240 args in various places. No bugs so far, but it's a dangerous
1235 practice.
1241 practice.
1236
1242
1237 2004-07-31 Fernando Perez <fperez@colorado.edu>
1243 2004-07-31 Fernando Perez <fperez@colorado.edu>
1238
1244
1239 * IPython/iplib.py (complete): ignore SyntaxError exceptions to
1245 * IPython/iplib.py (complete): ignore SyntaxError exceptions to
1240 fix completion of files with dots in their names under most
1246 fix completion of files with dots in their names under most
1241 profiles (pysh was OK because the completion order is different).
1247 profiles (pysh was OK because the completion order is different).
1242
1248
1243 2004-07-27 Fernando Perez <fperez@colorado.edu>
1249 2004-07-27 Fernando Perez <fperez@colorado.edu>
1244
1250
1245 * IPython/iplib.py (InteractiveShell.__init__): build dict of
1251 * IPython/iplib.py (InteractiveShell.__init__): build dict of
1246 keywords manually, b/c the one in keyword.py was removed in python
1252 keywords manually, b/c the one in keyword.py was removed in python
1247 2.4. Patch by Anakim Border <aborder-AT-users.sourceforge.net>.
1253 2.4. Patch by Anakim Border <aborder-AT-users.sourceforge.net>.
1248 This is NOT a bug under python 2.3 and earlier.
1254 This is NOT a bug under python 2.3 and earlier.
1249
1255
1250 2004-07-26 Fernando Perez <fperez@colorado.edu>
1256 2004-07-26 Fernando Perez <fperez@colorado.edu>
1251
1257
1252 * IPython/ultraTB.py (VerboseTB.text): Add another
1258 * IPython/ultraTB.py (VerboseTB.text): Add another
1253 linecache.checkcache() call to try to prevent inspect.py from
1259 linecache.checkcache() call to try to prevent inspect.py from
1254 crashing under python 2.3. I think this fixes
1260 crashing under python 2.3. I think this fixes
1255 http://www.scipy.net/roundup/ipython/issue17.
1261 http://www.scipy.net/roundup/ipython/issue17.
1256
1262
1257 2004-07-26 *** Released version 0.6.2
1263 2004-07-26 *** Released version 0.6.2
1258
1264
1259 2004-07-26 Fernando Perez <fperez@colorado.edu>
1265 2004-07-26 Fernando Perez <fperez@colorado.edu>
1260
1266
1261 * IPython/Magic.py (Magic.magic_cd): Fix bug where 'cd -N' would
1267 * IPython/Magic.py (Magic.magic_cd): Fix bug where 'cd -N' would
1262 fail for any number.
1268 fail for any number.
1263 (Magic.magic_bookmark): Fix bug where 'bookmark -l' would fail for
1269 (Magic.magic_bookmark): Fix bug where 'bookmark -l' would fail for
1264 empty bookmarks.
1270 empty bookmarks.
1265
1271
1266 2004-07-26 *** Released version 0.6.1
1272 2004-07-26 *** Released version 0.6.1
1267
1273
1268 2004-07-26 Fernando Perez <fperez@colorado.edu>
1274 2004-07-26 Fernando Perez <fperez@colorado.edu>
1269
1275
1270 * ipython_win_post_install.py (run): Added pysh shortcut for Windows.
1276 * ipython_win_post_install.py (run): Added pysh shortcut for Windows.
1271
1277
1272 * IPython/iplib.py (protect_filename): Applied Ville's patch for
1278 * IPython/iplib.py (protect_filename): Applied Ville's patch for
1273 escaping '()[]{}' in filenames.
1279 escaping '()[]{}' in filenames.
1274
1280
1275 * IPython/Magic.py (shlex_split): Fix handling of '*' and '?' for
1281 * IPython/Magic.py (shlex_split): Fix handling of '*' and '?' for
1276 Python 2.2 users who lack a proper shlex.split.
1282 Python 2.2 users who lack a proper shlex.split.
1277
1283
1278 2004-07-19 Fernando Perez <fperez@colorado.edu>
1284 2004-07-19 Fernando Perez <fperez@colorado.edu>
1279
1285
1280 * IPython/iplib.py (InteractiveShell.init_readline): Add support
1286 * IPython/iplib.py (InteractiveShell.init_readline): Add support
1281 for reading readline's init file. I follow the normal chain:
1287 for reading readline's init file. I follow the normal chain:
1282 $INPUTRC is honored, otherwise ~/.inputrc is used. Thanks to a
1288 $INPUTRC is honored, otherwise ~/.inputrc is used. Thanks to a
1283 report by Mike Heeter. This closes
1289 report by Mike Heeter. This closes
1284 http://www.scipy.net/roundup/ipython/issue16.
1290 http://www.scipy.net/roundup/ipython/issue16.
1285
1291
1286 2004-07-18 Fernando Perez <fperez@colorado.edu>
1292 2004-07-18 Fernando Perez <fperez@colorado.edu>
1287
1293
1288 * IPython/iplib.py (__init__): Add better handling of '\' under
1294 * IPython/iplib.py (__init__): Add better handling of '\' under
1289 Win32 for filenames. After a patch by Ville.
1295 Win32 for filenames. After a patch by Ville.
1290
1296
1291 2004-07-17 Fernando Perez <fperez@colorado.edu>
1297 2004-07-17 Fernando Perez <fperez@colorado.edu>
1292
1298
1293 * IPython/iplib.py (InteractiveShell._prefilter): fix bug where
1299 * IPython/iplib.py (InteractiveShell._prefilter): fix bug where
1294 autocalling would be triggered for 'foo is bar' if foo is
1300 autocalling would be triggered for 'foo is bar' if foo is
1295 callable. I also cleaned up the autocall detection code to use a
1301 callable. I also cleaned up the autocall detection code to use a
1296 regexp, which is faster. Bug reported by Alexander Schmolck.
1302 regexp, which is faster. Bug reported by Alexander Schmolck.
1297
1303
1298 * IPython/Magic.py (Magic.magic_pinfo): Fix bug where strings with
1304 * IPython/Magic.py (Magic.magic_pinfo): Fix bug where strings with
1299 '?' in them would confuse the help system. Reported by Alex
1305 '?' in them would confuse the help system. Reported by Alex
1300 Schmolck.
1306 Schmolck.
1301
1307
1302 2004-07-16 Fernando Perez <fperez@colorado.edu>
1308 2004-07-16 Fernando Perez <fperez@colorado.edu>
1303
1309
1304 * IPython/GnuplotInteractive.py (__all__): added plot2.
1310 * IPython/GnuplotInteractive.py (__all__): added plot2.
1305
1311
1306 * IPython/Gnuplot2.py (Gnuplot.plot2): added new function for
1312 * IPython/Gnuplot2.py (Gnuplot.plot2): added new function for
1307 plotting dictionaries, lists or tuples of 1d arrays.
1313 plotting dictionaries, lists or tuples of 1d arrays.
1308
1314
1309 * IPython/Magic.py (Magic.magic_hist): small clenaups and
1315 * IPython/Magic.py (Magic.magic_hist): small clenaups and
1310 optimizations.
1316 optimizations.
1311
1317
1312 * IPython/iplib.py:Remove old Changelog info for cleanup. This is
1318 * IPython/iplib.py:Remove old Changelog info for cleanup. This is
1313 the information which was there from Janko's original IPP code:
1319 the information which was there from Janko's original IPP code:
1314
1320
1315 03.05.99 20:53 porto.ifm.uni-kiel.de
1321 03.05.99 20:53 porto.ifm.uni-kiel.de
1316 --Started changelog.
1322 --Started changelog.
1317 --make clear do what it say it does
1323 --make clear do what it say it does
1318 --added pretty output of lines from inputcache
1324 --added pretty output of lines from inputcache
1319 --Made Logger a mixin class, simplifies handling of switches
1325 --Made Logger a mixin class, simplifies handling of switches
1320 --Added own completer class. .string<TAB> expands to last history
1326 --Added own completer class. .string<TAB> expands to last history
1321 line which starts with string. The new expansion is also present
1327 line which starts with string. The new expansion is also present
1322 with Ctrl-r from the readline library. But this shows, who this
1328 with Ctrl-r from the readline library. But this shows, who this
1323 can be done for other cases.
1329 can be done for other cases.
1324 --Added convention that all shell functions should accept a
1330 --Added convention that all shell functions should accept a
1325 parameter_string This opens the door for different behaviour for
1331 parameter_string This opens the door for different behaviour for
1326 each function. @cd is a good example of this.
1332 each function. @cd is a good example of this.
1327
1333
1328 04.05.99 12:12 porto.ifm.uni-kiel.de
1334 04.05.99 12:12 porto.ifm.uni-kiel.de
1329 --added logfile rotation
1335 --added logfile rotation
1330 --added new mainloop method which freezes first the namespace
1336 --added new mainloop method which freezes first the namespace
1331
1337
1332 07.05.99 21:24 porto.ifm.uni-kiel.de
1338 07.05.99 21:24 porto.ifm.uni-kiel.de
1333 --added the docreader classes. Now there is a help system.
1339 --added the docreader classes. Now there is a help system.
1334 -This is only a first try. Currently it's not easy to put new
1340 -This is only a first try. Currently it's not easy to put new
1335 stuff in the indices. But this is the way to go. Info would be
1341 stuff in the indices. But this is the way to go. Info would be
1336 better, but HTML is every where and not everybody has an info
1342 better, but HTML is every where and not everybody has an info
1337 system installed and it's not so easy to change html-docs to info.
1343 system installed and it's not so easy to change html-docs to info.
1338 --added global logfile option
1344 --added global logfile option
1339 --there is now a hook for object inspection method pinfo needs to
1345 --there is now a hook for object inspection method pinfo needs to
1340 be provided for this. Can be reached by two '??'.
1346 be provided for this. Can be reached by two '??'.
1341
1347
1342 08.05.99 20:51 porto.ifm.uni-kiel.de
1348 08.05.99 20:51 porto.ifm.uni-kiel.de
1343 --added a README
1349 --added a README
1344 --bug in rc file. Something has changed so functions in the rc
1350 --bug in rc file. Something has changed so functions in the rc
1345 file need to reference the shell and not self. Not clear if it's a
1351 file need to reference the shell and not self. Not clear if it's a
1346 bug or feature.
1352 bug or feature.
1347 --changed rc file for new behavior
1353 --changed rc file for new behavior
1348
1354
1349 2004-07-15 Fernando Perez <fperez@colorado.edu>
1355 2004-07-15 Fernando Perez <fperez@colorado.edu>
1350
1356
1351 * IPython/Logger.py (Logger.log): fixed recent bug where the input
1357 * IPython/Logger.py (Logger.log): fixed recent bug where the input
1352 cache was falling out of sync in bizarre manners when multi-line
1358 cache was falling out of sync in bizarre manners when multi-line
1353 input was present. Minor optimizations and cleanup.
1359 input was present. Minor optimizations and cleanup.
1354
1360
1355 (Logger): Remove old Changelog info for cleanup. This is the
1361 (Logger): Remove old Changelog info for cleanup. This is the
1356 information which was there from Janko's original code:
1362 information which was there from Janko's original code:
1357
1363
1358 Changes to Logger: - made the default log filename a parameter
1364 Changes to Logger: - made the default log filename a parameter
1359
1365
1360 - put a check for lines beginning with !@? in log(). Needed
1366 - put a check for lines beginning with !@? in log(). Needed
1361 (even if the handlers properly log their lines) for mid-session
1367 (even if the handlers properly log their lines) for mid-session
1362 logging activation to work properly. Without this, lines logged
1368 logging activation to work properly. Without this, lines logged
1363 in mid session, which get read from the cache, would end up
1369 in mid session, which get read from the cache, would end up
1364 'bare' (with !@? in the open) in the log. Now they are caught
1370 'bare' (with !@? in the open) in the log. Now they are caught
1365 and prepended with a #.
1371 and prepended with a #.
1366
1372
1367 * IPython/iplib.py (InteractiveShell.init_readline): added check
1373 * IPython/iplib.py (InteractiveShell.init_readline): added check
1368 in case MagicCompleter fails to be defined, so we don't crash.
1374 in case MagicCompleter fails to be defined, so we don't crash.
1369
1375
1370 2004-07-13 Fernando Perez <fperez@colorado.edu>
1376 2004-07-13 Fernando Perez <fperez@colorado.edu>
1371
1377
1372 * IPython/Gnuplot2.py (Gnuplot.hardcopy): add automatic generation
1378 * IPython/Gnuplot2.py (Gnuplot.hardcopy): add automatic generation
1373 of EPS if the requested filename ends in '.eps'.
1379 of EPS if the requested filename ends in '.eps'.
1374
1380
1375 2004-07-04 Fernando Perez <fperez@colorado.edu>
1381 2004-07-04 Fernando Perez <fperez@colorado.edu>
1376
1382
1377 * IPython/iplib.py (InteractiveShell.handle_shell_escape): Fix
1383 * IPython/iplib.py (InteractiveShell.handle_shell_escape): Fix
1378 escaping of quotes when calling the shell.
1384 escaping of quotes when calling the shell.
1379
1385
1380 2004-07-02 Fernando Perez <fperez@colorado.edu>
1386 2004-07-02 Fernando Perez <fperez@colorado.edu>
1381
1387
1382 * IPython/Prompts.py (CachedOutput.update): Fix problem with
1388 * IPython/Prompts.py (CachedOutput.update): Fix problem with
1383 gettext not working because we were clobbering '_'. Fixes
1389 gettext not working because we were clobbering '_'. Fixes
1384 http://www.scipy.net/roundup/ipython/issue6.
1390 http://www.scipy.net/roundup/ipython/issue6.
1385
1391
1386 2004-07-01 Fernando Perez <fperez@colorado.edu>
1392 2004-07-01 Fernando Perez <fperez@colorado.edu>
1387
1393
1388 * IPython/Magic.py (Magic.magic_cd): integrated bookmark handling
1394 * IPython/Magic.py (Magic.magic_cd): integrated bookmark handling
1389 into @cd. Patch by Ville.
1395 into @cd. Patch by Ville.
1390
1396
1391 * IPython/iplib.py (InteractiveShell.post_config_initialization):
1397 * IPython/iplib.py (InteractiveShell.post_config_initialization):
1392 new function to store things after ipmaker runs. Patch by Ville.
1398 new function to store things after ipmaker runs. Patch by Ville.
1393 Eventually this will go away once ipmaker is removed and the class
1399 Eventually this will go away once ipmaker is removed and the class
1394 gets cleaned up, but for now it's ok. Key functionality here is
1400 gets cleaned up, but for now it's ok. Key functionality here is
1395 the addition of the persistent storage mechanism, a dict for
1401 the addition of the persistent storage mechanism, a dict for
1396 keeping data across sessions (for now just bookmarks, but more can
1402 keeping data across sessions (for now just bookmarks, but more can
1397 be implemented later).
1403 be implemented later).
1398
1404
1399 * IPython/Magic.py (Magic.magic_bookmark): New bookmark system,
1405 * IPython/Magic.py (Magic.magic_bookmark): New bookmark system,
1400 persistent across sections. Patch by Ville, I modified it
1406 persistent across sections. Patch by Ville, I modified it
1401 soemwhat to allow bookmarking arbitrary dirs other than CWD. Also
1407 soemwhat to allow bookmarking arbitrary dirs other than CWD. Also
1402 added a '-l' option to list all bookmarks.
1408 added a '-l' option to list all bookmarks.
1403
1409
1404 * IPython/iplib.py (InteractiveShell.atexit_operations): new
1410 * IPython/iplib.py (InteractiveShell.atexit_operations): new
1405 center for cleanup. Registered with atexit.register(). I moved
1411 center for cleanup. Registered with atexit.register(). I moved
1406 here the old exit_cleanup(). After a patch by Ville.
1412 here the old exit_cleanup(). After a patch by Ville.
1407
1413
1408 * IPython/Magic.py (get_py_filename): added '~' to the accepted
1414 * IPython/Magic.py (get_py_filename): added '~' to the accepted
1409 characters in the hacked shlex_split for python 2.2.
1415 characters in the hacked shlex_split for python 2.2.
1410
1416
1411 * IPython/iplib.py (file_matches): more fixes to filenames with
1417 * IPython/iplib.py (file_matches): more fixes to filenames with
1412 whitespace in them. It's not perfect, but limitations in python's
1418 whitespace in them. It's not perfect, but limitations in python's
1413 readline make it impossible to go further.
1419 readline make it impossible to go further.
1414
1420
1415 2004-06-29 Fernando Perez <fperez@colorado.edu>
1421 2004-06-29 Fernando Perez <fperez@colorado.edu>
1416
1422
1417 * IPython/iplib.py (file_matches): escape whitespace correctly in
1423 * IPython/iplib.py (file_matches): escape whitespace correctly in
1418 filename completions. Bug reported by Ville.
1424 filename completions. Bug reported by Ville.
1419
1425
1420 2004-06-28 Fernando Perez <fperez@colorado.edu>
1426 2004-06-28 Fernando Perez <fperez@colorado.edu>
1421
1427
1422 * IPython/ipmaker.py (__call__): Added per-profile histories. Now
1428 * IPython/ipmaker.py (__call__): Added per-profile histories. Now
1423 the history file will be called 'history-PROFNAME' (or just
1429 the history file will be called 'history-PROFNAME' (or just
1424 'history' if no profile is loaded). I was getting annoyed at
1430 'history' if no profile is loaded). I was getting annoyed at
1425 getting my Numerical work history clobbered by pysh sessions.
1431 getting my Numerical work history clobbered by pysh sessions.
1426
1432
1427 * IPython/iplib.py (InteractiveShell.__init__): Internal
1433 * IPython/iplib.py (InteractiveShell.__init__): Internal
1428 getoutputerror() function so that we can honor the system_verbose
1434 getoutputerror() function so that we can honor the system_verbose
1429 flag for _all_ system calls. I also added escaping of #
1435 flag for _all_ system calls. I also added escaping of #
1430 characters here to avoid confusing Itpl.
1436 characters here to avoid confusing Itpl.
1431
1437
1432 * IPython/Magic.py (shlex_split): removed call to shell in
1438 * IPython/Magic.py (shlex_split): removed call to shell in
1433 parse_options and replaced it with shlex.split(). The annoying
1439 parse_options and replaced it with shlex.split(). The annoying
1434 part was that in Python 2.2, shlex.split() doesn't exist, so I had
1440 part was that in Python 2.2, shlex.split() doesn't exist, so I had
1435 to backport it from 2.3, with several frail hacks (the shlex
1441 to backport it from 2.3, with several frail hacks (the shlex
1436 module is rather limited in 2.2). Thanks to a suggestion by Ville
1442 module is rather limited in 2.2). Thanks to a suggestion by Ville
1437 Vainio <vivainio@kolumbus.fi>. For Python 2.3 there should be no
1443 Vainio <vivainio@kolumbus.fi>. For Python 2.3 there should be no
1438 problem.
1444 problem.
1439
1445
1440 (Magic.magic_system_verbose): new toggle to print the actual
1446 (Magic.magic_system_verbose): new toggle to print the actual
1441 system calls made by ipython. Mainly for debugging purposes.
1447 system calls made by ipython. Mainly for debugging purposes.
1442
1448
1443 * IPython/GnuplotRuntime.py (gnu_out): fix bug for cygwin, which
1449 * IPython/GnuplotRuntime.py (gnu_out): fix bug for cygwin, which
1444 doesn't support persistence. Reported (and fix suggested) by
1450 doesn't support persistence. Reported (and fix suggested) by
1445 Travis Caldwell <travis_caldwell2000@yahoo.com>.
1451 Travis Caldwell <travis_caldwell2000@yahoo.com>.
1446
1452
1447 2004-06-26 Fernando Perez <fperez@colorado.edu>
1453 2004-06-26 Fernando Perez <fperez@colorado.edu>
1448
1454
1449 * IPython/Logger.py (Logger.log): fix to handle correctly empty
1455 * IPython/Logger.py (Logger.log): fix to handle correctly empty
1450 continue prompts.
1456 continue prompts.
1451
1457
1452 * IPython/Extensions/InterpreterExec.py (pysh): moved the pysh()
1458 * IPython/Extensions/InterpreterExec.py (pysh): moved the pysh()
1453 function (basically a big docstring) and a few more things here to
1459 function (basically a big docstring) and a few more things here to
1454 speedup startup. pysh.py is now very lightweight. We want because
1460 speedup startup. pysh.py is now very lightweight. We want because
1455 it gets execfile'd, while InterpreterExec gets imported, so
1461 it gets execfile'd, while InterpreterExec gets imported, so
1456 byte-compilation saves time.
1462 byte-compilation saves time.
1457
1463
1458 2004-06-25 Fernando Perez <fperez@colorado.edu>
1464 2004-06-25 Fernando Perez <fperez@colorado.edu>
1459
1465
1460 * IPython/Magic.py (Magic.magic_cd): Fixed to restore usage of 'cd
1466 * IPython/Magic.py (Magic.magic_cd): Fixed to restore usage of 'cd
1461 -NUM', which was recently broken.
1467 -NUM', which was recently broken.
1462
1468
1463 * IPython/iplib.py (InteractiveShell.handle_shell_escape): allow !
1469 * IPython/iplib.py (InteractiveShell.handle_shell_escape): allow !
1464 in multi-line input (but not !!, which doesn't make sense there).
1470 in multi-line input (but not !!, which doesn't make sense there).
1465
1471
1466 * IPython/UserConfig/ipythonrc: made autoindent on by default.
1472 * IPython/UserConfig/ipythonrc: made autoindent on by default.
1467 It's just too useful, and people can turn it off in the less
1473 It's just too useful, and people can turn it off in the less
1468 common cases where it's a problem.
1474 common cases where it's a problem.
1469
1475
1470 2004-06-24 Fernando Perez <fperez@colorado.edu>
1476 2004-06-24 Fernando Perez <fperez@colorado.edu>
1471
1477
1472 * IPython/iplib.py (InteractiveShell._prefilter): big change -
1478 * IPython/iplib.py (InteractiveShell._prefilter): big change -
1473 special syntaxes (like alias calling) is now allied in multi-line
1479 special syntaxes (like alias calling) is now allied in multi-line
1474 input. This is still _very_ experimental, but it's necessary for
1480 input. This is still _very_ experimental, but it's necessary for
1475 efficient shell usage combining python looping syntax with system
1481 efficient shell usage combining python looping syntax with system
1476 calls. For now it's restricted to aliases, I don't think it
1482 calls. For now it's restricted to aliases, I don't think it
1477 really even makes sense to have this for magics.
1483 really even makes sense to have this for magics.
1478
1484
1479 2004-06-23 Fernando Perez <fperez@colorado.edu>
1485 2004-06-23 Fernando Perez <fperez@colorado.edu>
1480
1486
1481 * IPython/Extensions/InterpreterExec.py (prefilter_shell): Added
1487 * IPython/Extensions/InterpreterExec.py (prefilter_shell): Added
1482 $var=cmd <=> @sc var=cmd and $$var=cmd <=> @sc -l var=cmd.
1488 $var=cmd <=> @sc var=cmd and $$var=cmd <=> @sc -l var=cmd.
1483
1489
1484 * IPython/Magic.py (Magic.magic_rehashx): modified to handle
1490 * IPython/Magic.py (Magic.magic_rehashx): modified to handle
1485 extensions under Windows (after code sent by Gary Bishop). The
1491 extensions under Windows (after code sent by Gary Bishop). The
1486 extensions considered 'executable' are stored in IPython's rc
1492 extensions considered 'executable' are stored in IPython's rc
1487 structure as win_exec_ext.
1493 structure as win_exec_ext.
1488
1494
1489 * IPython/genutils.py (shell): new function, like system() but
1495 * IPython/genutils.py (shell): new function, like system() but
1490 without return value. Very useful for interactive shell work.
1496 without return value. Very useful for interactive shell work.
1491
1497
1492 * IPython/Magic.py (Magic.magic_unalias): New @unalias function to
1498 * IPython/Magic.py (Magic.magic_unalias): New @unalias function to
1493 delete aliases.
1499 delete aliases.
1494
1500
1495 * IPython/iplib.py (InteractiveShell.alias_table_update): make
1501 * IPython/iplib.py (InteractiveShell.alias_table_update): make
1496 sure that the alias table doesn't contain python keywords.
1502 sure that the alias table doesn't contain python keywords.
1497
1503
1498 2004-06-21 Fernando Perez <fperez@colorado.edu>
1504 2004-06-21 Fernando Perez <fperez@colorado.edu>
1499
1505
1500 * IPython/Magic.py (Magic.magic_rehash): Fix crash when
1506 * IPython/Magic.py (Magic.magic_rehash): Fix crash when
1501 non-existent items are found in $PATH. Reported by Thorsten.
1507 non-existent items are found in $PATH. Reported by Thorsten.
1502
1508
1503 2004-06-20 Fernando Perez <fperez@colorado.edu>
1509 2004-06-20 Fernando Perez <fperez@colorado.edu>
1504
1510
1505 * IPython/iplib.py (complete): modified the completer so that the
1511 * IPython/iplib.py (complete): modified the completer so that the
1506 order of priorities can be easily changed at runtime.
1512 order of priorities can be easily changed at runtime.
1507
1513
1508 * IPython/Extensions/InterpreterExec.py (prefilter_shell):
1514 * IPython/Extensions/InterpreterExec.py (prefilter_shell):
1509 Modified to auto-execute all lines beginning with '~', '/' or '.'.
1515 Modified to auto-execute all lines beginning with '~', '/' or '.'.
1510
1516
1511 * IPython/Magic.py (Magic.magic_sx): modified @sc and @sx to
1517 * IPython/Magic.py (Magic.magic_sx): modified @sc and @sx to
1512 expand Python variables prepended with $ in all system calls. The
1518 expand Python variables prepended with $ in all system calls. The
1513 same was done to InteractiveShell.handle_shell_escape. Now all
1519 same was done to InteractiveShell.handle_shell_escape. Now all
1514 system access mechanisms (!, !!, @sc, @sx and aliases) allow the
1520 system access mechanisms (!, !!, @sc, @sx and aliases) allow the
1515 expansion of python variables and expressions according to the
1521 expansion of python variables and expressions according to the
1516 syntax of PEP-215 - http://www.python.org/peps/pep-0215.html.
1522 syntax of PEP-215 - http://www.python.org/peps/pep-0215.html.
1517
1523
1518 Though PEP-215 has been rejected, a similar (but simpler) one
1524 Though PEP-215 has been rejected, a similar (but simpler) one
1519 seems like it will go into Python 2.4, PEP-292 -
1525 seems like it will go into Python 2.4, PEP-292 -
1520 http://www.python.org/peps/pep-0292.html.
1526 http://www.python.org/peps/pep-0292.html.
1521
1527
1522 I'll keep the full syntax of PEP-215, since IPython has since the
1528 I'll keep the full syntax of PEP-215, since IPython has since the
1523 start used Ka-Ping Yee's reference implementation discussed there
1529 start used Ka-Ping Yee's reference implementation discussed there
1524 (Itpl), and I actually like the powerful semantics it offers.
1530 (Itpl), and I actually like the powerful semantics it offers.
1525
1531
1526 In order to access normal shell variables, the $ has to be escaped
1532 In order to access normal shell variables, the $ has to be escaped
1527 via an extra $. For example:
1533 via an extra $. For example:
1528
1534
1529 In [7]: PATH='a python variable'
1535 In [7]: PATH='a python variable'
1530
1536
1531 In [8]: !echo $PATH
1537 In [8]: !echo $PATH
1532 a python variable
1538 a python variable
1533
1539
1534 In [9]: !echo $$PATH
1540 In [9]: !echo $$PATH
1535 /usr/local/lf9560/bin:/usr/local/intel/compiler70/ia32/bin:...
1541 /usr/local/lf9560/bin:/usr/local/intel/compiler70/ia32/bin:...
1536
1542
1537 (Magic.parse_options): escape $ so the shell doesn't evaluate
1543 (Magic.parse_options): escape $ so the shell doesn't evaluate
1538 things prematurely.
1544 things prematurely.
1539
1545
1540 * IPython/iplib.py (InteractiveShell.call_alias): added the
1546 * IPython/iplib.py (InteractiveShell.call_alias): added the
1541 ability for aliases to expand python variables via $.
1547 ability for aliases to expand python variables via $.
1542
1548
1543 * IPython/Magic.py (Magic.magic_rehash): based on the new alias
1549 * IPython/Magic.py (Magic.magic_rehash): based on the new alias
1544 system, now there's a @rehash/@rehashx pair of magics. These work
1550 system, now there's a @rehash/@rehashx pair of magics. These work
1545 like the csh rehash command, and can be invoked at any time. They
1551 like the csh rehash command, and can be invoked at any time. They
1546 build a table of aliases to everything in the user's $PATH
1552 build a table of aliases to everything in the user's $PATH
1547 (@rehash uses everything, @rehashx is slower but only adds
1553 (@rehash uses everything, @rehashx is slower but only adds
1548 executable files). With this, the pysh.py-based shell profile can
1554 executable files). With this, the pysh.py-based shell profile can
1549 now simply call rehash upon startup, and full access to all
1555 now simply call rehash upon startup, and full access to all
1550 programs in the user's path is obtained.
1556 programs in the user's path is obtained.
1551
1557
1552 * IPython/iplib.py (InteractiveShell.call_alias): The new alias
1558 * IPython/iplib.py (InteractiveShell.call_alias): The new alias
1553 functionality is now fully in place. I removed the old dynamic
1559 functionality is now fully in place. I removed the old dynamic
1554 code generation based approach, in favor of a much lighter one
1560 code generation based approach, in favor of a much lighter one
1555 based on a simple dict. The advantage is that this allows me to
1561 based on a simple dict. The advantage is that this allows me to
1556 now have thousands of aliases with negligible cost (unthinkable
1562 now have thousands of aliases with negligible cost (unthinkable
1557 with the old system).
1563 with the old system).
1558
1564
1559 2004-06-19 Fernando Perez <fperez@colorado.edu>
1565 2004-06-19 Fernando Perez <fperez@colorado.edu>
1560
1566
1561 * IPython/iplib.py (__init__): extended MagicCompleter class to
1567 * IPython/iplib.py (__init__): extended MagicCompleter class to
1562 also complete (last in priority) on user aliases.
1568 also complete (last in priority) on user aliases.
1563
1569
1564 * IPython/Itpl.py (Itpl.__str__): fixed order of globals/locals in
1570 * IPython/Itpl.py (Itpl.__str__): fixed order of globals/locals in
1565 call to eval.
1571 call to eval.
1566 (ItplNS.__init__): Added a new class which functions like Itpl,
1572 (ItplNS.__init__): Added a new class which functions like Itpl,
1567 but allows configuring the namespace for the evaluation to occur
1573 but allows configuring the namespace for the evaluation to occur
1568 in.
1574 in.
1569
1575
1570 2004-06-18 Fernando Perez <fperez@colorado.edu>
1576 2004-06-18 Fernando Perez <fperez@colorado.edu>
1571
1577
1572 * IPython/iplib.py (InteractiveShell.runcode): modify to print a
1578 * IPython/iplib.py (InteractiveShell.runcode): modify to print a
1573 better message when 'exit' or 'quit' are typed (a common newbie
1579 better message when 'exit' or 'quit' are typed (a common newbie
1574 confusion).
1580 confusion).
1575
1581
1576 * IPython/Magic.py (Magic.magic_colors): Added the runtime color
1582 * IPython/Magic.py (Magic.magic_colors): Added the runtime color
1577 check for Windows users.
1583 check for Windows users.
1578
1584
1579 * IPython/iplib.py (InteractiveShell.user_setup): removed
1585 * IPython/iplib.py (InteractiveShell.user_setup): removed
1580 disabling of colors for Windows. I'll test at runtime and issue a
1586 disabling of colors for Windows. I'll test at runtime and issue a
1581 warning if Gary's readline isn't found, as to nudge users to
1587 warning if Gary's readline isn't found, as to nudge users to
1582 download it.
1588 download it.
1583
1589
1584 2004-06-16 Fernando Perez <fperez@colorado.edu>
1590 2004-06-16 Fernando Perez <fperez@colorado.edu>
1585
1591
1586 * IPython/genutils.py (Stream.__init__): changed to print errors
1592 * IPython/genutils.py (Stream.__init__): changed to print errors
1587 to sys.stderr. I had a circular dependency here. Now it's
1593 to sys.stderr. I had a circular dependency here. Now it's
1588 possible to run ipython as IDLE's shell (consider this pre-alpha,
1594 possible to run ipython as IDLE's shell (consider this pre-alpha,
1589 since true stdout things end up in the starting terminal instead
1595 since true stdout things end up in the starting terminal instead
1590 of IDLE's out).
1596 of IDLE's out).
1591
1597
1592 * IPython/Prompts.py (Prompt2.set_colors): prevent crashes for
1598 * IPython/Prompts.py (Prompt2.set_colors): prevent crashes for
1593 users who haven't # updated their prompt_in2 definitions. Remove
1599 users who haven't # updated their prompt_in2 definitions. Remove
1594 eventually.
1600 eventually.
1595 (multiple_replace): added credit to original ASPN recipe.
1601 (multiple_replace): added credit to original ASPN recipe.
1596
1602
1597 2004-06-15 Fernando Perez <fperez@colorado.edu>
1603 2004-06-15 Fernando Perez <fperez@colorado.edu>
1598
1604
1599 * IPython/iplib.py (InteractiveShell.__init__): add 'cp' to the
1605 * IPython/iplib.py (InteractiveShell.__init__): add 'cp' to the
1600 list of auto-defined aliases.
1606 list of auto-defined aliases.
1601
1607
1602 2004-06-13 Fernando Perez <fperez@colorado.edu>
1608 2004-06-13 Fernando Perez <fperez@colorado.edu>
1603
1609
1604 * setup.py (scriptfiles): Don't trigger win_post_install unless an
1610 * setup.py (scriptfiles): Don't trigger win_post_install unless an
1605 install was really requested (so setup.py can be used for other
1611 install was really requested (so setup.py can be used for other
1606 things under Windows).
1612 things under Windows).
1607
1613
1608 2004-06-10 Fernando Perez <fperez@colorado.edu>
1614 2004-06-10 Fernando Perez <fperez@colorado.edu>
1609
1615
1610 * IPython/Logger.py (Logger.create_log): Manually remove any old
1616 * IPython/Logger.py (Logger.create_log): Manually remove any old
1611 backup, since os.remove may fail under Windows. Fixes bug
1617 backup, since os.remove may fail under Windows. Fixes bug
1612 reported by Thorsten.
1618 reported by Thorsten.
1613
1619
1614 2004-06-09 Fernando Perez <fperez@colorado.edu>
1620 2004-06-09 Fernando Perez <fperez@colorado.edu>
1615
1621
1616 * examples/example-embed.py: fixed all references to %n (replaced
1622 * examples/example-embed.py: fixed all references to %n (replaced
1617 with \\# for ps1/out prompts and with \\D for ps2 prompts). Done
1623 with \\# for ps1/out prompts and with \\D for ps2 prompts). Done
1618 for all examples and the manual as well.
1624 for all examples and the manual as well.
1619
1625
1620 2004-06-08 Fernando Perez <fperez@colorado.edu>
1626 2004-06-08 Fernando Perez <fperez@colorado.edu>
1621
1627
1622 * IPython/Prompts.py (Prompt2.set_p_str): fixed all prompt
1628 * IPython/Prompts.py (Prompt2.set_p_str): fixed all prompt
1623 alignment and color management. All 3 prompt subsystems now
1629 alignment and color management. All 3 prompt subsystems now
1624 inherit from BasePrompt.
1630 inherit from BasePrompt.
1625
1631
1626 * tools/release: updates for windows installer build and tag rpms
1632 * tools/release: updates for windows installer build and tag rpms
1627 with python version (since paths are fixed).
1633 with python version (since paths are fixed).
1628
1634
1629 * IPython/UserConfig/ipythonrc: modified to use \# instead of %n,
1635 * IPython/UserConfig/ipythonrc: modified to use \# instead of %n,
1630 which will become eventually obsolete. Also fixed the default
1636 which will become eventually obsolete. Also fixed the default
1631 prompt_in2 to use \D, so at least new users start with the correct
1637 prompt_in2 to use \D, so at least new users start with the correct
1632 defaults.
1638 defaults.
1633 WARNING: Users with existing ipythonrc files will need to apply
1639 WARNING: Users with existing ipythonrc files will need to apply
1634 this fix manually!
1640 this fix manually!
1635
1641
1636 * setup.py: make windows installer (.exe). This is finally the
1642 * setup.py: make windows installer (.exe). This is finally the
1637 integration of an old patch by Cory Dodt <dodt-AT-fcoe.k12.ca.us>,
1643 integration of an old patch by Cory Dodt <dodt-AT-fcoe.k12.ca.us>,
1638 which I hadn't included because it required Python 2.3 (or recent
1644 which I hadn't included because it required Python 2.3 (or recent
1639 distutils).
1645 distutils).
1640
1646
1641 * IPython/usage.py (__doc__): update docs (and manpage) to reflect
1647 * IPython/usage.py (__doc__): update docs (and manpage) to reflect
1642 usage of new '\D' escape.
1648 usage of new '\D' escape.
1643
1649
1644 * IPython/Prompts.py (ROOT_SYMBOL): Small fix for Windows (which
1650 * IPython/Prompts.py (ROOT_SYMBOL): Small fix for Windows (which
1645 lacks os.getuid())
1651 lacks os.getuid())
1646 (CachedOutput.set_colors): Added the ability to turn coloring
1652 (CachedOutput.set_colors): Added the ability to turn coloring
1647 on/off with @colors even for manually defined prompt colors. It
1653 on/off with @colors even for manually defined prompt colors. It
1648 uses a nasty global, but it works safely and via the generic color
1654 uses a nasty global, but it works safely and via the generic color
1649 handling mechanism.
1655 handling mechanism.
1650 (Prompt2.__init__): Introduced new escape '\D' for continuation
1656 (Prompt2.__init__): Introduced new escape '\D' for continuation
1651 prompts. It represents the counter ('\#') as dots.
1657 prompts. It represents the counter ('\#') as dots.
1652 *** NOTE *** THIS IS A BACKWARDS-INCOMPATIBLE CHANGE. Users will
1658 *** NOTE *** THIS IS A BACKWARDS-INCOMPATIBLE CHANGE. Users will
1653 need to update their ipythonrc files and replace '%n' with '\D' in
1659 need to update their ipythonrc files and replace '%n' with '\D' in
1654 their prompt_in2 settings everywhere. Sorry, but there's
1660 their prompt_in2 settings everywhere. Sorry, but there's
1655 otherwise no clean way to get all prompts to properly align. The
1661 otherwise no clean way to get all prompts to properly align. The
1656 ipythonrc shipped with IPython has been updated.
1662 ipythonrc shipped with IPython has been updated.
1657
1663
1658 2004-06-07 Fernando Perez <fperez@colorado.edu>
1664 2004-06-07 Fernando Perez <fperez@colorado.edu>
1659
1665
1660 * setup.py (isfile): Pass local_icons option to latex2html, so the
1666 * setup.py (isfile): Pass local_icons option to latex2html, so the
1661 resulting HTML file is self-contained. Thanks to
1667 resulting HTML file is self-contained. Thanks to
1662 dryice-AT-liu.com.cn for the tip.
1668 dryice-AT-liu.com.cn for the tip.
1663
1669
1664 * pysh.py: I created a new profile 'shell', which implements a
1670 * pysh.py: I created a new profile 'shell', which implements a
1665 _rudimentary_ IPython-based shell. This is in NO WAY a realy
1671 _rudimentary_ IPython-based shell. This is in NO WAY a realy
1666 system shell, nor will it become one anytime soon. It's mainly
1672 system shell, nor will it become one anytime soon. It's mainly
1667 meant to illustrate the use of the new flexible bash-like prompts.
1673 meant to illustrate the use of the new flexible bash-like prompts.
1668 I guess it could be used by hardy souls for true shell management,
1674 I guess it could be used by hardy souls for true shell management,
1669 but it's no tcsh/bash... pysh.py is loaded by the 'shell'
1675 but it's no tcsh/bash... pysh.py is loaded by the 'shell'
1670 profile. This uses the InterpreterExec extension provided by
1676 profile. This uses the InterpreterExec extension provided by
1671 W.J. van der Laan <gnufnork-AT-hetdigitalegat.nl>
1677 W.J. van der Laan <gnufnork-AT-hetdigitalegat.nl>
1672
1678
1673 * IPython/Prompts.py (PromptOut.__str__): now it will correctly
1679 * IPython/Prompts.py (PromptOut.__str__): now it will correctly
1674 auto-align itself with the length of the previous input prompt
1680 auto-align itself with the length of the previous input prompt
1675 (taking into account the invisible color escapes).
1681 (taking into account the invisible color escapes).
1676 (CachedOutput.__init__): Large restructuring of this class. Now
1682 (CachedOutput.__init__): Large restructuring of this class. Now
1677 all three prompts (primary1, primary2, output) are proper objects,
1683 all three prompts (primary1, primary2, output) are proper objects,
1678 managed by the 'parent' CachedOutput class. The code is still a
1684 managed by the 'parent' CachedOutput class. The code is still a
1679 bit hackish (all prompts share state via a pointer to the cache),
1685 bit hackish (all prompts share state via a pointer to the cache),
1680 but it's overall far cleaner than before.
1686 but it's overall far cleaner than before.
1681
1687
1682 * IPython/genutils.py (getoutputerror): modified to add verbose,
1688 * IPython/genutils.py (getoutputerror): modified to add verbose,
1683 debug and header options. This makes the interface of all getout*
1689 debug and header options. This makes the interface of all getout*
1684 functions uniform.
1690 functions uniform.
1685 (SystemExec.getoutputerror): added getoutputerror to SystemExec.
1691 (SystemExec.getoutputerror): added getoutputerror to SystemExec.
1686
1692
1687 * IPython/Magic.py (Magic.default_option): added a function to
1693 * IPython/Magic.py (Magic.default_option): added a function to
1688 allow registering default options for any magic command. This
1694 allow registering default options for any magic command. This
1689 makes it easy to have profiles which customize the magics globally
1695 makes it easy to have profiles which customize the magics globally
1690 for a certain use. The values set through this function are
1696 for a certain use. The values set through this function are
1691 picked up by the parse_options() method, which all magics should
1697 picked up by the parse_options() method, which all magics should
1692 use to parse their options.
1698 use to parse their options.
1693
1699
1694 * IPython/genutils.py (warn): modified the warnings framework to
1700 * IPython/genutils.py (warn): modified the warnings framework to
1695 use the Term I/O class. I'm trying to slowly unify all of
1701 use the Term I/O class. I'm trying to slowly unify all of
1696 IPython's I/O operations to pass through Term.
1702 IPython's I/O operations to pass through Term.
1697
1703
1698 * IPython/Prompts.py (Prompt2._str_other): Added functionality in
1704 * IPython/Prompts.py (Prompt2._str_other): Added functionality in
1699 the secondary prompt to correctly match the length of the primary
1705 the secondary prompt to correctly match the length of the primary
1700 one for any prompt. Now multi-line code will properly line up
1706 one for any prompt. Now multi-line code will properly line up
1701 even for path dependent prompts, such as the new ones available
1707 even for path dependent prompts, such as the new ones available
1702 via the prompt_specials.
1708 via the prompt_specials.
1703
1709
1704 2004-06-06 Fernando Perez <fperez@colorado.edu>
1710 2004-06-06 Fernando Perez <fperez@colorado.edu>
1705
1711
1706 * IPython/Prompts.py (prompt_specials): Added the ability to have
1712 * IPython/Prompts.py (prompt_specials): Added the ability to have
1707 bash-like special sequences in the prompts, which get
1713 bash-like special sequences in the prompts, which get
1708 automatically expanded. Things like hostname, current working
1714 automatically expanded. Things like hostname, current working
1709 directory and username are implemented already, but it's easy to
1715 directory and username are implemented already, but it's easy to
1710 add more in the future. Thanks to a patch by W.J. van der Laan
1716 add more in the future. Thanks to a patch by W.J. van der Laan
1711 <gnufnork-AT-hetdigitalegat.nl>
1717 <gnufnork-AT-hetdigitalegat.nl>
1712 (prompt_specials): Added color support for prompt strings, so
1718 (prompt_specials): Added color support for prompt strings, so
1713 users can define arbitrary color setups for their prompts.
1719 users can define arbitrary color setups for their prompts.
1714
1720
1715 2004-06-05 Fernando Perez <fperez@colorado.edu>
1721 2004-06-05 Fernando Perez <fperez@colorado.edu>
1716
1722
1717 * IPython/genutils.py (Term.reopen_all): Added Windows-specific
1723 * IPython/genutils.py (Term.reopen_all): Added Windows-specific
1718 code to load Gary Bishop's readline and configure it
1724 code to load Gary Bishop's readline and configure it
1719 automatically. Thanks to Gary for help on this.
1725 automatically. Thanks to Gary for help on this.
1720
1726
1721 2004-06-01 Fernando Perez <fperez@colorado.edu>
1727 2004-06-01 Fernando Perez <fperez@colorado.edu>
1722
1728
1723 * IPython/Logger.py (Logger.create_log): fix bug for logging
1729 * IPython/Logger.py (Logger.create_log): fix bug for logging
1724 with no filename (previous fix was incomplete).
1730 with no filename (previous fix was incomplete).
1725
1731
1726 2004-05-25 Fernando Perez <fperez@colorado.edu>
1732 2004-05-25 Fernando Perez <fperez@colorado.edu>
1727
1733
1728 * IPython/Magic.py (Magic.parse_options): fix bug where naked
1734 * IPython/Magic.py (Magic.parse_options): fix bug where naked
1729 parens would get passed to the shell.
1735 parens would get passed to the shell.
1730
1736
1731 2004-05-20 Fernando Perez <fperez@colorado.edu>
1737 2004-05-20 Fernando Perez <fperez@colorado.edu>
1732
1738
1733 * IPython/Magic.py (Magic.magic_prun): changed default profile
1739 * IPython/Magic.py (Magic.magic_prun): changed default profile
1734 sort order to 'time' (the more common profiling need).
1740 sort order to 'time' (the more common profiling need).
1735
1741
1736 * IPython/OInspect.py (Inspector.pinfo): flush the inspect cache
1742 * IPython/OInspect.py (Inspector.pinfo): flush the inspect cache
1737 so that source code shown is guaranteed in sync with the file on
1743 so that source code shown is guaranteed in sync with the file on
1738 disk (also changed in psource). Similar fix to the one for
1744 disk (also changed in psource). Similar fix to the one for
1739 ultraTB on 2004-05-06. Thanks to a bug report by Yann Le Du
1745 ultraTB on 2004-05-06. Thanks to a bug report by Yann Le Du
1740 <yann.ledu-AT-noos.fr>.
1746 <yann.ledu-AT-noos.fr>.
1741
1747
1742 * IPython/Magic.py (Magic.parse_options): Fixed bug where commands
1748 * IPython/Magic.py (Magic.parse_options): Fixed bug where commands
1743 with a single option would not be correctly parsed. Closes
1749 with a single option would not be correctly parsed. Closes
1744 http://www.scipy.net/roundup/ipython/issue14. This bug had been
1750 http://www.scipy.net/roundup/ipython/issue14. This bug had been
1745 introduced in 0.6.0 (on 2004-05-06).
1751 introduced in 0.6.0 (on 2004-05-06).
1746
1752
1747 2004-05-13 *** Released version 0.6.0
1753 2004-05-13 *** Released version 0.6.0
1748
1754
1749 2004-05-13 Fernando Perez <fperez@colorado.edu>
1755 2004-05-13 Fernando Perez <fperez@colorado.edu>
1750
1756
1751 * debian/: Added debian/ directory to CVS, so that debian support
1757 * debian/: Added debian/ directory to CVS, so that debian support
1752 is publicly accessible. The debian package is maintained by Jack
1758 is publicly accessible. The debian package is maintained by Jack
1753 Moffit <jack-AT-xiph.org>.
1759 Moffit <jack-AT-xiph.org>.
1754
1760
1755 * Documentation: included the notes about an ipython-based system
1761 * Documentation: included the notes about an ipython-based system
1756 shell (the hypothetical 'pysh') into the new_design.pdf document,
1762 shell (the hypothetical 'pysh') into the new_design.pdf document,
1757 so that these ideas get distributed to users along with the
1763 so that these ideas get distributed to users along with the
1758 official documentation.
1764 official documentation.
1759
1765
1760 2004-05-10 Fernando Perez <fperez@colorado.edu>
1766 2004-05-10 Fernando Perez <fperez@colorado.edu>
1761
1767
1762 * IPython/Logger.py (Logger.create_log): fix recently introduced
1768 * IPython/Logger.py (Logger.create_log): fix recently introduced
1763 bug (misindented line) where logstart would fail when not given an
1769 bug (misindented line) where logstart would fail when not given an
1764 explicit filename.
1770 explicit filename.
1765
1771
1766 2004-05-09 Fernando Perez <fperez@colorado.edu>
1772 2004-05-09 Fernando Perez <fperez@colorado.edu>
1767
1773
1768 * IPython/Magic.py (Magic.parse_options): skip system call when
1774 * IPython/Magic.py (Magic.parse_options): skip system call when
1769 there are no options to look for. Faster, cleaner for the common
1775 there are no options to look for. Faster, cleaner for the common
1770 case.
1776 case.
1771
1777
1772 * Documentation: many updates to the manual: describing Windows
1778 * Documentation: many updates to the manual: describing Windows
1773 support better, Gnuplot updates, credits, misc small stuff. Also
1779 support better, Gnuplot updates, credits, misc small stuff. Also
1774 updated the new_design doc a bit.
1780 updated the new_design doc a bit.
1775
1781
1776 2004-05-06 *** Released version 0.6.0.rc1
1782 2004-05-06 *** Released version 0.6.0.rc1
1777
1783
1778 2004-05-06 Fernando Perez <fperez@colorado.edu>
1784 2004-05-06 Fernando Perez <fperez@colorado.edu>
1779
1785
1780 * IPython/ultraTB.py (ListTB.text): modified a ton of string +=
1786 * IPython/ultraTB.py (ListTB.text): modified a ton of string +=
1781 operations to use the vastly more efficient list/''.join() method.
1787 operations to use the vastly more efficient list/''.join() method.
1782 (FormattedTB.text): Fix
1788 (FormattedTB.text): Fix
1783 http://www.scipy.net/roundup/ipython/issue12 - exception source
1789 http://www.scipy.net/roundup/ipython/issue12 - exception source
1784 extract not updated after reload. Thanks to Mike Salib
1790 extract not updated after reload. Thanks to Mike Salib
1785 <msalib-AT-mit.edu> for pinning the source of the problem.
1791 <msalib-AT-mit.edu> for pinning the source of the problem.
1786 Fortunately, the solution works inside ipython and doesn't require
1792 Fortunately, the solution works inside ipython and doesn't require
1787 any changes to python proper.
1793 any changes to python proper.
1788
1794
1789 * IPython/Magic.py (Magic.parse_options): Improved to process the
1795 * IPython/Magic.py (Magic.parse_options): Improved to process the
1790 argument list as a true shell would (by actually using the
1796 argument list as a true shell would (by actually using the
1791 underlying system shell). This way, all @magics automatically get
1797 underlying system shell). This way, all @magics automatically get
1792 shell expansion for variables. Thanks to a comment by Alex
1798 shell expansion for variables. Thanks to a comment by Alex
1793 Schmolck.
1799 Schmolck.
1794
1800
1795 2004-04-04 Fernando Perez <fperez@colorado.edu>
1801 2004-04-04 Fernando Perez <fperez@colorado.edu>
1796
1802
1797 * IPython/iplib.py (InteractiveShell.interact): Added a special
1803 * IPython/iplib.py (InteractiveShell.interact): Added a special
1798 trap for a debugger quit exception, which is basically impossible
1804 trap for a debugger quit exception, which is basically impossible
1799 to handle by normal mechanisms, given what pdb does to the stack.
1805 to handle by normal mechanisms, given what pdb does to the stack.
1800 This fixes a crash reported by <fgibbons-AT-llama.med.harvard.edu>.
1806 This fixes a crash reported by <fgibbons-AT-llama.med.harvard.edu>.
1801
1807
1802 2004-04-03 Fernando Perez <fperez@colorado.edu>
1808 2004-04-03 Fernando Perez <fperez@colorado.edu>
1803
1809
1804 * IPython/genutils.py (Term): Standardized the names of the Term
1810 * IPython/genutils.py (Term): Standardized the names of the Term
1805 class streams to cin/cout/cerr, following C++ naming conventions
1811 class streams to cin/cout/cerr, following C++ naming conventions
1806 (I can't use in/out/err because 'in' is not a valid attribute
1812 (I can't use in/out/err because 'in' is not a valid attribute
1807 name).
1813 name).
1808
1814
1809 * IPython/iplib.py (InteractiveShell.interact): don't increment
1815 * IPython/iplib.py (InteractiveShell.interact): don't increment
1810 the prompt if there's no user input. By Daniel 'Dang' Griffith
1816 the prompt if there's no user input. By Daniel 'Dang' Griffith
1811 <pythondev-dang-AT-lazytwinacres.net>, after a suggestion from
1817 <pythondev-dang-AT-lazytwinacres.net>, after a suggestion from
1812 Francois Pinard.
1818 Francois Pinard.
1813
1819
1814 2004-04-02 Fernando Perez <fperez@colorado.edu>
1820 2004-04-02 Fernando Perez <fperez@colorado.edu>
1815
1821
1816 * IPython/genutils.py (Stream.__init__): Modified to survive at
1822 * IPython/genutils.py (Stream.__init__): Modified to survive at
1817 least importing in contexts where stdin/out/err aren't true file
1823 least importing in contexts where stdin/out/err aren't true file
1818 objects, such as PyCrust (they lack fileno() and mode). However,
1824 objects, such as PyCrust (they lack fileno() and mode). However,
1819 the recovery facilities which rely on these things existing will
1825 the recovery facilities which rely on these things existing will
1820 not work.
1826 not work.
1821
1827
1822 2004-04-01 Fernando Perez <fperez@colorado.edu>
1828 2004-04-01 Fernando Perez <fperez@colorado.edu>
1823
1829
1824 * IPython/Magic.py (Magic.magic_sx): modified (as well as @sc) to
1830 * IPython/Magic.py (Magic.magic_sx): modified (as well as @sc) to
1825 use the new getoutputerror() function, so it properly
1831 use the new getoutputerror() function, so it properly
1826 distinguishes stdout/err.
1832 distinguishes stdout/err.
1827
1833
1828 * IPython/genutils.py (getoutputerror): added a function to
1834 * IPython/genutils.py (getoutputerror): added a function to
1829 capture separately the standard output and error of a command.
1835 capture separately the standard output and error of a command.
1830 After a comment from dang on the mailing lists. This code is
1836 After a comment from dang on the mailing lists. This code is
1831 basically a modified version of commands.getstatusoutput(), from
1837 basically a modified version of commands.getstatusoutput(), from
1832 the standard library.
1838 the standard library.
1833
1839
1834 * IPython/iplib.py (InteractiveShell.handle_shell_escape): added
1840 * IPython/iplib.py (InteractiveShell.handle_shell_escape): added
1835 '!!' as a special syntax (shorthand) to access @sx.
1841 '!!' as a special syntax (shorthand) to access @sx.
1836
1842
1837 * IPython/Magic.py (Magic.magic_sx): new magic, to execute a shell
1843 * IPython/Magic.py (Magic.magic_sx): new magic, to execute a shell
1838 command and return its output as a list split on '\n'.
1844 command and return its output as a list split on '\n'.
1839
1845
1840 2004-03-31 Fernando Perez <fperez@colorado.edu>
1846 2004-03-31 Fernando Perez <fperez@colorado.edu>
1841
1847
1842 * IPython/FakeModule.py (FakeModule.__init__): added __nonzero__
1848 * IPython/FakeModule.py (FakeModule.__init__): added __nonzero__
1843 method to dictionaries used as FakeModule instances if they lack
1849 method to dictionaries used as FakeModule instances if they lack
1844 it. At least pydoc in python2.3 breaks for runtime-defined
1850 it. At least pydoc in python2.3 breaks for runtime-defined
1845 functions without this hack. At some point I need to _really_
1851 functions without this hack. At some point I need to _really_
1846 understand what FakeModule is doing, because it's a gross hack.
1852 understand what FakeModule is doing, because it's a gross hack.
1847 But it solves Arnd's problem for now...
1853 But it solves Arnd's problem for now...
1848
1854
1849 2004-02-27 Fernando Perez <fperez@colorado.edu>
1855 2004-02-27 Fernando Perez <fperez@colorado.edu>
1850
1856
1851 * IPython/Logger.py (Logger.create_log): Fix bug where 'rotate'
1857 * IPython/Logger.py (Logger.create_log): Fix bug where 'rotate'
1852 mode would behave erratically. Also increased the number of
1858 mode would behave erratically. Also increased the number of
1853 possible logs in rotate mod to 999. Thanks to Rod Holland
1859 possible logs in rotate mod to 999. Thanks to Rod Holland
1854 <rhh@StructureLABS.com> for the report and fixes.
1860 <rhh@StructureLABS.com> for the report and fixes.
1855
1861
1856 2004-02-26 Fernando Perez <fperez@colorado.edu>
1862 2004-02-26 Fernando Perez <fperez@colorado.edu>
1857
1863
1858 * IPython/genutils.py (page): Check that the curses module really
1864 * IPython/genutils.py (page): Check that the curses module really
1859 has the initscr attribute before trying to use it. For some
1865 has the initscr attribute before trying to use it. For some
1860 reason, the Solaris curses module is missing this. I think this
1866 reason, the Solaris curses module is missing this. I think this
1861 should be considered a Solaris python bug, but I'm not sure.
1867 should be considered a Solaris python bug, but I'm not sure.
1862
1868
1863 2004-01-17 Fernando Perez <fperez@colorado.edu>
1869 2004-01-17 Fernando Perez <fperez@colorado.edu>
1864
1870
1865 * IPython/genutils.py (Stream.__init__): Changes to try to make
1871 * IPython/genutils.py (Stream.__init__): Changes to try to make
1866 ipython robust against stdin/out/err being closed by the user.
1872 ipython robust against stdin/out/err being closed by the user.
1867 This is 'user error' (and blocks a normal python session, at least
1873 This is 'user error' (and blocks a normal python session, at least
1868 the stdout case). However, Ipython should be able to survive such
1874 the stdout case). However, Ipython should be able to survive such
1869 instances of abuse as gracefully as possible. To simplify the
1875 instances of abuse as gracefully as possible. To simplify the
1870 coding and maintain compatibility with Gary Bishop's Term
1876 coding and maintain compatibility with Gary Bishop's Term
1871 contributions, I've made use of classmethods for this. I think
1877 contributions, I've made use of classmethods for this. I think
1872 this introduces a dependency on python 2.2.
1878 this introduces a dependency on python 2.2.
1873
1879
1874 2004-01-13 Fernando Perez <fperez@colorado.edu>
1880 2004-01-13 Fernando Perez <fperez@colorado.edu>
1875
1881
1876 * IPython/numutils.py (exp_safe): simplified the code a bit and
1882 * IPython/numutils.py (exp_safe): simplified the code a bit and
1877 removed the need for importing the kinds module altogether.
1883 removed the need for importing the kinds module altogether.
1878
1884
1879 2004-01-06 Fernando Perez <fperez@colorado.edu>
1885 2004-01-06 Fernando Perez <fperez@colorado.edu>
1880
1886
1881 * IPython/Magic.py (Magic.magic_sc): Made the shell capture system
1887 * IPython/Magic.py (Magic.magic_sc): Made the shell capture system
1882 a magic function instead, after some community feedback. No
1888 a magic function instead, after some community feedback. No
1883 special syntax will exist for it, but its name is deliberately
1889 special syntax will exist for it, but its name is deliberately
1884 very short.
1890 very short.
1885
1891
1886 2003-12-20 Fernando Perez <fperez@colorado.edu>
1892 2003-12-20 Fernando Perez <fperez@colorado.edu>
1887
1893
1888 * IPython/iplib.py (InteractiveShell.handle_shell_assign): Added
1894 * IPython/iplib.py (InteractiveShell.handle_shell_assign): Added
1889 new functionality, to automagically assign the result of a shell
1895 new functionality, to automagically assign the result of a shell
1890 command to a variable. I'll solicit some community feedback on
1896 command to a variable. I'll solicit some community feedback on
1891 this before making it permanent.
1897 this before making it permanent.
1892
1898
1893 * IPython/OInspect.py (Inspector.pinfo): Fix crash when info was
1899 * IPython/OInspect.py (Inspector.pinfo): Fix crash when info was
1894 requested about callables for which inspect couldn't obtain a
1900 requested about callables for which inspect couldn't obtain a
1895 proper argspec. Thanks to a crash report sent by Etienne
1901 proper argspec. Thanks to a crash report sent by Etienne
1896 Posthumus <etienne-AT-apple01.cs.vu.nl>.
1902 Posthumus <etienne-AT-apple01.cs.vu.nl>.
1897
1903
1898 2003-12-09 Fernando Perez <fperez@colorado.edu>
1904 2003-12-09 Fernando Perez <fperez@colorado.edu>
1899
1905
1900 * IPython/genutils.py (page): patch for the pager to work across
1906 * IPython/genutils.py (page): patch for the pager to work across
1901 various versions of Windows. By Gary Bishop.
1907 various versions of Windows. By Gary Bishop.
1902
1908
1903 2003-12-04 Fernando Perez <fperez@colorado.edu>
1909 2003-12-04 Fernando Perez <fperez@colorado.edu>
1904
1910
1905 * IPython/Gnuplot2.py (PlotItems): Fixes for working with
1911 * IPython/Gnuplot2.py (PlotItems): Fixes for working with
1906 Gnuplot.py version 1.7, whose internal names changed quite a bit.
1912 Gnuplot.py version 1.7, whose internal names changed quite a bit.
1907 While I tested this and it looks ok, there may still be corner
1913 While I tested this and it looks ok, there may still be corner
1908 cases I've missed.
1914 cases I've missed.
1909
1915
1910 2003-12-01 Fernando Perez <fperez@colorado.edu>
1916 2003-12-01 Fernando Perez <fperez@colorado.edu>
1911
1917
1912 * IPython/iplib.py (InteractiveShell._prefilter): Fixed a bug
1918 * IPython/iplib.py (InteractiveShell._prefilter): Fixed a bug
1913 where a line like 'p,q=1,2' would fail because the automagic
1919 where a line like 'p,q=1,2' would fail because the automagic
1914 system would be triggered for @p.
1920 system would be triggered for @p.
1915
1921
1916 * IPython/DPyGetOpt.py (DPyGetOpt.processArguments): Tab-related
1922 * IPython/DPyGetOpt.py (DPyGetOpt.processArguments): Tab-related
1917 cleanups, code unmodified.
1923 cleanups, code unmodified.
1918
1924
1919 * IPython/genutils.py (Term): added a class for IPython to handle
1925 * IPython/genutils.py (Term): added a class for IPython to handle
1920 output. In most cases it will just be a proxy for stdout/err, but
1926 output. In most cases it will just be a proxy for stdout/err, but
1921 having this allows modifications to be made for some platforms,
1927 having this allows modifications to be made for some platforms,
1922 such as handling color escapes under Windows. All of this code
1928 such as handling color escapes under Windows. All of this code
1923 was contributed by Gary Bishop, with minor modifications by me.
1929 was contributed by Gary Bishop, with minor modifications by me.
1924 The actual changes affect many files.
1930 The actual changes affect many files.
1925
1931
1926 2003-11-30 Fernando Perez <fperez@colorado.edu>
1932 2003-11-30 Fernando Perez <fperez@colorado.edu>
1927
1933
1928 * IPython/iplib.py (file_matches): new completion code, courtesy
1934 * IPython/iplib.py (file_matches): new completion code, courtesy
1929 of Jeff Collins. This enables filename completion again under
1935 of Jeff Collins. This enables filename completion again under
1930 python 2.3, which disabled it at the C level.
1936 python 2.3, which disabled it at the C level.
1931
1937
1932 2003-11-11 Fernando Perez <fperez@colorado.edu>
1938 2003-11-11 Fernando Perez <fperez@colorado.edu>
1933
1939
1934 * IPython/numutils.py (amap): Added amap() fn. Simple shorthand
1940 * IPython/numutils.py (amap): Added amap() fn. Simple shorthand
1935 for Numeric.array(map(...)), but often convenient.
1941 for Numeric.array(map(...)), but often convenient.
1936
1942
1937 2003-11-05 Fernando Perez <fperez@colorado.edu>
1943 2003-11-05 Fernando Perez <fperez@colorado.edu>
1938
1944
1939 * IPython/numutils.py (frange): Changed a call from int() to
1945 * IPython/numutils.py (frange): Changed a call from int() to
1940 int(round()) to prevent a problem reported with arange() in the
1946 int(round()) to prevent a problem reported with arange() in the
1941 numpy list.
1947 numpy list.
1942
1948
1943 2003-10-06 Fernando Perez <fperez@colorado.edu>
1949 2003-10-06 Fernando Perez <fperez@colorado.edu>
1944
1950
1945 * IPython/DPyGetOpt.py (DPyGetOpt.processArguments): changed to
1951 * IPython/DPyGetOpt.py (DPyGetOpt.processArguments): changed to
1946 prevent crashes if sys lacks an argv attribute (it happens with
1952 prevent crashes if sys lacks an argv attribute (it happens with
1947 embedded interpreters which build a bare-bones sys module).
1953 embedded interpreters which build a bare-bones sys module).
1948 Thanks to a report/bugfix by Adam Hupp <hupp-AT-cs.wisc.edu>.
1954 Thanks to a report/bugfix by Adam Hupp <hupp-AT-cs.wisc.edu>.
1949
1955
1950 2003-09-24 Fernando Perez <fperez@colorado.edu>
1956 2003-09-24 Fernando Perez <fperez@colorado.edu>
1951
1957
1952 * IPython/Magic.py (Magic._ofind): blanket except around getattr()
1958 * IPython/Magic.py (Magic._ofind): blanket except around getattr()
1953 to protect against poorly written user objects where __getattr__
1959 to protect against poorly written user objects where __getattr__
1954 raises exceptions other than AttributeError. Thanks to a bug
1960 raises exceptions other than AttributeError. Thanks to a bug
1955 report by Oliver Sander <osander-AT-gmx.de>.
1961 report by Oliver Sander <osander-AT-gmx.de>.
1956
1962
1957 * IPython/FakeModule.py (FakeModule.__repr__): this method was
1963 * IPython/FakeModule.py (FakeModule.__repr__): this method was
1958 missing. Thanks to bug report by Ralf Schmitt <ralf-AT-brainbot.com>.
1964 missing. Thanks to bug report by Ralf Schmitt <ralf-AT-brainbot.com>.
1959
1965
1960 2003-09-09 Fernando Perez <fperez@colorado.edu>
1966 2003-09-09 Fernando Perez <fperez@colorado.edu>
1961
1967
1962 * IPython/iplib.py (InteractiveShell._prefilter): fix bug where
1968 * IPython/iplib.py (InteractiveShell._prefilter): fix bug where
1963 unpacking a list whith a callable as first element would
1969 unpacking a list whith a callable as first element would
1964 mistakenly trigger autocalling. Thanks to a bug report by Jeffery
1970 mistakenly trigger autocalling. Thanks to a bug report by Jeffery
1965 Collins.
1971 Collins.
1966
1972
1967 2003-08-25 *** Released version 0.5.0
1973 2003-08-25 *** Released version 0.5.0
1968
1974
1969 2003-08-22 Fernando Perez <fperez@colorado.edu>
1975 2003-08-22 Fernando Perez <fperez@colorado.edu>
1970
1976
1971 * IPython/ultraTB.py (VerboseTB.linereader): Improved handling of
1977 * IPython/ultraTB.py (VerboseTB.linereader): Improved handling of
1972 improperly defined user exceptions. Thanks to feedback from Mark
1978 improperly defined user exceptions. Thanks to feedback from Mark
1973 Russell <mrussell-AT-verio.net>.
1979 Russell <mrussell-AT-verio.net>.
1974
1980
1975 2003-08-20 Fernando Perez <fperez@colorado.edu>
1981 2003-08-20 Fernando Perez <fperez@colorado.edu>
1976
1982
1977 * IPython/OInspect.py (Inspector.pinfo): changed String Form
1983 * IPython/OInspect.py (Inspector.pinfo): changed String Form
1978 printing so that it would print multi-line string forms starting
1984 printing so that it would print multi-line string forms starting
1979 with a new line. This way the formatting is better respected for
1985 with a new line. This way the formatting is better respected for
1980 objects which work hard to make nice string forms.
1986 objects which work hard to make nice string forms.
1981
1987
1982 * IPython/iplib.py (InteractiveShell.handle_auto): Fix bug where
1988 * IPython/iplib.py (InteractiveShell.handle_auto): Fix bug where
1983 autocall would overtake data access for objects with both
1989 autocall would overtake data access for objects with both
1984 __getitem__ and __call__.
1990 __getitem__ and __call__.
1985
1991
1986 2003-08-19 *** Released version 0.5.0-rc1
1992 2003-08-19 *** Released version 0.5.0-rc1
1987
1993
1988 2003-08-19 Fernando Perez <fperez@colorado.edu>
1994 2003-08-19 Fernando Perez <fperez@colorado.edu>
1989
1995
1990 * IPython/deep_reload.py (load_tail): single tiny change here
1996 * IPython/deep_reload.py (load_tail): single tiny change here
1991 seems to fix the long-standing bug of dreload() failing to work
1997 seems to fix the long-standing bug of dreload() failing to work
1992 for dotted names. But this module is pretty tricky, so I may have
1998 for dotted names. But this module is pretty tricky, so I may have
1993 missed some subtlety. Needs more testing!.
1999 missed some subtlety. Needs more testing!.
1994
2000
1995 * IPython/ultraTB.py (VerboseTB.linereader): harden against user
2001 * IPython/ultraTB.py (VerboseTB.linereader): harden against user
1996 exceptions which have badly implemented __str__ methods.
2002 exceptions which have badly implemented __str__ methods.
1997 (VerboseTB.text): harden against inspect.getinnerframes crashing,
2003 (VerboseTB.text): harden against inspect.getinnerframes crashing,
1998 which I've been getting reports about from Python 2.3 users. I
2004 which I've been getting reports about from Python 2.3 users. I
1999 wish I had a simple test case to reproduce the problem, so I could
2005 wish I had a simple test case to reproduce the problem, so I could
2000 either write a cleaner workaround or file a bug report if
2006 either write a cleaner workaround or file a bug report if
2001 necessary.
2007 necessary.
2002
2008
2003 * IPython/Magic.py (Magic.magic_edit): fixed bug where after
2009 * IPython/Magic.py (Magic.magic_edit): fixed bug where after
2004 making a class 'foo', file 'foo.py' couldn't be edited. Thanks to
2010 making a class 'foo', file 'foo.py' couldn't be edited. Thanks to
2005 a bug report by Tjabo Kloppenburg.
2011 a bug report by Tjabo Kloppenburg.
2006
2012
2007 * IPython/ultraTB.py (VerboseTB.debugger): hardened against pdb
2013 * IPython/ultraTB.py (VerboseTB.debugger): hardened against pdb
2008 crashes. Wrapped the pdb call in a blanket try/except, since pdb
2014 crashes. Wrapped the pdb call in a blanket try/except, since pdb
2009 seems rather unstable. Thanks to a bug report by Tjabo
2015 seems rather unstable. Thanks to a bug report by Tjabo
2010 Kloppenburg <tjabo.kloppenburg-AT-unix-ag.uni-siegen.de>.
2016 Kloppenburg <tjabo.kloppenburg-AT-unix-ag.uni-siegen.de>.
2011
2017
2012 * IPython/Release.py (version): release 0.5.0-rc1. I want to put
2018 * IPython/Release.py (version): release 0.5.0-rc1. I want to put
2013 this out soon because of the critical fixes in the inner loop for
2019 this out soon because of the critical fixes in the inner loop for
2014 generators.
2020 generators.
2015
2021
2016 * IPython/Magic.py (Magic.getargspec): removed. This (and
2022 * IPython/Magic.py (Magic.getargspec): removed. This (and
2017 _get_def) have been obsoleted by OInspect for a long time, I
2023 _get_def) have been obsoleted by OInspect for a long time, I
2018 hadn't noticed that they were dead code.
2024 hadn't noticed that they were dead code.
2019 (Magic._ofind): restored _ofind functionality for a few literals
2025 (Magic._ofind): restored _ofind functionality for a few literals
2020 (those in ["''",'""','[]','{}','()']). But it won't work anymore
2026 (those in ["''",'""','[]','{}','()']). But it won't work anymore
2021 for things like "hello".capitalize?, since that would require a
2027 for things like "hello".capitalize?, since that would require a
2022 potentially dangerous eval() again.
2028 potentially dangerous eval() again.
2023
2029
2024 * IPython/iplib.py (InteractiveShell._prefilter): reorganized the
2030 * IPython/iplib.py (InteractiveShell._prefilter): reorganized the
2025 logic a bit more to clean up the escapes handling and minimize the
2031 logic a bit more to clean up the escapes handling and minimize the
2026 use of _ofind to only necessary cases. The interactive 'feel' of
2032 use of _ofind to only necessary cases. The interactive 'feel' of
2027 IPython should have improved quite a bit with the changes in
2033 IPython should have improved quite a bit with the changes in
2028 _prefilter and _ofind (besides being far safer than before).
2034 _prefilter and _ofind (besides being far safer than before).
2029
2035
2030 * IPython/Magic.py (Magic.magic_edit): Fixed old bug (but rather
2036 * IPython/Magic.py (Magic.magic_edit): Fixed old bug (but rather
2031 obscure, never reported). Edit would fail to find the object to
2037 obscure, never reported). Edit would fail to find the object to
2032 edit under some circumstances.
2038 edit under some circumstances.
2033 (Magic._ofind): CRITICAL FIX. Finally removed the eval() calls
2039 (Magic._ofind): CRITICAL FIX. Finally removed the eval() calls
2034 which were causing double-calling of generators. Those eval calls
2040 which were causing double-calling of generators. Those eval calls
2035 were _very_ dangerous, since code with side effects could be
2041 were _very_ dangerous, since code with side effects could be
2036 triggered. As they say, 'eval is evil'... These were the
2042 triggered. As they say, 'eval is evil'... These were the
2037 nastiest evals in IPython. Besides, _ofind is now far simpler,
2043 nastiest evals in IPython. Besides, _ofind is now far simpler,
2038 and it should also be quite a bit faster. Its use of inspect is
2044 and it should also be quite a bit faster. Its use of inspect is
2039 also safer, so perhaps some of the inspect-related crashes I've
2045 also safer, so perhaps some of the inspect-related crashes I've
2040 seen lately with Python 2.3 might be taken care of. That will
2046 seen lately with Python 2.3 might be taken care of. That will
2041 need more testing.
2047 need more testing.
2042
2048
2043 2003-08-17 Fernando Perez <fperez@colorado.edu>
2049 2003-08-17 Fernando Perez <fperez@colorado.edu>
2044
2050
2045 * IPython/iplib.py (InteractiveShell._prefilter): significant
2051 * IPython/iplib.py (InteractiveShell._prefilter): significant
2046 simplifications to the logic for handling user escapes. Faster
2052 simplifications to the logic for handling user escapes. Faster
2047 and simpler code.
2053 and simpler code.
2048
2054
2049 2003-08-14 Fernando Perez <fperez@colorado.edu>
2055 2003-08-14 Fernando Perez <fperez@colorado.edu>
2050
2056
2051 * IPython/numutils.py (sum_flat): rewrote to be non-recursive.
2057 * IPython/numutils.py (sum_flat): rewrote to be non-recursive.
2052 Now it requires O(N) storage (N=size(a)) for non-contiguous input,
2058 Now it requires O(N) storage (N=size(a)) for non-contiguous input,
2053 but it should be quite a bit faster. And the recursive version
2059 but it should be quite a bit faster. And the recursive version
2054 generated O(log N) intermediate storage for all rank>1 arrays,
2060 generated O(log N) intermediate storage for all rank>1 arrays,
2055 even if they were contiguous.
2061 even if they were contiguous.
2056 (l1norm): Added this function.
2062 (l1norm): Added this function.
2057 (norm): Added this function for arbitrary norms (including
2063 (norm): Added this function for arbitrary norms (including
2058 l-infinity). l1 and l2 are still special cases for convenience
2064 l-infinity). l1 and l2 are still special cases for convenience
2059 and speed.
2065 and speed.
2060
2066
2061 2003-08-03 Fernando Perez <fperez@colorado.edu>
2067 2003-08-03 Fernando Perez <fperez@colorado.edu>
2062
2068
2063 * IPython/Magic.py (Magic.magic_edit): Removed all remaining string
2069 * IPython/Magic.py (Magic.magic_edit): Removed all remaining string
2064 exceptions, which now raise PendingDeprecationWarnings in Python
2070 exceptions, which now raise PendingDeprecationWarnings in Python
2065 2.3. There were some in Magic and some in Gnuplot2.
2071 2.3. There were some in Magic and some in Gnuplot2.
2066
2072
2067 2003-06-30 Fernando Perez <fperez@colorado.edu>
2073 2003-06-30 Fernando Perez <fperez@colorado.edu>
2068
2074
2069 * IPython/genutils.py (page): modified to call curses only for
2075 * IPython/genutils.py (page): modified to call curses only for
2070 terminals where TERM=='xterm'. After problems under many other
2076 terminals where TERM=='xterm'. After problems under many other
2071 terminals were reported by Keith Beattie <KSBeattie-AT-lbl.gov>.
2077 terminals were reported by Keith Beattie <KSBeattie-AT-lbl.gov>.
2072
2078
2073 * IPython/iplib.py (complete): removed spurious 'print "IE"' which
2079 * IPython/iplib.py (complete): removed spurious 'print "IE"' which
2074 would be triggered when readline was absent. This was just an old
2080 would be triggered when readline was absent. This was just an old
2075 debugging statement I'd forgotten to take out.
2081 debugging statement I'd forgotten to take out.
2076
2082
2077 2003-06-20 Fernando Perez <fperez@colorado.edu>
2083 2003-06-20 Fernando Perez <fperez@colorado.edu>
2078
2084
2079 * IPython/genutils.py (clock): modified to return only user time
2085 * IPython/genutils.py (clock): modified to return only user time
2080 (not counting system time), after a discussion on scipy. While
2086 (not counting system time), after a discussion on scipy. While
2081 system time may be a useful quantity occasionally, it may much
2087 system time may be a useful quantity occasionally, it may much
2082 more easily be skewed by occasional swapping or other similar
2088 more easily be skewed by occasional swapping or other similar
2083 activity.
2089 activity.
2084
2090
2085 2003-06-05 Fernando Perez <fperez@colorado.edu>
2091 2003-06-05 Fernando Perez <fperez@colorado.edu>
2086
2092
2087 * IPython/numutils.py (identity): new function, for building
2093 * IPython/numutils.py (identity): new function, for building
2088 arbitrary rank Kronecker deltas (mostly backwards compatible with
2094 arbitrary rank Kronecker deltas (mostly backwards compatible with
2089 Numeric.identity)
2095 Numeric.identity)
2090
2096
2091 2003-06-03 Fernando Perez <fperez@colorado.edu>
2097 2003-06-03 Fernando Perez <fperez@colorado.edu>
2092
2098
2093 * IPython/iplib.py (InteractiveShell.handle_magic): protect
2099 * IPython/iplib.py (InteractiveShell.handle_magic): protect
2094 arguments passed to magics with spaces, to allow trailing '\' to
2100 arguments passed to magics with spaces, to allow trailing '\' to
2095 work normally (mainly for Windows users).
2101 work normally (mainly for Windows users).
2096
2102
2097 2003-05-29 Fernando Perez <fperez@colorado.edu>
2103 2003-05-29 Fernando Perez <fperez@colorado.edu>
2098
2104
2099 * IPython/ipmaker.py (make_IPython): Load site._Helper() as help
2105 * IPython/ipmaker.py (make_IPython): Load site._Helper() as help
2100 instead of pydoc.help. This fixes a bizarre behavior where
2106 instead of pydoc.help. This fixes a bizarre behavior where
2101 printing '%s' % locals() would trigger the help system. Now
2107 printing '%s' % locals() would trigger the help system. Now
2102 ipython behaves like normal python does.
2108 ipython behaves like normal python does.
2103
2109
2104 Note that if one does 'from pydoc import help', the bizarre
2110 Note that if one does 'from pydoc import help', the bizarre
2105 behavior returns, but this will also happen in normal python, so
2111 behavior returns, but this will also happen in normal python, so
2106 it's not an ipython bug anymore (it has to do with how pydoc.help
2112 it's not an ipython bug anymore (it has to do with how pydoc.help
2107 is implemented).
2113 is implemented).
2108
2114
2109 2003-05-22 Fernando Perez <fperez@colorado.edu>
2115 2003-05-22 Fernando Perez <fperez@colorado.edu>
2110
2116
2111 * IPython/FlexCompleter.py (Completer.attr_matches): fixed to
2117 * IPython/FlexCompleter.py (Completer.attr_matches): fixed to
2112 return [] instead of None when nothing matches, also match to end
2118 return [] instead of None when nothing matches, also match to end
2113 of line. Patch by Gary Bishop.
2119 of line. Patch by Gary Bishop.
2114
2120
2115 * IPython/ipmaker.py (make_IPython): Added same sys.excepthook
2121 * IPython/ipmaker.py (make_IPython): Added same sys.excepthook
2116 protection as before, for files passed on the command line. This
2122 protection as before, for files passed on the command line. This
2117 prevents the CrashHandler from kicking in if user files call into
2123 prevents the CrashHandler from kicking in if user files call into
2118 sys.excepthook (such as PyQt and WxWindows have a nasty habit of
2124 sys.excepthook (such as PyQt and WxWindows have a nasty habit of
2119 doing). After a report by Kasper Souren <Kasper.Souren-AT-ircam.fr>
2125 doing). After a report by Kasper Souren <Kasper.Souren-AT-ircam.fr>
2120
2126
2121 2003-05-20 *** Released version 0.4.0
2127 2003-05-20 *** Released version 0.4.0
2122
2128
2123 2003-05-20 Fernando Perez <fperez@colorado.edu>
2129 2003-05-20 Fernando Perez <fperez@colorado.edu>
2124
2130
2125 * setup.py: added support for manpages. It's a bit hackish b/c of
2131 * setup.py: added support for manpages. It's a bit hackish b/c of
2126 a bug in the way the bdist_rpm distutils target handles gzipped
2132 a bug in the way the bdist_rpm distutils target handles gzipped
2127 manpages, but it works. After a patch by Jack.
2133 manpages, but it works. After a patch by Jack.
2128
2134
2129 2003-05-19 Fernando Perez <fperez@colorado.edu>
2135 2003-05-19 Fernando Perez <fperez@colorado.edu>
2130
2136
2131 * IPython/numutils.py: added a mockup of the kinds module, since
2137 * IPython/numutils.py: added a mockup of the kinds module, since
2132 it was recently removed from Numeric. This way, numutils will
2138 it was recently removed from Numeric. This way, numutils will
2133 work for all users even if they are missing kinds.
2139 work for all users even if they are missing kinds.
2134
2140
2135 * IPython/Magic.py (Magic._ofind): Harden against an inspect
2141 * IPython/Magic.py (Magic._ofind): Harden against an inspect
2136 failure, which can occur with SWIG-wrapped extensions. After a
2142 failure, which can occur with SWIG-wrapped extensions. After a
2137 crash report from Prabhu.
2143 crash report from Prabhu.
2138
2144
2139 2003-05-16 Fernando Perez <fperez@colorado.edu>
2145 2003-05-16 Fernando Perez <fperez@colorado.edu>
2140
2146
2141 * IPython/iplib.py (InteractiveShell.excepthook): New method to
2147 * IPython/iplib.py (InteractiveShell.excepthook): New method to
2142 protect ipython from user code which may call directly
2148 protect ipython from user code which may call directly
2143 sys.excepthook (this looks like an ipython crash to the user, even
2149 sys.excepthook (this looks like an ipython crash to the user, even
2144 when it isn't). After a patch by Gary Bishop <gb-AT-cs.unc.edu>.
2150 when it isn't). After a patch by Gary Bishop <gb-AT-cs.unc.edu>.
2145 This is especially important to help users of WxWindows, but may
2151 This is especially important to help users of WxWindows, but may
2146 also be useful in other cases.
2152 also be useful in other cases.
2147
2153
2148 * IPython/ultraTB.py (AutoFormattedTB.__call__): Changed to allow
2154 * IPython/ultraTB.py (AutoFormattedTB.__call__): Changed to allow
2149 an optional tb_offset to be specified, and to preserve exception
2155 an optional tb_offset to be specified, and to preserve exception
2150 info if given. After a patch by Gary Bishop <gb-AT-cs.unc.edu>.
2156 info if given. After a patch by Gary Bishop <gb-AT-cs.unc.edu>.
2151
2157
2152 * ipython.1 (Default): Thanks to Jack's work, we now have manpages!
2158 * ipython.1 (Default): Thanks to Jack's work, we now have manpages!
2153
2159
2154 2003-05-15 Fernando Perez <fperez@colorado.edu>
2160 2003-05-15 Fernando Perez <fperez@colorado.edu>
2155
2161
2156 * IPython/iplib.py (InteractiveShell.user_setup): Fix crash when
2162 * IPython/iplib.py (InteractiveShell.user_setup): Fix crash when
2157 installing for a new user under Windows.
2163 installing for a new user under Windows.
2158
2164
2159 2003-05-12 Fernando Perez <fperez@colorado.edu>
2165 2003-05-12 Fernando Perez <fperez@colorado.edu>
2160
2166
2161 * IPython/iplib.py (InteractiveShell.handle_emacs): New line
2167 * IPython/iplib.py (InteractiveShell.handle_emacs): New line
2162 handler for Emacs comint-based lines. Currently it doesn't do
2168 handler for Emacs comint-based lines. Currently it doesn't do
2163 much (but importantly, it doesn't update the history cache). In
2169 much (but importantly, it doesn't update the history cache). In
2164 the future it may be expanded if Alex needs more functionality
2170 the future it may be expanded if Alex needs more functionality
2165 there.
2171 there.
2166
2172
2167 * IPython/CrashHandler.py (CrashHandler.__call__): Added platform
2173 * IPython/CrashHandler.py (CrashHandler.__call__): Added platform
2168 info to crash reports.
2174 info to crash reports.
2169
2175
2170 * IPython/iplib.py (InteractiveShell.mainloop): Added -c option,
2176 * IPython/iplib.py (InteractiveShell.mainloop): Added -c option,
2171 just like Python's -c. Also fixed crash with invalid -color
2177 just like Python's -c. Also fixed crash with invalid -color
2172 option value at startup. Thanks to Will French
2178 option value at startup. Thanks to Will French
2173 <wfrench-AT-bestweb.net> for the bug report.
2179 <wfrench-AT-bestweb.net> for the bug report.
2174
2180
2175 2003-05-09 Fernando Perez <fperez@colorado.edu>
2181 2003-05-09 Fernando Perez <fperez@colorado.edu>
2176
2182
2177 * IPython/genutils.py (EvalDict.__getitem__): Renamed EvalString
2183 * IPython/genutils.py (EvalDict.__getitem__): Renamed EvalString
2178 to EvalDict (it's a mapping, after all) and simplified its code
2184 to EvalDict (it's a mapping, after all) and simplified its code
2179 quite a bit, after a nice discussion on c.l.py where Gustavo
2185 quite a bit, after a nice discussion on c.l.py where Gustavo
2180 CΓ³rdova <gcordova-AT-sismex.com> suggested the new version.
2186 CΓ³rdova <gcordova-AT-sismex.com> suggested the new version.
2181
2187
2182 2003-04-30 Fernando Perez <fperez@colorado.edu>
2188 2003-04-30 Fernando Perez <fperez@colorado.edu>
2183
2189
2184 * IPython/genutils.py (timings_out): modified it to reduce its
2190 * IPython/genutils.py (timings_out): modified it to reduce its
2185 overhead in the common reps==1 case.
2191 overhead in the common reps==1 case.
2186
2192
2187 2003-04-29 Fernando Perez <fperez@colorado.edu>
2193 2003-04-29 Fernando Perez <fperez@colorado.edu>
2188
2194
2189 * IPython/genutils.py (timings_out): Modified to use the resource
2195 * IPython/genutils.py (timings_out): Modified to use the resource
2190 module, which avoids the wraparound problems of time.clock().
2196 module, which avoids the wraparound problems of time.clock().
2191
2197
2192 2003-04-17 *** Released version 0.2.15pre4
2198 2003-04-17 *** Released version 0.2.15pre4
2193
2199
2194 2003-04-17 Fernando Perez <fperez@colorado.edu>
2200 2003-04-17 Fernando Perez <fperez@colorado.edu>
2195
2201
2196 * setup.py (scriptfiles): Split windows-specific stuff over to a
2202 * setup.py (scriptfiles): Split windows-specific stuff over to a
2197 separate file, in an attempt to have a Windows GUI installer.
2203 separate file, in an attempt to have a Windows GUI installer.
2198 That didn't work, but part of the groundwork is done.
2204 That didn't work, but part of the groundwork is done.
2199
2205
2200 * IPython/UserConfig/ipythonrc: Added M-i, M-o and M-I for
2206 * IPython/UserConfig/ipythonrc: Added M-i, M-o and M-I for
2201 indent/unindent with 4 spaces. Particularly useful in combination
2207 indent/unindent with 4 spaces. Particularly useful in combination
2202 with the new auto-indent option.
2208 with the new auto-indent option.
2203
2209
2204 2003-04-16 Fernando Perez <fperez@colorado.edu>
2210 2003-04-16 Fernando Perez <fperez@colorado.edu>
2205
2211
2206 * IPython/Magic.py: various replacements of self.rc for
2212 * IPython/Magic.py: various replacements of self.rc for
2207 self.shell.rc. A lot more remains to be done to fully disentangle
2213 self.shell.rc. A lot more remains to be done to fully disentangle
2208 this class from the main Shell class.
2214 this class from the main Shell class.
2209
2215
2210 * IPython/GnuplotRuntime.py: added checks for mouse support so
2216 * IPython/GnuplotRuntime.py: added checks for mouse support so
2211 that we don't try to enable it if the current gnuplot doesn't
2217 that we don't try to enable it if the current gnuplot doesn't
2212 really support it. Also added checks so that we don't try to
2218 really support it. Also added checks so that we don't try to
2213 enable persist under Windows (where Gnuplot doesn't recognize the
2219 enable persist under Windows (where Gnuplot doesn't recognize the
2214 option).
2220 option).
2215
2221
2216 * IPython/iplib.py (InteractiveShell.interact): Added optional
2222 * IPython/iplib.py (InteractiveShell.interact): Added optional
2217 auto-indenting code, after a patch by King C. Shu
2223 auto-indenting code, after a patch by King C. Shu
2218 <kingshu-AT-myrealbox.com>. It's off by default because it doesn't
2224 <kingshu-AT-myrealbox.com>. It's off by default because it doesn't
2219 get along well with pasting indented code. If I ever figure out
2225 get along well with pasting indented code. If I ever figure out
2220 how to make that part go well, it will become on by default.
2226 how to make that part go well, it will become on by default.
2221
2227
2222 * IPython/Prompts.py (Prompt1.auto_rewrite): Fixed bug which would
2228 * IPython/Prompts.py (Prompt1.auto_rewrite): Fixed bug which would
2223 crash ipython if there was an unmatched '%' in the user's prompt
2229 crash ipython if there was an unmatched '%' in the user's prompt
2224 string. Reported by Thorsten Kampe <thorsten-AT-thorstenkampe.de>.
2230 string. Reported by Thorsten Kampe <thorsten-AT-thorstenkampe.de>.
2225
2231
2226 * IPython/iplib.py (InteractiveShell.interact): removed the
2232 * IPython/iplib.py (InteractiveShell.interact): removed the
2227 ability to ask the user whether he wants to crash or not at the
2233 ability to ask the user whether he wants to crash or not at the
2228 'last line' exception handler. Calling functions at that point
2234 'last line' exception handler. Calling functions at that point
2229 changes the stack, and the error reports would have incorrect
2235 changes the stack, and the error reports would have incorrect
2230 tracebacks.
2236 tracebacks.
2231
2237
2232 * IPython/Magic.py (Magic.magic_page): Added new @page magic, to
2238 * IPython/Magic.py (Magic.magic_page): Added new @page magic, to
2233 pass through a peger a pretty-printed form of any object. After a
2239 pass through a peger a pretty-printed form of any object. After a
2234 contribution by Olivier Aubert <oaubert-AT-bat710.univ-lyon1.fr>
2240 contribution by Olivier Aubert <oaubert-AT-bat710.univ-lyon1.fr>
2235
2241
2236 2003-04-14 Fernando Perez <fperez@colorado.edu>
2242 2003-04-14 Fernando Perez <fperez@colorado.edu>
2237
2243
2238 * IPython/iplib.py (InteractiveShell.user_setup): Fixed bug where
2244 * IPython/iplib.py (InteractiveShell.user_setup): Fixed bug where
2239 all files in ~ would be modified at first install (instead of
2245 all files in ~ would be modified at first install (instead of
2240 ~/.ipython). This could be potentially disastrous, as the
2246 ~/.ipython). This could be potentially disastrous, as the
2241 modification (make line-endings native) could damage binary files.
2247 modification (make line-endings native) could damage binary files.
2242
2248
2243 2003-04-10 Fernando Perez <fperez@colorado.edu>
2249 2003-04-10 Fernando Perez <fperez@colorado.edu>
2244
2250
2245 * IPython/iplib.py (InteractiveShell.handle_help): Modified to
2251 * IPython/iplib.py (InteractiveShell.handle_help): Modified to
2246 handle only lines which are invalid python. This now means that
2252 handle only lines which are invalid python. This now means that
2247 lines like 'x=1 #?' execute properly. Thanks to Jeffery Collins
2253 lines like 'x=1 #?' execute properly. Thanks to Jeffery Collins
2248 for the bug report.
2254 for the bug report.
2249
2255
2250 2003-04-01 Fernando Perez <fperez@colorado.edu>
2256 2003-04-01 Fernando Perez <fperez@colorado.edu>
2251
2257
2252 * IPython/iplib.py (InteractiveShell.showtraceback): Fixed bug
2258 * IPython/iplib.py (InteractiveShell.showtraceback): Fixed bug
2253 where failing to set sys.last_traceback would crash pdb.pm().
2259 where failing to set sys.last_traceback would crash pdb.pm().
2254 Thanks to Jeffery D. Collins <Jeff.Collins-AT-vexcel.com> for the bug
2260 Thanks to Jeffery D. Collins <Jeff.Collins-AT-vexcel.com> for the bug
2255 report.
2261 report.
2256
2262
2257 2003-03-25 Fernando Perez <fperez@colorado.edu>
2263 2003-03-25 Fernando Perez <fperez@colorado.edu>
2258
2264
2259 * IPython/Magic.py (Magic.magic_prun): rstrip() output of profiler
2265 * IPython/Magic.py (Magic.magic_prun): rstrip() output of profiler
2260 before printing it (it had a lot of spurious blank lines at the
2266 before printing it (it had a lot of spurious blank lines at the
2261 end).
2267 end).
2262
2268
2263 * IPython/Gnuplot2.py (Gnuplot.hardcopy): fixed bug where lpr
2269 * IPython/Gnuplot2.py (Gnuplot.hardcopy): fixed bug where lpr
2264 output would be sent 21 times! Obviously people don't use this
2270 output would be sent 21 times! Obviously people don't use this
2265 too often, or I would have heard about it.
2271 too often, or I would have heard about it.
2266
2272
2267 2003-03-24 Fernando Perez <fperez@colorado.edu>
2273 2003-03-24 Fernando Perez <fperez@colorado.edu>
2268
2274
2269 * setup.py (scriptfiles): renamed the data_files parameter from
2275 * setup.py (scriptfiles): renamed the data_files parameter from
2270 'base' to 'data' to fix rpm build issues. Thanks to Ralf Ahlbrink
2276 'base' to 'data' to fix rpm build issues. Thanks to Ralf Ahlbrink
2271 for the patch.
2277 for the patch.
2272
2278
2273 2003-03-20 Fernando Perez <fperez@colorado.edu>
2279 2003-03-20 Fernando Perez <fperez@colorado.edu>
2274
2280
2275 * IPython/genutils.py (error): added error() and fatal()
2281 * IPython/genutils.py (error): added error() and fatal()
2276 functions.
2282 functions.
2277
2283
2278 2003-03-18 *** Released version 0.2.15pre3
2284 2003-03-18 *** Released version 0.2.15pre3
2279
2285
2280 2003-03-18 Fernando Perez <fperez@colorado.edu>
2286 2003-03-18 Fernando Perez <fperez@colorado.edu>
2281
2287
2282 * setupext/install_data_ext.py
2288 * setupext/install_data_ext.py
2283 (install_data_ext.initialize_options): Class contributed by Jack
2289 (install_data_ext.initialize_options): Class contributed by Jack
2284 Moffit for fixing the old distutils hack. He is sending this to
2290 Moffit for fixing the old distutils hack. He is sending this to
2285 the distutils folks so in the future we may not need it as a
2291 the distutils folks so in the future we may not need it as a
2286 private fix.
2292 private fix.
2287
2293
2288 * MANIFEST.in: Extensive reorganization, based on Jack Moffit's
2294 * MANIFEST.in: Extensive reorganization, based on Jack Moffit's
2289 changes for Debian packaging. See his patch for full details.
2295 changes for Debian packaging. See his patch for full details.
2290 The old distutils hack of making the ipythonrc* files carry a
2296 The old distutils hack of making the ipythonrc* files carry a
2291 bogus .py extension is gone, at last. Examples were moved to a
2297 bogus .py extension is gone, at last. Examples were moved to a
2292 separate subdir under doc/, and the separate executable scripts
2298 separate subdir under doc/, and the separate executable scripts
2293 now live in their own directory. Overall a great cleanup. The
2299 now live in their own directory. Overall a great cleanup. The
2294 manual was updated to use the new files, and setup.py has been
2300 manual was updated to use the new files, and setup.py has been
2295 fixed for this setup.
2301 fixed for this setup.
2296
2302
2297 * IPython/PyColorize.py (Parser.usage): made non-executable and
2303 * IPython/PyColorize.py (Parser.usage): made non-executable and
2298 created a pycolor wrapper around it to be included as a script.
2304 created a pycolor wrapper around it to be included as a script.
2299
2305
2300 2003-03-12 *** Released version 0.2.15pre2
2306 2003-03-12 *** Released version 0.2.15pre2
2301
2307
2302 2003-03-12 Fernando Perez <fperez@colorado.edu>
2308 2003-03-12 Fernando Perez <fperez@colorado.edu>
2303
2309
2304 * IPython/ColorANSI.py (make_color_table): Finally fixed the
2310 * IPython/ColorANSI.py (make_color_table): Finally fixed the
2305 long-standing problem with garbage characters in some terminals.
2311 long-standing problem with garbage characters in some terminals.
2306 The issue was really that the \001 and \002 escapes must _only_ be
2312 The issue was really that the \001 and \002 escapes must _only_ be
2307 passed to input prompts (which call readline), but _never_ to
2313 passed to input prompts (which call readline), but _never_ to
2308 normal text to be printed on screen. I changed ColorANSI to have
2314 normal text to be printed on screen. I changed ColorANSI to have
2309 two classes: TermColors and InputTermColors, each with the
2315 two classes: TermColors and InputTermColors, each with the
2310 appropriate escapes for input prompts or normal text. The code in
2316 appropriate escapes for input prompts or normal text. The code in
2311 Prompts.py got slightly more complicated, but this very old and
2317 Prompts.py got slightly more complicated, but this very old and
2312 annoying bug is finally fixed.
2318 annoying bug is finally fixed.
2313
2319
2314 All the credit for nailing down the real origin of this problem
2320 All the credit for nailing down the real origin of this problem
2315 and the correct solution goes to Jack Moffit <jack-AT-xiph.org>.
2321 and the correct solution goes to Jack Moffit <jack-AT-xiph.org>.
2316 *Many* thanks to him for spending quite a bit of effort on this.
2322 *Many* thanks to him for spending quite a bit of effort on this.
2317
2323
2318 2003-03-05 *** Released version 0.2.15pre1
2324 2003-03-05 *** Released version 0.2.15pre1
2319
2325
2320 2003-03-03 Fernando Perez <fperez@colorado.edu>
2326 2003-03-03 Fernando Perez <fperez@colorado.edu>
2321
2327
2322 * IPython/FakeModule.py: Moved the former _FakeModule to a
2328 * IPython/FakeModule.py: Moved the former _FakeModule to a
2323 separate file, because it's also needed by Magic (to fix a similar
2329 separate file, because it's also needed by Magic (to fix a similar
2324 pickle-related issue in @run).
2330 pickle-related issue in @run).
2325
2331
2326 2003-03-02 Fernando Perez <fperez@colorado.edu>
2332 2003-03-02 Fernando Perez <fperez@colorado.edu>
2327
2333
2328 * IPython/Magic.py (Magic.magic_autocall): new magic to control
2334 * IPython/Magic.py (Magic.magic_autocall): new magic to control
2329 the autocall option at runtime.
2335 the autocall option at runtime.
2330 (Magic.magic_dhist): changed self.user_ns to self.shell.user_ns
2336 (Magic.magic_dhist): changed self.user_ns to self.shell.user_ns
2331 across Magic.py to start separating Magic from InteractiveShell.
2337 across Magic.py to start separating Magic from InteractiveShell.
2332 (Magic._ofind): Fixed to return proper namespace for dotted
2338 (Magic._ofind): Fixed to return proper namespace for dotted
2333 names. Before, a dotted name would always return 'not currently
2339 names. Before, a dotted name would always return 'not currently
2334 defined', because it would find the 'parent'. s.x would be found,
2340 defined', because it would find the 'parent'. s.x would be found,
2335 but since 'x' isn't defined by itself, it would get confused.
2341 but since 'x' isn't defined by itself, it would get confused.
2336 (Magic.magic_run): Fixed pickling problems reported by Ralf
2342 (Magic.magic_run): Fixed pickling problems reported by Ralf
2337 Ahlbrink <RAhlbrink-AT-RosenInspection.net>. The fix was similar to
2343 Ahlbrink <RAhlbrink-AT-RosenInspection.net>. The fix was similar to
2338 that I'd used when Mike Heeter reported similar issues at the
2344 that I'd used when Mike Heeter reported similar issues at the
2339 top-level, but now for @run. It boils down to injecting the
2345 top-level, but now for @run. It boils down to injecting the
2340 namespace where code is being executed with something that looks
2346 namespace where code is being executed with something that looks
2341 enough like a module to fool pickle.dump(). Since a pickle stores
2347 enough like a module to fool pickle.dump(). Since a pickle stores
2342 a named reference to the importing module, we need this for
2348 a named reference to the importing module, we need this for
2343 pickles to save something sensible.
2349 pickles to save something sensible.
2344
2350
2345 * IPython/ipmaker.py (make_IPython): added an autocall option.
2351 * IPython/ipmaker.py (make_IPython): added an autocall option.
2346
2352
2347 * IPython/iplib.py (InteractiveShell._prefilter): reordered all of
2353 * IPython/iplib.py (InteractiveShell._prefilter): reordered all of
2348 the auto-eval code. Now autocalling is an option, and the code is
2354 the auto-eval code. Now autocalling is an option, and the code is
2349 also vastly safer. There is no more eval() involved at all.
2355 also vastly safer. There is no more eval() involved at all.
2350
2356
2351 2003-03-01 Fernando Perez <fperez@colorado.edu>
2357 2003-03-01 Fernando Perez <fperez@colorado.edu>
2352
2358
2353 * IPython/Magic.py (Magic._ofind): Changed interface to return a
2359 * IPython/Magic.py (Magic._ofind): Changed interface to return a
2354 dict with named keys instead of a tuple.
2360 dict with named keys instead of a tuple.
2355
2361
2356 * IPython: Started using CVS for IPython as of 0.2.15pre1.
2362 * IPython: Started using CVS for IPython as of 0.2.15pre1.
2357
2363
2358 * setup.py (make_shortcut): Fixed message about directories
2364 * setup.py (make_shortcut): Fixed message about directories
2359 created during Windows installation (the directories were ok, just
2365 created during Windows installation (the directories were ok, just
2360 the printed message was misleading). Thanks to Chris Liechti
2366 the printed message was misleading). Thanks to Chris Liechti
2361 <cliechti-AT-gmx.net> for the heads up.
2367 <cliechti-AT-gmx.net> for the heads up.
2362
2368
2363 2003-02-21 Fernando Perez <fperez@colorado.edu>
2369 2003-02-21 Fernando Perez <fperez@colorado.edu>
2364
2370
2365 * IPython/iplib.py (InteractiveShell._prefilter): Fixed catching
2371 * IPython/iplib.py (InteractiveShell._prefilter): Fixed catching
2366 of ValueError exception when checking for auto-execution. This
2372 of ValueError exception when checking for auto-execution. This
2367 one is raised by things like Numeric arrays arr.flat when the
2373 one is raised by things like Numeric arrays arr.flat when the
2368 array is non-contiguous.
2374 array is non-contiguous.
2369
2375
2370 2003-01-31 Fernando Perez <fperez@colorado.edu>
2376 2003-01-31 Fernando Perez <fperez@colorado.edu>
2371
2377
2372 * IPython/genutils.py (SystemExec.bq): Fixed bug where bq would
2378 * IPython/genutils.py (SystemExec.bq): Fixed bug where bq would
2373 not return any value at all (even though the command would get
2379 not return any value at all (even though the command would get
2374 executed).
2380 executed).
2375 (xsys): Flush stdout right after printing the command to ensure
2381 (xsys): Flush stdout right after printing the command to ensure
2376 proper ordering of commands and command output in the total
2382 proper ordering of commands and command output in the total
2377 output.
2383 output.
2378 (SystemExec/xsys/bq): Switched the names of xsys/bq and
2384 (SystemExec/xsys/bq): Switched the names of xsys/bq and
2379 system/getoutput as defaults. The old ones are kept for
2385 system/getoutput as defaults. The old ones are kept for
2380 compatibility reasons, so no code which uses this library needs
2386 compatibility reasons, so no code which uses this library needs
2381 changing.
2387 changing.
2382
2388
2383 2003-01-27 *** Released version 0.2.14
2389 2003-01-27 *** Released version 0.2.14
2384
2390
2385 2003-01-25 Fernando Perez <fperez@colorado.edu>
2391 2003-01-25 Fernando Perez <fperez@colorado.edu>
2386
2392
2387 * IPython/Magic.py (Magic.magic_edit): Fixed problem where
2393 * IPython/Magic.py (Magic.magic_edit): Fixed problem where
2388 functions defined in previous edit sessions could not be re-edited
2394 functions defined in previous edit sessions could not be re-edited
2389 (because the temp files were immediately removed). Now temp files
2395 (because the temp files were immediately removed). Now temp files
2390 are removed only at IPython's exit.
2396 are removed only at IPython's exit.
2391 (Magic.magic_run): Improved @run to perform shell-like expansions
2397 (Magic.magic_run): Improved @run to perform shell-like expansions
2392 on its arguments (~users and $VARS). With this, @run becomes more
2398 on its arguments (~users and $VARS). With this, @run becomes more
2393 like a normal command-line.
2399 like a normal command-line.
2394
2400
2395 * IPython/Shell.py (IPShellEmbed.__call__): Fixed a bunch of small
2401 * IPython/Shell.py (IPShellEmbed.__call__): Fixed a bunch of small
2396 bugs related to embedding and cleaned up that code. A fairly
2402 bugs related to embedding and cleaned up that code. A fairly
2397 important one was the impossibility to access the global namespace
2403 important one was the impossibility to access the global namespace
2398 through the embedded IPython (only local variables were visible).
2404 through the embedded IPython (only local variables were visible).
2399
2405
2400 2003-01-14 Fernando Perez <fperez@colorado.edu>
2406 2003-01-14 Fernando Perez <fperez@colorado.edu>
2401
2407
2402 * IPython/iplib.py (InteractiveShell._prefilter): Fixed
2408 * IPython/iplib.py (InteractiveShell._prefilter): Fixed
2403 auto-calling to be a bit more conservative. Now it doesn't get
2409 auto-calling to be a bit more conservative. Now it doesn't get
2404 triggered if any of '!=()<>' are in the rest of the input line, to
2410 triggered if any of '!=()<>' are in the rest of the input line, to
2405 allow comparing callables. Thanks to Alex for the heads up.
2411 allow comparing callables. Thanks to Alex for the heads up.
2406
2412
2407 2003-01-07 Fernando Perez <fperez@colorado.edu>
2413 2003-01-07 Fernando Perez <fperez@colorado.edu>
2408
2414
2409 * IPython/genutils.py (page): fixed estimation of the number of
2415 * IPython/genutils.py (page): fixed estimation of the number of
2410 lines in a string to be paged to simply count newlines. This
2416 lines in a string to be paged to simply count newlines. This
2411 prevents over-guessing due to embedded escape sequences. A better
2417 prevents over-guessing due to embedded escape sequences. A better
2412 long-term solution would involve stripping out the control chars
2418 long-term solution would involve stripping out the control chars
2413 for the count, but it's potentially so expensive I just don't
2419 for the count, but it's potentially so expensive I just don't
2414 think it's worth doing.
2420 think it's worth doing.
2415
2421
2416 2002-12-19 *** Released version 0.2.14pre50
2422 2002-12-19 *** Released version 0.2.14pre50
2417
2423
2418 2002-12-19 Fernando Perez <fperez@colorado.edu>
2424 2002-12-19 Fernando Perez <fperez@colorado.edu>
2419
2425
2420 * tools/release (version): Changed release scripts to inform
2426 * tools/release (version): Changed release scripts to inform
2421 Andrea and build a NEWS file with a list of recent changes.
2427 Andrea and build a NEWS file with a list of recent changes.
2422
2428
2423 * IPython/ColorANSI.py (__all__): changed terminal detection
2429 * IPython/ColorANSI.py (__all__): changed terminal detection
2424 code. Seems to work better for xterms without breaking
2430 code. Seems to work better for xterms without breaking
2425 konsole. Will need more testing to determine if WinXP and Mac OSX
2431 konsole. Will need more testing to determine if WinXP and Mac OSX
2426 also work ok.
2432 also work ok.
2427
2433
2428 2002-12-18 *** Released version 0.2.14pre49
2434 2002-12-18 *** Released version 0.2.14pre49
2429
2435
2430 2002-12-18 Fernando Perez <fperez@colorado.edu>
2436 2002-12-18 Fernando Perez <fperez@colorado.edu>
2431
2437
2432 * Docs: added new info about Mac OSX, from Andrea.
2438 * Docs: added new info about Mac OSX, from Andrea.
2433
2439
2434 * IPython/Gnuplot2.py (String): Added a String PlotItem class to
2440 * IPython/Gnuplot2.py (String): Added a String PlotItem class to
2435 allow direct plotting of python strings whose format is the same
2441 allow direct plotting of python strings whose format is the same
2436 of gnuplot data files.
2442 of gnuplot data files.
2437
2443
2438 2002-12-16 Fernando Perez <fperez@colorado.edu>
2444 2002-12-16 Fernando Perez <fperez@colorado.edu>
2439
2445
2440 * IPython/iplib.py (InteractiveShell.interact): fixed default (y)
2446 * IPython/iplib.py (InteractiveShell.interact): fixed default (y)
2441 value of exit question to be acknowledged.
2447 value of exit question to be acknowledged.
2442
2448
2443 2002-12-03 Fernando Perez <fperez@colorado.edu>
2449 2002-12-03 Fernando Perez <fperez@colorado.edu>
2444
2450
2445 * IPython/ipmaker.py: removed generators, which had been added
2451 * IPython/ipmaker.py: removed generators, which had been added
2446 by mistake in an earlier debugging run. This was causing trouble
2452 by mistake in an earlier debugging run. This was causing trouble
2447 to users of python 2.1.x. Thanks to Abel Daniel <abli-AT-freemail.hu>
2453 to users of python 2.1.x. Thanks to Abel Daniel <abli-AT-freemail.hu>
2448 for pointing this out.
2454 for pointing this out.
2449
2455
2450 2002-11-17 Fernando Perez <fperez@colorado.edu>
2456 2002-11-17 Fernando Perez <fperez@colorado.edu>
2451
2457
2452 * Manual: updated the Gnuplot section.
2458 * Manual: updated the Gnuplot section.
2453
2459
2454 * IPython/GnuplotRuntime.py: refactored a lot all this code, with
2460 * IPython/GnuplotRuntime.py: refactored a lot all this code, with
2455 a much better split of what goes in Runtime and what goes in
2461 a much better split of what goes in Runtime and what goes in
2456 Interactive.
2462 Interactive.
2457
2463
2458 * IPython/ipmaker.py: fixed bug where import_fail_info wasn't
2464 * IPython/ipmaker.py: fixed bug where import_fail_info wasn't
2459 being imported from iplib.
2465 being imported from iplib.
2460
2466
2461 * IPython/GnuplotInteractive.py (magic_gpc): renamed @gp to @gpc
2467 * IPython/GnuplotInteractive.py (magic_gpc): renamed @gp to @gpc
2462 for command-passing. Now the global Gnuplot instance is called
2468 for command-passing. Now the global Gnuplot instance is called
2463 'gp' instead of 'g', which was really a far too fragile and
2469 'gp' instead of 'g', which was really a far too fragile and
2464 common name.
2470 common name.
2465
2471
2466 * IPython/Gnuplot2.py (eps_fix_bbox): added this to fix broken
2472 * IPython/Gnuplot2.py (eps_fix_bbox): added this to fix broken
2467 bounding boxes generated by Gnuplot for square plots.
2473 bounding boxes generated by Gnuplot for square plots.
2468
2474
2469 * IPython/genutils.py (popkey): new function added. I should
2475 * IPython/genutils.py (popkey): new function added. I should
2470 suggest this on c.l.py as a dict method, it seems useful.
2476 suggest this on c.l.py as a dict method, it seems useful.
2471
2477
2472 * IPython/Gnuplot2.py (Gnuplot.plot): Overhauled plot and replot
2478 * IPython/Gnuplot2.py (Gnuplot.plot): Overhauled plot and replot
2473 to transparently handle PostScript generation. MUCH better than
2479 to transparently handle PostScript generation. MUCH better than
2474 the previous plot_eps/replot_eps (which I removed now). The code
2480 the previous plot_eps/replot_eps (which I removed now). The code
2475 is also fairly clean and well documented now (including
2481 is also fairly clean and well documented now (including
2476 docstrings).
2482 docstrings).
2477
2483
2478 2002-11-13 Fernando Perez <fperez@colorado.edu>
2484 2002-11-13 Fernando Perez <fperez@colorado.edu>
2479
2485
2480 * IPython/Magic.py (Magic.magic_edit): fixed docstring
2486 * IPython/Magic.py (Magic.magic_edit): fixed docstring
2481 (inconsistent with options).
2487 (inconsistent with options).
2482
2488
2483 * IPython/Gnuplot2.py (Gnuplot.hardcopy): hardcopy had been
2489 * IPython/Gnuplot2.py (Gnuplot.hardcopy): hardcopy had been
2484 manually disabled, I don't know why. Fixed it.
2490 manually disabled, I don't know why. Fixed it.
2485 (Gnuplot._plot_eps): added new plot_eps/replot_eps to get directly
2491 (Gnuplot._plot_eps): added new plot_eps/replot_eps to get directly
2486 eps output.
2492 eps output.
2487
2493
2488 2002-11-12 Fernando Perez <fperez@colorado.edu>
2494 2002-11-12 Fernando Perez <fperez@colorado.edu>
2489
2495
2490 * IPython/genutils.py (ask_yes_no): trap EOF and ^C so that they
2496 * IPython/genutils.py (ask_yes_no): trap EOF and ^C so that they
2491 don't propagate up to caller. Fixes crash reported by François
2497 don't propagate up to caller. Fixes crash reported by François
2492 Pinard.
2498 Pinard.
2493
2499
2494 2002-11-09 Fernando Perez <fperez@colorado.edu>
2500 2002-11-09 Fernando Perez <fperez@colorado.edu>
2495
2501
2496 * IPython/ipmaker.py (make_IPython): fixed problem with writing
2502 * IPython/ipmaker.py (make_IPython): fixed problem with writing
2497 history file for new users.
2503 history file for new users.
2498 (make_IPython): fixed bug where initial install would leave the
2504 (make_IPython): fixed bug where initial install would leave the
2499 user running in the .ipython dir.
2505 user running in the .ipython dir.
2500 (make_IPython): fixed bug where config dir .ipython would be
2506 (make_IPython): fixed bug where config dir .ipython would be
2501 created regardless of the given -ipythondir option. Thanks to Cory
2507 created regardless of the given -ipythondir option. Thanks to Cory
2502 Dodt <cdodt-AT-fcoe.k12.ca.us> for the bug report.
2508 Dodt <cdodt-AT-fcoe.k12.ca.us> for the bug report.
2503
2509
2504 * IPython/genutils.py (ask_yes_no): new function for asking yes/no
2510 * IPython/genutils.py (ask_yes_no): new function for asking yes/no
2505 type confirmations. Will need to use it in all of IPython's code
2511 type confirmations. Will need to use it in all of IPython's code
2506 consistently.
2512 consistently.
2507
2513
2508 * IPython/CrashHandler.py (CrashHandler.__call__): changed the
2514 * IPython/CrashHandler.py (CrashHandler.__call__): changed the
2509 context to print 31 lines instead of the default 5. This will make
2515 context to print 31 lines instead of the default 5. This will make
2510 the crash reports extremely detailed in case the problem is in
2516 the crash reports extremely detailed in case the problem is in
2511 libraries I don't have access to.
2517 libraries I don't have access to.
2512
2518
2513 * IPython/iplib.py (InteractiveShell.interact): changed the 'last
2519 * IPython/iplib.py (InteractiveShell.interact): changed the 'last
2514 line of defense' code to still crash, but giving users fair
2520 line of defense' code to still crash, but giving users fair
2515 warning. I don't want internal errors to go unreported: if there's
2521 warning. I don't want internal errors to go unreported: if there's
2516 an internal problem, IPython should crash and generate a full
2522 an internal problem, IPython should crash and generate a full
2517 report.
2523 report.
2518
2524
2519 2002-11-08 Fernando Perez <fperez@colorado.edu>
2525 2002-11-08 Fernando Perez <fperez@colorado.edu>
2520
2526
2521 * IPython/iplib.py (InteractiveShell.interact): added code to trap
2527 * IPython/iplib.py (InteractiveShell.interact): added code to trap
2522 otherwise uncaught exceptions which can appear if people set
2528 otherwise uncaught exceptions which can appear if people set
2523 sys.stdout to something badly broken. Thanks to a crash report
2529 sys.stdout to something badly broken. Thanks to a crash report
2524 from henni-AT-mail.brainbot.com.
2530 from henni-AT-mail.brainbot.com.
2525
2531
2526 2002-11-04 Fernando Perez <fperez@colorado.edu>
2532 2002-11-04 Fernando Perez <fperez@colorado.edu>
2527
2533
2528 * IPython/iplib.py (InteractiveShell.interact): added
2534 * IPython/iplib.py (InteractiveShell.interact): added
2529 __IPYTHON__active to the builtins. It's a flag which goes on when
2535 __IPYTHON__active to the builtins. It's a flag which goes on when
2530 the interaction starts and goes off again when it stops. This
2536 the interaction starts and goes off again when it stops. This
2531 allows embedding code to detect being inside IPython. Before this
2537 allows embedding code to detect being inside IPython. Before this
2532 was done via __IPYTHON__, but that only shows that an IPython
2538 was done via __IPYTHON__, but that only shows that an IPython
2533 instance has been created.
2539 instance has been created.
2534
2540
2535 * IPython/Magic.py (Magic.magic_env): I realized that in a
2541 * IPython/Magic.py (Magic.magic_env): I realized that in a
2536 UserDict, instance.data holds the data as a normal dict. So I
2542 UserDict, instance.data holds the data as a normal dict. So I
2537 modified @env to return os.environ.data instead of rebuilding a
2543 modified @env to return os.environ.data instead of rebuilding a
2538 dict by hand.
2544 dict by hand.
2539
2545
2540 2002-11-02 Fernando Perez <fperez@colorado.edu>
2546 2002-11-02 Fernando Perez <fperez@colorado.edu>
2541
2547
2542 * IPython/genutils.py (warn): changed so that level 1 prints no
2548 * IPython/genutils.py (warn): changed so that level 1 prints no
2543 header. Level 2 is now the default (with 'WARNING' header, as
2549 header. Level 2 is now the default (with 'WARNING' header, as
2544 before). I think I tracked all places where changes were needed in
2550 before). I think I tracked all places where changes were needed in
2545 IPython, but outside code using the old level numbering may have
2551 IPython, but outside code using the old level numbering may have
2546 broken.
2552 broken.
2547
2553
2548 * IPython/iplib.py (InteractiveShell.runcode): added this to
2554 * IPython/iplib.py (InteractiveShell.runcode): added this to
2549 handle the tracebacks in SystemExit traps correctly. The previous
2555 handle the tracebacks in SystemExit traps correctly. The previous
2550 code (through interact) was printing more of the stack than
2556 code (through interact) was printing more of the stack than
2551 necessary, showing IPython internal code to the user.
2557 necessary, showing IPython internal code to the user.
2552
2558
2553 * IPython/UserConfig/ipythonrc.py: Made confirm_exit 1 by
2559 * IPython/UserConfig/ipythonrc.py: Made confirm_exit 1 by
2554 default. Now that the default at the confirmation prompt is yes,
2560 default. Now that the default at the confirmation prompt is yes,
2555 it's not so intrusive. François' argument that ipython sessions
2561 it's not so intrusive. François' argument that ipython sessions
2556 tend to be complex enough not to lose them from an accidental C-d,
2562 tend to be complex enough not to lose them from an accidental C-d,
2557 is a valid one.
2563 is a valid one.
2558
2564
2559 * IPython/iplib.py (InteractiveShell.interact): added a
2565 * IPython/iplib.py (InteractiveShell.interact): added a
2560 showtraceback() call to the SystemExit trap, and modified the exit
2566 showtraceback() call to the SystemExit trap, and modified the exit
2561 confirmation to have yes as the default.
2567 confirmation to have yes as the default.
2562
2568
2563 * IPython/UserConfig/ipythonrc.py: removed 'session' option from
2569 * IPython/UserConfig/ipythonrc.py: removed 'session' option from
2564 this file. It's been gone from the code for a long time, this was
2570 this file. It's been gone from the code for a long time, this was
2565 simply leftover junk.
2571 simply leftover junk.
2566
2572
2567 2002-11-01 Fernando Perez <fperez@colorado.edu>
2573 2002-11-01 Fernando Perez <fperez@colorado.edu>
2568
2574
2569 * IPython/UserConfig/ipythonrc.py: new confirm_exit option
2575 * IPython/UserConfig/ipythonrc.py: new confirm_exit option
2570 added. If set, IPython now traps EOF and asks for
2576 added. If set, IPython now traps EOF and asks for
2571 confirmation. After a request by François Pinard.
2577 confirmation. After a request by François Pinard.
2572
2578
2573 * IPython/Magic.py (Magic.magic_Exit): New @Exit and @Quit instead
2579 * IPython/Magic.py (Magic.magic_Exit): New @Exit and @Quit instead
2574 of @abort, and with a new (better) mechanism for handling the
2580 of @abort, and with a new (better) mechanism for handling the
2575 exceptions.
2581 exceptions.
2576
2582
2577 2002-10-27 Fernando Perez <fperez@colorado.edu>
2583 2002-10-27 Fernando Perez <fperez@colorado.edu>
2578
2584
2579 * IPython/usage.py (__doc__): updated the --help information and
2585 * IPython/usage.py (__doc__): updated the --help information and
2580 the ipythonrc file to indicate that -log generates
2586 the ipythonrc file to indicate that -log generates
2581 ./ipython.log. Also fixed the corresponding info in @logstart.
2587 ./ipython.log. Also fixed the corresponding info in @logstart.
2582 This and several other fixes in the manuals thanks to reports by
2588 This and several other fixes in the manuals thanks to reports by
2583 François Pinard <pinard-AT-iro.umontreal.ca>.
2589 François Pinard <pinard-AT-iro.umontreal.ca>.
2584
2590
2585 * IPython/Logger.py (Logger.switch_log): Fixed error message to
2591 * IPython/Logger.py (Logger.switch_log): Fixed error message to
2586 refer to @logstart (instead of @log, which doesn't exist).
2592 refer to @logstart (instead of @log, which doesn't exist).
2587
2593
2588 * IPython/iplib.py (InteractiveShell._prefilter): fixed
2594 * IPython/iplib.py (InteractiveShell._prefilter): fixed
2589 AttributeError crash. Thanks to Christopher Armstrong
2595 AttributeError crash. Thanks to Christopher Armstrong
2590 <radix-AT-twistedmatrix.com> for the report/fix. This bug had been
2596 <radix-AT-twistedmatrix.com> for the report/fix. This bug had been
2591 introduced recently (in 0.2.14pre37) with the fix to the eval
2597 introduced recently (in 0.2.14pre37) with the fix to the eval
2592 problem mentioned below.
2598 problem mentioned below.
2593
2599
2594 2002-10-17 Fernando Perez <fperez@colorado.edu>
2600 2002-10-17 Fernando Perez <fperez@colorado.edu>
2595
2601
2596 * IPython/ConfigLoader.py (ConfigLoader.load): Fixes for Windows
2602 * IPython/ConfigLoader.py (ConfigLoader.load): Fixes for Windows
2597 installation. Thanks to Leonardo Santagada <retype-AT-terra.com.br>.
2603 installation. Thanks to Leonardo Santagada <retype-AT-terra.com.br>.
2598
2604
2599 * IPython/iplib.py (InteractiveShell._prefilter): Many changes to
2605 * IPython/iplib.py (InteractiveShell._prefilter): Many changes to
2600 this function to fix a problem reported by Alex Schmolck. He saw
2606 this function to fix a problem reported by Alex Schmolck. He saw
2601 it with list comprehensions and generators, which were getting
2607 it with list comprehensions and generators, which were getting
2602 called twice. The real problem was an 'eval' call in testing for
2608 called twice. The real problem was an 'eval' call in testing for
2603 automagic which was evaluating the input line silently.
2609 automagic which was evaluating the input line silently.
2604
2610
2605 This is a potentially very nasty bug, if the input has side
2611 This is a potentially very nasty bug, if the input has side
2606 effects which must not be repeated. The code is much cleaner now,
2612 effects which must not be repeated. The code is much cleaner now,
2607 without any blanket 'except' left and with a regexp test for
2613 without any blanket 'except' left and with a regexp test for
2608 actual function names.
2614 actual function names.
2609
2615
2610 But an eval remains, which I'm not fully comfortable with. I just
2616 But an eval remains, which I'm not fully comfortable with. I just
2611 don't know how to find out if an expression could be a callable in
2617 don't know how to find out if an expression could be a callable in
2612 the user's namespace without doing an eval on the string. However
2618 the user's namespace without doing an eval on the string. However
2613 that string is now much more strictly checked so that no code
2619 that string is now much more strictly checked so that no code
2614 slips by, so the eval should only happen for things that can
2620 slips by, so the eval should only happen for things that can
2615 really be only function/method names.
2621 really be only function/method names.
2616
2622
2617 2002-10-15 Fernando Perez <fperez@colorado.edu>
2623 2002-10-15 Fernando Perez <fperez@colorado.edu>
2618
2624
2619 * Updated LyX to 1.2.1 so I can work on the docs again. Added Mac
2625 * Updated LyX to 1.2.1 so I can work on the docs again. Added Mac
2620 OSX information to main manual, removed README_Mac_OSX file from
2626 OSX information to main manual, removed README_Mac_OSX file from
2621 distribution. Also updated credits for recent additions.
2627 distribution. Also updated credits for recent additions.
2622
2628
2623 2002-10-10 Fernando Perez <fperez@colorado.edu>
2629 2002-10-10 Fernando Perez <fperez@colorado.edu>
2624
2630
2625 * README_Mac_OSX: Added a README for Mac OSX users for fixing
2631 * README_Mac_OSX: Added a README for Mac OSX users for fixing
2626 terminal-related issues. Many thanks to Andrea Riciputi
2632 terminal-related issues. Many thanks to Andrea Riciputi
2627 <andrea.riciputi-AT-libero.it> for writing it.
2633 <andrea.riciputi-AT-libero.it> for writing it.
2628
2634
2629 * IPython/UserConfig/ipythonrc.py: Fixes to various small issues,
2635 * IPython/UserConfig/ipythonrc.py: Fixes to various small issues,
2630 thanks to Thorsten Kampe <thorsten-AT-thorstenkampe.de>.
2636 thanks to Thorsten Kampe <thorsten-AT-thorstenkampe.de>.
2631
2637
2632 * setup.py (make_shortcut): Fixes for Windows installation. Thanks
2638 * setup.py (make_shortcut): Fixes for Windows installation. Thanks
2633 to Fredrik Kant <fredrik.kant-AT-front.com> and Syver Enstad
2639 to Fredrik Kant <fredrik.kant-AT-front.com> and Syver Enstad
2634 <syver-en-AT-online.no> who both submitted patches for this problem.
2640 <syver-en-AT-online.no> who both submitted patches for this problem.
2635
2641
2636 * IPython/iplib.py (InteractiveShell.embed_mainloop): Patch for
2642 * IPython/iplib.py (InteractiveShell.embed_mainloop): Patch for
2637 global embedding to make sure that things don't overwrite user
2643 global embedding to make sure that things don't overwrite user
2638 globals accidentally. Thanks to Richard <rxe-AT-renre-europe.com>
2644 globals accidentally. Thanks to Richard <rxe-AT-renre-europe.com>
2639
2645
2640 * IPython/Gnuplot2.py (gp): Patch for Gnuplot.py 1.6
2646 * IPython/Gnuplot2.py (gp): Patch for Gnuplot.py 1.6
2641 compatibility. Thanks to Hayden Callow
2647 compatibility. Thanks to Hayden Callow
2642 <h.callow-AT-elec.canterbury.ac.nz>
2648 <h.callow-AT-elec.canterbury.ac.nz>
2643
2649
2644 2002-10-04 Fernando Perez <fperez@colorado.edu>
2650 2002-10-04 Fernando Perez <fperez@colorado.edu>
2645
2651
2646 * IPython/Gnuplot2.py (PlotItem): Added 'index' option for
2652 * IPython/Gnuplot2.py (PlotItem): Added 'index' option for
2647 Gnuplot.File objects.
2653 Gnuplot.File objects.
2648
2654
2649 2002-07-23 Fernando Perez <fperez@colorado.edu>
2655 2002-07-23 Fernando Perez <fperez@colorado.edu>
2650
2656
2651 * IPython/genutils.py (timing): Added timings() and timing() for
2657 * IPython/genutils.py (timing): Added timings() and timing() for
2652 quick access to the most commonly needed data, the execution
2658 quick access to the most commonly needed data, the execution
2653 times. Old timing() renamed to timings_out().
2659 times. Old timing() renamed to timings_out().
2654
2660
2655 2002-07-18 Fernando Perez <fperez@colorado.edu>
2661 2002-07-18 Fernando Perez <fperez@colorado.edu>
2656
2662
2657 * IPython/Shell.py (IPShellEmbed.restore_system_completer): fixed
2663 * IPython/Shell.py (IPShellEmbed.restore_system_completer): fixed
2658 bug with nested instances disrupting the parent's tab completion.
2664 bug with nested instances disrupting the parent's tab completion.
2659
2665
2660 * IPython/iplib.py (all_completions): Added Alex Schmolck's
2666 * IPython/iplib.py (all_completions): Added Alex Schmolck's
2661 all_completions code to begin the emacs integration.
2667 all_completions code to begin the emacs integration.
2662
2668
2663 * IPython/Gnuplot2.py (zip_items): Added optional 'titles'
2669 * IPython/Gnuplot2.py (zip_items): Added optional 'titles'
2664 argument to allow titling individual arrays when plotting.
2670 argument to allow titling individual arrays when plotting.
2665
2671
2666 2002-07-15 Fernando Perez <fperez@colorado.edu>
2672 2002-07-15 Fernando Perez <fperez@colorado.edu>
2667
2673
2668 * setup.py (make_shortcut): changed to retrieve the value of
2674 * setup.py (make_shortcut): changed to retrieve the value of
2669 'Program Files' directory from the registry (this value changes in
2675 'Program Files' directory from the registry (this value changes in
2670 non-english versions of Windows). Thanks to Thomas Fanslau
2676 non-english versions of Windows). Thanks to Thomas Fanslau
2671 <tfanslau-AT-gmx.de> for the report.
2677 <tfanslau-AT-gmx.de> for the report.
2672
2678
2673 2002-07-10 Fernando Perez <fperez@colorado.edu>
2679 2002-07-10 Fernando Perez <fperez@colorado.edu>
2674
2680
2675 * IPython/ultraTB.py (VerboseTB.debugger): enabled workaround for
2681 * IPython/ultraTB.py (VerboseTB.debugger): enabled workaround for
2676 a bug in pdb, which crashes if a line with only whitespace is
2682 a bug in pdb, which crashes if a line with only whitespace is
2677 entered. Bug report submitted to sourceforge.
2683 entered. Bug report submitted to sourceforge.
2678
2684
2679 2002-07-09 Fernando Perez <fperez@colorado.edu>
2685 2002-07-09 Fernando Perez <fperez@colorado.edu>
2680
2686
2681 * IPython/ultraTB.py (VerboseTB.nullrepr): fixed rare crash when
2687 * IPython/ultraTB.py (VerboseTB.nullrepr): fixed rare crash when
2682 reporting exceptions (it's a bug in inspect.py, I just set a
2688 reporting exceptions (it's a bug in inspect.py, I just set a
2683 workaround).
2689 workaround).
2684
2690
2685 2002-07-08 Fernando Perez <fperez@colorado.edu>
2691 2002-07-08 Fernando Perez <fperez@colorado.edu>
2686
2692
2687 * IPython/iplib.py (InteractiveShell.__init__): fixed reference to
2693 * IPython/iplib.py (InteractiveShell.__init__): fixed reference to
2688 __IPYTHON__ in __builtins__ to show up in user_ns.
2694 __IPYTHON__ in __builtins__ to show up in user_ns.
2689
2695
2690 2002-07-03 Fernando Perez <fperez@colorado.edu>
2696 2002-07-03 Fernando Perez <fperez@colorado.edu>
2691
2697
2692 * IPython/GnuplotInteractive.py (magic_gp_set_default): changed
2698 * IPython/GnuplotInteractive.py (magic_gp_set_default): changed
2693 name from @gp_set_instance to @gp_set_default.
2699 name from @gp_set_instance to @gp_set_default.
2694
2700
2695 * IPython/ipmaker.py (make_IPython): default editor value set to
2701 * IPython/ipmaker.py (make_IPython): default editor value set to
2696 '0' (a string), to match the rc file. Otherwise will crash when
2702 '0' (a string), to match the rc file. Otherwise will crash when
2697 .strip() is called on it.
2703 .strip() is called on it.
2698
2704
2699
2705
2700 2002-06-28 Fernando Perez <fperez@colorado.edu>
2706 2002-06-28 Fernando Perez <fperez@colorado.edu>
2701
2707
2702 * IPython/iplib.py (InteractiveShell.safe_execfile): fix importing
2708 * IPython/iplib.py (InteractiveShell.safe_execfile): fix importing
2703 of files in current directory when a file is executed via
2709 of files in current directory when a file is executed via
2704 @run. Patch also by RA <ralf_ahlbrink-AT-web.de>.
2710 @run. Patch also by RA <ralf_ahlbrink-AT-web.de>.
2705
2711
2706 * setup.py (manfiles): fix for rpm builds, submitted by RA
2712 * setup.py (manfiles): fix for rpm builds, submitted by RA
2707 <ralf_ahlbrink-AT-web.de>. Now we have RPMs!
2713 <ralf_ahlbrink-AT-web.de>. Now we have RPMs!
2708
2714
2709 * IPython/ipmaker.py (make_IPython): fixed lookup of default
2715 * IPython/ipmaker.py (make_IPython): fixed lookup of default
2710 editor when set to '0'. Problem was, '0' evaluates to True (it's a
2716 editor when set to '0'. Problem was, '0' evaluates to True (it's a
2711 string!). A. Schmolck caught this one.
2717 string!). A. Schmolck caught this one.
2712
2718
2713 2002-06-27 Fernando Perez <fperez@colorado.edu>
2719 2002-06-27 Fernando Perez <fperez@colorado.edu>
2714
2720
2715 * IPython/ipmaker.py (make_IPython): fixed bug when running user
2721 * IPython/ipmaker.py (make_IPython): fixed bug when running user
2716 defined files at the cmd line. __name__ wasn't being set to
2722 defined files at the cmd line. __name__ wasn't being set to
2717 __main__.
2723 __main__.
2718
2724
2719 * IPython/Gnuplot2.py (zip_items): improved it so it can plot also
2725 * IPython/Gnuplot2.py (zip_items): improved it so it can plot also
2720 regular lists and tuples besides Numeric arrays.
2726 regular lists and tuples besides Numeric arrays.
2721
2727
2722 * IPython/Prompts.py (CachedOutput.__call__): Added output
2728 * IPython/Prompts.py (CachedOutput.__call__): Added output
2723 supression for input ending with ';'. Similar to Mathematica and
2729 supression for input ending with ';'. Similar to Mathematica and
2724 Matlab. The _* vars and Out[] list are still updated, just like
2730 Matlab. The _* vars and Out[] list are still updated, just like
2725 Mathematica behaves.
2731 Mathematica behaves.
2726
2732
2727 2002-06-25 Fernando Perez <fperez@colorado.edu>
2733 2002-06-25 Fernando Perez <fperez@colorado.edu>
2728
2734
2729 * IPython/ConfigLoader.py (ConfigLoader.load): fixed checking of
2735 * IPython/ConfigLoader.py (ConfigLoader.load): fixed checking of
2730 .ini extensions for profiels under Windows.
2736 .ini extensions for profiels under Windows.
2731
2737
2732 * IPython/OInspect.py (Inspector.pinfo): improved alignment of
2738 * IPython/OInspect.py (Inspector.pinfo): improved alignment of
2733 string form. Fix contributed by Alexander Schmolck
2739 string form. Fix contributed by Alexander Schmolck
2734 <a.schmolck-AT-gmx.net>
2740 <a.schmolck-AT-gmx.net>
2735
2741
2736 * IPython/GnuplotRuntime.py (gp_new): new function. Returns a
2742 * IPython/GnuplotRuntime.py (gp_new): new function. Returns a
2737 pre-configured Gnuplot instance.
2743 pre-configured Gnuplot instance.
2738
2744
2739 2002-06-21 Fernando Perez <fperez@colorado.edu>
2745 2002-06-21 Fernando Perez <fperez@colorado.edu>
2740
2746
2741 * IPython/numutils.py (exp_safe): new function, works around the
2747 * IPython/numutils.py (exp_safe): new function, works around the
2742 underflow problems in Numeric.
2748 underflow problems in Numeric.
2743 (log2): New fn. Safe log in base 2: returns exact integer answer
2749 (log2): New fn. Safe log in base 2: returns exact integer answer
2744 for exact integer powers of 2.
2750 for exact integer powers of 2.
2745
2751
2746 * IPython/Magic.py (get_py_filename): fixed it not expanding '~'
2752 * IPython/Magic.py (get_py_filename): fixed it not expanding '~'
2747 properly.
2753 properly.
2748
2754
2749 2002-06-20 Fernando Perez <fperez@colorado.edu>
2755 2002-06-20 Fernando Perez <fperez@colorado.edu>
2750
2756
2751 * IPython/genutils.py (timing): new function like
2757 * IPython/genutils.py (timing): new function like
2752 Mathematica's. Similar to time_test, but returns more info.
2758 Mathematica's. Similar to time_test, but returns more info.
2753
2759
2754 2002-06-18 Fernando Perez <fperez@colorado.edu>
2760 2002-06-18 Fernando Perez <fperez@colorado.edu>
2755
2761
2756 * IPython/Magic.py (Magic.magic_save): modified @save and @r
2762 * IPython/Magic.py (Magic.magic_save): modified @save and @r
2757 according to Mike Heeter's suggestions.
2763 according to Mike Heeter's suggestions.
2758
2764
2759 2002-06-16 Fernando Perez <fperez@colorado.edu>
2765 2002-06-16 Fernando Perez <fperez@colorado.edu>
2760
2766
2761 * IPython/GnuplotRuntime.py: Massive overhaul to the Gnuplot
2767 * IPython/GnuplotRuntime.py: Massive overhaul to the Gnuplot
2762 system. GnuplotMagic is gone as a user-directory option. New files
2768 system. GnuplotMagic is gone as a user-directory option. New files
2763 make it easier to use all the gnuplot stuff both from external
2769 make it easier to use all the gnuplot stuff both from external
2764 programs as well as from IPython. Had to rewrite part of
2770 programs as well as from IPython. Had to rewrite part of
2765 hardcopy() b/c of a strange bug: often the ps files simply don't
2771 hardcopy() b/c of a strange bug: often the ps files simply don't
2766 get created, and require a repeat of the command (often several
2772 get created, and require a repeat of the command (often several
2767 times).
2773 times).
2768
2774
2769 * IPython/ultraTB.py (AutoFormattedTB.__call__): changed to
2775 * IPython/ultraTB.py (AutoFormattedTB.__call__): changed to
2770 resolve output channel at call time, so that if sys.stderr has
2776 resolve output channel at call time, so that if sys.stderr has
2771 been redirected by user this gets honored.
2777 been redirected by user this gets honored.
2772
2778
2773 2002-06-13 Fernando Perez <fperez@colorado.edu>
2779 2002-06-13 Fernando Perez <fperez@colorado.edu>
2774
2780
2775 * IPython/Shell.py (IPShell.__init__): Changed IPythonShell to
2781 * IPython/Shell.py (IPShell.__init__): Changed IPythonShell to
2776 IPShell. Kept a copy with the old names to avoid breaking people's
2782 IPShell. Kept a copy with the old names to avoid breaking people's
2777 embedded code.
2783 embedded code.
2778
2784
2779 * IPython/ipython: simplified it to the bare minimum after
2785 * IPython/ipython: simplified it to the bare minimum after
2780 Holger's suggestions. Added info about how to use it in
2786 Holger's suggestions. Added info about how to use it in
2781 PYTHONSTARTUP.
2787 PYTHONSTARTUP.
2782
2788
2783 * IPython/Shell.py (IPythonShell): changed the options passing
2789 * IPython/Shell.py (IPythonShell): changed the options passing
2784 from a string with funky %s replacements to a straight list. Maybe
2790 from a string with funky %s replacements to a straight list. Maybe
2785 a bit more typing, but it follows sys.argv conventions, so there's
2791 a bit more typing, but it follows sys.argv conventions, so there's
2786 less special-casing to remember.
2792 less special-casing to remember.
2787
2793
2788 2002-06-12 Fernando Perez <fperez@colorado.edu>
2794 2002-06-12 Fernando Perez <fperez@colorado.edu>
2789
2795
2790 * IPython/Magic.py (Magic.magic_r): new magic auto-repeat
2796 * IPython/Magic.py (Magic.magic_r): new magic auto-repeat
2791 command. Thanks to a suggestion by Mike Heeter.
2797 command. Thanks to a suggestion by Mike Heeter.
2792 (Magic.magic_pfile): added behavior to look at filenames if given
2798 (Magic.magic_pfile): added behavior to look at filenames if given
2793 arg is not a defined object.
2799 arg is not a defined object.
2794 (Magic.magic_save): New @save function to save code snippets. Also
2800 (Magic.magic_save): New @save function to save code snippets. Also
2795 a Mike Heeter idea.
2801 a Mike Heeter idea.
2796
2802
2797 * IPython/UserConfig/GnuplotMagic.py (plot): Improvements to
2803 * IPython/UserConfig/GnuplotMagic.py (plot): Improvements to
2798 plot() and replot(). Much more convenient now, especially for
2804 plot() and replot(). Much more convenient now, especially for
2799 interactive use.
2805 interactive use.
2800
2806
2801 * IPython/Magic.py (Magic.magic_run): Added .py automatically to
2807 * IPython/Magic.py (Magic.magic_run): Added .py automatically to
2802 filenames.
2808 filenames.
2803
2809
2804 2002-06-02 Fernando Perez <fperez@colorado.edu>
2810 2002-06-02 Fernando Perez <fperez@colorado.edu>
2805
2811
2806 * IPython/Struct.py (Struct.__init__): modified to admit
2812 * IPython/Struct.py (Struct.__init__): modified to admit
2807 initialization via another struct.
2813 initialization via another struct.
2808
2814
2809 * IPython/genutils.py (SystemExec.__init__): New stateful
2815 * IPython/genutils.py (SystemExec.__init__): New stateful
2810 interface to xsys and bq. Useful for writing system scripts.
2816 interface to xsys and bq. Useful for writing system scripts.
2811
2817
2812 2002-05-30 Fernando Perez <fperez@colorado.edu>
2818 2002-05-30 Fernando Perez <fperez@colorado.edu>
2813
2819
2814 * MANIFEST.in: Changed docfile selection to exclude all the lyx
2820 * MANIFEST.in: Changed docfile selection to exclude all the lyx
2815 documents. This will make the user download smaller (it's getting
2821 documents. This will make the user download smaller (it's getting
2816 too big).
2822 too big).
2817
2823
2818 2002-05-29 Fernando Perez <fperez@colorado.edu>
2824 2002-05-29 Fernando Perez <fperez@colorado.edu>
2819
2825
2820 * IPython/iplib.py (_FakeModule.__init__): New class introduced to
2826 * IPython/iplib.py (_FakeModule.__init__): New class introduced to
2821 fix problems with shelve and pickle. Seems to work, but I don't
2827 fix problems with shelve and pickle. Seems to work, but I don't
2822 know if corner cases break it. Thanks to Mike Heeter
2828 know if corner cases break it. Thanks to Mike Heeter
2823 <korora-AT-SDF.LONESTAR.ORG> for the bug reports and test cases.
2829 <korora-AT-SDF.LONESTAR.ORG> for the bug reports and test cases.
2824
2830
2825 2002-05-24 Fernando Perez <fperez@colorado.edu>
2831 2002-05-24 Fernando Perez <fperez@colorado.edu>
2826
2832
2827 * IPython/Magic.py (Macro.__init__): fixed magics embedded in
2833 * IPython/Magic.py (Macro.__init__): fixed magics embedded in
2828 macros having broken.
2834 macros having broken.
2829
2835
2830 2002-05-21 Fernando Perez <fperez@colorado.edu>
2836 2002-05-21 Fernando Perez <fperez@colorado.edu>
2831
2837
2832 * IPython/Magic.py (Magic.magic_logstart): fixed recently
2838 * IPython/Magic.py (Magic.magic_logstart): fixed recently
2833 introduced logging bug: all history before logging started was
2839 introduced logging bug: all history before logging started was
2834 being written one character per line! This came from the redesign
2840 being written one character per line! This came from the redesign
2835 of the input history as a special list which slices to strings,
2841 of the input history as a special list which slices to strings,
2836 not to lists.
2842 not to lists.
2837
2843
2838 2002-05-20 Fernando Perez <fperez@colorado.edu>
2844 2002-05-20 Fernando Perez <fperez@colorado.edu>
2839
2845
2840 * IPython/Prompts.py (CachedOutput.__init__): made the color table
2846 * IPython/Prompts.py (CachedOutput.__init__): made the color table
2841 be an attribute of all classes in this module. The design of these
2847 be an attribute of all classes in this module. The design of these
2842 classes needs some serious overhauling.
2848 classes needs some serious overhauling.
2843
2849
2844 * IPython/DPyGetOpt.py (DPyGetOpt.setPosixCompliance): fixed bug
2850 * IPython/DPyGetOpt.py (DPyGetOpt.setPosixCompliance): fixed bug
2845 which was ignoring '_' in option names.
2851 which was ignoring '_' in option names.
2846
2852
2847 * IPython/ultraTB.py (FormattedTB.__init__): Changed
2853 * IPython/ultraTB.py (FormattedTB.__init__): Changed
2848 'Verbose_novars' to 'Context' and made it the new default. It's a
2854 'Verbose_novars' to 'Context' and made it the new default. It's a
2849 bit more readable and also safer than verbose.
2855 bit more readable and also safer than verbose.
2850
2856
2851 * IPython/PyColorize.py (Parser.__call__): Fixed coloring of
2857 * IPython/PyColorize.py (Parser.__call__): Fixed coloring of
2852 triple-quoted strings.
2858 triple-quoted strings.
2853
2859
2854 * IPython/OInspect.py (__all__): new module exposing the object
2860 * IPython/OInspect.py (__all__): new module exposing the object
2855 introspection facilities. Now the corresponding magics are dummy
2861 introspection facilities. Now the corresponding magics are dummy
2856 wrappers around this. Having this module will make it much easier
2862 wrappers around this. Having this module will make it much easier
2857 to put these functions into our modified pdb.
2863 to put these functions into our modified pdb.
2858 This new object inspector system uses the new colorizing module,
2864 This new object inspector system uses the new colorizing module,
2859 so source code and other things are nicely syntax highlighted.
2865 so source code and other things are nicely syntax highlighted.
2860
2866
2861 2002-05-18 Fernando Perez <fperez@colorado.edu>
2867 2002-05-18 Fernando Perez <fperez@colorado.edu>
2862
2868
2863 * IPython/ColorANSI.py: Split the coloring tools into a separate
2869 * IPython/ColorANSI.py: Split the coloring tools into a separate
2864 module so I can use them in other code easier (they were part of
2870 module so I can use them in other code easier (they were part of
2865 ultraTB).
2871 ultraTB).
2866
2872
2867 2002-05-17 Fernando Perez <fperez@colorado.edu>
2873 2002-05-17 Fernando Perez <fperez@colorado.edu>
2868
2874
2869 * IPython/UserConfig/GnuplotMagic.py (magic_gp_set_instance):
2875 * IPython/UserConfig/GnuplotMagic.py (magic_gp_set_instance):
2870 fixed it to set the global 'g' also to the called instance, as
2876 fixed it to set the global 'g' also to the called instance, as
2871 long as 'g' was still a gnuplot instance (so it doesn't overwrite
2877 long as 'g' was still a gnuplot instance (so it doesn't overwrite
2872 user's 'g' variables).
2878 user's 'g' variables).
2873
2879
2874 * IPython/iplib.py (InteractiveShell.__init__): Added In/Out
2880 * IPython/iplib.py (InteractiveShell.__init__): Added In/Out
2875 global variables (aliases to _ih,_oh) so that users which expect
2881 global variables (aliases to _ih,_oh) so that users which expect
2876 In[5] or Out[7] to work aren't unpleasantly surprised.
2882 In[5] or Out[7] to work aren't unpleasantly surprised.
2877 (InputList.__getslice__): new class to allow executing slices of
2883 (InputList.__getslice__): new class to allow executing slices of
2878 input history directly. Very simple class, complements the use of
2884 input history directly. Very simple class, complements the use of
2879 macros.
2885 macros.
2880
2886
2881 2002-05-16 Fernando Perez <fperez@colorado.edu>
2887 2002-05-16 Fernando Perez <fperez@colorado.edu>
2882
2888
2883 * setup.py (docdirbase): make doc directory be just doc/IPython
2889 * setup.py (docdirbase): make doc directory be just doc/IPython
2884 without version numbers, it will reduce clutter for users.
2890 without version numbers, it will reduce clutter for users.
2885
2891
2886 * IPython/Magic.py (Magic.magic_run): Add explicit local dict to
2892 * IPython/Magic.py (Magic.magic_run): Add explicit local dict to
2887 execfile call to prevent possible memory leak. See for details:
2893 execfile call to prevent possible memory leak. See for details:
2888 http://mail.python.org/pipermail/python-list/2002-February/088476.html
2894 http://mail.python.org/pipermail/python-list/2002-February/088476.html
2889
2895
2890 2002-05-15 Fernando Perez <fperez@colorado.edu>
2896 2002-05-15 Fernando Perez <fperez@colorado.edu>
2891
2897
2892 * IPython/Magic.py (Magic.magic_psource): made the object
2898 * IPython/Magic.py (Magic.magic_psource): made the object
2893 introspection names be more standard: pdoc, pdef, pfile and
2899 introspection names be more standard: pdoc, pdef, pfile and
2894 psource. They all print/page their output, and it makes
2900 psource. They all print/page their output, and it makes
2895 remembering them easier. Kept old names for compatibility as
2901 remembering them easier. Kept old names for compatibility as
2896 aliases.
2902 aliases.
2897
2903
2898 2002-05-14 Fernando Perez <fperez@colorado.edu>
2904 2002-05-14 Fernando Perez <fperez@colorado.edu>
2899
2905
2900 * IPython/UserConfig/GnuplotMagic.py: I think I finally understood
2906 * IPython/UserConfig/GnuplotMagic.py: I think I finally understood
2901 what the mouse problem was. The trick is to use gnuplot with temp
2907 what the mouse problem was. The trick is to use gnuplot with temp
2902 files and NOT with pipes (for data communication), because having
2908 files and NOT with pipes (for data communication), because having
2903 both pipes and the mouse on is bad news.
2909 both pipes and the mouse on is bad news.
2904
2910
2905 2002-05-13 Fernando Perez <fperez@colorado.edu>
2911 2002-05-13 Fernando Perez <fperez@colorado.edu>
2906
2912
2907 * IPython/Magic.py (Magic._ofind): fixed namespace order search
2913 * IPython/Magic.py (Magic._ofind): fixed namespace order search
2908 bug. Information would be reported about builtins even when
2914 bug. Information would be reported about builtins even when
2909 user-defined functions overrode them.
2915 user-defined functions overrode them.
2910
2916
2911 2002-05-11 Fernando Perez <fperez@colorado.edu>
2917 2002-05-11 Fernando Perez <fperez@colorado.edu>
2912
2918
2913 * IPython/__init__.py (__all__): removed FlexCompleter from
2919 * IPython/__init__.py (__all__): removed FlexCompleter from
2914 __all__ so that things don't fail in platforms without readline.
2920 __all__ so that things don't fail in platforms without readline.
2915
2921
2916 2002-05-10 Fernando Perez <fperez@colorado.edu>
2922 2002-05-10 Fernando Perez <fperez@colorado.edu>
2917
2923
2918 * IPython/__init__.py (__all__): removed numutils from __all__ b/c
2924 * IPython/__init__.py (__all__): removed numutils from __all__ b/c
2919 it requires Numeric, effectively making Numeric a dependency for
2925 it requires Numeric, effectively making Numeric a dependency for
2920 IPython.
2926 IPython.
2921
2927
2922 * Released 0.2.13
2928 * Released 0.2.13
2923
2929
2924 * IPython/Magic.py (Magic.magic_prun): big overhaul to the
2930 * IPython/Magic.py (Magic.magic_prun): big overhaul to the
2925 profiler interface. Now all the major options from the profiler
2931 profiler interface. Now all the major options from the profiler
2926 module are directly supported in IPython, both for single
2932 module are directly supported in IPython, both for single
2927 expressions (@prun) and for full programs (@run -p).
2933 expressions (@prun) and for full programs (@run -p).
2928
2934
2929 2002-05-09 Fernando Perez <fperez@colorado.edu>
2935 2002-05-09 Fernando Perez <fperez@colorado.edu>
2930
2936
2931 * IPython/Magic.py (Magic.magic_doc): fixed to show docstrings of
2937 * IPython/Magic.py (Magic.magic_doc): fixed to show docstrings of
2932 magic properly formatted for screen.
2938 magic properly formatted for screen.
2933
2939
2934 * setup.py (make_shortcut): Changed things to put pdf version in
2940 * setup.py (make_shortcut): Changed things to put pdf version in
2935 doc/ instead of doc/manual (had to change lyxport a bit).
2941 doc/ instead of doc/manual (had to change lyxport a bit).
2936
2942
2937 * IPython/Magic.py (Profile.string_stats): made profile runs go
2943 * IPython/Magic.py (Profile.string_stats): made profile runs go
2938 through pager (they are long and a pager allows searching, saving,
2944 through pager (they are long and a pager allows searching, saving,
2939 etc.)
2945 etc.)
2940
2946
2941 2002-05-08 Fernando Perez <fperez@colorado.edu>
2947 2002-05-08 Fernando Perez <fperez@colorado.edu>
2942
2948
2943 * Released 0.2.12
2949 * Released 0.2.12
2944
2950
2945 2002-05-06 Fernando Perez <fperez@colorado.edu>
2951 2002-05-06 Fernando Perez <fperez@colorado.edu>
2946
2952
2947 * IPython/Magic.py (Magic.magic_hist): small bug fixed (recently
2953 * IPython/Magic.py (Magic.magic_hist): small bug fixed (recently
2948 introduced); 'hist n1 n2' was broken.
2954 introduced); 'hist n1 n2' was broken.
2949 (Magic.magic_pdb): added optional on/off arguments to @pdb
2955 (Magic.magic_pdb): added optional on/off arguments to @pdb
2950 (Magic.magic_run): added option -i to @run, which executes code in
2956 (Magic.magic_run): added option -i to @run, which executes code in
2951 the IPython namespace instead of a clean one. Also added @irun as
2957 the IPython namespace instead of a clean one. Also added @irun as
2952 an alias to @run -i.
2958 an alias to @run -i.
2953
2959
2954 * IPython/UserConfig/GnuplotMagic.py (magic_gp_set_instance):
2960 * IPython/UserConfig/GnuplotMagic.py (magic_gp_set_instance):
2955 fixed (it didn't really do anything, the namespaces were wrong).
2961 fixed (it didn't really do anything, the namespaces were wrong).
2956
2962
2957 * IPython/Debugger.py (__init__): Added workaround for python 2.1
2963 * IPython/Debugger.py (__init__): Added workaround for python 2.1
2958
2964
2959 * IPython/__init__.py (__all__): Fixed package namespace, now
2965 * IPython/__init__.py (__all__): Fixed package namespace, now
2960 'import IPython' does give access to IPython.<all> as
2966 'import IPython' does give access to IPython.<all> as
2961 expected. Also renamed __release__ to Release.
2967 expected. Also renamed __release__ to Release.
2962
2968
2963 * IPython/Debugger.py (__license__): created new Pdb class which
2969 * IPython/Debugger.py (__license__): created new Pdb class which
2964 functions like a drop-in for the normal pdb.Pdb but does NOT
2970 functions like a drop-in for the normal pdb.Pdb but does NOT
2965 import readline by default. This way it doesn't muck up IPython's
2971 import readline by default. This way it doesn't muck up IPython's
2966 readline handling, and now tab-completion finally works in the
2972 readline handling, and now tab-completion finally works in the
2967 debugger -- sort of. It completes things globally visible, but the
2973 debugger -- sort of. It completes things globally visible, but the
2968 completer doesn't track the stack as pdb walks it. That's a bit
2974 completer doesn't track the stack as pdb walks it. That's a bit
2969 tricky, and I'll have to implement it later.
2975 tricky, and I'll have to implement it later.
2970
2976
2971 2002-05-05 Fernando Perez <fperez@colorado.edu>
2977 2002-05-05 Fernando Perez <fperez@colorado.edu>
2972
2978
2973 * IPython/Magic.py (Magic.magic_oinfo): fixed formatting bug for
2979 * IPython/Magic.py (Magic.magic_oinfo): fixed formatting bug for
2974 magic docstrings when printed via ? (explicit \'s were being
2980 magic docstrings when printed via ? (explicit \'s were being
2975 printed).
2981 printed).
2976
2982
2977 * IPython/ipmaker.py (make_IPython): fixed namespace
2983 * IPython/ipmaker.py (make_IPython): fixed namespace
2978 identification bug. Now variables loaded via logs or command-line
2984 identification bug. Now variables loaded via logs or command-line
2979 files are recognized in the interactive namespace by @who.
2985 files are recognized in the interactive namespace by @who.
2980
2986
2981 * IPython/iplib.py (InteractiveShell.safe_execfile): Fixed bug in
2987 * IPython/iplib.py (InteractiveShell.safe_execfile): Fixed bug in
2982 log replay system stemming from the string form of Structs.
2988 log replay system stemming from the string form of Structs.
2983
2989
2984 * IPython/Magic.py (Macro.__init__): improved macros to properly
2990 * IPython/Magic.py (Macro.__init__): improved macros to properly
2985 handle magic commands in them.
2991 handle magic commands in them.
2986 (Magic.magic_logstart): usernames are now expanded so 'logstart
2992 (Magic.magic_logstart): usernames are now expanded so 'logstart
2987 ~/mylog' now works.
2993 ~/mylog' now works.
2988
2994
2989 * IPython/iplib.py (complete): fixed bug where paths starting with
2995 * IPython/iplib.py (complete): fixed bug where paths starting with
2990 '/' would be completed as magic names.
2996 '/' would be completed as magic names.
2991
2997
2992 2002-05-04 Fernando Perez <fperez@colorado.edu>
2998 2002-05-04 Fernando Perez <fperez@colorado.edu>
2993
2999
2994 * IPython/Magic.py (Magic.magic_run): added options -p and -f to
3000 * IPython/Magic.py (Magic.magic_run): added options -p and -f to
2995 allow running full programs under the profiler's control.
3001 allow running full programs under the profiler's control.
2996
3002
2997 * IPython/ultraTB.py (FormattedTB.__init__): Added Verbose_novars
3003 * IPython/ultraTB.py (FormattedTB.__init__): Added Verbose_novars
2998 mode to report exceptions verbosely but without formatting
3004 mode to report exceptions verbosely but without formatting
2999 variables. This addresses the issue of ipython 'freezing' (it's
3005 variables. This addresses the issue of ipython 'freezing' (it's
3000 not frozen, but caught in an expensive formatting loop) when huge
3006 not frozen, but caught in an expensive formatting loop) when huge
3001 variables are in the context of an exception.
3007 variables are in the context of an exception.
3002 (VerboseTB.text): Added '--->' markers at line where exception was
3008 (VerboseTB.text): Added '--->' markers at line where exception was
3003 triggered. Much clearer to read, especially in NoColor modes.
3009 triggered. Much clearer to read, especially in NoColor modes.
3004
3010
3005 * IPython/Magic.py (Magic.magic_run): bugfix: -n option had been
3011 * IPython/Magic.py (Magic.magic_run): bugfix: -n option had been
3006 implemented in reverse when changing to the new parse_options().
3012 implemented in reverse when changing to the new parse_options().
3007
3013
3008 2002-05-03 Fernando Perez <fperez@colorado.edu>
3014 2002-05-03 Fernando Perez <fperez@colorado.edu>
3009
3015
3010 * IPython/Magic.py (Magic.parse_options): new function so that
3016 * IPython/Magic.py (Magic.parse_options): new function so that
3011 magics can parse options easier.
3017 magics can parse options easier.
3012 (Magic.magic_prun): new function similar to profile.run(),
3018 (Magic.magic_prun): new function similar to profile.run(),
3013 suggested by Chris Hart.
3019 suggested by Chris Hart.
3014 (Magic.magic_cd): fixed behavior so that it only changes if
3020 (Magic.magic_cd): fixed behavior so that it only changes if
3015 directory actually is in history.
3021 directory actually is in history.
3016
3022
3017 * IPython/usage.py (__doc__): added information about potential
3023 * IPython/usage.py (__doc__): added information about potential
3018 slowness of Verbose exception mode when there are huge data
3024 slowness of Verbose exception mode when there are huge data
3019 structures to be formatted (thanks to Archie Paulson).
3025 structures to be formatted (thanks to Archie Paulson).
3020
3026
3021 * IPython/ipmaker.py (make_IPython): Changed default logging
3027 * IPython/ipmaker.py (make_IPython): Changed default logging
3022 (when simply called with -log) to use curr_dir/ipython.log in
3028 (when simply called with -log) to use curr_dir/ipython.log in
3023 rotate mode. Fixed crash which was occuring with -log before
3029 rotate mode. Fixed crash which was occuring with -log before
3024 (thanks to Jim Boyle).
3030 (thanks to Jim Boyle).
3025
3031
3026 2002-05-01 Fernando Perez <fperez@colorado.edu>
3032 2002-05-01 Fernando Perez <fperez@colorado.edu>
3027
3033
3028 * Released 0.2.11 for these fixes (mainly the ultraTB one which
3034 * Released 0.2.11 for these fixes (mainly the ultraTB one which
3029 was nasty -- though somewhat of a corner case).
3035 was nasty -- though somewhat of a corner case).
3030
3036
3031 * IPython/ultraTB.py (AutoFormattedTB.text): renamed __text to
3037 * IPython/ultraTB.py (AutoFormattedTB.text): renamed __text to
3032 text (was a bug).
3038 text (was a bug).
3033
3039
3034 2002-04-30 Fernando Perez <fperez@colorado.edu>
3040 2002-04-30 Fernando Perez <fperez@colorado.edu>
3035
3041
3036 * IPython/UserConfig/GnuplotMagic.py (magic_gp): Minor fix to add
3042 * IPython/UserConfig/GnuplotMagic.py (magic_gp): Minor fix to add
3037 a print after ^D or ^C from the user so that the In[] prompt
3043 a print after ^D or ^C from the user so that the In[] prompt
3038 doesn't over-run the gnuplot one.
3044 doesn't over-run the gnuplot one.
3039
3045
3040 2002-04-29 Fernando Perez <fperez@colorado.edu>
3046 2002-04-29 Fernando Perez <fperez@colorado.edu>
3041
3047
3042 * Released 0.2.10
3048 * Released 0.2.10
3043
3049
3044 * IPython/__release__.py (version): get date dynamically.
3050 * IPython/__release__.py (version): get date dynamically.
3045
3051
3046 * Misc. documentation updates thanks to Arnd's comments. Also ran
3052 * Misc. documentation updates thanks to Arnd's comments. Also ran
3047 a full spellcheck on the manual (hadn't been done in a while).
3053 a full spellcheck on the manual (hadn't been done in a while).
3048
3054
3049 2002-04-27 Fernando Perez <fperez@colorado.edu>
3055 2002-04-27 Fernando Perez <fperez@colorado.edu>
3050
3056
3051 * IPython/Magic.py (Magic.magic_logstart): Fixed bug where
3057 * IPython/Magic.py (Magic.magic_logstart): Fixed bug where
3052 starting a log in mid-session would reset the input history list.
3058 starting a log in mid-session would reset the input history list.
3053
3059
3054 2002-04-26 Fernando Perez <fperez@colorado.edu>
3060 2002-04-26 Fernando Perez <fperez@colorado.edu>
3055
3061
3056 * IPython/iplib.py (InteractiveShell.wait): Fixed bug where not
3062 * IPython/iplib.py (InteractiveShell.wait): Fixed bug where not
3057 all files were being included in an update. Now anything in
3063 all files were being included in an update. Now anything in
3058 UserConfig that matches [A-Za-z]*.py will go (this excludes
3064 UserConfig that matches [A-Za-z]*.py will go (this excludes
3059 __init__.py)
3065 __init__.py)
3060
3066
3061 2002-04-25 Fernando Perez <fperez@colorado.edu>
3067 2002-04-25 Fernando Perez <fperez@colorado.edu>
3062
3068
3063 * IPython/iplib.py (InteractiveShell.__init__): Added __IPYTHON__
3069 * IPython/iplib.py (InteractiveShell.__init__): Added __IPYTHON__
3064 to __builtins__ so that any form of embedded or imported code can
3070 to __builtins__ so that any form of embedded or imported code can
3065 test for being inside IPython.
3071 test for being inside IPython.
3066
3072
3067 * IPython/UserConfig/GnuplotMagic.py: (magic_gp_set_instance):
3073 * IPython/UserConfig/GnuplotMagic.py: (magic_gp_set_instance):
3068 changed to GnuplotMagic because it's now an importable module,
3074 changed to GnuplotMagic because it's now an importable module,
3069 this makes the name follow that of the standard Gnuplot module.
3075 this makes the name follow that of the standard Gnuplot module.
3070 GnuplotMagic can now be loaded at any time in mid-session.
3076 GnuplotMagic can now be loaded at any time in mid-session.
3071
3077
3072 2002-04-24 Fernando Perez <fperez@colorado.edu>
3078 2002-04-24 Fernando Perez <fperez@colorado.edu>
3073
3079
3074 * IPython/numutils.py: removed SIUnits. It doesn't properly set
3080 * IPython/numutils.py: removed SIUnits. It doesn't properly set
3075 the globals (IPython has its own namespace) and the
3081 the globals (IPython has its own namespace) and the
3076 PhysicalQuantity stuff is much better anyway.
3082 PhysicalQuantity stuff is much better anyway.
3077
3083
3078 * IPython/UserConfig/example-gnuplot.py (g2): Added gnuplot
3084 * IPython/UserConfig/example-gnuplot.py (g2): Added gnuplot
3079 embedding example to standard user directory for
3085 embedding example to standard user directory for
3080 distribution. Also put it in the manual.
3086 distribution. Also put it in the manual.
3081
3087
3082 * IPython/numutils.py (gnuplot_exec): Changed to take a gnuplot
3088 * IPython/numutils.py (gnuplot_exec): Changed to take a gnuplot
3083 instance as first argument (so it doesn't rely on some obscure
3089 instance as first argument (so it doesn't rely on some obscure
3084 hidden global).
3090 hidden global).
3085
3091
3086 * IPython/UserConfig/ipythonrc.py: put () back in accepted
3092 * IPython/UserConfig/ipythonrc.py: put () back in accepted
3087 delimiters. While it prevents ().TAB from working, it allows
3093 delimiters. While it prevents ().TAB from working, it allows
3088 completions in open (... expressions. This is by far a more common
3094 completions in open (... expressions. This is by far a more common
3089 case.
3095 case.
3090
3096
3091 2002-04-23 Fernando Perez <fperez@colorado.edu>
3097 2002-04-23 Fernando Perez <fperez@colorado.edu>
3092
3098
3093 * IPython/Extensions/InterpreterPasteInput.py: new
3099 * IPython/Extensions/InterpreterPasteInput.py: new
3094 syntax-processing module for pasting lines with >>> or ... at the
3100 syntax-processing module for pasting lines with >>> or ... at the
3095 start.
3101 start.
3096
3102
3097 * IPython/Extensions/PhysicalQ_Interactive.py
3103 * IPython/Extensions/PhysicalQ_Interactive.py
3098 (PhysicalQuantityInteractive.__int__): fixed to work with either
3104 (PhysicalQuantityInteractive.__int__): fixed to work with either
3099 Numeric or math.
3105 Numeric or math.
3100
3106
3101 * IPython/UserConfig/ipythonrc-numeric.py: reorganized the
3107 * IPython/UserConfig/ipythonrc-numeric.py: reorganized the
3102 provided profiles. Now we have:
3108 provided profiles. Now we have:
3103 -math -> math module as * and cmath with its own namespace.
3109 -math -> math module as * and cmath with its own namespace.
3104 -numeric -> Numeric as *, plus gnuplot & grace
3110 -numeric -> Numeric as *, plus gnuplot & grace
3105 -physics -> same as before
3111 -physics -> same as before
3106
3112
3107 * IPython/Magic.py (Magic.magic_magic): Fixed bug where
3113 * IPython/Magic.py (Magic.magic_magic): Fixed bug where
3108 user-defined magics wouldn't be found by @magic if they were
3114 user-defined magics wouldn't be found by @magic if they were
3109 defined as class methods. Also cleaned up the namespace search
3115 defined as class methods. Also cleaned up the namespace search
3110 logic and the string building (to use %s instead of many repeated
3116 logic and the string building (to use %s instead of many repeated
3111 string adds).
3117 string adds).
3112
3118
3113 * IPython/UserConfig/example-magic.py (magic_foo): updated example
3119 * IPython/UserConfig/example-magic.py (magic_foo): updated example
3114 of user-defined magics to operate with class methods (cleaner, in
3120 of user-defined magics to operate with class methods (cleaner, in
3115 line with the gnuplot code).
3121 line with the gnuplot code).
3116
3122
3117 2002-04-22 Fernando Perez <fperez@colorado.edu>
3123 2002-04-22 Fernando Perez <fperez@colorado.edu>
3118
3124
3119 * setup.py: updated dependency list so that manual is updated when
3125 * setup.py: updated dependency list so that manual is updated when
3120 all included files change.
3126 all included files change.
3121
3127
3122 * IPython/ipmaker.py (make_IPython): Fixed bug which was ignoring
3128 * IPython/ipmaker.py (make_IPython): Fixed bug which was ignoring
3123 the delimiter removal option (the fix is ugly right now).
3129 the delimiter removal option (the fix is ugly right now).
3124
3130
3125 * IPython/UserConfig/ipythonrc-physics.py: simplified not to load
3131 * IPython/UserConfig/ipythonrc-physics.py: simplified not to load
3126 all of the math profile (quicker loading, no conflict between
3132 all of the math profile (quicker loading, no conflict between
3127 g-9.8 and g-gnuplot).
3133 g-9.8 and g-gnuplot).
3128
3134
3129 * IPython/CrashHandler.py (CrashHandler.__call__): changed default
3135 * IPython/CrashHandler.py (CrashHandler.__call__): changed default
3130 name of post-mortem files to IPython_crash_report.txt.
3136 name of post-mortem files to IPython_crash_report.txt.
3131
3137
3132 * Cleanup/update of the docs. Added all the new readline info and
3138 * Cleanup/update of the docs. Added all the new readline info and
3133 formatted all lists as 'real lists'.
3139 formatted all lists as 'real lists'.
3134
3140
3135 * IPython/ipmaker.py (make_IPython): removed now-obsolete
3141 * IPython/ipmaker.py (make_IPython): removed now-obsolete
3136 tab-completion options, since the full readline parse_and_bind is
3142 tab-completion options, since the full readline parse_and_bind is
3137 now accessible.
3143 now accessible.
3138
3144
3139 * IPython/iplib.py (InteractiveShell.init_readline): Changed
3145 * IPython/iplib.py (InteractiveShell.init_readline): Changed
3140 handling of readline options. Now users can specify any string to
3146 handling of readline options. Now users can specify any string to
3141 be passed to parse_and_bind(), as well as the delimiters to be
3147 be passed to parse_and_bind(), as well as the delimiters to be
3142 removed.
3148 removed.
3143 (InteractiveShell.__init__): Added __name__ to the global
3149 (InteractiveShell.__init__): Added __name__ to the global
3144 namespace so that things like Itpl which rely on its existence
3150 namespace so that things like Itpl which rely on its existence
3145 don't crash.
3151 don't crash.
3146 (InteractiveShell._prefilter): Defined the default with a _ so
3152 (InteractiveShell._prefilter): Defined the default with a _ so
3147 that prefilter() is easier to override, while the default one
3153 that prefilter() is easier to override, while the default one
3148 remains available.
3154 remains available.
3149
3155
3150 2002-04-18 Fernando Perez <fperez@colorado.edu>
3156 2002-04-18 Fernando Perez <fperez@colorado.edu>
3151
3157
3152 * Added information about pdb in the docs.
3158 * Added information about pdb in the docs.
3153
3159
3154 2002-04-17 Fernando Perez <fperez@colorado.edu>
3160 2002-04-17 Fernando Perez <fperez@colorado.edu>
3155
3161
3156 * IPython/ipmaker.py (make_IPython): added rc_override option to
3162 * IPython/ipmaker.py (make_IPython): added rc_override option to
3157 allow passing config options at creation time which may override
3163 allow passing config options at creation time which may override
3158 anything set in the config files or command line. This is
3164 anything set in the config files or command line. This is
3159 particularly useful for configuring embedded instances.
3165 particularly useful for configuring embedded instances.
3160
3166
3161 2002-04-15 Fernando Perez <fperez@colorado.edu>
3167 2002-04-15 Fernando Perez <fperez@colorado.edu>
3162
3168
3163 * IPython/Logger.py (Logger.log): Fixed a nasty bug which could
3169 * IPython/Logger.py (Logger.log): Fixed a nasty bug which could
3164 crash embedded instances because of the input cache falling out of
3170 crash embedded instances because of the input cache falling out of
3165 sync with the output counter.
3171 sync with the output counter.
3166
3172
3167 * IPython/Shell.py (IPythonShellEmbed.__init__): added a debug
3173 * IPython/Shell.py (IPythonShellEmbed.__init__): added a debug
3168 mode which calls pdb after an uncaught exception in IPython itself.
3174 mode which calls pdb after an uncaught exception in IPython itself.
3169
3175
3170 2002-04-14 Fernando Perez <fperez@colorado.edu>
3176 2002-04-14 Fernando Perez <fperez@colorado.edu>
3171
3177
3172 * IPython/iplib.py (InteractiveShell.showtraceback): pdb mucks up
3178 * IPython/iplib.py (InteractiveShell.showtraceback): pdb mucks up
3173 readline, fix it back after each call.
3179 readline, fix it back after each call.
3174
3180
3175 * IPython/ultraTB.py (AutoFormattedTB.__text): made text a private
3181 * IPython/ultraTB.py (AutoFormattedTB.__text): made text a private
3176 method to force all access via __call__(), which guarantees that
3182 method to force all access via __call__(), which guarantees that
3177 traceback references are properly deleted.
3183 traceback references are properly deleted.
3178
3184
3179 * IPython/Prompts.py (CachedOutput._display): minor fixes to
3185 * IPython/Prompts.py (CachedOutput._display): minor fixes to
3180 improve printing when pprint is in use.
3186 improve printing when pprint is in use.
3181
3187
3182 2002-04-13 Fernando Perez <fperez@colorado.edu>
3188 2002-04-13 Fernando Perez <fperez@colorado.edu>
3183
3189
3184 * IPython/Shell.py (IPythonShellEmbed.__call__): SystemExit
3190 * IPython/Shell.py (IPythonShellEmbed.__call__): SystemExit
3185 exceptions aren't caught anymore. If the user triggers one, he
3191 exceptions aren't caught anymore. If the user triggers one, he
3186 should know why he's doing it and it should go all the way up,
3192 should know why he's doing it and it should go all the way up,
3187 just like any other exception. So now @abort will fully kill the
3193 just like any other exception. So now @abort will fully kill the
3188 embedded interpreter and the embedding code (unless that happens
3194 embedded interpreter and the embedding code (unless that happens
3189 to catch SystemExit).
3195 to catch SystemExit).
3190
3196
3191 * IPython/ultraTB.py (VerboseTB.__init__): added a call_pdb flag
3197 * IPython/ultraTB.py (VerboseTB.__init__): added a call_pdb flag
3192 and a debugger() method to invoke the interactive pdb debugger
3198 and a debugger() method to invoke the interactive pdb debugger
3193 after printing exception information. Also added the corresponding
3199 after printing exception information. Also added the corresponding
3194 -pdb option and @pdb magic to control this feature, and updated
3200 -pdb option and @pdb magic to control this feature, and updated
3195 the docs. After a suggestion from Christopher Hart
3201 the docs. After a suggestion from Christopher Hart
3196 (hart-AT-caltech.edu).
3202 (hart-AT-caltech.edu).
3197
3203
3198 2002-04-12 Fernando Perez <fperez@colorado.edu>
3204 2002-04-12 Fernando Perez <fperez@colorado.edu>
3199
3205
3200 * IPython/Shell.py (IPythonShellEmbed.__init__): modified to use
3206 * IPython/Shell.py (IPythonShellEmbed.__init__): modified to use
3201 the exception handlers defined by the user (not the CrashHandler)
3207 the exception handlers defined by the user (not the CrashHandler)
3202 so that user exceptions don't trigger an ipython bug report.
3208 so that user exceptions don't trigger an ipython bug report.
3203
3209
3204 * IPython/ultraTB.py (ColorTB.__init__): made the color scheme
3210 * IPython/ultraTB.py (ColorTB.__init__): made the color scheme
3205 configurable (it should have always been so).
3211 configurable (it should have always been so).
3206
3212
3207 2002-03-26 Fernando Perez <fperez@colorado.edu>
3213 2002-03-26 Fernando Perez <fperez@colorado.edu>
3208
3214
3209 * IPython/Shell.py (IPythonShellEmbed.__call__): many changes here
3215 * IPython/Shell.py (IPythonShellEmbed.__call__): many changes here
3210 and there to fix embedding namespace issues. This should all be
3216 and there to fix embedding namespace issues. This should all be
3211 done in a more elegant way.
3217 done in a more elegant way.
3212
3218
3213 2002-03-25 Fernando Perez <fperez@colorado.edu>
3219 2002-03-25 Fernando Perez <fperez@colorado.edu>
3214
3220
3215 * IPython/genutils.py (get_home_dir): Try to make it work under
3221 * IPython/genutils.py (get_home_dir): Try to make it work under
3216 win9x also.
3222 win9x also.
3217
3223
3218 2002-03-20 Fernando Perez <fperez@colorado.edu>
3224 2002-03-20 Fernando Perez <fperez@colorado.edu>
3219
3225
3220 * IPython/Shell.py (IPythonShellEmbed.__init__): leave
3226 * IPython/Shell.py (IPythonShellEmbed.__init__): leave
3221 sys.displayhook untouched upon __init__.
3227 sys.displayhook untouched upon __init__.
3222
3228
3223 2002-03-19 Fernando Perez <fperez@colorado.edu>
3229 2002-03-19 Fernando Perez <fperez@colorado.edu>
3224
3230
3225 * Released 0.2.9 (for embedding bug, basically).
3231 * Released 0.2.9 (for embedding bug, basically).
3226
3232
3227 * IPython/Shell.py (IPythonShellEmbed.__call__): Trap SystemExit
3233 * IPython/Shell.py (IPythonShellEmbed.__call__): Trap SystemExit
3228 exceptions so that enclosing shell's state can be restored.
3234 exceptions so that enclosing shell's state can be restored.
3229
3235
3230 * Changed magic_gnuplot.py to magic-gnuplot.py to standardize
3236 * Changed magic_gnuplot.py to magic-gnuplot.py to standardize
3231 naming conventions in the .ipython/ dir.
3237 naming conventions in the .ipython/ dir.
3232
3238
3233 * IPython/iplib.py (InteractiveShell.init_readline): removed '-'
3239 * IPython/iplib.py (InteractiveShell.init_readline): removed '-'
3234 from delimiters list so filenames with - in them get expanded.
3240 from delimiters list so filenames with - in them get expanded.
3235
3241
3236 * IPython/Shell.py (IPythonShellEmbed.__call__): fixed bug with
3242 * IPython/Shell.py (IPythonShellEmbed.__call__): fixed bug with
3237 sys.displayhook not being properly restored after an embedded call.
3243 sys.displayhook not being properly restored after an embedded call.
3238
3244
3239 2002-03-18 Fernando Perez <fperez@colorado.edu>
3245 2002-03-18 Fernando Perez <fperez@colorado.edu>
3240
3246
3241 * Released 0.2.8
3247 * Released 0.2.8
3242
3248
3243 * IPython/iplib.py (InteractiveShell.user_setup): fixed bug where
3249 * IPython/iplib.py (InteractiveShell.user_setup): fixed bug where
3244 some files weren't being included in a -upgrade.
3250 some files weren't being included in a -upgrade.
3245 (InteractiveShell.init_readline): Added 'set show-all-if-ambiguous
3251 (InteractiveShell.init_readline): Added 'set show-all-if-ambiguous
3246 on' so that the first tab completes.
3252 on' so that the first tab completes.
3247 (InteractiveShell.handle_magic): fixed bug with spaces around
3253 (InteractiveShell.handle_magic): fixed bug with spaces around
3248 quotes breaking many magic commands.
3254 quotes breaking many magic commands.
3249
3255
3250 * setup.py: added note about ignoring the syntax error messages at
3256 * setup.py: added note about ignoring the syntax error messages at
3251 installation.
3257 installation.
3252
3258
3253 * IPython/UserConfig/magic_gnuplot.py (magic_gp): finished
3259 * IPython/UserConfig/magic_gnuplot.py (magic_gp): finished
3254 streamlining the gnuplot interface, now there's only one magic @gp.
3260 streamlining the gnuplot interface, now there's only one magic @gp.
3255
3261
3256 2002-03-17 Fernando Perez <fperez@colorado.edu>
3262 2002-03-17 Fernando Perez <fperez@colorado.edu>
3257
3263
3258 * IPython/UserConfig/magic_gnuplot.py: new name for the
3264 * IPython/UserConfig/magic_gnuplot.py: new name for the
3259 example-magic_pm.py file. Much enhanced system, now with a shell
3265 example-magic_pm.py file. Much enhanced system, now with a shell
3260 for communicating directly with gnuplot, one command at a time.
3266 for communicating directly with gnuplot, one command at a time.
3261
3267
3262 * IPython/Magic.py (Magic.magic_run): added option -n to prevent
3268 * IPython/Magic.py (Magic.magic_run): added option -n to prevent
3263 setting __name__=='__main__'.
3269 setting __name__=='__main__'.
3264
3270
3265 * IPython/UserConfig/example-magic_pm.py (magic_pm): Added
3271 * IPython/UserConfig/example-magic_pm.py (magic_pm): Added
3266 mini-shell for accessing gnuplot from inside ipython. Should
3272 mini-shell for accessing gnuplot from inside ipython. Should
3267 extend it later for grace access too. Inspired by Arnd's
3273 extend it later for grace access too. Inspired by Arnd's
3268 suggestion.
3274 suggestion.
3269
3275
3270 * IPython/iplib.py (InteractiveShell.handle_magic): fixed bug when
3276 * IPython/iplib.py (InteractiveShell.handle_magic): fixed bug when
3271 calling magic functions with () in their arguments. Thanks to Arnd
3277 calling magic functions with () in their arguments. Thanks to Arnd
3272 Baecker for pointing this to me.
3278 Baecker for pointing this to me.
3273
3279
3274 * IPython/numutils.py (sum_flat): fixed bug. Would recurse
3280 * IPython/numutils.py (sum_flat): fixed bug. Would recurse
3275 infinitely for integer or complex arrays (only worked with floats).
3281 infinitely for integer or complex arrays (only worked with floats).
3276
3282
3277 2002-03-16 Fernando Perez <fperez@colorado.edu>
3283 2002-03-16 Fernando Perez <fperez@colorado.edu>
3278
3284
3279 * setup.py: Merged setup and setup_windows into a single script
3285 * setup.py: Merged setup and setup_windows into a single script
3280 which properly handles things for windows users.
3286 which properly handles things for windows users.
3281
3287
3282 2002-03-15 Fernando Perez <fperez@colorado.edu>
3288 2002-03-15 Fernando Perez <fperez@colorado.edu>
3283
3289
3284 * Big change to the manual: now the magics are all automatically
3290 * Big change to the manual: now the magics are all automatically
3285 documented. This information is generated from their docstrings
3291 documented. This information is generated from their docstrings
3286 and put in a latex file included by the manual lyx file. This way
3292 and put in a latex file included by the manual lyx file. This way
3287 we get always up to date information for the magics. The manual
3293 we get always up to date information for the magics. The manual
3288 now also has proper version information, also auto-synced.
3294 now also has proper version information, also auto-synced.
3289
3295
3290 For this to work, an undocumented --magic_docstrings option was added.
3296 For this to work, an undocumented --magic_docstrings option was added.
3291
3297
3292 2002-03-13 Fernando Perez <fperez@colorado.edu>
3298 2002-03-13 Fernando Perez <fperez@colorado.edu>
3293
3299
3294 * IPython/ultraTB.py (TermColors): fixed problem with dark colors
3300 * IPython/ultraTB.py (TermColors): fixed problem with dark colors
3295 under CDE terminals. An explicit ;2 color reset is needed in the escapes.
3301 under CDE terminals. An explicit ;2 color reset is needed in the escapes.
3296
3302
3297 2002-03-12 Fernando Perez <fperez@colorado.edu>
3303 2002-03-12 Fernando Perez <fperez@colorado.edu>
3298
3304
3299 * IPython/ultraTB.py (TermColors): changed color escapes again to
3305 * IPython/ultraTB.py (TermColors): changed color escapes again to
3300 fix the (old, reintroduced) line-wrapping bug. Basically, if
3306 fix the (old, reintroduced) line-wrapping bug. Basically, if
3301 \001..\002 aren't given in the color escapes, lines get wrapped
3307 \001..\002 aren't given in the color escapes, lines get wrapped
3302 weirdly. But giving those screws up old xterms and emacs terms. So
3308 weirdly. But giving those screws up old xterms and emacs terms. So
3303 I added some logic for emacs terms to be ok, but I can't identify old
3309 I added some logic for emacs terms to be ok, but I can't identify old
3304 xterms separately ($TERM=='xterm' for many terminals, like konsole).
3310 xterms separately ($TERM=='xterm' for many terminals, like konsole).
3305
3311
3306 2002-03-10 Fernando Perez <fperez@colorado.edu>
3312 2002-03-10 Fernando Perez <fperez@colorado.edu>
3307
3313
3308 * IPython/usage.py (__doc__): Various documentation cleanups and
3314 * IPython/usage.py (__doc__): Various documentation cleanups and
3309 updates, both in usage docstrings and in the manual.
3315 updates, both in usage docstrings and in the manual.
3310
3316
3311 * IPython/Prompts.py (CachedOutput.set_colors): cleanups for
3317 * IPython/Prompts.py (CachedOutput.set_colors): cleanups for
3312 handling of caching. Set minimum acceptabe value for having a
3318 handling of caching. Set minimum acceptabe value for having a
3313 cache at 20 values.
3319 cache at 20 values.
3314
3320
3315 * IPython/iplib.py (InteractiveShell.user_setup): moved the
3321 * IPython/iplib.py (InteractiveShell.user_setup): moved the
3316 install_first_time function to a method, renamed it and added an
3322 install_first_time function to a method, renamed it and added an
3317 'upgrade' mode. Now people can update their config directory with
3323 'upgrade' mode. Now people can update their config directory with
3318 a simple command line switch (-upgrade, also new).
3324 a simple command line switch (-upgrade, also new).
3319
3325
3320 * IPython/Magic.py (Magic.magic_pfile): Made @pfile an alias to
3326 * IPython/Magic.py (Magic.magic_pfile): Made @pfile an alias to
3321 @file (convenient for automagic users under Python >= 2.2).
3327 @file (convenient for automagic users under Python >= 2.2).
3322 Removed @files (it seemed more like a plural than an abbrev. of
3328 Removed @files (it seemed more like a plural than an abbrev. of
3323 'file show').
3329 'file show').
3324
3330
3325 * IPython/iplib.py (install_first_time): Fixed crash if there were
3331 * IPython/iplib.py (install_first_time): Fixed crash if there were
3326 backup files ('~') in .ipython/ install directory.
3332 backup files ('~') in .ipython/ install directory.
3327
3333
3328 * IPython/ipmaker.py (make_IPython): fixes for new prompt
3334 * IPython/ipmaker.py (make_IPython): fixes for new prompt
3329 system. Things look fine, but these changes are fairly
3335 system. Things look fine, but these changes are fairly
3330 intrusive. Test them for a few days.
3336 intrusive. Test them for a few days.
3331
3337
3332 * IPython/Prompts.py (CachedOutput.__init__): Massive rewrite of
3338 * IPython/Prompts.py (CachedOutput.__init__): Massive rewrite of
3333 the prompts system. Now all in/out prompt strings are user
3339 the prompts system. Now all in/out prompt strings are user
3334 controllable. This is particularly useful for embedding, as one
3340 controllable. This is particularly useful for embedding, as one
3335 can tag embedded instances with particular prompts.
3341 can tag embedded instances with particular prompts.
3336
3342
3337 Also removed global use of sys.ps1/2, which now allows nested
3343 Also removed global use of sys.ps1/2, which now allows nested
3338 embeddings without any problems. Added command-line options for
3344 embeddings without any problems. Added command-line options for
3339 the prompt strings.
3345 the prompt strings.
3340
3346
3341 2002-03-08 Fernando Perez <fperez@colorado.edu>
3347 2002-03-08 Fernando Perez <fperez@colorado.edu>
3342
3348
3343 * IPython/UserConfig/example-embed-short.py (ipshell): added
3349 * IPython/UserConfig/example-embed-short.py (ipshell): added
3344 example file with the bare minimum code for embedding.
3350 example file with the bare minimum code for embedding.
3345
3351
3346 * IPython/Shell.py (IPythonShellEmbed.set_dummy_mode): added
3352 * IPython/Shell.py (IPythonShellEmbed.set_dummy_mode): added
3347 functionality for the embeddable shell to be activated/deactivated
3353 functionality for the embeddable shell to be activated/deactivated
3348 either globally or at each call.
3354 either globally or at each call.
3349
3355
3350 * IPython/Prompts.py (Prompt1.auto_rewrite): Fixes the problem of
3356 * IPython/Prompts.py (Prompt1.auto_rewrite): Fixes the problem of
3351 rewriting the prompt with '--->' for auto-inputs with proper
3357 rewriting the prompt with '--->' for auto-inputs with proper
3352 coloring. Now the previous UGLY hack in handle_auto() is gone, and
3358 coloring. Now the previous UGLY hack in handle_auto() is gone, and
3353 this is handled by the prompts class itself, as it should.
3359 this is handled by the prompts class itself, as it should.
3354
3360
3355 2002-03-05 Fernando Perez <fperez@colorado.edu>
3361 2002-03-05 Fernando Perez <fperez@colorado.edu>
3356
3362
3357 * IPython/Magic.py (Magic.magic_logstart): Changed @log to
3363 * IPython/Magic.py (Magic.magic_logstart): Changed @log to
3358 @logstart to avoid name clashes with the math log function.
3364 @logstart to avoid name clashes with the math log function.
3359
3365
3360 * Big updates to X/Emacs section of the manual.
3366 * Big updates to X/Emacs section of the manual.
3361
3367
3362 * Removed ipython_emacs. Milan explained to me how to pass
3368 * Removed ipython_emacs. Milan explained to me how to pass
3363 arguments to ipython through Emacs. Some day I'm going to end up
3369 arguments to ipython through Emacs. Some day I'm going to end up
3364 learning some lisp...
3370 learning some lisp...
3365
3371
3366 2002-03-04 Fernando Perez <fperez@colorado.edu>
3372 2002-03-04 Fernando Perez <fperez@colorado.edu>
3367
3373
3368 * IPython/ipython_emacs: Created script to be used as the
3374 * IPython/ipython_emacs: Created script to be used as the
3369 py-python-command Emacs variable so we can pass IPython
3375 py-python-command Emacs variable so we can pass IPython
3370 parameters. I can't figure out how to tell Emacs directly to pass
3376 parameters. I can't figure out how to tell Emacs directly to pass
3371 parameters to IPython, so a dummy shell script will do it.
3377 parameters to IPython, so a dummy shell script will do it.
3372
3378
3373 Other enhancements made for things to work better under Emacs'
3379 Other enhancements made for things to work better under Emacs'
3374 various types of terminals. Many thanks to Milan Zamazal
3380 various types of terminals. Many thanks to Milan Zamazal
3375 <pdm-AT-zamazal.org> for all the suggestions and pointers.
3381 <pdm-AT-zamazal.org> for all the suggestions and pointers.
3376
3382
3377 2002-03-01 Fernando Perez <fperez@colorado.edu>
3383 2002-03-01 Fernando Perez <fperez@colorado.edu>
3378
3384
3379 * IPython/ipmaker.py (make_IPython): added a --readline! option so
3385 * IPython/ipmaker.py (make_IPython): added a --readline! option so
3380 that loading of readline is now optional. This gives better
3386 that loading of readline is now optional. This gives better
3381 control to emacs users.
3387 control to emacs users.
3382
3388
3383 * IPython/ultraTB.py (__date__): Modified color escape sequences
3389 * IPython/ultraTB.py (__date__): Modified color escape sequences
3384 and now things work fine under xterm and in Emacs' term buffers
3390 and now things work fine under xterm and in Emacs' term buffers
3385 (though not shell ones). Well, in emacs you get colors, but all
3391 (though not shell ones). Well, in emacs you get colors, but all
3386 seem to be 'light' colors (no difference between dark and light
3392 seem to be 'light' colors (no difference between dark and light
3387 ones). But the garbage chars are gone, and also in xterms. It
3393 ones). But the garbage chars are gone, and also in xterms. It
3388 seems that now I'm using 'cleaner' ansi sequences.
3394 seems that now I'm using 'cleaner' ansi sequences.
3389
3395
3390 2002-02-21 Fernando Perez <fperez@colorado.edu>
3396 2002-02-21 Fernando Perez <fperez@colorado.edu>
3391
3397
3392 * Released 0.2.7 (mainly to publish the scoping fix).
3398 * Released 0.2.7 (mainly to publish the scoping fix).
3393
3399
3394 * IPython/Logger.py (Logger.logstate): added. A corresponding
3400 * IPython/Logger.py (Logger.logstate): added. A corresponding
3395 @logstate magic was created.
3401 @logstate magic was created.
3396
3402
3397 * IPython/Magic.py: fixed nested scoping problem under Python
3403 * IPython/Magic.py: fixed nested scoping problem under Python
3398 2.1.x (automagic wasn't working).
3404 2.1.x (automagic wasn't working).
3399
3405
3400 2002-02-20 Fernando Perez <fperez@colorado.edu>
3406 2002-02-20 Fernando Perez <fperez@colorado.edu>
3401
3407
3402 * Released 0.2.6.
3408 * Released 0.2.6.
3403
3409
3404 * IPython/OutputTrap.py (OutputTrap.__init__): added a 'quiet'
3410 * IPython/OutputTrap.py (OutputTrap.__init__): added a 'quiet'
3405 option so that logs can come out without any headers at all.
3411 option so that logs can come out without any headers at all.
3406
3412
3407 * IPython/UserConfig/ipythonrc-scipy.py: created a profile for
3413 * IPython/UserConfig/ipythonrc-scipy.py: created a profile for
3408 SciPy.
3414 SciPy.
3409
3415
3410 * IPython/iplib.py (InteractiveShell.embed_mainloop): Changed so
3416 * IPython/iplib.py (InteractiveShell.embed_mainloop): Changed so
3411 that embedded IPython calls don't require vars() to be explicitly
3417 that embedded IPython calls don't require vars() to be explicitly
3412 passed. Now they are extracted from the caller's frame (code
3418 passed. Now they are extracted from the caller's frame (code
3413 snatched from Eric Jones' weave). Added better documentation to
3419 snatched from Eric Jones' weave). Added better documentation to
3414 the section on embedding and the example file.
3420 the section on embedding and the example file.
3415
3421
3416 * IPython/genutils.py (page): Changed so that under emacs, it just
3422 * IPython/genutils.py (page): Changed so that under emacs, it just
3417 prints the string. You can then page up and down in the emacs
3423 prints the string. You can then page up and down in the emacs
3418 buffer itself. This is how the builtin help() works.
3424 buffer itself. This is how the builtin help() works.
3419
3425
3420 * IPython/Prompts.py (CachedOutput.__call__): Fixed issue with
3426 * IPython/Prompts.py (CachedOutput.__call__): Fixed issue with
3421 macro scoping: macros need to be executed in the user's namespace
3427 macro scoping: macros need to be executed in the user's namespace
3422 to work as if they had been typed by the user.
3428 to work as if they had been typed by the user.
3423
3429
3424 * IPython/Magic.py (Magic.magic_macro): Changed macros so they
3430 * IPython/Magic.py (Magic.magic_macro): Changed macros so they
3425 execute automatically (no need to type 'exec...'). They then
3431 execute automatically (no need to type 'exec...'). They then
3426 behave like 'true macros'. The printing system was also modified
3432 behave like 'true macros'. The printing system was also modified
3427 for this to work.
3433 for this to work.
3428
3434
3429 2002-02-19 Fernando Perez <fperez@colorado.edu>
3435 2002-02-19 Fernando Perez <fperez@colorado.edu>
3430
3436
3431 * IPython/genutils.py (page_file): new function for paging files
3437 * IPython/genutils.py (page_file): new function for paging files
3432 in an OS-independent way. Also necessary for file viewing to work
3438 in an OS-independent way. Also necessary for file viewing to work
3433 well inside Emacs buffers.
3439 well inside Emacs buffers.
3434 (page): Added checks for being in an emacs buffer.
3440 (page): Added checks for being in an emacs buffer.
3435 (page): fixed bug for Windows ($TERM isn't set in Windows). Fixed
3441 (page): fixed bug for Windows ($TERM isn't set in Windows). Fixed
3436 same bug in iplib.
3442 same bug in iplib.
3437
3443
3438 2002-02-18 Fernando Perez <fperez@colorado.edu>
3444 2002-02-18 Fernando Perez <fperez@colorado.edu>
3439
3445
3440 * IPython/iplib.py (InteractiveShell.init_readline): modified use
3446 * IPython/iplib.py (InteractiveShell.init_readline): modified use
3441 of readline so that IPython can work inside an Emacs buffer.
3447 of readline so that IPython can work inside an Emacs buffer.
3442
3448
3443 * IPython/ultraTB.py (AutoFormattedTB.__call__): some fixes to
3449 * IPython/ultraTB.py (AutoFormattedTB.__call__): some fixes to
3444 method signatures (they weren't really bugs, but it looks cleaner
3450 method signatures (they weren't really bugs, but it looks cleaner
3445 and keeps PyChecker happy).
3451 and keeps PyChecker happy).
3446
3452
3447 * IPython/ipmaker.py (make_IPython): added hooks Struct to __IP
3453 * IPython/ipmaker.py (make_IPython): added hooks Struct to __IP
3448 for implementing various user-defined hooks. Currently only
3454 for implementing various user-defined hooks. Currently only
3449 display is done.
3455 display is done.
3450
3456
3451 * IPython/Prompts.py (CachedOutput._display): changed display
3457 * IPython/Prompts.py (CachedOutput._display): changed display
3452 functions so that they can be dynamically changed by users easily.
3458 functions so that they can be dynamically changed by users easily.
3453
3459
3454 * IPython/Extensions/numeric_formats.py (num_display): added an
3460 * IPython/Extensions/numeric_formats.py (num_display): added an
3455 extension for printing NumPy arrays in flexible manners. It
3461 extension for printing NumPy arrays in flexible manners. It
3456 doesn't do anything yet, but all the structure is in
3462 doesn't do anything yet, but all the structure is in
3457 place. Ultimately the plan is to implement output format control
3463 place. Ultimately the plan is to implement output format control
3458 like in Octave.
3464 like in Octave.
3459
3465
3460 * IPython/Magic.py (Magic.lsmagic): changed so that bound magic
3466 * IPython/Magic.py (Magic.lsmagic): changed so that bound magic
3461 methods are found at run-time by all the automatic machinery.
3467 methods are found at run-time by all the automatic machinery.
3462
3468
3463 2002-02-17 Fernando Perez <fperez@colorado.edu>
3469 2002-02-17 Fernando Perez <fperez@colorado.edu>
3464
3470
3465 * setup_Windows.py (make_shortcut): documented. Cleaned up the
3471 * setup_Windows.py (make_shortcut): documented. Cleaned up the
3466 whole file a little.
3472 whole file a little.
3467
3473
3468 * ToDo: closed this document. Now there's a new_design.lyx
3474 * ToDo: closed this document. Now there's a new_design.lyx
3469 document for all new ideas. Added making a pdf of it for the
3475 document for all new ideas. Added making a pdf of it for the
3470 end-user distro.
3476 end-user distro.
3471
3477
3472 * IPython/Logger.py (Logger.switch_log): Created this to replace
3478 * IPython/Logger.py (Logger.switch_log): Created this to replace
3473 logon() and logoff(). It also fixes a nasty crash reported by
3479 logon() and logoff(). It also fixes a nasty crash reported by
3474 Philip Hisley <compsys-AT-starpower.net>. Many thanks to him.
3480 Philip Hisley <compsys-AT-starpower.net>. Many thanks to him.
3475
3481
3476 * IPython/iplib.py (complete): got auto-completion to work with
3482 * IPython/iplib.py (complete): got auto-completion to work with
3477 automagic (I had wanted this for a long time).
3483 automagic (I had wanted this for a long time).
3478
3484
3479 * IPython/Magic.py (Magic.magic_files): Added @files as an alias
3485 * IPython/Magic.py (Magic.magic_files): Added @files as an alias
3480 to @file, since file() is now a builtin and clashes with automagic
3486 to @file, since file() is now a builtin and clashes with automagic
3481 for @file.
3487 for @file.
3482
3488
3483 * Made some new files: Prompts, CrashHandler, Magic, Logger. All
3489 * Made some new files: Prompts, CrashHandler, Magic, Logger. All
3484 of this was previously in iplib, which had grown to more than 2000
3490 of this was previously in iplib, which had grown to more than 2000
3485 lines, way too long. No new functionality, but it makes managing
3491 lines, way too long. No new functionality, but it makes managing
3486 the code a bit easier.
3492 the code a bit easier.
3487
3493
3488 * IPython/iplib.py (IPythonCrashHandler.__call__): Added version
3494 * IPython/iplib.py (IPythonCrashHandler.__call__): Added version
3489 information to crash reports.
3495 information to crash reports.
3490
3496
3491 2002-02-12 Fernando Perez <fperez@colorado.edu>
3497 2002-02-12 Fernando Perez <fperez@colorado.edu>
3492
3498
3493 * Released 0.2.5.
3499 * Released 0.2.5.
3494
3500
3495 2002-02-11 Fernando Perez <fperez@colorado.edu>
3501 2002-02-11 Fernando Perez <fperez@colorado.edu>
3496
3502
3497 * Wrote a relatively complete Windows installer. It puts
3503 * Wrote a relatively complete Windows installer. It puts
3498 everything in place, creates Start Menu entries and fixes the
3504 everything in place, creates Start Menu entries and fixes the
3499 color issues. Nothing fancy, but it works.
3505 color issues. Nothing fancy, but it works.
3500
3506
3501 2002-02-10 Fernando Perez <fperez@colorado.edu>
3507 2002-02-10 Fernando Perez <fperez@colorado.edu>
3502
3508
3503 * IPython/iplib.py (InteractiveShell.safe_execfile): added an
3509 * IPython/iplib.py (InteractiveShell.safe_execfile): added an
3504 os.path.expanduser() call so that we can type @run ~/myfile.py and
3510 os.path.expanduser() call so that we can type @run ~/myfile.py and
3505 have thigs work as expected.
3511 have thigs work as expected.
3506
3512
3507 * IPython/genutils.py (page): fixed exception handling so things
3513 * IPython/genutils.py (page): fixed exception handling so things
3508 work both in Unix and Windows correctly. Quitting a pager triggers
3514 work both in Unix and Windows correctly. Quitting a pager triggers
3509 an IOError/broken pipe in Unix, and in windows not finding a pager
3515 an IOError/broken pipe in Unix, and in windows not finding a pager
3510 is also an IOError, so I had to actually look at the return value
3516 is also an IOError, so I had to actually look at the return value
3511 of the exception, not just the exception itself. Should be ok now.
3517 of the exception, not just the exception itself. Should be ok now.
3512
3518
3513 * IPython/ultraTB.py (ColorSchemeTable.set_active_scheme):
3519 * IPython/ultraTB.py (ColorSchemeTable.set_active_scheme):
3514 modified to allow case-insensitive color scheme changes.
3520 modified to allow case-insensitive color scheme changes.
3515
3521
3516 2002-02-09 Fernando Perez <fperez@colorado.edu>
3522 2002-02-09 Fernando Perez <fperez@colorado.edu>
3517
3523
3518 * IPython/genutils.py (native_line_ends): new function to leave
3524 * IPython/genutils.py (native_line_ends): new function to leave
3519 user config files with os-native line-endings.
3525 user config files with os-native line-endings.
3520
3526
3521 * README and manual updates.
3527 * README and manual updates.
3522
3528
3523 * IPython/genutils.py: fixed unicode bug: use types.StringTypes
3529 * IPython/genutils.py: fixed unicode bug: use types.StringTypes
3524 instead of StringType to catch Unicode strings.
3530 instead of StringType to catch Unicode strings.
3525
3531
3526 * IPython/genutils.py (filefind): fixed bug for paths with
3532 * IPython/genutils.py (filefind): fixed bug for paths with
3527 embedded spaces (very common in Windows).
3533 embedded spaces (very common in Windows).
3528
3534
3529 * IPython/ipmaker.py (make_IPython): added a '.ini' to the rc
3535 * IPython/ipmaker.py (make_IPython): added a '.ini' to the rc
3530 files under Windows, so that they get automatically associated
3536 files under Windows, so that they get automatically associated
3531 with a text editor. Windows makes it a pain to handle
3537 with a text editor. Windows makes it a pain to handle
3532 extension-less files.
3538 extension-less files.
3533
3539
3534 * IPython/iplib.py (InteractiveShell.init_readline): Made the
3540 * IPython/iplib.py (InteractiveShell.init_readline): Made the
3535 warning about readline only occur for Posix. In Windows there's no
3541 warning about readline only occur for Posix. In Windows there's no
3536 way to get readline, so why bother with the warning.
3542 way to get readline, so why bother with the warning.
3537
3543
3538 * IPython/Struct.py (Struct.__str__): fixed to use self.__dict__
3544 * IPython/Struct.py (Struct.__str__): fixed to use self.__dict__
3539 for __str__ instead of dir(self), since dir() changed in 2.2.
3545 for __str__ instead of dir(self), since dir() changed in 2.2.
3540
3546
3541 * Ported to Windows! Tested on XP, I suspect it should work fine
3547 * Ported to Windows! Tested on XP, I suspect it should work fine
3542 on NT/2000, but I don't think it will work on 98 et al. That
3548 on NT/2000, but I don't think it will work on 98 et al. That
3543 series of Windows is such a piece of junk anyway that I won't try
3549 series of Windows is such a piece of junk anyway that I won't try
3544 porting it there. The XP port was straightforward, showed a few
3550 porting it there. The XP port was straightforward, showed a few
3545 bugs here and there (fixed all), in particular some string
3551 bugs here and there (fixed all), in particular some string
3546 handling stuff which required considering Unicode strings (which
3552 handling stuff which required considering Unicode strings (which
3547 Windows uses). This is good, but hasn't been too tested :) No
3553 Windows uses). This is good, but hasn't been too tested :) No
3548 fancy installer yet, I'll put a note in the manual so people at
3554 fancy installer yet, I'll put a note in the manual so people at
3549 least make manually a shortcut.
3555 least make manually a shortcut.
3550
3556
3551 * IPython/iplib.py (Magic.magic_colors): Unified the color options
3557 * IPython/iplib.py (Magic.magic_colors): Unified the color options
3552 into a single one, "colors". This now controls both prompt and
3558 into a single one, "colors". This now controls both prompt and
3553 exception color schemes, and can be changed both at startup
3559 exception color schemes, and can be changed both at startup
3554 (either via command-line switches or via ipythonrc files) and at
3560 (either via command-line switches or via ipythonrc files) and at
3555 runtime, with @colors.
3561 runtime, with @colors.
3556 (Magic.magic_run): renamed @prun to @run and removed the old
3562 (Magic.magic_run): renamed @prun to @run and removed the old
3557 @run. The two were too similar to warrant keeping both.
3563 @run. The two were too similar to warrant keeping both.
3558
3564
3559 2002-02-03 Fernando Perez <fperez@colorado.edu>
3565 2002-02-03 Fernando Perez <fperez@colorado.edu>
3560
3566
3561 * IPython/iplib.py (install_first_time): Added comment on how to
3567 * IPython/iplib.py (install_first_time): Added comment on how to
3562 configure the color options for first-time users. Put a <return>
3568 configure the color options for first-time users. Put a <return>
3563 request at the end so that small-terminal users get a chance to
3569 request at the end so that small-terminal users get a chance to
3564 read the startup info.
3570 read the startup info.
3565
3571
3566 2002-01-23 Fernando Perez <fperez@colorado.edu>
3572 2002-01-23 Fernando Perez <fperez@colorado.edu>
3567
3573
3568 * IPython/iplib.py (CachedOutput.update): Changed output memory
3574 * IPython/iplib.py (CachedOutput.update): Changed output memory
3569 variable names from _o,_oo,_ooo,_o<n> to simply _,__,___,_<n>. For
3575 variable names from _o,_oo,_ooo,_o<n> to simply _,__,___,_<n>. For
3570 input history we still use _i. Did this b/c these variable are
3576 input history we still use _i. Did this b/c these variable are
3571 very commonly used in interactive work, so the less we need to
3577 very commonly used in interactive work, so the less we need to
3572 type the better off we are.
3578 type the better off we are.
3573 (Magic.magic_prun): updated @prun to better handle the namespaces
3579 (Magic.magic_prun): updated @prun to better handle the namespaces
3574 the file will run in, including a fix for __name__ not being set
3580 the file will run in, including a fix for __name__ not being set
3575 before.
3581 before.
3576
3582
3577 2002-01-20 Fernando Perez <fperez@colorado.edu>
3583 2002-01-20 Fernando Perez <fperez@colorado.edu>
3578
3584
3579 * IPython/ultraTB.py (VerboseTB.linereader): Fixed printing of
3585 * IPython/ultraTB.py (VerboseTB.linereader): Fixed printing of
3580 extra garbage for Python 2.2. Need to look more carefully into
3586 extra garbage for Python 2.2. Need to look more carefully into
3581 this later.
3587 this later.
3582
3588
3583 2002-01-19 Fernando Perez <fperez@colorado.edu>
3589 2002-01-19 Fernando Perez <fperez@colorado.edu>
3584
3590
3585 * IPython/iplib.py (InteractiveShell.showtraceback): fixed to
3591 * IPython/iplib.py (InteractiveShell.showtraceback): fixed to
3586 display SyntaxError exceptions properly formatted when they occur
3592 display SyntaxError exceptions properly formatted when they occur
3587 (they can be triggered by imported code).
3593 (they can be triggered by imported code).
3588
3594
3589 2002-01-18 Fernando Perez <fperez@colorado.edu>
3595 2002-01-18 Fernando Perez <fperez@colorado.edu>
3590
3596
3591 * IPython/iplib.py (InteractiveShell.safe_execfile): now
3597 * IPython/iplib.py (InteractiveShell.safe_execfile): now
3592 SyntaxError exceptions are reported nicely formatted, instead of
3598 SyntaxError exceptions are reported nicely formatted, instead of
3593 spitting out only offset information as before.
3599 spitting out only offset information as before.
3594 (Magic.magic_prun): Added the @prun function for executing
3600 (Magic.magic_prun): Added the @prun function for executing
3595 programs with command line args inside IPython.
3601 programs with command line args inside IPython.
3596
3602
3597 2002-01-16 Fernando Perez <fperez@colorado.edu>
3603 2002-01-16 Fernando Perez <fperez@colorado.edu>
3598
3604
3599 * IPython/iplib.py (Magic.magic_hist): Changed @hist and @dhist
3605 * IPython/iplib.py (Magic.magic_hist): Changed @hist and @dhist
3600 to *not* include the last item given in a range. This brings their
3606 to *not* include the last item given in a range. This brings their
3601 behavior in line with Python's slicing:
3607 behavior in line with Python's slicing:
3602 a[n1:n2] -> a[n1]...a[n2-1]
3608 a[n1:n2] -> a[n1]...a[n2-1]
3603 It may be a bit less convenient, but I prefer to stick to Python's
3609 It may be a bit less convenient, but I prefer to stick to Python's
3604 conventions *everywhere*, so users never have to wonder.
3610 conventions *everywhere*, so users never have to wonder.
3605 (Magic.magic_macro): Added @macro function to ease the creation of
3611 (Magic.magic_macro): Added @macro function to ease the creation of
3606 macros.
3612 macros.
3607
3613
3608 2002-01-05 Fernando Perez <fperez@colorado.edu>
3614 2002-01-05 Fernando Perez <fperez@colorado.edu>
3609
3615
3610 * Released 0.2.4.
3616 * Released 0.2.4.
3611
3617
3612 * IPython/iplib.py (Magic.magic_pdef):
3618 * IPython/iplib.py (Magic.magic_pdef):
3613 (InteractiveShell.safe_execfile): report magic lines and error
3619 (InteractiveShell.safe_execfile): report magic lines and error
3614 lines without line numbers so one can easily copy/paste them for
3620 lines without line numbers so one can easily copy/paste them for
3615 re-execution.
3621 re-execution.
3616
3622
3617 * Updated manual with recent changes.
3623 * Updated manual with recent changes.
3618
3624
3619 * IPython/iplib.py (Magic.magic_oinfo): added constructor
3625 * IPython/iplib.py (Magic.magic_oinfo): added constructor
3620 docstring printing when class? is called. Very handy for knowing
3626 docstring printing when class? is called. Very handy for knowing
3621 how to create class instances (as long as __init__ is well
3627 how to create class instances (as long as __init__ is well
3622 documented, of course :)
3628 documented, of course :)
3623 (Magic.magic_doc): print both class and constructor docstrings.
3629 (Magic.magic_doc): print both class and constructor docstrings.
3624 (Magic.magic_pdef): give constructor info if passed a class and
3630 (Magic.magic_pdef): give constructor info if passed a class and
3625 __call__ info for callable object instances.
3631 __call__ info for callable object instances.
3626
3632
3627 2002-01-04 Fernando Perez <fperez@colorado.edu>
3633 2002-01-04 Fernando Perez <fperez@colorado.edu>
3628
3634
3629 * Made deep_reload() off by default. It doesn't always work
3635 * Made deep_reload() off by default. It doesn't always work
3630 exactly as intended, so it's probably safer to have it off. It's
3636 exactly as intended, so it's probably safer to have it off. It's
3631 still available as dreload() anyway, so nothing is lost.
3637 still available as dreload() anyway, so nothing is lost.
3632
3638
3633 2002-01-02 Fernando Perez <fperez@colorado.edu>
3639 2002-01-02 Fernando Perez <fperez@colorado.edu>
3634
3640
3635 * Released 0.2.3 (contacted R.Singh at CU about biopython course,
3641 * Released 0.2.3 (contacted R.Singh at CU about biopython course,
3636 so I wanted an updated release).
3642 so I wanted an updated release).
3637
3643
3638 2001-12-27 Fernando Perez <fperez@colorado.edu>
3644 2001-12-27 Fernando Perez <fperez@colorado.edu>
3639
3645
3640 * IPython/iplib.py (InteractiveShell.interact): Added the original
3646 * IPython/iplib.py (InteractiveShell.interact): Added the original
3641 code from 'code.py' for this module in order to change the
3647 code from 'code.py' for this module in order to change the
3642 handling of a KeyboardInterrupt. This was necessary b/c otherwise
3648 handling of a KeyboardInterrupt. This was necessary b/c otherwise
3643 the history cache would break when the user hit Ctrl-C, and
3649 the history cache would break when the user hit Ctrl-C, and
3644 interact() offers no way to add any hooks to it.
3650 interact() offers no way to add any hooks to it.
3645
3651
3646 2001-12-23 Fernando Perez <fperez@colorado.edu>
3652 2001-12-23 Fernando Perez <fperez@colorado.edu>
3647
3653
3648 * setup.py: added check for 'MANIFEST' before trying to remove
3654 * setup.py: added check for 'MANIFEST' before trying to remove
3649 it. Thanks to Sean Reifschneider.
3655 it. Thanks to Sean Reifschneider.
3650
3656
3651 2001-12-22 Fernando Perez <fperez@colorado.edu>
3657 2001-12-22 Fernando Perez <fperez@colorado.edu>
3652
3658
3653 * Released 0.2.2.
3659 * Released 0.2.2.
3654
3660
3655 * Finished (reasonably) writing the manual. Later will add the
3661 * Finished (reasonably) writing the manual. Later will add the
3656 python-standard navigation stylesheets, but for the time being
3662 python-standard navigation stylesheets, but for the time being
3657 it's fairly complete. Distribution will include html and pdf
3663 it's fairly complete. Distribution will include html and pdf
3658 versions.
3664 versions.
3659
3665
3660 * Bugfix: '.' wasn't being added to sys.path. Thanks to Prabhu
3666 * Bugfix: '.' wasn't being added to sys.path. Thanks to Prabhu
3661 (MayaVi author).
3667 (MayaVi author).
3662
3668
3663 2001-12-21 Fernando Perez <fperez@colorado.edu>
3669 2001-12-21 Fernando Perez <fperez@colorado.edu>
3664
3670
3665 * Released 0.2.1. Barring any nasty bugs, this is it as far as a
3671 * Released 0.2.1. Barring any nasty bugs, this is it as far as a
3666 good public release, I think (with the manual and the distutils
3672 good public release, I think (with the manual and the distutils
3667 installer). The manual can use some work, but that can go
3673 installer). The manual can use some work, but that can go
3668 slowly. Otherwise I think it's quite nice for end users. Next
3674 slowly. Otherwise I think it's quite nice for end users. Next
3669 summer, rewrite the guts of it...
3675 summer, rewrite the guts of it...
3670
3676
3671 * Changed format of ipythonrc files to use whitespace as the
3677 * Changed format of ipythonrc files to use whitespace as the
3672 separator instead of an explicit '='. Cleaner.
3678 separator instead of an explicit '='. Cleaner.
3673
3679
3674 2001-12-20 Fernando Perez <fperez@colorado.edu>
3680 2001-12-20 Fernando Perez <fperez@colorado.edu>
3675
3681
3676 * Started a manual in LyX. For now it's just a quick merge of the
3682 * Started a manual in LyX. For now it's just a quick merge of the
3677 various internal docstrings and READMEs. Later it may grow into a
3683 various internal docstrings and READMEs. Later it may grow into a
3678 nice, full-blown manual.
3684 nice, full-blown manual.
3679
3685
3680 * Set up a distutils based installer. Installation should now be
3686 * Set up a distutils based installer. Installation should now be
3681 trivially simple for end-users.
3687 trivially simple for end-users.
3682
3688
3683 2001-12-11 Fernando Perez <fperez@colorado.edu>
3689 2001-12-11 Fernando Perez <fperez@colorado.edu>
3684
3690
3685 * Released 0.2.0. First public release, announced it at
3691 * Released 0.2.0. First public release, announced it at
3686 comp.lang.python. From now on, just bugfixes...
3692 comp.lang.python. From now on, just bugfixes...
3687
3693
3688 * Went through all the files, set copyright/license notices and
3694 * Went through all the files, set copyright/license notices and
3689 cleaned up things. Ready for release.
3695 cleaned up things. Ready for release.
3690
3696
3691 2001-12-10 Fernando Perez <fperez@colorado.edu>
3697 2001-12-10 Fernando Perez <fperez@colorado.edu>
3692
3698
3693 * Changed the first-time installer not to use tarfiles. It's more
3699 * Changed the first-time installer not to use tarfiles. It's more
3694 robust now and less unix-dependent. Also makes it easier for
3700 robust now and less unix-dependent. Also makes it easier for
3695 people to later upgrade versions.
3701 people to later upgrade versions.
3696
3702
3697 * Changed @exit to @abort to reflect the fact that it's pretty
3703 * Changed @exit to @abort to reflect the fact that it's pretty
3698 brutal (a sys.exit()). The difference between @abort and Ctrl-D
3704 brutal (a sys.exit()). The difference between @abort and Ctrl-D
3699 becomes significant only when IPyhton is embedded: in that case,
3705 becomes significant only when IPyhton is embedded: in that case,
3700 C-D closes IPython only, but @abort kills the enclosing program
3706 C-D closes IPython only, but @abort kills the enclosing program
3701 too (unless it had called IPython inside a try catching
3707 too (unless it had called IPython inside a try catching
3702 SystemExit).
3708 SystemExit).
3703
3709
3704 * Created Shell module which exposes the actuall IPython Shell
3710 * Created Shell module which exposes the actuall IPython Shell
3705 classes, currently the normal and the embeddable one. This at
3711 classes, currently the normal and the embeddable one. This at
3706 least offers a stable interface we won't need to change when
3712 least offers a stable interface we won't need to change when
3707 (later) the internals are rewritten. That rewrite will be confined
3713 (later) the internals are rewritten. That rewrite will be confined
3708 to iplib and ipmaker, but the Shell interface should remain as is.
3714 to iplib and ipmaker, but the Shell interface should remain as is.
3709
3715
3710 * Added embed module which offers an embeddable IPShell object,
3716 * Added embed module which offers an embeddable IPShell object,
3711 useful to fire up IPython *inside* a running program. Great for
3717 useful to fire up IPython *inside* a running program. Great for
3712 debugging or dynamical data analysis.
3718 debugging or dynamical data analysis.
3713
3719
3714 2001-12-08 Fernando Perez <fperez@colorado.edu>
3720 2001-12-08 Fernando Perez <fperez@colorado.edu>
3715
3721
3716 * Fixed small bug preventing seeing info from methods of defined
3722 * Fixed small bug preventing seeing info from methods of defined
3717 objects (incorrect namespace in _ofind()).
3723 objects (incorrect namespace in _ofind()).
3718
3724
3719 * Documentation cleanup. Moved the main usage docstrings to a
3725 * Documentation cleanup. Moved the main usage docstrings to a
3720 separate file, usage.py (cleaner to maintain, and hopefully in the
3726 separate file, usage.py (cleaner to maintain, and hopefully in the
3721 future some perlpod-like way of producing interactive, man and
3727 future some perlpod-like way of producing interactive, man and
3722 html docs out of it will be found).
3728 html docs out of it will be found).
3723
3729
3724 * Added @profile to see your profile at any time.
3730 * Added @profile to see your profile at any time.
3725
3731
3726 * Added @p as an alias for 'print'. It's especially convenient if
3732 * Added @p as an alias for 'print'. It's especially convenient if
3727 using automagic ('p x' prints x).
3733 using automagic ('p x' prints x).
3728
3734
3729 * Small cleanups and fixes after a pychecker run.
3735 * Small cleanups and fixes after a pychecker run.
3730
3736
3731 * Changed the @cd command to handle @cd - and @cd -<n> for
3737 * Changed the @cd command to handle @cd - and @cd -<n> for
3732 visiting any directory in _dh.
3738 visiting any directory in _dh.
3733
3739
3734 * Introduced _dh, a history of visited directories. @dhist prints
3740 * Introduced _dh, a history of visited directories. @dhist prints
3735 it out with numbers.
3741 it out with numbers.
3736
3742
3737 2001-12-07 Fernando Perez <fperez@colorado.edu>
3743 2001-12-07 Fernando Perez <fperez@colorado.edu>
3738
3744
3739 * Released 0.1.22
3745 * Released 0.1.22
3740
3746
3741 * Made initialization a bit more robust against invalid color
3747 * Made initialization a bit more robust against invalid color
3742 options in user input (exit, not traceback-crash).
3748 options in user input (exit, not traceback-crash).
3743
3749
3744 * Changed the bug crash reporter to write the report only in the
3750 * Changed the bug crash reporter to write the report only in the
3745 user's .ipython directory. That way IPython won't litter people's
3751 user's .ipython directory. That way IPython won't litter people's
3746 hard disks with crash files all over the place. Also print on
3752 hard disks with crash files all over the place. Also print on
3747 screen the necessary mail command.
3753 screen the necessary mail command.
3748
3754
3749 * With the new ultraTB, implemented LightBG color scheme for light
3755 * With the new ultraTB, implemented LightBG color scheme for light
3750 background terminals. A lot of people like white backgrounds, so I
3756 background terminals. A lot of people like white backgrounds, so I
3751 guess we should at least give them something readable.
3757 guess we should at least give them something readable.
3752
3758
3753 2001-12-06 Fernando Perez <fperez@colorado.edu>
3759 2001-12-06 Fernando Perez <fperez@colorado.edu>
3754
3760
3755 * Modified the structure of ultraTB. Now there's a proper class
3761 * Modified the structure of ultraTB. Now there's a proper class
3756 for tables of color schemes which allow adding schemes easily and
3762 for tables of color schemes which allow adding schemes easily and
3757 switching the active scheme without creating a new instance every
3763 switching the active scheme without creating a new instance every
3758 time (which was ridiculous). The syntax for creating new schemes
3764 time (which was ridiculous). The syntax for creating new schemes
3759 is also cleaner. I think ultraTB is finally done, with a clean
3765 is also cleaner. I think ultraTB is finally done, with a clean
3760 class structure. Names are also much cleaner (now there's proper
3766 class structure. Names are also much cleaner (now there's proper
3761 color tables, no need for every variable to also have 'color' in
3767 color tables, no need for every variable to also have 'color' in
3762 its name).
3768 its name).
3763
3769
3764 * Broke down genutils into separate files. Now genutils only
3770 * Broke down genutils into separate files. Now genutils only
3765 contains utility functions, and classes have been moved to their
3771 contains utility functions, and classes have been moved to their
3766 own files (they had enough independent functionality to warrant
3772 own files (they had enough independent functionality to warrant
3767 it): ConfigLoader, OutputTrap, Struct.
3773 it): ConfigLoader, OutputTrap, Struct.
3768
3774
3769 2001-12-05 Fernando Perez <fperez@colorado.edu>
3775 2001-12-05 Fernando Perez <fperez@colorado.edu>
3770
3776
3771 * IPython turns 21! Released version 0.1.21, as a candidate for
3777 * IPython turns 21! Released version 0.1.21, as a candidate for
3772 public consumption. If all goes well, release in a few days.
3778 public consumption. If all goes well, release in a few days.
3773
3779
3774 * Fixed path bug (files in Extensions/ directory wouldn't be found
3780 * Fixed path bug (files in Extensions/ directory wouldn't be found
3775 unless IPython/ was explicitly in sys.path).
3781 unless IPython/ was explicitly in sys.path).
3776
3782
3777 * Extended the FlexCompleter class as MagicCompleter to allow
3783 * Extended the FlexCompleter class as MagicCompleter to allow
3778 completion of @-starting lines.
3784 completion of @-starting lines.
3779
3785
3780 * Created __release__.py file as a central repository for release
3786 * Created __release__.py file as a central repository for release
3781 info that other files can read from.
3787 info that other files can read from.
3782
3788
3783 * Fixed small bug in logging: when logging was turned on in
3789 * Fixed small bug in logging: when logging was turned on in
3784 mid-session, old lines with special meanings (!@?) were being
3790 mid-session, old lines with special meanings (!@?) were being
3785 logged without the prepended comment, which is necessary since
3791 logged without the prepended comment, which is necessary since
3786 they are not truly valid python syntax. This should make session
3792 they are not truly valid python syntax. This should make session
3787 restores produce less errors.
3793 restores produce less errors.
3788
3794
3789 * The namespace cleanup forced me to make a FlexCompleter class
3795 * The namespace cleanup forced me to make a FlexCompleter class
3790 which is nothing but a ripoff of rlcompleter, but with selectable
3796 which is nothing but a ripoff of rlcompleter, but with selectable
3791 namespace (rlcompleter only works in __main__.__dict__). I'll try
3797 namespace (rlcompleter only works in __main__.__dict__). I'll try
3792 to submit a note to the authors to see if this change can be
3798 to submit a note to the authors to see if this change can be
3793 incorporated in future rlcompleter releases (Dec.6: done)
3799 incorporated in future rlcompleter releases (Dec.6: done)
3794
3800
3795 * More fixes to namespace handling. It was a mess! Now all
3801 * More fixes to namespace handling. It was a mess! Now all
3796 explicit references to __main__.__dict__ are gone (except when
3802 explicit references to __main__.__dict__ are gone (except when
3797 really needed) and everything is handled through the namespace
3803 really needed) and everything is handled through the namespace
3798 dicts in the IPython instance. We seem to be getting somewhere
3804 dicts in the IPython instance. We seem to be getting somewhere
3799 with this, finally...
3805 with this, finally...
3800
3806
3801 * Small documentation updates.
3807 * Small documentation updates.
3802
3808
3803 * Created the Extensions directory under IPython (with an
3809 * Created the Extensions directory under IPython (with an
3804 __init__.py). Put the PhysicalQ stuff there. This directory should
3810 __init__.py). Put the PhysicalQ stuff there. This directory should
3805 be used for all special-purpose extensions.
3811 be used for all special-purpose extensions.
3806
3812
3807 * File renaming:
3813 * File renaming:
3808 ipythonlib --> ipmaker
3814 ipythonlib --> ipmaker
3809 ipplib --> iplib
3815 ipplib --> iplib
3810 This makes a bit more sense in terms of what these files actually do.
3816 This makes a bit more sense in terms of what these files actually do.
3811
3817
3812 * Moved all the classes and functions in ipythonlib to ipplib, so
3818 * Moved all the classes and functions in ipythonlib to ipplib, so
3813 now ipythonlib only has make_IPython(). This will ease up its
3819 now ipythonlib only has make_IPython(). This will ease up its
3814 splitting in smaller functional chunks later.
3820 splitting in smaller functional chunks later.
3815
3821
3816 * Cleaned up (done, I think) output of @whos. Better column
3822 * Cleaned up (done, I think) output of @whos. Better column
3817 formatting, and now shows str(var) for as much as it can, which is
3823 formatting, and now shows str(var) for as much as it can, which is
3818 typically what one gets with a 'print var'.
3824 typically what one gets with a 'print var'.
3819
3825
3820 2001-12-04 Fernando Perez <fperez@colorado.edu>
3826 2001-12-04 Fernando Perez <fperez@colorado.edu>
3821
3827
3822 * Fixed namespace problems. Now builtin/IPyhton/user names get
3828 * Fixed namespace problems. Now builtin/IPyhton/user names get
3823 properly reported in their namespace. Internal namespace handling
3829 properly reported in their namespace. Internal namespace handling
3824 is finally getting decent (not perfect yet, but much better than
3830 is finally getting decent (not perfect yet, but much better than
3825 the ad-hoc mess we had).
3831 the ad-hoc mess we had).
3826
3832
3827 * Removed -exit option. If people just want to run a python
3833 * Removed -exit option. If people just want to run a python
3828 script, that's what the normal interpreter is for. Less
3834 script, that's what the normal interpreter is for. Less
3829 unnecessary options, less chances for bugs.
3835 unnecessary options, less chances for bugs.
3830
3836
3831 * Added a crash handler which generates a complete post-mortem if
3837 * Added a crash handler which generates a complete post-mortem if
3832 IPython crashes. This will help a lot in tracking bugs down the
3838 IPython crashes. This will help a lot in tracking bugs down the
3833 road.
3839 road.
3834
3840
3835 * Fixed nasty bug in auto-evaluation part of prefilter(). Names
3841 * Fixed nasty bug in auto-evaluation part of prefilter(). Names
3836 which were boud to functions being reassigned would bypass the
3842 which were boud to functions being reassigned would bypass the
3837 logger, breaking the sync of _il with the prompt counter. This
3843 logger, breaking the sync of _il with the prompt counter. This
3838 would then crash IPython later when a new line was logged.
3844 would then crash IPython later when a new line was logged.
3839
3845
3840 2001-12-02 Fernando Perez <fperez@colorado.edu>
3846 2001-12-02 Fernando Perez <fperez@colorado.edu>
3841
3847
3842 * Made IPython a package. This means people don't have to clutter
3848 * Made IPython a package. This means people don't have to clutter
3843 their sys.path with yet another directory. Changed the INSTALL
3849 their sys.path with yet another directory. Changed the INSTALL
3844 file accordingly.
3850 file accordingly.
3845
3851
3846 * Cleaned up the output of @who_ls, @who and @whos. @who_ls now
3852 * Cleaned up the output of @who_ls, @who and @whos. @who_ls now
3847 sorts its output (so @who shows it sorted) and @whos formats the
3853 sorts its output (so @who shows it sorted) and @whos formats the
3848 table according to the width of the first column. Nicer, easier to
3854 table according to the width of the first column. Nicer, easier to
3849 read. Todo: write a generic table_format() which takes a list of
3855 read. Todo: write a generic table_format() which takes a list of
3850 lists and prints it nicely formatted, with optional row/column
3856 lists and prints it nicely formatted, with optional row/column
3851 separators and proper padding and justification.
3857 separators and proper padding and justification.
3852
3858
3853 * Released 0.1.20
3859 * Released 0.1.20
3854
3860
3855 * Fixed bug in @log which would reverse the inputcache list (a
3861 * Fixed bug in @log which would reverse the inputcache list (a
3856 copy operation was missing).
3862 copy operation was missing).
3857
3863
3858 * Code cleanup. @config was changed to use page(). Better, since
3864 * Code cleanup. @config was changed to use page(). Better, since
3859 its output is always quite long.
3865 its output is always quite long.
3860
3866
3861 * Itpl is back as a dependency. I was having too many problems
3867 * Itpl is back as a dependency. I was having too many problems
3862 getting the parametric aliases to work reliably, and it's just
3868 getting the parametric aliases to work reliably, and it's just
3863 easier to code weird string operations with it than playing %()s
3869 easier to code weird string operations with it than playing %()s
3864 games. It's only ~6k, so I don't think it's too big a deal.
3870 games. It's only ~6k, so I don't think it's too big a deal.
3865
3871
3866 * Found (and fixed) a very nasty bug with history. !lines weren't
3872 * Found (and fixed) a very nasty bug with history. !lines weren't
3867 getting cached, and the out of sync caches would crash
3873 getting cached, and the out of sync caches would crash
3868 IPython. Fixed it by reorganizing the prefilter/handlers/logger
3874 IPython. Fixed it by reorganizing the prefilter/handlers/logger
3869 division of labor a bit better. Bug fixed, cleaner structure.
3875 division of labor a bit better. Bug fixed, cleaner structure.
3870
3876
3871 2001-12-01 Fernando Perez <fperez@colorado.edu>
3877 2001-12-01 Fernando Perez <fperez@colorado.edu>
3872
3878
3873 * Released 0.1.19
3879 * Released 0.1.19
3874
3880
3875 * Added option -n to @hist to prevent line number printing. Much
3881 * Added option -n to @hist to prevent line number printing. Much
3876 easier to copy/paste code this way.
3882 easier to copy/paste code this way.
3877
3883
3878 * Created global _il to hold the input list. Allows easy
3884 * Created global _il to hold the input list. Allows easy
3879 re-execution of blocks of code by slicing it (inspired by Janko's
3885 re-execution of blocks of code by slicing it (inspired by Janko's
3880 comment on 'macros').
3886 comment on 'macros').
3881
3887
3882 * Small fixes and doc updates.
3888 * Small fixes and doc updates.
3883
3889
3884 * Rewrote @history function (was @h). Renamed it to @hist, @h is
3890 * Rewrote @history function (was @h). Renamed it to @hist, @h is
3885 much too fragile with automagic. Handles properly multi-line
3891 much too fragile with automagic. Handles properly multi-line
3886 statements and takes parameters.
3892 statements and takes parameters.
3887
3893
3888 2001-11-30 Fernando Perez <fperez@colorado.edu>
3894 2001-11-30 Fernando Perez <fperez@colorado.edu>
3889
3895
3890 * Version 0.1.18 released.
3896 * Version 0.1.18 released.
3891
3897
3892 * Fixed nasty namespace bug in initial module imports.
3898 * Fixed nasty namespace bug in initial module imports.
3893
3899
3894 * Added copyright/license notes to all code files (except
3900 * Added copyright/license notes to all code files (except
3895 DPyGetOpt). For the time being, LGPL. That could change.
3901 DPyGetOpt). For the time being, LGPL. That could change.
3896
3902
3897 * Rewrote a much nicer README, updated INSTALL, cleaned up
3903 * Rewrote a much nicer README, updated INSTALL, cleaned up
3898 ipythonrc-* samples.
3904 ipythonrc-* samples.
3899
3905
3900 * Overall code/documentation cleanup. Basically ready for
3906 * Overall code/documentation cleanup. Basically ready for
3901 release. Only remaining thing: licence decision (LGPL?).
3907 release. Only remaining thing: licence decision (LGPL?).
3902
3908
3903 * Converted load_config to a class, ConfigLoader. Now recursion
3909 * Converted load_config to a class, ConfigLoader. Now recursion
3904 control is better organized. Doesn't include the same file twice.
3910 control is better organized. Doesn't include the same file twice.
3905
3911
3906 2001-11-29 Fernando Perez <fperez@colorado.edu>
3912 2001-11-29 Fernando Perez <fperez@colorado.edu>
3907
3913
3908 * Got input history working. Changed output history variables from
3914 * Got input history working. Changed output history variables from
3909 _p to _o so that _i is for input and _o for output. Just cleaner
3915 _p to _o so that _i is for input and _o for output. Just cleaner
3910 convention.
3916 convention.
3911
3917
3912 * Implemented parametric aliases. This pretty much allows the
3918 * Implemented parametric aliases. This pretty much allows the
3913 alias system to offer full-blown shell convenience, I think.
3919 alias system to offer full-blown shell convenience, I think.
3914
3920
3915 * Version 0.1.17 released, 0.1.18 opened.
3921 * Version 0.1.17 released, 0.1.18 opened.
3916
3922
3917 * dot_ipython/ipythonrc (alias): added documentation.
3923 * dot_ipython/ipythonrc (alias): added documentation.
3918 (xcolor): Fixed small bug (xcolors -> xcolor)
3924 (xcolor): Fixed small bug (xcolors -> xcolor)
3919
3925
3920 * Changed the alias system. Now alias is a magic command to define
3926 * Changed the alias system. Now alias is a magic command to define
3921 aliases just like the shell. Rationale: the builtin magics should
3927 aliases just like the shell. Rationale: the builtin magics should
3922 be there for things deeply connected to IPython's
3928 be there for things deeply connected to IPython's
3923 architecture. And this is a much lighter system for what I think
3929 architecture. And this is a much lighter system for what I think
3924 is the really important feature: allowing users to define quickly
3930 is the really important feature: allowing users to define quickly
3925 magics that will do shell things for them, so they can customize
3931 magics that will do shell things for them, so they can customize
3926 IPython easily to match their work habits. If someone is really
3932 IPython easily to match their work habits. If someone is really
3927 desperate to have another name for a builtin alias, they can
3933 desperate to have another name for a builtin alias, they can
3928 always use __IP.magic_newname = __IP.magic_oldname. Hackish but
3934 always use __IP.magic_newname = __IP.magic_oldname. Hackish but
3929 works.
3935 works.
3930
3936
3931 2001-11-28 Fernando Perez <fperez@colorado.edu>
3937 2001-11-28 Fernando Perez <fperez@colorado.edu>
3932
3938
3933 * Changed @file so that it opens the source file at the proper
3939 * Changed @file so that it opens the source file at the proper
3934 line. Since it uses less, if your EDITOR environment is
3940 line. Since it uses less, if your EDITOR environment is
3935 configured, typing v will immediately open your editor of choice
3941 configured, typing v will immediately open your editor of choice
3936 right at the line where the object is defined. Not as quick as
3942 right at the line where the object is defined. Not as quick as
3937 having a direct @edit command, but for all intents and purposes it
3943 having a direct @edit command, but for all intents and purposes it
3938 works. And I don't have to worry about writing @edit to deal with
3944 works. And I don't have to worry about writing @edit to deal with
3939 all the editors, less does that.
3945 all the editors, less does that.
3940
3946
3941 * Version 0.1.16 released, 0.1.17 opened.
3947 * Version 0.1.16 released, 0.1.17 opened.
3942
3948
3943 * Fixed some nasty bugs in the page/page_dumb combo that could
3949 * Fixed some nasty bugs in the page/page_dumb combo that could
3944 crash IPython.
3950 crash IPython.
3945
3951
3946 2001-11-27 Fernando Perez <fperez@colorado.edu>
3952 2001-11-27 Fernando Perez <fperez@colorado.edu>
3947
3953
3948 * Version 0.1.15 released, 0.1.16 opened.
3954 * Version 0.1.15 released, 0.1.16 opened.
3949
3955
3950 * Finally got ? and ?? to work for undefined things: now it's
3956 * Finally got ? and ?? to work for undefined things: now it's
3951 possible to type {}.get? and get information about the get method
3957 possible to type {}.get? and get information about the get method
3952 of dicts, or os.path? even if only os is defined (so technically
3958 of dicts, or os.path? even if only os is defined (so technically
3953 os.path isn't). Works at any level. For example, after import os,
3959 os.path isn't). Works at any level. For example, after import os,
3954 os?, os.path?, os.path.abspath? all work. This is great, took some
3960 os?, os.path?, os.path.abspath? all work. This is great, took some
3955 work in _ofind.
3961 work in _ofind.
3956
3962
3957 * Fixed more bugs with logging. The sanest way to do it was to add
3963 * Fixed more bugs with logging. The sanest way to do it was to add
3958 to @log a 'mode' parameter. Killed two in one shot (this mode
3964 to @log a 'mode' parameter. Killed two in one shot (this mode
3959 option was a request of Janko's). I think it's finally clean
3965 option was a request of Janko's). I think it's finally clean
3960 (famous last words).
3966 (famous last words).
3961
3967
3962 * Added a page_dumb() pager which does a decent job of paging on
3968 * Added a page_dumb() pager which does a decent job of paging on
3963 screen, if better things (like less) aren't available. One less
3969 screen, if better things (like less) aren't available. One less
3964 unix dependency (someday maybe somebody will port this to
3970 unix dependency (someday maybe somebody will port this to
3965 windows).
3971 windows).
3966
3972
3967 * Fixed problem in magic_log: would lock of logging out if log
3973 * Fixed problem in magic_log: would lock of logging out if log
3968 creation failed (because it would still think it had succeeded).
3974 creation failed (because it would still think it had succeeded).
3969
3975
3970 * Improved the page() function using curses to auto-detect screen
3976 * Improved the page() function using curses to auto-detect screen
3971 size. Now it can make a much better decision on whether to print
3977 size. Now it can make a much better decision on whether to print
3972 or page a string. Option screen_length was modified: a value 0
3978 or page a string. Option screen_length was modified: a value 0
3973 means auto-detect, and that's the default now.
3979 means auto-detect, and that's the default now.
3974
3980
3975 * Version 0.1.14 released, 0.1.15 opened. I think this is ready to
3981 * Version 0.1.14 released, 0.1.15 opened. I think this is ready to
3976 go out. I'll test it for a few days, then talk to Janko about
3982 go out. I'll test it for a few days, then talk to Janko about
3977 licences and announce it.
3983 licences and announce it.
3978
3984
3979 * Fixed the length of the auto-generated ---> prompt which appears
3985 * Fixed the length of the auto-generated ---> prompt which appears
3980 for auto-parens and auto-quotes. Getting this right isn't trivial,
3986 for auto-parens and auto-quotes. Getting this right isn't trivial,
3981 with all the color escapes, different prompt types and optional
3987 with all the color escapes, different prompt types and optional
3982 separators. But it seems to be working in all the combinations.
3988 separators. But it seems to be working in all the combinations.
3983
3989
3984 2001-11-26 Fernando Perez <fperez@colorado.edu>
3990 2001-11-26 Fernando Perez <fperez@colorado.edu>
3985
3991
3986 * Wrote a regexp filter to get option types from the option names
3992 * Wrote a regexp filter to get option types from the option names
3987 string. This eliminates the need to manually keep two duplicate
3993 string. This eliminates the need to manually keep two duplicate
3988 lists.
3994 lists.
3989
3995
3990 * Removed the unneeded check_option_names. Now options are handled
3996 * Removed the unneeded check_option_names. Now options are handled
3991 in a much saner manner and it's easy to visually check that things
3997 in a much saner manner and it's easy to visually check that things
3992 are ok.
3998 are ok.
3993
3999
3994 * Updated version numbers on all files I modified to carry a
4000 * Updated version numbers on all files I modified to carry a
3995 notice so Janko and Nathan have clear version markers.
4001 notice so Janko and Nathan have clear version markers.
3996
4002
3997 * Updated docstring for ultraTB with my changes. I should send
4003 * Updated docstring for ultraTB with my changes. I should send
3998 this to Nathan.
4004 this to Nathan.
3999
4005
4000 * Lots of small fixes. Ran everything through pychecker again.
4006 * Lots of small fixes. Ran everything through pychecker again.
4001
4007
4002 * Made loading of deep_reload an cmd line option. If it's not too
4008 * Made loading of deep_reload an cmd line option. If it's not too
4003 kosher, now people can just disable it. With -nodeep_reload it's
4009 kosher, now people can just disable it. With -nodeep_reload it's
4004 still available as dreload(), it just won't overwrite reload().
4010 still available as dreload(), it just won't overwrite reload().
4005
4011
4006 * Moved many options to the no| form (-opt and -noopt
4012 * Moved many options to the no| form (-opt and -noopt
4007 accepted). Cleaner.
4013 accepted). Cleaner.
4008
4014
4009 * Changed magic_log so that if called with no parameters, it uses
4015 * Changed magic_log so that if called with no parameters, it uses
4010 'rotate' mode. That way auto-generated logs aren't automatically
4016 'rotate' mode. That way auto-generated logs aren't automatically
4011 over-written. For normal logs, now a backup is made if it exists
4017 over-written. For normal logs, now a backup is made if it exists
4012 (only 1 level of backups). A new 'backup' mode was added to the
4018 (only 1 level of backups). A new 'backup' mode was added to the
4013 Logger class to support this. This was a request by Janko.
4019 Logger class to support this. This was a request by Janko.
4014
4020
4015 * Added @logoff/@logon to stop/restart an active log.
4021 * Added @logoff/@logon to stop/restart an active log.
4016
4022
4017 * Fixed a lot of bugs in log saving/replay. It was pretty
4023 * Fixed a lot of bugs in log saving/replay. It was pretty
4018 broken. Now special lines (!@,/) appear properly in the command
4024 broken. Now special lines (!@,/) appear properly in the command
4019 history after a log replay.
4025 history after a log replay.
4020
4026
4021 * Tried and failed to implement full session saving via pickle. My
4027 * Tried and failed to implement full session saving via pickle. My
4022 idea was to pickle __main__.__dict__, but modules can't be
4028 idea was to pickle __main__.__dict__, but modules can't be
4023 pickled. This would be a better alternative to replaying logs, but
4029 pickled. This would be a better alternative to replaying logs, but
4024 seems quite tricky to get to work. Changed -session to be called
4030 seems quite tricky to get to work. Changed -session to be called
4025 -logplay, which more accurately reflects what it does. And if we
4031 -logplay, which more accurately reflects what it does. And if we
4026 ever get real session saving working, -session is now available.
4032 ever get real session saving working, -session is now available.
4027
4033
4028 * Implemented color schemes for prompts also. As for tracebacks,
4034 * Implemented color schemes for prompts also. As for tracebacks,
4029 currently only NoColor and Linux are supported. But now the
4035 currently only NoColor and Linux are supported. But now the
4030 infrastructure is in place, based on a generic ColorScheme
4036 infrastructure is in place, based on a generic ColorScheme
4031 class. So writing and activating new schemes both for the prompts
4037 class. So writing and activating new schemes both for the prompts
4032 and the tracebacks should be straightforward.
4038 and the tracebacks should be straightforward.
4033
4039
4034 * Version 0.1.13 released, 0.1.14 opened.
4040 * Version 0.1.13 released, 0.1.14 opened.
4035
4041
4036 * Changed handling of options for output cache. Now counter is
4042 * Changed handling of options for output cache. Now counter is
4037 hardwired starting at 1 and one specifies the maximum number of
4043 hardwired starting at 1 and one specifies the maximum number of
4038 entries *in the outcache* (not the max prompt counter). This is
4044 entries *in the outcache* (not the max prompt counter). This is
4039 much better, since many statements won't increase the cache
4045 much better, since many statements won't increase the cache
4040 count. It also eliminated some confusing options, now there's only
4046 count. It also eliminated some confusing options, now there's only
4041 one: cache_size.
4047 one: cache_size.
4042
4048
4043 * Added 'alias' magic function and magic_alias option in the
4049 * Added 'alias' magic function and magic_alias option in the
4044 ipythonrc file. Now the user can easily define whatever names he
4050 ipythonrc file. Now the user can easily define whatever names he
4045 wants for the magic functions without having to play weird
4051 wants for the magic functions without having to play weird
4046 namespace games. This gives IPython a real shell-like feel.
4052 namespace games. This gives IPython a real shell-like feel.
4047
4053
4048 * Fixed doc/?/?? for magics. Now all work, in all forms (explicit
4054 * Fixed doc/?/?? for magics. Now all work, in all forms (explicit
4049 @ or not).
4055 @ or not).
4050
4056
4051 This was one of the last remaining 'visible' bugs (that I know
4057 This was one of the last remaining 'visible' bugs (that I know
4052 of). I think if I can clean up the session loading so it works
4058 of). I think if I can clean up the session loading so it works
4053 100% I'll release a 0.2.0 version on c.p.l (talk to Janko first
4059 100% I'll release a 0.2.0 version on c.p.l (talk to Janko first
4054 about licensing).
4060 about licensing).
4055
4061
4056 2001-11-25 Fernando Perez <fperez@colorado.edu>
4062 2001-11-25 Fernando Perez <fperez@colorado.edu>
4057
4063
4058 * Rewrote somewhat oinfo (?/??). Nicer, now uses page() and
4064 * Rewrote somewhat oinfo (?/??). Nicer, now uses page() and
4059 there's a cleaner distinction between what ? and ?? show.
4065 there's a cleaner distinction between what ? and ?? show.
4060
4066
4061 * Added screen_length option. Now the user can define his own
4067 * Added screen_length option. Now the user can define his own
4062 screen size for page() operations.
4068 screen size for page() operations.
4063
4069
4064 * Implemented magic shell-like functions with automatic code
4070 * Implemented magic shell-like functions with automatic code
4065 generation. Now adding another function is just a matter of adding
4071 generation. Now adding another function is just a matter of adding
4066 an entry to a dict, and the function is dynamically generated at
4072 an entry to a dict, and the function is dynamically generated at
4067 run-time. Python has some really cool features!
4073 run-time. Python has some really cool features!
4068
4074
4069 * Renamed many options to cleanup conventions a little. Now all
4075 * Renamed many options to cleanup conventions a little. Now all
4070 are lowercase, and only underscores where needed. Also in the code
4076 are lowercase, and only underscores where needed. Also in the code
4071 option name tables are clearer.
4077 option name tables are clearer.
4072
4078
4073 * Changed prompts a little. Now input is 'In [n]:' instead of
4079 * Changed prompts a little. Now input is 'In [n]:' instead of
4074 'In[n]:='. This allows it the numbers to be aligned with the
4080 'In[n]:='. This allows it the numbers to be aligned with the
4075 Out[n] numbers, and removes usage of ':=' which doesn't exist in
4081 Out[n] numbers, and removes usage of ':=' which doesn't exist in
4076 Python (it was a Mathematica thing). The '...' continuation prompt
4082 Python (it was a Mathematica thing). The '...' continuation prompt
4077 was also changed a little to align better.
4083 was also changed a little to align better.
4078
4084
4079 * Fixed bug when flushing output cache. Not all _p<n> variables
4085 * Fixed bug when flushing output cache. Not all _p<n> variables
4080 exist, so their deletion needs to be wrapped in a try:
4086 exist, so their deletion needs to be wrapped in a try:
4081
4087
4082 * Figured out how to properly use inspect.formatargspec() (it
4088 * Figured out how to properly use inspect.formatargspec() (it
4083 requires the args preceded by *). So I removed all the code from
4089 requires the args preceded by *). So I removed all the code from
4084 _get_pdef in Magic, which was just replicating that.
4090 _get_pdef in Magic, which was just replicating that.
4085
4091
4086 * Added test to prefilter to allow redefining magic function names
4092 * Added test to prefilter to allow redefining magic function names
4087 as variables. This is ok, since the @ form is always available,
4093 as variables. This is ok, since the @ form is always available,
4088 but whe should allow the user to define a variable called 'ls' if
4094 but whe should allow the user to define a variable called 'ls' if
4089 he needs it.
4095 he needs it.
4090
4096
4091 * Moved the ToDo information from README into a separate ToDo.
4097 * Moved the ToDo information from README into a separate ToDo.
4092
4098
4093 * General code cleanup and small bugfixes. I think it's close to a
4099 * General code cleanup and small bugfixes. I think it's close to a
4094 state where it can be released, obviously with a big 'beta'
4100 state where it can be released, obviously with a big 'beta'
4095 warning on it.
4101 warning on it.
4096
4102
4097 * Got the magic function split to work. Now all magics are defined
4103 * Got the magic function split to work. Now all magics are defined
4098 in a separate class. It just organizes things a bit, and now
4104 in a separate class. It just organizes things a bit, and now
4099 Xemacs behaves nicer (it was choking on InteractiveShell b/c it
4105 Xemacs behaves nicer (it was choking on InteractiveShell b/c it
4100 was too long).
4106 was too long).
4101
4107
4102 * Changed @clear to @reset to avoid potential confusions with
4108 * Changed @clear to @reset to avoid potential confusions with
4103 the shell command clear. Also renamed @cl to @clear, which does
4109 the shell command clear. Also renamed @cl to @clear, which does
4104 exactly what people expect it to from their shell experience.
4110 exactly what people expect it to from their shell experience.
4105
4111
4106 Added a check to the @reset command (since it's so
4112 Added a check to the @reset command (since it's so
4107 destructive, it's probably a good idea to ask for confirmation).
4113 destructive, it's probably a good idea to ask for confirmation).
4108 But now reset only works for full namespace resetting. Since the
4114 But now reset only works for full namespace resetting. Since the
4109 del keyword is already there for deleting a few specific
4115 del keyword is already there for deleting a few specific
4110 variables, I don't see the point of having a redundant magic
4116 variables, I don't see the point of having a redundant magic
4111 function for the same task.
4117 function for the same task.
4112
4118
4113 2001-11-24 Fernando Perez <fperez@colorado.edu>
4119 2001-11-24 Fernando Perez <fperez@colorado.edu>
4114
4120
4115 * Updated the builtin docs (esp. the ? ones).
4121 * Updated the builtin docs (esp. the ? ones).
4116
4122
4117 * Ran all the code through pychecker. Not terribly impressed with
4123 * Ran all the code through pychecker. Not terribly impressed with
4118 it: lots of spurious warnings and didn't really find anything of
4124 it: lots of spurious warnings and didn't really find anything of
4119 substance (just a few modules being imported and not used).
4125 substance (just a few modules being imported and not used).
4120
4126
4121 * Implemented the new ultraTB functionality into IPython. New
4127 * Implemented the new ultraTB functionality into IPython. New
4122 option: xcolors. This chooses color scheme. xmode now only selects
4128 option: xcolors. This chooses color scheme. xmode now only selects
4123 between Plain and Verbose. Better orthogonality.
4129 between Plain and Verbose. Better orthogonality.
4124
4130
4125 * Large rewrite of ultraTB. Much cleaner now, with a separation of
4131 * Large rewrite of ultraTB. Much cleaner now, with a separation of
4126 mode and color scheme for the exception handlers. Now it's
4132 mode and color scheme for the exception handlers. Now it's
4127 possible to have the verbose traceback with no coloring.
4133 possible to have the verbose traceback with no coloring.
4128
4134
4129 2001-11-23 Fernando Perez <fperez@colorado.edu>
4135 2001-11-23 Fernando Perez <fperez@colorado.edu>
4130
4136
4131 * Version 0.1.12 released, 0.1.13 opened.
4137 * Version 0.1.12 released, 0.1.13 opened.
4132
4138
4133 * Removed option to set auto-quote and auto-paren escapes by
4139 * Removed option to set auto-quote and auto-paren escapes by
4134 user. The chances of breaking valid syntax are just too high. If
4140 user. The chances of breaking valid syntax are just too high. If
4135 someone *really* wants, they can always dig into the code.
4141 someone *really* wants, they can always dig into the code.
4136
4142
4137 * Made prompt separators configurable.
4143 * Made prompt separators configurable.
4138
4144
4139 2001-11-22 Fernando Perez <fperez@colorado.edu>
4145 2001-11-22 Fernando Perez <fperez@colorado.edu>
4140
4146
4141 * Small bugfixes in many places.
4147 * Small bugfixes in many places.
4142
4148
4143 * Removed the MyCompleter class from ipplib. It seemed redundant
4149 * Removed the MyCompleter class from ipplib. It seemed redundant
4144 with the C-p,C-n history search functionality. Less code to
4150 with the C-p,C-n history search functionality. Less code to
4145 maintain.
4151 maintain.
4146
4152
4147 * Moved all the original ipython.py code into ipythonlib.py. Right
4153 * Moved all the original ipython.py code into ipythonlib.py. Right
4148 now it's just one big dump into a function called make_IPython, so
4154 now it's just one big dump into a function called make_IPython, so
4149 no real modularity has been gained. But at least it makes the
4155 no real modularity has been gained. But at least it makes the
4150 wrapper script tiny, and since ipythonlib is a module, it gets
4156 wrapper script tiny, and since ipythonlib is a module, it gets
4151 compiled and startup is much faster.
4157 compiled and startup is much faster.
4152
4158
4153 This is a reasobably 'deep' change, so we should test it for a
4159 This is a reasobably 'deep' change, so we should test it for a
4154 while without messing too much more with the code.
4160 while without messing too much more with the code.
4155
4161
4156 2001-11-21 Fernando Perez <fperez@colorado.edu>
4162 2001-11-21 Fernando Perez <fperez@colorado.edu>
4157
4163
4158 * Version 0.1.11 released, 0.1.12 opened for further work.
4164 * Version 0.1.11 released, 0.1.12 opened for further work.
4159
4165
4160 * Removed dependency on Itpl. It was only needed in one place. It
4166 * Removed dependency on Itpl. It was only needed in one place. It
4161 would be nice if this became part of python, though. It makes life
4167 would be nice if this became part of python, though. It makes life
4162 *a lot* easier in some cases.
4168 *a lot* easier in some cases.
4163
4169
4164 * Simplified the prefilter code a bit. Now all handlers are
4170 * Simplified the prefilter code a bit. Now all handlers are
4165 expected to explicitly return a value (at least a blank string).
4171 expected to explicitly return a value (at least a blank string).
4166
4172
4167 * Heavy edits in ipplib. Removed the help system altogether. Now
4173 * Heavy edits in ipplib. Removed the help system altogether. Now
4168 obj?/?? is used for inspecting objects, a magic @doc prints
4174 obj?/?? is used for inspecting objects, a magic @doc prints
4169 docstrings, and full-blown Python help is accessed via the 'help'
4175 docstrings, and full-blown Python help is accessed via the 'help'
4170 keyword. This cleans up a lot of code (less to maintain) and does
4176 keyword. This cleans up a lot of code (less to maintain) and does
4171 the job. Since 'help' is now a standard Python component, might as
4177 the job. Since 'help' is now a standard Python component, might as
4172 well use it and remove duplicate functionality.
4178 well use it and remove duplicate functionality.
4173
4179
4174 Also removed the option to use ipplib as a standalone program. By
4180 Also removed the option to use ipplib as a standalone program. By
4175 now it's too dependent on other parts of IPython to function alone.
4181 now it's too dependent on other parts of IPython to function alone.
4176
4182
4177 * Fixed bug in genutils.pager. It would crash if the pager was
4183 * Fixed bug in genutils.pager. It would crash if the pager was
4178 exited immediately after opening (broken pipe).
4184 exited immediately after opening (broken pipe).
4179
4185
4180 * Trimmed down the VerboseTB reporting a little. The header is
4186 * Trimmed down the VerboseTB reporting a little. The header is
4181 much shorter now and the repeated exception arguments at the end
4187 much shorter now and the repeated exception arguments at the end
4182 have been removed. For interactive use the old header seemed a bit
4188 have been removed. For interactive use the old header seemed a bit
4183 excessive.
4189 excessive.
4184
4190
4185 * Fixed small bug in output of @whos for variables with multi-word
4191 * Fixed small bug in output of @whos for variables with multi-word
4186 types (only first word was displayed).
4192 types (only first word was displayed).
4187
4193
4188 2001-11-17 Fernando Perez <fperez@colorado.edu>
4194 2001-11-17 Fernando Perez <fperez@colorado.edu>
4189
4195
4190 * Version 0.1.10 released, 0.1.11 opened for further work.
4196 * Version 0.1.10 released, 0.1.11 opened for further work.
4191
4197
4192 * Modified dirs and friends. dirs now *returns* the stack (not
4198 * Modified dirs and friends. dirs now *returns* the stack (not
4193 prints), so one can manipulate it as a variable. Convenient to
4199 prints), so one can manipulate it as a variable. Convenient to
4194 travel along many directories.
4200 travel along many directories.
4195
4201
4196 * Fixed bug in magic_pdef: would only work with functions with
4202 * Fixed bug in magic_pdef: would only work with functions with
4197 arguments with default values.
4203 arguments with default values.
4198
4204
4199 2001-11-14 Fernando Perez <fperez@colorado.edu>
4205 2001-11-14 Fernando Perez <fperez@colorado.edu>
4200
4206
4201 * Added the PhysicsInput stuff to dot_ipython so it ships as an
4207 * Added the PhysicsInput stuff to dot_ipython so it ships as an
4202 example with IPython. Various other minor fixes and cleanups.
4208 example with IPython. Various other minor fixes and cleanups.
4203
4209
4204 * Version 0.1.9 released, 0.1.10 opened for further work.
4210 * Version 0.1.9 released, 0.1.10 opened for further work.
4205
4211
4206 * Added sys.path to the list of directories searched in the
4212 * Added sys.path to the list of directories searched in the
4207 execfile= option. It used to be the current directory and the
4213 execfile= option. It used to be the current directory and the
4208 user's IPYTHONDIR only.
4214 user's IPYTHONDIR only.
4209
4215
4210 2001-11-13 Fernando Perez <fperez@colorado.edu>
4216 2001-11-13 Fernando Perez <fperez@colorado.edu>
4211
4217
4212 * Reinstated the raw_input/prefilter separation that Janko had
4218 * Reinstated the raw_input/prefilter separation that Janko had
4213 initially. This gives a more convenient setup for extending the
4219 initially. This gives a more convenient setup for extending the
4214 pre-processor from the outside: raw_input always gets a string,
4220 pre-processor from the outside: raw_input always gets a string,
4215 and prefilter has to process it. We can then redefine prefilter
4221 and prefilter has to process it. We can then redefine prefilter
4216 from the outside and implement extensions for special
4222 from the outside and implement extensions for special
4217 purposes.
4223 purposes.
4218
4224
4219 Today I got one for inputting PhysicalQuantity objects
4225 Today I got one for inputting PhysicalQuantity objects
4220 (from Scientific) without needing any function calls at
4226 (from Scientific) without needing any function calls at
4221 all. Extremely convenient, and it's all done as a user-level
4227 all. Extremely convenient, and it's all done as a user-level
4222 extension (no IPython code was touched). Now instead of:
4228 extension (no IPython code was touched). Now instead of:
4223 a = PhysicalQuantity(4.2,'m/s**2')
4229 a = PhysicalQuantity(4.2,'m/s**2')
4224 one can simply say
4230 one can simply say
4225 a = 4.2 m/s**2
4231 a = 4.2 m/s**2
4226 or even
4232 or even
4227 a = 4.2 m/s^2
4233 a = 4.2 m/s^2
4228
4234
4229 I use this, but it's also a proof of concept: IPython really is
4235 I use this, but it's also a proof of concept: IPython really is
4230 fully user-extensible, even at the level of the parsing of the
4236 fully user-extensible, even at the level of the parsing of the
4231 command line. It's not trivial, but it's perfectly doable.
4237 command line. It's not trivial, but it's perfectly doable.
4232
4238
4233 * Added 'add_flip' method to inclusion conflict resolver. Fixes
4239 * Added 'add_flip' method to inclusion conflict resolver. Fixes
4234 the problem of modules being loaded in the inverse order in which
4240 the problem of modules being loaded in the inverse order in which
4235 they were defined in
4241 they were defined in
4236
4242
4237 * Version 0.1.8 released, 0.1.9 opened for further work.
4243 * Version 0.1.8 released, 0.1.9 opened for further work.
4238
4244
4239 * Added magics pdef, source and file. They respectively show the
4245 * Added magics pdef, source and file. They respectively show the
4240 definition line ('prototype' in C), source code and full python
4246 definition line ('prototype' in C), source code and full python
4241 file for any callable object. The object inspector oinfo uses
4247 file for any callable object. The object inspector oinfo uses
4242 these to show the same information.
4248 these to show the same information.
4243
4249
4244 * Version 0.1.7 released, 0.1.8 opened for further work.
4250 * Version 0.1.7 released, 0.1.8 opened for further work.
4245
4251
4246 * Separated all the magic functions into a class called Magic. The
4252 * Separated all the magic functions into a class called Magic. The
4247 InteractiveShell class was becoming too big for Xemacs to handle
4253 InteractiveShell class was becoming too big for Xemacs to handle
4248 (de-indenting a line would lock it up for 10 seconds while it
4254 (de-indenting a line would lock it up for 10 seconds while it
4249 backtracked on the whole class!)
4255 backtracked on the whole class!)
4250
4256
4251 FIXME: didn't work. It can be done, but right now namespaces are
4257 FIXME: didn't work. It can be done, but right now namespaces are
4252 all messed up. Do it later (reverted it for now, so at least
4258 all messed up. Do it later (reverted it for now, so at least
4253 everything works as before).
4259 everything works as before).
4254
4260
4255 * Got the object introspection system (magic_oinfo) working! I
4261 * Got the object introspection system (magic_oinfo) working! I
4256 think this is pretty much ready for release to Janko, so he can
4262 think this is pretty much ready for release to Janko, so he can
4257 test it for a while and then announce it. Pretty much 100% of what
4263 test it for a while and then announce it. Pretty much 100% of what
4258 I wanted for the 'phase 1' release is ready. Happy, tired.
4264 I wanted for the 'phase 1' release is ready. Happy, tired.
4259
4265
4260 2001-11-12 Fernando Perez <fperez@colorado.edu>
4266 2001-11-12 Fernando Perez <fperez@colorado.edu>
4261
4267
4262 * Version 0.1.6 released, 0.1.7 opened for further work.
4268 * Version 0.1.6 released, 0.1.7 opened for further work.
4263
4269
4264 * Fixed bug in printing: it used to test for truth before
4270 * Fixed bug in printing: it used to test for truth before
4265 printing, so 0 wouldn't print. Now checks for None.
4271 printing, so 0 wouldn't print. Now checks for None.
4266
4272
4267 * Fixed bug where auto-execs increase the prompt counter by 2 (b/c
4273 * Fixed bug where auto-execs increase the prompt counter by 2 (b/c
4268 they have to call len(str(sys.ps1)) ). But the fix is ugly, it
4274 they have to call len(str(sys.ps1)) ). But the fix is ugly, it
4269 reaches by hand into the outputcache. Think of a better way to do
4275 reaches by hand into the outputcache. Think of a better way to do
4270 this later.
4276 this later.
4271
4277
4272 * Various small fixes thanks to Nathan's comments.
4278 * Various small fixes thanks to Nathan's comments.
4273
4279
4274 * Changed magic_pprint to magic_Pprint. This way it doesn't
4280 * Changed magic_pprint to magic_Pprint. This way it doesn't
4275 collide with pprint() and the name is consistent with the command
4281 collide with pprint() and the name is consistent with the command
4276 line option.
4282 line option.
4277
4283
4278 * Changed prompt counter behavior to be fully like
4284 * Changed prompt counter behavior to be fully like
4279 Mathematica's. That is, even input that doesn't return a result
4285 Mathematica's. That is, even input that doesn't return a result
4280 raises the prompt counter. The old behavior was kind of confusing
4286 raises the prompt counter. The old behavior was kind of confusing
4281 (getting the same prompt number several times if the operation
4287 (getting the same prompt number several times if the operation
4282 didn't return a result).
4288 didn't return a result).
4283
4289
4284 * Fixed Nathan's last name in a couple of places (Gray, not Graham).
4290 * Fixed Nathan's last name in a couple of places (Gray, not Graham).
4285
4291
4286 * Fixed -Classic mode (wasn't working anymore).
4292 * Fixed -Classic mode (wasn't working anymore).
4287
4293
4288 * Added colored prompts using Nathan's new code. Colors are
4294 * Added colored prompts using Nathan's new code. Colors are
4289 currently hardwired, they can be user-configurable. For
4295 currently hardwired, they can be user-configurable. For
4290 developers, they can be chosen in file ipythonlib.py, at the
4296 developers, they can be chosen in file ipythonlib.py, at the
4291 beginning of the CachedOutput class def.
4297 beginning of the CachedOutput class def.
4292
4298
4293 2001-11-11 Fernando Perez <fperez@colorado.edu>
4299 2001-11-11 Fernando Perez <fperez@colorado.edu>
4294
4300
4295 * Version 0.1.5 released, 0.1.6 opened for further work.
4301 * Version 0.1.5 released, 0.1.6 opened for further work.
4296
4302
4297 * Changed magic_env to *return* the environment as a dict (not to
4303 * Changed magic_env to *return* the environment as a dict (not to
4298 print it). This way it prints, but it can also be processed.
4304 print it). This way it prints, but it can also be processed.
4299
4305
4300 * Added Verbose exception reporting to interactive
4306 * Added Verbose exception reporting to interactive
4301 exceptions. Very nice, now even 1/0 at the prompt gives a verbose
4307 exceptions. Very nice, now even 1/0 at the prompt gives a verbose
4302 traceback. Had to make some changes to the ultraTB file. This is
4308 traceback. Had to make some changes to the ultraTB file. This is
4303 probably the last 'big' thing in my mental todo list. This ties
4309 probably the last 'big' thing in my mental todo list. This ties
4304 in with the next entry:
4310 in with the next entry:
4305
4311
4306 * Changed -Xi and -Xf to a single -xmode option. Now all the user
4312 * Changed -Xi and -Xf to a single -xmode option. Now all the user
4307 has to specify is Plain, Color or Verbose for all exception
4313 has to specify is Plain, Color or Verbose for all exception
4308 handling.
4314 handling.
4309
4315
4310 * Removed ShellServices option. All this can really be done via
4316 * Removed ShellServices option. All this can really be done via
4311 the magic system. It's easier to extend, cleaner and has automatic
4317 the magic system. It's easier to extend, cleaner and has automatic
4312 namespace protection and documentation.
4318 namespace protection and documentation.
4313
4319
4314 2001-11-09 Fernando Perez <fperez@colorado.edu>
4320 2001-11-09 Fernando Perez <fperez@colorado.edu>
4315
4321
4316 * Fixed bug in output cache flushing (missing parameter to
4322 * Fixed bug in output cache flushing (missing parameter to
4317 __init__). Other small bugs fixed (found using pychecker).
4323 __init__). Other small bugs fixed (found using pychecker).
4318
4324
4319 * Version 0.1.4 opened for bugfixing.
4325 * Version 0.1.4 opened for bugfixing.
4320
4326
4321 2001-11-07 Fernando Perez <fperez@colorado.edu>
4327 2001-11-07 Fernando Perez <fperez@colorado.edu>
4322
4328
4323 * Version 0.1.3 released, mainly because of the raw_input bug.
4329 * Version 0.1.3 released, mainly because of the raw_input bug.
4324
4330
4325 * Fixed NASTY bug in raw_input: input line wasn't properly parsed
4331 * Fixed NASTY bug in raw_input: input line wasn't properly parsed
4326 and when testing for whether things were callable, a call could
4332 and when testing for whether things were callable, a call could
4327 actually be made to certain functions. They would get called again
4333 actually be made to certain functions. They would get called again
4328 once 'really' executed, with a resulting double call. A disaster
4334 once 'really' executed, with a resulting double call. A disaster
4329 in many cases (list.reverse() would never work!).
4335 in many cases (list.reverse() would never work!).
4330
4336
4331 * Removed prefilter() function, moved its code to raw_input (which
4337 * Removed prefilter() function, moved its code to raw_input (which
4332 after all was just a near-empty caller for prefilter). This saves
4338 after all was just a near-empty caller for prefilter). This saves
4333 a function call on every prompt, and simplifies the class a tiny bit.
4339 a function call on every prompt, and simplifies the class a tiny bit.
4334
4340
4335 * Fix _ip to __ip name in magic example file.
4341 * Fix _ip to __ip name in magic example file.
4336
4342
4337 * Changed 'tar -x -f' to 'tar xvf' in auto-installer. This should
4343 * Changed 'tar -x -f' to 'tar xvf' in auto-installer. This should
4338 work with non-gnu versions of tar.
4344 work with non-gnu versions of tar.
4339
4345
4340 2001-11-06 Fernando Perez <fperez@colorado.edu>
4346 2001-11-06 Fernando Perez <fperez@colorado.edu>
4341
4347
4342 * Version 0.1.2. Just to keep track of the recent changes.
4348 * Version 0.1.2. Just to keep track of the recent changes.
4343
4349
4344 * Fixed nasty bug in output prompt routine. It used to check 'if
4350 * Fixed nasty bug in output prompt routine. It used to check 'if
4345 arg != None...'. Problem is, this fails if arg implements a
4351 arg != None...'. Problem is, this fails if arg implements a
4346 special comparison (__cmp__) which disallows comparing to
4352 special comparison (__cmp__) which disallows comparing to
4347 None. Found it when trying to use the PhysicalQuantity module from
4353 None. Found it when trying to use the PhysicalQuantity module from
4348 ScientificPython.
4354 ScientificPython.
4349
4355
4350 2001-11-05 Fernando Perez <fperez@colorado.edu>
4356 2001-11-05 Fernando Perez <fperez@colorado.edu>
4351
4357
4352 * Also added dirs. Now the pushd/popd/dirs family functions
4358 * Also added dirs. Now the pushd/popd/dirs family functions
4353 basically like the shell, with the added convenience of going home
4359 basically like the shell, with the added convenience of going home
4354 when called with no args.
4360 when called with no args.
4355
4361
4356 * pushd/popd slightly modified to mimic shell behavior more
4362 * pushd/popd slightly modified to mimic shell behavior more
4357 closely.
4363 closely.
4358
4364
4359 * Added env,pushd,popd from ShellServices as magic functions. I
4365 * Added env,pushd,popd from ShellServices as magic functions. I
4360 think the cleanest will be to port all desired functions from
4366 think the cleanest will be to port all desired functions from
4361 ShellServices as magics and remove ShellServices altogether. This
4367 ShellServices as magics and remove ShellServices altogether. This
4362 will provide a single, clean way of adding functionality
4368 will provide a single, clean way of adding functionality
4363 (shell-type or otherwise) to IP.
4369 (shell-type or otherwise) to IP.
4364
4370
4365 2001-11-04 Fernando Perez <fperez@colorado.edu>
4371 2001-11-04 Fernando Perez <fperez@colorado.edu>
4366
4372
4367 * Added .ipython/ directory to sys.path. This way users can keep
4373 * Added .ipython/ directory to sys.path. This way users can keep
4368 customizations there and access them via import.
4374 customizations there and access them via import.
4369
4375
4370 2001-11-03 Fernando Perez <fperez@colorado.edu>
4376 2001-11-03 Fernando Perez <fperez@colorado.edu>
4371
4377
4372 * Opened version 0.1.1 for new changes.
4378 * Opened version 0.1.1 for new changes.
4373
4379
4374 * Changed version number to 0.1.0: first 'public' release, sent to
4380 * Changed version number to 0.1.0: first 'public' release, sent to
4375 Nathan and Janko.
4381 Nathan and Janko.
4376
4382
4377 * Lots of small fixes and tweaks.
4383 * Lots of small fixes and tweaks.
4378
4384
4379 * Minor changes to whos format. Now strings are shown, snipped if
4385 * Minor changes to whos format. Now strings are shown, snipped if
4380 too long.
4386 too long.
4381
4387
4382 * Changed ShellServices to work on __main__ so they show up in @who
4388 * Changed ShellServices to work on __main__ so they show up in @who
4383
4389
4384 * Help also works with ? at the end of a line:
4390 * Help also works with ? at the end of a line:
4385 ?sin and sin?
4391 ?sin and sin?
4386 both produce the same effect. This is nice, as often I use the
4392 both produce the same effect. This is nice, as often I use the
4387 tab-complete to find the name of a method, but I used to then have
4393 tab-complete to find the name of a method, but I used to then have
4388 to go to the beginning of the line to put a ? if I wanted more
4394 to go to the beginning of the line to put a ? if I wanted more
4389 info. Now I can just add the ? and hit return. Convenient.
4395 info. Now I can just add the ? and hit return. Convenient.
4390
4396
4391 2001-11-02 Fernando Perez <fperez@colorado.edu>
4397 2001-11-02 Fernando Perez <fperez@colorado.edu>
4392
4398
4393 * Python version check (>=2.1) added.
4399 * Python version check (>=2.1) added.
4394
4400
4395 * Added LazyPython documentation. At this point the docs are quite
4401 * Added LazyPython documentation. At this point the docs are quite
4396 a mess. A cleanup is in order.
4402 a mess. A cleanup is in order.
4397
4403
4398 * Auto-installer created. For some bizarre reason, the zipfiles
4404 * Auto-installer created. For some bizarre reason, the zipfiles
4399 module isn't working on my system. So I made a tar version
4405 module isn't working on my system. So I made a tar version
4400 (hopefully the command line options in various systems won't kill
4406 (hopefully the command line options in various systems won't kill
4401 me).
4407 me).
4402
4408
4403 * Fixes to Struct in genutils. Now all dictionary-like methods are
4409 * Fixes to Struct in genutils. Now all dictionary-like methods are
4404 protected (reasonably).
4410 protected (reasonably).
4405
4411
4406 * Added pager function to genutils and changed ? to print usage
4412 * Added pager function to genutils and changed ? to print usage
4407 note through it (it was too long).
4413 note through it (it was too long).
4408
4414
4409 * Added the LazyPython functionality. Works great! I changed the
4415 * Added the LazyPython functionality. Works great! I changed the
4410 auto-quote escape to ';', it's on home row and next to '. But
4416 auto-quote escape to ';', it's on home row and next to '. But
4411 both auto-quote and auto-paren (still /) escapes are command-line
4417 both auto-quote and auto-paren (still /) escapes are command-line
4412 parameters.
4418 parameters.
4413
4419
4414
4420
4415 2001-11-01 Fernando Perez <fperez@colorado.edu>
4421 2001-11-01 Fernando Perez <fperez@colorado.edu>
4416
4422
4417 * Version changed to 0.0.7. Fairly large change: configuration now
4423 * Version changed to 0.0.7. Fairly large change: configuration now
4418 is all stored in a directory, by default .ipython. There, all
4424 is all stored in a directory, by default .ipython. There, all
4419 config files have normal looking names (not .names)
4425 config files have normal looking names (not .names)
4420
4426
4421 * Version 0.0.6 Released first to Lucas and Archie as a test
4427 * Version 0.0.6 Released first to Lucas and Archie as a test
4422 run. Since it's the first 'semi-public' release, change version to
4428 run. Since it's the first 'semi-public' release, change version to
4423 > 0.0.6 for any changes now.
4429 > 0.0.6 for any changes now.
4424
4430
4425 * Stuff I had put in the ipplib.py changelog:
4431 * Stuff I had put in the ipplib.py changelog:
4426
4432
4427 Changes to InteractiveShell:
4433 Changes to InteractiveShell:
4428
4434
4429 - Made the usage message a parameter.
4435 - Made the usage message a parameter.
4430
4436
4431 - Require the name of the shell variable to be given. It's a bit
4437 - Require the name of the shell variable to be given. It's a bit
4432 of a hack, but allows the name 'shell' not to be hardwire in the
4438 of a hack, but allows the name 'shell' not to be hardwire in the
4433 magic (@) handler, which is problematic b/c it requires
4439 magic (@) handler, which is problematic b/c it requires
4434 polluting the global namespace with 'shell'. This in turn is
4440 polluting the global namespace with 'shell'. This in turn is
4435 fragile: if a user redefines a variable called shell, things
4441 fragile: if a user redefines a variable called shell, things
4436 break.
4442 break.
4437
4443
4438 - magic @: all functions available through @ need to be defined
4444 - magic @: all functions available through @ need to be defined
4439 as magic_<name>, even though they can be called simply as
4445 as magic_<name>, even though they can be called simply as
4440 @<name>. This allows the special command @magic to gather
4446 @<name>. This allows the special command @magic to gather
4441 information automatically about all existing magic functions,
4447 information automatically about all existing magic functions,
4442 even if they are run-time user extensions, by parsing the shell
4448 even if they are run-time user extensions, by parsing the shell
4443 instance __dict__ looking for special magic_ names.
4449 instance __dict__ looking for special magic_ names.
4444
4450
4445 - mainloop: added *two* local namespace parameters. This allows
4451 - mainloop: added *two* local namespace parameters. This allows
4446 the class to differentiate between parameters which were there
4452 the class to differentiate between parameters which were there
4447 before and after command line initialization was processed. This
4453 before and after command line initialization was processed. This
4448 way, later @who can show things loaded at startup by the
4454 way, later @who can show things loaded at startup by the
4449 user. This trick was necessary to make session saving/reloading
4455 user. This trick was necessary to make session saving/reloading
4450 really work: ideally after saving/exiting/reloading a session,
4456 really work: ideally after saving/exiting/reloading a session,
4451 *everythin* should look the same, including the output of @who. I
4457 *everythin* should look the same, including the output of @who. I
4452 was only able to make this work with this double namespace
4458 was only able to make this work with this double namespace
4453 trick.
4459 trick.
4454
4460
4455 - added a header to the logfile which allows (almost) full
4461 - added a header to the logfile which allows (almost) full
4456 session restoring.
4462 session restoring.
4457
4463
4458 - prepend lines beginning with @ or !, with a and log
4464 - prepend lines beginning with @ or !, with a and log
4459 them. Why? !lines: may be useful to know what you did @lines:
4465 them. Why? !lines: may be useful to know what you did @lines:
4460 they may affect session state. So when restoring a session, at
4466 they may affect session state. So when restoring a session, at
4461 least inform the user of their presence. I couldn't quite get
4467 least inform the user of their presence. I couldn't quite get
4462 them to properly re-execute, but at least the user is warned.
4468 them to properly re-execute, but at least the user is warned.
4463
4469
4464 * Started ChangeLog.
4470 * Started ChangeLog.
General Comments 0
You need to be logged in to leave comments. Login now