From af313514f87fa036f0813f0f4dafdfdd8f259a54 Mon Sep 17 00:00:00 2001 From: Eduardo Habkost Date: Mon, 25 Jun 2018 21:23:44 +0100 Subject: [PATCH 03/15] python: futurize -f lib2to3.fixes.fix_except RH-Author: Eduardo Habkost Message-id: <20180625212346.26440-3-ehabkost@redhat.com> Patchwork-id: 81050 O-Subject: [qemu-kvm RHEL8/virt212 PATCH 2/4] python: futurize -f lib2to3.fixes.fix_except Bugzilla: 1571533 RH-Acked-by: Thomas Huth RH-Acked-by: Vitaly Kuznetsov RH-Acked-by: Miroslav Rezanina Convert "except X, T" to "except X as T". This is necessary for Python 3 compatibility. Done using: $ py=$( (g grep -l -E '^#!.*python';find -name '*.py' -printf '%P\n';) | \ sort -u | grep -v README.sh4) $ futurize -w -f lib2to3.fixes.fix_except $py Reviewed-by: Stefan Hajnoczi Signed-off-by: Eduardo Habkost Message-Id: <20180608122952.2009-10-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost (cherry picked from commit bd228083f7364dd2903970ec4dc0cc55bf156104) Signed-off-by: Eduardo Habkost Signed-off-by: Danilo C. L. de Paula --- scripts/simpletrace.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/simpletrace.py b/scripts/simpletrace.py index 54e761f..6b46195 100755 --- a/scripts/simpletrace.py +++ b/scripts/simpletrace.py @@ -45,7 +45,7 @@ def get_record(edict, idtoname, rechdr, fobj): rec = (name, rechdr[1], rechdr[3]) try: event = edict[name] - except KeyError, e: + except KeyError as e: import sys sys.stderr.write('%s event is logged but is not declared ' \ 'in the trace events file, try using ' \ -- 1.8.3.1