From 55a421e281533bd9d9506f8a7704291ee836fccf Mon Sep 17 00:00:00 2001
From: Thorge Petersen <petersen@rz.uni-kiel.de>
Date: Thu, 17 Nov 2022 12:47:03 +0100
Subject: [PATCH] Use csv instead of unicodecsv
---
ckanext/odsh/validation.py | 15 ++++++---------
dev-requirements.txt | 1 -
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/ckanext/odsh/validation.py b/ckanext/odsh/validation.py
index f52249b9..fadf0088 100644
--- a/ckanext/odsh/validation.py
+++ b/ckanext/odsh/validation.py
@@ -1,6 +1,6 @@
# This Python file uses the following encoding: utf-8
import logging
-import unicodecsv as csv
+import csv
import re
import urllib.request, urllib.error, urllib.parse
import json
@@ -214,24 +214,21 @@ def known_spatial_uri(key, data, errors, context):
data[('extras', new_index+1, 'value')] = poly
return
- mapping_file = tk.config.get('ckanext.odsh.spatial.mapping')
- try:
- mapping_file = urllib.request.urlopen(mapping_file)
- except Exception:
- raise Exception("Could not load spatial mapping file!")
+ mapping_path = tk.config.get('ckanext.odsh.spatial.mapping')
not_found = True
spatial_text = str()
spatial = str()
- cr = csv.reader(mapping_file, delimiter="\t", encoding='utf-8')
- for row in cr:
+ with open(mapping_path, newline='') as mapping_file:
+ cr = csv.reader(mapping_file, delimiter="\t")
+ for row in cr:
if row[0] == value:
not_found = False
spatial_text = row[1]
loaded = json.loads(row[2])
spatial = json.dumps(loaded['geometry'])
break
- if not_found:
+ if not_found:
raise toolkit.Invalid(
'spatial_uri: uri unknown')
diff --git a/dev-requirements.txt b/dev-requirements.txt
index c574e4ea..296c410f 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -165,7 +165,6 @@ traceback2==1.4.0
translationstring==1.3
typing==3.6.4
tzlocal==1.3
-unicodecsv==0.14.1
unittest2==1.1.0
urllib3==1.23
vdm==0.13
--
GitLab