From montanaro at users.sourceforge.net  Fri Jun  3 03:13:19 2005
From: montanaro at users.sourceforge.net (Skip Montanaro)
Date: Thu, 02 Jun 2005 18:13:19 -0700
Subject: [Spambayes-checkins] spambayes/scripts sb_filter.py,1.17,1.18
Message-ID: <E1De0kR-0005Mg-PN@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/spambayes/spambayes/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20591

Modified Files:
	sb_filter.py 
Log Message:
If database doesn't exist, initialize it.  Closes the ancient #759917.


Index: sb_filter.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/scripts/sb_filter.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** sb_filter.py	1 Apr 2005 04:11:22 -0000	1.17
--- sb_filter.py	3 Jun 2005 01:13:17 -0000	1.18
***************
*** 151,155 ****
                              os.path.expanduser('~/.hammierc')])
          self.dbname, self.usedb = storage.database_type([])
!         self.h = None
  
      def open(self, mode):
--- 151,155 ----
                              os.path.expanduser('~/.hammierc')])
          self.dbname, self.usedb = storage.database_type([])
!         self.mode = self.h = None
  
      def open(self, mode):
***************
*** 172,176 ****
          self.open('n')
          self.close()
-         print >> sys.stderr, "Created new database in", self.dbname
  
      def filter(self, msg):
--- 172,175 ----
***************
*** 231,237 ****
      h.dbname, h.usedb = storage.database_type(opts)
  
!     if create_newdb:
          h.newdb()
!         sys.exit(0)
  
      if actions == []:
--- 230,238 ----
      h.dbname, h.usedb = storage.database_type(opts)
  
!     if create_newdb or not os.path.exists(h.dbname):
          h.newdb()
!         print >> sys.stderr, "Created new database in", h.dbname
!         if create_newdb:
!             sys.exit(0)
  
      if actions == []:


From anadelonbrin at users.sourceforge.net  Fri Jun  3 05:34:45 2005
From: anadelonbrin at users.sourceforge.net (Tony Meyer)
Date: Thu, 02 Jun 2005 20:34:45 -0700
Subject: [Spambayes-checkins] spambayes/spambayes message.py,1.68,1.69
Message-ID: <E1De2xJ-0007k6-8r@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/spambayes/spambayes/spambayes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29697/spambayes

Modified Files:
	message.py 
Log Message:
Need to use has_key() and not "in" for Python 2.2 compat.

Index: message.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/message.py,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -d -r1.68 -r1.69
*** message.py	29 Mar 2005 07:16:45 -0000	1.68
--- message.py	3 Jun 2005 03:34:42 -0000	1.69
***************
*** 126,130 ****
  
      def get_statistics_start_date(self):
!         if STATS_START_KEY in self.db:
              return self.db[STATS_START_KEY]
          else:
--- 126,130 ----
  
      def get_statistics_start_date(self):
!         if self.db.has_key(STATS_START_KEY):
              return self.db[STATS_START_KEY]
          else:


From mhammond at users.sourceforge.net  Tue Jun 21 05:18:41 2005
From: mhammond at users.sourceforge.net (Mark Hammond)
Date: Mon, 20 Jun 2005 20:18:41 -0700
Subject: [Spambayes-checkins] spambayes/Outlook2000/dialogs
	FolderSelector.py, 1.39, 1.40
Message-ID: <E1DkZHd-0000ni-Nt@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/spambayes/spambayes/Outlook2000/dialogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2463

Modified Files:
	FolderSelector.py 
Log Message:
A recent bugfix in pywin32 broke the Outlook folder dialogs - update so we
work with new and old pywin32 versions.


Index: FolderSelector.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/dialogs/FolderSelector.py,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** FolderSelector.py	1 Jun 2004 02:14:38 -0000	1.39
--- FolderSelector.py	21 Jun 2005 03:18:39 -0000	1.40
***************
*** 687,691 ****
          buf = win32gui.PyMakeBuffer(struct.calcsize(format), lparam)
          hwndFrom, id, code = struct.unpack(format, buf)
!         code += 0x4f0000 # hrm - wtf - commctrl uses this, and it works with mfc.  *sigh*
          id_name = self._GetIDName(id)
          if id_name == "IDC_LIST_FOLDERS":
--- 687,691 ----
          buf = win32gui.PyMakeBuffer(struct.calcsize(format), lparam)
          hwndFrom, id, code = struct.unpack(format, buf)
!         code += commctrl.PY_0U # work around silly old pywin32 bug
          id_name = self._GetIDName(id)
          if id_name == "IDC_LIST_FOLDERS":