mirrors/xonsh
1
0
Fork 0
mirror of https://github.com/xonsh/xonsh.git synced 2025-03-04 16:34:47 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #979 from adqm/be_a_better_listener

Browse source 
Respect decisions made about SHELL_TYPE in rc files
This commit is contained in:
Anthony Scopatz 2016-05-21 22:05:04 -04:00
commit 5e16e413c1
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
xonsh/main.py
View file

@ -186,8 +186,7 @@ def premain(argv=None):
version = '/'.join(('xonsh', __version__)),
print(version)
exit()
shell_kwargs = {'shell_type': args.shell_type or
DEFAULT_VALUES.get('SHELL_TYPE'),
shell_kwargs = {'shell_type': args.shell_type,
'completer': False,
'login': False,
'scriptcache': args.scriptcache,

4
xonsh/shell.py
View file

@ -47,7 +47,7 @@ class Shell(object):
if shell_type is not None:
env['SHELL_TYPE'] = shell_type
shell_type = env.get('SHELL_TYPE')
if shell_type == 'best':
if shell_type == 'best' or shell_type is None:
shell_type = BEST_SHELL_TYPE
elif shell_type == 'random':
shell_type = random.choice(('readline', 'prompt_toolkit'))
@ -89,7 +89,7 @@ class Shell(object):
names = builtins.__xonsh_config__.get('xontribs', ())
for name in names:
xontribs.update_context(name, ctx=self.ctx)
# load run contol files
# load run control files
env = builtins.__xonsh_env__
rc = env.get('XONSHRC') if rc is None else rc
self.ctx.update(xonshrc_context(rcfiles=rc, execer=self.execer))