Fixed types

Author: MichaelGoodale

python/python_mg/_lib_name.pyi

@@ -10,10 +10,6 @@ class MGNode:
     def lemma_string(self) -> str:
         """Format the node as a string in a tree if leaf or trace"""
 
-    def __str__(self) -> str: ...
-    def __eq__(self, other: object) -> bool: ...
-    def __hash__(self) -> int: ...
-
 class MGEdge:
     def is_move(self) -> bool:
         """Checks whether the edge is a movement edge"""
@@ -22,10 +18,6 @@ class MGEdge:
     def move_edge() -> MGEdge:
         """Gets a movement edge"""
 
-    def __str__(self) -> str: ...
-    def __eq__(self, other: object) -> bool: ...
-    def __hash__(self) -> int: ...
-
 class SyntacticStructure:
     """A parse tree for some string"""
 
@@ -36,7 +28,7 @@ class SyntacticStructure:
     def contains_lexical_entry(self, s: str) -> bool:
         """Check if this structure contains a specific lexical entry (formatted as an MG entry, will raise an error if unparseable)"""
 
-    def contains_word(self, s: Optional[str]) -> bool:
+    def contains_word(self, s: str | None) -> bool:
         """Check if this structure contains a specific word."""
 
     def prob(self) -> float:
@@ -51,9 +43,6 @@ class SyntacticStructure:
     def __to_tree_inner(
         self,
     ) -> tuple[list[tuple[int, MGNode]], list[tuple[int, int, MGEdge]], int]: ...
-    def __str__(self) -> str: ...
-    def __eq__(self, other: object) -> bool: ...
-    def __hash__(self) -> int: ...
 
 class Continuation:
     """A continuation of a prefix string"""
@@ -70,11 +59,7 @@ class Continuation:
     def is_multi_word(self) -> bool:
         """Check if the continuation is an affixed word"""
 
-    def __str__(self) -> str: ...
-    def __eq__(self, other: object) -> bool: ...
-    def __hash__(self) -> int: ...
-
-class GrammarIterator(Iterator[SyntacticStructure]):
+class GrammarIterator:
     def __iter__(self) -> GrammarIterator: ...
     def __next__(self) -> SyntacticStructure: ...
 
@@ -93,11 +78,11 @@ class Lexicon:
         self,
         prefix: str,
         category: str,
-        min_log_prob: float = -128.0,
+        min_log_prob: float | None = -128.0,
         move_prob: float = 0.5,
-        max_steps: int = 64,
-        n_beams: int = 256,
-        max_strings: Optional[int] = None,
+        max_steps: int | None = 64,
+        n_beams: int | None = 256,
+        max_strings: int | None = None,
     ) -> set[Continuation]:
         """Returns a set of all valid continuations from this prefix"""
 
@@ -106,37 +91,33 @@ class Lexicon:
         category: str,
         min_log_prob: float = -128.0,
         move_prob: float = 0.5,
-        max_steps: int = 64,
-        n_beams: int = 256,
-        max_strings: Optional[int] = None,
+        max_steps: int | None = 64,
+        n_beams: int | None = 256,
+        max_strings: int | None = None,
     ) -> list[tuple[list[str], float]]:
         """Returns a list of all unique strings and their probabilities"""
 
     def generate_grammar(
         self,
         category: str,
-        min_log_prob: float = -128.0,
+        min_log_prob: float | None = -128.0,
         move_prob: float = 0.5,
-        max_steps: int = 64,
-        n_beams: int = 256,
-        max_strings: Optional[int] = None,
+        max_steps: int | None = 64,
+        n_beams: int | None = 256,
+        max_strings: int | None = None,
     ) -> GrammarIterator:
         """Returns an iterator over all possible parses"""
 
     def parse(
         self,
         s: str,
         category: str,
-        min_log_prob: float = -128.0,
+        min_log_prob: float | None = -128.0,
         move_prob: float = 0.5,
-        max_steps: int = 64,
-        n_beams: int = 256,
-        max_strings: Optional[int] = None,
+        max_steps: int | None = 64,
+        n_beams: int | None = 256,
+        max_strings: int | None = None,
     ) -> list[SyntacticStructure]:
         """Returns a list of all possible parses of that string.
         The string, s, should be delimited by spaces for words and hyphens for multi-word expressions from head-movement
         """
-
-    def __str__(self) -> str: ...
-    def __eq__(self, other: object) -> bool: ...
-    def __hash__(self) -> int: ...