getnikola · Jan 21, 2015 · Jan 21, 2015 · Jan 21, 2015 · Jan 21, 2015
Showing with 14 additions and 11 deletions.

+6 −1 nikola/nikola.py

+5 −9 nikola/plugin_categories.py

+3 −1 nikola/plugins/task/scan_posts.py
diff --git a/nikola/nikola.py b/nikola/nikola.py
@@ -658,13 +658,18 @@ def __init__(self, **config):
         task_plugins = self._activate_plugins_of_category("BaseTask")
         self.task_stages = defaultdict(list)
         for plugin_info in task_plugins:
+            # While yapsy searches for plugins, it will also find
+            # the classes EarlyTask, Task and LateTask (from Nikola)
+            # and assume they are plugins (since they are derived from
+            # BaseTask as well). Since they lead to exceptions, we
+            # have to sort them out manually.
             if type(plugin_info.plugin_object) == EarlyTask:
                 continue
             if type(plugin_info.plugin_object) == Task:
                 continue
             if type(plugin_info.plugin_object) == LateTask:
                 continue
-            stage = plugin_info.plugin_object.get_stage()
+            stage = plugin_info.plugin_object.stage
             self.task_stages[stage].append(plugin_info.plugin_object)
         self._activate_plugins_of_category("TaskMultiplier")
 

diff --git a/nikola/plugin_categories.py b/nikola/plugin_categories.py
@@ -141,9 +141,8 @@ class BaseTask(BasePlugin):
     # the others have to be specifie in the command line.
     is_default = True
 
-    def get_stage(self):
-        """At which level to run."""
-        raise NotImplementedError()
+    # at which stage to run
+    stage = 10
 
     def gen_tasks(self):
         """Task generator."""
@@ -163,26 +162,23 @@ class EarlyTask(BaseTask):
 
     name = "dummy_task"
 
-    def get_stage(self):
-        return -10
+    stage = -10
 
 
 class Task(BaseTask):
     """Plugins of this type are task generators."""
 
     name = "dummy_task"
 
-    def get_stage(self):
-        return 10
+    stage = 10
 
 
 class LateTask(BaseTask):
     """Plugins of this type are executed after all plugins of type Task."""
 
     name = "dummy_latetask"
 
-    def get_stage(self):
-        return 100
+    stage = 100
 
 
 class TemplateSystem(BasePlugin):

diff --git a/nikola/plugins/task/scan_posts.py b/nikola/plugins/task/scan_posts.py
@@ -24,11 +24,13 @@
 # OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+from __future__ import unicode_literals
+
 from nikola.plugin_categories import BaseTask
 
 
 class ScanPosts(BaseTask):
-    """Just load tasks."""
+    """Just scans for posts."""
 
     name = "scan_posts"