PyFunceble-dev 4.3.0a21__py3-none-any.whl → 4.3.0a24__py3-none-any.whl

PyFunceble/checker/availability/base.py

@@ -58,7 +58,6 @@ from typing import Dict, List, Optional
 
 from sqlalchemy.orm import Session
 
-import PyFunceble.checker.utils.whois
 import PyFunceble.facility
 import PyFunceble.storage
 from PyFunceble.checker.availability.extras.base import ExtraRuleHandlerBase
@@ -75,6 +74,7 @@ from PyFunceble.checker.base import CheckerBase
 from PyFunceble.checker.syntax.domain import DomainSyntaxChecker
 from PyFunceble.checker.syntax.ip import IPSyntaxChecker
 from PyFunceble.checker.syntax.url import URLSyntaxChecker
+from PyFunceble.checker.utils.whois import get_whois_dataset_object
 from PyFunceble.converter.url2netloc import Url2Netloc
 from PyFunceble.query.dns.query_tool import DNSQueryTool
 from PyFunceble.query.http_status_code import HTTPStatusCode
@@ -511,8 +511,11 @@ class AvailabilityCheckerBase(CheckerBase):
         self.ip_syntax_checker.subject = self.idna_subject
         self.url_syntax_checker.subject = self.idna_subject
 
-        self.status = AvailabilityCheckerStatus()
-        self.status.params = self.params
+        if self.status.subject_kind is None:
+            self.status = AvailabilityCheckerStatus()
+            self.params = AvailabilityCheckerParams()
+            self.status.params = self.params
+
         self.status.dns_lookup_record = self.dns_query_tool.lookup_record
         self.status.whois_lookup_record = self.whois_query_tool.lookup_record
 
@@ -758,9 +761,7 @@ class AvailabilityCheckerBase(CheckerBase):
         if (
             PyFunceble.facility.ConfigLoader.is_already_loaded() and self.use_whois_db
         ):  # pragma: no cover ## Not interesting enough to spend time on it.
-            whois_object = PyFunceble.checker.utils.whois.get_whois_dataset_object(
-                db_session=self.db_session
-            )
+            whois_object = get_whois_dataset_object(db_session=self.db_session)
             known_record = whois_object[self.subject]
 
             if known_record and not isinstance(known_record, dict):

PyFunceble/checker/availability/domain.py

@@ -53,6 +53,8 @@ License:
 import PyFunceble.facility
 import PyFunceble.storage
 from PyFunceble.checker.availability.base import AvailabilityCheckerBase
+from PyFunceble.checker.availability.params import AvailabilityCheckerParams
+from PyFunceble.checker.availability.status import AvailabilityCheckerStatus
 from PyFunceble.checker.reputation.domain import DomainReputationChecker
 
 
@@ -87,6 +89,22 @@ class DomainAvailabilityChecker(AvailabilityCheckerBase):
         WHOIS datasets.
     """
 
+    def subject_propagator(self) -> "DomainAvailabilityChecker":
+        """
+        Propagate the currently set subject.
+
+        .. warning::
+            You are not invited to run this method directly.
+        """
+
+        self.status = AvailabilityCheckerStatus()
+        self.params = AvailabilityCheckerParams()
+        self.status.params = self.params
+
+        self.status.subject_kind = "domain"
+
+        return super().subject_propagator()
+
     def try_to_query_status_from_reputation(self) -> "DomainAvailabilityChecker":
         """
         Tries to query the status from the reputation lookup.

PyFunceble/checker/availability/extras/base.py

@@ -67,7 +67,7 @@ class ExtraRuleHandlerBase:
     """
     Provides the base of all extra rules handler.
 
-    :param statatus:
+    :param status:
         The previously gathered status.
     :type status:
         :class:`~PyFunceble.checker.availability.status.AvailabilityCheckerStatus`
@@ -167,7 +167,7 @@ class ExtraRuleHandlerBase:
         Provides a viable request URL.
         """
 
-        if any(self.status.idna_subject.startswith(x) for x in ("http:", "https:")):
+        if self.status.idna_subject.startswith(("http:", "https:")):
             return self.status.idna_subject
         return f"http://{self.status.idna_subject}:80"
 
