From 44c9d8f3c7967f9016248dccbee7056ef9753588 Mon Sep 17 00:00:00 2001
From: David Smith <smithdc@gmail.com>
Date: Sat, 11 Jul 2020 16:26:58 +0100
Subject: [PATCH] Changed form-group to mb-3 * form-group is deprecated in
 bootstrap 5 and is replaced by utility classes.

---
 rest_framework/templates/rest_framework/filters/search.html | 2 +-
 .../templates/rest_framework/horizontal/checkbox.html       | 2 +-
 .../rest_framework/horizontal/checkbox_multiple.html        | 2 +-
 .../templates/rest_framework/horizontal/dict_field.html     | 2 +-
 .../templates/rest_framework/horizontal/fieldset.html       | 2 +-
 .../templates/rest_framework/horizontal/input.html          | 2 +-
 .../templates/rest_framework/horizontal/list_field.html     | 2 +-
 .../templates/rest_framework/horizontal/list_fieldset.html  | 2 +-
 .../templates/rest_framework/horizontal/radio.html          | 2 +-
 .../templates/rest_framework/horizontal/select.html         | 2 +-
 .../rest_framework/horizontal/select_multiple.html          | 2 +-
 .../templates/rest_framework/horizontal/textarea.html       | 2 +-
 .../templates/rest_framework/inline/checkbox.html           | 2 +-
 .../templates/rest_framework/inline/checkbox_multiple.html  | 2 +-
 .../templates/rest_framework/inline/dict_field.html         | 2 +-
 rest_framework/templates/rest_framework/inline/input.html   | 2 +-
 .../templates/rest_framework/inline/list_field.html         | 2 +-
 rest_framework/templates/rest_framework/inline/radio.html   | 2 +-
 rest_framework/templates/rest_framework/inline/select.html  | 2 +-
 .../templates/rest_framework/inline/select_multiple.html    | 2 +-
 .../templates/rest_framework/inline/textarea.html           | 2 +-
 rest_framework/templates/rest_framework/login_base.html     | 4 ++--
 .../templates/rest_framework/vertical/checkbox.html         | 2 +-
 .../rest_framework/vertical/checkbox_multiple.html          | 2 +-
 .../templates/rest_framework/vertical/dict_field.html       | 2 +-
 rest_framework/templates/rest_framework/vertical/input.html | 2 +-
 .../templates/rest_framework/vertical/list_field.html       | 2 +-
 rest_framework/templates/rest_framework/vertical/radio.html | 2 +-
 .../templates/rest_framework/vertical/select.html           | 2 +-
 .../templates/rest_framework/vertical/select_multiple.html  | 2 +-
 .../templates/rest_framework/vertical/textarea.html         | 2 +-
 tests/test_bound_fields.py                                  | 6 +++---
 32 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/rest_framework/templates/rest_framework/filters/search.html b/rest_framework/templates/rest_framework/filters/search.html
index 065c3889a..323f2e749 100644
--- a/rest_framework/templates/rest_framework/filters/search.html
+++ b/rest_framework/templates/rest_framework/filters/search.html
@@ -1,7 +1,7 @@
 {% load i18n %}
 <h2>{% trans "Search" %}</h2>
 <form class="form-inline">
-  <div class="form-group">
+  <div class="mb-3">
     <div class="input-group">
       <input type="text" class="form-control" style="width: 350px" name="{{ param }}" value="{{ term }}">
       <span class="input-group-btn">
diff --git a/rest_framework/templates/rest_framework/horizontal/checkbox.html b/rest_framework/templates/rest_framework/horizontal/checkbox.html
index faaebb883..0d74d46ab 100644
--- a/rest_framework/templates/rest_framework/horizontal/checkbox.html
+++ b/rest_framework/templates/rest_framework/horizontal/checkbox.html
@@ -1,4 +1,4 @@
-<div class="form-group horizontal-checkbox {% if field.errors %}has-error{% endif %}">
+<div class="mb-3 horizontal-checkbox {% if field.errors %}has-error{% endif %}">
   {% if field.label %}
     <label class="col-sm-2 control-label {% if style.hide_label %}sr-only{% endif %}">
       {{ field.label }}
