[oe-commits] [bitbake] 11/13: toaster: api Add util function for returning the error response
git at git.openembedded.org
git at git.openembedded.org
Thu Jul 7 13:30:36 UTC 2016
rpurdie pushed a commit to branch master-next
in repository bitbake.
commit 98413b73b6b7b63332e317eddf53acb1f3179c12
Author: Michael Wood <michael.g.wood at intel.com>
AuthorDate: Wed Jul 6 18:22:37 2016 +0100
toaster: api Add util function for returning the error response
Also clean up flake8 warnings in XhrBuildRequest
Signed-off-by: Michael Wood <michael.g.wood at intel.com>
Signed-off-by: Elliot Smith <elliot.smith at intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
lib/toaster/toastergui/api.py | 28 ++++++++++++++++------------
1 file changed, 16 insertions(+), 12 deletions(-)
diff --git a/lib/toaster/toastergui/api.py b/lib/toaster/toastergui/api.py
index a024748..112ce58 100644
--- a/lib/toaster/toastergui/api.py
+++ b/lib/toaster/toastergui/api.py
@@ -29,6 +29,9 @@ from django.views.generic import View
from django.core.urlresolvers import reverse
+def error_response(error):
+ return JsonResponse({"error": error})
+
class XhrBuildRequest(View):
@@ -81,20 +84,24 @@ class XhrBuildRequest(View):
br.save()
except BuildRequest.DoesNotExist:
- return JsonResponse({'error':'No such build id %s' % i})
+ return error_response('No such build id %s' % i)
- return JsonResponse({'error': 'ok'})
+ return error_response('ok')
if 'buildDelete' in request.POST:
for i in request.POST['buildDelete'].strip().split(" "):
try:
- BuildRequest.objects.select_for_update().get(project = project, pk = i, state__lte = BuildRequest.REQ_DELETED).delete()
+ BuildRequest.objects.select_for_update().get(
+ project=project,
+ pk=i,
+ state__lte=BuildRequest.REQ_DELETED).delete()
+
except BuildRequest.DoesNotExist:
pass
- return JsonResponse({'error': 'ok' })
+ return error_response("ok")
if 'targets' in request.POST:
- ProjectTarget.objects.filter(project = project).delete()
+ ProjectTarget.objects.filter(project=project).delete()
s = str(request.POST['targets'])
for t in re.sub(r'[;%|"]', '', s).split(" "):
if ":" in t:
@@ -102,12 +109,12 @@ class XhrBuildRequest(View):
else:
target = t
task = ""
- ProjectTarget.objects.create(project = project,
- target = target,
- task = task)
+ ProjectTarget.objects.create(project=project,
+ target=target,
+ task=task)
project.schedule_build()
- return JsonResponse({'error': 'ok' })
+ return error_response('ok')
response = HttpResponse()
response.status_code = 500
@@ -135,9 +142,6 @@ class XhrLayer(View):
{"error": <error message>}
"""
- def error_response(error):
- return JsonResponse({"error": error})
-
try:
# We currently only allow Imported layers to be edited
layer_version = Layer_Version.objects.get(
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list