X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/74a95513f60ac1cddd488fad7d5cbcfdc674c221..52b732386eaabbe2d99e3b13ad680ab06bdc4c47:/forum/utils/html.py?ds=sidebyside diff --git a/forum/utils/html.py b/forum/utils/html.py index cab52a4..bf84e2f 100644 --- a/forum/utils/html.py +++ b/forum/utils/html.py @@ -1,6 +1,6 @@ """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.template import mark_safe @@ -39,7 +39,7 @@ class HTMLSanitizer(tokenizer.HTMLTokenizer, HTMLSanitizerMixin): 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") @@ -68,7 +68,7 @@ def hyperlink(url, title, **attrs): return mark_safe('%s' % (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)