modules: necessary changes to the import statements under storage/

23 files changed, 42 insertions, 43 deletions

diff --git a/pyanaconda/storage/__init__.py b/pyanaconda/storage/__init__.py
index 5ea2c7234..911f95a51 100644
--- a/pyanaconda/storage/__init__.py
+++ b/pyanaconda/storage/__init__.py
@@ -30,11 +30,11 @@ import statvfs
 import nss.nss
 import parted
 
-import isys
-import iutil
-from constants import *
+from pyanaconda import isys
+from pyanaconda import iutil
+from pyanaconda.constants import *
 from pykickstart.constants import *
-from flags import flags
+from pyanaconda.flags import flags
 
 import storage_log
 from errors import *
diff --git a/pyanaconda/storage/dasd.py b/pyanaconda/storage/dasd.py
index 3e8fefe1e..3c08d295f 100644
--- a/pyanaconda/storage/dasd.py
+++ b/pyanaconda/storage/dasd.py
@@ -19,13 +19,13 @@
 # Red Hat Author(s): David Cantrell <dcantrell@redhat.com>
 #
 
-import iutil
+from pyanaconda import iutil
 import sys
 import os
-from storage.errors import DasdFormatError
-from storage.devices import deviceNameToDiskByPath
-from constants import *
-from flags import flags
+from pyanaconda.storage.errors import DasdFormatError
+from pyanaconda.storage.devices import deviceNameToDiskByPath
+from pyanaconda.constants import *
+from pyanaconda.flags import flags
 
 import logging
 log = logging.getLogger("anaconda")
diff --git a/pyanaconda/storage/devicelibs/crypto.py b/pyanaconda/storage/devicelibs/crypto.py
index 136435dc2..84b055a37 100644
--- a/pyanaconda/storage/devicelibs/crypto.py
+++ b/pyanaconda/storage/devicelibs/crypto.py
@@ -22,7 +22,7 @@
 
 import os
 from pycryptsetup import CryptSetup
-import iutil
+from pyanaconda import iutil
 
 from ..errors import *
 
diff --git a/pyanaconda/storage/devicelibs/dm.py b/pyanaconda/storage/devicelibs/dm.py
index 02745e0cb..e526377c1 100644
--- a/pyanaconda/storage/devicelibs/dm.py
+++ b/pyanaconda/storage/devicelibs/dm.py
@@ -23,7 +23,7 @@
 import os
 
 import block
-import iutil
+from pyanaconda import iutil
 from ..errors import *
 
 import gettext
diff --git a/pyanaconda/storage/devicelibs/lvm.py b/pyanaconda/storage/devicelibs/lvm.py
index 15f083e7b..5ff6c7075 100644
--- a/pyanaconda/storage/devicelibs/lvm.py
+++ b/pyanaconda/storage/devicelibs/lvm.py
@@ -24,10 +24,10 @@ import os
 import math
 import re
 
-import iutil
+from pyanaconda import iutil
 
 from ..errors import *
-from constants import *
+from pyanaconda.constants import *
 
 import gettext
 _ = lambda x: gettext.ldgettext("anaconda", x)
diff --git a/pyanaconda/storage/devicelibs/mdraid.py b/pyanaconda/storage/devicelibs/mdraid.py
index 851f88fe3..9151ed606 100644
--- a/pyanaconda/storage/devicelibs/mdraid.py
+++ b/pyanaconda/storage/devicelibs/mdraid.py
@@ -22,7 +22,7 @@
 
 import os
 
-import iutil
+from pyanaconda import iutil
 from ..errors import *
 
 import gettext
diff --git a/pyanaconda/storage/devicelibs/mpath.py b/pyanaconda/storage/devicelibs/mpath.py
index c41256222..e95ee4759 100644
--- a/pyanaconda/storage/devicelibs/mpath.py
+++ b/pyanaconda/storage/devicelibs/mpath.py
@@ -2,7 +2,7 @@
 import re
 
 from ..udev import *
-import iutil
+from pyanaconda import iutil
 
 def parseMultipathOutput(output):
     # this function parses output from "multipath -d", so we can use its
diff --git a/pyanaconda/storage/devicelibs/swap.py b/pyanaconda/storage/devicelibs/swap.py
index ef0f4c2d6..02c873742 100644
--- a/pyanaconda/storage/devicelibs/swap.py
+++ b/pyanaconda/storage/devicelibs/swap.py
@@ -22,7 +22,7 @@
 
 import resource
 
