*** SimpleXMLRPCServer.py.latest	2004-10-02 14:03:31.192545040 -0300
--- SimpleXMLRPCServer.py	2004-10-02 14:39:52.192982576 -0300
***************
*** 151,159 ****
      reason to instantiate this class directly.
      """
  
!     def __init__(self):
          self.funcs = {}
          self.instance = None
  
      def register_instance(self, instance):
          """Registers an instance to respond to XML-RPC requests.
--- 151,161 ----
      reason to instantiate this class directly.
      """
  
!     def __init__(self, encoding=None, allow_none=0):
          self.funcs = {}
          self.instance = None
+         self.encoding = encoding
+         self.allow_none = allow_none
  
      def register_instance(self, instance):
          """Registers an instance to respond to XML-RPC requests.
***************
*** 229,241 ****
                  response = self._dispatch(method, params)
              # wrap response in a singleton tuple
              response = (response,)
!             response = xmlrpclib.dumps(response, methodresponse=1)
          except Fault, fault:
!             response = xmlrpclib.dumps(fault)
          except:
              # report exception back to server
              response = xmlrpclib.dumps(
!                 xmlrpclib.Fault(1, "%s:%s" % (sys.exc_type, sys.exc_value))
                  )
  
          return response
--- 231,246 ----
                  response = self._dispatch(method, params)
              # wrap response in a singleton tuple
              response = (response,)
!             response = xmlrpclib.dumps(response, methodresponse=1, 
! 	    		encoding=self.encoding, allow_none=self.allow_none)
          except Fault, fault:
!             response = xmlrpclib.dumps(fault, encoding=self.encoding, 
! 	    		allow_none=self.allow_none )
          except:
              # report exception back to server
              response = xmlrpclib.dumps(
!                 xmlrpclib.Fault(1, "%s:%s" % (sys.exc_type, sys.exc_value)),
!                 encoding=self.encoding, allow_none=self.allow_none
                  )
  
          return response
***************
*** 442,458 ****
      """
  
      def __init__(self, addr, requestHandler=SimpleXMLRPCRequestHandler,
!                  logRequests=1):
          self.logRequests = logRequests
  
!         SimpleXMLRPCDispatcher.__init__(self)
          SocketServer.TCPServer.__init__(self, addr, requestHandler)
  
  class CGIXMLRPCRequestHandler(SimpleXMLRPCDispatcher):
      """Simple handler for XML-RPC data passed through CGI."""
  
!     def __init__(self):
!         SimpleXMLRPCDispatcher.__init__(self)
  
      def handle_xmlrpc(self, request_text):
          """Handle a single XML-RPC request"""
--- 447,463 ----
      """
  
      def __init__(self, addr, requestHandler=SimpleXMLRPCRequestHandler,
!                  logRequests=1, encoding=None, allow_none=0):
          self.logRequests = logRequests
  
!         SimpleXMLRPCDispatcher.__init__(self, encoding, allow_none)
          SocketServer.TCPServer.__init__(self, addr, requestHandler)
  
  class CGIXMLRPCRequestHandler(SimpleXMLRPCDispatcher):
      """Simple handler for XML-RPC data passed through CGI."""
  
!     def __init__(self, encoding=None, allow_none=0 ):
!         SimpleXMLRPCDispatcher.__init__(self, encoding, allow_none)
  
      def handle_xmlrpc(self, request_text):
          """Handle a single XML-RPC request"""