From e897cbd237d9965da3a032c077302d72b7001a6e Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Fri, 13 Jul 2018 15:50:50 -0400 Subject: [PATCH] fix unicode bug in launch error message --- awx/api/serializers.py | 2 +- awx/main/models/credential/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/awx/api/serializers.py b/awx/api/serializers.py index dca0dfbdc8..9ae461c53c 100644 --- a/awx/api/serializers.py +++ b/awx/api/serializers.py @@ -4294,7 +4294,7 @@ class JobLaunchSerializer(BaseSerializer): errors.setdefault('credentials', []).append(_( 'Removing {} credential at launch time without replacement is not supported. ' 'Provided list lacked credential(s): {}.' - ).format(cred.unique_hash(display=True), ', '.join([str(c) for c in removed_creds]))) + ).format(cred.unique_hash(display=True), ', '.join([six.text_type(c) for c in removed_creds]))) # verify that credentials (either provided or existing) don't # require launch-time passwords that have not been provided diff --git a/awx/main/models/credential/__init__.py b/awx/main/models/credential/__init__.py index 1996bb2537..a31131c198 100644 --- a/awx/main/models/credential/__init__.py +++ b/awx/main/models/credential/__init__.py @@ -419,7 +419,7 @@ class Credential(PasswordFieldsModel, CommonModelNameNotUnique, ResourceMixin): else: fmt_str = six.text_type('{}_{}') return fmt_str.format(type_alias, self.inputs.get('vault_id')) - return str(type_alias) + return six.text_type(type_alias) @staticmethod def unique_dict(cred_qs):