From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41353) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fHGQh-0004Rz-F2 for qemu-devel@nongnu.org; Fri, 11 May 2018 18:22:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fHGQg-0004YU-OU for qemu-devel@nongnu.org; Fri, 11 May 2018 18:22:23 -0400 From: Eduardo Habkost Date: Fri, 11 May 2018 19:20:51 -0300 Message-Id: <20180511222052.8734-10-ehabkost@redhat.com> In-Reply-To: <20180511222052.8734-1-ehabkost@redhat.com> References: <20180511222052.8734-1-ehabkost@redhat.com> Subject: [Qemu-devel] [RFC 09/10] python: futurize -f lib2to3.fixes.fix_except List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Eduardo Habkost , Stefan Hajnoczi , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , "Daniel P. Berrange" , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Kevin Wolf , Fam Zheng , Juan Quintela , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Max Reitz , Markus Armbruster , Cleber Rosa , "Dr. David Alan Gilbert" , qemu-block@nongnu.org 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 Signed-off-by: Eduardo Habkost --- scripts/simpletrace.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/simpletrace.py b/scripts/simpletrace.py index 2658b5cc7c..d4a50a1e2b 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 ' \ -- 2.14.3