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

Make lazy_locate_binary be consistent with locate_binary

Browse source
This commit is contained in:
Burak Yigit Kaya 2016-06-24 18:06:55 +03:00
parent 4193e40ee1
commit 00b3f2220e
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
xonsh/tools.py
View file

@ -1660,6 +1660,12 @@ class CommandsCache(abc.Mapping):
def locate_binary(self, name):
"""Locates an executable on the file system using the cache."""
# invalidate the cache by accessing this property
_ = self.all_commands
return self.lazy_locate_binary(name)
def lazy_locate_binary(self, name):
"""Locates an executable in the cache, without invalidating it."""
possibilities = self.get_possible_names(name)
if ON_WINDOWS:
@ -1674,16 +1680,6 @@ class CommandsCache(abc.Mapping):
if local_bin:
return os.path.abspath(os.path.relpath(local_bin, cwd))
cmds = self.all_commands
cached = next((cmd for cmd in possibilities if cmd in cmds), None)
if cached:
return cmds[cached][0]
elif os.path.isfile(name) and name != os.path.basename(name):
return name
def lazy_locate_binary(self, name):
"""Locates an executable in the cache, without invalidating it."""
possibilities = self.get_possible_names(name)
cached = next((cmd for cmd in possibilities if cmd in self._cmds_cache), None)
if cached:
return self._cmds_cache[cached][0]