diff --git a/rest_framework/templates/rest_framework/horizontal/checkbox_multiple.html b/rest_framework/templates/rest_framework/horizontal/checkbox_multiple.html
index 42b47a428..2c55c77ee 100644
--- a/rest_framework/templates/rest_framework/horizontal/checkbox_multiple.html
+++ b/rest_framework/templates/rest_framework/horizontal/checkbox_multiple.html
@@ -1,6 +1,6 @@
 {% load rest_framework %}
 
-<div class="form-group">
+<div class="mb-3">
   {% if field.label %}
     <label class="col-sm-2 control-label {% if style.hide_label %}sr-only{% endif %}">
       {{ field.label }}
diff --git a/rest_framework/templates/rest_framework/horizontal/dict_field.html b/rest_framework/templates/rest_framework/horizontal/dict_field.html
index 7c7414bc4..bc5203b05 100644
--- a/rest_framework/templates/rest_framework/horizontal/dict_field.html
+++ b/rest_framework/templates/rest_framework/horizontal/dict_field.html
@@ -1,4 +1,4 @@
-<div class="form-group">
+<div class="mb-3">
   {% if field.label %}
     <label class="col-sm-2 control-label {% if style.hide_label %}sr-only{% endif %}">
       {{ field.label }}
diff --git a/rest_framework/templates/rest_framework/horizontal/fieldset.html b/rest_framework/templates/rest_framework/horizontal/fieldset.html
index 1747d2553..3b0b7af41 100644
--- a/rest_framework/templates/rest_framework/horizontal/fieldset.html
+++ b/rest_framework/templates/rest_framework/horizontal/fieldset.html
@@ -1,7 +1,7 @@
 {% load rest_framework %}
 <fieldset>
   {% if field.label %}
-    <div class="form-group" style="border-bottom: 1px solid #e5e5e5">
+    <div class="mb-3" style="border-bottom: 1px solid #e5e5e5">
       <legend class="control-label col-sm-2 {% if style.hide_label %}sr-only{% endif %}" style="border-bottom: 0">
         {{ field.label }}
       </legend>
diff --git a/rest_framework/templates/rest_framework/horizontal/input.html b/rest_framework/templates/rest_framework/horizontal/input.html
index b90810008..dbc44d819 100644
--- a/rest_framework/templates/rest_framework/horizontal/input.html
+++ b/rest_framework/templates/rest_framework/horizontal/input.html
@@ -1,4 +1,4 @@
-<div class="form-group {% if field.errors %}has-error{% endif %}">
+<div class="mb-3 {% if field.errors %}has-error{% endif %}">
   {% if field.label %}
     <label class="col-sm-2 control-label {% if style.hide_label %}sr-only{% endif %}">
       {{ field.label }}
diff --git a/rest_framework/templates/rest_framework/horizontal/list_field.html b/rest_framework/templates/rest_framework/horizontal/list_field.html
index 46a9b7ecd..e1761c1d9 100644
--- a/rest_framework/templates/rest_framework/horizontal/list_field.html
+++ b/rest_framework/templates/rest_framework/horizontal/list_field.html
@@ -1,4 +1,4 @@
-<div class="form-group">
+<div class="mb-3">
   {% if field.label %}
     <label class="col-sm-2 control-label {% if style.hide_label %}sr-only{% endif %}">
       {{ field.label }}
diff --git a/rest_framework/templates/rest_framework/horizontal/list_fieldset.html b/rest_framework/templates/rest_framework/horizontal/list_fieldset.html
index 962c333c0..89f6a5b87 100644
--- a/rest_framework/templates/rest_framework/horizontal/list_fieldset.html
+++ b/rest_framework/templates/rest_framework/horizontal/list_fieldset.html
@@ -2,7 +2,7 @@
 
 <fieldset>
   {% if field.label %}
-    <div class="form-group" style="border-bottom: 1px solid #e5e5e5">
+    <div class="mb-3" style="border-bottom: 1px solid #e5e5e5">
       <legend class="control-label col-sm-2 {% if style.hide_label %}sr-only{% endif %}" style="border-bottom: 0">
         {{ field.label }}
       </legend>
