Merge remote-tracking branch 'origin/dev' into col20

PyFunceble/checker/availability/base.py

@@ -76,7 +76,6 @@
 from PyFunceble.checker.syntax.ip import IPSyntaxChecker
 from PyFunceble.checker.syntax.url import URLSyntaxChecker
 from PyFunceble.converter.url2netloc import Url2Netloc
-from PyFunceble.helpers.regex import RegexHelper
 from PyFunceble.query.dns.query_tool import DNSQueryTool
 from PyFunceble.query.http_status_code import HTTPStatusCode
 from PyFunceble.query.netinfo.address import AddressInfo
@@ -919,12 +918,7 @@ def try_to_query_status_from_http_status_code(
         if from_domain_test and self.status.url_syntax:
             return self
 
-        if not self.status.url_syntax and not RegexHelper("[^a-z0-9._]").match(
-            self.idna_subject, return_match=False
-        ):
-            # The regex is there because while testing for domain, sometime we
-            # may see something like mailto:[email protected]
-
+        if not self.status.url_syntax and not self.idna_subject.startswith("http"):
             self.http_status_code_query_tool.set_subject(
                 f"http://{self.idna_subject}:80"
             )

PyFunceble/checker/availability/domain.py

@@ -50,7 +50,6 @@
     limitations under the License.
 """
 
-
 import PyFunceble.facility
 import PyFunceble.factory
 import PyFunceble.storage

PyFunceble/checker/availability/extras/base.py

@@ -50,7 +50,6 @@
     limitations under the License.
 """
 
-
 import functools
 import socket
 from typing import Callable, Dict, List, Optional, Union
@@ -423,7 +422,7 @@ def switch_to_down_if_status_code(
         of the given one.
         """
 
-        if not isinstance(status_code, (list, tuple)):
+        if not isinstance(status_code, (list, tuple, set)):
             status_code = [status_code]
 
         if any(self.status.http_status_code == x for x in status_code):

PyFunceble/checker/availability/extras/rules.py

@@ -78,7 +78,7 @@ class ExtraRulesHandler(ExtraRuleHandlerBase):
     def __init__(self, status: Optional[AvailabilityCheckerStatus] = None) -> None:
         self.regex_active2inactive = {
             r"\.000webhostapp\.com": [
-                (self.switch_to_down_if_status_code, 410),
+                (self.switch_to_down_if_status_code, {410, 424}),
             ],
             r"\.24\.eu$": [(self.switch_to_down_if_status_code, 503)],
             r"\.altervista\.org$": [(self.switch_to_down_if_status_code, 403)],

PyFunceble/checker/availability/ip.py

@@ -50,7 +50,6 @@
     limitations under the License.
 """
 
-
 import PyFunceble.facility
 import PyFunceble.factory
 import PyFunceble.storage

PyFunceble/checker/availability/url.py

@@ -50,7 +50,6 @@
     limitations under the License.
 """
 
-
 import PyFunceble.facility
 import PyFunceble.factory
 import PyFunceble.storage

PyFunceble/checker/reputation/base.py

@@ -50,7 +50,6 @@
     limitations under the License.
 """
 
-
 from typing import List, Optional
 
 from sqlalchemy.orm import Session

PyFunceble/checker/reputation/domain.py

@@ -50,7 +50,6 @@
     limitations under the License.
 """
 
-
 from typing import List, Optional
 
 from PyFunceble.checker.reputation.base import ReputationCheckerBase

PyFunceble/checker/reputation/ip.py

@@ -50,7 +50,6 @@
     limitations under the License.
 """
 
-
 from typing import List, Optional
 
 from PyFunceble.checker.reputation.base import ReputationCheckerBase

PyFunceble/checker/reputation/url.py

@@ -50,7 +50,6 @@
     limitations under the License.
 """
 
-
 from typing import List, Optional
 
 from PyFunceble.checker.reputation.base import ReputationCheckerBase

PyFunceble/checker/syntax/second_lvl_domain.py

@@ -65,8 +65,12 @@ class SecondLvlDomainSyntaxChecker(DomainSyntaxCheckerBase):
     """
 
     # pylint: disable=line-too-long
-    REGEX_VALID_DOMAIN: str = r"^(?=.{0,253}$)(([a-z0-9][a-z0-9-]{0,61}[a-z0-9]|[a-z0-9])\.)+((?=.*[^0-9])([a-z0-9][a-z0-9-]{0,61}[a-z0-9](?:\.)?|[a-z0-9](?:\.)?))$"
-    REGEX_VALID_RELAXED_DOMAIN: str = r"^(?=.{0,253}$)(([a-z0-9][a-z0-9_-]{0,61}[a-z0-9_-]|[a-z0-9])\.)+((?=.*[^0-9])([a-z0-9][a-z0-9-]{0,61}[a-z0-9](?:\.)?|[a-z0-9](?:\.)?))$"
+    REGEX_VALID_DOMAIN: str = (
+        r"^(?=.{0,253}$)(([a-z0-9][a-z0-9-]{0,61}[a-z0-9]|[a-z0-9])\.)+((?=.*[^0-9])([a-z0-9][a-z0-9-]{0,61}[a-z0-9](?:\.)?|[a-z0-9](?:\.)?))$"
+    )
+    REGEX_VALID_RELAXED_DOMAIN: str = (
+        r"^(?=.{0,253}$)(([a-z0-9][a-z0-9_-]{0,61}[a-z0-9_-]|[a-z0-9])\.)+((?=.*[^0-9])([a-z0-9][a-z0-9-]{0,61}[a-z0-9](?:\.)?|[a-z0-9](?:\.)?))$"
+    )
 
     last_point_index: Optional[int] = None
     """

PyFunceble/checker/syntax/status.py

@@ -50,6 +50,7 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 """
+
 import dataclasses
 from typing import Optional
 

PyFunceble/checker/syntax/subdomain.py

@@ -63,7 +63,9 @@ class SubDomainSyntaxChecker(DomainSyntaxCheckerBase):
     """
 
     # pylint: disable=line-too-long
-    REGEX_VALID_SUBDOMAIN: str = r"^(?=.{0,253}$)(([a-z0-9_][a-z0-9-_]{0,61}[a-z0-9_-]|[a-z0-9])\.)+((?=.*)([a-z0-9][a-z0-9-]{0,61}[a-z0-9](?:\.)?|[a-z0-9](?:\.)?))$"
+    REGEX_VALID_SUBDOMAIN: str = (
+        r"^(?=.{0,253}$)(([a-z0-9_][a-z0-9-_]{0,61}[a-z0-9_-]|[a-z0-9])\.)+((?=.*)([a-z0-9][a-z0-9-]{0,61}[a-z0-9](?:\.)?|[a-z0-9](?:\.)?))$"
+    )
 
     @DomainSyntaxCheckerBase.ensure_subject_is_given
     def is_valid(self) -> bool:

PyFunceble/checker/syntax/url.py

@@ -50,7 +50,6 @@
     limitations under the License.
 """
 
-
 import urllib.parse
 from typing import Optional
 

PyFunceble/cli/credential_loader.py

@@ -266,9 +266,9 @@ def start(self, *, ignore_cli: bool = True) -> "CredentialLoader":
             # We directly share the credential object into the DBSession object.
             # This will let us use the DBSession without having to think about
             # any other headache.
-            self.credential = (
-                PyFunceble.cli.factory.DBSession.credential
-            ) = self.DB_TYPE2OBJ[self.db_type]()
+            self.credential = PyFunceble.cli.factory.DBSession.credential = (
+                self.DB_TYPE2OBJ[self.db_type]()
+            )
 
             env_var_helper = EnvironmentVariableHelper(
                 env_file_path=self.credential.get_dot_env_file()

PyFunceble/cli/file_preloader.py

@@ -481,9 +481,9 @@ def start(self, print_dots: bool = False) -> "FilePreloader":
                 raise exception
 
         if not broken:
-            self.__description[self.__matching_index][
-                "previous_hash"
-            ] = self.__description[self.__matching_index]["hash"]
+            self.__description[self.__matching_index]["previous_hash"] = (
+                self.__description[self.__matching_index]["hash"]
+            )
 
         self.__save_description()
 

PyFunceble/cli/migrators/base.py

@@ -50,7 +50,6 @@
     limitations under the License.
 """
 
-
 from typing import Optional
 
 from sqlalchemy.orm import Session

PyFunceble/cli/processes/workers/base.py

@@ -115,9 +115,9 @@ def __init__(
         self.input_queue = self._params["input_queue"] = input_queue
         self.output_queue = self._params["output_queue"] = output_queue
 
-        self.continuous_integration = self._params[
-            "continuous_integration"
-        ] = continuous_integration
+        self.continuous_integration = self._params["continuous_integration"] = (
+            continuous_integration
+        )
 
         self.global_exit_event = self._params["global_exit_event"] = global_exit_event
         self.exit_it = multiprocessing.Event()

PyFunceble/cli/scripts/production.py

@@ -50,7 +50,6 @@
     limitations under the License.
 """
 
-
 import copy
 import functools
 import os
@@ -516,9 +515,9 @@ def update_version_file(self) -> "ProductionPrep":
             if to_append not in self.version_file_content["deprecated"]:
                 self.version_file_content["deprecated"].append(to_append)
 
-        self.version_file_content[
-            "current_version"
-        ] = PyFunceble.storage.PROJECT_VERSION
+        self.version_file_content["current_version"] = (
+            PyFunceble.storage.PROJECT_VERSION
+        )
 
         self.dict_helper.set_subject(self.version_file_content).to_yaml_file(
             self.VERSION_FILE_PATH

PyFunceble/cli/storage.py

@@ -253,9 +253,11 @@
 }
 
 OUTPUTS: Optional[Box] = Box(
-    Merge(UNIX_OUTPUTS).into(UNIVERSAL_OUTPUTS)
-    if PlatformUtility.is_unix()
-    else Merge(WIN_OUTPUTS).into(UNIVERSAL_OUTPUTS),
+    (
+        Merge(UNIX_OUTPUTS).into(UNIVERSAL_OUTPUTS)
+        if PlatformUtility.is_unix()
+        else Merge(WIN_OUTPUTS).into(UNIVERSAL_OUTPUTS)
+    ),
     frozen_box=True,
 )
 

PyFunceble/cli/utils/testing.py

@@ -232,9 +232,7 @@ def get_subjects_from_line(
     if cidr2subject is None:
         cidr2subject = CIDR2Subject()
 
-    adblock_inputline2subject.aggressive = (
-        wildcard2subject.aggressive
-    ) = (
+    adblock_inputline2subject.aggressive = wildcard2subject.aggressive = (
         rpz_inputline2subject.aggressive
     ) = inputline2subject.aggressive = url2netloc.aggressive = bool(
         PyFunceble.storage.CONFIGURATION.cli_decoding.aggressive

PyFunceble/data/alembic/mysql/versions/35c79626ecb9_fix_some_columns.py

@@ -5,6 +5,7 @@
 Create Date: 2020-08-21 11:42:07.044762
 
 """
+
 from alembic import op
 from sqlalchemy.exc import OperationalError
 

PyFunceble/data/alembic/mysql/versions/3a4c55a9320d_add_continue_table.py

@@ -5,6 +5,7 @@
 Create Date: 2020-12-13 22:52:56.968513
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 

PyFunceble/data/alembic/mysql/versions/3d6f4a33cdb2_add_inactive_table.py

@@ -5,6 +5,7 @@
 Create Date: 2020-12-13 19:45:41.893657
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 

PyFunceble/data/alembic/mysql/versions/45713fea8097_deletion_uneeded_columns_from_whois_.py

@@ -5,6 +5,7 @@
 Create Date: 2020-12-07 12:36:04.818466
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 from sqlalchemy.dialects import mysql

PyFunceble/data/alembic/mysql/versions/459a0d7b8f09_add_idna_subject_column_into_whois.py

@@ -5,6 +5,7 @@
 Create Date: 2020-12-07 12:37:52.018637
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 

PyFunceble/data/alembic/mysql/versions/6f4729deaf03_delete_inactive_source_column.py

@@ -5,6 +5,7 @@
 Create Date: 2021-02-13 12:21:00.493002
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 from sqlalchemy.dialects import mysql

PyFunceble/data/alembic/mysql/versions/7bcf7fa64ba1_rename_created_to_created_at_and.py

@@ -5,6 +5,7 @@
 Create Date: 2020-12-08 17:34:59.349943
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 from sqlalchemy.dialects import mysql

PyFunceble/data/alembic/mysql/versions/83ada95132bf_delete_the_file_table.py

@@ -5,6 +5,7 @@
 Create Date: 2020-12-07 12:49:48.797794
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 from sqlalchemy.dialects import mysql

PyFunceble/data/alembic/mysql/versions/912bbcb77a6c_add_registrar_column.py

@@ -5,6 +5,7 @@
 Create Date: 2021-12-04 23:52:11.861732
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 

PyFunceble/data/alembic/mysql/versions/95dc17ddd729_introduction_of_the_session_id_column.py

@@ -5,6 +5,7 @@
 Create Date: 2020-12-23 02:26:21.647125
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 

PyFunceble/data/alembic/mysql/versions/ade87195b0a0_base.py

@@ -5,6 +5,7 @@
 Create Date: 2020-08-15 20:12:26.768419
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 

PyFunceble/data/alembic/mysql/versions/bef7bcaac3f2_make_id_a_bigint.py

@@ -5,6 +5,7 @@
 Create Date: 2020-12-16 19:09:41.212679
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 from sqlalchemy.dialects import mysql

PyFunceble/data/alembic/mysql/versions/d8893cd406db_allow_whois_record_to_be_empty_null.py

@@ -5,6 +5,7 @@
 Create Date: 2020-08-22 17:27:52.087506
 
 """
+
 from alembic import op
 from sqlalchemy.dialects import mysql
 

PyFunceble/data/alembic/mysql/versions/e04e8301d1a2_deletion_of_the_mined_table.py

@@ -5,6 +5,7 @@
 Create Date: 2020-12-07 12:33:43.650514
 
 """
+
 import sqlalchemy as sa
 from alembic import op
 from sqlalchemy.dialects import mysql

PyFunceble/data/alembic/postgresql/versions/a32ac5d66eee_initial_version.py

@@ -5,6 +5,7 @@
 Create Date: 2022-12-28 07:20:50.310072
 
 """
+
 import sqlalchemy as sa
 from alembic import op