65-migrate Ckan2.9/py3

ckanext/provbz/harvesters/harvester.py

@@ -566,7 +566,7 @@ def after_import_stage(self, package_dict):
                     self.persist_package_multilang_field(package_id, 'publisher_name', publisher.get('text'), publisher.get('locale'), 'extra') 
 
             pass
-        except Exception, e:
+        except Exception as e:
             log.error('Exception occurred while persisting DB objects: %s', e)
             raise
 

ckanext/provbz/helpers.py

@@ -12,14 +12,14 @@
 import ckan.logic as logic
 from ckan.common import request
 
-from pylons import config
+from ckan.plugins.toolkit import config
 
 from ckan.lib.i18n import get_lang
 from ckanext.multilang.model import PackageMultilang, TagMultilang
 
 import ckanext.pages.db as db
 
-from HTMLParser import HTMLParser
+from html.parser import HTMLParser
 
 
 log = logging.getLogger(__file__)
@@ -102,7 +102,7 @@ def recent_updates(n):
 
     try:
         search_results = logic.get_action('package_search')(context, data_dict)
-    except search.SearchError, e:
+    except search.SearchError as e:
         log.error('Error searching for recently updated datasets')
         log.error(e)
         search_results = {}

ckanext/provbz/plugin.py

@@ -93,7 +93,8 @@ def get_custom_schema(self):
     def update_config(self, config):
         toolkit.add_template_directory(config, 'templates')
         toolkit.add_public_directory(config, 'public')
-        toolkit.add_resource('public/base', 'ckanext-provbz')
+        toolkit.add_resource('public/base', 'ckanext-provbz')  # path, webasset name
+        toolkit.add_public_directory(config, 'public/base')
 
     # Implementation of ITemplateHelpers
     # ------------------------------------------------------------

ckanext/provbz/public/webassets.yml

@@ -0,0 +1,5 @@
+provbz-homepage-js:
+  contents:
+    - base/base.js
+  filters: rjsmin
+  output: provbz/%(version)s_homepage.js

ckanext/provbz/templates/page.html

@@ -130,15 +130,15 @@ <h2>A sidebar item</h2>
 {%- endblock -%}
 
 {%- block scripts %}
-    {% resource 'base/main' %}
+    {% asset 'base/main' %}
 
-    {% resource 'base/ckan' %}
+    {% asset 'base/ckan' %}
 
     {% if g.tracking_enabled %}
-      {% resource 'base/tracking.js' %}
+      {% asset 'base/tracking.js' %}
     {% endif %}
 
-    {% resource 'ckanext-provbz/main' %}
+    {% asset 'ckanext-provbz/provbz-homepage-js' %}
 
   {{ super() }}
 {% endblock -%}

ckanext/provbz/templates/snippets/package_item.html

@@ -29,7 +29,7 @@
 
 {% block package_item %}
   <li class="{{ item_class or "dataset-item" }}">
-    <div class="package-item-clickable" onClick="location.href='{{ h.url_for(controller='package', action='read', id=package.name) }}'">
+    <div class="package-item-clickable" onClick="location.href='{{ h.url_for(controller='dataset', action='read', id=package.name) }}'">
     {% block content %}
       <div class="dataset-content">
         {% block heading %}
@@ -43,7 +43,7 @@ <h3 class="dataset-heading">
               {% endif %}
             {% endblock %}
             {% block heading_title %}
-              {{ h.link_to(h.truncate(title, truncate_title), h.url_for(controller='package', action='read', id=package.name)) }}
+              {{ h.link_to(h.truncate(title, truncate_title), h.url_for(controller='dataset', action='read', id=package.name)) }}
             {% endblock %}
             {% block heading_meta %}
               {% if package.get('state', '').startswith('draft') %}