pyupgrade

Author: willmcgugan

rich/_inspect.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 import inspect
 from inspect import cleandoc, getdoc, getfile, isclass, ismodule, signature
 from typing import Any, Collection, Iterable, Optional, Tuple, Type, Union

rich/console.py

@@ -2165,7 +2165,7 @@ def save_text(self, path: str, *, clear: bool = True, styles: bool = False) -> N
 
         """
         text = self.export_text(clear=clear, styles=styles)
-        with open(path, "wt", encoding="utf-8") as write_file:
+        with open(path, "w", encoding="utf-8") as write_file:
             write_file.write(text)
 
     def export_html(
@@ -2271,7 +2271,7 @@ def save_html(
             code_format=code_format,
             inline_styles=inline_styles,
         )
-        with open(path, "wt", encoding="utf-8") as write_file:
+        with open(path, "w", encoding="utf-8") as write_file:
             write_file.write(html)
 
     def export_svg(
@@ -2560,7 +2560,7 @@ def save_svg(
             font_aspect_ratio=font_aspect_ratio,
             unique_id=unique_id,
         )
-        with open(path, "wt", encoding="utf-8") as write_file:
+        with open(path, "w", encoding="utf-8") as write_file:
             write_file.write(svg)
 
 

rich/filesize.py

@@ -1,4 +1,3 @@
-# coding: utf-8
 """Functions for reporting filesizes. Borrowed from https://github.com/PyFilesystem/pyfilesystem2
 
 The functions declared in this module should cover the different
