summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Curtin <brian.curtin@gmail.com>2010-11-21 23:50:51 (GMT)
committerBrian Curtin <brian.curtin@gmail.com>2010-11-21 23:50:51 (GMT)
commit2d011ed71c71be0781e3c0de3604af690a6cbc96 (patch)
tree34815837c93d2dec123c90fad0581958d57914a6
parent8535d380c7c84fc77279342c0fa34bd92bb8c214 (diff)
downloadcpython-2d011ed71c71be0781e3c0de3604af690a6cbc96.zip
cpython-2d011ed71c71be0781e3c0de3604af690a6cbc96.tar.gz
cpython-2d011ed71c71be0781e3c0de3604af690a6cbc96.tar.bz2
Merged revisions 86651 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r86651 | brian.curtin | 2010-11-21 17:45:10 -0600 (Sun, 21 Nov 2010) | 5 lines Fix #6378. Start IDLE using the proper version of Python based on the directory tree that idle.bat resides in. Works with any/all versions of Python installed concurrently. ........
-rwxr-xr-xLib/idlelib/idle.bat5
-rw-r--r--Misc/NEWS3
2 files changed, 6 insertions, 2 deletions
diff --git a/Lib/idlelib/idle.bat b/Lib/idlelib/idle.bat
index c1b5fd2..4e67868 100755
--- a/Lib/idlelib/idle.bat
+++ b/Lib/idlelib/idle.bat
@@ -1,3 +1,4 @@
@echo off
-rem Working IDLE bat for Windows - uses start instead of absolute pathname
-start idle.pyw %1 %2 %3 %4 %5 %6 %7 %8 %9
+rem Start IDLE using the appropriate Python interpreter
+set CURRDIR=%~dp0
+start %CURRDIR%..\..\pythonw.exe %CURRDIR%idle.pyw %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/Misc/NEWS b/Misc/NEWS
index 4e2cb9c..fc40da5 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -13,6 +13,9 @@ Core and Builtins
Library
-------
+- Issue #6378: idle.bat now runs with the appropriate Python version rather than
+ the system default. Patch by Sridhar Ratnakumar.
+
- Issue #10407: Fix one NameError in distutils.
- Issue #10198: fix duplicate header written to wave files when writeframes()