From ef25747ad7b741cadb2572c4e7ad3a23ecded25a Mon Sep 17 00:00:00 2001 From: blag Date: Fri, 14 Jan 2022 21:17:46 -0800 Subject: [PATCH 1/3] Try to import django.utils.encoding.force_str as force_text for Django 4.0+ --- .../templatetags/pinax_theme_bootstrap_tags.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pinax_theme_bootstrap/templatetags/pinax_theme_bootstrap_tags.py b/pinax_theme_bootstrap/templatetags/pinax_theme_bootstrap_tags.py index 4f42d059..32543a1a 100644 --- a/pinax_theme_bootstrap/templatetags/pinax_theme_bootstrap_tags.py +++ b/pinax_theme_bootstrap/templatetags/pinax_theme_bootstrap_tags.py @@ -1,7 +1,10 @@ from __future__ import unicode_literals from django import template from django.contrib.messages.utils import get_level_tags -from django.utils.encoding import force_text +try: + from django.utils.encoding import force_str as force_text +except ImportError: + from django.utils.encoding import force_text LEVEL_TAGS = get_level_tags() From e47de4f213fef8e9a165dc5e28901eabf774cd61 Mon Sep 17 00:00:00 2001 From: blag Date: Fri, 14 Jan 2022 22:09:30 -0800 Subject: [PATCH 2/3] Add myself to AUTHORS --- AUTHORS | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS b/AUTHORS index a9c44be7..c06b70c8 100644 --- a/AUTHORS +++ b/AUTHORS @@ -39,3 +39,4 @@ Ethan A Kent Alex McLean mclean25 Ivo Rothschild +blag From 52b710310bf4bd123578d48874c167b15a261150 Mon Sep 17 00:00:00 2001 From: blag Date: Fri, 14 Jan 2022 22:09:43 -0800 Subject: [PATCH 3/3] Bump version to 8.0.2 --- pinax_theme_bootstrap/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pinax_theme_bootstrap/__init__.py b/pinax_theme_bootstrap/__init__.py index 9e17e009..9f301e2a 100644 --- a/pinax_theme_bootstrap/__init__.py +++ b/pinax_theme_bootstrap/__init__.py @@ -1 +1 @@ -__version__ = "8.0.1" +__version__ = "8.0.2"