Making requirements to Django 1.6

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

diff --git a/forum/utils/html.py b/forum/utils/html.py
index 28a6a4b9647fe990dca340d502102c44a542e7ff..88253e12e60c8ea92d8cc5a064bdc426f5d54ea2 100644 (file)
--- a/forum/utils/html.py
+++ b/forum/utils/html.py
@@ -1,6 +1,6 @@
 """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.safestring import mark_safe
 from django.utils.html import strip_tags
 from forum.utils.html2text import HTML2Text
 from django.utils.safestring import mark_safe


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


@@ -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_BASE_URL + obj.get_absolute_url(), unicode(obj), **attrs)
+    return hyperlink(settings.APP_URL + obj.get_absolute_url(), unicode(obj), **attrs)