[blivet:master 4/5] Change implicit relative imports to explicit relative imports

mulhern amulhern at redhat.com
Mon Apr 7 22:40:51 UTC 2014


Signed-off-by: mulhern <amulhern at redhat.com>
---
 blivet/__init__.py           | 48 +++++++++++-----------
 blivet/deviceaction.py       | 14 +++----
 blivet/devicefactory.py      | 16 ++++----
 blivet/devices.py            | 32 +++++++--------
 blivet/devicetree.py         | 98 ++++++++++++++++++++++----------------------
 blivet/formats/fslabeling.py |  2 +-
 blivet/iscsi.py              |  2 +-
 blivet/partitioning.py       | 14 +++----
 blivet/size.py               |  4 +-
 blivet/udev.py               | 12 +++---
 blivet/util.py               |  4 +-
 blivet/zfcp.py               |  2 +-
 12 files changed, 124 insertions(+), 124 deletions(-)

diff --git a/blivet/__init__.py b/blivet/__init__.py
index 8b0815f..3954114 100644
--- a/blivet/__init__.py
+++ b/blivet/__init__.py
@@ -65,29 +65,29 @@ import parted
 
 from pykickstart.constants import AUTOPART_TYPE_LVM, CLEARPART_TYPE_ALL, CLEARPART_TYPE_LINUX, CLEARPART_TYPE_LIST, CLEARPART_TYPE_NONE
 
-from storage_log import log_method_call
-from errors import DeviceError, DirtyFSError, FSResizeError, FSTabTypeMismatchError, LUKSDeviceWithoutKeyError, UnknownSourceDeviceError, SanityError, SanityWarning, StorageError, UnrecognizedFSTabEntryError
-from devices import BTRFSDevice, BTRFSSubVolumeDevice, BTRFSVolumeDevice, DirectoryDevice, FileDevice, LVMLogicalVolumeDevice, LVMThinLogicalVolumeDevice, LVMThinPoolDevice, LVMVolumeGroupDevice, MDRaidArrayDevice, NetworkStorageDevice, NFSDevice, NoDevice, OpticalDevice, PartitionDevice, TmpFSDevice, devicePathToName
-from devicetree import DeviceTree
-from deviceaction import ActionCreateDevice, ActionCreateFormat, ActionDestroyDevice, ActionDestroyFormat, ActionResizeDevice, ActionResizeFormat
-from formats import getFormat
-from formats import get_device_format_class
-from formats import get_default_filesystem_type
-import devicefactory
-from devicelibs.dm import name_from_dm_node
-from devicelibs.crypto import generateBackupPassphrase
-from devicelibs.edd import get_edd_dict
-from devicelibs.dasd import make_dasd_list, write_dasd_conf
-from udev import udev_trigger
-import iscsi
-import fcoe
-import zfcp
-import util
-import arch
-from flags import flags
-from platform import platform as _platform
-from size import Size
-from i18n import _
+from .storage_log import log_method_call
+from .errors import DeviceError, DirtyFSError, FSResizeError, FSTabTypeMismatchError, LUKSDeviceWithoutKeyError, UnknownSourceDeviceError, SanityError, SanityWarning, StorageError, UnrecognizedFSTabEntryError
+from .devices import BTRFSDevice, BTRFSSubVolumeDevice, BTRFSVolumeDevice, DirectoryDevice, FileDevice, LVMLogicalVolumeDevice, LVMThinLogicalVolumeDevice, LVMThinPoolDevice, LVMVolumeGroupDevice, MDRaidArrayDevice, NetworkStorageDevice, NFSDevice, NoDevice, OpticalDevice, PartitionDevice, TmpFSDevice, devicePathToName
+from .devicetree import DeviceTree
+from .deviceaction import ActionCreateDevice, ActionCreateFormat, ActionDestroyDevice, ActionDestroyFormat, ActionResizeDevice, ActionResizeFormat
+from .formats import getFormat
+from .formats import get_device_format_class
+from .formats import get_default_filesystem_type
+from . import devicefactory
+from .devicelibs.dm import name_from_dm_node
+from .devicelibs.crypto import generateBackupPassphrase
+from .devicelibs.edd import get_edd_dict
+from .devicelibs.dasd import make_dasd_list, write_dasd_conf
+from .udev import udev_trigger
+from . import iscsi
+from . import fcoe
+from . import zfcp
+from . import util
+from . import arch
+from .flags import flags
+from .platform import platform as _platform
+from .size import Size
+from .i18n import _
 
 import shelve
 import contextlib
