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.
........

diff --git a/Lib/idlelib/idle.bat b/Lib/idlelib/idle.bat
index c1b5fd28acb387e42d8578838c1f45229c7c841d..4e67868276d5e8256eeb9fa40fb276163a25c38c 100755 (executable)
--- 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 c64a99b022f4169074dfa4ffdce96ca5311a81a5..8f958147441d6953877e7ff94b6286991ed97c13 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -16,6 +16,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 two NameErrors in distutils.
 
 - Issue #10198: fix duplicate header written to wave files when writeframes()