From 9ccaee95d6afc65d528b469d16b4719733768ef6 Mon Sep 17 00:00:00 2001 From: David Reyna Date: Mon, 28 Aug 2023 01:45:18 -0700 Subject: bitbake: toaster: Update to Django 4.2 Update Toaster to support Django 4.2, to match current hosts and to address CVEs. [YOCTO #15152] (Bitbake rev: 4f5b1f5bede402295bf4dfc8845fe2f38973e157) Signed-off-by: Kieran McNulty Signed-off-by: David Reyna Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- bitbake/lib/toaster/toastermain/management/commands/checksocket.py | 4 ++-- bitbake/lib/toaster/toastermain/urls.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'bitbake/lib/toaster/toastermain') diff --git a/bitbake/lib/toaster/toastermain/management/commands/checksocket.py b/bitbake/lib/toaster/toastermain/management/commands/checksocket.py index 811fd5d516..b2c002da7a 100644 --- a/bitbake/lib/toaster/toastermain/management/commands/checksocket.py +++ b/bitbake/lib/toaster/toastermain/management/commands/checksocket.py @@ -13,7 +13,7 @@ import errno import socket from django.core.management.base import BaseCommand, CommandError -from django.utils.encoding import force_text +from django.utils.encoding import force_str DEFAULT_ADDRPORT = "0.0.0.0:8000" @@ -51,7 +51,7 @@ class Command(BaseCommand): if hasattr(err, 'errno') and err.errno in errors: errtext = errors[err.errno] else: - errtext = force_text(err) + errtext = force_str(err) raise CommandError(errtext) self.stdout.write("OK") diff --git a/bitbake/lib/toaster/toastermain/urls.py b/bitbake/lib/toaster/toastermain/urls.py index 5fb520b384..0360302668 100644 --- a/bitbake/lib/toaster/toastermain/urls.py +++ b/bitbake/lib/toaster/toastermain/urls.py @@ -6,7 +6,7 @@ # SPDX-License-Identifier: GPL-2.0-only # -from django.conf.urls import include, url +from django.urls import re_path as url, include from django.views.generic import RedirectView, TemplateView from django.views.decorators.cache import never_cache import bldcollector.views -- cgit v1.2.3-54-g00ecf