diff piecrust/data/builder.py @ 237:879fe1457e48

data: `Linker` refactor. * Unify the `Linker` and `RecursiveLinker`. * When a page and a directory share the same name, merge their entries in the returned iterator. * Tentative new templating interface.
author Ludovic Chabant <ludovic@chabant.com>
date Sun, 15 Feb 2015 22:46:23 -0800
parents 7decf00eee47
children d9d5c5de02a8
line wrap: on
line diff
--- a/piecrust/data/builder.py	Sun Feb 15 22:42:58 2015 -0800
+++ b/piecrust/data/builder.py	Sun Feb 15 22:46:23 2015 -0800
@@ -5,7 +5,7 @@
 from piecrust.configuration import merge_dicts
 from piecrust.data.assetor import Assetor
 from piecrust.data.debug import build_debug_info
-from piecrust.data.linker import Linker, RecursiveLinker
+from piecrust.data.linker import Linker
 from piecrust.data.paginator import Paginator
 from piecrust.uriutil import get_slug, get_first_sub_uri
 
@@ -36,7 +36,7 @@
     paginator = Paginator(page, pgn_source, first_uri, ctx.page_num,
                           ctx.pagination_filter)
     assetor = Assetor(page, first_uri)
-    recursive_linker = RecursiveLinker(page.source, page_path=page.rel_path)
+    recursive_linker = Linker(page.source, page_path=page.rel_path)
     data = {
             'piecrust': pc_data,
             'page': dict(page.config.get()),