[Python-checkins] cpython (merge 3.3 -> default): Closes #18224: Removed pydoc script from created venv, as it causes problems on

[vinay.sajip]

http://hg.python.org/cpython/rev/de73e7ffabb3
changeset:   84396:de73e7ffabb3
parent:      84394:6584e1ddc347
parent:      84395:af837bf390d0
user:        Vinay Sajip <vinay_sajip at yahoo.co.uk>
date:        Sun Jun 30 22:08:27 2013 +0100
summary:
  Closes #18224: Removed pydoc script from created venv, as it causes problems on Windows and adds no value over and above python -m pydoc ...

files:
  Lib/venv/scripts/nt/pydoc.py |  4 ----
  Lib/venv/scripts/posix/pydoc |  5 -----
  Misc/NEWS                    |  3 +++
  3 files changed, 3 insertions(+), 9 deletions(-)


diff --git a/Lib/venv/scripts/nt/pydoc.py b/Lib/venv/scripts/nt/pydoc.py
deleted file mode 100644
--- 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
--- 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
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -135,6 +135,9 @@
 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.

-- 
Repository URL: http://hg.python.org/cpython