diff options
author | catherine devlin <catherine.devlin@gmail.com> | 2011-02-02 08:13:03 -0500 |
---|---|---|
committer | catherine devlin <catherine.devlin@gmail.com> | 2011-02-02 08:13:03 -0500 |
commit | 98cca9f46ff80d2a0b58fe09afeaba6b75d2c7b6 (patch) | |
tree | 85d5170e8059daeeae3e4d763fce05ae7bd0be89 /cmd2.py | |
parent | 5655bd33f1796046c00823409c6d386b195717b1 (diff) | |
download | cmd2-hg-98cca9f46ff80d2a0b58fe09afeaba6b75d2c7b6.tar.gz |
fix xclip trapping bug
Diffstat (limited to 'cmd2.py')
-rwxr-xr-x | cmd2.py | 19 |
1 files changed, 10 insertions, 9 deletions
@@ -189,15 +189,16 @@ else: subprocess.check_call('xclip -o -sel clip', shell=True, stdout=subprocess.PIPE, stdin=subprocess.PIPE, stderr=subprocess.PIPE) can_clip = True except AttributeError: # check_call not defined, Python < 2.5 - teststring = 'Testing for presence of xclip.' - xclipproc = subprocess.Popen('xclip -sel clip', shell=True, stdout=subprocess.PIPE, stdin=subprocess.PIPE) - xclipproc.stdin.write(teststring) - xclipproc.stdin.close() - xclipproc = subprocess.Popen('xclip -o -sel clip', shell=True, stdout=subprocess.PIPE, stdin=subprocess.PIPE) - if xclipproc.stdout.read() == teststring: - can_clip = True - except (subprocess.CalledProcessError, OSError, IOError): - pass + try: + teststring = 'Testing for presence of xclip.' + xclipproc = subprocess.Popen('xclip -sel clip', shell=True, stdout=subprocess.PIPE, stdin=subprocess.PIPE) + xclipproc.stdin.write(teststring) + xclipproc.stdin.close() + xclipproc = subprocess.Popen('xclip -o -sel clip', shell=True, stdout=subprocess.PIPE, stdin=subprocess.PIPE) + if xclipproc.stdout.read() == teststring: + can_clip = True + except (subprocess.CalledProcessError, OSError, IOError): + pass if can_clip: def get_paste_buffer(): xclipproc = subprocess.Popen('xclip -o -sel clip', shell=True, stdout=subprocess.PIPE, stdin=subprocess.PIPE) |