From: Brian Curtin <brian.curtin@gmail.com>
Date: Sun, 21 Nov 2010 23:48:14 +0000 (+0000)
Subject: Merged revisions 86651 via svnmerge from
X-Git-Tag: v3.1.3~38
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=44c1db05fb2d0b753d18d13a415fa703aa7c0795;p=thirdparty%2FPython%2Fcpython.git

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 c1b5fd28acb3..4e67868276d5 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 c64a99b022f4..8f958147441d 100644
--- 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()