gnue/common/src/commdrivers/xmlrpc ClientAdapte...

[Arturas Kriukovas]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Arturas Kriukovas <address@hidden>      02/05/03 14:12:46

Modified files:
        common/src/commdrivers/xmlrpc: ClientAdapter.py 
                                       DebugSocketServer.py RpcDoc.py 
                                       ServerAdapter.py 

Log message:
        i18n changes.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/commdrivers/xmlrpc/ClientAdapter.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/commdrivers/xmlrpc/DebugSocketServer.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/commdrivers/xmlrpc/RpcDoc.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/commdrivers/xmlrpc/ServerAdapter.py.diff?tr1=1.10&tr2=1.11&r1=text&r2=text

Patches:
Index: gnue/common/src/commdrivers/xmlrpc/ClientAdapter.py
diff -c gnue/common/src/commdrivers/xmlrpc/ClientAdapter.py:1.4 
gnue/common/src/commdrivers/xmlrpc/ClientAdapter.py:1.5
*** gnue/common/src/commdrivers/xmlrpc/ClientAdapter.py:1.4     Tue Apr 30 
19:52:31 2002
--- gnue/common/src/commdrivers/xmlrpc/ClientAdapter.py Fri May  3 14:12:46 2002
***************
*** 61,70 ****
  
  except ImportError:
    raise GComm.AdapterInitializationError, \
!         "\nUnable to load xmlrpc.  To use the XML-RPC interface, \n" \
!       + "please install xmlrpc from:\n" \
        + "    http://py-xmlrpc.sourceforge.net/"; \
!       + "the appropriate DEBIAN package is python-xmlrpc.deb"
  
  
  ##############################################################################
--- 61,70 ----
  
  except ImportError:
    raise GComm.AdapterInitializationError, \
!         _("\nUnable to load xmlrpc.  To use the XML-RPC interface, \n") \
!       + _("please install xmlrpc from:\n") \
        + "    http://py-xmlrpc.sourceforge.net/"; \
!       + _("the appropriate DEBIAN package is python-xmlrpc.deb")
  
  
  ##############################################################################
***************
*** 111,121 ****
  
      except KeyError:
        raise GComm.AdapterConfigurationError,  \
!             "To use XML-RPC, you must either specify a 'url' or\n" +\
!             "a 'host' and 'port' setting."
      except:
        raise GComm.AdapterInitializationError, \
!          "Unable to initialize the XML-RPC interface at %s" % url
  
  
    def request(self, service, params={}):
--- 111,121 ----
  
      except KeyError:
        raise GComm.AdapterConfigurationError,  \
!             _("To use XML-RPC, you must either specify a 'url' or\n") +\
!             _("a 'host' and 'port' setting.")
      except:
        raise GComm.AdapterInitializationError, \
!          _("Unable to initialize the XML-RPC interface at %s") % url
  
  
    def request(self, service, params={}):
Index: gnue/common/src/commdrivers/xmlrpc/DebugSocketServer.py
diff -c gnue/common/src/commdrivers/xmlrpc/DebugSocketServer.py:1.4 
gnue/common/src/commdrivers/xmlrpc/DebugSocketServer.py:1.5
*** gnue/common/src/commdrivers/xmlrpc/DebugSocketServer.py:1.4 Wed Feb 27 
15:45:53 2002
--- gnue/common/src/commdrivers/xmlrpc/DebugSocketServer.py     Fri May  3 
14:12:46 2002
***************
*** 46,52 ****
      try:
        self._port = params['port']
      except KeyError:
!       raise GComm.AdapterConfigurationError,'Required parameter "port" not 
supplied'
      # self._tcpserver = SocketServer.TCPServer(('',self._port),
      #      self._requestHandler)
  
--- 46,52 ----
      try:
        self._port = params['port']
      except KeyError:
!       raise GComm.AdapterConfigurationError, _('Required parameter "port" not 
supplied')
      # self._tcpserver = SocketServer.TCPServer(('',self._port),
      #      self._requestHandler)
  
Index: gnue/common/src/commdrivers/xmlrpc/RpcDoc.py
diff -c gnue/common/src/commdrivers/xmlrpc/RpcDoc.py:1.1 
gnue/common/src/commdrivers/xmlrpc/RpcDoc.py:1.2
*** gnue/common/src/commdrivers/xmlrpc/RpcDoc.py:1.1    Mon Dec 17 19:19:51 2001
--- gnue/common/src/commdrivers/xmlrpc/RpcDoc.py        Fri May  3 14:12:46 2002
***************
*** 39,45 ****
  
  
    if command == 'help':
!     print "Help goes here"
      sys.exit()
  
    elif command == 'doc':
--- 39,45 ----
  
  
    if command == 'help':
!     print _("Help goes here")
      sys.exit()
  
    elif command == 'doc':
***************
*** 48,60 ****
        rpcdef = GComm.loadDefinition(arguments[0])
  
      except IndexError:
!       print "'doc' command expects a .grpc file as its argument."
        sys.exit()
  
      gendoc(rpcdef, outfile)
  
    else:
!     raise StandardError, "Unrecognized XML-RPC doc command: %s" % command
  
  
  def gendoc(rpcdef, outfile):
--- 48,60 ----
        rpcdef = GComm.loadDefinition(arguments[0])
  
      except IndexError:
!       print _("'doc' command expects a .grpc file as its argument.")
        sys.exit()
  
      gendoc(rpcdef, outfile)
  
    else:
!     raise StandardError, _("Unrecognized XML-RPC doc command: %s") % command
  
  
  def gendoc(rpcdef, outfile):
Index: gnue/common/src/commdrivers/xmlrpc/ServerAdapter.py
diff -c gnue/common/src/commdrivers/xmlrpc/ServerAdapter.py:1.10 
gnue/common/src/commdrivers/xmlrpc/ServerAdapter.py:1.11
*** gnue/common/src/commdrivers/xmlrpc/ServerAdapter.py:1.10    Wed May  1 
21:53:03 2002
--- gnue/common/src/commdrivers/xmlrpc/ServerAdapter.py Fri May  3 14:12:46 2002
***************
*** 57,66 ****
  
  except ImportError:
    raise GComm.AdapterInitializationError, \
!         "\nUnable to load xmlrpc.  To use the XML-RPC interface, \n" \
!       + "please install xmlrpc from:\n" \
        + "    http://py-xmlrpc.sourceforge.net/"; \
!       + "the appropriate DEBIAN package is python-xmlrpc"
  
  
  # Mapping from GRPC's datatype to XML-RPC datatypes
--- 57,66 ----
  
  except ImportError:
    raise GComm.AdapterInitializationError, \
!         _("\nUnable to load xmlrpc.  To use the XML-RPC interface, \n") \
!       + _("please install xmlrpc from:\n") \
        + "    http://py-xmlrpc.sourceforge.net/"; \
!       + _("the appropriate DEBIAN package is python-xmlrpc")
  
  
  # Mapping from GRPC's datatype to XML-RPC datatypes
***************
*** 88,94 ****
        self._port = params['port']
      except KeyError:
        raise GComm.AdapterConfigurationError,\
!             'Required parameter "port" not supplied'
  
      # Create Subserver
      self.server=XMLRPC_Server()
--- 88,94 ----
        self._port = params['port']
      except KeyError:
        raise GComm.AdapterConfigurationError,\
!             _('Required parameter "port" not supplied')
  
      # Create Subserver
      self.server=XMLRPC_Server()
***************
*** 156,162 ****
  
  
    def OnErr(server,source):
!     print "Error occured with s: %s on source %s." % (server,source)
      return xmlrpc.ONERR_KEEP_WORK
  
  
--- 156,162 ----
  
  
    def OnErr(server,source):
!     print _("Error occured with s: %s on source %s.") % (server,source)
      return xmlrpc.ONERR_KEEP_WORK
  
  
***************
*** 164,170 ****
    # Call the requested method
    #
    def call(self, method, params):
!     print "Dispatching: ", method, params
  
      ## Check if the Method is part of a service or a pointer to a
      ## single object
--- 164,170 ----
    # Call the requested method
    #
    def call(self, method, params):
!     print _("Dispatching: "), method, params
  
      ## Check if the Method is part of a service or a pointer to a
      ## single object
***************
*** 184,191 ****
          method=method[i+2:]
        except ValueError:
          raise AttributeError, \
!               "Wrong format of object handler " \
!               "in method call %s" % method
        # TODO check in service dir, if obj is supported or not
        o=ObjectLibrarian.retrieveObject(objhandle)
        server_method=getattr(o,method)
--- 184,191 ----
          method=method[i+2:]
        except ValueError:
          raise AttributeError, \
!               _("Wrong format of object handler ") \
!               _("in method call %s") % method
        # TODO check in service dir, if obj is supported or not
        o=ObjectLibrarian.retrieveObject(objhandle)
        server_method=getattr(o,method)
***************
*** 201,220 ****
  
          if server_method==None:
            raise AttributeError, \
!               "Server XML-RPC method %s  is not " \
!               "bound to real method" % method
        except KeyError:
          raise AttributeError, \
!               "Server does not have XML-RPC " \
!               "procedure %s" % method
      try:
        #
        pass
          # TODO:  Compare submitted attributs with signature
      except KeyError:
        raise AttributeError, \
!             "Server XML-RPC " \
!             "procedure %s accepts just %s as attributs" % (method,attr)
  
      # replace object handles in param with the real object
      counter=0
--- 201,220 ----
  
          if server_method==None:
            raise AttributeError, \
!               _("Server XML-RPC method %s  is not ") \
!               _("bound to real method") % method
        except KeyError:
          raise AttributeError, \
!               _("Server does not have XML-RPC ") \
!               _("procedure %s") % method
      try:
        #
        pass
          # TODO:  Compare submitted attributs with signature
      except KeyError:
        raise AttributeError, \
!             _("Server XML-RPC ") \
!             _("procedure %s accepts just %s as attributs") % (method,attr)
  
      # replace object handles in param with the real object
      counter=0
***************
*** 332,338 ****
          del args['obj_handle']
  
        except KeyError:
!         raise StandardError, 'Object handle not returned'   # TODO
  
      try:
        return ObjectLibrarian. \
--- 332,338 ----
          del args['obj_handle']
  
        except KeyError:
!         raise StandardError, _('Object handle not returned')   # TODO
  
      try:
        return ObjectLibrarian. \
***************
*** 340,344 ****
      except KeyError:
  
        # Attempt to use an invalid objecthandle
!       raise StandardError, 'Invalid object handle' # TODO
  
--- 340,344 ----
      except KeyError:
  
        # Attempt to use an invalid objecthandle
!       raise StandardError, _('Invalid object handle') # TODO