@@ -129,7 +129,7 @@ def storageInitialize(storage, ksdata, protected):
     flags.update_from_anaconda_flags(anaconda_flags)
 
     # Platform class setup depends on flags, re-initialize it.
-    import platform
+    from . import platform
     platform.reset_platform()
 
     storage.shutdown()
diff --git a/blivet/deviceaction.py b/blivet/deviceaction.py
index 3697733..4a50a1a 100644
--- a/blivet/deviceaction.py
+++ b/blivet/deviceaction.py
@@ -20,15 +20,15 @@
 # Red Hat Author(s): Dave Lehman <dlehman at redhat.com>
 #
 
-import util
+from . import util
 
-import udev
-from devices import StorageDevice
-from devices import PartitionDevice
-from devices import LVMLogicalVolumeDevice
-from formats import getFormat
+from . import udev
+from .devices import StorageDevice
+from .devices import PartitionDevice
+from .devices import LVMLogicalVolumeDevice
+from .formats import getFormat
 from parted import partitionFlag, PARTITION_LBA
-from i18n import _, N_
+from .i18n import _, N_
 
 import logging
 log = logging.getLogger("blivet")
diff --git a/blivet/devicefactory.py b/blivet/devicefactory.py
index 73a354d..6a90b58 100644
--- a/blivet/devicefactory.py
+++ b/blivet/devicefactory.py
@@ -20,14 +20,14 @@
 # Red Hat Author(s): David Lehman <dlehman at redhat.com>
 #
 
-from storage_log import log_method_call
-from errors import DeviceFactoryError, StorageError
-from devices import LUKSDevice
-from formats import getFormat
-from devicelibs import mdraid
-from devicelibs.lvm import get_pv_space
-from devicelibs.lvm import get_pool_padding
-from devicelibs.lvm import LVM_PE_SIZE
+from .storage_log import log_method_call
+from .errors import DeviceFactoryError, StorageError
+from .devices import LUKSDevice
+from .formats import getFormat
+from .devicelibs import mdraid
+from .devicelibs.lvm import get_pv_space
+from .devicelibs.lvm import get_pool_padding
+from .devicelibs.lvm import LVM_PE_SIZE
 from .partitioning import SameSizeSet
 from .partitioning import TotalSizeSet
 from .partitioning import doPartitioning
diff --git a/blivet/devices.py b/blivet/devices.py
index d7cc4b6..0520297 100644
--- a/blivet/devices.py
+++ b/blivet/devices.py
@@ -28,26 +28,26 @@ import abc
 from decimal import Decimal
 
 # device backend modules
-from devicelibs import raid
-from devicelibs import mdraid
-from devicelibs import lvm
-from devicelibs import dm
-from devicelibs import loop
-from devicelibs import btrfs
-from devicelibs import crypto
+from .devicelibs import raid
+from .devicelibs import mdraid
+from .devicelibs import lvm
+from .devicelibs import dm
+from .devicelibs import loop
+from .devicelibs import btrfs
+from .devicelibs import crypto
 import parted
 import _ped
 import block
 
-import errors
-import util
-import arch
-from flags import flags
-from storage_log import log_method_call
-import udev
-from formats import get_device_format_class, getFormat, DeviceFormat
-from size import Size
-from i18n import P_
+from . import errors
+from . import util
+from . import arch
+from .flags import flags
+from .storage_log import log_method_call
+from . import udev
+from .formats import get_device_format_class, getFormat, DeviceFormat
+from .size import Size
+from .i18n import P_
 
 import logging
 log = logging.getLogger("blivet")
