Update of /cvsroot/spambayes/spambayes/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17316/scripts
Modified Files:
sb_pop3dnd.py sb_server.py
Log Message:
Sorry - I forgot to run the tests before the last checkins, so there are
obvious failures.
Fix a random dot in sb_pop3nd.py and correct the importing in sb_server.
Index: sb_pop3dnd.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/scripts/sb_pop3dnd.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** sb_pop3dnd.py 22 Dec 2004 00:27:17 -0000 1.15
--- sb_pop3dnd.py 22 Dec 2004 01:51:49 -0000 1.16
***************
*** 303,307 ****
! class IM.APFileMessage(IMAPMessage, FileCorpus.FileMessage):
'''IMAP Message that persists as a file system artifact.'''
--- 303,307 ----
! class IMAPFileMessage(IMAPMessage, FileCorpus.FileMessage):
'''IMAP Message that persists as a file system artifact.'''
Index: sb_server.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/scripts/sb_server.py,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** sb_server.py 22 Dec 2004 01:29:14 -0000 1.36
--- sb_server.py 22 Dec 2004 01:51:49 -0000 1.37
***************
*** 109,117 ****
from email.Header import Header
from spambayes import i18n
from spambayes import Stats
from spambayes import Dibbler
from spambayes import storage
- from spambayes import message
from spambayes.FileCorpus import FileCorpus, ExpiryFileCorpus
from spambayes.FileCorpus import FileMessageFactory, GzipFileMessageFactory
--- 109,117 ----
from email.Header import Header
+ import spambayes.message
from spambayes import i18n
from spambayes import Stats
from spambayes import Dibbler
from spambayes import storage
from spambayes.FileCorpus import FileCorpus, ExpiryFileCorpus
from spambayes.FileCorpus import FileMessageFactory, GzipFileMessageFactory
***************
*** 494,498 ****
try:
msg = email.message_from_string(messageText,
! _class=message.SBHeaderMessage)
msg.setId(state.getNewMessageName())
# Now find the spam disposition and add the header.
--- 494,498 ----
try:
msg = email.message_from_string(messageText,
! _class=spambayes.message.SBHeaderMessage)
msg.setId(state.getNewMessageName())
# Now find the spam disposition and add the header.
***************
*** 562,566 ****
# This is one case where an unqualified 'except' is OK, 'cos
# anything's better than destroying people's email...
! messageText, details = message.\
insert_exception_header(messageText)
--- 562,566 ----
# This is one case where an unqualified 'except' is OK, 'cos
# anything's better than destroying people's email...
! messageText, details = spambayes.message.\
insert_exception_header(messageText)
***************
*** 806,814 ****
self.bayes = storage.open_storage(self.DBName, self.useDB)
if not hasattr(self, "MBDName"):
! self.MDBName, self.useMDB = message.database_type()
! self.mdb = message.open_storage(self.MDBName, self.useMDB)
# Load stats manager.
! self.stats = Stats(options, self.mdb)
self.buildStatusStrings()
--- 806,814 ----
self.bayes = storage.open_storage(self.DBName, self.useDB)
if not hasattr(self, "MBDName"):
! self.MDBName, self.useMDB = spambayes.message.database_type()
! self.mdb = spambayes.message.open_storage(self.MDBName, self.useMDB)
# Load stats manager.
! self.stats = Stats.Stats(options, self.mdb)
self.buildStatusStrings()
_______________________________________________
Spambayes-checkins mailing list
[EMAIL PROTECTED]
http://mail.python.org/mailman/listinfo/spambayes-checkins
