django-bootstrap3 23.2__tar.gz → 23.4__tar.gz

{django_bootstrap3-23.2 → django_bootstrap3-23.4}/.gitignore

@@ -63,3 +63,6 @@ local_settings.py
 # pyenv
 .python-version
 reports
+
+# Example database
+example/db.sqlite3

{django_bootstrap3-23.2 → django_bootstrap3-23.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-bootstrap3
-Version: 23.2
+Version: 23.4
 Summary: Bootstrap 3 for Django
 Project-URL: Changelog, https://github.com/zostera/django-bootstrap3/blob/main/CHANGELOG.md
 Project-URL: Documentation, https://django-bootstrap3.readthedocs.io/
@@ -21,14 +21,13 @@ Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Utilities
-Requires-Python: >=3.7
+Requires-Python: >=3.8
 Requires-Dist: beautifulsoup4>=4.8.0
 Requires-Dist: django>=3.2
 Description-Content-Type: text/markdown
@@ -40,7 +39,7 @@ Description-Content-Type: text/markdown
 [![Latest PyPI version](https://img.shields.io/pypi/v/django-bootstrap3.svg)](https://pypi.python.org/pypi/django-bootstrap3)
 [![Any color you like](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/ambv/black)
 
-Bootstrap 3 integration for Django.
+Bootstrap 3 for Django.
 
 ## Goal
 

{django_bootstrap3-23.2 → django_bootstrap3-23.4}/README.md

@@ -5,7 +5,7 @@
 [![Latest PyPI version](https://img.shields.io/pypi/v/django-bootstrap3.svg)](https://pypi.python.org/pypi/django-bootstrap3)
 [![Any color you like](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/ambv/black)
 
-Bootstrap 3 integration for Django.
+Bootstrap 3 for Django.
 
 ## Goal
 

{django_bootstrap3-23.2 → django_bootstrap3-23.4}/pyproject.toml

@@ -17,7 +17,6 @@ classifiers = [
   "License :: OSI Approved :: BSD License",
   "Operating System :: OS Independent",
   "Programming Language :: Python :: 3",
-  "Programming Language :: Python :: 3.7",
   "Programming Language :: Python :: 3.8",
   "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
@@ -36,7 +35,7 @@ dynamic = [
 license = "BSD-3-Clause"
 name = "django-bootstrap3"
 readme = "README.md"
-requires-python = ">=3.7"
+requires-python = ">=3.8"
 
 [project.urls]
 Changelog = "https://github.com/zostera/django-bootstrap3/blob/main/CHANGELOG.md"
@@ -74,10 +73,6 @@ cov-report = [
 test = "python manage.py test {args:tests}"
 test-cov = "coverage run manage.py test {args:tests}"
 
-[[tool.hatch.envs.all.matrix]]
-django = ["3.2"]
-python = ["3.7"]
-
 [[tool.hatch.envs.all.matrix]]
 django = ["3.2", "4.1", "4.2"]
 python = ["3.8", "3.9"]
@@ -149,7 +144,7 @@ style = [
 
 [tool.black]
 line-length = 120
-target_version = ["py37", "py38", "py39", "py310", "py311"]
+target_version = ["py38", "py39", "py310", "py311"]
 
 [tool.ruff]
 fix = false
@@ -174,7 +169,7 @@ select = [
   "UP", # pyupgrade
 ]
 src = ["src"]
-target-version = "py37"
+target-version = "py38"
 unfixable = [
   "F8", # names in flake8, such as defined but unused variables
 ]

django_bootstrap3-23.4/src/bootstrap3/__about__.py

@@ -0,0 +1 @@
+__version__ = "23.4"

{django_bootstrap3-23.2 → django_bootstrap3-23.4}/src/bootstrap3/renderers.py

@@ -1,3 +1,5 @@
+import re
+
 from django.forms import (
     BaseForm,
     BaseFormSet,
@@ -31,7 +33,7 @@ from .forms import (
     render_label,
 )
 from .text import text_value
-from .utils import add_css_class, render_template_file
+from .utils import IS_PRE_DJANGO4, add_css_class, render_template_file
 
 try:
     # If Django is set up without a database, importing this widget gives RuntimeError
@@ -311,15 +313,17 @@ class FieldRenderer(BaseRenderer):
 
     def list_to_class(self, html, klass):
         classes = add_css_class(klass, self.get_size_class())
-        mapping = [
-            ("<ul", "<div"),
-            ("</ul>", "</div>"),
-            ("<li", f'<div class="{classes}"'),
-            ("</li>", "</div>"),
-        ]
-        for k, v in mapping:
-            html = html.replace(k, v)
-        return html
+        if IS_PRE_DJANGO4:
+            return self._list_to_class_pre_django4(html, classes)
+        return re.sub("\s*<div>\s*<label", f' <div class="{classes}"><label', html)
+
+    def _list_to_class_pre_django4(self, html, classes):
+        return (
+            html.replace("<ul", "<div")
+            .replace("</ul>", "</div>")
+            .replace("<li", f'<div class="{classes}"')
+            .replace("</li>", "</div>")
+        )
 
     def put_inside_label(self, html):
         content = f"{html} {self.label}"
@@ -355,10 +359,10 @@ class FieldRenderer(BaseRenderer):
         return f'<div class="row bootstrap3-multi-input"><div class="col-xs-12">{html}</div></div>'
 
     def post_widget_render(self, html):
-        if isinstance(self.widget, RadioSelect):
-            html = self.list_to_class(html, "radio")
-        elif isinstance(self.widget, CheckboxSelectMultiple):
+        if isinstance(self.widget, CheckboxSelectMultiple):
             html = self.list_to_class(html, "checkbox")
+        elif isinstance(self.widget, RadioSelect):
+            html = self.list_to_class(html, "radio")
         elif isinstance(self.widget, SelectDateWidget):
             html = self.fix_date_select_input(html)
         elif isinstance(self.widget, ClearableFileInput):

{django_bootstrap3-23.2 → django_bootstrap3-23.4}/src/bootstrap3/utils.py

@@ -1,6 +1,7 @@
 import re
 from urllib.parse import parse_qs, urlencode, urlparse, urlunparse
 
+from django import get_version
 from django.forms.utils import flatatt
 from django.template import Variable, VariableDoesNotExist
 from django.template.base import FilterExpression, TemplateSyntaxError, kwarg_re
@@ -13,6 +14,10 @@ from bootstrap3.exceptions import BootstrapError
 
 from .text import text_value
 
+# TODO: Remove after support for Django 3.2 ends
+IS_PRE_DJANGO4 = get_version() < "4"
+
+
 # RegEx for quoted string
 QUOTED_STRING = re.compile(r'^["\'](?P<noquotes>.+)["\']$')
 

django_bootstrap3-23.2/src/bootstrap3/__about__.py

@@ -1 +0,0 @@
-__version__ = "23.2"