OSDN Git Service

Revert "tracetool: use Python 2.4-compatible exception handling syntax"
authorMarkus Armbruster <armbru@redhat.com>
Fri, 18 Dec 2015 07:52:43 +0000 (08:52 +0100)
committerMarkus Armbruster <armbru@redhat.com>
Mon, 8 Feb 2016 16:29:54 +0000 (17:29 +0100)
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>

scripts/tracetool.py

index 83bde7b..7b82959 100755 (executable)
@@ -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__":