diff --git a/blivet/devicetree.py b/blivet/devicetree.py
index 96daafb..c741f06 100644
--- a/blivet/devicetree.py
+++ b/blivet/devicetree.py
@@ -27,27 +27,27 @@ import shutil
 import pprint
 import copy
 
-from errors import CryptoError, DeviceError, DeviceTreeError, DiskLabelCommitError, DMError, FSError, InvalidDiskLabelError, LUKSError, MDRaidError, StorageError
-from devices import BTRFSDevice, BTRFSSubVolumeDevice, BTRFSVolumeDevice, DASDDevice, DMDevice, DMLinearDevice, DMRaidArrayDevice, DiskDevice, FcoeDiskDevice, FileDevice, LoopDevice, LUKSDevice, LVMLogicalVolumeDevice, LVMThinLogicalVolumeDevice, LVMThinPoolDevice, LVMVolumeGroupDevice, MDRaidArrayDevice, MultipathDevice, NoDevice, OpticalDevice, PartitionDevice, ZFCPDiskDevice, devicePathToName, iScsiDiskDevice
-from deviceaction import ActionCreateDevice, ActionDestroyDevice, action_type_from_string, action_object_from_string
-import formats
-from formats import getFormat
-from formats.fs import nodev_filesystems
-import devicelibs.mdraid
-import devicelibs.dm
-import devicelibs.lvm
-import devicelibs.mpath
-import devicelibs.loop
-import devicelibs.edd
-import udev
-import util
-from platform import platform
-import tsort
-from flags import flags
-from storage_log import log_method_call, log_method_return
+from .errors import CryptoError, DeviceError, DeviceTreeError, DiskLabelCommitError, DMError, FSError, InvalidDiskLabelError, LUKSError, MDRaidError, StorageError
+from .devices import BTRFSDevice, BTRFSSubVolumeDevice, BTRFSVolumeDevice, DASDDevice, DMDevice, DMLinearDevice, DMRaidArrayDevice, DiskDevice, FcoeDiskDevice, FileDevice, LoopDevice, LUKSDevice, LVMLogicalVolumeDevice, LVMThinLogicalVolumeDevice, LVMThinPoolDevice, LVMVolumeGroupDevice, MDRaidArrayDevice, MultipathDevice, NoDevice, OpticalDevice, PartitionDevice, ZFCPDiskDevice, devicePathToName, iScsiDiskDevice
+from .deviceaction import ActionCreateDevice, ActionDestroyDevice, action_type_from_string, action_object_from_string
+from . import formats
+from .formats import getFormat
+from .formats.fs import nodev_filesystems
+from .devicelibs import mdraid
+from .devicelibs import dm
+from .devicelibs import lvm
+from .devicelibs import mpath
+from .devicelibs import loop
+from .devicelibs import edd
+from . import udev
+from . import util
+from .platform import platform
+from . import tsort
+from .flags import flags
+from .storage_log import log_method_call, log_method_return
 import parted
-from i18n import _
-from size import Size
+from .i18n import _
+from .size import Size
 
 import logging
 log = logging.getLogger("blivet")
@@ -138,7 +138,7 @@ class DeviceTree(object):
             self.__luksDevs = luksDict
             self.__passphrases.extend([p for p in luksDict.values() if p])
 
-        devicelibs.lvm.lvm_cc_resetFilter()
+        lvm.lvm_cc_resetFilter()
 
         self._cleanup = False
 
@@ -160,19 +160,19 @@ class DeviceTree(object):
 
     def addIgnoredDisk(self, disk):
         self.ignoredDisks.append(disk)
-        devicelibs.lvm.lvm_cc_addFilterRejectRegexp(disk)
+        lvm.lvm_cc_addFilterRejectRegexp(disk)
 
     @property
     def pvInfo(self):
         if self._pvInfo is None:
