[blivet:master 26/26] Simplify a small chunk of Blivet.updateKSData()

mulhern amulhern at redhat.com
Thu May 29 18:47:44 UTC 2014


---
 blivet/__init__.py | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/blivet/__init__.py b/blivet/__init__.py
index b77ff8b..d68c16c 100644
--- a/blivet/__init__.py
+++ b/blivet/__init__.py
@@ -2136,17 +2136,13 @@ class Blivet(object):
                                 for a in d.ancestors))
         devices.sort(key=lambda d: len(d.ancestors))
         for device in devices:
-            class_attr = None
-            list_attr = None
-            for cls in ksMap.iterkeys():
-                if isinstance(device, cls):
-                    class_attr, list_attr = ksMap[cls]
-                    break
-
-            if not class_attr or not list_attr:
+            cls = next((c for c in ksMap if isinstance(device, c)), None)
+            if cls is None:
                 log.info("omitting ksdata: %s", device)
                 continue
 
+            class_attr, list_attr = ksMap[cls]
+
             cls = getattr(self.ksdata, class_attr)
             data = cls()    # all defaults
 
-- 
1.8.3.1



More information about the anaconda-patches mailing list