[Spambayes-checkins] spambayes/spambayes storage.py,1.23,1.24

[Richie Hindle]

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

Modified Files:
	storage.py 
Log Message:
Patched the patched patches in open_storage() until "hammiefilter -n"
worked again.


Index: storage.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/storage.py,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** storage.py	25 Aug 2003 19:08:57 -0000	1.23
--- storage.py	31 Aug 2003 21:10:58 -0000	1.24
***************
*** 63,67 ****
          return not not val
  
! import sys
  from spambayes import classifier
  from spambayes.Options import options
--- 63,67 ----
          return not not val
  
! import sys, types
  from spambayes import classifier
  from spambayes.Options import options
***************
*** 604,608 ****
      then a DBDictClassifier is used."""
      if useDB:
!         if data_source_name.find('::') != -1:
              db_type, rest = data_source_name.split('::', 1)
              if _storage_types.has_key(db_type.lower()):
--- 604,609 ----
      then a DBDictClassifier is used."""
      if useDB:
!         if (isinstance(data_source_name, types.StringTypes) and
!             data_source_name.find('::') != -1):
              db_type, rest = data_source_name.split('::', 1)
              if _storage_types.has_key(db_type.lower()):