fixed get_service_description to match SCSCP specs

Closes #5

Author: defeo

demo_server.py

@@ -91,7 +91,9 @@ def is_allowed_head(self, data):
                                     or head.cd == 'scscp1')
 
     def get_service_description(self, data):
-        return scscp.service_description(self.server.description)
+        return scscp.service_description(self.server.name.decode(),
+                                             self.server.version.decode(),
+                                             self.server.description)
 
 class Server(socketserver.ThreadingMixIn, socketserver.TCPServer, object):
     allow_reuse_address = True

scscp/cli.py

@@ -109,4 +109,4 @@ def is_allowed_head(self, name, cd):
         return self.heads.scscp2.is_allowed_head([om.OMSymbol(name, cd)])
 
     def get_description(self):
-        return '\n'.join(a.string for a in self.heads.scscp2.get_service_description([]).arguments)
+        return [a.string for a in self.heads.scscp2.get_service_description([]).arguments]

scscp/scscp.py

@@ -182,8 +182,8 @@ def signature(name, cd, symbol_sets=None, min=None, max=None):
 def get_service_description():
     return _apply('get_service_description', [])
 
-def service_description(*desc):
-    return _apply('service_description', [om.OMString(d) for d in desc])
+def service_description(service, name, description):
+    return _apply('service_description', [om.OMString(d) for d in (service, name, description)])
 
 def no_such_transient_cd(cd):
     return om.OMError(om.OMSymbol('no_such_transient_cd', cd='scscp2'), [om.OMString(cd)])

tests/test_cli.py

@@ -45,7 +45,7 @@ def test_two_clients(self):
         self.assertEqual(client.status, 2)
 
     def test_description(self):
-        self.assertEqual(self.client.get_description(), "Demo SCSCP server")
+        self.assertEqual(self.client.get_description(), ["DemoServer", "none", "Demo SCSCP server"])
 
     def test_arith(self):
         cases = [

tests/test_scscp_cd.py

@@ -9,10 +9,11 @@ def test_service_description(self):
                                  OMSymbol('get_service_description', 'scscp2', id=None, cdbase=None),
                                  [], id=None, cdbase=None))
 
-        self.assertEqual(scscp.service_description('Hello', 'world'),
+        self.assertEqual(scscp.service_description('Hello', 'world', '!'),
                              OMApplication(
                                  OMSymbol('service_description', 'scscp2', id=None, cdbase=None),
-                                 [OMString('Hello', id=None), OMString('world', id=None)],
+                                 [OMString('Hello', id=None), OMString('world', id=None),
+                                      OMString('!', id=None)],
                                  id=None, cdbase=None))
 
     def test_procedure(self):