diff options
author | Todd Leonhardt <todd.leonhardt@gmail.com> | 2017-08-10 09:36:30 -0400 |
---|---|---|
committer | Todd Leonhardt <todd.leonhardt@gmail.com> | 2017-08-10 09:36:30 -0400 |
commit | 2db18d0342c9e8ce1f3f5ee799791edfd0b46602 (patch) | |
tree | d164e4c723d0759a7be0a3c5402a382b9f424537 /cmd2.py | |
parent | a2df31081138beb634cad5cdba8aa18817b98b46 (diff) | |
parent | 256e069e2cd2627df0c02730132c7251c832818a (diff) | |
download | cmd2-git-2db18d0342c9e8ce1f3f5ee799791edfd0b46602.tar.gz |
Merge branch 'master' into buffer_size
Diffstat (limited to 'cmd2.py')
-rwxr-xr-x | cmd2.py | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -314,7 +314,7 @@ def options(option_list, arg_desc="arg"): # Can we access the clipboard? Should always be true on Windows and Mac, but only sometimes on Linux # noinspection PyUnresolvedReferences try: - if six.PY3 and sys.platform.startswith('linux'): + if sys.platform.startswith('linux'): # Avoid extraneous output to stderr from xclip when clipboard is empty at cost of overwriting clipboard contents pyperclip.copy('') else: |