[Spambayes-checkins] spambayes/spambayes ImapUI.py, 1.23, 1.24 __init__.py, 1.7, 1.8

[Mark Hammond]

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

Modified Files:
	ImapUI.py __init__.py 
Log Message:
Merging old 1.0 trunk onto the branch.


Index: ImapUI.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/ImapUI.py,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** ImapUI.py	6 Oct 2003 01:24:12 -0000	1.23
--- ImapUI.py	5 Dec 2003 04:41:25 -0000	1.24
***************
*** 168,191 ****
          self._writePreamble("Select Filter Folders")
          self._login_to_imap()
!         available_folders = self.imap.folder_list()
!         content = self.html.configForm.clone()
!         content.configFormContent = ""
!         content.introduction = """This page allows you to change which
!         folders are filtered, and where filtered mail ends up."""
!         content.config_submit.value = "Save Filter Folders"
!         content.optionsPathname = optionsPathname
  
!         for opt in ("unsure_folder", "spam_folder",
!                     "filter_folders"):
!             folderBox = self._buildFolderBox("imap", opt, available_folders)
!             content.configFormContent += folderBox
  
!         self.write(content)
!         self._writePostamble()
  
      def _login_to_imap(self):
          if self.imap_logged_in:
              return
!         if self.imap is None:
              server = options["imap", "server"][0]
              if server.find(':') > -1:
--- 168,192 ----
          self._writePreamble("Select Filter Folders")
          self._login_to_imap()
!         if self.imap_logged_in:
!             available_folders = self.imap.folder_list()
!             content = self.html.configForm.clone()
!             content.configFormContent = ""
!             content.introduction = """This page allows you to change which
!             folders are filtered, and where filtered mail ends up."""
!             content.config_submit.value = "Save Filter Folders"
!             content.optionsPathname = optionsPathname
  
!             for opt in ("unsure_folder", "spam_folder",
!                         "filter_folders"):
!                 folderBox = self._buildFolderBox("imap", opt, available_folders)
!                 content.configFormContent += folderBox
  
!             self.write(content)
!             self._writePostamble()
  
      def _login_to_imap(self):
          if self.imap_logged_in:
              return
!         if self.imap is None and len(options["imap", "server"]) > 0:
              server = options["imap", "server"][0]
              if server.find(':') > -1:
***************
*** 217,235 ****
          self._writePreamble("Select Training Folders")
          self._login_to_imap()
!         available_folders = self.imap.folder_list()
!         content = self.html.configForm.clone()
!         content.configFormContent = ""
!         content.introduction = """This page allows you to change which
!         folders contain mail to train Spambayes."""
!         content.config_submit.value = "Save Training Folders"
!         content.optionsPathname = optionsPathname
  
!         for opt in ("ham_train_folders",
!                     "spam_train_folders"):
!             folderBox = self._buildFolderBox("imap", opt, available_folders)
!             content.configFormContent += folderBox
  
!         self.write(content)
!         self._writePostamble()
  
      def onChangeopts(self, **parms):
--- 218,237 ----
          self._writePreamble("Select Training Folders")
          self._login_to_imap()
!         if self.imap_logged_in:
!             available_folders = self.imap.folder_list()
!             content = self.html.configForm.clone()
!             content.configFormContent = ""
!             content.introduction = """This page allows you to change which
!             folders contain mail to train Spambayes."""
!             content.config_submit.value = "Save Training Folders"
!             content.optionsPathname = optionsPathname
  
!             for opt in ("ham_train_folders",
!                         "spam_train_folders"):
!                 folderBox = self._buildFolderBox("imap", opt, available_folders)
!                 content.configFormContent += folderBox
  
!             self.write(content)
!             self._writePostamble()
  
      def onChangeopts(self, **parms):

Index: __init__.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/__init__.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** __init__.py	19 Sep 2003 01:04:16 -0000	1.7
--- __init__.py	5 Dec 2003 04:41:25 -0000	1.8
***************
*** 1,3 ****
  # package marker.
  
! __version__ = '1.0a6'
--- 1,3 ----
  # package marker.
  
! __version__ = '1.0a7'