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

qapi: Rename class QAPISchema to QAPISchemaParser 



I want to name a new class QAPISchema.

While there, make it a new-style class.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarDaniel P. Berrange <berrange@redhat.com>
Message-Id: <1442401589-24189-2-git-send-email-armbru@redhat.com>
parent 18640989

scripts/qapi.py

+4 −4
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ class QAPIExprError(Exception): 
        return error_path(self.info['parent']) + \

            "%s:%d: %s" % (self.info['file'], self.info['line'], self.msg)



class QAPISchema:

class QAPISchemaParser(object):



    def __init__(self, fp, previously_included = [], incl_info = None):

        abs_fname = os.path.abspath(fp.name)
@@ -149,7 +149,7 @@ class QAPISchema: 
                except IOError, e:

                    raise QAPIExprError(expr_info,

                                        '%s: %s' % (e.strerror, include))

                exprs_include = QAPISchema(fobj, previously_included,

                exprs_include = QAPISchemaParser(fobj, previously_included,

                                                 expr_info)

                self.exprs.extend(exprs_include.exprs)

            else:
@@ -755,7 +755,7 @@ def check_exprs(exprs): 


def parse_schema(fname):

    try:

        schema = QAPISchema(open(fname, "r"))

        schema = QAPISchemaParser(open(fname, "r"))

        return check_exprs(schema.exprs)

    except (QAPISchemaError, QAPIExprError), e:

        print >>sys.stderr, e