Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .github/workflows/python-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ jobs:
sudo apt-get install -y texlive-latex-*
echo "GENDOC_LATEXPATH=$(dirname $(which pdflatex))" >> $GITHUB_ENV
python -m pip install --upgrade build twine wheel GenPackageDoc PythonExtensionsCollection
python -m pip install -r ./requirements.txt

- name: Build source and wheel distributions
run: |
Expand Down
11 changes: 5 additions & 6 deletions JsonPreprocessor/CJsonPreprocessor.py
Original file line number Diff line number Diff line change
Expand Up @@ -564,8 +564,8 @@ def __handleDotInNestedParam(sNestedParam : str) -> str:
dataType = re.sub(r"^.+'([a-zA-Z]+)'.*$", "\\1", str(type(tmpValue)))
self.__reset()
raise Exception(f"The substitution of parameter '{sVar.replace('$$', '$')}' inside the string \
value '{sInputStr.replace('$$', '$')}' is not supported! The composite data types between 'str' \
and '{dataType}' is not acceptable.")
value '{sInputStr.replace('$$', '$')}' is not supported! Composite data types like lists and dictionaries cannot \
be substituted inside strings.")
while var[0] in sInputStr:
sLoopCheck1 = sInputStr
dReplacements = {"$" : "\$", "[" : "\[", "]" : "\]"}
Expand Down Expand Up @@ -638,13 +638,12 @@ def __handleDotInNestedParam(sNestedParam : str) -> str:
raise Exception(errorMsg)
else:
tmpValue = __getNestedValue(sVar)
if len(sInputStr.strip())>len(sVar.strip()) and bConvertToStr and \
(isinstance(tmpValue, list) or isinstance(tmpValue, dict)):
if bConvertToStr and (isinstance(tmpValue, list) or isinstance(tmpValue, dict)):
dataType = re.sub(r"^.+'([a-zA-Z]+)'.*$", "\\1", str(type(tmpValue)))
self.__reset()
raise Exception(f"The substitution of parameter '{sVar.replace('$$', '$')}' inside the string \
value '{sInputStr.replace('$$', '$')}' is not supported! The composite data types between 'str' \
and '{dataType}' is not acceptable.")
value '{sInputStr.replace('$$', '$')}' is not supported! Composite data types like lists and dictionaries cannot \
be substituted inside strings.")
if re.match(r"^\s*" + tmpPattern + r"\s*$", sInputStr, re.UNICODE) and not bKey:
return tmpValue
else:
Expand Down
Binary file modified JsonPreprocessor/JsonPreprocessor.pdf
Binary file not shown.
2 changes: 1 addition & 1 deletion JsonPreprocessor/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@
#
# Version and date of JsonPreprocessor
#
VERSION = "0.6.0"
VERSION = "0.6.1"
VERSION_DATE = "14.05.2024"

3 changes: 3 additions & 0 deletions packagedoc/additional_docs/History.tex
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,7 @@
- Improved error messages\newline
- Fixed bugs}

\historyversiondate{0.6.1}{05/2024}
\historychange{Add pydotdict package as dependencies}

\end{packagehistory}