From d760a71b760b630883784a98f0ee5687604a3b5e Mon Sep 17 00:00:00 2001 From: shortcutme Date: Thu, 29 Sep 2016 13:01:02 +0200 Subject: [PATCH] Rev1529, Fix json write bug with [] characters in value --- src/Config.py | 2 +- src/Site/SiteStorage.py | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/Config.py b/src/Config.py index 1e169b5d..9b19596d 100644 --- a/src/Config.py +++ b/src/Config.py @@ -8,7 +8,7 @@ class Config(object): def __init__(self, argv): self.version = "0.4.1" - self.rev = 1527 + self.rev = 1529 self.argv = argv self.action = None self.config_file = "zeronet.conf" diff --git a/src/Site/SiteStorage.py b/src/Site/SiteStorage.py index e2f4336b..610fc159 100644 --- a/src/Site/SiteStorage.py +++ b/src/Site/SiteStorage.py @@ -236,10 +236,16 @@ class SiteStorage(object): # Make it a little more compact by removing unnecessary white space def compact_list(match): - return "[ " + match.group(1).strip() + " ]" + if "\n" in match.group(1): + return "[ " + match.group(1).strip() + " ]" + else: + return match.group(0) def compact_dict(match): - return "{ " + match.group(1).strip() + " }" + if "\n" in match.group(1): + return "{ " + match.group(1).strip() + " }" + else: + return match.group(0) content = re.sub("\[([^,\{\[]{10,100}?)\]", compact_list, content, flags=re.DOTALL) content = re.sub("\{([^,\[\{]{10,100}?)\}", compact_dict, content, flags=re.DOTALL)