Message ID | 20200227144531.24309-2-armbru@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | qapi: Bye-bye Python 2 | expand |
On 2/27/20 3:45 PM, Markus Armbruster wrote: > Signed-off-by: Markus Armbruster <armbru@redhat.com> > --- > scripts/qapi/gen.py | 2 +- > scripts/qapi/parser.py | 6 +++--- > scripts/qapi/schema.py | 12 ++++++------ > scripts/qapi/source.py | 4 ++-- > 4 files changed, 12 insertions(+), 12 deletions(-) > > diff --git a/scripts/qapi/gen.py b/scripts/qapi/gen.py > index 95afae0615..a53a705c73 100644 > --- a/scripts/qapi/gen.py > +++ b/scripts/qapi/gen.py > @@ -22,7 +22,7 @@ from qapi.common import * > from qapi.schema import QAPISchemaVisitor > > > -class QAPIGen(object): > +class QAPIGen: > > def __init__(self, fname): > self.fname = fname > diff --git a/scripts/qapi/parser.py b/scripts/qapi/parser.py > index 342792e410..2e3a3c5d76 100644 > --- a/scripts/qapi/parser.py > +++ b/scripts/qapi/parser.py > @@ -23,7 +23,7 @@ from qapi.error import QAPIParseError, QAPISemError > from qapi.source import QAPISourceInfo > > > -class QAPISchemaParser(object): > +class QAPISchemaParser: > > def __init__(self, fname, previously_included=None, incl_info=None): > previously_included = previously_included or set() > @@ -293,7 +293,7 @@ class QAPISchemaParser(object): > raise QAPIParseError(self, "documentation comment must end with '##'") > > > -class QAPIDoc(object): > +class QAPIDoc: > """ > A documentation comment block, either definition or free-form > > @@ -312,7 +312,7 @@ class QAPIDoc(object): > Free-form documentation blocks consist only of a body section. > """ > > - class Section(object): > + class Section: > def __init__(self, name=None): > # optional section name (argument/member or section name) > self.name = name > diff --git a/scripts/qapi/schema.py b/scripts/qapi/schema.py > index 5100110fa2..c8bcfe2c49 100644 > --- a/scripts/qapi/schema.py > +++ b/scripts/qapi/schema.py > @@ -24,7 +24,7 @@ from qapi.expr import check_exprs > from qapi.parser import QAPISchemaParser > > > -class QAPISchemaEntity(object): > +class QAPISchemaEntity: > meta = None > > def __init__(self, name, info, doc, ifcond=None, features=None): > @@ -89,7 +89,7 @@ class QAPISchemaEntity(object): > return "%s '%s'" % (self.meta, self.name) > > > -class QAPISchemaVisitor(object): > +class QAPISchemaVisitor: > def visit_begin(self, schema): > pass > > @@ -135,7 +135,7 @@ class QAPISchemaVisitor(object): > pass > > > -class QAPISchemaModule(object): > +class QAPISchemaModule: > def __init__(self, name): > self.name = name > self._entity_list = [] > @@ -441,7 +441,7 @@ class QAPISchemaObjectType(QAPISchemaType): > self.features) > > > -class QAPISchemaMember(object): > +class QAPISchemaMember: > """ Represents object members, enum members and features """ > role = 'member' > > @@ -519,7 +519,7 @@ class QAPISchemaObjectTypeMember(QAPISchemaMember): > self.describe) > > > -class QAPISchemaObjectTypeVariants(object): > +class QAPISchemaObjectTypeVariants: > def __init__(self, tag_name, info, tag_member, variants): > # Flat unions pass tag_name but not tag_member. > # Simple unions and alternates pass tag_member but not tag_name. > @@ -787,7 +787,7 @@ class QAPISchemaEvent(QAPISchemaEntity): > self.arg_type, self.boxed) > > > -class QAPISchema(object): > +class QAPISchema: > def __init__(self, fname): > self.fname = fname > parser = QAPISchemaParser(fname) > diff --git a/scripts/qapi/source.py b/scripts/qapi/source.py > index 8956885033..e97b9a8e15 100644 > --- a/scripts/qapi/source.py > +++ b/scripts/qapi/source.py > @@ -13,7 +13,7 @@ import copy > import sys > > > -class QAPISchemaPragma(object): > +class QAPISchemaPragma: > def __init__(self): > # Are documentation comments required? > self.doc_required = False > @@ -23,7 +23,7 @@ class QAPISchemaPragma(object): > self.name_case_whitelist = [] > > > -class QAPISourceInfo(object): > +class QAPISourceInfo: > def __init__(self, fname, line, parent): > self.fname = fname > self.line = line > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
diff --git a/scripts/qapi/gen.py b/scripts/qapi/gen.py index 95afae0615..a53a705c73 100644 --- a/scripts/qapi/gen.py +++ b/scripts/qapi/gen.py @@ -22,7 +22,7 @@ from qapi.common import * from qapi.schema import QAPISchemaVisitor -class QAPIGen(object): +class QAPIGen: def __init__(self, fname): self.fname = fname diff --git a/scripts/qapi/parser.py b/scripts/qapi/parser.py index 342792e410..2e3a3c5d76 100644 --- a/scripts/qapi/parser.py +++ b/scripts/qapi/parser.py @@ -23,7 +23,7 @@ from qapi.error import QAPIParseError, QAPISemError from qapi.source import QAPISourceInfo -class QAPISchemaParser(object): +class QAPISchemaParser: def __init__(self, fname, previously_included=None, incl_info=None): previously_included = previously_included or set() @@ -293,7 +293,7 @@ class QAPISchemaParser(object): raise QAPIParseError(self, "documentation comment must end with '##'") -class QAPIDoc(object): +class QAPIDoc: """ A documentation comment block, either definition or free-form @@ -312,7 +312,7 @@ class QAPIDoc(object): Free-form documentation blocks consist only of a body section. """ - class Section(object): + class Section: def __init__(self, name=None): # optional section name (argument/member or section name) self.name = name diff --git a/scripts/qapi/schema.py b/scripts/qapi/schema.py index 5100110fa2..c8bcfe2c49 100644 --- a/scripts/qapi/schema.py +++ b/scripts/qapi/schema.py @@ -24,7 +24,7 @@ from qapi.expr import check_exprs from qapi.parser import QAPISchemaParser -class QAPISchemaEntity(object): +class QAPISchemaEntity: meta = None def __init__(self, name, info, doc, ifcond=None, features=None): @@ -89,7 +89,7 @@ class QAPISchemaEntity(object): return "%s '%s'" % (self.meta, self.name) -class QAPISchemaVisitor(object): +class QAPISchemaVisitor: def visit_begin(self, schema): pass @@ -135,7 +135,7 @@ class QAPISchemaVisitor(object): pass -class QAPISchemaModule(object): +class QAPISchemaModule: def __init__(self, name): self.name = name self._entity_list = [] @@ -441,7 +441,7 @@ class QAPISchemaObjectType(QAPISchemaType): self.features) -class QAPISchemaMember(object): +class QAPISchemaMember: """ Represents object members, enum members and features """ role = 'member' @@ -519,7 +519,7 @@ class QAPISchemaObjectTypeMember(QAPISchemaMember): self.describe) -class QAPISchemaObjectTypeVariants(object): +class QAPISchemaObjectTypeVariants: def __init__(self, tag_name, info, tag_member, variants): # Flat unions pass tag_name but not tag_member. # Simple unions and alternates pass tag_member but not tag_name. @@ -787,7 +787,7 @@ class QAPISchemaEvent(QAPISchemaEntity): self.arg_type, self.boxed) -class QAPISchema(object): +class QAPISchema: def __init__(self, fname): self.fname = fname parser = QAPISchemaParser(fname) diff --git a/scripts/qapi/source.py b/scripts/qapi/source.py index 8956885033..e97b9a8e15 100644 --- a/scripts/qapi/source.py +++ b/scripts/qapi/source.py @@ -13,7 +13,7 @@ import copy import sys -class QAPISchemaPragma(object): +class QAPISchemaPragma: def __init__(self): # Are documentation comments required? self.doc_required = False @@ -23,7 +23,7 @@ class QAPISchemaPragma(object): self.name_case_whitelist = [] -class QAPISourceInfo(object): +class QAPISourceInfo: def __init__(self, fname, line, parent): self.fname = fname self.line = line
Signed-off-by: Markus Armbruster <armbru@redhat.com> --- scripts/qapi/gen.py | 2 +- scripts/qapi/parser.py | 6 +++--- scripts/qapi/schema.py | 12 ++++++------ scripts/qapi/source.py | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-)