[Python-checkins] r71936 - in python/branches/py3k: Misc/NEWS Tools/scripts/idle Tools/scripts/idle3 Tools/scripts/pydoc Tools/scripts/pydoc3 setup.py

Sat Apr 25 23:11:46 CEST 2009

Author: benjamin.peterson
Date: Sat Apr 25 23:11:45 2009
New Revision: 71936
Log:
install idle and pydoc with a 3 suffix #5756
Added:
 python/branches/py3k/Tools/scripts/idle3
 - copied, changed from r71924, /python/branches/py3k/Tools/scripts/idle
 python/branches/py3k/Tools/scripts/pydoc3
 - copied, changed from r71924, /python/branches/py3k/Tools/scripts/pydoc
Removed:
 python/branches/py3k/Tools/scripts/idle
 python/branches/py3k/Tools/scripts/pydoc
Modified:
 python/branches/py3k/Misc/NEWS
 python/branches/py3k/setup.py
Modified: python/branches/py3k/Misc/NEWS
==============================================================================

--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Sat Apr 25 23:11:45 2009
@@ -76,6 +76,11 @@
 - 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
 -------
 
Deleted: python/branches/py3k/Tools/scripts/idle
==============================================================================
--- python/branches/py3k/Tools/scripts/idle	Sat Apr 25 23:11:45 2009
+++ (empty file)
@@ -1,5 +0,0 @@
-#! /usr/bin/env python
-
-from idlelib.PyShell import main
-if __name__ == '__main__':
- main()
Copied: python/branches/py3k/Tools/scripts/idle3 (from r71924, /python/branches/py3k/Tools/scripts/idle)
==============================================================================
--- /python/branches/py3k/Tools/scripts/idle	(original)
+++ python/branches/py3k/Tools/scripts/idle3	Sat Apr 25 23:11:45 2009
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 from idlelib.PyShell import main
 if __name__ == '__main__':
Deleted: python/branches/py3k/Tools/scripts/pydoc
==============================================================================
--- python/branches/py3k/Tools/scripts/pydoc	Sat Apr 25 23:11:45 2009
+++ (empty file)
@@ -1,5 +0,0 @@
-#!/usr/bin/env python
-
-import pydoc
-if __name__ == '__main__':
- pydoc.cli()
Copied: python/branches/py3k/Tools/scripts/pydoc3 (from r71924, /python/branches/py3k/Tools/scripts/pydoc)
==============================================================================
--- /python/branches/py3k/Tools/scripts/pydoc	(original)
+++ python/branches/py3k/Tools/scripts/pydoc3	Sat Apr 25 23:11:45 2009
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import pydoc
 if __name__ == '__main__':
Modified: python/branches/py3k/setup.py
==============================================================================
--- python/branches/py3k/setup.py	(original)
+++ python/branches/py3k/setup.py	Sat Apr 25 23:11:45 2009
@@ -1652,13 +1652,7 @@
 # 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
