Update TODO list.

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

diff --git a/pymin/services/proxy/__init__.py b/pymin/services/proxy/__init__.py
index 0577938271deced0545b6786caf08fa8f6545fe4..a02e6c58df2e7c69a8d8508f2029c84c23f461c6 100644 (file)
--- a/pymin/services/proxy/__init__.py
+++ b/pymin/services/proxy/__init__.py
@@ -10,18 +10,7 @@ from pymin.services.util import Restorable, ConfigWriter, InitdHandler, \
 
 import crypt
 
 
 import crypt
 

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

 
 class Host(Sequence):
     def __init__(self,ip):
 
 class Host(Sequence):
     def __init__(self,ip):


@@ -35,8 +24,8 @@ class HostHandler(DictSubHandler):
 
     handler_help = u"Manage proxy hosts"
 
 
     handler_help = u"Manage proxy hosts"
 

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

 
 class User(Sequence):
     def __init__(self, name, password):
 
 class User(Sequence):
     def __init__(self, name, password):


@@ -52,8 +41,8 @@ class UserHandler(DictSubHandler):
 
     handler_help = u"Manage proxy users"
 
 
     handler_help = u"Manage proxy users"
 

-    _dict_subhandler_attr = 'users'
-    _dict_subhandler_class = User
+    _cont_subhandler_attr = 'users'
+    _cont_subhandler_class = User

 
 class ProxyHandler(Restorable, ConfigWriter, InitdHandler,
                    TransactionalHandler, ParametersHandler):
 
 class ProxyHandler(Restorable, ConfigWriter, InitdHandler,
                    TransactionalHandler, ParametersHandler):


@@ -81,7 +70,7 @@ class ProxyHandler(Restorable, ConfigWriter, InitdHandler,
         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)
         self.user = UserHandler(self)
 
         self.host = HostHandler(self)
         self.user = UserHandler(self)