@@ -177,7 +177,7 @@ class ExtraRuleHandlerBase:
         Provides a viable request URL that default to an HTTPS URL.
         """
 
-        if any(self.status.idna_subject.startswith(x) for x in ("http:", "https:")):
+        if self.status.idna_subject.startswith(("http:", "https:")):
             return self.status.idna_subject
         return f"https://{self.status.idna_subject}:443"
 
@@ -226,7 +226,7 @@ class ExtraRuleHandlerBase:
         Do a request and store its response into the `req` attribute.
 
         :param bool allow_redirects:
-            Whether we shoold follow the redirection - or not.
+            Whether we should follow the redirection - or not.
         """
 
         self.req = self.requester.get(self.req_url, allow_redirects=allow_redirects)

PyFunceble/checker/availability/extras/dns.py

@@ -132,7 +132,7 @@ class DNSRulesHandler(ExtraRuleHandlerBase):
             if not self.regex_helper.set_regex(regex).match(
                 self.status.netloc, return_match=False
             ):
-                break
+                continue
 
             for ruler, params in rulesets:
                 if self.status.status_after_extra_rules:

PyFunceble/checker/availability/extras/etoxic.py

@@ -64,7 +64,7 @@ class EToxicHandler(ExtraRuleHandlerBase):
         :class:`~PyFunceble.checker.availability.status.AvailabilityCheckerStatus`
     """
 
-    MATCHES = [
+    MATCHES = (
         ".0wn0.com",
         ".123.st",
         ".1forum.biz",
@@ -282,7 +282,7 @@ class EToxicHandler(ExtraRuleHandlerBase):
         ".yoo7.com",
         ".ze-43eme.com",
         ".zxr7team.com",
-    ]
+    )
 
     @ExtraRuleHandlerBase.ensure_status_is_given
     @ExtraRuleHandlerBase.setup_status_before
@@ -294,7 +294,7 @@ class EToxicHandler(ExtraRuleHandlerBase):
         )
 
         if self.status.status_before_extra_rules == PyFunceble.storage.STATUS.up:
-            if any(self.status.netloc.endswith(x) for x in self.MATCHES):
+            if self.status.netloc.endswith(self.MATCHES):
                 self.do_on_header_match(
                     self.req_url,
                     matches={"location": [f"/{self.status.netloc}", "/search/"]},

PyFunceble/checker/availability/extras/parked.py

@@ -65,6 +65,25 @@ class ParkedRulesHandler(ExtraRuleHandlerBase):
         :class:`~PyFunceble.checker.availability.status.AvailabilityCheckerStatus`
     """
 
+    PARKED_CONTENT_PATTERNS = (
+        'class="parked-domains',
+        "buy-domain",
+        "this domain name is parked",
+        "this domain is parked",
+        "interested in this domain",
+        "really cool domain parked",
+        "domain is for sale",
+        '_trackpageview("/parked/[% parked_type %]/',
+        "| parked domain",
+        "parked banner",
+        "contact with domain owner",
+        "web page is parked",
+        "buy or lease this domain",
+        "parked domain name on ",
+        "it is currently parked by the owner",
+        "parked page for",
+    )
+
     def _switch_down_by_cookie(self) -> "ParkedRulesHandler":
         """
         Tries to switch the status to inactive if some special cookies where found.
@@ -75,31 +94,14 @@ class ParkedRulesHandler(ExtraRuleHandlerBase):
 
         return self
 
-    def _swith_down_by_content(self) -> "ParkedRulesHandler":
+    def _switch_down_by_content(self) -> "ParkedRulesHandler":
         """
         Tries to switch the status to inactive if some relative content were found.
         """
 
         content = self.req.text.lower()
 
-        if (  # pylint: disable=too-many-boolean-expressions
-            'class="parked-domains' in content
-            or "buy-domain" in content
-            or "this domain name is parked" in content
-            or "this domain is parked" in content
-            or "interested in this domain" in content
-            or "really cool domain parked" in content
-            or "domain is for sale" in content
-            or '_trackpageview("/parked/[% parked_type %]/' in content
-            or "| parked domain" in content
-            or "parked banner" in content
-            or "contact with domain owner" in content
-            or "web page is parked" in content
-            or "buy or lease this domain" in content
-            or "parked domain name on " in content
-            or "it is currently parked by the owner" in content
-            or "parked page for" in content
-        ):
+        if any(x in content for x in self.PARKED_CONTENT_PATTERNS):
             self.switch_to_down()
 
         return self
@@ -120,7 +122,7 @@ class ParkedRulesHandler(ExtraRuleHandlerBase):
                 self._switch_down_by_cookie()
 
             if not self.status.status_after_extra_rules:
-                self._swith_down_by_content()
+                self._switch_down_by_content()
 
             PyFunceble.facility.Logger.info(
                 "Finished to check %r against our own set of parked rules.",

PyFunceble/checker/availability/extras/rules.py

@@ -58,7 +58,6 @@ import PyFunceble.facility
 import PyFunceble.storage
 from PyFunceble.checker.availability.extras.base import ExtraRuleHandlerBase
 from PyFunceble.checker.availability.status import AvailabilityCheckerStatus
-from PyFunceble.helpers.regex import RegexHelper
 
 
 class ExtraRulesHandler(ExtraRuleHandlerBase):
@@ -106,7 +105,7 @@ class ExtraRulesHandler(ExtraRuleHandlerBase):
             r"\.translate\.goog$": [(self.switch_to_down_if_status_code, 403)],
             r"\.tumblr\.com$": [(self.switch_to_down_if_status_code, 404)],
             r"\.vercel\.app$": [
-                (self.switch_to_down_if_status_code, "451"),
+                (self.switch_to_down_if_status_code, 451),
                 self.handle_vercel_dot_app,
             ],
             r"\.web\.app$": [(self.switch_to_down_if_status_code, 404)],
@@ -119,8 +118,8 @@ class ExtraRulesHandler(ExtraRuleHandlerBase):
                 (self.switch_to_down_if_status_code, 410),
                 self.handle_wordpress_dot_com,
             ],
-            r"\.weebly\.com$": [(self.switch_to_down_if_status_code, {"404", "406"})],
-            r"\.zzz\.com\.ua$": [(self.switch_to_down_if_status_code, {"402"})],
+            r"\.weebly\.com$": [(self.switch_to_down_if_status_code, {404, 406})],
+            r"\.zzz\.com\.ua$": [(self.switch_to_down_if_status_code, {402})],
         }
 
         if PyFunceble.facility.ConfigLoader.is_already_loaded():
@@ -135,15 +134,12 @@ class ExtraRulesHandler(ExtraRuleHandlerBase):
         Handles the standard regex lookup case.
         """
 
