ElectionDay: Fixes license portion of catalog.rdf for Open Data Swiss

This also fixes the same bug for Landsgemeinde TYPE: Bugfix LINK: OGC-1729
OneGov · Oct 15, 2024 · 0d5f068 · 0d5f068
1 parent 6f9d132
commit 0d5f068
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 16 deletions.
diff --git a/src/onegov/core/cache.py b/src/onegov/core/cache.py
@@ -82,7 +82,7 @@ def instance_lru_cache(
     def decorator(wrapped: '_F') -> '_F':
         def wrapper(self: Any) -> Any:
             return lru_cache(maxsize=maxsize)(
-                update_wrapper(partial(wrapped, self), wrapped)  # type:ignore
+                update_wrapper(partial(wrapped, self), wrapped)
             )
 
         # NOTE: we are doing some oddball stuff here that the type

diff --git a/src/onegov/core/cli/commands.py b/src/onegov/core/cli/commands.py
@@ -190,7 +190,7 @@ def __init__(self, queue_processors: list[SmsQueueProcessor]):
         )
 
     def on_moved(self, event: 'FileSystemEvent') -> None:
-        dest_path = os.path.abspath(event.dest_path)
+        dest_path = os.path.abspath(event.dest_path)  # type:ignore[type-var]
         assert isinstance(dest_path, str)
         for qp in self.queue_processors:
             # only one queue processor should match
@@ -208,7 +208,7 @@ def on_moved(self, event: 'FileSystemEvent') -> None:
     #       moved. But we should also trigger when new files are created just
     #       in case this ever changes.
     def on_created(self, event: 'FileSystemEvent') -> None:
-        src_path = os.path.abspath(event.src_path)
+        src_path = os.path.abspath(event.src_path)  # type:ignore[type-var]
         assert isinstance(src_path, str)
         for qp in self.queue_processors:
             # only one queue processor should match

diff --git a/src/onegov/election_day/views/opendata_swiss.py b/src/onegov/election_day/views/opendata_swiss.py
@@ -322,12 +322,8 @@ def translate(text: 'TranslationString', locale: str) -> str:
             sub(dist, 'dcat:downloadURL', {'rdf:resource': url})
 
             # Legal
-            license = sub(
-                dist, 'dct:license',
-                {'rdf:about': 'http://dcat-ap.ch/vocabulary/licenses/terms_by'}
-            )
-            sub(license, 'rdf:type', {
-                'rdf:resource': 'http://purl.org/dc/terms/RightsStatement'
+            sub(dist, 'dct:license', {
+                'rdf:resource': 'http://dcat-ap.ch/vocabulary/licenses/terms_by'
             })
 
             # Media Type

diff --git a/src/onegov/landsgemeinde/views/opendata_swiss.py b/src/onegov/landsgemeinde/views/opendata_swiss.py
@@ -187,12 +187,8 @@ def set_headers(response: 'Response') -> None:
         url = request.link(item, 'json')
         sub(dist, 'dcat:accessURL', {'rdf:resource': url})
         sub(dist, 'dcat:downloadURL', {'rdf:resource': url})
-        license = sub(
-            dist, 'dct:license',
-            {'rdf:about': 'http://dcat-ap.ch/vocabulary/licenses/terms_by'}
-        )
-        sub(license, 'rdf:type', {
-            'rdf:resource': 'http://purl.org/dc/terms/RightsStatement'
+        sub( dist, 'dct:license', {
+            'rdf:resource': 'http://dcat-ap.ch/vocabulary/licenses/terms_by'
         })
         sub(dist, 'dcat:mediaType', {
             'rdf:resource': 'https://www.iana.org/assignments/media-types/'

diff --git a/src/onegov/org/models/ticket.py b/src/onegov/org/models/ticket.py
@@ -345,7 +345,7 @@ def get_links(  # type:ignore[override]
             url_obj = URL(request.link(self.submission))
             edit_url = url_obj.query_param('edit', '').as_string()
 
-            (links if not links else extra).append(  # type:ignore
+            (links if not links else extra).append(
                 Link(
                     text=_('Edit submission'),
                     url=request.return_here(edit_url),