chore: typing

prettyqt/animations/fx.py

@@ -53,7 +53,8 @@ def animate(
     ) -> AnimationTimer:
         """General animation with global coordinates."""
         self._animation = core.PropertyAnimation()
-        self._animation.apply_to(self._widget.__getattr__(self._property_name))
+        prop = getattr(self._widget, self._property_name)
+        self._animation.apply_to(prop)
         self._animation.set_start_value(start)
         self._animation.set_end_value(end)
         self._animation.set_easing(easing)
@@ -75,7 +76,8 @@ def transition_to(
     ) -> AnimationTimer:
         """Makes property transition from current value to given end value."""
         self._animation = core.PropertyAnimation()
-        self._animation.apply_to(self._widget.__getattr__(self._property_name))
+        prop = getattr(self._widget, self._property_name)
+        self._animation.apply_to(prop)
         prop_name = self._animation.get_property_name()
         obj = self._animation.targetObject()
         start: datatypes.VariantType = obj.property(prop_name)
@@ -106,7 +108,8 @@ def transition_from(
     ) -> AnimationTimer:
         """Makes property transition from given start value to its current value."""
         self._animation = core.PropertyAnimation()
-        self._animation.apply_to(self._widget.__getattr__(self._property_name))
+        prop = getattr(self._widget, self._property_name)
+        self._animation.apply_to(prop)
         prop_name = self._animation.get_property_name()
         obj = self._animation.targetObject()
         end: core.VariantType = obj.property(prop_name)
@@ -137,7 +140,8 @@ def animate_on_event(
     ) -> core.PropertyAnimation:
         """Starts property transition from start to end when given event occurs."""
         self._animation = core.PropertyAnimation()
-        self._animation.apply_to(self._widget.__getattr__(self._property_name))
+        prop = getattr(self._widget, self._property_name)
+        self._animation.apply_to(prop)
         if start is None:
             prop_name = self._animation.get_property_name()
             obj = self._animation.targetObject()
@@ -174,8 +178,9 @@ def __init__(self, widget: widgets.QWidget):
     def __getitem__(self, value: str) -> AnimationWrapper:
         value = helpers.to_lower_camel(value)
         logger.debug(f"Building {value!r} PropertyAnimation for {self._widget!r}")
-        self._wrapper = AnimationWrapper(value, self)
-        return self._wrapper
+        wrapper = AnimationWrapper(value, self)
+        self._wrapper = wrapper
+        return wrapper
 
     # def __getattr__(self, attr):
     #     return self.__getitem__(attr)

prettyqt/charts/boxset.py

@@ -36,7 +36,7 @@ def __getitem__(
         self, index: int | ValuePositionStr | QtCharts.QBoxSet.ValuePositions
     ) -> float:
         """Returns the value of the box-and-whiskers item specified by index."""
-        if type(index) is not int:  # noqa: E721
+        if type(index) is not int:
             index = VALUE_POSITION.get_enum_value(index).value
         if not (0 <= index <= 4):
             raise KeyError(index)
@@ -46,7 +46,7 @@ def __setitem__(
         self, index: int | ValuePositionStr | QtCharts.QBoxSet.ValuePositions, value: int
     ):
         """Sets the value specified by value in the position specified by index."""
-        if type(index) is not int:  # noqa: E721
+        if type(index) is not int:
             index = VALUE_POSITION.get_enum_value(index).value
         if not (0 <= index <= 4):
             raise KeyError(index)

prettyqt/core/_datetime.py

@@ -10,7 +10,8 @@ class DateTime(core.QDateTime):
     """DateTime funcitons."""
 
     def __repr__(self):
-        template = super().__repr__().split("(")[1]
+        super_repr = super().__repr__()
+        template = str(super_repr).split("(")[1]
         return f"{type(self).__name__}({template}"
 
     def __str__(self):
@@ -19,9 +20,9 @@ def __str__(self):
     def __reduce__(self):
         return type(self), (self.date(), self.time(), self.get_timezone())
 
-    def __format__(self, format_spec: constants.DateFormatStr):
+    def __format__(self, format_spec: str):
         if format_spec in constants.DATE_FORMAT:
-            return self.to_format(format_spec)
+            return self.toString(constants.DATE_FORMAT[format_spec])
         return self.toString(format_spec)
 
     @classmethod

prettyqt/core/_time.py

@@ -9,7 +9,8 @@ class Time(core.QTime):
     """Clock time functions."""
 
     def __repr__(self):
