Remove the storage module and replace it with blivet.

8 files changed, 35 insertions, 35 deletions

diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py
index 94faef082..a590b6f58 100644
--- a/pyanaconda/ui/gui/spokes/custom.py
+++ b/pyanaconda/ui/gui/spokes/custom.py
@@ -49,29 +49,29 @@ from pykickstart.constants import *
 from pyanaconda.product import productName, productVersion
 from pyanaconda.threads import threadMgr
 
-from pyanaconda.storage.formats import device_formats
-from pyanaconda.storage.formats import getFormat
-from pyanaconda.storage.formats.fs import FS
-from pyanaconda.storage.size import Size
-from pyanaconda.storage import Root
-from pyanaconda.storage import DEVICE_TYPE_LVM
-from pyanaconda.storage import DEVICE_TYPE_BTRFS
-from pyanaconda.storage import DEVICE_TYPE_PARTITION
-from pyanaconda.storage import DEVICE_TYPE_MD
-from pyanaconda.storage import DEVICE_TYPE_DISK
-from pyanaconda.storage import getDeviceType
-from pyanaconda.storage import getRAIDLevel
-from pyanaconda.storage import findExistingInstallations
-from pyanaconda.storage.partitioning import doPartitioning
-from pyanaconda.storage.partitioning import doAutoPartition
-from pyanaconda.storage.errors import StorageError
-from pyanaconda.storage.errors import NoDisksError
-from pyanaconda.storage.errors import NotEnoughFreeSpaceError
-from pyanaconda.storage.errors import ErrorRecoveryFailure
-from pyanaconda.storage.errors import CryptoError
-from pyanaconda.storage.errors import MDRaidError
-from pyanaconda.storage.devicelibs import mdraid
-from pyanaconda.storage.devices import LUKSDevice
+from blivet.formats import device_formats
+from blivet.formats import getFormat
+from blivet.formats.fs import FS
+from blivet.size import Size
+from blivet import Root
+from blivet import DEVICE_TYPE_LVM
+from blivet import DEVICE_TYPE_BTRFS
+from blivet import DEVICE_TYPE_PARTITION
+from blivet import DEVICE_TYPE_MD
+from blivet import DEVICE_TYPE_DISK
+from blivet import getDeviceType
+from blivet import getRAIDLevel
+from blivet import findExistingInstallations
+from blivet.partitioning import doPartitioning
+from blivet.partitioning import doAutoPartition
+from blivet.errors import StorageError
+from blivet.errors import NoDisksError
+from blivet.errors import NotEnoughFreeSpaceError
+from blivet.errors import ErrorRecoveryFailure
+from blivet.errors import CryptoError
+from blivet.errors import MDRaidError
+from blivet.devicelibs import mdraid
+from blivet.devices import LUKSDevice
 
 from pyanaconda.ui import communication
 from pyanaconda.ui.gui import GUIObject
diff --git a/pyanaconda/ui/gui/spokes/lib/cart.py b/pyanaconda/ui/gui/spokes/lib/cart.py
index 76d36494f..bdc4fafcc 100644
--- a/pyanaconda/ui/gui/spokes/lib/cart.py
+++ b/pyanaconda/ui/gui/spokes/lib/cart.py
@@ -23,7 +23,7 @@
 from gi.repository import Gtk
 
 from pyanaconda.ui.gui import GUIObject
-from pyanaconda.storage.size import Size
+from blivet.size import Size
 
 import gettext
 
diff --git a/pyanaconda/ui/gui/spokes/lib/resize.py b/pyanaconda/ui/gui/spokes/lib/resize.py
index 0753331ff..ff6e0141e 100644
--- a/pyanaconda/ui/gui/spokes/lib/resize.py
+++ b/pyanaconda/ui/gui/spokes/lib/resize.py
@@ -24,7 +24,7 @@ from __future__ import division
 from gi.repository import Gtk
 
 from pyanaconda.ui.gui import GUIObject
-from pyanaconda.storage.size import Size
+from blivet.size import Size
 
 import gettext
 
