From 049b37f621f39af4dcfb8da128cb1a6f8f214434 Mon Sep 17 00:00:00 2001 From: Dimitri Papadopoulos <3234522+DimitriPapadopoulos@users.noreply.github.com> Date: Tue, 5 Aug 2025 23:39:40 +0200 Subject: [PATCH 1/2] Apply ruff/pyupgrade rule UP006 UP006 Use `dict` instead of `Dict` for type annotation UP006 Use `list` instead of `List` for type annotation UP006 Use `set` instead of `Set` for type annotation --- readme_renderer/__main__.py | 4 ++-- readme_renderer/clean.py | 6 +++--- readme_renderer/markdown.py | 4 ++-- readme_renderer/rst.py | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/readme_renderer/__main__.py b/readme_renderer/__main__.py index a370fab..dd0db62 100644 --- a/readme_renderer/__main__.py +++ b/readme_renderer/__main__.py @@ -5,10 +5,10 @@ import pathlib from importlib.metadata import metadata import sys -from typing import Optional, List +from typing import Optional -def main(cli_args: Optional[List[str]] = None) -> None: +def main(cli_args: Optional[list[str]] = None) -> None: parser = argparse.ArgumentParser( description="Renders a .md, .rst, or .txt README to HTML", ) diff --git a/readme_renderer/clean.py b/readme_renderer/clean.py index a123044..08c5d01 100644 --- a/readme_renderer/clean.py +++ b/readme_renderer/clean.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from typing import Dict, Optional, Set +from typing import Optional import nh3 @@ -67,8 +67,8 @@ def clean( html: str, - tags: Optional[Set[str]] = None, - attributes: Optional[Dict[str, Set[str]]] = None + tags: Optional[set[str]] = None, + attributes: Optional[dict[str, set[str]]] = None ) -> Optional[str]: if tags is None: tags = ALLOWED_TAGS diff --git a/readme_renderer/markdown.py b/readme_renderer/markdown.py index 6e71a43..69b74fe 100644 --- a/readme_renderer/markdown.py +++ b/readme_renderer/markdown.py @@ -14,7 +14,7 @@ import re import warnings -from typing import cast, Any, Dict, Callable, Match, Optional +from typing import cast, Any, Callable, Match, Optional from html import unescape @@ -32,7 +32,7 @@ try: import cmarkgfm from cmarkgfm.cmark import Options as cmarkgfmOptions - variants: Dict[str, Callable[[str], str]] = { + variants: dict[str, Callable[[str], str]] = { "GFM": lambda raw: cast(str, cmarkgfm.github_flavored_markdown_to_html( raw, options=cmarkgfmOptions.CMARK_OPT_UNSAFE )), diff --git a/readme_renderer/rst.py b/readme_renderer/rst.py index 52621a3..b05cd4f 100644 --- a/readme_renderer/rst.py +++ b/readme_renderer/rst.py @@ -13,7 +13,7 @@ # limitations under the License. import io -from typing import Any, Dict, IO, Optional +from typing import Any, IO, Optional from docutils.core import publish_parts from docutils.nodes import Element @@ -26,7 +26,7 @@ class ReadMeHTMLTranslator(HTMLTranslator): # Overrides base class not to output `` tag for SVG images. - object_image_types: Dict[str, str] = {} + object_image_types: dict[str, str] = {} def emptytag( self, From 9881d145ac247f1d879a1a612fea61f6dafa8abf Mon Sep 17 00:00:00 2001 From: Dimitri Papadopoulos <3234522+DimitriPapadopoulos@users.noreply.github.com> Date: Tue, 5 Aug 2025 23:41:07 +0200 Subject: [PATCH 2/2] Apply ruff/pyupgrade rule UP035 UP035 Import from `re` instead: `Match` --- readme_renderer/markdown.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/readme_renderer/markdown.py b/readme_renderer/markdown.py index 69b74fe..5b1c504 100644 --- a/readme_renderer/markdown.py +++ b/readme_renderer/markdown.py @@ -14,7 +14,8 @@ import re import warnings -from typing import cast, Any, Callable, Match, Optional +from typing import cast, Any, Callable, Optional +from re import Match from html import unescape