Mercurial > piecrust2

diff piecrust/data/pagedata.py @ 852:4850f8c21b6e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
core: Start of the big refactor for PieCrust 3.0. * Everything is a `ContentSource`, including assets directories. * Most content sources are subclasses of the base file-system source. * A source is processed by a "pipeline", and there are 2 built-in pipelines, one for assets and one for pages. The asset pipeline is vaguely functional, but the page pipeline is completely broken right now. * Rewrite the baking process as just running appropriate pipelines on each content item. This should allow for better parallelization.
author Ludovic Chabant <ludovic@chabant.com>
date Wed, 17 May 2017 00:11:48 -0700
parents e35407c60e00
children 08e02c2a2a1a
line wrap: on
line diff
--- a/piecrust/data/pagedata.py	Sat Apr 29 21:42:22 2017 -0700
+++ b/piecrust/data/pagedata.py	Wed May 17 00:11:48 2017 -0700
@@ -75,8 +75,8 @@
             except Exception as ex:
                 logger.exception(ex)
                 raise Exception(
-                        "Error while loading attribute '%s' for: %s" %
-                        (name, self._page.rel_path)) from ex
+                    "Error while loading attribute '%s' for: %s" %
+                    (name, self._page.rel_path)) from ex
 
             # Forget this loader now that it served its purpose.
             try:
@@ -95,8 +95,8 @@
             except Exception as ex:
                 logger.exception(ex)
                 raise Exception(
-                        "Error while loading attribute '%s' for: %s" %
-                        (name, self._page.rel_path)) from ex
+                    "Error while loading attribute '%s' for: %s" %
+                    (name, self._page.rel_path)) from ex
             # We always keep the wildcard loader in the loaders list.
             return self._values[name]
 
@@ -116,12 +116,14 @@
 
         if not override_existing and attr_name in self._loaders:
             raise Exception(
-                    "A loader has already been mapped for: %s" % attr_name)
+                "A loader has already been mapped for: %s" % attr_name)
         self._loaders[attr_name] = loader
 
     def _mapValue(self, attr_name, value, override_existing=False):
-        loader = lambda _, __: value
-        self._mapLoader(attr_name, loader, override_existing=override_existing)
+        self._mapLoader(
+            attr_name,
+            lambda _, __: value,
+            override_existing=override_existing)
 
     def _ensureLoaded(self):
         if self._is_loaded:
@@ -133,8 +135,8 @@
         except Exception as ex:
             logger.exception(ex)
             raise Exception(
-                    "Error while loading data for: %s" %
-                    self._page.rel_path) from ex
+                "Error while loading data for: %s" %
+                self._page.rel_path) from ex
 
     def _load(self):
         pass
@@ -152,7 +154,7 @@
     """ Template data for a page.
     """
     def __init__(self, page, ctx):
-        super(PageData, self).__init__(page)
+        super().__init__(page)
         self._ctx = ctx
 
     def _load(self):