From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53209) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VEz3P-000891-6a for qemu-devel@nongnu.org; Thu, 29 Aug 2013 06:02:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VEz3J-0003Tj-Hc for qemu-devel@nongnu.org; Thu, 29 Aug 2013 06:02:15 -0400 Received: from mail6.webfaction.com ([74.55.86.74]:41135 helo=smtp.webfaction.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VEz3J-0003Te-AX for qemu-devel@nongnu.org; Thu, 29 Aug 2013 06:02:09 -0400 Message-ID: <521F1C1F.7000305@ctshepherd.com> Date: Thu, 29 Aug 2013 11:02:07 +0100 From: Charlie Shepherd MIME-Version: 1.0 References: <521F1AF0.5070400@ctshepherd.com> In-Reply-To: <521F1AF0.5070400@ctshepherd.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH] Remove Python 2.5 syntax from scripts/qapi-visit.py List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , Anthony Liguori , Michael Roth 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. --- 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..5d04438 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 fn_prefix: + full_name = name + else: + full_name = "%s_%s" % (name, fn_prefix) 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