diff --git a/rest_framework/templates/rest_framework/horizontal/radio.html b/rest_framework/templates/rest_framework/horizontal/radio.html
index 171047338..56bfda0c1 100644
--- a/rest_framework/templates/rest_framework/horizontal/radio.html
+++ b/rest_framework/templates/rest_framework/horizontal/radio.html
@@ -3,7 +3,7 @@
 
 {% trans "None" as none_choice %}
 
-<div class="form-group">
+<div class="mb-3">
   {% if field.label %}
     <label class="col-sm-2 control-label {% if style.hide_label %}sr-only{% endif %}">
       {{ field.label }}
diff --git a/rest_framework/templates/rest_framework/horizontal/select.html b/rest_framework/templates/rest_framework/horizontal/select.html
index 7a3db2db8..d1b5e137e 100644
--- a/rest_framework/templates/rest_framework/horizontal/select.html
+++ b/rest_framework/templates/rest_framework/horizontal/select.html
@@ -1,6 +1,6 @@
 {% load rest_framework %}
 
-<div class="form-group">
+<div class="mb-3">
   {% if field.label %}
     <label class="col-sm-2 control-label {% if style.hide_label %}sr-only{% endif %}">
       {{ field.label }}
diff --git a/rest_framework/templates/rest_framework/horizontal/select_multiple.html b/rest_framework/templates/rest_framework/horizontal/select_multiple.html
index 36ff9fd0d..e48a4242f 100644
--- a/rest_framework/templates/rest_framework/horizontal/select_multiple.html
+++ b/rest_framework/templates/rest_framework/horizontal/select_multiple.html
@@ -3,7 +3,7 @@
 
 {% trans "No items to select." as no_items %}
 
-<div class="form-group">
+<div class="mb-3">
   {% if field.label %}
     <label class="col-sm-2 control-label {% if style.hide_label %}sr-only{% endif %}">
       {{ field.label }}
diff --git a/rest_framework/templates/rest_framework/horizontal/textarea.html b/rest_framework/templates/rest_framework/horizontal/textarea.html
index b279a2f68..8d5da811f 100644
--- a/rest_framework/templates/rest_framework/horizontal/textarea.html
+++ b/rest_framework/templates/rest_framework/horizontal/textarea.html
@@ -1,4 +1,4 @@
-<div class="form-group {% if field.errors %}has-error{% endif %}">
+<div class="mb-3 {% if field.errors %}has-error{% endif %}">
   {% if field.label %}
     <label class="col-sm-2 control-label {% if style.hide_label %}sr-only{% endif %}">
       {{ field.label }}
diff --git a/rest_framework/templates/rest_framework/inline/checkbox.html b/rest_framework/templates/rest_framework/inline/checkbox.html
index 665249a52..e145dee69 100644
--- a/rest_framework/templates/rest_framework/inline/checkbox.html
+++ b/rest_framework/templates/rest_framework/inline/checkbox.html
@@ -1,4 +1,4 @@
-<div class="form-group {% if field.errors %}has-error{% endif %}">
+<div class="mb-3 {% if field.errors %}has-error{% endif %}">
   <div class="checkbox">
     <label>
       <input type="checkbox" name="{{ field.name }}" value="true" {% if field.value %}checked{% endif %}>
diff --git a/rest_framework/templates/rest_framework/inline/checkbox_multiple.html b/rest_framework/templates/rest_framework/inline/checkbox_multiple.html
index e95c46d87..6c8d88408 100644
--- a/rest_framework/templates/rest_framework/inline/checkbox_multiple.html
+++ b/rest_framework/templates/rest_framework/inline/checkbox_multiple.html
@@ -1,6 +1,6 @@
 {% load rest_framework %}
 
-<div class="form-group {% if field.errors %}has-error{% endif %}">
+<div class="mb-3 {% if field.errors %}has-error{% endif %}">
   {% if field.label %}
     <label class="sr-only">{{ field.label }}</label>
   {% endif %}
