[Python-checkins] r88732 - in python/branches/release27-maint: Lib/mailbox.py Misc/NEWS

[r.david.murray]

Author: r.david.murray
Date: Thu Mar  3 19:17:40 2011
New Revision: 88732

Log:
Merged revisions 88730 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r88730 | r.david.murray | 2011-03-03 13:03:36 -0500 (Thu, 03 Mar 2011) | 2 lines
  
  #11306: Treat EROFS like EACCES when making a 'file is read-only' decision
........


Modified:
   python/branches/release27-maint/   (props changed)
   python/branches/release27-maint/Lib/mailbox.py
   python/branches/release27-maint/Misc/NEWS

Modified: python/branches/release27-maint/Lib/mailbox.py
==============================================================================
--- python/branches/release27-maint/Lib/mailbox.py	(original)
+++ python/branches/release27-maint/Lib/mailbox.py	Thu Mar  3 19:17:40 2011
@@ -554,7 +554,7 @@
                     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
@@ -1905,7 +1905,7 @@
             try:
                 fcntl.lockf(f, fcntl.LOCK_EX | fcntl.LOCK_NB)
             except IOError, 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:
@@ -1915,7 +1915,7 @@
                 pre_lock = _create_temporary(f.name + '.lock')
                 pre_lock.close()
             except IOError, e:
-                if e.errno == errno.EACCES:
+                if e.errno in (errno.EACCES, errno.EROFS):
                     return  # Without write access, just skip dotlocking.
                 else:
                     raise

Modified: python/branches/release27-maint/Misc/NEWS
==============================================================================
--- python/branches/release27-maint/Misc/NEWS	(original)
+++ python/branches/release27-maint/Misc/NEWS	Thu Mar  3 19:17:40 2011
@@ -37,6 +37,10 @@
 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().