The syntax `var = a if b else c` was added in Python 2.5, but QEMU has a
minimum Python version of 2.4, which chokes on this syntax. This patch
converts the new syntax to Python 2.4 compatible syntax.
Signed-off-by: Charlie Shepherd <char...@ctshepherd.com>
---
scripts/qapi-visit.py | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py
index 597cca4..cdf40c9 100644
--- a/scripts/qapi-visit.py
+++ b/scripts/qapi-visit.py
@@ -20,7 +20,10 @@ import errno
def generate_visit_struct_fields(name, field_prefix, fn_prefix, members):
substructs = []
ret = ''
- full_name = name if not fn_prefix else "%s_%s" % (name, fn_prefix)
+ if not fn_prefix:
+ full_name = name
+ else:
+ full_name = "%s_%s" % (name, fn_prefix)
for argname, argentry, optional, structured in parse_args(members):
if structured:
@@ -84,7 +87,10 @@ if (!error_is_set(errp)) {
''')
push_indent()
- full_name = name if not field_prefix else "%s_%s" % (field_prefix, name)
+ if not field_prefix:
+ full_name = name
+ else:
+ full_name = "%s_%s" % (field_prefix, name)
if len(field_prefix):
ret += mcgen('''
@@ -270,7 +276,7 @@ void visit_type_%(name)s(Visitor *m, %(name)s ** obj, const
char *name, Error **
if (!err) {
switch ((*obj)->kind) {
''',
- name=name, type="type" if not discriminator else
discriminator)
+ name=name, type=(discriminator or "type"))
for key in members:
if not discriminator:
--
1.7.9.5
