From accff84ecc92da0b78ec1700d556a956590715df Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Thu, 8 Aug 2013 20:47:17 -0400 Subject: [PATCH] virtinst: Fix import ordering to standardize on relative imports Kind of annoying that some imports were directly from files while some were from the __init__.py convenience bits. --- tests/capabilities.py | 5 +++-- virtinst/CloneManager.py | 4 ++-- virtinst/DistroInstaller.py | 6 +++--- virtinst/Guest.py | 16 ++++++++-------- virtinst/ImageInstaller.py | 6 +++--- virtinst/NodeDeviceParser.py | 8 +++++--- virtinst/VirtualAudio.py | 2 +- virtinst/VirtualCharDevice.py | 2 +- virtinst/VirtualController.py | 2 +- virtinst/VirtualDisk.py | 2 +- virtinst/VirtualFilesystem.py | 2 +- virtinst/VirtualGraphics.py | 2 +- virtinst/VirtualHostDevice.py | 4 ++-- virtinst/VirtualInputDevice.py | 2 +- virtinst/VirtualMemballoon.py | 2 +- virtinst/VirtualNetworkInterface.py | 2 +- virtinst/VirtualRedirDevice.py | 3 +-- virtinst/VirtualSmartCardDevice.py | 2 +- virtinst/VirtualTPMDevice.py | 2 +- virtinst/VirtualVideoDevice.py | 2 +- virtinst/VirtualWatchdog.py | 2 +- virtinst/__init__.py | 23 ++++++++++++++++------- virtinst/osdict.py | 2 +- virtinst/xmlbuilder.py | 1 + 24 files changed, 58 insertions(+), 46 deletions(-) diff --git a/tests/capabilities.py b/tests/capabilities.py index 707d4ae9f..f131cb8a7 100644 --- a/tests/capabilities.py +++ b/tests/capabilities.py @@ -14,9 +14,10 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, # MA 02110-1301 USA. -import os.path +import os import unittest -import virtinst.CapabilitiesParser as capabilities + +from virtinst import CapabilitiesParser as capabilities def build_host_feature_dict(feature_list): diff --git a/virtinst/CloneManager.py b/virtinst/CloneManager.py index 2a023fe67..92e9c5fa1 100644 --- a/virtinst/CloneManager.py +++ b/virtinst/CloneManager.py @@ -27,8 +27,8 @@ import urlgrabber.progress as progress import libvirt from virtinst import Guest -from virtinst.VirtualNetworkInterface import VirtualNetworkInterface -from virtinst.VirtualDisk import VirtualDisk +from virtinst import VirtualNetworkInterface +from virtinst import VirtualDisk from virtinst import Storage from virtinst import util diff --git a/virtinst/DistroInstaller.py b/virtinst/DistroInstaller.py index 6dcca5f50..e4cfd94c6 100644 --- a/virtinst/DistroInstaller.py +++ b/virtinst/DistroInstaller.py @@ -29,7 +29,7 @@ from virtinst import support from virtinst import Storage from virtinst import util from virtinst import Installer -from virtinst.VirtualDisk import VirtualDisk +from virtinst import VirtualDisk from virtinst import OSDistro @@ -238,9 +238,9 @@ def _upload_media(conn, scratchdir, system_scratchdir, -class DistroInstaller(Installer.Installer): +class DistroInstaller(Installer): def __init__(self, *args, **kwargs): - Installer.Installer.__init__(self, *args, **kwargs) + Installer.__init__(self, *args, **kwargs) self.livecd = False self._location_is_path = True diff --git a/virtinst/Guest.py b/virtinst/Guest.py index 733dfb8ac..35b6d4edd 100644 --- a/virtinst/Guest.py +++ b/virtinst/Guest.py @@ -30,15 +30,15 @@ import libvirt import virtinst from virtinst import util from virtinst import support -from virtinst.osxml import OSXML +from virtinst import OSXML +from virtinst import VirtualDisk +from virtinst import VirtualDevice +from virtinst import Clock +from virtinst import Seclabel +from virtinst import CPU +from virtinst import DomainNumatune +from virtinst import DomainFeatures from virtinst.xmlbuilder import XMLBuilder, XMLProperty -from virtinst.VirtualDisk import VirtualDisk -from virtinst.VirtualDevice import VirtualDevice -from virtinst.Clock import Clock -from virtinst.Seclabel import Seclabel -from virtinst.CPU import CPU -from virtinst.DomainNumatune import DomainNumatune -from virtinst.DomainFeatures import DomainFeatures from virtinst import osdict diff --git a/virtinst/ImageInstaller.py b/virtinst/ImageInstaller.py index 40847e426..e0c711e9d 100644 --- a/virtinst/ImageInstaller.py +++ b/virtinst/ImageInstaller.py @@ -23,17 +23,17 @@ import os from virtinst import Installer from virtinst import ImageParser from virtinst import CapabilitiesParser -from virtinst.VirtualDisk import VirtualDisk +from virtinst import VirtualDisk -class ImageInstaller(Installer.Installer): +class ImageInstaller(Installer): """ Installer for virt-image-based guests """ _has_install_phase = False def __init__(self, conn, image, boot_index=None): - Installer.Installer.__init__(self, conn) + Installer.__init__(self, conn) self._image = image diff --git a/virtinst/NodeDeviceParser.py b/virtinst/NodeDeviceParser.py index fea1c80d6..86dc03540 100644 --- a/virtinst/NodeDeviceParser.py +++ b/virtinst/NodeDeviceParser.py @@ -17,12 +17,14 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, # MA 02110-1301 USA. -from virtinst import util -import libvirt import logging -# class USBDevice +import libvirt +from virtinst import util + + +# class USBDevice CAPABILITY_TYPE_SYSTEM = "system" CAPABILITY_TYPE_NET = "net" CAPABILITY_TYPE_PCI = "pci" diff --git a/virtinst/VirtualAudio.py b/virtinst/VirtualAudio.py index 62cba487e..6d8e1997c 100644 --- a/virtinst/VirtualAudio.py +++ b/virtinst/VirtualAudio.py @@ -17,7 +17,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, # MA 02110-1301 USA. -from virtinst.VirtualDevice import VirtualDevice +from virtinst import VirtualDevice from virtinst.xmlbuilder import XMLProperty diff --git a/virtinst/VirtualCharDevice.py b/virtinst/VirtualCharDevice.py index 95b4166d2..a6942744e 100644 --- a/virtinst/VirtualCharDevice.py +++ b/virtinst/VirtualCharDevice.py @@ -17,7 +17,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, # MA 02110-1301 USA. -from virtinst.VirtualDevice import VirtualDevice +from virtinst import VirtualDevice from virtinst.xmlbuilder import XMLProperty diff --git a/virtinst/VirtualController.py b/virtinst/VirtualController.py index 58c18fac5..91cc84f76 100644 --- a/virtinst/VirtualController.py +++ b/virtinst/VirtualController.py @@ -17,7 +17,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, # MA 02110-1301 USA. -from virtinst.VirtualDevice import VirtualDevice +from virtinst import VirtualDevice from virtinst.xmlbuilder import XMLProperty diff --git a/virtinst/VirtualDisk.py b/virtinst/VirtualDisk.py index 66855b57b..7ec73228c 100644 --- a/virtinst/VirtualDisk.py +++ b/virtinst/VirtualDisk.py @@ -31,7 +31,7 @@ import urlgrabber.progress as progress import virtinst from virtinst import diskbackend from virtinst import util -from virtinst.VirtualDevice import VirtualDevice +from virtinst import VirtualDevice from virtinst.xmlbuilder import XMLProperty diff --git a/virtinst/VirtualFilesystem.py b/virtinst/VirtualFilesystem.py index 9573bfefc..ef64f7944 100644 --- a/virtinst/VirtualFilesystem.py +++ b/virtinst/VirtualFilesystem.py @@ -19,7 +19,7 @@ import os -from virtinst.VirtualDevice import VirtualDevice +from virtinst import VirtualDevice from virtinst.xmlbuilder import XMLProperty diff --git a/virtinst/VirtualGraphics.py b/virtinst/VirtualGraphics.py index 782ef3a29..6a7c6e9bd 100644 --- a/virtinst/VirtualGraphics.py +++ b/virtinst/VirtualGraphics.py @@ -19,7 +19,7 @@ import os -from virtinst.VirtualDevice import VirtualDevice +from virtinst import VirtualDevice from virtinst.xmlbuilder import XMLProperty diff --git a/virtinst/VirtualHostDevice.py b/virtinst/VirtualHostDevice.py index 0f24804a2..93f1f15f4 100644 --- a/virtinst/VirtualHostDevice.py +++ b/virtinst/VirtualHostDevice.py @@ -17,9 +17,9 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, # MA 02110-1301 USA. -from virtinst.VirtualDevice import VirtualDevice -from virtinst.xmlbuilder import XMLProperty +from virtinst import VirtualDevice from virtinst import NodeDeviceParser +from virtinst.xmlbuilder import XMLProperty class VirtualHostDevice(VirtualDevice): diff --git a/virtinst/VirtualInputDevice.py b/virtinst/VirtualInputDevice.py index e71f3bbcb..46c9dca25 100644 --- a/virtinst/VirtualInputDevice.py +++ b/virtinst/VirtualInputDevice.py @@ -17,7 +17,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, # MA 02110-1301 USA. -from virtinst.VirtualDevice import VirtualDevice +from virtinst import VirtualDevice from virtinst.xmlbuilder import XMLProperty diff --git a/virtinst/VirtualMemballoon.py b/virtinst/VirtualMemballoon.py index aac5c0d43..8f2f65d94 100644 --- a/virtinst/VirtualMemballoon.py +++ b/virtinst/VirtualMemballoon.py @@ -17,7 +17,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, # MA 02110-1301 USA. -from virtinst.VirtualDevice import VirtualDevice +from virtinst import VirtualDevice from virtinst.xmlbuilder import XMLProperty diff --git a/virtinst/VirtualNetworkInterface.py b/virtinst/VirtualNetworkInterface.py index 3249366a4..3e59d2772 100644 --- a/virtinst/VirtualNetworkInterface.py +++ b/virtinst/VirtualNetworkInterface.py @@ -21,7 +21,7 @@ import logging import random from virtinst import util -from virtinst.VirtualDevice import VirtualDevice +from virtinst import VirtualDevice from virtinst.xmlbuilder import XMLBuilder, XMLProperty diff --git a/virtinst/VirtualRedirDevice.py b/virtinst/VirtualRedirDevice.py index c4c64803f..4b1d40c7c 100644 --- a/virtinst/VirtualRedirDevice.py +++ b/virtinst/VirtualRedirDevice.py @@ -19,8 +19,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, # MA 02110-1301 USA. -from virtinst.VirtualDevice import VirtualDevice - +from virtinst import VirtualDevice from virtinst.xmlbuilder import XMLProperty diff --git a/virtinst/VirtualSmartCardDevice.py b/virtinst/VirtualSmartCardDevice.py index 5a4fcbd12..111b0ea61 100644 --- a/virtinst/VirtualSmartCardDevice.py +++ b/virtinst/VirtualSmartCardDevice.py @@ -19,7 +19,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, # MA 02110-1301 USA. -from virtinst.VirtualDevice import VirtualDevice +from virtinst import VirtualDevice from virtinst.xmlbuilder import XMLProperty diff --git a/virtinst/VirtualTPMDevice.py b/virtinst/VirtualTPMDevice.py index ffdc8cd79..5f28837c3 100644 --- a/virtinst/VirtualTPMDevice.py +++ b/virtinst/VirtualTPMDevice.py @@ -22,7 +22,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, # MA 02110-1301 USA. -from virtinst.VirtualDevice import VirtualDevice +from virtinst import VirtualDevice from virtinst.xmlbuilder import XMLProperty diff --git a/virtinst/VirtualVideoDevice.py b/virtinst/VirtualVideoDevice.py index 252747ce2..efabdb5db 100644 --- a/virtinst/VirtualVideoDevice.py +++ b/virtinst/VirtualVideoDevice.py @@ -17,7 +17,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, # MA 02110-1301 USA. -from virtinst.VirtualDevice import VirtualDevice +from virtinst import VirtualDevice from virtinst.xmlbuilder import XMLProperty diff --git a/virtinst/VirtualWatchdog.py b/virtinst/VirtualWatchdog.py index 5dfd117cf..59d9add22 100644 --- a/virtinst/VirtualWatchdog.py +++ b/virtinst/VirtualWatchdog.py @@ -17,7 +17,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, # MA 02110-1301 USA. -from virtinst.VirtualDevice import VirtualDevice +from virtinst import VirtualDevice from virtinst.xmlbuilder import XMLProperty diff --git a/virtinst/__init__.py b/virtinst/__init__.py index 42c9b5b28..3c6ea22f5 100644 --- a/virtinst/__init__.py +++ b/virtinst/__init__.py @@ -19,10 +19,17 @@ enable_rhel_defaults = not cliconfig.rhel_enable_unsupported_opts cliutils.setup_i18n() -# Public imports +from virtinst import util +from virtinst import support -from virtinst.Guest import Guest from virtinst.osxml import OSXML +from virtinst.DomainFeatures import DomainFeatures +from virtinst.DomainNumatune import DomainNumatune +from virtinst.Clock import Clock +from virtinst.CPU import CPU, CPUFeature +from virtinst.Seclabel import Seclabel + +from virtinst.VirtualDevice import VirtualDevice from virtinst.VirtualNetworkInterface import VirtualNetworkInterface from virtinst.VirtualGraphics import VirtualGraphics from virtinst.VirtualAudio import VirtualAudio @@ -41,12 +48,14 @@ from virtinst.VirtualSmartCardDevice import VirtualSmartCardDevice from virtinst.VirtualRedirDevice import VirtualRedirDevice from virtinst.VirtualMemballoon import VirtualMemballoon from virtinst.VirtualTPMDevice import VirtualTPMDevice + +from virtinst.Installer import (ContainerInstaller, ImportInstaller, + LiveCDInstaller, PXEInstaller, Installer) + from virtinst.DistroInstaller import DistroInstaller from virtinst.ImageInstaller import ImageInstaller -from virtinst.Installer import (ContainerInstaller, ImportInstaller, - LiveCDInstaller, PXEInstaller) + +from virtinst.Guest import Guest from virtinst.CloneManager import Cloner -from virtinst.Clock import Clock -from virtinst.CPU import CPU, CPUFeature -from virtinst.Seclabel import Seclabel + from virtinst.connection import VirtualConnection diff --git a/virtinst/osdict.py b/virtinst/osdict.py index 5f84b7ae1..19a5241b6 100644 --- a/virtinst/osdict.py +++ b/virtinst/osdict.py @@ -20,7 +20,7 @@ # MA 02110-1301 USA. from virtinst import support -from virtinst.VirtualDevice import VirtualDevice +from virtinst import VirtualDevice HV_ALL = "all" diff --git a/virtinst/xmlbuilder.py b/virtinst/xmlbuilder.py index 474a6c710..2c1f569bf 100644 --- a/virtinst/xmlbuilder.py +++ b/virtinst/xmlbuilder.py @@ -26,6 +26,7 @@ import libxml2 from virtinst import util + # pylint: disable=W0212 # This whole file is calling around into non-public functions that we # don't want regular API users to touch