minor: Correct PushButton docstring for command parameter

docs/changelog.md

@@ -1,5 +1,8 @@
 # guizero
 
+## Unreleased
+- **Breaking:** removed the `icon` constructor argument from [PushButton](pushbutton.md), deprecated since 2018 in favour of `image` and non-functional (silently ignored) for several releases. Use `image` instead.
+
 ## 1.6.0 - 2025-01-10
 - Add example for how to set box borders
 - Add pyproject.toml to enable building with `build` module instead of `setup.py`

docs/deployment.md

@@ -15,7 +15,7 @@ Install locally:
 
 ```
 cd guizero
-python setup.py install
+pip install .
 ```
 
 Build for deployment:

docs/pushbutton.md

@@ -12,7 +12,6 @@ __init__(
     padx=10,
     grid=None,
     align=None,
-    icon=None,
     visible=True,
     enabled=None,
     width=None,

guizero/PushButton.py

@@ -14,7 +14,6 @@ def __init__(
         padx=10,
         grid=None,
         align=None,
-        icon=None,
         visible=True,
         enabled=None,
         width=None,
@@ -27,7 +26,7 @@ def __init__(
             The Container (App, Box, etc) the Picture will belong to.
 
         :param Callable command:
-            A string containing the image to display, defaults to `None`.
+            The function to call when the button is pressed.
 
         :param List args:
             A list of arguments to pass to the command. Defaults to `None`.
@@ -53,11 +52,6 @@ def __init__(
         :param string align:
             How to align the widget within the grid, defaults to None.
 
-        :param string icon:
-            A string containing the image to display, defaults to `None`.
-            If an image is specified, this overrides any text set to display
-            on the button. (DEPRECATED)
-
         :param bool visible:
             If the widget should be visible, defaults to `True`.
 
@@ -75,7 +69,6 @@ def __init__(
         """
 
         self._value = 0
-        self._image_source = icon
         self._image_source = image
         self._image = None
         self._image_height = None

guizero/Waffle.py

@@ -337,7 +337,7 @@ def canvas_x(self):
 
     @property
     def canvas_y(self):
-        return self._canvas_x
+        return self._canvas_y
 
     @property
     def size(self):

guizero/base.py

@@ -197,7 +197,7 @@ def _on_configure_change(self, event):
             if self._actual_height != event.tk_event.height or self._actual_width != event.tk_event.width: 
 
                 self._actual_height = event.tk_event.height
-                self._actual_width = event.tk_event.height
+                self._actual_width = event.tk_event.width
 
                 # call the resize event
                 if self._when_resized is not None:
@@ -945,5 +945,5 @@ def text_overstrike(self):
 
     @text_overstrike.setter
     def text_overstrike(self, overstrike):
-        TextMixin.set_text_underline(self, overstrike)
+        TextMixin.set_text_overstrike(self, overstrike)
         super(ContainerWidget, self.__class__).text_overstrike.fset(self, overstrike)

guizero/utilities.py

@@ -1,8 +1,4 @@
-# this is to cater for Python 2, is it really needed?
-try:
-    from inspect import getfullargspec
-except ImportError:
-    from inspect import getargspec as getfullargspec
+from inspect import getfullargspec
 
 try:
     from PIL import Image, ImageTk

pyproject.toml

@@ -11,7 +11,7 @@ authors = [
 ]
 description = "Python module to allow learners to easily create GUIs"
 readme = "README.md"
-requires-python = ">=3"
+requires-python = ">=3.6"
 keywords = ["GUI", "guizero", "interface",]
 license = {text = "BSD-3-Clause"}
 classifiers = [
@@ -23,7 +23,6 @@ classifiers = [
     "Intended Audience :: Developers",
     "License :: OSI Approved :: BSD License",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.5",
     "Programming Language :: Python :: 3.6",
     "Programming Language :: Python :: 3.7",
     "Programming Language :: Python :: 3.8",
@@ -39,4 +38,7 @@ images =  ["pillow>=4.3.0"]
 
 [project.urls]
 Repository = "https://github.com/lawsie/guizero"
-Documentation = "https://lawsie.github.io/guizero/"
+Documentation = "https://lawsie.github.io/guizero/"
+
+[tool.pytest.ini_options]
+addopts = "--capture=sys"

requirements.txt

@@ -2,5 +2,5 @@ build==1.2.1
 mkdocs==1.6.1
 mkdocs-bootswatch==1.1
 pre-commit==4.0.1
-pytest==8.3.4
+pytest==9.1.1
 pillow>=4.3.0

tests/common_test.py

@@ -2,7 +2,7 @@
 from threading import Event
 from time import sleep
 from unittest.mock import MagicMock
-from guizero import Text, Picture, TitleBox
+from guizero import Text, Picture
 from tkinter import Spinbox
 
 # find a suitable font to test with
@@ -337,10 +337,7 @@ def cascading_properties_test(container):
     container.text_underline = True
     container.font = TEST_FONT
     container.enabled = False
-
-    # Titleboxes cannot be overstruck, it underlines...
-    if not isinstance(container, TitleBox):
-        container.text_overstrike = True
+    container.text_overstrike = True
 
     assert t.bg == "red"
     assert t.text_color == "purple"
@@ -350,10 +347,7 @@ def cascading_properties_test(container):
     assert t.text_underline == True
     assert t.font == TEST_FONT
     assert t.enabled == False
-
-    # Titleboxes cannot be overstruck, it underlines...
-    if not isinstance(container, TitleBox):
-        assert t.text_overstrike == True
+    assert t.text_overstrike == True
 
     assert p.bg == "red"
     assert p.enabled == False
@@ -372,10 +366,7 @@ def inheriting_properties_test(container):
     container.text_underline = True
     container.font = TEST_FONT
     container.enabled = False
-
-    # Titleboxes cannot be overstruck, it underlines...
-    if not isinstance(container, TitleBox):
-        container.text_overstrike = True
+    container.text_overstrike = True
 
     t = Text(container, color=None, size=None, font=None, bold=None, italic=None, underline=None, overstrike=None)
     assert t.bg == "red"
@@ -386,10 +377,7 @@ def inheriting_properties_test(container):
     assert t.text_underline == True
     assert t.font == TEST_FONT
     assert not t.enabled
-
-    # Titleboxes cannot be overstruck, it underlines...
-    if not isinstance(container, TitleBox):
-        assert t.text_overstrike == True
+    assert t.text_overstrike == True
 
     p = Picture(container)
     assert p.bg == "red"

tests/test_app.py

@@ -102,6 +102,19 @@ def callback_params(event):
     a.resize(505, 506)
     assert not resize_event.wait(0.1)
 
+    # resize so that only the width changes, and the new width equals
+    # the previous height - this catches a bug where the widget's
+    # actual width was mistakenly tracked using the configure event's
+    # height, which masked width-only changes like this one
+    a.when_resized = callback
+    a.resize(300, 200)
+    assert resize_event.wait(1)
+    resize_event.clear()
+
+    a.resize(200, 200)
+    assert resize_event.wait(1)
+    resize_event.clear()
+
     a.destroy()
 
 def test_cascading_properties():

tests/test_waffle.py

@@ -115,6 +115,19 @@ def test_pixel_getters_setters():
     assert pixel.color == w.color
     assert pixel.dotty == w.dotty
 
+    # canvas_x/canvas_y are the top-left pixel position on the canvas,
+    # offset by column/row * (pixel size + padding), plus the initial pad
+    assert pixel.canvas_x == w.pad + (pixel.x * (w.pixel_size + w.pad))
+    assert pixel.canvas_y == w.pad + (pixel.y * (w.pixel_size + w.pad))
+
+    # a second pixel with x and y swapped relative to the first, to catch
+    # canvas_x/canvas_y being confused with one another
+    pixel2 = w[1,0]
+    assert pixel2.canvas_x == w.pad + (pixel2.x * (w.pixel_size + w.pad))
+    assert pixel2.canvas_y == w.pad + (pixel2.y * (w.pixel_size + w.pad))
+    assert pixel.canvas_x != pixel2.canvas_x
+    assert pixel.canvas_y != pixel2.canvas_y
+
     pixel.color = "red"
     assert pixel.color == "red"