[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 02/25] qapi: More idiomatic string operations
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 02/25] qapi: More idiomatic string operations |
Date: |
Fri, 30 Oct 2015 16:42:31 +0100 |
From: Eric Blake <address@hidden>
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 <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
---
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
- [Qemu-devel] [PULL 00/25] QAPI patches, Markus Armbruster, 2015/10/30
- [Qemu-devel] [PULL 02/25] qapi: More idiomatic string operations,
Markus Armbruster <=
- [Qemu-devel] [PULL 07/25] qapi-visit: Split off visit_type_FOO_fields forward decl, Markus Armbruster, 2015/10/30
- [Qemu-devel] [PULL 08/25] qapi-types: Refactor base fields output, Markus Armbruster, 2015/10/30
- [Qemu-devel] [PULL 04/25] qapi: Reserve '*List' type names for list types, Markus Armbruster, 2015/10/30
- [Qemu-devel] [PULL 03/25] qapi: More robust conditions for when labels are needed, Markus Armbruster, 2015/10/30
- [Qemu-devel] [PULL 16/25] sockets: Convert to new qapi union layout, Markus Armbruster, 2015/10/30
- [Qemu-devel] [PULL 13/25] qapi-visit: Convert to new qapi union layout, Markus Armbruster, 2015/10/30
- [Qemu-devel] [PULL 12/25] qapi: Start converting to new qapi union layout, Markus Armbruster, 2015/10/30
- [Qemu-devel] [PULL 21/25] tpm: Convert to new qapi union layout, Markus Armbruster, 2015/10/30
- [Qemu-devel] [PULL 25/25] qapi-schema: mark InetSocketAddress as mandatory again, Markus Armbruster, 2015/10/30
- [Qemu-devel] [PULL 24/25] qapi: Simplify gen_struct_field(), Markus Armbruster, 2015/10/30