diff --git a/rest_framework/templates/rest_framework/inline/dict_field.html b/rest_framework/templates/rest_framework/inline/dict_field.html
index 1301452b9..96853ae3e 100644
--- a/rest_framework/templates/rest_framework/inline/dict_field.html
+++ b/rest_framework/templates/rest_framework/inline/dict_field.html
@@ -1,4 +1,4 @@
-<div class="form-group">
+<div class="mb-3">
   {% if field.label %}
     <label class="sr-only">
       {{ field.label }}
diff --git a/rest_framework/templates/rest_framework/inline/input.html b/rest_framework/templates/rest_framework/inline/input.html
index 26cdcb70c..bdbcff160 100644
--- a/rest_framework/templates/rest_framework/inline/input.html
+++ b/rest_framework/templates/rest_framework/inline/input.html
@@ -1,4 +1,4 @@
-<div class="form-group {% if field.errors %}has-error{% endif %}">
+<div class="mb-3 {% if field.errors %}has-error{% endif %}">
   {% if field.label %}
     <label class="sr-only">
       {{ field.label }}
diff --git a/rest_framework/templates/rest_framework/inline/list_field.html b/rest_framework/templates/rest_framework/inline/list_field.html
index 321d01bd1..a49b5bcf6 100644
--- a/rest_framework/templates/rest_framework/inline/list_field.html
+++ b/rest_framework/templates/rest_framework/inline/list_field.html
@@ -1,4 +1,4 @@
-<div class="form-group">
+<div class="mb-3">
   {% if field.label %}
     <label class="sr-only">
       {{ field.label }}
diff --git a/rest_framework/templates/rest_framework/inline/radio.html b/rest_framework/templates/rest_framework/inline/radio.html
index 38fac449b..d1ea5fd0e 100644
--- a/rest_framework/templates/rest_framework/inline/radio.html
+++ b/rest_framework/templates/rest_framework/inline/radio.html
@@ -2,7 +2,7 @@
 {% load rest_framework %}
 {% trans "None" as none_choice %}
 
-<div class="form-group {% if field.errors %}has-error{% endif %}">
+<div class="mb-3 {% if field.errors %}has-error{% endif %}">
   {% if field.label %}
     <label class="sr-only">
       {{ field.label }}
diff --git a/rest_framework/templates/rest_framework/inline/select.html b/rest_framework/templates/rest_framework/inline/select.html
index 5023c2203..a50864241 100644
--- a/rest_framework/templates/rest_framework/inline/select.html
+++ b/rest_framework/templates/rest_framework/inline/select.html
@@ -1,6 +1,6 @@
 {% load rest_framework %}
 
-<div class="form-group {% if field.errors %}has-error{% endif %}">
+<div class="mb-3 {% if field.errors %}has-error{% endif %}">
   {% if field.label %}
     <label class="sr-only">
       {{ field.label }}
diff --git a/rest_framework/templates/rest_framework/inline/select_multiple.html b/rest_framework/templates/rest_framework/inline/select_multiple.html
index b5fd46f8b..f783e8593 100644
--- a/rest_framework/templates/rest_framework/inline/select_multiple.html
+++ b/rest_framework/templates/rest_framework/inline/select_multiple.html
@@ -2,7 +2,7 @@
 {% load rest_framework %}
 {% trans "No items to select." as no_items %}
 
-<div class="form-group {% if field.errors %}has-error{% endif %}">
+<div class="mb-3 {% if field.errors %}has-error{% endif %}">
   {% if field.label %}
     <label class="sr-only">
       {{ field.label }}
diff --git a/rest_framework/templates/rest_framework/inline/textarea.html b/rest_framework/templates/rest_framework/inline/textarea.html
index bce427faa..4fc18d740 100644
--- a/rest_framework/templates/rest_framework/inline/textarea.html
+++ b/rest_framework/templates/rest_framework/inline/textarea.html
@@ -1,4 +1,4 @@
-<div class="form-group {% if field.errors %}has-error{% endif %}">
+<div class="mb-3 {% if field.errors %}has-error{% endif %}">
   {% if field.label %}
     <label class="sr-only">
       {{ field.label }}
