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

PyFunceble/cli/migrators/mariadb/base.py

@@ -56,8 +56,6 @@ from typing import Any, Generator, Tuple
 from sqlalchemy.sql import text
 
 import PyFunceble.cli.facility
-import PyFunceble.cli.factory
-import PyFunceble.sessions
 from PyFunceble.cli.migrators.db_base import DBMigratorBase
 
 
@@ -72,7 +70,7 @@ class MariaDBMigratorBase(DBMigratorBase):
         Otherwise, apply the given :code:`default`.
         """
 
-        def inner_metdhod(func):
+        def inner_method(func):
             @functools.wraps(func)
             def wrapper(self, *args, **kwargs):
                 if self.authorized:
@@ -81,7 +79,7 @@ class MariaDBMigratorBase(DBMigratorBase):
 
             return wrapper
 
-        return inner_metdhod
+        return inner_method
 
     def get_rows(
         self, statement: str, limit: int = 20

PyFunceble/cli/migrators/mariadb/file_and_status.py

@@ -92,7 +92,7 @@ class FileAndStatusMigrator(MariaDBMigratorBase):
         )
 
         inactive_dataset = PyFunceble.cli.utils.testing.get_inactive_dataset_object()
-        continue_dataset = PyFunceble.cli.utils.testing.get_continue_databaset_object()
+        continue_dataset = PyFunceble.cli.utils.testing.get_continue_dataset_object()
 
         drop_table = True
 

PyFunceble/cli/migrators/mariadb/whois_record_idna_subject.py

@@ -52,9 +52,7 @@ License:
 
 import domain2idna
 
-import PyFunceble.cli.factory
 import PyFunceble.facility
-import PyFunceble.sessions
 from PyFunceble.cli.migrators.mariadb.base import MariaDBMigratorBase
 from PyFunceble.cli.utils.stdout import print_single_line
 from PyFunceble.database.sqlalchemy.all_schemas import WhoisRecord

PyFunceble/cli/processes/migrator.py

@@ -55,7 +55,6 @@ from typing import Optional
 import colorama
 from sqlalchemy.orm import Session
 
-import PyFunceble.checker.utils.whois
 import PyFunceble.cli.utils.stdout
 import PyFunceble.cli.utils.testing
 import PyFunceble.facility

PyFunceble/cli/processes/workers/base.py

@@ -61,7 +61,6 @@ import PyFunceble.cli.facility
 import PyFunceble.cli.factory
 import PyFunceble.ext.process_manager
 import PyFunceble.facility
-import PyFunceble.sessions
 import PyFunceble.storage
 from PyFunceble.query.requests.requester import Requester
 

PyFunceble/cli/processes/workers/chancy_producer.py

@@ -53,7 +53,6 @@ License:
 from typing import Any, Optional, Tuple
 
 import PyFunceble.facility
-import PyFunceble.storage
 from PyFunceble.checker.status_base import CheckerStatusBase
 from PyFunceble.cli.processes.workers.producer import ProducerWorker
 
@@ -81,7 +80,7 @@ class ChancyProducerWorker(ProducerWorker):
 
         if not isinstance(test_dataset, dict):
             PyFunceble.facility.Logger.info(
-                "Skipping because test dataset is not a dictionnary."
+                "Skipping because test dataset is not a dictionary."
             )
             return None
 

PyFunceble/cli/processes/workers/dir_files_sorter.py

@@ -149,26 +149,18 @@ class DireFileSorterWorker(FileSorterWorkerBase):
         # Just for human brain :-)
         directory = consumed["directory"]
 
-        if "remove_duplicates" in consumed:
-            remove_duplicates = consumed["remove_duplicates"]
-        else:
-            remove_duplicates = True
-
-        if "write_header" in consumed:
-            write_header = consumed["write_header"]
-        else:
-            write_header = True
+        remove_duplicates = consumed.get("remove_duplicates", True)
+        write_header = consumed.get("write_header", True)
 
         with concurrent.futures.ThreadPoolExecutor(
             max_workers=PyFunceble.storage.CONFIGURATION.cli_testing.max_workers,
         ) as executor:
-            submitted_list = []
-
-            for file in self.get_files_to_sort(directory):
-                submitted = executor.submit(
+            submitted_list = [
+                executor.submit(
                     self.process_file_sorting, file, remove_duplicates, write_header
                 )
-                submitted_list.append(submitted)
+                for file in self.get_files_to_sort(directory)
+            ]
 
             for submitted in concurrent.futures.as_completed(submitted_list):
                 # Ensure that everything is finished

PyFunceble/cli/processes/workers/file_sorter.py

@@ -103,15 +103,8 @@ class FileSorterWorker(FileSorterWorkerBase):
         # Just for human brain :-)
         file = consumed["file"]
 
-        if "remove_duplicates" in consumed:
-            remove_duplicates = consumed["remove_duplicates"]
-        else:
-            remove_duplicates = True
-
-        if "write_header" in consumed:
-            write_header = consumed["write_header"]
-        else:
-            write_header = True
+        remove_duplicates = consumed.get("remove_duplicates", True)
+        write_header = consumed.get("write_header", True)
 
         self.process_file_sorting(
             file, remove_duplicates=remove_duplicates, write_header=write_header

PyFunceble/cli/processes/workers/migrator.py

@@ -53,7 +53,6 @@ License:
 import traceback
 
 import PyFunceble.facility
-import PyFunceble.storage
 from PyFunceble.cli.processes.workers.base import WorkerBase
 
 

PyFunceble/cli/processes/workers/producer.py

@@ -68,7 +68,7 @@ from PyFunceble.cli.filesystem.status_file import StatusFileGenerator
 from PyFunceble.cli.processes.workers.base import WorkerBase
 from PyFunceble.cli.utils.stdout import get_template_to_use, print_single_line
 from PyFunceble.cli.utils.testing import (
-    get_continue_databaset_object,
+    get_continue_dataset_object,
     get_inactive_dataset_object,
 )
 from PyFunceble.dataset.autocontinue.base import ContinueDatasetBase
@@ -127,9 +127,7 @@ class ProducerWorker(WorkerBase):
         )
         self.whois_dataset = get_whois_dataset_object(db_session=self.db_session)
         self.inactive_dataset = get_inactive_dataset_object(db_session=self.db_session)
-        self.continue_dataset = get_continue_databaset_object(
-            db_session=self.db_session
-        )
+        self.continue_dataset = get_continue_dataset_object(db_session=self.db_session)
         self.status_file_generator = StatusFileGenerator().guess_all_settings()
         self.counter = FilesystemCounter()
         self.registrar_counter = RegistrarCounter()

PyFunceble/cli/processes/workers/tester.py

@@ -89,7 +89,7 @@ class TesterWorker(WorkerBase):
         result = super().perform_external_poweron_checks()
 
         self.continue_dataset = (
-            PyFunceble.cli.utils.testing.get_continue_databaset_object(
+            PyFunceble.cli.utils.testing.get_continue_dataset_object(
                 db_session=self.db_session
             )
         )
@@ -215,8 +215,7 @@ class TesterWorker(WorkerBase):
 
         if not isinstance(consumed, dict):
             PyFunceble.facility.Logger.debug(
-                "Skipping latest dataset because consumed data was not "
-                "a dictionnary."
+                "Skipping latest dataset because consumed data was not a dictionary."
             )
             return None
 

PyFunceble/cli/scripts/iana.py

@@ -143,12 +143,18 @@ class IanaDBGenerator:
     An internal storage map.
     """
 
