Issue 2119 - Add get_page_content template function.

cms/converters.py

 # coding: utf-8
 
 # This file is part of the Adblock Plus web scripts,
 # Copyright (C) 2006-2015 Eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
 # published by the Free Software Foundation.
 #
 # Adblock Plus is distributed in the hope that it will be useful,
@@ skipping 326 matching lines @@
     # generating the master translation.
     localedata = self._params["localedata"]
     return jinja2.Markup(self.localize_string(name, default, localedata, html_escapes))
 
   def get_string(self, name, page):
     localedata = self._params["source"].read_locale(self._params["locale"], page)
     default = localedata[name]
     return jinja2.Markup(self.localize_string(name, default, localedata, html_escapes))
 
   def get_page_content(self, page, locale=None):
-    from utils import get_page_params

[Wladimir Palant, 2015/04/06 19:14:30]

That's an implicit relative import. From
https://www.python.org/dev/peps/pep-0008/:
So please:

  from cms.utils import get_page_params

[kzar, 2015/04/07 14:43:56]

Done.

-
-    page, ext = os.path.splitext(page)

[Wladimir Palant, 2015/04/06 19:14:30]

We never specify the format as part of the page. You should "guess" the format:

  source = self._params["source]
  for format in converters.iterkeys():
    if source.has_page(source, format):
      ...

In fact, that's something that get_page_params() could do.

[kzar, 2015/04/07 14:43:56]

Done.

+    from cms.utils import get_page_params
+
     if locale is None:
       locale = self._params["locale"]
-    params = get_page_params(self._params["source"], locale, page, ext[1:])
-    return {k: params[k] for k in ("head", "body")}
+    return get_page_params(self._params["source"], locale, page)
 
   def linkify(self, page, locale=None, **attrs):
     if locale is None:
       locale = self._params["locale"]
 
     locale, url = self._params["source"].resolve_link(page, locale)
     return jinja2.Markup('<a%s>' % ''.join(
       ' %s="%s"' % (name, jinja2.escape(value)) for name, value in [
         ('href', url),
         ('hreflang', locale)
@@ skipping 17 matching lines @@
         stack.pop()
       stack[-1]["subitems"].append(item)
       stack.append(item)
     return structured
 
 converters = {
   "html": RawConverter,
   "md": MarkdownConverter,
   "tmpl": TemplateConverter,
 }