Fri Jan 10 02:41:09 EST 2003

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

Modified Files:
      Tag: reorg-branch
	OptionConfig.py hammiefilter.py hammiesrv.py mailsort.py 
	mboxtrain.py pop3graph.py pop3proxy.py setup.py 
Removed Files:
      Tag: reorg-branch
	Corpus.py CostCounter.py FileCorpus.py HistToGNU.py 
	Histogram.py Options.py TestDriver.py Tester.py cdb.py chi2.py 
	classifier.py cmp.py dbmstorage.py fpfn.py hammiebulk.py 
	heapq.py loosecksum.py mboxcount.py mboxtest.py mboxutils.py 
	msgs.py optimize.py rates.py rebal.py sets.py simplexloop.py 
	split.py splitn.py splitndirs.py storage.py table.py timcv.py 
	timtest.py tokenizer.py weaktest.py 
Log Message:
Checkpointing before I head home.

Still to do: 
 - distutils magic to make sure that the 22compat modules are 
   installed when needed.
 - Walking through testtools and utilities and fixing imports.
 - Documentation.

hammie works, everything else that people use in day-to-day operation
should work - please give it a go.

Index: OptionConfig.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/OptionConfig.py,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** OptionConfig.py	1 Dec 2002 04:11:39 -0000	1.1
--- OptionConfig.py	10 Jan 2003 10:41:05 -0000	1.1.2.1
***************
*** 30,34 ****
  import SmarterHTTPServer
  import BaseHTTPServer
! from Options import options
  import re
  from cStringIO import StringIO
--- 30,34 ----
  import SmarterHTTPServer
  import BaseHTTPServer
! from spambayes.Options import options
  import re
  from cStringIO import StringIO

Index: hammiefilter.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/hammiefilter.py,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -C2 -d -r1.5 -r1.5.2.1
*** hammiefilter.py	2 Dec 2002 06:02:34 -0000	1.5
--- hammiefilter.py	10 Jan 2003 10:41:06 -0000	1.5.2.1
***************
*** 40,46 ****
  import sys
  import getopt
! import hammie
! import Options
! import StringIO

  # See Options.py for explanations of these properties
--- 40,44 ----
  import sys
  import getopt
! from spambayes import hammie, Options, StringIO

  # See Options.py for explanations of these properties

Index: hammiesrv.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/hammiesrv.py,v
retrieving revision 1.10
retrieving revision 1.10.4.1
diff -C2 -d -r1.10 -r1.10.4.1
*** hammiesrv.py	7 Nov 2002 22:30:06 -0000	1.10
--- hammiesrv.py	10 Jan 2003 10:41:06 -0000	1.10.4.1
***************
*** 28,32 ****
  import traceback
  import xmlrpclib
! import hammie

  try:
--- 28,32 ----
  import traceback
  import xmlrpclib
! from spambayes import hammie

  try:

Index: mailsort.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/mailsort.py,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** mailsort.py	29 Nov 2002 00:57:23 -0000	1.1
--- mailsort.py	10 Jan 2003 10:41:06 -0000	1.1.2.1
***************
*** 23,31 ****
  import socket
  import email
! import mboxutils

! import cdb
! from tokenizer import tokenize
! import classifier

--- 23,31 ----
  import socket
  import email
! from spambayes import mboxutils

! from spambayes import cdb
! from spambayes.tokenizer import tokenize
! from spambayes import classifier

Index: mboxtrain.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/mboxtrain.py,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -d -r1.2 -r1.2.2.1
*** mboxtrain.py	11 Dec 2002 16:21:15 -0000	1.2
--- mboxtrain.py	10 Jan 2003 10:41:06 -0000	1.2.2.1
***************
*** 35,43 ****
  """

! import mboxutils
! import getopt
! import hammie
! import sys
! import os

  program = sys.argv[0]
--- 35,40 ----
  """

! import sys, os, getopt
! from spambayes import hammie, mboxutils

  program = sys.argv[0]

Index: pop3graph.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/pop3graph.py,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** pop3graph.py	20 Nov 2002 12:30:16 -0000	1.1
--- pop3graph.py	10 Jan 2003 10:41:06 -0000	1.1.2.1
***************
*** 5,11 ****
  from __future__ import division

! import sys, mboxutils
! from FileCorpus import FileCorpus, FileMessageFactory, GzipFileMessageFactory
! from Options import options

  def main():
--- 5,12 ----
  from __future__ import division

! import sys
! from spambayes import  mboxutils
! from spambayes.FileCorpus import FileCorpus, FileMessageFactory, GzipFileMessageFactory
! from spambayes.Options import options

  def main():

