shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-01 08:21:15 +03:00
Code Releases Activity

Remove legacy exception handling.

Browse Source
This commit is contained in:
jangsutsr 2016-08-24 10:58:53 -04:00
parent c3f844cfe0
commit 8576dcda19
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
awx/main/models/jobs.py
View File

@ -746,14 +746,11 @@ class Job(UnifiedJob, JobOptions):
Hides fields marked as passwords in survey.
'''
if self.survey_passwords:
try:
extra_vars = json.loads(self.extra_vars)
for key, value in self.survey_passwords.items():
if key in extra_vars:
extra_vars[key] = value
return json.dumps(extra_vars)
except ValueError:
pass
extra_vars = json.loads(self.extra_vars)
for key, value in self.survey_passwords.items():
if key in extra_vars:
extra_vars[key] = value
return json.dumps(extra_vars)
else:
return self.extra_vars