Merge branch 'fix_double_wrapping_check' of github.com:adqm/xonsh into adqm-fix_double_wrapping_check

This commit is contained in:
Anthony Scopatz 2016-03-03 12:59:56 -05:00
commit ad21481f46

View file

@ -185,15 +185,15 @@ class Execer(object):
if prev_indent == curr_indent:
raise original_error
maxcol = self._find_next_break(line, last_error_col)
if line.startswith('$['):
# if we have already wrapped this in subproc tokens
# and it still doesn't work, adding more won't help
# anything
raise original_error
sbpline = subproc_toks(line,
returnline=True,
maxcol=maxcol,
lexer=self.parser.lexer)
if sbpline.startswith('$[$['):
# if we have already wrapped this in subproc tokens
# and it still doesn't work, adding more won't help
# anything
raise original_error
if sbpline is None:
# subprocess line had no valid tokens, likely because
# it only contained a comment.