|
| 1 | +From 40d1d3a154e1d87ac229d5b8b81ca403c45eb862 Mon Sep 17 00:00:00 2001 |
| 2 | +From: =?UTF-8?q?Jakub=20Kul=C3=ADk?= < [email protected]> |
| 3 | +Date: Wed, 13 Nov 2024 09:52:33 +0100 |
| 4 | +Subject: [PATCH] Fix test suite for release 1.9.0 |
| 5 | + |
| 6 | +--- |
| 7 | + tests/test_pyperclip.py | 13 ++++++------- |
| 8 | + 1 file changed, 6 insertions(+), 7 deletions(-) |
| 9 | + |
| 10 | +diff --git a/tests/test_pyperclip.py b/tests/test_pyperclip.py |
| 11 | +index cf31b56..5300785 100644 |
| 12 | +--- a/tests/test_pyperclip.py |
| 13 | ++++ b/tests/test_pyperclip.py |
| 14 | +@@ -8,7 +8,7 @@ |
| 15 | + #import sys |
| 16 | + #sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..')) |
| 17 | + |
| 18 | +-from pyperclip import _executable_exists, HAS_DISPLAY |
| 19 | ++from pyperclip import _executable_exists |
| 20 | + from pyperclip import (init_osx_pbcopy_clipboard, init_osx_pyobjc_clipboard, |
| 21 | + init_dev_clipboard_clipboard, |
| 22 | + init_qt_clipboard, |
| 23 | +@@ -99,12 +99,11 @@ def test_non_str(self): |
| 24 | + self.copy(False) |
| 25 | + self.assertEqual(self.paste(), 'False') |
| 26 | + |
| 27 | +- # All other non-str values raise an exception. |
| 28 | +- with self.assertRaises(PyperclipException): |
| 29 | +- self.copy(None) |
| 30 | ++ self.copy(None) |
| 31 | ++ self.assertEqual(self.paste(), 'None') |
| 32 | + |
| 33 | +- with self.assertRaises(PyperclipException): |
| 34 | +- self.copy([2, 4, 6, 8]) |
| 35 | ++ self.copy([2, 4, 6, 8]) |
| 36 | ++ self.assertEqual(self.paste(), '[2, 4, 6, 8]') |
| 37 | + |
| 38 | + |
| 39 | + class TestCygwin(_TestClipboard): |
| 40 | +@@ -135,7 +134,7 @@ class TestOSX(_TestClipboard): |
| 41 | + |
| 42 | + |
| 43 | + class TestQt(_TestClipboard): |
| 44 | +- if HAS_DISPLAY: |
| 45 | ++ if os.getenv("DISPLAY"): |
| 46 | + try: |
| 47 | + import PyQt5.QtWidgets |
| 48 | + except ImportError: |
0 commit comments