diff --git a/rest_framework/templates/rest_framework/login_base.html b/rest_framework/templates/rest_framework/login_base.html
index ba4891708..8c4b61874 100644
--- a/rest_framework/templates/rest_framework/login_base.html
+++ b/rest_framework/templates/rest_framework/login_base.html
@@ -19,7 +19,7 @@
               <input type="hidden" name="next" value="{{ next }}" />
 
               <div id="div_id_username" class="clearfix control-group {% if form.username.errors %}error{% endif %}">
-                <div class="form-group">
+                <div class="mb-3">
                   <label for="id_username">{{ form.username.label }}:</label>
                   <input type="text" name="username" maxlength="100"
                       autocapitalize="off"
@@ -35,7 +35,7 @@
               </div>
 
               <div id="div_id_password" class="clearfix control-group {% if form.password.errors %}error{% endif %}">
-                <div class="form-group">
+                <div class="mb-3">
                   <label for="id_password">{{ form.password.label }}:</label>
                   <input type="password" name="password" maxlength="100" autocapitalize="off" autocorrect="off" class="form-control textinput textInput" id="id_password" required>
                   {% if form.password.errors %}
diff --git a/rest_framework/templates/rest_framework/vertical/checkbox.html b/rest_framework/templates/rest_framework/vertical/checkbox.html
index 827ad8af4..cdc8eee32 100644
--- a/rest_framework/templates/rest_framework/vertical/checkbox.html
+++ b/rest_framework/templates/rest_framework/vertical/checkbox.html
@@ -1,4 +1,4 @@
-<div class="form-group {% if field.errors %}has-error{% endif %}">
+<div class="mb-3 {% if field.errors %}has-error{% endif %}">
   <div class="checkbox">
     <label>
       <input type="checkbox" name="{{ field.name }}" value="true" {% if field.value %}checked{% endif %}>
diff --git a/rest_framework/templates/rest_framework/vertical/checkbox_multiple.html b/rest_framework/templates/rest_framework/vertical/checkbox_multiple.html
index 1bc13dfcf..5aed1519a 100644
--- a/rest_framework/templates/rest_framework/vertical/checkbox_multiple.html
+++ b/rest_framework/templates/rest_framework/vertical/checkbox_multiple.html
@@ -1,6 +1,6 @@
 {% load rest_framework %}
 
