From c04280165066cb2dc355fb48e88229d696e5217b Mon Sep 17 00:00:00 2001 From: Jakob Kramer Date: Sat, 4 Aug 2012 17:51:26 +0200 Subject: [PATCH] renamed MARKDOWN_INSTANCE to UNSAFE_... as proposed by Elrond. Conflicts: mediagoblin/tools/text.py Signed-off-by: Joar Wandborg --- mediagoblin/tools/text.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mediagoblin/tools/text.py b/mediagoblin/tools/text.py index 82de8a48..138d8ed7 100644 --- a/mediagoblin/tools/text.py +++ b/mediagoblin/tools/text.py @@ -110,7 +110,9 @@ def tag_length_validator(form, field): ', '.join(too_long_tags))) -MARKDOWN_INSTANCE = markdown.Markdown(safe_mode='escape') +# Don't use the safe mode, because lxml.html.clean is better and we are using +# it anyway +UNSAFE_MARKDOWN_INSTANCE = markdown.Markdown() def cleaned_markdown_conversion(text): @@ -122,4 +124,4 @@ def cleaned_markdown_conversion(text): if not text: return u'' - return clean_html(MARKDOWN_INSTANCE.convert(text)) + return clean_html(UNSAFE_MARKDOWN_INSTANCE.convert(text))