adding a new setting that allows to automatically redirect the user's browser to...

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

diff --git a/forum/utils/html.py b/forum/utils/html.py
index cab52a4252ecd666dc5c9e06958a5f0300cde9bc..28a6a4b9647fe990dca340d502102c44a542e7ff 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
+#import html5lib
+from html5lib import sanitizer, serializer, tokenizer, treebuilders, treewalkers, HTMLParser

 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):


@@ -39,7 +39,7 @@ class HTMLSanitizer(tokenizer.HTMLTokenizer, HTMLSanitizerMixin):
 
 def sanitize_html(html):
     """Sanitizes an HTML fragment."""
 
 def sanitize_html(html):
     """Sanitizes an HTML fragment."""

-    p = html5lib.HTMLParser(tokenizer=HTMLSanitizer,
+    p = HTMLParser(tokenizer=HTMLSanitizer,

                             tree=treebuilders.getTreeBuilder("dom"))
     dom_tree = p.parseFragment(html)
     walker = treewalkers.getTreeWalker("dom")
                             tree=treebuilders.getTreeBuilder("dom"))
     dom_tree = p.parseFragment(html)
     walker = treewalkers.getTreeWalker("dom")


@@ -68,7 +68,7 @@ def hyperlink(url, title, **attrs):
     return mark_safe('<a href="%s" %s>%s</a>' % (url, " ".join('%s="%s"' % i for i in attrs.items()), title))
 
 def objlink(obj, **attrs):
     return mark_safe('<a href="%s" %s>%s</a>' % (url, " ".join('%s="%s"' % i for i in attrs.items()), title))
 
 def objlink(obj, **attrs):

-    return hyperlink(settings.APP_URL + obj.get_absolute_url(), unicode(obj), **attrs)
+    return hyperlink(settings.APP_BASE_URL + obj.get_absolute_url(), unicode(obj), **attrs)