Fix some stuff

getnikola · May 5, 2017 · 3e4ad02 · 3e4ad02
1 parent 5adfa75
commit 3e4ad02
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/nikola/nikola.py b/nikola/nikola.py
@@ -1694,14 +1694,14 @@ def apply_shortcodes(self, data, filename=None, lang=None, with_dependencies=Fal
             lang = utils.LocaleBorg().current_lang
         return shortcodes.apply_shortcodes(data, self.shortcode_registry, self, filename, lang=lang, with_dependencies=with_dependencies, extra_context=extra_context)
 
-    def apply_shortcodes_uuid(self, data, shortcodes, filename=None, lang=None, with_dependencies=False, extra_context=None):
+    def apply_shortcodes_uuid(self, data, _shortcodes, filename=None, lang=None, with_dependencies=False, extra_context=None):
         """Apply shortcodes from the registry on data."""
         if lang is None:
             lang = utils.LocaleBorg().current_lang
         if extra_context is None:
             extra_context = {}
         deps = []
-        for k, v in shortcodes:
+        for k, v in _shortcodes.items():
             replacement, _deps = shortcodes.apply_shortcodes(v, self.shortcode_registry, self, filename, lang=lang, with_dependencies=with_dependencies, extra_context=extra_context)
             data.replace(k, replacement)
             deps.extend(_deps)

diff --git a/tests/base.py b/tests/base.py
@@ -230,3 +230,7 @@ def register_shortcode(self, name, f):
     def apply_shortcodes(self, data, *a, **kw):
         """Apply shortcodes from the registry on data."""
         return nikola.shortcodes.apply_shortcodes(data, self.shortcode_registry, **kw)
+
+    def apply_shortcodes_uuid(self, data, shortcodes, *a, **kw):
+        """Apply shortcodes from the registry on data."""
+        return nikola.shortcodes.apply_shortcodes_uuid(data, shortcodes, self.shortcode_registry, **kw)