chore: cleanup

Author: phil65

prettyqt/core/mimedata.py

@@ -2,13 +2,16 @@
 
 from typing import TYPE_CHECKING, Any, Self
 
+import anyenv
+
 from prettyqt import core
-from prettyqt.utils import datatypes, helpers
 
 
 if TYPE_CHECKING:
     from collections.abc import Iterable, Iterator
 
+    from prettyqt.utils import datatypes
+
 
 DB = core.MimeDatabase()
 
@@ -36,14 +39,15 @@ def set_data(self, mime_type: str, data: str):
         self.setData(mime_type, core.QByteArray(data.encode()))
 
     def set_json_data(self, mime_type: str, data: datatypes.JSONType):
-        self.setData(mime_type, core.QByteArray(helpers.dump_json(data)))
+        bytes_ = anyenv.dump_json(data).encode()
+        self.setData(mime_type, core.QByteArray(bytes_))
 
     def get_data(self, mime_type: str) -> str:
         return bytes(self.data(mime_type)).decode()
 
     def get_json_data(self, mime_type: str) -> datatypes.JSONType:
         data = self.data(mime_type)
-        return helpers.load_json(bytes(data))
+        return anyenv.load_json(bytes(data))
 
     def keys(self) -> list[str]:
         return self.formats()

prettyqt/itemmodels/proxies/columnorderproxymodel.py

@@ -1,8 +1,14 @@
 from __future__ import annotations
 
+from typing import TYPE_CHECKING
+
 from prettyqt import constants, core
 
 
+if TYPE_CHECKING:
+    from collections.abc import Sequence
+
+
 class ColumnOrderProxyModel(core.IdentityProxyModel):
     """Proxy model which reorders the columns of the source model.
 
@@ -27,10 +33,10 @@ class ColumnOrderProxyModel(core.IdentityProxyModel):
     ID = "column_order"
     ICON = "mdi.reorder-vertical"
 
-    def __init__(self, order: list[int | str], **kwargs):
-        self._column_order = order
+    def __init__(self, order: Sequence[int | str], **kwargs):
+        self._column_order = list(order)
         super().__init__(**kwargs)
-        self.set_column_order(order)
+        self.set_column_order(self._column_order)
 
     def get_column_order(self) -> list[int]:
         return self._column_order

prettyqt/utils/asyncrunner.py

@@ -20,7 +20,7 @@
 import os
 import threading
 import time
-from typing import Any, ParamSpec, TypeVar, cast
+from typing import Any, ParamSpec, Self, TypeVar, cast
 
 from prettyqt import core
 
@@ -31,14 +31,6 @@
 T = TypeVar("T")
 
 
-def chunked_iter(src: Iterable, size: int):
-    if not src:
-        return
-    src_iter = iter(src)
-    while cur_chunk := list(itertools.islice(src_iter, size)):
-        yield cur_chunk
-
-
 class AsyncRunner:
     """A runner which runs long-lasting functions using a thread pool."""
 
@@ -59,7 +51,7 @@ def __init__(self, max_threads: int | None = None):
         self._signaller = _FutureDoneSignaller()
         self._signaller.future_done_signal.connect(self._resume_coroutine)
 
-    def __enter__(self: T) -> T:
+    def __enter__(self) -> Self:
         return self
 
     def __exit__(self, *exc_info: object):
@@ -108,7 +100,7 @@ def close(self):
 
     async def run(
         self, func: Callable[Params, T], *args: Params.args, **kwargs: Params.kwargs
-    ) -> T:
+    ) -> T | None:
         """Run the given function in a thread.
 
         While it is running, yields
@@ -149,7 +141,7 @@ async def run_parallel(  # type:ignore[override]
         # that try to submit functions to execute in threads would only be resumed
         # much later, causing a noticeable slow down in the application.
         batch_size = max(self._max_threads // 2, 1)
-        for function_batch in chunked_iter(funcs, batch_size):
+        for function_batch in itertools.batched(funcs, batch_size):
             # Submit all functions from the current batch to the thread pool,
             # using the _AsyncTask to track the futures and await when they finish.
             task = _AsyncTask({self._pool.submit(f) for f in function_batch})

prettyqt/utils/helpers.py

@@ -104,29 +104,6 @@ def add_connections(item):
     return items, connections
 
 
-def dump_json(data: str):
-    try:
-        import orjson
-
-        opts = orjson.OPT_NAIVE_UTC | orjson.OPT_SERIALIZE_NUMPY
-        return orjson.dumps(data, option=opts)
-    except ImportError:
-        import json
-
-        return json.dumps(data).encode()
-
-
-def load_json(data):
-    try:
-        import orjson
-
-        return orjson.loads(data)
-    except ImportError:
-        import json
-
-        return json.loads(data)
-
-
 def parse_time(time_str: str) -> int:
     """Parse given string and return duration in seconds.
 

pyproject.toml

@@ -30,6 +30,7 @@ dependencies = [
     "qstylizer",
     "typing-extensions",
     "sublime-search>=0.1.2",
+    "anyenv>=0.4.6",
 ]
 # dynamic = ["version"]
 
@@ -207,6 +208,7 @@ ignore = [
     # "PLR2004", # Magic values instead of named consts
     "SLF001", # Private member accessed
     "TRY003", # Avoid specifying long messages outside the exception class
+    "TC006",
 ]
 
 [tool.ruff.lint.flake8-quotes]