-import iutil
+from pyanaconda import iutil
 import os
 
 from ..errors import *
diff --git a/pyanaconda/storage/devices.py b/pyanaconda/storage/devices.py
index 6b110ca37..8a7b74432 100644
--- a/pyanaconda/storage/devices.py
+++ b/pyanaconda/storage/devices.py
@@ -104,11 +104,10 @@ from devicelibs import lvm
 from devicelibs import dm
 import parted
 import _ped
-import platform
 import block
 
 from errors import *
-from iutil import notify_kernel, numeric_type
+from pyanaconda.iutil import notify_kernel, numeric_type
 from .storage_log import log_method_call
 from udev import *
 from formats import get_device_format_class, getFormat, DeviceFormat
diff --git a/pyanaconda/storage/devicetree.py b/pyanaconda/storage/devicetree.py
index a09363908..ec8576e7b 100644
--- a/pyanaconda/storage/devicetree.py
+++ b/pyanaconda/storage/devicetree.py
@@ -37,7 +37,7 @@ import devicelibs.lvm
 import devicelibs.mpath
 from udev import *
 from .storage_log import log_method_call
-import iutil
+from pyanaconda import iutil
 
 import gettext
 _ = lambda x: gettext.ldgettext("anaconda", x)
diff --git a/pyanaconda/storage/fcoe.py b/pyanaconda/storage/fcoe.py
index 40a603090..317a57764 100644
--- a/pyanaconda/storage/fcoe.py
+++ b/pyanaconda/storage/fcoe.py
@@ -18,11 +18,11 @@
 #
 
 import os
-import iutil
-import isys
+from pyanaconda import iutil
+from pyanaconda import isys
 import logging
 import time
-from flags import flags
+from pyanaconda.flags import flags
 log = logging.getLogger("anaconda")
 
 import gettext
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 *
diff --git a/pyanaconda/storage/iscsi.py b/pyanaconda/storage/iscsi.py
index d7a31e79b..45aba19ac 100644
--- a/pyanaconda/storage/iscsi.py
+++ b/pyanaconda/storage/iscsi.py
@@ -18,11 +18,11 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-from constants import *
+from pyanaconda.constants import *
 from udev import *
 import os
-import iutil
-from flags import flags
+from pyanaconda import iutil
+from pyanaconda.flags import flags
 import logging
 import shutil
 import time
diff --git a/pyanaconda/storage/partitioning.py b/pyanaconda/storage/partitioning.py
index db5171c8a..618f54dfc 100644
--- a/pyanaconda/storage/partitioning.py
+++ b/pyanaconda/storage/partitioning.py
@@ -27,7 +27,7 @@ from operator import add, sub, gt, lt
 import parted
 from pykickstart.constants import *
 
-from constants import *
+from pyanaconda.constants import *
 
 from errors import *
 from deviceaction import *
diff --git a/pyanaconda/storage/storage_log.py b/pyanaconda/storage/storage_log.py
index a52513d8c..79981a819 100644
--- a/pyanaconda/storage/storage_log.py
+++ b/pyanaconda/storage/storage_log.py
@@ -1,5 +1,5 @@
 import logging
-import anaconda_log
+from pyanaconda import anaconda_log
 import inspect
 
 def log_method_call(d, *args, **kwargs):
diff --git a/pyanaconda/storage/udev.py b/pyanaconda/storage/udev.py
index eac6a9b56..2a64a5f18 100644
--- a/pyanaconda/storage/udev.py
+++ b/pyanaconda/storage/udev.py
@@ -22,9 +22,9 @@
 
 import os
 
-import iutil
+from pyanaconda import iutil
 from errors import *
-from baseudev import *
+from pyanaconda.baseudev import *
 
 import logging
 log = logging.getLogger("storage")
diff --git a/pyanaconda/storage/zfcp.py b/pyanaconda/storage/zfcp.py
index 829a282ad..001fc4c29 100644
--- a/pyanaconda/storage/zfcp.py
+++ b/pyanaconda/storage/zfcp.py
@@ -21,13 +21,13 @@
 
 import string
 import os
-from constants import *
+from pyanaconda.constants import *
 from udev import udev_settle
 
 import gettext
 _ = lambda x: gettext.ldgettext("anaconda", x)
 
-import iutil
+from pyanaconda import iutil
 import logging
 log = logging.getLogger("anaconda")