-        regex_helper = RegexHelper()
-
         for (
             regex,
             data,
         ) in regex_registry.items():
-            broken = False
             for element in data:
-                if not regex_helper.set_regex(regex).match(
+                if not self.regex_helper.set_regex(regex).match(
                     self.status.netloc, return_match=False
                 ):
                     continue
@@ -154,11 +150,7 @@ class ExtraRulesHandler(ExtraRuleHandlerBase):
                     element()
 
                 if self.status.status_after_extra_rules:
-                    broken = True
-                    break
-
-            if broken:
-                break
+                    return self
 
         return self
 

PyFunceble/checker/availability/extras/subject_switch.py

@@ -116,10 +116,9 @@ class SubjectSwitchRulesHandler(ExtraRuleHandlerBase):
             if netloc == self.status.idna_subject and netloc not in variations:
                 continue
 
-            if not start_path:
-                if local_path != "/":
-                    continue
-            elif start_path != local_path:
+            if (not start_path and local_path != "/") or (
+                start_path and start_path != local_path
+            ):
                 continue
 
             self.switch_to_down()
@@ -141,7 +140,7 @@ class SubjectSwitchRulesHandler(ExtraRuleHandlerBase):
         )
 
         try:
-            if any(self.status.netloc.startswith(x) for x in ("www.", "m.")):
+            if self.status.netloc.startswith(("www.", "m.")):
                 self.do_request()
 
                 if not self.status.status_after_extra_rules:

PyFunceble/checker/availability/ip.py

@@ -53,6 +53,8 @@ License:
 import PyFunceble.facility
 import PyFunceble.storage
 from PyFunceble.checker.availability.base import AvailabilityCheckerBase
+from PyFunceble.checker.availability.params import AvailabilityCheckerParams
+from PyFunceble.checker.availability.status import AvailabilityCheckerStatus
 from PyFunceble.checker.reputation.ip import IPReputationChecker
 
 
@@ -87,6 +89,22 @@ class IPAvailabilityChecker(AvailabilityCheckerBase):
         WHOIS datasets.
     """
 
+    def subject_propagator(self) -> "IPAvailabilityChecker":
+        """
+        Propagate the currently set subject.
+
+        .. warning::
+            You are not invited to run this method directly.
+        """
+
+        self.status = AvailabilityCheckerStatus()
+        self.params = AvailabilityCheckerParams()
+        self.status.params = self.params
+
+        self.status.subject_kind = "ip"
+
+        return super().subject_propagator()
+
     def try_to_query_status_from_reputation(self) -> "IPAvailabilityChecker":
         """
         Tries to query the status from the reputation lookup.

