diff --git a/src/virtManager/addhardware.py b/src/virtManager/addhardware.py index 39eb7315f..165463ac9 100644 --- a/src/virtManager/addhardware.py +++ b/src/virtManager/addhardware.py @@ -70,7 +70,7 @@ class vmmAddHardware(gobject.GObject): gobject.TYPE_NONE, [str]), } def __init__(self, config, vm): - self.__gobject_init__() + gobject.GObject.__init__(self) self.config = config self.vm = vm self.conn = vm.get_connection() diff --git a/src/virtManager/asyncjob.py b/src/virtManager/asyncjob.py index 8904e15f9..7466316d8 100644 --- a/src/virtManager/asyncjob.py +++ b/src/virtManager/asyncjob.py @@ -43,7 +43,7 @@ class vmmAsyncJob(gobject.GObject): text=_("Please wait a few moments..."), title=_("Operation in progress"), run_main=True): - self.__gobject_init__() + gobject.GObject.__init__(self) self.config = config self.run_main = bool(run_main) diff --git a/src/virtManager/choosecd.py b/src/virtManager/choosecd.py index 5b20cdde1..92986972d 100644 --- a/src/virtManager/choosecd.py +++ b/src/virtManager/choosecd.py @@ -35,7 +35,7 @@ class vmmChooseCD(gobject.GObject): } def __init__(self, config, dev_id_info, connection, media_type): - self.__gobject_init__() + gobject.GObject.__init__(self) self.window = gtk.glade.XML( config.get_glade_dir() + "/vmm-choose-cd.glade", "vmm-choose-cd", domain="virt-manager") diff --git a/src/virtManager/clone.py b/src/virtManager/clone.py index fa29ca749..0d89097c4 100644 --- a/src/virtManager/clone.py +++ b/src/virtManager/clone.py @@ -69,7 +69,7 @@ class vmmCloneVM(gobject.GObject): } def __init__(self, config, orig_vm): - self.__gobject_init__() + gobject.GObject.__init__(self) self.config = config self.orig_vm = orig_vm diff --git a/src/virtManager/connect.py b/src/virtManager/connect.py index d07e30a10..255ae45fe 100644 --- a/src/virtManager/connect.py +++ b/src/virtManager/connect.py @@ -55,7 +55,7 @@ class vmmConnect(gobject.GObject): } def __init__(self, config, engine): - self.__gobject_init__() + gobject.GObject.__init__(self) self.engine = engine self.window = gtk.glade.XML( diff --git a/src/virtManager/connection.py b/src/virtManager/connection.py index 9a5c80b35..1fbd15037 100644 --- a/src/virtManager/connection.py +++ b/src/virtManager/connection.py @@ -101,7 +101,7 @@ class vmmConnection(gobject.GObject): STATE_INACTIVE = 3 def __init__(self, config, uri, readOnly=None, engine=None): - self.__gobject_init__() + gobject.GObject.__init__(self) self.config = config self.engine = engine diff --git a/src/virtManager/console.py b/src/virtManager/console.py index 3fb05ab8b..f8270bc42 100644 --- a/src/virtManager/console.py +++ b/src/virtManager/console.py @@ -49,7 +49,7 @@ def has_property(obj, setting): class vmmConsolePages(gobject.GObject): def __init__(self, config, vm, engine, window): - self.__gobject_init__() + gobject.GObject.__init__(self) self.config = config self.vm = vm diff --git a/src/virtManager/create.py b/src/virtManager/create.py index d593d71d9..d48334981 100644 --- a/src/virtManager/create.py +++ b/src/virtManager/create.py @@ -68,7 +68,7 @@ class vmmCreate(gobject.GObject): } def __init__(self, config, engine): - self.__gobject_init__() + gobject.GObject.__init__(self) self.config = config self.engine = engine diff --git a/src/virtManager/createinterface.py b/src/virtManager/createinterface.py index 763685133..66f26ee77 100644 --- a/src/virtManager/createinterface.py +++ b/src/virtManager/createinterface.py @@ -67,7 +67,7 @@ class vmmCreateInterface(gobject.GObject): } def __init__(self, config, conn): - self.__gobject_init__() + gobject.GObject.__init__(self) self.config = config self.conn = conn self.interface = None diff --git a/src/virtManager/createnet.py b/src/virtManager/createnet.py index b6f7014d6..86a2d04b3 100644 --- a/src/virtManager/createnet.py +++ b/src/virtManager/createnet.py @@ -45,7 +45,7 @@ class vmmCreateNetwork(gobject.GObject): gobject.TYPE_NONE, [str]), } def __init__(self, config, conn): - self.__gobject_init__() + gobject.GObject.__init__(self) self.config = config self.conn = conn diff --git a/src/virtManager/createpool.py b/src/virtManager/createpool.py index 6f0186eb5..a58dcc418 100644 --- a/src/virtManager/createpool.py +++ b/src/virtManager/createpool.py @@ -40,7 +40,7 @@ class vmmCreatePool(gobject.GObject): } def __init__(self, config, conn): - self.__gobject_init__() + gobject.GObject.__init__(self) self.conn = conn self.config = config diff --git a/src/virtManager/createvol.py b/src/virtManager/createvol.py index eee963bb2..261404806 100644 --- a/src/virtManager/createvol.py +++ b/src/virtManager/createvol.py @@ -40,7 +40,7 @@ class vmmCreateVolume(gobject.GObject): } def __init__(self, config, conn, parent_pool): - self.__gobject_init__() + gobject.GObject.__init__(self) self.conn = conn self.parent_pool = parent_pool self.config = config diff --git a/src/virtManager/delete.py b/src/virtManager/delete.py index 13c6ad198..185e3dcf0 100644 --- a/src/virtManager/delete.py +++ b/src/virtManager/delete.py @@ -47,7 +47,7 @@ class vmmDeleteDialog(gobject.GObject): } def __init__(self, config, vm): - self.__gobject_init__() + gobject.GObject.__init__(self) self.config = config self.vm = vm self.conn = vm.connection diff --git a/src/virtManager/details.py b/src/virtManager/details.py index e070a0b5b..fe4257410 100644 --- a/src/virtManager/details.py +++ b/src/virtManager/details.py @@ -250,7 +250,7 @@ class vmmDetails(gobject.GObject): def __init__(self, config, vm, engine, parent=None): - self.__gobject_init__() + gobject.GObject.__init__(self) self.config = config self.vm = vm self.conn = self.vm.get_connection() diff --git a/src/virtManager/engine.py b/src/virtManager/engine.py index 79f847c5d..5d723081c 100644 --- a/src/virtManager/engine.py +++ b/src/virtManager/engine.py @@ -217,7 +217,7 @@ class vmmEngine(gobject.GObject): } def __init__(self, config): - self.__gobject_init__() + gobject.GObject.__init__(self) self.config = config diff --git a/src/virtManager/halhelper.py b/src/virtManager/halhelper.py index 1ce907be4..11b4ceb36 100644 --- a/src/virtManager/halhelper.py +++ b/src/virtManager/halhelper.py @@ -42,7 +42,7 @@ class vmmHalHelper(gobject.GObject): } def __init__(self): - self.__gobject_init__() + gobject.GObject.__init__(self) self.bus = None self.hal_iface = None diff --git a/src/virtManager/host.py b/src/virtManager/host.py index f4a1e42e5..7f5aa837a 100644 --- a/src/virtManager/host.py +++ b/src/virtManager/host.py @@ -52,7 +52,7 @@ class vmmHost(gobject.GObject): gobject.TYPE_NONE, (str,)), } def __init__(self, config, conn, engine): - self.__gobject_init__() + gobject.GObject.__init__(self) self.config = config self.conn = conn self.engine = engine diff --git a/src/virtManager/libvirtobject.py b/src/virtManager/libvirtobject.py index c9aee0c68..4254f97aa 100644 --- a/src/virtManager/libvirtobject.py +++ b/src/virtManager/libvirtobject.py @@ -44,7 +44,7 @@ class vmmLibvirtObject(gobject.GObject): } def __init__(self, config, connection): - self.__gobject_init__() + gobject.GObject.__init__(self) self.config = config self.connection = connection diff --git a/src/virtManager/manager.py b/src/virtManager/manager.py index 4740b9596..b2d702031 100644 --- a/src/virtManager/manager.py +++ b/src/virtManager/manager.py @@ -117,7 +117,7 @@ class vmmManager(gobject.GObject): gobject.TYPE_NONE, []),} def __init__(self, config, engine): - self.__gobject_init__() + gobject.GObject.__init__(self) self.config = config self.engine = engine diff --git a/src/virtManager/mediadev.py b/src/virtManager/mediadev.py index 29eaa772f..7deb5307b 100644 --- a/src/virtManager/mediadev.py +++ b/src/virtManager/mediadev.py @@ -62,7 +62,7 @@ class vmmMediaDevice(gobject.GObject): def __init__(self, path, key, has_media, media_label, media_key, nodedev_obj = None, media_type = MEDIA_CDROM): - self.__gobject_init__() + gobject.GObject.__init__(self) self.path = path self.key = key diff --git a/src/virtManager/migrate.py b/src/virtManager/migrate.py index 065f98e95..2e2126155 100644 --- a/src/virtManager/migrate.py +++ b/src/virtManager/migrate.py @@ -51,7 +51,7 @@ class vmmMigrateDialog(gobject.GObject): } def __init__(self, config, vm, engine): - self.__gobject_init__() + gobject.GObject.__init__(self) self.config = config self.vm = vm self.conn = vm.connection diff --git a/src/virtManager/netdev.py b/src/virtManager/netdev.py index 8162b5822..3fe0ac3cd 100644 --- a/src/virtManager/netdev.py +++ b/src/virtManager/netdev.py @@ -23,7 +23,7 @@ class vmmNetDevice(gobject.GObject): __gsignals__ = {} def __init__(self, name, mac, is_shared, bridge=None, hal_path=None): - self.__gobject_init__() + gobject.GObject.__init__(self) self.name = name self.mac = mac diff --git a/src/virtManager/network.py b/src/virtManager/network.py index 3c9db4ef1..d665392d6 100644 --- a/src/virtManager/network.py +++ b/src/virtManager/network.py @@ -50,7 +50,7 @@ class vmmNetwork(gobject.GObject): return desc def __init__(self, config, connection, net, uuid, active): - self.__gobject_init__() + gobject.GObject.__init__(self) self.config = config self.connection = connection self.net = net diff --git a/src/virtManager/preferences.py b/src/virtManager/preferences.py index c16d12ff6..3f8b272a4 100644 --- a/src/virtManager/preferences.py +++ b/src/virtManager/preferences.py @@ -32,7 +32,7 @@ class vmmPreferences(gobject.GObject): gobject.TYPE_NONE, [str]), } def __init__(self, config): - self.__gobject_init__() + gobject.GObject.__init__(self) self.window = gtk.glade.XML(config.get_glade_dir() + "/vmm-preferences.glade", "vmm-preferences", domain="virt-manager") self.config = config diff --git a/src/virtManager/storagebrowse.py b/src/virtManager/storagebrowse.py index 24cf938e1..38d944fdc 100644 --- a/src/virtManager/storagebrowse.py +++ b/src/virtManager/storagebrowse.py @@ -40,7 +40,7 @@ class vmmStorageBrowser(gobject.GObject): } def __init__(self, config, conn): - self.__gobject_init__() + gobject.GObject.__init__(self) self.config = config self.conn = conn diff --git a/src/virtManager/storagepool.py b/src/virtManager/storagepool.py index 6faea6f4a..08436a05d 100644 --- a/src/virtManager/storagepool.py +++ b/src/virtManager/storagepool.py @@ -30,7 +30,7 @@ class vmmStoragePool(gobject.GObject): } def __init__(self, config, connection, pool, uuid, active): - self.__gobject_init__() + gobject.GObject.__init__(self) self.config = config self.connection = connection self.pool = pool # Libvirt pool object diff --git a/src/virtManager/storagevol.py b/src/virtManager/storagevol.py index 2761b45df..d8d2334e8 100644 --- a/src/virtManager/storagevol.py +++ b/src/virtManager/storagevol.py @@ -25,7 +25,7 @@ class vmmStorageVolume(gobject.GObject): __gsignals__ = { } def __init__(self, config, connection, vol, name): - self.__gobject_init__() + gobject.GObject.__init__(self) self.config = config self.connection = connection self.vol = vol # Libvirt storage volume object diff --git a/src/virtManager/systray.py b/src/virtManager/systray.py index da2588163..e7d7cbf33 100644 --- a/src/virtManager/systray.py +++ b/src/virtManager/systray.py @@ -69,7 +69,7 @@ class vmmSystray(gobject.GObject): } def __init__(self, config, engine): - self.__gobject_init__() + gobject.GObject.__init__(self) self.config = config self.engine = engine diff --git a/tests/pylint-virt-manager.sh b/tests/pylint-virt-manager.sh index 62ebbf252..136a2eb77 100755 --- a/tests/pylint-virt-manager.sh +++ b/tests/pylint-virt-manager.sh @@ -16,8 +16,6 @@ NO_PYL_CONFIG=".*No config file found.*" GETTEXT_VAR="Undefined variable '_'" # These all work fine and are legit, just false positives -GOBJECT_VAR="has no '__gobject_init__' member" -GOBJECT_INIT="__init__ method from base class 'GObject' is not called" EMIT_VAR="has no 'emit' member" ERROR_VBOX="Class 'vbox' has no 'pack_start' member" EXCEPTHOOK="no '__excepthook__' member" @@ -91,8 +89,6 @@ pylint --ignore=$IGNOREFILES $FILES \ --disable=${DMSG}\ --disable=${DCHECKERS} 2>&1 | \ egrep -ve "$NO_PYL_CONFIG" \ - -ve "$GOBJECT_VAR" \ - -ve "$GOBJECT_INIT" \ -ve "$EMIT_VAR" \ -ve "$CONNECT_VAR" \ -ve "$DISCONNECT_VAR" \