From ee5c856af7563619305a0c68ab32c06e6e6c1b2d Mon Sep 17 00:00:00 2001 From: Philipp Hahn Date: Wed, 21 Nov 2018 07:55:57 +0100 Subject: Remove legacy libvirtError arguments The fields have been deprecated in C with git:f60dc0bc09f09c6817d6706a9edb1579a3e2b2b8 They are only passed to the libvirtError constructor, but not stored for later or used anywhere else. sed -ri '/raise libvirtError/s/, \w+=self(\._dom)?//' *.py Signed-off-by: Philipp Hahn --- generator.py | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'generator.py') diff --git a/generator.py b/generator.py index f69466c..0229df2 100755 --- a/generator.py +++ b/generator.py @@ -1720,31 +1720,31 @@ def buildWrappers(module): else: if classname == "virConnect": classes.write( - " if ret is None:raise libvirtError('%s() failed', conn=self)\n" % + " if ret is None:raise libvirtError('%s() failed')\n" % (name)) elif classname == "virDomain": classes.write( - " if ret is None:raise libvirtError('%s() failed', dom=self)\n" % + " if ret is None:raise libvirtError('%s() failed')\n" % (name)) elif classname == "virNetwork": classes.write( - " if ret is None:raise libvirtError('%s() failed', net=self)\n" % + " if ret is None:raise libvirtError('%s() failed')\n" % (name)) elif classname == "virInterface": classes.write( - " if ret is None:raise libvirtError('%s() failed', net=self)\n" % + " if ret is None:raise libvirtError('%s() failed')\n" % (name)) elif classname == "virStoragePool": classes.write( - " if ret is None:raise libvirtError('%s() failed', pool=self)\n" % + " if ret is None:raise libvirtError('%s() failed')\n" % (name)) elif classname == "virStorageVol": classes.write( - " if ret is None:raise libvirtError('%s() failed', vol=self)\n" % + " if ret is None:raise libvirtError('%s() failed')\n" % (name)) elif classname in ["virDomainCheckpoint", "virDomainSnapshot"]: classes.write( - " if ret is None:raise libvirtError('%s() failed', dom=self._dom)\n" % + " if ret is None:raise libvirtError('%s() failed')\n" % (name)) else: classes.write( @@ -1776,27 +1776,27 @@ def buildWrappers(module): test = functions_int_default_test if classname == "virConnect": classes.write((" if " + test + - ": raise libvirtError('%s() failed', conn=self)\n") % + ": raise libvirtError('%s() failed')\n") % ("ret", name)) elif classname == "virDomain": classes.write((" if " + test + - ": raise libvirtError('%s() failed', dom=self)\n") % + ": raise libvirtError('%s() failed')\n") % ("ret", name)) elif classname == "virNetwork": classes.write((" if " + test + - ": raise libvirtError('%s() failed', net=self)\n") % + ": raise libvirtError('%s() failed')\n") % ("ret", name)) elif classname == "virInterface": classes.write((" if " + test + - ": raise libvirtError('%s() failed', net=self)\n") % + ": raise libvirtError('%s() failed')\n") % ("ret", name)) elif classname == "virStoragePool": classes.write((" if " + test + - ": raise libvirtError('%s() failed', pool=self)\n") % + ": raise libvirtError('%s() failed')\n") % ("ret", name)) elif classname == "virStorageVol": classes.write((" if " + test + - ": raise libvirtError('%s() failed', vol=self)\n") % + ": raise libvirtError('%s() failed')\n") % ("ret", name)) else: classes.write((" if " + test + @@ -1809,27 +1809,27 @@ def buildWrappers(module): if name not in functions_noexcept: if classname == "virConnect": classes.write((" if %s is None" + - ": raise libvirtError('%s() failed', conn=self)\n") % + ": raise libvirtError('%s() failed')\n") % ("ret", name)) elif classname == "virDomain": classes.write((" if %s is None" + - ": raise libvirtError('%s() failed', dom=self)\n") % + ": raise libvirtError('%s() failed')\n") % ("ret", name)) elif classname == "virNetwork": classes.write((" if %s is None" + - ": raise libvirtError('%s() failed', net=self)\n") % + ": raise libvirtError('%s() failed')\n") % ("ret", name)) elif classname == "virInterface": classes.write((" if %s is None" + - ": raise libvirtError('%s() failed', net=self)\n") % + ": raise libvirtError('%s() failed')\n") % ("ret", name)) elif classname == "virStoragePool": classes.write((" if %s is None" + - ": raise libvirtError('%s() failed', pool=self)\n") % + ": raise libvirtError('%s() failed')\n") % ("ret", name)) elif classname == "virStorageVol": classes.write((" if %s is None" + - ": raise libvirtError('%s() failed', vol=self)\n") % + ": raise libvirtError('%s() failed')\n") % ("ret", name)) else: classes.write((" if %s is None" + -- cgit v1.2.1