diff --git a/pyanaconda/ui/gui/spokes/storage.py b/pyanaconda/ui/gui/spokes/storage.py
index a91d30242..58ebf857f 100644
--- a/pyanaconda/ui/gui/spokes/storage.py
+++ b/pyanaconda/ui/gui/spokes/storage.py
@@ -51,9 +51,9 @@ from pyanaconda.ui.gui.categories.storage import StorageCategory
 from pyanaconda.ui.gui.utils import enlightbox, gtk_call_once, gtk_thread_wait
 
 from pyanaconda.kickstart import doKickstartStorage
-from pyanaconda.storage.size import Size
-from pyanaconda.storage.errors import StorageError
-from pyanaconda.storage.platform import platform
+from blivet.size import Size
+from blivet.errors import StorageError
+from blivet.platform import platform
 from pyanaconda.threads import threadMgr, AnacondaThread
 from pyanaconda.product import productName
 from pyanaconda.flags import flags
diff --git a/pyanaconda/ui/gui/tools/run-spoke.py b/pyanaconda/ui/gui/tools/run-spoke.py
index 92173e747..5f85907cc 100755
--- a/pyanaconda/ui/gui/tools/run-spoke.py
+++ b/pyanaconda/ui/gui/tools/run-spoke.py
@@ -27,7 +27,7 @@ from pyanaconda import anaconda_log
 anaconda_log.init()
 
 from pyanaconda.installclass import DefaultInstall
-from pyanaconda.storage import Storage
+from blivet import Blivet
 from pyanaconda.threads import initThreading
 from pyanaconda.packaging.yumpayload import YumPayload
 from pykickstart.version import makeVersion
@@ -89,7 +89,7 @@ if not spokeClass:
 print "Running %s %s from %s" % (spokeText, spokeClass, spokeModule)
 
 ksdata = makeVersion()
-storage = Storage(data=ksdata)
+storage = Blivet(ksdata=ksdata)
 storage.reset()
 instclass = DefaultInstall()
 
diff --git a/pyanaconda/ui/lib/space.py b/pyanaconda/ui/lib/space.py
index c7601d371..44d1e3c78 100644
--- a/pyanaconda/ui/lib/space.py
+++ b/pyanaconda/ui/lib/space.py
@@ -19,7 +19,7 @@
 # Red Hat Author(s): David Lehman <dlehman@redhat.com>
 #
 
-from pyanaconda.storage.size import Size
+from blivet.size import Size
 
 import gettext
 
diff --git a/pyanaconda/ui/tui/spokes/storage.py b/pyanaconda/ui/tui/spokes/storage.py
index 5314438b3..292ffc29c 100644
--- a/pyanaconda/ui/tui/spokes/storage.py
+++ b/pyanaconda/ui/tui/spokes/storage.py
@@ -26,8 +26,8 @@ from pyanaconda.ui.tui.spokes import NormalTUISpoke
 from pyanaconda.ui.tui.simpleline import TextWidget, CheckboxWidget
 
 from pykickstart.constants import AUTOPART_TYPE_LVM
-from pyanaconda.storage.size import Size
-from pyanaconda.storage.errors import StorageError
+from blivet.size import Size
+from blivet.errors import StorageError
 from pyanaconda.flags import flags
 from pyanaconda.kickstart import doKickstartStorage
 from pyanaconda.threads import threadMgr, AnacondaThread
diff --git a/pyanaconda/ui/tui/tools/run-text-spoke.py b/pyanaconda/ui/tui/tools/run-text-spoke.py
index bc132f885..09c91a322 100755
--- a/pyanaconda/ui/tui/tools/run-text-spoke.py
+++ b/pyanaconda/ui/tui/tools/run-text-spoke.py
@@ -13,7 +13,7 @@ from pyanaconda import anaconda_log
 anaconda_log.init()
 
 from pyanaconda.installclass import DefaultInstall
-from pyanaconda.storage import Storage
+from blivet import Blivet
 from pyanaconda.threads import initThreading
 from pyanaconda.packaging.yumpayload import YumPayload
 from pykickstart.version import makeVersion
@@ -79,7 +79,7 @@ if not spokeClass:
 print "Running %s %s from %s" % (spokeText, spokeClass, spokeModule)
 
 ksdata = makeVersion()
-storage = Storage(data=ksdata)
+storage = Blivet(ksdata=ksdata)
 storage.reset()
 instclass = DefaultInstall()
 app = App("TEST HARNESS", yes_or_no_question = YesNoDialog)