Bugfix: call ProcessInfo.stop() in the right way (without parameters).

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

diff --git a/pymin/services/firewall/__init__.py b/pymin/services/firewall/__init__.py
index c13ad010f18e2fc751e98fa0a2de80ef13d7e240..06b41915cd4a78b66a300dee08f0ce51eec666cc 100644 (file)
--- a/pymin/services/firewall/__init__.py
+++ b/pymin/services/firewall/__init__.py
@@ -10,18 +10,7 @@ from pymin.dispatcher import Handler, handler, HandlerError
 from pymin.services.util import Restorable, ConfigWriter, ServiceHandler, \
                                 TransactionalHandler, ListSubHandler
 
 from pymin.services.util import Restorable, ConfigWriter, ServiceHandler, \
                                 TransactionalHandler, ListSubHandler
 

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

 
 class Rule(Sequence):
     r"""Rule(chain, target[, src[, dst[, ...]]]) -> Rule instance.
 
 class Rule(Sequence):
     r"""Rule(chain, target[, src[, dst[, ...]]]) -> Rule instance.


@@ -61,10 +50,6 @@ class Rule(Sequence):
         if src_port is not None: self.src_port = src_port
         if dst_port is not None: self.dst_port = dst_port
 
         if src_port is not None: self.src_port = src_port
         if dst_port is not None: self.dst_port = dst_port
 

-    def __cmp__(self, other):
-        r"Compares two Rule objects."
-        return cmp(self.as_tuple(), other.as_tuple())
-

     def as_tuple(self):
         r"Return a tuple representing the rule."
         return (self.chain, self.target, self.src, self.dst, self.protocol,
     def as_tuple(self):
         r"Return a tuple representing the rule."
         return (self.chain, self.target, self.src, self.dst, self.protocol,


@@ -99,7 +84,7 @@ class FirewallHandler(Restorable, ConfigWriter, ServiceHandler,
 
     handler_help = u"Manage firewall service"
 
 
     handler_help = u"Manage firewall service"
 

-    _persistent_attrs = 'rules'
+    _persistent_attrs = ['rules']

 
     _restorable_defaults = dict(rules=list())
 
 
     _restorable_defaults = dict(rules=list())
 


@@ -116,7 +101,7 @@ class FirewallHandler(Restorable, ConfigWriter, ServiceHandler,
         self._service_restart = self._service_start
         self._service_reload = self._service_start
         self._config_build_templates()
         self._service_restart = self._service_start
         self._service_reload = self._service_start
         self._config_build_templates()

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

         self.rule = RuleHandler(self)
 
     def _get_config_vars(self, config_file):
         self.rule = RuleHandler(self)
 
     def _get_config_vars(self, config_file):