install idle and pydoc with a 3 suffix #5756

benjaminp · benjaminp · commit 0b4915e99ec7 · 2009-04-25T21:11:45.000Z
diff --git 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/idle3 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/pydoc3 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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#! /usr/bin/env python`
	`1`	`+#! /usr/bin/env python3`
`2`	`2`
`3`	`3`	`from idlelib.PyShell import main`
`4`	`4`	`if __name__ == '__main__':`