[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 3/5] qapi: Fix some pycodestyle-3 complaints
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 3/5] qapi: Fix some pycodestyle-3 complaints |
Date: |
Wed, 15 Aug 2018 09:13:06 +0200 |
Fix the following issues:
common.py:873:13: E129 visually indented line with same indent as next
logical line
common.py:1766:5: E741 ambiguous variable name 'l'
common.py:1784:1: E305 expected 2 blank lines after class or function
definition, found 1
common.py:1833:1: E305 expected 2 blank lines after class or function
definition, found 1
common.py:1843:1: E305 expected 2 blank lines after class or function
definition, found 1
visit.py:181:18: E127 continuation line over-indented for visual indent
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
[Fixup squashed in:]
Message-ID: <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>
---
scripts/qapi/common.py | 15 +++++++++------
scripts/qapi/visit.py | 2 +-
tests/qapi-schema/test-qapi.py | 13 +++++++------
3 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/scripts/qapi/common.py b/scripts/qapi/common.py
index 9230a2a3e8..02c5c6767a 100644
--- a/scripts/qapi/common.py
+++ b/scripts/qapi/common.py
@@ -884,12 +884,12 @@ def check_keys(expr_elem, meta, required, optional=[]):
if key not in required and key not in optional:
raise QAPISemError(info, "Unknown key '%s' in %s '%s'"
% (key, meta, name))
- if (key == 'gen' or key == 'success-response') and value is not False:
+ if key in ['gen', 'success-response'] and value is not False:
raise QAPISemError(info,
"'%s' of %s '%s' should only use false value"
% (key, meta, name))
- if (key == 'boxed' or key == 'allow-oob' or
- key == 'allow-preconfig') and value is not True:
+ if (key in ['boxed', 'allow-oob', 'allow-preconfig']
+ and value is not True):
raise QAPISemError(info,
"'%s' of %s '%s' should only use true value"
% (key, meta, name))
@@ -1845,12 +1845,12 @@ def camel_to_upper(value):
return c_fun_str
new_name = ''
- l = len(c_fun_str)
- for i in range(l):
+ length = len(c_fun_str)
+ for i in range(length):
c = c_fun_str[i]
# When c is upper and no '_' appears before, do more checks
if c.isupper() and (i > 0) and c_fun_str[i - 1] != '_':
- if i < l - 1 and c_fun_str[i + 1].islower():
+ if i < length - 1 and c_fun_str[i + 1].islower():
new_name += '_'
elif c_fun_str[i - 1].isdigit():
new_name += '_'
@@ -1863,6 +1863,7 @@ def c_enum_const(type_name, const_name, prefix=None):
type_name = prefix
return camel_to_upper(type_name) + '_' + c_name(const_name, False).upper()
+
if hasattr(str, 'maketrans'):
c_name_trans = str.maketrans('.-', '__')
else:
@@ -1912,6 +1913,7 @@ def c_name(name, protect=True):
return 'q_' + name
return name
+
eatspace = '\033EATSPACE.'
pointer_suffix = ' *' + eatspace
@@ -1922,6 +1924,7 @@ def genindent(count):
ret += ' '
return ret
+
indent_level = 0
diff --git a/scripts/qapi/visit.py b/scripts/qapi/visit.py
index dd5034a66a..460cf12989 100644
--- a/scripts/qapi/visit.py
+++ b/scripts/qapi/visit.py
@@ -187,7 +187,7 @@ void visit_type_%(c_name)s(Visitor *v, const char *name,
%(c_name)s **obj, Error
}
switch ((*obj)->type) {
''',
- c_name=c_name(name))
+ c_name=c_name(name))
for var in variants.variants:
ret += mcgen('''
diff --git a/tests/qapi-schema/test-qapi.py b/tests/qapi-schema/test-qapi.py
index f514fe71e4..cea21c773a 100644
--- a/tests/qapi-schema/test-qapi.py
+++ b/tests/qapi-schema/test-qapi.py
@@ -34,8 +34,8 @@ class QAPISchemaTestVisitor(QAPISchemaVisitor):
if base:
print(' base %s' % base.name)
for m in members:
- print(' member %s: %s optional=%s' % \
- (m.name, m.type.name, m.optional))
+ print(' member %s: %s optional=%s'
+ % (m.name, m.type.name, m.optional))
self._print_variants(variants)
self._print_if(ifcond)
@@ -46,10 +46,11 @@ class QAPISchemaTestVisitor(QAPISchemaVisitor):
def visit_command(self, name, info, ifcond, arg_type, ret_type, gen,
success_response, boxed, allow_oob, allow_preconfig):
- print('command %s %s -> %s' % \
- (name, arg_type and arg_type.name, ret_type and ret_type.name))
- print(' gen=%s success_response=%s boxed=%s oob=%s preconfig=%s' % \
- (gen, success_response, boxed, allow_oob, allow_preconfig))
+ print('command %s %s -> %s'
+ % (name, arg_type and arg_type.name,
+ ret_type and ret_type.name))
+ print(' gen=%s success_response=%s boxed=%s oob=%s preconfig=%s'
+ % (gen, success_response, boxed, allow_oob, allow_preconfig))
self._print_if(ifcond)
def visit_event(self, name, info, ifcond, arg_type, boxed):
--
2.17.1
- [Qemu-devel] [PULL 0/5] Miscellaneous patches for 2018-08-15, Markus Armbruster, 2018/08/15
- [Qemu-devel] [PULL 3/5] qapi: Fix some pycodestyle-3 complaints,
Markus Armbruster <=
- [Qemu-devel] [PULL 1/5] qmp-shell: learn to send commands with quoted arguments, Markus Armbruster, 2018/08/15
- [Qemu-devel] [PULL 5/5] monitor: fix oob command leak, Markus Armbruster, 2018/08/15
- [Qemu-devel] [PULL 4/5] tests: fix crumple/recursive leak, Markus Armbruster, 2018/08/15
- [Qemu-devel] [PULL 2/5] tests: change /0.15/* tests to /qmp/*, Markus Armbruster, 2018/08/15
- Re: [Qemu-devel] [PULL 0/5] Miscellaneous patches for 2018-08-15, Peter Maydell, 2018/08/15