summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2016-05-10 14:10:30 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-14 22:05:15 (GMT)
commit0854035d9c6b1e231587f30c6cb421020b643209 (patch)
tree552168d7c4cb3c851096074a6dd39a3d26487a60
parent519a85ef25a9c5552ce6478dcd39898c31cf1cd6 (diff)
downloadpoky-0854035d9c6b1e231587f30c6cb421020b643209.tar.gz
bitbake: toaster: use new syntax of except statement
Used except 'except (<exception1>, <exception2>):' syntax as it's supported by python 2 and pythone 3. Old syntax 'except <exception1>, <exception2>:' is not supported by python 3. [YOCTO #9584] (Bitbake rev: d19e305ffa44a848b02ede63dc5de8d2640089e6) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xbitbake/lib/toaster/toastergui/views.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py
index 82cc52e..e78b0da 100755
--- a/bitbake/lib/toaster/toastergui/views.py
+++ b/bitbake/lib/toaster/toastergui/views.py
@@ -2887,7 +2887,7 @@ if True:
2887 else: 2887 else:
2888 context['dl_dir'] = ProjectVariable.objects.get(project = prj, name = "DL_DIR").value 2888 context['dl_dir'] = ProjectVariable.objects.get(project = prj, name = "DL_DIR").value
2889 context['dl_dir_defined'] = "1" 2889 context['dl_dir_defined'] = "1"
2890 except ProjectVariable.DoesNotExist,BuildEnvironment.DoesNotExist: 2890 except (ProjectVariable.DoesNotExist, BuildEnvironment.DoesNotExist):
2891 pass 2891 pass
2892 try: 2892 try:
2893 context['fstypes'] = ProjectVariable.objects.get(project = prj, name = "IMAGE_FSTYPES").value 2893 context['fstypes'] = ProjectVariable.objects.get(project = prj, name = "IMAGE_FSTYPES").value
@@ -2915,7 +2915,7 @@ if True:
2915 else: 2915 else:
2916 context['sstate_dir'] = ProjectVariable.objects.get(project = prj, name = "SSTATE_DIR").value 2916 context['sstate_dir'] = ProjectVariable.objects.get(project = prj, name = "SSTATE_DIR").value
2917 context['sstate_dir_defined'] = "1" 2917 context['sstate_dir_defined'] = "1"
2918 except ProjectVariable.DoesNotExist, BuildEnvironment.DoesNotExist: 2918 except (ProjectVariable.DoesNotExist, BuildEnvironment.DoesNotExist):
2919 pass 2919 pass
2920 2920
2921 return context 2921 return context
@@ -2978,5 +2978,5 @@ if True:
2978 return response 2978 return response
2979 else: 2979 else:
2980 return render(request, "unavailable_artifact.html") 2980 return render(request, "unavailable_artifact.html")
2981 except ObjectDoesNotExist, IOError: 2981 except (ObjectDoesNotExist, IOError):
2982 return render(request, "unavailable_artifact.html") 2982 return render(request, "unavailable_artifact.html")