pyupgrade to 3.14

Author: v--

ruff.toml

@@ -1,5 +1,5 @@
 line-length = 120
-target-version = "py313"
+target-version = "py314"
 
 [format]
 quote-style = "single"

src/notebook/bibtex/entry.py

@@ -128,7 +128,7 @@ class BibEntry:
     urldate:       Annotated[BibString | None, BibFieldAnnotation()] = None
 
     # Based on https://stackoverflow.com/a/77690186/2756776
-    def __or__(self, other: 'BibEntry') -> 'BibEntry':
+    def __or__(self, other: BibEntry) -> BibEntry:
         return BibEntry(**asdict(self) | asdict(other))
 
     def _string_properties(self) -> Iterable[tuple[str, BibString]]:

src/notebook/bibtex/parsing/parser.py

@@ -41,7 +41,7 @@ def skip_whitespace_and_comments(self) -> BibToken | None:
 
         return None
 
-    def parse_entry_name(self, name_context: 'BibValueContext', existing_names: Collection[str]) -> str:
+    def parse_entry_name(self, name_context: BibValueContext, existing_names: Collection[str]) -> str:
         # Entry names may even contain %, which is otherwise used for comments
         while (head := self.peek()) and head.kind not in ['CLOSING_BRACE', 'COMMA', 'LINE_BREAK']:
             self.advance()
