7 files changed, 12 insertions, 12 deletions
diff --git a/pyanaconda/storage/formats/__init__.py b/pyanaconda/storage/formats/__init__.py
index 2decf4c2f..aec2f37aa 100644
--- a/pyanaconda/storage/formats/__init__.py
+++ b/pyanaconda/storage/formats/__init__.py
@@ -22,7 +22,7 @@
 
 import os
 
-from iutil import notify_kernel, get_sysfs_path_by_name
+from pyanaconda.iutil import notify_kernel, get_sysfs_path_by_name
 from ..storage_log import log_method_call
 from ..errors import *
 from ..devicelibs.dm import dm_node_from_name
@@ -45,7 +45,7 @@ def register_device_format(fmt_class):
 
 default_fstypes = ("ext4", "ext3", "ext2")
 def get_default_filesystem_type(boot=None):
-    import platform
+    from pyanaconda import platform
 
     if boot:
         fstypes = [platform.getPlatform(None).defaultBootFSType]
diff --git a/pyanaconda/storage/formats/disklabel.py b/pyanaconda/storage/formats/disklabel.py
index a76e45283..8e10866d4 100644
--- a/pyanaconda/storage/formats/disklabel.py
+++ b/pyanaconda/storage/formats/disklabel.py
@@ -26,7 +26,7 @@ import copy
 from ..storage_log import log_method_call
 import parted
 import _ped
-import platform
+from pyanaconda import platform
 from ..errors import *
 from ..udev import udev_settle
 from . import DeviceFormat, register_device_format
diff --git a/pyanaconda/storage/formats/dmraid.py b/pyanaconda/storage/formats/dmraid.py
index 3d2ee86ee..e6c696ba3 100644
--- a/pyanaconda/storage/formats/dmraid.py
+++ b/pyanaconda/storage/formats/dmraid.py
@@ -21,7 +21,7 @@
 #
 
 from ..storage_log import log_method_call
-from flags import flags
+from pyanaconda.flags import flags
 from ..errors import *
 from . import DeviceFormat, register_device_format
 
diff --git a/pyanaconda/storage/formats/fs.py b/pyanaconda/storage/formats/fs.py
index e5c2af3b6..c3ea79c21 100644
--- a/pyanaconda/storage/formats/fs.py
+++ b/pyanaconda/storage/formats/fs.py
@@ -32,12 +32,12 @@ import os
 import sys
 import tempfile
 import selinux
-import isys
+from pyanaconda import isys
 
 from ..errors import *
 from . import DeviceFormat, register_device_format
-import iutil
-from flags import flags
+from pyanaconda import iutil
+from pyanaconda.flags import flags
 from parted import fileSystemType
 from ..storage_log import log_method_call
 
@@ -1082,7 +1082,7 @@ class EFIFS(FATFS):
 
     @property
     def supported(self):
-        import platform
+        from pyanaconda import platform
         p = platform.getPlatform(None)
         return (isinstance(p, platform.EFI) and
                 p.isEfi and
@@ -1287,7 +1287,7 @@ class AppleBootstrapFS(HFS):
 
     @property
     def supported(self):
-        import platform
+        from pyanaconda import platform
         return (isinstance(platform.getPlatform(None), platform.NewWorldPPC)
                 and self.utilsAvailable)
 
diff --git a/pyanaconda/storage/formats/mdraid.py b/pyanaconda/storage/formats/mdraid.py
index f35cbd3f9..c08c9cc31 100644
--- a/pyanaconda/storage/formats/mdraid.py
+++ b/pyanaconda/storage/formats/mdraid.py
@@ -23,7 +23,7 @@
 import os
 
 from ..storage_log import log_method_call
-from flags import flags
+from pyanaconda.flags import flags
 from parted import PARTITION_RAID
 from ..errors import *
 from ..devicelibs import mdraid
diff --git a/pyanaconda/storage/formats/prepboot.py b/pyanaconda/storage/formats/prepboot.py
index 2191b81e1..8b8e1e081 100644
--- a/pyanaconda/storage/formats/prepboot.py
+++ b/pyanaconda/storage/formats/prepboot.py
@@ -53,7 +53,7 @@ class PPCPRePBoot(DeviceFormat):
 
     @property
     def supported(self):
-        import platform
+        from pyanaconda import platform
         return isinstance(platform.getPlatform(None), platform.IPSeriesPPC)
 
     def writeKS(self, f):
diff --git a/pyanaconda/storage/formats/swap.py b/pyanaconda/storage/formats/swap.py
index 362f6d585..014f5a4db 100644
--- a/pyanaconda/storage/formats/swap.py
+++ b/pyanaconda/storage/formats/swap.py
@@ -20,7 +20,7 @@
 # Red Hat Author(s): Dave Lehman <dlehman@redhat.com>
 #
 
-from iutil import numeric_type
+from pyanaconda.iutil import numeric_type
 from parted import PARTITION_SWAP, fileSystemType
 from ..storage_log import log_method_call
 from ..errors import *