Merge pull request #2160 from freakboy3742/post-audit-cleanup

Post audit cleanup

android/src/toga_android/app.py

@@ -84,7 +84,7 @@ def onOptionsItemSelected(self, menuitem):
             # This method also fires when opening submenus
             return False
         else:
-            self.menuitem_mapping[itemid].action(None)
+            self.menuitem_mapping[itemid].action()
             return True
 
     def onPrepareOptionsMenu(self, menu):

android/src/toga_android/dialogs.py

@@ -57,7 +57,7 @@ def __init__(
         self.native.show()
 
     def completion_handler(self, return_value: bool) -> None:
-        self.on_result(self, return_value)
+        self.on_result(return_value)
         self.interface.future.set_result(return_value)
 
 

android/src/toga_android/widgets/button.py

@@ -12,7 +12,7 @@ def __init__(self, button_impl):
         self.button_impl = button_impl
 
     def onClick(self, _view):
-        self.button_impl.interface.on_press(None)
+        self.button_impl.interface.on_press()
 
 
 class Button(TextViewWidget):

android/src/toga_android/widgets/canvas.py

@@ -40,11 +40,11 @@ def __init__(self, impl):
     def onTouch(self, canvas, event):
         x, y = map(self.impl.scale_out, (event.getX(), event.getY()))
         if (action := event.getAction()) == MotionEvent.ACTION_DOWN:
-            self.interface.on_press(None, x, y)
+            self.interface.on_press(x, y)
         elif action == MotionEvent.ACTION_MOVE:
-            self.interface.on_drag(None, x, y)
+            self.interface.on_drag(x, y)
         elif action == MotionEvent.ACTION_UP:
-            self.interface.on_release(None, x, y)
+            self.interface.on_release(x, y)
         else:  # pragma: no cover
             return False
         return True
@@ -58,7 +58,7 @@ def create(self):
 
     def set_bounds(self, x, y, width, height):
         super().set_bounds(x, y, width, height)
-        self.interface.on_resize(None, width=width, height=height)
+        self.interface.on_resize(width=width, height=height)
 
     def redraw(self):
         self.native.invalidate()

android/src/toga_android/widgets/dateinput.py

@@ -42,7 +42,7 @@ def get_value(self):
     def set_value(self, value):
         self.native.setText(value.isoformat())
         self._dialog.updateDate(value.year, value.month - 1, value.day)
-        self.interface.on_change(None)
+        self.interface.on_change()
 
     def get_min_date(self):
         return py_date(self._picker.getMinDate())

android/src/toga_android/widgets/detailedlist.py

@@ -21,7 +21,7 @@ def __init__(self, impl, row_number):
 
     def onClick(self, _view):
         self.impl._set_selection(self.row_number)
-        self.impl.interface.on_select(None)
+        self.impl.interface.on_select()
 
 
 @dataclass
@@ -40,7 +40,7 @@ def __init__(self, impl, row_number):
 
     def onLongClick(self, _view):
         self.impl._set_selection(self.row_number)
-        self.impl.interface.on_select(None)
+        self.impl.interface.on_select()
 
         actions = [
             action
@@ -76,7 +76,7 @@ def __init__(self, actions, row):
         self.row = row
 
     def onClick(self, dialog, which):
-        self.actions[which].handler(None, row=self.row)
+        self.actions[which].handler(row=self.row)
 
 
 class OnRefreshListener(dynamic_proxy(SwipeRefreshLayout.OnRefreshListener)):
@@ -85,7 +85,7 @@ def __init__(self, interface):
         self._interface = interface
 
     def onRefresh(self):
-        self._interface.on_refresh(None)
+        self._interface.on_refresh()
 
 
 class DetailedList(Widget):

android/src/toga_android/widgets/multilinetextinput.py

@@ -12,7 +12,7 @@ def create(self):
         )
 
     def _on_change(self):
-        self.interface.on_change(None)
+        self.interface.on_change()
 
     def _on_confirm(self):  # pragma: nocover
         pass  # The interface doesn't support this event.

android/src/toga_android/widgets/numberinput.py

@@ -34,7 +34,7 @@ def set_min_value(self, value):
         pass  # This backend doesn't support stepped increments.
 
     def _on_change(self):
-        self.interface.on_change(None)
+        self.interface.on_change()
 
     def _on_confirm(self):  # pragma: nocover
         pass  # The interface doesn't support this event.

android/src/toga_android/widgets/scrollcontainer.py

@@ -27,7 +27,7 @@ def __init__(self, impl):
         self.impl = impl
 
     def onScrollChange(self, view, new_x, new_y, old_x, old_y):
-        self.impl.interface.on_scroll(None)
+        self.impl.interface.on_scroll()
 
 
 class ScrollContainer(Widget, Container):

android/src/toga_android/widgets/selection.py

@@ -35,7 +35,7 @@ def create(self):
     # the change, and use self.last_selection to prevent duplication.
     def on_change(self, index):
         if index != self.last_selection:
-            self.interface.on_change(None)
+            self.interface.on_change()
             self.last_selection = index
 
     def insert(self, index, item):
@@ -68,7 +68,7 @@ def remove(self, index, item=None):
                 self.select_item(self.last_selection)
 
         if removed_selection:
-            self.interface.on_change(None)
+            self.interface.on_change()
 
     def select_item(self, index, item=None):
         self.native.setSelection(index)

android/src/toga_android/widgets/slider.py

@@ -24,10 +24,10 @@ def onProgressChanged(self, _view, _progress, _from_user):
         self.impl.on_change()
 
     def onStartTrackingTouch(self, native_seekbar):
-        self.impl.interface.on_press(None)
+        self.impl.interface.on_press()
 
     def onStopTrackingTouch(self, native_seekbar):
-        self.impl.interface.on_release(None)
+        self.impl.interface.on_release()
 
 
 class Slider(Widget, toga.widgets.slider.IntSliderImpl):

android/src/toga_android/widgets/switch.py

@@ -12,7 +12,7 @@ def __init__(self, impl):
         self._impl = impl
 
     def onCheckedChanged(self, _button, _checked):
-        self._impl.interface.on_change(None)
+        self._impl.interface.on_change()
 
 
 class Switch(TextViewWidget):

android/src/toga_android/widgets/table.py

@@ -28,7 +28,7 @@ def onClick(self, view):
         else:
             self.impl.clear_selection()
             self.impl.add_selection(tr_id, view)
-        self.impl.interface.on_select(None)
+        self.impl.interface.on_select()
 
 
 class TogaOnLongClickListener(dynamic_proxy(View.OnLongClickListener)):
@@ -40,8 +40,8 @@ def onLongClick(self, view):
         self.impl.clear_selection()
         index = view.getId()
         self.impl.add_selection(index, view)
-        self.impl.interface.on_select(None)
-        self.impl.interface.on_activate(None, row=self.impl.interface.data[index])
+        self.impl.interface.on_select()
+        self.impl.interface.on_activate(row=self.impl.interface.data[index])
         return True
 
 

android/src/toga_android/widgets/textinput.py

@@ -110,17 +110,17 @@ def is_valid(self):
         return self.native.getError() is None
 
     def _on_change(self):
-        self.interface.on_change(None)
+        self.interface.on_change()
         self.interface._validate()
 
     def _on_confirm(self):
-        self.interface.on_confirm(None)
+        self.interface.on_confirm()
 
     def _on_gain_focus(self):
-        self.interface.on_gain_focus(None)
+        self.interface.on_gain_focus()
 
     def _on_lose_focus(self):
-        self.interface.on_lose_focus(None)
+        self.interface.on_lose_focus()
 
     def rehint(self):
         self.interface.intrinsic.width = at_least(self.interface._MIN_WIDTH)

android/src/toga_android/widgets/timeinput.py

@@ -38,7 +38,7 @@ def get_value(self):
     def set_value(self, value):
         self.native.setText(value.isoformat(timespec="minutes"))
         self._dialog.updateTime(value.hour, value.minute)
-        self.interface.on_change(None)
+        self.interface.on_change()
 
     def get_min_time(self):
         return self._min_time

changes/2171.misc.rst

@@ -0,0 +1 @@
+The use of ``pytest-freezegun`` was replaced with ``pytest-freezer``, due to lack of maintenance on the freezegun plugin.

cocoa/src/toga_cocoa/app.py

@@ -47,7 +47,7 @@ def cocoa_windowShouldClose(self):
         # As a result of calling that method, the app will either
         # exit, or the user will cancel the exit; in which case
         # the main window shouldn't close, either.
-        self.interface.app.on_exit(None)
+        self.interface.app.on_exit()
         return False
 
 
@@ -101,7 +101,7 @@ def application_openFiles_(self, app, filenames) -> None:  # pragma: no cover
     @objc_method
     def selectMenuItem_(self, sender) -> None:
         cmd = self.impl._menu_items[sender]
-        cmd.action(None)
+        cmd.action()
 
     @objc_method
     def validateMenuItem_(self, sender) -> bool:
@@ -303,7 +303,7 @@ def _menu_about(self, app, **kwargs):
         self.interface.about()
 
     def _menu_quit(self, app, **kwargs):
-        self.interface.on_exit(None)
+        self.interface.on_exit()
 
     def _menu_close_window(self, app, **kwargs):
         if self.interface.current_window:

cocoa/src/toga_cocoa/dialogs.py

@@ -54,14 +54,14 @@ def build_dialog(self):
         pass
 
     def completion_handler(self, return_value: int) -> None:
-        self.on_result(None, None)
+        self.on_result(None)
 
         self.interface.future.set_result(None)
 
     def bool_completion_handler(self, return_value: int) -> None:
         result = return_value == NSAlertFirstButtonReturn
 
-        self.on_result(None, result)
+        self.on_result(result)
 
         self.interface.future.set_result(result)
 
@@ -216,7 +216,7 @@ def single_path_completion_handler(self, return_value: int) -> None:
         else:
             result = None
 
-        self.on_result(None, result)
+        self.on_result(result)
         self.interface.future.set_result(result)
 
     def multi_path_completion_handler(self, return_value: int) -> None:
@@ -225,7 +225,7 @@ def multi_path_completion_handler(self, return_value: int) -> None:
         else:
             result = None
 
-        self.on_result(None, result)
+        self.on_result(result)
 
         self.interface.future.set_result(result)
 

cocoa/src/toga_cocoa/widgets/button.py

@@ -22,7 +22,7 @@ class TogaButton(NSButton):
 
     @objc_method
     def onPress_(self, obj) -> None:
-        self.interface.on_press(None)
+        self.interface.on_press()
 
 
 class Button(Widget):

cocoa/src/toga_cocoa/widgets/canvas.py

@@ -50,34 +50,34 @@ def isFlipped(self) -> bool:
     def mouseDown_(self, event) -> None:
         position = self.convertPoint(event.locationInWindow, fromView=None)
         if event.clickCount == 1:
-            self.interface.on_press(None, position.x, position.y)
+            self.interface.on_press(position.x, position.y)
         else:
-            self.interface.on_activate(None, position.x, position.y)
+            self.interface.on_activate(position.x, position.y)
 
     @objc_method
     def rightMouseDown_(self, event) -> None:
         position = self.convertPoint(event.locationInWindow, fromView=None)
-        self.interface.on_alt_press(None, position.x, position.y)
+        self.interface.on_alt_press(position.x, position.y)
 
     @objc_method
     def mouseUp_(self, event) -> None:
         position = self.convertPoint(event.locationInWindow, fromView=None)
-        self.interface.on_release(None, position.x, position.y)
+        self.interface.on_release(position.x, position.y)
 
     @objc_method
     def rightMouseUp_(self, event) -> None:
         position = self.convertPoint(event.locationInWindow, fromView=None)
-        self.interface.on_alt_release(None, position.x, position.y)
+        self.interface.on_alt_release(position.x, position.y)
 
     @objc_method
     def mouseDragged_(self, event) -> None:
         position = self.convertPoint(event.locationInWindow, fromView=None)
-        self.interface.on_drag(None, position.x, position.y)
+        self.interface.on_drag(position.x, position.y)
 
     @objc_method
     def rightMouseDragged_(self, event) -> None:
         position = self.convertPoint(event.locationInWindow, fromView=None)
-        self.interface.on_alt_drag(None, position.x, position.y)
+        self.interface.on_alt_drag(position.x, position.y)
 
 
 class Canvas(Widget):
@@ -94,7 +94,7 @@ def redraw(self):
 
     def set_bounds(self, x, y, width, height):
         super().set_bounds(x, y, width, height)
-        self.interface.on_resize(None, width=width, height=height)
+        self.interface.on_resize(width=width, height=height)
 
     def set_background_color(self, color):
         if color is TRANSPARENT or color is None:

cocoa/src/toga_cocoa/widgets/detailedlist.py

@@ -56,12 +56,12 @@ def menuForEvent_(self, event):
     @objc_method
     def primaryActionOnRow_(self, menuitem):
         row = self.interface.data[menuitem.tag]
-        self.interface.on_primary_action(self.interface, row=row)
+        self.interface.on_primary_action(row=row)
 
     @objc_method
     def secondaryActionOnRow_(self, menuitem):
         row = self.interface.data[menuitem.tag]
-        self.interface.on_secondary_action(self.interface, row=row)
+        self.interface.on_secondary_action(row=row)
 
     # TableDataSource methods
     @objc_method
@@ -122,7 +122,7 @@ def selectionShouldChangeInTableView_(self, table) -> bool:
 
     @objc_method
     def tableViewSelectionDidChange_(self, notification) -> None:
-        self.interface.on_select(self.interface)
+        self.interface.on_select()
 
 
 class DetailedList(Widget):
@@ -180,7 +180,7 @@ def remove(self, index, item):
 
         # After deletion, the selection changes, but Cocoa doesn't send
         # a tableViewSelectionDidChange: message.
-        self.interface.on_select(self.interface)
+        self.interface.on_select()
 
     def clear(self):
         self.native_detailedlist.reloadData()

cocoa/src/toga_cocoa/widgets/internal/refresh.py

@@ -273,7 +273,7 @@ def scrollWheel_(self, event) -> None:
                 NSMakePoint(self.contentView.bounds.origin.x, -HEADER_HEIGHT)
             )
             self.refresh_indicator.startAnimation(self)
-            self.interface.on_refresh(self.interface)
+            self.interface.on_refresh()
 
         send_super(__class__, self, "scrollWheel:", event, argtypes=[c_void_p])
 

cocoa/src/toga_cocoa/widgets/multilinetextinput.py

@@ -21,7 +21,7 @@ class TogaTextView(NSTextView):
 
     @objc_method
     def textDidChange_(self, notification) -> None:
-        self.interface.on_change(None)
+        self.interface.on_change()
 
 
 class MultilineTextInput(Widget):
@@ -78,7 +78,7 @@ def get_value(self):
 
     def set_value(self, value):
         self.native_text.string = value
-        self.interface.on_change(None)
+        self.interface.on_change()
 
     def set_color(self, value):
         self.native_text.textColor = native_color(value)