From anadelonbrin at users.sourceforge.net Wed Dec 14 08:37:26 2005 From: anadelonbrin at users.sourceforge.net (Tony Meyer) Date: Wed, 14 Dec 2005 08:37:26 +0100 (CET) Subject: [Spambayes-checkins] spambayes/spambayes/test test_sb_pop3dnd.py, 1.1, 1.2 Message-ID: <20051214073726.EC9B81E4002@bag.python.org> Update of /cvsroot/spambayes/spambayes/spambayes/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27203/spambayes/test Modified Files: test_sb_pop3dnd.py Log Message: Correct import. Index: test_sb_pop3dnd.py =================================================================== RCS file: /cvsroot/spambayes/spambayes/spambayes/test/test_sb_pop3dnd.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** test_sb_pop3dnd.py 5 Nov 2004 02:37:34 -0000 1.1 --- test_sb_pop3dnd.py 14 Dec 2005 07:37:23 -0000 1.2 *************** *** 14,18 **** from spambayes.Options import options from spambayes.classifier import Classifier ! from spambayes.message import message_from_string from sb_pop3dnd import IMAPMessage, DynamicIMAPMessage, IMAPFileMessage from sb_pop3dnd import IMAPFileMessageFactory --- 14,18 ---- from spambayes.Options import options from spambayes.classifier import Classifier ! from spambayes.message import SBHeaderMessage from sb_pop3dnd import IMAPMessage, DynamicIMAPMessage, IMAPFileMessage from sb_pop3dnd import IMAPFileMessageFactory From anadelonbrin at users.sourceforge.net Wed Dec 14 08:38:12 2005 From: anadelonbrin at users.sourceforge.net (Tony Meyer) Date: Wed, 14 Dec 2005 08:38:12 +0100 (CET) Subject: [Spambayes-checkins] spambayes/spambayes/test test_stats.py, 1.4, 1.5 Message-ID: <20051214073812.6CD0A1E4002@bag.python.org> Update of /cvsroot/spambayes/spambayes/spambayes/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27356/spambayes/test Modified Files: test_stats.py Log Message: Update tests. Index: test_stats.py =================================================================== RCS file: /cvsroot/spambayes/spambayes/spambayes/test/test_stats.py,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** test_stats.py 6 Apr 2005 02:42:05 -0000 1.4 --- test_stats.py 14 Dec 2005 07:38:08 -0000 1.5 *************** *** 137,163 **** self.assertEqual(self.s.totals[stat], 0) # Stuff some things in to calculate. ! msg = Message('0', self.messageinfo_db) msg.RememberTrained(True) msg.RememberClassification(options['Headers','header_spam_string']) ! msg = Message('1', self.messageinfo_db) msg.RememberTrained(False) msg.RememberClassification(options['Headers','header_spam_string']) ! msg = Message('2', self.messageinfo_db) msg.RememberTrained(True) msg.RememberClassification(options['Headers','header_ham_string']) ! msg = Message('3', self.messageinfo_db) msg.RememberTrained(False) msg.RememberClassification(options['Headers','header_ham_string']) ! msg = Message('4', self.messageinfo_db) msg.RememberClassification(options['Headers','header_ham_string']) ! msg = Message('5', self.messageinfo_db) msg.RememberTrained(False) msg.RememberClassification(options['Headers','header_unsure_string']) ! msg = Message('6', self.messageinfo_db) msg.RememberTrained(True) msg.RememberClassification(options['Headers','header_unsure_string']) ! msg = Message('7', self.messageinfo_db) msg.RememberClassification(options['Headers','header_unsure_string']) ! msg = Message('8', self.messageinfo_db) msg.RememberClassification(options['Headers','header_unsure_string']) self.s.CalculatePersistentStats() --- 137,163 ---- self.assertEqual(self.s.totals[stat], 0) # Stuff some things in to calculate. ! msg = Message('0') msg.RememberTrained(True) msg.RememberClassification(options['Headers','header_spam_string']) ! msg = Message('1') msg.RememberTrained(False) msg.RememberClassification(options['Headers','header_spam_string']) ! msg = Message('2') msg.RememberTrained(True) msg.RememberClassification(options['Headers','header_ham_string']) ! msg = Message('3') msg.RememberTrained(False) msg.RememberClassification(options['Headers','header_ham_string']) ! msg = Message('4') msg.RememberClassification(options['Headers','header_ham_string']) ! msg = Message('5') msg.RememberTrained(False) msg.RememberClassification(options['Headers','header_unsure_string']) ! msg = Message('6') msg.RememberTrained(True) msg.RememberClassification(options['Headers','header_unsure_string']) ! msg = Message('7') msg.RememberClassification(options['Headers','header_unsure_string']) ! msg = Message('8') msg.RememberClassification(options['Headers','header_unsure_string']) self.s.CalculatePersistentStats() *************** *** 453,479 **** def _stuff_with_persistent_data(self): # Put data into the totals. ! msg = Message('0', self.messageinfo_db) msg.RememberTrained(True) msg.RememberClassification(options['Headers','header_spam_string']) ! msg = Message('1', self.messageinfo_db) msg.RememberTrained(False) msg.RememberClassification(options['Headers','header_spam_string']) ! msg = Message('2', self.messageinfo_db) msg.RememberTrained(True) msg.RememberClassification(options['Headers','header_ham_string']) ! msg = Message('3', self.messageinfo_db) msg.RememberTrained(False) msg.RememberClassification(options['Headers','header_ham_string']) ! msg = Message('4', self.messageinfo_db) msg.RememberClassification(options['Headers','header_ham_string']) ! msg = Message('5', self.messageinfo_db) msg.RememberTrained(False) msg.RememberClassification(options['Headers','header_unsure_string']) ! msg = Message('6', self.messageinfo_db) msg.RememberTrained(True) msg.RememberClassification(options['Headers','header_unsure_string']) ! msg = Message('7', self.messageinfo_db) msg.RememberClassification(options['Headers','header_unsure_string']) ! msg = Message('8', self.messageinfo_db) msg.RememberClassification(options['Headers','header_unsure_string']) --- 453,479 ---- def _stuff_with_persistent_data(self): # Put data into the totals. ! msg = Message('0') msg.RememberTrained(True) msg.RememberClassification(options['Headers','header_spam_string']) ! msg = Message('1') msg.RememberTrained(False) msg.RememberClassification(options['Headers','header_spam_string']) ! msg = Message('2') msg.RememberTrained(True) msg.RememberClassification(options['Headers','header_ham_string']) ! msg = Message('3') msg.RememberTrained(False) msg.RememberClassification(options['Headers','header_ham_string']) ! msg = Message('4') msg.RememberClassification(options['Headers','header_ham_string']) ! msg = Message('5') msg.RememberTrained(False) msg.RememberClassification(options['Headers','header_unsure_string']) ! msg = Message('6') msg.RememberTrained(True) msg.RememberClassification(options['Headers','header_unsure_string']) ! msg = Message('7') msg.RememberClassification(options['Headers','header_unsure_string']) ! msg = Message('8') msg.RememberClassification(options['Headers','header_unsure_string']) *************** *** 510,520 **** time.sleep(0.1) # Put more data in. ! msg = Message('0', self.messageinfo_db) msg.RememberTrained(True) msg.RememberClassification(options['Headers','header_spam_string']) ! msg = Message('7', self.messageinfo_db) msg.RememberTrained(False) msg.RememberClassification(options['Headers','header_spam_string']) ! msg = Message('2', self.messageinfo_db) msg.RememberTrained(True) msg.RememberClassification(options['Headers','header_ham_string']) --- 510,520 ---- time.sleep(0.1) # Put more data in. ! msg = Message('0') msg.RememberTrained(True) msg.RememberClassification(options['Headers','header_spam_string']) ! msg = Message('7') msg.RememberTrained(False) msg.RememberClassification(options['Headers','header_spam_string']) ! msg = Message('2') msg.RememberTrained(True) msg.RememberClassification(options['Headers','header_ham_string']) From anadelonbrin at users.sourceforge.net Wed Dec 14 08:51:55 2005 From: anadelonbrin at users.sourceforge.net (Tony Meyer) Date: Wed, 14 Dec 2005 08:51:55 +0100 (CET) Subject: [Spambayes-checkins] spambayes/spambayes OptionsClass.py, 1.29, 1.30 Message-ID: <20051214075155.C18B31E400A@bag.python.org> Update of /cvsroot/spambayes/spambayes/spambayes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26381/spambayes Modified Files: OptionsClass.py Log Message: Fix notate_ options. Index: OptionsClass.py =================================================================== RCS file: /cvsroot/spambayes/spambayes/spambayes/OptionsClass.py,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** OptionsClass.py 15 Nov 2005 00:28:07 -0000 1.29 --- OptionsClass.py 14 Dec 2005 07:33:12 -0000 1.30 *************** *** 689,693 **** self.get("Headers", "header_unsure_string")) ! return val in header_strings or not val if self.is_valid(sect, opt, val): self._options[sect, opt.lower()].set(val) --- 689,694 ---- self.get("Headers", "header_unsure_string")) ! self._options[sect, opt.lower()].set(val) ! return if self.is_valid(sect, opt, val): self._options[sect, opt.lower()].set(val) From anadelonbrin at users.sourceforge.net Wed Dec 14 08:51:57 2005 From: anadelonbrin at users.sourceforge.net (Tony Meyer) Date: Wed, 14 Dec 2005 08:51:57 +0100 (CET) Subject: [Spambayes-checkins] spambayes/spambayes/test test_sb_imapfilter.py, 1.10, 1.11 Message-ID: <20051214075157.BF5661E400C@bag.python.org> Update of /cvsroot/spambayes/spambayes/spambayes/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27037/spambayes/test Modified Files: test_sb_imapfilter.py Log Message: Update tests. Index: test_sb_imapfilter.py =================================================================== RCS file: /cvsroot/spambayes/spambayes/spambayes/test/test_sb_imapfilter.py,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** test_sb_imapfilter.py 13 Jan 2005 21:48:15 -0000 1.10 --- test_sb_imapfilter.py 14 Dec 2005 07:36:33 -0000 1.11 *************** *** 20,24 **** from spambayes.Options import options from spambayes.classifier import Classifier ! from sb_imapfilter import run, BadIMAPResponseError from sb_imapfilter import IMAPSession, IMAPMessage, IMAPFolder, IMAPFilter --- 20,24 ---- from spambayes.Options import options from spambayes.classifier import Classifier ! from sb_imapfilter import run, BadIMAPResponseError, LoginFailure from sb_imapfilter import IMAPSession, IMAPMessage, IMAPFolder, IMAPFilter *************** *** 342,346 **** def testBadLogin(self): print "\nYou should see a message indicating that login failed." ! self.assertRaises(SystemExit, self.imap.login, IMAP_USERNAME, "wrong password") --- 342,346 ---- def testBadLogin(self): print "\nYou should see a message indicating that login failed." ! self.assertRaises(LoginFailure, self.imap.login, IMAP_USERNAME, "wrong password") *************** *** 612,616 **** self.assertEqual(response[0], "OK") self.msg.uid = response[1][0][7:-1] ! self.msg.folder = IMAPFolder("Inbox", self.msg.imap_server) new_msg = self.msg.get_full_message() --- 612,616 ---- self.assertEqual(response[0], "OK") self.msg.uid = response[1][0][7:-1] ! self.msg.folder = IMAPFolder("Inbox", self.msg.imap_server, None) new_msg = self.msg.get_full_message() *************** *** 634,638 **** self.msg.imap_server.select() self.msg.uid = 103 # id of malformed message in dummy server ! self.msg.folder = IMAPFolder("Inbox", self.msg.imap_server) print "\nWith email package versions less than 3.0, you should " \ "see an error parsing the message." --- 634,638 ---- self.msg.imap_server.select() self.msg.uid = 103 # id of malformed message in dummy server ! self.msg.folder = IMAPFolder("Inbox", self.msg.imap_server, None) print "\nWith email package versions less than 3.0, you should " \ "see an error parsing the message." *************** *** 661,669 **** BaseIMAPFilterTest.setUp(self) self.imap.login(IMAP_USERNAME, IMAP_PASSWORD) ! self.folder = IMAPFolder("testfolder", self.imap) def test_cmp(self): ! folder2 = IMAPFolder("testfolder", self.imap) ! folder3 = IMAPFolder("testfolder2", self.imap) self.assertEqual(self.folder, folder2) self.assertNotEqual(self.folder, folder3) --- 661,669 ---- BaseIMAPFilterTest.setUp(self) self.imap.login(IMAP_USERNAME, IMAP_PASSWORD) ! self.folder = IMAPFolder("testfolder", self.imap, None) def test_cmp(self): ! folder2 = IMAPFolder("testfolder", self.imap, None) ! folder3 = IMAPFolder("testfolder2", self.imap, None) self.assertEqual(self.folder, folder2) self.assertNotEqual(self.folder, folder3) *************** *** 749,753 **** self.imap.login(IMAP_USERNAME, IMAP_PASSWORD) classifier = Classifier() ! self.filter = IMAPFilter(classifier) options["imap", "ham_train_folders"] = ("ham_to_train",) options["imap", "spam_train_folders"] = ("spam_to_train",) --- 749,753 ---- self.imap.login(IMAP_USERNAME, IMAP_PASSWORD) classifier = Classifier() ! self.filter = IMAPFilter(classifier, None) options["imap", "ham_train_folders"] = ("ham_to_train",) options["imap", "spam_train_folders"] = ("spam_to_train",) From anadelonbrin at users.sourceforge.net Wed Dec 14 08:51:58 2005 From: anadelonbrin at users.sourceforge.net (Tony Meyer) Date: Wed, 14 Dec 2005 08:51:58 +0100 (CET) Subject: [Spambayes-checkins] spambayes/spambayes/test test_Corpus.py, 1.1, 1.2 Message-ID: <20051214075158.BC8311E400A@bag.python.org> Update of /cvsroot/spambayes/spambayes/spambayes/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26687/spambayes/test Modified Files: test_Corpus.py Log Message: KeyError is raised when a message isn't present, not NotImplementedError. Index: test_Corpus.py =================================================================== RCS file: /cvsroot/spambayes/spambayes/spambayes/test/test_Corpus.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** test_Corpus.py 20 Jan 2005 03:37:55 -0000 1.1 --- test_Corpus.py 14 Dec 2005 07:35:17 -0000 1.2 *************** *** 131,135 **** for id in ids: self.corpus.addMessage(simple_msg(id)) ! self.assertRaises(NotImplementedError, self.corpus.__getitem__, 4) def test_keys(self): --- 131,135 ---- for id in ids: self.corpus.addMessage(simple_msg(id)) ! self.assertRaises(KeyError, self.corpus.__getitem__, 4) def test_keys(self): From anadelonbrin at users.sourceforge.net Wed Dec 14 08:51:59 2005 From: anadelonbrin at users.sourceforge.net (Tony Meyer) Date: Wed, 14 Dec 2005 08:51:59 +0100 (CET) Subject: [Spambayes-checkins] spambayes/spambayes Corpus.py,1.25,1.26 Message-ID: <20051214075159.D83DA1E400A@bag.python.org> Update of /cvsroot/spambayes/spambayes/spambayes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25742/spambayes Modified Files: Corpus.py Log Message: contains is meant to check messages, not ids. Index: Corpus.py =================================================================== RCS file: /cvsroot/spambayes/spambayes/spambayes/Corpus.py,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** Corpus.py 15 Nov 2005 00:01:52 -0000 1.25 --- Corpus.py 14 Dec 2005 07:32:04 -0000 1.26 *************** *** 214,218 **** def __contains__(self, other): ! return other in self.msgs def __iter__(self): --- 214,218 ---- def __contains__(self, other): ! return other in self.msgs.values() def __iter__(self): From anadelonbrin at users.sourceforge.net Wed Dec 14 09:18:05 2005 From: anadelonbrin at users.sourceforge.net (Tony Meyer) Date: Wed, 14 Dec 2005 09:18:05 +0100 (CET) Subject: [Spambayes-checkins] spambayes/scripts sb_server.py,1.49,1.50 Message-ID: <20051214081805.35B131E4002@bag.python.org> Update of /cvsroot/spambayes/spambayes/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6332/scripts Modified Files: sb_server.py Log Message: Don't open messageinfo db twice. Index: sb_server.py =================================================================== RCS file: /cvsroot/spambayes/spambayes/scripts/sb_server.py,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** sb_server.py 28 Nov 2005 10:55:07 -0000 1.49 --- sb_server.py 14 Dec 2005 08:18:00 -0000 1.50 *************** *** 887,890 **** --- 887,891 ---- self.MDBName, self.useMDB = spambayes.message.database_type() self.mdb = spambayes.message.open_storage(self.MDBName, self.useMDB) + spambayes.message.Message.message_info_db = self.mdb # Load stats manager. From anadelonbrin at users.sourceforge.net Wed Dec 14 09:19:25 2005 From: anadelonbrin at users.sourceforge.net (Tony Meyer) Date: Wed, 14 Dec 2005 09:19:25 +0100 (CET) Subject: [Spambayes-checkins] spambayes/spambayes/test test_stats.py, 1.5, 1.6 Message-ID: <20051214081925.D72321E4002@bag.python.org> Update of /cvsroot/spambayes/spambayes/spambayes/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6768/spambayes/test Modified Files: test_stats.py Log Message: Don't open messageinfo db twice. Index: test_stats.py =================================================================== RCS file: /cvsroot/spambayes/spambayes/spambayes/test/test_stats.py,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** test_stats.py 14 Dec 2005 07:38:08 -0000 1.5 --- test_stats.py 14 Dec 2005 08:19:21 -0000 1.6 *************** *** 18,21 **** --- 18,22 ---- self.messageinfo_db = MessageInfoPickle(self.messageinfo_db_name) self.s = Stats(options, self.messageinfo_db) + Message.message_info_db = self.messageinfo_db def tearDown(self):