fix command names

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

diff --git a/pymin/services/proxy/__init__.py b/pymin/services/proxy/__init__.py
index 5e8460e21ac075fd5ae1f288cc16fd249fe44abd..54ff3797eb5db436662cf3488c446663687fffb2 100644 (file)
--- a/pymin/services/proxy/__init__.py
+++ b/pymin/services/proxy/__init__.py
@@ -21,13 +21,7 @@ class Error(HandlerError):
 
     message - A descriptive error message.
     """
 
     message - A descriptive error message.
     """

-
-    def __init__(self, message):
-        r"Initialize the Error object. See class documentation for more info."
-        self.message = message
-
-    def __str__(self):
-        return self.message
+    pass

 
 class HostError(Error, KeyError):
     r"""
 
 class HostError(Error, KeyError):
     r"""


@@ -38,7 +32,7 @@ class HostError(Error, KeyError):
 
     def __init__(self, hostname):
         r"Initialize the object. See class documentation for more info."
 
     def __init__(self, hostname):
         r"Initialize the object. See class documentation for more info."

-        self.message = 'Host error: "%s"' % hostname
+        self.message = u'Host error: "%s"' % hostname

 
 class HostAlreadyExistsError(HostError):
     r"""
 
 class HostAlreadyExistsError(HostError):
     r"""


@@ -49,7 +43,7 @@ class HostAlreadyExistsError(HostError):
 
     def __init__(self, hostname):
         r"Initialize the object. See class documentation for more info."
 
     def __init__(self, hostname):
         r"Initialize the object. See class documentation for more info."

-        self.message = 'Host already exists: "%s"' % hostname
+        self.message = u'Host already exists: "%s"' % hostname

 
 class HostNotFoundError(HostError):
     r"""
 
 class HostNotFoundError(HostError):
     r"""


@@ -61,7 +55,7 @@ class HostNotFoundError(HostError):
 
     def __init__(self, hostname):
         r"Initialize the object. See class documentation for more info."
 
     def __init__(self, hostname):
         r"Initialize the object. See class documentation for more info."

-        self.message = 'Host not found: "%s"' % hostname
+        self.message = u'Host not found: "%s"' % hostname

 
 
 class Host(Sequence):
 
 
 class Host(Sequence):


@@ -74,6 +68,8 @@ class Host(Sequence):
 
 class HostHandler(Handler):
 
 
 class HostHandler(Handler):
 

+    handler_help = u"Manage proxy hosts"
+

     def __init__(self, hosts):
         self.hosts = hosts
 
     def __init__(self, hosts):
         self.hosts = hosts
 


@@ -102,12 +98,14 @@ class UserHandler(Handler):
 
     def __init__(self, users):
         self.users = users
 
     def __init__(self, users):
         self.users = users

-
+       
+    @handler('Adds a user')

     def add(self, user, password):
         if user in self.users:
             raise UserAlreadyExistsError(user)
         self.users[user] = crypt.crypt(password,'BA')
     def add(self, user, password):
         if user in self.users:
             raise UserAlreadyExistsError(user)
         self.users[user] = crypt.crypt(password,'BA')

-
+    
+    @handler('Deletes a user')

     def delete(self, user):
         if not user in self.users:
             raise UserNotFound(user)
     def delete(self, user):
         if not user in self.users:
             raise UserNotFound(user)


@@ -116,6 +114,8 @@ class UserHandler(Handler):
 class ProxyHandler(Restorable, ConfigWriter, InitdHandler,
                    TransactionalHandler, ParametersHandler):
 
 class ProxyHandler(Restorable, ConfigWriter, InitdHandler,
                    TransactionalHandler, ParametersHandler):
 

+    handler_help = u"Manage proxy service"
+

     _initd_name = 'squid'
 
     _persistent_attrs = ('params', 'hosts', 'users')
     _initd_name = 'squid'
 
     _persistent_attrs = ('params', 'hosts', 'users')


@@ -158,4 +158,4 @@ if __name__ == '__main__':
     px.host.delete('192.168.0.25.27')
     px.user.add('lala','soronga')
     px.user.add('culo','sarasa')
     px.host.delete('192.168.0.25.27')
     px.user.add('lala','soronga')
     px.user.add('culo','sarasa')

-    px.commit()
\ No newline at end of file
+    px.commit()