[PATCH] A couple updates to installclasses.
Chris Lumens
clumens at redhat.com
Mon Sep 8 19:09:29 UTC 2014
* hidden and showHidden should be booleans, not ints in disguise.
* Get rid of default and id. These are unused.
* Stop marking names for translation and remove mnemonics. These haven't been
used since the days of workstation/server/custom selection in the UI. Does
anyone else even still remember this?
---
po/POTFILES.in | 4 ----
pyanaconda/installclass.py | 15 ++++++---------
pyanaconda/installclasses/fedora.py | 7 ++-----
pyanaconda/installclasses/rhel.py | 7 ++-----
4 files changed, 10 insertions(+), 23 deletions(-)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index b3cc906..5a1302e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -23,10 +23,6 @@ pyanaconda/text.py
pyanaconda/users.py
pyanaconda/vnc.py
-# Install class definitions
-pyanaconda/installclasses/fedora.py
-pyanaconda/installclasses/rhel.py
-
# Packaging module source files
pyanaconda/packaging/__init__.py
pyanaconda/packaging/livepayload.py
diff --git a/pyanaconda/installclass.py b/pyanaconda/installclass.py
index 3a52f65..cba3c6a 100644
--- a/pyanaconda/installclass.py
+++ b/pyanaconda/installclass.py
@@ -37,7 +37,7 @@ from pyanaconda.kickstart import getAvailableDiskSpace
class BaseInstallClass(object):
# default to not being hidden
- hidden = 0
+ hidden = False
name = "base"
bootloaderTimeoutDefault = None
bootloaderExtraArgs = []
@@ -58,9 +58,6 @@ class BaseInstallClass(object):
# Blivet uses by default.
defaultFS = None
- # don't select this class by default
- default = 0
-
@property
def l10n_domain(self):
if self._l10n_domain is None:
@@ -122,8 +119,8 @@ class BaseInstallClass(object):
allClasses = []
allClasses_hidden = []
-# returns ( className, classObject, classLogo ) tuples
-def availableClasses(showHidden=0):
+# returns ( className, classObject ) tuples
+def availableClasses(showHidden=False):
global allClasses
global allClasses_hidden
@@ -198,7 +195,7 @@ def availableClasses(showHidden=0):
# If it's got these two methods, it's an InstallClass.
if hasattr(obj, "setDefaultPartitioning") and hasattr(obj, "setPackageSelection"):
sortOrder = getattr(obj, "sortPriority", 0)
- if obj.hidden == 0 or showHidden == 1:
+ if not obj.hidden or showHidden:
lst.append(((obj.name, obj), sortOrder))
except (ImportError, AttributeError):
log.warning ("module import of %s failed: %s", mainName, sys.exc_type)
@@ -217,8 +214,8 @@ def availableClasses(showHidden=0):
def getBaseInstallClass():
# figure out what installclass we should base on.
- allavail = availableClasses(showHidden = 1)
- avail = availableClasses(showHidden = 0)
+ allavail = availableClasses(showHidden=True)
+ avail = availableClasses(showHidden=False)
if len(avail) == 1:
(cname, cobject) = avail[0]
diff --git a/pyanaconda/installclasses/fedora.py b/pyanaconda/installclasses/fedora.py
index d2dbb73..84acfb7 100644
--- a/pyanaconda/installclasses/fedora.py
+++ b/pyanaconda/installclasses/fedora.py
@@ -21,15 +21,12 @@ from pyanaconda.installclass import BaseInstallClass
from pyanaconda.product import productName
from pyanaconda import network
from pyanaconda import nm
-from pyanaconda.i18n import N_
class FedoraBaseInstallClass(BaseInstallClass):
- # name has underscore used for mnemonics, strip if you dont need it
- id = "fedora"
- name = N_("_Fedora")
+ name = "Fedora"
sortPriority = 10000
if productName.startswith("Red Hat "):
- hidden = 1
+ hidden = True
_l10n_domain = "anaconda"
diff --git a/pyanaconda/installclasses/rhel.py b/pyanaconda/installclasses/rhel.py
index 5931432..5dc39f2 100644
--- a/pyanaconda/installclasses/rhel.py
+++ b/pyanaconda/installclasses/rhel.py
@@ -17,19 +17,16 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
-from pyanaconda.i18n import N_
from pyanaconda.installclass import BaseInstallClass
from pyanaconda.product import productName
from pyanaconda import network
from pyanaconda import nm
class RHELBaseInstallClass(BaseInstallClass):
- # name has underscore used for mnemonics, strip if you dont need it
- id = "rhel"
- name = N_("Red Hat Enterprise Linux")
+ name = "Red Hat Enterprise Linux"
sortPriority = 10000
if not productName.startswith("Red Hat "):
- hidden = 1
+ hidden = True
defaultFS = "xfs"
bootloaderTimeoutDefault = 5
--
1.9.3
More information about the anaconda-patches
mailing list