-            self._pvInfo = devicelibs.lvm.pvinfo()
+            self._pvInfo = lvm.pvinfo()
 
         return self._pvInfo
 
     @property
     def lvInfo(self):
         if self._lvInfo is None:
-            self._lvInfo = devicelibs.lvm.lvs()
+            self._lvInfo = lvm.lvs()
 
         return self._lvInfo
 
@@ -281,7 +281,7 @@ class DeviceTree(object):
 
             # Remove lvm filters for devices we are operating on
             for device in (d for d in self._devices if d.dependsOn(action.device)):
-                devicelibs.lvm.lvm_cc_removeFilterRejectRegexp(device.name)
+                lvm.lvm_cc_removeFilterRejectRegexp(device.name)
 
         for action in self._actions[:]:
             log.info("executing action: %s", action)
@@ -599,7 +599,7 @@ class DeviceTree(object):
 
         if name.startswith("loop"):
             # ignore loop devices unless they're backed by a file
-            return (not devicelibs.loop.get_backing_file(name))
+            return (not loop.get_backing_file(name))
 
         if self.udevDeviceIsDisk(info):
             # Ignore any readonly disks
@@ -700,7 +700,7 @@ class DeviceTree(object):
             for slave_name in slave_names:
                 # if it's a dm-X name, resolve it to a map name first
                 if slave_name.startswith("dm-"):
-                    dev_name = devicelibs.dm.name_from_dm_node(slave_name)
+                    dev_name = dm.name_from_dm_node(slave_name)
                 else:
                     dev_name = slave_name.replace("!", "/") # handles cciss
                 slave_dev = self.getDeviceByName(dev_name)
@@ -750,7 +750,7 @@ class DeviceTree(object):
             # something must be wrong -- if all of the slaves are in
             # the tree, this device should be as well
             if device is None:
-                devicelibs.lvm.lvm_cc_addFilterRejectRegexp(name)
+                lvm.lvm_cc_addFilterRejectRegexp(name)
                 log.warning("ignoring dm device %s", name)
 
         return device
@@ -771,7 +771,7 @@ class DeviceTree(object):
         for slave_name in slave_names:
             # if it's a dm-X name, resolve it to a map name first
             if slave_name.startswith("dm-"):
-                dev_name = devicelibs.dm.name_from_dm_node(slave_name)
+                dev_name = dm.name_from_dm_node(slave_name)
             else:
                 dev_name = slave_name.replace("!", "/") # handles cciss
             slave_dev = self.getDeviceByName(dev_name)
@@ -815,7 +815,7 @@ class DeviceTree(object):
         for slave_name in slave_names:
             # if it's a dm-X name, resolve it to a map name
             if slave_name.startswith("dm-"):
-                dev_name = devicelibs.dm.name_from_dm_node(slave_name)
+                dev_name = dm.name_from_dm_node(slave_name)
             else:
                 dev_name = slave_name
             slave_dev = self.getDeviceByName(dev_name)
@@ -851,7 +851,7 @@ class DeviceTree(object):
 
             log.error("failed to scan md array %s", name)
             try:
-                devicelibs.mdraid.mddeactivate(path)
+                mdraid.mddeactivate(path)
             except MDRaidError:
                 log.error("failed to stop broken md array %s", name)
 
@@ -864,7 +864,7 @@ class DeviceTree(object):
         device = None
 
         if name.startswith("md"):
-            name = devicelibs.mdraid.name_from_md_node(name)
+            name = mdraid.name_from_md_node(name)
             device = self.getDeviceByName(name)
             if device:
                 return device
@@ -873,7 +873,7 @@ class DeviceTree(object):
             disk_name = os.path.basename(os.path.dirname(sysfs_path))
             disk_name = disk_name.replace('!','/')
             if disk_name.startswith("md"):
-                disk_name = devicelibs.mdraid.name_from_md_node(disk_name)
+                disk_name = mdraid.name_from_md_node(disk_name)
 
             disk = self.getDeviceByName(disk_name)
 
