topotato: crowbar fix typing re. CallableNS

Need to find a better way to do this, but let's get pylint and mypy
clean for the time being.

Signed-off-by: David Lamparter <[email protected]>

topotato/frr/core.py

@@ -21,6 +21,7 @@
 from typing import (
     cast,
     Any,
+    Callable,
     ClassVar,
     Collection,
     Dict,
@@ -56,7 +57,6 @@ def deprecated(fn):  # type: ignore
 )
 from ..pcapng import Context
 from ..network import TopotatoNetwork
-from ..topobase import CallableNS
 from ..control import TargetSection
 from .exceptions import FRRStartupVtyshConfigFail
 
@@ -473,7 +473,7 @@ def __str__(self):
 
 
 # pylint: disable=too-many-ancestors,too-many-instance-attributes
-class FRRRouterNS(TopotatoNetwork.RouterNS, CallableNS):
+class FRRRouterNS(TopotatoNetwork.RouterNS):
     """
     Add a bunch of FRR daemons on top of an (OS-dependent) RouterNS
     """
@@ -490,6 +490,10 @@ class FRRRouterNS(TopotatoNetwork.RouterNS, CallableNS):
     frrconfpath: str
     merged_cfg: str
 
+    # hack to fix CallableNS foo...  really needs some improvement
+    check_call: Callable[..., None]
+    popen: Callable[..., "subprocess.Popen"]
+
     def __init__(
         self,
         instance: TopotatoNetwork,