From be9d603bf89d71e5f4f53ef59ef216aaba83805f Mon Sep 17 00:00:00 2001 From: Pavel Patsey Date: Sun, 26 Jan 2025 18:58:17 +0300 Subject: [PATCH] add individual exceptions --- vpn_manager/cidr4_merge/__init__.py | 2 ++ vpn_manager/cidr4_merge/cidr4_merger.py | 12 +++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 vpn_manager/cidr4_merge/__init__.py diff --git a/vpn_manager/cidr4_merge/__init__.py b/vpn_manager/cidr4_merge/__init__.py new file mode 100644 index 0000000..f8176bd --- /dev/null +++ b/vpn_manager/cidr4_merge/__init__.py @@ -0,0 +1,2 @@ +class Cidr4MergerError(Exception): + pass diff --git a/vpn_manager/cidr4_merge/cidr4_merger.py b/vpn_manager/cidr4_merge/cidr4_merger.py index b551ff8..9fda443 100644 --- a/vpn_manager/cidr4_merge/cidr4_merger.py +++ b/vpn_manager/cidr4_merge/cidr4_merger.py @@ -1,11 +1,17 @@ import cProfile +from vpn_manager.cidr4_merge import Cidr4MergerError + from .util import cidr4_to_node, get_data, make_cidr4 Node = tuple[int, int] -class Cidr4MergerError(Exception): +class EnsureNoSubnetError(Cidr4MergerError): + pass + + +class EnsureNoNeighborsError(Cidr4MergerError): pass @@ -20,7 +26,7 @@ def find_subnets(nodes: list[Node]) -> list[tuple[Node, Node]]: def ensure_no_subnets(nodes: list[Node]): if subnets := find_subnets(nodes): - raise Cidr4MergerError(f"There are subnets! {subnets=}") + raise EnsureNoSubnetError(f"There are subnets! {subnets=}") def find_neighbors(nodes: list[Node]) -> list[tuple[int, Node, Node]]: @@ -34,7 +40,7 @@ def find_neighbors(nodes: list[Node]) -> list[tuple[int, Node, Node]]: def ensure_no_neighbors(nodes: list[Node]): if neighbors := find_neighbors(nodes): - raise Cidr4MergerError(f"There are neighbors! {neighbors=}") + raise EnsureNoNeighborsError(f"There are neighbors! {neighbors=}") def merge_nodes(a: Node, b: Node) -> tuple[Node, int]: