mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 08:59:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Issue #22427: TemporaryDirectory no longer attempts to clean up twice when

Browse source 
used in the with statement in generator.
This commit is contained in:
Serhiy Storchaka 2014-09-24 13:26:25 +03:00
parent b87630c273
commit 5e193ac0bd
3 changed files with 30 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Lib/tempfile.py
View file

@ -663,11 +663,6 @@ class TemporaryDirectory(object):
in it are removed.
"""
# Handle mkdtemp raising an exception
name = None
_finalizer = None
_closed = False
def __init__(self, suffix="", prefix=template, dir=None):
self.name = mkdtemp(suffix, prefix, dir)
self._finalizer = _weakref.finalize(
@ -675,10 +670,9 @@ class TemporaryDirectory(object):
warn_message="Implicitly cleaning up {!r}".format(self))
@classmethod
def _cleanup(cls, name, warn_message=None):
def _cleanup(cls, name, warn_message):
_shutil.rmtree(name)
if warn_message is not None:
_warnings.warn(warn_message, ResourceWarning)
_warnings.warn(warn_message, ResourceWarning)
def __repr__(self):
@ -691,8 +685,5 @@ class TemporaryDirectory(object):
self.cleanup()
def cleanup(self):
if self._finalizer is not None:
self._finalizer.detach()
if self.name is not None and not self._closed:
if self._finalizer.detach():
_shutil.rmtree(self.name)
self._closed = True