-        template = super().__repr__().split("(")[1]  # type: ignore
+        super_repr = super().__repr__()
+        template = str(super_repr).split("(")[1]  # type: ignore
         return f"{type(self).__name__}({template}"
 
     def __str__(self):

prettyqt/core/event.py

@@ -307,7 +307,7 @@
     z_order_change=mod.Type.ZOrderChange,
 )
 
-MouseButtonTypeStr = Literal["press", "release", "double_click", "release"]
+MouseButtonTypeStr = Literal["press", "release", "double_click", "move"]
 
 MouseButtonType: bidict[MouseButtonTypeStr, QtCore.QEvent.Type] = bidict(
     press=QtCore.QEvent.Type.MouseButtonPress,

prettyqt/core/mimedatabase.py

@@ -35,7 +35,9 @@ def get_mime_type_for_data(
         return core.MimeType(self.mimeTypeForData(data))
 
     def get_mime_type_for_filename_and_data(
-        self, filename: os.PathLike, data: datatypes.ByteArrayType | core.QIODevice
+        self,
+        filename: str | os.PathLike[str],
+        data: datatypes.ByteArrayType | core.QIODevice,
     ) -> core.MimeType:
         path = os.fspath(filename)
         return core.MimeType(self.mimeTypeForFileNameAndData(path, data))

prettyqt/custom_widgets/crossfadewidget.py

@@ -8,8 +8,8 @@
 class CrossFadeWidget(widgets.Widget):
     def __init__(
         self,
-        pixmap_1: gui.QPixmap | os.PathLike | None = None,
-        pixmap_2: gui.QPixmap | os.PathLike | None = None,
+        pixmap_1: gui.QPixmap | os.PathLike[str] | str | None = None,
+        pixmap_2: gui.QPixmap | os.PathLike[str] | str | None = None,
         **kwargs,
     ):
         super().__init__(**kwargs)
@@ -27,18 +27,24 @@ def start_fade(self, duration: int = 500):
         self.timeline.start()
         # self.show()
 
-    def set_pixmap_1(self, pixmap: gui.QPixmap | os.PathLike | widgets.QWidget | None):
+    def set_pixmap_1(
+        self, pixmap: gui.QPixmap | os.PathLike[str] | str | widgets.QWidget | None
+    ):
         self.pixmap_1 = self._get_pixmap(pixmap)
         self.updateGeometry()
         self.repaint()
 
-    def set_pixmap_2(self, pixmap: gui.QPixmap | os.PathLike | widgets.QWidget | None):
+    def set_pixmap_2(
+        self, pixmap: gui.QPixmap | os.PathLike[str] | str | widgets.QWidget | None
+    ):
         self.pixmap_2 = self._get_pixmap(pixmap)
         self.updateGeometry()
         self.repaint()
 
     @staticmethod
-    def _get_pixmap(pixmap: gui.QPixmap | os.PathLike | widgets.QWidget | None):
+    def _get_pixmap(
+        pixmap: gui.QPixmap | os.PathLike[str] | str | widgets.QWidget | None,
+    ):
         match pixmap:
             case gui.QPixmap():
                 return pixmap

prettyqt/custom_widgets/imageviewer.py

@@ -40,7 +40,7 @@ def draw_size(p: gui.Painter, rect: core.Rect, w: int, h: int):
     f = p.font()
     f.setBold(True)
     p.setFont(f)
-    sz = "\u00a0%d x %d\u00a0" % (w, h)
+    sz = f"\u00a0{w:d} x {h:d}\u00a0"
     flags = (
         constants.AlignmentFlag.AlignBottom
         | constants.AlignmentFlag.AlignRight
@@ -55,7 +55,7 @@ def draw_size(p: gui.Painter, rect: core.Rect, w: int, h: int):
 class ImageViewer(widgets.Widget):
     def __init__(
         self,
-        image: gui.QPixmap | os.PathLike | None = None,
+        image: gui.QPixmap | os.PathLike[str] | str | None = None,
         *,
         show_border: bool = True,
         show_size: bool = False,
@@ -70,7 +70,7 @@ def __init__(
         self.draw_border = show_border
         self.show_size = show_size
 
-    def set_image(self, pixmap: gui.QPixmap | os.PathLike | None):
+    def set_image(self, pixmap: gui.QPixmap | os.PathLike[str] | str | None):
         match pixmap:
             case gui.QPixmap():
                 self._pixmap = pixmap

prettyqt/custom_widgets/itemviews/filetree.py

@@ -133,7 +133,7 @@ def _on_current_changed(self, new, _):
             path = new.data(model.Roles.FilePathRole)
             self.tool_bar.set_breadcrumbs(path)
 
-    def _update_root(self, path: os.PathLike):
+    def _update_root(self, path: os.PathLike[str]):
         if pathlib.Path(path).exists():
             self._file_tree.setRoot(os.fspath(path))
 

prettyqt/custom_widgets/numfilterwidget.py

@@ -38,7 +38,7 @@ def _on_menu_click(self, action: gui.QAction):
 
     def get_filter_fn(self) -> Callable:
         val = self.lineedit.get_value()
-        if val == "":
+        if not val:
             return lambda x: True
         val = float(val)
         match self.op_button.text():

prettyqt/gui/image.py

@@ -151,7 +151,7 @@ def from_pil(cls, image) -> Self:
         return img
 
     @classmethod
-    def for_mimetype(cls, path: os.PathLike) -> Self | None:
+    def for_mimetype(cls, path: os.PathLike[str] | str) -> Self | None:
         """Try to create an icon from theme using the file mimetype.
 
         E.g.::
@@ -171,7 +171,7 @@ def for_mimetype(cls, path: os.PathLike) -> Self | None:
                 icon = cls(cls.fromTheme(icon))
                 if not icon.isNull():
                     return icon
-        return None  #  gui.Icon.fromTheme("text-x-generic")
+        return None  # gui.Icon.fromTheme("text-x-generic")
 
     def to_pil(self):
         from PIL import Image as PILImage

prettyqt/gui/pixmap.py

@@ -48,7 +48,10 @@ def from_image(
         return cls(cls.fromImage(img, flag))
 
     def save_to_file(
-        self, path: os.PathLike, fmt: str = "png", quality: int | None = None
+        self,
+        path: str | os.PathLike[str],
+        fmt: str = "png",
+        quality: int | None = None,
     ) -> bool:
         return self.save(os.fspath(path), fmt, -1 if quality is None else quality)
 

prettyqt/gui/window.py

@@ -92,7 +92,7 @@ def set_modality(
     def get_modality(self) -> constants.WindowModalityStr:
         return constants.WINDOW_MODALITY.inverse[self.modality()]
 
-    def set_file_path(self, file_path: os.PathLike):
+    def set_file_path(self, file_path: str | os.PathLike[str]):
         path = os.fspath(file_path)
         self.setFilePath(path)
 

prettyqt/ipython/outofprocessipythonwidget.py

@@ -19,7 +19,7 @@
 # asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())
 
 
-def run_server(connection_file: os.PathLike):
+def run_server(connection_file: str | os.PathLike[str]):
     IPython.embed_kernel(
         local_ns=sys._getframe(1).f_locals,
         connection_file=os.fspath(connection_file),

prettyqt/itemmodels/fsspecmodel.py

@@ -395,7 +395,7 @@ def rmdir(self, index: core.QModelIndex | str) -> bool:
             self.fs.rmdir(path)
         return self.fs.exists(path)
 
-    def setRootPath(self, path: os.PathLike | None) -> core.ModelIndex:
+    def setRootPath(self, path: str | os.PathLike[str] | None) -> core.ModelIndex:
         path = os.fspath(path) if path else self.fs.root_marker
         item = self.fs.info(path)
         self.set_root_item(item)

prettyqt/itemmodels/gitpythontreemodel.py

@@ -44,7 +44,7 @@ class GitPythonTreeModel(itemmodels.TreeModel):
         # "Executable mode",
     ]
 
-    def __init__(self, path: os.PathLike | str | git.Tree | git.Repo, **kwargs):
+    def __init__(self, path: os.PathLike[str] | str | git.Tree | git.Repo, **kwargs):
         match path:
             case os.PathLike() | str():
                 tree = git.Repo(path).tree()
@@ -151,7 +151,9 @@ class GitPythonCommitTreeModel(itemmodels.TreeModel):
     ]
 
     def __init__(
-        self, repo: os.PathLike | str | git.Tree | git.Repo | git.Commit, **kwargs
+        self,
+        repo: os.PathLike[str] | str | git.Tree | git.Repo | git.Commit,
+        **kwargs,
     ):
         match repo:
             case os.PathLike() | str():

prettyqt/itemmodels/moduleinfomodel.py

@@ -18,7 +18,7 @@ class ModuleInfoModel(itemmodels.TreeModel):
     """Tree Model to display a module hierarchy (using pkgutil)."""
 
     HEADER = ["Name", "Path", "Is Package"]
-    SUPPORTS = str | os.PathLike | types.ModuleType | pkgutil.ModuleInfo
+    SUPPORTS = str | os.PathLike[str] | types.ModuleType | pkgutil.ModuleInfo
 
     def __init__(self, obj, **kwargs):
         match obj:

prettyqt/itemmodels/proxies/slicehighlightcurrentproxymodel.py

@@ -198,8 +198,7 @@ def data(
             and (
                 (self._mode == "column" and index.column() == self._current_column)
                 or (
-                    self._mode == "row"
-                    and (index.row() == self._current_row)
+                    (self._mode == "row" and (index.row() == self._current_row))
                     or self._mode == "all"
                 )
             )

prettyqt/multimedia/mediarecorder.py

@@ -57,7 +57,9 @@
 
 
 class MediaRecorder(core.ObjectMixin, QtMultimedia.QMediaRecorder):
-    def set_output_location(self, url: datatypes.UrlType | os.PathLike | None = None):
+    def set_output_location(
+        self, url: datatypes.UrlType | os.PathLike[str] | None = None
+    ):
         url = datatypes.to_local_url(url)
         self.setOutputLocation(url)
 

prettyqt/qml/qmlapplicationengine.py

@@ -17,7 +17,7 @@ def __iter__(self) -> Iterator[QtCore.QObject]:
     def load_data(
         self,
         data: datatypes.ByteArrayType,
-        url: datatypes.UrlType | os.PathLike | None = None,
+        url: datatypes.UrlType | os.PathLike[str] | None = None,
     ):
         data = datatypes.to_bytearray(data)
         url = datatypes.to_local_url(url)

prettyqt/syntaxhighlighters/regexmatchhighlighter.py

@@ -39,7 +39,7 @@ def highlightBlock(self, text: str):
                 break
             starts_in_line = start_char <= start <= end_char
             ends_in_line = start_char <= end <= end_char
-            if starts_in_line and ends_in_line or not ends_in_line and starts_in_line:
+            if (starts_in_line and ends_in_line) or (not ends_in_line and starts_in_line):
                 # print(f"in line: {line_pos} - {line_pos + match_len}")
                 self._colorize(start - start_char, end - start, i)
             elif ends_in_line:

prettyqt/utils/classhelpers.py

@@ -64,7 +64,7 @@ def to_module(
             except (ImportError, AttributeError) as e:
                 logger.warning(f"Could not import {module_path!r}")
                 if return_none:
-                    return
+                    return None
                 raise e
         case types.ModuleType():
             return module
@@ -93,7 +93,7 @@ def to_module_parts(module: Sequence[str] | str | types.ModuleType) -> tuple[str
 
 def find_common_ancestor(cls_list: list[type]) -> type:
     mros = [list(inspect.getmro(cls)) for cls in cls_list]
-    track = collections.defaultdict(int)
+    track: collections.defaultdict[type, int] = collections.defaultdict(int)
     while mros:
         for mro in mros:
             cur = mro.pop(0)
@@ -105,7 +105,7 @@ def find_common_ancestor(cls_list: list[type]) -> type:
             ):
                 return cur
             if len(mro) == 0:
-                mros.remove(mro)
+                mros.remove(mro)  # noqa: B909
     raise TypeError("Couldnt find common base class")
 
 
@@ -202,7 +202,7 @@ def iter_classes_for_module(
     """
     module = to_module(module)
     if not module:
-        return []
+        return
     if recursive:
         for _name, submod in inspect.getmembers(module, inspect.ismodule):
             if submod.__name__.startswith(module_filter or ""):

prettyqt/utils/datatypes.py

@@ -40,7 +40,7 @@ def __call__(cls, *args, **kw):
 PatternType = re.Pattern | QtCore.QRegularExpression
 PatternAndStringType = str | PatternType
 JSONType = str | int | float | bool | None | dict[str, Any] | list[Any]
-PathType = str | os.PathLike
+PathType = str | os.PathLike[str]
 
 
 class Validatable(Protocol):
@@ -589,7 +589,7 @@ def to_url(url: UrlType | None) -> QtCore.QUrl:
             raise TypeError(url)
 
 
-def to_local_url(url: UrlType | os.PathLike | None) -> QtCore.QUrl:
+def to_local_url(url: UrlType | os.PathLike[str] | None) -> QtCore.QUrl:
     # TODO: need to check whether we should merge to_local_url and to_url
     # core.Url.from_user_input() perhaps a good option, too?
     match url: