Issue #15776: Allow pyvenv to work in existing directory with --clean.

Patch by Vinay Sajip.
This commit is contained in:
Andrew Svetlov 2012-08-24 19:00:15 +03:00
parent ad2a7d528a
commit 82649f3b87
2 changed files with 11 additions and 1 deletions

View File

@ -105,7 +105,15 @@ class EnvBuilder:
if os.path.exists(env_dir) and not (self.clear or self.upgrade):
raise ValueError('Directory exists: %s' % env_dir)
if os.path.exists(env_dir) and self.clear:
shutil.rmtree(env_dir)
# Issue 15776: To support running pyvenv on '.', the venv
# directory contents are emptied and recreated, instead of
# the venv directory being deleted and recreated.
for f in os.listdir(env_dir):
f = os.path.join(env_dir, f)
if os.path.isdir(f):
shutil.rmtree(f)
else:
os.remove(f)
context = Context()
context.env_dir = env_dir
context.env_name = os.path.split(env_dir)[1]

View File

@ -29,6 +29,8 @@ Core and Builtins
Library
-------
- Issue #15776: Allow pyvenv to work in existing directory with --clean.
- Issue #15249: BytesGenerator now correctly mangles From lines (when
requested) even if the body contains undecodable bytes.