From 6dd87830d091673741a4aabfb0680ae5ca64c257 Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Thu, 8 May 1997 23:11:52 +0000 Subject: [PATCH] Improve getting the mailbox from the environment. --- Lib/mailbox.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Lib/mailbox.py b/Lib/mailbox.py index 36f58f568c8..2d0254ea5a6 100755 --- a/Lib/mailbox.py +++ b/Lib/mailbox.py @@ -142,12 +142,12 @@ def _test(): args = sys.argv[1:] if not args: - if os.environ.has_key('MAIL'): - mbox = os.environ['MAIL'] - elif os.environ.has_key('MAIL'): - mbox = os.environ['USER'] + for key in 'MAIL', 'LOGNAME', 'USER': + if os.environ.has_key(key): + mbox = os.environ[key] + break else: - print "Who are you?" + print "$MAIL, $LOGNAME nor $USER set -- who are you?" return else: mbox = args[0]