From 91221f2857961cfed3411e5c49cfa256d9c6a3f8 Mon Sep 17 00:00:00 2001
From: "R. David Murray" <rdmurray@bitdance.com>
Date: Thu, 3 Mar 2011 18:03:36 +0000
Subject: [PATCH] #11306: Treat EROFS like EACCES when making a 'file is
 read-only' decision

---
 Lib/mailbox.py | 6 +++---
 Misc/NEWS      | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Lib/mailbox.py b/Lib/mailbox.py
index 2a0d321c94e..ace17092b80 100644
--- a/Lib/mailbox.py
+++ b/Lib/mailbox.py
@@ -578,7 +578,7 @@ def __init__(self, path, factory=None, create=True):
                     f = open(self._path, 'wb+')
                 else:
                     raise NoSuchMailboxError(self._path)
-            elif e.errno == errno.EACCES:
+            elif e.errno in (errno.EACCES, errno.EROFS):
                 f = open(self._path, 'rb')
             else:
                 raise
@@ -2002,7 +2002,7 @@ def _lock_file(f, dotlock=True):
             try:
                 fcntl.lockf(f, fcntl.LOCK_EX | fcntl.LOCK_NB)
             except IOError as e:
-                if e.errno in (errno.EAGAIN, errno.EACCES):
+                if e.errno in (errno.EAGAIN, errno.EACCES, errno.EROFS):
                     raise ExternalClashError('lockf: lock unavailable: %s' %
                                              f.name)
                 else:
@@ -2012,7 +2012,7 @@ def _lock_file(f, dotlock=True):
                 pre_lock = _create_temporary(f.name + '.lock')
                 pre_lock.close()
             except IOError as e:
-                if e.errno == errno.EACCES:
+                if e.errno in (errno.EACCES, errno.EROFS):
                     return  # Without write access, just skip dotlocking.
                 else:
                     raise
diff --git a/Misc/NEWS b/Misc/NEWS
index 64e2d592290..09b4a95abd1 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -52,6 +52,10 @@ Core and Builtins
 Library
 -------
 
+- Issue #11306: mailbox in certain cases adapts to an inability to open
+  certain files in read-write mode.  Previously it detected this by
+  checking for EACCES, now it also checks for EROFS.
+
 - Issue #11265: asyncore now correctly handles EPIPE, EBADF and EAGAIN errors
   on accept(), send() and recv().