@@ -888,7 +888,7 @@ class DeviceTree(object):
                 # if the current device is still not in
                 # the tree, something has gone wrong
                 log.error("failure scanning device %s", disk_name)
-                devicelibs.lvm.lvm_cc_addFilterRejectRegexp(name)
+                lvm.lvm_cc_addFilterRejectRegexp(name)
                 return
 
         if not disk.partitioned:
@@ -901,7 +901,7 @@ class DeviceTree(object):
             # fwraid members from lvm since multipath and dmraid are already
             # active and lvm should therefore know to ignore them
             if not disk.format.hidden:
-                devicelibs.lvm.lvm_cc_addFilterRejectRegexp(name)
+                lvm.lvm_cc_addFilterRejectRegexp(name)
 
             log.debug("ignoring partition %s on %s", name, disk.format.type)
             return
@@ -972,7 +972,7 @@ class DeviceTree(object):
             parentName = devicePathToName(parentPath)
             container = self.getDeviceByName(parentName)
             if not container:
-                parentSysName = devicelibs.mdraid.md_node_from_name(parentName)
+                parentSysName = mdraid.md_node_from_name(parentName)
                 container_sysfs = "/class/block/" + parentSysName
                 container_info = udev.udev_get_block_device(container_sysfs)
                 if not container_info:
@@ -1019,7 +1019,7 @@ class DeviceTree(object):
                           minor=udev.udev_device_get_minor(info),
                           sysfsPath=sysfs_path, **kwargs)
 
-        if devicelibs.mpath.is_multipath_member(device.path):
+        if mpath.is_multipath_member(device.path):
             info["ID_FS_TYPE"] = "multipath_member"
 
         if diskType == DASDDevice:
@@ -1105,7 +1105,7 @@ class DeviceTree(object):
                 device = None
 
         if device and device.isDisk and \
-           devicelibs.mpath.is_multipath_member(device.path):
+           mpath.is_multipath_member(device.path):
             # mark as multipath_member also when repopulating devicetree
             info["ID_FS_TYPE"] = "multipath_member"
             # newly added device (eg iSCSI) could make this one a multipath member
@@ -1355,7 +1355,7 @@ class DeviceTree(object):
 
             if lv_attr[0] in 'Ss':
                 log.info("found lvm snapshot volume '%s'", name)
-                origin_name = devicelibs.lvm.lvorigin(vg_name, lv_name)
+                origin_name = lvm.lvorigin(vg_name, lv_name)
                 if not origin_name:
                     log.error("lvm snapshot '%s-%s' has unknown origin",
                                 vg_name, lv_name)
@@ -1405,7 +1405,7 @@ class DeviceTree(object):
                 lv_class = LVMThinPoolDevice
             elif lv_attr[0] == 'V':
                 # thin volume
-                pool_name = devicelibs.lvm.thinlvpoolname(vg_name, lv_name)
+                pool_name = lvm.thinlvpoolname(vg_name, lv_name)
                 pool_device_name = "%s-%s" % (vg_name, pool_name)
                 addRequiredLV(pool_device_name, "failed to look up thin pool")
                 lv_class = LVMThinLogicalVolumeDevice
@@ -1731,7 +1731,7 @@ class DeviceTree(object):
             # luks/dmcrypt
             kwargs["name"] = "luks-%s" % uuid
         elif format_type in formats.mdraid.MDRaidMember._udevTypes:
-            info.update(devicelibs.mdraid.mdexamine(device.path))
+            info.update(mdraid.mdexamine(device.path))
 
             # mdraid
             try:
@@ -1826,7 +1826,7 @@ class DeviceTree(object):
             # incomplete VGs. We will remove the PVs from the blacklist when/if
             # the time comes to remove the incomplete VG and its PVs.
             for pv in vg.pvs:
