[Spambayes-checkins] spambayes/scripts sb_client.py, 1.1, 1.2 sb_dbexpimp.py, 1.1, 1.2 sb_filter.py, 1.1, 1.2 sb_notesfilter.py, 1.1, 1.2 sb_server.py, 1.2, 1.3

Tue Sep 9 22:33:19 EDT 2003

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

Modified Files:
	sb_client.py sb_dbexpimp.py sb_filter.py sb_notesfilter.py 
	sb_server.py 
Log Message:
Update names of scripts in comments/docstrings.

Index: sb_client.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/scripts/sb_client.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sb_client.py	5 Sep 2003 01:16:45 -0000	1.1
--- sb_client.py	10 Sep 2003 04:33:17 -0000	1.2
***************
*** 1,5 ****
  #! /usr/bin/env python

! """A client for hammiesrv.

  Just feed it your mail on stdin, and it spits out the same message
--- 1,5 ----
  #! /usr/bin/env python

! """A client for sb_xmlrpcserver.py.

  Just feed it your mail on stdin, and it spits out the same message

Index: sb_dbexpimp.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/scripts/sb_dbexpimp.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sb_dbexpimp.py	5 Sep 2003 01:16:45 -0000	1.1
--- sb_dbexpimp.py	10 Sep 2003 04:33:17 -0000	1.2
***************
*** 1,5 ****
  #! /usr/bin/env python

! """dbExpImp.py - Bayes database export/import

  Classes:
--- 1,5 ----
  #! /usr/bin/env python

! """sb_dbexpimp.py - Bayes database export/import

  Classes:
***************
*** 41,45 ****

  Usage:
!     dbExpImp [options]

          options:
--- 41,45 ----

  Usage:
!     sb_dbexpimp [options]

          options:
***************
*** 60,81 ****

      Export pickled mybayes.db into mybayes.db.export as a csv flat file
!         dbExpImp -e -d mybayes.db -f mybayes.db.export

      Import mybayes.eb.export into a new DBM mybayes.db
!         dbExpImp -i -D mybayes.db -f mybayes.db.export

      Export, then import (reorganize) new pickled mybayes.db
!         dbExpImp -e -i -n -d mybayes.db -f mybayes.db.export

      Convert a bayes database from pickle to DBM
!         dbExpImp -e -d abayes.db -f abayes.export
!         dbExpImp -i -D abayes.db -f abayes.export

      Create a new database (newbayes.db) from two
          databases (abayes.db, bbayes.db)
!         dbExpImp -e -d abayes.db -f abayes.export
!         dbExpImp -e -d bbayes.db -f bbayes.export
!         dbExpImp -i -d newbayes.db -f abayes.export
!         dbExpImp -i -m -d newbayes.db -f bbayes.export

  To Do:
--- 60,81 ----

      Export pickled mybayes.db into mybayes.db.export as a csv flat file
!         sb_dbexpimp -e -d mybayes.db -f mybayes.db.export

      Import mybayes.eb.export into a new DBM mybayes.db
!         sb_dbexpimp -i -D mybayes.db -f mybayes.db.export

      Export, then import (reorganize) new pickled mybayes.db
!         sb_dbexpimp -e -i -n -d mybayes.db -f mybayes.db.export

      Convert a bayes database from pickle to DBM
!         sb_dbexpimp -e -d abayes.db -f abayes.export
!         sb_dbexpimp -i -D abayes.db -f abayes.export

      Create a new database (newbayes.db) from two
          databases (abayes.db, bbayes.db)
!         sb_dbexpimp -e -d abayes.db -f abayes.export
!         sb_dbexpimp -e -d bbayes.db -f bbayes.export
!         sb_dbexpimp -i -d newbayes.db -f abayes.export
!         sb_dbexpimp -i -m -d newbayes.db -f bbayes.export

  To Do:
***************
*** 264,266 ****
              runImport(dbFN, useDBM, newDBM, flatFN)
      else:
!         print >>sys.stderr, __doc__
\ No newline at end of file
--- 264,266 ----
              runImport(dbFN, useDBM, newDBM, flatFN)
      else:
!         print >>sys.stderr, __doc__

Index: sb_filter.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/scripts/sb_filter.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sb_filter.py	5 Sep 2003 01:16:45 -0000	1.1
--- sb_filter.py	10 Sep 2003 04:33:17 -0000	1.2
***************
*** 7,11 ****
  ##
  ##   :0 fw
! ##   | hammiefilter.py
  ##
  ## Then, you can set up your MUA to pipe ham and spam to it, one at a
--- 7,11 ----
  ##
  ##   :0 fw
! ##   | sb_filter.py
  ##
  ## Then, you can set up your MUA to pipe ham and spam to it, one at a

Index: sb_notesfilter.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/scripts/sb_notesfilter.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sb_notesfilter.py	5 Sep 2003 01:16:45 -0000	1.1
--- sb_notesfilter.py	10 Sep 2003 04:33:17 -0000	1.2
***************
*** 1,5 ****
  #! /usr/bin/env python

! '''notesfilter.py - Lotus Notes Spambayes interface.

  Classes:
--- 1,5 ----
  #! /usr/bin/env python

! '''sb_notesfilter.py - Lotus Notes Spambayes interface.

  Classes:

Index: sb_server.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/scripts/sb_server.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** sb_server.py	9 Sep 2003 06:51:00 -0000	1.2
--- sb_server.py	10 Sep 2003 04:33:17 -0000	1.3
***************
*** 1,11 ****
  #!/usr/bin/env python

! """A POP3 proxy that works with classifier.py, and adds a simple
  X-Spambayes-Classification header (ham/spam/unsure) to each incoming
! email.  You point pop3proxy at your POP3 server, and configure your
  email client to collect mail from the proxy then filter on the added
  header.  Usage:

!     pop3proxy.py [options] [<server> [<server port>]]
          <server> is the name of your real POP3 server
          <port>   is the port number of your real POP3 server, which
--- 1,16 ----
  #!/usr/bin/env python

! """The primary server for SpamBayes.
! 
! Currently serves the web interface, and any configured POP3 and SMTP
! proxies.
! 
! The POP3 proxy works with classifier.py, and adds a simple
  X-Spambayes-Classification header (ham/spam/unsure) to each incoming
! email.  You point the proxy at your POP3 server, and configure your
  email client to collect mail from the proxy then filter on the added
  header.  Usage:

!     sb_server.py [options] [<server> [<server port>]]
          <server> is the name of your real POP3 server
          <port>   is the port number of your real POP3 server, which