fix obvious brainfarts

nikola/plugins/compile/rest/__init__.py

@@ -82,7 +82,7 @@ def compile_string(self, data, source_path=None, is_two_file=True, post=None, la
         }
 
         from nikola import shortcodes as sc
-        new_data, shortcodes = sc._extract_shortcodes(data)
+        new_data, shortcodes = sc.extract_shortcodes(data)
         output, error_level, deps = rst2html(
             new_data, settings_overrides=settings_overrides, logger=self.logger, source_path=source_path, l_add_ln=add_ln, transforms=self.site.rst_transforms,
             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
             # Original issue: empty files.  `output` became a bytestring.
             output = output.decode('utf-8')
 
-        output, shortcode_deps = self.site.apply_shortcodes2(output, shortcodes, filename=source_path, with_dependencies=True, extra_context=dict(post=post))
+        output, shortcode_deps = self.site.apply_shortcodes_uuid(output, shortcodes, filename=source_path, with_dependencies=True, extra_context=dict(post=post))
         return output, error_level, deps, shortcode_deps
 
     # TODO remove in v8

nikola/shortcodes.py

@@ -209,7 +209,7 @@ def _parse_shortcode_args(data, start, shortcode_name, start_pos):
     raise ParsingError("Shortcode '{0}' starting at {1} is not terminated correctly with '%}}}}'!".format(shortcode_name, _format_position(data, start_pos)))
 
 
-def _extract_shortcodes(data):
+def extract_shortcodes(data):
     """
     Returns data, shortcodes: