jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

minor: remove unused _shutil_rmtree_remove_writable

This commit is contained in:
Daniel Hahler 2018-10-23 17:35:52 +02:00
parent f30911d3af
commit b51ee48f78
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/_pytest/pathlib.py
View File

@ -13,7 +13,6 @@ import shutil
from os.path import expanduser, expandvars, isabs, sep from os.path import expanduser, expandvars, isabs, sep
from posixpath import sep as posix_sep from posixpath import sep as posix_sep
import fnmatch import fnmatch
import stat
from .compat import PY36 from .compat import PY36
@ -40,17 +39,10 @@ def ensure_reset_dir(path):
path.mkdir() path.mkdir()
def _shutil_rmtree_remove_writable(func, fspath, _):
"Clear the readonly bit and reattempt the removal"
os.chmod(fspath, stat.S_IWRITE)
func(fspath)
def rmtree(path, force=False): def rmtree(path, force=False):
if force: if force:
# ignore_errors leaves dead folders around # NOTE: ignore_errors might leave dead folders around.
# python needs a rm -rf as a followup # Python needs a rm -rf as a followup.
# the trick with _shutil_rmtree_remove_writable is unreliable
shutil.rmtree(str(path), ignore_errors=True) shutil.rmtree(str(path), ignore_errors=True)
else: else:
shutil.rmtree(str(path)) shutil.rmtree(str(path))