From 4bf8e8888c7df6717eb43487136cc9d5c155bc6c Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sun, 19 Jun 2011 20:41:40 -0500 Subject: Adds util.cleaned_markdown_conversion() and uses it in the submission process This simplifies the markdown processing & html cleaning of descritions and etc by providing a wrapper function that we can use in multiple locations. --- mediagoblin/util.py | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'mediagoblin/util.py') diff --git a/mediagoblin/util.py b/mediagoblin/util.py index 4d625728..0e43a1f5 100644 --- a/mediagoblin/util.py +++ b/mediagoblin/util.py @@ -29,6 +29,7 @@ import jinja2 import translitcodec from webob import Response, exc from lxml.html.clean import Cleaner +import markdown from mediagoblin import mg_globals from mediagoblin.db.util import ObjectId @@ -375,6 +376,16 @@ def clean_html(html): return HTML_CLEANER.clean_html(html) +MARKDOWN_INSTANCE = markdown.Markdown(safe_mode='escape') + + +def cleaned_markdown_conversion(text): + """ + Take a block of text, run it through MarkDown, and clean its HTML. + """ + return clean_html(MARKDOWN_INSTANCE.convert(text)) + + SETUP_GETTEXTS = {} def setup_gettext(locale): -- cgit v1.2.3