PyFunceble/checker/availability/params.py

@@ -60,7 +60,7 @@ from PyFunceble.checker.params_base import CheckerParamsBase
 @dataclasses.dataclass
 class AvailabilityCheckerParams(CheckerParamsBase):
     """
-    Provides the description of an availability checker paramaters.
+    Provides the description of an availability checker parameters.
     """
 
     use_extra_rules: Optional[bool] = None

PyFunceble/checker/availability/status.py

@@ -64,7 +64,7 @@ from PyFunceble.query.record.whois import WhoisQueryToolRecord
 @dataclasses.dataclass
 class AvailabilityCheckerStatus(CheckerStatusBase):
     """
-    Provides the description of an availablity status.
+    Provides the description of an availability status.
     """
 
     # pylint: disable=too-many-instance-attributes
@@ -100,9 +100,14 @@ class AvailabilityCheckerStatus(CheckerStatusBase):
     http_status_code: Optional[int] = None
 
     def __post_init__(self) -> None:
-        self.dns_lookup_record = DNSQueryToolRecord()
-        self.whois_lookup_record = WhoisQueryToolRecord()
-        self.params = AvailabilityCheckerParams()
+        if self.dns_lookup_record is None:
+            self.dns_lookup_record = DNSQueryToolRecord()
+
+        if self.whois_lookup_record is None:
+            self.whois_lookup_record = WhoisQueryToolRecord()
+
+        if not hasattr(self, "params") or self.params is None:
+            self.params = AvailabilityCheckerParams()
 
     def is_special(self) -> bool:
         """

PyFunceble/checker/availability/url.py

@@ -53,6 +53,7 @@ License:
 import PyFunceble.facility
 import PyFunceble.storage
 from PyFunceble.checker.availability.base import AvailabilityCheckerBase
+from PyFunceble.checker.availability.params import AvailabilityCheckerParams
 from PyFunceble.checker.availability.status import AvailabilityCheckerStatus
 from PyFunceble.checker.reputation.url import URLReputationChecker
 from PyFunceble.checker.syntax.url import URLSyntaxChecker
@@ -111,7 +112,11 @@ class URLAvailabilityChecker(AvailabilityCheckerBase):
         self.url_syntax_checker.subject = self.idna_subject
 
         self.status = AvailabilityCheckerStatus()
+        self.params = AvailabilityCheckerParams()
         self.status.params = self.params
+
+        self.status.subject_kind = "url"
+
         self.status.dns_lookup_record = self.dns_query_tool.lookup_record
         self.status.whois_lookup_record = None
 
@@ -122,6 +127,7 @@ class URLAvailabilityChecker(AvailabilityCheckerBase):
         ).get_converted()
 
         self.status.status = None
+        self.status.status_source = None
 
         self.query_common_checker()
 

PyFunceble/checker/base.py

@@ -62,6 +62,7 @@ import PyFunceble.storage
 from PyFunceble.checker.params_base import CheckerParamsBase
 from PyFunceble.checker.status_base import CheckerStatusBase
 from PyFunceble.converter.url2netloc import Url2Netloc
+from PyFunceble.helpers.regex import RegexHelper
 from PyFunceble.query.platform import PlatformQueryTool
 
 
@@ -88,6 +89,7 @@ class CheckerBase:
     _idna_subject: Optional[str] = None
 
     url2netloc: Optional[Url2Netloc] = None
+    regex_helper: Optional[RegexHelper] = None
 
     db_session: Optional[Session] = None
     platform_query_tool: Optional[PlatformQueryTool] = None
@@ -105,6 +107,7 @@ class CheckerBase:
     ) -> None:
         self.platform_query_tool = PlatformQueryTool()
         self.url2netloc = Url2Netloc()
+        self.regex_helper = RegexHelper()
 
         if self.params is None:
             self.params = CheckerParamsBase()
@@ -383,6 +386,7 @@ class CheckerBase:
             self.idna_subject
         ).get_converted()
         self.status.status = None
+        self.status.status_source = None
 
         return self.query_common_checker()
 

PyFunceble/checker/reputation/base.py

@@ -130,8 +130,11 @@ class ReputationCheckerBase(CheckerBase):
         self.ip_syntax_checker.subject = self.idna_subject
         self.url_syntax_checker.subject = self.idna_subject
 
-        self.status = ReputationCheckerStatus()
-        self.status.params = self.params
+        if self.status.subject_kind is None:
+            self.status = ReputationCheckerStatus()
+            self.params = ReputationCheckerParams()
+            self.status.params = self.params
+
         self.status.dns_lookup_record = self.dns_query_tool.lookup_record
 
         return super().subject_propagator()

PyFunceble/checker/reputation/domain.py

@@ -53,6 +53,8 @@ License:
 from typing import List, Optional
 
 from PyFunceble.checker.reputation.base import ReputationCheckerBase
+from PyFunceble.checker.reputation.params import ReputationCheckerParams
+from PyFunceble.checker.reputation.status import ReputationCheckerStatus
 
 
 class DomainReputationChecker(ReputationCheckerBase):
@@ -66,5 +68,14 @@ class DomainReputationChecker(ReputationCheckerBase):
         status gathering.
     """
 
