gnue/gnue-common/src/commdrivers/xmlrpc CommDri...

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    01/11/30 17:58:25

Modified files:
        gnue-common/src/commdrivers/xmlrpc: CommDriver.py 

Log message:
        synching machines

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/commdrivers/xmlrpc/CommDriver.py.diff?cvsroot=OldCVS&tr1=1.6&tr2=1.7&r1=text&r2=text

Patches:
Index: gnue/gnue-common/src/commdrivers/xmlrpc/CommDriver.py
diff -c gnue/gnue-common/src/commdrivers/xmlrpc/CommDriver.py:1.6 
gnue/gnue-common/src/commdrivers/xmlrpc/CommDriver.py:1.7
*** gnue/gnue-common/src/commdrivers/xmlrpc/CommDriver.py:1.6   Wed Nov 28 
23:40:39 2001
--- gnue/gnue-common/src/commdrivers/xmlrpc/CommDriver.py       Fri Nov 30 
17:58:25 2001
***************
*** 49,54 ****
--- 49,56 ----
  from gnue.common.commdrivers._helpers import ObjectLibrarian
  
  from gnue.common.commdrivers import GCommBase
+ from gnue.common import GComm
+ 
  import string
  
  try:
***************
*** 68,86 ****
  class ClientAdapter(GCommBase.Client):
  
    def __init__(self, params):
      try:
!       url = params['url']
!       if not len(url):
!         raise KeyError
!     except KeyError:
        try:
!         transport = params['transport']
        except KeyError:
!         transport = 'https'
  
!       url = "%s://%s:%s/" % ( transport, params['host'], params['port'] )
  
!     self._server = xmlrpclib.Server(url)
  
  
    def requestService(self, service, params={}):
--- 70,102 ----
  class ClientAdapter(GCommBase.Client):
  
    def __init__(self, params):
+ 
+ 
      try:
! 
        try:
!         url = params['url']
!         if not len(url):
!           raise KeyError
        except KeyError:
!         try:
!           transport = params['transport']
!         except KeyError:
!           transport = 'https'
! 
!         url = "%s://%s:%s/" % \
!             ( transport, params['host'], params['port'] )
  
!       self._server = xmlrpclib.Server(url)
  
! 
!     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 requestService(self, service, params={}):