shaba/libvirt-python
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt-python.git synced 2025-07-25 04:58:57 +03:00
Code Issues Projects Releases Activity

Removed unused 'functions_list_exception_test' code from generator

Browse Source 
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@redhat.com>
This commit is contained in:
Daniel P. Berrange
2017-01-19 15:21:01 +00:00
parent 60f71591b9
commit 405f537bd0
1 changed files with 8 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
generator.py
View File

@ -1067,11 +1067,6 @@ def is_integral_type (name):
def is_optional_arg(info): def is_optional_arg(info):
return re.search("^\(?optional\)?", info) is not None 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): def is_python_noninteger_type (name):
@ -1447,11 +1442,7 @@ def buildWrappers(module):
elif is_python_noninteger_type (ret[0]): elif is_python_noninteger_type (ret[0]):
if name not in functions_noexcept: if name not in functions_noexcept:
if name in functions_list_exception_test: classes.write ((" if %s is None" +
test = functions_list_exception_test[name]
else:
test = functions_list_default_test
classes.write ((" if " + test +
": raise libvirtError ('%s() failed')\n") % ": raise libvirtError ('%s() failed')\n") %
("ret", name)) ("ret", name))
classes.write(" return ret\n") classes.write(" return ret\n")
@ -1673,36 +1664,32 @@ def buildWrappers(module):
elif is_python_noninteger_type (ret[0]): elif is_python_noninteger_type (ret[0]):
if name not in functions_noexcept: 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": if classname == "virConnect":
classes.write ((" if " + test + classes.write ((" if %s is None" +
": raise libvirtError ('%s() failed', conn=self)\n") % ": raise libvirtError ('%s() failed', conn=self)\n") %
("ret", name)) ("ret", name))
elif classname == "virDomain": elif classname == "virDomain":
classes.write ((" if " + test + classes.write ((" if %s is None" +
": raise libvirtError ('%s() failed', dom=self)\n") % ": raise libvirtError ('%s() failed', dom=self)\n") %
("ret", name)) ("ret", name))
elif classname == "virNetwork": elif classname == "virNetwork":
classes.write ((" if " + test + classes.write ((" if %s is None" +
": raise libvirtError ('%s() failed', net=self)\n") % ": raise libvirtError ('%s() failed', net=self)\n") %
("ret", name)) ("ret", name))
elif classname == "virInterface": elif classname == "virInterface":
classes.write ((" if " + test + classes.write ((" if %s is None" +
": raise libvirtError ('%s() failed', net=self)\n") % ": raise libvirtError ('%s() failed', net=self)\n") %
("ret", name)) ("ret", name))
elif classname == "virStoragePool": elif classname == "virStoragePool":
classes.write ((" if " + test + classes.write ((" if %s is None" +
": raise libvirtError ('%s() failed', pool=self)\n") % ": raise libvirtError ('%s() failed', pool=self)\n") %
("ret", name)) ("ret", name))
elif classname == "virStorageVol": elif classname == "virStorageVol":
classes.write ((" if " + test + classes.write ((" if %s is None" +
": raise libvirtError ('%s() failed', vol=self)\n") % ": raise libvirtError ('%s() failed', vol=self)\n") %
("ret", name)) ("ret", name))
else: else:
classes.write ((" if " + test + classes.write ((" if %s is None" +
": raise libvirtError ('%s() failed')\n") % ": raise libvirtError ('%s() failed')\n") %
("ret", name)) ("ret", name))