diff options
| author | Jakob Kramer <jakob.kramer@gmx.de> | 2012-08-04 17:51:26 +0200 |
|---|---|---|
| committer | Joar Wandborg <git@wandborg.com> | 2012-08-07 18:48:57 +0200 |
| commit | c04280165066cb2dc355fb48e88229d696e5217b (patch) | |
| tree | 04feba88df6714892a78d7b6d2a7f636777e9089 | |
| parent | 3031764d13348ce4a3f03a3ee0c7418bcfb27c90 (diff) | |
| download | mediagoblin-c04280165066cb2dc355fb48e88229d696e5217b.tar.lz mediagoblin-c04280165066cb2dc355fb48e88229d696e5217b.tar.xz mediagoblin-c04280165066cb2dc355fb48e88229d696e5217b.zip | |
renamed MARKDOWN_INSTANCE to UNSAFE_...
as proposed by Elrond.
Conflicts:
mediagoblin/tools/text.py
Signed-off-by: Joar Wandborg <git@wandborg.com>
| -rw-r--r-- | mediagoblin/tools/text.py | 6 |
1 files 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)) |