Fixed #29038 -- Removed closing slash from HTML void tags.

1 files changed, 120 insertions, 120 deletions

diff --git a/tests/model_formsets/tests.py b/tests/model_formsets/tests.py
index 92d607f7c3..4d00a589ce 100644
--- a/tests/model_formsets/tests.py
+++ b/tests/model_formsets/tests.py
@@ -152,20 +152,20 @@ class ModelFormsetTest(TestCase):
         self.assertHTMLEqual(
             formset.forms[0].as_p(),
             '<p><label for="id_form-0-name">Name:</label>'
-            '<input id="id_form-0-name" type="text" name="form-0-name" maxlength="100" />'
-            '<input type="hidden" name="form-0-id" id="id_form-0-id" /></p>'
+            '<input id="id_form-0-name" type="text" name="form-0-name" maxlength="100">'
+            '<input type="hidden" name="form-0-id" id="id_form-0-id"></p>'
         )
         self.assertHTMLEqual(
             formset.forms[1].as_p(),
             '<p><label for="id_form-1-name">Name:</label>'
-            '<input id="id_form-1-name" type="text" name="form-1-name" maxlength="100" />'
-            '<input type="hidden" name="form-1-id" id="id_form-1-id" /></p>'
+            '<input id="id_form-1-name" type="text" name="form-1-name" maxlength="100">'
+            '<input type="hidden" name="form-1-id" id="id_form-1-id"></p>'
         )
         self.assertHTMLEqual(
             formset.forms[2].as_p(),
             '<p><label for="id_form-2-name">Name:</label>'
-            ' <input id="id_form-2-name" type="text" name="form-2-name" maxlength="100" />'
-            '<input type="hidden" name="form-2-id" id="id_form-2-id" /></p>'
+            ' <input id="id_form-2-name" type="text" name="form-2-name" maxlength="100">'
+            '<input type="hidden" name="form-2-id" id="id_form-2-id"></p>'
         )
 
         data = {
@@ -202,20 +202,20 @@ class ModelFormsetTest(TestCase):
         self.assertHTMLEqual(
             formset.forms[0].as_p(),
             '<p><label for="id_form-0-name">Name:</label>'
-            '<input id="id_form-0-name" type="text" name="form-0-name" value="Arthur Rimbaud" maxlength="100" />'
-            '<input type="hidden" name="form-0-id" value="%d" id="id_form-0-id" /></p>' % author2.id
+            '<input id="id_form-0-name" type="text" name="form-0-name" value="Arthur Rimbaud" maxlength="100">'
+            '<input type="hidden" name="form-0-id" value="%d" id="id_form-0-id"></p>' % author2.id
         )
         self.assertHTMLEqual(
             formset.forms[1].as_p(),
             '<p><label for="id_form-1-name">Name:</label>'
-            '<input id="id_form-1-name" type="text" name="form-1-name" value="Charles Baudelaire" maxlength="100" />'
-            '<input type="hidden" name="form-1-id" value="%d" id="id_form-1-id" /></p>' % author1.id
+            '<input id="id_form-1-name" type="text" name="form-1-name" value="Charles Baudelaire" maxlength="100">'
+            '<input type="hidden" name="form-1-id" value="%d" id="id_form-1-id"></p>' % author1.id
         )
         self.assertHTMLEqual(
             formset.forms[2].as_p(),
             '<p><label for="id_form-2-name">Name:</label>'
-            '<input id="id_form-2-name" type="text" name="form-2-name" maxlength="100" />'
-            '<input type="hidden" name="form-2-id" id="id_form-2-id" /></p>'
+            '<input id="id_form-2-name" type="text" name="form-2-name" maxlength="100">'
+            '<input type="hidden" name="form-2-id" id="id_form-2-id"></p>'
         )
 
         data = {
@@ -253,36 +253,36 @@ class ModelFormsetTest(TestCase):
             formset.forms[0].as_p(),
             '<p><label for="id_form-0-name">Name:</label>'
             '<input id="id_form-0-name" type="text" name="form-0-name" '
-            'value="Arthur Rimbaud" maxlength="100" /></p>'
+            'value="Arthur Rimbaud" maxlength="100"></p>'
             '<p><label for="id_form-0-DELETE">Delete:</label>'
-            '<input type="checkbox" name="form-0-DELETE" id="id_form-0-DELETE" />'
-            '<input type="hidden" name="form-0-id" value="%d" id="id_form-0-id" /></p>' % author2.id
+            '<input type="checkbox" name="form-0-DELETE" id="id_form-0-DELETE">'
+            '<input type="hidden" name="form-0-id" value="%d" id="id_form-0-id"></p>' % author2.id
         )
         self.assertHTMLEqual(
             formset.forms[1].as_p(),
             '<p><label for="id_form-1-name">Name:</label>'
             '<input id="id_form-1-name" type="text" name="form-1-name" '
-            'value="Charles Baudelaire" maxlength="100" /></p>'
+            'value="Charles Baudelaire" maxlength="100"></p>'
             '<p><label for="id_form-1-DELETE">Delete:</label>'
-            '<input type="checkbox" name="form-1-DELETE" id="id_form-1-DELETE" />'
-            '<input type="hidden" name="form-1-id" value="%d" id="id_form-1-id" /></p>' % author1.id
+            '<input type="checkbox" name="form-1-DELETE" id="id_form-1-DELETE">'
+            '<input type="hidden" name="form-1-id" value="%d" id="id_form-1-id"></p>' % author1.id
         )
         self.assertHTMLEqual(
             formset.forms[2].as_p(),
             '<p><label for="id_form-2-name">Name:</label>'
             '<input id="id_form-2-name" type="text" name="form-2-name" '
-            'value="Paul Verlaine" maxlength="100" /></p>'
+            'value="Paul Verlaine" maxlength="100"></p>'
             '<p><label for="id_form-2-DELETE">Delete:</label>'
-            '<input type="checkbox" name="form-2-DELETE" id="id_form-2-DELETE" />'
-            '<input type="hidden" name="form-2-id" value="%d" id="id_form-2-id" /></p>' % author3.id
+            '<input type="checkbox" name="form-2-DELETE" id="id_form-2-DELETE">'
+            '<input type="hidden" name="form-2-id" value="%d" id="id_form-2-id"></p>' % author3.id
         )
         self.assertHTMLEqual(
             formset.forms[3].as_p(),
             '<p><label for="id_form-3-name">Name:</label>'
-            '<input id="id_form-3-name" type="text" name="form-3-name" maxlength="100" /></p>'
+            '<input id="id_form-3-name" type="text" name="form-3-name" maxlength="100"></p>'
             '<p><label for="id_form-3-DELETE">Delete:</label>'
-            '<input type="checkbox" name="form-3-DELETE" id="id_form-3-DELETE" />'
-            '<input type="hidden" name="form-3-id" id="id_form-3-id" /></p>'
+            '<input type="checkbox" name="form-3-DELETE" id="id_form-3-DELETE">'
+            '<input type="hidden" name="form-3-id" id="id_form-3-id"></p>'
         )
 
         data = {
@@ -528,10 +528,10 @@ class ModelFormsetTest(TestCase):
         self.assertHTMLEqual(
             formset.forms[0].as_p(),
             '<p><label for="id_form-0-name">Name:</label>'
-            '<input id="id_form-0-name" type="text" name="form-0-name" maxlength="100" /></p>'
+            '<input id="id_form-0-name" type="text" name="form-0-name" maxlength="100"></p>'
             '<p><label for="id_form-0-write_speed">Write speed:</label>'
-            '<input type="number" name="form-0-write_speed" id="id_form-0-write_speed" />'
-            '<input type="hidden" name="form-0-author_ptr" id="id_form-0-author_ptr" /></p>'
+            '<input type="number" name="form-0-write_speed" id="id_form-0-write_speed">'
+            '<input type="hidden" name="form-0-author_ptr" id="id_form-0-author_ptr"></p>'
         )
 
         data = {
@@ -556,18 +556,18 @@ class ModelFormsetTest(TestCase):
         self.assertHTMLEqual(
             formset.forms[0].as_p(),
             '<p><label for="id_form-0-name">Name:</label>'
-            '<input id="id_form-0-name" type="text" name="form-0-name" value="Ernest Hemingway" maxlength="100" /></p>'
+            '<input id="id_form-0-name" type="text" name="form-0-name" value="Ernest Hemingway" maxlength="100"></p>'
             '<p><label for="id_form-0-write_speed">Write speed:</label>'
-            '<input type="number" name="form-0-write_speed" value="10" id="id_form-0-write_speed" />'
-            '<input type="hidden" name="form-0-author_ptr" value="%d" id="id_form-0-author_ptr" /></p>' % hemingway_id
+            '<input type="number" name="form-0-write_speed" value="10" id="id_form-0-write_speed">'
+            '<input type="hidden" name="form-0-author_ptr" value="%d" id="id_form-0-author_ptr"></p>' % hemingway_id
         )
         self.assertHTMLEqual(
             formset.forms[1].as_p(),
             '<p><label for="id_form-1-name">Name:</label>'
-            '<input id="id_form-1-name" type="text" name="form-1-name" maxlength="100" /></p>'
+            '<input id="id_form-1-name" type="text" name="form-1-name" maxlength="100"></p>'
             '<p><label for="id_form-1-write_speed">Write speed:</label>'
-            '<input type="number" name="form-1-write_speed" id="id_form-1-write_speed" />'
-            '<input type="hidden" name="form-1-author_ptr" id="id_form-1-author_ptr" /></p>'
+            '<input type="number" name="form-1-write_speed" id="id_form-1-write_speed">'
+            '<input type="hidden" name="form-1-author_ptr" id="id_form-1-author_ptr"></p>'
         )
 
         data = {
@@ -598,23 +598,23 @@ class ModelFormsetTest(TestCase):
         self.assertHTMLEqual(
             formset.forms[0].as_p(),
             '<p><label for="id_book_set-0-title">Title:</label> <input id="id_book_set-0-title" type="text" '
-            'name="book_set-0-title" maxlength="100" /><input type="hidden" name="book_set-0-author" value="%d" '
-            'id="id_book_set-0-author" /><input type="hidden" name="book_set-0-id" id="id_book_set-0-id" />'
+            'name="book_set-0-title" maxlength="100"><input type="hidden" name="book_set-0-author" value="%d" '
+            'id="id_book_set-0-author"><input type="hidden" name="book_set-0-id" id="id_book_set-0-id">'
             '</p>' % author.id
         )
         self.assertHTMLEqual(
             formset.forms[1].as_p(),
             '<p><label for="id_book_set-1-title">Title:</label>'
-            '<input id="id_book_set-1-title" type="text" name="book_set-1-title" maxlength="100" />'
-            '<input type="hidden" name="book_set-1-author" value="%d" id="id_book_set-1-author" />'
-            '<input type="hidden" name="book_set-1-id" id="id_book_set-1-id" /></p>' % author.id
+            '<input id="id_book_set-1-title" type="text" name="book_set-1-title" maxlength="100">'
+            '<input type="hidden" name="book_set-1-author" value="%d" id="id_book_set-1-author">'
+            '<input type="hidden" name="book_set-1-id" id="id_book_set-1-id"></p>' % author.id
         )
         self.assertHTMLEqual(
             formset.forms[2].as_p(),
             '<p><label for="id_book_set-2-title">Title:</label>'
-            '<input id="id_book_set-2-title" type="text" name="book_set-2-title" maxlength="100" />'
-            '<input type="hidden" name="book_set-2-author" value="%d" id="id_book_set-2-author" />'
-            '<input type="hidden" name="book_set-2-id" id="id_book_set-2-id" /></p>' % author.id
+            '<input id="id_book_set-2-title" type="text" name="book_set-2-title" maxlength="100">'
+            '<input type="hidden" name="book_set-2-author" value="%d" id="id_book_set-2-author">'
+            '<input type="hidden" name="book_set-2-id" id="id_book_set-2-id"></p>' % author.id
         )
 
         data = {
@@ -648,25 +648,25 @@ class ModelFormsetTest(TestCase):
             formset.forms[0].as_p(),
             '<p><label for="id_book_set-0-title">Title:</label>'
             '<input id="id_book_set-0-title" type="text" name="book_set-0-title" '
-            'value="Les Fleurs du Mal" maxlength="100" />'
-            '<input type="hidden" name="book_set-0-author" value="%d" id="id_book_set-0-author" />'
-            '<input type="hidden" name="book_set-0-id" value="%d" id="id_book_set-0-id" /></p>' % (
+            'value="Les Fleurs du Mal" maxlength="100">'
+            '<input type="hidden" name="book_set-0-author" value="%d" id="id_book_set-0-author">'
+            '<input type="hidden" name="book_set-0-id" value="%d" id="id_book_set-0-id"></p>' % (
                 author.id, book1.id,
             )
         )
         self.assertHTMLEqual(
             formset.forms[1].as_p(),
             '<p><label for="id_book_set-1-title">Title:</label>'
-            '<input id="id_book_set-1-title" type="text" name="book_set-1-title" maxlength="100" />'
-            '<input type="hidden" name="book_set-1-author" value="%d" id="id_book_set-1-author" />'
-            '<input type="hidden" name="book_set-1-id" id="id_book_set-1-id" /></p>' % author.id
+            '<input id="id_book_set-1-title" type="text" name="book_set-1-title" maxlength="100">'
+            '<input type="hidden" name="book_set-1-author" value="%d" id="id_book_set-1-author">'
+            '<input type="hidden" name="book_set-1-id" id="id_book_set-1-id"></p>' % author.id
         )
         self.assertHTMLEqual(
             formset.forms[2].as_p(),
             '<p><label for="id_book_set-2-title">Title:</label>'
-            '<input id="id_book_set-2-title" type="text" name="book_set-2-title" maxlength="100" />'
-            '<input type="hidden" name="book_set-2-author" value="%d" id="id_book_set-2-author" />'
-            '<input type="hidden" name="book_set-2-id" id="id_book_set-2-id" /></p>' % author.id
+            '<input id="id_book_set-2-title" type="text" name="book_set-2-title" maxlength="100">'
+            '<input type="hidden" name="book_set-2-author" value="%d" id="id_book_set-2-author">'
+            '<input type="hidden" name="book_set-2-id" id="id_book_set-2-id"></p>' % author.id
         )
 
         data = {
@@ -733,17 +733,17 @@ class ModelFormsetTest(TestCase):
         self.assertHTMLEqual(
             formset.forms[0].as_p(),
             '<p><label for="id_test-0-title">Title:</label>'
-            '<input id="id_test-0-title" type="text" name="test-0-title" maxlength="100" />'
-            '<input type="hidden" name="test-0-author" id="id_test-0-author" />'
-            '<input type="hidden" name="test-0-id" id="id_test-0-id" /></p>'
+            '<input id="id_test-0-title" type="text" name="test-0-title" maxlength="100">'
+            '<input type="hidden" name="test-0-author" id="id_test-0-author">'
+            '<input type="hidden" name="test-0-id" id="id_test-0-id"></p>'
         )
 
         self.assertHTMLEqual(
             formset.forms[1].as_p(),
             '<p><label for="id_test-1-title">Title:</label>'
-            '<input id="id_test-1-title" type="text" name="test-1-title" maxlength="100" />'
-            '<input type="hidden" name="test-1-author" id="id_test-1-author" />'
-            '<input type="hidden" name="test-1-id" id="id_test-1-id" /></p>'
+            '<input id="id_test-1-title" type="text" name="test-1-title" maxlength="100">'
+            '<input type="hidden" name="test-1-author" id="id_test-1-author">'
+            '<input type="hidden" name="test-1-id" id="id_test-1-id"></p>'
         )
 
     def test_inline_formsets_with_custom_pk(self):
@@ -762,12 +762,12 @@ class ModelFormsetTest(TestCase):
             formset.forms[0].as_p(),
             '<p><label for="id_bookwithcustompk_set-0-my_pk">My pk:</label>'
             '<input id="id_bookwithcustompk_set-0-my_pk" type="number" '
-            'name="bookwithcustompk_set-0-my_pk" step="1" /></p>'
+            'name="bookwithcustompk_set-0-my_pk" step="1"></p>'
             '<p><label for="id_bookwithcustompk_set-0-title">Title:</label>'
             '<input id="id_bookwithcustompk_set-0-title" type="text" '
-            'name="bookwithcustompk_set-0-title" maxlength="100" />'
+            'name="bookwithcustompk_set-0-title" maxlength="100">'
             '<input type="hidden" name="bookwithcustompk_set-0-author" '
-            'value="1" id="id_bookwithcustompk_set-0-author" /></p>'
+            'value="1" id="id_bookwithcustompk_set-0-author"></p>'
         )
 
         data = {
@@ -802,14 +802,14 @@ class ModelFormsetTest(TestCase):
             formset.forms[0].as_p(),
             '<p><label for="id_alternatebook_set-0-title">Title:</label>'
             '<input id="id_alternatebook_set-0-title" type="text" '
-            'name="alternatebook_set-0-title" maxlength="100" /></p>'
+            'name="alternatebook_set-0-title" maxlength="100"></p>'
             '<p><label for="id_alternatebook_set-0-notes">Notes:</label>'
             '<input id="id_alternatebook_set-0-notes" type="text" '
-            'name="alternatebook_set-0-notes" maxlength="100" />'
+            'name="alternatebook_set-0-notes" maxlength="100">'
             '<input type="hidden" name="alternatebook_set-0-author" value="1" '
-            'id="id_alternatebook_set-0-author" />'
+            'id="id_alternatebook_set-0-author">'
             '<input type="hidden" name="alternatebook_set-0-book_ptr" '
-            'id="id_alternatebook_set-0-book_ptr" /></p>'
+            'id="id_alternatebook_set-0-book_ptr"></p>'
         )
 
         data = {
@@ -905,39 +905,39 @@ class ModelFormsetTest(TestCase):
             formset.forms[0].as_p(),
             '<p><label for="id_book_set-0-title">Title:</label>'
             '<input id="id_book_set-0-title" type="text" name="book_set-0-title" '
-            'value="Les Paradis Artificiels" maxlength="100" />'
-            '<input type="hidden" name="book_set-0-author" value="1" id="id_book_set-0-author" />'
-            '<input type="hidden" name="book_set-0-id" value="1" id="id_book_set-0-id" /></p>'
+            'value="Les Paradis Artificiels" maxlength="100">'
+            '<input type="hidden" name="book_set-0-author" value="1" id="id_book_set-0-author">'
+            '<input type="hidden" name="book_set-0-id" value="1" id="id_book_set-0-id"></p>'
         )
         self.assertHTMLEqual(
             formset.forms[1].as_p(),
             '<p><label for="id_book_set-1-title">Title:</label>'
             '<input id="id_book_set-1-title" type="text" name="book_set-1-title" '
-            'value="Les Fleurs du Mal" maxlength="100" />'
-            '<input type="hidden" name="book_set-1-author" value="1" id="id_book_set-1-author" />'
-            '<input type="hidden" name="book_set-1-id" value="2" id="id_book_set-1-id" /></p>'
+            'value="Les Fleurs du Mal" maxlength="100">'
+            '<input type="hidden" name="book_set-1-author" value="1" id="id_book_set-1-author">'
+            '<input type="hidden" name="book_set-1-id" value="2" id="id_book_set-1-id"></p>'
         )
         self.assertHTMLEqual(
             formset.forms[2].as_p(),
             '<p><label for="id_book_set-2-title">Title:</label>'
             '<input id="id_book_set-2-title" type="text" name="book_set-2-title" '
-            'value="Flowers of Evil" maxlength="100" />'
-            '<input type="hidden" name="book_set-2-author" value="1" id="id_book_set-2-author" />'
-            '<input type="hidden" name="book_set-2-id" value="3" id="id_book_set-2-id" /></p>'
+            'value="Flowers of Evil" maxlength="100">'
+            '<input type="hidden" name="book_set-2-author" value="1" id="id_book_set-2-author">'
+            '<input type="hidden" name="book_set-2-id" value="3" id="id_book_set-2-id"></p>'
         )
         self.assertHTMLEqual(
             formset.forms[3].as_p(),
             '<p><label for="id_book_set-3-title">Title:</label>'
-            '<input id="id_book_set-3-title" type="text" name="book_set-3-title" maxlength="100" />'
-            '<input type="hidden" name="book_set-3-author" value="1" id="id_book_set-3-author" />'
-            '<input type="hidden" name="book_set-3-id" id="id_book_set-3-id" /></p>'
+            '<input id="id_book_set-3-title" type="text" name="book_set-3-title" maxlength="100">'
+            '<input type="hidden" name="book_set-3-author" value="1" id="id_book_set-3-author">'
+            '<input type="hidden" name="book_set-3-id" id="id_book_set-3-id"></p>'
         )
         self.assertHTMLEqual(
             formset.forms[4].as_p(),
             '<p><label for="id_book_set-4-title">Title:</label>'
-            '<input id="id_book_set-4-title" type="text" name="book_set-4-title" maxlength="100" />'
-            '<input type="hidden" name="book_set-4-author" value="1" id="id_book_set-4-author" />'
-            '<input type="hidden" name="book_set-4-id" id="id_book_set-4-id" /></p>'
+            '<input id="id_book_set-4-title" type="text" name="book_set-4-title" maxlength="100">'
+            '<input type="hidden" name="book_set-4-author" value="1" id="id_book_set-4-author">'
+            '<input type="hidden" name="book_set-4-id" id="id_book_set-4-id"></p>'
         )
 
         data = {
@@ -962,23 +962,23 @@ class ModelFormsetTest(TestCase):
             formset.forms[0].as_p(),
             '<p><label for="id_book_set-0-title">Title:</label>'
             '<input id="id_book_set-0-title" type="text" name="book_set-0-title" '
-            'value="Flowers of Evil" maxlength="100" />'
-            '<input type="hidden" name="book_set-0-author" value="1" id="id_book_set-0-author" />'
-            '<input type="hidden" name="book_set-0-id" value="3" id="id_book_set-0-id" /></p>'
+            'value="Flowers of Evil" maxlength="100">'
+            '<input type="hidden" name="book_set-0-author" value="1" id="id_book_set-0-author">'
+            '<input type="hidden" name="book_set-0-id" value="3" id="id_book_set-0-id"></p>'
         )
         self.assertHTMLEqual(
             formset.forms[1].as_p(),
             '<p><label for="id_book_set-1-title">Title:</label>'
-            '<input id="id_book_set-1-title" type="text" name="book_set-1-title" maxlength="100" />'
-            '<input type="hidden" name="book_set-1-author" value="1" id="id_book_set-1-author" />'
-            '<input type="hidden" name="book_set-1-id" id="id_book_set-1-id" /></p>'
+            '<input id="id_book_set-1-title" type="text" name="book_set-1-title" maxlength="100">'
+            '<input type="hidden" name="book_set-1-author" value="1" id="id_book_set-1-author">'
+            '<input type="hidden" name="book_set-1-id" id="id_book_set-1-id"></p>'
         )
         self.assertHTMLEqual(
             formset.forms[2].as_p(),
             '<p><label for="id_book_set-2-title">Title:</label>'
-            '<input id="id_book_set-2-title" type="text" name="book_set-2-title" maxlength="100" />'
-            '<input type="hidden" name="book_set-2-author" value="1" id="id_book_set-2-author" />'
-            '<input type="hidden" name="book_set-2-id" id="id_book_set-2-id" /></p>'
+            '<input id="id_book_set-2-title" type="text" name="book_set-2-title" maxlength="100">'
+            '<input type="hidden" name="book_set-2-author" value="1" id="id_book_set-2-author">'
+            '<input type="hidden" name="book_set-2-id" id="id_book_set-2-id"></p>'
         )
 
         data = {
@@ -1040,9 +1040,9 @@ class ModelFormsetTest(TestCase):
         self.assertHTMLEqual(
             formset.forms[0].as_p(),
             '<p><label for="id_form-0-my_pk">My pk:</label> <input id="id_form-0-my_pk" type="text" '
-            'name="form-0-my_pk" maxlength="10" /></p>'
+            'name="form-0-my_pk" maxlength="10"></p>'
             '<p><label for="id_form-0-some_field">Some field:</label>'
-            '<input id="id_form-0-some_field" type="text" name="form-0-some_field" maxlength="100" /></p>'
+            '<input id="id_form-0-some_field" type="text" name="form-0-some_field" maxlength="100"></p>'
         )
 
         # Custom primary keys with ForeignKey, OneToOneField and AutoField ############
@@ -1055,16 +1055,16 @@ class ModelFormsetTest(TestCase):
         self.assertHTMLEqual(
             formset.forms[0].as_p(),
             '<p><label for="id_owner_set-0-name">Name:</label>'
-            '<input id="id_owner_set-0-name" type="text" name="owner_set-0-name" maxlength="100" />'
-            '<input type="hidden" name="owner_set-0-place" value="1" id="id_owner_set-0-place" />'
-            '<input type="hidden" name="owner_set-0-auto_id" id="id_owner_set-0-auto_id" /></p>'
+            '<input id="id_owner_set-0-name" type="text" name="owner_set-0-name" maxlength="100">'
+            '<input type="hidden" name="owner_set-0-place" value="1" id="id_owner_set-0-place">'
+            '<input type="hidden" name="owner_set-0-auto_id" id="id_owner_set-0-auto_id"></p>'
         )
         self.assertHTMLEqual(
             formset.forms[1].as_p(),
             '<p><label for="id_owner_set-1-name">Name:</label>'
-            '<input id="id_owner_set-1-name" type="text" name="owner_set-1-name" maxlength="100" />'
-            '<input type="hidden" name="owner_set-1-place" value="1" id="id_owner_set-1-place" />'
-            '<input type="hidden" name="owner_set-1-auto_id" id="id_owner_set-1-auto_id" /></p>'
+            '<input id="id_owner_set-1-name" type="text" name="owner_set-1-name" maxlength="100">'
+            '<input type="hidden" name="owner_set-1-place" value="1" id="id_owner_set-1-place">'
+            '<input type="hidden" name="owner_set-1-auto_id" id="id_owner_set-1-auto_id"></p>'
         )
 
         data = {
@@ -1089,24 +1089,24 @@ class ModelFormsetTest(TestCase):
         self.assertHTMLEqual(
             formset.forms[0].as_p(),
             '<p><label for="id_owner_set-0-name">Name:</label>'
-            '<input id="id_owner_set-0-name" type="text" name="owner_set-0-name" value="Joe Perry" maxlength="100" />'
-            '<input type="hidden" name="owner_set-0-place" value="1" id="id_owner_set-0-place" />'
-            '<input type="hidden" name="owner_set-0-auto_id" value="%d" id="id_owner_set-0-auto_id" /></p>'
+            '<input id="id_owner_set-0-name" type="text" name="owner_set-0-name" value="Joe Perry" maxlength="100">'
+            '<input type="hidden" name="owner_set-0-place" value="1" id="id_owner_set-0-place">'
+            '<input type="hidden" name="owner_set-0-auto_id" value="%d" id="id_owner_set-0-auto_id"></p>'
             % owner1.auto_id
         )
         self.assertHTMLEqual(
             formset.forms[1].as_p(),
             '<p><label for="id_owner_set-1-name">Name:</label>'
-            '<input id="id_owner_set-1-name" type="text" name="owner_set-1-name" maxlength="100" />'
-            '<input type="hidden" name="owner_set-1-place" value="1" id="id_owner_set-1-place" />'
-            '<input type="hidden" name="owner_set-1-auto_id" id="id_owner_set-1-auto_id" /></p>'
+            '<input id="id_owner_set-1-name" type="text" name="owner_set-1-name" maxlength="100">'
+            '<input type="hidden" name="owner_set-1-place" value="1" id="id_owner_set-1-place">'
+            '<input type="hidden" name="owner_set-1-auto_id" id="id_owner_set-1-auto_id"></p>'
         )
         self.assertHTMLEqual(
             formset.forms[2].as_p(),
             '<p><label for="id_owner_set-2-name">Name:</label>'
-            '<input id="id_owner_set-2-name" type="text" name="owner_set-2-name" maxlength="100" />'
-            '<input type="hidden" name="owner_set-2-place" value="1" id="id_owner_set-2-place" />'
-            '<input type="hidden" name="owner_set-2-auto_id" id="id_owner_set-2-auto_id" /></p>'
+            '<input id="id_owner_set-2-name" type="text" name="owner_set-2-name" maxlength="100">'
+            '<input type="hidden" name="owner_set-2-place" value="1" id="id_owner_set-2-place">'
+            '<input type="hidden" name="owner_set-2-auto_id" id="id_owner_set-2-auto_id"></p>'
         )
 
         data = {
@@ -1141,7 +1141,7 @@ class ModelFormsetTest(TestCase):
             '<option value="%d">Jack Berry at Giordanos</option>'
             '</select></p>'
             '<p><label for="id_form-0-age">Age:</label>'
-            '<input type="number" name="form-0-age" id="id_form-0-age" min="0" /></p>'
+            '<input type="number" name="form-0-age" id="id_form-0-age" min="0"></p>'
             % (owner1.auto_id, owner2.auto_id)
         )
 
@@ -1154,8 +1154,8 @@ class ModelFormsetTest(TestCase):
         self.assertHTMLEqual(
             formset.forms[0].as_p(),
             '<p><label for="id_ownerprofile-0-age">Age:</label>'
-            '<input type="number" name="ownerprofile-0-age" id="id_ownerprofile-0-age" min="0" />'
-            '<input type="hidden" name="ownerprofile-0-owner" value="%d" id="id_ownerprofile-0-owner" /></p>'
+            '<input type="number" name="ownerprofile-0-age" id="id_ownerprofile-0-age" min="0">'
+            '<input type="hidden" name="ownerprofile-0-owner" value="%d" id="id_ownerprofile-0-owner"></p>'
             % owner1.auto_id
         )
 
@@ -1179,8 +1179,8 @@ class ModelFormsetTest(TestCase):
         self.assertHTMLEqual(
             formset.forms[0].as_p(),
             '<p><label for="id_ownerprofile-0-age">Age:</label>'
-            '<input type="number" name="ownerprofile-0-age" value="54" id="id_ownerprofile-0-age" min="0" />'
-            '<input type="hidden" name="ownerprofile-0-owner" value="%d" id="id_ownerprofile-0-owner" /></p>'
+            '<input type="number" name="ownerprofile-0-age" value="54" id="id_ownerprofile-0-age" min="0">'
+            '<input type="hidden" name="ownerprofile-0-owner" value="%d" id="id_ownerprofile-0-owner"></p>'
             % owner1.auto_id
         )
 
@@ -1212,11 +1212,11 @@ class ModelFormsetTest(TestCase):
         self.assertHTMLEqual(
             formset.forms[0].as_p(),
             '<p><label for="id_location_set-0-lat">Lat:</label>'
-            '<input id="id_location_set-0-lat" type="text" name="location_set-0-lat" maxlength="100" /></p>'
+            '<input id="id_location_set-0-lat" type="text" name="location_set-0-lat" maxlength="100"></p>'
             '<p><label for="id_location_set-0-lon">Lon:</label> '
-            '<input id="id_location_set-0-lon" type="text" name="location_set-0-lon" maxlength="100" />'
-            '<input type="hidden" name="location_set-0-place" value="1" id="id_location_set-0-place" />'
-            '<input type="hidden" name="location_set-0-id" id="id_location_set-0-id" /></p>'
+            '<input id="id_location_set-0-lon" type="text" name="location_set-0-lon" maxlength="100">'
+            '<input type="hidden" name="location_set-0-place" value="1" id="id_location_set-0-place">'
+            '<input type="hidden" name="location_set-0-id" id="id_location_set-0-id"></p>'
         )
 
     def test_foreign_keys_in_parents(self):
@@ -1372,13 +1372,13 @@ class ModelFormsetTest(TestCase):
             result,
             '<p><label for="id_membership_set-0-date_joined">Date joined:</label>'
             '<input type="text" name="membership_set-0-date_joined" '
-            'value="__DATETIME__" id="id_membership_set-0-date_joined" />'
+            'value="__DATETIME__" id="id_membership_set-0-date_joined">'
             '<input type="hidden" name="initial-membership_set-0-date_joined" value="__DATETIME__" '
-            'id="initial-membership_set-0-id_membership_set-0-date_joined" /></p>'
+            'id="initial-membership_set-0-id_membership_set-0-date_joined"></p>'
             '<p><label for="id_membership_set-0-karma">Karma:</label>'
-            '<input type="number" name="membership_set-0-karma" id="id_membership_set-0-karma" />'
-            '<input type="hidden" name="membership_set-0-person" value="%d" id="id_membership_set-0-person" />'
-            '<input type="hidden" name="membership_set-0-id" id="id_membership_set-0-id" /></p>'
+            '<input type="number" name="membership_set-0-karma" id="id_membership_set-0-karma">'
+            '<input type="hidden" name="membership_set-0-person" value="%d" id="id_membership_set-0-person">'
+            '<input type="hidden" name="membership_set-0-id" id="id_membership_set-0-id"></p>'
             % person.id)
 
         # test for validation with callable defaults. Validations rely on hidden fields
@@ -1724,7 +1724,7 @@ class TestModelFormsetOverridesTroughFormMeta(TestCase):
         form = PoetFormSet.form()
         self.assertHTMLEqual(
             "%s" % form['name'],
-            '<input id="id_name" maxlength="100" type="text" class="poet" name="name" required />'
+            '<input id="id_name" maxlength="100" type="text" class="poet" name="name" required>'
         )
 
     def test_inlineformset_factory_widgets(self):
@@ -1735,7 +1735,7 @@ class TestModelFormsetOverridesTroughFormMeta(TestCase):
         form = BookFormSet.form()
         self.assertHTMLEqual(
             "%s" % form['title'],
-            '<input class="book" id="id_title" maxlength="100" name="title" type="text" required />'
+            '<input class="book" id="id_title" maxlength="100" name="title" type="text" required>'
         )
 
     def test_modelformset_factory_labels_overrides(self):