From 151dad72ddd0100fc0f22cbb0fcb8b73acc8eea8 Mon Sep 17 00:00:00 2001 From: aricept Date: Tue, 9 Jan 2024 12:17:45 -0600 Subject: [PATCH 1/2] Change force_text to force_str Change removed method force_text to force_str for which it was an alias, for compatibility with Django 4.2+. --- django_markdown/utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/django_markdown/utils.py b/django_markdown/utils.py index 5e5e195..0573277 100644 --- a/django_markdown/utils.py +++ b/django_markdown/utils.py @@ -3,7 +3,7 @@ from django import VERSION from django.template import loader -from django.utils.encoding import force_text +from django.utils.encoding import force_str from django.utils.safestring import mark_safe from . import settings @@ -35,7 +35,7 @@ def markdown(value, extensions=settings.MARKDOWN_EXTENSIONS, """ return mark_safe(markdown_module.markdown( - force_text(value), extensions=extensions, + force_str(value), extensions=extensions, extension_configs=extension_configs, safe_mode=safe)) From 0b92bd97fcc97c5c4ff21912f3f041a972c84dc8 Mon Sep 17 00:00:00 2001 From: aricept Date: Tue, 9 Jan 2024 12:31:47 -0600 Subject: [PATCH 2/2] Update tox.ini with new python and django supported versions --- tox.ini | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/tox.ini b/tox.ini index 543e7c6..2f14619 100644 --- a/tox.ini +++ b/tox.ini @@ -3,12 +3,19 @@ envlist= py36-d20 py36-d21 py36-d22 + py36-d30 + py36-d31 + py36-d32 + py38-d40 + py38-d41 + py38-d42 cov flake8 [tox:travis] 3.6 = py36, cov 3.7 = py37 +3.8 = py38 [pylama] skip=example/* @@ -53,6 +60,36 @@ deps = django<=2.3 {[testenv]deps} +[testenv:py36-d30] +deps = + django<3.1 + {[testenv]deps} + +[testenv:py36-d31] +deps = + django<3.2 + {[testenv]deps} + +[testenv:py36-d32] +deps = + django<3.3 + {[testenv]deps} + +[testenv:py38-d40] +deps = + django<4.1 + {[testenv]deps} + +[testenv:py38-d41] +deps = + django<=4.2 + {[testenv]deps} + +[testenv:py38-d42] +deps = + django<4.3 + {[testenv]deps} + [testenv:cov] deps = coverage