diff --git a/Misc/NEWS b/Misc/NEWS index 9750f4b6b2b..b10fa947aa0 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/idle3 similarity index 75% rename from Tools/scripts/idle rename to Tools/scripts/idle3 index 1ba2a2c5981..8ee92c2afe8 100755 --- 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 0879a425878..c9b83bb55b2 100755 --- 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 6343ccde322..03994de1b6f 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