Remove event deprecations strategy (for release 0.4.0)

magicgui/backends/_qtpy/widgets.py

@@ -3,6 +3,7 @@
 
 import math
 import re
+from functools import partial
 from typing import TYPE_CHECKING, Any, Iterable, Sequence
 
 import qtpy
@@ -1184,22 +1185,21 @@ def _mgui_bind_column_headers_change_callback(self, callback) -> None:
 
     def _mgui_bind_change_callback(self, callback):
         """Bind callback to event of changing any cell."""
-
-        def _item_callback(item, callback=callback):
-            col_head = item.tableWidget().horizontalHeaderItem(item.column())
-            col_head = col_head.text() if col_head is not None else ""
-            row_head = item.tableWidget().verticalHeaderItem(item.row())
-            row_head = row_head.text() if row_head is not None else ""
-            data = {
-                "data": item.data(self._DATA_ROLE),
-                "row": item.row(),
-                "column": item.column(),
-                "column_header": col_head,
-                "row_header": row_head,
-            }
-            callback(data)
-
-        self._qwidget.itemChanged.connect(_item_callback)
+        self._qwidget.itemChanged.connect(partial(self._item_callback, callback))
+
+    def _item_callback(self, callback, item: QtW.QTableWidgetItem):
+        col_head = item.tableWidget().horizontalHeaderItem(item.column())
+        col_head = col_head.text() if col_head is not None else ""
+        row_head = item.tableWidget().verticalHeaderItem(item.row())
+        row_head = row_head.text() if row_head is not None else ""
+        data = {
+            "data": item.data(self._DATA_ROLE),
+            "row": item.row(),
+            "column": item.column(),
+            "column_header": col_head,
+            "row_header": row_head,
+        }
+        callback(data)
 
     # These are only here to implement the ValueWidget interface... but in this one
     # case, all of the get/set value logic happens in magicgui.widgets.Table
@@ -1214,29 +1214,24 @@ def _mgui_set_value(self):
 class _ItemDelegate(QtW.QStyledItemDelegate):
     """Displays table widget items with properly formatted numbers."""
 
-    def __init__(self, *args, ndigits: int = 4, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.ndigits = ndigits
-
     def displayText(self, value, locale):
-        value = self._format_number(value)
-        return super().displayText(value, locale)
+        return super().displayText(_format_number(value, 4), locale)
 
-    def _format_number(self, text: str) -> str:
-        """convert string to int or float if possible"""
+
+def _format_number(text: str, ndigits: int = 4) -> str:
+    """convert string to int or float if possible"""
+    try:
+        value: int | float | None = int(text)
+    except ValueError:
         try:
-            value: int | float | None = int(text)
+            value = float(text)
         except ValueError:
-            try:
-                value = float(text)
-            except ValueError:
-                value = None
-
-        if isinstance(value, (int, float)):
-            dgt = self.ndigits
-            if 0.1 <= abs(value) < 10 ** (dgt + 1) or value == 0:
-                text = str(value) if isinstance(value, int) else f"{value:.{dgt}f}"
-            else:
-                text = f"{value:.{dgt-1}e}"
-
-        return text
+            value = None
+
+    if isinstance(value, (int, float)):
+        if 0.1 <= abs(value) < 10 ** (ndigits + 1) or value == 0:
+            text = str(value) if isinstance(value, int) else f"{value:.{ndigits}f}"
+        else:
+            text = f"{value:.{ndigits-1}e}"
+
+    return text

magicgui/widgets/_bases/button_widget.py

@@ -1,6 +1,7 @@
 from typing import Optional
 
-from magicgui.events import Signal, SignalInstance
+from psygnal import Signal, SignalInstance
+
 from magicgui.widgets import _protocols
 
 from .value_widget import ValueWidget

magicgui/widgets/_bases/container_widget.py

@@ -3,9 +3,10 @@
 import inspect
 from typing import TYPE_CHECKING, Any, Callable, MutableSequence, Sequence, overload
 
+from psygnal import Signal
+
 from magicgui._util import debounce
 from magicgui.application import use_app
-from magicgui.events import Signal
 from magicgui.signature import MagicParameter, MagicSignature, magic_signature
 from magicgui.widgets import _protocols
 from magicgui.widgets._bases.mixins import _OrientationMixin

magicgui/widgets/_bases/value_widget.py

@@ -2,9 +2,9 @@
 
 from typing import Any, Union
 
+from psygnal import Signal
 from typing_extensions import get_args, get_origin
 
-from magicgui.events import Signal
 from magicgui.widgets import _protocols
 
 from .widget import Widget

magicgui/widgets/_bases/widget.py

@@ -5,9 +5,10 @@
 from contextlib import contextmanager
 from typing import TYPE_CHECKING, Any
 
+from psygnal import Signal
+
 from magicgui._type_wrapper import resolve_forward_refs
 from magicgui.application import use_app
-from magicgui.events import Signal
 from magicgui.widgets import _protocols
 
 BUILDING_DOCS = sys.argv[-2:] == ["build", "docs"]

magicgui/widgets/_function_gui.py

@@ -22,9 +22,10 @@
     cast,
 )
 
+from psygnal import Signal
+
 from magicgui._type_wrapper import resolve_forward_refs
 from magicgui.application import AppRef
-from magicgui.events import Signal
 from magicgui.signature import MagicSignature, magic_signature
 from magicgui.widgets import Container, MainWindow, ProgressBar, PushButton
 from magicgui.widgets._bases.value_widget import ValueWidget

tests/test_docs.py

@@ -46,7 +46,7 @@ def test_examples(fname):
         pytest.mark.skip()
         return
     app = use_app()
-    app.start_timer(0, app.quit)
+    app.start_timer(50 if "table" in str(fname) else 5, app.quit)
     try:
         runpy.run_path(fname)
     except ImportError as e:

tests/test_table.py

@@ -391,9 +391,8 @@ def test_delete(qapp):
 
 
 def test_item_delegate(qapp):
-    from magicgui.backends._qtpy.widgets import _ItemDelegate
+    from magicgui.backends._qtpy.widgets import _format_number
 
     data = ["1.2", "1.23456789", "0.000123", "1234567", "0.0", "1", "s"]
-    idel = _ItemDelegate(ndigits=4)
-    results = [idel._format_number(v) for v in data]
+    results = [_format_number(v, 4) for v in data]
     assert results == ["1.2000", "1.2346", "1.230e-04", "1.235e+06", "0.0000", "1", "s"]