gnue/common/src/commdrivers GCommBase.py pw_xml...

[Jan Ischebeck]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jan Ischebeck <address@hidden>  02/05/26 15:57:33

Modified files:
        common/src/commdrivers: GCommBase.py 
        common/src/commdrivers/pw_xmlrpc: ClientAdapter.py 
        common/src/commdrivers/xmlrpc: ClientAdapter.py 

Log message:
        some patches

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/commdrivers/GCommBase.py.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/commdrivers/pw_xmlrpc/ClientAdapter.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/commdrivers/xmlrpc/ClientAdapter.py.diff?tr1=1.7&tr2=1.8&r1=text&r2=text

Patches:
Index: gnue/common/src/commdrivers/GCommBase.py
diff -c gnue/common/src/commdrivers/GCommBase.py:1.16 
gnue/common/src/commdrivers/GCommBase.py:1.17
*** gnue/common/src/commdrivers/GCommBase.py:1.16       Fri May  3 13:45:05 2002
--- gnue/common/src/commdrivers/GCommBase.py    Sun May 26 15:57:33 2002
***************
*** 91,100 ****
      
    def runService(self, method, data):
      pass
- 
-   def serveAsNewThread(self):
-     thread.start_new_thread(self.serve,())
- 
      
    def parseParameter(self, params):
      server.__init__(self)
--- 91,96 ----
***************
*** 164,169 ****
        raise GComm.ProgrammingError
  
  
-   def __call__(self, *args, **params):
-     self._adapter.runMethod(self, *args, **params)
  
--- 160,167 ----
        raise GComm.ProgrammingError
  
  
  
+ 
+   def __call__(self, *args, **params):
+     return self._adapter.runMethod(string.join(self._attrPath,'.'),
+                                   *args, **params)
Index: gnue/common/src/commdrivers/pw_xmlrpc/ClientAdapter.py
diff -c gnue/common/src/commdrivers/pw_xmlrpc/ClientAdapter.py:1.3 
gnue/common/src/commdrivers/pw_xmlrpc/ClientAdapter.py:1.4
*** gnue/common/src/commdrivers/pw_xmlrpc/ClientAdapter.py:1.3  Mon May  6 
13:27:41 2002
--- gnue/common/src/commdrivers/pw_xmlrpc/ClientAdapter.py      Sun May 26 
15:57:33 2002
***************
*** 165,172 ****
        raise StandardError, data.message
  
  
-   def __call__(self, *args, **params):
-     return self._adapter.runMethod(string.join(self._attrPath,'.'),
-                                   *args, **params)
- 
  
--- 165,168 ----
Index: gnue/common/src/commdrivers/xmlrpc/ClientAdapter.py
diff -c gnue/common/src/commdrivers/xmlrpc/ClientAdapter.py:1.7 
gnue/common/src/commdrivers/xmlrpc/ClientAdapter.py:1.8
*** gnue/common/src/commdrivers/xmlrpc/ClientAdapter.py:1.7     Mon May  6 
13:27:41 2002
--- gnue/common/src/commdrivers/xmlrpc/ClientAdapter.py Sun May 26 15:57:33 2002
***************
*** 88,95 ****
--- 88,102 ----
  
      self._timeout = 1.0
      
+     #
+     # check for the correct parameters
+     #
+     
      try:
  
+       #
+       #  test for an url parameter
+       # 
        try:
          url = params['url']
          if not len(url):
***************
*** 100,108 ****
          
          transport, netloc, path, params, query, fragment = \
                     urlparse.urlparse(url)
!         host, path=split(netloc,':',1)
          
        except KeyError:
          try:
            transport = params['transport']
          except KeyError:
--- 107,118 ----
          
          transport, netloc, path, params, query, fragment = \
                     urlparse.urlparse(url)
!         host, port=split(netloc,':',1)
          
        except KeyError:
+         #
+         #  transport parameter
+         #
          try:
            transport = params['transport']
          except KeyError:
***************
*** 113,135 ****
                   "py-xmlrpc just support http as a transport. " +\
                   "If you need https please have a look at the " +\
                   "'pw_xmlrpc' adapter."
!           
          try:
            path = params['path']
          except KeyError:
            path = '/'
  
          url = "%s://%s:%s%s" % \
!           ( transport, params['host'], params['port'],path )
          
        # setLoglevel
        if hasattr(params,'loglevel'):
          xmlrpc.setLogLevel(params['loglevel'])
        else:
!          xmlrpc.setLogLevel(1)
  
!       self._client = xmlrpc.client(params['host'],
!                                    params['port'],path)      
  
      except KeyError:
        raise GComm.AdapterConfigurationError,  \
--- 123,170 ----
                   "py-xmlrpc just support http as a transport. " +\
                   "If you need https please have a look at the " +\
                   "'pw_xmlrpc' adapter."
!         #
!         #   path parameter
!         #
          try:
            path = params['path']
          except KeyError:
            path = '/'
  
+         #
+         #   port parameter
+         #
+         try:
+           port = params['port']          
+         except KeyError:
+           port = 8765
+         
+           
+         #
+         #   host parameter
+         #
+         try:
+           host = params['host']
+         except KeyError:
+           host = 'localhost'
+ 
+           
+ 
          url = "%s://%s:%s%s" % \
!           ( transport, params['host'], port,path )
          
        # setLoglevel
        if hasattr(params,'loglevel'):
          xmlrpc.setLogLevel(params['loglevel'])
        else:
!         xmlrpc.setLogLevel(1)
  
!       # care for non-integer port settings
!       if type(port)!=type(12):
!         port=string.atoi(port)
! 
!       # create the real xmlrpc client
!       self._client = xmlrpc.client(host,port,path)      
  
      except KeyError:
        raise GComm.AdapterConfigurationError,  \
***************
*** 206,215 ****
      else:
        # TODO:
        raise StandardError, data.message
- 
- 
-   def __call__(self, *args, **params):
-     return self._adapter.runMethod(string.join(self._attrPath,'.'),
-                                   *args, **params)
  
  
--- 241,245 ----