[blivet:master 2/2] Remove pointless overrides.

mulhern amulhern at redhat.com
Fri Nov 21 18:07:34 UTC 2014


They are pointless if they give the same value to the attribute that
the assignment that they override does.

Signed-off-by: mulhern <amulhern at redhat.com>
---
 blivet/formats/biosboot.py      |  1 -
 blivet/formats/disklabel.py     |  1 -
 blivet/formats/dmraid.py        |  3 ---
 blivet/formats/fs.py            | 10 ----------
 blivet/formats/luks.py          |  1 -
 blivet/formats/multipath.py     |  3 ---
 blivet/formats/prepboot.py      |  1 -
 tests/formats_test/init_test.py |  3 ---
 8 files changed, 23 deletions(-)

diff --git a/blivet/formats/biosboot.py b/blivet/formats/biosboot.py
index 8ffccb8..0c6c251 100644
--- a/blivet/formats/biosboot.py
+++ b/blivet/formats/biosboot.py
@@ -31,7 +31,6 @@ class BIOSBoot(DeviceFormat):
     """ BIOS boot partition for GPT disklabels. """
     _type = "biosboot"
     _name = N_("BIOS Boot")
-    _udevTypes = []
     partedFlag = PARTITION_BIOS_GRUB
     _formattable = True                 # can be formatted
     _linuxNative = True                 # for clearpart
diff --git a/blivet/formats/disklabel.py b/blivet/formats/disklabel.py
index afb8679..ed42bef 100644
--- a/blivet/formats/disklabel.py
+++ b/blivet/formats/disklabel.py
@@ -43,7 +43,6 @@ class DiskLabel(DeviceFormat):
     _type = "disklabel"
     _name = N_("partition table")
     _formattable = True                # can be formatted
-    _supported = False                 # is supported
 
     def __init__(self, **kwargs):
         """
diff --git a/blivet/formats/dmraid.py b/blivet/formats/dmraid.py
index fb32d59..a44967a 100644
--- a/blivet/formats/dmraid.py
+++ b/blivet/formats/dmraid.py
@@ -48,11 +48,8 @@ class DMRaidMember(DeviceFormat):
                  "jmicron_raid_member", "lsi_mega_raid_member",
                  "nvidia_raid_member", "promise_fasttrack_raid_member",
                  "silicon_medley_raid_member", "via_raid_member"]
-    _formattable = False                # can be formatted
     _supported = True                   # is supported
-    _linuxNative = False                # for clearpart
     _packages = ["dmraid"]              # required packages
-    _resizable = False                  # can be resized
     _hidden = True                      # hide devices with this formatting?
 
     def __init__(self, **kwargs):
diff --git a/blivet/formats/fs.py b/blivet/formats/fs.py
index eb7f0bb..a37d4de 100644
--- a/blivet/formats/fs.py
+++ b/blivet/formats/fs.py
@@ -939,7 +939,6 @@ class Ext2FS(FS):
     _resizable = True
     _linuxNative = True
     _maxSize = Size("8 TiB")
-    _defaultMountOptions = ["defaults"]
     _defaultCheckOptions = ["-f", "-p", "-C", "0"]
     _dump = True
     _check = True
@@ -1113,7 +1112,6 @@ register_device_format(FATFS)
 class EFIFS(FATFS):
     _type = "efi"
     _mountType = "vfat"
-    _modules = ["vfat"]
     _name = N_("EFI System Partition")
     _minSize = Size("50 MiB")
 
@@ -1190,7 +1188,6 @@ class GFS2(FS):
     _formattable = True
     _defaultFormatOptions = ["-j", "1", "-p", "lock_nolock", "-O"]
     _linuxNative = True
-    _supported = False
     _dump = True
     _check = True
     _packages = ["gfs2-utils"]
@@ -1220,7 +1217,6 @@ class JFS(FS):
     _maxSize = Size("8 TiB")
     _formattable = True
     _linuxNative = True
-    _supported = False
     _dump = True
     _check = True
     _infofs = "jfs_tune"
@@ -1251,12 +1247,10 @@ class ReiserFS(FS):
     _maxSize = Size("16 TiB")
     _formattable = True
     _linuxNative = True
-    _supported = False
     _dump = True
     _check = True
     _packages = ["reiserfs-utils"]
     _infofs = "debugreiserfs"
-    _defaultInfoOptions = []
     _existingSizeFields = ["Count of blocks on the device:", "Blocksize:"]
     partedSystem = fileSystemType["reiserfs"]
 
@@ -1502,10 +1496,6 @@ class Iso9660FS(FS):
     """ ISO9660 filesystem. """
     _type = "iso9660"
     _supported = True
-    _resizable = False
-    _linuxNative = False
-    _dump = False
-    _check = False
     _defaultMountOptions = ["ro"]
 
 register_device_format(Iso9660FS)
diff --git a/blivet/formats/luks.py b/blivet/formats/luks.py
index f374fbc..03af88f 100644
--- a/blivet/formats/luks.py
+++ b/blivet/formats/luks.py
@@ -47,7 +47,6 @@ class LUKS(DeviceFormat):
     _lockedName = N_("Encrypted")
     _udevTypes = ["crypto_LUKS"]
     _formattable = True                 # can be formatted
-    _supported = False                  # is supported
     _linuxNative = True                 # for clearpart
     _packages = ["cryptsetup"]          # required packages
     _minSize = crypto.LUKS_METADATA_SIZE
diff --git a/blivet/formats/multipath.py b/blivet/formats/multipath.py
index 447a9ba..2c93176 100644
--- a/blivet/formats/multipath.py
+++ b/blivet/formats/multipath.py
@@ -37,11 +37,8 @@ class MultipathMember(DeviceFormat):
     _type = "multipath_member"
     _name = N_("multipath member device")
     _udev_types = ["multipath_member"]
-    _formattable = False                # can be formatted
     _supported = True                   # is supported
-    _linuxNative = False                # for clearpart
     _packages = ["device-mapper-multipath"] # required packages
-    _resizable = False                  # can be resized
     _hidden = True                      # hide devices with this formatting?
 
     def __init__(self, **kwargs):
diff --git a/blivet/formats/prepboot.py b/blivet/formats/prepboot.py
index ddf6a18..e44967a 100644
--- a/blivet/formats/prepboot.py
+++ b/blivet/formats/prepboot.py
@@ -34,7 +34,6 @@ class PPCPRePBoot(DeviceFormat):
     """ Generic device format. """
     _type = "prepboot"
     _name = N_("PPC PReP Boot")
-    _udevTypes = []
     partedFlag = PARTITION_PREP
     _formattable = True                 # can be formatted
     _linuxNative = True                 # for clearpart
diff --git a/tests/formats_test/init_test.py b/tests/formats_test/init_test.py
index 700d3f3..6fc11c6 100644
--- a/tests/formats_test/init_test.py
+++ b/tests/formats_test/init_test.py
@@ -6,9 +6,6 @@ import blivet.formats as formats
 
 class FormatsTestCase(unittest.TestCase):
 
-    def setUp(self):
-        pass
-
     def testFormatsMethods(self):
         ##
         ## get_device_format_class
-- 
1.9.3



More information about the anaconda-patches mailing list