From 173da89b520c570ead89a9371b57b5db12ab887d Mon Sep 17 00:00:00 2001 From: Sawan Choudhary Date: Fri, 10 Jul 2020 12:03:52 -0700 Subject: [PATCH] Python3 fixes Change-Id: I64669dad15ea2c83fec5cf317e7f5c030068b409 (cherry picked from commit b9214c2507d78357ebd5cdffb80c41edd831a69c) --- cloudpulse/cmd/api.py | 2 ++ cloudpulse/objects/cpulse.py | 5 ++++- cloudpulse/scenario/plugins/operator_tests/operator.py | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/cloudpulse/cmd/api.py b/cloudpulse/cmd/api.py index 2f465cf..52b2f56 100644 --- a/cloudpulse/cmd/api.py +++ b/cloudpulse/cmd/api.py @@ -13,6 +13,8 @@ # limitations under the License. """Starter script for the Cloudpulse API service.""" +import eventlet +eventlet.monkey_patch() import logging as std_logging import os diff --git a/cloudpulse/objects/cpulse.py b/cloudpulse/objects/cpulse.py index a8cbf72..7ede729 100644 --- a/cloudpulse/objects/cpulse.py +++ b/cloudpulse/objects/cpulse.py @@ -57,7 +57,10 @@ class Cpulse(base.CloudpulsePersistentObject, base.CloudpulseObject, def _from_db_object(test, db): """Converts a database entity to a formal object.""" for field in test.fields: - test[field] = db[field] + if isinstance(db[field], bytes): + test[field] = db[field].decode('utf-8') + else: + test[field] = db[field] test.obj_reset_changes() return test diff --git a/cloudpulse/scenario/plugins/operator_tests/operator.py b/cloudpulse/scenario/plugins/operator_tests/operator.py index e9b1f40..2393ce9 100644 --- a/cloudpulse/scenario/plugins/operator_tests/operator.py +++ b/cloudpulse/scenario/plugins/operator_tests/operator.py @@ -98,8 +98,8 @@ def execute(command): return {'status': 126, 'output': ""} if p.returncode == 126 or p.returncode == 127: - stdout = str(b"") - return {'status': p.returncode, 'output': stdout} + stdout = b'' + return {'status': p.returncode, 'output': stdout.decode('utf-8')} def get_container_name(name):