Merge pull request #42 from aniketschneider/validation-email-template

[osqa.git] / forum / utils / html.py

diff --git a/forum/utils/html.py b/forum/utils/html.py
index 6afaf62ac3978f62ad6933b2a29ceb3679ef50c9..88253e12e60c8ea92d8cc5a064bdc426f5d54ea2 100644 (file)
--- a/forum/utils/html.py
+++ b/forum/utils/html.py
@@ -1,9 +1,9 @@
 """Utilities for working with HTML."""
 """Utilities for working with HTML."""

-#import html5lib

 from html5lib import sanitizer, serializer, tokenizer, treebuilders, treewalkers, HTMLParser
 from html5lib import sanitizer, serializer, tokenizer, treebuilders, treewalkers, HTMLParser

+from urllib import quote_plus

 from django.utils.html import strip_tags
 from forum.utils.html2text import HTML2Text
 from django.utils.html import strip_tags
 from forum.utils.html2text import HTML2Text

-from django.template import mark_safe
+from django.utils.safestring import mark_safe

 from forum import settings
 
 class HTMLSanitizerMixin(sanitizer.HTMLSanitizerMixin):
 from forum import settings
 
 class HTMLSanitizerMixin(sanitizer.HTMLSanitizerMixin):


@@ -50,7 +50,7 @@ def sanitize_html(html):
     return u''.join(output_generator)
 
 def cleanup_urls(url):
     return u''.join(output_generator)
 
 def cleanup_urls(url):

-    return strip_tags(url)
+    return quote_plus(strip_tags(url))

 
 
 def html2text(s, ignore_tags=(), indent_width=4, page_width=80):
 
 
 def html2text(s, ignore_tags=(), indent_width=4, page_width=80):