aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Reyna <David.Reyna@windriver.com>2017-11-30 00:55:24 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-12-18 15:04:53 +0000
commit1b34e3c0075b4bb8a4800fef3e12c3f39743973c (patch)
tree074e098aafe05923cecf10c19a5495334b8ccc9e
parent21dde782c049108dd9455ffbf431de214437e800 (diff)
downloadbitbake-1b34e3c0075b4bb8a4800fef3e12c3f39743973c.zip
bitbake-1b34e3c0075b4bb8a4800fef3e12c3f39743973c.tar.gz
bitbake-1b34e3c0075b4bb8a4800fef3e12c3f39743973c.tar.bz2
toaster: update Toaster for Django 1.11
Toaster needs to accomodate API changes in Django 1.11. [YOCTO #12192] Signed-off-by: David Reyna <David.Reyna@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--lib/toaster/bldcollector/urls.py2
-rw-r--r--lib/toaster/toastergui/urls.py2
-rwxr-xr-xlib/toaster/toastergui/views.py2
-rw-r--r--lib/toaster/toastermain/settings.py2
-rw-r--r--lib/toaster/toastermain/urls.py2
-rw-r--r--toaster-requirements.txt2
6 files changed, 6 insertions, 6 deletions
diff --git a/lib/toaster/bldcollector/urls.py b/lib/toaster/bldcollector/urls.py
index 076afdb..ed379bf 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 3ad5566..e07b0ef 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 334bb4a..209b07d 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 54ab31f..13541d3 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 6750bdf..e2fb0ae 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
diff --git a/toaster-requirements.txt b/toaster-requirements.txt
index 3f47650..c0ec368 100644
--- a/toaster-requirements.txt
+++ b/toaster-requirements.txt
@@ -1,3 +1,3 @@
-Django>1.8,<1.9.9
+Django>1.8,<1.11.9
beautifulsoup4>=4.4.0
pytz