diff --git a/daemon.py b/daemon.py index e580703cf..cb9096a15 100644 --- a/daemon.py +++ b/daemon.py @@ -10800,8 +10800,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.httpPrefix, self.server.domainFull, self.path) - msg = json.dumps(catalogStr, - ensure_ascii=False).encode('utf-8') + msg = msg.encode('utf-8') msglen = len(msg) self._set_headers('text/csv', msglen, None, callingDomain) diff --git a/shares.py b/shares.py index 16427d0a2..f4abd6096 100644 --- a/shares.py +++ b/shares.py @@ -963,7 +963,7 @@ def sharesCatalogCSVEndpoint(baseDir: str, httpPrefix: str, return '' csvStr = \ 'id,type,hasType,startDate,expiryDate,' + \ - 'quantity,price,currency,Image,description,\r\n' + 'quantity,price,currency,Image,description,\n' for item in catalogJson['DFC:supplies']: csvStr += '"' + item['@id'] + '",' csvStr += '"' + item['@type'] + '",' @@ -975,7 +975,7 @@ def sharesCatalogCSVEndpoint(baseDir: str, httpPrefix: str, csvStr += '"' + item['DFC:price'].split(' ')[1] + '",' csvStr += '"' + item['DFC:Image'] + '",' description = item['DFC:description'].replace('"', "'") - csvStr += '"' + description + '",\r\n' + csvStr += '"' + description + '",\n' return csvStr