提交 8712fa53 编写于 作者: E Eric Blake 提交者: Markus Armbruster

qapi: More idiomatic string operations

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: NEric Blake <eblake@redhat.com>
Message-Id: <1445898903-12082-3-git-send-email-eblake@redhat.com>
Signed-off-by: NMarkus Armbruster <armbru@redhat.com>
上级 19767083
无相关合并请求
...@@ -172,7 +172,7 @@ class QAPISchemaParser(object): ...@@ -172,7 +172,7 @@ class QAPISchemaParser(object):
if self.tok == '#': if self.tok == '#':
self.cursor = self.src.find('\n', self.cursor) self.cursor = self.src.find('\n', self.cursor)
elif self.tok in ['{', '}', ':', ',', '[', ']']: elif self.tok in "{}:,[]":
return return
elif self.tok == "'": elif self.tok == "'":
string = '' string = ''
...@@ -390,7 +390,7 @@ def add_name(name, info, meta, implicit=False): ...@@ -390,7 +390,7 @@ def add_name(name, info, meta, implicit=False):
raise QAPIExprError(info, raise QAPIExprError(info,
"%s '%s' is already defined" "%s '%s' is already defined"
% (all_names[name], name)) % (all_names[name], name))
if not implicit and name[-4:] == 'Kind': if not implicit and name.endswith('Kind'):
raise QAPIExprError(info, raise QAPIExprError(info,
"%s '%s' should not end in 'Kind'" "%s '%s' should not end in 'Kind'"
% (meta, name)) % (meta, name))
...@@ -910,7 +910,7 @@ class QAPISchemaEnumType(QAPISchemaType): ...@@ -910,7 +910,7 @@ class QAPISchemaEnumType(QAPISchemaType):
def is_implicit(self): def is_implicit(self):
# See QAPISchema._make_implicit_enum_type() # See QAPISchema._make_implicit_enum_type()
return self.name[-4:] == 'Kind' return self.name.endswith('Kind')
def c_type(self, is_param=False): def c_type(self, is_param=False):
return c_name(self.name) return c_name(self.name)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册
反馈
建议
客服 返回
顶部