+    def subject_propagator(self) -> "DomainReputationChecker":
+        self.status = ReputationCheckerStatus()
+        self.params = ReputationCheckerParams()
+        self.status.params = self.params
+
+        self.status.subject_kind = "domain"
+
+        return super().subject_propagator()
+
     def query_a_record(self) -> Optional[List[str]]:
         return self.dns_query_tool.set_query_record_type("A").query()

PyFunceble/checker/reputation/ip.py

@@ -53,6 +53,8 @@ License:
 from typing import List, Optional
 
 from PyFunceble.checker.reputation.base import ReputationCheckerBase
+from PyFunceble.checker.reputation.params import ReputationCheckerParams
+from PyFunceble.checker.reputation.status import ReputationCheckerStatus
 
 
 class IPReputationChecker(ReputationCheckerBase):
@@ -66,6 +68,15 @@ class IPReputationChecker(ReputationCheckerBase):
         status gathering.
     """
 
+    def subject_propagator(self) -> "IPReputationChecker":
+        self.status = ReputationCheckerStatus()
+        self.params = ReputationCheckerParams()
+        self.status.params = self.params
+
+        self.status.subject_kind = "ip"
+
+        return super().subject_propagator()
+
     def query_a_record(self) -> Optional[List[str]]:
         result = set()
 

PyFunceble/checker/reputation/status.py

@@ -62,7 +62,7 @@ from PyFunceble.query.record.dns import DNSQueryToolRecord
 @dataclasses.dataclass
 class ReputationCheckerStatus(CheckerStatusBase):
     """
-    Provides the description of an availablity status.
+    Provides the description of a reputation status.
     """
 
     # pylint: disable=too-many-instance-attributes

PyFunceble/checker/reputation/url.py

@@ -53,6 +53,8 @@ License:
 from typing import List, Optional
 
 from PyFunceble.checker.reputation.base import ReputationCheckerBase
+from PyFunceble.checker.reputation.params import ReputationCheckerParams
+from PyFunceble.checker.reputation.status import ReputationCheckerStatus
 from PyFunceble.checker.syntax.ip import IPSyntaxChecker
 from PyFunceble.converter.url2netloc import Url2Netloc
 
@@ -68,6 +70,15 @@ class URLReputationChecker(ReputationCheckerBase):
         status gathering.
     """
 
+    def subject_propagator(self) -> "URLReputationChecker":
+        self.status = ReputationCheckerStatus()
+        self.params = ReputationCheckerParams()
+        self.status.params = self.params
+
+        self.status.subject_kind = "url"
+
+        return super().subject_propagator()
+
     def query_a_record(self) -> Optional[List[str]]:
         url_base = Url2Netloc(self.status.subject).get_converted()
 
@@ -96,7 +107,7 @@ class URLReputationChecker(ReputationCheckerBase):
 
             self.dns_query_tool.subject = self.idna_subject
 
