[Spambayes] Outlook plugin broken in CVS (options code?)

[Piers Haken]

I'm not sure what's up, but my plugin's not starting since I updated
from CVS.

Here's what I'm getting.

Piers.

SpamAddin - Connecting to Outlook
Created new configuration file 'C:\Documents and
Settings\piersh\Application Data\SpamBayes\default_configuration.pck'
Traceback (most recent call last):
  File "C:\Python22\lib\site-packages\win32com\universal.py", line 170,
in dispatch
    retVal = ob._InvokeEx_(meth.dispid, 0, meth.invkind, args, None,
None)
  File "C:\Python22\lib\site-packages\win32com\server\policy.py", line
322, in _InvokeEx_
    return self._invokeex_(dispid, lcid, wFlags, args, kwargs,
serviceProvider)
  File "C:\Python22\lib\site-packages\win32com\server\policy.py", line
601, in _invokeex_
    return DesignatedWrapPolicy._invokeex_( self, dispid, lcid, wFlags,
args, kwArgs, serviceProvider)
  File "C:\Python22\lib\site-packages\win32com\server\policy.py", line
541, in _invokeex_
    return apply(func, args)
  File "C:\Python22\spam\spambayes\Outlook2000\addin.py", line 684, in
OnConnection
    self.manager = manager.GetManager(application)
  File "C:\Python22\spam\spambayes\Outlook2000\manager.py", line 475, in
GetManager
    _mgr = BayesManager(outlook=outlook, verbose=verbose)
  File "C:\Python22\spam\spambayes\Outlook2000\manager.py", line 156, in
__init__
    import_core_spambayes_stuff(self.ini_filename)
  File "C:\Python22\spam\spambayes\Outlook2000\manager.py", line 70, in
import_core_spambayes_stuff
    from spambayes import classifier
  File "C:\Python22\spam\spambayes\spambayes\classifier.py", line 40, in
?
    from spambayes.Options import options
  File "C:\Python22\spam\spambayes\spambayes\Options.py", line 1411, in
?
    options.mergefiles(filenames)
  File "C:\Python22\spam\spambayes\spambayes\Options.py", line 1288, in
mergefiles
    self._update()
  File "C:\Python22\spam\spambayes\spambayes\Options.py", line 1326, in
_update
    self.set(section, option, value)
  File "C:\Python22\spam\spambayes\spambayes\Options.py", line 1276, in
set
    self.convert(sect, opt, val)
  File "C:\Python22\spam\spambayes\spambayes\Options.py", line 1261, in
convert
    return converter(value)
  File "C:\Python22\spam\spambayes\spambayes\Options.py", line 952, in
<lambda>
    'address_headers': ('get', lambda s: Set(s.split())),
exceptions.AttributeError: 'Set' object has no attribute 'split'