[master 07/11] modules: necessary changes to the import statements under pyanaconda/iw

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



---
 pyanaconda/iw/DeviceSelector.py             |    2 +-
 pyanaconda/iw/GroupSelector.py              |    2 +-
 pyanaconda/iw/account_gui.py                |    6 ++--
 pyanaconda/iw/advanced_storage.py           |   18 +++++++-------
 pyanaconda/iw/autopart_type.py              |    8 +++---
 pyanaconda/iw/blpasswidget.py               |    4 +-
 pyanaconda/iw/bootloader_main_gui.py        |    4 +-
 pyanaconda/iw/cleardisks_gui.py             |    8 +++---
 pyanaconda/iw/congrats_gui.py               |    6 ++--
 pyanaconda/iw/examine_gui.py                |    8 +++---
 pyanaconda/iw/filter_gui.py                 |   32 +++++++++++++-------------
 pyanaconda/iw/filter_type.py                |    8 +++---
 pyanaconda/iw/iw_gui.py                     |    2 +-
 pyanaconda/iw/language_gui.py               |    6 ++--
 pyanaconda/iw/lvm_dialog_gui.py             |   10 ++++----
 pyanaconda/iw/netconfig_dialog.py           |    6 ++--
 pyanaconda/iw/network_gui.py                |    8 +++---
 pyanaconda/iw/osbootwidget.py               |    8 +++---
 pyanaconda/iw/package_gui.py                |    4 +-
 pyanaconda/iw/partition_dialog_gui.py       |   10 ++++----
 pyanaconda/iw/partition_gui.py              |   22 +++++++++---------
 pyanaconda/iw/partition_ui_helpers_gui.py   |    8 +++---
 pyanaconda/iw/pixmapRadioButtonGroup_gui.py |    2 +-
 pyanaconda/iw/progress_gui.py               |    8 +++---
 pyanaconda/iw/raid_dialog_gui.py            |   12 +++++-----
 pyanaconda/iw/task_gui.py                   |   12 +++++-----
 pyanaconda/iw/timezone_gui.py               |    6 ++--
 pyanaconda/iw/upgrade_bootloader_gui.py     |    6 ++--
 pyanaconda/iw/upgrade_migratefs_gui.py      |    8 +++---
 pyanaconda/iw/upgrade_swap_gui.py           |   10 ++++----
 pyanaconda/iw/welcome_gui.py                |    4 +-
 pyanaconda/iw/zipl_gui.py                   |    4 +-
 32 files changed, 131 insertions(+), 131 deletions(-)

diff --git a/pyanaconda/iw/DeviceSelector.py b/pyanaconda/iw/DeviceSelector.py
index 33a7fe3..a77831c 100644
--- a/pyanaconda/iw/DeviceSelector.py
+++ b/pyanaconda/iw/DeviceSelector.py
@@ -20,7 +20,7 @@
 
 import gtk, gobject
 import gtk.glade
-import gui
+import pyanaconda.gui as gui
 
 import gettext
 _ = lambda x: gettext.ldgettext("anaconda", x)
diff --git a/pyanaconda/iw/GroupSelector.py b/pyanaconda/iw/GroupSelector.py
index 29bc2ab..6a3a675 100644
--- a/pyanaconda/iw/GroupSelector.py
+++ b/pyanaconda/iw/GroupSelector.py
@@ -31,7 +31,7 @@ try:
 except ImportError: # yum 2.9.x
     mdErrors = yum.Errors
 from yum.constants import *
-from compssort import *
+from pyanaconda.compssort import *
 
 I18N_DOMAIN="anaconda"
 
diff --git a/pyanaconda/iw/account_gui.py b/pyanaconda/iw/account_gui.py
index 5b08aef..b8488fb 100644
--- a/pyanaconda/iw/account_gui.py
+++ b/pyanaconda/iw/account_gui.py
@@ -21,10 +21,10 @@
 
 import gtk
 import string
-import gui
+import pyanaconda.gui as gui
 from iw_gui import *
-from flags import flags
-from constants import *
+from pyanaconda.flags import flags
+from pyanaconda.constants import *
 import cracklib
 import _isys
 
