Skip to content

fix TypeError in python3 #168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 9, 2023
Merged

fix TypeError in python3 #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/core/src/bootstrap/Bootstrapper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,9 @@ def get_current_env():
def get_path_to_log_files_and_telemetry_dir(self, argv, auto_assessment_only):
""" Performs the minimum steps required to determine where to start logging """
sequence_number = self.get_value_from_argv(argv, Constants.ARG_SEQUENCE_NUMBER)
environment_settings = json.loads(base64.b64decode(self.get_value_from_argv(argv, Constants.ARG_ENVIRONMENT_SETTINGS).replace("b\'", "")))
decode_bytes = base64.b64decode(self.get_value_from_argv(argv, Constants.ARG_ENVIRONMENT_SETTINGS).replace("b\'", ""))
decode_value = decode_bytes.decode()
environment_settings = json.loads(decode_value)
log_folder = environment_settings[Constants.EnvSettings.LOG_FOLDER] # can throw exception and that's okay (since we can't recover from this)
exec_demarcator = ".aa" if auto_assessment_only else ""
log_file_path = os.path.join(log_folder, str(sequence_number) + exec_demarcator + ".core.log")
Expand Down
3 changes: 2 additions & 1 deletion src/core/src/core_logic/ExecutionConfig.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,8 @@ def __get_decoded_json_from_argv(self, argv, key):
value = self.__get_value_from_argv(argv, key)

try:
decoded_value = base64.b64decode(value.replace("b\'", ""))
decoded_bytes = base64.b64decode(value.replace("b\'", ""))
decoded_value = decoded_bytes.decode()
decoded_json = json.loads(decoded_value)
except Exception as error:
self.composite_logger.log_error('Unable to process JSON in core arguments for key: {0}. Details: {1}.'.format(str(key), repr(error)))
Expand Down