##// END OF EJS Templates
fix macro n1-n2 syntax, which had broken.
fperez -
Show More
@@ -1,7 +1,7 b''
1 # -*- coding: utf-8 -*-
1 # -*- coding: utf-8 -*-
2 """Magic functions for InteractiveShell.
2 """Magic functions for InteractiveShell.
3
3
4 $Id: Magic.py 1188 2006-03-02 18:24:00Z vivainio $"""
4 $Id: Magic.py 1203 2006-03-12 09:30:31Z fperez $"""
5
5
6 #*****************************************************************************
6 #*****************************************************************************
7 # Copyright (C) 2001 Janko Hauser <jhauser@zscout.de> and
7 # Copyright (C) 2001 Janko Hauser <jhauser@zscout.de> and
@@ -1687,7 +1687,7 b' Currently the magic system has the following functions:\\n"""'
1687
1687
1688 In [60]: exec In[44:48]+In[49]"""
1688 In [60]: exec In[44:48]+In[49]"""
1689
1689
1690 opts,args = self.parse_options(parameter_s,'r')
1690 opts,args = self.parse_options(parameter_s,'r',mode='list')
1691 name,ranges = args[0], args[1:]
1691 name,ranges = args[0], args[1:]
1692 #print 'rng',ranges # dbg
1692 #print 'rng',ranges # dbg
1693 lines = self.extract_input_slices(ranges,opts.has_key('r'))
1693 lines = self.extract_input_slices(ranges,opts.has_key('r'))
@@ -1717,7 +1717,7 b' Currently the magic system has the following functions:\\n"""'
1717 It adds a '.py' extension to the file if you don't do so yourself, and
1717 It adds a '.py' extension to the file if you don't do so yourself, and
1718 it asks for confirmation before overwriting existing files."""
1718 it asks for confirmation before overwriting existing files."""
1719
1719
1720 opts,args = self.parse_options(parameter_s,'r', mode = 'list')
1720 opts,args = self.parse_options(parameter_s,'r',mode='list')
1721 fname,ranges = args[0], args[1:]
1721 fname,ranges = args[0], args[1:]
1722 if not fname.endswith('.py'):
1722 if not fname.endswith('.py'):
1723 fname += '.py'
1723 fname += '.py'
@@ -1,3 +1,8 b''
1 2006-03-12 Fernando Perez <Fernando.Perez@colorado.edu>
2
3 * IPython/Magic.py (magic_macro): fix so that the n1-n2 syntax for
4 line ranges works again.
5
1 2006-03-11 Fernando Perez <Fernando.Perez@colorado.edu>
6 2006-03-11 Fernando Perez <Fernando.Perez@colorado.edu>
2
7
3 * IPython/iplib.py (showtraceback): add back sys.last_traceback
8 * IPython/iplib.py (showtraceback): add back sys.last_traceback
General Comments 0
You need to be logged in to leave comments. Login now