[Spambayes-checkins] spambayes hammiefilter.py,1.18,1.19

[Tony Meyer]

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

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

Index: hammiefilter.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/hammiefilter.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** hammiefilter.py	5 Jun 2003 15:06:24 -0000	1.18
--- hammiefilter.py	13 Aug 2003 22:49:41 -0000	1.19
***************
*** 100,112 ****
          #   * had hammie.db as their value for persistent_storage_file, and
          #   * their config file was loaded by Options.py.
!         if options["hammiefilter", "persistent_storage_file"] == \
             options.default("Storage", "persistent_storage_file"):
!             options["hammiefilter", "persistent_storage_file"] = \
                                      "~/.hammiedb"
          options.merge_files(['/etc/hammierc',
                              os.path.expanduser('~/.hammierc')])
!         self.dbname = options["hammiefilter", "persistent_storage_file"]
          self.dbname = os.path.expanduser(self.dbname)
!         self.usedb = options["hammiefilter", "persistent_use_database"]
  
      def newdb(self):
--- 100,112 ----
          #   * had hammie.db as their value for persistent_storage_file, and
          #   * their config file was loaded by Options.py.
!         if options["Storage", "persistent_storage_file"] == \
             options.default("Storage", "persistent_storage_file"):
!             options["Storage", "persistent_storage_file"] = \
                                      "~/.hammiedb"
          options.merge_files(['/etc/hammierc',
                              os.path.expanduser('~/.hammierc')])
!         self.dbname = options["Storage", "persistent_storage_file"]
          self.dbname = os.path.expanduser(self.dbname)
!         self.usedb = options["Storage", "persistent_use_database"]
  
      def newdb(self):