From 094619b5bde5c06f5ecf6189ff5290155fee30fb Mon Sep 17 00:00:00 2001 From: Tom Kralidis Date: Mon, 9 Sep 2024 08:53:19 -0400 Subject: [PATCH] remove unicodecsv (#1804) --- Dockerfile | 1 - pygeoapi/formatter/csv_.py | 8 ++++---- requirements.txt | 1 - 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 98e7ffc18..71505ba98 100644 --- a/Dockerfile +++ b/Dockerfile @@ -98,7 +98,6 @@ ENV TZ=${TZ} \ python3-greenlet \ python3-pip \ python3-tz \ - python3-unicodecsv \ python3-yaml \ ${ADD_DEB_PACKAGES}" diff --git a/pygeoapi/formatter/csv_.py b/pygeoapi/formatter/csv_.py index 664bc8807..51a6ded17 100644 --- a/pygeoapi/formatter/csv_.py +++ b/pygeoapi/formatter/csv_.py @@ -27,11 +27,10 @@ # # ================================================================= +import csv import io import logging -import unicodecsv as csv - from pygeoapi.formatter.base import BaseFormatter, FormatterSerializationError LOGGER = logging.getLogger(__name__) @@ -83,10 +82,11 @@ def write(self, options: dict = {}, data: dict = None) -> str: # TODO: implement wkt geometry serialization LOGGER.debug('not a point geometry, skipping') + print("JJJ", fields) LOGGER.debug(f'CSV fields: {fields}') try: - output = io.BytesIO() + output = io.StringIO() writer = csv.DictWriter(output, fields) writer.writeheader() @@ -101,7 +101,7 @@ def write(self, options: dict = {}, data: dict = None) -> str: LOGGER.error(err) raise FormatterSerializationError('Error writing CSV output') - return output.getvalue() + return output.getvalue().encode('utf-8') def __repr__(self): return f' {self.name}' diff --git a/requirements.txt b/requirements.txt index ef0f47d81..601f51b83 100644 --- a/requirements.txt +++ b/requirements.txt @@ -16,4 +16,3 @@ requests shapely SQLAlchemy<2.0.0 tinydb -unicodecsv