From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55951) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9VSO-0005xG-La for qemu-devel@nongnu.org; Thu, 17 Dec 2015 05:06:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a9VSN-0005jr-V1 for qemu-devel@nongnu.org; Thu, 17 Dec 2015 05:06:44 -0500 From: Markus Armbruster Date: Thu, 17 Dec 2015 11:06:30 +0100 Message-Id: <1450346791-25562-4-git-send-email-armbru@redhat.com> In-Reply-To: <1450346791-25562-1-git-send-email-armbru@redhat.com> References: <1450346791-25562-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 3/4] Revert "tracetool: use Python 2.4-compatible exception handling syntax" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, qemu-block@nongnu.org, mdroth@linux.vnet.ibm.com, stefanha@redhat.com This reverts commit 662da3854e3f490223373b40afdcfcc339d14aa5. Signed-off-by: Markus Armbruster --- scripts/tracetool.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/tracetool.py b/scripts/tracetool.py index 83bde7b..7b82959 100755 --- a/scripts/tracetool.py +++ b/scripts/tracetool.py @@ -71,7 +71,7 @@ def main(args): try: opts, args = getopt.getopt(args[1:], "", long_opts) - except getopt.GetoptError, err: + except getopt.GetoptError as err: error_opt(str(err)) check_backends = False @@ -132,7 +132,7 @@ def main(args): try: tracetool.generate(sys.stdin, arg_format, arg_backends, binary=binary, probe_prefix=probe_prefix) - except tracetool.TracetoolError, e: + except tracetool.TracetoolError as e: error_opt(str(e)) if __name__ == "__main__": -- 2.4.3