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

Timestamp:

Jun 26, 2015, 2:07:46 PM (9 years ago)

Author:

djay

Message:

Fix GetResult? and POST asynchronous requests on Windows. Prevent CONTENT_TYPE=text/xml before creating the process using CreateProcess?. Revert modifications made r587 for using url_decode directly inside zoo_loader.c, the url_decode call should be in kvpParseInputs (from request_parser.c), indeed, there should not be any decoding required in other cases than Execute requests. Fix issue in mapsFromPyDict, small changes in mapFromPyDict to fix parsing result value (only) for Python 3.

File:

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

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

@@ -523 +523 @@
 maps* mapsFromPyDict(PyDictObject* t){
   maps* res=NULL;
-  maps* cursor=res;
+  maps* cursor=NULL;
   PyObject* list=PyDict_Keys((PyObject*)t);
   int nb=PyList_Size(list);
   int i;
+  PyObject* key;
+  PyObject* value;
   for(i=0;i<nb;i++){
 #ifdef DEBUG
     fprintf(stderr,">> parsing maps %d\n",i);
 #endif
-    PyObject* key=PyList_GetItem(list,i);
-    PyObject* value=PyDict_GetItem((PyObject*)t,key);
+    key=PyList_GetItem(list,i);
+    value=PyDict_GetItem((PyObject*)t,key);
 #ifdef DEBUG
     fprintf(stderr,">> DEBUG VALUES : %s => %s\n",
@@ -538 +540 @@
 #endif
     cursor=(maps*)malloc(MAPS_SIZE);
-    cursor->name=PyString_AsString(key);
+    cursor->name=zStrdup(PyString_AsString(key));
     cursor->content=mapFromPyDict((PyDictObject*)value);
 #ifdef DEBUG
@@ -572 +574 @@
   int nb=PyList_Size(list);
   int i;
+  PyObject* key;
+  PyObject* value;
   for(i=0;i<nb;i++){
-    PyObject* key=PyList_GetItem(list,i);
-    PyObject* value=PyDict_GetItem((PyObject*)t,key);
+    key=PyList_GetItem(list,i);
+    value=PyDict_GetItem((PyObject*)t,key);
 #ifdef DEBUG
     fprintf(stderr,">> DEBUG VALUES : %s => %s\n",
@@ -584 +588 @@
       Py_ssize_t size;
 #if PY_MAJOR_VERSION >= 3
-      buffer=_PyUnicode_AsStringAndSize(value,&size);
+      if(PyBytes_Check(value)){
+        size=PyBytes_Size(value);
+        buffer=PyBytes_AsString(value);
+      }
+      else
+        if(PyUnicode_Check(value) && PyUnicode_READY(value) == 0){
+          buffer=PyUnicode_AsUTF8AndSize(value,&size);
+        }
+        else{
+          fprintf(stderr,"Unsupported return value.");
+          return NULL;
+        }
 #else
       PyString_AsStringAndSize(value,&buffer,&size);