summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Peters <tim.peters@gmail.com>2001-08-05 05:43:20 (GMT)
committerTim Peters <tim.peters@gmail.com>2001-08-05 05:43:20 (GMT)
commit45e5e72eb8488d3df4c183d4e91bf27c19b08b76 (patch)
treebd40af841d43a3da32940299f571179c06cac5a1
parentb39fa0e0fa84d4fc52388addd9e552f7a1b9152f (diff)
downloadcpython-45e5e72eb8488d3df4c183d4e91bf27c19b08b76.zip
cpython-45e5e72eb8488d3df4c183d4e91bf27c19b08b76.tar.gz
cpython-45e5e72eb8488d3df4c183d4e91bf27c19b08b76.tar.bz2
Rename pydoc.pyw to pydocgui.pyw: Since we changed Python to allow .pyw
files to satisfy imports, pydoc.pyw was just importing itself!
-rw-r--r--PCbuild/python20.wse2
-rwxr-xr-xTools/scripts/pydoc.pyw2
-rw-r--r--Tools/scripts/pydocgui.pyw5
3 files changed, 6 insertions, 3 deletions
diff --git a/PCbuild/python20.wse b/PCbuild/python20.wse
index 6131986..3ec564e 100644
--- a/PCbuild/python20.wse
+++ b/PCbuild/python20.wse
@@ -2451,7 +2451,7 @@ end
item: Create Shortcut
Source=%MAINDIR%\pythonw.exe
Destination=%GROUP%\Module Docs.lnk
- Command Options="%MAINDIR%\Tools\Scripts\pydoc.pyw"
+ Command Options="%MAINDIR%\Tools\Scripts\pydocgui.pyw"
Working Directory=%MAINDIR%
Key Type=1536
Flags=00000001
diff --git a/Tools/scripts/pydoc.pyw b/Tools/scripts/pydoc.pyw
deleted file mode 100755
index 66992f9..0000000
--- a/Tools/scripts/pydoc.pyw
+++ /dev/null
@@ -1,2 +0,0 @@
-import pydoc
-pydoc.gui()
diff --git a/Tools/scripts/pydocgui.pyw b/Tools/scripts/pydocgui.pyw
new file mode 100644
index 0000000..61a8b89
--- /dev/null
+++ b/Tools/scripts/pydocgui.pyw
@@ -0,0 +1,5 @@
+# Note: this file must not be named pydoc.pyw, lest it just end up
+# importing itself (Python began allowing import of .pyw files
+# between 2.2a1 and 2.2a2).
+import pydoc
+pydoc.gui()