Download as
Browse Code »

Commit 9c502ce5d6673552084598f7af45d35cc03d0b2d

Authored by Sergio Oliveira
1 parent 540555ad
Exists in master and in 29 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, colab-vcard, colab_search, colab_tag, colab_tag_merge, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_header, fixed_gitlab_import, go_to_profile_panel, mobile_user_scalable, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, split_screen, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd

Fixed to only call tasks if fetch_data is not abstract 

Signed-off-by: Sergio Oliveira <sergio@tracy.com.br>
Showing 2 changed files with 8 additions and 3 deletions   Show diff stats
colab/plugins/data/base_importer.py
  Diff comments   View file @9c502ce
... ... @@ -11,4 +11,9 @@ class PluginDataImporter(object):
11 11  
12 12 @abc.abstractmethod
13 13 def fetch_data(self):
14   - raise NotImplementedError('fetchData not yet implemented')
  14 + raise NotImplementedError
  15 + fetch_data.is_abstract = True
  16 +
  17 + @abc.abstractmethod
  18 + def app_label(self):
  19 + raise NotImplementedError
... ...
colab/plugins/data/tasks.py
  Diff comments   View file @9c502ce
... ... @@ -27,10 +27,10 @@ def register_tasks():
27 27  
28 28 for item_name in dir(module):
29 29 item = getattr(module, item_name)
30   - if item is PluginDataImporter:
31   - continue
32 30  
33 31 if callable(getattr(item, 'fetch_data', None)):
  32 + if getattr(item.fetch_data, 'is_abstract', False):
  33 + continue
34 34 instance = item()
35 35 task_name = '{}.{}'.format(module.__name__, item_name)
36 36 task = app.task(name=task_name, bind=True)(instance.fetch_data)
... ...