Ticket #9854: django-form-patch.diff

forms.py

@@ -17 +17 @@
 
 NON_FIELD_ERRORS = '__all__'
 
+try:
+    from django.conf import settings
+    FORM_HELP_TEXT_HTML = settings.FORM_HELP_TEXT_HTML
+except ImportError:
+    FORM_HELP_TEXT_HTML = u' %s'
+
 def pretty_name(name):
     "Converts 'first_name' to 'First name'"
     name = name[0].upper() + name[1:]
@@ -63 +69 @@
             new_class.media = media_property(new_class)
         return new_class
 
+
 class BaseForm(StrAndUnicode):
     # This is the main implementation of all the Form logic. Note that this
     # class is different than Form. See the comments by the Form class for more
@@ -187 +194 @@
 
     def as_table(self):
         "Returns this form rendered as HTML <tr>s -- excluding the <table></table>."
-        return self._html_output(u'<tr><th>%(label)s</th><td>%(errors)s%(field)s%(help_text)s</td></tr>', u'<tr><td colspan="2">%s</td></tr>', '</td></tr>', u'<br />%s', False)
+        return self._html_output(u'<tr><th>%(label)s</th><td>%(errors)s%(field)s%(help_text)s</td></tr>', u'<tr><td colspan="2">%s</td></tr>', '</td></tr>', FORM_HELP_TEXT_HTML, False)
 
     def as_ul(self):
         "Returns this form rendered as HTML <li>s -- excluding the <ul></ul>."
-        return self._html_output(u'<li>%(errors)s%(label)s %(field)s%(help_text)s</li>', u'<li>%s</li>', '</li>', u' %s', False)
+        return self._html_output(u'<li>%(errors)s%(label)s %(field)s%(help_text)s</li>', u'<li>%s</li>', '</li>', FORM_HELP_TEXT_HTML, False)
 
     def as_p(self):
         "Returns this form rendered as HTML <p>s."
-        return self._html_output(u'<p>%(label)s %(field)s%(help_text)s</p>', u'%s', '</p>', u' %s', True)
+        return self._html_output(u'<p>%(label)s %(field)s%(help_text)s</p>', u'%s', '</p>', FORM_HELP_TEXT_HTML, True)
 
     def non_field_errors(self):
         """