Changeset 391 for python/trunk/RISCOS/Modules/getpath_riscos.c

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)
• RISCOS/Modules/getpath_riscos.c (modified) (5 diffs)

python/trunk/RISCOS/Modules/getpath_riscos.c

@@ -6 +6 @@
 static void
 calculate_path()
-{ 
-        char *pypath = getenv("Python$Path");
-        if (pypath) {
-                int pathlen = strlen(pypath);
-                module_search_path = malloc(pathlen + 1);
-                if (module_search_path) 
-                        strncpy(module_search_path, pypath, pathlen + 1);
-                else {
-                        fprintf(stderr, 
-                                "Not enough memory for dynamic PYTHONPATH.\n"
-                                "Using default static PYTHONPATH.\n");
-                }
-        }
-        if (!module_search_path) 
-                module_search_path = "<Python$Dir>.Lib";
-        prefix = "<Python$Dir>";
-        exec_prefix = prefix;
-        progpath = Py_GetProgramName();
+{
+    char *pypath = getenv("Python$Path");
+    if (pypath) {
+        int pathlen = strlen(pypath);
+        module_search_path = malloc(pathlen + 1);
+        if (module_search_path)
+            strncpy(module_search_path, pypath, pathlen + 1);
+        else {
+            fprintf(stderr,
+                "Not enough memory for dynamic PYTHONPATH.\n"
+                "Using default static PYTHONPATH.\n");
+        }
+    }
+    if (!module_search_path)
+        module_search_path = "<Python$Dir>.Lib";
+    prefix = "<Python$Dir>";
+    exec_prefix = prefix;
+    progpath = Py_GetProgramName();
 }
 
@@ -31 +31 @@
 Py_GetPath()
 {
-        if (!module_search_path)
-                calculate_path();
-        return module_search_path;
+    if (!module_search_path)
+        calculate_path();
+    return module_search_path;
 }
 
@@ -39 +39 @@
 Py_GetPrefix()
 {
-        if (!module_search_path)
-                calculate_path();
-        return prefix;
+    if (!module_search_path)
+        calculate_path();
+    return prefix;
 }
 
@@ -47 +47 @@
 Py_GetExecPrefix()
 {
-        if (!module_search_path)
-                calculate_path();
-        return exec_prefix;
+    if (!module_search_path)
+        calculate_path();
+    return exec_prefix;
 }
 
@@ -55 +55 @@
 Py_GetProgramFullPath()
 {
-        if (!module_search_path)
-                calculate_path();
-        return progpath;
+    if (!module_search_path)
+        calculate_path();
+    return progpath;
 }