It really is just another pyanaconda subpackage. --- anaconda | 2 +- booty/bootloaderInfo.py | 2 +- booty/ppc.py | 2 +- booty/sparc.py | 2 +- pyanaconda/iw/account_gui.py | 2 +- pyanaconda/iw/cleardisks_gui.py | 2 +- pyanaconda/iw/netconfig_dialog.py | 2 +- pyanaconda/iw/network_gui.py | 2 +- pyanaconda/iw/task_gui.py | 2 +- pyanaconda/iw/upgrade_migratefs_gui.py | 2 +- pyanaconda/storage/__init__.py | 2 +- pyanaconda/storage/devices.py | 2 +- pyanaconda/storage/fcoe.py | 2 +- pyanaconda/storage/formats/fs.py | 2 +- pyanaconda/textw/keyboard_text.py | 2 +- pyanaconda/textw/netconfig_text.py | 2 +- pyanaconda/textw/partition_text.py | 2 +- pyanaconda/textw/upgrade_text.py | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/anaconda b/anaconda index 31ee1f6..1f432f2 100755 --- a/anaconda +++ b/anaconda @@ -471,7 +471,7 @@ if __name__ == "__main__": # this handles setting up updates for pypackages to minimize the set needed setupPythonUpdates() - import isys + import pyanaconda.isys as isys isys.initLog() import signal, string, time diff --git a/booty/bootloaderInfo.py b/booty/bootloaderInfo.py index b5b42d6..d455bf7 100644 --- a/booty/bootloaderInfo.py +++ b/booty/bootloaderInfo.py @@ -32,7 +32,7 @@ from lilo import LiloConfigFile from pyanaconda.flags import flags import pyanaconda.iutil as iutil -import isys +import pyanaconda.isys as isys from pyanaconda.product import * import booty diff --git a/booty/ppc.py b/booty/ppc.py index 5ef7e9a..53bb9e4 100644 --- a/booty/ppc.py +++ b/booty/ppc.py @@ -138,7 +138,7 @@ class ppcBootloaderInfo(bootloaderInfo): os.chmod(instRoot + cf, 0600) # FIXME: hack to make sure things are written to disk - import isys + import pyanaconda.isys as isys isys.sync() isys.sync() isys.sync() diff --git a/booty/sparc.py b/booty/sparc.py index 63b49e8..da06e2a 100644 --- a/booty/sparc.py +++ b/booty/sparc.py @@ -81,7 +81,7 @@ class sparcBootloaderInfo(bootloaderInfo): os.chmod(instRoot + cf, 0600) # FIXME: hack to make sure things are written to disk - import isys + import pyanaconda.isys as isys isys.sync() isys.sync() isys.sync() diff --git a/pyanaconda/iw/account_gui.py b/pyanaconda/iw/account_gui.py index b8488fb..fd54ef4 100644 --- a/pyanaconda/iw/account_gui.py +++ b/pyanaconda/iw/account_gui.py @@ -26,7 +26,7 @@ from iw_gui import * from pyanaconda.flags import flags from pyanaconda.constants import * import cracklib -import _isys +from pyanaconda.isys import _isys import gettext _ = lambda x: gettext.ldgettext("anaconda", x) diff --git a/pyanaconda/iw/cleardisks_gui.py b/pyanaconda/iw/cleardisks_gui.py index c09219c..23a7abc 100644 --- a/pyanaconda/iw/cleardisks_gui.py +++ b/pyanaconda/iw/cleardisks_gui.py @@ -22,7 +22,7 @@ import gtk, gobject import pyanaconda.gui as gui from DeviceSelector import * from pyanaconda.constants import * -import isys +import pyanaconda.isys as isys from iw_gui import * from pyanaconda.storage.devices import deviceNameToDiskByPath from pyanaconda.storage.udev import * diff --git a/pyanaconda/iw/netconfig_dialog.py b/pyanaconda/iw/netconfig_dialog.py index 187fb75..b48c19c 100644 --- a/pyanaconda/iw/netconfig_dialog.py +++ b/pyanaconda/iw/netconfig_dialog.py @@ -28,7 +28,7 @@ import gettext _ = lambda x: gettext.ldgettext("anaconda", x) import pyanaconda.network as network -import isys +import pyanaconda.isys as isys class NetworkConfigurator: def __init__(self, network): diff --git a/pyanaconda/iw/network_gui.py b/pyanaconda/iw/network_gui.py index f7dbb7d..a97cfe6 100644 --- a/pyanaconda/iw/network_gui.py +++ b/pyanaconda/iw/network_gui.py @@ -29,7 +29,7 @@ import pyanaconda.iutil as iutil import gobject import subprocess import gtk -import isys +import pyanaconda.isys as isys import urlgrabber.grabber from pyanaconda.constants import * diff --git a/pyanaconda/iw/task_gui.py b/pyanaconda/iw/task_gui.py index af50baa..d6eedbb 100644 --- a/pyanaconda/iw/task_gui.py +++ b/pyanaconda/iw/task_gui.py @@ -25,7 +25,7 @@ import gzip from iw_gui import * from pyanaconda.image import * from pyanaconda.constants import * -import isys +import pyanaconda.isys as isys import shutil import gettext diff --git a/pyanaconda/iw/upgrade_migratefs_gui.py b/pyanaconda/iw/upgrade_migratefs_gui.py index 23aed31..fe09f67 100644 --- a/pyanaconda/iw/upgrade_migratefs_gui.py +++ b/pyanaconda/iw/upgrade_migratefs_gui.py @@ -24,7 +24,7 @@ from pyanaconda.constants import * from pyanaconda.storage.formats import getFormat from pyanaconda.storage.deviceaction import ActionMigrateFormat import string -import isys +import pyanaconda.isys as isys import pyanaconda.iutil as iutil import gtk diff --git a/pyanaconda/storage/__init__.py b/pyanaconda/storage/__init__.py index 3bebad0..4239e49 100644 --- a/pyanaconda/storage/__init__.py +++ b/pyanaconda/storage/__init__.py @@ -30,7 +30,7 @@ import statvfs import nss.nss import parted -import isys +import pyanaconda.isys as isys import pyanaconda.iutil as iutil from pyanaconda.constants import * from pykickstart.constants import * diff --git a/pyanaconda/storage/devices.py b/pyanaconda/storage/devices.py index 57a618d..1ef6895 100644 --- a/pyanaconda/storage/devices.py +++ b/pyanaconda/storage/devices.py @@ -3507,7 +3507,7 @@ class OpticalDevice(StorageDevice): def eject(self): """ Eject the drawer. """ - import _isys + from pyanaconda.isys import _isys log_method_call(self, self.name, status=self.status) if not self.exists: diff --git a/pyanaconda/storage/fcoe.py b/pyanaconda/storage/fcoe.py index 3be852c..0d246d5 100644 --- a/pyanaconda/storage/fcoe.py +++ b/pyanaconda/storage/fcoe.py @@ -19,7 +19,7 @@ import os import pyanaconda.iutil as iutil -import isys +import pyanaconda.isys as isys import logging import time from pyanaconda.flags import flags diff --git a/pyanaconda/storage/formats/fs.py b/pyanaconda/storage/formats/fs.py index fa55245..c33c6d9 100644 --- a/pyanaconda/storage/formats/fs.py +++ b/pyanaconda/storage/formats/fs.py @@ -32,7 +32,7 @@ import os import sys import tempfile import selinux -import isys +import pyanaconda.isys as isys from ..errors import * from . import DeviceFormat, register_device_format diff --git a/pyanaconda/textw/keyboard_text.py b/pyanaconda/textw/keyboard_text.py index 09b152a..1089099 100644 --- a/pyanaconda/textw/keyboard_text.py +++ b/pyanaconda/textw/keyboard_text.py @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -import isys +import pyanaconda.isys as isys from snack import * from constants_text import * from pyanaconda.flags import flags diff --git a/pyanaconda/textw/netconfig_text.py b/pyanaconda/textw/netconfig_text.py index 5d33f0c..a22f23f 100644 --- a/pyanaconda/textw/netconfig_text.py +++ b/pyanaconda/textw/netconfig_text.py @@ -22,7 +22,7 @@ # -import isys +import pyanaconda.isys as isys import pyanaconda.network as network from snack import * from constants_text import * diff --git a/pyanaconda/textw/partition_text.py b/pyanaconda/textw/partition_text.py index b483f25..89baba1 100644 --- a/pyanaconda/textw/partition_text.py +++ b/pyanaconda/textw/partition_text.py @@ -22,7 +22,7 @@ # import os, sys -import isys +import pyanaconda.isys as isys import string import copy import pyanaconda.network as network diff --git a/pyanaconda/textw/upgrade_text.py b/pyanaconda/textw/upgrade_text.py index 78eb988..ca9f64e 100644 --- a/pyanaconda/textw/upgrade_text.py +++ b/pyanaconda/textw/upgrade_text.py @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -import isys +import pyanaconda.isys as isys import pyanaconda.iutil as iutil import pyanaconda.upgrade as upgrade from constants_text import * -- 1.7.0.1 _______________________________________________ Anaconda-devel-list mailing list Anaconda-devel-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/anaconda-devel-list