install idle and pydoc with a 3 suffix #5756

diff --git a/Misc/NEWS b/Misc/NEWS
index 9750f4b6b2bee01c7ae5f1f14f2759a74e35e39f..b10fa947aa06d8ca74ba834c6c7620c743c42121 100644 (file)
--- 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/idle3
similarity index 75%
rename from Tools/scripts/idle
rename to Tools/scripts/idle3
index 1ba2a2c598169e067a1f1b26b9bdccffbb22c06e..8ee92c2afe8492b4221402b6ab37c8e2b0e59b18 100755 (executable)
--- a/Tools/scripts/idle
+++ b/Tools/scripts/idle3
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 from idlelib.PyShell import main
 if __name__ == '__main__':

diff --git a/Tools/scripts/pydoc b/Tools/scripts/pydoc3
similarity index 71%
rename from Tools/scripts/pydoc
rename to Tools/scripts/pydoc3
index 0879a4258784b86a8751e3f1fe463e0aa697382f..c9b83bb55b208b4520b1561999dae60975f643c4 100755 (executable)
--- a/Tools/scripts/pydoc
+++ b/Tools/scripts/pydoc3
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import pydoc
 if __name__ == '__main__':

diff --git a/setup.py b/setup.py
index 6343ccde32295bd42e9a2c875d2b946e34edb2b1..03994de1b6fcf1cadfba40385f8c90f2326cc69a 100644 (file)
--- 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