Merge pull request #4 from computerlyrik/mypy

Make mypy pass

pyproject.toml

@@ -183,3 +183,9 @@ ignore = [
     "ISC002", # multi-line-implicit-string-concatenation
 ]
 target-version = "py38"
+
+[tool.mypy]
+exclude = ["_vendor"]
+ignore_missing_imports = true
+check_untyped_defs = true
+install_types = true

src/dymoprint/gui/q_dymo_label_widgets.py

@@ -50,6 +50,8 @@ class BaseDymoLabelWidget(QWidget):
         Abstract method to be implemented by subclasses for rendering the label.
     """
 
+    render_engine: DymoRenderEngine
+
     itemRenderSignal = QtCore.pyqtSignal(name="itemRenderSignal")
 
     def content_changed(self):
@@ -90,7 +92,6 @@ class TextDymoLabelWidget(BaseDymoLabelWidget):
         itemRenderSignal: A signal emitted when the content of the label changes.
     """
 
-    render_engine: DymoRenderEngine
     align: QComboBox
     label: QPlainTextEdit
     font_style: FontStyle
@@ -245,7 +246,6 @@ class BarcodeDymoLabelWidget(BaseDymoLabelWidget):
             and barcode type.
     """
 
-    render_engine: DymoRenderEngine
     label: QLineEdit
     barcode_type_label: QLabel
     barcode_type: QComboBox

src/dymoprint/gui/q_dymo_labels_list.py

@@ -1,5 +1,8 @@
+from typing import Optional
+
 from PIL import Image
 from PyQt6 import QtCore
+from PyQt6.QtGui import QAction
 from PyQt6.QtWidgets import QAbstractItemView, QListWidget, QListWidgetItem, QMenu
 
 from dymoprint.gui.q_dymo_label_widgets import (
@@ -8,6 +11,7 @@
     QrDymoLabelWidget,
     TextDymoLabelWidget,
 )
+from dymoprint.lib.dymo_print_engines import DymoRenderEngine
 
 
 class QDymoLabelList(QListWidget):
@@ -38,6 +42,8 @@ class QDymoLabelList(QListWidget):
     """
 
     renderSignal = QtCore.pyqtSignal(Image.Image, name="renderSignal")
+    render_engine: DymoRenderEngine
+    itemWidget: TextDymoLabelWidget
 
     def __init__(
         self, render_engine, min_payload_len_px=0, justify="center", parent=None
@@ -66,7 +72,9 @@ def dropEvent(self, e) -> None:
         super().dropEvent(e)
         self.render_label()
 
-    def update_params(self, render_engine, min_payload_len_px=0, justify="center"):
+    def update_params(
+        self, render_engine: DymoRenderEngine, min_payload_len_px=0, justify="center"
+    ):
         """Update the render engine used for rendering the label.
 
         Args:
@@ -109,11 +117,11 @@ def contextMenuEvent(self, event):
             event (QContextMenuEvent): The context menu event.
         """
         contextMenu = QMenu(self)
-        add_text = contextMenu.addAction("Add Text")
-        add_qr = contextMenu.addAction("Add QR")
-        add_barcode = contextMenu.addAction("Add Barcode")
-        add_img = contextMenu.addAction("Add Image")
-        delete = contextMenu.addAction("Delete")
+        add_text: Optional[QAction] = contextMenu.addAction("Add Text")
+        add_qr: Optional[QAction] = contextMenu.addAction("Add QR")
+        add_barcode: Optional[QAction] = contextMenu.addAction("Add Barcode")
+        add_img: Optional[QAction] = contextMenu.addAction("Add Image")
+        delete: Optional[QAction] = contextMenu.addAction("Delete")
         menu_click = contextMenu.exec(event.globalPos())
 
         if menu_click == add_text:
@@ -149,8 +157,8 @@ def contextMenuEvent(self, event):
             item_widget.itemRenderSignal.connect(self.render_label)
         if menu_click == delete:
             try:
-                item = self.itemAt(event.pos())
-                self.takeItem(self.indexFromItem(item).row())  # self.update()
+                item_to_delete = self.itemAt(event.pos())
+                self.takeItem(self.indexFromItem(item_to_delete).row())  # self.update()
             except Exception as e:  # noqa: BLE001
                 print(f"No item selected {e}")
         self.render_label()

src/dymoprint/lib/barcode_writer.py

@@ -89,17 +89,19 @@ def _init(self, code):
         self._draw = ImageDraw.Draw(self._image)
 
     def _paint_module(self, xpos, ypos, width, color):
-        size = [
+        size = (
             (mm2px(xpos, self.dpi), mm2px(ypos, self.dpi)),
             (
                 mm2px(xpos + width, self.dpi),
                 mm2px(ypos + self.module_height, self.dpi),
             ),
-        ]
+        )
+        assert self._draw is not None
         self._draw.rectangle(size, outline=color, fill=color)
 
     def _finish(self):
         # although Image mode set to "1", draw function writes white as 255
+        assert self._image is not None
         self._image = self._image.point(lambda x: 1 if x > 0 else 0, mode="1")
         return self._image