-                devicelibs.lvm.lvm_cc_addFilterRejectRegexp(pv.name)
+                lvm.lvm_cc_addFilterRejectRegexp(pv.name)
 
     def hide(self, device):
         """ Hide the specified device.
@@ -1883,7 +1883,7 @@ class DeviceTree(object):
         self._removeDevice(device, force=True, moddisk=False)
 
         self._hidden.append(device)
-        devicelibs.lvm.lvm_cc_addFilterRejectRegexp(device.name)
+        lvm.lvm_cc_addFilterRejectRegexp(device.name)
 
         if isinstance(device, DASDDevice):
             self.dasd.remove(device)
@@ -1912,7 +1912,7 @@ class DeviceTree(object):
                                                           hidden.id)
                 self._hidden.remove(hidden)
                 self._devices.append(hidden)
-                devicelibs.lvm.lvm_cc_removeFilterRejectRegexp(hidden.name)
+                lvm.lvm_cc_removeFilterRejectRegexp(hidden.name)
                 for parent in hidden.parents:
                     parent.addChild()
 
@@ -1928,7 +1928,7 @@ class DeviceTree(object):
                 filedev.setup()
                 log.debug("%s", filedev)
 
-                loop_name = devicelibs.loop.get_loop_name(filedev.path)
+                loop_name = loop.get_loop_name(filedev.path)
                 loop_sysfs = None
                 if loop_name:
                     loop_sysfs = "/class/block/%s" % loop_name
@@ -2029,7 +2029,7 @@ class DeviceTree(object):
         self.dropLVMCache()
 
         if flags.installer_mode and not flags.image_install:
-            devicelibs.mpath.set_friendly_names(enabled=flags.multipath_friendly_names)
+            mpath.set_friendly_names(enabled=flags.multipath_friendly_names)
 
         self.setupDiskImages()
 
@@ -2472,7 +2472,7 @@ class DeviceTree(object):
         elif re.match(r'(0x)?[A-Za-z0-9]{2}(p\d+)?$', devspec):
             # BIOS drive number
             spec = int(devspec, 16)
-            for (edd_name, edd_number) in devicelibs.edd.edd_dict.items():
+            for (edd_name, edd_number) in edd.edd_dict.items():
                 if edd_number == spec:
                     device = self.getDeviceByName(edd_name)
                     break
@@ -2490,7 +2490,7 @@ class DeviceTree(object):
 
                 if devspec.startswith("/dev/dm-"):
                     try:
-                        dm_name = devicelibs.dm.name_from_dm_node(devspec[5:])
+                        dm_name = dm.name_from_dm_node(devspec[5:])
                     except StorageError as e:
                         log.info("failed to resolve %s: %s", devspec, e)
                         dm_name = None
@@ -2500,7 +2500,7 @@ class DeviceTree(object):
 
                 if re.match(r'/dev/md\d+(p\d+)?$', devspec):
                     try:
-                        md_name = devicelibs.mdraid.name_from_md_node(devspec[5:])
+                        md_name = mdraid.name_from_md_node(devspec[5:])
                     except StorageError as e:
                         log.info("failed to resolve %s: %s", devspec, e)
                         md_name = None
diff --git a/blivet/formats/fslabeling.py b/blivet/formats/fslabeling.py
index c718560..22e86fe 100644
--- a/blivet/formats/fslabeling.py
+++ b/blivet/formats/fslabeling.py
@@ -21,7 +21,7 @@
 
 import abc
 
-import fslabel
+from . import fslabel
 
 class FSLabeling(object):
     """An abstract class that represents filesystem labeling actions.
diff --git a/blivet/iscsi.py b/blivet/iscsi.py
index ba3aaf0..28071ed 100644
--- a/blivet/iscsi.py
+++ b/blivet/iscsi.py
@@ -18,7 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-from udev import udev_settle
+from .udev import udev_settle
 from . import util
 from .flags import flags
 from .i18n import _
