From 0b4915e99ec7e7cd6b4923aa827e1541b67b78a9 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 25 Apr 2009 21:11:45 +0000
Subject: install idle and pydoc with a 3 suffix #5756

---
 Misc/NEWS            | 5 +++++
 Tools/scripts/idle   | 5 -----
 Tools/scripts/idle3  | 5 +++++
 Tools/scripts/pydoc  | 5 -----
 Tools/scripts/pydoc3 | 5 +++++
 setup.py             | 8 +-------
 6 files changed, 16 insertions(+), 17 deletions(-)
 delete mode 100755 Tools/scripts/idle
 create mode 100755 Tools/scripts/idle3
 delete mode 100755 Tools/scripts/pydoc
 create mode 100755 Tools/scripts/pydoc3

diff --git a/Misc/NEWS b/Misc/NEWS
index 9750f4b..b10fa94 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -76,6 +76,11 @@ Core and Builtins
 - Issue #1113244: Py_XINCREF, Py_DECREF, Py_XDECREF: Add `do { ... } while (0)'
   to avoid compiler warnings.
 
+Installation
+------------
+
+- Issue #5756: Install idle and pydoc with a 3 suffix.
+
 Library
 -------
 
diff --git a/Tools/scripts/idle b/Tools/scripts/idle
deleted file mode 100755
index 1ba2a2c..0000000
--- a/Tools/scripts/idle
+++ /dev/null
@@ -1,5 +0,0 @@
-#! /usr/bin/env python
-
-from idlelib.PyShell import main
-if __name__ == '__main__':
-    main()
diff --git a/Tools/scripts/idle3 b/Tools/scripts/idle3
new file mode 100755
index 0000000..8ee92c2
--- /dev/null
+++ b/Tools/scripts/idle3
@@ -0,0 +1,5 @@
+#! /usr/bin/env python3
+
+from idlelib.PyShell import main
+if __name__ == '__main__':
+    main()
diff --git a/Tools/scripts/pydoc b/Tools/scripts/pydoc
deleted file mode 100755
index 0879a42..0000000
--- a/Tools/scripts/pydoc
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env python
-
-import pydoc
-if __name__ == '__main__':
-    pydoc.cli()
diff --git a/Tools/scripts/pydoc3 b/Tools/scripts/pydoc3
new file mode 100755
index 0000000..c9b83bb
--- /dev/null
+++ b/Tools/scripts/pydoc3
@@ -0,0 +1,5 @@
+#!/usr/bin/env python3
+
+import pydoc
+if __name__ == '__main__':
+    pydoc.cli()
diff --git a/setup.py b/setup.py
index 6343ccd..03994de 100644
--- a/setup.py
+++ b/setup.py
@@ -1652,13 +1652,7 @@ def main():
           # called unless there's at least one extension module defined.
           ext_modules=[Extension('_struct', ['_struct.c'])],
 
-          # Scripts to install
-          # Commented out because we don't want them to override the 2.x
-          # ones. See #1590.
-          scripts = []
-          #scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle',
-          #           'Tools/scripts/2to3',
-          #           'Lib/smtpd.py']
+          scripts = ["Tools/scripts/pydoc3", "Tools/scripts/idle3"]
         )
 
 # --install-platlib
-- 
cgit v0.12