From 9932656558032117e1e6bf8a881d68312dbcced6 Mon Sep 17 00:00:00 2001 From: Ilias Trichopoulos Date: Mon, 12 Jan 2015 10:53:00 +0100 Subject: [PATCH] Use PluginCategory enum --- importer/indico_importer/base.py | 3 ++- importer/indico_importer/plugin.py | 4 ++-- importer_invenio/indico_importer_invenio/plugin.py | 1 - livesync/indico_livesync/base.py | 4 ++-- livesync/indico_livesync/plugin.py | 3 ++- livesync_debug/indico_livesync_debug/plugin.py | 1 - livesync_invenio/indico_livesync_invenio/plugin.py | 1 - payment_manual/indico_payment_manual/plugin.py | 1 - payment_paypal/indico_payment_paypal/plugin.py | 1 - search/indico_search/base.py | 4 ++-- search/indico_search/plugin.py | 4 ++-- 11 files changed, 12 insertions(+), 15 deletions(-) diff --git a/importer/indico_importer/base.py b/importer/indico_importer/base.py index 9f03ea4..f2270eb 100644 --- a/importer/indico_importer/base.py +++ b/importer/indico_importer/base.py @@ -18,7 +18,7 @@ from __future__ import unicode_literals from flask_pluginengine import depends -from indico.core.plugins import IndicoPlugin +from indico.core.plugins import IndicoPlugin, PluginCategory from indico_importer.plugin import ImporterPlugin @@ -27,6 +27,7 @@ class ImporterSourcePluginBase(IndicoPlugin): """Base class for importer engine plugins""" importer_engine_classes = None + category = PluginCategory.importers def init(self): super(ImporterSourcePluginBase, self).init() diff --git a/importer/indico_importer/plugin.py b/importer/indico_importer/plugin.py index 8df477d..aff5b65 100644 --- a/importer/indico_importer/plugin.py +++ b/importer/indico_importer/plugin.py @@ -17,7 +17,7 @@ from __future__ import unicode_literals from indico.core import signals -from indico.core.plugins import IndicoPlugin, IndicoPluginBlueprint, plugin_url_rule_to_js +from indico.core.plugins import IndicoPlugin, IndicoPluginBlueprint, plugin_url_rule_to_js, PluginCategory from MaKaC.webinterface.pages.conferences import WPConfModifScheduleGraphic from indico.util.i18n import _ @@ -32,7 +32,7 @@ class ImporterPlugin(IndicoPlugin): """ hidden = True - category = 'import' + category = PluginCategory.importers def init(self): super(ImporterPlugin, self).init() diff --git a/importer_invenio/indico_importer_invenio/plugin.py b/importer_invenio/indico_importer_invenio/plugin.py index c0fc3d9..1e3a87d 100644 --- a/importer_invenio/indico_importer_invenio/plugin.py +++ b/importer_invenio/indico_importer_invenio/plugin.py @@ -30,4 +30,3 @@ class ImporterInvenioPlugin(ImporterSourcePluginBase): importer_engine_classes = (InvenioImporter,) settings_form = SettingsForm - category = 'import' diff --git a/livesync/indico_livesync/base.py b/livesync/indico_livesync/base.py index 9cc169a..a0820b3 100644 --- a/livesync/indico_livesync/base.py +++ b/livesync/indico_livesync/base.py @@ -18,7 +18,7 @@ from __future__ import unicode_literals from flask_pluginengine import depends, trim_docstring -from indico.core.plugins import IndicoPlugin +from indico.core.plugins import IndicoPlugin, PluginCategory from indico.util.date_time import now_utc from indico.util.decorators import classproperty from MaKaC.conference import CategoryManager @@ -34,7 +34,7 @@ class LiveSyncPluginBase(IndicoPlugin): # pragma: no cover #: dict containing the backend(s) provided by the plugin; the keys are unique identifiers backend_classes = None - category = 'synchronization' + category = PluginCategory.synchronization def init(self): super(LiveSyncPluginBase, self).init() diff --git a/livesync/indico_livesync/plugin.py b/livesync/indico_livesync/plugin.py index 8c78f85..df8d6f5 100644 --- a/livesync/indico_livesync/plugin.py +++ b/livesync/indico_livesync/plugin.py @@ -21,7 +21,7 @@ from flask import request from wtforms.validators import NumberRange from wtforms.fields.html5 import IntegerField -from indico.core.plugins import IndicoPlugin, wrap_cli_manager +from indico.core.plugins import IndicoPlugin, PluginCategory, wrap_cli_manager from indico.core.plugins.views import WPPlugins from indico.util.i18n import _ from indico.web.forms.base import IndicoForm @@ -55,6 +55,7 @@ class LiveSyncPlugin(IndicoPlugin): settings_form = SettingsForm default_settings = {'excluded_categories': [], 'queue_entry_ttl': 0} + category = PluginCategory.synchronization def init(self): super(LiveSyncPlugin, self).init() diff --git a/livesync_debug/indico_livesync_debug/plugin.py b/livesync_debug/indico_livesync_debug/plugin.py index 81238d4..ff9dadb 100644 --- a/livesync_debug/indico_livesync_debug/plugin.py +++ b/livesync_debug/indico_livesync_debug/plugin.py @@ -28,4 +28,3 @@ class LiveSyncDebugPlugin(LiveSyncPluginBase): """ backend_classes = {'debug': LiveSyncDebugBackend} - category = 'synchronization' diff --git a/livesync_invenio/indico_livesync_invenio/plugin.py b/livesync_invenio/indico_livesync_invenio/plugin.py index 5501e98..803692a 100644 --- a/livesync_invenio/indico_livesync_invenio/plugin.py +++ b/livesync_invenio/indico_livesync_invenio/plugin.py @@ -28,4 +28,3 @@ class InvenioLiveSyncPlugin(LiveSyncPluginBase): """ backend_classes = {'invenio': InvenioLiveSyncBackend} - category = 'synchronization' diff --git a/payment_manual/indico_payment_manual/plugin.py b/payment_manual/indico_payment_manual/plugin.py index adf4831..d57bc0f 100644 --- a/payment_manual/indico_payment_manual/plugin.py +++ b/payment_manual/indico_payment_manual/plugin.py @@ -45,7 +45,6 @@ class ManualPaymentPlugin(PaymentPluginMixin, IndicoPlugin): who then pays manually using e.g. a wire transfer. Marking the registrant as paid is then done manually by a manager of the event. """ - category = 'payment' settings_form = PluginSettingsForm event_settings_form = EventSettingsForm default_settings = {'method_name': 'Bank Transfer'} diff --git a/payment_paypal/indico_payment_paypal/plugin.py b/payment_paypal/indico_payment_paypal/plugin.py index 7d2c9fd..4b518d1 100644 --- a/payment_paypal/indico_payment_paypal/plugin.py +++ b/payment_paypal/indico_payment_paypal/plugin.py @@ -44,7 +44,6 @@ class PaypalPaymentPlugin(PaymentPluginMixin, IndicoPlugin): Provides a payment method using the PayPal IPN API. """ - category = 'payment' settings_form = PluginSettingsForm event_settings_form = EventSettingsForm default_settings = {'method_name': 'PayPal', diff --git a/search/indico_search/base.py b/search/indico_search/base.py index cd5a018..2df53f5 100644 --- a/search/indico_search/base.py +++ b/search/indico_search/base.py @@ -17,7 +17,7 @@ from flask import session from flask_pluginengine import depends -from indico.core.plugins import IndicoPlugin +from indico.core.plugins import IndicoPlugin, PluginCategory from indico_search.forms import SearchForm from indico_search.plugin import SearchPlugin @@ -31,7 +31,7 @@ class SearchPluginBase(IndicoPlugin): engine_class = None #: the SearchForm subclass to use search_form = SearchForm - category = 'search' + category = PluginCategory.search def init(self): super(SearchPluginBase, self).init() diff --git a/search/indico_search/plugin.py b/search/indico_search/plugin.py index 9124aca..78b10ea 100644 --- a/search/indico_search/plugin.py +++ b/search/indico_search/plugin.py @@ -19,7 +19,7 @@ from __future__ import unicode_literals from flask import request from flask_pluginengine import plugins_loaded -from indico.core.plugins import IndicoPlugin +from indico.core.plugins import IndicoPlugin, PluginCategory from indico_search.blueprint import blueprint from indico_search.util import render_engine_or_search_template @@ -31,7 +31,7 @@ class SearchPlugin(IndicoPlugin): Provides a base for search engine plugins. """ - category = 'search' + category = PluginCategory.search hidden = True _engine_plugin = None # the search engine plugin