[Spambayes-checkins] spambayes/scripts sb_xmlrpcserver.py,1.2,1.3

[Barry A. Warsaw]

Update of /cvsroot/spambayes/spambayes/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv28804

Modified Files:
	sb_xmlrpcserver.py 
Log Message:
Make sure that the socket being bound is reusable.

Change XMLHammie.score() so that the float score is returned directly
instead of trying to be wrapped in a Binary object. The latter won't
work since Binary's expect a string buffer, and besides XMLRPC
supports floats directly.


Index: sb_xmlrpcserver.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/scripts/sb_xmlrpcserver.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** sb_xmlrpcserver.py	24 Sep 2003 06:38:30 -0000	1.2
--- sb_xmlrpcserver.py	25 Nov 2003 03:58:14 -0000	1.3
***************
*** 22,30 ****
  
  import os
- import SimpleXMLRPCServer
  import getopt
  import sys
  import traceback
  import xmlrpclib
  
  from spambayes import hammie, Options
--- 22,30 ----
  
  import os
  import getopt
  import sys
  import traceback
  import xmlrpclib
+ import SimpleXMLRPCServer
  
  from spambayes import hammie, Options
***************
*** 38,41 ****
--- 38,45 ----
  
  
+ class ReusableSimpleXMLRPCServer(SimpleXMLRPCServer.SimpleXMLRPCServer):
+     allow_reuse_address = True
+ 
+ 
  program = sys.argv[0] # For usage(); referenced by docstring above
  
***************
*** 46,50 ****
          except AttributeError:
              pass
!         return xmlrpclib.Binary(hammie.Hammie.score(self, msg, *extra))
  
      def filter(self, msg, *extra):
--- 50,54 ----
          except AttributeError:
              pass
!         return hammie.Hammie.score(self, msg, *extra)
  
      def filter(self, msg, *extra):
***************
*** 94,99 ****
      h = XMLHammie(bayes)
  
!     server = SimpleXMLRPCServer.SimpleXMLRPCServer((ip, port),
!                                                    SimpleXMLRPCServer.SimpleXMLRPCRequestHandler)
      server.register_instance(h)
      server.serve_forever()
--- 98,104 ----
      h = XMLHammie(bayes)
  
!     server = ReusableSimpleXMLRPCServer(
!         (ip, port),
!         SimpleXMLRPCServer.SimpleXMLRPCRequestHandler)
      server.register_instance(h)
      server.serve_forever()