diff options
author | David Reyna <David.Reyna@windriver.com> | 2020-03-25 21:24:55 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-03-29 20:02:12 +0100 |
commit | 9730f95686b2ac72cf1fa513c555f7c7787e2667 (patch) | |
tree | f51bc180597551dbf2e7d057ce54f38720a23277 /lib/toaster/toastergui | |
parent | 51f827911b7202de3e855e683fdbd732d7a84e09 (diff) | |
download | bitbake-9730f95686b2ac72cf1fa513c555f7c7787e2667.tar.gz |
toaster: migrate to Django-2.2
Toaster migration to Django-2.2. Django-1.x has been deprecated.
[YOCTO #13207]
Signed-off-by: David Reyna <David.Reyna@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib/toaster/toastergui')
-rw-r--r-- | lib/toaster/toastergui/api.py | 2 | ||||
-rw-r--r-- | lib/toaster/toastergui/templatetags/project_url_tag.py | 2 | ||||
-rw-r--r-- | lib/toaster/toastergui/templatetags/projecttags.py | 4 | ||||
-rw-r--r-- | lib/toaster/toastergui/typeaheads.py | 2 | ||||
-rw-r--r-- | lib/toaster/toastergui/views.py | 16 | ||||
-rw-r--r-- | lib/toaster/toastergui/widgets.py | 2 |
6 files changed, 14 insertions, 14 deletions
diff --git a/lib/toaster/toastergui/api.py b/lib/toaster/toastergui/api.py index a4afc9e70..b4cdc335e 100644 --- a/lib/toaster/toastergui/api.py +++ b/lib/toaster/toastergui/api.py @@ -24,7 +24,7 @@ from bldcontrol import bbcontroller from django.http import HttpResponse, JsonResponse from django.views.generic import View -from django.core.urlresolvers import reverse +from django.urls import reverse from django.db.models import Q, F from django.db import Error from toastergui.templatetags.projecttags import filtered_filesizeformat diff --git a/lib/toaster/toastergui/templatetags/project_url_tag.py b/lib/toaster/toastergui/templatetags/project_url_tag.py index 71e092578..7b6f15b2c 100644 --- a/lib/toaster/toastergui/templatetags/project_url_tag.py +++ b/lib/toaster/toastergui/templatetags/project_url_tag.py @@ -3,7 +3,7 @@ # from django import template -from django.core.urlresolvers import reverse +from django.urls import reverse register = template.Library() diff --git a/lib/toaster/toastergui/templatetags/projecttags.py b/lib/toaster/toastergui/templatetags/projecttags.py index b703da304..c432f59a7 100644 --- a/lib/toaster/toastergui/templatetags/projecttags.py +++ b/lib/toaster/toastergui/templatetags/projecttags.py @@ -44,7 +44,7 @@ def json(value, default = None): # it manually here return mark_safe(JsonLib.dumps(value, indent=2, default = default, ensure_ascii=False).replace('</', '<\\/')) -@register.assignment_tag +@register.simple_tag def query(qs, **kwargs): """ template tag which allows queryset filtering. Usage: {% query books author=author as mybooks %} @@ -83,7 +83,7 @@ def divide(value, arg): def multiply(value, arg): return int(value) * int(arg) -@register.assignment_tag +@register.simple_tag def datecompute(delta, start = timezone.now()): return start + timedelta(delta) diff --git a/lib/toaster/toastergui/typeaheads.py b/lib/toaster/toastergui/typeaheads.py index fd750ffb7..a1e6fe90f 100644 --- a/lib/toaster/toastergui/typeaheads.py +++ b/lib/toaster/toastergui/typeaheads.py @@ -10,7 +10,7 @@ import subprocess from toastergui.widgets import ToasterTypeAhead from orm.models import Project -from django.core.urlresolvers import reverse +from django.urls import reverse from django.core.cache import cache diff --git a/lib/toaster/toastergui/views.py b/lib/toaster/toastergui/views.py index e2ead830b..ae1973ff2 100644 --- a/lib/toaster/toastergui/views.py +++ b/lib/toaster/toastergui/views.py @@ -19,7 +19,7 @@ from orm.models import Target_Installed_Package, Target_File from orm.models import TargetKernelFile, TargetSDKFile, Target_Image_File from orm.models import BitbakeVersion, CustomImageRecipe -from django.core.urlresolvers import reverse, resolve +from django.urls import reverse, resolve from django.core.exceptions import ObjectDoesNotExist from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger from django.http import HttpResponseNotFound, JsonResponse @@ -352,7 +352,7 @@ def _get_parameters_values(request, default_count, default_order): # set cookies for parameters. this is usefull in case parameters are set # manually from the GET values of the link def _set_parameters_values(pagesize, orderby, request): - from django.core.urlresolvers import resolve + from django.urls import resolve current_url = resolve(request.path_info).url_name request.session['%s_count' % current_url] = pagesize request.session['%s_orderby' % current_url] =orderby @@ -1364,8 +1364,8 @@ if True: template = "newproject.html" context = { - 'email': request.user.email if request.user.is_authenticated() else '', - 'username': request.user.username if request.user.is_authenticated() else '', + 'email': request.user.email if request.user.is_authenticated else '', + 'username': request.user.username if request.user.is_authenticated else '', 'releases': Release.objects.order_by("description"), } @@ -1391,7 +1391,7 @@ if True: # set alert for missing fields raise BadParameterException("Fields missing: %s" % ", ".join(missing)) - if not request.user.is_authenticated(): + if not request.user.is_authenticated: user = authenticate(username = request.POST.get('username', '_anonuser'), password = 'nopass') if user is None: user = User.objects.create_user(username = request.POST.get('username', '_anonuser'), email = request.POST.get('email', ''), password = "nopass") @@ -1438,8 +1438,8 @@ if True: project = Project.objects.get(pk=pid) template = "newproject_specific.html" context = { - 'email': request.user.email if request.user.is_authenticated() else '', - 'username': request.user.username if request.user.is_authenticated() else '', + 'email': request.user.email if request.user.is_authenticated else '', + 'username': request.user.username if request.user.is_authenticated else '', 'releases': Release.objects.order_by("description"), 'projectname': project.name, 'project_pk': project.pk, @@ -1469,7 +1469,7 @@ if True: # set alert for missing fields raise BadParameterException("Fields missing: %s" % ", ".join(missing)) - if not request.user.is_authenticated(): + if not request.user.is_authenticated: user = authenticate(username = request.POST.get('username', '_anonuser'), password = 'nopass') if user is None: user = User.objects.create_user(username = request.POST.get('username', '_anonuser'), email = request.POST.get('email', ''), password = "nopass") diff --git a/lib/toaster/toastergui/widgets.py b/lib/toaster/toastergui/widgets.py index 645f4587e..ceff52942 100644 --- a/lib/toaster/toastergui/widgets.py +++ b/lib/toaster/toastergui/widgets.py @@ -22,7 +22,7 @@ from django.utils import timezone from toastergui.templatetags.projecttags import sectohms, get_tasks from toastergui.templatetags.projecttags import json as template_json from django.http import JsonResponse -from django.core.urlresolvers import reverse +from django.urls import reverse import types import json |