comparison piecrust/data/paginationdata.py @ 922:b447c24bc8d4

Merge changes from PieCrust2 branch.
author Ludovic Chabant <ludovic@chabant.com>
date Fri, 29 Sep 2017 17:05:09 -0700
parents d6d35b2efd04 cd236a6af9f6
children cc55740860de
comparison
equal deleted inserted replaced
921:628d639bb30b 922:b447c24bc8d4
1 import copy
1 import time 2 import time
2 import logging 3 import logging
3 from piecrust.data.pagedata import LazyPageConfigData 4 from piecrust.data.pagedata import LazyPageConfigData
4 from piecrust.sources.base import AbortedSourceUseError 5 from piecrust.sources.base import AbortedSourceUseError
5 6
17 page = self._page 18 page = self._page
18 dt = page.datetime 19 dt = page.datetime
19 set_val = self._setValue 20 set_val = self._setValue
20 21
21 page_url = page.getUri() 22 page_url = page.getUri()
22 _, slug = split_uri(page.app, page_url) 23 _, rel_url = split_uri(page.app, page_url)
23 set_val('url', page_url) 24 set_val('url', page_url)
24 set_val('slug', slug) 25 set_val('rel_url', rel_url)
26 set_val('slug', rel_url) # For backwards compatibility
27 set_val('route', copy.deepcopy(page.source_metadata['route_params']))
25 set_val('timestamp', time.mktime(page.datetime.timetuple())) 28 set_val('timestamp', time.mktime(page.datetime.timetuple()))
26 set_val('datetime', { 29 set_val('datetime', {
27 'year': dt.year, 'month': dt.month, 'day': dt.day, 30 'year': dt.year, 'month': dt.month, 'day': dt.day,
28 'hour': dt.hour, 'minute': dt.minute, 'second': dt.second}) 31 'hour': dt.hour, 'minute': dt.minute, 'second': dt.second})
29 set_val('mtime', page.content_mtime) 32 set_val('mtime', page.content_mtime)