Moving default filter registration into Nikola.__init__.

getnikola · Jun 4, 2017 · 30efe17 · 30efe17
1 parent f54db6c
commit 30efe17
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 64 deletions.
diff --git a/nikola/filters.py b/nikola/filters.py
@@ -26,8 +26,7 @@
 
 """Utility functions to help run filters on files.
 
-All filters defined in this module are registered in the
-default_filters plugin.
+All filters defined in this module are registered in Nikola.__init__.
 """
 
 from functools import wraps

diff --git a/nikola/nikola.py b/nikola/nikola.py
@@ -61,7 +61,7 @@
 
 from .post import Post  # NOQA
 from .state import Persistor
-from . import DEBUG, utils, shortcodes
+from . import DEBUG, filters, utils, shortcodes
 from .plugin_categories import (
     Command,
     LateTask,
@@ -974,6 +974,17 @@ def __init__(self, **config):
         # Get search path for themes
         self.themes_dirs = ['themes'] + self.config['EXTRA_THEMES_DIRS']
 
+        # Register default filters
+        filter_name_format = 'filters.{0}'
+        for filter_name, filter_definition in filters.__dict__.items():
+            # Ignore objects whose name starts with an underscore, or which are not callable
+            if filter_name.startswith('_'):
+                continue
+            if not callable(filter_definition):
+                continue
+            # Register all other objects as filters
+            site.register_filter(filter_name_format.format(filter_name), filter_definition)
+
         self._set_global_context_from_config()
         # Read data files only if a site exists (Issue #2708)
         if self.configured:

diff --git a/nikola/plugins/misc/default_filters.plugin b/nikola/plugins/misc/default_filters.plugin
diff --git a/nikola/plugins/misc/default_filters.py b/nikola/plugins/misc/default_filters.py