summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorMichael W. Hudson <mwh@python.net>2002-03-05 14:00:16 (GMT)
committerMichael W. Hudson <mwh@python.net>2002-03-05 14:00:16 (GMT)
commitcedf2a4eedbab5d32e1932ffe8e2f716eae79ad0 (patch)
tree0e230382dbe84d30ce113eb22eb6a335f13625ea /Lib
parent234bb740f71381a8086818f56a5b92f9155d4fe1 (diff)
downloadcpython-cedf2a4eedbab5d32e1932ffe8e2f716eae79ad0.zip
cpython-cedf2a4eedbab5d32e1932ffe8e2f716eae79ad0.tar.gz
cpython-cedf2a4eedbab5d32e1932ffe8e2f716eae79ad0.tar.bz2
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.
Diffstat (limited to 'Lib')
-rwxr-xr-xLib/mailbox.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/Lib/mailbox.py b/Lib/mailbox.py
index b1c082d..302e4b1 100755
--- a/Lib/mailbox.py
+++ b/Lib/mailbox.py
@@ -6,7 +6,8 @@
import rfc822
import os
-__all__ = ["UnixMailbox","MmdfMailbox","MHMailbox","Maildir","BabylMailbox"]
+__all__ = ["UnixMailbox","MmdfMailbox","MHMailbox","Maildir","BabylMailbox",
+ "PortableUnixMailbox"]
class _Mailbox:
def __init__(self, fp, factory=rfc822.Message):
@@ -91,6 +92,7 @@ class _Subfile:
del self.fp
+# Recommended to use PortableUnixMailbox instead!
class UnixMailbox(_Mailbox):
def _search_start(self):
while 1:
@@ -282,7 +284,7 @@ def _test():
mb = MHMailbox(mbox)
else:
fp = open(mbox, 'r')
- mb = UnixMailbox(fp)
+ mb = PortableUnixMailbox(fp)
msgs = []
while 1: