---
pyanaconda/textw/add_drive_text.py | 26 +++++++++++++-------------
pyanaconda/textw/complete_text.py | 4 ++--
pyanaconda/textw/constants_text.py | 2 +-
pyanaconda/textw/keyboard_text.py | 4 ++--
pyanaconda/textw/language_text.py | 2 +-
pyanaconda/textw/netconfig_text.py | 2 +-
pyanaconda/textw/network_text.py | 2 +-
pyanaconda/textw/partition_text.py | 9 +++------
pyanaconda/textw/progress_text.py | 4 ++--
pyanaconda/textw/task_text.py | 2 +-
pyanaconda/textw/timezone_text.py | 6 +++---
pyanaconda/textw/upgrade_bootloader_text.py | 8 ++++----
pyanaconda/textw/upgrade_text.py | 10 +++++-----
pyanaconda/textw/userauth_text.py | 2 +-
pyanaconda/textw/welcome_text.py | 2 +-
pyanaconda/textw/zipl_text.py | 4 ++--
16 files changed, 43 insertions(+), 46 deletions(-)
diff --git a/pyanaconda/textw/add_drive_text.py b/pyanaconda/textw/add_drive_text.py
index e805618..402b5f7 100644
--- a/pyanaconda/textw/add_drive_text.py
+++ b/pyanaconda/textw/add_drive_text.py
@@ -1,11 +1,11 @@
-import iutil
-import network
-import storage.iscsi
-import storage.fcoe
-import storage.zfcp
+import pyanaconda.iutil as iutil
+import pyanaconda.network as network
+import pyanaconda.storage.iscsi
+import pyanaconda.storage.fcoe
+import pyanaconda.storage.zfcp
from snack import *
from constants_text import *
-from constants import *
+from pyanaconda.constants import *
import gettext
_ = lambda x: gettext.ldgettext("anaconda", x)
@@ -19,11 +19,11 @@ class addDriveDialog(object):
def addDriveDialog(self, screen):
newdrv = []
- if storage.iscsi.has_iscsi():
+ if pyanaconda.storage.iscsi.has_iscsi():
newdrv.append("Add iSCSI target")
if iutil.isS390():
newdrv.append( "Add zFCP LUN" )
- if storage.fcoe.has_fcoe():
+ if pyanaconda.storage.fcoe.has_fcoe():
newdrv.append("Add FCoE SAN")
if len(newdrv) == 0:
@@ -73,7 +73,7 @@ class addDriveDialog(object):
fcplun = entries[2].strip()
# This may throw a value error, which gets handled by addDriveDialog()
- storage.zfcp.ZFCP().addFCP(devnum, wwpn, fcplun)
+ pyanaconda.storage.zfcp.ZFCP().addFCP(devnum, wwpn, fcplun)
return INSTALL_OK
@@ -121,7 +121,7 @@ class addDriveDialog(object):
nic = interfaceList.current()
dcb = dcbCheckbox.selected()
- storage.fcoe.fcoe().addSan(nic=nic, dcb=dcb,
+ pyanaconda.storage.fcoe.fcoe().addSan(nic=nic, dcb=dcb,
intf=self.anaconda.intf)
screen.popWindow()
@@ -135,7 +135,7 @@ class addDriveDialog(object):
"'linux asknetwork'")
return INSTALL_BACK
- iname = storage.iscsi.iscsi().initiator
+ iname = pyanaconda.storage.iscsi.iscsi().initiator
(button, entries) = EntryWindow(screen,
_("Configure iSCSI Parameters"),
_("To use iSCSI disks, you must provide the address of your iSCSI target and the iSCSI initiator name you've configured for your host."),
@@ -174,8 +174,8 @@ class addDriveDialog(object):
raise ValueError, msg
iname = entries[1].strip()
- storage.iscsi.iscsi().initiator = iname
- storage.iscsi.iscsi().addTarget(ip, port, user, pw, user_in, pw_in,
+ pyanacodna.storage.iscsi.iscsi().initiator = iname
+ pyanaconda.storage.iscsi.iscsi().addTarget(ip, port, user, pw, user_in, pw_in,
intf=self.anaconda.intf)
return INSTALL_OK
diff --git a/pyanaconda/textw/complete_text.py b/pyanaconda/textw/complete_text.py
index fc4e5c1..6f0277d 100644
--- a/pyanaconda/textw/complete_text.py
+++ b/pyanaconda/textw/complete_text.py
@@ -20,9 +20,9 @@
from snack import *
from constants_text import *
-from constants import *
+from pyanaconda.constants import *
import gettext
-import platform
+import pyanaconda.platform as platform
_ = lambda x: gettext.ldgettext("anaconda", x)
class FinishedWindow:
diff --git a/pyanaconda/textw/constants_text.py b/pyanaconda/textw/constants_text.py
index 1561d5a..bba5ceb 100644
--- a/pyanaconda/textw/constants_text.py
+++ b/pyanaconda/textw/constants_text.py
@@ -17,7 +17,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
-from constants import *
+from pyanaconda.constants import *
import gettext
_ = lambda x: gettext.ldgettext("anaconda", x)
diff --git a/pyanaconda/textw/keyboard_text.py b/pyanaconda/textw/keyboard_text.py
index aa0201a..09b152a 100644
--- a/pyanaconda/textw/keyboard_text.py
+++ b/pyanaconda/textw/keyboard_text.py
@@ -20,9 +20,9 @@
import isys
from snack import *
from constants_text import *
-from flags import flags
+from pyanaconda.flags import flags
-from constants import *
+from pyanaconda.constants import *
import gettext
_ = lambda x: gettext.ldgettext("anaconda", x)
diff --git a/pyanaconda/textw/language_text.py b/pyanaconda/textw/language_text.py
index 14c8503..7cb86e8 100644
--- a/pyanaconda/textw/language_text.py
+++ b/pyanaconda/textw/language_text.py
@@ -21,7 +21,7 @@
from snack import *
from constants_text import *
-from constants import *
+from pyanaconda.constants import *
import gettext
_ = lambda x: gettext.ldgettext("anaconda", x)
diff --git a/pyanaconda/textw/netconfig_text.py b/pyanaconda/textw/netconfig_text.py
index 9b0b156..5d33f0c 100644
--- a/pyanaconda/textw/netconfig_text.py
+++ b/pyanaconda/textw/netconfig_text.py
@@ -23,7 +23,7 @@
import isys
-import network
+import pyanaconda.network as network
from snack import *
from constants_text import *
diff --git a/pyanaconda/textw/network_text.py b/pyanaconda/textw/network_text.py
index 26499b8..dd92abb 100644
--- a/pyanaconda/textw/network_text.py
+++ b/pyanaconda/textw/network_text.py
@@ -22,7 +22,7 @@
# David Cantrell <dcantrell@xxxxxxxxxx>
#
from constants_text import *
-import network
+import pyanaconda.network as network
class HostnameWindow:
def __call__(self, screen, anaconda):
diff --git a/pyanaconda/textw/partition_text.py b/pyanaconda/textw/partition_text.py
index 5cbcd70..b483f25 100644
--- a/pyanaconda/textw/partition_text.py
+++ b/pyanaconda/textw/partition_text.py
@@ -25,15 +25,12 @@ import os, sys
import isys
import string
import copy
-import network
+import pyanaconda.network as network
import parted
-import storage.iscsi
-import storage.fcoe
-import storage.zfcp
-from partIntfHelpers import *
+from pyanaconda.partIntfHelpers import *
from snack import *
from constants_text import *
-from constants import *
+from pyanaconda.constants import *
from add_drive_text import addDriveDialog
import gettext
diff --git a/pyanaconda/textw/progress_text.py b/pyanaconda/textw/progress_text.py
index 579408a..3735eae 100644
--- a/pyanaconda/textw/progress_text.py
+++ b/pyanaconda/textw/progress_text.py
@@ -18,10 +18,10 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
-from constants import *
+from pyanaconda.constants import *
from snack import *
from constants_text import *
-from iutil import strip_markup
+from pyanaconda.iutil import strip_markup
import gettext
_ = lambda x: gettext.ldgettext("anaconda", x)
diff --git a/pyanaconda/textw/task_text.py b/pyanaconda/textw/task_text.py
index 17d312b..416e572 100644
--- a/pyanaconda/textw/task_text.py
+++ b/pyanaconda/textw/task_text.py
@@ -18,7 +18,7 @@
#
from constants_text import *
-from constants import *
+from pyanaconda.constants import *
class TaskWindow:
def __call__(self, screen, anaconda):
diff --git a/pyanaconda/textw/timezone_text.py b/pyanaconda/textw/timezone_text.py
index c78442a..9098ea1 100644
--- a/pyanaconda/textw/timezone_text.py
+++ b/pyanaconda/textw/timezone_text.py
@@ -20,14 +20,14 @@
import sys
import string
-import iutil
+import pyanaconda.iutil as iutil
from time import *
from snack import *
from constants_text import *
-from bootloader import hasWindows
+from pyanaconda.bootloader import hasWindows
from scdate.core import zonetab
-from constants import *
+from pyanaconda.constants import *
import gettext
_ = lambda x: gettext.ldgettext("anaconda", x)
diff --git a/pyanaconda/textw/upgrade_bootloader_text.py b/pyanaconda/textw/upgrade_bootloader_text.py
index 574dd52..291c7f2 100644
--- a/pyanaconda/textw/upgrade_bootloader_text.py
+++ b/pyanaconda/textw/upgrade_bootloader_text.py
@@ -21,12 +21,12 @@
from snack import *
from constants_text import *
-from flags import flags
+from pyanaconda.flags import flags
import string
-from booty import checkbootloader
-from storage.devices import devicePathToName
+from pyanaconda.booty import checkbootloader
+from pyanaconda.storage.devices import devicePathToName
-from constants import *
+from pyanaconda.constants import *
import gettext
_ = lambda x: gettext.ldgettext("anaconda", x)
diff --git a/pyanaconda/textw/upgrade_text.py b/pyanaconda/textw/upgrade_text.py
index fdb5eee..78eb988 100644
--- a/pyanaconda/textw/upgrade_text.py
+++ b/pyanaconda/textw/upgrade_text.py
@@ -18,13 +18,13 @@
#
import isys
-import iutil
-import upgrade
+import pyanaconda.iutil as iutil
+import pyanaconda.upgrade as upgrade
from constants_text import *
from snack import *
-from flags import flags
-from constants import *
-from storage.formats import getFormat
+from pyanaconda.flags import flags
+from pyanaconda.constants import *
+from pyanaconda.storage.formats import getFormat
import gettext
_ = lambda x: gettext.ldgettext("anaconda", x)
diff --git a/pyanaconda/textw/userauth_text.py b/pyanaconda/textw/userauth_text.py
index 111858c..090c9d9 100644
--- a/pyanaconda/textw/userauth_text.py
+++ b/pyanaconda/textw/userauth_text.py
@@ -21,7 +21,7 @@ from snack import *
from constants_text import *
import cracklib
-from constants import *
+from pyanaconda.constants import *
import gettext
_ = lambda x: gettext.ldgettext("anaconda", x)
diff --git a/pyanaconda/textw/welcome_text.py b/pyanaconda/textw/welcome_text.py
index f1eee76..3cddf17 100644
--- a/pyanaconda/textw/welcome_text.py
+++ b/pyanaconda/textw/welcome_text.py
@@ -19,7 +19,7 @@
from snack import *
from constants_text import *
-from constants import *
+from pyanaconda.constants import *
import sys
import gettext
_ = lambda x: gettext.ldgettext("anaconda", x)
diff --git a/pyanaconda/textw/zipl_text.py b/pyanaconda/textw/zipl_text.py
index 9a1b202..1a546e2 100644
--- a/pyanaconda/textw/zipl_text.py
+++ b/pyanaconda/textw/zipl_text.py
@@ -22,8 +22,8 @@ import string
from snack import *
from constants_text import *
-from constants import *
-from storage.dasd import getDasdPorts
+from pyanaconda.constants import *
+from pyanaconda.storage.dasd import getDasdPorts
import gettext
_ = lambda x: gettext.ldgettext("anaconda", x)
--
1.7.0.1
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
