diff --git a/squinnondation/hazel.py b/squinnondation/hazel.py index ea6843f..e85c281 100644 --- a/squinnondation/hazel.py +++ b/squinnondation/hazel.py @@ -1,11 +1,15 @@ # Copyright (C) 2020 by eichhornchen, ÿnérant # SPDX-License-Identifier: GPL-3.0-or-later -from typing import Any, List, Optional, Tuple +from typing import Any, Tuple from ipaddress import IPv6Address -from enum import Enum -from messages import Packet, TLV, HelloTLV, NeighbourTLV, Pad1TLV, PadNTLV, DataTLV, AckTLV, GoAwayTLV, WarningTLV from threading import Thread +import curses +import re +import socket + +from .messages import Packet, DataTLV + class Hazelnut: """ diff --git a/squinnondation/messages.py b/squinnondation/messages.py index 9fabdc2..67f1f52 100644 --- a/squinnondation/messages.py +++ b/squinnondation/messages.py @@ -1,9 +1,11 @@ # Copyright (C) 2020 by eichhornchen, ÿnérant # SPDX-License-Identifier: GPL-3.0-or-later -from typing import Any, List, Optional, Tuple +from typing import Any, List, Optional from ipaddress import IPv6Address from enum import Enum +import sys + class TLV: """ diff --git a/squinnondation/squinnondation.py b/squinnondation/squinnondation.py index 1539fd4..b80d8c3 100644 --- a/squinnondation/squinnondation.py +++ b/squinnondation/squinnondation.py @@ -2,17 +2,11 @@ # SPDX-License-Identifier: GPL-3.0-or-later import curses -import re -import socket -import sys from argparse import ArgumentParser -from enum import Enum -from ipaddress import IPv6Address -from threading import Thread -from typing import Any, List, Optional, Tuple +from typing import Any -from squinnondation.term_manager import TermManager -from hazel import Hazelnut, Squirrel +from .hazel import Hazelnut, Squirrel, Worm +from .term_manager import TermManager class Squinnondation: