[Spambayes-checkins] spambayes/Outlook2000 manager.py,1.67,1.68

[Mark Hammond]

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

Modified Files:
	manager.py 
Log Message:
The setting of "verbose" was a little confused.  Now only the config
file is used.


Index: manager.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/manager.py,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** manager.py	25 Jul 2003 06:40:28 -0000	1.67
--- manager.py	27 Jul 2003 23:47:43 -0000	1.68
***************
*** 190,194 ****
  # Our main "bayes manager"
  class BayesManager:
!     def __init__(self, config_base="default", outlook=None, verbose=1):
          self.reported_error_map = {}
          self.reported_startup_error = False
--- 190,194 ----
  # Our main "bayes manager"
  class BayesManager:
!     def __init__(self, config_base="default", outlook=None, verbose=0):
          self.reported_error_map = {}
          self.reported_startup_error = False
***************
*** 716,728 ****
  _mgr = None
  
! def GetManager(outlook = None, verbose=1):
      global _mgr
      if _mgr is None:
          if outlook is None:
              outlook = win32com.client.Dispatch("Outlook.Application")
!         _mgr = BayesManager(outlook=outlook, verbose=verbose)
!     # If requesting greater verbosity, honour it
!     if verbose > _mgr.verbose:
!         _mgr.verbose = verbose
      return _mgr
  
--- 716,725 ----
  _mgr = None
  
! def GetManager(outlook = None):
      global _mgr
      if _mgr is None:
          if outlook is None:
              outlook = win32com.client.Dispatch("Outlook.Application")
!         _mgr = BayesManager(outlook=outlook)
      return _mgr