-            return result
+            return list(result)
 
         result = (
             self.dns_query_tool.set_query_record_type("A").set_subject(url_base).query()

PyFunceble/checker/syntax/base.py

@@ -94,7 +94,10 @@ class SyntaxCheckerBase(CheckerBase):
             You are not invited to run this method directly.
         """
 
-        self.status = SyntaxCheckerStatus()
+        if self.status.subject_kind is None:
+            self.status = SyntaxCheckerStatus()
+            self.params = SyntaxCheckerParams()
+            self.status.params = self.params
 
         return super().subject_propagator()
 

PyFunceble/checker/syntax/domain.py

@@ -56,6 +56,7 @@ from sqlalchemy.orm import Session
 
 from PyFunceble.checker.syntax.base import SyntaxCheckerBase
 from PyFunceble.checker.syntax.domain_base import DomainSyntaxCheckerBase
+from PyFunceble.checker.syntax.params import SyntaxCheckerParams
 from PyFunceble.checker.syntax.second_lvl_domain import SecondLvlDomainSyntaxChecker
 from PyFunceble.checker.syntax.status import SyntaxCheckerStatus
 from PyFunceble.checker.syntax.subdomain import SubDomainSyntaxChecker
@@ -95,6 +96,9 @@ class DomainSyntaxChecker(DomainSyntaxCheckerBase, SyntaxCheckerBase):
         self.subdomain_checker.subject = self.idna_subject
 
         self.status = SyntaxCheckerStatus()
+        self.params = SyntaxCheckerParams()
+        self.status.params = self.params
+
         self.status.subject_kind = "domain"
 
         return super().subject_propagator()

PyFunceble/checker/syntax/ip.py

@@ -56,6 +56,7 @@ from PyFunceble.checker.base import CheckerBase
 from PyFunceble.checker.syntax.base import SyntaxCheckerBase
 from PyFunceble.checker.syntax.ipv4 import IPv4SyntaxChecker
 from PyFunceble.checker.syntax.ipv6 import IPv6SyntaxChecker
+from PyFunceble.checker.syntax.params import SyntaxCheckerParams
 from PyFunceble.checker.syntax.status import SyntaxCheckerStatus
 
 
@@ -88,6 +89,9 @@ class IPSyntaxChecker(SyntaxCheckerBase):
         self.ipv6_checker.subject = self.idna_subject
 
         self.status = SyntaxCheckerStatus()
+        self.params = SyntaxCheckerParams()
+        self.status.params = self.params
+
         self.status.subject_kind = "ip"
 
         return super().subject_propagator()

PyFunceble/checker/syntax/ipv4.py

@@ -53,7 +53,6 @@ License:
 import ipaddress
 
 from PyFunceble.checker.base import CheckerBase
-from PyFunceble.helpers.regex import RegexHelper
 
 
 class IPv4SyntaxChecker(CheckerBase):
@@ -121,19 +120,17 @@ class IPv4SyntaxChecker(CheckerBase):
         Validate the given subject.
         """
 
-        try:
+        for method in (
+            ipaddress.ip_address,
+            ipaddress.ip_interface,
+            lambda x: ipaddress.ip_network(x, strict=False),
+        ):
             try:
-                return ipaddress.ip_address(self.idna_subject).version == 4
+                return method(self.idna_subject).version == 4
             except ValueError:
-                try:
-                    return ipaddress.ip_interface(self.idna_subject).version == 4
-                except ValueError:
-                    return (
-                        ipaddress.ip_network(self.idna_subject, strict=False).version
-                        == 4
-                    )
-        except ValueError:
-            return False
+                continue
+
+        return False
 
     @CheckerBase.ensure_subject_is_given
     def is_valid_range(self) -> bool:
@@ -163,7 +160,7 @@ class IPv4SyntaxChecker(CheckerBase):
                     or address.is_loopback
                     or address.is_link_local
                     or not address.is_global
-                    or RegexHelper(self._get_regex_reserved_ip()).match(
+                    or self.regex_helper.set_regex(self._get_regex_reserved_ip()).match(
                         self.idna_subject, return_match=False
                     )
                 )

PyFunceble/checker/syntax/ipv6.py

@@ -69,19 +69,17 @@ class IPv6SyntaxChecker(CheckerBase):
         Validate the given subject.
         """
 
-        try:
+        for method in (
+            ipaddress.ip_address,
+            ipaddress.ip_interface,
+            lambda x: ipaddress.ip_network(x, strict=False),
+        ):
             try:
-                return ipaddress.ip_address(self.idna_subject).version == 6
+                return method(self.idna_subject).version == 6
             except ValueError:
-                try:
-                    return ipaddress.ip_interface(self.idna_subject).version == 6
-                except ValueError:
-                    return (
-                        ipaddress.ip_network(self.idna_subject, strict=False).version
-                        == 6
-                    )
-        except ValueError:
-            return False
+                continue
+
+        return False
 
     @CheckerBase.ensure_subject_is_given
     def is_valid_range(self) -> bool: