diff options
| -rw-r--r-- | patternutils/commands/pjson.py | 6 | ||||
| -rw-r--r-- | patternutils/commands/pmatch.py | 6 | ||||
| -rw-r--r-- | patternutils/commands/prss.py | 8 | ||||
| -rw-r--r-- | patternutils/commands/targs.py | 2 | ||||
| -rw-r--r-- | patternutils/config.py | 6 | ||||
| -rw-r--r-- | patternutils/match.py | 4 | ||||
| -rw-r--r-- | patternutils/template.py | 6 | ||||
| -rw-r--r-- | patternutils/utils.py | 6 |
8 files changed, 22 insertions, 22 deletions
diff --git a/patternutils/commands/pjson.py b/patternutils/commands/pjson.py index 73786a4..faf1be0 100644 --- a/patternutils/commands/pjson.py +++ b/patternutils/commands/pjson.py @@ -1,6 +1,6 @@ import json import re -from typing import Any, Dict, Pattern +from typing import Any, Pattern import click @@ -9,8 +9,8 @@ from .. import utils def apply_regex( - data: Dict[str, str], key: str, regex_pattern: Pattern[str] -) -> Dict[str, str]: + data: dict[str, str], key: str, regex_pattern: Pattern[str] +) -> dict[str, str]: try: subject = data[key] except KeyError: diff --git a/patternutils/commands/pmatch.py b/patternutils/commands/pmatch.py index c217c36..f69df48 100644 --- a/patternutils/commands/pmatch.py +++ b/patternutils/commands/pmatch.py @@ -2,7 +2,7 @@ import functools import itertools import os.path import re -from typing import Any, Dict, Generator, Iterator, List, Optional, Pattern +from typing import Any, Generator, Iterator, Optional, Pattern import click @@ -15,7 +15,7 @@ def apply_regex( walk_function: Iterator[Any], regex_pattern: Pattern[str], match_full_path: bool, -) -> Generator[Optional[Dict[str, str]], None, None]: +) -> Generator[Optional[dict[str, str]], None, None]: for f in walk_function: subject = f.path if match_full_path else f.name @@ -87,7 +87,7 @@ def apply_regex( @click.argument("regex-pattern") def pmatch( regex_pattern: str, - directory: List[str], + directory: list[str], match_directories: bool, recursive: bool, abort_on_no_match: bool, diff --git a/patternutils/commands/prss.py b/patternutils/commands/prss.py index a176587..1ec4675 100644 --- a/patternutils/commands/prss.py +++ b/patternutils/commands/prss.py @@ -2,7 +2,7 @@ import functools import itertools import os import os.path -from typing import Any, Dict, Generator, Iterator, List, Optional +from typing import Any, Generator, Iterator, Optional import click @@ -18,8 +18,8 @@ from .. import utils def match( parsed_feed: feedparser.util.FeedParserDict, walk_function: functools.partial[Generator[os.DirEntry[Any], None, None]], - directory: List[str], -) -> Generator[Optional[Dict[str, str]], None, None]: + directory: list[str], +) -> Generator[Optional[dict[str, str]], None, None]: direntries = [] filenames = [] @@ -96,7 +96,7 @@ def match( @click.argument("url") def prss( url: str, - directory: List[str], + directory: list[str], recursive: bool, abort_on_no_file: bool, stream: bool, diff --git a/patternutils/commands/targs.py b/patternutils/commands/targs.py index 5ca8d04..c99a6aa 100644 --- a/patternutils/commands/targs.py +++ b/patternutils/commands/targs.py @@ -4,7 +4,7 @@ import multiprocessing import os import shlex import subprocess -from typing import Callable, Dict, List, Union +from typing import Callable import click diff --git a/patternutils/config.py b/patternutils/config.py index 2bce26c..50566f2 100644 --- a/patternutils/config.py +++ b/patternutils/config.py @@ -1,13 +1,13 @@ import glob import os.path -from typing import List, Optional, Tuple +from typing import Optional import click CONFIG_PATH = click.get_app_dir("patternutils") -def load_template(template_name: str, command_name: Optional[str]) -> Tuple[str, str]: +def load_template(template_name: str, command_name: Optional[str]) -> tuple[str, str]: """Load a template from the config directory.""" files = find_templates(template_name, command_name) @@ -26,7 +26,7 @@ def load_template(template_name: str, command_name: Optional[str]) -> Tuple[str, return output_pattern, template_engine -def find_templates(template_name: str, command_name: Optional[str] = None) -> List[str]: +def find_templates(template_name: str, command_name: Optional[str] = None) -> list[str]: template_glob = "{}.*".format(template_name) command_glob = "*" if command_name is None else command_name command_glob = os.path.join(CONFIG_PATH, command_glob) diff --git a/patternutils/match.py b/patternutils/match.py index 1387001..fc6a805 100644 --- a/patternutils/match.py +++ b/patternutils/match.py @@ -1,7 +1,7 @@ -from typing import Dict, Pattern +from typing import Pattern -def apply(subject: str, regex_pattern: Pattern[str]) -> Dict[str, str]: +def apply(subject: str, regex_pattern: Pattern[str]) -> dict[str, str]: if (match := regex_pattern.search(subject)) is not None: groupdict = match.groupdict() groupdict["_subject"] = subject diff --git a/patternutils/template.py b/patternutils/template.py index 8dbc650..f0b3c43 100644 --- a/patternutils/template.py +++ b/patternutils/template.py @@ -1,4 +1,4 @@ -from typing import Callable, Tuple +from typing import Callable try: import jinja2 @@ -27,10 +27,10 @@ else: def quote(value: str) -> str: return shlex.quote(value) - def splitpath(value: str) -> Tuple[str, str]: + def splitpath(value: str) -> tuple[str, str]: return os.path.split(value) - def splitext(value: str) -> Tuple[str, str]: + def splitext(value: str) -> tuple[str, str]: return os.path.splitext(value) jinja_env.filters["datetime"] = to_datetime diff --git a/patternutils/utils.py b/patternutils/utils.py index ae8a5fa..d78d990 100644 --- a/patternutils/utils.py +++ b/patternutils/utils.py @@ -1,6 +1,6 @@ import json import os -from typing import Any, Dict, Generator, List, Union +from typing import Any, Generator, Union import click @@ -10,7 +10,7 @@ def max_procs() -> int: return 1 if cpu_count is None else cpu_count * 2 -def edit(data: Union[Dict[str, str], List[str]]) -> Dict[str, str]: +def edit(data: Union[dict[str, str], list[str]]) -> dict[str, str]: longest = len(max(data, key=len)) @@ -38,7 +38,7 @@ def json_dumps(data: Any, human_readable: bool = False) -> str: {"indent": 4, "sort_keys": True} if human_readable else {"separators": (",", ":")} - ) # type: Dict[str, Any] + ) # type: dict[str, Any] return json.dumps(data, **config) |