-<div class="form-group {% if field.errors %}has-error{% endif %}">
+<div class="mb-3 {% if field.errors %}has-error{% endif %}">
   {% if field.label %}
     <label {% if style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</label>
   {% endif %}
diff --git a/rest_framework/templates/rest_framework/vertical/dict_field.html b/rest_framework/templates/rest_framework/vertical/dict_field.html
index dde803b49..a46759196 100644
--- a/rest_framework/templates/rest_framework/vertical/dict_field.html
+++ b/rest_framework/templates/rest_framework/vertical/dict_field.html
@@ -1,4 +1,4 @@
-<div class="form-group">
+<div class="mb-3">
   {% if field.label %}
     <label {% if style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</label>
   {% endif %}
diff --git a/rest_framework/templates/rest_framework/vertical/input.html b/rest_framework/templates/rest_framework/vertical/input.html
index 29c4370d5..6bcd3d93d 100644
--- a/rest_framework/templates/rest_framework/vertical/input.html
+++ b/rest_framework/templates/rest_framework/vertical/input.html
@@ -1,4 +1,4 @@
-<div class="form-group {% if field.errors %}has-error{% endif %}">
+<div class="mb-3 {% if field.errors %}has-error{% endif %}">
   {% if field.label %}
     <label {% if style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</label>
   {% endif %}
diff --git a/rest_framework/templates/rest_framework/vertical/list_field.html b/rest_framework/templates/rest_framework/vertical/list_field.html
index 47a60c5d9..f5a724ad2 100644
--- a/rest_framework/templates/rest_framework/vertical/list_field.html
+++ b/rest_framework/templates/rest_framework/vertical/list_field.html
@@ -1,4 +1,4 @@
-<div class="form-group">
+<div class="mb-3">
   {% if field.label %}
     <label {% if style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</label>
   {% endif %}
diff --git a/rest_framework/templates/rest_framework/vertical/radio.html b/rest_framework/templates/rest_framework/vertical/radio.html
index 39b3c7150..3d8ec0690 100644
--- a/rest_framework/templates/rest_framework/vertical/radio.html
+++ b/rest_framework/templates/rest_framework/vertical/radio.html
@@ -2,7 +2,7 @@
 {% load rest_framework %}
 {% trans "None" as none_choice %}
 
-<div class="form-group {% if field.errors %}has-error{% endif %}">
+<div class="mb-3 {% if field.errors %}has-error{% endif %}">
   {% if field.label %}
     <label {% if style.hide_label %}class="sr-only"{% endif %}>
       {{ field.label }}
diff --git a/rest_framework/templates/rest_framework/vertical/select.html b/rest_framework/templates/rest_framework/vertical/select.html
index 6ccaaf27f..03a581d2d 100644
--- a/rest_framework/templates/rest_framework/vertical/select.html
+++ b/rest_framework/templates/rest_framework/vertical/select.html
@@ -1,6 +1,6 @@
 {% load rest_framework %}
 
-<div class="form-group {% if field.errors %}has-error{% endif %}">
+<div class="mb-3 {% if field.errors %}has-error{% endif %}">
   {% if field.label %}
     <label {% if style.hide_label %}class="sr-only"{% endif %}>
       {{ field.label }}
diff --git a/rest_framework/templates/rest_framework/vertical/select_multiple.html b/rest_framework/templates/rest_framework/vertical/select_multiple.html
index b77c4be3b..0b34df1e9 100644
--- a/rest_framework/templates/rest_framework/vertical/select_multiple.html
+++ b/rest_framework/templates/rest_framework/vertical/select_multiple.html
@@ -2,7 +2,7 @@
 {% load rest_framework %}
 {% trans "No items to select." as no_items %}
 
-<div class="form-group {% if field.errors %}has-error{% endif %}">
+<div class="mb-3 {% if field.errors %}has-error{% endif %}">
   {% if field.label %}
     <label {% if style.hide_label %}class="sr-only"{% endif %}>
       {{ field.label }}
diff --git a/rest_framework/templates/rest_framework/vertical/textarea.html b/rest_framework/templates/rest_framework/vertical/textarea.html
index fea94cd06..41f45917e 100644
--- a/rest_framework/templates/rest_framework/vertical/textarea.html
+++ b/rest_framework/templates/rest_framework/vertical/textarea.html
@@ -1,4 +1,4 @@
-<div class="form-group {% if field.errors %}has-error{% endif %}">
+<div class="mb-3 {% if field.errors %}has-error{% endif %}">
   {% if field.label %}
     <label {% if style.hide_label %}class="sr-only"{% endif %}>
       {{ field.label }}
diff --git a/tests/test_bound_fields.py b/tests/test_bound_fields.py
index eee7d9b85..52ef9b368 100644
--- a/tests/test_bound_fields.py
+++ b/tests/test_bound_fields.py
@@ -78,7 +78,7 @@ class TestSimpleBoundField:
         renderer = HTMLFormRenderer()
         rendered = renderer.render_field(serializer['bool_field'], {})
         expected_packed = (
-            '<divclass="form-group">'
+            '<divclass="mb-3">'
             '<divclass="checkbox">'
             '<label>'
             '<inputtype="checkbox"name="bool_field"value="true"checked>'
@@ -170,12 +170,12 @@ class TestNestedBoundField:
                 '<legend>Nested2</legend>'
                 '<fieldset>'
                 '<legend>Nested1</legend>'
-                '<divclass="form-group">'
+                '<divclass="mb-3">'
                 '<label>Textfield</label>'
                 '<inputname="nested2.nested1.text_field"class="form-control"type="text"value="">'
                 '</div>'
                 '</fieldset>'
-                '<divclass="form-group">'
+                '<divclass="mb-3">'
                 '<label>Textfield</label>'
                 '<inputname="nested2.text_field"class="form-control"type="text"value="test">'
                 '</div>'