Drop pylons support

ckanext/dcat/plugins/__init__.py

@@ -6,12 +6,11 @@
 from ckantoolkit import config
 
 from ckan import plugins as p
-try:
- from ckan.lib.plugins import DefaultTranslation
-except ImportError:
- class DefaultTranslation(object):
- pass
 
+from ckan.lib.plugins import DefaultTranslation
+
+import ckanext.dcat.blueprints as blueprints
+import ckanext.dcat.cli as cli
 
 from ckanext.dcat.logic import (dcat_dataset_show,
  dcat_catalog_show,
@@ -21,8 +20,6 @@ class DefaultTranslation(object):
  )
 from ckanext.dcat import utils
 
-from ckanext.dcat.plugins.flask_plugin import MixinDCATPlugin, MixinDCATJSONInterface
-
 
 CUSTOM_ENDPOINT_CONFIG = 'ckanext.dcat.catalog_endpoint'
 TRANSLATE_KEYS_CONFIG = 'ckanext.dcat.translate_keys'
@@ -31,14 +28,26 @@ class DefaultTranslation(object):
 I18N_DIR = os.path.join(HERE, u"../i18n")
 
 
-class DCATPlugin(MixinDCATPlugin, p.SingletonPlugin, DefaultTranslation):
+class DCATPlugin(p.SingletonPlugin, DefaultTranslation):
 
  p.implements(p.IConfigurer, inherit=True)
  p.implements(p.ITemplateHelpers, inherit=True)
  p.implements(p.IActions, inherit=True)
  p.implements(p.IAuthFunctions, inherit=True)
  p.implements(p.IPackageController, inherit=True)
  p.implements(p.ITranslation, inherit=True)
+ p.implements(p.IClick)
+ p.implements(p.IBlueprint)
+
+ # IClick
+
+ def get_commands(self):
+ return cli.get_commands()
+
+ # IBlueprint
+
+ def get_blueprint(self):
+ return [blueprints.dcat]
 
  # ITranslation
 
@@ -123,9 +132,15 @@ def set_titles(object_dict):
  return data_dict
 
 
-class DCATJSONInterface(MixinDCATJSONInterface, p.SingletonPlugin):
+class DCATJSONInterface(p.SingletonPlugin):
  p.implements(p.IActions)
  p.implements(p.IAuthFunctions, inherit=True)
+ p.implements(p.IBlueprint)
+
+ # IBlueprint
+
+ def get_blueprint(self):
+ return [blueprints.dcat_json_interface]
 
  # IActions
 

ckanext/dcat/processors.py

@@ -426,14 +426,6 @@ def _get_from_extra(key):
 
  config.update({DCAT_EXPOSE_SUBCATALOGS: args.subcatalogs})
 
- # Workaround until the core translation function defaults to the Flask one
- from paste.registry import Registry
- from ckan.lib.cli import MockTranslator
- registry = Registry()
- registry.prepare()
- from pylons import translator
- registry.register(translator, MockTranslator())
-
  if args.mode == 'produce':
  serializer = RDFSerializer(profiles=args.profile,
  compatibility_mode=args.compat_mode)