X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=quotes%2Flocalmodels.py;h=691ea8cc6421c13ad3c43bececf5f8e61d935e96;hb=6d29db35c714fe52854a5b2e4002403150da1954;hp=0cbb37603afd06805272de4b282a8a83092f9214;hpb=5c563ff1701456a2ca7108a301e4e48457475daa;p=djsite.git

diff --git a/quotes/localmodels.py b/quotes/localmodels.py
index 0cbb376..691ea8c 100644
--- a/quotes/localmodels.py
+++ b/quotes/localmodels.py
@@ -2,7 +2,8 @@ import tinymce.models
 import bleach
 
 def valid_html(value):
-    return bleach.clean(value, bleach.ALLOWED_TAGS + ['p'])
+    return bleach.clean(value, bleach.ALLOWED_TAGS + ['p', 'br'],
+                        strip=True, strip_comments=True)
 
 class HTMLField(tinymce.models.HTMLField):
     def pre_save(self, model_instance, add):
@@ -10,10 +11,3 @@ class HTMLField(tinymce.models.HTMLField):
         safe_value = valid_html(value)
         setattr(model_instance, self.attname, safe_value)
         return safe_value
-
-import tagging.fields
-
-class TagField(tagging.fields.TagField):
-    def __init__(self, *args, **kwargs):
-        kwargs.setdefault('help_text', 'Space-separated list of tags')
-        return tagging.fields.TagField.__init__(self, *args, **kwargs)