diff --git a/blivet/partitioning.py b/blivet/partitioning.py
index 2409a70..0135d05 100644
--- a/blivet/partitioning.py
+++ b/blivet/partitioning.py
@@ -25,13 +25,13 @@ from operator import gt, lt
 import parted
 from pykickstart.constants import AUTOPART_TYPE_BTRFS, AUTOPART_TYPE_LVM, AUTOPART_TYPE_LVM_THINP, AUTOPART_TYPE_PLAIN
 
-from errors import DeviceError, NoDisksError, NotEnoughFreeSpaceError, PartitioningError, SanityError, SanityWarning
-from flags import flags
-from devices import PartitionDevice, LUKSDevice, devicePathToName
-from formats import getFormat
-from devicelibs.lvm import get_pool_padding
-from size import Size
-from i18n import _
+from .errors import DeviceError, NoDisksError, NotEnoughFreeSpaceError, PartitioningError, SanityError, SanityWarning
+from .flags import flags
+from .devices import PartitionDevice, LUKSDevice, devicePathToName
+from .formats import getFormat
+from .devicelibs.lvm import get_pool_padding
+from .size import Size
+from .i18n import _
 
 import logging
 log = logging.getLogger("blivet")
diff --git a/blivet/size.py b/blivet/size.py
index ab2a40f..c0b4671 100644
--- a/blivet/size.py
+++ b/blivet/size.py
@@ -28,8 +28,8 @@ from decimal import Decimal
 from decimal import InvalidOperation
 from decimal import ROUND_DOWN
 
-from errors import SizeParamsError, SizePlacesError
-from i18n import _, P_, N_
+from .errors import SizeParamsError, SizePlacesError
+from .i18n import _, P_, N_
 
 # Container for size unit prefix information
 _Prefix = namedtuple("Prefix", ["factor", "prefix", "abbr"])
diff --git a/blivet/udev.py b/blivet/udev.py
index 00f5891..95ec4ca 100644
--- a/blivet/udev.py
+++ b/blivet/udev.py
@@ -24,10 +24,10 @@
 import os
 import re
 
-import util
-from size import Size
+from . import util
+from .size import Size
 
-import pyudev
+from . import pyudev
 global_udev = pyudev.Udev()
 
 import logging
@@ -99,7 +99,7 @@ def udev_resolve_devspec(devspec):
     if not devspec:
         return None
 
-    import devices as _devices
+    from . import devices as _devices
     ret = None
     for dev in udev_get_block_devices():
         if devspec.startswith("LABEL="):
@@ -491,8 +491,8 @@ def udev_device_is_biosraid_member(info):
     # string that describes the type of dmraid (isw_raid_member...),  I don't
     # want to maintain a list and mdraid's ID_FS_TYPE='linux_raid_member', so
     # dmraid will be everything that is raid and not linux_raid_member
-    from formats.dmraid import DMRaidMember
-    from formats.mdraid import MDRaidMember
+    from .formats.dmraid import DMRaidMember
+    from .formats.mdraid import MDRaidMember
     if info.has_key("ID_FS_TYPE") and \
             (info["ID_FS_TYPE"] in DMRaidMember._udevTypes or \
              info["ID_FS_TYPE"] in MDRaidMember._udevTypes) and \
diff --git a/blivet/util.py b/blivet/util.py
index 2a002f2..61675f5 100644
--- a/blivet/util.py
+++ b/blivet/util.py
@@ -6,8 +6,8 @@ import subprocess
 import re
 from decimal import Decimal
 
-from udev import udev_settle
-from size import Size
+from .udev import udev_settle
+from .size import Size
 
 import logging
 log = logging.getLogger("blivet")
diff --git a/blivet/zfcp.py b/blivet/zfcp.py
index 5aa3718..1321697 100644
--- a/blivet/zfcp.py
+++ b/blivet/zfcp.py
@@ -21,7 +21,7 @@
 
 import string
 import os
-from udev import udev_settle
+from .udev import udev_settle
 from . import util
 from .i18n import _
 
-- 
1.8.3.1



More information about the anaconda-patches mailing list