[Spambayes-checkins] spambayes/pspam/pspam options.py,1.2,1.3 profile.py,1.6,1.7

[Anthony Baxter]

Update of /cvsroot/spambayes/spambayes/pspam/pspam
In directory sc8-pr-cvs1:/tmp/cvs-serv389/pspam/pspam

Modified Files:
	options.py profile.py 
Log Message:
merging reorg-branch into the trunk. 


Index: options.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/pspam/pspam/options.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** options.py	12 Nov 2002 07:03:20 -0000	1.2
--- options.py	14 Jan 2003 05:38:20 -0000	1.3
***************
*** 1,5 ****
  from Options import options, all_options, \
       boolean_cracker, float_cracker, int_cracker, string_cracker
! from sets import Set
  
  all_options["Score"] = {'max_ham': float_cracker,
--- 1,8 ----
  from Options import options, all_options, \
       boolean_cracker, float_cracker, int_cracker, string_cracker
! try: 
!     from sets import Set
! except ImportError:
!     from spambayes.compatsets import Set
  
  all_options["Score"] = {'max_ham': float_cracker,

Index: profile.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/pspam/pspam/profile.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** profile.py	26 Nov 2002 17:16:35 -0000	1.6
--- profile.py	14 Jan 2003 05:38:20 -0000	1.7
***************
*** 6,11 ****
  from BTrees.OOBTree import OOBTree
  
! import classifier
! from tokenizer import tokenize
  
  from pspam.folder import Folder
--- 6,11 ----
  from BTrees.OOBTree import OOBTree
  
! from spambayes import classifier
! from spambayes.tokenizer import tokenize
  
  from pspam.folder import Folder