Improve getting the mailbox from the environment.

diff --git a/Lib/mailbox.py b/Lib/mailbox.py
index 36f58f568c81be952b449270ae740f581a11cd51..2d0254ea5a6f95e7b971e319cedc9e0aa066c341 100755 (executable)
--- 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]