Make assignments that override abstract properties into simple attrib…

…utes.

Related: storaged-project#12

See commit 3b50bf259ab8e1ce98969cf15e672459bbef5e18for a further
explanation.

Signed-off-by: mulhern <amulhern@redhat.com>

blivet/formats/fslabeling.py

@@ -61,8 +61,8 @@ def labelingArgs(self, label):
 
 class Ext2FSLabeling(FSLabeling):
 
-    default_label = property(lambda s: "")
-    label_app = property(lambda s: fslabel.E2Label)
+    default_label = ""
+    label_app = fslabel.E2Label
 
     def labelFormatOK(self, label):
         return len(label) < 17
@@ -72,8 +72,8 @@ def labelingArgs(self, label):
 
 class FATFSLabeling(FSLabeling):
 
-    default_label = property(lambda s: "NO NAME")
-    label_app = property(lambda s: fslabel.DosFsLabel)
+    default_label = "NO NAME"
+    label_app = fslabel.DosFsLabel
 
     def labelFormatOK(self, label):
         return len(label) < 12
@@ -83,8 +83,8 @@ def labelingArgs(self, label):
 
 class JFSLabeling(FSLabeling):
 
-    default_label = property(lambda s: "")
-    label_app = property(lambda s: fslabel.JFSTune)
+    default_label = ""
+    label_app = fslabel.JFSTune
 
     def labelFormatOK(self, label):
         return len(label) < 17
@@ -94,8 +94,8 @@ def labelingArgs(self, label):
 
 class ReiserFSLabeling(FSLabeling):
 
-    default_label = property(lambda s: "")
-    label_app = property(lambda s: fslabel.ReiserFSTune)
+    default_label = ""
+    label_app = fslabel.ReiserFSTune
 
     def labelFormatOK(self, label):
         return len(label) < 17
@@ -105,8 +105,8 @@ def labelingArgs(self, label):
 
 class XFSLabeling(FSLabeling):
 
-    default_label = property(lambda s: "")
-    label_app = property(lambda s: fslabel.XFSAdmin)
+    default_label = ""
+    label_app = fslabel.XFSAdmin
 
     def labelFormatOK(self, label):
         return ' ' not in label and len(label) < 13
@@ -116,8 +116,8 @@ def labelingArgs(self, label):
 
 class HFSLabeling(FSLabeling):
 
-    default_label = property(lambda s: "Untitled")
-    label_app = property(lambda s: None)
+    default_label = "Untitled"
+    label_app = None
 
     def labelFormatOK(self, label):
         return ':' not in label and len(label) < 28 and len(label) > 0
@@ -127,8 +127,8 @@ def labelingArgs(self, label):
 
 class HFSPlusLabeling(FSLabeling):
 
-    default_label = property(lambda s: "Untitled")
-    label_app = property(lambda s: None)
+    default_label = "Untitled"
+    label_app = None
 
     def labelFormatOK(self, label):
         return ':' not in label and 0 < len(label) < 129
@@ -138,8 +138,8 @@ def labelingArgs(self, label):
 
 class NTFSLabeling(FSLabeling):
 
-    default_label = property(lambda s: "")
-    label_app = property(lambda s: fslabel.NTFSLabel)
+    default_label = ""
+    label_app = fslabel.NTFSLabel
 
     def labelFormatOK(self, label):
         return len(label) < 129