Update to supported Python features (#111)

* Replace format with f-strings
* Use builtin generics
* Update to Ruff 0.6

examples/expressions.py

@@ -37,4 +37,4 @@ def make_expr(args):
     expressions = ["123", "2 ^ 3", "1 + 1", "1 - 2 + 3 - 4", "3 - 4 * 2 + 10", "14 / (3.1 + 3.9)"]
 
     for expression in expressions:
-        print("{} = {}".format(expression, ExpressionParsers.expr.parse(expression).unwrap()))
+        print(f"{expression} = {ExpressionParsers.expr.parse(expression).unwrap()}")

examples/json.py

@@ -64,4 +64,4 @@ class JsonParsers(ParserContext, whitespace=r"[ \t\n\r]*"):
     ]
 
     for string in strings:
-        print("source: {}\nvalue: {}".format(string, JsonParsers.value.parse(string)))
+        print(f"source: {string}\nvalue: {JsonParsers.value.parse(string)}")

examples/positioned.py

@@ -56,7 +56,7 @@ def _consume(self, state: State, reader: Reader[Input]):
             return status
 
     def __repr__(self):
-        return self.name_or_nothing() + "positioned({})".format(self.parser.name_or_repr())
+        return self.name_or_nothing() + f"positioned({self.parser.name_or_repr()})"
 
 
 def positioned(parser: Parser[Input, PositionAware[Output]]):

examples/url.py

@@ -68,4 +68,4 @@ class TypicalUrlParsers(ParserContext):
     ]
 
     for string in strings:
-        print("source: {}\nvalue: {}".format(string, TypicalUrlParsers.url.parse(string)))
+        print(f"source: {string}\nvalue: {TypicalUrlParsers.url.parse(string)}")

pyproject.toml

@@ -32,7 +32,7 @@ pytest-cov = "*"
 pytest-timeout = "*"
 
 # Lint
-ruff = "^0.1"
+ruff = "^0.6"
 
 # Docs
 mkdocs-material = "^9"

src/parsita/parsers/_base.py

@@ -3,7 +3,7 @@
 __all__ = ["Parser", "wrap_literal"]
 
 from abc import abstractmethod
-from typing import Any, Generic, List, Optional, Sequence, Union
+from typing import Any, Generic, Optional, Sequence, Union
 
 from .. import options
 from ..state import (
@@ -188,7 +188,7 @@ def __or__(self, other) -> Parser:
         from ._alternative import LongestAlternativeParser
 
         other = wrap_literal(other)
-        parsers: List[Parser] = []
+        parsers: list[Parser] = []
         if isinstance(self, LongestAlternativeParser) and not self.protected:
             parsers.extend(self.parsers)
         else:

src/parsita/state/_exceptions.py

@@ -3,7 +3,7 @@
 __all__ = ["ParseError", "RecursionError"]
 
 from dataclasses import dataclass
-from typing import TYPE_CHECKING, Any, List
+from typing import TYPE_CHECKING, Any
 
 from ._reader import Reader
 
@@ -19,7 +19,7 @@ class ParseError(Exception):
     """
 
     farthest: Reader[Any]
-    expected: List[str]
+    expected: list[str]
 
     def __str__(self):
         return self.farthest.expected_error(self.expected)

src/parsita/state/_state.py

@@ -3,7 +3,7 @@
 __all__ = ["State", "Continue", "Input", "Output"]
 
 from dataclasses import dataclass
-from typing import TYPE_CHECKING, Any, Dict, Generic, List, Optional, Tuple, TypeVar
+from typing import TYPE_CHECKING, Any, Generic, Optional, TypeVar
 
 from ._reader import Reader
 
@@ -17,8 +17,8 @@
 class State(Generic[Input]):
     def __init__(self):
         self.farthest: Optional[Reader[Any]] = None
-        self.expected: List[str] = []
-        self.memo: Dict[Tuple[Parser[Input, Any], int], Optional[Continue[Input, Any]]] = {}
+        self.expected: list[str] = []
+        self.memo: dict[tuple[Parser[Input, Any], int], Optional[Continue[Input, Any]]] = {}
 
     def register_failure(self, expected: str, reader: Reader[Any]):
         if self.farthest is None or self.farthest.position < reader.position: