diff --git a/IPython/iplib.py b/IPython/iplib.py index 7267b64..8f76fed 100644 --- a/IPython/iplib.py +++ b/IPython/iplib.py @@ -6,7 +6,7 @@ Requires Python 2.3 or newer. This file contains all the classes and helper functions specific to IPython. -$Id: iplib.py 1019 2006-01-14 13:02:12Z vivainio $ +$Id: iplib.py 1027 2006-01-16 21:07:24Z vivainio $ """ #***************************************************************************** @@ -1894,15 +1894,20 @@ want to merge them back into the new files.""" % locals() if not oinfo['found']: return self.handle_normal(line,continue_prompt) else: - #print 'iFun <%s> rest <%s>' % (iFun,theRest) # dbg + #print 'pre<%s> iFun <%s> rest <%s>' % (pre,iFun,theRest) # dbg if oinfo['isalias']: return self.handle_alias(line,continue_prompt, pre,iFun,theRest) - if self.rc.autocall and \ - not self.re_exclude_auto.match(theRest) and \ - self.re_fun_name.match(iFun) and \ - callable(oinfo['obj']) : + if (self.rc.autocall + and + ( + #only consider exclusion re if not "," or ";" autoquoting + (pre == self.ESC_QUOTE or pre == self.ESC_QUOTE2) or + (not self.re_exclude_auto.match(theRest))) + and + self.re_fun_name.match(iFun) and + callable(oinfo['obj'])) : #print 'going auto' # dbg return self.handle_auto(line,continue_prompt, pre,iFun,theRest,oinfo['obj']) diff --git a/doc/ChangeLog b/doc/ChangeLog index 5153625..9dfb5e6 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,10 +1,16 @@ 2006-01-16 Ville Vainio - * Reverted back to old %edit functionality that returns - file contents on exit. + * Ipython/magic.py:Reverted back to old %edit functionality + that returns file contents on exit. + + * IPython/path.py: Added Jason Orendorff's "path" module to + IPython tree, http://www.jorendorff.com/articles/python/path/ + + * Ipython/iplib.py:"," and ";" autoquoting-upon-autocall + now work again without considering the exclusion regexp - + hence, things like ',foo my/path' turn to 'foo("my/path")' + instead of syntax error. - * Added Jason Orendorff's "path" module to IPython tree, - http://www.jorendorff.com/articles/python/path/ 2006-01-14 Ville Vainio