From 39b033b502a6bdd04cb6a189acc2c86264081e7d Mon Sep 17 00:00:00 2001 From: amercader Date: Fri, 19 Apr 2024 16:05:02 +0200 Subject: [PATCH] Remove old py2 compat stuff --- ckanext/dcat/profiles.py | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/ckanext/dcat/profiles.py b/ckanext/dcat/profiles.py index 788d0f13..c1ced34f 100644 --- a/ckanext/dcat/profiles.py +++ b/ckanext/dcat/profiles.py @@ -1,6 +1,3 @@ -from builtins import str -from past.builtins import basestring -from builtins import object import datetime import json @@ -20,6 +17,7 @@ from ckan.model.license import LicenseRegister from ckan.plugins import toolkit from ckan.lib.munge import munge_tag +from ckan.lib.helpers import resource_formats from ckanext.dcat.utils import resource_uri, publisher_uri_organization_fallback, DCAT_EXPOSE_SUBCATALOGS, DCAT_CLEAN_TAGS DCT = Namespace("http://purl.org/dc/terms/") @@ -67,7 +65,7 @@ class URIRefOrLiteral(object): def __new__(cls, value): try: stripped_value = value.strip() - if (isinstance(value, basestring) and (stripped_value.startswith("http://") + if (isinstance(value, str) and (stripped_value.startswith("http://") or stripped_value.startswith("https://"))): uri_obj = CleanedURIRef(value) # although all invalid chars checked by rdflib should have been quoted, try to serialize @@ -101,7 +99,7 @@ def _careful_quote(value): return value def __new__(cls, value): - if isinstance(value, basestring): + if isinstance(value, str): value = CleanedURIRef._careful_quote(value.strip()) return URIRef(value) @@ -625,10 +623,8 @@ def _distribution_format(self, distribution, normalize_ckan_format=True): label = format_uri if ((imt or label) and normalize_ckan_format): - import ckan.config - from ckan.lib import helpers - format_registry = helpers.resource_formats() + format_registry = resource_formats() if imt in format_registry: label = format_registry[imt][1] @@ -662,7 +658,7 @@ def _read_list_value(self, value): # List of values if isinstance(value, list): items = value - elif isinstance(value, basestring): + elif isinstance(value, str): try: items = json.loads(value) if isinstance(items, ((int, float, complex))):