From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55456) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZpUc9-0006tL-Gx for qemu-devel@nongnu.org; Fri, 23 Oct 2015 01:10:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZpUc6-0003C8-8y for qemu-devel@nongnu.org; Fri, 23 Oct 2015 01:10:05 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44803) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZpUc6-0003Bw-3q for qemu-devel@nongnu.org; Fri, 23 Oct 2015 01:10:02 -0400 From: Eric Blake Date: Thu, 22 Oct 2015 23:09:35 -0600 Message-Id: <1445576998-2921-3-git-send-email-eblake@redhat.com> In-Reply-To: <1445576998-2921-1-git-send-email-eblake@redhat.com> References: <1445576998-2921-1-git-send-email-eblake@redhat.com> Subject: [Qemu-devel] [PATCH v10 02/25] qapi: More idiomatic string operations List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: armbru@redhat.com, Michael Roth Rather than slicing the end of a string, we can use python's endswith(). And rather than creating a set of characters, we can search for a character within a string. Signed-off-by: Eric Blake --- v10: new patch --- scripts/qapi.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/qapi.py b/scripts/qapi.py index 9d53255..3af4c2c 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -172,7 +172,7 @@ class QAPISchemaParser(object): if self.tok == '#': self.cursor = self.src.find('\n', self.cursor) - elif self.tok in ['{', '}', ':', ',', '[', ']']: + elif self.tok in "{}:,[]": return elif self.tok == "'": string = '' @@ -390,7 +390,7 @@ def add_name(name, info, meta, implicit=False): raise QAPIExprError(info, "%s '%s' is already defined" % (all_names[name], name)) - if not implicit and name[-4:] == 'Kind': + if not implicit and name.endswith('Kind'): raise QAPIExprError(info, "%s '%s' should not end in 'Kind'" % (meta, name)) @@ -910,7 +910,7 @@ class QAPISchemaEnumType(QAPISchemaType): def is_implicit(self): # See QAPISchema._make_implicit_enum_type() - return self.name[-4:] == 'Kind' + return self.name.endswith('Kind') def c_type(self, is_param=False): return c_name(self.name) -- 2.4.3