@@ -60,7 +60,7 @@ def parse_entry_name(self, name_context: 'BibValueContext', existing_names: Coll
 
         return entry_name
 
-    def parse_property_key(self, entry_context: 'BibEntryContext', existing_keys: Collection[str]) -> str:
+    def parse_property_key(self, entry_context: BibEntryContext, existing_keys: Collection[str]) -> str:
         head = self.peek_unsafe()
 
         if head.kind != 'WORD':
@@ -75,7 +75,7 @@ def parse_property_key(self, entry_context: 'BibEntryContext', existing_keys: Co
         self.advance()
         return head.value
 
-    def _parse_escape_sequence(self, value_context: 'BibValueContext') -> str:
+    def _parse_escape_sequence(self, value_context: BibValueContext) -> str:
         lookahead = self.peek_multiple(2)
 
         if len(lookahead) == 1:
@@ -90,7 +90,7 @@ def _parse_escape_sequence(self, value_context: 'BibValueContext') -> str:
             case _:
                 return '\\' + lookahead[1].value
 
-    def parse_value_in_context(self, value_context: 'BibValueContext', key: str, *, quotes: bool) -> None:
+    def parse_value_in_context(self, value_context: BibValueContext, key: str, *, quotes: bool) -> None:
         self.advance()
 
         builder = value_context.string_builder
@@ -190,7 +190,7 @@ def parse_raw_value(self) -> BibString:
     def parse_author_string(self, source: BibString) -> BibAuthor:
         return BibAuthor(full_name=source.strip())
 
-    def parse_list(self, value_context: 'BibValueContext') -> Iterable[BibString]:
+    def parse_list(self, value_context: BibValueContext) -> Iterable[BibString]:
         value = value_context.string_builder.get_value()
         expecting_and = False
         buffer = list[BibString]()
@@ -216,11 +216,11 @@ def parse_list(self, value_context: 'BibValueContext') -> Iterable[BibString]:
         if len(buffer) > 0:
             yield CompositeString(buffer) if len(buffer) > 1 else buffer[0].strip()
 
-    def parse_authors(self, value_context: 'BibValueContext') -> Iterable[BibAuthor]:
+    def parse_authors(self, value_context: BibValueContext) -> Iterable[BibAuthor]:
         for entry in self.parse_list(value_context):
             yield self.parse_author_string(entry)
 
-    def perform_inline_validation(self, value_context: 'BibValueContext', key: str) -> None:
+    def perform_inline_validation(self, value_context: BibValueContext, key: str) -> None:
         value_str = str(value_context.string_builder.get_value())
 
         if len(value_str) == 0 or value_str.isspace():
@@ -230,7 +230,7 @@ def perform_inline_validation(self, value_context: 'BibValueContext', key: str)
             for _ in self.parse_authors(value_context):
                 pass
 
-    def parse_entry_properties(self, entry_context: 'BibEntryContext') -> Iterable[tuple[str, 'BibValueContext']]:
+    def parse_entry_properties(self, entry_context: BibEntryContext) -> Iterable[tuple[str, BibValueContext]]:
         existing_keys = set[str]()
         last_comma: BibToken | None = None
 
@@ -293,12 +293,12 @@ def parse_entry_properties(self, entry_context: 'BibEntryContext') -> Iterable[t
         if last_comma is not None:
             raise entry_context.annotate_token_error('Trailing commas are disallowed', token=last_comma)
 
-    def perform_global_validation(self, entry_context: 'BibEntryContext', properties: dict[str, 'BibValueContext']) -> None:
+    def perform_global_validation(self, entry_context: BibEntryContext, properties: dict[str, BibValueContext]) -> None:
         if 'title' not in properties:
             raise entry_context.annotate_context_error('Entry without title')
 
     @list_accumulator
-    def process_authors(self, properties: dict[str, 'BibValueContext'], key: str) -> Iterable[BibAuthor]:
+    def process_authors(self, properties: dict[str, BibValueContext], key: str) -> Iterable[BibAuthor]:
         if key not in properties:
             return
 
@@ -326,7 +326,7 @@ def process_authors(self, properties: dict[str, 'BibValueContext'], key: str) ->
         if short_value_context and len(short_segments) > 0:
             raise short_value_context.annotate_context_error(error_message)
 
-    def process_language(self, properties: dict[str, 'BibValueContext'], key: str) -> Sequence[BibString]:
+    def process_language(self, properties: dict[str, BibValueContext], key: str) -> Sequence[BibString]:
         value_context = properties.pop(key, None)
 
         if value_context is None:

src/notebook/bibtex/string.py

@@ -20,7 +20,7 @@ def __eq__(self, other: object) -> bool:
 
         return self.value == other.value
 
-    def strip(self) -> 'VerbatimString':
+    def strip(self) -> VerbatimString:
         return self
 
     lstrip = rstrip = strip
@@ -30,9 +30,9 @@ def isspace(self) -> bool:
 
 
 class CompositeString:
-    segments: 'Sequence[BibString]'
+    segments: Sequence[BibString]
 
-    def __init__(self, segments: 'Sequence[BibString]') -> None:
+    def __init__(self, segments: Sequence[BibString]) -> None:
         self.segments = segments
 
     def __str__(self) -> str:
@@ -47,7 +47,7 @@ def __eq__(self, other: object) -> bool:
 
         return self.segments == other.segments
 
-    def strip(self) -> 'CompositeString':
+    def strip(self) -> CompositeString:
         return self
 
     lstrip = rstrip = strip

src/notebook/commands/common/formatting.py

@@ -12,7 +12,7 @@
 class FormatterContext(NamedTuple):
     src: TextIO
     dest: TextIO
-    logger: 'loguru.Logger'
+    logger: loguru.Logger
 
 
 class FormatterContextManager:

src/notebook/commands/watcher/command.py

@@ -18,7 +18,7 @@
 WatchTarget = Literal['all', 'notebook', 'figures']
 
 
-async def iter_file_changes(logger: 'loguru.Logger') -> AsyncIterator:
+async def iter_file_changes(logger: loguru.Logger) -> AsyncIterator:
     with Inotify() as inotify:
         inotify.add_watch(ROOT_PATH, Mask.MODIFY)
         inotify.add_watch(ROOT_PATH / 'text', Mask.MODIFY)
@@ -36,7 +36,7 @@ async def iter_file_changes(logger: 'loguru.Logger') -> AsyncIterator:
                 yield os.path.relpath(event.path, ROOT_PATH)
 
 
-async def setup_watchers(base_logger: 'loguru.Logger', *, no_aux: bool) -> None:
+async def setup_watchers(base_logger: loguru.Logger, *, no_aux: bool) -> None:
     runner = TaskRunner()
 
     async for path in iter_file_changes(base_logger):

src/notebook/commands/watcher/task.py

@@ -9,7 +9,7 @@
 
 
 class WatcherTask(abc.ABC):
-    sublogger: 'loguru.Logger'
+    sublogger: loguru.Logger
     out_buffer: int | None
 
     def __eq__(self, other: object) -> bool:
@@ -23,11 +23,11 @@ def __hash__(self) -> int:
     def command(self) -> str:
         ...
 
-    async def pre_process(self, runner: 'TaskRunner') -> None:
+    async def pre_process(self, runner: TaskRunner) -> None:
         pass
 
-    async def post_process(self, runner: 'TaskRunner') -> None:
+    async def post_process(self, runner: TaskRunner) -> None:
         pass
 
-    async def on_failure(self, runner: 'TaskRunner') -> None:
+    async def on_failure(self, runner: TaskRunner) -> None:
         pass

src/notebook/commands/watcher/tasks/asymptote.py

@@ -13,7 +13,7 @@ class AsymptoteTask(WatcherTask):
     src_path: pathlib.Path
     out_buffer: int | None = None
 
-    def __init__(self, base_logger: 'loguru.Logger', src_path: pathlib.Path | str) -> None:
+    def __init__(self, base_logger: loguru.Logger, src_path: pathlib.Path | str) -> None:
         self.src_path = pathlib.Path(src_path)
         self.base_logger = base_logger
         self.sublogger = base_logger.bind(logger=str(self.src_path))

src/notebook/commands/watcher/tasks/biber.py

@@ -12,11 +12,11 @@
 
 
 class BiberTask(WatcherTask):
-    base_logger: 'loguru.Logger'
+    base_logger: loguru.Logger
     out_buffer: int | None = asyncio.subprocess.DEVNULL
     tex_path: pathlib.Path
 
-    def __init__(self, base_logger: 'loguru.Logger', tex_path: pathlib.Path | str) -> None:
+    def __init__(self, base_logger: loguru.Logger, tex_path: pathlib.Path | str) -> None:
         self.tex_path = pathlib.Path(tex_path)
         self.base_logger = base_logger
         self.sublogger = base_logger.bind(logger=str(os.path.relpath(self.bcf_path, ROOT_PATH)))

src/notebook/commands/watcher/tasks/latex.py

@@ -19,7 +19,7 @@ class LaTeXTask(WatcherTask):
     tex_path: pathlib.Path
     out_buffer: int | None = asyncio.subprocess.DEVNULL
 
-    def __init__(self, base_logger: 'loguru.Logger', tex_path: pathlib.Path | str) -> None:
+    def __init__(self, base_logger: loguru.Logger, tex_path: pathlib.Path | str) -> None:
         self.tex_path = pathlib.Path(tex_path)
         self.base_logger = base_logger
         self.sublogger = base_logger.bind(logger=str(os.path.relpath(self.tex_path, ROOT_PATH)))