[blivet:master 04/10] Put a field and a method in the base class

mulhern amulhern at redhat.com
Tue Mar 25 15:49:03 UTC 2014


* Add an abstract method for _labelstrRegex
* Stick field _name in the base class (can't abstractify it)

All subclasses already override _labelstrRegex, so these errors were benign.

Signed-off-by: mulhern <amulhern at redhat.com>
---
 blivet/formats/fslabel.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/blivet/formats/fslabel.py b/blivet/formats/fslabel.py
index 2d7ca98..c0dc7e9 100644
--- a/blivet/formats/fslabel.py
+++ b/blivet/formats/fslabel.py
@@ -30,6 +30,7 @@ class FSLabelApp(object):
     """
 
     __metaclass__ = abc.ABCMeta
+    _name = None
 
     @property
     def name(self):
@@ -83,6 +84,16 @@ class FSLabelApp(object):
         """
         raise NotImplementedError
 
+    @abc.abstractmethod
+    def _labelstrRegex(self):
+        """Returns a regular expression to match against output of file
+           label reading application to extract label.
+
+           :return: the regular expressions
+           :rtype: str
+        """
+        raise NotImplementedError
+
     def readLabelCommand(self, fs):
         """Get the command to read the filesystem label.
 
-- 
1.8.3.1



More information about the anaconda-patches mailing list