From d74bcbeaf241a67871d62b7e2c17900ae900642e Mon Sep 17 00:00:00 2001 From: David Reyna Date: Tue, 27 Jun 2017 13:44:28 -0700 Subject: bitbake: toaster: address Django-1.10 API deprecations There are four main API deprecations in Django-1.10: (a) String view arguments to url() must be replaced by the explicit class reference (b) New TEMPLATES stucture in settings.py consolidates TEMPLATE_DIRS, TEMPLATE_CONTEXT_PROCESSORS, TEMPLATE_LOADERS, TEMPLATE_STRING_IF_INVALID, and TEMPLATE_DEBUG (c) patterns() wrapper in url() is removed, with urlpatterns now a simple list (d) NoArgsCommand in commands() must be replace by BaseCommand, and handle_noargs() changed to handle() Also, the Django version checker must be updated to accept two digit sub-version numbers (e.g. "1.8" < "1.10") [YOCTO #11684] (Bitbake rev: e4c7a94fac7a53fc146387a57e5a09b9ec3caca0) Signed-off-by: David Reyna Signed-off-by: Richard Purdie --- bitbake/lib/toaster/toastergui/urls.py | 61 +++++++++++++++++----------------- 1 file changed, 31 insertions(+), 30 deletions(-) (limited to 'bitbake/lib/toaster/toastergui') diff --git a/bitbake/lib/toaster/toastergui/urls.py b/bitbake/lib/toaster/toastergui/urls.py index d92f190aed..1ad79a4dd3 100644 --- a/bitbake/lib/toaster/toastergui/urls.py +++ b/bitbake/lib/toaster/toastergui/urls.py @@ -1,7 +1,7 @@ # # BitBake Toaster Implementation # -# Copyright (C) 2013 Intel Corporation +# Copyright (C) 2013-2017 Intel Corporation # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as @@ -25,49 +25,50 @@ from toastergui import buildtables from toastergui import typeaheads from toastergui import api from toastergui import widgets +from toastergui import views -urlpatterns = patterns('toastergui.views', +urlpatterns = [ # landing page - url(r'^landing/$', 'landing', name='landing'), + url(r'^landing/$', views.landing, name='landing'), url(r'^builds/$', tables.AllBuildsTable.as_view(template_name="builds-toastertable.html"), name='all-builds'), # build info navigation - url(r'^build/(?P\d+)$', 'builddashboard', name="builddashboard"), + url(r'^build/(?P\d+)$', views.builddashboard, name="builddashboard"), url(r'^build/(?P\d+)/tasks/$', buildtables.BuildTasksTable.as_view( template_name="buildinfo-toastertable.html"), name='tasks'), - url(r'^build/(?P\d+)/task/(?P\d+)$', 'task', name='task'), + url(r'^build/(?P\d+)/task/(?P\d+)$', views.task, name='task'), url(r'^build/(?P\d+)/recipes/$', buildtables.BuiltRecipesTable.as_view( template_name="buildinfo-toastertable.html"), name='recipes'), - url(r'^build/(?P\d+)/recipe/(?P\d+)/active_tab/(?P\d{1})$', 'recipe', name='recipe'), + url(r'^build/(?P\d+)/recipe/(?P\d+)/active_tab/(?P\d{1})$', views.recipe, name='recipe'), - url(r'^build/(?P\d+)/recipe/(?P\d+)$', 'recipe', name='recipe'), - url(r'^build/(?P\d+)/recipe_packages/(?P\d+)$', 'recipe_packages', name='recipe_packages'), + url(r'^build/(?P\d+)/recipe/(?P\d+)$', views.recipe, name='recipe'), + url(r'^build/(?P\d+)/recipe_packages/(?P\d+)$', views.recipe_packages, name='recipe_packages'), url(r'^build/(?P\d+)/packages/$', buildtables.BuiltPackagesTable.as_view( template_name="buildinfo-toastertable.html"), name='packages'), - url(r'^build/(?P\d+)/package/(?P\d+)$', 'package_built_detail', + url(r'^build/(?P\d+)/package/(?P\d+)$', views.package_built_detail, name='package_built_detail'), url(r'^build/(?P\d+)/package_built_dependencies/(?P\d+)$', - 'package_built_dependencies', name='package_built_dependencies'), + views.package_built_dependencies, name='package_built_dependencies'), url(r'^build/(?P\d+)/package_included_detail/(?P\d+)/(?P\d+)$', - 'package_included_detail', name='package_included_detail'), + views.package_included_detail, name='package_included_detail'), url(r'^build/(?P\d+)/package_included_dependencies/(?P\d+)/(?P\d+)$', - 'package_included_dependencies', name='package_included_dependencies'), + views.package_included_dependencies, name='package_included_dependencies'), url(r'^build/(?P\d+)/package_included_reverse_dependencies/(?P\d+)/(?P\d+)$', - 'package_included_reverse_dependencies', name='package_included_reverse_dependencies'), + views.package_included_reverse_dependencies, name='package_included_reverse_dependencies'), url(r'^build/(?P\d+)/target/(?P\d+)$', buildtables.InstalledPackagesTable.as_view( @@ -75,11 +76,11 @@ urlpatterns = patterns('toastergui.views', name='target'), - url(r'^dentries/build/(?P\d+)/target/(?P\d+)$', 'xhr_dirinfo', name='dirinfo_ajax'), - url(r'^build/(?P\d+)/target/(?P\d+)/dirinfo$', 'dirinfo', name='dirinfo'), - url(r'^build/(?P\d+)/target/(?P\d+)/dirinfo_filepath/_(?P(?:/[^/\n]+)*)$', 'dirinfo', name='dirinfo_filepath'), - url(r'^build/(?P\d+)/configuration$', 'configuration', name='configuration'), - url(r'^build/(?P\d+)/configvars$', 'configvars', name='configvars'), + url(r'^dentries/build/(?P\d+)/target/(?P\d+)$', views.xhr_dirinfo, name='dirinfo_ajax'), + url(r'^build/(?P\d+)/target/(?P\d+)/dirinfo$', views.dirinfo, name='dirinfo'), + url(r'^build/(?P\d+)/target/(?P\d+)/dirinfo_filepath/_(?P(?:/[^/\n]+)*)$', views.dirinfo, name='dirinfo_filepath'), + url(r'^build/(?P\d+)/configuration$', views.configuration, name='configuration'), + url(r'^build/(?P\d+)/configvars$', views.configvars, name='configvars'), url(r'^build/(?P\d+)/buildtime$', buildtables.BuildTimeTable.as_view( template_name="buildinfo-toastertable.html"), @@ -97,26 +98,26 @@ urlpatterns = patterns('toastergui.views', # image information dir url(r'^build/(?P\d+)/target/(?P\d+)/packagefile/(?P\d+)$', - 'image_information_dir', name='image_information_dir'), + views.image_information_dir, name='image_information_dir'), # build download artifact - url(r'^build/(?P\d+)/artifact/(?P\w+)/id/(?P\w+)', 'build_artifact', name="build_artifact"), + url(r'^build/(?P\d+)/artifact/(?P\w+)/id/(?P\w+)', views.build_artifact, name="build_artifact"), # project URLs - url(r'^newproject/$', 'newproject', name='newproject'), + url(r'^newproject/$', views.newproject, name='newproject'), url(r'^projects/$', tables.ProjectsTable.as_view(template_name="projects-toastertable.html"), name='all-projects'), - url(r'^project/(?P\d+)/$', 'project', name='project'), - url(r'^project/(?P\d+)/configuration$', 'projectconf', name='projectconf'), + url(r'^project/(?P\d+)/$', views.project, name='project'), + url(r'^project/(?P\d+)/configuration$', views.projectconf, name='projectconf'), url(r'^project/(?P\d+)/builds/$', tables.ProjectBuildsTable.as_view(template_name="projectbuilds-toastertable.html"), name='projectbuilds'), # the import layer is a project-specific functionality; - url(r'^project/(?P\d+)/importlayer$', 'importlayer', name='importlayer'), + url(r'^project/(?P\d+)/importlayer$', views.importlayer, name='importlayer'), # the table pages that have been converted to ToasterTable widget url(r'^project/(?P\d+)/machines/$', @@ -142,7 +143,7 @@ urlpatterns = patterns('toastergui.views', name="projectlayers"), url(r'^project/(?P\d+)/layer/(?P\d+)$', - 'layerdetails', name='layerdetails'), + views.layerdetails, name='layerdetails'), url(r'^project/(?P\d+)/layer/(?P\d+)/recipes/$', tables.LayerRecipesTable.as_view(template_name="generic-toastertable-page.html"), @@ -166,7 +167,7 @@ urlpatterns = patterns('toastergui.views', name="customrecipe"), url(r'^project/(?P\d+)/customrecipe/(?P\d+)/download$', - 'customrecipe_download', + views.customrecipe_download, name="customrecipedownload"), url(r'^project/(?P\d+)/recipe/(?P\d+)$', @@ -186,9 +187,9 @@ urlpatterns = patterns('toastergui.views', typeaheads.GitRevisionTypeAhead.as_view(), name='xhr_gitrevtypeahead'), - url(r'^xhr_testreleasechange/(?P\d+)$', 'xhr_testreleasechange', + url(r'^xhr_testreleasechange/(?P\d+)$', views.xhr_testreleasechange, name='xhr_testreleasechange'), - url(r'^xhr_configvaredit/(?P\d+)$', 'xhr_configvaredit', + url(r'^xhr_configvaredit/(?P\d+)$', views.xhr_configvaredit, name='xhr_configvaredit'), url(r'^xhr_layer/(?P\d+)/(?P\d+)$', @@ -200,7 +201,7 @@ urlpatterns = patterns('toastergui.views', name='xhr_layer'), # JS Unit tests - url(r'^js-unit-tests/$', 'jsunittests', name='js-unit-tests'), + url(r'^js-unit-tests/$', views.jsunittests, name='js-unit-tests'), # image customisation functionality url(r'^xhr_customrecipe/(?P\d+)' @@ -237,4 +238,4 @@ urlpatterns = patterns('toastergui.views', # default redirection url(r'^$', RedirectView.as_view(url='landing', permanent=True)), -) +] -- cgit v1.2.3-54-g00ecf