diff options
| author | Charles-François Natali <neologix@free.fr> | 2011-07-29 16:59:24 (GMT) |
|---|---|---|
| committer | Charles-François Natali <neologix@free.fr> | 2011-07-29 16:59:24 (GMT) |
| commit | def35435ee4001f8aedac01b559bb0dc2d0aab00 (patch) | |
| tree | a3533dae9cb8a88566d6a9304dbc5fbc89ced164 /Lib/tempfile.py | |
| parent | fe1e298d8bbfbdfd1c2af74dbb74f47e2d04a6d0 (diff) | |
| download | cpython-def35435ee4001f8aedac01b559bb0dc2d0aab00.zip cpython-def35435ee4001f8aedac01b559bb0dc2d0aab00.tar.gz cpython-def35435ee4001f8aedac01b559bb0dc2d0aab00.tar.bz2 | |
Issue #12464: tempfile.TemporaryDirectory.cleanup() should not follow symlinks:
fix it. Patch by Petri Lehtinen.
Diffstat (limited to 'Lib/tempfile.py')
| -rw-r--r-- | Lib/tempfile.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/tempfile.py b/Lib/tempfile.py index b28d91f..48b77a8 100644 --- a/Lib/tempfile.py +++ b/Lib/tempfile.py @@ -661,6 +661,7 @@ class TemporaryDirectory(object): _listdir = staticmethod(_os.listdir) _path_join = staticmethod(_os.path.join) _isdir = staticmethod(_os.path.isdir) + _islink = staticmethod(_os.path.islink) _remove = staticmethod(_os.remove) _rmdir = staticmethod(_os.rmdir) _os_error = _os.error @@ -672,7 +673,7 @@ class TemporaryDirectory(object): for name in self._listdir(path): fullname = self._path_join(path, name) try: - isdir = self._isdir(fullname) + isdir = self._isdir(fullname) and not self._islink(fullname) except self._os_error: isdir = False if isdir: |