[Python-checkins] cpython (merge 3.2 -> default): Issue #14992: merge from 3.2

[ned.deily]

http://hg.python.org/cpython/rev/a1c8c79e035d
changeset:   78472:a1c8c79e035d
parent:      78470:7d821a09a640
parent:      78471:3f42c9dbd8a7
user:        Ned Deily <nad at acm.org>
date:        Wed Aug 08 21:03:02 2012 -0700
summary:
  Issue #14992: merge from 3.2

files:
  Lib/test/test_os.py |  5 ++++-
  1 files changed, 4 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -863,7 +863,10 @@
         try:
             existing_testfn_mode = stat.S_IMODE(
                     os.lstat(support.TESTFN).st_mode)
-            os.chmod(support.TESTFN, existing_testfn_mode | S_ISGID)
+            try:
+                os.chmod(support.TESTFN, existing_testfn_mode | S_ISGID)
+            except PermissionError:
+                raise unittest.SkipTest('Cannot set S_ISGID for dir.')
             if (os.lstat(support.TESTFN).st_mode & S_ISGID != S_ISGID):
                 raise unittest.SkipTest('No support for S_ISGID dir mode.')
             # The os should apply S_ISGID from the parent dir for us, but

-- 
Repository URL: http://hg.python.org/cpython