Merge branch 'patch-2' of https://github.com/naufraghi/xonsh into naufraghi-patch-2

This commit is contained in:
Anthony Scopatz 2015-03-16 19:38:41 -05:00
commit 32379aa060

View file

@ -138,8 +138,8 @@ def xonshrc_context(rcfile=None, execer=None):
try:
execer.filename = rcfile
execer.exec(rc, glbs={}, locs=env)
except SyntaxError:
warn('syntax error in xonsh run control file {0!r}'.format(rcfile),
except SyntaxError as err:
warn('syntax error in xonsh run control file {0!r}: {1!s}'.format(rcfile, err),
RuntimeWarning)
finally:
execer.filename = fname