Merge branch 'main' into support/3.2

zatosource · May 16, 2024 · 1e99498 · 1e99498
2 parents ddfd107 + 801b919
commit 1e99498
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/code/zato-common/src/zato/common/util/api.py b/code/zato-common/src/zato/common/util/api.py
@@ -1059,7 +1059,9 @@ def parse_extra_into_dict(lines:'str | bytes', convert_bool:'bool'=True):
  original_line = line
  if line:
 
+ line = line.replace(r'\r', '')
  line = line.strip()
+
  if line.startswith('#'):
  continue