Skip to content

Commit a1c98df

Browse files
committed
test: undo changes in clipboard tests
1 parent d009b80 commit a1c98df

File tree

1 file changed

+4
-49
lines changed

1 file changed

+4
-49
lines changed

pandas/tests/io/test_clipboard.py

Lines changed: 4 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import importlib
21
from textwrap import dedent
32

43
import numpy as np
@@ -19,7 +18,6 @@
1918
)
2019
import pandas._testing as tm
2120

22-
import pandas.io.clipboard
2321
from pandas.io.clipboard import (
2422
CheckedCall,
2523
_stringifyText,
@@ -171,60 +169,17 @@ def test_stringify_text(text):
171169
_stringifyText(text)
172170

173171

174-
@pytest.fixture(
175-
params=[
176-
pytest.param(
177-
("qtpy.QtWidgets", "QApplication"),
178-
marks=[
179-
pytest.mark.xfail(
180-
importlib.util.find_spec("qtpy") is None
181-
or importlib.util.find_spec("qtpy.QtWidgets") is None,
182-
reason="qtpy isn't installed",
183-
)
184-
],
185-
),
186-
pytest.param(
187-
("PyQt6.QtWidgets", "QApplication"),
188-
marks=[
189-
pytest.mark.xfail(
190-
importlib.util.find_spec("PyQt6") is None
191-
or importlib.util.find_spec("PyQt6.QtWidgets") is None,
192-
reason="PyQt6 isn't installed",
193-
)
194-
],
195-
),
196-
pytest.param(
197-
("PyQt5.QtWidgets", "QApplication"),
198-
marks=[
199-
pytest.mark.xfail(
200-
importlib.util.find_spec("PyQt5") is None
201-
or importlib.util.find_spec("PyQt5.QtWidgets") is None,
202-
reason="PyQt5 isn't installed",
203-
)
204-
],
205-
),
206-
],
207-
ids=["qtpy", "PyQt6", "PyQt5"],
208-
)
209-
def set_pyqt_clipboard(monkeypatch, request):
210-
module, attribute = request.param
211-
qt_module = importlib.import_module(module)
212-
q_application_binding = getattr(qt_module, attribute)
213-
214-
get_qapp_binding = lambda x: q_application_binding
215-
monkeypatch.setattr(pandas.io.clipboard, "_import_module", get_qapp_binding)
172+
@pytest.fixture
173+
def set_pyqt_clipboard(monkeypatch):
216174
qt_cut, qt_paste = init_qt_clipboard()
217175
with monkeypatch.context() as m:
218176
m.setattr(pd.io.clipboard, "clipboard_set", qt_cut)
219177
m.setattr(pd.io.clipboard, "clipboard_get", qt_paste)
220-
yield module, attribute
178+
yield
221179

222180

223181
@pytest.fixture
224-
def clipboard(set_pyqt_clipboard):
225-
module, attribute = set_pyqt_clipboard
226-
qt_module = importlib.import_module(module)
227-
qapp = getattr(qt_module, attribute)
182+
def clipboard(qapp):
228183
clip = qapp.clipboard()
229184
yield clip
230185
clip.clear()

0 commit comments

Comments
 (0)