diff --git a/pyanaconda/iw/advanced_storage.py b/pyanaconda/iw/advanced_storage.py
index 899cd83..47f78bf 100644
--- a/pyanaconda/iw/advanced_storage.py
+++ b/pyanaconda/iw/advanced_storage.py
@@ -22,11 +22,11 @@ _ = lambda x: gettext.ldgettext("anaconda", x)
 import gobject
 import gtk
 import gtk.glade
-import gui
-import iutil
-import network
-import storage.fcoe
-import storage.iscsi
+import pyanaconda.gui as gui
+import pyanaconda.iutil as iutil
+import pyanaconda.network as network
+import pyanaconda.storage.fcoe
+import pyanaconda.storage.iscsi
 
 def addFcoeDrive(anaconda):
     (dxml, dialog) = gui.getGladeWidget("fcoe-config.glade", "fcoeDialog")
@@ -216,11 +216,11 @@ def addDrive(anaconda):
         dxml.get_widget("zfcpRadio").hide()
         dxml.get_widget("zfcpRadio").set_group(None)
 
-    if not storage.iscsi.has_iscsi():
+    if not pyanaconda.storage.iscsi.has_iscsi():
         dxml.get_widget("iscsiRadio").set_sensitive(False)
         dxml.get_widget("iscsiRadio").set_active(False)
 
-    if not storage.fcoe.has_fcoe():
+    if not pyanaconda.storage.fcoe.has_fcoe():
         dxml.get_widget("fcoeRadio").set_sensitive(False)
         dxml.get_widget("fcoeRadio").set_active(False)
 
@@ -237,9 +237,9 @@ def addDrive(anaconda):
     if rc in [gtk.RESPONSE_CANCEL, gtk.RESPONSE_DELETE_EVENT]:
         return False
 
-    if dxml.get_widget("iscsiRadio").get_active() and storage.iscsi.has_iscsi():
+    if dxml.get_widget("iscsiRadio").get_active() and pyanaconda.storage.iscsi.has_iscsi():
         rc = addIscsiDrive(anaconda)
-    elif dxml.get_widget("fcoeRadio").get_active() and storage.fcoe.has_fcoe():
+    elif dxml.get_widget("fcoeRadio").get_active() and pyanaconda.storage.fcoe.has_fcoe():
         rc = addFcoeDrive(anaconda)
     elif dxml.get_widget("zfcpRadio") is not None and dxml.get_widget("zfcpRadio").get_active():
         rc = addZfcpDrive(anaconda)
diff --git a/pyanaconda/iw/autopart_type.py b/pyanaconda/iw/autopart_type.py
index 9b46fca..b55265c 100644
--- a/pyanaconda/iw/autopart_type.py
+++ b/pyanaconda/iw/autopart_type.py
@@ -23,14 +23,14 @@ import gtk
 import gobject
 import math
 
-from constants import *
-import gui
+from pyanaconda.constants import *
+import pyanaconda.gui as gui
 from partition_ui_helpers_gui import *
 from pixmapRadioButtonGroup_gui import pixmapRadioButtonGroup
 
 from iw_gui import *
-from flags import flags
-from storage.deviceaction import *
+from pyanaconda.flags import flags
+from pyanaconda.storage.deviceaction import *
 
 import gettext
 _ = lambda x: gettext.ldgettext("anaconda", x)
diff --git a/pyanaconda/iw/blpasswidget.py b/pyanaconda/iw/blpasswidget.py
index c6e6881..1865e92 100644
--- a/pyanaconda/iw/blpasswidget.py
+++ b/pyanaconda/iw/blpasswidget.py
@@ -20,8 +20,8 @@
 #
 
 import gtk
-import gui
-from constants import *
+import pyanaconda.gui as gui
+from pyanaconda.constants import *
 
 import gettext
 _ = lambda x: gettext.ldgettext("anaconda", x)
diff --git a/pyanaconda/iw/bootloader_main_gui.py b/pyanaconda/iw/bootloader_main_gui.py
index 05588b6..9bd5c55 100644
--- a/pyanaconda/iw/bootloader_main_gui.py
+++ b/pyanaconda/iw/bootloader_main_gui.py
@@ -21,9 +21,9 @@
 
 import gtk
 import gobject
