From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Sun, 30 Jun 2013 21:06:52 +0000 (+0100)
Subject: Issue #18224: Removed pydoc script from created venv, as it causes problems on Window... 
X-Git-Tag: v3.4.0a1~353^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=61d003a8f147a99c22a63f9e259631e51dd66970;p=thirdparty%2FPython%2Fcpython.git

Issue #18224: Removed pydoc script from created venv, as it causes problems on Windows and adds no value over and above python -m pydoc ...
---

diff --git a/Lib/venv/scripts/nt/pydoc.py b/Lib/venv/scripts/nt/pydoc.py
deleted file mode 100644
index dbf2db71b498..000000000000
--- a/Lib/venv/scripts/nt/pydoc.py
+++ /dev/null
@@ -1,4 +0,0 @@
-#!__VENV_PYTHON__
-if __name__ == '__main__':
-    import sys, pydoc
-    sys.exit(pydoc.cli())
diff --git a/Lib/venv/scripts/posix/pydoc b/Lib/venv/scripts/posix/pydoc
deleted file mode 100755
index 92337711289f..000000000000
--- a/Lib/venv/scripts/posix/pydoc
+++ /dev/null
@@ -1,5 +0,0 @@
-#!__VENV_PYTHON__
-if __name__ == '__main__':
-    import sys, pydoc
-    sys.exit(pydoc.cli())
-
diff --git a/Misc/NEWS b/Misc/NEWS
index 884ae94dde04..17d8f601a256 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -38,6 +38,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #18224: Removed pydoc script from created venv, as it causes problems
+  on Windows and adds no value over and above python -m pydoc ...
+
 - Issue #18155: The csv module now correctly handles csv files that use
   a delimter character that has a special meaning in regexes, instead of
   throwing an exception.