From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Fri, 24 Aug 2012 19:01:02 +0000 (+0100)
Subject: Reverted change to venv initialisation.
X-Git-Tag: v3.3.0rc1~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a6894ba3c9a66f2a5af5cc663538f86c0fa10079;p=python

Reverted change to venv initialisation.
---

diff --git a/Lib/venv/__init__.py b/Lib/venv/__init__.py
index 3553fecb89..8d2deb7385 100644
--- a/Lib/venv/__init__.py
+++ b/Lib/venv/__init__.py
@@ -105,15 +105,7 @@ 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:
-            # 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)
+            shutil.rmtree(env_dir)
         context = Context()
         context.env_dir = env_dir
         context.env_name = os.path.split(env_dir)[1]