diff options
| author | Kevin Van Brunt <kmvanbrunt@gmail.com> | 2019-08-17 19:38:36 -0400 |
|---|---|---|
| committer | Kevin Van Brunt <kmvanbrunt@gmail.com> | 2019-08-17 19:38:36 -0400 |
| commit | 90cc59811421ed14bc6ba5ba72a68fedcfd3db92 (patch) | |
| tree | 0b05115096e2147eed9af83f7e66b0352fb18f16 | |
| parent | 125eba80917e2a5b960efce5506c5c92f7893e7d (diff) | |
| parent | d6549c847a40e995dc6d6bcbf8ace1c121c4b0ee (diff) | |
| download | cmd2-git-90cc59811421ed14bc6ba5ba72a68fedcfd3db92.tar.gz | |
Merge branch 'master' into completion_state
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | cmd2/clipboard.py | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d6a7d12..cb7ff7ba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,6 @@ ## 0.9.17 (TBD, 2019) +* Bug Fixes + * Fixed a bug when using WSL when all Windows paths have been removed from $PATH * Enhancements * No longer treating empty text scripts as an error condition diff --git a/cmd2/clipboard.py b/cmd2/clipboard.py index 8e3cddc3..18370f9a 100644 --- a/cmd2/clipboard.py +++ b/cmd2/clipboard.py @@ -10,7 +10,8 @@ from pyperclip import PyperclipException try: # Try getting the contents of the clipboard _ = pyperclip.paste() -except PyperclipException: +except (PyperclipException, FileNotFoundError): + # NOTE: FileNotFoundError is for Windows Subsystem for Linux (WSL) when Windows paths are removed from $PATH can_clip = False else: can_clip = True |