Changeset 391 for python/trunk/Mac/PythonLauncher/FileSettings.m

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Mac/PythonLauncher/FileSettings.m (modified) (15 diffs)

python/trunk/Mac/PythonLauncher/FileSettings.m

@@ -15 +15 @@
     static FileSettings *fsdefault_py, *fsdefault_pyw, *fsdefault_pyc;
     FileSettings **curdefault;
-    
+
     if ([filetype isEqualToString: @"Python Script"]) {
         curdefault = &fsdefault_py;
@@ -37 +37 @@
     static FileSettings *default_py, *default_pyw, *default_pyc;
     FileSettings **curdefault;
-    
+
     if ([filetype isEqualToString: @"Python Script"]) {
         curdefault = &default_py;
@@ -58 +58 @@
 {
     FileSettings *cur;
-    
+
     cur = [FileSettings new];
     [cur initForFileType: filetype];
@@ -68 +68 @@
     self = [super init];
     if (!self) return self;
-    
+
     interpreter = [source->interpreter retain];
     honourhashbang = source->honourhashbang;
@@ -82 +82 @@
     prefskey = source->prefskey;
     if (prefskey) [prefskey retain];
-    
+
     return self;
 }
@@ -89 +89 @@
 {
     FileSettings *defaults;
-    
+
     defaults = [FileSettings getDefaultsForFileType: filetype];
     self = [self initWithFileSettings: defaults];
@@ -96 +96 @@
 }
 
-//- (id)init
-//{
-//    self = [self initForFileType: @"Python Script"];
-//    return self;
-//}
-
 - (id)initForFSDefaultFileType: (NSString *)filetype
 {
@@ -108 +102 @@
     NSDictionary *dict;
     static NSDictionary *factorySettings;
-    
+
     self = [super init];
     if (!self) return self;
-    
+
     if (factorySettings == NULL) {
         NSBundle *bdl = [NSBundle mainBundle];
@@ -150 +144 @@
     NSUserDefaults *defaults;
     NSDictionary *dict;
-    
+
     defaults = [NSUserDefaults standardUserDefaults];
     dict = [defaults dictionaryForKey: filetype];
@@ -157 +151 @@
     [self applyValuesFromDict: dict];
 }
-    
+
 - (id)initForDefaultFileType: (NSString *)filetype
 {
     FileSettings *fsdefaults;
-    
+
     fsdefaults = [FileSettings getFactorySettingsForFileType: filetype];
     self = [self initWithFileSettings: fsdefaults];
@@ -221 +215 @@
 {
     id value;
-    
+
     value = [dict objectForKey: @"interpreter"];
     if (value) interpreter = [value retain];
@@ -248 +242 @@
 - (NSString*)_replaceSingleQuotes: (NSString*)string
 {
-        /* Replace all single-quotes by '"'"', that way shellquoting will
-         * be correct when the result value is delimited  using single quotes.
-         */
-        NSArray* components = [string componentsSeparatedByString:@"'"];
-
-        return [components componentsJoinedByString:@"'\"'\"'"];
+    /* Replace all single-quotes by '"'"', that way shellquoting will
+     * be correct when the result value is delimited  using single quotes.
+     */
+    NSArray* components = [string componentsSeparatedByString:@"'"];
+
+    return [components componentsJoinedByString:@"'\"'\"'"];
 }
 
@@ -266 +260 @@
     script_dir = [script substringToIndex:
             [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 &&
@@ -275 +269 @@
             p = hashbangbuf + 2;
             while (*p == ' ') p++;
-            cur_interp = [NSString stringWithCString: p];
+            cur_interp = [NSString stringWithUTF8String: p];
     }
     if (!cur_interp)
         cur_interp = interpreter;
-        
+
     return [NSString stringWithFormat:
         @"cd '%@' && '%@'%s%s%s%s%s%s %@ '%@' %@ %s",
@@ -298 +292 @@
 - (NSArray *) interpreters { return interpreters;};
 
-// FileSettingsSource protocol 
+// FileSettingsSource protocol
 - (NSString *) interpreter { return interpreter;};
 - (BOOL) honourhashbang { return honourhashbang; };