Replace iteritems with items

Change-Id: I766e8831573cc86d9117d4d07f556bc98e6c61be
Story: 2000975
Task: 5948
This commit is contained in:
Christoph Held 2017-11-30 11:03:57 +01:00 committed by Witold Bedyk
parent fa4790a70e
commit af3bfd45e1
5 changed files with 14 additions and 14 deletions

View File

@ -55,7 +55,7 @@ class MetricsRepository(metrics_repository.AbstractMetricsRepository):
sub_dimensions = {}
if dimensions:
for key, value in dimensions.iteritems():
for key, value in dimensions.items():
if not value:
sub_dimensions[key] = value
@ -77,7 +77,7 @@ class MetricsRepository(metrics_repository.AbstractMetricsRepository):
extracted_dimensions = sub_dimensions.copy()
for dims in iter(or_dims_tuple):
for k, v in dims.iteritems():
for k, v in dims.items():
extracted_dimensions[k] = v
metrics = self._list_metrics(tenant_id, region, name,
@ -142,7 +142,7 @@ class MetricsRepository(metrics_repository.AbstractMetricsRepository):
if include_metric_hash:
metric[u'metric_hash'] = metric_hash
for name, value in metric_map.iteritems():
for name, value in metric_map.items():
if name == '__name__':
@ -175,7 +175,7 @@ class MetricsRepository(metrics_repository.AbstractMetricsRepository):
dimension_clause = ''
if dimensions:
for name, value in dimensions.iteritems():
for name, value in dimensions.items():
if not value:
dimension_clause += ' and metric_map contains key %s '
@ -353,7 +353,7 @@ class MetricsRepository(metrics_repository.AbstractMetricsRepository):
for row in rows:
metric_map = row.metric_map
for name, value in metric_map.iteritems():
for name, value in metric_map.items():
if name == '__name__':
value = urllib.unquote_plus(value)
@ -693,7 +693,7 @@ class MetricsRepository(metrics_repository.AbstractMetricsRepository):
for row in rows:
metric_map = row.metric_map
for name, value in metric_map.iteritems():
for name, value in metric_map.items():
name = urllib.unquote_plus(name)
value = urllib.unquote_plus(value)
@ -730,7 +730,7 @@ class MetricsRepository(metrics_repository.AbstractMetricsRepository):
for row in rows:
metric_map = row.metric_map
for name, value in metric_map.iteritems():
for name, value in metric_map.items():
name = urllib.unquote_plus(name)
dim_name = {u'dimension_name': name}

View File

@ -263,7 +263,7 @@ class MetricsRepository(metrics_repository.AbstractMetricsRepository):
# dimensions - optional
if dimensions:
for dimension_name, dimension_value in iter(
sorted(dimensions.iteritems())):
sorted(dimensions.items())):
# replace ' with \' to make query parsable
clean_dimension_name = dimension_name.replace("\'", "\\'")
if dimension_value == "":
@ -601,7 +601,7 @@ class MetricsRepository(metrics_repository.AbstractMetricsRepository):
if not group_by:
measurement[u'dimensions'] = dimensions
else:
measurement[u'dimensions'] = {key: value for key, value in serie['tags'].iteritems()
measurement[u'dimensions'] = {key: value for key, value in serie['tags'].items()
if not key.startswith('_')}
json_measurement_list.append(measurement)
@ -712,7 +712,7 @@ class MetricsRepository(metrics_repository.AbstractMetricsRepository):
if not group_by:
statistic[u'dimensions'] = dimensions
else:
statistic[u'dimensions'] = {key: value for key, value in serie['tags'].iteritems()
statistic[u'dimensions'] = {key: value for key, value in serie['tags'].items()
if not key.startswith('_')}
json_statistics_list.append(statistic)

View File

@ -104,7 +104,7 @@ class SubAlarmDefinition(object):
def __hash__(self):
dimensions_str = "".join(sorted([name + value for name, value in
self.dimensions.iteritems()]))
self.dimensions.items()]))
# don't use id to hash.
return (hash(self.alarm_definition_id) ^

View File

@ -288,7 +288,7 @@ class AlarmDefinitionsRepository(sql_repository.SQLRepository,
query_from = query_from.join(sad, sadi == ad.c.id)
i = 0
for n, v in dimensions.iteritems():
for n, v in dimensions.items():
bind_dimension_name = 'b_sadd_dimension_name_{}'.format(i)
bind_value = 'b_sadd_value_{}'.format(i)
sadd_ = (select([sadd.c.sub_alarm_definition_id])
@ -575,7 +575,7 @@ class AlarmDefinitionsRepository(sql_repository.SQLRepository,
parms = []
for sub_alarm_definition_id, sub_alarm_def in (
changed_sub_alarm_defs_by_id.iteritems()):
changed_sub_alarm_defs_by_id.items()):
parms.append({'b_operator': sub_alarm_def.operator,
'b_threshold': sub_alarm_def.threshold,
'b_is_deterministic': sub_alarm_def.deterministic,

View File

@ -622,7 +622,7 @@ class TestAlarmDefinition(AlarmTestBase):
result_def = json.loads(result[0])
self.assertEqual(result_def, expected_def)
for key, value in alarm_def.iteritems():
for key, value in alarm_def.items():
del alarm_def[key]
self.simulate_request("/v2.0/alarm-definitions/%s" % expected_def[u'id'],