Improve getting the mailbox from the environment.

c7162a0e · Guido van Rossum · 7410bb43 · c7162a0e
Commit c7162a0e authored May 08, 1997 by Guido van Rossum
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

Lib/mailbox.py Lib/mailbox.py +5 -5

No files found.
--- 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'):
+		for key in 'MAIL', 'LOGNAME', 'USER':
-			mbox = os.environ['MAIL']
+			if os.environ.has_key(key):
-		elif os.environ.has_key('MAIL'):
+				mbox = os.environ[key]
-			mbox = os.environ['USER']
+				break
 		else:
-			print "Who are you?"
+			print "$MAIL, $LOGNAME nor $USER set -- who are you?"
 			return
 	else:
 		mbox = args[0]