From e12f795245516b3ac72057bc0d0d93346a033871 Mon Sep 17 00:00:00 2001 From: "d.kovalenko" Date: Sun, 2 Nov 2025 09:41:02 +0300 Subject: [PATCH 1/5] tests includes src as module --- tests/CfgFileReader.py | 2 +- .../Unpack_StrList2/test_set001__common.py | 2 +- .../test_set001__common.py | 2 +- .../Pack_Str/test_set001__common.py | 2 +- .../Pack_StrList2/test_set001__common.py | 2 +- ...test_set001__generic_support_of_options.py | 8 ++--- .../AddOption/test_set001__common.py | 20 +++++------ .../AddTopLevelFile/test_set001__common.py | 4 +-- .../GetOptionValue/test_set001__common.py | 12 +++---- .../Mix/test_set001__common.py | 4 +-- .../SetOptionValue/test_set001__common.py | 28 +++++++-------- .../SetOptionValueItem/test_set001__common.py | 8 ++--- .../get_AllFiles/test_set001__common.py | 12 +++---- .../get_AllOptions/test_set001__common.py | 14 ++++---- .../Delete/test_set001__common.py | 4 +-- .../AddComment/test_set001__common.py | 6 ++-- .../AddInclude/test_set001__common.py | 12 +++---- .../AddOption/test_set001__common.py | 6 ++-- .../Clear/test_set001__common.py | 36 +++++++++---------- .../Delete/test_set001__common.py | 4 +-- .../Mix/test_set001__common.py | 12 +++---- .../set_ValueItem/test_set001__common.py | 12 +++---- .../test_set001__common.py | 18 +++++----- .../test_set001__common.py | 10 +++--- .../AddComment/test_set001__common.py | 22 ++++++------ .../AddEmptyLine/test_set001__common.py | 12 +++---- .../AddInclude/test_set001__common.py | 12 +++---- .../AddOption/test_set001__common.py | 10 +++--- .../GetOptionValue/test_set001__common.py | 2 +- .../SetOptionValue/test_set001__common.py | 32 ++++++++--------- .../SetOptionValueItem/test_set001__common.py | 8 ++--- .../get_Lines/test_set001__common.py | 20 +++++------ .../DoWork/test_set001__work.py | 16 ++++----- .../test_set001__common.py | 8 ++--- .../GetFileByName/test_set001__common.py | 4 +-- .../bool_option/test_set001__common.py | 6 ++-- .../listen_addresses/test_set001__common.py | 6 ++-- 37 files changed, 199 insertions(+), 199 deletions(-) diff --git a/tests/CfgFileReader.py b/tests/CfgFileReader.py index 187a3be..1f80f31 100644 --- a/tests/CfgFileReader.py +++ b/tests/CfgFileReader.py @@ -1,7 +1,7 @@ # ///////////////////////////////////////////////////////////////////////////// # Postgres Pro. PostgreSQL Configuration Python Library. Tests. -from ..src.os.abstract.configuration_os_ops import ConfigurationFileReader +from src.os.abstract.configuration_os_ops import ConfigurationFileReader import io diff --git a/tests/core/configuration/read_utils/ReadUtils/Unpack_StrList2/test_set001__common.py b/tests/core/configuration/read_utils/ReadUtils/Unpack_StrList2/test_set001__common.py index f81214d..d0dc46c 100644 --- a/tests/core/configuration/read_utils/ReadUtils/Unpack_StrList2/test_set001__common.py +++ b/tests/core/configuration/read_utils/ReadUtils/Unpack_StrList2/test_set001__common.py @@ -1,7 +1,7 @@ # ////////////////////////////////////////////////////////////////////////////// # Postgres Pro. PostgreSQL Configuration Python Library. Tests. -from .......src.core.read_utils import ReadUtils +from src.core.read_utils import ReadUtils import pytest diff --git a/tests/core/configuration/write_utils/WriteUtils/Helper__PackStrListItem2/test_set001__common.py b/tests/core/configuration/write_utils/WriteUtils/Helper__PackStrListItem2/test_set001__common.py index d3fe16d..b805030 100644 --- a/tests/core/configuration/write_utils/WriteUtils/Helper__PackStrListItem2/test_set001__common.py +++ b/tests/core/configuration/write_utils/WriteUtils/Helper__PackStrListItem2/test_set001__common.py @@ -1,7 +1,7 @@ # ////////////////////////////////////////////////////////////////////////////// # Postgres Pro. PostgreSQL Configuration Python Library. Tests. -from .......src.core.write_utils import WriteUtils +from src.core.write_utils import WriteUtils import pytest diff --git a/tests/core/configuration/write_utils/WriteUtils/Pack_Str/test_set001__common.py b/tests/core/configuration/write_utils/WriteUtils/Pack_Str/test_set001__common.py index 3ef8ef6..48ae87b 100644 --- a/tests/core/configuration/write_utils/WriteUtils/Pack_Str/test_set001__common.py +++ b/tests/core/configuration/write_utils/WriteUtils/Pack_Str/test_set001__common.py @@ -1,7 +1,7 @@ # ////////////////////////////////////////////////////////////////////////////// # Postgres Pro. PostgreSQL Configuration Python Library. Tests. -from .......src.core.write_utils import WriteUtils +from src.core.write_utils import WriteUtils import pytest diff --git a/tests/core/configuration/write_utils/WriteUtils/Pack_StrList2/test_set001__common.py b/tests/core/configuration/write_utils/WriteUtils/Pack_StrList2/test_set001__common.py index 16eb61d..3e8a394 100644 --- a/tests/core/configuration/write_utils/WriteUtils/Pack_StrList2/test_set001__common.py +++ b/tests/core/configuration/write_utils/WriteUtils/Pack_StrList2/test_set001__common.py @@ -1,7 +1,7 @@ # ////////////////////////////////////////////////////////////////////////////// # Postgres Pro. PostgreSQL Configuration Python Library. Tests. -from .......src.core.write_utils import WriteUtils +from src.core.write_utils import WriteUtils import pytest diff --git a/tests/implementation/v00/configuration_std/Mix/test_set001__generic_support_of_options.py b/tests/implementation/v00/configuration_std/Mix/test_set001__generic_support_of_options.py index 1b9ed71..dbd1211 100644 --- a/tests/implementation/v00/configuration_std/Mix/test_set001__generic_support_of_options.py +++ b/tests/implementation/v00/configuration_std/Mix/test_set001__generic_support_of_options.py @@ -2,10 +2,10 @@ # Postgres Pro. PostgreSQL Configuration Python Library. Tests. # fmt: off -from ......src.implementation.v00.configuration_std import PostgresConfiguration_Std as PgCfg_Std -from ......src.implementation.v00.configuration_std import PostgresConfigurationWriter_Base as PgCfg_Writer_Base -from ......src.implementation.v00.configuration_std import PostgresConfigurationWriterCtx_Base as PgCfg_WriterCtx_Base -from ......src.implementation.v00.configuration_std import PostgresConfigurationReader_Base as PgCfg_Reader_Base +from src.implementation.v00.configuration_std import PostgresConfiguration_Std as PgCfg_Std +from src.implementation.v00.configuration_std import PostgresConfigurationWriter_Base as PgCfg_Writer_Base +from src.implementation.v00.configuration_std import PostgresConfigurationWriterCtx_Base as PgCfg_WriterCtx_Base +from src.implementation.v00.configuration_std import PostgresConfigurationReader_Base as PgCfg_Reader_Base from .....TestServices import TestServices # fmt: on diff --git a/tests/implementation/v00/configuration_std/Objects/PostgresConfiguration/AddOption/test_set001__common.py b/tests/implementation/v00/configuration_std/Objects/PostgresConfiguration/AddOption/test_set001__common.py index 0a2f345..009a234 100644 --- a/tests/implementation/v00/configuration_std/Objects/PostgresConfiguration/AddOption/test_set001__common.py +++ b/tests/implementation/v00/configuration_std/Objects/PostgresConfiguration/AddOption/test_set001__common.py @@ -2,19 +2,19 @@ # Postgres Pro. PostgreSQL Configuration Python Library. Tests. # fmt: off -from ........src.implementation.v00.configuration_std import PostgresConfiguration_Std as PgCfg_Std +from src.implementation.v00.configuration_std import PostgresConfiguration_Std as PgCfg_Std -from ........src.implementation.v00.configuration_base import PostgresConfigurationOption_Base as PgCfg_Option_Base -from ........src.implementation.v00.configuration_base import PostgresConfigurationFileLine_Base as PgCfg_FileLine_Base -from ........src.implementation.v00.configuration_base import PostgresConfigurationFile_Base as PgCfg_File_Base -from ........src.implementation.v00.configuration_base import PostgresConfigurationTopLevelFile_Base as PgCfg_TopLevelFile_Base +from src.implementation.v00.configuration_base import PostgresConfigurationOption_Base as PgCfg_Option_Base +from src.implementation.v00.configuration_base import PostgresConfigurationFileLine_Base as PgCfg_FileLine_Base +from src.implementation.v00.configuration_base import PostgresConfigurationFile_Base as PgCfg_File_Base +from src.implementation.v00.configuration_base import PostgresConfigurationTopLevelFile_Base as PgCfg_TopLevelFile_Base -from ........src.implementation.v00.configuration_base import PostgresConfigurationOption as PgCfg_Option +from src.implementation.v00.configuration_base import PostgresConfigurationOption as PgCfg_Option -from ........src.implementation.v00.configuration_base import PgCfgModel__OptionData -from ........src.implementation.v00.configuration_base import PgCfgModel__FileLineData -from ........src.implementation.v00.configuration_base import PgCfgModel__FileData -from ........src.implementation.v00.configuration_base import PgCfgModel__ConfigurationData +from src.implementation.v00.configuration_base import PgCfgModel__OptionData +from src.implementation.v00.configuration_base import PgCfgModel__FileLineData +from src.implementation.v00.configuration_base import PgCfgModel__FileData +from src.implementation.v00.configuration_base import PgCfgModel__ConfigurationData from .......TestServices import TestServices # fmt: on diff --git a/tests/implementation/v00/configuration_std/Objects/PostgresConfiguration/AddTopLevelFile/test_set001__common.py b/tests/implementation/v00/configuration_std/Objects/PostgresConfiguration/AddTopLevelFile/test_set001__common.py index f1c5f9a..4064538 100644 --- a/tests/implementation/v00/configuration_std/Objects/PostgresConfiguration/AddTopLevelFile/test_set001__common.py +++ b/tests/implementation/v00/configuration_std/Objects/PostgresConfiguration/AddTopLevelFile/test_set001__common.py @@ -2,9 +2,9 @@ # Postgres Pro. PostgreSQL Configuration Python Library. Tests. # fmt: off -from ........src.implementation.v00.configuration_std import PostgresConfiguration_Std as PgCfg_Std +from src.implementation.v00.configuration_std import PostgresConfiguration_Std as PgCfg_Std -from ........src.implementation.v00.configuration_base import PostgresConfigurationTopLevelFile_Base as PgCfg_TopLevelFile_Base +from src.implementation.v00.configuration_base import PostgresConfigurationTopLevelFile_Base as PgCfg_TopLevelFile_Base # fmt: on from .......TestServices import TestServices diff --git a/tests/implementation/v00/configuration_std/Objects/PostgresConfiguration/GetOptionValue/test_set001__common.py b/tests/implementation/v00/configuration_std/Objects/PostgresConfiguration/GetOptionValue/test_set001__common.py index 9372bba..75b4eb4 100644 --- a/tests/implementation/v00/configuration_std/Objects/PostgresConfiguration/GetOptionValue/test_set001__common.py +++ b/tests/implementation/v00/configuration_std/Objects/PostgresConfiguration/GetOptionValue/test_set001__common.py @@ -2,14 +2,14 @@ # Postgres Pro. PostgreSQL Configuration Python Library. Tests. # fmt: off -from ........src.abstract.v00.configuration import PostgresConfigurationOption +from src.abstract.v00.configuration import PostgresConfigurationOption -from ........src.implementation.v00.configuration_std import PostgresConfiguration_Std as PgCfg_Std -from ........src.implementation.v00.configuration_base import PostgresConfigurationSetOptionValueResult_Base as PgCfg_SetOptionResult_Base -from ........src.implementation.v00.configuration_base import PostgresConfigurationSetOptionValueEventID as PgCfg_SetOptionEventID -from ........src.implementation.v00.configuration_base import PostgresConfigurationOption_Base as PgCfg_Option_Base +from src.implementation.v00.configuration_std import PostgresConfiguration_Std as PgCfg_Std +from src.implementation.v00.configuration_base import PostgresConfigurationSetOptionValueResult_Base as PgCfg_SetOptionResult_Base +from src.implementation.v00.configuration_base import PostgresConfigurationSetOptionValueEventID as PgCfg_SetOptionEventID +from src.implementation.v00.configuration_base import PostgresConfigurationOption_Base as PgCfg_Option_Base -from ........src.implementation.v00.configuration_base import PostgresConfigurationSetOptionValueResult as PgCfg_SetOptionResult +from src.implementation.v00.configuration_base import PostgresConfigurationSetOptionValueResult as PgCfg_SetOptionResult # fmt: on from .......TestServices import TestServices diff --git a/tests/implementation/v00/configuration_std/Objects/PostgresConfiguration/Mix/test_set001__common.py b/tests/implementation/v00/configuration_std/Objects/PostgresConfiguration/Mix/test_set001__common.py index e6b4fa0..64692df 100644 --- a/tests/implementation/v00/configuration_std/Objects/PostgresConfiguration/Mix/test_set001__common.py +++ b/tests/implementation/v00/configuration_std/Objects/PostgresConfiguration/Mix/test_set001__common.py @@ -2,9 +2,9 @@ # Postgres Pro. PostgreSQL Configuration Python Library. Tests. # fmt: off -from ........src.implementation.v00.configuration_std import PostgresConfiguration_Std as PgCfg_Std +from src.implementation.v00.configuration_std import PostgresConfiguration_Std as PgCfg_Std -from ........src.implementation.v00.configuration_base import PgCfgModel__ConfigurationData +from src.implementation.v00.configuration_base import PgCfgModel__ConfigurationData from .......TestServices import TestServices # fmt: on diff --git a/tests/implementation/v00/configuration_std/Objects/PostgresConfiguration/SetOptionValue/test_set001__common.py b/tests/implementation/v00/configuration_std/Objects/PostgresConfiguration/SetOptionValue/test_set001__common.py index 3fa1db7..f3e5bf3 100644 --- a/tests/implementation/v00/configuration_std/Objects/PostgresConfiguration/SetOptionValue/test_set001__common.py +++ b/tests/implementation/v00/configuration_std/Objects/PostgresConfiguration/SetOptionValue/test_set001__common.py @@ -2,24 +2,24 @@ # Postgres Pro. PostgreSQL Configuration Python Library. Tests. # fmt: off -from ........src.abstract.v00.configuration import PostgresConfigurationOption +from src.abstract.v00.configuration import PostgresConfigurationOption -from ........src.implementation.v00.configuration_std import PostgresConfiguration_Std as PgCfg_Std +from src.implementation.v00.configuration_std import PostgresConfiguration_Std as PgCfg_Std -from ........src.implementation.v00.configuration_base import PostgresConfigurationSetOptionValueResult_Base as PgCfg_SetOptionResult_Base -from ........src.implementation.v00.configuration_base import PostgresConfigurationSetOptionValueEventID as PgCfg_SetOptionEventID -from ........src.implementation.v00.configuration_base import PostgresConfigurationOption_Base as PgCfg_Option_Base -from ........src.implementation.v00.configuration_base import PostgresConfigurationFileLine_Base as PgCfg_FileLine_Base -from ........src.implementation.v00.configuration_base import PostgresConfigurationFile_Base as PgCfg_File_Base -from ........src.implementation.v00.configuration_base import PostgresConfigurationTopLevelFile_Base as PgCfg_TopLevelFile_Base +from src.implementation.v00.configuration_base import PostgresConfigurationSetOptionValueResult_Base as PgCfg_SetOptionResult_Base +from src.implementation.v00.configuration_base import PostgresConfigurationSetOptionValueEventID as PgCfg_SetOptionEventID +from src.implementation.v00.configuration_base import PostgresConfigurationOption_Base as PgCfg_Option_Base +from src.implementation.v00.configuration_base import PostgresConfigurationFileLine_Base as PgCfg_FileLine_Base +from src.implementation.v00.configuration_base import PostgresConfigurationFile_Base as PgCfg_File_Base +from src.implementation.v00.configuration_base import PostgresConfigurationTopLevelFile_Base as PgCfg_TopLevelFile_Base -from ........src.implementation.v00.configuration_base import PostgresConfigurationOption as PgCfg_Option -from ........src.implementation.v00.configuration_base import PostgresConfigurationSetOptionValueResult as PgCfg_SetOptionResult +from src.implementation.v00.configuration_base import PostgresConfigurationOption as PgCfg_Option +from src.implementation.v00.configuration_base import PostgresConfigurationSetOptionValueResult as PgCfg_SetOptionResult -from ........src.implementation.v00.configuration_base import PgCfgModel__OptionData -from ........src.implementation.v00.configuration_base import PgCfgModel__FileLineData -from ........src.implementation.v00.configuration_base import PgCfgModel__FileData -from ........src.implementation.v00.configuration_base import PgCfgModel__ConfigurationData +from src.implementation.v00.configuration_base import PgCfgModel__OptionData +from src.implementation.v00.configuration_base import PgCfgModel__FileLineData +from src.implementation.v00.configuration_base import PgCfgModel__FileData +from src.implementation.v00.configuration_base import PgCfgModel__ConfigurationData from .......TestServices import TestServices # fmt: on diff --git a/tests/implementation/v00/configuration_std/Objects/PostgresConfiguration/SetOptionValueItem/test_set001__common.py b/tests/implementation/v00/configuration_std/Objects/PostgresConfiguration/SetOptionValueItem/test_set001__common.py index 8ceffd2..e99aa40 100644 --- a/tests/implementation/v00/configuration_std/Objects/PostgresConfiguration/SetOptionValueItem/test_set001__common.py +++ b/tests/implementation/v00/configuration_std/Objects/PostgresConfiguration/SetOptionValueItem/test_set001__common.py @@ -2,12 +2,12 @@ # Postgres Pro. PostgreSQL Configuration Python Library. Tests. # fmt: off -from ........src.implementation.v00.configuration_std import PostgresConfiguration_Std as PgCfg_Std +from src.implementation.v00.configuration_std import PostgresConfiguration_Std as PgCfg_Std -from ........src.implementation.v00.configuration_base import PostgresConfigurationSetOptionValueResult_Base as PgCfg_SetOptionResult_Base -from ........src.implementation.v00.configuration_base import PostgresConfigurationOption_Base as PgCfg_Option_Base +from src.implementation.v00.configuration_base import PostgresConfigurationSetOptionValueResult_Base as PgCfg_SetOptionResult_Base +from src.implementation.v00.configuration_base import PostgresConfigurationOption_Base as PgCfg_Option_Base -from ........src.implementation.v00.configuration_base import PostgresConfigurationSetOptionValueEventID as PgCfg_SetOptionEventID +from src.implementation.v00.configuration_base import PostgresConfigurationSetOptionValueEventID as PgCfg_SetOptionEventID # fmt: on from .......TestServices import TestServices diff --git a/tests/implementation/v00/configuration_std/Objects/PostgresConfiguration/get_AllFiles/test_set001__common.py b/tests/implementation/v00/configuration_std/Objects/PostgresConfiguration/get_AllFiles/test_set001__common.py index 471ff99..8e9bb7e 100644 --- a/tests/implementation/v00/configuration_std/Objects/PostgresConfiguration/get_AllFiles/test_set001__common.py +++ b/tests/implementation/v00/configuration_std/Objects/PostgresConfiguration/get_AllFiles/test_set001__common.py @@ -2,14 +2,14 @@ # Postgres Pro. PostgreSQL Configuration Python Library. Tests. # fmt: off -from ........src.implementation.v00.configuration_std import PostgresConfiguration_Std as PgCfg_Std +from src.implementation.v00.configuration_std import PostgresConfiguration_Std as PgCfg_Std -from ........src.implementation.v00.configuration_base import PostgresConfiguration_Base__AllFiles as PgCfg_Base__AllFiles -from ........src.implementation.v00.configuration_base import PostgresConfiguration_Base__AllFilesIterator as PgCfg_Base__AllFilesIterator -from ........src.implementation.v00.configuration_base import PostgresConfigurationTopLevelFile_Base as PgCfg_TopLevelFile_Base +from src.implementation.v00.configuration_base import PostgresConfiguration_Base__AllFiles as PgCfg_Base__AllFiles +from src.implementation.v00.configuration_base import PostgresConfiguration_Base__AllFilesIterator as PgCfg_Base__AllFilesIterator +from src.implementation.v00.configuration_base import PostgresConfigurationTopLevelFile_Base as PgCfg_TopLevelFile_Base -from ........src.abstract.v00.configuration import PostgresConfigurationFiles as PgCfg_Files -from ........src.abstract.v00.configuration import PostgresConfigurationFilesIterator as PgCfg_FilesIterator +from src.abstract.v00.configuration import PostgresConfigurationFiles as PgCfg_Files +from src.abstract.v00.configuration import PostgresConfigurationFilesIterator as PgCfg_FilesIterator # fmt: on from .......TestServices import TestServices diff --git a/tests/implementation/v00/configuration_std/Objects/PostgresConfiguration/get_AllOptions/test_set001__common.py b/tests/implementation/v00/configuration_std/Objects/PostgresConfiguration/get_AllOptions/test_set001__common.py index f37c49f..e134f83 100644 --- a/tests/implementation/v00/configuration_std/Objects/PostgresConfiguration/get_AllOptions/test_set001__common.py +++ b/tests/implementation/v00/configuration_std/Objects/PostgresConfiguration/get_AllOptions/test_set001__common.py @@ -2,15 +2,15 @@ # Postgres Pro. PostgreSQL Configuration Python Library. Tests. # fmt: off -from ........src.implementation.v00.configuration_std import PostgresConfiguration_Std as PgCfg_Std +from src.implementation.v00.configuration_std import PostgresConfiguration_Std as PgCfg_Std -from ........src.implementation.v00.configuration_base import PostgresConfiguration_Base__AllOptions as PgCfg_Base__AllOptions -from ........src.implementation.v00.configuration_base import PostgresConfiguration_Base__AllOptionsIterator as PgCfg_Base__AllOptionsIterator -from ........src.implementation.v00.configuration_base import PostgresConfigurationOption_Base as PgCfg_Option_Base +from src.implementation.v00.configuration_base import PostgresConfiguration_Base__AllOptions as PgCfg_Base__AllOptions +from src.implementation.v00.configuration_base import PostgresConfiguration_Base__AllOptionsIterator as PgCfg_Base__AllOptionsIterator +from src.implementation.v00.configuration_base import PostgresConfigurationOption_Base as PgCfg_Option_Base -from ........src.abstract.v00.configuration import PostgresConfigurationOption as PgCfg_Option -from ........src.abstract.v00.configuration import PostgresConfigurationOptions as PgCfg_Options -from ........src.abstract.v00.configuration import PostgresConfigurationOptionsIterator as PgCfg_OptionsIterator +from src.abstract.v00.configuration import PostgresConfigurationOption as PgCfg_Option +from src.abstract.v00.configuration import PostgresConfigurationOptions as PgCfg_Options +from src.abstract.v00.configuration import PostgresConfigurationOptionsIterator as PgCfg_OptionsIterator # fmt: on from .......TestServices import TestServices diff --git a/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationComment/Delete/test_set001__common.py b/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationComment/Delete/test_set001__common.py index a9e9774..45d50d3 100644 --- a/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationComment/Delete/test_set001__common.py +++ b/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationComment/Delete/test_set001__common.py @@ -2,8 +2,8 @@ # Postgres Pro. PostgreSQL Configuration Python Library. Tests. # fmt: off -from ........src.implementation.v00.configuration_std import PostgresConfiguration_Std as PgCfg_Std -from ........src.implementation.v00.configuration_base import PostgresConfigurationComment_Base as PgCfg_Comment_Base +from src.implementation.v00.configuration_std import PostgresConfiguration_Std as PgCfg_Std +from src.implementation.v00.configuration_base import PostgresConfigurationComment_Base as PgCfg_Comment_Base # fmt: on from .......TestServices import TestServices diff --git a/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationFileLine/AddComment/test_set001__common.py b/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationFileLine/AddComment/test_set001__common.py index 036e4c7..c7a4de0 100644 --- a/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationFileLine/AddComment/test_set001__common.py +++ b/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationFileLine/AddComment/test_set001__common.py @@ -2,11 +2,11 @@ # Postgres Pro. PostgreSQL Configuration Python Library. Tests. # fmt: off -from ........src.implementation.v00.configuration_std import PostgresConfiguration_Std as PgCfg_Std +from src.implementation.v00.configuration_std import PostgresConfiguration_Std as PgCfg_Std -from ........src.implementation.v00.configuration_base import PostgresConfigurationComment_Base as PgCfg_Comment_Base +from src.implementation.v00.configuration_base import PostgresConfigurationComment_Base as PgCfg_Comment_Base -from ........src.implementation.v00.configuration_base import PgCfgModel__CommentData +from src.implementation.v00.configuration_base import PgCfgModel__CommentData # fmt: on from .......TestServices import TestServices diff --git a/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationFileLine/AddInclude/test_set001__common.py b/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationFileLine/AddInclude/test_set001__common.py index 938566c..65a30ec 100644 --- a/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationFileLine/AddInclude/test_set001__common.py +++ b/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationFileLine/AddInclude/test_set001__common.py @@ -2,14 +2,14 @@ # Postgres Pro. PostgreSQL Configuration Python Library. Tests. # fmt: off -from ........src.implementation.v00.configuration_std import PostgresConfiguration_Std as PgCfg_Std +from src.implementation.v00.configuration_std import PostgresConfiguration_Std as PgCfg_Std -from ........src.implementation.v00.configuration_base import PostgresConfigurationIncludedFile_Base as PgCfg_IncludedFile_Base -from ........src.implementation.v00.configuration_base import PostgresConfigurationInclude_Base as PgCfg_Include_Base -from ........src.implementation.v00.configuration_base import PostgresConfigurationOption_Base as PgCfg_Option_Base +from src.implementation.v00.configuration_base import PostgresConfigurationIncludedFile_Base as PgCfg_IncludedFile_Base +from src.implementation.v00.configuration_base import PostgresConfigurationInclude_Base as PgCfg_Include_Base +from src.implementation.v00.configuration_base import PostgresConfigurationOption_Base as PgCfg_Option_Base -from ........src.implementation.v00.configuration_base import PgCfgModel__OptionData -from ........src.implementation.v00.configuration_base import PgCfgModel__IncludeData +from src.implementation.v00.configuration_base import PgCfgModel__OptionData +from src.implementation.v00.configuration_base import PgCfgModel__IncludeData # fmt: on from .......TestServices import TestServices diff --git a/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationFileLine/AddOption/test_set001__common.py b/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationFileLine/AddOption/test_set001__common.py index 350dac6..99b8bcb 100644 --- a/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationFileLine/AddOption/test_set001__common.py +++ b/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationFileLine/AddOption/test_set001__common.py @@ -2,11 +2,11 @@ # Postgres Pro. PostgreSQL Configuration Python Library. Tests. # fmt: off -from ........src.implementation.v00.configuration_std import PostgresConfiguration_Std as PgCfg_Std +from src.implementation.v00.configuration_std import PostgresConfiguration_Std as PgCfg_Std -from ........src.implementation.v00.configuration_base import PostgresConfigurationOption_Base as PgCfg_Option_Base +from src.implementation.v00.configuration_base import PostgresConfigurationOption_Base as PgCfg_Option_Base -from ........src.implementation.v00.configuration_base import PgCfgModel__OptionData +from src.implementation.v00.configuration_base import PgCfgModel__OptionData # fmt: on from .......TestServices import TestServices diff --git a/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationFileLine/Clear/test_set001__common.py b/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationFileLine/Clear/test_set001__common.py index 09a9fc1..ab46311 100644 --- a/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationFileLine/Clear/test_set001__common.py +++ b/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationFileLine/Clear/test_set001__common.py @@ -2,24 +2,24 @@ # Postgres Pro. PostgreSQL Configuration Python Library. Tests. # fmt: off -from ........src.implementation.v00.configuration_std import PostgresConfiguration_Std as PgCfg_Std - -from ........src.implementation.v00.configuration_base import PostgresConfigurationSetOptionValueResult_Base as PgCfg_SetOptionResult_Base -from ........src.implementation.v00.configuration_base import PostgresConfigurationSetOptionValueEventID as PgCfg_SetOptionEventID -from ........src.implementation.v00.configuration_base import PostgresConfigurationFile_Base as PgCfg_File_Base -from ........src.implementation.v00.configuration_base import PostgresConfigurationTopLevelFile_Base as PgCfg_TopLevelFile_Base -from ........src.implementation.v00.configuration_base import PostgresConfigurationFileLine_Base as PgCfg_FileLine_Base -from ........src.implementation.v00.configuration_base import PostgresConfigurationComment_Base as PgCfg_Comment_Base -from ........src.implementation.v00.configuration_base import PostgresConfigurationFileLines_Base as PgCfg_FileLines_Base - -from ........src.implementation.v00.configuration_base import PgCfgModel__FileLineData -from ........src.implementation.v00.configuration_base import PgCfgModel__CommentData -from ........src.implementation.v00.configuration_base import PgCfgModel__OptionData - -from ........src.abstract.v00.configuration import PostgresConfigurationComment as PgCfg_Comment -from ........src.abstract.v00.configuration import PostgresConfigurationFileLine as PgCfg_FileLine -from ........src.abstract.v00.configuration import PostgresConfigurationFileLines as PgCfg_FileLines -from ........src.abstract.v00.configuration import PostgresConfigurationFile as PgCfg_File +from src.implementation.v00.configuration_std import PostgresConfiguration_Std as PgCfg_Std + +from src.implementation.v00.configuration_base import PostgresConfigurationSetOptionValueResult_Base as PgCfg_SetOptionResult_Base +from src.implementation.v00.configuration_base import PostgresConfigurationSetOptionValueEventID as PgCfg_SetOptionEventID +from src.implementation.v00.configuration_base import PostgresConfigurationFile_Base as PgCfg_File_Base +from src.implementation.v00.configuration_base import PostgresConfigurationTopLevelFile_Base as PgCfg_TopLevelFile_Base +from src.implementation.v00.configuration_base import PostgresConfigurationFileLine_Base as PgCfg_FileLine_Base +from src.implementation.v00.configuration_base import PostgresConfigurationComment_Base as PgCfg_Comment_Base +from src.implementation.v00.configuration_base import PostgresConfigurationFileLines_Base as PgCfg_FileLines_Base + +from src.implementation.v00.configuration_base import PgCfgModel__FileLineData +from src.implementation.v00.configuration_base import PgCfgModel__CommentData +from src.implementation.v00.configuration_base import PgCfgModel__OptionData + +from src.abstract.v00.configuration import PostgresConfigurationComment as PgCfg_Comment +from src.abstract.v00.configuration import PostgresConfigurationFileLine as PgCfg_FileLine +from src.abstract.v00.configuration import PostgresConfigurationFileLines as PgCfg_FileLines +from src.abstract.v00.configuration import PostgresConfigurationFile as PgCfg_File # fmt: on from .......TestServices import TestServices diff --git a/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationInclude/Delete/test_set001__common.py b/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationInclude/Delete/test_set001__common.py index 21594b5..8a91bf9 100644 --- a/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationInclude/Delete/test_set001__common.py +++ b/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationInclude/Delete/test_set001__common.py @@ -2,9 +2,9 @@ # Postgres Pro. PostgreSQL Configuration Python Library. Tests. # fmt: off -from ........src.implementation.v00.configuration_std import PostgresConfiguration_Std as PgCfg_Std +from src.implementation.v00.configuration_std import PostgresConfiguration_Std as PgCfg_Std -from ........src.implementation.v00.configuration_base import PostgresConfigurationInclude_Base as PgCfg_Include_Base +from src.implementation.v00.configuration_base import PostgresConfigurationInclude_Base as PgCfg_Include_Base # fmt: on from .......TestServices import TestServices diff --git a/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationOption/Mix/test_set001__common.py b/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationOption/Mix/test_set001__common.py index 96ebff3..cbdf621 100644 --- a/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationOption/Mix/test_set001__common.py +++ b/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationOption/Mix/test_set001__common.py @@ -2,14 +2,14 @@ # Postgres Pro. PostgreSQL Configuration Python Library. Tests. # fmt: off -from ........src.implementation.v00.configuration_std import PostgresConfiguration_Std as PgCfg_Std +from src.implementation.v00.configuration_std import PostgresConfiguration_Std as PgCfg_Std -from ........src.implementation.v00.configuration_base import PostgresConfigurationSetOptionValueResult_Base as PgCfg_SetOptionResult_Base -from ........src.implementation.v00.configuration_base import PostgresConfigurationSetOptionValueEventID as PgCfg_SetOptionEventID -from ........src.implementation.v00.configuration_base import PostgresConfigurationFileLine_Base as PgCfg_FileLine_Base -from ........src.implementation.v00.configuration_base import PostgresConfigurationTopLevelFile_Base as PgCfg_TopLevelFile_Base +from src.implementation.v00.configuration_base import PostgresConfigurationSetOptionValueResult_Base as PgCfg_SetOptionResult_Base +from src.implementation.v00.configuration_base import PostgresConfigurationSetOptionValueEventID as PgCfg_SetOptionEventID +from src.implementation.v00.configuration_base import PostgresConfigurationFileLine_Base as PgCfg_FileLine_Base +from src.implementation.v00.configuration_base import PostgresConfigurationTopLevelFile_Base as PgCfg_TopLevelFile_Base -from ........src.implementation.v00.configuration_base import PgCfgModel__ConfigurationData +from src.implementation.v00.configuration_base import PgCfgModel__ConfigurationData from .......TestServices import TestServices # fmt: on diff --git a/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationOption/set_ValueItem/test_set001__common.py b/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationOption/set_ValueItem/test_set001__common.py index 0e2470f..7c881f2 100644 --- a/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationOption/set_ValueItem/test_set001__common.py +++ b/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationOption/set_ValueItem/test_set001__common.py @@ -2,14 +2,14 @@ # Postgres Pro. PostgreSQL Configuration Python Library. Tests. # fmt: off -from ........src.implementation.v00.configuration_std import PostgresConfiguration_Std as PgCfg_Std +from src.implementation.v00.configuration_std import PostgresConfiguration_Std as PgCfg_Std -from ........src.implementation.v00.configuration_base import PostgresConfigurationSetOptionValueResult_Base as PgCfg_SetOptionResult_Base -from ........src.implementation.v00.configuration_base import PostgresConfigurationSetOptionValueEventID as PgCfg_SetOptionEventID -from ........src.implementation.v00.configuration_base import PostgresConfigurationFileLine_Base as PgCfg_FileLine_Base -from ........src.implementation.v00.configuration_base import PostgresConfigurationTopLevelFile_Base as PgCfg_TopLevelFile_Base +from src.implementation.v00.configuration_base import PostgresConfigurationSetOptionValueResult_Base as PgCfg_SetOptionResult_Base +from src.implementation.v00.configuration_base import PostgresConfigurationSetOptionValueEventID as PgCfg_SetOptionEventID +from src.implementation.v00.configuration_base import PostgresConfigurationFileLine_Base as PgCfg_FileLine_Base +from src.implementation.v00.configuration_base import PostgresConfigurationTopLevelFile_Base as PgCfg_TopLevelFile_Base -from ........src.implementation.v00.configuration_base import PgCfgModel__ConfigurationData +from src.implementation.v00.configuration_base import PgCfgModel__ConfigurationData from .......TestServices import TestServices # fmt: on diff --git a/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationReader_Base/LoadConfigurationFile/test_set001__common.py b/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationReader_Base/LoadConfigurationFile/test_set001__common.py index 7dbe27b..b7ff775 100644 --- a/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationReader_Base/LoadConfigurationFile/test_set001__common.py +++ b/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationReader_Base/LoadConfigurationFile/test_set001__common.py @@ -2,18 +2,18 @@ # Postgres Pro. PostgreSQL Configuration Python Library. Tests. # fmt: off -from ........src.implementation.v00.configuration_std import PostgresConfiguration_Std as PgCfg_Std +from src.implementation.v00.configuration_std import PostgresConfiguration_Std as PgCfg_Std -from ........src.implementation.v00.configuration_base import PostgresConfigurationFile_Base as PgCfg_File_Base -from ........src.implementation.v00.configuration_base import PostgresConfigurationTopLevelFile_Base as PgCfg_TopLevelFile_Base -from ........src.implementation.v00.configuration_base import PostgresConfigurationReader_Base as PgCfg_Reader_Base +from src.implementation.v00.configuration_base import PostgresConfigurationFile_Base as PgCfg_File_Base +from src.implementation.v00.configuration_base import PostgresConfigurationTopLevelFile_Base as PgCfg_TopLevelFile_Base +from src.implementation.v00.configuration_base import PostgresConfigurationReader_Base as PgCfg_Reader_Base -from ........src.implementation.v00.configuration_base import PostgresConfigurationFile as PgCfg_File +from src.implementation.v00.configuration_base import PostgresConfigurationFile as PgCfg_File -from ........src.implementation.v00.configuration_base import PgCfgModel__CommentData -from ........src.implementation.v00.configuration_base import PgCfgModel__OptionData -from ........src.implementation.v00.configuration_base import PgCfgModel__FileData -from ........src.implementation.v00.configuration_base import PgCfgModel__FileStatus +from src.implementation.v00.configuration_base import PgCfgModel__CommentData +from src.implementation.v00.configuration_base import PgCfgModel__OptionData +from src.implementation.v00.configuration_base import PgCfgModel__FileData +from src.implementation.v00.configuration_base import PgCfgModel__FileStatus from .......TestServices import TestServices # fmt: on diff --git a/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationReader_Base/LoadFileDataContent/test_set001__common.py b/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationReader_Base/LoadFileDataContent/test_set001__common.py index aa1987f..02a2ff3 100644 --- a/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationReader_Base/LoadFileDataContent/test_set001__common.py +++ b/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationReader_Base/LoadFileDataContent/test_set001__common.py @@ -2,13 +2,13 @@ # Postgres Pro. PostgreSQL Configuration Python Library. Tests. # fmt: off -from ........src.implementation.v00.configuration_std import PostgresConfiguration_Std as PgCfg_Std +from src.implementation.v00.configuration_std import PostgresConfiguration_Std as PgCfg_Std -from ........src.implementation.v00.configuration_base import PostgresConfigurationReader_Base as PgCfg_Reader_Base +from src.implementation.v00.configuration_base import PostgresConfigurationReader_Base as PgCfg_Reader_Base -from ........src.implementation.v00.configuration_base import PgCfgModel__CommentData -from ........src.implementation.v00.configuration_base import PgCfgModel__OptionData -from ........src.implementation.v00.configuration_base import PgCfgModel__IncludeData +from src.implementation.v00.configuration_base import PgCfgModel__CommentData +from src.implementation.v00.configuration_base import PgCfgModel__OptionData +from src.implementation.v00.configuration_base import PgCfgModel__IncludeData # fmt: on from .......TestServices import TestServices diff --git a/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationTopLevelFile/AddComment/test_set001__common.py b/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationTopLevelFile/AddComment/test_set001__common.py index c2a7b52..2ec5466 100644 --- a/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationTopLevelFile/AddComment/test_set001__common.py +++ b/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationTopLevelFile/AddComment/test_set001__common.py @@ -2,20 +2,20 @@ # Postgres Pro. PostgreSQL Configuration Python Library. Tests. # fmt: off -from ........src.implementation.v00.configuration_std import PostgresConfiguration_Std as PgCfg_Std +from src.implementation.v00.configuration_std import PostgresConfiguration_Std as PgCfg_Std -from ........src.implementation.v00.configuration_base import PostgresConfigurationFile_Base as PgCfg_File_Base -from ........src.implementation.v00.configuration_base import PostgresConfigurationTopLevelFile_Base as PgCfg_TopLevelFile_Base -from ........src.implementation.v00.configuration_base import PostgresConfigurationFileLine_Base as PgCfg_FileLine_Base -from ........src.implementation.v00.configuration_base import PostgresConfigurationComment_Base as PgCfg_Comment_Base -from ........src.implementation.v00.configuration_base import PostgresConfigurationFileLines_Base as PgCfg_FileLines_Base +from src.implementation.v00.configuration_base import PostgresConfigurationFile_Base as PgCfg_File_Base +from src.implementation.v00.configuration_base import PostgresConfigurationTopLevelFile_Base as PgCfg_TopLevelFile_Base +from src.implementation.v00.configuration_base import PostgresConfigurationFileLine_Base as PgCfg_FileLine_Base +from src.implementation.v00.configuration_base import PostgresConfigurationComment_Base as PgCfg_Comment_Base +from src.implementation.v00.configuration_base import PostgresConfigurationFileLines_Base as PgCfg_FileLines_Base -from ........src.implementation.v00.configuration_base import PgCfgModel__FileLineData -from ........src.implementation.v00.configuration_base import PgCfgModel__CommentData +from src.implementation.v00.configuration_base import PgCfgModel__FileLineData +from src.implementation.v00.configuration_base import PgCfgModel__CommentData -from ........src.abstract.v00.configuration import PostgresConfigurationComment as PgCfg_Comment -from ........src.abstract.v00.configuration import PostgresConfigurationFileLines as PgCfg_FileLines -from ........src.abstract.v00.configuration import PostgresConfigurationFile as PgCfg_File +from src.abstract.v00.configuration import PostgresConfigurationComment as PgCfg_Comment +from src.abstract.v00.configuration import PostgresConfigurationFileLines as PgCfg_FileLines +from src.abstract.v00.configuration import PostgresConfigurationFile as PgCfg_File # fmt: on from .......TestServices import TestServices diff --git a/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationTopLevelFile/AddEmptyLine/test_set001__common.py b/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationTopLevelFile/AddEmptyLine/test_set001__common.py index 4a666dd..3d72da1 100644 --- a/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationTopLevelFile/AddEmptyLine/test_set001__common.py +++ b/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationTopLevelFile/AddEmptyLine/test_set001__common.py @@ -2,14 +2,14 @@ # Postgres Pro. PostgreSQL Configuration Python Library. Tests. # fmt: off -from ........src.implementation.v00.configuration_std import PostgresConfiguration_Std as PgCfg_Std +from src.implementation.v00.configuration_std import PostgresConfiguration_Std as PgCfg_Std -from ........src.implementation.v00.configuration_base import PostgresConfigurationTopLevelFile_Base as PgCfg_TopLevelFile_Base -from ........src.implementation.v00.configuration_base import PostgresConfigurationFileLine_Base as PgCfg_FileLine_Base -from ........src.implementation.v00.configuration_base import PostgresConfigurationFileLines_Base as PgCfg_FileLines_Base +from src.implementation.v00.configuration_base import PostgresConfigurationTopLevelFile_Base as PgCfg_TopLevelFile_Base +from src.implementation.v00.configuration_base import PostgresConfigurationFileLine_Base as PgCfg_FileLine_Base +from src.implementation.v00.configuration_base import PostgresConfigurationFileLines_Base as PgCfg_FileLines_Base -from ........src.abstract.v00.configuration import PostgresConfigurationFileLine as PgCfg_FileLine -from ........src.abstract.v00.configuration import PostgresConfigurationFileLines as PgCfg_FileLines +from src.abstract.v00.configuration import PostgresConfigurationFileLine as PgCfg_FileLine +from src.abstract.v00.configuration import PostgresConfigurationFileLines as PgCfg_FileLines # fmt: on from .......TestServices import TestServices diff --git a/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationTopLevelFile/AddInclude/test_set001__common.py b/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationTopLevelFile/AddInclude/test_set001__common.py index 1bdfe8e..f39098b 100644 --- a/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationTopLevelFile/AddInclude/test_set001__common.py +++ b/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationTopLevelFile/AddInclude/test_set001__common.py @@ -2,14 +2,14 @@ # Postgres Pro. PostgreSQL Configuration Python Library. Tests. # fmt: off -from ........src.implementation.v00.configuration_std import PostgresConfiguration_Std as PgCfg_Std +from src.implementation.v00.configuration_std import PostgresConfiguration_Std as PgCfg_Std -from ........src.implementation.v00.configuration_base import PostgresConfigurationInclude_Base as PgCfg_Include_Base -from ........src.implementation.v00.configuration_base import PostgresConfigurationFile_Base as PgCfg_File_Base -from ........src.implementation.v00.configuration_base import PostgresConfigurationTopLevelFile_Base as PgCfg_TopLevelFile_Base +from src.implementation.v00.configuration_base import PostgresConfigurationInclude_Base as PgCfg_Include_Base +from src.implementation.v00.configuration_base import PostgresConfigurationFile_Base as PgCfg_File_Base +from src.implementation.v00.configuration_base import PostgresConfigurationTopLevelFile_Base as PgCfg_TopLevelFile_Base -from ........src.implementation.v00.configuration_base import PostgresConfigurationInclude as PgCfg_Include -from ........src.implementation.v00.configuration_base import PostgresConfigurationFile as PgCfg_File +from src.implementation.v00.configuration_base import PostgresConfigurationInclude as PgCfg_Include +from src.implementation.v00.configuration_base import PostgresConfigurationFile as PgCfg_File # fmt: on from .......TestServices import TestServices diff --git a/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationTopLevelFile/AddOption/test_set001__common.py b/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationTopLevelFile/AddOption/test_set001__common.py index 594bff5..0cbd925 100644 --- a/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationTopLevelFile/AddOption/test_set001__common.py +++ b/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationTopLevelFile/AddOption/test_set001__common.py @@ -2,13 +2,13 @@ # Postgres Pro. PostgreSQL Configuration Python Library. Tests. # fmt: off -from ........src.implementation.v00.configuration_std import PostgresConfiguration_Std as PgCfg_Std +from src.implementation.v00.configuration_std import PostgresConfiguration_Std as PgCfg_Std -from ........src.implementation.v00.configuration_base import PostgresConfigurationTopLevelFile_Base as PgCfg_TopLevelFile_Base -from ........src.implementation.v00.configuration_base import PostgresConfigurationOption_Base as PgCfg_Option_Base +from src.implementation.v00.configuration_base import PostgresConfigurationTopLevelFile_Base as PgCfg_TopLevelFile_Base +from src.implementation.v00.configuration_base import PostgresConfigurationOption_Base as PgCfg_Option_Base -from ........src.implementation.v00.configuration_base import PgCfgModel__FileData -from ........src.implementation.v00.configuration_base import PgCfgModel__OptionData +from src.implementation.v00.configuration_base import PgCfgModel__FileData +from src.implementation.v00.configuration_base import PgCfgModel__OptionData # fmt: on diff --git a/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationTopLevelFile/GetOptionValue/test_set001__common.py b/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationTopLevelFile/GetOptionValue/test_set001__common.py index 73810a9..eacacfb 100644 --- a/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationTopLevelFile/GetOptionValue/test_set001__common.py +++ b/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationTopLevelFile/GetOptionValue/test_set001__common.py @@ -2,7 +2,7 @@ # Postgres Pro. PostgreSQL Configuration Python Library. Tests. # fmt: off -from ........src.implementation.v00.configuration_std import PostgresConfiguration_Std as PgCfg_Std +from src.implementation.v00.configuration_std import PostgresConfiguration_Std as PgCfg_Std # fmt: on from .......TestServices import TestServices diff --git a/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationTopLevelFile/SetOptionValue/test_set001__common.py b/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationTopLevelFile/SetOptionValue/test_set001__common.py index 2683101..4627468 100644 --- a/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationTopLevelFile/SetOptionValue/test_set001__common.py +++ b/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationTopLevelFile/SetOptionValue/test_set001__common.py @@ -2,22 +2,22 @@ # Postgres Pro. PostgreSQL Configuration Python Library. Tests. # fmt: off -from ........src.implementation.v00.configuration_std import PostgresConfiguration_Std as PgCfg_Std - -from ........src.implementation.v00.configuration_base import PostgresConfiguration_Base as PgCfg_Base -from ........src.implementation.v00.configuration_base import PostgresConfigurationSetOptionValueResult_Base as PgCfg_SetOptionResult_Base -from ........src.implementation.v00.configuration_base import PostgresConfigurationSetOptionValueEventID as PgCfg_SetOptionEventID -from ........src.implementation.v00.configuration_base import PostgresConfigurationTopLevelFile_Base as PgCfg_TopLevelFile_Base -from ........src.implementation.v00.configuration_base import PostgresConfigurationOption_Base as PgCfg_Option_Base -from ........src.implementation.v00.configuration_base import PostgresConfigurationFile_Base as PgCfg_File_Base -from ........src.implementation.v00.configuration_base import PostgresConfigurationFileLine_Base as PgCfg_FileLine_Base - -from ........src.implementation.v00.configuration_base import PgCfgModel__FileData -from ........src.implementation.v00.configuration_base import PgCfgModel__FileLineData -from ........src.implementation.v00.configuration_base import PgCfgModel__OptionData - -from ........src.abstract.v00.configuration import PostgresConfiguration as PgCfg -from ........src.abstract.v00.configuration import PostgresConfigurationFile as PgCfg_File +from src.implementation.v00.configuration_std import PostgresConfiguration_Std as PgCfg_Std + +from src.implementation.v00.configuration_base import PostgresConfiguration_Base as PgCfg_Base +from src.implementation.v00.configuration_base import PostgresConfigurationSetOptionValueResult_Base as PgCfg_SetOptionResult_Base +from src.implementation.v00.configuration_base import PostgresConfigurationSetOptionValueEventID as PgCfg_SetOptionEventID +from src.implementation.v00.configuration_base import PostgresConfigurationTopLevelFile_Base as PgCfg_TopLevelFile_Base +from src.implementation.v00.configuration_base import PostgresConfigurationOption_Base as PgCfg_Option_Base +from src.implementation.v00.configuration_base import PostgresConfigurationFile_Base as PgCfg_File_Base +from src.implementation.v00.configuration_base import PostgresConfigurationFileLine_Base as PgCfg_FileLine_Base + +from src.implementation.v00.configuration_base import PgCfgModel__FileData +from src.implementation.v00.configuration_base import PgCfgModel__FileLineData +from src.implementation.v00.configuration_base import PgCfgModel__OptionData + +from src.abstract.v00.configuration import PostgresConfiguration as PgCfg +from src.abstract.v00.configuration import PostgresConfigurationFile as PgCfg_File # fmt: on from .......TestServices import TestServices diff --git a/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationTopLevelFile/SetOptionValueItem/test_set001__common.py b/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationTopLevelFile/SetOptionValueItem/test_set001__common.py index fcb6352..365793e 100644 --- a/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationTopLevelFile/SetOptionValueItem/test_set001__common.py +++ b/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationTopLevelFile/SetOptionValueItem/test_set001__common.py @@ -2,12 +2,12 @@ # Postgres Pro. PostgreSQL Configuration Python Library. Tests. # fmt: off -from ........src.implementation.v00.configuration_std import PostgresConfiguration_Std as PgCfg_Std +from src.implementation.v00.configuration_std import PostgresConfiguration_Std as PgCfg_Std -from ........src.implementation.v00.configuration_base import PostgresConfigurationSetOptionValueResult_Base as PgCfg_SetOptionResult_Base -from ........src.implementation.v00.configuration_base import PostgresConfigurationSetOptionValueEventID as PgCfg_SetOptionEventID +from src.implementation.v00.configuration_base import PostgresConfigurationSetOptionValueResult_Base as PgCfg_SetOptionResult_Base +from src.implementation.v00.configuration_base import PostgresConfigurationSetOptionValueEventID as PgCfg_SetOptionEventID -from ........src.implementation.v00.configuration_base import PgCfgModel__OptionData +from src.implementation.v00.configuration_base import PgCfgModel__OptionData # fmt: on from .......TestServices import TestServices diff --git a/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationTopLevelFile/get_Lines/test_set001__common.py b/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationTopLevelFile/get_Lines/test_set001__common.py index 62f18ae..39be4f8 100644 --- a/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationTopLevelFile/get_Lines/test_set001__common.py +++ b/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationTopLevelFile/get_Lines/test_set001__common.py @@ -2,19 +2,19 @@ # Postgres Pro. PostgreSQL Configuration Python Library. Tests. # fmt: off -from ........src.implementation.v00.configuration_std import PostgresConfiguration_Std as PgCfg_Std +from src.implementation.v00.configuration_std import PostgresConfiguration_Std as PgCfg_Std -from ........src.implementation.v00.configuration_base import PostgresConfigurationSetOptionValueResult_Base as PgCfg_SetOptionResult_Base -from ........src.implementation.v00.configuration_base import PostgresConfigurationTopLevelFile_Base as PgCfg_TopLevelFile_Base -from ........src.implementation.v00.configuration_base import PostgresConfigurationFileLine_Base as PgCfg_FileLine_Base -from ........src.implementation.v00.configuration_base import PostgresConfigurationFileLines_Base as PgCfg_FileLines_Base -from ........src.implementation.v00.configuration_base import PostgresConfigurationFileLinesIterator_Base as PgCfg_FileLinesIterator_Base +from src.implementation.v00.configuration_base import PostgresConfigurationSetOptionValueResult_Base as PgCfg_SetOptionResult_Base +from src.implementation.v00.configuration_base import PostgresConfigurationTopLevelFile_Base as PgCfg_TopLevelFile_Base +from src.implementation.v00.configuration_base import PostgresConfigurationFileLine_Base as PgCfg_FileLine_Base +from src.implementation.v00.configuration_base import PostgresConfigurationFileLines_Base as PgCfg_FileLines_Base +from src.implementation.v00.configuration_base import PostgresConfigurationFileLinesIterator_Base as PgCfg_FileLinesIterator_Base -from ........src.implementation.v00.configuration_base import PostgresConfigurationSetOptionValueResult as PgCfg_SetOptionResult +from src.implementation.v00.configuration_base import PostgresConfigurationSetOptionValueResult as PgCfg_SetOptionResult -from ........src.abstract.v00.configuration import PostgresConfigurationFileLine as PgCfg_FileLine -from ........src.abstract.v00.configuration import PostgresConfigurationFileLines as PgCfg_FileLines -from ........src.abstract.v00.configuration import PostgresConfigurationFileLinesIterator as PgCfg_FileLinesIterator +from src.abstract.v00.configuration import PostgresConfigurationFileLine as PgCfg_FileLine +from src.abstract.v00.configuration import PostgresConfigurationFileLines as PgCfg_FileLines +from src.abstract.v00.configuration import PostgresConfigurationFileLinesIterator as PgCfg_FileLinesIterator # fmt: on from .......TestServices import TestServices diff --git a/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationWriter_Base/DoWork/test_set001__work.py b/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationWriter_Base/DoWork/test_set001__work.py index 655884f..57bdb8f 100644 --- a/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationWriter_Base/DoWork/test_set001__work.py +++ b/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationWriter_Base/DoWork/test_set001__work.py @@ -2,17 +2,17 @@ # Postgres Pro. PostgreSQL Configuration Python Library. Tests. # fmt: off -from ........src.implementation.v00.configuration_std import PostgresConfiguration_Std as PgCfg_Std +from src.implementation.v00.configuration_std import PostgresConfiguration_Std as PgCfg_Std -from ........src.implementation.v00.configuration_base import PostgresConfigurationFile_Base as PgCfg_File_Base -from ........src.implementation.v00.configuration_base import PostgresConfigurationTopLevelFile_Base as PgCfg_TopLevelFile_Base -from ........src.implementation.v00.configuration_base import PostgresConfigurationWriter_Base as PgCfg_Writer_Base -from ........src.implementation.v00.configuration_base import PostgresConfigurationWriterCtx_Base as PgCfg_WriterCtx_Base +from src.implementation.v00.configuration_base import PostgresConfigurationFile_Base as PgCfg_File_Base +from src.implementation.v00.configuration_base import PostgresConfigurationTopLevelFile_Base as PgCfg_TopLevelFile_Base +from src.implementation.v00.configuration_base import PostgresConfigurationWriter_Base as PgCfg_Writer_Base +from src.implementation.v00.configuration_base import PostgresConfigurationWriterCtx_Base as PgCfg_WriterCtx_Base -from ........src.implementation.v00.configuration_base import PostgresConfigurationFile as PgCfg_File +from src.implementation.v00.configuration_base import PostgresConfigurationFile as PgCfg_File -from ........src.implementation.v00.configuration_base import PgCfgModel__FileData -from ........src.implementation.v00.configuration_base import PgCfgModel__FileStatus +from src.implementation.v00.configuration_base import PgCfgModel__FileData +from src.implementation.v00.configuration_base import PgCfgModel__FileStatus from .......TestServices import TestServices # fmt: on diff --git a/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationWriter_Base/test_set001__common.py b/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationWriter_Base/test_set001__common.py index a73af23..8f71c59 100644 --- a/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationWriter_Base/test_set001__common.py +++ b/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationWriter_Base/test_set001__common.py @@ -2,12 +2,12 @@ # Postgres Pro. PostgreSQL Configuration Python Library. Tests. # fmt: off -from .......src.implementation.v00.configuration_std import PostgresConfiguration_Std as PgCfg_Std +from src.implementation.v00.configuration_std import PostgresConfiguration_Std as PgCfg_Std -from .......src.implementation.v00.configuration_base import PostgresConfigurationWriter_Base as PgCfg_Writer_Base -from .......src.implementation.v00.configuration_base import PostgresConfigurationWriterCtx_Base as PgCfg_WriterCtx_Base +from src.implementation.v00.configuration_base import PostgresConfigurationWriter_Base as PgCfg_Writer_Base +from src.implementation.v00.configuration_base import PostgresConfigurationWriterCtx_Base as PgCfg_WriterCtx_Base -from .......src.implementation.v00.configuration_base import PgCfgModel__FileData +from src.implementation.v00.configuration_base import PgCfgModel__FileData from ......TestServices import TestServices # fmt: on diff --git a/tests/implementation/v00/configuration_std/Objects/PostgresConfiguration__AllFiles/GetFileByName/test_set001__common.py b/tests/implementation/v00/configuration_std/Objects/PostgresConfiguration__AllFiles/GetFileByName/test_set001__common.py index 6beaff8..0d210c6 100644 --- a/tests/implementation/v00/configuration_std/Objects/PostgresConfiguration__AllFiles/GetFileByName/test_set001__common.py +++ b/tests/implementation/v00/configuration_std/Objects/PostgresConfiguration__AllFiles/GetFileByName/test_set001__common.py @@ -2,9 +2,9 @@ # Postgres Pro. PostgreSQL Configuration Python Library. Tests. # fmt: off -from ........src.implementation.v00.configuration_std import PostgresConfiguration_Std as PgCfg_Std +from src.implementation.v00.configuration_std import PostgresConfiguration_Std as PgCfg_Std -from ........src.implementation.v00.configuration_base import PostgresConfigurationTopLevelFile_Base as PgCfg_TopLevelFile_Base +from src.implementation.v00.configuration_base import PostgresConfigurationTopLevelFile_Base as PgCfg_TopLevelFile_Base # fmt: on from .......TestServices import TestServices diff --git a/tests/implementation/v00/configuration_std/Options/STD/generic/bool_option/test_set001__common.py b/tests/implementation/v00/configuration_std/Options/STD/generic/bool_option/test_set001__common.py index 0b35ee6..1e9eed5 100644 --- a/tests/implementation/v00/configuration_std/Options/STD/generic/bool_option/test_set001__common.py +++ b/tests/implementation/v00/configuration_std/Options/STD/generic/bool_option/test_set001__common.py @@ -2,11 +2,11 @@ # Postgres Pro. PostgreSQL Configuration Python Library. Tests # fmt: off -from .........src.implementation.v00.configuration_std import PostgresConfiguration_Std as PgCfg_Std +from src.implementation.v00.configuration_std import PostgresConfiguration_Std as PgCfg_Std -from .........src.implementation.v00.configuration_base import PostgresConfigurationReader_Base as PgCfg_Reader_Base +from src.implementation.v00.configuration_base import PostgresConfigurationReader_Base as PgCfg_Reader_Base -from .........src.implementation.v00.configuration_base import PgCfgModel__OptionData +from src.implementation.v00.configuration_base import PgCfgModel__OptionData from ........TestServices import TestServices from ........CfgFileReader import CfgFileReader diff --git a/tests/implementation/v00/configuration_std/Options/STD/listen_addresses/test_set001__common.py b/tests/implementation/v00/configuration_std/Options/STD/listen_addresses/test_set001__common.py index 76b2b22..29f0624 100644 --- a/tests/implementation/v00/configuration_std/Options/STD/listen_addresses/test_set001__common.py +++ b/tests/implementation/v00/configuration_std/Options/STD/listen_addresses/test_set001__common.py @@ -2,10 +2,10 @@ # Postgres Pro. PostgreSQL Configuration Python Library. Tests. # fmt: off -from ........src.implementation.v00.configuration_std import PostgresConfiguration_Std as PgCfg_Std +from src.implementation.v00.configuration_std import PostgresConfiguration_Std as PgCfg_Std -from ........src.implementation.v00.configuration_base import PostgresConfigurationWriter_Base as PgCfg_Writer_Base -from ........src.implementation.v00.configuration_base import PostgresConfigurationWriterCtx_Base as PgCfg_WriterCtx_Base +from src.implementation.v00.configuration_base import PostgresConfigurationWriter_Base as PgCfg_Writer_Base +from src.implementation.v00.configuration_base import PostgresConfigurationWriterCtx_Base as PgCfg_WriterCtx_Base from .......TestServices import TestServices # fmt: on From 8229b7c837d3b7688feb1c26e61809b41de907bf Mon Sep 17 00:00:00 2001 From: "d.kovalenko" Date: Sun, 2 Nov 2025 10:12:14 +0300 Subject: [PATCH 2/5] Using typing.List, typing.Dict and typing.Set [py3.7] --- src/core/helpers.py | 2 +- src/core/model.py | 31 ++++++++++--------- ...prepare_get_value__std__unique_str_list.py | 7 +++-- ...handler_to_prepare_set_value__std__bool.py | 6 ++-- ...prepare_set_value__std__unique_str_list.py | 7 +++-- src/core/read_utils.py | 6 ++-- src/core/write_utils.py | 4 ++- src/implementation/v00/configuration_base.py | 20 +++++++----- tests/TestConfigHelper.py | 5 +-- tests/TestGlobalCache.py | 6 ++-- .../Unpack_StrList2/test_set001__common.py | 5 +-- .../Pack_StrList2/test_set001__common.py | 7 +++-- ...test_set001__generic_support_of_options.py | 13 ++++---- .../AddOption/test_set001__common.py | 3 +- .../GetOptionValue/test_set001__common.py | 3 +- .../SetOptionValue/test_set001__common.py | 9 +++--- .../SetOptionValueItem/test_set001__common.py | 5 +-- .../get_AllFiles/test_set001__common.py | 3 +- .../get_AllOptions/test_set001__common.py | 5 +-- .../AddComment/test_set001__common.py | 2 +- .../AddInclude/test_set001__common.py | 2 +- .../AddOption/test_set001__common.py | 2 +- .../Mix/test_set001__common.py | 3 +- .../test_set001__common.py | 19 ++++++------ .../AddEmptyLine/test_set001__common.py | 2 +- .../GetOptionValue/test_set001__common.py | 3 +- .../SetOptionValue/test_set001__common.py | 3 +- .../test_set001__common.py | 3 +- 28 files changed, 109 insertions(+), 77 deletions(-) diff --git a/src/core/helpers.py b/src/core/helpers.py index 1a018ed..b938226 100644 --- a/src/core/helpers.py +++ b/src/core/helpers.py @@ -27,7 +27,7 @@ def ExtractOptionDataName(option: typing.Union[str, OptionData]) -> str: # -------------------------------------------------------------------- def ExtractFirstOptionFromIndexItem( - optionName: str, indexItem: typing.Union[OptionData, list[OptionData]] + optionName: str, indexItem: typing.Union[OptionData, typing.List[OptionData]] ) -> OptionData: assert type(optionName) == str diff --git a/src/core/model.py b/src/core/model.py index 36034cf..901b8ca 100644 --- a/src/core/model.py +++ b/src/core/model.py @@ -155,7 +155,7 @@ def __init__(self, element: FileLineElementData): # -------------------------------------------------------------------- m_Parent: FileData - m_Items: list[tagItem] + m_Items: typing.List[tagItem] # -------------------------------------------------------------------- def __init__(self, parent: FileData): @@ -164,7 +164,7 @@ def __init__(self, parent: FileData): super().__init__() self.m_Parent = parent - self.m_Items = list[__class__.tagItem]() + self.m_Items = list() # own interface ------------------------------------------------------ def MarkAsDeletedFrom(self, fileData: FileData) -> None: @@ -206,9 +206,9 @@ class FileData(ObjectData): m_LastModifiedTimestamp: typing.Optional[datetime.datetime] m_Path: str - m_Lines: list[FileLineData] + m_Lines: typing.List[FileLineData] - m_OptionsByName: dict[str, OptionData] + m_OptionsByName: typing.Dict[str, OptionData] # -------------------------------------------------------------------- def __init__(self, parent: ConfigurationData, path: str): @@ -226,9 +226,10 @@ def __init__(self, parent: ConfigurationData, path: str): self.m_LastModifiedTimestamp = None self.m_Path = path - self.m_Lines = list[FileLineData]() + self.m_Lines = list() - self.m_OptionsByName = dict[str, OptionData]() + self.m_OptionsByName = dict() + assert type(self.m_OptionsByName) == dict assert type(self.m_Path) == str assert self.m_Path != "" @@ -254,10 +255,10 @@ class ConfigurationData(ObjectData): m_DataDir: str m_OsOps: ConfigurationOsOps - m_Files: list[FileData] + m_Files: typing.List[FileData] - m_AllOptionsByName: dict[str, typing.Union[OptionData, list[OptionData]]] - m_AllFilesByName: dict[str, typing.Union[FileData, list[FileData]]] + m_AllOptionsByName: typing.Dict[str, typing.Union[OptionData, typing.List[OptionData]]] + m_AllFilesByName: typing.Dict[str, typing.Union[FileData, typing.List[FileData]]] # -------------------------------------------------------------------- def __init__(self, data_dir: str, osOps: ConfigurationOsOps): @@ -269,11 +270,13 @@ def __init__(self, data_dir: str, osOps: ConfigurationOsOps): self.m_DataDir = data_dir self.m_OsOps = osOps - self.m_Files = list[FileData]() - self.m_AllOptionsByName = dict[ - str, typing.Union[OptionData, list[OptionData]] - ]() - self.m_AllFilesByName = dict[str, typing.Union[FileData, list[FileData]]]() + self.m_Files = list() + self.m_AllOptionsByName = dict + self.m_AllFilesByName = dict + + assert type(self.m_Files) == list + assert type(self.m_AllOptionsByName) == dict + assert type(self.m_AllFilesByName) == dict # Own interface ------------------------------------------------------ @property diff --git a/src/core/option/handlers/prepare_get_value/option_handler_to_prepare_get_value__std__unique_str_list.py b/src/core/option/handlers/prepare_get_value/option_handler_to_prepare_get_value__std__unique_str_list.py index fe301ab..9be26f8 100644 --- a/src/core/option/handlers/prepare_get_value/option_handler_to_prepare_get_value__std__unique_str_list.py +++ b/src/core/option/handlers/prepare_get_value/option_handler_to_prepare_get_value__std__unique_str_list.py @@ -7,6 +7,8 @@ from ....handlers import OptionHandlerCtxToPrepareGetValue from ....handlers import ConfigurationDataHandler +import typing + # ////////////////////////////////////////////////////////////////////////////// # OptionHandlerToPrepareGetValue__Std__UniqueStrList @@ -25,9 +27,8 @@ def PrepareGetValue(self, ctx: OptionHandlerCtxToPrepareGetValue) -> any: assert ctx.OptionValue is not None assert type(ctx.OptionValue) == list - result = list[str]() - - index = set[str]() + result: typing.List[str] = list() + index: set[str] = set() for x in ctx.OptionValue: assert x is not None diff --git a/src/core/option/handlers/prepare_set_value/option_handler_to_prepare_set_value__std__bool.py b/src/core/option/handlers/prepare_set_value/option_handler_to_prepare_set_value__std__bool.py index c0f0089..67e75d8 100644 --- a/src/core/option/handlers/prepare_set_value/option_handler_to_prepare_set_value__std__bool.py +++ b/src/core/option/handlers/prepare_set_value/option_handler_to_prepare_set_value__std__bool.py @@ -9,6 +9,8 @@ from ....handlers import OptionHandlerCtxToPrepareSetValue from ....handlers import ConfigurationDataHandler +import typing + # ////////////////////////////////////////////////////////////////////////////// # OptionHandlerToPrepareSetValue__Std__Bool @@ -84,7 +86,7 @@ def PrepareSetValue(self, ctx: OptionHandlerCtxToPrepareSetValue) -> any: C_MIN_STR_VALUE_LENGTH = 1 C_MAX_STR_VALUE_LENGTH = 5 - sm_Str_False: list[str] = [ + sm_Str_False: typing.List[str] = [ "of", "off", "f", @@ -97,7 +99,7 @@ def PrepareSetValue(self, ctx: OptionHandlerCtxToPrepareSetValue) -> any: "0", ] - sm_Str_True: list[str] = [ + sm_Str_True: typing.List[str] = [ "on", "t", "tr", diff --git a/src/core/option/handlers/prepare_set_value/option_handler_to_prepare_set_value__std__unique_str_list.py b/src/core/option/handlers/prepare_set_value/option_handler_to_prepare_set_value__std__unique_str_list.py index 602c8e3..49daae4 100755 --- a/src/core/option/handlers/prepare_set_value/option_handler_to_prepare_set_value__std__unique_str_list.py +++ b/src/core/option/handlers/prepare_set_value/option_handler_to_prepare_set_value__std__unique_str_list.py @@ -11,6 +11,8 @@ from ....read_utils import ReadUtils +import typing + # ////////////////////////////////////////////////////////////////////////////// # OptionHandlerToPrepareSetValue__Std__UniqueStrList @@ -36,9 +38,8 @@ def PrepareSetValue(self, ctx: OptionHandlerCtxToPrepareSetValue) -> any: assert type(result) == list return result elif typeOfOptionValue == list: - result = list[str]() - - index = set[str]() + result: typing.List[str] = list() + index: typing.Set[str] = set() for x in ctx.OptionValue: if x is None: diff --git a/src/core/read_utils.py b/src/core/read_utils.py index edc2585..db55c4c 100644 --- a/src/core/read_utils.py +++ b/src/core/read_utils.py @@ -165,7 +165,7 @@ def IsValidSeqCh2(ch: str) -> bool: return __class__.IsValidSeqCh1(ch) # -------------------------------------------------------------------- - def Unpack_StrList2(source: str) -> list[str]: + def Unpack_StrList2(source: str) -> typing.List[str]: assert source is not None assert type(source) == str @@ -184,8 +184,8 @@ class tagCtx: ctx.mode = C_MODE__NONE ctx.curValueItem = None ctx.dataLength = 0 - ctx.result = list[str]() - ctx.index = set[str]() + ctx.result = list() + ctx.index = set() i = 0 length = len(source) diff --git a/src/core/write_utils.py b/src/core/write_utils.py index cd05575..d906724 100644 --- a/src/core/write_utils.py +++ b/src/core/write_utils.py @@ -1,6 +1,7 @@ # ////////////////////////////////////////////////////////////////////////////// # Postgres Pro. PostgreSQL Configuration Python Library. +import typing # ////////////////////////////////////////////////////////////////////////////// # class WriteUtils @@ -14,7 +15,8 @@ def Pack_StrList2(strList: list) -> str: result = "" sep = "" - index = set[str]() + index: typing.Set[str] = set() + assert type(index) == set for x in strList: assert x is not None diff --git a/src/implementation/v00/configuration_base.py b/src/implementation/v00/configuration_base.py index 22285a2..40d55f9 100644 --- a/src/implementation/v00/configuration_base.py +++ b/src/implementation/v00/configuration_base.py @@ -3005,7 +3005,8 @@ def Debug__CheckOurObjectData(self, data: PgCfgModel__ObjectData): assert data is not None assert isinstance(data, PgCfgModel__ObjectData) - stack = set[PgCfgModel__ObjectData]() + stack: typing.Set[PgCfgModel__ObjectData] = set() + assert type(stack) == set ptr = data while ptr is not self.m_Data: @@ -3030,7 +3031,8 @@ def GetObject( assert isinstance(objectData, PgCfgModel__ObjectData) # Build stack - stack = list[PostgresConfigurationObject]() + stack: typing.List[PostgresConfigurationObject] = [] + while True: stack.append(objectData) @@ -3165,7 +3167,7 @@ def LoadConfigurationFile( assert type(filePath) == str assert filePath != "" - existFileDatas = dict[str, PgCfgModel__FileData]() + existFileDatas: typing.Dict[str, PgCfgModel__FileData] = dict() for fileName in cfg.m_Data.m_AllFilesByName.keys(): assert type(fileName) == str @@ -3212,7 +3214,7 @@ def LoadConfigurationFile( assert rootFile.m_FileData.m_LastModifiedTimestamp is None assert len(rootFile.m_FileData.m_Lines) == 0 - queuedFileDatas = set[PgCfgModel__FileData]() + queuedFileDatas: typing.Set[PgCfgModel__FileData] = set() queuedFileDatas.add(rootFile.m_FileData) @@ -3757,9 +3759,13 @@ def __init__(self, cfg: PostgresConfiguration_Base): self.Cfg = cfg - self.AllFiles = list[PostgresConfigurationWriterFileCtx_Base]() - self.NewFiles = list[PostgresConfigurationWriterFileCtx_Base]() - self.UpdFiles = list[PostgresConfigurationWriterFileCtx_Base]() + self.AllFiles = list() + self.NewFiles = list() + self.UpdFiles = list() + + assert type(self.AllFiles) == list + assert type(self.NewFiles) == list + assert type(self.UpdFiles) == list # -------------------------------------------------------------------- def Init(self): diff --git a/tests/TestConfigHelper.py b/tests/TestConfigHelper.py index bac3c58..6a58538 100644 --- a/tests/TestConfigHelper.py +++ b/tests/TestConfigHelper.py @@ -5,6 +5,7 @@ from .ThrowError import ThrowError import os +import typing # ///////////////////////////////////////////////////////////////////////////// # TestConfigHelper @@ -20,9 +21,9 @@ def NoCleanup() -> bool: return __class__.Helper__ToBoolean(v, TestConfigPropNames.TEST_CFG__NO_CLEANUP) # Helper methods ----------------------------------------------------- - sm_YES: list[str] = ["1", "TRUE", "YES"] + sm_YES: typing.List[str] = ["1", "TRUE", "YES"] - sm_NO: list[str] = ["0", "FALSE", "NO"] + sm_NO: typing.List[str] = ["0", "FALSE", "NO"] # -------------------------------------------------------------------- def Helper__ToBoolean(v, envVarName: str) -> bool: diff --git a/tests/TestGlobalCache.py b/tests/TestGlobalCache.py index 83abc28..7ea7e6d 100644 --- a/tests/TestGlobalCache.py +++ b/tests/TestGlobalCache.py @@ -3,6 +3,7 @@ import logging import threading +import typing from .TestGlobalResource import TestGlobalResource @@ -12,7 +13,7 @@ class TestGlobalCache: sm_Guard = threading.Lock() - sm_Dict: dict[str, any] = dict[str, any]() + sm_Dict: typing.Dict[str, any] = dict # -------------------------------------------------------------------- def __init__(self): @@ -42,7 +43,8 @@ def ReleaseAllResources(): assert isinstance(__class__.sm_Dict, dict) with __class__.sm_Guard: - emptyDict = dict[str, any]() + emptyDict: typing.Dict[str, any] = dict() + assert type(emptyDict) == dict curDict = __class__.sm_Dict diff --git a/tests/core/configuration/read_utils/ReadUtils/Unpack_StrList2/test_set001__common.py b/tests/core/configuration/read_utils/ReadUtils/Unpack_StrList2/test_set001__common.py index d0dc46c..cdae232 100644 --- a/tests/core/configuration/read_utils/ReadUtils/Unpack_StrList2/test_set001__common.py +++ b/tests/core/configuration/read_utils/ReadUtils/Unpack_StrList2/test_set001__common.py @@ -4,6 +4,7 @@ from src.core.read_utils import ReadUtils import pytest +import typing # ////////////////////////////////////////////////////////////////////////////// # TestSet001__Common @@ -17,9 +18,9 @@ def test_001__empty(self): class tagData002: descr: str source: str - result: list[str] + result: typing.List[str] - def __init__(self, d: str, s: str, r: list[str]): + def __init__(self, d: str, s: str, r: typing.List[str]): assert type(d) == str assert type(s) == str assert type(r) == list diff --git a/tests/core/configuration/write_utils/WriteUtils/Pack_StrList2/test_set001__common.py b/tests/core/configuration/write_utils/WriteUtils/Pack_StrList2/test_set001__common.py index 3e8a394..5b8e8c4 100644 --- a/tests/core/configuration/write_utils/WriteUtils/Pack_StrList2/test_set001__common.py +++ b/tests/core/configuration/write_utils/WriteUtils/Pack_StrList2/test_set001__common.py @@ -4,6 +4,7 @@ from src.core.write_utils import WriteUtils import pytest +import typing # ////////////////////////////////////////////////////////////////////////////// # TestSet001__Common @@ -11,15 +12,15 @@ class TestSet001__Common: def test_001__empty(self): - assert WriteUtils.Pack_StrList2(list[str]()) == "" + assert WriteUtils.Pack_StrList2([]) == "" # -------------------------------------------------------------------- class tagData002: descr: str - source: list[str] + source: typing.List[str] result: str - def __init__(self, d: str, s: list[str], r: str): + def __init__(self, d: str, s: typing.List[str], r: str): assert type(d) == str assert type(s) == list assert type(r) == str diff --git a/tests/implementation/v00/configuration_std/Mix/test_set001__generic_support_of_options.py b/tests/implementation/v00/configuration_std/Mix/test_set001__generic_support_of_options.py index dbd1211..34e7c17 100644 --- a/tests/implementation/v00/configuration_std/Mix/test_set001__generic_support_of_options.py +++ b/tests/implementation/v00/configuration_std/Mix/test_set001__generic_support_of_options.py @@ -11,6 +11,7 @@ # fmt: on import pytest +import typing import os # ////////////////////////////////////////////////////////////////////////////// @@ -18,7 +19,7 @@ class TestSet001__GenericSupportOfOptions: - sm_data001: list[tuple[str, any, any]] = [ + sm_data001: typing.List[typing.Tuple[str, any, any]] = [ ("int", 0, 0), ("str__empty", "", ""), ("bool_prop_true", True, True), @@ -27,7 +28,7 @@ class TestSet001__GenericSupportOfOptions: # -------------------------------------------------------------------- @pytest.fixture(params=sm_data001, ids=[x[0] for x in sm_data001]) - def data001(self, request: pytest.FixtureRequest) -> tuple[any, any]: + def data001(self, request: pytest.FixtureRequest) -> typing.Tuple[any, any]: assert isinstance(request, pytest.FixtureRequest) assert type(request.param) == tuple assert len(request.param) == 3 @@ -35,7 +36,7 @@ def data001(self, request: pytest.FixtureRequest) -> tuple[any, any]: # -------------------------------------------------------------------- def test_001__set_get( - self, request: pytest.FixtureRequest, data001: tuple[any, any] + self, request: pytest.FixtureRequest, data001: typing.Tuple[any, any] ): assert isinstance(request, pytest.FixtureRequest) @@ -49,7 +50,7 @@ def test_001__set_get( assert cfg.GetOptionValue("a") == data001[1] # -------------------------------------------------------------------- - sm_data002: list[tuple[str, any, any]] = [ + sm_data002: typing.List[typing.Tuple[str, any, any]] = [ ("int", 0, "0"), ("str__empty", "", ""), ("bool_prop_true", True, "on"), @@ -58,7 +59,7 @@ def test_001__set_get( # -------------------------------------------------------------------- @pytest.fixture(params=sm_data002, ids=[x[0] for x in sm_data002]) - def data002(self, request: pytest.FixtureRequest) -> tuple[any, any]: + def data002(self, request: pytest.FixtureRequest) -> typing.Tuple[any, any]: assert isinstance(request, pytest.FixtureRequest) assert type(request.param) == tuple assert len(request.param) == 3 @@ -66,7 +67,7 @@ def data002(self, request: pytest.FixtureRequest) -> tuple[any, any]: # -------------------------------------------------------------------- def test_002__write_and_read( - self, request: pytest.FixtureRequest, data002: tuple[any, any] + self, request: pytest.FixtureRequest, data002: typing.Tuple[any, any] ): assert isinstance(request, pytest.FixtureRequest) assert type(data002) == tuple diff --git a/tests/implementation/v00/configuration_std/Objects/PostgresConfiguration/AddOption/test_set001__common.py b/tests/implementation/v00/configuration_std/Objects/PostgresConfiguration/AddOption/test_set001__common.py index 009a234..58c3eb5 100644 --- a/tests/implementation/v00/configuration_std/Objects/PostgresConfiguration/AddOption/test_set001__common.py +++ b/tests/implementation/v00/configuration_std/Objects/PostgresConfiguration/AddOption/test_set001__common.py @@ -20,6 +20,7 @@ # fmt: on import pytest +import typing import os import re @@ -28,7 +29,7 @@ class TestSet001__Common: - sm_OPTS001: list[str] = ["port", "proxima.port"] + sm_OPTS001: typing.List[str] = ["port", "proxima.port"] # -------------------------------------------------------------------- @pytest.mark.parametrize("optName", sm_OPTS001, ids=lambda x: f"{x}") diff --git a/tests/implementation/v00/configuration_std/Objects/PostgresConfiguration/GetOptionValue/test_set001__common.py b/tests/implementation/v00/configuration_std/Objects/PostgresConfiguration/GetOptionValue/test_set001__common.py index 75b4eb4..37698ad 100644 --- a/tests/implementation/v00/configuration_std/Objects/PostgresConfiguration/GetOptionValue/test_set001__common.py +++ b/tests/implementation/v00/configuration_std/Objects/PostgresConfiguration/GetOptionValue/test_set001__common.py @@ -15,6 +15,7 @@ from .......TestServices import TestServices import pytest +import typing import re # ////////////////////////////////////////////////////////////////////////////// @@ -22,7 +23,7 @@ class TestSet001__Common: - sm_OPTS001: list[str] = ["port", "proxima.port"] + sm_OPTS001: typing.List[str] = ["port", "proxima.port"] @pytest.mark.parametrize("optName", sm_OPTS001, ids=lambda x: f"{x}") def test_001__port(self, request: pytest.FixtureRequest, optName: str): diff --git a/tests/implementation/v00/configuration_std/Objects/PostgresConfiguration/SetOptionValue/test_set001__common.py b/tests/implementation/v00/configuration_std/Objects/PostgresConfiguration/SetOptionValue/test_set001__common.py index f3e5bf3..10eeea0 100644 --- a/tests/implementation/v00/configuration_std/Objects/PostgresConfiguration/SetOptionValue/test_set001__common.py +++ b/tests/implementation/v00/configuration_std/Objects/PostgresConfiguration/SetOptionValue/test_set001__common.py @@ -25,6 +25,7 @@ # fmt: on import pytest +import typing import os import re @@ -33,7 +34,7 @@ class TestSet001__Common: - sm_OPTS001: list[str] = ["port", "proxima.port"] + sm_OPTS001: typing.List[str] = ["port", "proxima.port"] # -------------------------------------------------------------------- @pytest.mark.parametrize("optName", sm_OPTS001, ids=lambda x: f"{x}") @@ -405,14 +406,14 @@ def test_011__empty_name(self, request: pytest.FixtureRequest): cfg.SetOptionValue("", 123) # -------------------------------------------------------------------- - sm_data012__values: list[tuple[str, str, any, any]] = [ + sm_data012__values: typing.List[typing.Tuple[str, str, any, any]] = [ ("port-int_int", "port", 123, 123), ("port-str_int", "port", "321", 321), ] # -------------------------------------------------------------------- @pytest.fixture(params=sm_data012__values, ids=[x[0] for x in sm_data012__values]) - def data012(self, request: pytest.FixtureRequest) -> tuple[str, any, any]: + def data012(self, request: pytest.FixtureRequest) -> typing.Tuple[str, any, any]: assert isinstance(request, pytest.FixtureRequest) assert type(request.param) == tuple assert len(request.param) == 4 @@ -421,7 +422,7 @@ def data012(self, request: pytest.FixtureRequest) -> tuple[str, any, any]: # -------------------------------------------------------------------- def test_012__one_opt( - self, request: pytest.FixtureRequest, data012: tuple[str, any, any] + self, request: pytest.FixtureRequest, data012: typing.Tuple[str, any, any] ): assert isinstance(request, pytest.FixtureRequest) assert type(data012) == tuple diff --git a/tests/implementation/v00/configuration_std/Objects/PostgresConfiguration/SetOptionValueItem/test_set001__common.py b/tests/implementation/v00/configuration_std/Objects/PostgresConfiguration/SetOptionValueItem/test_set001__common.py index e99aa40..7fb7e71 100644 --- a/tests/implementation/v00/configuration_std/Objects/PostgresConfiguration/SetOptionValueItem/test_set001__common.py +++ b/tests/implementation/v00/configuration_std/Objects/PostgresConfiguration/SetOptionValueItem/test_set001__common.py @@ -13,6 +13,7 @@ from .......TestServices import TestServices import pytest +import typing import logging import re @@ -78,9 +79,9 @@ def test_002(self, request: pytest.FixtureRequest): cfg = PgCfg_Std(TestServices.GetRootTmpDir()) - expectedValue = list[str]() + expectedValue: typing.List[str] = list() - index = set[str]() + index: typing.Set[str] = set() for iOptValue in range(len(optValues)): optValue = optValues[iOptValue] diff --git a/tests/implementation/v00/configuration_std/Objects/PostgresConfiguration/get_AllFiles/test_set001__common.py b/tests/implementation/v00/configuration_std/Objects/PostgresConfiguration/get_AllFiles/test_set001__common.py index 8e9bb7e..658c36f 100644 --- a/tests/implementation/v00/configuration_std/Objects/PostgresConfiguration/get_AllFiles/test_set001__common.py +++ b/tests/implementation/v00/configuration_std/Objects/PostgresConfiguration/get_AllFiles/test_set001__common.py @@ -15,6 +15,7 @@ from .......TestServices import TestServices import pytest +import typing import os # ////////////////////////////////////////////////////////////////////////////// @@ -40,7 +41,7 @@ def test_000(self, request: pytest.FixtureRequest): assert allFiles2 is allFiles1 # check cache # -------------------------------------------------------------------- - sm_OPTS001: list[str] = ["port", "proxima.port"] + sm_OPTS001: typing.List[str] = ["port", "proxima.port"] @pytest.mark.parametrize("optName", sm_OPTS001, ids=lambda x: f"{x}") def test_001(self, request: pytest.FixtureRequest, optName: str): diff --git a/tests/implementation/v00/configuration_std/Objects/PostgresConfiguration/get_AllOptions/test_set001__common.py b/tests/implementation/v00/configuration_std/Objects/PostgresConfiguration/get_AllOptions/test_set001__common.py index e134f83..71cad3b 100644 --- a/tests/implementation/v00/configuration_std/Objects/PostgresConfiguration/get_AllOptions/test_set001__common.py +++ b/tests/implementation/v00/configuration_std/Objects/PostgresConfiguration/get_AllOptions/test_set001__common.py @@ -16,6 +16,7 @@ from .......TestServices import TestServices import pytest +import typing # ////////////////////////////////////////////////////////////////////////////// # TestSet001__Common @@ -40,7 +41,7 @@ def test_000(self, request: pytest.FixtureRequest): assert allOptions2 is allOptions1 # check cache # -------------------------------------------------------------------- - sm_OPTS001: list[str] = ["port", "proxima.port"] + sm_OPTS001: typing.List[str] = ["port", "proxima.port"] @pytest.mark.parametrize("optName", sm_OPTS001, ids=lambda x: f"{x}") def test_001(self, request: pytest.FixtureRequest, optName: str): @@ -135,7 +136,7 @@ def test_004__two_options(self, request: pytest.FixtureRequest): assert len(cfg.get_AllOptions()) == 2 - names = set[str]() + names: typing.Set[str] = set() for opt in cfg.get_AllOptions(): assert opt is not None diff --git a/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationFileLine/AddComment/test_set001__common.py b/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationFileLine/AddComment/test_set001__common.py index c7a4de0..4b68392 100644 --- a/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationFileLine/AddComment/test_set001__common.py +++ b/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationFileLine/AddComment/test_set001__common.py @@ -19,7 +19,7 @@ class TestSet001__Common: - sm_data001__offsets: list[typing.Optional[int]] = [None, 1, 2, 3, 10] + sm_data001__offsets: typing.List[typing.Optional[int]] = [None, 1, 2, 3, 10] # -------------------------------------------------------------------- @pytest.fixture( diff --git a/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationFileLine/AddInclude/test_set001__common.py b/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationFileLine/AddInclude/test_set001__common.py index 65a30ec..7821a6e 100644 --- a/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationFileLine/AddInclude/test_set001__common.py +++ b/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationFileLine/AddInclude/test_set001__common.py @@ -24,7 +24,7 @@ class TestSet001__Common: - sm_data001__offsets: list[typing.Optional[int]] = [None, 1, 2, 3, 10] + sm_data001__offsets: typing.List[typing.Optional[int]] = [None, 1, 2, 3, 10] # -------------------------------------------------------------------- @pytest.fixture( diff --git a/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationFileLine/AddOption/test_set001__common.py b/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationFileLine/AddOption/test_set001__common.py index 99b8bcb..84f8cbe 100644 --- a/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationFileLine/AddOption/test_set001__common.py +++ b/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationFileLine/AddOption/test_set001__common.py @@ -20,7 +20,7 @@ class TestSet001__Common: - sm_data001__offsets: list[typing.Optional[int]] = [None, 1, 2, 3, 10] + sm_data001__offsets: typing.List[typing.Optional[int]] = [None, 1, 2, 3, 10] # -------------------------------------------------------------------- @pytest.fixture( diff --git a/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationOption/Mix/test_set001__common.py b/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationOption/Mix/test_set001__common.py index cbdf621..804c80c 100644 --- a/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationOption/Mix/test_set001__common.py +++ b/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationOption/Mix/test_set001__common.py @@ -15,6 +15,7 @@ # fmt: on import pytest +import typing import re # ////////////////////////////////////////////////////////////////////////////// @@ -22,7 +23,7 @@ class TestSet001__Common: - sm_OPTS001: list[str] = ["port", "proxima.port"] + sm_OPTS001: typing.List[str] = ["port", "proxima.port"] @pytest.mark.parametrize("optName", sm_OPTS001, ids=lambda x: f"{x}") def test_001(self, request: pytest.FixtureRequest, optName: str): diff --git a/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationReader_Base/LoadFileDataContent/test_set001__common.py b/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationReader_Base/LoadFileDataContent/test_set001__common.py index 02a2ff3..9933181 100644 --- a/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationReader_Base/LoadFileDataContent/test_set001__common.py +++ b/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationReader_Base/LoadFileDataContent/test_set001__common.py @@ -15,6 +15,7 @@ from .......CfgFileReader import CfgFileReader import pytest +import typing import re import os @@ -132,7 +133,7 @@ def test_102__two_comments(self, request: pytest.FixtureRequest): assert fileLineData1.m_Items[0].m_Element.m_Text == "comment2" # -------------------------------------------------------------------- - sm_data201__assign: list[tuple[str, str]] = [ + sm_data201__assign: typing.List[typing.Tuple[str, str]] = [ ("assign", "="), ("space", " "), ("tab", "\t"), @@ -230,7 +231,7 @@ def test_203__option__without_assign(self, request: pytest.FixtureRequest): assert fileLineData0.m_Items[0].m_Element.m_Value == 234 # -------------------------------------------------------------------- - sm_data204: list[tuple[str, str]] = [ + sm_data204: typing.List[typing.Tuple[str, str]] = [ ("EOF", ""), ("EOL", "\n"), ("space_and_EOF", " "), @@ -414,7 +415,7 @@ def test_303__optionQ__two_quote(self, request: pytest.FixtureRequest): assert fileLineData0.m_Items[0].m_Element.m_Value == "'" # -------------------------------------------------------------------- - sm_endData304: list[tuple[str, str, str]] = [ + sm_endData304: typing.List[typing.Tuple[str, str, str]] = [ ("b", "\\b", "\b"), ("f", "\\f", "\f"), ("n", "\\n", "\n"), @@ -430,7 +431,7 @@ def test_303__optionQ__two_quote(self, request: pytest.FixtureRequest): # -------------------------------------------------------------------- @pytest.fixture(params=sm_endData304, ids=[x[0] for x in sm_endData304]) - def endData304(self, request: pytest.FixtureRequest) -> tuple[str, str, str]: + def endData304(self, request: pytest.FixtureRequest) -> typing.Tuple[str, str, str]: assert isinstance(request, pytest.FixtureRequest) assert type(request.param) == tuple assert len(request.param) == 3 @@ -465,7 +466,7 @@ def test_304__optionQ__escape( assert fileLineData0.m_Items[0].m_Element.m_Value == endData304[2] # -------------------------------------------------------------------- - sm_data3E01: list[tuple[str, str]] = [ + sm_data3E01: typing.List[typing.Tuple[str, str]] = [ ("EOF", ""), ("EOL", "\n"), ("space_EOF", " "), @@ -507,7 +508,7 @@ def test_3E01__optionQ__no_end_quote( PgCfg_Reader_Base.LoadFileContent(file1, src) # -------------------------------------------------------------------- - sm_data3E02: list[tuple[str, str]] = [ + sm_data3E02: typing.List[typing.Tuple[str, str]] = [ ("EOF", ""), ("EOL", "\n"), ] @@ -611,7 +612,7 @@ def test_4E01__empty_path(self, request: pytest.FixtureRequest): PgCfg_Reader_Base.LoadFileContent(file1, src) # -------------------------------------------------------------------- - sm_dataE4E02: list[tuple[str, str]] = [ + sm_dataE4E02: typing.List[typing.Tuple[str, str]] = [ ("EOF", ""), ("EOL", "\n"), ("a_EOF", "a"), @@ -665,7 +666,7 @@ def test_4E03__unknown_escape_symbol(self, request: pytest.FixtureRequest): PgCfg_Reader_Base.LoadFileContent(file1, src) # -------------------------------------------------------------------- - sm_dataE4E04: list[tuple[str, str]] = [ + sm_dataE4E04: typing.List[typing.Tuple[str, str]] = [ ("EOF", ""), ("EOL", "\n"), ] @@ -696,7 +697,7 @@ def test_4E04__incompleted_escape( PgCfg_Reader_Base.LoadFileContent(file1, src) # -------------------------------------------------------------------- - sm_dataE4E05: list[tuple[str, str]] = [ + sm_dataE4E05: typing.List[typing.Tuple[str, str]] = [ ("EOF", ""), ("EOL", "\n"), ("space_EOF", " "), diff --git a/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationTopLevelFile/AddEmptyLine/test_set001__common.py b/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationTopLevelFile/AddEmptyLine/test_set001__common.py index 3d72da1..eb20999 100644 --- a/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationTopLevelFile/AddEmptyLine/test_set001__common.py +++ b/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationTopLevelFile/AddEmptyLine/test_set001__common.py @@ -54,7 +54,7 @@ def test_001(self, request: pytest.FixtureRequest): assert len(fileLines) == 2 assert ( - list[PgCfg_FileLine_Base](fileLines)[-1].m_FileLineData + list(fileLines)[-1].m_FileLineData is fileLine2.m_FileLineData ) diff --git a/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationTopLevelFile/GetOptionValue/test_set001__common.py b/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationTopLevelFile/GetOptionValue/test_set001__common.py index eacacfb..354f391 100644 --- a/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationTopLevelFile/GetOptionValue/test_set001__common.py +++ b/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationTopLevelFile/GetOptionValue/test_set001__common.py @@ -8,6 +8,7 @@ from .......TestServices import TestServices import pytest +import typing import logging # ////////////////////////////////////////////////////////////////////////////// @@ -15,7 +16,7 @@ class TestSet001__Common: - sm_OPTS001: list[str] = ["port", "proxima.port"] + sm_OPTS001: typing.List[str] = ["port", "proxima.port"] @pytest.mark.parametrize("optName", sm_OPTS001, ids=lambda x: f"{x}") def test_001__no_opt(self, request: pytest.FixtureRequest, optName: str): diff --git a/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationTopLevelFile/SetOptionValue/test_set001__common.py b/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationTopLevelFile/SetOptionValue/test_set001__common.py index 4627468..8fe82e3 100644 --- a/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationTopLevelFile/SetOptionValue/test_set001__common.py +++ b/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationTopLevelFile/SetOptionValue/test_set001__common.py @@ -23,6 +23,7 @@ from .......TestServices import TestServices import pytest +import typing import os import re import logging @@ -32,7 +33,7 @@ class TestSet001__Common: - sm_OPTS001: list[str] = ["port", "proxima.port"] + sm_OPTS001: typing.List[str] = ["port", "proxima.port"] @pytest.mark.parametrize("optName", sm_OPTS001, ids=lambda x: f"{x}") def test_001(self, request: pytest.FixtureRequest, optName: str): diff --git a/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationWriter_Base/test_set001__common.py b/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationWriter_Base/test_set001__common.py index 8f71c59..64a62e6 100644 --- a/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationWriter_Base/test_set001__common.py +++ b/tests/implementation/v00/configuration_std/Objects/PostgresConfigurationWriter_Base/test_set001__common.py @@ -13,13 +13,14 @@ # fmt: on import pytest +import typing # ////////////////////////////////////////////////////////////////////////////// # TestSet001__Common class TestSet001__Common: - sm_OPTS001: list[str] = ["port", "proxima.port"] + sm_OPTS001: typing.List[str] = ["port", "proxima.port"] @pytest.mark.parametrize("optName", sm_OPTS001, ids=lambda x: f"{x}") def test_001(self, request: pytest.FixtureRequest, optName: str): From b2acbed4f2ebe29bb692e2a39f77be1833a4fc56 Mon Sep 17 00:00:00 2001 From: "d.kovalenko" Date: Sun, 2 Nov 2025 10:13:05 +0300 Subject: [PATCH 3/5] Python 3.7 does not support operator ":=" --- src/implementation/v00/configuration_base.py | 39 +++++++++++++++++--- 1 file changed, 33 insertions(+), 6 deletions(-) diff --git a/src/implementation/v00/configuration_base.py b/src/implementation/v00/configuration_base.py index 40d55f9..19b11e9 100644 --- a/src/implementation/v00/configuration_base.py +++ b/src/implementation/v00/configuration_base.py @@ -3304,7 +3304,13 @@ def Helper__LoadFileContent( lineReader = ReadUtils__LineReader() - while lineData := fileContent.ReadLine(): + while True: + lineData = fileContent.ReadLine() + + if not lineData: + # assert lineData is None + break + assert type(lineData) == str lineReader.SetData(lineData) @@ -3348,7 +3354,15 @@ def Helper__ProcessLineData( sequenceOffset = lineReader.GetColOffset() sequence = ch - while ch := lineReader.ReadSymbol(): + while True: + ch = lineReader.ReadSymbol() + + if not ch: + assert ch is None + break + + assert type(ch) == str + if ReadUtils.IsValidSeqCh2(ch): sequence += ch continue @@ -3389,8 +3403,15 @@ def Helper__ProcessLineData__Comment( commentText = "" commentOffset = lineReader.GetColOffset() - ch: str - while ch := lineReader.ReadSymbol(): + while True: + ch = lineReader.ReadSymbol() + + if not ch: + assert ch is None + break + + assert type(ch) == str + if ReadUtils.IsEOL(ch): break commentText += ch @@ -3701,9 +3722,15 @@ def Helper__ProcessLineData__Option__Generic( optionValue = "" - ch: str + while True: + ch = lineReader.ReadSymbol() + + if not ch: + assert ch is None + break + + assert type(ch) == str - while ch := lineReader.ReadSymbol(): if ch == "#" or ReadUtils.IsEOL(ch): lineReader.StepBack() break From 3dbb50016913afdb3dbb7ffb76bc3444234e593b Mon Sep 17 00:00:00 2001 From: "d.kovalenko" Date: Sun, 2 Nov 2025 10:15:55 +0300 Subject: [PATCH 4/5] travis: enable python 3.7 and 3.8 --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 03c4c32..c1f6d37 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,6 +19,8 @@ notifications: on_failure: always env: + - TEST_PLATFORM=std3-all PYTHON_VERSION=3.7 + - TEST_PLATFORM=std3-all PYTHON_VERSION=3.8 - TEST_PLATFORM=std3-all PYTHON_VERSION=3.9 - TEST_PLATFORM=std3-all PYTHON_VERSION=3.10 - TEST_PLATFORM=std3-all PYTHON_VERSION=3.11 From 22e2d72508047e196ae327f95bb8937b0fdd4e66 Mon Sep 17 00:00:00 2001 From: "d.kovalenko" Date: Sun, 2 Nov 2025 10:21:41 +0300 Subject: [PATCH 5/5] fix: ConfigurationData is corrected (compilation error) --- src/core/model.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/model.py b/src/core/model.py index 901b8ca..db83e7b 100644 --- a/src/core/model.py +++ b/src/core/model.py @@ -271,8 +271,8 @@ def __init__(self, data_dir: str, osOps: ConfigurationOsOps): self.m_OsOps = osOps self.m_Files = list() - self.m_AllOptionsByName = dict - self.m_AllFilesByName = dict + self.m_AllOptionsByName = dict() + self.m_AllFilesByName = dict() assert type(self.m_Files) == list assert type(self.m_AllOptionsByName) == dict