[Spambayes-checkins] spambayes/spambayes Options.py,1.94,1.95

[Tony Meyer]

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

Modified Files:
	Options.py 
Log Message:
Bring pspam into the modern spambayes world.  update.py, pop.py and scoremsg.py all seem to
work ok for me, with very limited testing.

Let the connection address be either a INET address (in the form "(server,port)", or a UNIX one.

Standardise the options code (move the options into the same place as all the rest, and dump
the pspam only file, which didn't work with the new OptionsClass anyway).  Note that the
options have no nice name or docstring, because I don't really know that I know enough to
fill those out.  They might vanish sometime anyway.

Index: Options.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/Options.py,v
retrieving revision 1.94
retrieving revision 1.95
diff -C2 -d -r1.94 -r1.95
*** Options.py	17 Dec 2003 09:09:52 -0000	1.94
--- Options.py	18 Dec 2003 06:41:52 -0000	1.95
***************
*** 1027,1030 ****
--- 1027,1060 ----
    ),
  
+   "ZODB" : (
+     ("zeo_addr", "", "",
+      """""",
+      IMAP_ASTRING, DO_NOT_RESTORE),
+ 
+     ("event_log_file", "", "",
+      """""",
+      IMAP_ASTRING, RESTORE),
+ 
+     ("folder_dir", "", "",
+      """""",
+      PATH, DO_NOT_RESTORE),
+ 
+     ("ham_folders", "", "",
+      """""",
+      PATH, DO_NOT_RESTORE),
+ 
+     ("spam_folders", "", "",
+      """""",
+      PATH, DO_NOT_RESTORE),
+ 
+     ("event_log_severity", "", 0,
+      """""",
+      INTEGER, RESTORE),
+ 
+     ("cache_size", "", 2000,
+      """""",
+      INTEGER, RESTORE),
+   ),
+ 
    "imapserver" : (
      ("username", "Username", "",