fz0x1/HPI
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

core: migrate code to benefit from 3.9 stuff

Browse source 
for now keeping ruff on 3.8 target version, need to sort out modules as well
This commit is contained in:
Dima Gerasimov 2024-10-19 20:19:07 +01:00
parent d1511929a8
commit 721fd98dca
37 changed files with 413 additions and 302 deletions
Download patch file Download diff file Expand all files Collapse all files

27
my/core/denylist.py
View file

@ -5,24 +5,25 @@ A helper module for defining denylists for sources programmatically
For docs, see doc/DENYLIST.md
"""
from __future__ import annotations
import functools
import json
import sys
from collections import defaultdict
from collections.abc import Iterator, Mapping
from pathlib import Path
from typing import Any, Dict, List, Set, TypeVar
from typing import Any, TypeVar
import click
from more_itertools import seekable
from my.core.common import PathIsh
from my.core.serialize import dumps
from my.core.warnings import medium
from .serialize import dumps
from .warnings import medium
T = TypeVar("T")
DenyMap = Mapping[str, Set[Any]]
DenyMap = Mapping[str, set[Any]]
def _default_key_func(obj: T) -> str:
@ -30,9 +31,9 @@ def _default_key_func(obj: T) -> str:
class DenyList:
def __init__(self, denylist_file: PathIsh):
def __init__(self, denylist_file: Path | str) -> None:
self.file = Path(denylist_file).expanduser().absolute()
self._deny_raw_list: List[Dict[str, Any]] = []
self._deny_raw_list: list[dict[str, Any]] = []
self._deny_map: DenyMap = defaultdict(set)
# deny cli, user can override these
@ -46,7 +47,7 @@ class DenyList:
return
deny_map: DenyMap = defaultdict(set)
data: List[Dict[str, Any]]= json.loads(self.file.read_text())
data: list[dict[str, Any]] = json.loads(self.file.read_text())
self._deny_raw_list = data
for ignore in data:
@ -113,7 +114,7 @@ class DenyList:
self._load()
self._deny_raw({key: self._stringify_value(value)}, write=write)
def _deny_raw(self, data: Dict[str, Any], *, write: bool = False) -> None:
def _deny_raw(self, data: dict[str, Any], *, write: bool = False) -> None:
self._deny_raw_list.append(data)
if write:
self.write()
@ -132,7 +133,7 @@ class DenyList:
def _deny_cli_remember(
self,
items: Iterator[T],
mem: Dict[str, T],
mem: dict[str, T],
) -> Iterator[str]:
keyf = self._deny_cli_key_func or _default_key_func
# i.e., convert each item to a string, and map str -> item
@ -158,10 +159,8 @@ class DenyList:
# reset the iterator
sit.seek(0)
# so we can map the selected string from fzf back to the original objects
memory_map: Dict[str, T] = {}
picker = FzfPrompt(
executable_path=self.fzf_path, default_options="--no-multi"
)
memory_map: dict[str, T] = {}
picker = FzfPrompt(executable_path=self.fzf_path, default_options="--no-multi")
picked_l = picker.prompt(
self._deny_cli_remember(itr, memory_map),
"--read0",