Commit b736e25a authored by Markus Armbruster's avatar Markus Armbruster
Browse files

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

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20180621083551.775-1-armbru@redhat.com>
[Fixup squashed in:]
Message-ID: <871sd0nzw9.fsf@dusky.pond.sub.org>
Reviewed-by: default avatarDaniel P. Berrangé <berrange@redhat.com>
parent 214e4a5b

scripts/qapi/common.py

+9 −6
Original line number Diff line number Diff line
@@ -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

tests/qapi-schema/test-qapi.py

+7 −6
Original line number Diff line number Diff line
@@ -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):

scripts/qapi/visit.py

+1 −1

File changed.

Contains only whitespace changes.