Limit tags from tinymce and use strip in bleach rather than replace

[djsite.git] / quotes / localmodels.py

diff --git a/quotes/localmodels.py b/quotes/localmodels.py
index 0cbb37603afd06805272de4b282a8a83092f9214..691ea8cc6421c13ad3c43bececf5f8e61d935e96 100644 (file)
--- 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)