Add a default __cmp__() implementation to pymin.seqtool.Sequence.

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

diff --git a/pymin/services/firewall/__init__.py b/pymin/services/firewall/__init__.py
index b0784bfbb62c5569413fc1f75da6440037b0636b..90d3ee9e44b662517db577e36ed8a4a5d76e8399 100644 (file)
--- a/pymin/services/firewall/__init__.py
+++ b/pymin/services/firewall/__init__.py
@@ -61,10 +61,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,


@@ -81,8 +77,8 @@ class RuleHandler(ListSubHandler):
 
     handler_help = u"Manage firewall rules"
 
 
     handler_help = u"Manage firewall rules"
 

-    _list_subhandler_attr = 'rules'
-    _list_subhandler_class = Rule
+    _cont_subhandler_attr = 'rules'
+    _cont_subhandler_class = Rule

 
 class FirewallHandler(Restorable, ConfigWriter, ServiceHandler,
                       TransactionalHandler):
 
 class FirewallHandler(Restorable, ConfigWriter, ServiceHandler,
                       TransactionalHandler):