diff mbox

scripts/qapi.py: Avoid syntax not supported by Python 2.4

Message ID 20140520142929.37e2cb7f@redhat.com
State New
Headers show

Commit Message

Luiz Capitulino May 20, 2014, 6:29 p.m. UTC
The Python "except Foo as x" syntax was only introduced in
Python 2.6, but we aim to support Python 2.4 and later.
Use the old-style "except Foo, x" syntax instead, thus
fixing configure/compile on systems with older Python.

Reported-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 scripts/qapi.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Andreas Färber May 21, 2014, 11:42 a.m. UTC | #1
Am 20.05.2014 20:29, schrieb Luiz Capitulino:
> The Python "except Foo as x" syntax was only introduced in
> Python 2.6, but we aim to support Python 2.4 and later.
> Use the old-style "except Foo, x" syntax instead, thus
> fixing configure/compile on systems with older Python.
> 
> Reported-by: Peter Maydell <peter.maydell@linaro.org>
> Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
> ---
>  scripts/qapi.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/scripts/qapi.py b/scripts/qapi.py
> index 0265b40..86e9608 100644
> --- a/scripts/qapi.py
> +++ b/scripts/qapi.py
> @@ -116,7 +116,7 @@ class QAPISchema:
>                      continue
>                  try:
>                      fobj = open(include_path, 'r')
> -                except IOError as e:
> +                except IOError, e:
>                      raise QAPIExprError(expr_info,
>                                          '%s: %s' % (e.strerror, include))
>                  exprs_include = QAPISchema(fobj, include, self.include_hist,

I have the same change applied locally, so

Tested-by: Andreas Färber <andreas.faerber@web.de>

Thanks,
Andreas
diff mbox

Patch

diff --git a/scripts/qapi.py b/scripts/qapi.py
index 0265b40..86e9608 100644
--- a/scripts/qapi.py
+++ b/scripts/qapi.py
@@ -116,7 +116,7 @@  class QAPISchema:
                     continue
                 try:
                     fobj = open(include_path, 'r')
-                except IOError as e:
+                except IOError, e:
                     raise QAPIExprError(expr_info,
                                         '%s: %s' % (e.strerror, include))
                 exprs_include = QAPISchema(fobj, include, self.include_hist,