Changeset 943 for trunk/zoo-project/zoo-kernel/service_internal_python.c

Timestamp:

Jun 27, 2019, 12:57:25 PM (5 years ago)

Author:

knut

Message:

Fix problem with the parsing of system environment variables (Windows version). Need to verify that problem does not pertain to non-Windows versions also.

File:

• trunk/zoo-project/zoo-kernel/service_internal_python.c (modified) (5 diffs)

trunk/zoo-project/zoo-kernel/service_internal_python.c

@@ -236 +236 @@
           SetEnvironmentVariable("PYTHONHOME", home->value);
   }
-  char buffer[128];        
+  char buffer[128];
 #endif  
   if(hasToClean>0)
@@ -254 +254 @@
 #else
   init_zoo();
-#endif  
+#endif 
   mainstate = PyThreadState_Swap(NULL);
   PyEval_ReleaseLock();
@@ -285 +285 @@
     errorException (m, "Unable to parse serviceProvider please check your zcfg file.", "NoApplicableCode", NULL);
     exit(-1);
-  }  
-  pModule = PyImport_Import(pName);    
+  } 
+
+  pModule = PyImport_Import(pName);
   int res=SERVICE_FAILED;
   if (pModule != NULL) {
@@ -301 +302 @@
       PyTuple_SetItem(pArgs, 1, (PyObject *)arg2);
       PyTuple_SetItem(pArgs, 2, (PyObject *)arg3);
-      pValue = PyObject_CallObject(pFunc, pArgs);         
+      pValue = PyObject_CallObject(pFunc, pArgs);
       if (pValue != NULL) {
         res=PyInt_AsLong(pValue);
@@ -335 +336 @@
 #endif
   PyThreadState_Swap(mainstate);
-  Py_Finalize();  
+  Py_Finalize();
   return res;
 }