| Submitter | Stefan Hajnoczi |
|---|---|
| Date | April 27, 2012, 2:23 p.m. |
| Message ID | <1335536625-4621-2-git-send-email-stefanha@linux.vnet.ibm.com> |
| Download | mbox | patch |
| Permalink | /patch/155485/ |
| State | New |
| Headers | show |
Comments
Stefan Hajnoczi writes: > The newer "except <exception-type> as <exception>:" syntax is not > supported by Python 2.4, we need to use "except <exception-type>, > <exception>:". > Tested all trace backends with Python 2.4. > Reported-by: Andreas Färber <afaerber@suse.de> > Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com> Reviewed-by: Lluís Vilanova <vilanova@ac.upc.edu> > --- > scripts/tracetool.py | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > diff --git a/scripts/tracetool.py b/scripts/tracetool.py > index cacfd99..c003cf6 100755 > --- a/scripts/tracetool.py > +++ b/scripts/tracetool.py > @@ -70,7 +70,7 @@ def main(args): > try: > opts, args = getopt.getopt(args[1:], "", long_opts) > - except getopt.GetoptError as err: > + except getopt.GetoptError, err: > error_opt(str(err)) > check_backend = False > @@ -131,7 +131,7 @@ def main(args): > try: > tracetool.generate(sys.stdin, arg_format, arg_backend, > binary = binary, probe_prefix = probe_prefix) > - except tracetool.TracetoolError as e: > + except tracetool.TracetoolError, e: > error_opt(str(e)) > if __name__ == "__main__": > -- > 1.7.10
Patch
diff --git a/scripts/tracetool.py b/scripts/tracetool.py index cacfd99..c003cf6 100755 --- a/scripts/tracetool.py +++ b/scripts/tracetool.py @@ -70,7 +70,7 @@ def main(args): try: opts, args = getopt.getopt(args[1:], "", long_opts) - except getopt.GetoptError as err: + except getopt.GetoptError, err: error_opt(str(err)) check_backend = False @@ -131,7 +131,7 @@ def main(args): try: tracetool.generate(sys.stdin, arg_format, arg_backend, binary = binary, probe_prefix = probe_prefix) - except tracetool.TracetoolError as e: + except tracetool.TracetoolError, e: error_opt(str(e)) if __name__ == "__main__":
The newer "except <exception-type> as <exception>:" syntax is not supported by Python 2.4, we need to use "except <exception-type>, <exception>:". Tested all trace backends with Python 2.4. Reported-by: Andreas Färber <afaerber@suse.de> Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com> --- scripts/tracetool.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)