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

Fixed libedit init file problem

Browse source
This commit is contained in:
Anthony Scopatz 2016-05-25 00:17:41 -04:00
parent 87de846408
commit e0ed02cdd6
3 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.rst
View file

@ -28,6 +28,8 @@ Current Developments
spaces in their path names spaces in their path names
* Fixed a bug preventing ``source-bash`` from working on Windows * Fixed a bug preventing ``source-bash`` from working on Windows
* Numerous improvements to job control via a nearly-complete rewrite * Numerous improvements to job control via a nearly-complete rewrite
* Fixed issue with loading readline init files (inputrc) that seems to be
triggered by libedit.
* Rectified install issue with Jupyter hook when installing with pyenv, * Rectified install issue with Jupyter hook when installing with pyenv,
Jupyter install hook now repects ``--prefix`` argument. Jupyter install hook now repects ``--prefix`` argument.
* Fixed issue with the xonsh.ply subpackage not being installed. * Fixed issue with the xonsh.ply subpackage not being installed.

8
xonsh/readline_shell.py
View file

@ -69,8 +69,12 @@ def setup_readline():
readline.parse_and_bind("bind ^I rl_complete") readline.parse_and_bind("bind ^I rl_complete")
else: else:
readline.parse_and_bind("tab: complete") readline.parse_and_bind("tab: complete")
# load custom user settings # try to load custom user settings
readline.read_init_file() try:
readline.read_init_file()
except Exception:
# this seems to fail with libedit
print_exception('xonsh: could not load readline default init file.')
def teardown_readline(): def teardown_readline():

5
xonsh/tools.py
View file

@ -344,7 +344,7 @@ def suggest_commands(cmd, env, aliases):
return rtn return rtn
def print_exception(): def print_exception(msg=None):
"""Print exceptions with/without traceback.""" """Print exceptions with/without traceback."""
env = getattr(builtins, '__xonsh_env__', os.environ) env = getattr(builtins, '__xonsh_env__', os.environ)
if 'XONSH_SHOW_TRACEBACK' not in env: if 'XONSH_SHOW_TRACEBACK' not in env:
@ -356,6 +356,9 @@ def print_exception():
exc_type, exc_value, exc_traceback = sys.exc_info() exc_type, exc_value, exc_traceback = sys.exc_info()
exception_only = traceback.format_exception_only(exc_type, exc_value) exception_only = traceback.format_exception_only(exc_type, exc_value)
sys.stderr.write(''.join(exception_only)) sys.stderr.write(''.join(exception_only))
if msg:
msg = msg if msg.endswith('\n') else msg + '\n'
sys.stderr.write(msg)
# Modified from Public Domain code, by Magnus Lie Hetland # Modified from Public Domain code, by Magnus Lie Hetland