From: Neil Schemenauer <nascheme@enme.ucalgary.ca>
Date: Sun, 24 Mar 2002 01:38:38 +0000 (+0000)
Subject: Try /var/mail before trying /usr/mail.  Most new systems use /var.
X-Git-Tag: v2.3c1~6367
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=03f3ee6d891e86d3744793f5d66624e52c8261d5;p=python

Try /var/mail before trying /usr/mail.  Most new systems use /var.
This in inside the test so it really doesn't matter much.  Closes
SF patch 497097.
---

diff --git a/Lib/mailbox.py b/Lib/mailbox.py
index 302e4b108a..ed83489716 100755
--- a/Lib/mailbox.py
+++ b/Lib/mailbox.py
@@ -276,7 +276,10 @@ def _test():
     if mbox[:1] == '+':
         mbox = os.environ['HOME'] + '/Mail/' + mbox[1:]
     elif not '/' in mbox:
-        mbox = '/usr/mail/' + mbox
+        if os.path.isfile('/var/mail/' + mbox):
+            mbox = '/var/mail/' + mbox
+        else:
+            mbox = '/usr/mail/' + mbox
     if os.path.isdir(mbox):
         if os.path.isdir(os.path.join(mbox, 'cur')):
             mb = Maildir(mbox)