[Python-checkins] CVS: python/dist/src/Lib mailbox.py,1.33,1.33.12.1

[Michael Hudson]

Update of /cvsroot/python/python/dist/src/Lib
In directory usw-pr-cvs1:/tmp/cvs-serv22981

Modified Files:
      Tag: release22-maint
	mailbox.py 
Log Message:
backport bwarsaw's checkin of
    revision 1.34 of mailbox.py

Added PortableUnixMailbox to the __all__ variable, and in the __main__
section use this class instead of UnixMailbox as per the comments in
the latter's class.

Bug fix candidate for 2.2.1.


Index: mailbox.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/mailbox.py,v
retrieving revision 1.33
retrieving revision 1.33.12.1
diff -C2 -d -r1.33 -r1.33.12.1
*** mailbox.py	13 Sep 2001 01:29:13 -0000	1.33
--- mailbox.py	5 Mar 2002 14:00:16 -0000	1.33.12.1
***************
*** 7,11 ****
  import os
  
! __all__ = ["UnixMailbox","MmdfMailbox","MHMailbox","Maildir","BabylMailbox"]
  
  class _Mailbox:
--- 7,12 ----
  import os
  
! __all__ = ["UnixMailbox","MmdfMailbox","MHMailbox","Maildir","BabylMailbox",
!            "PortableUnixMailbox"]
  
  class _Mailbox:
***************
*** 92,95 ****
--- 93,97 ----
  
  
+ # Recommended to use PortableUnixMailbox instead!
  class UnixMailbox(_Mailbox):
      def _search_start(self):
***************
*** 283,287 ****
      else:
          fp = open(mbox, 'r')
!         mb = UnixMailbox(fp)
  
      msgs = []
--- 285,289 ----
      else:
          fp = open(mbox, 'r')
!         mb = PortableUnixMailbox(fp)
  
      msgs = []