From 82649f3b873f470941d5226802dd3c0e45221173 Mon Sep 17 00:00:00 2001 From: Andrew Svetlov Date: Fri, 24 Aug 2012 19:00:15 +0300 Subject: Issue #15776: Allow pyvenv to work in existing directory with --clean. Patch by Vinay Sajip. --- Lib/venv/__init__.py | 10 +++++++++- Misc/NEWS | 2 ++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Lib/venv/__init__.py b/Lib/venv/__init__.py index 8d2deb7..3553fec 100644 --- a/Lib/venv/__init__.py +++ b/Lib/venv/__init__.py @@ -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] diff --git a/Misc/NEWS b/Misc/NEWS index 227f2ac..57f022c 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -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. -- cgit v0.12