Attachment 1472983 Details for Bug 1572886 – additional fix

[patch] additional fix

0001-fix-syntax-multiple-except.-as-parenthes.-tuple.patch (text/plain), 1023 bytes, created by Tomas Jelinek on 2018-08-03 13:13:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomas Jelinek

Created: 2018-08-03 13:13:27 UTC

Size: 1023 bytes

patch

obsolete

>From 102e1d211f57339f92110921d607b0db33d50ca7 Mon Sep 17 00:00:00 2001
>From: Valentin Vidic <Valentin.Vidic@CARNet.hr>
>Date: Sun, 24 Jun 2018 09:19:34 +0200
>Subject: [PATCH] fix syntax (multiple except. as parenthes. tuple)
>
>See https://docs.python.org/2/tutorial/errors.html#handling-exceptions
>
>...the parentheses around this tuple are required, because except
>ValueError, e: was the syntax used for what is normally written as
>except ValueError as e: in modern Python...
>---
> pcs/cluster.py | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/pcs/cluster.py b/pcs/cluster.py
>index a64fd5fd..b4d49d27 100644
>--- a/pcs/cluster.py
>+++ b/pcs/cluster.py
>@@ -1138,7 +1138,7 @@ class IsComponentStartSupported(object):
>                     data["pcsd_capabilities"]
>                 ):
>                     self.supported = True
>-            except KeyError, ValueError:
>+            except (KeyError, ValueError):
>                 # not a valid json or 404 => not supported
>                 pass
> 
>-- 
>2.11.0
>

Actions: View | Diff

Attachments on bug 1572886: 1453211 | 1472983