-import gui
+import pyanaconda.gui as gui
 from iw_gui import *
-from constants import *
+from pyanaconda.constants import *
 
 import gettext
 _ = lambda x: gettext.ldgettext("anaconda", x)
diff --git a/pyanaconda/iw/cleardisks_gui.py b/pyanaconda/iw/cleardisks_gui.py
index b135be1..c09219c 100644
--- a/pyanaconda/iw/cleardisks_gui.py
+++ b/pyanaconda/iw/cleardisks_gui.py
@@ -19,13 +19,13 @@
 #
 
 import gtk, gobject
-import gui
+import pyanaconda.gui as gui
 from DeviceSelector import *
-from constants import *
+from pyanaconda.constants import *
 import isys
 from iw_gui import *
-from storage.devices import deviceNameToDiskByPath
-from storage.udev import *
+from pyanaconda.storage.devices import deviceNameToDiskByPath
+from pyanaconda.storage.udev import *
 
 import gettext
 _ = lambda x: gettext.ldgettext("anaconda", x)
diff --git a/pyanaconda/iw/congrats_gui.py b/pyanaconda/iw/congrats_gui.py
index 3027568..ef33b92 100644
--- a/pyanaconda/iw/congrats_gui.py
+++ b/pyanaconda/iw/congrats_gui.py
@@ -19,11 +19,11 @@
 #
 
 import gtk
-import gui
+import pyanaconda.gui as gui
 from iw_gui import *
-from constants import *
+from pyanaconda.constants import *
 import os
-import platform
+import pyanaconda.platform as platform
 
 import gettext
 _ = lambda x: gettext.ldgettext("anaconda", x)
diff --git a/pyanaconda/iw/examine_gui.py b/pyanaconda/iw/examine_gui.py
index ee3f1b6..b9d3d4d 100644
--- a/pyanaconda/iw/examine_gui.py
+++ b/pyanaconda/iw/examine_gui.py
@@ -19,12 +19,12 @@
 #
 
 import gtk
-import gui
+import pyanaconda.gui as gui
 from iw_gui import *
 from pixmapRadioButtonGroup_gui import pixmapRadioButtonGroup
-from constants import *
-import upgrade
-from flags import flags
+from pyanaconda.constants import *
+import pyanaconda.upgrade as upgrade
+from pyanaconda.flags import flags
 
 import gettext
 _ = lambda x: gettext.ldgettext("anaconda", x)
diff --git a/pyanaconda/iw/filter_gui.py b/pyanaconda/iw/filter_gui.py
index cf42d86..54597b4 100644
--- a/pyanaconda/iw/filter_gui.py
+++ b/pyanaconda/iw/filter_gui.py
@@ -22,22 +22,22 @@ import block
 import collections
 import gtk, gobject
 import gtk.glade
-import gui
-import iutil
+import pyanaconda.gui as gui
+import pyanaconda.iutil as iutil
 import parted
 import _ped
 from DeviceSelector import *
-from baseudev import *
-from constants import *
+from pyanaconda.baseudev import *
+from pyanaconda.constants import *
 from iw_gui import *
-from storage.devices import devicePathToName
-from storage.udev import *
-from storage.devicelibs.mpath import *
-from flags import flags
-import storage.iscsi
-import storage.fcoe
-import storage.zfcp
-import storage.dasd
+from pyanaconda.storage.devices import devicePathToName
+from pyanaconda.storage.udev import *
+from pyanaconda.storage.devicelibs.mpath import *
+from pyanaconda.flags import flags
+import pyanaconda.storage.iscsi
+import pyanaconda.storage.fcoe
+import pyanaconda.storage.zfcp
+import pyanaconda.storage.dasd
 
 import gettext
 _ = lambda x: gettext.ldgettext("anaconda", x)
@@ -562,10 +562,10 @@ class FilterWindow(InstallWindow):
 
         udev_trigger(subsystem="block", action="change")
         # So that drives onlined by these show up in the filter UI
