diff options
Diffstat (limited to 'cmd2/clipboard.py')
| -rw-r--r-- | cmd2/clipboard.py | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/cmd2/clipboard.py b/cmd2/clipboard.py index b2331649..8e3cddc3 100644 --- a/cmd2/clipboard.py +++ b/cmd2/clipboard.py @@ -2,30 +2,14 @@ """ This module provides basic ability to copy from and paste to the clipboard/pastebuffer. """ -import sys - import pyperclip - -# Newer versions of pyperclip are released as a single file, but older versions had a more complicated structure -try: - from pyperclip.exceptions import PyperclipException -except ImportError: # pragma: no cover - # noinspection PyUnresolvedReferences,PyProtectedMember - from pyperclip import PyperclipException +# noinspection PyProtectedMember +from pyperclip import PyperclipException # Can we access the clipboard? Should always be true on Windows and Mac, but only sometimes on Linux -# noinspection PyUnresolvedReferences try: - # Get the version of the pyperclip module as a float - pyperclip_ver = float('.'.join(pyperclip.__version__.split('.')[:2])) - - # The extraneous output bug in pyperclip on Linux using xclip was fixed in more recent versions of pyperclip - if sys.platform.startswith('linux') and pyperclip_ver < 1.6: - # Avoid extraneous output to stderr from xclip when clipboard is empty at cost of overwriting clipboard contents - pyperclip.copy('') - else: - # Try getting the contents of the clipboard - _ = pyperclip.paste() + # Try getting the contents of the clipboard + _ = pyperclip.paste() except PyperclipException: can_clip = False else: |