From 9e2abb30d57214b62eb6ec6a74e03a55c75caed5 Mon Sep 17 00:00:00 2001 From: mas2hc Date: Tue, 25 Jul 2023 19:21:57 +0700 Subject: [PATCH] Updates quotes around string value --- JsonPreprocessor/CJsonPreprocessor.py | 16 ---------------- atest/jsonpreprocessor/test_jsonpreprocessor.py | 16 ++++++++-------- 2 files changed, 8 insertions(+), 24 deletions(-) diff --git a/JsonPreprocessor/CJsonPreprocessor.py b/JsonPreprocessor/CJsonPreprocessor.py index 227760ce..ee99221b 100644 --- a/JsonPreprocessor/CJsonPreprocessor.py +++ b/JsonPreprocessor/CJsonPreprocessor.py @@ -574,9 +574,6 @@ def __jsonUpdated(k, v, oJson, bNested, keyNested = ''): v = ldict['value'] except: raise Exception(f"The variable '{valueProcessed}' is not available!") - - if isinstance(v, str) and re.match('^\s*none|true|false\s*$', v.lower()): - v = '\"' + v + '\"' __jsonUpdated(k, v, oJson, bNested, keyNested) if keyNested != '': @@ -652,18 +649,6 @@ def jsonLoad(self, jFile : str, masterFile : bool = True): Preprocessed json file(s) as dictionary data structure ''' - def __handleStrNoneTrueFalse(objJson): - oJson = {} - for k, v in objJson.items(): - if isinstance(v, dict): - v = __handleStrNoneTrueFalse(v) - oJson[k] = v - elif isinstance(v, str) and re.match('^\s*none|true|false\s*$', v.lower()): - v = '\"' + v + '\"' - oJson[k] = v - else: - oJson[k] = v - return oJson jFile=jFile.strip() @@ -742,7 +727,6 @@ def __handleStrNoneTrueFalse(objJson): except Exception as error: raise Exception(f"json file '{jFile}': '{error}'") - oJson = __handleStrNoneTrueFalse(oJson) os.chdir(currentDir) self.__checkDotInParamName(oJson) diff --git a/atest/jsonpreprocessor/test_jsonpreprocessor.py b/atest/jsonpreprocessor/test_jsonpreprocessor.py index 47b942ed..cf7cb6be 100644 --- a/atest/jsonpreprocessor/test_jsonpreprocessor.py +++ b/atest/jsonpreprocessor/test_jsonpreprocessor.py @@ -348,15 +348,15 @@ def test_none_true_false_datatype(self): sJsonfile = os.path.abspath("../testdata/config/06_override_params/project_config_04.json") oJsonPreprocessor = CJsonPreprocessor(syntax="python") oJsonData = oJsonPreprocessor.jsonLoad(sJsonfile) - assert oJsonData['string_null'] == "null" - assert oJsonData['string_none'] == '"None"' - assert oJsonData['string_true'] == '"True"' - assert oJsonData['string_false'] == '"False"' - assert oJsonData['convert_null_to_string'] == '"None"' - assert oJsonData['convert_none_to_string'] == '"None"' + assert oJsonData['string_null'] == 'null' + assert oJsonData['string_none'] == 'None' + assert oJsonData['string_true'] == 'True' + assert oJsonData['string_false'] == 'False' + assert oJsonData['convert_null_to_string'] == 'None' + assert oJsonData['convert_none_to_string'] == 'None' assert oJsonData['convert_float_to_string'] == "1.332" - assert oJsonData['convert_true_to_string'] == '"True"' - assert oJsonData['convert_false_to_string'] == '"False"' + assert oJsonData['convert_true_to_string'] == 'True' + assert oJsonData['convert_false_to_string'] == 'False' assert oJsonData['params']['global'] == JSONFORMAT_NONE_TRUE_FALSE['params']['global'] assert oJsonData['preprocessor']['definitions'] == JSONFORMAT_NONE_TRUE_FALSE['preprocessor']['definitions']