Use Django's linebreaks method

diff --git a/quotes/conftest.py b/quotes/conftest.py
index b87a6baf2a756894143ec20c6f2db398144f8f01..9210e6aeb60a2049e2837372fda0ff9fffe8bd05 100644 (file)
--- a/quotes/conftest.py
+++ b/quotes/conftest.py
@@ -21,7 +21,8 @@ class ValidatingClient(object):
             return None
         assert response.charset == 'utf-8'
         document = response.content.decode(response.charset)
-        lxml.etree.fromstring(document)
+        print 'For url %s got page:\n%s' % (url, document)
+        lxml.etree.fromstring(document.replace('<br>', '<br/>'))
         assert '<script>' not in document
         return document
 

diff --git a/quotes/localmodels.py b/quotes/localmodels.py
index afe874a6c8c8938f2412aa3873e5fc3250240613..c09f7710361be183be7112d39f2396c45db73bfd 100644 (file)
--- a/quotes/localmodels.py
+++ b/quotes/localmodels.py
@@ -2,7 +2,7 @@ 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'])
 
 class HTMLField(tinymce.models.HTMLField):
     def pre_save(self, model_instance, add):

diff --git a/quotes/massimport.py b/quotes/massimport.py
index ade6f3899879bdbc5a76a9d10e12b0bc71ac8b02..cf63152f84e9b5a98b0c53b6fbea89904e7619ae 100644 (file)
--- a/quotes/massimport.py
+++ b/quotes/massimport.py
@@ -1,5 +1,6 @@
 import re
 from django.db import DatabaseError, transaction
+from django.utils.html import linebreaks
 
 from quotes.models import QuoteTag, Quote, Work, Author
 
@@ -41,13 +42,8 @@ def add_tags_on_quote(quote, tagline, resultcontext):
         quote.tags.add(tag)
 
 def paragraphize(text):
-    paragraph = ""
-    for line in text.splitlines():
-        line = line.strip()
-        if not line: continue
-        paragraph += "<p>%s</p>" % line
-        # rest of the HTML will be bleach.clean()'d
-    return paragraph
+    text = text.strip()
+    return linebreaks(text)
         
 def create_quote(quotetext, authorname, workname, tagline, resultcontext):
     author = get_or_create_author(authorname, resultcontext)