qapi: Fix some pycodestyle-3 complaints

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

Backports commit b736e25a1820c63f7d69baa03e624cef80c4de90 from qemu
This commit is contained in:
Markus Armbruster 2018-08-16 07:14:31 -04:00 committed by Lioncash
parent e2e7bb0e21
commit f257623b9f
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
2 changed files with 10 additions and 7 deletions

View file

@ -896,12 +896,12 @@ def check_keys(expr_elem, meta, required, optional=[]):
if key not in required and key not in optional: if key not in required and key not in optional:
raise QAPISemError(info, "Unknown key '%s' in %s '%s'" raise QAPISemError(info, "Unknown key '%s' in %s '%s'"
% (key, meta, name)) % (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, raise QAPISemError(info,
"'%s' of %s '%s' should only use false value" "'%s' of %s '%s' should only use false value"
% (key, meta, name)) % (key, meta, name))
if (key == 'boxed' or key == 'allow-oob' or if (key in ['boxed', 'allow-oob', 'allow-preconfig']
key == 'allow-preconfig') and value is not True: and value is not True):
raise QAPISemError(info, raise QAPISemError(info,
"'%s' of %s '%s' should only use true value" "'%s' of %s '%s' should only use true value"
% (key, meta, name)) % (key, meta, name))
@ -1857,12 +1857,12 @@ def camel_to_upper(value):
return c_fun_str return c_fun_str
new_name = '' new_name = ''
l = len(c_fun_str) length = len(c_fun_str)
for i in range(l): for i in range(length):
c = c_fun_str[i] c = c_fun_str[i]
# When c is upper and no '_' appears before, do more checks # When c is upper and no '_' appears before, do more checks
if c.isupper() and (i > 0) and c_fun_str[i - 1] != '_': 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 += '_' new_name += '_'
elif c_fun_str[i - 1].isdigit(): elif c_fun_str[i - 1].isdigit():
new_name += '_' new_name += '_'
@ -1875,6 +1875,7 @@ def c_enum_const(type_name, const_name, prefix=None):
type_name = prefix type_name = prefix
return camel_to_upper(type_name) + '_' + c_name(const_name, False).upper() return camel_to_upper(type_name) + '_' + c_name(const_name, False).upper()
if hasattr(str, 'maketrans'): if hasattr(str, 'maketrans'):
c_name_trans = str.maketrans('.-', '__') c_name_trans = str.maketrans('.-', '__')
else: else:
@ -1924,6 +1925,7 @@ def c_name(name, protect=True):
return 'q_' + name return 'q_' + name
return name return name
eatspace = '\033EATSPACE.' eatspace = '\033EATSPACE.'
pointer_suffix = ' *' + eatspace pointer_suffix = ' *' + eatspace
@ -1934,6 +1936,7 @@ def genindent(count):
ret += ' ' ret += ' '
return ret return ret
indent_level = 0 indent_level = 0

View file

@ -187,7 +187,7 @@ void visit_type_%(c_name)s(Visitor *v, const char *name, %(c_name)s **obj, Error
} }
switch ((*obj)->type) { switch ((*obj)->type) {
''', ''',
c_name=c_name(name)) c_name=c_name(name))
for var in variants.variants: for var in variants.variants:
ret += mcgen(''' ret += mcgen('''