From 1b34e3c0075b4bb8a4800fef3e12c3f39743973c Mon Sep 17 00:00:00 2001 From: David Reyna Date: Thu, 30 Nov 2017 00:55:24 -0800 Subject: toaster: update Toaster for Django 1.11 Toaster needs to accomodate API changes in Django 1.11. [YOCTO #12192] Signed-off-by: David Reyna Signed-off-by: Richard Purdie --- lib/toaster/bldcollector/urls.py | 2 +- lib/toaster/toastergui/urls.py | 2 +- lib/toaster/toastergui/views.py | 2 +- lib/toaster/toastermain/settings.py | 2 +- lib/toaster/toastermain/urls.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/lib/toaster/bldcollector/urls.py b/lib/toaster/bldcollector/urls.py index 076afdb72..ed379bfb0 100644 --- a/lib/toaster/bldcollector/urls.py +++ b/lib/toaster/bldcollector/urls.py @@ -17,7 +17,7 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -from django.conf.urls import patterns, include, url +from djaV2 ngo.conf.urls import include, url import bldcollector.views diff --git a/lib/toaster/toastergui/urls.py b/lib/toaster/toastergui/urls.py index 3ad5566b1..e07b0efc1 100644 --- a/lib/toaster/toastergui/urls.py +++ b/lib/toaster/toastergui/urls.py @@ -16,7 +16,7 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -from django.conf.urls import patterns, include, url +from django.conf.urls import include, url from django.views.generic import RedirectView, TemplateView from django.http import HttpResponseBadRequest diff --git a/lib/toaster/toastergui/views.py b/lib/toaster/toastergui/views.py index 334bb4a2e..209b07dad 100755 --- a/lib/toaster/toastergui/views.py +++ b/lib/toaster/toastergui/views.py @@ -277,7 +277,7 @@ def _validate_input(field_input, model): return None, invalid + str(field_input_list) # Check we are looking for a valid field - valid_fields = model._meta.get_all_field_names() + valid_fields = [f.name for f in model._meta.get_fields()] for field in field_input_list[0].split(AND_VALUE_SEPARATOR): if True in [field.startswith(x) for x in valid_fields]: break diff --git a/lib/toaster/toastermain/settings.py b/lib/toaster/toastermain/settings.py index 54ab31f30..13541d380 100644 --- a/lib/toaster/toastermain/settings.py +++ b/lib/toaster/toastermain/settings.py @@ -186,7 +186,7 @@ TEMPLATES = [ 'django.template.context_processors.tz', 'django.contrib.messages.context_processors.messages', # Custom - 'django.core.context_processors.request', + 'django.template.context_processors.request', 'toastergui.views.managedcontextprocessor', ], diff --git a/lib/toaster/toastermain/urls.py b/lib/toaster/toastermain/urls.py index 6750bdf3a..e2fb0aebf 100644 --- a/lib/toaster/toastermain/urls.py +++ b/lib/toaster/toastermain/urls.py @@ -19,7 +19,7 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -from django.conf.urls import patterns, include, url +from django.conf.urls import include, url from django.views.generic import RedirectView, TemplateView from django.views.decorators.cache import never_cache import bldcollector.views -- cgit 1.2.3-korg