[Spambayes-checkins] spambayes/spambayes hammiebulk.py,1.8,1.9

[Tony Meyer]

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

Modified Files:
	hammiebulk.py 
Log Message:
Update option retrieval, since some of the backwards compat code isn't
working as it should.

This should fix both:
[ 787296 ] Local installation problem: hammiefilter_persistent_storage
and
[ 788002 ] hammiebulk.py uses wrong option name

Index: hammiebulk.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/hammiebulk.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** hammiebulk.py	9 Jul 2003 00:53:38 -0000	1.8
--- hammiebulk.py	13 Aug 2003 22:48:38 -0000	1.9
***************
*** 60,64 ****
  
  # Default database name
! DEFAULTDB = os.path.expanduser(options.hammiefilter_persistent_storage_file)
  # This is a bit of a hack to counter the default for
  # persistent_storage_file changing from ~/.hammiedb to hammie.db
--- 60,64 ----
  
  # Default database name
! DEFAULTDB = os.path.expanduser(options["Storage", "persistent_storage_file"])
  # This is a bit of a hack to counter the default for
  # persistent_storage_file changing from ~/.hammiedb to hammie.db