##// END OF EJS Templates
Made ! and !! shell escapes work again in multiline statements.
vivainio -
r105:4459c668
parent child
Show More
@@ -6,7 +6,7 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 1007 2006-01-12 17:15:41Z vivainio $
9 $Id: iplib.py 1012 2006-01-12 21:29:37Z vivainio $
10 """
10 """
11
11
12 #*****************************************************************************
12 #*****************************************************************************
@@ -1898,7 +1898,7 want to merge them back into the new files.""" % locals()
1898
1898
1899 #print 'line in :', `line` # dbg
1899 #print 'line in :', `line` # dbg
1900 # Example of a special handler. Others follow a similar pattern.
1900 # Example of a special handler. Others follow a similar pattern.
1901 if line.startswith('!!'):
1901 if line.lstrip().startswith('!!'):
1902 # rewrite iFun/theRest to properly hold the call to %sx and
1902 # rewrite iFun/theRest to properly hold the call to %sx and
1903 # the actual command to be executed, so handle_magic can work
1903 # the actual command to be executed, so handle_magic can work
1904 # correctly
1904 # correctly
@@ -1907,7 +1907,7 want to merge them back into the new files.""" % locals()
1907 return self.handle_magic('%ssx %s' % (self.ESC_MAGIC,line[2:]),
1907 return self.handle_magic('%ssx %s' % (self.ESC_MAGIC,line[2:]),
1908 continue_prompt,pre,iFun,theRest)
1908 continue_prompt,pre,iFun,theRest)
1909 else:
1909 else:
1910 cmd=line[1:]
1910 cmd=line.lstrip()[1:]
1911 line_out = '%sipsystem(%s)' % (pre,make_quoted_expr(cmd))
1911 line_out = '%sipsystem(%s)' % (pre,make_quoted_expr(cmd))
1912 # update cache/log and return
1912 # update cache/log and return
1913 self.log(line_out,continue_prompt)
1913 self.log(line_out,continue_prompt)
@@ -1,23 +1,30
1 2006-01-12 Ville Vainio <vivainio@gmail.com>
1 2006-01-12 Ville Vainio <vivainio@gmail.com>
2
2
3 * IPython/iplib.py.py (make_quoted_expr,handle_shell_escape):
3 * IPython/iplib.py (make_quoted_expr,handle_shell_escape):
4 Prettified and hardened string/backslash quoting with ipsystem(),
4 Prettified and hardened string/backslash quoting with ipsystem(),
5 ipalias() and ipmagic(). Now even \ characters are passed to
5 ipalias() and ipmagic(). Now even \ characters are passed to
6 %magics, !shell escapes and aliases exactly as they are in the
6 %magics, !shell escapes and aliases exactly as they are in the
7 ipython command line. Should improve backslash experience,
7 ipython command line. Should improve backslash experience,
8 particularly in Windows. %cd magic still doesn't support backslash
8 particularly in Windows (path delimiter for some commands that
9 path delimiters, though. Also deleted all pretense of supporting
9 won't understand '/'), but Unix benefits as well (regexps). %cd
10 multiline command strings in !system or %magic commands. Thanks to
10 magic still doesn't support backslash path delimiters, though. Also
11 Jerry McRae for suggestions.
11 deleted all pretense of supporting multiline command strings in
12 !system or %magic commands. Thanks to Jerry McRae for suggestions.
12
13
13 * doc/build_doc_instructions.txt added. Documentation on how to use
14 * doc/build_doc_instructions.txt added. Documentation on how to use
14 doc/update_manual.py, added yesterday. Both files contributed by
15 doc/update_manual.py, added yesterday. Both files contributed by
15 Jörgen Stenarson <jorgen.stenarson@bostream.nu>. This slates
16 Jörgen Stenarson <jorgen.stenarson@bostream.nu>. This slates
16 doc/*.sh for deprecation at a later date.
17 doc/*.sh for deprecation at a later date.
17
18
18 * Added ipython.py to root directory for zero-installation
19 * /ipython.py Added ipython.py to root directory for
19 (tar xzvf ipython.tgz; cd ipython; python ipython.py) and
20 zero-installation (tar xzvf ipython.tgz; cd ipython; python
20 development convenience.
21 ipython.py) and development convenience (no need to kee doing
22 "setup.py install" between changes).
23
24 * Made ! and !! shell escapes work (again) in multiline expressions:
25 if 1:
26 !ls
27 !!ls
21
28
22 2006-01-12 Fernando Perez <Fernando.Perez@colorado.edu>
29 2006-01-12 Fernando Perez <Fernando.Perez@colorado.edu>
23
30
General Comments 0
You need to be logged in to leave comments. Login now