Skip to content

Updates quotes around string value #110

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Updates quotes around string value #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e2abb3
Updates quotes around string value
namsonx Jul 25, 2023
b4a8d9f
Merge branch 'develop' into namsonx/task/80/quotes_around_str_value
namsonx Aug 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions JsonPreprocessor/CJsonPreprocessor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,9 +584,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 != '':
Expand Down Expand Up @@ -662,18 +659,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

def __handleListElements(sInput : str) -> str:
items = re.split("\s*,\s*", sInput)
Expand Down Expand Up @@ -777,7 +762,6 @@ def __handleListElements(sInput : str) -> str:
except Exception as error:
raise Exception(f"json file '{jFile}': '{error}'")

oJson = __handleStrNoneTrueFalse(oJson)
os.chdir(currentDir)

self.__checkDotInParamName(oJson)
Expand Down
16 changes: 8 additions & 8 deletions atest/jsonpreprocessor/test_jsonpreprocessor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']

Expand Down