Skip to content

Commit 813b330

Browse files
committedMay 4, 2017
fix obvious brainfarts
1 parent d041bfa commit 813b330

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed
 

‎nikola/plugins/compile/rest/__init__.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ def compile_string(self, data, source_path=None, is_two_file=True, post=None, la
8282
}
8383

8484
from nikola import shortcodes as sc
85-
new_data, shortcodes = sc._extract_shortcodes(data)
85+
new_data, shortcodes = sc.extract_shortcodes(data)
8686
output, error_level, deps = rst2html(
8787
new_data, settings_overrides=settings_overrides, logger=self.logger, source_path=source_path, l_add_ln=add_ln, transforms=self.site.rst_transforms,
8888
no_title_transform=self.site.config.get('NO_DOCUTILS_TITLE_TRANSFORM', False))
@@ -91,7 +91,7 @@ def compile_string(self, data, source_path=None, is_two_file=True, post=None, la
9191
# Original issue: empty files. `output` became a bytestring.
9292
output = output.decode('utf-8')
9393

94-
output, shortcode_deps = self.site.apply_shortcodes2(output, shortcodes, filename=source_path, with_dependencies=True, extra_context=dict(post=post))
94+
output, shortcode_deps = self.site.apply_shortcodes_uuid(output, shortcodes, filename=source_path, with_dependencies=True, extra_context=dict(post=post))
9595
return output, error_level, deps, shortcode_deps
9696

9797
# TODO remove in v8

‎nikola/shortcodes.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ def _parse_shortcode_args(data, start, shortcode_name, start_pos):
209209
raise ParsingError("Shortcode '{0}' starting at {1} is not terminated correctly with '%}}}}'!".format(shortcode_name, _format_position(data, start_pos)))
210210

211211

212-
def _extract_shortcodes(data):
212+
def extract_shortcodes(data):
213213
"""
214214
Returns data, shortcodes:
215215

0 commit comments

Comments
 (0)
Failed to load comments.