Merge commit 'nico-baryon/master'

[software/pymin.git] / pymin / services / dhcp / __init__.py

diff --git a/pymin/services/dhcp/__init__.py b/pymin/services/dhcp/__init__.py
index dd2fa9d0f2b4438f6a4b549dd6f616896614389a..de1515b092c7955e4ee6970387f0545758693aea 100644 (file)
--- a/pymin/services/dhcp/__init__.py
+++ b/pymin/services/dhcp/__init__.py
@@ -6,20 +6,9 @@ from pymin.seqtools import Sequence
 from pymin.dispatcher import Handler, handler, HandlerError
 from pymin.services.util import Restorable, ConfigWriter, InitdHandler, \
                                 TransactionalHandler, ParametersHandler, \
 from pymin.dispatcher import Handler, handler, HandlerError
 from pymin.services.util import Restorable, ConfigWriter, InitdHandler, \
                                 TransactionalHandler, ParametersHandler, \

-                                DictSubHandler
+                                DictSubHandler, ReloadHandler

 
 

-__ALL__ = ('DhcpHandler', 'Error')
-
-class Error(HandlerError):
-    r"""
-    Error(message) -> Error instance :: Base DhcpHandler exception class.
-
-    All exceptions raised by the DhcpHandler inherits from this one, so you can
-    easily catch any DhcpHandler exception.
-
-    message - A descriptive error message.
-    """
-    pass
+__ALL__ = ('DhcpHandler',)

 
 class Host(Sequence):
     r"""Host(name, ip, mac) -> Host instance :: Class representing a host.
 
 class Host(Sequence):
     r"""Host(name, ip, mac) -> Host instance :: Class representing a host.


@@ -54,11 +43,11 @@ class HostHandler(DictSubHandler):
 
     handler_help = u"Manage DHCP hosts"
 
 
     handler_help = u"Manage DHCP hosts"
 

-    _dict_subhandler_attr = 'hosts'
-    _dict_subhandler_class = Host
+    _cont_subhandler_attr = 'hosts'
+    _cont_subhandler_class = Host

 
 

-class DhcpHandler(Restorable, ConfigWriter, InitdHandler, TransactionalHandler,
-                  ParametersHandler):
+class DhcpHandler(Restorable, ConfigWriter, ReloadHandler, TransactionalHandler,
+                  ParametersHandler, InitdHandler):

     r"""DhcpHandler([pickle_dir[, config_dir]]) -> DhcpHandler instance.
 
     Handles DHCP service commands for the dhcpd program.
     r"""DhcpHandler([pickle_dir[, config_dir]]) -> DhcpHandler instance.
 
     Handles DHCP service commands for the dhcpd program.


@@ -98,7 +87,7 @@ class DhcpHandler(Restorable, ConfigWriter, InitdHandler, TransactionalHandler,
         self._persistent_dir = pickle_dir
         self._config_writer_cfg_dir = config_dir
         self._config_build_templates()
         self._persistent_dir = pickle_dir
         self._config_writer_cfg_dir = config_dir
         self._config_build_templates()

-        self._restore()
+        InitdHandler.__init__(self)

         self.host = HostHandler(self)
 
     def _get_config_vars(self, config_file):
         self.host = HostHandler(self)
 
     def _get_config_vars(self, config_file):