You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ariatosca.apache.org by mx...@apache.org on 2017/02/06 15:49:35 UTC
incubator-ariatosca git commit: pickle instead of dill
Repository: incubator-ariatosca
Updated Branches:
refs/heads/ARIA-42-Generic-ctx-serialization-mechanism 5fd583d65 -> c079925c3
pickle instead of dill
Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/c079925c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/c079925c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/c079925c
Branch: refs/heads/ARIA-42-Generic-ctx-serialization-mechanism
Commit: c079925c3fa12605f2291305ca520866d0ca4710
Parents: 5fd583d
Author: mxmrlv <mx...@gmail.com>
Authored: Mon Feb 6 17:49:10 2017 +0200
Committer: mxmrlv <mx...@gmail.com>
Committed: Mon Feb 6 17:49:10 2017 +0200
----------------------------------------------------------------------
aria/orchestrator/workflows/executor/process.py | 6 +++---
requirements.txt | 1 -
2 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/c079925c/aria/orchestrator/workflows/executor/process.py
----------------------------------------------------------------------
diff --git a/aria/orchestrator/workflows/executor/process.py b/aria/orchestrator/workflows/executor/process.py
index f670dfe..23a4f52 100644
--- a/aria/orchestrator/workflows/executor/process.py
+++ b/aria/orchestrator/workflows/executor/process.py
@@ -37,7 +37,7 @@ import struct
import subprocess
import tempfile
import Queue
-import dill
+import pickle
import jsonpickle
@@ -114,7 +114,7 @@ class ProcessExecutor(base.BaseExecutor):
file_descriptor, arguments_json_path = tempfile.mkstemp(prefix='executor-', suffix='.json')
os.close(file_descriptor)
with open(arguments_json_path, 'wb') as f:
- f.write(dill.dumps(self._create_arguments_dict(task)))
+ f.write(pickle.dumps(self._create_arguments_dict(task)))
env = os.environ.copy()
# See _update_env for plugin_prefix usage
@@ -307,7 +307,7 @@ def _patch_session(ctx, messenger, instrument):
def _main():
arguments_json_path = sys.argv[1]
with open(arguments_json_path) as f:
- arguments = dill.loads(f.read())
+ arguments = pickle.loads(f.read())
# arguments_json_path is a temporary file created by the parent process.
# so we remove it here
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/c079925c/requirements.txt
----------------------------------------------------------------------
diff --git a/requirements.txt b/requirements.txt
index 2a26140..3f922e8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -29,6 +29,5 @@ wagon==0.5.0
bottle==0.12.11
six==1.10.0
Fabric==1.13.1
-dill==0.2.6
# Fabric makes use of this library, but doesn't bring it :(
pypiwin32==219 ; sys_platform == 'win32'