nbforager 0.8.8__tar.gz → 0.8.9__tar.gz

{nbforager-0.8.8 → nbforager-0.8.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: nbforager
-Version: 0.8.8
+Version: 0.8.9
 Summary: Python package designed to assist in working with the Netbox REST API. The filter parameters are identical to those in the Web UI filter form. It replaces brief data with full information, and Netbox objects are represented as a recursive multidimensional dictionary.
 License: Apache-2.0
 Keywords: netbox
@@ -22,7 +22,6 @@ Requires-Dist: requests (>=2,<3)
 Requires-Dist: tabulate (>=0.9,<0.10)
 Requires-Dist: vhelpers (>=0.3)
 Project-URL: Bug Tracker, https://github.com/vladimirs-git/nbforager/issues
-Project-URL: Download URL, https://github.com/vladimirs-git/nbforager/archive/refs/tags/0.8.8.tar.gz
 Project-URL: homepage, https://github.com/vladimirs-git/nbforager
 Project-URL: repository, https://github.com/vladimirs-git/nbforager
 Description-Content-Type: text/x-rst

{nbforager-0.8.8 → nbforager-0.8.9}/nbforager/foragers/joiner.py

@@ -6,7 +6,7 @@ from vhelpers import vlist
 
 from nbforager import helpers as h
 from nbforager.api.base_c import BaseC
-from nbforager.foragers.ipv4 import IPv4
+from netports import IPv4
 from nbforager.nb_tree import NbTree
 from nbforager.parser import nb_parser
 from nbforager.parser.nb_value import NbValue

{nbforager-0.8.8 → nbforager-0.8.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "nbforager"
-version = "0.8.8"
+version = "0.8.9"
 description = "Python package designed to assist in working with the Netbox REST API. The filter parameters are identical to those in the Web UI filter form. It replaces brief data with full information, and Netbox objects are represented as a recursive multidimensional dictionary."
 authors = ["Vladimirs Prusakovs <vladimir.prusakovs@gmail.com>"]
 readme = "README.rst"
@@ -19,7 +19,6 @@ classifiers = [
 homepage = "https://github.com/vladimirs-git/nbforager"
 repository = "https://github.com/vladimirs-git/nbforager"
 "Bug Tracker" = "https://github.com/vladimirs-git/nbforager/issues"
-"Download URL" = "https://github.com/vladimirs-git/nbforager/archive/refs/tags/0.8.8.tar.gz"
 
 [tool.poetry.dependencies]
 python = "^3.11"

nbforager-0.8.8/nbforager/foragers/ipv4.py

@@ -1,85 +0,0 @@
-"""IPv4 address representation in CIDR notation."""
-
-from __future__ import annotations
-
-from functools import total_ordering
-from ipaddress import IPv4Interface, IPv4Network
-
-
-@total_ordering
-class IPv4:
-    """IPv4 address representation in CIDR notation."""
-
-    def __init__(self, cidr: str, strict: bool = False):
-        """Initialize IPv4 object with the given CIDR notation.
-
-        :param cidr: A string like '192.168.1.1/24'
-        :param strict: If True, IP must be valid network address (not host address).
-        :raises ValueError: If strict is True and a network address is not supplied.
-        """
-        if strict:
-            IPv4Network(cidr, strict=strict)
-        self.interface = IPv4Interface(cidr)
-
-    def __repr__(self):
-        """Representation of the object."""
-        return f"IPv4('{self.cidr}')"
-
-    def __str__(self):
-        """String representation
-
-        :return: IPv4 address with prefixlen, A.B.C.D/LEN.
-        """
-        return self.cidr
-
-    def __hash__(self) -> int:
-        """Hash value of the object."""
-        return hash(self.interface.network)
-
-    def __eq__(self, other: IPv4, /) -> bool:
-        """Check if two objects are equal.
-
-        :param other: Another object to compare.
-        :return: True if objects are equal, False otherwise.
-        """
-        if not isinstance(other, IPv4):
-            return False
-        return self.interface == other.interface
-
-    def __lt__(self, other: IPv4, /) -> bool:
-        """Compare two objects.
-
-        :param other: Another object to compare with.
-        """
-        if not isinstance(other, IPv4):
-            return False
-        return self.interface < other.interface
-
-    def __contains__(self, other: IPv4, /) -> bool:
-        """Check if all IPs in the other subnet are part of this network."""
-        return other.interface.network.subnet_of(self.interface.network)
-
-    @property
-    def ip(self) -> str:
-        """IPv4 address without prefixlen, A.B.C.D."""
-        return str(self.interface.ip)
-
-    @property
-    def cidr(self) -> str:
-        """IPv4 address with prefixlen, A.B.C.D/LEN."""
-        return str(self.interface.with_prefixlen)
-
-    @property
-    def is_private(self) -> bool:
-        """IPv4 address is private."""
-        return bool(self.interface.ip.is_private)
-
-    @property
-    def net(self) -> str:
-        """IPv4 network with prefixlen, A.B.C.D/LEN."""
-        return str(self.interface.network)
-
-    @property
-    def prefixlen(self) -> int:
-        """IPv4 network with prefixlen, A.B.C.D/LEN."""
-        return self.interface.network.prefixlen