openstack/adjutant-ui
Code Issues Proposed changes

Get rid of iteritems in favor of items

Browse Source 
Change-Id: I8cb19d301be92b7c6f4a26b4616547221f77caf0
This commit is contained in:
Adrian Turjak 2019-01-17 16:21:13 +13:00
parent baeb8879a2
commit 64b7a8c58f
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
adjutant_ui/api/adjutant.py
View File

@ -592,7 +592,7 @@ def quota_sizes_get(request, region=None):
resp = _get_quota_information(request, regions=region, include_usage=False) resp = _get_quota_information(request, regions=region, include_usage=False)
for size_name, size in six.iteritems(resp['quota_sizes']): for size_name, size in resp['quota_sizes'].items():
quota_sizes_dict[size_name] = QUOTA_SIZE( quota_sizes_dict[size_name] = QUOTA_SIZE(
id=size_name, id=size_name,
name=size_name, name=size_name,
@ -620,10 +620,10 @@ def size_details_get(request, size, region=None):
data = resp['quota_sizes'][size] data = resp['quota_sizes'][size]
region_data = resp['regions'][0]['current_quota'] region_data = resp['regions'][0]['current_quota']
for service, values in six.iteritems(data): for service, values in data.items():
if service not in resp['regions'][0]['current_usage']: if service not in resp['regions'][0]['current_usage']:
continue continue
for resource, value in six.iteritems(values): for resource, value in values.items():
if _is_quota_hidden(service, resource): if _is_quota_hidden(service, resource):
continue continue
@ -655,8 +655,8 @@ def quota_details_get(request, region):
data = resp['regions'][0]['current_quota'] data = resp['regions'][0]['current_quota']
for service, values in six.iteritems(data): for service, values in data.items():
for name, value in six.iteritems(values): for name, value in values.items():
if _is_quota_hidden(service, name): if _is_quota_hidden(service, name):
continue continue
@ -669,7 +669,7 @@ def quota_details_get(request, region):
percent = '-' percent = '-'
size_blob = {} size_blob = {}
for size_name, size_data in resp['quota_sizes'].iteritems(): for size_name, size_data in resp['quota_sizes'].items():
size_blob[size_name] = size_data[service].get(name, '-') size_blob[size_name] = size_data[service].get(name, '-')
if name != 'id': if name != 'id':

2
adjutant_ui/content/tasks/templates/tasks/_task_detail_notes.html
View File

@ -5,7 +5,7 @@
<h4>{% trans "Action Notes" %}</h4> <h4>{% trans "Action Notes" %}</h4>
<hr class="header_rule"> <hr class="header_rule">
<dl class="dl-horizontal"> <dl class="dl-horizontal">
{% for action, notes in task.action_notes.iteritems %} {% for action, notes in task.action_notes.items %}
<dt>{{ action }}</dt> <dt>{{ action }}</dt>
{% for note in notes %} {% for note in notes %}
<dd>{{ note }}</dd> <dd>{{ note }}</dd>