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 branch 'prompt-err' of github.com:scopatz/xonsh into scopatz-prompt-err

Browse source
This commit is contained in:
adam j hartz 2015-08-03 18:34:05 -04:00
commit 8fb90853ea
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
xonsh/base_shell.py
View file

@ -102,12 +102,19 @@ class BaseShell(object):
"""Obtains the current prompt string."""
if self.need_more_lines:
if self.mlprompt is None:
self.mlprompt = multiline_prompt()
try:
self.mlprompt = multiline_prompt()
except Exception:
_print_exception()
self.mlprompt = '<multiline prompt error> '
return self.mlprompt
env = builtins.__xonsh_env__
if 'PROMPT' in env:
p = env['PROMPT']
p = format_prompt(p)
try:
p = format_prompt(p)
except Exception:
_print_exception()
else:
p = "set '$PROMPT = ...' $ "
self.settitle()