Typing adjustments

src/macrogen/datings.py

@@ -18,7 +18,7 @@
 logger = config.getLogger(__name__)
 
 
-def parse_datestr(datestr: str) -> date:
+def parse_datestr(datestr: str) -> Optional[date]:
     """
     Parses a date str like 1799-01-01 to a date.
 
@@ -80,7 +80,7 @@ def add_to_graph(self, G: nx.MultiDiGraph):
         ...
 
 
-def _firstattr(object, *args: Tuple[str]) -> Optional[Tuple[str, Any]]:
+def _firstattr(object: Any, *args: str) -> Tuple[Optional[str], Optional[Any]]:
     """
     Returns the first of the given attributes together with its value. E.g., when an object o has the attributes bar=1
     and baz=2 and none else and you call ``_firstattr(o, 'foo', 'bar', 'baz')`` it will return ``'bar', 1``
@@ -215,7 +215,7 @@ def add_to_graph(self, G: nx.MultiDiGraph) -> None:
                              ignore=self.ignore)
 
 
-def _parse_file(filename: str) -> Generator[_AbstractDating, None, None]:
+def _parse_file(filename: Union[Path, str]) -> Generator[_AbstractDating, None, None]:
     """
     Parses the given macrogenesis XML file and returns the datings from there.
     Args:

src/macrogen/fes.py

@@ -59,6 +59,7 @@ def _exhaust_sinks(self, sink: bool = True):
         """
         sink_method = self.graph.out_degree if sink else self.graph.in_degree
         while True:
+            # noinspection PyCallingNonCallable
             sinks = [u for (u, d) in sink_method() if d == 0]
             if sinks:
                 yield from sinks
@@ -140,6 +141,7 @@ def solve(self) -> List[Tuple[V, V]]:
             for v in self._exhaust_sources():
                 self.to_start(v)
             if self.graph:
+                # noinspection PyCallingNonCallable
                 u = max(self.graph.nodes, key=lambda v: self.graph.out_degree(v, weight='weight')
                                                         - self.graph.in_degree(v, weight='weight'))
                 self.to_start(u)

tests/test_fes.py

@@ -44,7 +44,7 @@ def test_eades_ff():
     result = Eades(g).solve()
     assert set(result) == {(2, 3)}
 
-    solver = Eades(g, [(4,5), (2, 3)])
+    solver = Eades(g, [(4, 5), (2, 3)])
     result = set(solver.solve())
     assert set(result) == {(3, 2)}