From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Wed, 2 Jun 2010 03:50:56 +0000 (+0000)
Subject: Merged revisions 81649 via svnmerge from
X-Git-Tag: v3.2a1~656
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=82bfcc87f023c0423443c6691b1d9ad2db4fb4a5;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 81649 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81649 | ronald.oussoren | 2010-06-02 05:47:14 +0200 (Wed, 02 Jun 2010) | 5 lines

  Fix for issue8868: without this patch 'MacOS.WMAvailable()' will return
  False on MacOSX 10.5 or earlier and scripts won't be able to access GUI
  functionality.
........
---

diff --git a/Mac/Tools/pythonw.c b/Mac/Tools/pythonw.c
index 8da6f47d3a61..0b2fafc68a99 100644
--- a/Mac/Tools/pythonw.c
+++ b/Mac/Tools/pythonw.c
@@ -151,6 +151,14 @@ int
 main(int argc, char **argv) {
     char* exec_path = get_python_path();
 
+    /*
+     * Let argv[0] refer to the new interpreter. This is needed to
+     * get the effect we want on OSX 10.5 or earlier. That is, without
+     * changing argv[0] the real interpreter won't have access to
+     * the Window Server.
+     */
+    argv[0] = exec_path;
+
 #ifdef HAVE_SPAWN_H
     /* We're weak-linking to posix-spawnv to ensure that
      * an executable build on 10.5 can work on 10.4.