cgi.py: Don't crash if we have three values for a parameter.

[chopwood] / service.py

diff --git a/service.py b/service.py
index 0944e2c..8b1c87b 100644 (file)
--- a/service.py
+++ b/service.py
@@ -78,8 +78,9 @@ class BasicService (object):
   A simple base class for services.
   """
 
-  def __init__(me, friendly, *args, **kw):
+  def __init__(me, friendly, name = None, *args, **kw):
     super(BasicService, me).__init__(*args)
+    me.name = name
     me.friendly = friendly
     me.meta = kw
 
@@ -328,9 +329,7 @@ class CommandRemoteService (BasicRemoteService):
   R_PAT = RX.compile('%(.)')
 
   def __init__(me, set, clear, *args, **kw):
-    """
-    Initialize the command remote service.
-    """
+    """Initialize the command remote service."""
     super(CommandRemoteService, me).__init__(*args, **kw)
     me._set = set
     me._clear = clear
@@ -379,5 +378,7 @@ def add_master_service():
                                    'users', 'user', 'passwd'),
                  CFG.HASH,
                  friendly = 'Password changing service')
+  for name, svc in SERVICES.iteritems():
+    if svc.name is None: svc.name = name
 
 ###----- That's all, folks --------------------------------------------------