@@ -27,7 +26,7 @@ def _to_str(
     if size == 1:
         return "1 byte"
     elif size < base:
-        return "{:,} bytes".format(size)
+        return f"{size:,} bytes"
 
     for i, suffix in enumerate(suffixes, 2):  # noqa: B007
         unit = base**i

rich/markdown.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import sys
-from typing import ClassVar, Dict, Iterable, List, Optional, Type, Union
+from typing import ClassVar, Iterable
 
 from markdown_it import MarkdownIt
 from markdown_it.token import Token
@@ -31,7 +31,7 @@ class MarkdownElement:
     new_line: ClassVar[bool] = True
 
     @classmethod
-    def create(cls, markdown: "Markdown", token: Token) -> "MarkdownElement":
+    def create(cls, markdown: Markdown, token: Token) -> MarkdownElement:
         """Factory to create markdown element,
 
         Args:
@@ -43,30 +43,28 @@ def create(cls, markdown: "Markdown", token: Token) -> "MarkdownElement":
         """
         return cls()
 
-    def on_enter(self, context: "MarkdownContext") -> None:
+    def on_enter(self, context: MarkdownContext) -> None:
         """Called when the node is entered.
 
         Args:
             context (MarkdownContext): The markdown context.
         """
 
-    def on_text(self, context: "MarkdownContext", text: TextType) -> None:
+    def on_text(self, context: MarkdownContext, text: TextType) -> None:
         """Called when text is parsed.
 
         Args:
             context (MarkdownContext): The markdown context.
         """
 
-    def on_leave(self, context: "MarkdownContext") -> None:
+    def on_leave(self, context: MarkdownContext) -> None:
         """Called when the parser leaves the element.
 
         Args:
             context (MarkdownContext): [description]
         """
 
-    def on_child_close(
-        self, context: "MarkdownContext", child: "MarkdownElement"
-    ) -> bool:
+    def on_child_close(self, context: MarkdownContext, child: MarkdownElement) -> bool:
         """Called when a child element is closed.
 
         This method allows a parent element to take over rendering of its children.
@@ -81,8 +79,8 @@ def on_child_close(
         return True
 
     def __rich_console__(
-        self, console: "Console", options: "ConsoleOptions"
-    ) -> "RenderResult":
+        self, console: Console, options: ConsoleOptions
+    ) -> RenderResult:
         return ()
 
 
@@ -100,14 +98,14 @@ class TextElement(MarkdownElement):
 
     style_name = "none"
 
-    def on_enter(self, context: "MarkdownContext") -> None:
+    def on_enter(self, context: MarkdownContext) -> None:
         self.style = context.enter_style(self.style_name)
         self.text = Text(justify="left")
 
-    def on_text(self, context: "MarkdownContext", text: TextType) -> None:
+    def on_text(self, context: MarkdownContext, text: TextType) -> None:
         self.text.append(text, context.current_style if isinstance(text, str) else None)
 
-    def on_leave(self, context: "MarkdownContext") -> None:
+    def on_leave(self, context: MarkdownContext) -> None:
         context.leave_style()
 
 
@@ -118,7 +116,7 @@ class Paragraph(TextElement):
     justify: JustifyMethod
 
     @classmethod
-    def create(cls, markdown: "Markdown", token: Token) -> "Paragraph":
+    def create(cls, markdown: Markdown, token: Token) -> Paragraph:
         return cls(justify=markdown.justify or "left")
 
     def __init__(self, justify: JustifyMethod) -> None:
@@ -135,10 +133,10 @@ class Heading(TextElement):
     """A heading."""
 
     @classmethod
-    def create(cls, markdown: "Markdown", token: Token) -> "Heading":
+    def create(cls, markdown: Markdown, token: Token) -> Heading:
         return cls(token.tag)
 
-    def on_enter(self, context: "MarkdownContext") -> None:
+    def on_enter(self, context: MarkdownContext) -> None:
         self.text = Text()
         context.enter_style(self.style_name)
 
@@ -172,7 +170,7 @@ class CodeBlock(TextElement):
     style_name = "markdown.code_block"
 
     @classmethod
-    def create(cls, markdown: "Markdown", token: Token) -> "CodeBlock":
+    def create(cls, markdown: Markdown, token: Token) -> CodeBlock:
         node_info = token.info or ""
         lexer_name = node_info.partition(" ")[0]
         return cls(lexer_name or "text", markdown.code_theme)
@@ -199,9 +197,7 @@ class BlockQuote(TextElement):
     def __init__(self) -> None:
         self.elements: Renderables = Renderables()
 
-    def on_child_close(
-        self, context: "MarkdownContext", child: "MarkdownElement"
-    ) -> bool:
+    def on_child_close(self, context: MarkdownContext, child: MarkdownElement) -> bool:
         self.elements.append(child)
         return False
 
@@ -238,9 +234,7 @@ def __init__(self) -> None:
         self.header: TableHeaderElement | None = None
         self.body: TableBodyElement | None = None
 
-    def on_child_close(
-        self, context: "MarkdownContext", child: "MarkdownElement"
-    ) -> bool:
+    def on_child_close(self, context: MarkdownContext, child: MarkdownElement) -> bool:
         if isinstance(child, TableHeaderElement):
             self.header = child
         elif isinstance(child, TableBodyElement):
@@ -272,9 +266,7 @@ class TableHeaderElement(MarkdownElement):
     def __init__(self) -> None:
         self.row: TableRowElement | None = None
 
-    def on_child_close(
-        self, context: "MarkdownContext", child: "MarkdownElement"
-    ) -> bool:
+    def on_child_close(self, context: MarkdownContext, child: MarkdownElement) -> bool:
         assert isinstance(child, TableRowElement)
         self.row = child
         return False
@@ -286,9 +278,7 @@ class TableBodyElement(MarkdownElement):
     def __init__(self) -> None:
         self.rows: list[TableRowElement] = []
 
-    def on_child_close(
-        self, context: "MarkdownContext", child: "MarkdownElement"
-    ) -> bool:
+    def on_child_close(self, context: MarkdownContext, child: MarkdownElement) -> bool:
         assert isinstance(child, TableRowElement)
         self.rows.append(child)
         return False
@@ -298,11 +288,9 @@ class TableRowElement(MarkdownElement):
     """MarkdownElement corresponding to `tr_open` and `tr_close`."""
 
     def __init__(self) -> None:
-        self.cells: List[TableDataElement] = []
+        self.cells: list[TableDataElement] = []
 
-    def on_child_close(
-        self, context: "MarkdownContext", child: "MarkdownElement"
-    ) -> bool:
+    def on_child_close(self, context: MarkdownContext, child: MarkdownElement) -> bool:
         assert isinstance(child, TableDataElement)
         self.cells.append(child)
         return False
@@ -313,7 +301,7 @@ class TableDataElement(MarkdownElement):
     and `th_open` and `th_close`."""
 
     @classmethod
-    def create(cls, markdown: "Markdown", token: Token) -> "MarkdownElement":
+    def create(cls, markdown: Markdown, token: Token) -> MarkdownElement:
         style = str(token.attrs.get("style")) or ""
 
         justify: JustifyMethod
@@ -333,7 +321,7 @@ def __init__(self, justify: JustifyMethod) -> None:
         self.content: Text = Text("", justify=justify)
         self.justify = justify
 
-    def on_text(self, context: "MarkdownContext", text: TextType) -> None:
+    def on_text(self, context: MarkdownContext, text: TextType) -> None:
         text = Text(text) if isinstance(text, str) else text
         text.stylize(context.current_style)
         self.content.append_text(text)
@@ -343,17 +331,15 @@ class ListElement(MarkdownElement):
     """A list element."""
 
     @classmethod
-    def create(cls, markdown: "Markdown", token: Token) -> "ListElement":
+    def create(cls, markdown: Markdown, token: Token) -> ListElement:
         return cls(token.type, int(token.attrs.get("start", 1)))
 
     def __init__(self, list_type: str, list_start: int | None) -> None:
-        self.items: List[ListItem] = []
+        self.items: list[ListItem] = []
         self.list_type = list_type
         self.list_start = list_start
 
-    def on_child_close(
-        self, context: "MarkdownContext", child: "MarkdownElement"
-    ) -> bool:
+    def on_child_close(self, context: MarkdownContext, child: MarkdownElement) -> bool:
         assert isinstance(child, ListItem)
         self.items.append(child)
         return False
@@ -381,9 +367,7 @@ class ListItem(TextElement):
     def __init__(self) -> None:
         self.elements: Renderables = Renderables()
 
-    def on_child_close(
-        self, context: "MarkdownContext", child: "MarkdownElement"
-    ) -> bool:
+    def on_child_close(self, context: MarkdownContext, child: MarkdownElement) -> bool:
         self.elements.append(child)
         return False
 
@@ -419,7 +403,7 @@ def render_number(
 
 class Link(TextElement):
     @classmethod
-    def create(cls, markdown: "Markdown", token: Token) -> "MarkdownElement":
+    def create(cls, markdown: Markdown, token: Token) -> MarkdownElement:
         url = token.attrs.get("href", "#")
         return cls(token.content, str(url))
 
@@ -434,7 +418,7 @@ class ImageItem(TextElement):
     new_line = False
 
     @classmethod
-    def create(cls, markdown: "Markdown", token: Token) -> "MarkdownElement":
+    def create(cls, markdown: Markdown, token: Token) -> MarkdownElement:
         """Factory to create markdown element,
 
         Args:
@@ -449,10 +433,10 @@ def create(cls, markdown: "Markdown", token: Token) -> "MarkdownElement":
     def __init__(self, destination: str, hyperlinks: bool) -> None:
         self.destination = destination
         self.hyperlinks = hyperlinks
-        self.link: Optional[str] = None
+        self.link: str | None = None
         super().__init__()
 
-    def on_enter(self, context: "MarkdownContext") -> None:
+    def on_enter(self, context: MarkdownContext) -> None:
         self.link = context.current_style.link
         self.text = Text(justify="left")
         super().on_enter(context)
@@ -476,15 +460,15 @@ def __init__(
         console: Console,
         options: ConsoleOptions,
         style: Style,
-        inline_code_lexer: Optional[str] = None,
+        inline_code_lexer: str | None = None,
         inline_code_theme: str = "monokai",
     ) -> None:
         self.console = console
         self.options = options
         self.style_stack: StyleStack = StyleStack(style)
         self.stack: Stack[MarkdownElement] = Stack()
 
-        self._syntax: Optional[Syntax] = None
+        self._syntax: Syntax | None = None
         if inline_code_lexer is not None:
             self._syntax = Syntax("", inline_code_lexer, theme=inline_code_theme)
 
@@ -504,7 +488,7 @@ def on_text(self, text: str, node_type: str) -> None:
         else:
             self.stack.top.on_text(self, text)
 
-    def enter_style(self, style_name: Union[str, Style]) -> Style:
+    def enter_style(self, style_name: str | Style) -> Style:
         """Enter a style context."""
         style = self.console.get_style(style_name, default="none")
         self.style_stack.push(style)
@@ -531,7 +515,7 @@ class Markdown(JupyterMixin):
             highlighting, or None for no highlighting. Defaults to None.
     """
 
-    elements: ClassVar[Dict[str, Type[MarkdownElement]]] = {
+    elements: ClassVar[dict[str, type[MarkdownElement]]] = {
         "paragraph_open": Paragraph,
         "heading_open": Heading,
         "fence": CodeBlock,
@@ -556,17 +540,17 @@ def __init__(
         self,
         markup: str,
         code_theme: str = "monokai",
-        justify: Optional[JustifyMethod] = None,
-        style: Union[str, Style] = "none",
+        justify: JustifyMethod | None = None,
+        style: str | Style = "none",
         hyperlinks: bool = True,
-        inline_code_lexer: Optional[str] = None,
-        inline_code_theme: Optional[str] = None,
+        inline_code_lexer: str | None = None,
+        inline_code_theme: str | None = None,
     ) -> None:
         parser = MarkdownIt().enable("strikethrough").enable("table")
         self.markup = markup
         self.parsed = parser.parse(markup)
         self.code_theme = code_theme
-        self.justify: Optional[JustifyMethod] = justify
+        self.justify: JustifyMethod | None = justify
         self.style = style
         self.hyperlinks = hyperlinks
         self.inline_code_lexer = inline_code_lexer
@@ -772,7 +756,7 @@ def __rich_console__(
     if args.path == "-":
         markdown_body = sys.stdin.read()
     else:
-        with open(args.path, "rt", encoding="utf-8") as markdown_file:
+        with open(args.path, encoding="utf-8") as markdown_file:
             markdown_body = markdown_file.read()
 
     markdown = Markdown(

rich/progress.py

@@ -1326,7 +1326,7 @@ def open(
         # normalize the mode (always rb, rt)
         _mode = "".join(sorted(mode, reverse=False))
         if _mode not in ("br", "rt", "r"):
-            raise ValueError("invalid mode {!r}".format(mode))
+            raise ValueError(f"invalid mode {mode!r}")
 
         # patch buffering to provide the same behaviour as the builtin `open`
         line_buffering = buffering == 1

rich/progress_bar.py

@@ -108,7 +108,7 @@ def _get_pulse_segments(
 
         for index in range(PULSE_SIZE):
             position = index / PULSE_SIZE
-            fade = 0.5 + cos((position * pi * 2)) / 2.0
+            fade = 0.5 + cos(position * pi * 2) / 2.0
             color = blend_rgb(fore_color, back_color, cross_fade=fade)
             append(_Segment(bar, _Style(color=from_triplet(color))))
         return segments