emaint: declare handler name consistently across modules

6 files changed, 12 insertions, 10 deletions

diff --git a/pym/portage/emaint/modules/binhost/binhost.py b/pym/portage/emaint/modules/binhost/binhost.py
index 527b02fb3..ebcc9054f 100644
--- a/pym/portage/emaint/modules/binhost/binhost.py
+++ b/pym/portage/emaint/modules/binhost/binhost.py
@@ -19,9 +19,9 @@ class BinhostHandler(object):
 
 	short_desc = "Generate a metadata index for binary packages"
 
+	@staticmethod
 	def name():
 		return "binhost"
-	name = staticmethod(name)
 
 	def __init__(self):
 		eroot = portage.settings['EROOT']
diff --git a/pym/portage/emaint/modules/config/config.py b/pym/portage/emaint/modules/config/config.py
index a05a3c2c7..a0d56992c 100644
--- a/pym/portage/emaint/modules/config/config.py
+++ b/pym/portage/emaint/modules/config/config.py
@@ -10,14 +10,14 @@ class CleanConfig(object):
 
 	short_desc = "Discard any no longer installed configs from emerge's tracker list"
 
+	@staticmethod
+	def name():
+		return "cleanconfmem"
+
 	def __init__(self):
 		self._root = portage.settings["ROOT"]
 		self.target = os.path.join(portage.settings["EROOT"], PRIVATE_PATH, 'config')
 
-	def name():
-		return "cleanconfmem"
-	name = staticmethod(name)
-
 	def load_configlist(self):
 		return grabdict(self.target)
 
diff --git a/pym/portage/emaint/modules/logs/logs.py b/pym/portage/emaint/modules/logs/logs.py
index dfe0ef0a4..97b45475d 100644
--- a/pym/portage/emaint/modules/logs/logs.py
+++ b/pym/portage/emaint/modules/logs/logs.py
@@ -18,9 +18,9 @@ class CleanLogs(object):
 
 	short_desc = "Clean PORT_LOGDIR logs"
 
+	@staticmethod
 	def name():
 		return "logs"
-	name = staticmethod(name)
 
 
 	def can_progressbar(self, func):
diff --git a/pym/portage/emaint/modules/move/move.py b/pym/portage/emaint/modules/move/move.py
index 1c2636dac..4e505ceee 100644
--- a/pym/portage/emaint/modules/move/move.py
+++ b/pym/portage/emaint/modules/move/move.py
@@ -167,9 +167,10 @@ class MoveInstalled(MoveHandler):
 
 	short_desc = "Perform package move updates for installed packages"
 
+	@staticmethod
 	def name():
 		return "moveinst"
-	name = staticmethod(name)
+
 	def __init__(self):
 		eroot = portage.settings['EROOT']
 		MoveHandler.__init__(self, portage.db[eroot]["vartree"], portage.db[eroot]["porttree"])
@@ -178,9 +179,10 @@ class MoveBinary(MoveHandler):
 
 	short_desc = "Perform package move updates for binary packages"
 
+	@staticmethod
 	def name():
 		return "movebin"
-	name = staticmethod(name)
+
 	def __init__(self):
 		eroot = portage.settings['EROOT']
 		MoveHandler.__init__(self, portage.db[eroot]["bintree"], portage.db[eroot]['porttree'])
diff --git a/pym/portage/emaint/modules/resume/resume.py b/pym/portage/emaint/modules/resume/resume.py
index 0d65d4181..580643b26 100644
--- a/pym/portage/emaint/modules/resume/resume.py
+++ b/pym/portage/emaint/modules/resume/resume.py
@@ -8,9 +8,9 @@ class CleanResume(object):
 
 	short_desc = "Discard emerge --resume merge lists"
 
+	@staticmethod
 	def name():
 		return "cleanresume"
-	name = staticmethod(name)
 
 	def check(self,  **kwargs):
 		onProgress = kwargs.get('onProgress', None)
diff --git a/pym/portage/emaint/modules/world/world.py b/pym/portage/emaint/modules/world/world.py
index ebc3adcbb..d142c3dda 100644
--- a/pym/portage/emaint/modules/world/world.py
+++ b/pym/portage/emaint/modules/world/world.py
@@ -9,9 +9,9 @@ class WorldHandler(object):
 
 	short_desc = "Fix problems in the world file"
 
+	@staticmethod
 	def name():
 		return "world"
-	name = staticmethod(name)
 
 	def __init__(self):
 		self.invalid = []