[Spambayes-checkins] spambayes hammiesrv.py,1.4,1.5

[Neale Pickett]

Update of /cvsroot/spambayes/spambayes
In directory usw-pr-cvs1:/tmp/cvs-serv25401

Modified Files:
	hammiesrv.py 
Log Message:
* hammiesrv can now handle xmlrpclib.Binary objects, so you can send
  it 8-bit messages.


Index: hammiesrv.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/hammiesrv.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** hammiesrv.py	27 Sep 2002 21:04:06 -0000	1.4
--- hammiesrv.py	8 Oct 2002 17:38:21 -0000	1.5
***************
*** 35,38 ****
--- 35,54 ----
  DEFAULTDB = hammie.DEFAULTDB
  
+ class XMLHammie(hammie.Hammie):
+     def score(self, msg, **kwargs):
+         try:
+             msg = msg.data
+         except AttributeError:
+             pass
+         return hammie.Hammie.score(self, msg, **kwargs)
+ 
+     def filter(self, msg, **kwargs):
+         try:
+             msg = msg.data
+         except AttributeError:
+             pass
+         return hammie.Hammie.filter(self, msg, **kwargs)
+ 
+ 
  class HammieHandler(SimpleXMLRPCServer.SimpleXMLRPCRequestHandler):
      def do_POST(self):
***************
*** 114,118 ****
  
      bayes = hammie.createbayes(pck, usedb)
!     h = hammie.Hammie(bayes)
  
      server = SimpleXMLRPCServer.SimpleXMLRPCServer((ip, port), HammieHandler)
--- 130,134 ----
  
      bayes = hammie.createbayes(pck, usedb)
!     h = XMLHammie(bayes)
  
      server = SimpleXMLRPCServer.SimpleXMLRPCServer((ip, port), HammieHandler)