---
pyanaconda/storage/__init__.py | 6 +++---
pyanaconda/storage/dasd.py | 10 +++++-----
pyanaconda/storage/devicelibs/crypto.py | 2 +-
pyanaconda/storage/devicelibs/dm.py | 2 +-
pyanaconda/storage/devicelibs/lvm.py | 4 ++--
pyanaconda/storage/devicelibs/mdraid.py | 2 +-
pyanaconda/storage/devicelibs/mpath.py | 2 +-
pyanaconda/storage/devicelibs/swap.py | 2 +-
pyanaconda/storage/devices.py | 3 +--
pyanaconda/storage/devicetree.py | 2 +-
pyanaconda/storage/fcoe.py | 4 ++--
pyanaconda/storage/formats/__init__.py | 4 ++--
pyanaconda/storage/formats/disklabel.py | 2 +-
pyanaconda/storage/formats/dmraid.py | 2 +-
pyanaconda/storage/formats/fs.py | 8 ++++----
pyanaconda/storage/formats/mdraid.py | 2 +-
pyanaconda/storage/formats/prepboot.py | 2 +-
pyanaconda/storage/formats/swap.py | 2 +-
pyanaconda/storage/iscsi.py | 6 +++---
pyanaconda/storage/partitioning.py | 2 +-
pyanaconda/storage/storage_log.py | 2 +-
pyanaconda/storage/udev.py | 4 ++--
pyanaconda/storage/zfcp.py | 4 ++--
23 files changed, 39 insertions(+), 40 deletions(-)
diff --git a/pyanaconda/storage/__init__.py b/pyanaconda/storage/__init__.py
index 5ea2c72..3bebad0 100644
--- a/pyanaconda/storage/__init__.py
+++ b/pyanaconda/storage/__init__.py
@@ -31,10 +31,10 @@ import nss.nss
import parted
import isys
-import iutil
-from constants import *
+import pyanaconda.iutil as 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 3e8fefe..aec831a 100644
--- a/pyanaconda/storage/dasd.py
+++ b/pyanaconda/storage/dasd.py
@@ -19,13 +19,13 @@
# Red Hat Author(s): David Cantrell <dcantrell@xxxxxxxxxx>
#
-import iutil
+import pyanaconda.iutil as 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 136435d..278313e 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
+import pyanaconda.iutil as iutil
from ..errors import *
diff --git a/pyanaconda/storage/devicelibs/dm.py b/pyanaconda/storage/devicelibs/dm.py
index 02745e0..bbe1ee8 100644
--- a/pyanaconda/storage/devicelibs/dm.py
+++ b/pyanaconda/storage/devicelibs/dm.py
@@ -23,7 +23,7 @@
import os
import block
-import iutil
+import pyanaconda.iutil as iutil
from ..errors import *
import gettext
diff --git a/pyanaconda/storage/devicelibs/lvm.py b/pyanaconda/storage/devicelibs/lvm.py
index 726d209..9fabbd7 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
+import pyanaconda.iutil as 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 851f88f..a8a887a 100644
--- a/pyanaconda/storage/devicelibs/mdraid.py
+++ b/pyanaconda/storage/devicelibs/mdraid.py
@@ -22,7 +22,7 @@
import os
-import iutil
+import pyanaconda.iutil as iutil
from ..errors import *
import gettext
diff --git a/pyanaconda/storage/devicelibs/mpath.py b/pyanaconda/storage/devicelibs/mpath.py
index c412562..17b03ac 100644
--- a/pyanaconda/storage/devicelibs/mpath.py
+++ b/pyanaconda/storage/devicelibs/mpath.py
@@ -2,7 +2,7 @@
import re
from ..udev import *
-import iutil
+import pyanaconda.iutil as 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 ef0f4c2..2101a6b 100644
--- a/pyanaconda/storage/devicelibs/swap.py
+++ b/pyanaconda/storage/devicelibs/swap.py
@@ -22,7 +22,7 @@
import resource
-import iutil
+import pyanaconda.iutil as iutil
import os
from ..errors import *
diff --git a/pyanaconda/storage/devices.py b/pyanaconda/storage/devices.py
index 8d09b94..57a618d 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 7b6da53..d2ff728 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
+import pyanaconda.iutil as iutil
import gettext
_ = lambda x: gettext.ldgettext("anaconda", x)
diff --git a/pyanaconda/storage/fcoe.py b/pyanaconda/storage/fcoe.py
index 40a6030..3be852c 100644
--- a/pyanaconda/storage/fcoe.py
+++ b/pyanaconda/storage/fcoe.py
@@ -18,11 +18,11 @@
#
import os
-import iutil
+import pyanaconda.iutil as iutil
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 2decf4c..67034b8 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
+ import pyanaconda.platform as platform
if boot:
fstypes = [platform.getPlatform(None).defaultBootFSType]
diff --git a/pyanaconda/storage/formats/disklabel.py b/pyanaconda/storage/formats/disklabel.py
index a76e452..e28265c 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
+import pyanaconda.platform as 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 3d2ee86..e6c696b 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 7a2f1a9..fa55245 100644
--- a/pyanaconda/storage/formats/fs.py
+++ b/pyanaconda/storage/formats/fs.py
@@ -36,8 +36,8 @@ import isys
from ..errors import *
from . import DeviceFormat, register_device_format
-import iutil
-from flags import flags
+import pyanaconda.iutil as iutil
+from pyanaconda.flags import flags
from parted import fileSystemType
from ..storage_log import log_method_call
@@ -1079,7 +1079,7 @@ class EFIFS(FATFS):
@property
def supported(self):
- import platform
+ import pyanaconda.platform as platform
p = platform.getPlatform(None)
return (isinstance(p, platform.EFI) and
p.isEfi and
@@ -1284,7 +1284,7 @@ class AppleBootstrapFS(HFS):
@property
def supported(self):
- import platform
+ import pyanaconda.platform as 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 f35cbd3..c08c9cc 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 2191b81..b1a868b 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
+ import pyanaconda.platform as 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 362f6d5..014f5a4 100644
--- a/pyanaconda/storage/formats/swap.py
+++ b/pyanaconda/storage/formats/swap.py
@@ -20,7 +20,7 @@
# Red Hat Author(s): Dave Lehman <dlehman@xxxxxxxxxx>
#
-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 d7a31e7..ac526a3 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
+import pyanaconda.iutil as 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 db5171c..618f54d 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 a52513d..bc7e489 100644
--- a/pyanaconda/storage/storage_log.py
+++ b/pyanaconda/storage/storage_log.py
@@ -1,5 +1,5 @@
import logging
-import anaconda_log
+import pyanaconda.anaconda_log as anaconda_log
import inspect
def log_method_call(d, *args, **kwargs):
diff --git a/pyanaconda/storage/udev.py b/pyanaconda/storage/udev.py
index dfe6e2f..8a6ac80 100644
--- a/pyanaconda/storage/udev.py
+++ b/pyanaconda/storage/udev.py
@@ -22,9 +22,9 @@
import os
-import iutil
+import pyanaconda.iutil as 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 829a282..452a60a 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
+import pyanaconda.iutil as iutil
import logging
log = logging.getLogger("anaconda")
--
1.7.0.1
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