+    whois_query_tool: Optional[WhoisQueryTool] = None
+    regex_helper: Optional[RegexHelper] = None
+
     def __init__(self, destination: Optional[str] = None) -> None:
         if destination is not None:
             self.destination = destination
         else:
             self.destination = IanaDataset().source_file
 
+        self.whois_query_tool = WhoisQueryTool()
+        self.regex_helper = RegexHelper()
+
     @property
     def destination(self) -> Optional[str]:
         """
@@ -196,11 +202,9 @@ class IanaDBGenerator:
         Given an extension, tries to get or guess its extension.
         """
 
-        whois_query_tool = WhoisQueryTool()
-
         dummy_domain = f"hello.{extension}"
         iana_record = (
-            whois_query_tool.set_server(self.IANA_WHOIS_SERVER)
+            self.whois_query_tool.set_server(self.IANA_WHOIS_SERVER)
             .set_subject(dummy_domain)
             .record
         )
@@ -208,7 +212,7 @@ class IanaDBGenerator:
         if iana_record and "refer" in iana_record:
             regex_referrer = r"(?s)refer\:\s+([a-zA-Z0-9._-]+)\n"
 
-            matched = RegexHelper(regex_referrer).match(
+            matched = self.regex_helper.set_regex(regex_referrer).match(
                 iana_record, return_match=True, group=1
             )
 
@@ -216,7 +220,7 @@ class IanaDBGenerator:
                 return matched
 
         possible_server = f"whois.nic.{extension}"
-        response = whois_query_tool.set_server(possible_server).record
+        response = self.whois_query_tool.set_server(possible_server).record
 
         if response:
             return possible_server
@@ -224,7 +228,7 @@ class IanaDBGenerator:
         if extension in self.MANUAL_SERVER:
             possible_server = self.MANUAL_SERVER[extension]
 
-            response = whois_query_tool.set_server(possible_server).record
+            response = self.whois_query_tool.set_server(possible_server).record
 
             if response:
                 return possible_server
@@ -247,10 +251,10 @@ class IanaDBGenerator:
 
         regex_valid_extension = r"(/domains/root/db/)(.*)(\.html)"
 
-        regex_helper = RegexHelper(regex_valid_extension)
-
-        if regex_helper.match(block, return_match=False):
-            extension = regex_helper.match(block, return_match=True, group=2)
+        if self.regex_helper.set_regex(regex_valid_extension).match(
+            block, return_match=False
+        ):
+            extension = self.regex_helper.match(block, return_match=True, group=2)
 
             if extension:
                 return extension, self.get_referrer_from_extension(extension)

PyFunceble/cli/scripts/production.py

@@ -388,10 +388,10 @@ class ProductionPrep:
         Updates all URL in the source code.
         """
 
-        to_ignore = [
+        to_ignore = {
             ".gitignore",
             ".keep",
-        ]
+        }
 
         self.update_urls(os.path.join(self.config_dir, "setup.py"))
 

PyFunceble/cli/scripts/public_suffix.py

@@ -86,7 +86,7 @@ class PublicSuffixGenerator:
     An internal storage of our map.
     """
 
-    wildacrd2subject: Wildcard2Subject = Wildcard2Subject()
+    wildcard2subject: Wildcard2Subject = Wildcard2Subject()
 
     def __init__(self, destination: Optional[str] = None) -> None:
         if destination is not None:
@@ -147,7 +147,7 @@ class PublicSuffixGenerator:
         if not any(line.startswith(x) for x in self.COMMENT_SIGN) and "." in line:
             lines = [line, line.encode("idna").decode("utf-8")]
             lines = [
-                self.wildacrd2subject.set_data_to_convert(x).get_converted()
+                self.wildcard2subject.set_data_to_convert(x).get_converted()
                 for x in lines
             ]
             extension = lines[0].rsplit(".", 1)[-1]

PyFunceble/cli/system/integrator.py

@@ -73,7 +73,7 @@ class SystemIntegrator(SystemBase):
     Provides our system integrator. The idea is that we given an argparse
     Namespace, we should be able to parse it into our system.
 
-    To simplify the trick and headache in the CLI management, I explicitely
+    To simplify the trick and headache in the CLI management, I explicitly
     mapped the :code:`dest` argument to what we are supposed to have in the
     flatten version of the configuration. That way, we only need to compare
     against the flatten version instead of looping over all possible levels

PyFunceble/cli/system/launcher.py

@@ -69,7 +69,6 @@ import domain2idna
 import sqlalchemy.exc
 from sqlalchemy.orm import Session
 
-import PyFunceble.checker.utils.whois
 import PyFunceble.cli.storage
 import PyFunceble.cli.utils.ascii_logo
 import PyFunceble.cli.utils.sort
@@ -78,6 +77,7 @@ import PyFunceble.facility
 import PyFunceble.helpers.exceptions
 import PyFunceble.storage
 from PyFunceble.checker.syntax.url import URLSyntaxChecker
+from PyFunceble.checker.utils.whois import get_whois_dataset_object
 from PyFunceble.cli.continuous_integration.base import ContinuousIntegrationBase
 from PyFunceble.cli.continuous_integration.exceptions import StopExecution
 from PyFunceble.cli.continuous_integration.utils import ci_object
@@ -101,7 +101,7 @@ from PyFunceble.cli.processes.producer import ProducerProcessesManager
 from PyFunceble.cli.processes.tester import TesterProcessesManager
 from PyFunceble.cli.system.base import SystemBase
 from PyFunceble.cli.utils.testing import (
-    get_continue_databaset_object,
+    get_continue_dataset_object,
     get_destination_from_origin,
     get_inactive_dataset_object,
     get_subjects_from_line,
@@ -119,6 +119,7 @@ from PyFunceble.converter.wildcard2subject import Wildcard2Subject
 from PyFunceble.dataset.autocontinue.base import ContinueDatasetBase
 from PyFunceble.dataset.autocontinue.csv import CSVContinueDataset
 from PyFunceble.dataset.inactive.base import InactiveDatasetBase
+from PyFunceble.dataset.whois.base import WhoisDatasetBase
 from PyFunceble.helpers.directory import DirectoryHelper
 from PyFunceble.helpers.download import DownloadHelper
 from PyFunceble.helpers.file import FileHelper
@@ -167,6 +168,7 @@ class SystemLauncher(SystemBase):
 
     continue_dataset: Optional[ContinueDatasetBase] = None
     inactive_dataset: Optional[InactiveDatasetBase] = None
+    whois_dataset: Optional[WhoisDatasetBase] = None
     continuous_integration: Optional[ContinuousIntegrationBase] = None
 
     db_session: Optional[Session] = None
@@ -185,10 +187,9 @@ class SystemLauncher(SystemBase):
 
         self.execution_time_holder = ExecutionTime().set_start_time()
         self.checker_type = get_testing_mode()
-        self.continue_dataset = get_continue_databaset_object(
-            db_session=self.db_session
-        )
+        self.continue_dataset = get_continue_dataset_object(db_session=self.db_session)
         self.inactive_dataset = get_inactive_dataset_object(db_session=self.db_session)
+        self.whois_dataset = get_whois_dataset_object(db_session=self.db_session)
         self.continuous_integration = ci_object()
 
         if self.continuous_integration.authorized:
@@ -772,7 +773,7 @@ class SystemLauncher(SystemBase):
     def generate_waiting_files(self) -> "SystemLauncher":
         """
         Generates all the files that needs to be generated when all status
-        are proceeses.
+        are processes.
         """
 
         def generate_percentage_file(parent_dirname: Union[str, None]) -> None:
@@ -998,18 +999,19 @@ class SystemLauncher(SystemBase):
             """
             Remove the inline destination - when necessary.
 
-            :param protocl:
+            :param protocol:
                 The protocol to work with.
             """
 
             if not protocol["destination"]:
-                DirectoryHelper(
+                directory_helper.set_path(
                     self.counter.set_differ_to_inline(True)
                     .set_parent_dirname(protocol["destination"])
                     .get_output_basedir()
                 ).delete()
 
         file_helper = FileHelper()
+        directory_helper = DirectoryHelper()
 
         for protocol in self.testing_protocol:
             if "destination" in protocol or "output_dir" in protocol:
@@ -1019,12 +1021,13 @@ class SystemLauncher(SystemBase):
                 remove_continue_dataset(protocol)
                 remove_preload_dataset(protocol)
                 remove_inline_dest(protocol)
+                self.whois_dataset.cleanup()
 
         return self
 
     def run_standard_end_instructions(self) -> "SystemLauncher":
         """
-        Runns our standard "end" instructions.
+        Runs our standard "end" instructions.
 
         The instructions executed by this method are the one we execute normally.
 
@@ -1045,7 +1048,7 @@ class SystemLauncher(SystemBase):
 
     def run_ci_saving_instructions(self) -> "SystemLauncher":
         """
-        Runns our CI "saving" instructions.
+        Runs our CI "saving" instructions.
 
         The instructions executed by this method are the one we execute
         before ending a testing session under one of the supported CI engines.
@@ -1067,7 +1070,7 @@ class SystemLauncher(SystemBase):
 
     def run_ci_end_saving_instructions(self) -> "SystemLauncher":
         """
-        Runns our CI END "saving" instructions.
+        Runs our CI END "saving" instructions.
 
         The instructions executed by this method are the one we execute
         before ending a testing session under one of the supported CI engines.

PyFunceble/cli/utils/stdout.py

@@ -136,6 +136,6 @@ def print_thanks() -> None:
                     )
                 else:
                     print(
-                        "Do you ave a feedback, an issue or an improvement idea? "
+                        "Do you have a feedback, an issue or an improvement idea? "
                         "Let us know on GitHub!"
                     )

PyFunceble/cli/utils/testing.py

@@ -90,7 +90,7 @@ def get_testing_mode() -> str:
     return "UNKNOWN"
 
 
-def get_continue_databaset_object(
+def get_continue_dataset_object(
     db_session: Optional[Session] = None,
 ) -> Union[DatasetBase, CSVDatasetBase, DBDatasetBase]:
     """
@@ -199,35 +199,25 @@ def get_subjects_from_line(
     result = []
 
     if adblock_inputline2subject is None:
-        adblock_inputline2subject = AdblockInputLine2Subject(
-            aggressive=bool(PyFunceble.storage.CONFIGURATION.cli_decoding.aggressive)
-        )
+        adblock_inputline2subject = AdblockInputLine2Subject()
 
     if wildcard2subject is None:
-        wildcard2subject = Wildcard2Subject(
-            aggressive=bool(PyFunceble.storage.CONFIGURATION.cli_decoding.aggressive)
-        )
+        wildcard2subject = Wildcard2Subject()
 
     if rpz_policy2subject is None:
         rpz_policy2subject = RPZPolicy2Subject()
 
     if rpz_inputline2subject is None:
-        rpz_inputline2subject = RPZInputLine2Subject(
-            aggressive=bool(PyFunceble.storage.CONFIGURATION.cli_decoding.aggressive)
-        )
+        rpz_inputline2subject = RPZInputLine2Subject()
 
     if inputline2subject is None:
-        inputline2subject = InputLine2Subject(
-            aggressive=bool(PyFunceble.storage.CONFIGURATION.cli_decoding.aggressive)
-        )
+        inputline2subject = InputLine2Subject()
 
     if subject2complements is None:
         subject2complements = Subject2Complements()
 
     if url2netloc is None:
-        url2netloc = Url2Netloc(
-            aggressive=bool(PyFunceble.storage.CONFIGURATION.cli_decoding.aggressive)
-        )
+        url2netloc = Url2Netloc()
 
     if cidr2subject is None:
         cidr2subject = CIDR2Subject()

PyFunceble/config/compare.py

@@ -11,7 +11,7 @@ The tool to check the availability or syntax of domain, IP or URL.
     ██║        ██║   ██║     ╚██████╔╝██║ ╚████║╚██████╗███████╗██████╔╝███████╗███████╗
     ╚═╝        ╚═╝   ╚═╝      ╚═════╝ ╚═╝  ╚═══╝ ╚═════╝╚══════╝╚═════╝ ╚══════╝╚══════╝
 
-Provides the configuration comparision interface.
+Provides the configuration comparison interface.
 
 Author:
     Nissar Chababy, @funilrys, contactTATAfunilrysTODTODcom
@@ -175,7 +175,7 @@ class ConfigComparison:
     }
 
     _local_config: dict = {}
-    _upsteam_config: dict = {}
+    _upstream_config: dict = {}
 
     dict_helper: DictHelper = DictHelper()
 
@@ -228,12 +228,12 @@ class ConfigComparison:
         Provides the current state of the :code:`_upstream_config`.
         """
 
-        return self._upsteam_config
+        return self._upstream_config
 
     @upstream_config.setter
     def upstream_config(self, value: dict) -> None:
         """
-        Sets the upstram configuration to work with.
+        Sets the upstream configuration to work with.
 
         :raise TypeError:
             When :code:`value` is not a :py:class:`dict`
@@ -242,11 +242,11 @@ class ConfigComparison:
         if not isinstance(value, dict):
             raise TypeError(f"<value> should be {dict}, {type(value)} given.")
 
-        self._upsteam_config = copy.deepcopy(value)
+        self._upstream_config = copy.deepcopy(value)
 
     def set_upstream_config(self, value: dict) -> "ConfigComparison":
         """
-        Sets the upstram configuration to work with.
+        Sets the upstream configuration to work with.
         """
 
         self.upstream_config = value
@@ -265,6 +265,7 @@ class ConfigComparison:
             )
             or "user_agent" not in self.local_config
             or not isinstance(self.local_config["user_agent"], dict)
+            or "http_codes" not in self.local_config
             or "active" in self.local_config["http_codes"]
             or "not_found_default" in self.local_config["http_codes"]
             or "self_managed" not in self.local_config["http_codes"]
@@ -281,7 +282,7 @@ class ConfigComparison:
             if index in self.DELETED_CORE:
                 return False
 
-        for index in self.local_config["links"]:
+        for index in self.local_config.get("links", {}):
             if index in self.DELETED_LINKS:
                 return False
 
@@ -369,10 +370,10 @@ class ConfigComparison:
                 del merged[index]
 
         for index in self.DELETED_LINKS:
-            if index in merged["links"]:
+            if index in merged.get("links", {}):
                 del merged["links"][index]
 
-        if not bool(merged["http_codes"]["self_managed"]):
+        if "http_codes" in merged and not bool(merged["http_codes"]["self_managed"]):
             for index, values in PyFunceble.storage.STD_HTTP_CODES.list.items():
                 merged["http_codes"]["list"][index] = list(values)
 

PyFunceble/config/loader.py

@@ -99,8 +99,8 @@ class ConfigLoader:
     _config_dir: Optional[str] = None
     __config_loaded: bool = False
 
-    file_helper: FileHelper = FileHelper()
-    dict_helper: DictHelper = DictHelper()
+    file_helper: Optional[FileHelper] = None
+    dict_helper: Optional[DictHelper] = None
 
     def __init__(
         self, merge_upstream: Optional[bool] = None, *, config_dir: Optional[str] = None
@@ -123,6 +123,9 @@ class ConfigLoader:
         elif EnvironmentVariableHelper("PYFUNCEBLE_AUTO_CONFIGURATION").exists():
             self.merge_upstream = True
 
+        self.file_helper = FileHelper()
+        self.dict_helper = DictHelper()
+
     def __del__(self) -> None:
         self.destroy()
 
@@ -451,7 +454,7 @@ class ConfigLoader:
         self,
     ) -> "ConfigLoader":
         """
-        Downloads all the dynamicly (generated) infrastructure files.
+        Downloads all the dynamically (generated) infrastructure files.
 
         .. note::
             Downloaded if missing:
@@ -532,7 +535,7 @@ class ConfigLoader:
             or self.merge_upstream
             or is_3_x_version(config)
             or not config_comparer.is_local_identical()
-        ):  # pragma: no cover ## Testing the underlying comparison method is sufficent
+        ):  # pragma: no cover ## Testing the underlying comparison method is sufficient
             config = config_comparer.get_merged()
 
             self.dict_helper.set_subject(config).to_yaml_file(self.path_to_config)

PyFunceble/converter/input_line2subject.py

@@ -60,7 +60,7 @@ from PyFunceble.converter.url2netloc import Url2Netloc
 
 class InputLine2Subject(ConverterBase):
     """
-    Converts/Extract the subjcts to test from an inputed line.
+    Converts/Extract the subjects to test from an imputed line.
     """
 
     COMMENT: str = "#"
@@ -72,7 +72,7 @@ class InputLine2Subject(ConverterBase):
     @ConverterBase.data_to_convert.setter
     def data_to_convert(self, value: Any) -> None:
         """
-        Overrites the default behavior.
+        Overrides the default behavior.
 
         :raise TypeError:
             When the given data to convert is not :py:class:`str`

PyFunceble/converter/internal_url.py

@@ -71,7 +71,7 @@ class InternalUrlConverter(ConverterBase):
     @ConverterBase.data_to_convert.setter
     def data_to_convert(self, value: Any) -> None:
         """
-        Overrites the default behavior.
+        Overrides the default behavior.
 
         :raise TypeError:
             When the given data to convert is not :py:class:`str`

PyFunceble/converter/rpz_input_line2subject.py

@@ -59,7 +59,7 @@ from PyFunceble.converter.input_line2subject import InputLine2Subject
 
 class RPZInputLine2Subject(InputLine2Subject):
     """
-    Converts/Extracts the subject from the given RPZ inputline.
+    Converts/Extracts the subject from the given RPZ input line.
     """
 
     COMMENT: list = [";", "//", "#"]
@@ -96,9 +96,7 @@ class RPZInputLine2Subject(InputLine2Subject):
             if self.SPACE in subject or self.TAB in subject:
                 subject = subject.split()[0]
 
-                if not subject.isdigit():
-                    result.append(subject)
-            elif not subject.isdigit():
+            if not subject.isdigit():
                 result.append(subject)
 
         return result