Browse Source

Handle urlencode difference.

Bentley James Oakes 7 years ago
parent
commit
540e1b03c2
2 changed files with 11 additions and 6 deletions
  1. 6 6
      wrappers/classes/modelverse.xml
  2. 5 0
      wrappers/modelverse_SCCD.xml

+ 6 - 6
wrappers/classes/modelverse.xml

@@ -141,7 +141,7 @@
                     <transition event="request" cond="isinstance(value, type([]))" target=".">
                         <parameter name="value"/>
                         <raise event="HTTP_input" target="self.http_clients[0]">
-                            <parameter expr='urllib.urlencode({"op": "set_input", "data": json.dumps(value), "taskname": self.taskname})'/>
+                            <parameter expr='urlencode({"op": "set_input", "data": json.dumps(value), "taskname": self.taskname})'/>
                             <parameter expr='None'/>
                         </raise>
                     </transition>
@@ -149,7 +149,7 @@
                     <transition event="request" cond="not isinstance(value, type([]))" target=".">
                         <parameter name="value"/>
                         <raise event="HTTP_input" target="self.http_clients[0]">
-                            <parameter expr='urllib.urlencode({"op": "set_input", "value": json.dumps(value), "taskname": self.taskname})'/>
+                            <parameter expr='urlencode({"op": "set_input", "value": json.dumps(value), "taskname": self.taskname})'/>
                             <parameter expr='None'/>
                         </raise>
                     </transition>
@@ -159,7 +159,7 @@
                         <parameter name="taskname"/>
                         <parameter name="http_client"/>
                         <raise event="HTTP_input" target="self.http_clients[http_client]">
-                            <parameter expr='urllib.urlencode({"op": "set_input", "value": json.dumps(value), "taskname": taskname})'/>
+                            <parameter expr='urlencode({"op": "set_input", "value": json.dumps(value), "taskname": taskname})'/>
                             <parameter expr='"parent"'/>
                         </raise>
                     </transition>
@@ -167,7 +167,7 @@
                     <transition event="HTTP_output" cond="not self.finish_output_thread" target=".">
                         <parameter name="data"/>
                         <raise event="HTTP_input" target="self.http_clients[1]">
-                            <parameter expr='urllib.urlencode({"op": "get_output", "taskname": self.taskname})'/>
+                            <parameter expr='urlencode({"op": "get_output", "taskname": self.taskname})'/>
                             <parameter expr='"parent"'/>
                         </raise>
                         <script>
@@ -179,7 +179,7 @@
                     <transition event="HTTP_output" cond="self.finish_output_thread" target="../finished">
                         <parameter name="data"/>
                         <raise event="HTTP_input" target="self.http_clients[1]">
-                            <parameter expr='urllib.urlencode({"op": "get_output", "taskname": self.taskname})'/>
+                            <parameter expr='urlencode({"op": "get_output", "taskname": self.taskname})'/>
                             <parameter expr='"parent"'/>
                         </raise>
                         <script>
@@ -222,7 +222,7 @@
                         <transition cond="self.i == 2" target="../../wait_for_action/connected">
                             <!-- Start polling for output -->
                             <raise event="HTTP_input" target="self.http_clients[1]">
-                                <parameter expr='urllib.urlencode({"op": "get_output", "taskname": self.taskname})'/>
+                                <parameter expr='urlencode({"op": "get_output", "taskname": self.taskname})'/>
                                 <parameter expr='"parent"'/>
                             </raise>
 

+ 5 - 0
wrappers/modelverse_SCCD.xml

@@ -12,6 +12,11 @@
         import urllib
         import json
         import sys
+
+        try:
+            from urllib.parse import urlencode as urlencode
+        except ModuleNotFoundError:
+            from urllib import urlencode as urlencode
     </top>
 
     <inport name="socket_in"/>