From: Guido van Rossum <guido@python.org>
Date: Thu, 8 May 1997 23:11:52 +0000 (+0000)
Subject: Improve getting the mailbox from the environment.
X-Git-Tag: v1.5a1~33
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6dd87830d091673741a4aabfb0680ae5ca64c257;p=thirdparty%2FPython%2Fcpython.git

Improve getting the mailbox from the environment.
---

diff --git a/Lib/mailbox.py b/Lib/mailbox.py
index 36f58f568c81..2d0254ea5a6f 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]