14 Feb
2019
14 Feb
'19
7 a.m.
Module: check_mk
Branch: master
Commit: f098c709c52b02492096d83e3cb950be4592db95
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f098c709c52b02…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed Feb 13 15:19:20 2019 +0100
Group modes: Add abc metaclass
Change-Id: I1b34650cc3a5f1d544de3e2ecf2246f2335e5545
---
cmk/gui/wato/pages/groups.py | 43 +++++++++++++++++++++++++++++++------------
1 file changed, 31 insertions(+), 12 deletions(-)
diff --git a/cmk/gui/wato/pages/groups.py b/cmk/gui/wato/pages/groups.py
index efb6d90..6b7cb73 100644
--- a/cmk/gui/wato/pages/groups.py
+++ b/cmk/gui/wato/pages/groups.py
@@ -25,6 +25,7 @@
# Boston, MA 02110-1301 USA.
import os
+import abc
import cmk.utils.paths
@@ -58,10 +59,13 @@ from cmk.gui.plugins.wato import (
)
-# TODO: abc.ABCMeta
class ModeGroups(WatoMode):
- # TODO: Refactore to abc.abstractmethod
- type_name = None
+ __metaclass__ = abc.ABCMeta
+
+ @abc.abstractproperty
+ def type_name(self):
+ # type: () -> str
+ raise NotImplementedError()
def __init__(self):
super(ModeGroups, self).__init__()
@@ -136,10 +140,13 @@ class ModeGroups(WatoMode):
self._show_row_cells(table, name, group)
-# TODO: abc.ABCMeta
class ModeEditGroup(WatoMode):
- # TODO: Reimplement as abc.abstactmethod
- type_name = None
+ __metaclass__ = abc.ABCMeta
+
+ @abc.abstractproperty
+ def type_name(self):
+ # type: () -> str
+ raise NotImplementedError()
def __init__(self):
self._name = None
@@ -237,7 +244,9 @@ class ModeEditGroup(WatoMode):
@mode_registry.register
class ModeHostgroups(ModeGroups):
- type_name = "host"
+ @property
+ def type_name(self):
+ return "host"
@classmethod
def name(cls):
@@ -278,7 +287,9 @@ class ModeHostgroups(ModeGroups):
@mode_registry.register
class ModeServicegroups(ModeGroups):
- type_name = "service"
+ @property
+ def type_name(self):
+ return "service"
@classmethod
def name(cls):
@@ -320,7 +331,9 @@ class ModeServicegroups(ModeGroups):
@mode_registry.register
class ModeContactgroups(ModeGroups):
- type_name = "contact"
+ @property
+ def type_name(self):
+ return "contact"
@classmethod
def name(cls):
@@ -379,7 +392,9 @@ class ModeContactgroups(ModeGroups):
@mode_registry.register
class ModeEditServicegroup(ModeEditGroup):
- type_name = "service"
+ @property
+ def type_name(self):
+ return "service"
@classmethod
def name(cls):
@@ -397,7 +412,9 @@ class ModeEditServicegroup(ModeEditGroup):
@mode_registry.register
class ModeEditHostgroup(ModeEditGroup):
- type_name = "host"
+ @property
+ def type_name(self):
+ return "host"
@classmethod
def name(cls):
@@ -415,7 +432,9 @@ class ModeEditHostgroup(ModeEditGroup):
@mode_registry.register
class ModeEditContactgroup(ModeEditGroup):
- type_name = "contact"
+ @property
+ def type_name(self):
+ return "contact"
@classmethod
def name(cls):