refactor how system scrypt make the call to cr.server

integration/test_scripts.py

@@ -67,7 +67,8 @@ def test_define_view_strict_subvariable_syntax(self):
 
         scrunch_dataset = get_mutable_dataset(ds.body.id, self.site)
         project.move_here([scrunch_dataset])
-        project.execute(script_body, strict_subvariable_syntax=True)
+        resp = project.execute(script_body, strict_subvariable_syntax=True)
+        wait_progress(resp, self.site.session)
         view = scrunch_dataset.views.get_by_name("My view")
         assert view.project.name == project.name
 

scrunch/scripts.py

@@ -55,10 +55,11 @@ def execute(self, script_body, strict_subvariable_syntax=None):
 
 class SystemScript(BaseScript):
 
-    def format_request_url(self, execute, strict_subvariable_syntax=None):
+    def format_request_url(self, request_url, strict_subvariable_syntax=None):
         strict_subvariable_syntax_flag = self.get_default_syntax_flag(strict_subvariable_syntax)
         if strict_subvariable_syntax_flag:
-            execute.self += "?strict_subvariable_syntax=true"
+            request_url += "?strict_subvariable_syntax=true"
+        return request_url
 
     def execute(self, script_body, strict_subvariable_syntax=None):
         """
@@ -70,9 +71,8 @@ def execute(self, script_body, strict_subvariable_syntax=None):
         # The script execution endpoint is a shoji:view
         payload = shoji_view_wrapper(script_body)
         try:
-            execute = self.resource.execute
-            self.format_request_url(execute, strict_subvariable_syntax)
-            return execute.post(payload)
+            execute_url = self.format_request_url(self.resource.views['execute'], strict_subvariable_syntax)
+            return self.resource.session.post(execute_url, json=payload)
         except pycrunch.ClientError as err:
             resolutions = err.args[2]["resolutions"]
             raise ScriptExecutionError(err, resolutions)