External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-19 05:31:22 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3333 from ryanpetrello/more-py3-bugs

Browse Source 
fix a few additional py3 issues

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
This commit is contained in:
softwarefactory-project-zuul[bot] 2019-02-28 13:31:05 +00:00 committed by GitHub
commit dea71d2682
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
awx/api/metadata.py
View File

@ -238,12 +238,10 @@ class JobTypeMetadata(Metadata):
res = super(JobTypeMetadata, self).get_field_info(field)
if field.field_name == 'job_type':
index = 0
for choice in res['choices']:
if choice[0] == 'scan':
res['choices'].pop(index)
break
index += 1
res['choices'] = [
choice for choice in res['choices']
if choice[0] != 'scan'
]
return res
@ -253,7 +251,7 @@ class SublistAttachDetatchMetadata(Metadata):
actions = super(SublistAttachDetatchMetadata, self).determine_actions(request, view)
method = 'POST'
if method in actions:
for field in actions[method]:
for field in list(actions[method].keys()):
if field == 'id':
continue
actions[method].pop(field)