[PATCH 5/5] Fully qualify device classes instead of relying on namespace oddities.

[David Lehman <dlehman@xxxxxxxxxx>]

---
 iw/partition_gui.py |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/iw/partition_gui.py b/iw/partition_gui.py
index f3f0ff9..ef67e1a 100644
--- a/iw/partition_gui.py
+++ b/iw/partition_gui.py
@@ -49,7 +49,7 @@ 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 devicePathToName
 
 import gettext
 _ = lambda x: gettext.ldgettext("anaconda", x)
@@ -1128,16 +1128,16 @@ class PartitionWindow(InstallWindow):
                 device = self.storage.newPartition(fmt_type=tempformat, size=200)
                 self.editPartition(device, isNew = True)
 
-            elif isinstance(stripe_dev, storage.LVMVolumeGroupDevice):
+            elif isinstance(stripe_dev, storage.devices.LVMVolumeGroupDevice):
                 self.editLVMLogicalVolume(vg = stripe_dev)
                 return
 
     def treeActivateCB(self, *args):
         curr_dev = self.tree.getCurrentDevice()
-        if isinstance(curr_dev, storage.PartitionDevice) \
-                or isinstance(curr_dev, storage.LVMLogicalVolumeDevice) \
-                or isinstance(curr_dev, storage.LVMVolumeGroupDevice) \
-                or isinstance(curr_dev, storage.MDRaidArrayDevice):
+        if isinstance(curr_dev, (storage.devices.PartitionDevice,
+                                 storage.devices.LVMLogicalVolumeDevice,
+                                 storage.devices.LVMVolumeGroupDevice,
+                                 storage.devices.MDRaidArrayDevice)):
             self.editCB()
 
         elif curr_dev == None:
@@ -1157,7 +1157,7 @@ class PartitionWindow(InstallWindow):
                 device = self.storage.newPartition(fmt_type=tempformat, size=200)
                 self.editPartition(device, isNew = True)
 
-            elif isinstance(curr_parent, storage.LVMVolumeGroupDevice):
+            elif isinstance(curr_parent, storage.devices.LVMVolumeGroupDevice):
                 self.editLVMLogicalVolume(vg = curr_parent)
                 return
 
@@ -1202,7 +1202,7 @@ class PartitionWindow(InstallWindow):
                             dcCB = self.barviewActivateCB)
                 self.stripeGraph.setDisplayed(parent)
 
-            elif isinstance(parent, storage.LVMVolumeGroupDevice):
+            elif isinstance(parent, storage.devices.LVMVolumeGroupDevice):
                 if not isinstance(self.stripeGraph, LVMStripeGraph):
                     self.stripeGraph.shutDown()
                     self.stripeGraph = LVMStripeGraph(self.storage,
@@ -1221,7 +1221,7 @@ class PartitionWindow(InstallWindow):
             # this is deletable but not editable.
             self.deleteButton.set_sensitive(True)
 
-        elif isinstance(device, storage.PartitionDevice):
+        elif isinstance(device, storage.devices.PartitionDevice):
             if not isinstance(self.stripeGraph, DiskStripeGraph):
                 self.stripeGraph.shutDown()
                 self.stripeGraph = DiskStripeGraph(self.storage,
@@ -1233,7 +1233,7 @@ class PartitionWindow(InstallWindow):
             self.deleteButton.set_sensitive(True)
             self.editButton.set_sensitive(True)
 
-        elif isinstance(device, storage.LVMVolumeGroupDevice):
+        elif isinstance(device, storage.devices.LVMVolumeGroupDevice):
             if not isinstance(self.stripeGraph, LVMStripeGraph):
                 self.stripeGraph.shutDown()
                 self.stripeGraph = LVMStripeGraph(self.storage, vg = device,
@@ -1243,7 +1243,7 @@ class PartitionWindow(InstallWindow):
             self.deleteButton.set_sensitive(True)
             self.editButton.set_sensitive(True)
 
-        elif isinstance(device, storage.LVMLogicalVolumeDevice):
+        elif isinstance(device, storage.devices.LVMLogicalVolumeDevice):
             if not isinstance(self.stripeGraph, LVMStripeGraph):
                 self.stripeGraph.shutDown()
                 self.stripeGraph = LVMStripeGraph(self.storage, vg = device.vg,
@@ -1254,7 +1254,7 @@ class PartitionWindow(InstallWindow):
             self.deleteButton.set_sensitive(True)
             self.editButton.set_sensitive(True)
 
-        elif isinstance(device, storage.MDRaidArrayDevice):
+        elif isinstance(device, storage.devices.MDRaidArrayDevice):
             if not isinstance(self.stripeGraph, MDRaidArrayStripeGraph):
                 self.stripeGraph.shutDown()
                 self.stripeGraph = MDRaidArrayStripeGraph(self.storage,
-- 
1.6.5.2

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list