From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Mon, 30 Mar 2009 19:25:21 +0000 (+0000)
Subject: Merged revisions 70735 via svnmerge from
X-Git-Tag: v3.1a2~164
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4a85269f7370a807fa577ea0ff454df5a0958c95;p=python

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

........
  r70735 | ronald.oussoren | 2009-03-30 14:22:56 -0500 (Mon, 30 Mar 2009) | 3 lines

  Remove usage of the deprecated '-cString' and '+stringWithCString:' API's
  in PythonLauncher, replacing them with the correct counterparts.
........
---

diff --git a/Mac/PythonLauncher/FileSettings.m b/Mac/PythonLauncher/FileSettings.m
index 1f3695eec1..66b4fdc086 100755
--- a/Mac/PythonLauncher/FileSettings.m
+++ b/Mac/PythonLauncher/FileSettings.m
@@ -267,14 +267,14 @@
 	    [script length]-[[script lastPathComponent] length]];
     
     if (honourhashbang &&
-       (fp=fopen([script cString], "r")) &&
+       (fp=fopen([script fileSystemRepresentation], "r")) &&
        fgets(hashbangbuf, sizeof(hashbangbuf), fp) &&
        strncmp(hashbangbuf, "#!", 2) == 0 &&
        (p=strchr(hashbangbuf, '\n'))) {
             *p = '\0';
             p = hashbangbuf + 2;
             while (*p == ' ') p++;
-            cur_interp = [NSString stringWithCString: p];
+            cur_interp = [NSString stringWithUTF8String: p];
     }
     if (!cur_interp)
         cur_interp = interpreter;