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 'melund-check_subprocess_result'

Browse source
This commit is contained in:
Anthony Scopatz 2015-07-14 17:45:49 -07:00
commit b559c03ff2
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
xonsh/aliases.py
View file

@ -76,7 +76,7 @@ def bash_aliases():
input='alias',
stderr=subprocess.PIPE,
universal_newlines=True)
except subprocess.CalledProcessError:
except (subprocess.CalledProcessError, FileNotFoundError):
s = ''
items = [line.split('=', 1) for line in s.splitlines() if '=' in line]
aliases = {}

2
xonsh/completer.py
View file

@ -51,7 +51,7 @@ class Completer(object):
# or we could make this lazy
self._load_bash_complete_files()
self.have_bash = True
except subprocess.CalledProcessError:
except (subprocess.CalledProcessError, FileNotFoundError):
self.have_bash = False
def complete(self, prefix, line, begidx, endidx, ctx=None):

16
xonsh/environ.py
View file

@ -184,7 +184,7 @@ def locate_binary(name, cwd):
universal_newlines=True)
if not binary_location:
return
except subprocess.CalledProcessError:
except (subprocess.CalledProcessError, FileNotFoundError):
return
return binary_location
@ -254,7 +254,7 @@ def get_git_branch(cwd=None):
input=_input,
stderr=subprocess.PIPE,
universal_newlines=True) or None
except subprocess.CalledProcessError:
except (subprocess.CalledProcessError, FileNotFoundError):
continue
# fall back to using the git binary if the above failed
@ -268,7 +268,7 @@ def get_git_branch(cwd=None):
s = s.strip()
if len(s) > 0:
branch = s
except subprocess.CalledProcessError:
except (subprocess.CalledProcessError, FileNotFoundError):
pass
return branch
@ -286,9 +286,9 @@ def call_hg_command(command, cwd):
cwd=cwd,
universal_newlines=True,
env=hg_env)
except subprocess.CalledProcessError:
except (subprocess.CalledProcessError, FileNotFoundError):
pass
return s
@ -340,10 +340,9 @@ def git_dirty_working_directory(cwd=None):
cwd=cwd,
universal_newlines=True)
return bool(s)
except subprocess.CalledProcessError:
except (subprocess.CalledProcessError, FileNotFoundError):
return False
@ensure_hg
def hg_dirty_working_directory(cwd=None, root=None):
id = call_hg_command(['identify', '--id'], cwd).strip(os.linesep)
@ -478,8 +477,9 @@ def bash_env():
env=currenv,
stderr=subprocess.PIPE,
universal_newlines=True)
except subprocess.CalledProcessError:
except (subprocess.CalledProcessError, FileNotFoundError):
s = ''
items = [line.split('=', 1) for line in s.splitlines() if '=' in line]
env = dict(items)
return env