Replace custom clipboard code with pyperclip

sebastinas · sebastinas · commit 8ba24d1a88ac · 2021-02-14T18:12:56.000+01:00
pyperclip supports Wayland and Windows
diff --git a/README.rst b/README.rst
@@ -163,6 +163,7 @@ Dependencies
 * babel (optional, for internationalization)
 * jedi (optional, for experimental multiline completion)
 * watchdog (optional, for monitoring imported modules for changes)
+* pyperclip (optional, for copying to the clipboard)
 
 bpython-urwid
 -------------
diff --git a/bpython/clipboard.py b/bpython/clipboard.py
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -36,12 +36,17 @@
 from enum import Enum
 from itertools import takewhile
 from pathlib import Path
+from pygments.lexers import Python3Lexer
+from pygments.token import Token
 from types import ModuleType
 
-from pygments.token import Token
-from pygments.lexers import Python3Lexer
+have_pyperclip = True
+try:
+    import pyperclip
+except ImportError:
+    have_pyperclip = False
+
 from . import autocomplete, inspection, simpleeval
-from .clipboard import get_clipboard, CopyFailed
 from .config import getpreferredencoding
 from .formatter import Parenthesis
 from .history import History
@@ -430,7 +435,6 @@ def __init__(self, interp, config):
         # Necessary to fix mercurial.ui.ui expecting sys.stderr to have this
         # attribute
         self.closed = False
-        self.clipboard = get_clipboard()
 
         if self.config.hist_file.exists():
             try:
@@ -862,14 +866,14 @@ def write2file(self):
     def copy2clipboard(self):
         """Copy current content to clipboard."""
 
-        if self.clipboard is None:
+        if not have_pyperclip:
             self.interact.notify(_("No clipboard available."))
             return
 
         content = self.get_session_formatted_for_file()
         try:
-            self.clipboard.copy(content)
-        except CopyFailed:
+            pyperclip.copy(content)
+        except pyperclip.PyperclipException:
             self.interact.notify(_("Could not copy to clipboard."))
         else:
             self.interact.notify(_("Copied content to clipboard."))
diff --git a/setup.cfg b/setup.cfg
@@ -28,9 +28,10 @@ install_requires =
     pyxdg
 
 [options.extras_require]
+clipboard = pyperclip
+jedi = jedi >= 0.16
 urwid = urwid
 watch = watchdog
-jedi = jedi >= 0.16
 
 [options.entry_points]
 console_scripts =
