Show More
@@ -6,7 +6,7 b' Requires Python 2.3 or newer.' | |||
|
6 | 6 | |
|
7 | 7 | This file contains all the classes and helper functions specific to IPython. |
|
8 | 8 | |
|
9 |
$Id: iplib.py 10 |
|
|
9 | $Id: iplib.py 1027 2006-01-16 21:07:24Z vivainio $ | |
|
10 | 10 | """ |
|
11 | 11 | |
|
12 | 12 | #***************************************************************************** |
@@ -1894,15 +1894,20 b' want to merge them back into the new files.""" % locals()' | |||
|
1894 | 1894 | if not oinfo['found']: |
|
1895 | 1895 | return self.handle_normal(line,continue_prompt) |
|
1896 | 1896 | else: |
|
1897 | #print 'iFun <%s> rest <%s>' % (iFun,theRest) # dbg | |
|
1897 | #print 'pre<%s> iFun <%s> rest <%s>' % (pre,iFun,theRest) # dbg | |
|
1898 | 1898 | if oinfo['isalias']: |
|
1899 | 1899 | return self.handle_alias(line,continue_prompt, |
|
1900 | 1900 | pre,iFun,theRest) |
|
1901 | 1901 | |
|
1902 |
if self.rc.autocall |
|
|
1903 | not self.re_exclude_auto.match(theRest) and \ | |
|
1904 | self.re_fun_name.match(iFun) and \ | |
|
1905 | callable(oinfo['obj']) : | |
|
1902 | if (self.rc.autocall | |
|
1903 | and | |
|
1904 | ( | |
|
1905 | #only consider exclusion re if not "," or ";" autoquoting | |
|
1906 | (pre == self.ESC_QUOTE or pre == self.ESC_QUOTE2) or | |
|
1907 | (not self.re_exclude_auto.match(theRest))) | |
|
1908 | and | |
|
1909 | self.re_fun_name.match(iFun) and | |
|
1910 | callable(oinfo['obj'])) : | |
|
1906 | 1911 | #print 'going auto' # dbg |
|
1907 | 1912 | return self.handle_auto(line,continue_prompt, |
|
1908 | 1913 | pre,iFun,theRest,oinfo['obj']) |
@@ -1,10 +1,16 b'' | |||
|
1 | 1 | 2006-01-16 Ville Vainio <vivainio@gmail.com> |
|
2 | 2 | |
|
3 |
* Reverted back to old %edit functionality |
|
|
4 | file contents on exit. | |
|
3 | * Ipython/magic.py:Reverted back to old %edit functionality | |
|
4 | that returns file contents on exit. | |
|
5 | ||
|
6 | * IPython/path.py: Added Jason Orendorff's "path" module to | |
|
7 | IPython tree, http://www.jorendorff.com/articles/python/path/ | |
|
8 | ||
|
9 | * Ipython/iplib.py:"," and ";" autoquoting-upon-autocall | |
|
10 | now work again without considering the exclusion regexp - | |
|
11 | hence, things like ',foo my/path' turn to 'foo("my/path")' | |
|
12 | instead of syntax error. | |
|
5 | 13 | |
|
6 | * Added Jason Orendorff's "path" module to IPython tree, | |
|
7 | http://www.jorendorff.com/articles/python/path/ | |
|
8 | 14 | |
|
9 | 15 | 2006-01-14 Ville Vainio <vivainio@gmail.com> |
|
10 | 16 |
General Comments 0
You need to be logged in to leave comments.
Login now