mirror of
https://github.com/python/cpython.git
synced 2025-12-15 21:44:50 +00:00
Fix #9333. Expose os.symlink on Windows only when usable.
In order to create symlinks on Windows, SeCreateSymbolicLinkPrivilege is an account privilege that is required to be held by the user. Not only must the privilege be enabled for the account, the activated privileges for the currently running application must be adjusted to enable the requested privilege. Rather than exposing an additional function to be called prior to the user's first os.symlink call, we handle the AdjustTokenPrivileges Windows API call internally and only expose os.symlink when the privilege escalation was successful. Due to the change of only exposing os.symlink when it's available, we can go back to the original test skipping methods of checking via `hasattr`.
This commit is contained in:
parent
02524629f3
commit
52173d4959
12 changed files with 126 additions and 79 deletions
|
|
@ -1,5 +1,5 @@
|
|||
import unittest
|
||||
from test.support import run_unittest, TESTFN, skip_unless_symlink, can_symlink
|
||||
from test.support import run_unittest, TESTFN
|
||||
import glob
|
||||
import os
|
||||
import shutil
|
||||
|
|
@ -25,7 +25,7 @@ class GlobTests(unittest.TestCase):
|
|||
self.mktemp('ZZZ')
|
||||
self.mktemp('a', 'bcd', 'EF')
|
||||
self.mktemp('a', 'bcd', 'efg', 'ha')
|
||||
if can_symlink():
|
||||
if hasattr(os, "symlink"):
|
||||
os.symlink(self.norm('broken'), self.norm('sym1'))
|
||||
os.symlink(self.norm('broken'), self.norm('sym2'))
|
||||
|
||||
|
|
@ -98,7 +98,8 @@ class GlobTests(unittest.TestCase):
|
|||
# either of these results are reasonable
|
||||
self.assertIn(res[0], [self.tempdir, self.tempdir + os.sep])
|
||||
|
||||
@skip_unless_symlink
|
||||
@unittest.skipUnless(hasattr(os, "symlink"),
|
||||
"Missing symlink implementation")
|
||||
def test_glob_broken_symlinks(self):
|
||||
eq = self.assertSequencesEqual_noorder
|
||||
eq(self.glob('sym*'), [self.norm('sym1'), self.norm('sym2')])
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue