Support of python 3.7, 3.8 (#2)

* tests includes src as module

* Using typing.List, typing.Dict and typing.Set [py3.7]

* Python 3.7 does not support operator ":="

* travis: enable python 3.7 and 3.8

* fix: ConfigurationData is corrected (compilation error)

Author: dmitry-lipetsk

.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

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
 

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

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

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",

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:

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)

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

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)
 
@@ -3302,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)
@@ -3346,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
@@ -3387,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
@@ -3699,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
@@ -3757,9 +3786,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):

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