Index: pop3proxy.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/pop3proxy.py,v
retrieving revision 1.32
retrieving revision 1.32.2.1
diff -C2 -d -r1.32 -r1.32.2.1
*** pop3proxy.py	3 Dec 2002 21:22:22 -0000	1.32
--- pop3proxy.py	10 Jan 2003 10:41:06 -0000	1.32.2.1
***************
*** 141,149 ****
  import os, sys, re, operator, errno, getopt, string, cStringIO, time, bisect
  import socket, asyncore, asynchat, cgi, urlparse, webbrowser
! import mailbox, storage, tokenizer, mboxutils, email.Header
! from FileCorpus import FileCorpus, ExpiryFileCorpus
! from FileCorpus import FileMessageFactory, GzipFileMessageFactory
  from email.Iterators import typed_subpart_iterator
! from Options import options

  # HEADER_EXAMPLE is the longest possible header - the length of this one
--- 141,150 ----
  import os, sys, re, operator, errno, getopt, string, cStringIO, time, bisect
  import socket, asyncore, asynchat, cgi, urlparse, webbrowser
! import mailbox, email.Header
! from spambayes import storage, tokenizer, mboxutils
! from spambayes.FileCorpus import FileCorpus, ExpiryFileCorpus
! from spambayes.FileCorpus import FileMessageFactory, GzipFileMessageFactory
  from email.Iterators import typed_subpart_iterator
! from spambayes.Options import options

  # HEADER_EXAMPLE is the longest possible header - the length of this one

Index: setup.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/setup.py,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -C2 -d -r1.10 -r1.10.2.1
*** setup.py	11 Dec 2002 04:56:30 -0000	1.10
--- setup.py	10 Jan 2003 10:41:06 -0000	1.10.2.1
***************
*** 1,4 ****
--- 1,17 ----
  from distutils.core import setup

+ import sys, email
+ if email.__version__ < '2.4.3':
+     print "Error: email package version < 2.4.3 found - need newer version"
+     print "See INTEGRATION.txt for download information"
+     sys.exit(0)
+ 
+ compat_mods = []
+ try: 
+     import sets, heapq
+ except ImportError:
+     compat_mods = [ '22compat/sets.py', '22compat/heapq.py', ]
+     # TODO. Figure distutils magic out here.
+ 
  setup(
    name='spambayes',
***************
*** 7,37 ****
             'hammiecli.py',
             'hammiesrv.py',
!            'loosecksum.py',
!            'timtest.py',
!            'timcv.py',
!            'splitndirs.py',
!            'runtest.sh',
!            'rebal.py',
!            'HistToGNU.py',
!            'mboxcount.py',
!            'mboxtest.py',
!            'cmp.py',
!            'table.py',
!            'rates.py',
            ],
!   py_modules=['classifier',
!               'tokenizer',
!               'hammie',
!               'msgs',
!               'storage',
!               'dbmstorage',
!               'Corpus',
!               'hammiebulk',
!               'chi2',
!               'Histogram',
!               'Options',
!               'Tester',
!               'TestDriver',
!               'mboxutils',
!              ]
    )
--- 20,28 ----
             'hammiecli.py',
             'hammiesrv.py',
!            'hammiefilter.py',
!            'pop3graph.py',
!            'pop3proxy.py',
            ],
! 
!         packages = [ 'spambayes', ]
    )

--- Corpus.py DELETED ---

--- CostCounter.py DELETED ---

--- FileCorpus.py DELETED ---

--- HistToGNU.py DELETED ---

--- Histogram.py DELETED ---

--- Options.py DELETED ---

--- TestDriver.py DELETED ---

--- Tester.py DELETED ---

--- cdb.py DELETED ---

--- chi2.py DELETED ---

--- classifier.py DELETED ---

--- cmp.py DELETED ---

--- dbmstorage.py DELETED ---

--- fpfn.py DELETED ---

--- hammiebulk.py DELETED ---

--- heapq.py DELETED ---

--- loosecksum.py DELETED ---

--- mboxcount.py DELETED ---

--- mboxtest.py DELETED ---

--- mboxutils.py DELETED ---

--- msgs.py DELETED ---

--- optimize.py DELETED ---

--- rates.py DELETED ---

--- rebal.py DELETED ---

--- sets.py DELETED ---

--- simplexloop.py DELETED ---

--- split.py DELETED ---

--- splitn.py DELETED ---

--- splitndirs.py DELETED ---

--- storage.py DELETED ---

--- table.py DELETED ---

--- timcv.py DELETED ---

--- timtest.py DELETED ---

--- tokenizer.py DELETED ---

--- weaktest.py DELETED ---