Merge branch 'wrywerytwreywery-xonshrc'

This commit is contained in:
Anthony Scopatz 2015-03-23 11:00:39 -05:00
commit 6f53240ae1

View file

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