Migrate ckan2.9/py3

ckanext/pages/actions.py

@@ -4,14 +4,14 @@
 
 import ckan.plugins as p
 import ckan.lib.navl.dictization_functions as df
-import ckan.new_authz as new_authz
+import ckan.authz as new_authz
 import ckan.lib.uploader as uploader
 import ckan.lib.helpers as h
-from HTMLParser import HTMLParser
+from html.parser import HTMLParser
 
-from pylons.i18n.translation import get_lang
+from ckan.lib.i18n import get_lang
 
-import db
+from ckanext.pages import db
 
 _ = p.toolkit._
 
@@ -48,21 +48,21 @@ def handle_starttag(self, tag, attrs):
             self.first_image = dict(attrs)['src']
 
 schema = {
-    'id': [p.toolkit.get_validator('ignore_empty'), unicode],
-    'title': [p.toolkit.get_validator('not_empty'), unicode],
-    'name': [p.toolkit.get_validator('not_empty'), unicode,
+    'id': [p.toolkit.get_validator('ignore_empty'), str],
+    'title': [p.toolkit.get_validator('not_empty'), str],
+    'name': [p.toolkit.get_validator('not_empty'), str,
              p.toolkit.get_validator('name_validator'), page_name_validator],
-    'content': [p.toolkit.get_validator('ignore_missing'), unicode],
-    'page_type': [p.toolkit.get_validator('ignore_missing'), unicode],
+    'content': [p.toolkit.get_validator('ignore_missing'), str],
+    'page_type': [p.toolkit.get_validator('ignore_missing'), str],
 
-    'lang': [p.toolkit.get_validator('not_empty'), unicode],
+    'lang': [p.toolkit.get_validator('not_empty'), str],
 
     'order': [p.toolkit.get_validator('ignore_missing'),
-              unicode],
+              str],
     'private': [p.toolkit.get_validator('ignore_missing'),
                 p.toolkit.get_validator('boolean_validator')],
-    'group_id': [p.toolkit.get_validator('ignore_missing'), unicode],
-    'user_id': [p.toolkit.get_validator('ignore_missing'), unicode],
+    'group_id': [p.toolkit.get_validator('ignore_missing'), str],
+    'user_id': [p.toolkit.get_validator('ignore_missing'), str],
     'created': [p.toolkit.get_validator('ignore_missing'),
                 p.toolkit.get_validator('isodate')],
     'publish_date': [not_empty_if_blog,

ckanext/pages/auth.py

@@ -1,7 +1,7 @@
 import ckan.plugins as p
-import ckan.new_authz as new_authz
+import ckan.authz as new_authz
 
-import db
+from ckanext.pages import db
 
 
 def sysadmin(context, data_dict):

ckanext/pages/fanstatic/webassets.yml

@@ -0,0 +1,13 @@
+pages-css:
+  contents:
+    - css/medium-editor.css
+    - css/bootstrap.css
+  output: pages/%(version)s_pages.css
+  filters: cssrewrite
+
+pages-homepage-js:
+  contents:
+    - js/medium-editor.js
+    - js/pages-editor.js
+  filters: rjsmin
+  output: pages/%(version)s_homepage.js

ckanext/pages/plugin.py

@@ -1,27 +1,26 @@
 import logging
-from pylons import config
+from ckan.plugins.toolkit import config
 import ckan.plugins.toolkit as toolkit
 ignore_missing = toolkit.get_validator('ignore_missing')
 
 import ckan.lib.i18n as i18n
 
-import ckan.plugins as p
+import ckan.plugins as plugs
 import ckan.lib.helpers as h
 
-import actions
-import auth
+from ckanext.pages import actions
+from ckanext.pages import auth
+from ckan.lib.i18n import get_lang
 
-from pylons.i18n.translation import get_lang
-
-import db
+from ckanext.pages import db
 
 log = logging.getLogger(__name__)
 
 def build_pages_nav_main(*args):
 
-    about_menu = p.toolkit.asbool(config.get('ckanext.pages.about_menu', True))
-    group_menu = p.toolkit.asbool(config.get('ckanext.pages.group_menu', True))
-    org_menu = p.toolkit.asbool(config.get('ckanext.pages.organization_menu', True))
+    about_menu = plugs.toolkit.asbool(config.get('ckanext.pages.about_menu', True))
+    group_menu = plugs.toolkit.asbool(config.get('ckanext.pages.group_menu', True))
+    org_menu = plugs.toolkit.asbool(config.get('ckanext.pages.organization_menu', True))
 
     new_args = []
     for arg in args:
@@ -36,13 +35,13 @@ def build_pages_nav_main(*args):
     output = h.build_nav_main(*new_args)
 
     # do not display any private datasets in menu even for sysadmins
-    pages_list = p.toolkit.get_action('ckanext_pages_list')(None, {'order': True, 'private': False})
+    pages_list = plugs.toolkit.get_action('ckanext_pages_list')(None, {'order': True, 'private': False})
 
     page_name = ''
 
-    if (p.toolkit.c.action in ('pages_show', 'blog_show')
-       and p.toolkit.c.controller == 'ckanext.pages.controller:PagesController'):
-        page_name = p.toolkit.c.environ['routes.url'].current().split('/')[-1]
+    if (plugs.toolkit.c.action in ('pages_show', 'blog_show')
+       and plugs.toolkit.c.controller == 'ckanext.pages.controller:PagesController'):
+        page_name = plugs.toolkit.c.environ['routes.url'].current().split('/')[-1]
 
     for page in pages_list:
         if page['page_type'] == 'blog':
@@ -62,7 +61,7 @@ def build_pages_nav_main(*args):
 
 
 def render_content(content):
-    allow_html = p.toolkit.asbool(config.get('ckanext.pages.allow_html', False))
+    allow_html = plugs.toolkit.asbool(config.get('ckanext.pages.allow_html', False))
     try:
         return h.render_markdown(content, allow_html=allow_html)
     except TypeError:
@@ -75,7 +74,7 @@ def get_wysiwyg_editor():
 
 
 def get_recent_blog_posts(number=5, exclude=None):
-    blog_list = p.toolkit.get_action('ckanext_pages_list')(
+    blog_list = plugs.toolkit.get_action('ckanext_pages_list')(
         None, {'order_publish_date': True, 'private': False,
                'page_type': 'blog'}
     )
@@ -110,30 +109,38 @@ def check_for_page_locale(page):
 
     return False
 
-class PagesPlugin(p.SingletonPlugin):
-    p.implements(p.IConfigurer, inherit=True)
-    p.implements(p.ITemplateHelpers, inherit=True)
-    p.implements(p.IConfigurable, inherit=True)
-    p.implements(p.IRoutes, inherit=True)
-    p.implements(p.IActions, inherit=True)
-    p.implements(p.IAuthFunctions, inherit=True)
+class PagesPlugin(plugs.SingletonPlugin):
+    plugs.implements(plugs.IConfigurer, inherit=True)
+    plugs.implements(plugs.ITemplateHelpers, inherit=True)
+    plugs.implements(plugs.IConfigurable, inherit=True)
+    plugs.implements(plugs.IRoutes, inherit=True)
+    plugs.implements(plugs.IActions, inherit=True)
+    plugs.implements(plugs.IAuthFunctions, inherit=True)
 
     def update_config(self, config):
-        self.organization_pages = p.toolkit.asbool(config.get('ckanext.pages.organization', False))
-        self.group_pages = p.toolkit.asbool(config.get('ckanext.pages.group', False))
+        self.organization_pages = plugs.toolkit.asbool(config.get('ckanext.pages.organization', False))
+        self.group_pages = plugs.toolkit.asbool(config.get('ckanext.pages.group', False))
 
-        p.toolkit.add_template_directory(config, 'theme/templates_main')
+        plugs.toolkit.add_template_directory(config, 'theme/templates_main')
         if self.group_pages:
-            p.toolkit.add_template_directory(config, 'theme/templates_group')
+            plugs.toolkit.add_template_directory(config, 'theme/templates_group')
         if self.organization_pages:
-            p.toolkit.add_template_directory(config, 'theme/templates_organization')
+            plugs.toolkit.add_template_directory(config, 'theme/templates_organization')
+
+        #new editting
+
+        plugs.toolkit.add_public_directory(config, 'public')
+        plugs.toolkit.add_template_directory(config, 'templates')
+        plugs.toolkit.add_resource('fanstatic', 'pages')  # path, webasset name
+        plugs.toolkit.add_public_directory(config, 'fanstatic')  # needed workaround to have webasset find files
+
+        # ---------------------------------------------------
 
-        p.toolkit.add_resource('fanstatic', 'pages')
-        p.toolkit.add_public_directory(config, 'public')
+        plugs.toolkit.add_public_directory(config, 'public')
 
-        p.toolkit.add_resource('theme/public', 'ckanext-pages')
-        p.toolkit.add_resource('theme/resources', 'pages-theme')
-        p.toolkit.add_public_directory(config, 'theme/public')
+        plugs.toolkit.add_resource('theme/public', 'ckanext-pages')
+        plugs.toolkit.add_resource('theme/resources', 'pages-theme')
+        plugs.toolkit.add_public_directory(config, 'theme/public')
 
     def configure(self, config):
         return
@@ -241,14 +248,14 @@ def get_auth_functions(self):
             'ckanext_group_pages_list': auth.group_pages_list,
        }
 
-class TextBoxView(p.SingletonPlugin):
+class TextBoxView(plugs.SingletonPlugin):
 
-    p.implements(p.IConfigurer, inherit=True)
-    p.implements(p.IResourceView, inherit=True)
+    plugs.implements(plugs.IConfigurer, inherit=True)
+    plugs.implements(plugs.IResourceView, inherit=True)
 
     def update_config(self, config):
-        p.toolkit.add_resource('textbox/theme', 'textbox')
-        p.toolkit.add_template_directory(config, 'textbox/templates')
+        plugs.toolkit.add_resource('textbox/theme', 'textbox')
+        plugs.toolkit.add_template_directory(config, 'textbox/templates')
 
     def info(self):
         schema = {

ckanext/pages/theme/templates_main/base.html

@@ -1,14 +1,11 @@
 {% ckan_extends %}
 
-{% block links %}
+{% block styles %}
     {{ super() }}
-
-    <!--[if IE]>
-    <script src="{{ h.url_for_static('/classList.min.js') }}"></script>
-    <![endif]-->
-
-    {% resource 'pages/css/medium-editor.css' %}
-    {% resource 'pages/css/bootstrap.css' %}
-    {% resource 'pages/js/medium-editor.js' %}
-    {% resource 'pages/js/pages-editor.js' %}
+    {% asset 'pages/pages-css' %}
 {% endblock %}
+
+{% block scripts %}
+    {{ super() }}
+    {% asset 'pages/pages-homepage-js' %}
+{% endblock %}