cleanup for PR

This commit is contained in:
Bob Hyman 2016-08-31 21:24:38 -04:00
parent 33c68e3757
commit d9bb2088c0
3 changed files with 1 additions and 18 deletions

1
.gitignore vendored
View file

@ -21,7 +21,6 @@ docs/envvarsbody
docs/xontribsbody
docs/eventsbody
xonsh/dev.githash
**/__pycache__/
# temporary files from vim and emacs
*~

View file

@ -1,13 +0,0 @@
**Added:** None
**Changed:**
* ``lazy_locate_binary`` handles binary on different drive letter than current working directory (on Windows).
**Deprecated:** None
**Removed:** None
**Fixed:** None
**Security:** None

View file

@ -133,10 +133,7 @@ class CommandsCache(cabc.Mapping):
if os.path.isfile(full_name)
), None)
if local_bin:
if os.path.splitdrive(cwd)[0] != os.path.splitdrive(local_bin)[0]: # if cwd not on same drive as bin
return os.path.abspath(local_bin) # avoid ValueError in relpath()
else:
return os.path.abspath(os.path.relpath(local_bin, cwd))
return os.path.abspath(os.path.relpath(local_bin, cwd))
cached = next((cmd for cmd in possibilities if cmd in self._cmds_cache), None)
if cached: