From 3062b5ce08cad6dedca8b2001ea239d54360973c Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Sun, 16 Jun 2019 22:19:17 -0400 Subject: [PATCH] virtManager: Move a lot of misc files to lib/ --- virt-manager | 4 ++-- virtManager/addhardware.py | 2 +- virtManager/clone.py | 2 +- virtManager/config.py | 4 ++-- virtManager/connection.py | 6 +++--- virtManager/createconn.py | 2 +- virtManager/createnet.py | 2 +- virtManager/createpool.py | 2 +- virtManager/createvm.py | 2 +- virtManager/createvol.py | 2 +- virtManager/delete.py | 2 +- virtManager/details/details.py | 6 +++--- virtManager/details/snapshots.py | 2 +- virtManager/device/addstorage.py | 2 +- virtManager/device/fsdetails.py | 2 +- virtManager/device/gfxdetails.py | 2 +- virtManager/device/mediacombo.py | 2 +- virtManager/device/netlist.py | 2 +- virtManager/device/vsockdetails.py | 2 +- virtManager/engine.py | 2 +- virtManager/host.py | 4 ++-- virtManager/hostnets.py | 2 +- virtManager/hoststorage.py | 2 +- virtManager/lib/__init__.py | 0 virtManager/{ => lib}/connectauth.py | 2 +- virtManager/{ => lib}/graphwidgets.py | 0 virtManager/{ => lib}/inspection.py | 6 +++--- virtManager/{ => lib}/keyring.py | 0 virtManager/{ => lib}/libvirtenummap.py | 0 virtManager/{ => lib}/module_trace.py | 0 virtManager/{ => lib}/statsmanager.py | 2 +- virtManager/{ => lib}/uiutil.py | 0 virtManager/manager.py | 4 ++-- virtManager/migrate.py | 2 +- virtManager/object/domain.py | 2 +- virtManager/preferences.py | 4 ++-- virtManager/storagebrowse.py | 2 +- virtManager/xmleditor.py | 2 +- 38 files changed, 43 insertions(+), 43 deletions(-) create mode 100644 virtManager/lib/__init__.py rename virtManager/{ => lib}/connectauth.py (99%) rename virtManager/{ => lib}/graphwidgets.py (100%) rename virtManager/{ => lib}/inspection.py (98%) rename virtManager/{ => lib}/keyring.py (100%) rename virtManager/{ => lib}/libvirtenummap.py (100%) rename virtManager/{ => lib}/module_trace.py (100%) rename virtManager/{ => lib}/statsmanager.py (99%) rename virtManager/{ => lib}/uiutil.py (100%) diff --git a/virt-manager b/virt-manager index 5da572f3d..ca6a59348 100755 --- a/virt-manager +++ b/virt-manager @@ -228,9 +228,9 @@ def main(): if options.trace_libvirt: log.debug("Libvirt tracing requested") - import virtManager.module_trace + from virtManager.lib import module_trace import libvirt - virtManager.module_trace.wrap_module(libvirt, + module_trace.wrap_module(libvirt, mainloop=(options.trace_libvirt == "mainloop"), regex=None) diff --git a/virtManager/addhardware.py b/virtManager/addhardware.py index 52ce0f6b6..842eada18 100644 --- a/virtManager/addhardware.py +++ b/virtManager/addhardware.py @@ -16,7 +16,7 @@ from virtinst import (DeviceChannel, DeviceConsole, DeviceSound, DeviceTpm, DeviceVideo, DeviceVsock, DeviceWatchdog) from virtinst import log -from . import uiutil +from .lib import uiutil from .asyncjob import vmmAsyncJob from .baseclass import vmmGObjectUI from .device.addstorage import vmmAddStorage diff --git a/virtManager/clone.py b/virtManager/clone.py index 507727a2f..8f53003cd 100644 --- a/virtManager/clone.py +++ b/virtManager/clone.py @@ -14,7 +14,7 @@ from virtinst import Cloner from virtinst import DeviceInterface from virtinst import log -from . import uiutil +from .lib import uiutil from .baseclass import vmmGObjectUI from .asyncjob import vmmAsyncJob from .storagebrowse import vmmStorageBrowser diff --git a/virtManager/config.py b/virtManager/config.py index ded3b2e44..55c6f06b8 100644 --- a/virtManager/config.py +++ b/virtManager/config.py @@ -13,8 +13,8 @@ from gi.repository import Gtk from virtinst import DomainCpu from virtinst import log -from .inspection import vmmInspection -from .keyring import vmmKeyring, vmmSecret +from .lib.inspection import vmmInspection +from .lib.keyring import vmmKeyring, vmmSecret class _SettingsWrapper(object): diff --git a/virtManager/connection.py b/virtManager/connection.py index 035fbe8b7..413e07e7b 100644 --- a/virtManager/connection.py +++ b/virtManager/connection.py @@ -15,15 +15,15 @@ import virtinst from virtinst import log from virtinst import pollhelpers -from . import connectauth +from .lib import connectauth from .baseclass import vmmGObject -from .libvirtenummap import LibvirtEnumMap +from .lib.libvirtenummap import LibvirtEnumMap from .object.domain import vmmDomain from .object.interface import vmmInterface from .object.network import vmmNetwork from .object.nodedev import vmmNodeDevice from .object.storagepool import vmmStoragePool -from .statsmanager import vmmStatsManager +from .lib.statsmanager import vmmStatsManager class _ObjectList(vmmGObject): diff --git a/virtManager/createconn.py b/virtManager/createconn.py index 773b7de7a..d30ee0919 100644 --- a/virtManager/createconn.py +++ b/virtManager/createconn.py @@ -12,7 +12,7 @@ from gi.repository import Gtk from virtinst import log -from . import uiutil +from .lib import uiutil from .baseclass import vmmGObjectUI from .connmanager import vmmConnectionManager diff --git a/virtManager/createnet.py b/virtManager/createnet.py index c0b7dc666..d785743c6 100644 --- a/virtManager/createnet.py +++ b/virtManager/createnet.py @@ -16,7 +16,7 @@ from virtinst import generatename from virtinst import log from virtinst import Network -from . import uiutil +from .lib import uiutil from .asyncjob import vmmAsyncJob from .baseclass import vmmGObjectUI from .xmleditor import vmmXMLEditor diff --git a/virtManager/createpool.py b/virtManager/createpool.py index 0adbe0f9e..188717cb8 100644 --- a/virtManager/createpool.py +++ b/virtManager/createpool.py @@ -12,7 +12,7 @@ from gi.repository import Gtk from virtinst import log from virtinst import StoragePool -from . import uiutil +from .lib import uiutil from .asyncjob import vmmAsyncJob from .baseclass import vmmGObjectUI from .xmleditor import vmmXMLEditor diff --git a/virtManager/createvm.py b/virtManager/createvm.py index a9497dd04..79d944237 100644 --- a/virtManager/createvm.py +++ b/virtManager/createvm.py @@ -18,7 +18,7 @@ import virtinst import virtinst.generatename from virtinst import log -from . import uiutil +from .lib import uiutil from .asyncjob import vmmAsyncJob from .baseclass import vmmGObjectUI from .connmanager import vmmConnectionManager diff --git a/virtManager/createvol.py b/virtManager/createvol.py index 6751e4bb8..7219c77d8 100644 --- a/virtManager/createvol.py +++ b/virtManager/createvol.py @@ -10,7 +10,7 @@ from gi.repository import Gdk from virtinst import log from virtinst import StorageVolume -from . import uiutil +from .lib import uiutil from .asyncjob import vmmAsyncJob from .baseclass import vmmGObjectUI from .xmleditor import vmmXMLEditor diff --git a/virtManager/delete.py b/virtManager/delete.py index 86d649602..6ad327f00 100644 --- a/virtManager/delete.py +++ b/virtManager/delete.py @@ -18,7 +18,7 @@ from virtinst import xmlutil from .asyncjob import vmmAsyncJob from .baseclass import vmmGObjectUI -from . import uiutil +from .lib import uiutil STORAGE_ROW_CONFIRM = 0 STORAGE_ROW_CANT_DELETE = 1 diff --git a/virtManager/details/details.py b/virtManager/details/details.py index d3e54fe55..51d170e9d 100644 --- a/virtManager/details/details.py +++ b/virtManager/details/details.py @@ -14,7 +14,7 @@ import libvirt import virtinst from virtinst import log -from .. import uiutil +from ..lib import uiutil from ..addhardware import vmmAddHardware from ..baseclass import vmmGObjectUI from ..device.addstorage import vmmAddStorage @@ -23,7 +23,7 @@ from ..device.gfxdetails import vmmGraphicsDetails from ..device.mediacombo import vmmMediaCombo from ..device.netlist import vmmNetworkList from ..device.vsockdetails import vmmVsockDetails -from ..graphwidgets import Sparkline +from ..lib.graphwidgets import Sparkline from ..oslist import vmmOSList from ..storagebrowse import vmmStorageBrowser from ..xmleditor import vmmXMLEditor @@ -1147,7 +1147,7 @@ class vmmDetails(vmmGObjectUI): return key def inspection_refresh(self, _src): - from ..inspection import vmmInspection + from ..lib.inspection import vmmInspection inspection = vmmInspection.get_instance() if inspection: inspection.vm_refresh(self.vm) diff --git a/virtManager/details/snapshots.py b/virtManager/details/snapshots.py index ab638fc24..65d014a52 100644 --- a/virtManager/details/snapshots.py +++ b/virtManager/details/snapshots.py @@ -19,7 +19,7 @@ from virtinst import generatename from virtinst import log from virtinst import xmlutil -from .. import uiutil +from ..lib import uiutil from ..asyncjob import vmmAsyncJob from ..baseclass import vmmGObjectUI diff --git a/virtManager/device/addstorage.py b/virtManager/device/addstorage.py index 03838b2ca..b98fe9bdd 100644 --- a/virtManager/device/addstorage.py +++ b/virtManager/device/addstorage.py @@ -10,7 +10,7 @@ from gi.repository import Gtk import virtinst from virtinst import log -from .. import uiutil +from ..lib import uiutil from ..baseclass import vmmGObjectUI diff --git a/virtManager/device/fsdetails.py b/virtManager/device/fsdetails.py index 97ecf01ca..68264a142 100644 --- a/virtManager/device/fsdetails.py +++ b/virtManager/device/fsdetails.py @@ -9,7 +9,7 @@ from gi.repository import Gtk from virtinst import DeviceFilesystem -from .. import uiutil +from ..lib import uiutil from ..baseclass import vmmGObjectUI from ..storagebrowse import vmmStorageBrowser diff --git a/virtManager/device/gfxdetails.py b/virtManager/device/gfxdetails.py index 1131ae8fe..e3fbd338d 100644 --- a/virtManager/device/gfxdetails.py +++ b/virtManager/device/gfxdetails.py @@ -9,7 +9,7 @@ from gi.repository import Gtk import virtinst -from .. import uiutil +from ..lib import uiutil from ..baseclass import vmmGObjectUI diff --git a/virtManager/device/mediacombo.py b/virtManager/device/mediacombo.py index 3fcb0488f..12ce3eee3 100644 --- a/virtManager/device/mediacombo.py +++ b/virtManager/device/mediacombo.py @@ -5,7 +5,7 @@ from gi.repository import Gtk -from .. import uiutil +from ..lib import uiutil from ..baseclass import vmmGObject, vmmGObjectUI diff --git a/virtManager/device/netlist.py b/virtManager/device/netlist.py index cffee3620..c5557cb0f 100644 --- a/virtManager/device/netlist.py +++ b/virtManager/device/netlist.py @@ -10,7 +10,7 @@ from gi.repository import Gtk import virtinst from virtinst import log -from .. import uiutil +from ..lib import uiutil from ..baseclass import vmmGObjectUI diff --git a/virtManager/device/vsockdetails.py b/virtManager/device/vsockdetails.py index b147dc729..6f765e98d 100644 --- a/virtManager/device/vsockdetails.py +++ b/virtManager/device/vsockdetails.py @@ -3,7 +3,7 @@ # This work is licensed under the GNU GPLv2 or later. # See the COPYING file in the top-level directory. -from .. import uiutil +from ..lib import uiutil from ..baseclass import vmmGObjectUI diff --git a/virtManager/engine.py b/virtManager/engine.py index 220a23f9e..8a5a4b133 100644 --- a/virtManager/engine.py +++ b/virtManager/engine.py @@ -18,7 +18,7 @@ from virtinst import log from .baseclass import vmmGObject from .createconn import vmmCreateConn from .connmanager import vmmConnectionManager -from .inspection import vmmInspection +from .lib.inspection import vmmInspection from .systray import vmmSystray (PRIO_HIGH, diff --git a/virtManager/host.py b/virtManager/host.py index d22dc77ef..a7a349b2d 100644 --- a/virtManager/host.py +++ b/virtManager/host.py @@ -6,10 +6,10 @@ from virtinst import log -from . import uiutil +from .lib import uiutil from .baseclass import vmmGObjectUI from .engine import vmmEngine -from .graphwidgets import Sparkline +from .lib.graphwidgets import Sparkline from .hostnets import vmmHostNets from .hoststorage import vmmHostStorage diff --git a/virtManager/hostnets.py b/virtManager/hostnets.py index 4bdf5da07..787a8f4c8 100644 --- a/virtManager/hostnets.py +++ b/virtManager/hostnets.py @@ -9,7 +9,7 @@ from gi.repository import Pango from virtinst import log -from . import uiutil +from .lib import uiutil from .asyncjob import vmmAsyncJob from .baseclass import vmmGObjectUI from .createnet import vmmCreateNetwork diff --git a/virtManager/hoststorage.py b/virtManager/hoststorage.py index 7d722aba4..c8c699d47 100644 --- a/virtManager/hoststorage.py +++ b/virtManager/hoststorage.py @@ -11,7 +11,7 @@ from virtinst import DeviceDisk from virtinst import log from virtinst import StoragePool -from . import uiutil +from .lib import uiutil from .asyncjob import vmmAsyncJob from .baseclass import vmmGObjectUI from .createpool import vmmCreatePool diff --git a/virtManager/lib/__init__.py b/virtManager/lib/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/virtManager/connectauth.py b/virtManager/lib/connectauth.py similarity index 99% rename from virtManager/connectauth.py rename to virtManager/lib/connectauth.py index 31acd6a37..759acdbdb 100644 --- a/virtManager/connectauth.py +++ b/virtManager/lib/connectauth.py @@ -17,7 +17,7 @@ import libvirt from virtinst import log -from .baseclass import vmmGObjectUI +from ..baseclass import vmmGObjectUI from . import uiutil diff --git a/virtManager/graphwidgets.py b/virtManager/lib/graphwidgets.py similarity index 100% rename from virtManager/graphwidgets.py rename to virtManager/lib/graphwidgets.py diff --git a/virtManager/inspection.py b/virtManager/lib/inspection.py similarity index 98% rename from virtManager/inspection.py rename to virtManager/lib/inspection.py index 76efa3747..b7d8959b9 100644 --- a/virtManager/inspection.py +++ b/virtManager/lib/inspection.py @@ -8,9 +8,9 @@ import threading from virtinst import log -from .baseclass import vmmGObject -from .connmanager import vmmConnectionManager -from .object.domain import vmmInspectionApplication, vmmInspectionData +from ..baseclass import vmmGObject +from ..connmanager import vmmConnectionManager +from ..object.domain import vmmInspectionApplication, vmmInspectionData def _inspection_error(_errstr): diff --git a/virtManager/keyring.py b/virtManager/lib/keyring.py similarity index 100% rename from virtManager/keyring.py rename to virtManager/lib/keyring.py diff --git a/virtManager/libvirtenummap.py b/virtManager/lib/libvirtenummap.py similarity index 100% rename from virtManager/libvirtenummap.py rename to virtManager/lib/libvirtenummap.py diff --git a/virtManager/module_trace.py b/virtManager/lib/module_trace.py similarity index 100% rename from virtManager/module_trace.py rename to virtManager/lib/module_trace.py diff --git a/virtManager/statsmanager.py b/virtManager/lib/statsmanager.py similarity index 99% rename from virtManager/statsmanager.py rename to virtManager/lib/statsmanager.py index 26a088248..e0f083766 100644 --- a/virtManager/statsmanager.py +++ b/virtManager/lib/statsmanager.py @@ -10,7 +10,7 @@ import libvirt from virtinst import log -from .baseclass import vmmGObject +from ..baseclass import vmmGObject class _VMStatsRecord(object): diff --git a/virtManager/uiutil.py b/virtManager/lib/uiutil.py similarity index 100% rename from virtManager/uiutil.py rename to virtManager/lib/uiutil.py diff --git a/virtManager/manager.py b/virtManager/manager.py index 88f39bdc5..83e32ccb7 100644 --- a/virtManager/manager.py +++ b/virtManager/manager.py @@ -13,11 +13,11 @@ from virtinst import log from virtinst import xmlutil from . import vmmenu -from . import uiutil +from .lib import uiutil from .baseclass import vmmGObjectUI from .connmanager import vmmConnectionManager from .engine import vmmEngine -from .graphwidgets import CellRendererSparkline +from .lib.graphwidgets import CellRendererSparkline # Number of data points for performance graphs GRAPH_LEN = 40 diff --git a/virtManager/migrate.py b/virtManager/migrate.py index d7973128f..a8ad209f9 100644 --- a/virtManager/migrate.py +++ b/virtManager/migrate.py @@ -13,7 +13,7 @@ from gi.repository import Pango from virtinst import log from virtinst import xmlutil -from . import uiutil +from .lib import uiutil from .asyncjob import vmmAsyncJob from .baseclass import vmmGObjectUI from .connmanager import vmmConnectionManager diff --git a/virtManager/object/domain.py b/virtManager/object/domain.py index 3c6900156..f61f0f536 100644 --- a/virtManager/object/domain.py +++ b/virtManager/object/domain.py @@ -18,7 +18,7 @@ from virtinst import Guest from virtinst import log from .libvirtobject import vmmLibvirtObject -from ..libvirtenummap import LibvirtEnumMap +from ..lib.libvirtenummap import LibvirtEnumMap class _SENTINEL(object): diff --git a/virtManager/preferences.py b/virtManager/preferences.py index 40bdf43f8..26d004fd9 100644 --- a/virtManager/preferences.py +++ b/virtManager/preferences.py @@ -10,9 +10,9 @@ from gi.repository import Gdk from virtinst import DomainCpu from virtinst import log -from . import uiutil +from .lib import uiutil from .baseclass import vmmGObjectUI -from .inspection import vmmInspection +from .lib.inspection import vmmInspection from .systray import vmmSystray diff --git a/virtManager/storagebrowse.py b/virtManager/storagebrowse.py index c117b8ba6..44e5dd2a2 100644 --- a/virtManager/storagebrowse.py +++ b/virtManager/storagebrowse.py @@ -6,7 +6,7 @@ from virtinst import log -from . import uiutil +from .lib import uiutil from .baseclass import vmmGObjectUI from .hoststorage import vmmHostStorage diff --git a/virtManager/xmleditor.py b/virtManager/xmleditor.py index 21786bf98..9e55f83d7 100644 --- a/virtManager/xmleditor.py +++ b/virtManager/xmleditor.py @@ -6,7 +6,7 @@ import gi gi.require_version('GtkSource', '4') from gi.repository import GtkSource -from . import uiutil +from .lib import uiutil from .baseclass import vmmGObjectUI _PAGE_DETAILS = 0