[Spambayes-checkins] spambayes hammiesrv.py,1.6,1.7

[Neale Pickett]

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

Modified Files:
	hammiesrv.py 
Log Message:
* Changed icky optional argument checking to nice *extra syntax
  (thanks, Guido!)


Index: hammiesrv.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/hammiesrv.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** hammiesrv.py	17 Oct 2002 18:19:41 -0000	1.6
--- hammiesrv.py	17 Oct 2002 21:30:13 -0000	1.7
***************
*** 41,51 ****
          except AttributeError:
              pass
!         score = hammie.Hammie.score
!         if len(extra) == 0:
!             return score(self, msg)
!         elif len(extra) == 1:
!             return score(self, msg, extra[0])
!         else:
!             raise TypeError("Wrong number of arguments")
  
      def filter(self, msg, *extra):
--- 41,45 ----
          except AttributeError:
              pass
!         return hammie.Hammie.score(self, msg, *extra)
  
      def filter(self, msg, *extra):
***************
*** 54,66 ****
          except AttributeError:
              pass
!         filter = hammie.Hammie.filter
!         if len(extra) == 0:
!             return filter(self, msg)
!         elif len(extra) == 1:
!             return filter(self, msg, extra[0])
!         elif len(extra) == 2:
!             return filter(self, msg, extra[0], extra[1])
!         else:
!             raise TypeError("Wrong number of arguments")
  
  
--- 48,52 ----
          except AttributeError:
              pass
!         return hammie.Hammie.filter(self, msg, *extra)