[Spambayes-checkins] spambayes/pspam/pspam options.py,1.2,1.2.4.1

[Anthony Baxter]

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

Modified Files:
      Tag: reorg-branch
	options.py 
Log Message:
distutils ate my brain. Rather than continue down the horrible horrible
path of distutils madness, take a less nuanced approach to the sets.py and
heapq.py modules.


Index: options.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/pspam/pspam/options.py,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -C2 -d -r1.2 -r1.2.4.1
*** options.py	12 Nov 2002 07:03:20 -0000	1.2
--- options.py	13 Jan 2003 06:45:40 -0000	1.2.4.1
***************
*** 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,