[Spambayes-checkins] spambayes/Outlook2000 addin.py,1.113,1.114

[Mark Hammond]

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

Modified Files:
	addin.py 
Log Message:
Print the 'fully qualified' folder names that we are watching.  No longer
hide Python FutureWarnings, and a typo in a comment.


Index: addin.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/addin.py,v
retrieving revision 1.113
retrieving revision 1.114
diff -C2 -d -r1.113 -r1.114
*** addin.py	29 Sep 2003 02:14:25 -0000	1.113
--- addin.py	27 Oct 2003 03:36:24 -0000	1.114
***************
*** 21,25 ****
  # * Our config files also want a consistent locale, so periods and commas
  #   are the same when they are read as when they are written.
! # So, at a few opportune times, we simple set it back.
  # We do it here as early as possible, before any imports that may see this
  #
--- 21,25 ----
  # * Our config files also want a consistent locale, so periods and commas
  #   are the same when they are read as when they are written.
! # So, at a few opportune times, we simply set it back.
  # We do it here as early as possible, before any imports that may see this
  #
***************
*** 30,43 ****
  locale.setlocale(locale.LC_NUMERIC, "C")
  
- if sys.version_info >= (2, 3):
-     # sick off the new hex() warnings!
-     # todo - remove this - win32all has removed all these warnings
-     # (but we will wait some time for people to update)
-     warnings.filterwarnings("ignore", category=FutureWarning, append=1)
-     # Binary builds can avoid our pendingdeprecation too
-     if hasattr(sys, "frozen"):
-         warnings.filterwarnings("ignore", category=DeprecationWarning, append=1)
- 
- 
  from win32com import universal
  from win32com.server.exception import COMException
--- 30,33 ----
***************
*** 1308,1312 ****
              if existing is None or existing.__class__ != HandlerClass:
                  folder = msgstore_folder.GetOutlookItem()
!                 name = msgstore_folder.name
                  try:
                      new_hook = DispatchWithEvents(folder.Items, HandlerClass)
--- 1298,1302 ----
              if existing is None or existing.__class__ != HandlerClass:
                  folder = msgstore_folder.GetOutlookItem()
!                 name = msgstore_folder.GetFQName()
                  try:
                      new_hook = DispatchWithEvents(folder.Items, HandlerClass)
***************
*** 1329,1333 ****
                          tb = None # dont want it, and nuke circular ref
                          traceback.print_exception(etype, value, tb)
!                     print "SpamBayes: Watching for new messages in folder ", name
              else:
                  new_hooks[msgstore_folder.id] = existing
--- 1319,1323 ----
                          tb = None # dont want it, and nuke circular ref
                          traceback.print_exception(etype, value, tb)
!                     print "SpamBayes: Watching for new messages in folder", name
              else:
                  new_hooks[msgstore_folder.id] = existing