aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2015-12-18 08:52:43 +0100
committerMarkus Armbruster <armbru@redhat.com>2016-02-08 17:29:54 +0100
commit86b227d984fde7069c49ceb92828a965baa11186 (patch)
tree8c9a20c331409a3d853899c8f3b9ecf0caf256cc
parentcf6c63456b47118a7f0fbb917c220c0a483db6de (diff)
Revert "tracetool: use Python 2.4-compatible exception handling syntax"
This reverts commit 662da3854e3f490223373b40afdcfcc339d14aa5. We require Python 2.6 now (commit fec2103). Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Acked-by: Stefan Hajnoczi <stefanha@redhat.com> Message-Id: <1450425164-24969-4-git-send-email-armbru@redhat.com>
-rwxr-xr-xscripts/tracetool.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/tracetool.py b/scripts/tracetool.py
index 83bde7bda9..7b82959e84 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__":