Fix xsel import when clipboard is empty, and add timeout failsafe (kivy#8682)

clayote · web-flow · commit e97c3e561d9d · 2024-04-20T14:00:56.000+02:00
* Add timeout to `clipboard_xsel` at import time

* Call '--version' in `xsel` subprocess

Guarantees some return value, even if the clipboard is empty.

* Remove meaningless try/except
diff --git a/kivy/core/clipboard/clipboard_xsel.py b/kivy/core/clipboard/clipboard_xsel.py
@@ -11,12 +11,9 @@
 if platform != 'linux':
     raise SystemError('unsupported platform for xsel clipboard')
 
-try:
-    import subprocess
-    p = subprocess.Popen(['xsel'], stdout=subprocess.PIPE)
-    p.communicate()
-except:
-    raise
+import subprocess
+p = subprocess.Popen(['xsel', '--version'], stdout=subprocess.PIPE)
+p.communicate(timeout=1)
 
 
 class ClipboardXsel(ClipboardExternalBase):
