summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorDavid Reyna <David.Reyna@windriver.com>2017-12-01 15:30:13 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-12-18 15:05:36 +0000
commit6b132acd0a2241c21974866c572826d7b0a9efc3 (patch)
tree46dc07f9010038c962cbfc2e942fea0fad759cad /bitbake
parent8eaf495b05912422614d4d6a2faa23940a4739fc (diff)
downloadpoky-6b132acd0a2241c21974866c572826d7b0a9efc3.tar.gz
bitbake: toaster: update Toaster for Django 1.11
Toaster needs to accomodate API changes in Django 1.11. [YOCTO #12192] (Bitbake rev: bfec25108d8e00a8ca2c93859a03082bea19789c) Signed-off-by: David Reyna <David.Reyna@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/toaster/bldcollector/urls.py2
-rw-r--r--bitbake/lib/toaster/toastergui/urls.py2
-rwxr-xr-xbitbake/lib/toaster/toastergui/views.py2
-rw-r--r--bitbake/lib/toaster/toastermain/settings.py2
-rw-r--r--bitbake/lib/toaster/toastermain/urls.py2
-rw-r--r--bitbake/toaster-requirements.txt2
6 files changed, 6 insertions, 6 deletions
diff --git a/bitbake/lib/toaster/bldcollector/urls.py b/bitbake/lib/toaster/bldcollector/urls.py
index 076afdb722..888175d0ab 100644
--- a/bitbake/lib/toaster/bldcollector/urls.py
+++ b/bitbake/lib/toaster/bldcollector/urls.py
@@ -17,7 +17,7 @@
17# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 17# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
18 18
19 19
20from django.conf.urls import patterns, include, url 20from django.conf.urls import include, url
21 21
22import bldcollector.views 22import bldcollector.views
23 23
diff --git a/bitbake/lib/toaster/toastergui/urls.py b/bitbake/lib/toaster/toastergui/urls.py
index 3ad5566b1d..e07b0efc1f 100644
--- a/bitbake/lib/toaster/toastergui/urls.py
+++ b/bitbake/lib/toaster/toastergui/urls.py
@@ -16,7 +16,7 @@
16# with this program; if not, write to the Free Software Foundation, Inc., 16# with this program; if not, write to the Free Software Foundation, Inc.,
17# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 17# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
18 18
19from django.conf.urls import patterns, include, url 19from django.conf.urls import include, url
20from django.views.generic import RedirectView, TemplateView 20from django.views.generic import RedirectView, TemplateView
21 21
22from django.http import HttpResponseBadRequest 22from django.http import HttpResponseBadRequest
diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py
index 334bb4a2e9..209b07dad8 100755
--- a/bitbake/lib/toaster/toastergui/views.py
+++ b/bitbake/lib/toaster/toastergui/views.py
@@ -277,7 +277,7 @@ def _validate_input(field_input, model):
277 return None, invalid + str(field_input_list) 277 return None, invalid + str(field_input_list)
278 278
279 # Check we are looking for a valid field 279 # Check we are looking for a valid field
280 valid_fields = model._meta.get_all_field_names() 280 valid_fields = [f.name for f in model._meta.get_fields()]
281 for field in field_input_list[0].split(AND_VALUE_SEPARATOR): 281 for field in field_input_list[0].split(AND_VALUE_SEPARATOR):
282 if True in [field.startswith(x) for x in valid_fields]: 282 if True in [field.startswith(x) for x in valid_fields]:
283 break 283 break
diff --git a/bitbake/lib/toaster/toastermain/settings.py b/bitbake/lib/toaster/toastermain/settings.py
index 54ab31f302..13541d380f 100644
--- a/bitbake/lib/toaster/toastermain/settings.py
+++ b/bitbake/lib/toaster/toastermain/settings.py
@@ -186,7 +186,7 @@ TEMPLATES = [
186 'django.template.context_processors.tz', 186 'django.template.context_processors.tz',
187 'django.contrib.messages.context_processors.messages', 187 'django.contrib.messages.context_processors.messages',
188 # Custom 188 # Custom
189 'django.core.context_processors.request', 189 'django.template.context_processors.request',
190 'toastergui.views.managedcontextprocessor', 190 'toastergui.views.managedcontextprocessor',
191 191
192 ], 192 ],
diff --git a/bitbake/lib/toaster/toastermain/urls.py b/bitbake/lib/toaster/toastermain/urls.py
index 6750bdf3aa..e2fb0aebfd 100644
--- a/bitbake/lib/toaster/toastermain/urls.py
+++ b/bitbake/lib/toaster/toastermain/urls.py
@@ -19,7 +19,7 @@
19# with this program; if not, write to the Free Software Foundation, Inc., 19# with this program; if not, write to the Free Software Foundation, Inc.,
20# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 20# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
21 21
22from django.conf.urls import patterns, include, url 22from django.conf.urls import include, url
23from django.views.generic import RedirectView, TemplateView 23from django.views.generic import RedirectView, TemplateView
24from django.views.decorators.cache import never_cache 24from django.views.decorators.cache import never_cache
25import bldcollector.views 25import bldcollector.views
diff --git a/bitbake/toaster-requirements.txt b/bitbake/toaster-requirements.txt
index 3f47650b46..c0ec36828a 100644
--- a/bitbake/toaster-requirements.txt
+++ b/bitbake/toaster-requirements.txt
@@ -1,3 +1,3 @@
1Django>1.8,<1.9.9 1Django>1.8,<1.11.9
2beautifulsoup4>=4.4.0 2beautifulsoup4>=4.4.0
3pytz 3pytz