virtManager: Switch to relative imports

virtManager/about.py

@@ -20,7 +20,7 @@
 
 import logging
 
-from virtManager.baseclass import vmmGObjectUI
+from .baseclass import vmmGObjectUI
 
 
 class vmmAbout(vmmGObjectUI):

virtManager/addhardware.py

@@ -33,14 +33,14 @@ from virtinst import (VirtualChannelDevice, VirtualParallelDevice,
                       VirtualTPMDevice, VirtualPanicDevice)
 from virtinst import VirtualController
 
-from virtManager import uiutil
-from virtManager.fsdetails import vmmFSDetails
-from virtManager.gfxdetails import vmmGraphicsDetails
-from virtManager.netlist import vmmNetworkList
-from virtManager.asyncjob import vmmAsyncJob
-from virtManager.storagebrowse import vmmStorageBrowser
-from virtManager.baseclass import vmmGObjectUI
-from virtManager.addstorage import vmmAddStorage
+from . import uiutil
+from .fsdetails import vmmFSDetails
+from .gfxdetails import vmmGraphicsDetails
+from .netlist import vmmNetworkList
+from .asyncjob import vmmAsyncJob
+from .storagebrowse import vmmStorageBrowser
+from .baseclass import vmmGObjectUI
+from .addstorage import vmmAddStorage
 
 (PAGE_ERROR,
 PAGE_DISK,

virtManager/addstorage.py

@@ -26,8 +26,8 @@ from gi.repository import GObject
 from gi.repository import Gtk
 
 import virtinst
-from virtManager import uiutil
-from virtManager.baseclass import vmmGObjectUI
+from . import uiutil
+from .baseclass import vmmGObjectUI
 
 
 class vmmAddStorage(vmmGObjectUI):

virtManager/asyncjob.py

@@ -29,7 +29,7 @@ from gi.repository import Gtk
 import libvirt
 import urlgrabber
 
-from virtManager.baseclass import vmmGObjectUI
+from .baseclass import vmmGObjectUI
 
 
 class vmmMeter(urlgrabber.progress.BaseMeter):

virtManager/autodrawer.py

@@ -26,7 +26,7 @@ from gi.repository import Gdk
 from gi.repository import GLib
 from gi.repository import Gtk
 
-from virtManager import uiutil
+from . import uiutil
 
 # pylint: disable=arguments-differ
 # Newer pylint can detect, but warns that overridden arguments are wrong

virtManager/baseclass.py

@@ -24,7 +24,7 @@ import sys
 import threading
 import traceback
 
-from virtManager import config
+from . import config
 
 from gi.repository import Gdk
 from gi.repository import GLib
@@ -221,7 +221,7 @@ class vmmGObjectUI(vmmGObject):
 
     def _get_err(self):
         if self._err is None:
-            from virtManager import error
+            from . import error
             self._err = error.vmmErrorDialog(self.topwin)
         return self._err
     err = property(_get_err)

virtManager/choosecd.py

@@ -22,11 +22,11 @@ import logging
 
 from gi.repository import GObject
 
-from virtManager.baseclass import vmmGObjectUI
-from virtManager.mediadev import MEDIA_FLOPPY
-from virtManager.mediacombo import vmmMediaCombo
-from virtManager.storagebrowse import vmmStorageBrowser
-from virtManager.addstorage import vmmAddStorage
+from .baseclass import vmmGObjectUI
+from .mediadev import MEDIA_FLOPPY
+from .mediacombo import vmmMediaCombo
+from .storagebrowse import vmmStorageBrowser
+from .addstorage import vmmAddStorage
 
 
 class vmmChooseCD(vmmGObjectUI):

virtManager/clone.py

@@ -24,10 +24,10 @@ import os
 from gi.repository import Gtk
 from gi.repository import Gdk
 
-from virtManager import uiutil
-from virtManager.baseclass import vmmGObjectUI
-from virtManager.asyncjob import vmmAsyncJob
-from virtManager.storagebrowse import vmmStorageBrowser
+from . import uiutil
+from .baseclass import vmmGObjectUI
+from .asyncjob import vmmAsyncJob
+from .storagebrowse import vmmStorageBrowser
 
 import virtinst
 from virtinst import Cloner

virtManager/config.py

@@ -25,7 +25,7 @@ from gi.repository import GLib
 from gi.repository import Gtk
 
 from virtinst import CPU
-from virtManager.keyring import vmmKeyring, vmmSecret
+from .keyring import vmmKeyring, vmmSecret
 
 running_config = None
 

virtManager/connect.py

@@ -26,8 +26,8 @@ from gi.repository import Gio
 from gi.repository import GObject
 from gi.repository import Gtk
 
-from virtManager import uiutil
-from virtManager.baseclass import vmmGObjectUI
+from . import uiutil
+from .baseclass import vmmGObjectUI
 
 (HV_QEMU,
 HV_XEN,

virtManager/connection.py

@@ -32,14 +32,14 @@ import virtinst
 from virtinst import pollhelpers
 from virtinst import util
 
-from virtManager import connectauth
-from virtManager.baseclass import vmmGObject
-from virtManager.domain import vmmDomain
-from virtManager.interface import vmmInterface
-from virtManager.mediadev import vmmMediaDevice
-from virtManager.network import vmmNetwork
-from virtManager.nodedev import vmmNodeDevice
-from virtManager.storagepool import vmmStoragePool
+from . import connectauth
+from .baseclass import vmmGObject
+from .domain import vmmDomain
+from .interface import vmmInterface
+from .mediadev import vmmMediaDevice
+from .network import vmmNetwork
+from .nodedev import vmmNodeDevice
+from .storagepool import vmmStoragePool
 
 
 # debugging helper to turn off events

virtManager/console.py

@@ -36,10 +36,10 @@ import signal
 import socket
 import threading
 
-from virtManager.autodrawer import AutoDrawer
-from virtManager.baseclass import vmmGObjectUI, vmmGObject
-from virtManager.serialcon import vmmSerialConsole
-from virtManager.details import DETAILS_PAGE_CONSOLE
+from .autodrawer import AutoDrawer
+from .baseclass import vmmGObjectUI, vmmGObject
+from .serialcon import vmmSerialConsole
+from .details import DETAILS_PAGE_CONSOLE
 
 # Console pages
 (CONSOLE_PAGE_UNAVAILABLE,

virtManager/create.py

@@ -29,16 +29,16 @@ from gi.repository import Gdk
 import virtinst
 from virtinst import util
 
-from virtManager import uiutil
-from virtManager.mediadev import MEDIA_CDROM
-from virtManager.baseclass import vmmGObjectUI
-from virtManager.asyncjob import vmmAsyncJob
-from virtManager.storagebrowse import vmmStorageBrowser
-from virtManager.details import vmmDetails
-from virtManager.domain import vmmDomainVirtinst
-from virtManager.netlist import vmmNetworkList
-from virtManager.mediacombo import vmmMediaCombo
-from virtManager.addstorage import vmmAddStorage
+from . import uiutil
+from .mediadev import MEDIA_CDROM
+from .baseclass import vmmGObjectUI
+from .asyncjob import vmmAsyncJob
+from .storagebrowse import vmmStorageBrowser
+from .details import vmmDetails
+from .domain import vmmDomainVirtinst
+from .netlist import vmmNetworkList
+from .mediacombo import vmmMediaCombo
+from .addstorage import vmmAddStorage
 
 # Number of seconds to wait for media detection
 DETECT_TIMEOUT = 20

virtManager/createinterface.py

@@ -25,9 +25,9 @@ import logging
 
 from virtinst import Interface, InterfaceProtocol
 
-from virtManager import uiutil
-from virtManager.baseclass import vmmGObjectUI
-from virtManager.asyncjob import vmmAsyncJob
+from . import uiutil
+from .baseclass import vmmGObjectUI
+from .asyncjob import vmmAsyncJob
 
 PAGE_TYPE = 0
 PAGE_DETAILS = 1

virtManager/createnet.py

@@ -28,9 +28,9 @@ from gi.repository import Gdk
 
 from virtinst import Network
 
-from virtManager import uiutil
-from virtManager.asyncjob import vmmAsyncJob
-from virtManager.baseclass import vmmGObjectUI
+from . import uiutil
+from .asyncjob import vmmAsyncJob
+from .baseclass import vmmGObjectUI
 
 (PAGE_NAME,
 PAGE_IPV4,

virtManager/createpool.py

@@ -23,9 +23,9 @@ from gi.repository import Gdk
 
 import logging
 
-from virtManager.baseclass import vmmGObjectUI
-from virtManager.asyncjob import vmmAsyncJob
-from virtManager import uiutil
+from .baseclass import vmmGObjectUI
+from .asyncjob import vmmAsyncJob
+from . import uiutil
 
 from virtinst import StoragePool
 

virtManager/createvol.py

@@ -24,9 +24,9 @@ from gi.repository import GObject
 from gi.repository import Gtk
 from gi.repository import Gdk
 
-from virtManager import uiutil
-from virtManager.baseclass import vmmGObjectUI
-from virtManager.asyncjob import vmmAsyncJob
+from . import uiutil
+from .baseclass import vmmGObjectUI
+from .asyncjob import vmmAsyncJob
 
 from virtinst import StorageVolume
 
@@ -342,7 +342,7 @@ class vmmCreateVolume(vmmGObjectUI):
                 ignore = src
                 self.widget("backing-store").set_text(text)
 
-            from virtManager.storagebrowse import vmmStorageBrowser
+            from .storagebrowse import vmmStorageBrowser
             self.storage_browser = vmmStorageBrowser(self.conn)
             self.storage_browser.connect("storage-browse-finish", cb)
             self.storage_browser.topwin.set_modal(self.topwin.get_modal())

virtManager/delete.py

@@ -29,9 +29,9 @@ import logging
 import virtinst
 from virtinst import util
 
-from virtManager.asyncjob import vmmAsyncJob
-from virtManager.baseclass import vmmGObjectUI
-from virtManager import uiutil
+from .asyncjob import vmmAsyncJob
+from .baseclass import vmmGObjectUI
+from . import uiutil
 
 STORAGE_ROW_CONFIRM = 0
 STORAGE_ROW_CANT_DELETE = 1

virtManager/details.py

@@ -27,17 +27,17 @@ from gi.repository import Gdk
 
 import libvirt
 
-from virtManager import vmmenu
-from virtManager import uiutil
-from virtManager.baseclass import vmmGObjectUI
-from virtManager.addhardware import vmmAddHardware
-from virtManager.choosecd import vmmChooseCD
-from virtManager.fsdetails import vmmFSDetails
-from virtManager.gfxdetails import vmmGraphicsDetails
-from virtManager.netlist import vmmNetworkList
-from virtManager.snapshots import vmmSnapshotPage
-from virtManager.storagebrowse import vmmStorageBrowser
-from virtManager.graphwidgets import Sparkline
+from . import vmmenu
+from . import uiutil
+from .baseclass import vmmGObjectUI
+from .addhardware import vmmAddHardware
+from .choosecd import vmmChooseCD
+from .fsdetails import vmmFSDetails
+from .gfxdetails import vmmGraphicsDetails
+from .netlist import vmmNetworkList
+from .snapshots import vmmSnapshotPage
+from .storagebrowse import vmmStorageBrowser
+from .graphwidgets import Sparkline
 
 import virtinst
 from virtinst import util
@@ -492,7 +492,7 @@ class vmmDetails(vmmGObjectUI):
         self.ignorePause = False
         self.ignoreDetails = False
 
-        from virtManager.console import vmmConsolePages
+        from .console import vmmConsolePages
         self.console = vmmConsolePages(self.vm, self.builder, self.topwin)
         self.snapshots = vmmSnapshotPage(self.vm, self.builder, self.topwin)
         self.widget("snapshot-placeholder").add(self.snapshots.top_box)

virtManager/domain.py

@@ -32,7 +32,7 @@ from virtinst import Guest
 from virtinst import util
 from virtinst import VirtualController
 
-from virtManager.libvirtobject import vmmLibvirtObject
+from .libvirtobject import vmmLibvirtObject
 
 if not hasattr(libvirt, "VIR_DOMAIN_PMSUSPENDED"):
     setattr(libvirt, "VIR_DOMAIN_PMSUSPENDED", 7)

virtManager/engine.py

@@ -30,22 +30,22 @@ import traceback
 
 from virtinst import util
 
-from virtManager import packageutils
-from virtManager.about import vmmAbout
-from virtManager.baseclass import vmmGObject
-from virtManager.clone import vmmCloneVM
-from virtManager.connect import vmmConnect
-from virtManager.connection import vmmConnection
-from virtManager.preferences import vmmPreferences
-from virtManager.manager import vmmManager
-from virtManager.migrate import vmmMigrateDialog
-from virtManager.details import vmmDetails
-from virtManager.asyncjob import vmmAsyncJob
-from virtManager.create import vmmCreate
-from virtManager.host import vmmHost
-from virtManager.error import vmmErrorDialog
-from virtManager.systray import vmmSystray
-from virtManager.delete import vmmDeleteDialog
+from . import packageutils
+from .about import vmmAbout
+from .baseclass import vmmGObject
+from .clone import vmmCloneVM
+from .connect import vmmConnect
+from .connection import vmmConnection
+from .preferences import vmmPreferences
+from .manager import vmmManager
+from .migrate import vmmMigrateDialog
+from .details import vmmDetails
+from .asyncjob import vmmAsyncJob
+from .create import vmmCreate
+from .host import vmmHost
+from .error import vmmErrorDialog
+from .systray import vmmSystray
+from .delete import vmmDeleteDialog
 
 # Enable this to get a report of leaked objects on app shutdown
 # gtk3/pygobject has issues here as of Fedora 18
@@ -451,7 +451,7 @@ class vmmEngine(vmmGObject):
         if not self.config.support_inspection:
             return
 
-        from virtManager.inspection import vmmInspection
+        from .inspection import vmmInspection
         self.inspection = vmmInspection()
         self.inspection.start()
         self.connect("conn-added", self.inspection.conn_added)

virtManager/error.py

@@ -22,7 +22,7 @@ from gi.repository import Gtk
 import logging
 import traceback
 
-from virtManager.baseclass import vmmGObject
+from .baseclass import vmmGObject
 
 
 def _launch_dialog(dialog, primary_text, secondary_text, title,

virtManager/fsdetails.py

@@ -24,9 +24,9 @@ from gi.repository import GObject
 
 from virtinst import VirtualFilesystem, StorageVolume
 from virtinst import util
-from virtManager import uiutil
-from virtManager.baseclass import vmmGObjectUI
-from virtManager.storagebrowse import vmmStorageBrowser
+from . import uiutil
+from .baseclass import vmmGObjectUI
+from .storagebrowse import vmmStorageBrowser
 
 
 class vmmFSDetails(vmmGObjectUI):

virtManager/gfxdetails.py

@@ -23,8 +23,8 @@ from gi.repository import Gtk
 from gi.repository import GObject
 
 import virtinst
-from virtManager import uiutil
-from virtManager.baseclass import vmmGObjectUI
+from . import uiutil
+from .baseclass import vmmGObjectUI
 
 
 class vmmGraphicsDetails(vmmGObjectUI):

virtManager/host.py

@@ -28,14 +28,14 @@ from virtinst import VirtualDisk
 from virtinst import StoragePool
 from virtinst import Interface
 
-from virtManager import uiutil
-from virtManager.asyncjob import vmmAsyncJob
-from virtManager.createnet import vmmCreateNetwork
-from virtManager.createpool import vmmCreatePool
-from virtManager.createvol import vmmCreateVolume
-from virtManager.createinterface import vmmCreateInterface
-from virtManager.baseclass import vmmGObjectUI
-from virtManager.graphwidgets import Sparkline
+from . import uiutil
+from .asyncjob import vmmAsyncJob
+from .createnet import vmmCreateNetwork
+from .createpool import vmmCreatePool
+from .createvol import vmmCreateVolume
+from .createinterface import vmmCreateInterface
+from .baseclass import vmmGObjectUI
+from .graphwidgets import Sparkline
 
 INTERFACE_PAGE_INFO = 0
 INTERFACE_PAGE_ERROR = 1

virtManager/inspection.py

@@ -25,8 +25,8 @@ import re
 
 from guestfs import GuestFS  # pylint: disable=import-error
 
-from virtManager.baseclass import vmmGObject
-from virtManager.domain import vmmInspectionData
+from .baseclass import vmmGObject
+from .domain import vmmInspectionData
 
 
 class vmmInspection(vmmGObject):

virtManager/interface.py

@@ -20,7 +20,7 @@
 
 from virtinst import Interface
 
-from virtManager.libvirtobject import vmmLibvirtObject
+from .libvirtobject import vmmLibvirtObject
 
 
 class vmmInterface(vmmLibvirtObject):

virtManager/libvirtobject.py

@@ -22,7 +22,7 @@ from gi.repository import GObject
 
 import logging
 
-from virtManager.baseclass import vmmGObject
+from .baseclass import vmmGObject
 
 
 class vmmLibvirtObject(vmmGObject):

virtManager/manager.py

@@ -27,10 +27,10 @@ from gi.repository import GdkPixbuf
 
 from virtinst import util
 
-from virtManager import vmmenu
-from virtManager import uiutil
-from virtManager.baseclass import vmmGObjectUI
-from virtManager.graphwidgets import CellRendererSparkline
+from . import vmmenu
+from . import uiutil
+from .baseclass import vmmGObjectUI
+from .graphwidgets import CellRendererSparkline
 
 import libvirt
 

virtManager/mediacombo.py

@@ -19,8 +19,8 @@
 
 from gi.repository import Gtk
 
-from virtManager import uiutil
-from virtManager.baseclass import vmmGObjectUI
+from . import uiutil
+from .baseclass import vmmGObjectUI
 
 
 class vmmMediaCombo(vmmGObjectUI):

virtManager/mediadev.py

@@ -24,7 +24,7 @@ import logging
 
 from virtinst import NodeDevice
 
-from virtManager.baseclass import vmmGObject
+from .baseclass import vmmGObject
 
 MEDIA_FLOPPY = "floppy"
 MEDIA_CDROM = "cdrom"

virtManager/migrate.py

@@ -29,10 +29,10 @@ from gi.repository import Gtk
 import libvirt
 from virtinst import util
 
-from virtManager import uiutil
-from virtManager.baseclass import vmmGObjectUI
-from virtManager.asyncjob import vmmAsyncJob
-from virtManager.domain import vmmDomain
+from . import uiutil
+from .baseclass import vmmGObjectUI
+from .asyncjob import vmmAsyncJob
+from .domain import vmmDomain
 
 
 def uri_join(uri_tuple):

virtManager/netlist.py

@@ -23,8 +23,8 @@ from gi.repository import Gtk
 from gi.repository import GObject
 
 import virtinst
-from virtManager import uiutil
-from virtManager.baseclass import vmmGObjectUI
+from . import uiutil
+from .baseclass import vmmGObjectUI
 
 
 class vmmNetworkList(vmmGObjectUI):

virtManager/network.py

@@ -24,7 +24,7 @@ import ipaddr
 
 from virtinst import Network
 
-from virtManager.libvirtobject import vmmLibvirtObject
+from .libvirtobject import vmmLibvirtObject
 
 
 def _make_addr_str(addrStr, prefix, netmaskStr):

virtManager/nodedev.py

@@ -20,7 +20,7 @@
 
 from virtinst import NodeDevice
 
-from virtManager.libvirtobject import vmmLibvirtObject
+from .libvirtobject import vmmLibvirtObject
 
 
 def _parse_convert(conn, parsexml=None):

virtManager/preferences.py

@@ -23,8 +23,8 @@ import logging
 from gi.repository import Gtk
 from gi.repository import Gdk
 
-from virtManager import uiutil
-from virtManager.baseclass import vmmGObjectUI
+from . import uiutil
+from .baseclass import vmmGObjectUI
 
 
 class vmmPreferences(vmmGObjectUI):

virtManager/serialcon.py

@@ -32,7 +32,7 @@ from gi.repository import Vte
 
 import libvirt
 
-from virtManager.baseclass import vmmGObject
+from .baseclass import vmmGObject
 
 
 class ConsoleConnection(vmmGObject):

virtManager/snapshots.py

@@ -32,9 +32,9 @@ from gi.repository import Pango
 from virtinst import DomainSnapshot
 from virtinst import util
 
-from virtManager import uiutil
-from virtManager.baseclass import vmmGObjectUI
-from virtManager.asyncjob import vmmAsyncJob
+from . import uiutil
+from .baseclass import vmmGObjectUI
+from .asyncjob import vmmAsyncJob
 
 
 mimemap = {

virtManager/storagebrowse.py

@@ -23,11 +23,11 @@ import logging
 from gi.repository import GObject
 from gi.repository import Gtk
 
-from virtManager import host
-from virtManager.asyncjob import vmmAsyncJob
-from virtManager.createvol import vmmCreateVolume
-from virtManager.baseclass import vmmGObjectUI
-from virtManager import uiutil
+from . import host
+from .asyncjob import vmmAsyncJob
+from .createvol import vmmCreateVolume
+from .baseclass import vmmGObjectUI
+from . import uiutil
 
 
 class vmmStorageBrowser(vmmGObjectUI):

virtManager/storagepool.py

@@ -27,7 +27,7 @@ from virtinst import pollhelpers
 from virtinst import StoragePool, StorageVolume
 from virtinst import util
 
-from virtManager.libvirtobject import vmmLibvirtObject
+from .libvirtobject import vmmLibvirtObject
 
 
 class vmmStorageVolume(vmmLibvirtObject):

virtManager/systray.py

@@ -23,9 +23,9 @@ import logging
 from gi.repository import GObject
 from gi.repository import Gtk
 
-from virtManager import vmmenu
-from virtManager.baseclass import vmmGObject
-from virtManager.error import vmmErrorDialog
+from . import vmmenu
+from .baseclass import vmmGObject
+from .error import vmmErrorDialog
 
 try:
     from gi.repository import AppIndicator3  # pylint: disable=no-name-in-module