From 8501b5235cb4c4d23eba796f201eace350e08bf2 Mon Sep 17 00:00:00 2001 From: Telles Nobrega Date: Thu, 25 Jul 2019 17:19:02 -0300 Subject: [PATCH] Python 3 fixes String to Bytes compatibility. Story: #2006258 Task: #35875 Change-Id: Id0ad0f3c644af52f41217105b249df78d0b722cc (cherry picked from commit abc8f570559d142bab22a7557ad1658a6407b7f6) --- sahara/service/edp/spark/engine.py | 2 +- sahara/utils/ssh_remote.py | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sahara/service/edp/spark/engine.py b/sahara/service/edp/spark/engine.py index 83a35ff3d4..40a0e6beb8 100644 --- a/sahara/service/edp/spark/engine.py +++ b/sahara/service/edp/spark/engine.py @@ -173,7 +173,7 @@ class SparkJobEngine(base_engine.JobEngine): job_configs.get('configs', {})): path = 'service/edp/resources/edp-spark-wrapper.jar' name = 'builtin-%s.jar' % uuidutils.generate_uuid() - builtin_libs = [{'raw': files.get_file_text(path), + builtin_libs = [{'raw': files.try_get_file_text(path), 'name': name}] uploaded_paths = [] diff --git a/sahara/utils/ssh_remote.py b/sahara/utils/ssh_remote.py index c6da6601d3..a45332e6a5 100644 --- a/sahara/utils/ssh_remote.py +++ b/sahara/utils/ssh_remote.py @@ -276,7 +276,11 @@ def _get_http_client(host, port, proxy_command=None, gateway_host=None, def _write_fl(sftp, remote_file, data): - write_data = paramiko.py3compat.StringIO(data) + try: + write_data = paramiko.py3compat.StringIO(data) + except TypeError: + write_data = paramiko.py3compat.BytesIO(data) + sftp.putfo(write_data, remote_file)