From efe5c944cdbde999ec9704c3962a8a0b55303929 Mon Sep 17 00:00:00 2001 From: Thomas VINCENT Date: Fri, 15 Dec 2023 14:08:18 +0100 Subject: [PATCH 1/2] do not return a weakref proxy --- src/silx/gui/conftest.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/silx/gui/conftest.py b/src/silx/gui/conftest.py index c6986c5e85..225ae0febb 100644 --- a/src/silx/gui/conftest.py +++ b/src/silx/gui/conftest.py @@ -1,4 +1,3 @@ -import weakref import pytest from silx.gui import qt @@ -27,7 +26,7 @@ def createWidget(cls, *args, **kwargs): qapp_utils.qWaitForWindowExposed(widget) widgets.append(widget) - return weakref.proxy(widget) + return widget yield createWidget From 1968d83e93192006398f9bde9d6a2d185b141cc8 Mon Sep 17 00:00:00 2001 From: Thomas VINCENT Date: Fri, 15 Dec 2023 15:07:29 +0100 Subject: [PATCH 2/2] update floatedit tests --- src/silx/gui/widgets/test/test_floatedit.py | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/silx/gui/widgets/test/test_floatedit.py b/src/silx/gui/widgets/test/test_floatedit.py index 57a652242b..c5edded77f 100644 --- a/src/silx/gui/widgets/test/test_floatedit.py +++ b/src/silx/gui/widgets/test/test_floatedit.py @@ -32,21 +32,20 @@ @pytest.fixture def floatEdit(qWidgetFactory): - proxy = qWidgetFactory(FloatEdit) - yield proxy + widget = qWidgetFactory(FloatEdit) + yield widget @pytest.fixture -def floatEditHolder(qapp, qapp_utils, qWidgetFactory, floatEdit): - proxy = qWidgetFactory(qt.QWidget) - holder = proxy.__repr__.__self__ - layout = qt.QHBoxLayout(holder) +def floatEditHolder(qWidgetFactory, floatEdit): + widget = qWidgetFactory(qt.QWidget) + layout = qt.QHBoxLayout(widget) layout.addStretch() - layout.addWidget(floatEdit.__repr__.__self__) - yield proxy + layout.addWidget(floatEdit) + yield widget -def test_show(qapp_utils, floatEdit): +def test_show(floatEdit): pass @@ -55,7 +54,7 @@ def test_value(floatEdit): assert floatEdit.value() == 1.5 -def test_no_widgetresize(qapp_utils, floatEditHolder, floatEdit): +def test_no_widgetresize(floatEditHolder, floatEdit): floatEditHolder.resize(50, 50) floatEdit.setValue(123) a = floatEdit.width()