[master 2/12] Rearrange and group some of the StorageDevice's methods/properties

vpodzime installerbot-noreply at redhat.com
Fri Jun 12 13:58:02 UTC 2015


From: Vratislav Podzimek <vpodzime at redhat.com>

Those that are related to each other should be next to each other and titled.
---
 blivet/devices/storage.py | 124 ++++++++++++++++++++++++++--------------------
 1 file changed, 71 insertions(+), 53 deletions(-)

diff --git a/blivet/devices/storage.py b/blivet/devices/storage.py
index 88f8b8e..ed398d7 100644
--- a/blivet/devices/storage.py
+++ b/blivet/devices/storage.py
@@ -486,6 +486,9 @@ def _postDestroy(self):
         """ Perform post-destruction operations. """
         self.exists = False
 
+    #
+    # parents' modifications/notifications
+    #
     def setupParents(self, orig=False):
         """ Run setup method of all parent devices. """
         log_method_call(self, name=self.name, orig=orig, kids=self.kids)
@@ -500,6 +503,37 @@ def setupParents(self, orig=False):
             if _format.type and _format.exists:
                 _format.setup()
 
+    # pylint: disable=unused-argument
+    def removeHook(self, modparent=True):
+        """ Perform actions related to removing a device from the devicetree.
+
+            :keyword bool modparent: whether to account for removal in parents
+
+            Parent child counts are adjusted regardless of modparent's value.
+            The intended use of modparent is to prevent doing things like
+            removing a parted.Partition from the disk that contains it as part
+            of msdos extended partition management. In general, you should not
+            override the default value of modparent in new code.
+        """
+        for parent in self.parents:
+            parent.removeChild()
+
+    def addHook(self, new=True):
+        """ Perform actions related to adding a device to the devicetree.
+
+            :keyword bool new: whether this device is new to the devicetree
+
+            The only intended use case for new=False is when unhiding a device
+            from the devicetree. Additional operations are performed when new is
+            False that are normally performed as part of the device constructor.
+        """
+        if not new:
+            for p in self.parents:
+                p.addChild()
+
+    #
+    # size manipulations
+    #
     def _getSize(self):
         """ Get the device's size, accounting for pending changes. """
         size = self._size
@@ -575,6 +609,29 @@ def maxSize(self):
         return self.alignTargetSize(self.format.maxSize) if self.resizable else self.currentSize
 
     @property
+    def growable(self):
+        """ True if this device or its component devices are growable. """
+        return getattr(self, "req_grow", False) or any(p.growable for p in self.parents)
+
+    def checkSize(self):
+        """ Check to make sure the size of the device is allowed by the
+            format used.
+
+            Returns:
+            0  - ok
+            1  - Too large
+            -1 - Too small
+        """
+        if self.format.maxSize and self.size > self.format.maxSize:
+            return 1
+        elif self.format.minSize and self.size < self.format.minSize:
+            return -1
+        return 0
+
+    #
+    # status
+    #
+    @property
     def mediaPresent(self):
         """ True if this device contains usable media. """
         return True
@@ -591,6 +648,9 @@ def status(self):
             return False
         return os.access(self.path, os.W_OK)
 
+    #
+    # format manipulations
+    #
     def _setFormat(self, fmt):
         """ Set the Device's format. """
         if not fmt:
@@ -634,6 +694,14 @@ def preCommitFixup(self, *args, **kwargs):
         pass
 
     @property
+    def formatImmutable(self):
+        """ Is it possible to execute format actions on this device? """
+        return self._formatImmutable or self.protected
+
+    #
+    # misc properties
+    #
+    @property
     def removable(self):
         devpath = os.path.normpath(self.sysfsPath)
         remfile = os.path.normpath("%s/removable" % devpath)
@@ -642,11 +710,6 @@ def removable(self):
                 open(remfile).readline().strip() == "1")
 
     @property
-    def formatImmutable(self):
-        """ Is it possible to execute format actions on this device? """
-        return self._formatImmutable or self.protected
-
-    @property
     def direct(self):
         """ Is this device directly accessible? """
         return self.isleaf
@@ -675,54 +738,6 @@ def model(self):
     def vendor(self):
         return self._vendor
 
-    @property
-    def growable(self):
-        """ True if this device or its component devices are growable. """
-        return getattr(self, "req_grow", False) or any(p.growable for p in self.parents)
-
-    def checkSize(self):
-        """ Check to make sure the size of the device is allowed by the
-            format used.
-
-            Returns:
-            0  - ok
-            1  - Too large
-            -1 - Too small
-        """
-        if self.format.maxSize and self.size > self.format.maxSize:
-            return 1
-        elif self.format.minSize and self.size < self.format.minSize:
-            return -1
-        return 0
-
-    # pylint: disable=unused-argument
-    def removeHook(self, modparent=True):
-        """ Perform actions related to removing a device from the devicetree.
-
-            :keyword bool modparent: whether to account for removal in parents
-
-            Parent child counts are adjusted regardless of modparent's value.
-            The intended use of modparent is to prevent doing things like
-            removing a parted.Partition from the disk that contains it as part
-            of msdos extended partition management. In general, you should not
-            override the default value of modparent in new code.
-        """
-        for parent in self.parents:
-            parent.removeChild()
-
-    def addHook(self, new=True):
-        """ Perform actions related to adding a device to the devicetree.
-
-            :keyword bool new: whether this device is new to the devicetree
-
-            The only intended use case for new=False is when unhiding a device
-            from the devicetree. Additional operations are performed when new is
-            False that are normally performed as part of the device constructor.
-        """
-        if not new:
-            for p in self.parents:
-                p.addChild()
-
     def populateKSData(self, data):
         # the common pieces are basically the formatting
         self.format.populateKSData(data)
@@ -751,6 +766,9 @@ def isNameValid(cls, name):
         badchars = any(c in ('\x00', '/') for c in name)
         return not(badchars or name == '.' or name == '..')
 
+    #
+    # dependencies
+    #
     @classmethod
     def typeExternalDependencies(cls):
         """ A list of external dependencies of this device type.


-- 
To view this commit on github, visit https://github.com/rhinstaller/blivet/commit/e47ad836d062e63f5c7dd868fec2ad005b99c438


More information about the anaconda-patches mailing list