diff options
author | David Reyna <David.Reyna@windriver.com> | 2023-08-28 01:45:18 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-08-30 10:41:54 +0100 |
commit | 9ccaee95d6afc65d528b469d16b4719733768ef6 (patch) | |
tree | d6101a730c67d03f65c25486efecaf7031a64fb5 /bitbake/lib/toaster/toastermain | |
parent | 10f38157a069cb6938323cadd5e523037a29ace9 (diff) | |
download | poky-9ccaee95d6afc65d528b469d16b4719733768ef6.tar.gz |
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 <Kieran.McNulty@windriver.com>
Signed-off-by: David Reyna <David.Reyna@windriver.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster/toastermain')
-rw-r--r-- | bitbake/lib/toaster/toastermain/management/commands/checksocket.py | 4 | ||||
-rw-r--r-- | bitbake/lib/toaster/toastermain/urls.py | 2 |
2 files changed, 3 insertions, 3 deletions
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 | |||
13 | import socket | 13 | import socket |
14 | 14 | ||
15 | from django.core.management.base import BaseCommand, CommandError | 15 | from django.core.management.base import BaseCommand, CommandError |
16 | from django.utils.encoding import force_text | 16 | from django.utils.encoding import force_str |
17 | 17 | ||
18 | DEFAULT_ADDRPORT = "0.0.0.0:8000" | 18 | DEFAULT_ADDRPORT = "0.0.0.0:8000" |
19 | 19 | ||
@@ -51,7 +51,7 @@ class Command(BaseCommand): | |||
51 | if hasattr(err, 'errno') and err.errno in errors: | 51 | if hasattr(err, 'errno') and err.errno in errors: |
52 | errtext = errors[err.errno] | 52 | errtext = errors[err.errno] |
53 | else: | 53 | else: |
54 | errtext = force_text(err) | 54 | errtext = force_str(err) |
55 | raise CommandError(errtext) | 55 | raise CommandError(errtext) |
56 | 56 | ||
57 | self.stdout.write("OK") | 57 | 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 @@ | |||
6 | # SPDX-License-Identifier: GPL-2.0-only | 6 | # SPDX-License-Identifier: GPL-2.0-only |
7 | # | 7 | # |
8 | 8 | ||
9 | from django.conf.urls import include, url | 9 | from django.urls import re_path as url, include |
10 | from django.views.generic import RedirectView, TemplateView | 10 | from django.views.generic import RedirectView, TemplateView |
11 | from django.views.decorators.cache import never_cache | 11 | from django.views.decorators.cache import never_cache |
12 | import bldcollector.views | 12 | import bldcollector.views |