-        storage.iscsi.iscsi().startup(anaconda.intf)
-        storage.fcoe.fcoe().startup(anaconda.intf)
-        storage.zfcp.ZFCP().startup(anaconda.intf)
-        storage.dasd.DASD().startup(anaconda.intf,
+        pyanaconda.storage.iscsi.iscsi().startup(anaconda.intf)
+        pyanaconda.storage.fcoe.fcoe().startup(anaconda.intf)
+        pyanaconda.storage.zfcp.ZFCP().startup(anaconda.intf)
+        pyanaconda.storage.dasd.DASD().startup(anaconda.intf,
                                     anaconda.storage.exclusiveDisks,
                                     anaconda.storage.zeroMbr)
         disks = filter(udev_device_is_disk, udev_get_block_devices())
diff --git a/pyanaconda/iw/filter_type.py b/pyanaconda/iw/filter_type.py
index 3c691bd..3d507fc 100644
--- a/pyanaconda/iw/filter_type.py
+++ b/pyanaconda/iw/filter_type.py
@@ -21,14 +21,14 @@ import gtk
 import gobject
 import math
 
-from constants import *
-import gui
+from pyanaconda.constants import *
+import pyanaconda.gui as gui
 from partition_ui_helpers_gui import *
 from pixmapRadioButtonGroup_gui import pixmapRadioButtonGroup
 
 from iw_gui import *
-from flags import flags
-from storage.deviceaction import *
+from pyanaconda.flags import flags
+from pyanaconda.storage.deviceaction import *
 
 import gettext
 _ = lambda x: gettext.ldgettext("anaconda", x)
diff --git a/pyanaconda/iw/iw_gui.py b/pyanaconda/iw/iw_gui.py
index 997a239..c24ce86 100644
--- a/pyanaconda/iw/iw_gui.py
+++ b/pyanaconda/iw/iw_gui.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/iw/language_gui.py b/pyanaconda/iw/language_gui.py
index 952f8a8..5b28a1d 100644
--- a/pyanaconda/iw/language_gui.py
+++ b/pyanaconda/iw/language_gui.py
@@ -19,14 +19,14 @@
 
 import gobject
 import gtk
-import gui
+import pyanaconda.gui as gui
 from iw_gui import *
-from constants import *
+from pyanaconda.constants import *
 
 import gettext
 _ = lambda x: gettext.ldgettext("anaconda", x)
 
-from gui import setupTreeViewFixupIdleHandler, StayOnScreen
+from pyanaconda.gui import setupTreeViewFixupIdleHandler, StayOnScreen
 
 class LanguageWindow (InstallWindow):
 
diff --git a/pyanaconda/iw/lvm_dialog_gui.py b/pyanaconda/iw/lvm_dialog_gui.py
index d906852..36e3131 100644
--- a/pyanaconda/iw/lvm_dialog_gui.py
+++ b/pyanaconda/iw/lvm_dialog_gui.py
@@ -26,12 +26,12 @@ import gobject
 import gtk
 import datacombo
 
-import gui
+import pyanaconda.gui as gui
 from partition_ui_helpers_gui import *
-from constants import *
-from storage.devices import *
-from storage.deviceaction import *
-from partIntfHelpers import *
+from pyanaconda.constants import *
+from pyanaconda.storage.devices import *
+from pyanaconda.storage.deviceaction import *
+from pyanaconda.partIntfHelpers import *
 
 import gettext
 _ = lambda x: gettext.ldgettext("anaconda", x)
diff --git a/pyanaconda/iw/netconfig_dialog.py b/pyanaconda/iw/netconfig_dialog.py
index 336cf0e..187fb75 100644
--- a/pyanaconda/iw/netconfig_dialog.py
+++ b/pyanaconda/iw/netconfig_dialog.py
@@ -21,13 +21,13 @@
 
 import gtk
 import gobject
-import gui
+import pyanaconda.gui as gui
 
-from constants import *
+from pyanaconda.constants import *
 import gettext
 _ = lambda x: gettext.ldgettext("anaconda", x)
 
-import network
+import pyanaconda.network as network
 import isys
 
 class NetworkConfigurator:
diff --git a/pyanaconda/iw/network_gui.py b/pyanaconda/iw/network_gui.py
index 34d1db4..f7dbb7d 100644
--- a/pyanaconda/iw/network_gui.py
+++ b/pyanaconda/iw/network_gui.py
@@ -23,16 +23,16 @@
 
 import string
 from iw_gui import *
-import gui
-import network
-import iutil
+import pyanaconda.gui as gui
+import pyanaconda.network as network
+import pyanaconda.iutil as iutil
 import gobject
 import subprocess
 import gtk
 import isys
 import urlgrabber.grabber
 
-from constants import *
+from pyanaconda.constants import *
 import gettext
 _ = lambda x: gettext.ldgettext("anaconda", x)
 
diff --git a/pyanaconda/iw/osbootwidget.py b/pyanaconda/iw/osbootwidget.py
index 8c89d43..a76830e 100644
--- a/pyanaconda/iw/osbootwidget.py
+++ b/pyanaconda/iw/osbootwidget.py
@@ -21,12 +21,12 @@
 
 import gtk
 import gobject
-import iutil
+import pyanaconda.iutil as iutil
 import parted
-import gui
+import pyanaconda.gui as gui
 import datacombo
-from constants import *
-from storage.devices import devicePathToName
+from pyanaconda.constants import *
+from pyanaconda.storage.devices import devicePathToName
 
 import gettext
 _ = lambda x: gettext.ldgettext("anaconda", x)
diff --git a/pyanaconda/iw/package_gui.py b/pyanaconda/iw/package_gui.py
index 4e6bfbe..58a9942 100644
--- a/pyanaconda/iw/package_gui.py
+++ b/pyanaconda/iw/package_gui.py
@@ -22,10 +22,10 @@
 # FIXME: group selection isn't currently backend independent
 from GroupSelector import GroupSelector
 
-import gui
+import pyanaconda.gui as gui
 from iw_gui import *
 
-from constants import *
+from pyanaconda.constants import *
 import gettext
 _ = lambda x: gettext.ldgettext("anaconda", x)
 
diff --git a/pyanaconda/iw/partition_dialog_gui.py b/pyanaconda/iw/partition_dialog_gui.py
index 9064af4..9c26258 100644
--- a/pyanaconda/iw/partition_dialog_gui.py
+++ b/pyanaconda/iw/partition_dialog_gui.py
@@ -25,12 +25,12 @@ import copy
 import gobject
 import gtk
 
-import gui
-from storage.devices import PartitionDevice, LUKSDevice
-from storage.deviceaction import *
+import pyanaconda.gui as gui
+from pyanaconda.storage.devices import PartitionDevice, LUKSDevice
+from pyanaconda.storage.deviceaction import *
 from partition_ui_helpers_gui import *
-from constants import *
-from partIntfHelpers import *
+from pyanaconda.constants import *
+from pyanaconda.partIntfHelpers import *
 
 import gettext
 _ = lambda x: gettext.ldgettext("anaconda", x)
diff --git a/pyanaconda/iw/partition_gui.py b/pyanaconda/iw/partition_gui.py
index 79e2e43..106d6fb 100644
--- a/pyanaconda/iw/partition_gui.py
+++ b/pyanaconda/iw/partition_gui.py
@@ -29,31 +29,31 @@ try:
 except ImportError:
     import gnome.canvas as gnomecanvas
 import pango
-import gui
+import pyanaconda.gui as gui
 import parted
 import string
 import types
 import copy
 from decimal import Decimal
 
-import storage
+import pyanaconda.storage as storage
 from iw_gui import *
-from flags import flags
+from pyanaconda.flags import flags
 
 import datacombo
 import lvm_dialog_gui as l_d_g
 import raid_dialog_gui as r_d_g
 import partition_dialog_gui as p_d_g
 
-from partIntfHelpers import *
-from constants import *
+from pyanaconda.partIntfHelpers import *
+from pyanaconda.constants import *
 from partition_ui_helpers_gui import *
-from storage.partitioning import doPartitioning
-from storage.partitioning import hasFreeDiskSpace
-from storage.devicelibs import lvm
-from storage.devices import devicePathToName, PartitionDevice
-from storage.devices import deviceNameToDiskByPath
-from storage.errors import DeviceNotFoundError
+from pyanaconda.storage.partitioning import doPartitioning
+from pyanaconda.storage.partitioning import hasFreeDiskSpace
+from pyanaconda.storage.devicelibs import lvm
+from pyanaconda.storage.devices import devicePathToName, PartitionDevice
+from pyanaconda.storage.devices import deviceNameToDiskByPath
+from pyanaconda.storage.errors import DeviceNotFoundError
 
 import gettext
 _ = lambda x: gettext.ldgettext("anaconda", x)
diff --git a/pyanaconda/iw/partition_ui_helpers_gui.py b/pyanaconda/iw/partition_ui_helpers_gui.py
index f38adea..ac21593 100644
--- a/pyanaconda/iw/partition_ui_helpers_gui.py
+++ b/pyanaconda/iw/partition_ui_helpers_gui.py
@@ -25,11 +25,11 @@ import gobject
 import gtk
 import checklist
 import datacombo
-import iutil
+import pyanaconda.iutil as iutil
 
-from constants import *
-from partIntfHelpers import *
-from storage.formats import *
+from pyanaconda.constants import *
+from pyanaconda.partIntfHelpers import *
+from pyanaconda.storage.formats import *
 
 import gettext
 _ = lambda x: gettext.ldgettext("anaconda", x)
diff --git a/pyanaconda/iw/pixmapRadioButtonGroup_gui.py b/pyanaconda/iw/pixmapRadioButtonGroup_gui.py
index 0ded4e2..308a13f 100644
--- a/pyanaconda/iw/pixmapRadioButtonGroup_gui.py
+++ b/pyanaconda/iw/pixmapRadioButtonGroup_gui.py
@@ -19,7 +19,7 @@
 #
 
 import gtk
-from constants import *
+from pyanaconda.constants import *
 
 class pixmapRadioButtonGroup:
 
diff --git a/pyanaconda/iw/progress_gui.py b/pyanaconda/iw/progress_gui.py
index a72b526..82f5046 100644
--- a/pyanaconda/iw/progress_gui.py
+++ b/pyanaconda/iw/progress_gui.py
@@ -24,11 +24,11 @@ import glob
 import gtk
 import pango
 
-import gui
-from flags import flags
+import pyanaconda.gui as gui
+from pyanaconda.flags import flags
 from iw_gui import *
-from constants import *
-import language
+from pyanaconda.constants import *
+import pyanaconda.language as language
 
 import logging
 log = logging.getLogger("anaconda")
diff --git a/pyanaconda/iw/raid_dialog_gui.py b/pyanaconda/iw/raid_dialog_gui.py
index f6d7db0..9498b44 100644
--- a/pyanaconda/iw/raid_dialog_gui.py
+++ b/pyanaconda/iw/raid_dialog_gui.py
@@ -27,13 +27,13 @@ import gobject
 import gtk
 import datacombo
 
-import gui
-import storage.devicelibs.mdraid as mdraidlib
-from storage.devices import *
-from storage.deviceaction import *
+import pyanaconda.gui as gui
+import pyanaconda.storage.devicelibs.mdraid as mdraidlib
+from pyanaconda.storage.devices import *
+from pyanaconda.storage.deviceaction import *
 from partition_ui_helpers_gui import *
-from constants import *
-from partIntfHelpers import *
+from pyanaconda.constants import *
+from pyanaconda.partIntfHelpers import *
 
 import gettext
 _ = lambda x: gettext.ldgettext("anaconda", x)
diff --git a/pyanaconda/iw/task_gui.py b/pyanaconda/iw/task_gui.py
index dabd13e..af50baa 100644
--- a/pyanaconda/iw/task_gui.py
+++ b/pyanaconda/iw/task_gui.py
@@ -20,21 +20,21 @@
 import gtk
 import gtk.glade
 import gobject
-import gui
+import pyanaconda.gui as gui
 import gzip
 from iw_gui import *
-from image import *
-from constants import *
+from pyanaconda.image import *
+from pyanaconda.constants import *
 import isys
 import shutil
 
 import gettext
 _ = lambda x: gettext.ldgettext("anaconda", x)
 
-import network
-import iutil
+import pyanaconda.network as network
+import pyanaconda.iutil as iutil
 
-from yuminstall import AnacondaYumRepo
+from pyanaconda.yuminstall import AnacondaYumRepo
 import urlgrabber.grabber
 import yum.Errors
 
diff --git a/pyanaconda/iw/timezone_gui.py b/pyanaconda/iw/timezone_gui.py
index 1ca4829..ca237bc 100644
--- a/pyanaconda/iw/timezone_gui.py
+++ b/pyanaconda/iw/timezone_gui.py
@@ -29,10 +29,10 @@ import sys
 
 from timezone_map_gui import TimezoneMap, Enum
 from iw_gui import *
-from booty.bootloaderInfo import dosFilesystems
-from bootloader import hasWindows
+from pyanaconda.booty.bootloaderInfo import dosFilesystems
+from pyanaconda.bootloader import hasWindows
 
-from constants import *
+from pyanaconda.constants import *
 import gettext
 _ = lambda x: gettext.ldgettext("anaconda", x)
 
diff --git a/pyanaconda/iw/upgrade_bootloader_gui.py b/pyanaconda/iw/upgrade_bootloader_gui.py
index 2597a53..afbe62b 100644
--- a/pyanaconda/iw/upgrade_bootloader_gui.py
+++ b/pyanaconda/iw/upgrade_bootloader_gui.py
@@ -23,10 +23,10 @@
 from iw_gui import *
 
 import gtk
-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/iw/upgrade_migratefs_gui.py b/pyanaconda/iw/upgrade_migratefs_gui.py
index dd3de5c..23aed31 100644
--- a/pyanaconda/iw/upgrade_migratefs_gui.py
+++ b/pyanaconda/iw/upgrade_migratefs_gui.py
@@ -20,12 +20,12 @@
 #
 
 from iw_gui import *
-from constants import *
-from storage.formats import getFormat
-from storage.deviceaction import ActionMigrateFormat
+from pyanaconda.constants import *
+from pyanaconda.storage.formats import getFormat
+from pyanaconda.storage.deviceaction import ActionMigrateFormat
 import string
 import isys 
-import iutil
+import pyanaconda.iutil as iutil
 import gtk
 
 import gettext
diff --git a/pyanaconda/iw/upgrade_swap_gui.py b/pyanaconda/iw/upgrade_swap_gui.py
index 0edba09..b560081 100644
--- a/pyanaconda/iw/upgrade_swap_gui.py
+++ b/pyanaconda/iw/upgrade_swap_gui.py
@@ -19,15 +19,15 @@
 # Author(s): Mike Fulbright <msf@xxxxxxxxxx>
 #
 
-import iutil
-import upgrade
-import gui
+import pyanaconda.iutil as iutil
+import pyanaconda.upgrade as upgrade
+import pyanaconda.gui as gui
 import gobject
 import gtk
 from iw_gui 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/iw/welcome_gui.py b/pyanaconda/iw/welcome_gui.py
index b101477..1ee75c0 100644
--- a/pyanaconda/iw/welcome_gui.py
+++ b/pyanaconda/iw/welcome_gui.py
@@ -18,11 +18,11 @@
 #
 
 import gtk
-import gui
+import pyanaconda.gui as gui
 import sys
 from iw_gui import *
 
-from constants import *
+from pyanaconda.constants import *
 import gettext
 _ = lambda x: gettext.ldgettext("anaconda", x)
 
diff --git a/pyanaconda/iw/zipl_gui.py b/pyanaconda/iw/zipl_gui.py
index 9f2bdc2..a4ea01d 100644
--- a/pyanaconda/iw/zipl_gui.py
+++ b/pyanaconda/iw/zipl_gui.py
@@ -22,8 +22,8 @@
 import gtk
 import string
 from iw_gui 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


[Index of Archives]     [Kickstart]     [Fedora Users]     [Fedora Legacy List]     [Fedora Maintainers]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [Yosemite Photos]     [KDE Users]     [Fedora Tools]
  Powered by Linux