From 4dabdbe11ddc47a885c7f8cc6b3f26439d40d77c Mon Sep 17 00:00:00 2001 From: David Reyna Date: Wed, 25 Mar 2020 21:24:55 -0700 Subject: bitbake: toaster: migrate to Django-2.2 Toaster migration to Django-2.2. Django-1.x has been deprecated. [YOCTO #13207] (Bitbake rev: 9730f95686b2ac72cf1fa513c555f7c7787e2667) Signed-off-by: David Reyna Signed-off-by: Richard Purdie --- bitbake/lib/toaster/toastergui/views.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'bitbake/lib/toaster/toastergui/views.py') diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py index e2ead830b1..ae1973ff24 100644 --- a/bitbake/lib/toaster/toastergui/views.py +++ b/bitbake/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") -- cgit v1.2.3-54-g00ecf