Improve getting the mailbox from the environment.
diff --git a/Lib/mailbox.py b/Lib/mailbox.py
index 36f58f5..2d0254e 100755
--- a/Lib/mailbox.py
+++ b/Lib/mailbox.py
@@ -142,12 +142,12 @@
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]