summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis Osipov <osipov_d@list.ru>2017-06-08 12:16:48 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2017-06-08 12:16:48 (GMT)
commita0b9088881b8fcfda864070335b249071508ee0c (patch)
tree49ef37ca5ac19447357c9a1d8fbaed2989865aed
parent54ba41ecc5711f89841342c5f9dd555ee13404b5 (diff)
downloadcpython-a0b9088881b8fcfda864070335b249071508ee0c.zip
cpython-a0b9088881b8fcfda864070335b249071508ee0c.tar.gz
cpython-a0b9088881b8fcfda864070335b249071508ee0c.tar.bz2
[3.5] bpo-30584: Fix test_os fails on non-English Windows (GH-1980) (#2000)
* Fix bpo-30584 * Adding a comment mentionning the bpo and explaining what is the identifier * Add Denis Osipov to Misc/ACKS (cherry picked from commit 897bba75632dfce87c355e3cd4700468357715a7)
-rw-r--r--Lib/test/test_os.py4
-rw-r--r--Misc/ACKS1
2 files changed, 4 insertions, 1 deletions
diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index 10383cf..5865783 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -448,7 +448,9 @@ class StatAttributeTests(unittest.TestCase):
# force CreateFile to fail with ERROR_ACCESS_DENIED.
DETACHED_PROCESS = 8
subprocess.check_call(
- ['icacls.exe', fname, '/deny', 'Users:(S)'],
+ # bpo-30584: Use security identifier *S-1-5-32-545 instead
+ # of localized "Users" to not depend on the locale.
+ ['icacls.exe', fname, '/deny', '*S-1-5-32-545:(S)'],
creationflags=DETACHED_PROCESS
)
result = os.stat(fname)
diff --git a/Misc/ACKS b/Misc/ACKS
index 53f6879..1ed9e5b 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1101,6 +1101,7 @@ William Orr
Michele Orrù
Tomáš Orsava
Oleg Oshmyan
+Denis Osipov
Denis S. Otkidach
Peter Otten
Michael Otteneder