Mercurial > piecrust2

comparison piecrust/data/builder.py @ 5:474c9882decf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Upgrade to Python 3.
author Ludovic Chabant <ludovic@chabant.com>
date Mon, 11 Aug 2014 22:36:47 -0700
parents f485ba500df3
children 30a42341cfa8
comparison
equal deleted inserted replaced
4:7dc71c2dc9a8 5:474c9882decf
57 return data 57 return data
58 58
59 59
60 def build_layout_data(page, page_data, contents): 60 def build_layout_data(page, page_data, contents):
61 data = dict(page_data) 61 data = dict(page_data)
62 for name, txt in contents.iteritems(): 62 for name, txt in contents.items():
63 if name in data: 63 if name in data:
64 logger.warning("Content segment '%s' will hide existing data." % 64 logger.warning("Content segment '%s' will hide existing data." %
65 name) 65 name)
66 data[name] = txt 66 data[name] = txt
67 return data 67 return data