| Message ID | 20240514215740.940155-3-jsnow@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | qapi: new sphinx qapi domain pre-requisites | expand |
John Snow <jsnow@redhat.com> writes: > Fix minor irritants to pylint/flake8 et al. > > (Yes, these need to be guarded by the Python tests. That's a work in > progress, a series that's quite likely to follow once I finish this > Sphinx project. Please pardon the temporary irritation.) No worries; one step at a time. > Signed-off-by: John Snow <jsnow@redhat.com> > --- > scripts/qapi/introspect.py | 8 ++++---- > scripts/qapi/schema.py | 6 +++--- > scripts/qapi/visit.py | 5 +++-- > 3 files changed, 10 insertions(+), 9 deletions(-) > > diff --git a/scripts/qapi/introspect.py b/scripts/qapi/introspect.py > index 86c075a6ad2..ac14b20f308 100644 > --- a/scripts/qapi/introspect.py > +++ b/scripts/qapi/introspect.py > @@ -27,8 +27,8 @@ > from .schema import ( > QAPISchema, > QAPISchemaAlternatives, > - QAPISchemaBranches, > QAPISchemaArrayType, > + QAPISchemaBranches, > QAPISchemaBuiltinType, > QAPISchemaEntity, > QAPISchemaEnumMember, > @@ -233,9 +233,9 @@ def _use_type(self, typ: QAPISchemaType) -> str: > typ = type_int > elif (isinstance(typ, QAPISchemaArrayType) and > typ.element_type.json_type() == 'int'): > - type_intList = self._schema.lookup_type('intList') > - assert type_intList > - typ = type_intList > + type_intlist = self._schema.lookup_type('intList') > + assert type_intlist > + typ = type_intlist I named the variable after the type. Suppressing the linter complaint just to keep that name isn't worthwhile. I might have picked type_int_list instead. No need to change it now. > # Add type to work queue if new > if typ not in self._used_types: > self._used_types.append(typ) > diff --git a/scripts/qapi/schema.py b/scripts/qapi/schema.py > index 721c470d2b8..d65c35f6ee6 100644 > --- a/scripts/qapi/schema.py > +++ b/scripts/qapi/schema.py > @@ -730,6 +730,7 @@ def set_defined_in(self, name: str) -> None: > for v in self.variants: > v.set_defined_in(name) > > + # pylint: disable=unused-argument > def check( > self, schema: QAPISchema, seen: Dict[str, QAPISchemaMember] > ) -> None: > @@ -1166,7 +1167,7 @@ def _def_definition(self, defn: QAPISchemaDefinition) -> None: > defn.info, "%s is already defined" % other_defn.describe()) > self._entity_dict[defn.name] = defn > > - def lookup_entity(self,name: str) -> Optional[QAPISchemaEntity]: > + def lookup_entity(self, name: str) -> Optional[QAPISchemaEntity]: > return self._entity_dict.get(name) > > def lookup_type(self, name: str) -> Optional[QAPISchemaType]: > @@ -1302,11 +1303,10 @@ def _make_implicit_object_type( > name = 'q_obj_%s-%s' % (name, role) > typ = self.lookup_entity(name) > if typ: > - assert(isinstance(typ, QAPISchemaObjectType)) > + assert isinstance(typ, QAPISchemaObjectType) > # The implicit object type has multiple users. This can > # only be a duplicate definition, which will be flagged > # later. > - pass > else: > self._def_definition(QAPISchemaObjectType( > name, info, None, ifcond, None, None, members, None)) > diff --git a/scripts/qapi/visit.py b/scripts/qapi/visit.py > index e766acaac92..12f92e429f6 100644 > --- a/scripts/qapi/visit.py > +++ b/scripts/qapi/visit.py > @@ -280,8 +280,9 @@ def gen_visit_alternate(name: str, > abort(); > default: > assert(visit_is_input(v)); > - error_setg(errp, "Invalid parameter type for '%%s', expected: %(name)s", > - name ? name : "null"); > + error_setg(errp, > + "Invalid parameter type for '%%s', expected: %(name)s", > + name ? name : "null"); > /* Avoid passing invalid *obj to qapi_free_%(c_name)s() */ > g_free(*obj); > *obj = NULL; This is mostly lint I neglected to pick off in my recent work. Thanks for taking care of it! Reviewed-by: Markus Armbruster <armbru@redhat.com>
diff --git a/scripts/qapi/introspect.py b/scripts/qapi/introspect.py index 86c075a6ad2..ac14b20f308 100644 --- a/scripts/qapi/introspect.py +++ b/scripts/qapi/introspect.py @@ -27,8 +27,8 @@ from .schema import ( QAPISchema, QAPISchemaAlternatives, - QAPISchemaBranches, QAPISchemaArrayType, + QAPISchemaBranches, QAPISchemaBuiltinType, QAPISchemaEntity, QAPISchemaEnumMember, @@ -233,9 +233,9 @@ def _use_type(self, typ: QAPISchemaType) -> str: typ = type_int elif (isinstance(typ, QAPISchemaArrayType) and typ.element_type.json_type() == 'int'): - type_intList = self._schema.lookup_type('intList') - assert type_intList - typ = type_intList + type_intlist = self._schema.lookup_type('intList') + assert type_intlist + typ = type_intlist # Add type to work queue if new if typ not in self._used_types: self._used_types.append(typ) diff --git a/scripts/qapi/schema.py b/scripts/qapi/schema.py index 721c470d2b8..d65c35f6ee6 100644 --- a/scripts/qapi/schema.py +++ b/scripts/qapi/schema.py @@ -730,6 +730,7 @@ def set_defined_in(self, name: str) -> None: for v in self.variants: v.set_defined_in(name) + # pylint: disable=unused-argument def check( self, schema: QAPISchema, seen: Dict[str, QAPISchemaMember] ) -> None: @@ -1166,7 +1167,7 @@ def _def_definition(self, defn: QAPISchemaDefinition) -> None: defn.info, "%s is already defined" % other_defn.describe()) self._entity_dict[defn.name] = defn - def lookup_entity(self,name: str) -> Optional[QAPISchemaEntity]: + def lookup_entity(self, name: str) -> Optional[QAPISchemaEntity]: return self._entity_dict.get(name) def lookup_type(self, name: str) -> Optional[QAPISchemaType]: @@ -1302,11 +1303,10 @@ def _make_implicit_object_type( name = 'q_obj_%s-%s' % (name, role) typ = self.lookup_entity(name) if typ: - assert(isinstance(typ, QAPISchemaObjectType)) + assert isinstance(typ, QAPISchemaObjectType) # The implicit object type has multiple users. This can # only be a duplicate definition, which will be flagged # later. - pass else: self._def_definition(QAPISchemaObjectType( name, info, None, ifcond, None, None, members, None)) diff --git a/scripts/qapi/visit.py b/scripts/qapi/visit.py index e766acaac92..12f92e429f6 100644 --- a/scripts/qapi/visit.py +++ b/scripts/qapi/visit.py @@ -280,8 +280,9 @@ def gen_visit_alternate(name: str, abort(); default: assert(visit_is_input(v)); - error_setg(errp, "Invalid parameter type for '%%s', expected: %(name)s", - name ? name : "null"); + error_setg(errp, + "Invalid parameter type for '%%s', expected: %(name)s", + name ? name : "null"); /* Avoid passing invalid *obj to qapi_free_%(c_name)s() */ g_free(*obj); *obj = NULL;
Fix minor irritants to pylint/flake8 et al. (Yes, these need to be guarded by the Python tests. That's a work in progress, a series that's quite likely to follow once I finish this Sphinx project. Please pardon the temporary irritation.) Signed-off-by: John Snow <jsnow@redhat.com> --- scripts/qapi/introspect.py | 8 ++++---- scripts/qapi/schema.py | 6 +++--- scripts/qapi/visit.py | 5 +++-- 3 files changed, 10 insertions(+), 9 deletions(-)