update summary plugin so that tests are fixed (hopefully)

This commit is contained in:
Bruno Binet 2013-03-01 01:34:18 +01:00
commit 03f87057c2

View file

@ -19,17 +19,8 @@ def content_object_init(instance):
if 'summary' in instance.metadata: if 'summary' in instance.metadata:
return return
try: def _get_content(self):
content = instance.content content = self._content
except:
# in some tests, this fails because a context has not been set
return
# monkey patch a new function around get_content that removes summary
# markers
prev_get_content = instance.get_content
def get_content(self, siteurl):
content = prev_get_content(siteurl)
if self.settings['SUMMARY_BEGIN_MARKER']: if self.settings['SUMMARY_BEGIN_MARKER']:
content = content.replace( content = content.replace(
self.settings['SUMMARY_BEGIN_MARKER'], '', 1) self.settings['SUMMARY_BEGIN_MARKER'], '', 1)
@ -37,9 +28,11 @@ def content_object_init(instance):
content = content.replace( content = content.replace(
self.settings['SUMMARY_END_MARKER'], '', 1) self.settings['SUMMARY_END_MARKER'], '', 1)
return content return content
instance.get_content = types.MethodType(get_content, instance) instance._get_content = types.MethodType(_get_content, instance)
# extract out our summary # extract out our summary
if not hasattr(instance, '_summary'):
content = instance._content
begin_summary = -1 begin_summary = -1
end_summary = -1 end_summary = -1
if instance.settings['SUMMARY_BEGIN_MARKER']: if instance.settings['SUMMARY_BEGIN_MARKER']: