The 'reference_keepers' data structure and associated code in the generator is inherited from libxml. This has never been used in libvirt, so delete it to simplify the generator. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com&gt; --- generator.py | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/generator.py b/generator.py index 6bcf80b..9c59ec0 100755 --- a/generator.py +++ b/generator.py @@ -1074,9 +1074,6 @@ functions_noexcept = { 'virNWFilterGetName': True, } -reference_keepers = { -} - function_classes = {} function_classes["None"] = [] @@ -1500,10 +1497,6 @@ def buildWrappers(module): classes.write("class %s(%s):\n" % (classname, classes_ancestor[classname])) classes.write(" def __init__(self, _obj=None):\n") - if classname in reference_keepers: - rlist = reference_keepers[classname] - for ref in rlist: - classes.write(" self.%s = None\n" % ref[1]) classes.write(" self._o = _obj\n") classes.write(" %s.__init__(self, _obj=_obj)\n\n" % ( classes_ancestor[classname])) @@ -1517,10 +1510,6 @@ def buildWrappers(module): classes.write(" def __init__(self, dom, _obj=None):\n") else: classes.write(" def __init__(self, _obj=None):\n") - if classname in reference_keepers: - rlist = reference_keepers[classname] - for ref in rlist: - classes.write(" self.%s = None\n" % ref[1]) if classname in [ "virDomain", "virNetwork", "virInterface", "virNodeDevice", "virSecret", "virStream", "virNWFilter" ]: @@ -1673,19 +1662,6 @@ def buildWrappers(module): classes.write(classes_type[ret[0]][1] % ("ret")) classes.write("\n") - # - # Sometime one need to keep references of the source - # class in the returned class object. - # See reference_keepers for the list - # - tclass = classes_type[ret[0]][2] - if tclass in reference_keepers: - rlist = reference_keepers[tclass] - for pref in rlist: - if pref[0] == classname: - classes.write(" __tmp.%s = self\n" % - pref[1]) - # Post-processing - just before we return. if name in function_post: classes.write(" %s\n" % -- 2.9.3

