[gnome-continuous-yocto/gnomeostree-3.28-rocko: 305/8267] bitbake: toaster: use new syntax of except statement



commit 0854035d9c6b1e231587f30c6cb421020b643209
Author: Ed Bartosh <ed bartosh linux intel com>
Date:   Tue May 10 17:10:30 2016 +0300

    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>

 bitbake/lib/toaster/toastergui/views.py |    6 +++---
 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:
             else:
                 context['dl_dir'] = ProjectVariable.objects.get(project = prj, name = "DL_DIR").value
             context['dl_dir_defined'] = "1"
-        except ProjectVariable.DoesNotExist,BuildEnvironment.DoesNotExist:
+        except (ProjectVariable.DoesNotExist, BuildEnvironment.DoesNotExist):
             pass
         try:
             context['fstypes'] =  ProjectVariable.objects.get(project = prj, name = "IMAGE_FSTYPES").value
@@ -2915,7 +2915,7 @@ if True:
             else:
                 context['sstate_dir'] = ProjectVariable.objects.get(project = prj, name = "SSTATE_DIR").value
             context['sstate_dir_defined'] = "1"
-        except ProjectVariable.DoesNotExist, BuildEnvironment.DoesNotExist:
+        except (ProjectVariable.DoesNotExist, BuildEnvironment.DoesNotExist):
             pass
 
         return context
@@ -2978,5 +2978,5 @@ if True:
                 return response
             else:
                 return render(request, "unavailable_artifact.html")
-        except ObjectDoesNotExist, IOError:
+        except (ObjectDoesNotExist, IOError):
             return render(request, "unavailable_artifact.html")


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]