Migrate to CKAN 2.9.4 & python 3.7, following process at ozwillo/ckan…

…ext-ozwillo-theme#8
ozwillo · Dec 6, 2021 · 5bd2449 · 5bd2449
1 parent 02378c7
commit 5bd2449
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 5 deletions.
diff --git a/ckanext/location/fanstatic/.gitignore → ckanext/location/assets/.gitignore b/ckanext/location/fanstatic/.gitignore → ckanext/location/assets/.gitignore
diff --git a/...t/location/fanstatic/location_loadbar.css → ckanext/location/assets/location_loadbar.css b/...t/location/fanstatic/location_loadbar.css → ckanext/location/assets/location_loadbar.css
diff --git a/...xt/location/fanstatic/location_showbar.js → ckanext/location/assets/location_showbar.js b/...xt/location/fanstatic/location_showbar.js → ckanext/location/assets/location_showbar.js
diff --git a/ckanext/location/assets/webassets.yml b/ckanext/location/assets/webassets.yml
@@ -0,0 +1,6 @@
+location_bar:
+  output: ckanext-ozwillo-theme/%(version)s_location
+  contents:
+    - location_loadbar.css
+    - location_showbar.js
+
diff --git a/ckanext/location/plugin.py b/ckanext/location/plugin.py
@@ -7,7 +7,7 @@
 import ckan.plugins as plugins
 import ckan.plugins.toolkit as toolkit
 from ckan.lib.plugins import DefaultTranslation
-from location import geores
+from .location import geores
 import os
 import logging
 
@@ -80,7 +80,7 @@ def upload(self, id, max_size=10):
         if self.filename:
             try:
                 os.makedirs(directory)
-            except OSError, e:
+            except OSError as e:
                 # errno 17 is file already exists
                 if e.errno != 17:
                     raise
@@ -116,5 +116,5 @@ def upload(self, id, max_size=10):
         if self.clear:
             try:
                 os.remove(filepath)
-            except OSError, e:
+            except OSError as e:
                 pass
diff --git a/ckanext/location/templates/package/snippets/resource_form.html b/ckanext/location/templates/package/snippets/resource_form.html
@@ -30,8 +30,7 @@
 {% endblock basic_fields %}
 
 {% block add_button %}
-    {% resource 'location/location_loadbar.css' %}
-    {% resource 'location/location_showbar.js' %}
+    {% asset 'location/location_bar' %}
 
         <div id="progress">
         <div class="loader"></div>