The 'foreign_encoding_args' data structure and associated code in the generator is inherited from libxml. This has never been used in libvirt, so delete it to simplify the generator. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com&gt; --- generator.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/generator.py b/generator.py index 3dce74b..decda72 100755 --- a/generator.py +++ b/generator.py @@ -370,9 +370,6 @@ py_return_types = { unknown_types = {} -foreign_encoding_args = ( -) - ####################################################################### # # This part writes the C <-> Python stubs libvirt.[ch] and @@ -693,8 +690,6 @@ def print_function_wrapper(module, name, output, export, include): c_args = c_args + " %s %s;\n" % (arg[1], arg[0]) if arg[1] in py_types: (f, t, n, c) = py_types[arg[1]] - if (f == 'z') and (name in foreign_encoding_args) and (num_bufs == 0): - f = 't#' if f is not None: format = format + f if t is not None: -- 2.9.3

The 'classes_ancestor' data structure and associated code in the generator is inherited from libxml. This has never been used in libvirt, so delete it to simplify the generator. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com&gt; --- generator.py | 56 ++++++++++++++++++++++---------------------------------- 1 file changed, 22 insertions(+), 34 deletions(-) diff --git a/generator.py b/generator.py index 8998b53..3d2e05e 100755 --- a/generator.py +++ b/generator.py @@ -1017,9 +1017,6 @@ primary_classes = ["virDomain", "virNetwork", "virInterface", "virConnect", "virNodeDevice", "virSecret", "virNWFilter", "virStream", "virDomainSnapshot"] -classes_ancestor = { -} - classes_destructors = { "virDomain": "virDomainFree", "virNetwork": "virNetworkFree", @@ -1284,7 +1281,6 @@ def buildWrappers(module): global classes_type global classes_list global primary_classes - global classes_ancestor global converter_type global classes_destructors global functions_noexcept @@ -1473,37 +1469,29 @@ def buildWrappers(module): if classname == "None": pass else: - if classname in classes_ancestor: - classes.write("class %s(%s):\n" % (classname, - classes_ancestor[classname])) - classes.write(" def __init__(self, _obj=None):\n") - classes.write(" self._o = _obj\n") - classes.write(" %s.__init__(self, _obj=_obj)\n\n" % ( - classes_ancestor[classname])) + classes.write("class %s(object):\n" % (classname)) + if classname in [ "virDomain", "virNetwork", "virInterface", "virStoragePool", + "virStorageVol", "virNodeDevice", "virSecret","virStream", + "virNWFilter" ]: + classes.write(" def __init__(self, conn, _obj=None):\n") + elif classname in [ 'virDomainSnapshot' ]: + classes.write(" def __init__(self, dom, _obj=None):\n") else: - classes.write("class %s(object):\n" % (classname)) - if classname in [ "virDomain", "virNetwork", "virInterface", "virStoragePool", - "virStorageVol", "virNodeDevice", "virSecret","virStream", - "virNWFilter" ]: - classes.write(" def __init__(self, conn, _obj=None):\n") - elif classname in [ 'virDomainSnapshot' ]: - classes.write(" def __init__(self, dom, _obj=None):\n") - else: - classes.write(" def __init__(self, _obj=None):\n") - if classname in [ "virDomain", "virNetwork", "virInterface", - "virNodeDevice", "virSecret", "virStream", - "virNWFilter" ]: - classes.write(" self._conn = conn\n") - elif classname in [ "virStorageVol", "virStoragePool" ]: - classes.write(" self._conn = conn\n" + \ - " if not isinstance(conn, virConnect):\n" + \ - " self._conn = conn._conn\n") - elif classname in [ "virDomainSnapshot" ]: - classes.write(" self._dom = dom\n") - classes.write(" self._conn = dom.connect()\n") - classes.write(" if type(_obj).__name__ not in [\"PyCapsule\", \"PyCObject\"]:\n") - classes.write(" raise Exception(\"Expected a wrapped C Object but got %s\" % type(_obj))\n") - classes.write(" self._o = _obj\n\n") + classes.write(" def __init__(self, _obj=None):\n") + if classname in [ "virDomain", "virNetwork", "virInterface", + "virNodeDevice", "virSecret", "virStream", + "virNWFilter" ]: + classes.write(" self._conn = conn\n") + elif classname in [ "virStorageVol", "virStoragePool" ]: + classes.write(" self._conn = conn\n" + \ + " if not isinstance(conn, virConnect):\n" + \ + " self._conn = conn._conn\n") + elif classname in [ "virDomainSnapshot" ]: + classes.write(" self._dom = dom\n") + classes.write(" self._conn = dom.connect()\n") + classes.write(" if type(_obj).__name__ not in [\"PyCapsule\", \"PyCObject\"]:\n") + classes.write(" raise Exception(\"Expected a wrapped C Object but got %s\" % type(_obj))\n") + classes.write(" self._o = _obj\n\n") destruct=None if classname in classes_destructors: classes.write(" def __del__(self):\n") -- 2.9.3

The 'functions_list_exception_test' data structure and associated code in the generator is inherited from libxml. This has never been used in libvirt, so delete it to simplify the generator. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com&gt; --- generator.py | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/generator.py b/generator.py index cf3759c..5dfa73e 100755 --- a/generator.py +++ b/generator.py @@ -1067,11 +1067,6 @@ def is_integral_type (name): def is_optional_arg(info): return re.search("^\(?optional\)?", info) is not None -# Functions returning lists which need special rules to check for errors -# and raise exceptions. -functions_list_exception_test = { -} -functions_list_default_test = "%s is None" def is_python_noninteger_type (name): @@ -1447,11 +1442,7 @@ def buildWrappers(module): elif is_python_noninteger_type (ret[0]): if name not in functions_noexcept: - if name in functions_list_exception_test: - test = functions_list_exception_test[name] - else: - test = functions_list_default_test - classes.write ((" if " + test + + classes.write ((" if %s is None" + ": raise libvirtError ('%s() failed')\n") % ("ret", name)) classes.write(" return ret\n") @@ -1673,36 +1664,32 @@ def buildWrappers(module): elif is_python_noninteger_type (ret[0]): if name not in functions_noexcept: - if name in functions_list_exception_test: - test = functions_list_exception_test[name] - else: - test = functions_list_default_test if classname == "virConnect": - classes.write ((" if " + test + + classes.write ((" if %s is None" + ": raise libvirtError ('%s() failed', conn=self)\n") % ("ret", name)) elif classname == "virDomain": - classes.write ((" if " + test + + classes.write ((" if %s is None" + ": raise libvirtError ('%s() failed', dom=self)\n") % ("ret", name)) elif classname == "virNetwork": - classes.write ((" if " + test + + classes.write ((" if %s is None" + ": raise libvirtError ('%s() failed', net=self)\n") % ("ret", name)) elif classname == "virInterface": - classes.write ((" if " + test + + classes.write ((" if %s is None" + ": raise libvirtError ('%s() failed', net=self)\n") % ("ret", name)) elif classname == "virStoragePool": - classes.write ((" if " + test + + classes.write ((" if %s is None" + ": raise libvirtError ('%s() failed', pool=self)\n") % ("ret", name)) elif classname == "virStorageVol": - classes.write ((" if " + test + + classes.write ((" if %s is None" + ": raise libvirtError ('%s() failed', vol=self)\n") % ("ret", name)) else: - classes.write ((" if " + test + + classes.write ((" if %s is None" + ": raise libvirtError ('%s() failed')\n") % ("ret", name)) -- 2.9.3