From 8b36f90db9f76264fdfeb260b137066266f9fa71 Mon Sep 17 00:00:00 2001 From: Massimo Santini Date: Tue, 4 Oct 2011 07:31:21 +0200 Subject: [PATCH] Revert "Relativize URLs in summary as we do for content" This reverts commit 5a993de4002cfc83168d5a902fd8b25cef0a2251. --- pelican/contents.py | 13 ++----------- pelican/writers.py | 20 +++++--------------- 2 files changed, 7 insertions(+), 26 deletions(-) diff --git a/pelican/contents.py b/pelican/contents.py index 4f72f13a..d0859a96 100644 --- a/pelican/contents.py +++ b/pelican/contents.py @@ -85,8 +85,8 @@ class Page(object): self.locale_date = self.date.strftime(self.date_format.encode('ascii','xmlcharrefreplace')).decode('utf') # manage summary - if not hasattr(self, '_summary'): - self._summary = property(lambda self: truncate_html_words(self.content, 50)).__get__(self, Page) + if not hasattr(self, 'summary'): + self.summary = property(lambda self: truncate_html_words(self.content, 50)).__get__(self, Page) # manage status if not hasattr(self, 'status'): @@ -106,15 +106,6 @@ class Page(object): content = self._content return content - @property - def summary(self): - if hasattr(self, "_get_summary"): - summary = self._get_summary() - else: - summary = self._summary - return summary - - class Article(Page): mandatory_properties = ('title', 'date', 'category') diff --git a/pelican/writers.py b/pelican/writers.py index c57ae299..4dfc1ba6 100644 --- a/pelican/writers.py +++ b/pelican/writers.py @@ -16,8 +16,7 @@ class Writer(object): def __init__(self, output_path, settings=None): self.output_path = output_path - self.reminder_content = dict() - self.reminder_summary = dict() + self.reminder = dict() self.settings = settings or {} def _create_new_feed(self, feed_type, context): @@ -201,20 +200,11 @@ class Writer(object): self.update_context_contents(name, item) # if it is a content, patch it - else: - - if hasattr(item, '_content'): - relative_path = get_relative_path(name) - paths = self.reminder_content.setdefault(item, []) + elif hasattr(item, '_content'): + relative_path = get_relative_path(name) + + paths = self.reminder.setdefault(item, []) if relative_path not in paths: paths.append(relative_path) setattr(item, "_get_content", partial(_update_content, name, item)) - - if hasattr(item, '_summary'): - relative_path = get_relative_path(name) - paths = self.reminder_summary.setdefault(item, []) - if relative_path not in paths: - paths.append(relative_path) - setattr(item, "_get_summary", - partial(_update_content, name, item))