Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add timeouts to handle errors #269

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add timeouts to handle errors #269

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e4f859f
Add timeouts to handle errors
shiribailem Sep 17, 2024
5afc97a
Shorten timeout for sanity
shiribailem Sep 17, 2024
df47df4
Add global timeout variable
shiribailem Oct 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 14 additions & 12 deletions src/pyperclip/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@

_IS_RUNNING_PYTHON_2 = sys.version_info[0] == 2 # type: bool

paste_timeout = 0.1

# For paste(): Python 3 uses str, Python 2 uses unicode.
if _IS_RUNNING_PYTHON_2:
# mypy complains about `unicode` for Python 2, so we ignore the type error:
Expand Down Expand Up @@ -99,12 +101,12 @@ def copy_osx_pbcopy(text):
text = _PYTHON_STR_TYPE(text) # Converts non-str values to str.
p = subprocess.Popen(['pbcopy', 'w'],
stdin=subprocess.PIPE, close_fds=True)
p.communicate(input=text.encode(ENCODING))
p.communicate(input=text.encode(ENCODING), timeout=paste_timeout)

def paste_osx_pbcopy():
p = subprocess.Popen(['pbpaste', 'r'],
stdout=subprocess.PIPE, close_fds=True)
stdout, stderr = p.communicate()
stdout, stderr = p.communicate(timeout=paste_timeout)
return stdout.decode(ENCODING)

return copy_osx_pbcopy, paste_osx_pbcopy
Expand Down Expand Up @@ -166,7 +168,7 @@ def copy_xclip(text, primary=False):
selection=PRIMARY_SELECTION
p = subprocess.Popen(['xclip', '-selection', selection],
stdin=subprocess.PIPE, close_fds=True)
p.communicate(input=text.encode(ENCODING))
p.communicate(input=text.encode(ENCODING), timeout=paste_timeout)

def paste_xclip(primary=False):
selection=DEFAULT_SELECTION
Expand All @@ -176,7 +178,7 @@ def paste_xclip(primary=False):
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
close_fds=True)
stdout, stderr = p.communicate()
stdout, stderr = p.communicate(timeout=paste_timeout)
# Intentionally ignore extraneous output on stderr when clipboard is empty
return stdout.decode(ENCODING)

Expand All @@ -194,15 +196,15 @@ def copy_xsel(text, primary=False):
selection_flag = PRIMARY_SELECTION
p = subprocess.Popen(['xsel', selection_flag, '-i'],
stdin=subprocess.PIPE, close_fds=True)
p.communicate(input=text.encode(ENCODING))
p.communicate(input=text.encode(ENCODING), timeout=paste_timeout)

def paste_xsel(primary=False):
selection_flag = DEFAULT_SELECTION
if primary:
selection_flag = PRIMARY_SELECTION
p = subprocess.Popen(['xsel', selection_flag, '-o'],
stdout=subprocess.PIPE, close_fds=True)
stdout, stderr = p.communicate()
stdout, stderr = p.communicate(timeout=paste_timeout)
return stdout.decode(ENCODING)

return copy_xsel, paste_xsel
Expand All @@ -222,14 +224,14 @@ def copy_wl(text, primary=False):
else:
pass
p = subprocess.Popen(args, stdin=subprocess.PIPE, close_fds=True)
p.communicate(input=text.encode(ENCODING))
p.communicate(input=text.encode(ENCODING), timeout=paste_timeout)

def paste_wl(primary=False):
args = ["wl-paste", "-n", "-t", "text"]
if primary:
args.append(PRIMARY_SELECTION)
p = subprocess.Popen(args, stdout=subprocess.PIPE, close_fds=True)
stdout, _stderr = p.communicate()
stdout, _stderr = p.communicate(timeout=paste_timeout)
return stdout.decode(ENCODING)

return copy_wl, paste_wl
Expand All @@ -242,13 +244,13 @@ def copy_klipper(text):
['qdbus', 'org.kde.klipper', '/klipper', 'setClipboardContents',
text.encode(ENCODING)],
stdin=subprocess.PIPE, close_fds=True)
p.communicate(input=None)
p.communicate(input=None, timeout=paste_timeout)

def paste_klipper():
p = subprocess.Popen(
['qdbus', 'org.kde.klipper', '/klipper', 'getClipboardContents'],
stdout=subprocess.PIPE, close_fds=True)
stdout, stderr = p.communicate()
stdout, stderr = p.communicate(timeout=paste_timeout)

# Workaround for https://bugs.kde.org/show_bug.cgi?id=342874
# TODO: https://github.com/asweigart/pyperclip/issues/43
Expand Down Expand Up @@ -468,7 +470,7 @@ def copy_wsl(text):
text = _PYTHON_STR_TYPE(text) # Converts non-str values to str.
p = subprocess.Popen(['clip.exe'],
stdin=subprocess.PIPE, close_fds=True)
p.communicate(input=text.encode('utf-16le'))
p.communicate(input=text.encode('utf-16le'), timeout=paste_timeout)

def paste_wsl():
ps_script = '[Convert]::ToBase64String([Text.Encoding]::UTF8.GetBytes((Get-Clipboard -Raw)))'
Expand All @@ -478,7 +480,7 @@ def paste_wsl():
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
close_fds=True)
stdout, stderr = p.communicate()
stdout, stderr = p.communicate(timeout=paste_timeout)

if stderr:
raise Exception(f"Error pasting from clipboard: {stderr}")
Expand Down