diff --git a/django/newforms/forms.py b/django/newforms/forms.py index 6ebebded4b..1ea1c73d9a 100644 --- a/django/newforms/forms.py +++ b/django/newforms/forms.py @@ -159,7 +159,7 @@ class BaseForm(StrAndUnicode): def as_p(self): "Returns this form rendered as HTML

s." - return self._html_output(u'

%(label)s %(field)s%(help_text)s

', u'

%s

', '

', u' %s', True) + return self._html_output(u'

%(label)s %(field)s%(help_text)s

', u'%s', '

', u' %s', True) def non_field_errors(self): """ diff --git a/tests/regressiontests/forms/tests.py b/tests/regressiontests/forms/tests.py index d487ab9e8e..0808ebe97e 100644 --- a/tests/regressiontests/forms/tests.py +++ b/tests/regressiontests/forms/tests.py @@ -1974,11 +1974,11 @@ AttributeError: 'Person' object has no attribute 'cleaned_data'
  • >>> print p.as_p() -

    +

    -

    +

    -

    +

    If you don't pass any values to the Form's __init__(), or if you pass None, @@ -2684,7 +2684,7 @@ its field's order in the form.
  • Last name:
  • Birthday:
  • >>> print p.as_p() -

    +

    First name:

    Last name:

    Birthday: