Re: [Qemu-devel] [PATCH] Remove Python 2.5 syntax from scripts/qapi-visit.py

[Charlie Shepherd]

On 29/08/2013 11:14, Stefan Hajnoczi wrote:
> On Thu, Aug 29, 2013 at 12:02 PM, Charlie Shepherd
> <address@hidden> wrote:
> > On 29/08/2013 10:57, Charlie Shepherd wrote:
> >
> > > default_x86_64_rhel5:
> > >
> > > http://buildbot.b1-systems.de/qemu/builders/default_x86_64_rhel5/builds/684/steps/compile/logs/stdio
> > > >      File
> > > > "/home/buildbot/slave-public/default_x86_64_rhel5/build/scripts/qapi-visit.py",
> > > > line 23
> > > >        full_name = name if not fn_prefix else "%s_%s" % (name, fn_prefix)
> > > >                          ^
> > > > SyntaxError: invalid syntax
> > > > make: *** [qapi-visit.h] Error 1
> > > This syntax was introduced in Python 2.5, patch to follow to convert
> > > this to valid Python 2.4 syntax.
> >
> > 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.
> >
> > ---
> Missing Signed-off-by: line.
>
> Also it looks like the email is double-spaced.  Copy-paste or email
> client issue?

Thunderbird strikes again. I'll send a respin with git send-email.

> > -    full_name = name if not field_prefix else "%s_%s" % (field_prefix,
> > name)
> >
> > +    if not fn_prefix:
> >
> > +        full_name = name
> >
> > +    else:
> >
> > +        full_name = "%s_%s" % (name, fn_prefix)
> Careful, (field_prefix, name) were swapped to (name, fn_prefix).

Good catch.


Charlie