[Python-checkins] r70736 - in python/branches/py3k: Mac/PythonLauncher/FileSettings.m

Mon Mar 30 21:25:23 CEST 2009

Author: ronald.oussoren
Date: Mon Mar 30 21:25:21 2009
New Revision: 70736
Log:
Merged revisions 70735 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk
........
 r70735 | ronald.oussoren | 2009年03月30日 14:22:56 -0500 (2009年3月30日) | 3 lines
 
 Remove usage of the deprecated '-cString' and '+stringWithCString:' API's
 in PythonLauncher, replacing them with the correct counterparts.
........
Modified:
 python/branches/py3k/ (props changed)
 python/branches/py3k/Mac/PythonLauncher/FileSettings.m
Modified: python/branches/py3k/Mac/PythonLauncher/FileSettings.m
==============================================================================

--- python/branches/py3k/Mac/PythonLauncher/FileSettings.m	(original)
+++ python/branches/py3k/Mac/PythonLauncher/FileSettings.m	Mon Mar 30 21:25:21 2009
@@ -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;
