From 81a7356988a1d57045a5d101b5a4f47141f41489 Mon Sep 17 00:00:00 2001 From: Jason McBrayer Date: Sun, 29 Oct 2023 13:08:47 -0400 Subject: [PATCH] Support and prefer Django 4.1.x. Backwards compatibility for 3.2 LTS is provided for now, but you'll have to change the pipfile if you insist on it. --- Pipfile | 3 ++- brutaldon/settings.py | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Pipfile b/Pipfile index 09e8b9c..61dd29d 100644 --- a/Pipfile +++ b/Pipfile @@ -21,9 +21,10 @@ requests = "*" six = "*" "urllib3" = "*" webencodings = "*" -Django = "~=3.2" +Django = "~=4.2" django-html_sanitizer = "*" inscriptis = "*" lxml = "*" [dev-packages] +python-lsp-server = {extras = ["pyflakes", "rope", "yapf"], version = "*"} diff --git a/brutaldon/settings.py b/brutaldon/settings.py index 5fe9ea0..8d0610d 100644 --- a/brutaldon/settings.py +++ b/brutaldon/settings.py @@ -12,6 +12,14 @@ https://docs.djangoproject.com/en/2.0/ref/settings/ import os +# Work around issue in sanitizer +import django +try: + from django.utils.encoding import smart_text +except: + from django.utils.encoding import smart_str + django.utils.encoding.smart_text = smart_str + # Build paths inside the project like this: os.path.join(BASE_DIR, ...) BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))