|
 |
9ae3a8 |
From e41361867982017cdfed92f1874395da2596cb51 Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
Message-Id: <e41361867982017cdfed92f1874395da2596cb51.1387369730.git.minovotn@redhat.com>
|
|
|
9ae3a8 |
In-Reply-To: <091eecc4fa42754760dfff393dabcc2b444e9693.1387369730.git.minovotn@redhat.com>
|
|
|
9ae3a8 |
References: <091eecc4fa42754760dfff393dabcc2b444e9693.1387369730.git.minovotn@redhat.com>
|
|
|
9ae3a8 |
From: Markus Armbruster <armbru@redhat.com>
|
|
|
9ae3a8 |
Date: Tue, 10 Dec 2013 15:29:20 +0100
|
|
|
9ae3a8 |
Subject: [PATCH 20/21] scripts/qapi.py: Avoid syntax not supported by Python
|
|
|
9ae3a8 |
2.4
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RH-Author: Markus Armbruster <armbru@redhat.com>
|
|
|
9ae3a8 |
Message-id: <1386689361-30281-18-git-send-email-armbru@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 56138
|
|
|
9ae3a8 |
O-Subject: [PATCH 7.0 qemu-kvm 17/18] scripts/qapi.py: Avoid syntax not supported by Python 2.4
|
|
|
9ae3a8 |
Bugzilla: 997915
|
|
|
9ae3a8 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Luiz Capitulino <lcapitulino@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
From: Peter Maydell <peter.maydell@linaro.org>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
The Python "except Foo as x" syntax was only introduced in
|
|
|
9ae3a8 |
Python 2.6, but we aim to support Python 2.4 and later.
|
|
|
9ae3a8 |
Use the old-style "except Foo, x" syntax instead, thus
|
|
|
9ae3a8 |
fixing configure/compile on systems with older Python.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
|
|
|
9ae3a8 |
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
|
|
|
9ae3a8 |
(cherry picked from commit 21e0043bada1a24ae2ba6cd0051e104c0cbf9634)
|
|
|
9ae3a8 |
Signed-off-by: Markus Armbruster <armbru@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
scripts/qapi.py | 2 +-
|
|
|
9ae3a8 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Michal Novotny <minovotn@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
scripts/qapi.py | 2 +-
|
|
|
9ae3a8 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/scripts/qapi.py b/scripts/qapi.py
|
|
|
9ae3a8 |
index 0ebea94..1069310 100644
|
|
|
9ae3a8 |
--- a/scripts/qapi.py
|
|
|
9ae3a8 |
+++ b/scripts/qapi.py
|
|
|
9ae3a8 |
@@ -161,7 +161,7 @@ class QAPISchema:
|
|
|
9ae3a8 |
def parse_schema(fp):
|
|
|
9ae3a8 |
try:
|
|
|
9ae3a8 |
schema = QAPISchema(fp)
|
|
|
9ae3a8 |
- except QAPISchemaError as e:
|
|
|
9ae3a8 |
+ except QAPISchemaError, e:
|
|
|
9ae3a8 |
print >>sys.stderr, e
|
|
|
9ae3a8 |
exit(1)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.7.11.7
|
|
|
9ae3a8 |
|